Spelling/error messages fixes.
diff --git a/loader/module.c b/loader/module.c
index 0fc6942..9123788 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -1118,7 +1118,7 @@
if (hFile == INVALID_HANDLE_VALUE) goto done;
if ( !MODULE_GetBinaryType( hFile, name, &type ) )
- {
+ { /* unknown file, try as unix executable */
CloseHandle( hFile );
retv = PROCESS_Create( 0, name, tidy_cmdline, lpEnvironment,
lpProcessAttributes, lpThreadAttributes,
@@ -1324,7 +1324,7 @@
{
if ( !MODULE_DllProcessAttach( wm, NULL ) )
{
- WARN_(module)("Attach failed for module '%s', \n", libname);
+ WARN_(module)("Attach failed for module '%s'.\n", libname);
MODULE_FreeLibrary(wm);
SetLastError(ERROR_DLL_INIT_FAILED);
wm = NULL;
@@ -1374,7 +1374,7 @@
* The HFILE parameter is not used and marked reserved in the SDK. I can
* only guess that it should force a file to be mapped, but I rather
* ignore the parameter because it would be extremely difficult to
- * integrate this with different types of module represenations.
+ * integrate this with different types of module representations.
*
* libdir is used to support LOAD_WITH_ALTERED_SEARCH_PATH during the recursion
* on this function. When first called from LoadLibraryExA it will be
@@ -1424,12 +1424,12 @@
if ( ! GetSystemDirectoryA ( filename, MAX_PATH ) )
goto error;
- /* if the library name contains a path and can not be found, return an error.
- exception: if the path is the system directory, proceed, so that modules,
- which are not PE-modules can be loaded
-
- if the library name does not contain a path and can not be found, assume the
- system directory is meant */
+ /* if the library name contains a path and can not be found,
+ * return an error.
+ * exception: if the path is the system directory, proceed,
+ * so that modules which are not PE modules can be loaded.
+ * If the library name does not contain a path and can not
+ * be found, assume the system directory is meant */
if ( ! FILE_strncasecmp ( filename, libname, strlen ( filename ) ))
strcpy ( filename, libname );
@@ -1440,7 +1440,7 @@
strcat ( filename, libname );
}
- /* if the filename doesn't have an extension append .DLL */
+ /* if the filename doesn't have an extension, append .DLL */
if (!(p = strrchr( filename, '.')) || strchr( p, '/' ) || strchr( p, '\\'))
strcat( filename, ".dll" );
}
@@ -1542,7 +1542,11 @@
}
if(GetLastError() != ERROR_FILE_NOT_FOUND)
- break;
+ {
+ ERR("Loading of %s DLL %s failed (error %ld), check this file.\n",
+ filetype, filename, GetLastError());
+ break;
+ }
}
error:
@@ -1552,7 +1556,7 @@
libdir = NULL;
}
RtlLeaveCriticalSection( &loader_section );
- WARN("Failed to load module '%s'; error=0x%08lx\n", filename, GetLastError());
+ WARN("Failed to load module '%s'; error=%ld\n", filename, GetLastError());
HeapFree ( GetProcessHeap(), 0, filename );
return NULL;
}
diff --git a/loader/pe_image.c b/loader/pe_image.c
index 7555f19..cd2c744 100644
--- a/loader/pe_image.c
+++ b/loader/pe_image.c
@@ -528,7 +528,7 @@
/**********************************************************************
* PE_CreateModule
*
- * Create WINE_MODREF structure for loaded HMODULE32, link it into
+ * Create WINE_MODREF structure for loaded HMODULE, link it into
* process modref_list, and fixup all imports.
*
* Note: hModule must point to a correctly allocated PE image,
@@ -663,7 +663,7 @@
/* FIXME: there are several more dangling references
* left. Including dlls loaded by this dll before the
* failed one. Unrolling is rather difficult with the
- * current structure and we can leave it them lying
+ * current structure and we can leave them lying
* around with no problems, so we don't care.
* As these might reference our wm, we don't free it.
*/
@@ -739,7 +739,7 @@
/* Called if the library is loaded or freed.
* NOTE: if a thread attaches a DLL, the current thread will only do
- * DLL_PROCESS_ATTACH. Only new created threads do DLL_THREAD_ATTACH
+ * DLL_PROCESS_ATTACH. Only newly created threads do DLL_THREAD_ATTACH
* (SDK)
*/
typedef DWORD (CALLBACK *DLLENTRYPROC)(HMODULE,DWORD,LPVOID);
