Cosmetics.

debugger/winedbg.c

@@ -450,7 +450,7 @@ static	BOOL	DEBUG_HandleException(EXCEPTION_RECORD *rec, BOOL first_chance, BOOL
             DEBUG_Printf(DBG_CHN_MESG, "stack overflow");
             break;
         case EXCEPTION_PRIV_INSTRUCTION:
-            DEBUG_Printf(DBG_CHN_MESG, "priviledged instruction");
+            DEBUG_Printf(DBG_CHN_MESG, "privileged instruction");
             break;
         case EXCEPTION_ACCESS_VIOLATION:
             if (rec->NumberParameters == 2)

dlls/oleaut32/ole2disp.c

@@ -63,7 +63,7 @@ BSTR16 WINAPI SysAllocString16(LPCOLESTR16 in)
 	if (!in) return 0;
     
 	out = BSTR_AllocBytes(strlen(in)+1);
-	if(!out)return 0;
+	if (!out) return 0;
 	strcpy(BSTR_GetAddr(out),in);
 	return out;
 }
@@ -270,7 +270,7 @@ void WINAPI SysFreeString(BSTR in)
     bufferPointer--;
 
     /*
-     * Free the memory from it's "real" origin.
+     * Free the memory from its "real" origin.
      */
     HeapFree(GetProcessHeap(), 0, bufferPointer);
 }
@@ -485,7 +485,7 @@ BSTR WINAPI SysAllocStringByteLen(LPCSTR in, UINT len)
 
     /*
      * Allocate a new buffer to hold the string.
-     * dont't forget to keep an empty spot at the begining of the
+     * dont't forget to keep an empty spot at the beginning of the
      * buffer for the character count and an extra character at the
      * end for the NULL.
      */

documentation/patches.sgml

@@ -39,8 +39,10 @@
       <para>
         For additions: mention that you have some new files and
         include them as either separate attachments or by appending
-        <command>diff -Nu</command> of them to any <command>cvs diff
+        the <command>diff -u /dev/null /my/new/file</command> output of them
-          -u</command> output you may have.
+	to any <command>cvs diff -u</command> output you may have.
+	Alernatively, use <command>diff -Nu olddir/ newdir/</command>
+	in case of multiple new files to add.
       </para>
       <para>
         For removals, list the files.

documentation/samples/config

@@ -67,6 +67,8 @@ WINE REGISTRY Version 2
 
 # <wineconf>
 
+; Be careful here, wrong DllOverrides settings have the potential
+; to pretty much kill your setup.
 [DllOverrides]
 "commdlg"      = "builtin, native"
 "comdlg32"     = "builtin, native"

files/dos_fs.c

