Changeset 15093

Timestamp:

Oct 25, 2000, 9:47:00 PM (24 years ago)

Author:

sandervl

Message:

SearchPathA fix (multiple dirs), add rename odin.ini entry for winspool.drv, extra pointer checks in Read/WriteProcessMemory

Location:

tags/trunk/src/kernel32

Files:

• directory.cpp (modified) (2 diffs)
• initsystem.cpp (modified) (2 diffs)
• stubs.cpp (modified) (3 diffs)
• windllbase.cpp (modified) (2 diffs)

tags/trunk/src/kernel32/directory.cpp ¶

@@ -1 @@
-/* $Id: directory.cpp,v 1.32 2000-10-09 22:51:17 sandervl Exp $ */
+/* $Id: directory.cpp,v 1.33 2000-10-25 19:46:59 sandervl Exp $ */
 
 /*
@@ -589 +589 @@
     if (path && !*path) path = NULL;  /* Ignore empty path */
 
+    /* See if path is a list of directories to search. If so, only search
+       those (according to SDK docs) */
+    if ((path != NULL) && strchr(path, ';')) {
+        ret = OSLibDosSearchPath(OSLIB_SEARCHDIR, (LPSTR)path, (LPSTR)name, 
+                                 full_name, MAX_PATHNAME_LEN);
+        goto done;
+    }
+
     len = strlen(name);
     if (ext) len += strlen(ext);

tags/trunk/src/kernel32/initsystem.cpp ¶

