Alexandre Julliard : gdi32: Return the correct module handle for the initial display driver load.
Alexandre Julliard
julliard at winehq.org
Wed Feb 6 13:38:12 CST 2013
Module: wine
Branch: master
Commit: 0d7108c6299588c047edb93b69ee9ad43f441a93
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7108c6299588c047edb93b69ee9ad43f441a93
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Feb 6 12:21:33 2013 +0100
gdi32: Return the correct module handle for the initial display driver load.
---
dlls/gdi32/driver.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c
index 82706c3..70208fb 100644
--- a/dlls/gdi32/driver.c
+++ b/dlls/gdi32/driver.c
@@ -100,11 +100,7 @@ static const struct gdi_dc_funcs *get_display_driver( HMODULE *module_ret )
HMODULE module = 0;
HKEY hkey;
- if (display_driver)
- {
- *module_ret = display_driver->module;
- return display_driver->funcs; /* already loaded */
- }
+ if (display_driver) goto done;
strcpy( buffer, "x11" ); /* default value */
/* @@ Wine registry key: HKCU\Software\Wine\Drivers */
@@ -140,6 +136,8 @@ static const struct gdi_dc_funcs *get_display_driver( HMODULE *module_ret )
FreeLibrary( driver->module );
HeapFree( GetProcessHeap(), 0, driver );
}
+done:
+ *module_ret = display_driver->module;
return display_driver->funcs;
}
More information about the wine-cvs
mailing list