docu patch
Andreas Mohr
a.mohr at mailto.de
Sun Sep 30 10:39:22 CDT 2001
Hi all,
yet another documentation/message text patch.
- clarify missing xpm-devel package message in configure.in
(one user still didn't know that he had to install a package, since the
error message mentioned almost nothing)
- fix debug buffer overflow in loader/module.c
- clarify DLL not found message in loader/pe_image.c
(several people still didn't understand it correctly)
- other misc. fixes
--
Andreas Mohr Stauferstr. 6, D-71272 Renningen, Germany
Tel. +49 7159 800604 http://home.nexgo.de/andi.mohr/
-------------- next part --------------
Determining best CVS host...
Using CVSROOT :pserver:cvs at rhlx01.fht-esslingen.de:/home/wine
Index: configure.in
===================================================================
RCS file: /home/wine/wine/configure.in,v
retrieving revision 1.227
diff -u -r1.227 configure.in
--- configure.in 19 Sep 2001 20:30:28 -0000 1.227
+++ configure.in 30 Sep 2001 15:34:48 -0000
@@ -159,6 +159,7 @@
dnl NOTE: autoconf does not allow commas inside the third
dnl parameter to AC_CHECK_HEADERS, due to some quoting
dnl magic it does.
+ echo "Install the following packages:"
echo "Red Hat < 7.1 : xpm xpm-devel"
echo "Red Hat >= 7.1 : XFree86-devel"
echo "Caldera OpenLinux : xpm xpm-devel xpm-devel-static"
Index: files/drive.c
===================================================================
RCS file: /home/wine/wine/files/drive.c,v
retrieving revision 1.59
diff -u -r1.59 drive.c
--- files/drive.c 17 Sep 2001 20:44:00 -0000 1.59
+++ files/drive.c 30 Sep 2001 15:34:49 -0000
@@ -948,7 +948,7 @@
/***********************************************************************
* DRIVE_BuildEnv
*
- * Build the environment array containing the drives current directories.
+ * Build the environment array containing the drives' current directories.
* Resulting pointer must be freed with HeapFree.
*/
char *DRIVE_BuildEnv(void)
Index: files/profile.c
===================================================================
RCS file: /home/wine/wine/files/profile.c,v
retrieving revision 1.59
diff -u -r1.59 profile.c
--- files/profile.c 28 Aug 2001 18:39:26 -0000 1.59
+++ files/profile.c 30 Sep 2001 15:34:50 -0000
@@ -1478,7 +1478,7 @@
if (PROFILE_Open( filename ))
{
- if (!section && !entry && !string)
+ if (!section && !entry && !string) /* documented "file flush" case */
PROFILE_ReleaseFile(); /* always return FALSE in this case */
else
ret = PROFILE_SetString( section, entry, string );
Index: loader/module.c
===================================================================
RCS file: /home/wine/wine/loader/module.c,v
retrieving revision 1.138
diff -u -r1.138 module.c
--- loader/module.c 24 Aug 2001 21:13:02 -0000 1.138
+++ loader/module.c 30 Sep 2001 15:34:51 -0000
@@ -1084,7 +1084,7 @@
FIXME("(%s,...): PROFILE_SERVER ignored\n", name);
if (lpStartupInfo->lpDesktop)
FIXME("(%s,...): lpStartupInfo->lpDesktop %s ignored\n",
- name, lpStartupInfo->lpDesktop);
+ name, debugstr_a(lpStartupInfo->lpDesktop));
if (lpStartupInfo->lpTitle)
FIXME("(%s,...): lpStartupInfo->lpTitle %s ignored\n",
name, lpStartupInfo->lpTitle);
Index: loader/pe_image.c
===================================================================
RCS file: /home/wine/wine/loader/pe_image.c,v
retrieving revision 1.98
diff -u -r1.98 pe_image.c
--- loader/pe_image.c 24 Aug 2001 21:13:02 -0000 1.98
+++ loader/pe_image.c 30 Sep 2001 15:34:51 -0000
@@ -291,7 +291,7 @@
wmImp = MODULE_LoadLibraryExA( name, 0, 0 );
if (!wmImp) {
- ERR_(module)("Module (file) %s needed by %s not found\n", name, wm->filename);
+ ERR_(module)("Module (file) %s (which is needed by %s) not found\n", name, wm->filename);
return 1;
}
wm->deps[i++] = wmImp;
@@ -386,7 +386,7 @@
if (!dir->VirtualAddress || !dir->Size)
{
if (nt->OptionalHeader.ImageBase == 0x400000)
- ERR("Standard load address for a Win32 program (0x00400000) not available - patched kernel ?\n");
+ ERR("Standard load address for a Win32 program (0x00400000) not available - security-patched kernel ?\n");
ERR( "FATAL: Need to relocate %s, but no relocation records present (%s). Try to run that file directly !\n",
filename,
(nt->FileHeader.Characteristics&IMAGE_FILE_RELOCS_STRIPPED)?
Index: memory/environ.c
===================================================================
RCS file: /home/wine/wine/memory/environ.c,v
retrieving revision 1.26
diff -u -r1.26 environ.c
--- memory/environ.c 20 Sep 2001 19:05:12 -0000 1.26
+++ memory/environ.c 30 Sep 2001 15:34:51 -0000
@@ -300,6 +300,21 @@
/***********************************************************************
* GetCommandLineA (KERNEL32.@)
+ *
+ * WARNING: there's a Windows incompatibility lurking here !
+ * Win32s always includes the full path of the program file,
+ * whereas Windows NT only returns the full file path plus arguments
+ * in case the program has been started with a full path.
+ * Win9x seems to have inherited NT behaviour.
+ *
+ * Note that both Start Menu Execute and Explorer start programs with
+ * fully specified quoted app file paths, which is why probably the only case
+ * where you'll see single file names is in case of direct launch
+ * via CreateProcess or WinExec.
+ *
+ * Perhaps we should take care of Win3.1 programs here (Win32s "feature").
+ *
+ * References: MS KB article q102762.txt (special Win32s handling)
*/
LPSTR WINAPI GetCommandLineA(void)
{
Index: tools/winelauncher.in
===================================================================
RCS file: /home/wine/wine/tools/winelauncher.in,v
retrieving revision 1.11
diff -u -r1.11 winelauncher.in
--- tools/winelauncher.in 14 Sep 2001 00:10:22 -0000 1.11
+++ tools/winelauncher.in 30 Sep 2001 15:34:52 -0000
@@ -60,7 +60,7 @@
Most Linux distributions have one or the other of these
tools.
- We strongly recommend that you use your distributions
+ We strongly recommend that you use your distribution's
software methods to locate xmessage."
else
@@ -70,7 +70,7 @@
#------------------------------------------------------------------------------
# We're going to do a lot of fancy footwork below.
-# Before we get started, it would be nice to know the argv0,
+# Before we get started, it would be nice to know the argv0
# of the actual script we're running (and lets remove at least
# one level of symlinking).
#------------------------------------------------------------------------------
Index: win32/device.c
===================================================================
RCS file: /home/wine/wine/win32/device.c,v
retrieving revision 1.53
diff -u -r1.53 device.c
--- win32/device.c 25 Jul 2001 00:43:36 -0000 1.53
+++ win32/device.c 30 Sep 2001 15:34:52 -0000
@@ -327,7 +327,7 @@
if (!strncasecmp( info->name, filename, strlen(info->name) ))
return FILE_CreateDevice( info->id | 0x10000, access, sa );
- FIXME( "Unknown VxD %s. Try --winver nt40 or win31 !\n", filename);
+ FIXME( "Unknown/unsupported VxD %s. Try --winver nt40 or win31 !\n", filename);
SetLastError( ERROR_FILE_NOT_FOUND );
return 0;
}
More information about the wine-patches
mailing list