- fix wrong hexadecimal GetLastError() output

controls/EDIT.TODO

@@ -94,7 +94,7 @@ if the buffer is already locked, so you can call it whenever you feel it
 
 At the end of EditWndProc(), EDIT_ReleasePointer() is automatically called
 which cleans up the initialized pointer.  So you don't have to worry about
-unlocking the memory block. This way, the buffer gets locked / unlock only
+unlocking the memory block. This way, the buffer gets locked / unlocked only
 once every message, although EDIT_GetPointer() may actually have been called
 a hundred times.  Only when the actual HLOCAL is needed (for example to
 ReAlloc), an extra call (besides the cleanup at the end of EditWndProc()) to
@@ -192,12 +192,7 @@ poorly documented.  Somebody that knows ?
 
 D) Known bugs / Features
 
--	The control still calls GetTabbedTextExtent() and TabbedTextOut() in
-	their 16 bit version (since the 32 bit versions don't yet exist).
-	Therefore the tab list is 16 bits (should be 32).
 -	Scrollbar tracking is broken.
--	Lots of API calls are to 16 bit functions, because their 32 bit
-	versions haven't been implemented yet (e.g. clipboard).
 -	Turning on WordWrap with 16-bit Notepad leaves part of the horizontal
 	scrollbar visible (problem with WM_ERASEBKGND ???).
 -	FIXME's (grep for them).

dlls/dplayx/dplayx_global.c

@@ -221,7 +221,7 @@ BOOL DPLAYX_ConstructData(void)
   }
   else
   {
-    ERR( ": semaphore error 0x%08lx\n", GetLastError() );
+    ERR( ": semaphore error %ld\n", GetLastError() );
     return FALSE;
   }
 
@@ -246,7 +246,7 @@ BOOL DPLAYX_ConstructData(void)
   }
   else
   {
-    ERR( ": unable to create shared memory 0x%08lx\n", GetLastError() );
+    ERR( ": unable to create shared memory (%ld)\n", GetLastError() );
     return FALSE;
   }
 
