Changeset 25262 in vbox

Timestamp:

Dec 9, 2009 4:20:18 AM (15 years ago)

Author:

vboxsync

Message:

SUPDrv: Works on vista...

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.c (modified) (2 diffs)
• SUPDrvInternal.h (modified) (1 diff)
• solaris/SUPDrv-solaris.c (modified) (1 diff)
• win/SUPDrv-win.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -3502 +3502 @@
 #ifdef VBOX_WITH_NATIVE_R0_LOADER
     pImage->fNative         = true;
+    RTSemFastMutexRelease(pDevExt->mtxLdr); /*hack*/
     rc = supdrvOSLdrOpen(pDevExt, pImage, pReq->u.In.szFilename);
+    RTSemFastMutexRequest(pDevExt->mtxLdr); /*hack*/
 #else
     rc = VERR_NOT_SUPPORTED;
@@ -3520 +3522 @@
         RTMemFree(pImage);
         Log(("supdrvIOCtl_LdrOpen(%s): failed - %Rrc\n", pReq->u.In.szName, rc));
-        return VERR_NO_MEMORY;
+        return rc;
     }
     Assert(VALID_PTR(pImage->pvImage) || RT_FAILURE(rc));

trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h

@@ -429 +429 @@
     uint32_t volatile               cUsage;
 #ifdef VBOX_WITH_NATIVE_R0_LOADER
+# ifdef RT_OS_WINDOWS
+    /** The section object for the loaded image (fNative=true). */
+    void                           *pvNtSectionObj;
+# endif
     /** Whether it's loaded by the native loader or not. */
     bool                            fNative;

trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c

@@ -901 +901 @@
 int  VBOXCALL   supdrvOSLdrOpen(PSUPDRVDEVEXT pDevExt, PSUPDRVLDRIMAGE pImage, const char *pszFilename)
 {
+    /** @todo This is something that shouldn't be impossible to implement
+     *  here and would make a few people happy. */
     NOREF(pDevExt); NOREF(pImage); NOREF(pszFilename);
     return VERR_NOT_SUPPORTED;

trunk/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp

@@ -596 +596 @@
 #ifdef VBOX_WITH_NATIVE_R0_LOADER
 
+#define MY_SystemLoadGdiDriverInformation               26
+#define MY_SystemLoadGdiDriverInSystemSpaceInformation  54
+#define MY_SystemUnloadGdiDriverInformation             27
+
+typedef struct MYSYSTEMGDIDRIVERINFO
+{
+    UNICODE_STRING  Name;                   /**< In:  image file name. */
+    PVOID           ImageAddress;           /**< Out: the load address. */
+    PVOID           SectionPointer;         /**< Out: section object. */
+    PVOID           EntryPointer;           /**< Out: entry point address. */
+    PVOID           ExportSectionPointer;   /**< Out: export directory/section. */
+    ULONG           ImageLength;            /**< Out: SizeOfImage. */
+} MYSYSTEMGDIDRIVERINFO;
+
+extern "C" __declspec(dllimport) NTSTATUS NTAPI ZwSetSystemInformation(ULONG, PVOID, ULONG);
+
 int  VBOXCALL   supdrvOSLdrOpen(PSUPDRVDEVEXT pDevExt, PSUPDRVLDRIMAGE pImage, const char *pszFilename)
 {
-    NOREF(pDevExt); NOREF(pImage); NOREF(pszFilename);
-    return VERR_NOT_SUPPORTED;
+    MYSYSTEMGDIDRIVERINFO Info;
+
+    /** @todo fix this horrible stuff. */
+    WCHAR wszConv[192 + 32];
+    unsigned i = 0;
+    wszConv[i++] = '\\';
+    wszConv[i++] = '?';
+    wszConv[i++] = '?';
+    wszConv[i++] = '\\';
+    unsigned cchPref = i;
+    char ch;
+    do
+    {
+        ch = pszFilename[i - cchPref];
+        wszConv[i++] = ch == '/' ? '\\' : ch;
+    } while (ch);
+    RtlInitUnicodeString(&Info.Name, wszConv);
+
+    Info.ImageAddress           = NULL;
+    Info.SectionPointer         = NULL;
+    Info.EntryPointer           = NULL;
+    Info.ExportSectionPointer   = NULL;
+    Info.ImageLength            = 0;
+
+    NTSTATUS rc = ZwSetSystemInformation(MY_SystemLoadGdiDriverInSystemSpaceInformation, &Info, sizeof(Info));
+    if (NT_SUCCESS(rc))
+    {
+        pImage->pvImage = Info.ImageAddress;
+        pImage->pvNtSectionObj = Info.SectionPointer;
+        SUPR0Printf("ImageAddress=%p SectionPointer=%p ImageLength=%#x cbImageBits=%#x rc=%#x '%ws'\n",
+                    Info.ImageAddress, Info.SectionPointer, Info.ImageLength, pImage->cbImageBits, rc, Info.Name.Buffer);
+        if (pImage->cbImageBits == Info.ImageLength)
+            return VINF_SUCCESS;
+        supdrvOSLdrUnload(pDevExt, pImage);
+        rc = STATUS_INFO_LENGTH_MISMATCH;
+    }
+    SUPR0Printf("rc=%#x '%ws'\n", rc, Info.Name.Buffer);
+    //STATUS_OBJECT_NAME_NOT_FOUND == 0xc0000034 -> SUPR0
+
+    NOREF(pDevExt); NOREF(pszFilename);
+    pImage->pvNtSectionObj = NULL;
+    return VERR_INTERNAL_ERROR_5; /** @todo convert status, making sure it isn't NOT_SUPPORTED. */
 }
 
@@ -606 +662 @@
 {
     NOREF(pDevExt); NOREF(pImage); NOREF(pv); NOREF(pbImageBits);
-    return VERR_NOT_SUPPORTED;
+    return VINF_SUCCESS;
 }
 
@@ -613 +669 @@
 {
     NOREF(pDevExt); NOREF(pImage); NOREF(pbImageBits);
-    return VERR_NOT_SUPPORTED;
+    if (pImage->pvNtSectionObj)
+    {
+        /** @todo check that the two image versions matches. */
+        return VINF_SUCCESS;
+    }
+    return VERR_INTERNAL_ERROR_4;
 }
 
@@ -619 +680 @@
 void VBOXCALL   supdrvOSLdrUnload(PSUPDRVDEVEXT pDevExt, PSUPDRVLDRIMAGE pImage)
 {
-    NOREF(pDevExt); NOREF(pImage);
+    if (pImage->pvNtSectionObj)
+    {
+        NTSTATUS rc = ZwSetSystemInformation(MY_SystemUnloadGdiDriverInformation,
+                                             &pImage->pvNtSectionObj, sizeof(pImage->pvNtSectionObj));
+    }
+    NOREF(pDevExt);
 }