Changeset 3678 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

RegQueryValueW, OpenFile and LoadLibrary fixes

Location:

trunk/src/kernel32

Files:

• HandleManager.cpp (modified) (2 diffs)
• hmfile.cpp (modified) (3 diffs)
• registry.cpp (modified) (6 diffs)
• winimagebase.cpp (modified) (8 diffs)
• winimagebase.h (modified) (2 diffs)
• winimagepeldr.cpp (modified) (2 diffs)
• wprocess.cpp (modified) (7 diffs)

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.40 2000-06-01 11:28:42 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.41 2000-06-08 18:08:54 sandervl Exp $ */
 
 /*
@@ -1016 +1016 @@
   {
         TabWin32Handles[iIndexNew].hmHandleData.hHMHandle = INVALID_HANDLE_VALUE;
-        SetLastError(rc);          /* Hehe, OS/2 and NT are pretty compatible :) */
+        SetLastError(pOFStruct->nErrCode);
         return (INVALID_HANDLE_VALUE);                           /* signal error */
   }

trunk/src/kernel32/hmfile.cpp

@@ -1 @@
-/* $Id: hmfile.cpp,v 1.1 2000-06-01 11:28:46 sandervl Exp $ */
+/* $Id: hmfile.cpp,v 1.2 2000-06-08 18:08:56 sandervl Exp $ */
 
 /*
@@ -137 +137 @@
   SetLastError(ERROR_SUCCESS);
 
-  dprintf(("KERNEL32: HMDeviceFileClass::OpenFile %s(%s,%08x,%08x,%08x) - stub?\n",
+  dprintf(("KERNEL32: HMDeviceFileClass::OpenFile %s(%s,%08x,%08x,%08x)",
            lpHMDeviceName,
            lpFileName,
@@ -165 +165 @@
 
         if(SearchPathA(NULL, lpFileName, NULL, sizeof(filepath), filepath, &filenameinpath) == 0
-           && !(fuMode & OF_CREATE) ) {
+           && !(fuMode & OF_CREATE) ) 
+        {
+                pOFStruct->nErrCode = ERROR_FILE_NOT_FOUND;
                 SetLastError(ERROR_FILE_NOT_FOUND);
                 return HFILE_ERROR;

trunk/src/kernel32/registry.cpp

@@ -1 @@
-/* $Id: registry.cpp,v 1.1 2000-03-03 11:15:59 sandervl Exp $ */
+/* $Id: registry.cpp,v 1.2 2000-06-08 18:08:56 sandervl Exp $ */
 
 /*
@@ -30 +30 @@
 #include "unicode.h"
 #include <winreg.h>
+
+#define DBG_LOCALLOG    DBG_registry
+#include "dbglocal.h"
 
 
@@ -789 +792 @@
 
 ODINFUNCTION4(LONG,RegQueryValueW,HKEY,   hkey,
-                                   LPCWSTR,lpszSubKey,
-                                   LPWSTR, lpszValue,
-                                   PLONG,  pcbValue)
+                                  LPCWSTR,lpszSubKey,
+                                  LPWSTR, lpszValue,
+                                  PLONG,  pcbValue)
 {
   char *astring1 = UnicodeToAsciiString((LPWSTR)lpszSubKey);
@@ -803 +806 @@
   if(rc == ERROR_SUCCESS)
   {
-    astring2 = (char *)malloc(*pcbValue);
-    strcpy(astring2, (char *)lpszValue);
-    AsciiToUnicode(astring2, lpszValue);
-    free(astring2);
+        if(pcbValue) {
+                astring2 = (char *)malloc(*pcbValue);
+                strcpy(astring2, (char *)lpszValue);
+                AsciiToUnicode(astring2, lpszValue);
+                free(astring2);
+        }
   }
+  FreeAsciiString(astring1);
   return(rc);
 }
@@ -918 +924 @@
 
 ODINFUNCTION5(LONG,RegSetValueW,HKEY,   hkey,
-                                 LPCWSTR,lpSubKey,
-                                 DWORD,  dwType,
-                                 LPCWSTR,lpData,
-                                 DWORD,  cbData)
+                                LPCWSTR,lpSubKey,
+                                DWORD,  dwType,
+                                LPCWSTR,lpData,
+                                DWORD,  cbData)
 {
   char *astring1 = UnicodeToAsciiString((LPWSTR)lpSubKey);
@@ -956 +962 @@
 
 ODINFUNCTION6(LONG,RegSetValueExA,HKEY,  arg1,
-                                   LPSTR, arg2,
-                                   DWORD, arg3,
-                                   DWORD, arg4,
-                                   BYTE*, arg5,
-                                   DWORD, arg6)
+                                  LPSTR, arg2,
+                                  DWORD, arg3,
+                                  DWORD, arg4,
+                                  BYTE*, arg5,
+                                  DWORD, arg6)
 {
   return _O32_RegSetValueEx(ConvertKey(arg1),

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;
 }
 //******************************************************************************

trunk/src/kernel32/winimagebase.h

@@ -1 @@
-/* $Id: winimagebase.h,v 1.10 2000-05-28 16:45:12 sandervl Exp $ */
+/* $Id: winimagebase.h,v 1.11 2000-06-08 18:08:57 sandervl Exp $ */
 
 /*
@@ -87 +87 @@
         ULONG getResourceSize(HRSRC hResource);
 
-static  BOOL  isPEImage(char *szFileName);
+        //returns ERROR_SUCCESS or error code
+static  ULONG isPEImage(char *szFileName);
 static  BOOL  findDll(const char *pszFileName, char *pszFullName,
                       int cchFullName, const char *pszAltPath = NULL);

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.46 2000-06-01 11:28:48 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.47 2000-06-08 18:08:57 sandervl Exp $ */
 
 /*
@@ -1343 +1343 @@
         Win32DllBase::renameDll(modname);
 
-        if(isPEImage(modname) == FALSE)
+        if(isPEImage(modname) != ERROR_SUCCESS_W)
         {//LX image, so let OS/2 do all the work for us
                 APIRET rc;

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.81 2000-05-22 19:08:01 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.82 2000-06-08 18:08:58 sandervl Exp $ */
 
 /*
@@ -661 +661 @@
     BOOL            fPath;              /* Flags which is set if the    */
                                         /* lpszLibFile contains a path. */
