Don't load the WINEPS driver until it's needed.

dlls/gdi/gdi_main.c

@@ -24,9 +24,6 @@ BOOL WINAPI MAIN_GdiInit(HINSTANCE hinstDLL, DWORD reason, LPVOID lpvReserved)
     /* Create the Win16 printer driver */
     if (!WIN16DRV_Init()) return FALSE;
 
-    /* PSDRV initialization */
-    if (!LoadLibraryA( "wineps" )) return FALSE;
-
     return TRUE;
 }
 

graphics/driver.c

@@ -54,15 +54,23 @@ BOOL DRIVER_RegisterDriver( LPCSTR name, const DC_FUNCTIONS *funcs )
  */
 const DC_FUNCTIONS *DRIVER_FindDriver( LPCSTR name )
 {
-    GRAPHICS_DRIVER *driver = firstDriver;
+    GRAPHICS_DRIVER *driver;
+    HINSTANCE hDriver;
 
     TRACE(": %s\n", name);
-    while (driver && name)
-    {
+
+    if (!name) return genericDriver ? genericDriver->funcs : NULL;
+
+    for (driver = firstDriver; driver; driver = driver->next)
         if (!strcasecmp( driver->name, name )) return driver->funcs;
-        driver = driver->next;
-    }
-    return genericDriver ? genericDriver->funcs : NULL;
+
+    if (!(hDriver = LoadLibraryA (name))) return NULL;
+
+    for (driver = firstDriver; driver; driver = driver->next)
+        if (!strcasecmp( driver->name, name )) return driver->funcs;
+
+    FreeLibrary (hDriver);
+    return NULL;
 }