Attachment #4075 for bug #10431

(-)a/dix/registry.c (-1 / +1 lines)

Lines 313-319 dixResetRegistry(void)	Link Here

313

	fclose(fh);

313

	fclose(fh);

314

    fh = fopen(FILENAME, "r");

314

    fh = fopen(FILENAME, "r");

315

    if (!fh)

315

    if (!fh)

316

	LogMessage(X_WARNING, "Failed to open protocol names file " FILENAME);

316

	LogMessage(X_WARNING, "Failed to open protocol names file " FILENAME "\n");

317

318

    /* Add built-in resources */

318

    /* Add built-in resources */

319

    RegisterResourceName(RT_NONE, "NONE");

319

    RegisterResourceName(RT_NONE, "NONE");

(-)a/hw/xwin/winclipboardthread.c (-1 / +1 lines)

Lines 454-460 winClipboardErrorHandler (Display pDisplay, XErrorEvent pErr)	Link Here

454

static int

454

static int

455

winClipboardIOErrorHandler (Display *pDisplay)

455

winClipboardIOErrorHandler (Display *pDisplay)

456

457

  ErrorF ("\nwinClipboardIOErrorHandler!\n\n");

457

  ErrorF ("winClipboardIOErrorHandler!\n\n");

458

459

  /* Restart at the main entry point */

459

  /* Restart at the main entry point */

460

  longjmp (g_jmpEntry, WIN_JMP_ERROR_IO);

460

  longjmp (g_jmpEntry, WIN_JMP_ERROR_IO);




      if (pProcArg->pDisplay == NULL)
	{
	  ErrorF ("winMultiWindowXMsgProc - Could not open display, try: %d, "
		  "sleeping: %d\n",
		  iRetries + 1, WIN_CONNECT_DELAY);
	  ++iRetries;
	  sleep (WIN_CONNECT_DELAY);

      if (pWMInfo->pDisplay == NULL)
	{
	  ErrorF ("winInitMultiWindowWM - Could not open display, try: %d, "
		  "sleeping: %d\n",
		  iRetries + 1, WIN_CONNECT_DELAY);
	  ++iRetries;
	  sleep (WIN_CONNECT_DELAY);

static int
winMultiWindowWMIOErrorHandler (Display *pDisplay)
{
  ErrorF ("winMultiWindowWMIOErrorHandler!\n\n");

  if (g_shutdown)
    pthread_exit(NULL);

static int
winMultiWindowXMsgProcIOErrorHandler (Display *pDisplay)
{
  ErrorF ("winMultiWindowXMsgProcIOErrorHandler!\n\n");

  /* Restart at the main entry point */
  longjmp (g_jmpXMsgProcEntry, WIN_JMP_ERROR_IO);

(-)a/hw/xwin/winshadddnl.c (-1 / +1 lines)

Lines 554-560 winFinishCreateWindowsWindowDDNL (WindowPtr pWin)	Link Here

554

  int			iWidth, iHeight;

554

  int			iWidth, iHeight;

555

  int			iX, iY;

555

  int			iX, iY;

556

557

  winDebug ("\nwinFinishCreateWindowsWindowDDNL!\n\n");

557

  winDebug ("winFinishCreateWindowsWindowDDNL!\n\n");

558

559

  iX = pWin->drawable.x + GetSystemMetrics (SM_XVIRTUALSCREEN);

559

  iX = pWin->drawable.x + GetSystemMetrics (SM_XVIRTUALSCREEN);

560

  iY = pWin->drawable.y + GetSystemMetrics (SM_YVIRTUALSCREEN);

560

  iY = pWin->drawable.y + GetSystemMetrics (SM_YVIRTUALSCREEN);




	fwrite(tmpBuffer, len, 1, stderr);
    if ((verb < 0 || logFileVerbosity >= verb) && len > 0) {
	if (logFile) {
            static char tmpBuffer2[1024];
            static Bool needTimestamp = TRUE;

            if (needTimestamp)
              {
                needTimestamp = FALSE;

                /* Format the date and time per ISO8601 */
                time_t t = time(NULL);
                struct tm tm;
                localtime_r(&t, &tm);
                strftime(tmpBuffer2, sizeof(tmpBuffer2), "%F %T ",  &tm);

                /* Concatente the string produced by formatting the va_list */
                strncat(tmpBuffer2, tmpBuffer, sizeof(tmpBuffer2));
              }
            else
              {
                strncpy(tmpBuffer2, tmpBuffer, sizeof(tmpBuffer2));
              }
            len = strlen(tmpBuffer2);

            /* If the log message ends with a newline, note that we need to start the next line with a timestamp */
            if (tmpBuffer2[len-1] == '\n')
              needTimestamp = TRUE;

	    fwrite(tmpBuffer2, len, 1, logFile);
	    if (logFlush) {
		fflush(logFile);
#ifndef WIN32
- 

Return to bug 10431