-    BOOL            fPE;                /* isPEImage return value. */
+    ULONG           fPE;                /* isPEImage return value. */
 
     /** @sketch
@@ -802 +802 @@
      */
     fPE = Win32ImageBase::isPEImage(szModname);
-    if (fPE)
+    if(fPE == ERROR_SUCCESS)
     {
         Win32PeLdrDll * peldrDll;
@@ -887 +887 @@
     else
     {
-        dprintf(("KERNEL32: LoadLibraryExA(%s, 0x%x, 0x%x) library were found (%s) but it's not loadable!",
-                 lpszLibFile, hFile, dwFlags, szModname));
-        SetLastError(ERROR_INVALID_EXE_SIGNATURE);
+        dprintf(("KERNEL32: LoadLibraryExA(%s, 0x%x, 0x%x) library wasn't found (%s) or isn't loadable; err %x",
+                 lpszLibFile, hFile, dwFlags, szModname, fPE));
+        SetLastError(fPE);
     }
 
@@ -1370 +1370 @@
         if(winimage == NULL)
         {
-     char modname[CCHMAXPATH];
+        char modname[CCHMAXPATH];
 
         strcpy(modname, lpszModName);
@@ -1376 +1376 @@
         Win32DllBase::renameDll(modname);
 
-        if(Win32ImageBase::isPEImage(modname) == FALSE)
-                {
+        if(Win32ImageBase::isPEImage(modname) != ERROR_SUCCESS)
+        {
          HINSTANCE hInstance;
 
@@ -1431 +1431 @@
         Win32DllBase::renameDll(modname);
 
-        if(Win32ImageBase::isPEImage(modname) == FALSE)
-                {
+        if(Win32ImageBase::isPEImage(modname) != ERROR_SUCCESS)
+        {
          HINSTANCE hInstance;