commit 42d20f9dca567097d1044f5d30f23df3cdcee9f2
author Alexandre Julliard <julliard@winehq.org> Thu Aug 10 01:16:19 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Aug 10 01:16:19 2000 +0000
tree f1cae80cf812316351d54914a8c8e705f1023474
parent 5ab9d860f2976782ee44a925ba5b658633058de7

Merged clipboard driver into USER driver.
Moved all ttydrv source files to dlls/ttydrv.
Load functions pointer for the USER driver from the graphics driver
dll with GetProcAddress.

windows/cursoricon.c

diff --git a/windows/cursoricon.c b/windows/cursoricon.c
index 7b37d4a..437be3a 100644
--- a/windows/cursoricon.c
+++ b/windows/cursoricon.c
@@ -707,7 +707,7 @@
             }
         }
         else resid = LOWORD(name);
-        h = USER_Driver->pLoadOEMResource( resid, fCursor ? OEM_CURSOR : OEM_ICON );
+        h = USER_Driver.pLoadOEMResource( resid, fCursor ? OEM_CURSOR : OEM_ICON );
     }
 
     else  /* Load from resource */
@@ -1392,7 +1392,7 @@
     /* Change the cursor shape only if it is visible */
     if (CURSOR_ShowCount >= 0)
     {
-        USER_Driver->pSetCursor( (CURSORICONINFO*)GlobalLock16( hActiveCursor ) );
+        USER_Driver.pSetCursor( (CURSORICONINFO*)GlobalLock16( hActiveCursor ) );
         GlobalUnlock16( hActiveCursor );
     }
     return hOldCursor;
@@ -1413,7 +1413,7 @@
  */
 BOOL WINAPI SetCursorPos( INT x, INT y )
 {
-    USER_Driver->pMoveCursor( x, y );
+    USER_Driver.pMoveCursor( x, y );
     return TRUE;
 }
 
@@ -1439,14 +1439,14 @@
     {
         if (++CURSOR_ShowCount == 0)  /* Show it */
         {
-            USER_Driver->pSetCursor( (CURSORICONINFO*)GlobalLock16( hActiveCursor ) );
+            USER_Driver.pSetCursor( (CURSORICONINFO*)GlobalLock16( hActiveCursor ) );
             GlobalUnlock16( hActiveCursor );
         }
     }
     else
     {
         if (--CURSOR_ShowCount == -1)  /* Hide it */
-            USER_Driver->pSetCursor( NULL );
+            USER_Driver.pSetCursor( NULL );
     }
     return CURSOR_ShowCount;
 }
@@ -2096,7 +2096,7 @@
       if (!instance)  /* OEM bitmap */
       {
 	  if (HIWORD((int)name)) return 0;
-          return USER_Driver->pLoadOEMResource( LOWORD((int)name), OEM_BITMAP );
+          return USER_Driver.pLoadOEMResource( LOWORD((int)name), OEM_BITMAP );
       }
 
       if (!(hRsrc = FindResourceW( instance, name, RT_BITMAPW ))) return 0;