From 8ab673bb2f1fbe3df702f00f4e5dd7697edd07ed Mon Sep 17 00:00:00 2001
From: APL <>
Date: Thu, 28 Apr 2011 15:11:03 +0000
Subject: [PATCH] OCC22150 Problem with GetWindowLong function on 64-bit
 platform

---
 src/OpenGl/OpenGl_txgl.cxx     | 51 +++++-----------------------------
 src/Visual3d/Visual3d_View.cxx |  6 +---
 2 files changed, 8 insertions(+), 49 deletions(-)

diff --git a/src/OpenGl/OpenGl_txgl.cxx b/src/OpenGl/OpenGl_txgl.cxx
index 01b3040637..14ff531c7f 100755
--- a/src/OpenGl/OpenGl_txgl.cxx
+++ b/src/OpenGl/OpenGl_txgl.cxx
@@ -83,7 +83,6 @@ Old code resulted in crashes on some ATI Radeon cards under Linux.
 #include <stdio.h>
 
 #include <OpenGl_Memory.hxx>
-#include <OpenGl_ResourceCleaner.hxx>
 
 
 #ifdef WNT
@@ -313,8 +312,6 @@ __declspec( dllexport ) int __fastcall __OpenGl_INIT__ (
 
     if( !ctx) return TFailure;
 
-    OpenGl_ResourceCleaner::GetInstance()->AppendContext( ctx, true );
-
     cmap = XCreateColormap( disp,  par, vis->visual, AllocNone );
 
     color.red = (unsigned short) (bgcolr * 0xFFFF);
@@ -420,11 +417,7 @@ __declspec( dllexport ) int __fastcall __OpenGl_INIT__ (
 
     if ( pfd.dwFlags & PFD_NEED_PALETTE ) 
     {
-#ifndef _WIN64
-      WINDOW_DATA* wd = ( WINDOW_DATA* )GetWindowLong ( par, GWL_USERDATA );
-#else
-      WINDOW_DATA* wd = ( WINDOW_DATA* )GetWindowLong ( par, GWLP_USERDATA );
-#endif
+      WINDOW_DATA* wd = ( WINDOW_DATA* )GetWindowLongPtr ( par, GWLP_USERDATA );
 
       InterfaceGraphic_RealizePalette (hte -> hDC, wd -> hPal, FALSE,
         s_sysPalInUse = pfd.dwFlags & PFD_NEED_SYSTEM_PALETTE ? TRUE : FALSE); 
@@ -458,29 +451,12 @@ __declspec( dllexport ) int __fastcall __OpenGl_INIT__ (
       return 0;     
     }  
 
-    Standard_Boolean isShared = Standard_True;
-
-    if (previous_ctx == 0 )
-      previous_ctx = hte -> hGLRC;
-    // if we already have some shared context
-    else
+    if (previous_ctx == 0 )    
     {
-      // try to share context with one from resource cleaner list
-      GLCONTEXT shareCtx = OpenGl_ResourceCleaner::GetInstance()->GetSharedContext();
-      
-      if (shareCtx != 0)
-        isShared = (Standard_Boolean)wglShareLists(shareCtx, hte -> hGLRC);
-      else
-      {
-        isShared = (Standard_Boolean)wglShareLists(previous_ctx, hte -> hGLRC);
-	      // add shared previous_ctx to a control list if it's not there
-        if (isShared)
-          OpenGl_ResourceCleaner::GetInstance()->AppendContext(previous_ctx, isShared);
-      }
-    }
+      previous_ctx = hte -> hGLRC;
+    } else
+      wglShareLists(previous_ctx, hte -> hGLRC);
 
-    // add the context to OpenGl_ResourceCleaner control list
-    OpenGl_ResourceCleaner::GetInstance()->AppendContext( hte -> hGLRC, isShared);
     _Txgl_Map.Bind( (Tint)par, hte );
 
     return par;
@@ -614,11 +590,7 @@ __declspec( dllexport ) int __fastcall __OpenGl_INIT__ (
 
     if ( pfd.dwFlags & PFD_NEED_PALETTE ) 
     {
-#ifndef _WIN64
-      WINDOW_DATA* wd = ( WINDOW_DATA* )GetWindowLong ( par, GWL_USERDATA );
-#else
-      WINDOW_DATA* wd = ( WINDOW_DATA* )GetWindowLong ( par, GWLP_USERDATA );
-#endif
+      WINDOW_DATA* wd = ( WINDOW_DATA* )GetWindowLongPtr ( par, GWLP_USERDATA );
 
       InterfaceGraphic_RealizePalette (hte -> hDC, wd -> hPal, FALSE,
         s_sysPalInUse = pfd.dwFlags & PFD_NEED_SYSTEM_PALETTE ? TRUE : FALSE); 
@@ -791,7 +763,6 @@ __declspec( dllexport ) int __fastcall __OpenGl_INIT__ (
     /* FSXXX sync necessary if non-direct rendering */
     glXWaitGL();
 
-    OpenGl_ResourceCleaner::GetInstance()->RemoveContext( ctx );
     _Txgl_Map.UnBind( win );
 
     if (previous_ctx == ctx) {
@@ -832,11 +803,7 @@ __declspec( dllexport ) int __fastcall __OpenGl_INIT__ (
     /*  palette messages in the main application message loop. */
     /*  In debug version we don't have message loop for most   */
     /*  cases. So, let's restore system colors here now.       */
-#ifndef _WIN64
-    wd = ( WINDOW_DATA* )GetWindowLong ( win, GWL_USERDATA );
-#else
-    wd = ( WINDOW_DATA* )GetWindowLong ( win, GWLP_USERDATA );
-#endif
+    wd = ( WINDOW_DATA* )GetWindowLongPtr ( win, GWLP_USERDATA );
 
     if ( wd != NULL ) InterfaceGraphic_RealizePalette (
       hte -> hDC, wd -> hPal, TRUE, s_sysPalInUse);
@@ -844,16 +811,12 @@ __declspec( dllexport ) int __fastcall __OpenGl_INIT__ (
 
     if ( --hte -> nUsed == 0 ) 
     { 
-      OpenGl_ResourceCleaner::GetInstance()->RemoveContext( hte -> hGLRC );
 #ifdef OCC954    
       if ( wglGetCurrentContext() != NULL )
 #endif
         wglDeleteContext ( hte -> hGLRC );
       ReleaseDC ( win, hte -> hDC );
       _Txgl_Map.UnBind( (Tint ) win );
-      if( _Txgl_Map.Size() == 0 ) {
-        previous_ctx = 0;
-      }
       delete hte;
     }  
 
diff --git a/src/Visual3d/Visual3d_View.cxx b/src/Visual3d/Visual3d_View.cxx
index 262eb9002a..a7c61cc533 100755
--- a/src/Visual3d/Visual3d_View.cxx
+++ b/src/Visual3d/Visual3d_View.cxx
@@ -479,11 +479,7 @@ const Handle(WNT_Window) theWindow = *(Handle(WNT_Window) *) &AWindow;
 #ifdef RIC120302
         MyCView.DefWindow.XParentWindow = ( HWND )(theWindow->HParentWindow());
 #endif
-#ifndef _WIN64
-        wd = ( WNT_WindowData* )GetWindowLong (( HWND )(theWindow->HWindow()), GWL_USERDATA);
-#else
-        wd = ( WNT_WindowData* )GetWindowLong (( HWND )(theWindow->HWindow()), GWLP_USERDATA);
-#endif
+        wd = ( WNT_WindowData* )GetWindowLongPtr (( HWND )(theWindow->HWindow()), GWLP_USERDATA);
         wd -> WNT_WDriver_Ptr = ( void* )this;
         wd -> WNT_VMgr        = ( void* )MyPtrViewManager;
 #endif  /* WNT */