Changeset 46593 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Jun 17, 2013 2:32:51 PM (12 years ago)

Author:

vboxsync

Message:

updates

Location:

trunk/src/VBox/Additions/WINNT

Files:

• Graphics/Video/disp/wddm/VBoxDispD3D.cpp (modified) (1 diff)
• Graphics/Video/disp/wddm/VBoxDispD3DIf.cpp (modified) (1 diff)
• Graphics/Video/disp/wddm/VBoxDispKmt.cpp (modified) (2 diffs)
• Graphics/Video/disp/wddm/VBoxScreen.cpp (modified) (4 diffs)
• Graphics/Wine/switcher/sw_common.c (modified) (6 diffs)
• Graphics/Wine/wined3d/directx.c (modified) (3 diffs)
• Graphics/Wine_new/switcher/sw_common.c (modified) (5 diffs)
• Graphics/Wine_new/wined3d/directx.c (modified) (3 diffs)
• Installer/InstallHelper/VBoxGuestInstallHelper.cpp (modified) (2 diffs)
• Installer/VBoxDrvInst.cpp (modified) (2 diffs)
• SharedFolders/np/vboxmrxnp.cpp (modified) (1 diff)
• VBoxCredProv/VBoxCredentialProvider.cpp (modified) (1 diff)
• VBoxGINA/VBoxGINA.cpp (modified) (16 diffs)
• VBoxMMR/dllmain.cpp (modified) (1 diff)
• VBoxMMR/tsmfhook.cpp (modified) (2 diffs)
• VBoxTray/VBoxLA.cpp (modified) (4 diffs)
• VBoxTray/VBoxMMR.cpp (modified) (4 diffs)
• VBoxTray/VBoxSeamless.cpp (modified) (7 diffs)
• VBoxTray/VBoxTray.cpp (modified) (16 diffs)
• VBoxTray/VBoxVRDP.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp

@@ -1800 +1800 @@
             vboxVDbgVEHandlerRegister();
 #endif
-            int rc = RTR3InitDll(0);
+            int rc = RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
             AssertRC(rc);
             if (RT_SUCCESS(rc))

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3DIf.cpp

@@ -28 +28 @@
 }
 
