Changeset 22040 for trunk/src

Timestamp:

Oct 25, 2012, 12:39:39 PM (13 years ago)

Author:

dmik

Message:

kernel32: Fix Win32ImageBase::matchModName().

As opposed to the declared functionality, it was comparing the name part
of the argument with the full path of the stored module name and this would
obviously not work if the module name were a full path.

One of the failig cases was a frequent attempt to retrieve the resources of the
current executable by doing LoadLibraryEx() with the full executable name.

Location:

trunk/src/kernel32

Files:

• hmfile.cpp (modified) (1 diff)
• oslibmisc.cpp (modified) (1 diff)
• oslibmisc.h (modified) (2 diffs)
• winimagebase.cpp (modified) (1 diff)

trunk/src/kernel32/hmfile.cpp

@@ -1348 +1348 @@
 
     HMFileInfo *fileInfo = (HMFileInfo *)pHMHandleData->dwUserData;
-    dprintf(("*** %s", fileInfo->lpszFileName));
     if(OSLibDosGetFileInformationByHandle(fileInfo->lpszFileName,
                                           INVALID_HANDLE_VALUE,

trunk/src/kernel32/oslibmisc.cpp

@@ -267 +267 @@
 //******************************************************************************
 //******************************************************************************
-char *OSLibStripPath(char *path)
-{
-  /* @@@PH what does this function do ? Strip the path from a FQFN name ? */
-  char *pszFilename;
-  char *pszFilename1;
-
-  pszFilename  = strrchr(path, '\\');                 /* find rightmost backslash */
-  pszFilename1 = strrchr(path, '/');                  /* find rightmost slash */
-  if(pszFilename > pszFilename1 && pszFilename != NULL)
-    return (++pszFilename);              /* return pointer to next character */
-
-  if (pszFilename1 != NULL)
-    return (++pszFilename1);              /* return pointer to next character */
-
-  return (path);                                     /* default return value */
+const char *OSLibStripPath(const char *path)
+{
+    const char *pszName;
+    register char ch;
+
+    /*
+     * Search the filename string finding the modulename start and end.
+     * The loop ends when we have passed one char left of the module name.
+     */
+    pszName = path + strlen(path) - 1;
+    while (pszName >= path
+           && (ch = *pszName) != '\\'
+           && ch != '/'
+           && ch != ':'
+           )
+    {
+        pszName--;
+    }
+    pszName++;
+
+    return pszName;
 }
 //******************************************************************************

trunk/src/kernel32/oslibmisc.h

@@ -18 +18 @@
 #endif
 
-char *OSLibStripPath(char *path);
+const char *OSLibStripPath(const char *path);
 
 ULONG OSLibiGetModuleHandleA(char *pszModule);
@@ -109 +109 @@
 #endif
 
+#ifdef __cplusplus
+inline char *OSLibStripPath(char *path)
+{
+    return (char *)OSLibStripPath((const char *)path);
+}
 #endif
+
+#endif

trunk/src/kernel32/winimagebase.cpp

@@ -557 +557 @@
 BOOL Win32ImageBase::matchModName(const char *pszFilename) const
 {
-    const char *pszModName;             /* Pointer to the modulename. */
-    const char *pszModNameEnd = NULL;   /* Pointer to the dot starting the extention. (if any) */
-    register char ch;
-
-    /** @sketch
-     * Search the filename string finding the modulename start and end.
-     * The loop ends when we have passed one char left of the module name.
-     */
-    pszModName = pszFilename + strlen(pszFilename) - 1;
-    while (pszModName >= pszFilename
-           && (ch = *pszModName) != '\\'
-           && ch != '/'
-           && ch != ':'
-           )
-    {
-        pszModName--;
-    }
-    pszModName++;
-
-    /** @sketch
+    /*
      * Compare the names caseinsensitivly.
      */
-    return stricmp(pszModName, szModule) == 0;
+    return stricmp(OSLibStripPath(pszFilename), OSLibStripPath(szModule)) == 0;
 }