Alexandre Julliard : user32: Get the graphics driver name from the desktop window registry entry.
Alexandre Julliard
julliard at winehq.org
Tue Oct 29 15:12:25 CDT 2013
Module: wine
Branch: master
Commit: 010769249c667317cd7b93388bb89fa7c34bad80
URL: http://source.winehq.org/git/wine.git/?a=commit;h=010769249c667317cd7b93388bb89fa7c34bad80
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Oct 29 12:12:21 2013 +0100
user32: Get the graphics driver name from the desktop window registry entry.
---
dlls/user32/driver.c | 66 ++++++++++++++++++++++++++++++++--------------
dlls/user32/misc.c | 3 --
dlls/user32/sysparams.c | 6 ----
3 files changed, 46 insertions(+), 29 deletions(-)
diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
index 192eebe..fdcf853 100644
--- a/dlls/user32/driver.c
+++ b/dlls/user32/driver.c
@@ -26,20 +26,61 @@
#include "winuser.h"
#include "wine/debug.h"
#include "wine/gdi_driver.h"
+#include "wine/unicode.h"
#include "user_private.h"
#include "controls.h"
+WINE_DEFAULT_DEBUG_CHANNEL(user);
+
static USER_DRIVER null_driver, lazy_load_driver;
const USER_DRIVER *USER_Driver = &lazy_load_driver;
-static DWORD driver_load_error;
+static char driver_load_error[80];
+
+static HMODULE load_desktop_driver( HWND hwnd )
+{
+ static const WCHAR display_device_guid_propW[] = {
+ '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_',
+ 'd','e','v','i','c','e','_','g','u','i','d',0 };
+ static const WCHAR key_pathW[] = {
+ 'S','y','s','t','e','m','\\',
+ 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',
+ 'C','o','n','t','r','o','l','\\',
+ 'V','i','d','e','o','\\','{',0};
+ static const WCHAR displayW[] = {'}','\\','0','0','0','0',0};
+ static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0};
+ HMODULE ret = 0;
+ HKEY hkey;
+ DWORD size;
+ WCHAR path[MAX_PATH];
+ WCHAR key[(sizeof(key_pathW) + sizeof(displayW)) / sizeof(WCHAR) + 40];
+ UINT guid_atom = HandleToULong( GetPropW( hwnd, display_device_guid_propW ));
+
+ strcpy( driver_load_error, "The explorer process failed to start." ); /* default error */
+
+ memcpy( key, key_pathW, sizeof(key_pathW) );
+ if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0;
+ strcatW( key, displayW );
+ if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0;
+ size = sizeof(path);
+ if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size ))
+ {
+ if (!(ret = LoadLibraryW( path ))) ERR( "failed to load %s\n", debugstr_w(path) );
+ TRACE( "%s %p\n", debugstr_w(path), ret );
+ }
+ else
+ {
+ size = sizeof(driver_load_error);
+ RegQueryValueExA( hkey, "DriverError", NULL, NULL, (BYTE *)driver_load_error, &size );
+ }
+ RegCloseKey( hkey );
+ return ret;
+}
/* load the graphics driver */
static const USER_DRIVER *load_driver(void)
{
- static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0};
- HDC hdc;
void *ptr;
HMODULE graphics_driver;
USER_DRIVER *driver, *prev;
@@ -47,9 +88,7 @@ static const USER_DRIVER *load_driver(void)
driver = HeapAlloc( GetProcessHeap(), 0, sizeof(*driver) );
*driver = null_driver;
- hdc = CreateDCW( displayW, NULL, NULL, NULL );
-
- graphics_driver = __wine_get_driver_module( hdc );
+ graphics_driver = load_desktop_driver( GetDesktopWindow() );
if (graphics_driver)
{
#define GET_USER_FUNC(name) \
@@ -109,7 +148,6 @@ static const USER_DRIVER *load_driver(void)
GET_USER_FUNC(SystemParametersInfo);
#undef GET_USER_FUNC
}
- else driver_load_error = GetLastError();
prev = InterlockedCompareExchangePointer( (void **)&USER_Driver, driver, &lazy_load_driver );
if (prev != &lazy_load_driver)
@@ -122,7 +160,6 @@ static const USER_DRIVER *load_driver(void)
register_builtin_classes();
- DeleteDC( hdc );
return driver;
}
@@ -304,18 +341,7 @@ static BOOL CDECL nulldrv_CreateWindow( HWND hwnd )
if (warned++) return FALSE;
MESSAGE( "Application tried to create a window, but no driver could be loaded.\n");
- switch (driver_load_error)
- {
- case ERROR_MOD_NOT_FOUND:
- MESSAGE( "The graphics driver is missing. Check your build!\n" );
- break;
- case ERROR_DLL_INIT_FAILED:
- MESSAGE( "Make sure that your X server is running and that $DISPLAY is set correctly.\n" );
- break;
- default:
- MESSAGE( "Unknown error (%d).\n", driver_load_error );
- }
-
+ if (driver_load_error[0]) MESSAGE( "%s\n", driver_load_error );
return FALSE;
}
diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c
index 9177f56..ad3c788 100644
--- a/dlls/user32/misc.c
+++ b/dlls/user32/misc.c
@@ -441,9 +441,6 @@ BOOL WINAPI GetMonitorInfoW(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo)
*/
BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp )
{
- /* make sure the desktop window exists */
- GetDesktopWindow();
-
return USER_Driver->pEnumDisplayMonitors( hdc, rect, proc, lp );
}
diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
index bdfed38..4b510f2 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -2792,9 +2792,6 @@ LONG WINAPI ChangeDisplaySettingsExA( LPCSTR devname, LPDEVMODEA devmode, HWND h
LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd,
DWORD flags, LPVOID lparam )
{
- /* make sure the desktop window is created before mode changing */
- GetDesktopWindow();
-
return USER_Driver->pChangeDisplaySettingsEx( devname, devmode, hwnd, flags, lparam );
}
@@ -2866,9 +2863,6 @@ BOOL WINAPI EnumDisplaySettingsExA(LPCSTR lpszDeviceName, DWORD iModeNum,
BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum,
LPDEVMODEW lpDevMode, DWORD dwFlags)
{
- /* make sure the desktop window is created before mode enumeration */
- GetDesktopWindow();
-
return USER_Driver->pEnumDisplaySettingsEx(lpszDeviceName, iModeNum, lpDevMode, dwFlags);
}
More information about the wine-cvs
mailing list