Attachment #2805 for bug #19953

(-)posixxrdp.orig/configure.ac (-1 / +1 lines)

Lines 25-31	Link Here

              [pulse=true], [pulse=false])

              [pulse=true], [pulse=false])

	      if test "${enable_pulse}" != "no"

	      if test "${enable_pulse}" != "no"

		then

		then

		PKG_CHECK_MODULES(PULSE, libpulse >= 0.9.11,

		PKG_CHECK_MODULES(PULSE, libpulse >= 0.9.10,

#			XRDP_ADD_PLUGIN([pulse])

#			XRDP_ADD_PLUGIN([pulse])

#			XRDP_ADD_CFLAGS([pulse],[${PULSE_CFLAGS}])

#			XRDP_ADD_CFLAGS([pulse],[${PULSE_CFLAGS}])

(-)posixxrdp.orig/libxrdp/xrdp_rdp.c (-2 / +2 lines)

Lines 414-421	Link Here

414

    in_uint8(p, self->client_info.connectionType);

414

    in_uint8(p, self->client_info.connectionType);

415

416

417

  wcstombs(str1, (const wchar_t * restrict)(self->client_info.clientName), 16);

417

  wcstombs(str1, (const wchar_t  * )(self->client_info.clientName), 16);

418

  wcstombs(str2, (const wchar_t * restrict)(self->client_info.imeFileName), 32);

418

  wcstombs(str2, (const wchar_t  * )(self->client_info.imeFileName), 32);

419

  //MDBGLOG("sound","\n\n$$$$\n postBeta2ColorDepth=%8.8x;\n highColorDepth=%d;\n supportedColorDepths=%d;\n earlyCapabilityFlags=%d;\n keyboardType=%d;\n keyboardLayout=%d;\n colorDepth=%8.8x;\n connectionType=%d;\n clientName=%s;\n imeFileName=%s;\n version=%8.8x;\n length=%d;\n",self->client_info.postBeta2ColorDepth, self->client_info.highColorDepth, self->client_info.supportedColorDepths, self->client_info.earlyCapabilityFlags, self->client_info.keyboardType, self->client_info.keyboardLayout, self->client_info.colorDepth, self->client_info.connectionType, str1, str2, (unsigned int)(self->client_info.version), ud_length);

419

  //MDBGLOG("sound","\n\n$$$$\n postBeta2ColorDepth=%8.8x;\n highColorDepth=%d;\n supportedColorDepths=%d;\n earlyCapabilityFlags=%d;\n keyboardType=%d;\n keyboardLayout=%d;\n colorDepth=%8.8x;\n connectionType=%d;\n clientName=%s;\n imeFileName=%s;\n version=%8.8x;\n length=%d;\n",self->client_info.postBeta2ColorDepth, self->client_info.highColorDepth, self->client_info.supportedColorDepths, self->client_info.earlyCapabilityFlags, self->client_info.keyboardType, self->client_info.keyboardLayout, self->client_info.colorDepth, self->client_info.connectionType, str1, str2, (unsigned int)(self->client_info.version), ud_length);

420

421

  self->client_info.bpp = 8;

421

  self->client_info.bpp = 8;

(-)posixxrdp.orig/sesman/chansrv/drdynvc.c (-1 / +1 lines)

Lines 123-129	Link Here

123

static callback * APP_CC get_callback_from_opid(ptrdiff_t);

123

static callback * APP_CC get_callback_from_opid(ptrdiff_t);

124

125

static ptrdiff_t APP_CC reserve_channel_id(void);

125

static ptrdiff_t APP_CC reserve_channel_id(void);

126

static int APP_CC release_channel_id(ptrdiff_t);

126

static ptrdiff_t APP_CC release_channel_id(ptrdiff_t);

127

128

static int APP_CC drdynvc_handle_connection(tbus);

128

static int APP_CC drdynvc_handle_connection(tbus);

129

(-)posixxrdp.orig/sesman/chansrv/rdpfs.c (-1 / +1 lines)

Lines 103-109	Link Here

103

static int APP_CC get_cv_fs(int, tc_p *, rdpfs *);

103

static int APP_CC get_cv_fs(int, tc_p *, rdpfs *);

104

static int APP_CC get_cbdata_fs(int reqid, callback **);

104

static int APP_CC get_cbdata_fs(int reqid, callback **);

105

static int APP_CC ntstatus_to_errcode(DWORD);

105

static int APP_CC ntstatus_to_errcode(DWORD);

106

static APP_CC int rdpfs_parse_path(const char *, char **, char **);

106

static APP_CC ptrdiff_t rdpfs_parse_path(const char *, char **, char **);

107

108

static int APP_CC construct_MINSHALL_FRENCH_SYMLINK(MINSHALL_FRENCH_SYMLINK *);

108

static int APP_CC construct_MINSHALL_FRENCH_SYMLINK(MINSHALL_FRENCH_SYMLINK *);

109

static char * APP_CC get_MINSHALL_FRENCH_SYMLINK(MINSHALL_FRENCH_SYMLINK *);

109

static char * APP_CC get_MINSHALL_FRENCH_SYMLINK(MINSHALL_FRENCH_SYMLINK *);

(-)posixxrdp.orig/sesman/chansrv/rdpport.c (-2 / +2 lines)

Lines 605-611	Link Here

605

  return rv;

605

  return rv;

606

607

608

static int APP_CC issue_port_cmd(rdpport_t * port, const rdpdr_packet_t *restrict ipkt) {

608

static int APP_CC issue_port_cmd(rdpport_t * port, const rdpdr_packet_t * ipkt) {

609

	int rv = 0;

609

	int rv = 0;

610

	tbus fd = -1;

610

	tbus fd = -1;

611

	uint32_t crc32 = 0;

611

	uint32_t crc32 = 0;

Lines 636-642	Link Here

636

	uint32_t device_id = 0;

636

	uint32_t device_id = 0;

637

	uint32_t * p_crc32 = (uint32_t *)NULL;

637

	uint32_t * p_crc32 = (uint32_t *)NULL;

638

	char * p = (char *)NULL;

638

	char * p = (char *)NULL;

639

	rdpdr_packet_t *restrict reply = (rdpdr_packet_t *restrict)ipkt;

639

	rdpdr_packet_t * reply = (rdpdr_packet_t * ) ipkt;

640

	rdp_irq_data_t * data = (rdp_irq_data_t *)(&(reply->data));

640

	rdp_irq_data_t * data = (rdp_irq_data_t *)(&(reply->data));

641

642

	fd = port->fd;

642

	fd = port->fd;

(-)posixxrdp.orig/sesman/dynamic/xrdp_rdpeai.c (-2 / +2 lines)

Lines 1338-1344	Link Here

1338

1339

      SAY("g_pa_trans = %p, g_pa_trans->sck = %d",g_pa_trans,g_pa_trans->sck);

1339

      SAY("g_pa_trans = %p, g_pa_trans->sck = %d",g_pa_trans,g_pa_trans->sck);

1340

1341

      pa_disable_sigpipe();

1341

      //pa_disable_sigpipe();

1342

      signal(SIGPIPE, SIG_IGN);

1342

      signal(SIGPIPE, SIG_IGN);

1343

1344

      while (!done) {

1344

      while (!done) {

Lines 1378-1384	Link Here

1378

1379

    else {			/* parent */

1379

    else {			/* parent */

1380

      unsigned char locked = 0;

1380

      unsigned char locked = 0;

1381

      pa_disable_sigpipe();

1381

      //pa_disable_sigpipe();

1382

      signal(SIGPIPE, SIG_IGN);

1382

      signal(SIGPIPE, SIG_IGN);

1383

      g_is_child = 0;

1383

      g_is_child = 0;

1384

      rv = pfd;

1384

      rv = pfd;

Return to bug 19953