@@ -1 @@
-/* $Id: initsystem.cpp,v 1.21 2000-10-21 14:30:46 sandervl Exp $ */
+/* $Id: initsystem.cpp,v 1.22 2000-10-25 19:46:59 sandervl Exp $ */
 /*
  * Odin system initialization (registry, directories & environment)
@@ -618 +618 @@
    RegCloseKey(hkey);
 
+
+//[HKEY_LOCAL_MACHINE\Software\Microsoft\OLE]
+//# allow cross-machine calls (RPC) (default Y)
+//"EnableDCOM"="Y"
+//# allow incoming connections ? (def. N)
+//"EnableRemoteConnect"="N"
+   if(RegCreateKeyA(HKEY_LOCAL_MACHINE,"Software\\Microsoft\\OLE",&hkey)!=ERROR_SUCCESS) {
+    goto initreg_error;
+   }
+   digbuf[0] = 'Y';
+   digbuf[1] = 0;
+   RegSetValueExA(hkey, "EnableDCOM",0,REG_SZ, (LPBYTE)digbuf, 2);
+   digbuf[0] = 'N';
+   digbuf[1] = 0;
+   RegSetValueExA(hkey, "EnableRemoteConnect",0,REG_SZ, (LPBYTE)digbuf, 2);
+   RegCloseKey(hkey);
+
    return TRUE;
 

tags/trunk/src/kernel32/stubs.cpp ¶

@@ -1686 +1686 @@
 
 DWORD WIN32API ReadProcessMemory(HANDLE  hProcess,
-                                    LPCVOID lpBaseAddress,
-                                    LPVOID  lpBuffer,
-                                    DWORD   cbRead,
-                                    LPDWORD lpNumberOfBytesRead)
-{
-  dprintf(("Kernel32: ReadProcessMemory(%08xh,%08xh,%08xh,%08xh,%08xh) not implemented.\n",
+                                 LPCVOID lpBaseAddress,
+                                 LPVOID  lpBuffer,
+                                 DWORD   cbRead,
+                                 LPDWORD lpNumberOfBytesRead)
+{
+  dprintf(("Kernel32: ReadProcessMemory(%08xh,%08xh,%08xh,%08xh,%08xh) not completely implemented",
            hProcess,
            lpBaseAddress,
@@ -1699 +1699 @@
 
   // do some (faked) access check
-  if (hProcess != GetCurrentProcess())
+  if(hProcess != GetCurrentProcess())
   {
-    SetLastError(ERROR_ACCESS_DENIED);
-    return FALSE;
+        dprintf(("WARNING: ReadProcessMemory: can't read memory from other processes!"));
+        SetLastError(ERROR_ACCESS_DENIED);
+        return FALSE;
   }
 
-  
+  if(IsBadReadPtr(lpBaseAddress, cbRead)) {
+        dprintf(("ERROR: ReadProcessMemory bad source pointer!"));
+        if(lpNumberOfBytesRead)
+            *lpNumberOfBytesRead = 0;
+        SetLastError(ERROR_ACCESS_DENIED);
+        return FALSE;
+  }
   // FIXME: check this, if we ever run win32 binaries in different addressspaces
   //    ... and add a sizecheck
   memcpy(lpBuffer,lpBaseAddress,cbRead);
-  if (lpNumberOfBytesRead) 
-    *lpNumberOfBytesRead = cbRead;
-  
+  if(lpNumberOfBytesRead)
+        *lpNumberOfBytesRead = cbRead;
+
+  SetLastError(ERROR_SUCCESS);
   return TRUE;
 }
@@ -1740 +1748 @@
 {
   // do some (faked) access check
-  if (hProcess != GetCurrentProcess())
+  if(hProcess != GetCurrentProcess())
   {
-    dprintf(("Kernel32: WriteProcessMemory(%08xh,%08xh,%08xh,%08xh,%08xh) not implemented (different process!!)",
-           hProcess,
-           lpBaseAddress,
-           lpBuffer,
-           cbWrite,
-           lpNumberOfBytesWritten));
-    SetLastError(ERROR_ACCESS_DENIED);
-    return FALSE;
+        dprintf(("Kernel32: WriteProcessMemory(%08xh,%08xh,%08xh,%08xh,%08xh) not implemented (different process!!)",
+                 hProcess, lpBaseAddress, lpBuffer, cbWrite, lpNumberOfBytesWritten));
+        SetLastError(ERROR_ACCESS_DENIED);
+        return FALSE;
   }
   dprintf(("Kernel32: WriteProcessMemory(%08xh,%08xh,%08xh,%08xh,%08xh))",
-           hProcess,
-           lpBaseAddress,
-           lpBuffer,
-           cbWrite,
-           lpNumberOfBytesWritten));
-  
+           hProcess,lpBaseAddress, lpBuffer, cbWrite, lpNumberOfBytesWritten));
+
+  if(IsBadWritePtr((LPVOID)lpBaseAddress, cbWrite))
+  {
+        dprintf(("ERROR: WriteProcessMemory bad destination pointer!"));
+        if(lpNumberOfBytesWritten)
+            *lpNumberOfBytesWritten = 0;
+        SetLastError(ERROR_ACCESS_DENIED);
+        return FALSE;
+  }
+
   // FIXME: check this, if we ever run win32 binaries in different addressspaces
   //    ... and add a sizecheck
   memcpy((void*)lpBaseAddress,lpBuffer,cbWrite);
-  if (lpNumberOfBytesWritten) 
-    *lpNumberOfBytesWritten = cbWrite;
-  
+  if(lpNumberOfBytesWritten)
+        *lpNumberOfBytesWritten = cbWrite;
+
+  SetLastError(ERROR_SUCCESS);
   return TRUE;
 }

tags/trunk/src/kernel32/windllbase.cpp ¶

@@ -1 @@
-/* $Id: windllbase.cpp,v 1.19 2000-10-23 13:42:42 sandervl Exp $ */
+/* $Id: windllbase.cpp,v 1.20 2000-10-25 19:47:00 sandervl Exp $ */
 
 /*
@@ -667 +667 @@
         PROFILE_SetOdinIniString(DLLRENAMEOS2_SECTION, "WNETAP32", "NETAPI32");
     }
+    if(PROFILE_GetOdinIniString(DLLRENAMEWIN_SECTION, "WINSPOOL", "", renameddll,
+                                sizeof(renameddll)-1) <= 1)
+    {
+        PROFILE_SetOdinIniString(DLLRENAMEWIN_SECTION, "WINSPOOL", "WINSPOOL.DLL");
+        PROFILE_SetOdinIniString(DLLRENAMEOS2_SECTION, "WINSPOOL", "WINSPOOL.DRV");
+    }
 }
 //******************************************************************************