VirtualBox

Ignore:
Timestamp:
Jun 17, 2013 2:32:51 PM (12 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
86471
Message:

updates

Location:
trunk/src/VBox/Additions/WINNT/Graphics
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r44529 r46593  
    18001800            vboxVDbgVEHandlerRegister();
    18011801#endif
    1802             int rc = RTR3InitDll(0);
     1802            int rc = RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
    18031803            AssertRC(rc);
    18041804            if (RT_SUCCESS(rc))

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

    r44529 r46593  
    2828}
    2929
     30/**
     31 * Loads a system DLL.
     32 *
     33 * @returns Module handle or NULL
     34 * @param   pszName             The DLL name.
     35 */
     36static HMODULE loadSystemDll(const char *pszName)
     37{
     38    char   szPath[MAX_PATH];
     39    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
     40    size_t cbName  = strlen(pszName) + 1;
     41    if (cchPath + 1 + cbName > sizeof(szPath))
     42    {
     43        SetLastError(ERROR_FILENAME_EXCED_RANGE);
     44        return NULL;
     45    }
     46    szPath[cchPath] = '\\';
     47    memcpy(&szPath[cchPath + 1], pszName, cbName);
     48    return LoadLibraryA(szPath);
     49}
    3050
    3151HRESULT VBoxDispD3DOpen(VBOXDISPD3D *pD3D)
    3252{
    3353#ifdef VBOX_WDDM_WOW64
    34     pD3D->hD3DLib = LoadLibraryW(L"VBoxD3D9wddm-x86.dll");
     54    pD3D->hD3DLib = loadSystemDll("VBoxD3D9wddm-x86.dll");
    3555#else
    36     pD3D->hD3DLib = LoadLibraryW(L"VBoxD3D9wddm.dll");
     56    pD3D->hD3DLib = loadSystemDll("VBoxD3D9wddm.dll");
    3757#endif
    3858    if (!pD3D->hD3DLib)
    3959    {
    4060        DWORD winErr = GetLastError();
    41         WARN((__FUNCTION__": LoadLibraryW failed, winErr = (%d)", winErr));
     61        WARN((__FUNCTION__": LoadLibrary failed, winErr = (%d)", winErr));
    4262        return E_FAIL;
    4363    }

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

    r46172 r46593  
    2323#endif
    2424
     25/**
     26 * Loads a system DLL.
     27 *
     28 * @returns Module handle or NULL
     29 * @param   pszName             The DLL name.
     30 */
     31static HMODULE loadSystemDll(const char *pszName)
     32{
     33    char   szPath[MAX_PATH];
     34    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
     35    size_t cbName  = strlen(pszName) + 1;
     36    if (cchPath + 1 + cbName > sizeof(szPath))
     37        return NULL;
     38    szPath[cchPath] = '\\';
     39    memcpy(&szPath[cchPath + 1], pszName, cbName);
     40    return LoadLibraryA(szPath);
     41}
     42
    2543HRESULT vboxDispKmtCallbacksInit(PVBOXDISPKMT_CALLBACKS pCallbacks)
    2644{
    … …  
    2947    memset(pCallbacks, 0, sizeof (*pCallbacks));
    3048
    31     pCallbacks->hGdi32 = LoadLibraryW(L"gdi32.dll");
     49    pCallbacks->hGdi32 = loadSystemDll("gdi32.dll");
    3250    if (pCallbacks->hGdi32 != NULL)
    3351    {

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

    r44529 r46593  
    11/* $Id$ */
    2 
    32/** @file
    43 * VBoxVideo Display D3D User mode dll
    … …  
    65
    76/*
    8  * Copyright (C) 2011-2012 Oracle Corporation
     7 * Copyright (C) 2011-2013 Oracle Corporation
    98 *
    109 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    341340}
    342341
     342/**
     343 * Loads a system DLL.
     344 *
     345 * @returns Module handle or NULL
     346 * @param   pszName             The DLL name.
     347 */
     348static HMODULE loadSystemDll(const char *pszName)
     349{
     350    char   szPath[MAX_PATH];
     351    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
     352    size_t cbName  = strlen(pszName) + 1;
     353    if (cchPath + 1 + cbName > sizeof(szPath))
     354        return NULL;
     355    szPath[cchPath] = '\\';
     356    memcpy(&szPath[cchPath + 1], pszName, cbName);
     357    return LoadLibraryA(szPath);
     358}
     359
    343360//HRESULT vboxScreenMonInit(PVBOXSCREENMON pMon)
    344361HRESULT vboxScreenMonInit()
    … …  
    351368    pMon->LoData.ScreenLayout.EscapeHdr.escapeCode = VBOXESC_SCREENLAYOUT;
    352369
    353     pMon->hGdi32 = LoadLibraryW(L"gdi32.dll");
     370    pMon->hGdi32 = loadSystemDll("gdi32.dll");
    354371    if (pMon->hGdi32 != NULL)
    355372    {

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

    r44529 r46593  
    11/* $Id$ */
    2 
    32/** @file
    43 * VBox D3D8/9 dll switcher
    … …  
    65
    76/*
    8  * Copyright (C) 2009-2012 Oracle Corporation
     7 * Copyright (C) 2009-2013 Oracle Corporation
    98 *
    109 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2322static char* gsBlackListDll[] = {"awt.dll", "wpfgfx_v0400.dll", "wpfgfx_v0300.dll", NULL};
    2423
     24/**
     25 * Loads a system DLL.
     26 *
     27 * @returns Module handle or NULL
     28 * @param   pszName             The DLL name.
     29 */
     30static HMODULE loadSystemDll(const char *pszName)
     31{
     32    char   szPath[MAX_PATH];
     33    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
     34    size_t cbName  = strlen(pszName) + 1;
     35    if (cchPath + 1 + cbName > sizeof(szPath))
     36        return NULL;
     37    szPath[cchPath] = '\\';
     38    memcpy(&szPath[cchPath + 1], pszName, cbName);
     39    return LoadLibraryA(szPath);
     40}
     41
    2542/* Checks if 3D is enabled for VM and it works on host machine */
    2643BOOL isVBox3DEnabled(void)
    … …  
    3148
    3249#ifdef VBOX_WDDM_WOW64
    33     hDLL = LoadLibrary("VBoxOGL-x86.dll");
     50    hDLL = loadSystemDll("VBoxOGL-x86.dll");
    3451#else
    35     hDLL = LoadLibrary("VBoxOGL.dll");
     52    hDLL = loadSystemDll("VBoxOGL.dll");
    3653#endif
    3754
    … …  
    6683    int i;
    6784
    68         if (!GetModuleFileName(NULL, name, 1000))
    69                 return TRUE;
     85    if (!GetModuleFileName(NULL, name, 1000))
     86        return TRUE;
    7087
    7188    /*Extract filename*/
    … …  
    108125
    109126    if (isVBox3DEnabled() && checkOptions())
    110     {
    111127        dllName = vboxName;
    112     } else
    113     {
     128    else
    114129        dllName = msName;
    115     }
    116130
    117     hDLL = LoadLibrary(dllName);
     131    hDLL = loadSystemDll(dllName);
    118132    FillD3DExports(hDLL);
    119133}
     134

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

    r42499 r46593  
    53085308}
    53095309
     5310/**
     5311 * Loads a system DLL.
     5312 *
     5313 * @returns Module handle or NULL
     5314 * @param   pszName             The DLL name.
     5315 */
     5316static HMODULE loadSystemDll(const char *pszName)
     5317{
     5318    char   szPath[MAX_PATH];
     5319    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
     5320    size_t cbName  = strlen(pszName) + 1;
     5321    if (cchPath + 1 + cbName > sizeof(szPath))
     5322        return NULL;
     5323    szPath[cchPath] = '\\';
     5324    memcpy(&szPath[cchPath + 1], pszName, cbName);
     5325    return LoadLibraryA(szPath);
     5326}
     5327
    53105328static BOOL InitAdapters(IWineD3DImpl *This)
    53115329{
    … …  
    53235341    if(!mod_gl) {
    53245342#ifdef USE_WIN32_OPENGL
    5325 #define USE_GL_FUNC(pfn) pfn = (void*)GetProcAddress(mod_gl, #pfn);
    5326 #if defined(VBOX_WITH_WDDM) || defined(VBOX_WINE_WITH_SINGLE_SWAPCHAIN_CONTEXT)
     5343# define USE_GL_FUNC(pfn) pfn = (void*)GetProcAddress(mod_gl, #pfn);
     5344# if defined(VBOX_WITH_WDDM) || defined(VBOX_WINE_WITH_SINGLE_SWAPCHAIN_CONTEXT)
    53275345        BOOL (APIENTRY *pDrvValidateVersion)(DWORD) DECLSPEC_HIDDEN;
    5328 #ifdef VBOX_WDDM_WOW64
    5329         mod_gl = LoadLibraryA("VBoxOGL-x86.dll");
    5330 #else
    5331         mod_gl = LoadLibraryA("VBoxOGL.dll");
    5332 #endif
    5333 #else
    5334         mod_gl = LoadLibraryA("opengl32.dll");
    5335 #endif
     5346#  ifdef VBOX_WDDM_WOW64
     5347        mod_gl = loadSystemDll("VBoxOGL-x86.dll");
     5348#  else
     5349        mod_gl = loadSystemDll("VBoxOGL.dll");
     5350#  endif
     5351# else
     5352        mod_gl = loadSystemDll("opengl32.dll");
     5353# endif
    53365354        if(!mod_gl) {
    53375355            ERR("Can't load opengl32.dll!\n");
    53385356            goto nogl_adapter;
    53395357        }
    5340 #if defined(VBOX_WITH_WDDM) || defined(VBOX_WINE_WITH_SINGLE_SWAPCHAIN_CONTEXT)
     5358# if defined(VBOX_WITH_WDDM) || defined(VBOX_WINE_WITH_SINGLE_SWAPCHAIN_CONTEXT)
    53415359        /* init properly */
    53425360        pDrvValidateVersion = (void*)GetProcAddress(mod_gl, "DrvValidateVersion");
    … …  
    53495367            goto nogl_adapter;
    53505368        }
    5351 #endif
     5369# endif
    53525370#else
    5353 #define USE_GL_FUNC(pfn) pfn = (void*)pwglGetProcAddress(#pfn);
     5371# define USE_GL_FUNC(pfn) pfn = (void*)pwglGetProcAddress(#pfn);
    53545372        /* To bypass the opengl32 thunks load wglGetProcAddress from gdi32 (glXGetProcAddress wrapper) instead of opengl32's */
    53555373        mod_gl = GetModuleHandleA("gdi32.dll");

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

    r46521 r46593  
    11/* $Id$ */
    2 
    32/** @file
    43 * VBox D3D8/9 dll switcher
    … …  
    65
    76/*
    8  * Copyright (C) 2009 Oracle Corporation
     7 * Copyright (C) 2009-2013 Oracle Corporation
    98 *
    109 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2322static char* gsBlackListDll[] = {"awt.dll", "wpfgfx_v0400.dll", "wpfgfx_v0300.dll", NULL};
    2423
     24/**
     25 * Loads a system DLL.
     26 *
     27 * @returns Module handle or NULL
     28 * @param   pszName             The DLL name.
     29 */
     30static HMODULE loadSystemDll(const char *pszName)
     31{
     32    char   szPath[MAX_PATH];
     33    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
     34    size_t cbName  = strlen(pszName) + 1;
     35    if (cchPath + 1 + cbName > sizeof(szPath))
     36        return NULL;
     37    szPath[cchPath] = '\\';
     38    memcpy(&szPath[cchPath + 1], pszName, cbName);
     39    return LoadLibraryA(szPath);
     40}
     41
    2542/* Checks if 3D is enabled for VM and it works on host machine */
    2643BOOL isVBox3DEnabled(void)
    … …  
    3148
    3249#ifdef VBOX_WDDM_WOW64
    33     hDLL = LoadLibrary("VBoxOGL-x86.dll");
     50    hDLL = loadSystemDll("VBoxOGL-x86.dll");
    3451#else
    35     hDLL = LoadLibrary("VBoxOGL.dll");
     52    hDLL = loadSystemDll("VBoxOGL.dll");
    3653#endif
    3754
    … …  
    108125
    109126    if (isVBox3DEnabled() && checkOptions())
    110     {
    111127        dllName = vboxName;
    112     } else
    113     {
     128    else
    114129        dllName = msName;
    115     }
    116130
    117     hDLL = LoadLibrary(dllName);
     131    hDLL = loadSystemDll(dllName);
    118132    FillD3DExports(hDLL);
    119133}
     134

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

    r46521 r46593  
    51215121}
    51225122
     5123/**
     5124 * Loads a system DLL.
     5125 *
     5126 * @returns Module handle or NULL
     5127 * @param   pszName             The DLL name.
     5128 */
     5129static HMODULE loadSystemDll(const char *pszName)
     5130{
     5131    char   szPath[MAX_PATH];
     5132    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
     5133    size_t cbName  = strlen(pszName) + 1;
     5134    if (cchPath + 1 + cbName > sizeof(szPath))
     5135        return NULL;
     5136    szPath[cchPath] = '\\';
     5137    memcpy(&szPath[cchPath + 1], pszName, cbName);
     5138    return LoadLibraryA(szPath);
     5139}
     5140
    51235141/* Do not call while under the GL lock. */
    51245142static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal)
    … …  
    51425160#ifdef USE_WIN32_OPENGL
    51435161    {
    5144 #ifndef VBOX
     5162# ifndef VBOX
    51455163        HMODULE mod_gl = GetModuleHandleA("opengl32.dll");
    5146 #else
     5164# else
    51475165        BOOL (APIENTRY *pDrvValidateVersion)(DWORD) DECLSPEC_HIDDEN;
    5148 # ifdef VBOX_WDDM_WOW64
    5149         HMODULE mod_gl = LoadLibraryA("VBoxOGL-x86.dll");
    5150 # else
    5151         HMODULE mod_gl = LoadLibraryA("VBoxOGL.dll");
    5152 # endif
     5166#  ifdef VBOX_WDDM_WOW64
     5167        HMODULE mod_gl = loadSystemDll("VBoxOGL-x86.dll");
     5168#  else
     5169        HMODULE mod_gl = loadSystemDll("VBoxOGL.dll");
     5170#  endif
    51535171        if (!mod_gl)
    51545172        {
    … …  
    51695187        }
    51705188
    5171 # define VBOX_USE_FUNC(f) p##f = (void *)GetProcAddress(mod_gl, #f);
     5189#  define VBOX_USE_FUNC(f) p##f = (void *)GetProcAddress(mod_gl, #f);
    51725190        VBOX_GL_FUNCS_GEN
    5173 # undef VBOX_USE_FUNC
    5174 #endif
    5175 #define USE_GL_FUNC(f) gl_info->gl_ops.gl.p_##f = (void *)GetProcAddress(mod_gl, #f);
     5191#  undef VBOX_USE_FUNC
     5192# endif
     5193# define USE_GL_FUNC(f) gl_info->gl_ops.gl.p_##f = (void *)GetProcAddress(mod_gl, #f);
    51765194        ALL_WGL_FUNCS
    5177 #undef USE_GL_FUNC
     5195# undef USE_GL_FUNC
    51785196        gl_info->gl_ops.wgl.p_wglSwapBuffers = (void *)GetProcAddress(mod_gl, "wglSwapBuffers");
    51795197    }
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette