Skip to content

W
wine-winehq
Commit 0d7108c6 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

gdi32: Return the correct module handle for the initial display driver load.

parent aeefa821
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
dlls/gdi32/driver.c
View file @ 0d7108c6
...@@ -100,11 +100,7 @@ static const struct gdi_dc_funcs *get_display_driver( HMODULE *module_ret ) ...@@ -100,11 +100,7 @@ static const struct gdi_dc_funcs *get_display_driver( HMODULE *module_ret )
HMODULE module = 0; HMODULE module = 0;
HKEY hkey; HKEY hkey;
if (display_driver) if (display_driver) goto done;
{
*module_ret = display_driver->module;
return display_driver->funcs; /* already loaded */
}
strcpy( buffer, "x11" ); /* default value */ strcpy( buffer, "x11" ); /* default value */
/* @@ Wine registry key: HKCU\Software\Wine\Drivers */ /* @@ Wine registry key: HKCU\Software\Wine\Drivers */
...@@ -140,6 +136,8 @@ static const struct gdi_dc_funcs *get_display_driver( HMODULE *module_ret ) ...@@ -140,6 +136,8 @@ static const struct gdi_dc_funcs *get_display_driver( HMODULE *module_ret )
FreeLibrary( driver->module ); FreeLibrary( driver->module );
HeapFree( GetProcessHeap(), 0, driver ); HeapFree( GetProcessHeap(), 0, driver );
} }
done:
*module_ret = display_driver->module;
return display_driver->funcs; return display_driver->funcs;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment