Changeset 5303 for trunk/src

Timestamp:

Mar 12, 2001, 3:16:33 PM (24 years ago)

Author:

sandervl

Message:

SearchPath & pe loader fixes

Location:

trunk/src/kernel32

Files:

• directory.cpp (modified) (3 diffs)
• hmstd.cpp (modified) (3 diffs)
• winimagepeldr.cpp (modified) (3 diffs)

trunk/src/kernel32/directory.cpp

@@ -1 @@
-/* $Id: directory.cpp,v 1.34 2000-12-28 18:17:56 sandervl Exp $ */
+/* $Id: directory.cpp,v 1.35 2001-03-12 14:16:33 sandervl Exp $ */
 
 /*
@@ -691 +691 @@
     lstrcpynA( buffer, (LPSTR)full_name, buflen);
     SetLastError(0);
-    return strlen(buffer);
+    return strlen(full_name);
 }
 
@@ -714 +714 @@
     lstrcpynAtoW( buffer, full_name, buflen);
     SetLastError(0);
-    return strlen(full_name);
-}
+    return ret;
+}

trunk/src/kernel32/hmstd.cpp

@@ -1 @@
-/* $Id: hmstd.cpp,v 1.1 2001-01-23 18:31:26 sandervl Exp $ */
+/* $Id: hmstd.cpp,v 1.2 2001-03-12 14:16:33 sandervl Exp $ */
 
 /*
@@ -70 +70 @@
 {
   BOOL         bRC;
+  DWORD        bytesread;
 
   dprintf2(("KERNEL32: HMDeviceStandardClass::ReadFile %s(%08x,%08x,%08x,%08x,%08x) - NOT IMPLEMENTED\n",
@@ -80 +81 @@
 
 
-  return FALSE;
+  if(lpNumberOfBytesRead == NULL) {
+     lpNumberOfBytesRead = &bytesread;
+  }
+  if(pHMHandleData->dwUserData != STD_INPUT_HANDLE) {
+     return FALSE;
+  }
+  return O32_ReadFile(pHMHandleData->hHMHandle, (LPVOID)lpBuffer, nNumberOfBytesToRead,
+                      lpNumberOfBytesRead, lpOverlapped);
 }
 

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.68 2001-02-25 16:05:39 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.69 2001-03-12 14:16:33 sandervl Exp $ */
 
 /*
@@ -1675 +1675 @@
     if(WinDll == NULL)
     {  //not found, so load it
-        WinDll = loadDll(pszCurModule);
+        if (WinExe != NULL && WinExe->matchModName(pszCurModule)) {
+             WinImage = (Win32ImageBase *)WinExe;
+        }
+        else {
+             WinDll = loadDll(pszCurModule);
+        }
     }
     else {
@@ -1681 +1686 @@
         dprintf((LOG, "Already found ", pszCurModule));
     }
-    if(WinDll == NULL) {
-        //TODO: might not be the right order (check executable first and only then dll??)
-        if (WinExe != NULL && WinExe->matchModName(pszCurModule)) {
-             WinImage = (Win32ImageBase *)WinExe;
-        }
-        else return FALSE;
-    }
-    else {
+    if(WinDll != NULL) {
         //add the dll we just loaded to dependency list for this image
         addDependency(WinDll);