Mesa (mesa_7_7_branch): gdi: Never fail at DLL load time.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Thu Feb 11 16:38:38 UTC 2010


Module: Mesa
Branch: mesa_7_7_branch
Commit: 94028edfc51b44ebaab274a61b938fdcfcf3b96c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=94028edfc51b44ebaab274a61b938fdcfcf3b96c

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Feb 11 16:34:43 2010 +0000

gdi: Never fail at DLL load time.

Windows doesn't really expect things to fail at this point -- it
will try many times until it finally gives up, worse, something bad
happens.

The WGL state tracker will gracefully decline to do work even when it
is loaded.

---

 src/gallium/winsys/gdi/gdi_llvmpipe_winsys.c |   10 +++++-----
 src/gallium/winsys/gdi/gdi_softpipe_winsys.c |   10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/gallium/winsys/gdi/gdi_llvmpipe_winsys.c b/src/gallium/winsys/gdi/gdi_llvmpipe_winsys.c
index e8bc0f5..36a8a9e 100644
--- a/src/gallium/winsys/gdi/gdi_llvmpipe_winsys.c
+++ b/src/gallium/winsys/gdi/gdi_llvmpipe_winsys.c
@@ -267,13 +267,13 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
 {
    switch (fdwReason) {
    case DLL_PROCESS_ATTACH:
-      if (!stw_init(&stw_winsys)) {
-         return FALSE;
-      }
-      return stw_init_thread();
+      stw_init(&stw_winsys);
+      stw_init_thread();
+      break;
 
    case DLL_THREAD_ATTACH:
-      return stw_init_thread();
+      stw_init_thread();
+      break;
 
    case DLL_THREAD_DETACH:
       stw_cleanup_thread();
diff --git a/src/gallium/winsys/gdi/gdi_softpipe_winsys.c b/src/gallium/winsys/gdi/gdi_softpipe_winsys.c
index 5e0ccf3..5838a5e 100644
--- a/src/gallium/winsys/gdi/gdi_softpipe_winsys.c
+++ b/src/gallium/winsys/gdi/gdi_softpipe_winsys.c
@@ -317,13 +317,13 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
 {
    switch (fdwReason) {
    case DLL_PROCESS_ATTACH:
-      if (!stw_init(&stw_winsys)) {
-         return FALSE;
-      }
-      return stw_init_thread();
+      stw_init(&stw_winsys);
+      stw_init_thread();
+      break;
 
    case DLL_THREAD_ATTACH:
-      return stw_init_thread();
+      stw_init_thread();
+      break;
 
    case DLL_THREAD_DETACH:
       stw_cleanup_thread();




More information about the mesa-commit mailing list