Changeset 3678 for trunk/src/kernel32/winimagebase.cpp

Timestamp:

Jun 8, 2000, 8:08:58 PM (25 years ago)

Author:

sandervl

Message:

RegQueryValueW, OpenFile and LoadLibrary fixes

File:

• trunk/src/kernel32/winimagebase.cpp (modified) (8 diffs)

trunk/src/kernel32/winimagebase.cpp

@@ -1 @@
-/* $Id: winimagebase.cpp,v 1.21 2000-05-28 16:45:12 sandervl Exp $ */
+/* $Id: winimagebase.cpp,v 1.22 2000-06-08 18:08:56 sandervl Exp $ */
 
 /*
@@ -37 +37 @@
 #include "directory.h"
 #include <win\virtual.h>
+#include <winconst.h>
 
 #define DBG_LOCALLOG    DBG_winimagebase
@@ -200 +201 @@
 }
 //******************************************************************************
-//******************************************************************************
-BOOL Win32ImageBase::isPEImage(char *szFileName)
+//returns ERROR_SUCCESS or error code
+//******************************************************************************
+ULONG Win32ImageBase::isPEImage(char *szFileName)
 {
  char   filename[CCHMAXPATH];
@@ -219 +221 @@
         dprintf(("KERNEL32:Win32ImageBase::isPEImage(%s) findDll failed to find the file.\n",
                  szFileName, rc));
-        return FALSE;
+        return ERROR_FILE_NOT_FOUND_W;
   }
   rc = DosOpen(filename,                       /* File path name */
@@ -237 +239 @@
         dprintf(("KERNEL32:Win32ImageBase::isPEImage(%s) failed with %u\n",
                   szFileName, rc));
-        return(FALSE);
+        return ERROR_FILE_NOT_FOUND_W;
   }
 
@@ -246 +248 @@
   if(pdoshdr == NULL)   {
         DosClose(win32handle);                /* Close the file */
-        return(FALSE);
+        return ERROR_INVALID_EXE_SIGNATURE_W;
   }
   rc = DosRead(win32handle, pdoshdr, sizeof(IMAGE_DOS_HEADER), &ulRead);
   if(rc != NO_ERROR) {
         DosClose(win32handle);                /* Close the file */
-        return(FALSE);
+        return ERROR_INVALID_EXE_SIGNATURE_W;
   }
   ULONG hdrsize = pdoshdr->e_lfanew + SIZE_OF_NT_SIGNATURE + sizeof(IMAGE_FILE_HEADER);
@@ -262 +264 @@
   if(win32file == NULL) {
         DosClose(win32handle);                /* Close the file */
-        return(FALSE);
+        return ERROR_NOT_ENOUGH_MEMORY_W;
   }
   rc = DosRead(win32handle, win32file, hdrsize, &ulRead);
@@ -284 +286 @@
   }
   DosClose(win32handle);
-  return(TRUE);
+  return ERROR_SUCCESS_W;
 
 failure:
   free(win32file);
   DosClose(win32handle);
-  return(FALSE);
+  return ERROR_INVALID_EXE_SIGNATURE_W;
 }
 //******************************************************************************