another docu patch
Andreas Mohr
andi at rhlx01.fht-esslingen.de
Fri Oct 19 17:17:58 CDT 2001
Hi all,
- get rid of pidgin english ("priviledged")
- ensure consistent documentation
- sample config: add comment about the usefulness and dangers of DLL
loadorders:
One guy completely removed native loading in default loadorder and wondered
why the heck his program couldn't find certain .dlls...
- files/dos_fs.c: clarify comm error message
- tools/winecheck: clarification
- win32/except.c: add explicit debugger launch message
some guy was wondering what the hell wine was doing when it launched
winedbg automatically
--
Andreas Mohr Stauferstr. 6, D-71272 Renningen, Germany
-------------- next part --------------
Determining best CVS host...
Using CVSROOT :pserver:cvs at rhlx01.fht-esslingen.de:/home/wine
Index: debugger/winedbg.c
===================================================================
RCS file: /home/wine/wine/debugger/winedbg.c,v
retrieving revision 1.40
diff -u -r1.40 winedbg.c
--- debugger/winedbg.c 4 Oct 2001 16:17:16 -0000 1.40
+++ debugger/winedbg.c 19 Oct 2001 20:11:55 -0000
@@ -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)
Index: dlls/oleaut32/ole2disp.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/ole2disp.c,v
retrieving revision 1.19
diff -u -r1.19 ole2disp.c
--- dlls/oleaut32/ole2disp.c 23 Jul 2001 23:50:19 -0000 1.19
+++ dlls/oleaut32/ole2disp.c 19 Oct 2001 20:11:55 -0000
@@ -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.
*/
Index: documentation/patches.sgml
===================================================================
RCS file: /home/wine/wine/documentation/patches.sgml,v
retrieving revision 1.2
diff -u -r1.2 patches.sgml
--- documentation/patches.sgml 13 Dec 2000 21:52:37 -0000 1.2
+++ documentation/patches.sgml 19 Oct 2001 20:11:56 -0000
@@ -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.
Index: documentation/samples/config
===================================================================
RCS file: /home/wine/wine/documentation/samples/config,v
retrieving revision 1.15
diff -u -r1.15 config
--- documentation/samples/config 17 Sep 2001 20:25:26 -0000 1.15
+++ documentation/samples/config 19 Oct 2001 20:11:56 -0000
@@ -67,6 +67,9 @@
# <wineconf>
+; wrong DllOverrides settings have the potential to pretty much kill
+; your setup. Fiddling can be extremely productive, but *remember* to revert
+; them if it causes problems !
[DllOverrides]
"commdlg" = "builtin, native"
"comdlg32" = "builtin, native"
Index: files/dos_fs.c
===================================================================
RCS file: /home/wine/wine/files/dos_fs.c,v
retrieving revision 1.95
diff -u -r1.95 dos_fs.c
--- files/dos_fs.c 14 Oct 2001 16:08:45 -0000 1.95
+++ files/dos_fs.c 19 Oct 2001 20:11:57 -0000
@@ -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;
Index: files/profile.c
===================================================================
RCS file: /home/wine/wine/files/profile.c,v
retrieving revision 1.60
diff -u -r1.60 profile.c
--- files/profile.c 2 Oct 2001 17:49:20 -0000 1.60
+++ files/profile.c 19 Oct 2001 20:11:58 -0000
@@ -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 */
}
Index: graphics/x11drv/oembitmap.c
===================================================================
RCS file: /home/wine/wine/graphics/x11drv/oembitmap.c,v
retrieving revision 1.30
diff -u -r1.30 oembitmap.c
--- graphics/x11drv/oembitmap.c 11 Sep 2001 00:32:33 -0000 1.30
+++ graphics/x11drv/oembitmap.c 19 Oct 2001 20:11:58 -0000
@@ -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) */
Index: memory/instr.c
===================================================================
RCS file: /home/wine/wine/memory/instr.c,v
retrieving revision 1.12
diff -u -r1.12 instr.c
--- memory/instr.c 13 Dec 2000 20:20:16 -0000 1.12
+++ memory/instr.c 19 Oct 2001 20:11:58 -0000
@@ -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 )
{
Index: tools/winecheck
===================================================================
RCS file: /home/wine/wine/tools/winecheck,v
retrieving revision 1.3
diff -u -r1.3 winecheck
--- tools/winecheck 19 Sep 2001 22:34:39 -0000 1.3
+++ tools/winecheck 19 Oct 2001 20:11:58 -0000
@@ -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 = ();
}
Index: win32/except.c
===================================================================
RCS file: /home/wine/wine/win32/except.c,v
retrieving revision 1.46
diff -u -r1.46 except.c
--- win32/except.c 15 Aug 2001 17:34:07 -0000 1.46
+++ win32/except.c 19 Oct 2001 20:11:59 -0000
@@ -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,7 @@
char buffer[256];
char format[256];
+ MESSAGE("Wine: Crash/exception occurred -> trying to start debugger as configured in registry file...\n");
if (!RegOpenKeyA(HKEY_LOCAL_MACHINE,
"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug", &hDbgConf)) {
DWORD type;
Index: windows/keyboard.c
===================================================================
RCS file: /home/wine/wine/windows/keyboard.c,v
retrieving revision 1.42
diff -u -r1.42 keyboard.c
--- windows/keyboard.c 17 Oct 2001 17:50:05 -0000 1.42
+++ windows/keyboard.c 19 Oct 2001 20:11:59 -0000
@@ -126,7 +126,7 @@
*/
DWORD WINAPI OemKeyScan(WORD wOemChar)
{
- TRACE("*OemKeyScan (%d)\n", wOemChar);
+ TRACE("(%d)\n", wOemChar);
return wOemChar;
}
Index: windows/win.c
===================================================================
RCS file: /home/wine/wine/windows/win.c,v
retrieving revision 1.162
diff -u -r1.162 win.c
--- windows/win.c 16 Oct 2001 21:58:59 -0000 1.162
+++ windows/win.c 19 Oct 2001 20:12:00 -0000
@@ -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();
}
More information about the wine-patches
mailing list