@@ -734,7 +734,7 @@ static HANDLE DOSFS_CreateCommPort(LPCSTR name, DWORD access, DWORD attributes,
     SERVER_END_VAR_REQ;
 
     if(!ret)
-        ERR("Couldn't open %s ! (check permissions)\n",devname);
+        ERR("Couldn't open device '%s' ! (check permissions)\n",devname);
     else
         TRACE("return %08X\n", ret );
     return ret;

files/profile.c

@@ -1116,7 +1116,7 @@ void PROFILE_UsageWineIni(void)
 {
     MESSAGE("Perhaps you have not properly edited or created "
 	"your Wine configuration file.\n");
-    MESSAGE("This is '%s/config'\n", get_config_dir());
+    MESSAGE("This is (supposed to be) '%s/config'\n", get_config_dir());
     /* RTFM, so to say */
 }
 

graphics/x11drv/oembitmap.c

@@ -296,7 +296,7 @@ static BOOL OBM_CreateBitmaps( char **data, BOOL color,
 #else /* defined(HAVE_LIBXXPM) */
     FIXME_(x11drv)(
         "Xpm support not in the binary, "
-	"please install the Xpm and Xpm-devel packages and recompile\n"
+	"please install the Xpm and Xpm-devel packages and recompile wine\n"
     );
     return FALSE;
 #endif /* defined(HAVE_LIBXXPM) */

memory/instr.c

@@ -1,5 +1,5 @@
 /*
- * Emulation of priviledged instructions
+ * Emulation of privileged instructions
  *
  * Copyright 1995 Alexandre Julliard
  */
@@ -380,7 +380,7 @@ static void INSTR_outport( WORD port, int size, DWORD val, CONTEXT86 *context )
 /***********************************************************************
  *           INSTR_EmulateInstruction
  *
- * Emulate a priviledged instruction. Returns TRUE if emulation successful.
+ * Emulate a privileged instruction. Returns TRUE if emulation successful.
  */
 BOOL INSTR_EmulateInstruction( CONTEXT86 *context )
 {

tools/winecheck

@@ -554,7 +554,7 @@ sub Check_Registry {
   }
   else
   {
-    Do_PrintResult($is_critical, "entry \"SHAREDMEMLOCATION\" not found", "file winedefault.reg doesn't seem to have been applied using regapi");
+    Do_PrintResult($is_critical, "entry \"SHAREDMEMLOCATION\" not found in system.reg registry file", "file winedefault.reg doesn't seem to have been applied using regapi");
   }
   @entries = ();
 
@@ -568,7 +568,7 @@ sub Check_Registry {
   }
   else
   {
-    Do_PrintResult($is_critical, "entry \"Default Taskbar\" not found", "Windows registry does not seem to be added to Wine. This can affect many newer programs. Original registry entries won't be available with a no-windows install, of course, so you'll have to live with that.");
+    Do_PrintResult($is_critical, "entry \"Default Taskbar\" not found", "Windows registry does not seem to be added to Wine, as this typical Windows registry entry does not exist in Wine's registry. This can affect many newer programs. Original registry entries won't be available with a no-windows install, of course, so you'll have to live with that.");
   }
   @entries = ();
 }

win32/except.c

@@ -92,7 +92,7 @@ static int format_exception_msg( const EXCEPTION_POINTERS *ptr, char *buffer, in
         len = snprintf( buffer, size, "Unhandled stack overflow" );
         break;
     case EXCEPTION_PRIV_INSTRUCTION:
-        len = snprintf( buffer, size, "Unhandled priviledged instruction" );
+        len = snprintf( buffer, size, "Unhandled privileged instruction" );
         break;
     case EXCEPTION_ACCESS_VIOLATION:
         if (rec->NumberParameters == 2)
@@ -200,6 +200,8 @@ static BOOL	start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent)
     char		buffer[256];
     char 		format[256];
 
+    MESSAGE("wine: Unhandled exception, starting debugger...\n");
+
     if (!RegOpenKeyA(HKEY_LOCAL_MACHINE, 
 		     "Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug", &hDbgConf)) {
        DWORD 	type;

windows/keyboard.c

@@ -126,7 +126,7 @@ VOID WINAPI ScreenSwitchEnable16(WORD unused)
  */
 DWORD WINAPI OemKeyScan(WORD wOemChar)
 {
-  TRACE("*OemKeyScan (%d)\n", wOemChar);
+  TRACE("(%d)\n", wOemChar);
 
   return wOemChar;
 }

windows/win.c

@@ -323,9 +323,9 @@ void WIN_ReleaseWndPtr(WND *wndPtr)
 {
     if(!wndPtr) return;
 
-    /*Decrement destruction monitoring value*/
+    /* Decrement destruction monitoring value */
      wndPtr->irefCount--;
-     /* Check if it's time to release the memory*/
+     /* Check if it's time to release the memory */
      if(wndPtr->irefCount == 0 && !wndPtr->dwMagic)
      {
          /* Release memory */
@@ -336,7 +336,7 @@ void WIN_ReleaseWndPtr(WND *wndPtr)
          /* This else if is useful to monitor the WIN_ReleaseWndPtr function */
          ERR("forgot a Lock on %p somewhere\n",wndPtr);
      }
-     /*unlock all WND structures for thread safeness*/
+     /* unlock all WND structures for thread safeness */
      USER_Unlock();
 }