Commit f359895d authored by Andreas Mohr's avatar Andreas Mohr Committed by Alexandre Julliard

Yet another documentation/message text patch.

parent e145bde6
......@@ -159,6 +159,7 @@ then
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"
......
......@@ -948,7 +948,7 @@ static UINT DRIVE_GetCurrentDirectory( UINT buflen, LPSTR buf )
/***********************************************************************
* 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)
......
......@@ -1478,7 +1478,7 @@ BOOL WINAPI WritePrivateProfileStringA( LPCSTR section, LPCSTR entry,
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 );
......
......@@ -1084,7 +1084,7 @@ BOOL WINAPI CreateProcessA( LPCSTR lpApplicationName, LPSTR lpCommandLine,
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);
......
......@@ -291,7 +291,7 @@ DWORD PE_fixup_imports( WINE_MODREF *wm )
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 @@ static int do_relocations( char *base, const IMAGE_NT_HEADERS *nt, const char *f
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)?
......
......@@ -300,6 +300,21 @@ BOOL ENV_BuildCommandLine( char **argv )
/***********************************************************************
* 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)
{
......
......@@ -60,7 +60,7 @@ Warning:
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 @@ fi
#------------------------------------------------------------------------------
# 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).
#------------------------------------------------------------------------------
......
......@@ -327,7 +327,7 @@ HANDLE DEVICE_Open( LPCSTR filename, DWORD access,
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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment