Cosmetics.
diff --git a/debugger/winedbg.c b/debugger/winedbg.c
index c579c11..2c7b228 100644
--- a/debugger/winedbg.c
+++ b/debugger/winedbg.c
@@ -450,7 +450,7 @@
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)
diff --git a/dlls/oleaut32/ole2disp.c b/dlls/oleaut32/ole2disp.c
index 217c21f..72a4108 100644
--- a/dlls/oleaut32/ole2disp.c
+++ b/dlls/oleaut32/ole2disp.c
@@ -63,7 +63,7 @@
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 @@
bufferPointer--;
/*
- * Free the memory from it's "real" origin.
+ * Free the memory from its "real" origin.
*/
HeapFree(GetProcessHeap(), 0, bufferPointer);
}
@@ -485,7 +485,7 @@
/*
* 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.
*/
diff --git a/documentation/patches.sgml b/documentation/patches.sgml
index 00ebaf2..114d7b3 100644
--- a/documentation/patches.sgml
+++ b/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
- -u</command> output you may have.
+ the <command>diff -u /dev/null /my/new/file</command> output of them
+ 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.
diff --git a/documentation/samples/config b/documentation/samples/config
index eb478ff..b3fcdad 100644
--- a/documentation/samples/config
+++ b/documentation/samples/config
@@ -67,6 +67,8 @@
# <wineconf>
+; Be careful here, wrong DllOverrides settings have the potential
+; to pretty much kill your setup.
[DllOverrides]
"commdlg" = "builtin, native"
"comdlg32" = "builtin, native"
diff --git a/files/dos_fs.c b/files/dos_fs.c
index 8af8ff1..c303472 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -734,7 +734,7 @@
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;
diff --git a/files/profile.c b/files/profile.c
index 4c655ef..207d6fa 100644
--- a/files/profile.c
+++ b/files/profile.c
@@ -1116,7 +1116,7 @@
{
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 */
}
diff --git a/graphics/x11drv/oembitmap.c b/graphics/x11drv/oembitmap.c
index abcd294..510e383 100644
--- a/graphics/x11drv/oembitmap.c
+++ b/graphics/x11drv/oembitmap.c
@@ -296,7 +296,7 @@
#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) */
diff --git a/memory/instr.c b/memory/instr.c
index 39167e5..c7f20dc 100644
--- a/memory/instr.c
+++ b/memory/instr.c
@@ -1,5 +1,5 @@
/*
- * Emulation of priviledged instructions
+ * Emulation of privileged instructions
*
* Copyright 1995 Alexandre Julliard
*/
@@ -380,7 +380,7 @@
/***********************************************************************
* 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 )
{
diff --git a/tools/winecheck b/tools/winecheck
index 89918e7..f964bb3 100755
--- a/tools/winecheck
+++ b/tools/winecheck
@@ -554,7 +554,7 @@
}
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 @@
}
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 = ();
}
diff --git a/win32/except.c b/win32/except.c
index 71eebc6..00dfa28 100644
--- a/win32/except.c
+++ b/win32/except.c
@@ -92,7 +92,7 @@
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 @@
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;
diff --git a/windows/keyboard.c b/windows/keyboard.c
index 8a589c0..f8f5abc 100644
--- a/windows/keyboard.c
+++ b/windows/keyboard.c
@@ -126,7 +126,7 @@
*/
DWORD WINAPI OemKeyScan(WORD wOemChar)
{
- TRACE("*OemKeyScan (%d)\n", wOemChar);
+ TRACE("(%d)\n", wOemChar);
return wOemChar;
}
diff --git a/windows/win.c b/windows/win.c
index 970bf0e..dc85efc 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -323,9 +323,9 @@
{
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 @@
/* 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();
}