+/**
+ * Loads a system DLL.
+ *
+ * @returns Module handle or NULL
+ * @param   pszName             The DLL name.
+ */
+static HMODULE loadSystemDll(const char *pszName)
+{
+    char   szPath[MAX_PATH];
+    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
+    size_t cbName  = strlen(pszName) + 1;
+    if (cchPath + 1 + cbName > sizeof(szPath))
+    {
+        SetLastError(ERROR_FILENAME_EXCED_RANGE);
+        return NULL;
+    }
+    szPath[cchPath] = '\\';
+    memcpy(&szPath[cchPath + 1], pszName, cbName);
+    return LoadLibraryA(szPath);
+}
 
 HRESULT VBoxDispD3DOpen(VBOXDISPD3D *pD3D)
 {
 #ifdef VBOX_WDDM_WOW64
-    pD3D->hD3DLib = LoadLibraryW(L"VBoxD3D9wddm-x86.dll");
+    pD3D->hD3DLib = loadSystemDll("VBoxD3D9wddm-x86.dll");
 #else
-    pD3D->hD3DLib = LoadLibraryW(L"VBoxD3D9wddm.dll");
+    pD3D->hD3DLib = loadSystemDll("VBoxD3D9wddm.dll");
 #endif
     if (!pD3D->hD3DLib)
     {
         DWORD winErr = GetLastError();
-        WARN((__FUNCTION__": LoadLibraryW failed, winErr = (%d)", winErr));
+        WARN((__FUNCTION__": LoadLibrary failed, winErr = (%d)", winErr));
         return E_FAIL;
     }

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispKmt.cpp

@@ -23 +23 @@
 #endif
 
+/**
+ * Loads a system DLL.
+ *
+ * @returns Module handle or NULL
+ * @param   pszName             The DLL name.
+ */
+static HMODULE loadSystemDll(const char *pszName)
+{
+    char   szPath[MAX_PATH];
+    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
+    size_t cbName  = strlen(pszName) + 1;
+    if (cchPath + 1 + cbName > sizeof(szPath))
+        return NULL;
+    szPath[cchPath] = '\\';
+    memcpy(&szPath[cchPath + 1], pszName, cbName);
+    return LoadLibraryA(szPath);
+}
+
 HRESULT vboxDispKmtCallbacksInit(PVBOXDISPKMT_CALLBACKS pCallbacks)
 {
@@ -29 +47 @@
     memset(pCallbacks, 0, sizeof (*pCallbacks));
 
-    pCallbacks->hGdi32 = LoadLibraryW(L"gdi32.dll");
+    pCallbacks->hGdi32 = loadSystemDll("gdi32.dll");
     if (pCallbacks->hGdi32 != NULL)
     {

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxScreen.cpp

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * VBoxVideo Display D3D User mode dll
@@ -6 +5 @@
 
 /*
- * Copyright (C) 2011-2012 Oracle Corporation
+ * Copyright (C) 2011-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -341 +340 @@
 }
 
+/**
+ * Loads a system DLL.
+ *
+ * @returns Module handle or NULL
+ * @param   pszName             The DLL name.
+ */
+static HMODULE loadSystemDll(const char *pszName)
+{
+    char   szPath[MAX_PATH];
+    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
+    size_t cbName  = strlen(pszName) + 1;
+    if (cchPath + 1 + cbName > sizeof(szPath))
+        return NULL;
+    szPath[cchPath] = '\\';
+    memcpy(&szPath[cchPath + 1], pszName, cbName);
+    return LoadLibraryA(szPath);
+}
+
 //HRESULT vboxScreenMonInit(PVBOXSCREENMON pMon)
 HRESULT vboxScreenMonInit()
@@ -351 +368 @@
     pMon->LoData.ScreenLayout.EscapeHdr.escapeCode = VBOXESC_SCREENLAYOUT;
 
-    pMon->hGdi32 = LoadLibraryW(L"gdi32.dll");
+    pMon->hGdi32 = loadSystemDll("gdi32.dll");
     if (pMon->hGdi32 != NULL)
     {

trunk/src/VBox/Additions/WINNT/Graphics/Wine/switcher/sw_common.c

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * VBox D3D8/9 dll switcher
@@ -6 +5 @@
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23 +22 @@
 static char* gsBlackListDll[] = {"awt.dll", "wpfgfx_v0400.dll", "wpfgfx_v0300.dll", NULL};
 
+/**
+ * Loads a system DLL.
+ *
+ * @returns Module handle or NULL
+ * @param   pszName             The DLL name.
+ */
+static HMODULE loadSystemDll(const char *pszName)
+{
+    char   szPath[MAX_PATH];
+    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
+    size_t cbName  = strlen(pszName) + 1;
+    if (cchPath + 1 + cbName > sizeof(szPath))
+        return NULL;
+    szPath[cchPath] = '\\';
+    memcpy(&szPath[cchPath + 1], pszName, cbName);
+    return LoadLibraryA(szPath);
+}
+
 /* Checks if 3D is enabled for VM and it works on host machine */
 BOOL isVBox3DEnabled(void)
@@ -31 +48 @@
 
 #ifdef VBOX_WDDM_WOW64
-    hDLL = LoadLibrary("VBoxOGL-x86.dll");
+    hDLL = loadSystemDll("VBoxOGL-x86.dll");
 #else
-    hDLL = LoadLibrary("VBoxOGL.dll");
+    hDLL = loadSystemDll("VBoxOGL.dll");
 #endif
 
@@ -66 +83 @@
     int i;
 
-        if (!GetModuleFileName(NULL, name, 1000))
-                return TRUE;
+    if (!GetModuleFileName(NULL, name, 1000))
+        return TRUE;
 
     /*Extract filename*/
@@ -108 +125 @@
 
     if (isVBox3DEnabled() && checkOptions())
-    {
         dllName = vboxName;
-    } else
-    {
+    else
         dllName = msName;
-    }
 
-    hDLL = LoadLibrary(dllName);
+    hDLL = loadSystemDll(dllName);
     FillD3DExports(hDLL); 
 }
+

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/directx.c

@@ -5308 +5308 @@
 }
 
+/**
+ * Loads a system DLL.
+ *
+ * @returns Module handle or NULL
+ * @param   pszName             The DLL name.
+ */
+static HMODULE loadSystemDll(const char *pszName)
+{
+    char   szPath[MAX_PATH];
+    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
+    size_t cbName  = strlen(pszName) + 1;
+    if (cchPath + 1 + cbName > sizeof(szPath))
+        return NULL;
+    szPath[cchPath] = '\\';
+    memcpy(&szPath[cchPath + 1], pszName, cbName);
+    return LoadLibraryA(szPath);
+}
+
 static BOOL InitAdapters(IWineD3DImpl *This)
 {
@@ -5323 +5341 @@
     if(!mod_gl) {
 #ifdef USE_WIN32_OPENGL
-#define USE_GL_FUNC(pfn) pfn = (void*)GetProcAddress(mod_gl, #pfn);
-#if defined(VBOX_WITH_WDDM) || defined(VBOX_WINE_WITH_SINGLE_SWAPCHAIN_CONTEXT)
+# define USE_GL_FUNC(pfn) pfn = (void*)GetProcAddress(mod_gl, #pfn);
+# if defined(VBOX_WITH_WDDM) || defined(VBOX_WINE_WITH_SINGLE_SWAPCHAIN_CONTEXT)
         BOOL (APIENTRY *pDrvValidateVersion)(DWORD) DECLSPEC_HIDDEN;
-#ifdef VBOX_WDDM_WOW64
-        mod_gl = LoadLibraryA("VBoxOGL-x86.dll");
-#else
-        mod_gl = LoadLibraryA("VBoxOGL.dll");
-#endif
-#else
-        mod_gl = LoadLibraryA("opengl32.dll");
-#endif
+#  ifdef VBOX_WDDM_WOW64
+        mod_gl = loadSystemDll("VBoxOGL-x86.dll");
+#  else
+        mod_gl = loadSystemDll("VBoxOGL.dll");
+#  endif
+# else
+        mod_gl = loadSystemDll("opengl32.dll");
+# endif
         if(!mod_gl) {
             ERR("Can't load opengl32.dll!\n");
             goto nogl_adapter;
         }
-#if defined(VBOX_WITH_WDDM) || defined(VBOX_WINE_WITH_SINGLE_SWAPCHAIN_CONTEXT)
+# if defined(VBOX_WITH_WDDM) || defined(VBOX_WINE_WITH_SINGLE_SWAPCHAIN_CONTEXT)
         /* init properly */
         pDrvValidateVersion = (void*)GetProcAddress(mod_gl, "DrvValidateVersion");
@@ -5349 +5367 @@
             goto nogl_adapter;
         }
-#endif
+# endif
 #else
-#define USE_GL_FUNC(pfn) pfn = (void*)pwglGetProcAddress(#pfn);
+# define USE_GL_FUNC(pfn) pfn = (void*)pwglGetProcAddress(#pfn);
         /* To bypass the opengl32 thunks load wglGetProcAddress from gdi32 (glXGetProcAddress wrapper) instead of opengl32's */
         mod_gl = GetModuleHandleA("gdi32.dll");

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/switcher/sw_common.c

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * VBox D3D8/9 dll switcher
@@ -6 +5 @@
 
 /*
- * Copyright (C) 2009 Oracle Corporation
+ * Copyright (C) 2009-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23 +22 @@
 static char* gsBlackListDll[] = {"awt.dll", "wpfgfx_v0400.dll", "wpfgfx_v0300.dll", NULL};
 
+/**
+ * Loads a system DLL.
+ *
+ * @returns Module handle or NULL
+ * @param   pszName             The DLL name.
+ */
+static HMODULE loadSystemDll(const char *pszName)
+{
+    char   szPath[MAX_PATH];
+    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
+    size_t cbName  = strlen(pszName) + 1;
+    if (cchPath + 1 + cbName > sizeof(szPath))
+        return NULL;
+    szPath[cchPath] = '\\';
+    memcpy(&szPath[cchPath + 1], pszName, cbName);
+    return LoadLibraryA(szPath);
+}
+
 /* Checks if 3D is enabled for VM and it works on host machine */
 BOOL isVBox3DEnabled(void)
@@ -31 +48 @@
 
 #ifdef VBOX_WDDM_WOW64
-    hDLL = LoadLibrary("VBoxOGL-x86.dll");
+    hDLL = loadSystemDll("VBoxOGL-x86.dll");
 #else
-    hDLL = LoadLibrary("VBoxOGL.dll");
+    hDLL = loadSystemDll("VBoxOGL.dll");
 #endif
 
@@ -108 +125 @@
 
     if (isVBox3DEnabled() && checkOptions())
-    {
         dllName = vboxName;
-    } else
-    {
+    else
         dllName = msName;
-    }
 
-    hDLL = LoadLibrary(dllName);
+    hDLL = loadSystemDll(dllName);
     FillD3DExports(hDLL); 
 }
+

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/directx.c

@@ -5121 +5121 @@
 }
 
+/**
+ * Loads a system DLL.
+ *
+ * @returns Module handle or NULL
+ * @param   pszName             The DLL name.
+ */
+static HMODULE loadSystemDll(const char *pszName)
+{
+    char   szPath[MAX_PATH];
+    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
+    size_t cbName  = strlen(pszName) + 1;
+    if (cchPath + 1 + cbName > sizeof(szPath))
+        return NULL;
+    szPath[cchPath] = '\\';
+    memcpy(&szPath[cchPath + 1], pszName, cbName);
+    return LoadLibraryA(szPath);
+}
+
 /* Do not call while under the GL lock. */
 static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal)
@@ -5142 +5160 @@
 #ifdef USE_WIN32_OPENGL
     {
-#ifndef VBOX
+# ifndef VBOX
         HMODULE mod_gl = GetModuleHandleA("opengl32.dll");
-#else
+# else
         BOOL (APIENTRY *pDrvValidateVersion)(DWORD) DECLSPEC_HIDDEN;
-# ifdef VBOX_WDDM_WOW64
-        HMODULE mod_gl = LoadLibraryA("VBoxOGL-x86.dll");
-# else
-        HMODULE mod_gl = LoadLibraryA("VBoxOGL.dll");
-# endif
+#  ifdef VBOX_WDDM_WOW64
+        HMODULE mod_gl = loadSystemDll("VBoxOGL-x86.dll");
+#  else
+        HMODULE mod_gl = loadSystemDll("VBoxOGL.dll");
+#  endif
         if (!mod_gl)
         {
@@ -5169 +5187 @@
         }
 
-# define VBOX_USE_FUNC(f) p##f = (void *)GetProcAddress(mod_gl, #f);
+#  define VBOX_USE_FUNC(f) p##f = (void *)GetProcAddress(mod_gl, #f);
         VBOX_GL_FUNCS_GEN
-# undef VBOX_USE_FUNC
-#endif
-#define USE_GL_FUNC(f) gl_info->gl_ops.gl.p_##f = (void *)GetProcAddress(mod_gl, #f);
+#  undef VBOX_USE_FUNC
+# endif
+# define USE_GL_FUNC(f) gl_info->gl_ops.gl.p_##f = (void *)GetProcAddress(mod_gl, #f);
         ALL_WGL_FUNCS
-#undef USE_GL_FUNC
+# undef USE_GL_FUNC
         gl_info->gl_ops.wgl.p_wglSwapBuffers = (void *)GetProcAddress(mod_gl, "wglSwapBuffers");
     }

trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp

