ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow specifying multiple graphics drivers and use the first one that 

loads successfully.
This commit is contained in:
Alexandre Julliard 2004-07-13 03:53:55 +00:00
parent 642584c560
commit 503ffff9a5
2 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/gdi/driver.c
View File

@ -209,8 +209,8 @@ static struct graphics_driver *create_driver( HMODULE module )
*/ */
static struct graphics_driver *load_display_driver(void) static struct graphics_driver *load_display_driver(void)
{ {
char buffer[MAX_PATH]; char buffer[MAX_PATH], *name, *next;
HMODULE module; HMODULE module = 0;
HKEY hkey; HKEY hkey;
if (display_driver) /* already loaded */ if (display_driver) /* already loaded */
@ -219,7 +219,7 @@ static struct graphics_driver *load_display_driver(void)
return display_driver; return display_driver;
} }
strcpy( buffer, "x11drv" ); /* default value */ strcpy( buffer, "x11drv,ttydrv" ); /* default value */
if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\Wine", &hkey )) if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\Wine", &hkey ))
{ {
DWORD type, count = sizeof(buffer); DWORD type, count = sizeof(buffer);
@ -227,17 +227,28 @@ static struct graphics_driver *load_display_driver(void)
RegCloseKey( hkey ); RegCloseKey( hkey );
} }
if (!(module = LoadLibraryA( buffer ))) name = buffer;
while (name)
{ {
MESSAGE( "Could not load graphics driver '%s'\n", buffer ); next = strchr( name, ',' );
return NULL; if (next) *next++ = 0;
if ((module = LoadLibraryA( name )) != 0) break;
name = next;
}
if (!module)
{
MESSAGE( "wine: Could not load graphics driver '%s'.\n", buffer );
if (!strcasecmp( buffer, "x11drv" ))
MESSAGE( "Make sure that your X server is running and that $DISPLAY is set correctly.\n" );
ExitProcess(1);
} }
if (!(display_driver = create_driver( module ))) if (!(display_driver = create_driver( module )))
{ {
MESSAGE( "Could not create graphics driver '%s'\n", buffer ); MESSAGE( "Could not create graphics driver '%s'\n", buffer );
FreeLibrary( module ); FreeLibrary( module );
return NULL; ExitProcess(1);
} }
display_driver->count++; /* we don't want to free it */ display_driver->count++; /* we don't want to free it */

24
dlls/user/user_main.c
View File

@ -55,22 +55,32 @@ extern void WDML_NotifyThreadDetach(void);
/* load the graphics driver */ /* load the graphics driver */
static BOOL load_driver(void) static BOOL load_driver(void)
{ {
char buffer[MAX_PATH]; char buffer[MAX_PATH], *name, *next;
HKEY hkey; HKEY hkey;
DWORD type, count;
strcpy( buffer, "x11drv" ); /* default value */ strcpy( buffer, "x11drv,ttydrv" ); /* default value */
if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\Wine", &hkey )) if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\Wine", &hkey ))
{ {
count = sizeof(buffer); DWORD type, count = sizeof(buffer);
RegQueryValueExA( hkey, "GraphicsDriver", 0, &type, buffer, &count ); RegQueryValueExA( hkey, "GraphicsDriver", 0, &type, buffer, &count );
RegCloseKey( hkey ); RegCloseKey( hkey );
} }
if (!(graphics_driver = LoadLibraryA( buffer ))) name = buffer;
while (name)
{ {
MESSAGE( "Could not load graphics driver '%s'\n", buffer ); next = strchr( name, ',' );
return FALSE; if (next) *next++ = 0;
if ((graphics_driver = LoadLibraryA( name )) != 0) break;
name = next;
}
if (!graphics_driver)
{
MESSAGE( "wine: Could not load graphics driver '%s'.\n", buffer );
if (!strcasecmp( buffer, "x11drv" ))
MESSAGE( "Make sure that your X server is running and that $DISPLAY is set correctly.\n" );
ExitProcess(1);
} }
GET_USER_FUNC(InitKeyboard); GET_USER_FUNC(InitKeyboard);