Alexandre Julliard : gdi32: Trigger the display driver load for CreateCompatibleDC(0).

Alexandre Julliard julliard at winehq.org
Mon Dec 30 13:06:00 CST 2013


Module: wine
Branch: master
Commit: 200eb1d30b8801ad022c4f5dfd32f0e19c313774
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=200eb1d30b8801ad022c4f5dfd32f0e19c313774

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Dec 30 17:43:29 2013 +0100

gdi32: Trigger the display driver load for CreateCompatibleDC(0).

---

 dlls/gdi32/dc.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c
index ba869f1..9500de2 100644
--- a/dlls/gdi32/dc.c
+++ b/dlls/gdi32/dc.c
@@ -739,7 +739,7 @@ HDC WINAPI CreateCompatibleDC( HDC hdc )
 {
     DC *dc, *origDC;
     HDC ret;
-    const struct gdi_dc_funcs *funcs = &null_driver;
+    const struct gdi_dc_funcs *funcs;
     PHYSDEV physDev = NULL;
 
     GDI_CheckNotLock();
@@ -751,6 +751,7 @@ HDC WINAPI CreateCompatibleDC( HDC hdc )
         funcs = physDev->funcs;
         release_dc_ptr( origDC );
     }
+    else funcs = DRIVER_load_driver( displayW );
 
     if (!(dc = alloc_dc_ptr( OBJ_MEMDC ))) return 0;
 
@@ -765,7 +766,7 @@ HDC WINAPI CreateCompatibleDC( HDC hdc )
 
     ret = dc->hSelf;
 
-    if (!funcs->pCreateCompatibleDC( physDev, &dc->physDev ))
+    if (funcs->pCreateCompatibleDC && !funcs->pCreateCompatibleDC( physDev, &dc->physDev ))
     {
         WARN("creation aborted by device\n");
         free_dc_ptr( dc );




More information about the wine-cvs mailing list