@@ -256,7 +256,7 @@ BOOL DPLAYX_ConstructData(void)
 
   if( lpSharedStaticData == NULL )
   {
-    ERR( ": unable to map static data into process memory space: 0x%08lx\n", 
+    ERR( ": unable to map static data into process memory space (%ld)\n", 
          GetLastError() );
     return FALSE;
   }

dlls/ole32/compobj.c

@@ -1454,7 +1454,7 @@ HRESULT WINAPI CoCreateInstance(
 			  (LPVOID)&lpclf);
 
   if (FAILED(hres)) {
-    FIXME("no classfactory created for %s, hres is 0x%08lx\n",
+    FIXME("no classfactory created for CLSID %s, hres is 0x%08lx\n",
 	  debugstr_guid(rclsid),hres);
     return hres;
   }

dlls/oleaut32/typelib.c

@@ -1942,7 +1942,7 @@ int TLB_ReadTypeLib(LPCWSTR pszFileName, INT index, ITypeLib2 **ppTypeLib)
     if(*ppTypeLib)
       ret = S_OK;
     else
-      ERR("Loading of typelib %s failed with error 0x%08lx\n",
+      ERR("Loading of typelib %s failed with error %ld\n",
 	  debugstr_w(pszFileName), GetLastError());
 
     return ret;

dlls/wineps/wps_De.rc

@@ -5,7 +5,7 @@ STYLE  WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE
 CAPTION "Papier"
 FONT 8, "Helv"
 {
- LTEXT "Papier &Gre:", -1, 10, 6, 100, 8
+ LTEXT "&Papiergre:", -1, 10, 6, 100, 8
  LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS |
 	 WS_TABSTOP
  GROUPBOX "Ausrichtung", -1, 10, 80, 200, 50

dlls/x11drv/dga2.c

@@ -63,7 +63,7 @@ void X11DRV_XF86DGA2_Init(void)
 
   /* test that it works */
   if (!TSXDGAOpenFramebuffer(gdi_display, DefaultScreen(gdi_display))) {
-    TRACE("disabling XF86DGA2 (insufficient permissions?)\n");
+    WARN("disabling XF86DGA2 (insufficient permissions?)\n");
     return;
   }
   TSXDGACloseFramebuffer(gdi_display, DefaultScreen(gdi_display));
@@ -84,7 +84,7 @@ void X11DRV_XF86DGA2_Init(void)
   for (i=0; i<nmodes; i++)
     convert_mode(&modes[i], &xf86dga2_modes[i+1]);
 
-  TRACE("Enabling DGA\n");
+  TRACE("Enabling XF86DGA2 mode\n");
 }
 
 void X11DRV_XF86DGA2_Cleanup(void)

documentation/samples/config

@@ -210,6 +210,8 @@ WINE REGISTRY Version 2
 
 [Tweak.Layout]
 ;; supported styles are 'Win31'(default), 'Win95', 'Win98'
+;; this has *nothing* to do with the windows version Wine returns:
+;; use cmdline option --winver if you want that.
 "WineLook" = "Win95"
 
 [Console]

files/directory.c

@@ -121,7 +121,7 @@ int DIR_Init(void)
                              path, sizeof(path) );
     if (strchr(path, '/'))
     {
-	MESSAGE("No '/' allowed in [wine] 'Path=' statement of wine config!\n");
+	MESSAGE("Fix your wine config to use DOS drive syntax in [wine] 'Path=' statement! (no '/' allowed)\n");
 	PROFILE_UsageWineIni();
 	ExitProcess(1);
     }

files/dos_fs.c

@@ -1222,13 +1222,13 @@ static DWORD DOSFS_DoGetFullPathName( LPCSTR name, DWORD len, LPSTR result,
     int namelen,drive=0;
 
     if ((strlen(name) >1)&& (name[1]==':'))
-      /*drive letter given */
+      /* drive letter given */
       {
 	driveletter = name[0];
       }
     if ((strlen(name) >2)&& (name[1]==':') &&
 	     ((name[2]=='\\') || (name[2]=='/')))
-      /*absolute path given */
+      /* absolute path given */
       {
 	lstrcpynA(full_name.short_name,name,MAX_PATHNAME_LEN);
 	drive = (int)FILE_toupper(name[0]) - 'A';
@@ -1285,7 +1285,7 @@ static DWORD DOSFS_DoGetFullPathName( LPCSTR name, DWORD len, LPSTR result,
 	if ( *p == '/' )
 	  *p = '\\';
       }
-     /* Use memmove, as areas overlap*/
+     /* Use memmove, as areas overlap */
      /* Delete .. */
     while ((p = strstr(full_name.short_name,"\\..\\")))
       {
@@ -1317,8 +1317,8 @@ static DWORD DOSFS_DoGetFullPathName( LPCSTR name, DWORD len, LPSTR result,
     namelen=strlen(full_name.short_name);
     if (!strcmp(full_name.short_name+namelen-3,"\\.."))
 	{
-	  /* one more starnge case: "c:\test\test1\.." 
-	   return "c:\test"*/
+	  /* one more strange case: "c:\test\test1\.." 
+	   return "c:\test" */
 	  *(full_name.short_name+namelen-3)=0;
 	  q = strrchr(full_name.short_name,'\\');
 	  *q =0;
@@ -1332,7 +1332,7 @@ static DWORD DOSFS_DoGetFullPathName( LPCSTR name, DWORD len, LPSTR result,
 
     /* If the lpBuffer buffer is too small, the return value is the 
     size of the buffer, in characters, required to hold the path 
-    plus the terminating \0 (tested against win95osr, bon 001118)
+    plus the terminating \0 (tested against win95osr2, bon 001118)
     . */
     ret = strlen(full_name.short_name);
     if (ret >= len )

misc/cdrom.c

@@ -869,7 +869,7 @@ DWORD CDROM_GetLabel(int drive, char *label)
 
 	    case CDS_MIXED:
 		cdname = "Mixed mode";
-		ERR("We don't have a way of determining the label of a mixed mode CD - Linux doesn't allow raw access !!\n");
+		FIXME("Need to get the label of a mixed mode CD: not implemented yet !\n");
 		/* fall through */
 
 	    case CDS_NO_INFO:

msdos/int21.c

@@ -2448,7 +2448,7 @@ void WINAPI DOS3Call( CONTEXT86 *context )
     }
 
     if ((context->EFlags & 0x0001))
-        TRACE("failed, error 0x%04lx\n", GetLastError() );
+        TRACE("failed, error %ld\n", GetLastError() );
  
     TRACE("returning: AX=%04x BX=%04x CX=%04x DX=%04x "
                  "SI=%04x DI=%04x DS=%04x ES=%04x EFL=%08lx\n",

programs/uninstaller/main.c

 /*
  * Q&D Uninstaller (main.c)
  * 
- * Copyright 2000 Andreas Mohr <a.mohr@mailto.de>
+ * Copyright 2000 Andreas Mohr <andi@lisas.de>
  * To be distributed under the Wine License
  */
 
@@ -40,7 +40,7 @@
 char appname[18];
 
 static char about_string[] =
-    "Windows program uninstaller (C) 2000 by Andreas Mohr <a.mohr@mailto.de>";
+    "Windows program uninstaller (C) 2000 by Andreas Mohr <andi@lisas.de>";
 static char program_description[] =
 	"Welcome to the Wine uninstaller !\n\nThe purpose of this program is to let you get rid of all those fantastic programs that somehow manage to always take way too much space on your HDD :-)";
 

programs/uninstaller/rsrc.rc

 /*
  * Uninstaller (rsrc.rc)
  * 
- * Copyright 2000 Andreas Mohr <a.mohr@mailto.de>
+ * Copyright 2000 Andreas Mohr <andi@lisas.de>
  * To be distributed under the Wine License
  */
 

scheduler/pthread.c

@@ -2,7 +2,7 @@
  * pthread emulation for re-entrant libcs
  *
  * We can't use pthreads directly, so why not let libcs
- * that wants pthreads use Wine's own threading instead...
+ * that want pthreads use Wine's own threading instead...
  *
  * Copyright 1999 Ove Kven
  */

tools/wineinstall

@@ -378,7 +378,7 @@ then {
     then {
       rm -f $TMPCONF $TMPREG > /dev/null
 
-      echo " not found."
+      echo " not found. (no matching /etc/fstab mount entry found)"
       conf_question low do_without_windows \
        "Windows was not found on your system, so I assume you want" \
        "a Wine-only installation. Am I correct?"

win32/except.c

@@ -291,12 +291,12 @@ EXIT:
 /******************************************************************
  *		start_debugger_atomic
  *
- * starts the debugger is an atomic way:
+ * starts the debugger in an atomic way:
  *	- either the debugger is not started and it is started
- *	- either the debugger has already been started by an other thread
- *	- either the debugger couldn't be started
+ *	- or the debugger has already been started by another thread
+ *	- or the debugger couldn't be started
  *
- * returns TRUE for the two first condition, FALSE for the last
+ * returns TRUE for the two first conditions, FALSE for the last
  */
 static	int	start_debugger_atomic(PEXCEPTION_POINTERS epointers)
 {
@@ -314,9 +314,8 @@ static	int	start_debugger_atomic(PEXCEPTION_POINTERS epointers)
 	attr.SecurityDescriptor       = NULL;
 	attr.SecurityQualityOfService = NULL;
 
-	/* ask for manual reset, so that once the debugger is started, every thread will be
-	 * know it
-	 */
+	/* ask for manual reset, so that once the debugger is started,
+	 * every thread will know it */
 	NtCreateEvent( &hEvent, EVENT_ALL_ACCESS, &attr, TRUE, FALSE );
 	if (InterlockedCompareExchange( (LPLONG)&hRunOnce, hEvent, 0 ) == 0)
 	{
@@ -338,9 +337,9 @@ static	int	start_debugger_atomic(PEXCEPTION_POINTERS epointers)
 	
     /* and wait for the winner to have actually created the debugger */
     WaitForSingleObject( hRunOnce, INFINITE );
-    /* in fact, here, we only know that someone has tried to start the debugger, we'll know
-     * by reposting the exception if it has actually attached to the current process
-     */
+    /* in fact, here, we only know that someone has tried to start the debugger,
+     * we'll know by reposting the exception if it has actually attached
+     * to the current process */
     return TRUE;
 }
 

win32/time.c

@@ -42,20 +42,20 @@ VOID WINAPI GetLocalTime(LPSYSTEMTIME systime)
  */
 VOID WINAPI GetSystemTime(LPSYSTEMTIME systime)
 {
-    time_t local_time;
-    struct tm *local_tm;
+    time_t system_time;
+    struct tm *system_tm;
     struct timeval tv;
 
     gettimeofday(&tv, NULL);
-    local_time = tv.tv_sec;
-    local_tm = gmtime(&local_time);
-
-    systime->wYear = local_tm->tm_year + 1900;
-    systime->wMonth = local_tm->tm_mon + 1;
-    systime->wDayOfWeek = local_tm->tm_wday;
-    systime->wDay = local_tm->tm_mday;
-    systime->wHour = local_tm->tm_hour;
-    systime->wMinute = local_tm->tm_min;
-    systime->wSecond = local_tm->tm_sec;
+    system_time = tv.tv_sec;
+    system_tm = gmtime(&system_time);
+
+    systime->wYear = system_tm->tm_year + 1900;
+    systime->wMonth = system_tm->tm_mon + 1;
+    systime->wDayOfWeek = system_tm->tm_wday;
+    systime->wDay = system_tm->tm_mday;
+    systime->wHour = system_tm->tm_hour;
+    systime->wMinute = system_tm->tm_min;
+    systime->wSecond = system_tm->tm_sec;
     systime->wMilliseconds = (tv.tv_usec / 1000) % 1000;
 }