@@ -197 +197 @@
 
 /**
+ * Loads a system DLL.
+ *
+ * @returns Module handle or NULL
+ * @param   pszName             The DLL name.
+ */
+static HMODULE loadSystemDll(const char *pszName)
+{
+    char   szPath[MAX_PATH];
+    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
+    size_t cbName  = strlen(pszName) + 1;
+    if (cchPath + 1 + cbName > sizeof(szPath))
+        return NULL;
+    szPath[cchPath] = '\\';
+    memcpy(&szPath[cchPath + 1], pszName, cbName);
+    return LoadLibraryA(szPath);
+}
+
+/**
  * Disables the Windows File Protection for a specified file
  * using an undocumented SFC API call. Don't try this at home!
@@ -214 +232 @@
     if (SUCCEEDED(hr))
     {
-        HMODULE hSFC = LoadLibrary("sfc_os.dll");
+        HMODULE hSFC = loadSystemDll("sfc_os.dll");
         if (NULL != hSFC)
         {

trunk/src/VBox/Additions/WINNT/Installer/VBoxDrvInst.cpp

@@ -130 +130 @@
      if (pCallbackContext)
          fwprintf((FILE*)pCallbackContext, _T("(%u) %u - %s\n"), Event, dwError, pEventDescription);
+}
+
+/**
+ * Loads a system DLL.
+ *
+ * @returns Module handle or NULL
+ * @param   pszName             The DLL name.
+ */
+static HMODULE loadSystemDll(const char *pszName)
+{
+    char   szPath[MAX_PATH];
+    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
+    size_t cbName  = strlen(pszName) + 1;
+    if (cchPath + 1 + cbName > sizeof(szPath))
+        return NULL;
+    szPath[cchPath] = '\\';
+    memcpy(&szPath[cchPath + 1], pszName, cbName);
+    return LoadLibraryA(szPath);
 }
 
