Roderick Colenbrander : wined3d: Don't use ENTER_GL/ LEAVE_GL on systems without winex11.drv.

[Alexandre Julliard]

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

Author: Roderick Colenbrander 
Date:   Tue Aug 14 12:03:29 2007 +0200

wined3d: Don't use ENTER_GL/LEAVE_GL on systems without winex11.drv.

---

dlls/wined3d/wined3d_main.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index 5ec14be..13ab258 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -94,6 +94,10 @@ static inline DWORD get_config_key(HKEY defkey, HKEY appkey, const char* name, c
     return ERROR_FILE_NOT_FOUND;
 }

+static void wined3d_do_nothing(void)
+{
+}
+
 /* At process attach */
 BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
 {
@@ -138,6 +142,11 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
            wine_tsx11_lock_ptr   = (void *)GetProcAddress( mod, "wine_tsx11_lock" );
            wine_tsx11_unlock_ptr = (void *)GetProcAddress( mod, "wine_tsx11_unlock" );
        }
+       else /* We are most likely on Windows */
+       {
+           wine_tsx11_lock_ptr   = wined3d_do_nothing;
+           wine_tsx11_unlock_ptr = wined3d_do_nothing;
+       }
        /* @@ Wine registry key: HKCU\Software\Wine\Direct3D */
        if ( RegOpenKeyA( HKEY_CURRENT_USER, "Software\Wine\Direct3D", &hkey ) ) hkey = 0;