@@ -146 +164 @@
 {
     HRESULT hr = S_OK;
-    HMODULE hDIFxAPI = LoadLibrary(_T("DIFxAPI.dll"));
+    HMODULE hDIFxAPI = loadSystemDll("DIFxAPI.dll");
     if (NULL == hDIFxAPI)
     {

trunk/src/VBox/Additions/WINNT/SharedFolders/np/vboxmrxnp.cpp

@@ -1598 +1598 @@
     {
         case DLL_PROCESS_ATTACH:
-            RTR3InitDll(0);
+            RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
             VbglR3Init();
             LogRel(("VBOXNP: DLL loaded.\n"));

trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredentialProvider.cpp

@@ -363 +363 @@
         case DLL_PROCESS_ATTACH:
         {
-            int rc = RTR3InitDll(0 /* Flags */);
+            int rc = RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
             if (RT_SUCCESS(rc))
                 rc = VbglR3Init();

trunk/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.cpp

@@ -20 +20 @@
 #include <iprt/buildconfig.h>
 #include <iprt/initterm.h>
+#include <iprt/ldr.h>
 
 #include <VBox/VBoxGuestLib.h>
@@ -83 +84 @@
         case DLL_PROCESS_ATTACH:
         {
-            RTR3InitDll(0 /* Flags */);
+            RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
             VbglR3Init();
 
@@ -115 +116 @@
                          DWORD *pdwDllVersion)
 {
-    HINSTANCE hDll;
-
     VBoxGINAVerbose(0, "VBoxGINA::WlxNegotiate: dwWinlogonVersion: %ld\n", dwWinlogonVersion);
 
     /* Load the standard Microsoft GINA DLL. */
-    if (!(hDll = LoadLibrary(TEXT("MSGINA.DLL"))))
-    {
-        VBoxGINAVerbose(0, "VBoxGINA::WlxNegotiate: failed loading MSGINA! Last error=%ld\n", GetLastError());
+    RTLDRMOD hLdrMod;
+    int rc = RTLdrLoadSystem("MSGINA.DLL", true /*fNoUnload*/, &hLdrMod);
+    if (RT_FAILURE(rc))
+    {
+        VBoxGINAVerbose(0, "VBoxGINA::WlxNegotiate: failed loading MSGINA! rc=%Rrc\n", rc);
         return FALSE;
     }
@@ -129 +130 @@
      * Now get the entry points of the MSGINA
      */
-    GWlxNegotiate = (PGWLXNEGOTIATE)GetProcAddress(hDll, "WlxNegotiate");
+    GWlxNegotiate = (PGWLXNEGOTIATE)RTLdrGetFunction(hLdrMod, "WlxNegotiate");
     if (!GWlxNegotiate)
     {
@@ -135 +136 @@
         return FALSE;
     }
-    GWlxInitialize = (PGWLXINITIALIZE)GetProcAddress(hDll, "WlxInitialize");
+    GWlxInitialize = (PGWLXINITIALIZE)RTLdrGetFunction(hLdrMod, "WlxInitialize");
     if (!GWlxInitialize)
     {
@@ -142 +143 @@
     }
     GWlxDisplaySASNotice =
-        (PGWLXDISPLAYSASNOTICE)GetProcAddress(hDll, "WlxDisplaySASNotice");
+        (PGWLXDISPLAYSASNOTICE)RTLdrGetFunction(hLdrMod, "WlxDisplaySASNotice");
     if (!GWlxDisplaySASNotice)
     {
@@ -149 +150 @@
     }
     GWlxLoggedOutSAS =
-        (PGWLXLOGGEDOUTSAS)GetProcAddress(hDll, "WlxLoggedOutSAS");
+        (PGWLXLOGGEDOUTSAS)RTLdrGetFunction(hLdrMod, "WlxLoggedOutSAS");
     if (!GWlxLoggedOutSAS)
     {
@@ -156 +157 @@
     }
     GWlxActivateUserShell =
-        (PGWLXACTIVATEUSERSHELL)GetProcAddress(hDll, "WlxActivateUserShell");
+        (PGWLXACTIVATEUSERSHELL)RTLdrGetFunction(hLdrMod, "WlxActivateUserShell");
     if (!GWlxActivateUserShell)
     {
@@ -163 +164 @@
     }
     GWlxLoggedOnSAS =
-        (PGWLXLOGGEDONSAS)GetProcAddress(hDll, "WlxLoggedOnSAS");
+        (PGWLXLOGGEDONSAS)RTLdrGetFunction(hLdrMod, "WlxLoggedOnSAS");
     if (!GWlxLoggedOnSAS)
     {
@@ -170 +171 @@
     }
     GWlxDisplayLockedNotice =
-        (PGWLXDISPLAYLOCKEDNOTICE)GetProcAddress(hDll, "WlxDisplayLockedNotice");
+        (PGWLXDISPLAYLOCKEDNOTICE)RTLdrGetFunction(hLdrMod, "WlxDisplayLockedNotice");
     if (!GWlxDisplayLockedNotice)
     {
@@ -176 +177 @@
         return FALSE;
     }
-    GWlxIsLockOk = (PGWLXISLOCKOK)GetProcAddress(hDll, "WlxIsLockOk");
+    GWlxIsLockOk = (PGWLXISLOCKOK)RTLdrGetFunction(hLdrMod, "WlxIsLockOk");
     if (!GWlxIsLockOk)
     {
@@ -183 +184 @@
     }
     GWlxWkstaLockedSAS =
-        (PGWLXWKSTALOCKEDSAS)GetProcAddress(hDll, "WlxWkstaLockedSAS");
+        (PGWLXWKSTALOCKEDSAS)RTLdrGetFunction(hLdrMod, "WlxWkstaLockedSAS");
     if (!GWlxWkstaLockedSAS)
     {
@@ -189 +190 @@
         return FALSE;
     }
-    GWlxIsLogoffOk = (PGWLXISLOGOFFOK)GetProcAddress(hDll, "WlxIsLogoffOk");
+    GWlxIsLogoffOk = (PGWLXISLOGOFFOK)RTLdrGetFunction(hLdrMod, "WlxIsLogoffOk");
     if (!GWlxIsLogoffOk)
     {
@@ -195 +196 @@
         return FALSE;
     }
-    GWlxLogoff = (PGWLXLOGOFF)GetProcAddress(hDll, "WlxLogoff");
+    GWlxLogoff = (PGWLXLOGOFF)RTLdrGetFunction(hLdrMod, "WlxLogoff");
     if (!GWlxLogoff)
     {
@@ -201 +202 @@
         return FALSE;
     }
-    GWlxShutdown = (PGWLXSHUTDOWN)GetProcAddress(hDll, "WlxShutdown");
+    GWlxShutdown = (PGWLXSHUTDOWN)RTLdrGetFunction(hLdrMod, "WlxShutdown");
     if (!GWlxShutdown)
     {
@@ -208 +209 @@
     }
     /* GINA 1.1, optional */
-    GWlxStartApplication = (PGWLXSTARTAPPLICATION)GetProcAddress(hDll, "WlxStartApplication");
-    GWlxScreenSaverNotify = (PGWLXSCREENSAVERNOTIFY)GetProcAddress(hDll, "WlxScreenSaverNotify");
+    GWlxStartApplication = (PGWLXSTARTAPPLICATION)RTLdrGetFunction(hLdrMod, "WlxStartApplication");
+    GWlxScreenSaverNotify = (PGWLXSCREENSAVERNOTIFY)RTLdrGetFunction(hLdrMod, "WlxScreenSaverNotify");
     /* GINA 1.3, optional */
-    GWlxNetworkProviderLoad = (PGWLXNETWORKPROVIDERLOAD)GetProcAddress( hDll, "WlxNetworkProviderLoad");
-    GWlxDisplayStatusMessage = (PGWLXDISPLAYSTATUSMESSAGE)GetProcAddress( hDll, "WlxDisplayStatusMessage");
-    GWlxGetStatusMessage = (PGWLXGETSTATUSMESSAGE)GetProcAddress( hDll, "WlxGetStatusMessage");
-    GWlxRemoveStatusMessage = (PGWLXREMOVESTATUSMESSAGE)GetProcAddress( hDll, "WlxRemoveStatusMessage");
+    GWlxNetworkProviderLoad = (PGWLXNETWORKPROVIDERLOAD)RTLdrGetFunction(hLdrMod, "WlxNetworkProviderLoad");
+    GWlxDisplayStatusMessage = (PGWLXDISPLAYSTATUSMESSAGE)RTLdrGetFunction(hLdrMod, "WlxDisplayStatusMessage");
+    GWlxGetStatusMessage = (PGWLXGETSTATUSMESSAGE)RTLdrGetFunction(hLdrMod, "WlxGetStatusMessage");
+    GWlxRemoveStatusMessage = (PGWLXREMOVESTATUSMESSAGE)RTLdrGetFunction(hLdrMod, "WlxRemoveStatusMessage");
     /* GINA 1.4, optional */
     GWlxGetConsoleSwitchCredentials =
-        (PGWLXGETCONSOLESWITCHCREDENTIALS)GetProcAddress(hDll, "WlxGetConsoleSwitchCredentials");
-    GWlxReconnectNotify = (PGWLXRECONNECTNOTIFY)GetProcAddress(hDll, "WlxReconnectNotify");
-    GWlxDisconnectNotify = (PGWLXDISCONNECTNOTIFY)GetProcAddress(hDll, "WlxDisconnectNotify");
+        (PGWLXGETCONSOLESWITCHCREDENTIALS)RTLdrGetFunction(hLdrMod, "WlxGetConsoleSwitchCredentials");
+    GWlxReconnectNotify = (PGWLXRECONNECTNOTIFY)RTLdrGetFunction(hLdrMod, "WlxReconnectNotify");
+    GWlxDisconnectNotify = (PGWLXDISCONNECTNOTIFY)RTLdrGetFunction(hLdrMod, "WlxDisconnectNotify");
     VBoxGINAVerbose(0, "VBoxGINA::WlxNegotiate: optional function pointers:\n"
                     "  WlxStartApplication: %p\n"

trunk/src/VBox/Additions/WINNT/VBoxMMR/dllmain.cpp

@@ -45 +45 @@
             if (isWMP)
             {
-                RTR3InitDll(0);
+                RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
                 VbglR3Init();
                 VBoxMMRHookLog("VBoxMMR: Hooking wmplayer process\n");

trunk/src/VBox/Additions/WINNT/VBoxMMR/tsmfhook.cpp

@@ -1343 +1343 @@
 }
 
-void InstallHooksForModule(const char *pszName, HookEntry hooks[])
-{
-    HMODULE hMod = LoadLibraryA(pszName);
-    if (hMod != NULL)
-    {
-        VBoxMMRHookLog("VBoxMMR: Hooking %s -> %x \n", pszName, hMod);
-        const IMAGE_IMPORT_DESCRIPTOR *pDescriptor = GetImportDescriptor(hMod);
-        InstallHooks(pDescriptor, (PBYTE) hMod, hooks);
+void InstallHooksForSystemModule(const char *pszName, HookEntry hooks[])
+{
+    /* Construct the full path to the given module and load it. */
+    char   szPath[MAX_PATH];
+    UINT   cchPath = GetSystemDirectoryA(szPath, MAX_PATH);
+    size_t cbName  = strlen(pszName) + 1;
+    if (cchPath + 1 + cbName <= sizeof(szPath))
+    {
+        szPath[cchPath] = '\\';
+        memcpy(&szPath[cchPath + 1], pszName, cbName);
+
+        HMODULE hMod = LoadLibraryA(szPath);
+        if (hMod != NULL)
+        {
+            VBoxMMRHookLog("VBoxMMR: Hooking %s -> %x \n", pszName, hMod);
+            const IMAGE_IMPORT_DESCRIPTOR *pDescriptor = GetImportDescriptor(hMod);
+            InstallHooks(pDescriptor, (PBYTE) hMod, hooks);
+        }
+        else
+            VBoxMMRHookLog("VBoxMMR: Error hooking %s -> not found (last error %u)\n", pszName, GetLastError());
     }
     else
-    {
         VBoxMMRHookLog("VBoxMMR: Error hooking %s -> not found\n", pszName);
-    }
 }
 
@@ -1382 +1392 @@
         }
 
-        InstallHooksForModule("winmm.dll", g_WinMMHooks);
-        InstallHooksForModule("tsmf.dll", g_TSMFHooks);
-        InstallHooksForModule("DSHOWRDPFILTER.dll", g_TSMFHooks);
-        InstallHooksForModule("MSMPEG2VDEC.dll", g_DShowHooks);
-        InstallHooksForModule("MFDS.dll", g_DShowHooks);
-        InstallHooksForModule("mf.dll", g_MFHooks);
+        InstallHooksForSystemModule("winmm.dll", g_WinMMHooks);
+        InstallHooksForSystemModule("tsmf.dll", g_TSMFHooks);
+        InstallHooksForSystemModule("DSHOWRDPFILTER.dll", g_TSMFHooks);
+        InstallHooksForSystemModule("MSMPEG2VDEC.dll", g_DShowHooks);
+        InstallHooksForSystemModule("MFDS.dll", g_DShowHooks);
+        InstallHooksForSystemModule("mf.dll", g_MFHooks);
 
         ULONG ret = RegisterTraceGuids(

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxLA.cpp

@@ -27 +27 @@
 #include <iprt/alloc.h>
 #include <iprt/list.h>
+#include <iprt/ldr.h>
 
 #define LALOG(a) do { if (gCtx.fLogEnabled) LogRel(a); } while(0)
@@ -87 +88 @@
         char *pszPropWaitPattern; /* Which properties are monitored. */
     } activeClient;
-
-    HMODULE hModuleKernel32;
 
     BOOL (WINAPI * pfnProcessIdToSessionId)(DWORD dwProcessId, DWORD *pSessionId);
@@ -1250 +1249 @@
     RT_ZERO(gCtx.activeClient);
 
-    gCtx.hModuleKernel32 = LoadLibrary("KERNEL32");
-
-    if (gCtx.hModuleKernel32)
-    {
-        *(uintptr_t *)&gCtx.pfnProcessIdToSessionId = (uintptr_t)GetProcAddress(gCtx.hModuleKernel32, "ProcessIdToSessionId");
-    }
-    else
-    {
-        gCtx.pfnProcessIdToSessionId = NULL;
-    }
+    *(void **)&gCtx.pfnProcessIdToSessionId = RTLdrGetSystemSymbol("KERNEL32", "ProcessIdToSessionId");
     *pfStartThread = true;
     *ppInstance = &gCtx;
@@ -1280 +1270 @@
     ActionExecutorDeleteActions(&pCtx->listDetachActions);
 
-    if (pCtx->hModuleKernel32)
-    {
-        FreeLibrary(pCtx->hModuleKernel32);
-        pCtx->pfnProcessIdToSessionId = NULL;
-    }
-    pCtx->hModuleKernel32 = NULL;
+    pCtx->pfnProcessIdToSessionId = NULL;
 }
 

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxMMR.cpp

@@ -18 +18 @@
 #include "VBoxTray.h"
 #include "VBoxMMR.h"
+#include <iprt/ldr.h>
 
 struct VBOXMMRCONTEXT
 {
-    HINSTANCE hMod;
+    RTLDRMOD  hModHook;
     HHOOK     hHook;
 };
@@ -32 +33 @@
 void VBoxMMRCleanup(VBOXMMRCONTEXT *pCtx)
 {
-    if (NULL != pCtx->hHook)
+    if (pCtx->hHook)
     {
         UnhookWindowsHookEx(pCtx->hHook);
+        pCtx->hHook = NULL;
     }
 
-    if (pCtx->hMod)
+    if (pCtx->hModHook != NIL_RTLDRMOD)
     {
-        FreeLibrary(pCtx->hMod);
+        RTLdrClose(pCtx->hModHook);
+        pCtx->hModHook = NIL_RTLDRMOD;
     }
-
-    return;
 }
 
@@ -50 +51 @@
     bool *pfStartThread)
 {
-    HOOKPROC pHook = NULL;
-
     LogRel2(("VBoxMMR: Initializing\n"));
 
-    gCtx.hMod = LoadLibraryA(g_pszMMRDLL);
-    if (NULL == gCtx.hMod)
+    int rc = RTLdrLoadAppPriv(g_pszMMRDLL, &gCtx.hModHook);
+    if (RT_SUCCESS(rc))
     {
-        LogRel2(("VBoxMMR: Hooking library not found\n"));
-        VBoxMMRCleanup(&gCtx);
-        return VERR_NOT_FOUND;
+        HOOKPROC pHook = (HOOKPROC)RTLdrGetFunction(gCtx.hModHook, g_pszMMRPROC);
+        if (pHook)
+        {
+            HMODULE hMod = (HMODULE)RTLdrGetNativeHandle(gCtx.hModHook);
+            Assert(hMod != (HMODULE)~(uintptr_t)0);
+            gCtx.hHook = SetWindowsHookEx(WH_CBT, pHook, hMod, 0);
+            if (gCtx.hHook)
+            {
+                *ppInstance = &gCtx;
+                return VINF_SUCCESS;
+            }
+
+            rc = RTErrConvertFromWin32(GetLastError());
+            LogRel2(("VBoxMMR: Error installing hooking proc: %Rrc\n", rc));
+        }
+        else
+        {
+            LogRel2(("VBoxMMR: Hooking proc not found\n"));
+            rc = VERR_NOT_FOUND;
+        }
     }
+    else
+        LogRel2(("VBoxMMR: Hooking library not found (%Rrc)\n", rc));
 
-    pHook = (HOOKPROC) GetProcAddress(gCtx.hMod, g_pszMMRPROC);
-    if (NULL == pHook)
-    {
-        LogRel2(("VBoxMMR: Hooking proc not found\n"));
-        VBoxMMRCleanup(&gCtx);
-        return VERR_NOT_FOUND;
-    }
-
-    gCtx.hHook = SetWindowsHookEx(WH_CBT, pHook, gCtx.hMod, 0);
-    if (NULL == gCtx.hHook)
-    {
-        int rc = RTErrConvertFromWin32(GetLastError());
-        LogRel2(("VBoxMMR: Error installing hooking proc: %d\n", rc));
-        VBoxMMRCleanup(&gCtx);
-        return rc;
-    }
-
-    *ppInstance = &gCtx;
-
-    return VINF_SUCCESS;
+    RTLdrClose(gCtx.hModHook);
+    gCtx.hModHook = NIL_RTLDRMOD;
+    return rc;
 }
 
@@ -95 +96 @@
     return 0;
 }
+

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxSeamless.cpp

@@ -25 +25 @@
 #include <VBox/VMMDev.h>
 #include <iprt/assert.h>
+#include <iprt/ldr.h>
 #include <VBoxGuestInternal.h>
 
@@ -31 +32 @@
     const VBOXSERVICEENV *pEnv;
 
-    HMODULE    hModule;
+    RTLDRMOD hModHook;
 
     BOOL    (* pfnVBoxHookInstallWindowTracker)(HMODULE hDll);
@@ -55 +56 @@
     *pfStartThread = false;
     gCtx.pEnv = pEnv;
+    gCtx.hModHook = NIL_RTLDRMOD;
 
     OSVERSIONINFO OSinfo;
@@ -72 +74 @@
     {
         /* Will fail if SetWinEventHook is not present (version < NT4 SP6 apparently) */
-        gCtx.hModule = LoadLibrary(VBOXHOOK_DLL_NAME);
-        if (gCtx.hModule)
-        {
-            *(uintptr_t *)&gCtx.pfnVBoxHookInstallWindowTracker = (uintptr_t)GetProcAddress(gCtx.hModule, "VBoxHookInstallWindowTracker");
-            *(uintptr_t *)&gCtx.pfnVBoxHookRemoveWindowTracker  = (uintptr_t)GetProcAddress(gCtx.hModule, "VBoxHookRemoveWindowTracker");
+        rc = RTLdrLoadAppPriv(VBOXHOOK_DLL_NAME, &gCtx.hModHook);
+        if (RT_SUCCESS(rc))
+        {
+            *(PFNRT *)&gCtx.pfnVBoxHookInstallWindowTracker = RTLdrGetFunction(gCtx.hModHook, "VBoxHookInstallWindowTracker");
+            *(PFNRT *)&gCtx.pfnVBoxHookRemoveWindowTracker  = RTLdrGetFunction(gCtx.hModHook, "VBoxHookRemoveWindowTracker");
 
             /* rc should contain success status */
@@ -90 +92 @@
         }
         else
-        {
-            rc = RTErrConvertFromWin32(GetLastError());
             Log(("VBoxTray: VBoxSeamlessInit: LoadLibrary of \"%s\" failed with rc=%Rrc\n", VBOXHOOK_DLL_NAME, rc));
-        }
     }
 
@@ -109 +108 @@
     if (gCtx.pfnVBoxHookRemoveWindowTracker)
         gCtx.pfnVBoxHookRemoveWindowTracker();
-    if (gCtx.hModule)
-        FreeLibrary(gCtx.hModule);
-    gCtx.hModule = 0;
+    if (gCtx.hModHook != NIL_RTLDRMOD)
+    {
+        RTLdrClose(gCtx.hModHook);
+        gCtx.hModHook = NIL_RTLDRMOD;
+    }
     return;
 }
@@ -122 +123 @@
         VBoxSeamlessCheckWindows();
 
-        gCtx.pfnVBoxHookInstallWindowTracker(gCtx.hModule);
+        HMODULE hMod = (HMODULE)RTLdrGetNativeHandle(gCtx.hModHook);
+        Assert(hMod != (HMODULE)~(uintptr_t)0);
+        gCtx.pfnVBoxHookInstallWindowTracker(hMod);
     }
 }

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp

@@ -41 +41 @@
 
 #include <iprt/buildconfig.h>
+#include <iprt/ldr.h>
 
 /* Default desktop state tracking */
@@ -63 +64 @@
  * of the window passed to vboxStInit */
 static int vboxStInit(HWND hWnd);
-static void vboxStTerm();
+static void vboxStTerm(void);
 /* @returns true on "IsActiveConsole" state change */
 static BOOL vboxStHandleEvent(WPARAM EventID, LPARAM SessionID);
@@ -549 +550 @@
         {
             BOOL (WINAPI * pfnConvertStringSecurityDescriptorToSecurityDescriptorA)(LPCSTR StringSecurityDescriptor, DWORD StringSDRevision, PSECURITY_DESCRIPTOR  *SecurityDescriptor, PULONG  SecurityDescriptorSize);
-
-            HMODULE hModule = LoadLibrary("ADVAPI32.DLL");
-            if (!hModule)
-            {
-                dwErr = GetLastError();
-                Log(("VBoxTray: Loading module ADVAPI32.DLL failed with last error = %08X\n", dwErr));
-            }
-            else
+            *(void **)&pfnConvertStringSecurityDescriptorToSecurityDescriptorA =
+                RTLdrGetSystemSymbol("ADVAPI32.DLL", "ConvertStringSecurityDescriptorToSecurityDescriptorA");
+            Log(("VBoxTray: pfnConvertStringSecurityDescriptorToSecurityDescriptorA = %x\n", pfnConvertStringSecurityDescriptorToSecurityDescriptorA));
+            if (pfnConvertStringSecurityDescriptorToSecurityDescriptorA)
             {
                 PSECURITY_DESCRIPTOR    pSD;
@@ -563 +560 @@
                 BOOL                    fSaclDefaulted = FALSE;
 
-                *(uintptr_t *)&pfnConvertStringSecurityDescriptorToSecurityDescriptorA = (uintptr_t)GetProcAddress(hModule, "ConvertStringSecurityDescriptorToSecurityDescriptorA");
-
-                Log(("VBoxTray: pfnConvertStringSecurityDescriptorToSecurityDescriptorA = %x\n", pfnConvertStringSecurityDescriptorToSecurityDescriptorA));
-                if (pfnConvertStringSecurityDescriptorToSecurityDescriptorA)
+                fRC = pfnConvertStringSecurityDescriptorToSecurityDescriptorA("S:(ML;;NW;;;LW)", /* this means "low integrity" */
+                                                                              SDDL_REVISION_1, &pSD, NULL);
+                if (!fRC)
                 {
-                    fRC = pfnConvertStringSecurityDescriptorToSecurityDescriptorA("S:(ML;;NW;;;LW)", /* this means "low integrity" */
-                                                                                  SDDL_REVISION_1, &pSD, NULL);
+                    dwErr = GetLastError();
+                    Log(("VBoxTray: ConvertStringSecurityDescriptorToSecurityDescriptorA failed with last error = %08X\n", dwErr));
+                }
+                else
+                {
+                    fRC = GetSecurityDescriptorSacl(pSD, &fSaclPresent, &pSacl, &fSaclDefaulted);
                     if (!fRC)
                     {
                         dwErr = GetLastError();
-                        Log(("VBoxTray: ConvertStringSecurityDescriptorToSecurityDescriptorA failed with last error = %08X\n", dwErr));
+                        Log(("VBoxTray: GetSecurityDescriptorSacl failed with last error = %08X\n", dwErr));
                     }
                     else
                     {
-                        fRC = GetSecurityDescriptorSacl(pSD, &fSaclPresent, &pSacl, &fSaclDefaulted);
+                        fRC = SetSecurityDescriptorSacl(SecAttr.lpSecurityDescriptor, TRUE, pSacl, FALSE);
                         if (!fRC)
                         {
                             dwErr = GetLastError();
-                            Log(("VBoxTray: GetSecurityDescriptorSacl failed with last error = %08X\n", dwErr));
-                        }
-                        else
-                        {
-                            fRC = SetSecurityDescriptorSacl(SecAttr.lpSecurityDescriptor, TRUE, pSacl, FALSE);
-                            if (!fRC)
-                            {
-                                dwErr = GetLastError();
-                                Log(("VBoxTray: SetSecurityDescriptorSacl failed with last error = %08X\n", dwErr));
-                            }
+                            Log(("VBoxTray: SetSecurityDescriptorSacl failed with last error = %08X\n", dwErr));
                         }
                     }
@@ -1015 +1006 @@
 {
     HWND hWTSAPIWnd;
-    HMODULE hWTSAPI32;
+    RTLDRMOD hLdrModWTSAPI32;
     BOOL fIsConsole;
     WTS_CONNECTSTATE_CLASS enmConnectState;
@@ -1032 +1023 @@
     USHORT *pProtocolType = NULL;
     DWORD cbBuf = 0;
-    if (gVBoxSt.pfnWTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSConnectState, (LPTSTR *)&penmConnectState, &cbBuf))
-    {
-        if (gVBoxSt.pfnWTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSClientProtocolType, (LPTSTR *)&pProtocolType, &cbBuf))
+    if (gVBoxSt.pfnWTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSConnectState,
+                                               (LPTSTR *)&penmConnectState, &cbBuf))
+    {
+        if (gVBoxSt.pfnWTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSClientProtocolType,
+                                                   (LPTSTR *)&pProtocolType, &cbBuf))
         {
             gVBoxSt.fIsConsole = (*pProtocolType == 0);
@@ -1040 +1033 @@
             return VINF_SUCCESS;
         }
-        else
-        {
-            DWORD dwErr = GetLastError();
-            WARN(("VBoxTray: WTSQuerySessionInformationA WTSClientProtocolType failed, error = %08X\n", dwErr));
-            rc = RTErrConvertFromWin32(dwErr);
-        }
+
+        DWORD dwErr = GetLastError();
+        WARN(("VBoxTray: WTSQuerySessionInformationA WTSClientProtocolType failed, error = %08X\n", dwErr));
+        rc = RTErrConvertFromWin32(dwErr);
     }
     else
@@ -1063 +1054 @@
 static int vboxStInit(HWND hWnd)
 {
-    int rc = VINF_SUCCESS;
-    memset(&gVBoxSt, 0, sizeof (gVBoxSt));
-    gVBoxSt.hWTSAPI32 = LoadLibrary("WTSAPI32.DLL");
-    if (gVBoxSt.hWTSAPI32)
-    {
-        *(uintptr_t *)&gVBoxSt.pfnWTSRegisterSessionNotification = (uintptr_t)GetProcAddress(gVBoxSt.hWTSAPI32, "WTSRegisterSessionNotification");
-        if (!gVBoxSt.pfnWTSRegisterSessionNotification)
-        {
+    RT_ZERO(gVBoxSt);
+    int rc = RTLdrLoadSystem("WTSAPI32.DLL", false /*fNoUnload*/, &gVBoxSt.hLdrModWTSAPI32);
+    if (RT_SUCCESS(rc))
+    {
+        rc = RTLdrGetSymbol(gVBoxSt.hLdrModWTSAPI32, "WTSRegisterSessionNotification",
+                            (void **)&gVBoxSt.pfnWTSRegisterSessionNotification);
+        if (RT_SUCCESS(rc))
+        {
+            rc = RTLdrGetSymbol(gVBoxSt.hLdrModWTSAPI32, "WTSUnRegisterSessionNotification",
+                                (void **)&gVBoxSt.pfnWTSUnRegisterSessionNotification);
+            if (RT_SUCCESS(rc))
+            {
+                rc = RTLdrGetSymbol(gVBoxSt.hLdrModWTSAPI32, "WTSQuerySessionInformationA",
+                                    (void **)&gVBoxSt.pfnWTSQuerySessionInformationA);
+                if (RT_FAILURE(rc))
+                    WARN(("VBoxTray: WTSQuerySessionInformationA not found\n"));
+            }
+            else
+                WARN(("VBoxTray: WTSUnRegisterSessionNotification not found\n"));
+        }
+        else
             WARN(("VBoxTray: WTSRegisterSessionNotification not found\n"));
-            rc = VERR_NOT_SUPPORTED;
-        }
-
-        *(uintptr_t *)&gVBoxSt.pfnWTSUnRegisterSessionNotification = (uintptr_t)GetProcAddress(gVBoxSt.hWTSAPI32, "WTSUnRegisterSessionNotification");
-        if (!gVBoxSt.pfnWTSUnRegisterSessionNotification)
-        {
-            WARN(("VBoxTray: WTSUnRegisterSessionNotification not found\n"));
-            rc = VERR_NOT_SUPPORTED;
-        }
-
-        *(uintptr_t *)&gVBoxSt.pfnWTSQuerySessionInformationA = (uintptr_t)GetProcAddress(gVBoxSt.hWTSAPI32, "WTSQuerySessionInformationA");
-        if (!gVBoxSt.pfnWTSQuerySessionInformationA)
-        {
-            WARN(("VBoxTray: WTSQuerySessionInformationA not found\n"));
-            rc = VERR_NOT_SUPPORTED;
-        }
-
-        if (rc == VINF_SUCCESS)
+        if (RT_SUCCESS(rc))
         {
             gVBoxSt.hWTSAPIWnd = hWnd;
             if (gVBoxSt.pfnWTSRegisterSessionNotification(gVBoxSt.hWTSAPIWnd, NOTIFY_FOR_THIS_SESSION))
-            {
                 vboxStCheckState();
-            }
             else
             {
@@ -1102 +1087 @@
                 if (dwErr == RPC_S_INVALID_BINDING)
                 {
-                    gVBoxSt.idDelayedInitTimer = SetTimer(gVBoxSt.hWTSAPIWnd, TIMERID_VBOXTRAY_ST_DELAYED_INIT_TIMER, 2000, (TIMERPROC)NULL);
-                    rc = VINF_SUCCESS;
-
+                    gVBoxSt.idDelayedInitTimer = SetTimer(gVBoxSt.hWTSAPIWnd, TIMERID_VBOXTRAY_ST_DELAYED_INIT_TIMER,
+                                                          2000, (TIMERPROC)NULL);
                     gVBoxSt.fIsConsole = TRUE;
                     gVBoxSt.enmConnectState = WTSActive;
+                    rc = VINF_SUCCESS;
                 }
                 else
@@ -1116 +1101 @@
         }
 
-        FreeLibrary(gVBoxSt.hWTSAPI32);
+        RTLdrClose(gVBoxSt.hLdrModWTSAPI32);
     }
     else
-    {
-        DWORD dwErr = GetLastError();
-        WARN(("VBoxTray: WTSAPI32 load failed, error = %08X\n", dwErr));
-        rc = RTErrConvertFromWin32(dwErr);
-    }
-
-    memset(&gVBoxSt, 0, sizeof (gVBoxSt));
+        WARN(("VBoxTray: WTSAPI32 load failed, rc = %Rrc\n", rc));
+
+    RT_ZERO(gVBoxSt);
     gVBoxSt.fIsConsole = TRUE;
     gVBoxSt.enmConnectState = WTSActive;
@@ -1131 +1112 @@
 }
 
-static void vboxStTerm()
-{
-    if (gVBoxSt.hWTSAPIWnd)
+static void vboxStTerm(void)
+{
+    if (!gVBoxSt.hWTSAPIWnd)
     {
         WARN(("VBoxTray: vboxStTerm called for non-initialized St\n"));
@@ -1154 +1135 @@
     }
 
-    FreeLibrary(gVBoxSt.hWTSAPI32);
-    memset(&gVBoxSt, 0, sizeof (gVBoxSt));
+    RTLdrClose(gVBoxSt.hLdrModWTSAPI32);
+    RT_ZERO(gVBoxSt);
 }
 
@@ -1228 +1209 @@
     BOOL fIsInputDesktop;
     UINT_PTR idTimer;
-    HMODULE hHookModule;
+    RTLDRMOD hLdrModHook;
     BOOL (* pfnVBoxHookInstallActiveDesktopTracker)(HMODULE hDll);
     BOOL (* pfnVBoxHookRemoveActiveDesktopTracker)();
-    HMODULE hUSER32;
     HDESK (WINAPI * pfnGetThreadDesktop)(DWORD dwThreadId);
     HDESK (WINAPI * pfnOpenInputDesktop)(DWORD dwFlags, BOOL fInherit, ACCESS_MASK dwDesiredAccess);
@@ -1289 +1269 @@
     }
 
-    memset(&gVBoxDt, 0, sizeof (gVBoxDt));
+    RT_ZERO(gVBoxDt);
 
     gVBoxDt.hNotifyEvent = CreateEvent(NULL, FALSE, FALSE, VBOXHOOK_GLOBAL_DT_EVENT_NAME);
     if (gVBoxDt.hNotifyEvent != NULL)
     {
-        gVBoxDt.hHookModule = LoadLibrary(VBOXHOOK_DLL_NAME);
-        if (gVBoxDt.hHookModule)
-        {
-            *(uintptr_t *)&gVBoxDt.pfnVBoxHookInstallActiveDesktopTracker = (uintptr_t)GetProcAddress(gVBoxDt.hHookModule, "VBoxHookInstallActiveDesktopTracker");
-            if (!gVBoxDt.pfnVBoxHookInstallActiveDesktopTracker)
-            {
+        /* Load the hook dll and resolve the necessary entry points. */
+        rc = RTLdrLoadAppPriv(VBOXHOOK_DLL_NAME, &gVBoxDt.hLdrModHook);
+        if (RT_SUCCESS(rc))
+        {
+            rc = RTLdrGetSymbol(gVBoxDt.hLdrModHook, "VBoxHookInstallActiveDesktopTracker",
+                                (void **)&gVBoxDt.pfnVBoxHookInstallActiveDesktopTracker);
+            if (RT_SUCCESS(rc))
+            {
+                rc = RTLdrGetSymbol(gVBoxDt.hLdrModHook, "VBoxHookRemoveActiveDesktopTracker",
+                                    (void **)&gVBoxDt.pfnVBoxHookRemoveActiveDesktopTracker);
+                if (RT_FAILURE(rc))
+                    WARN(("VBoxTray: VBoxHookRemoveActiveDesktopTracker not found\n"));
+            }
+            else
                 WARN(("VBoxTray: VBoxHookInstallActiveDesktopTracker not found\n"));
-                rc = VERR_NOT_SUPPORTED;
-            }
-
-            *(uintptr_t *)&gVBoxDt.pfnVBoxHookRemoveActiveDesktopTracker  = (uintptr_t)GetProcAddress(gVBoxDt.hHookModule, "VBoxHookInstallActiveDesktopTracker");
-            if (!gVBoxDt.pfnVBoxHookRemoveActiveDesktopTracker)
-            {
-                WARN(("VBoxTray: VBoxHookRemoveActiveDesktopTracker not found\n"));
-                rc = VERR_NOT_SUPPORTED;
-            }
-
-            if (VINF_SUCCESS == rc)
-            {
-                gVBoxDt.hUSER32 = LoadLibrary("User32.dll");
-                if (gVBoxDt.hUSER32)
+            if (RT_SUCCESS(rc))
+            {
+                /* Try get the system APIs we need. */
+                *(void **)&gVBoxDt.pfnGetThreadDesktop = RTLdrGetSystemSymbol("User32.dll", "GetThreadDesktop");
+                if (!gVBoxDt.pfnGetThreadDesktop)
                 {
-                    *(uintptr_t *)&gVBoxDt.pfnGetThreadDesktop = (uintptr_t)GetProcAddress(gVBoxDt.hUSER32, "GetThreadDesktop");
-                    if (!gVBoxDt.pfnGetThreadDesktop)
+                    WARN(("VBoxTray: GetThreadDesktop not found\n"));
+                    rc = VERR_NOT_SUPPORTED;
+                }
+
+                *(void **)&gVBoxDt.pfnOpenInputDesktop = RTLdrGetSystemSymbol("User32.dll", "OpenInputDesktop");
+                if (!gVBoxDt.pfnOpenInputDesktop)
+                {
+                    WARN(("VBoxTray: OpenInputDesktop not found\n"));
+                    rc = VERR_NOT_SUPPORTED;
+                }
+
+                *(void **)&gVBoxDt.pfnCloseDesktop = RTLdrGetSystemSymbol("User32.dll", "CloseDesktop");
+                if (!gVBoxDt.pfnCloseDesktop)
+                {
+                    WARN(("VBoxTray: CloseDesktop not found\n"));
+                    rc = VERR_NOT_SUPPORTED;
+                }
+
+                if (RT_SUCCESS(rc))
+                {
+                    BOOL fRc = FALSE;
+                    /* For Vista and up we need to change the integrity of the security descriptor, too. */
+                    if (gMajorVersion >= 6)
                     {
-                        WARN(("VBoxTray: GetThreadDesktop not found\n"));
-                        rc = VERR_NOT_SUPPORTED;
-                    }
-
-                    *(uintptr_t *)&gVBoxDt.pfnOpenInputDesktop = (uintptr_t)GetProcAddress(gVBoxDt.hUSER32, "OpenInputDesktop");
-                    if (!gVBoxDt.pfnOpenInputDesktop)
-                    {
-                        WARN(("VBoxTray: OpenInputDesktop not found\n"));
-                        rc = VERR_NOT_SUPPORTED;
-                    }
-
-                    *(uintptr_t *)&gVBoxDt.pfnCloseDesktop = (uintptr_t)GetProcAddress(gVBoxDt.hUSER32, "CloseDesktop");
-                    if (!gVBoxDt.pfnCloseDesktop)
-                    {
-                        WARN(("VBoxTray: CloseDesktop not found\n"));
-                        rc = VERR_NOT_SUPPORTED;
-                    }
-
-                    if (VINF_SUCCESS == rc)
-                    {
-                        BOOL bRc = FALSE;
-                        /* For Vista and up we need to change the integrity of the security descriptor, too. */
-                        if (gMajorVersion >= 6)
+                        HMODULE hModHook = (HMODULE)RTLdrGetNativeHandle(gVBoxDt.hLdrModHook);
+                        Assert((uintptr_t)hModHook != ~(uintptr_t)0);
+                        fRc = gVBoxDt.pfnVBoxHookInstallActiveDesktopTracker(hModHook);
+                        if (!fRc)
                         {
-                            bRc = gVBoxDt.pfnVBoxHookInstallActiveDesktopTracker(gVBoxDt.hHookModule);
-                            if (!bRc)
-                            {
-                                DWORD dwErr = GetLastError();
-                                WARN(("VBoxTray: pfnVBoxHookInstallActiveDesktopTracker failed, last error = %08X\n", dwErr));
-                            }
-                        }
-
-                        if (!bRc)
-                        {
-                            gVBoxDt.idTimer = SetTimer(ghwndToolWindow, TIMERID_VBOXTRAY_DT_TIMER, 500, (TIMERPROC)NULL);
-                            if (!gVBoxDt.idTimer)
-                            {
-                                DWORD dwErr = GetLastError();
-                                WARN(("VBoxTray: SetTimer error %08X\n", dwErr));
-                                rc = RTErrConvertFromWin32(dwErr);
-                            }
-                        }
-
-                        if (RT_SUCCESS(rc))
-                        {
-                            gVBoxDt.fIsInputDesktop = vboxDtCalculateIsInputDesktop();
-                            return VINF_SUCCESS;
+                            DWORD dwErr = GetLastError();
+                            WARN(("VBoxTray: pfnVBoxHookInstallActiveDesktopTracker failed, last error = %08X\n", dwErr));
                         }
                     }
-                    FreeLibrary(gVBoxDt.hUSER32);
+
+                    if (!fRc)
+                    {
+                        gVBoxDt.idTimer = SetTimer(ghwndToolWindow, TIMERID_VBOXTRAY_DT_TIMER, 500, (TIMERPROC)NULL);
+                        if (!gVBoxDt.idTimer)
+                        {
+                            DWORD dwErr = GetLastError();
+                            WARN(("VBoxTray: SetTimer error %08X\n", dwErr));
+                            rc = RTErrConvertFromWin32(dwErr);
+                        }
+                    }
+
+                    if (RT_SUCCESS(rc))
+                    {
+                        gVBoxDt.fIsInputDesktop = vboxDtCalculateIsInputDesktop();
+                        return VINF_SUCCESS;
+                    }
                 }
             }
 
-            FreeLibrary(gVBoxDt.hHookModule);
+            RTLdrClose(gVBoxDt.hLdrModHook);
         }
         else
@@ -1391 +1367 @@
 
 
-    memset(&gVBoxDt, 0, sizeof (gVBoxDt));
+    RT_ZERO(gVBoxDt);
     gVBoxDt.fIsInputDesktop = TRUE;
 
@@ -1399 +1375 @@
 static void vboxDtTerm()
 {
-    if (!gVBoxDt.hHookModule)
+    if (!gVBoxDt.hLdrModHook)
         return;
 
     gVBoxDt.pfnVBoxHookRemoveActiveDesktopTracker();
 
-    FreeLibrary(gVBoxDt.hUSER32);
-    FreeLibrary(gVBoxDt.hHookModule);
+    RTLdrClose(gVBoxDt.hLdrModHook);
     CloseHandle(gVBoxDt.hNotifyEvent);
 
-    memset(&gVBoxDt, 0, sizeof (gVBoxDt));
+    RT_ZERO(gVBoxDt);
 }
 /* @returns true on "IsInputDesktop" state change */

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxVRDP.cpp

@@ -25 +25 @@
 #include <VBoxGuestInternal.h>
 #include <iprt/assert.h>
+#include <iprt/ldr.h>
 
 
@@ -256 +257 @@
     BOOL fSavedThemeEnabled;
 
-    HMODULE hModule;
+    RTLDRMOD hModUxTheme;
 
     HRESULT (* pfnEnableTheming)(BOOL fEnable);
@@ -274 +275 @@
     gCtx.fSavedThemeEnabled = FALSE;
 
-    gCtx.hModule = LoadLibrary("UxTheme");
-
-    if (gCtx.hModule)
-    {
-        *(uintptr_t *)&gCtx.pfnEnableTheming = (uintptr_t)GetProcAddress(gCtx.hModule, "EnableTheming");
-        *(uintptr_t *)&gCtx.pfnIsThemeActive = (uintptr_t)GetProcAddress(gCtx.hModule, "IsThemeActive");
+    int rc = RTLdrLoadSystem("UxTheme.dll", false /*fNoUnload*/, &gCtx.hModUxTheme);
+    if (RT_SUCCESS(rc))
+    {
+        *(PFNRT *)&gCtx.pfnEnableTheming = RTLdrGetFunction(gCtx.hModUxTheme, "EnableTheming");
+        *(PFNRT *)&gCtx.pfnIsThemeActive = RTLdrGetFunction(gCtx.hModUxTheme, "IsThemeActive");
     }
     else
     {
-        gCtx.pfnEnableTheming = 0;
+        gCtx.hModUxTheme = NIL_RTLDRMOD;
+        gCtx.pfnEnableTheming = NULL;
+        gCtx.pfnIsThemeActive = NULL;
     }
 
@@ -297 +299 @@
     VBOXVRDPCONTEXT *pCtx = (VBOXVRDPCONTEXT *)pInstance;
     vboxExperienceRestore (pCtx->level);
-    if (gCtx.hModule)
-        FreeLibrary(gCtx.hModule);
-    gCtx.hModule = 0;
+    if (gCtx.hModUxTheme != NIL_RTLDRMOD)
+    {
+        RTLdrClose(gCtx.hModUxTheme);
+        gCtx.hModUxTheme = NIL_RTLDRMOD;
+    }
     return;
 }