Alexandre Julliard : user32: Get rid of the CreateCursorIcon driver entry point.

Alexandre Julliard julliard at winehq.org
Tue Oct 22 13:30:40 CDT 2013


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Oct 21 22:08:21 2013 +0200

user32: Get rid of the CreateCursorIcon driver entry point.

---

 dlls/user32/cursoricon.c   |    3 ---
 dlls/user32/driver.c       |   12 ------------
 dlls/user32/user_private.h |    1 -
 3 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c
index 93aa0c6..53089c2 100644
--- a/dlls/user32/cursoricon.c
+++ b/dlls/user32/cursoricon.c
@@ -972,7 +972,6 @@ done:
             list_add_head( &icon_cache, &info->entry );
         }
         release_icon_ptr( hObj, info );
-        USER_Driver->pCreateCursorIcon( hObj );
     }
     else
     {
@@ -1609,7 +1608,6 @@ HICON WINAPI CopyIcon( HICON hIcon )
         release_icon_ptr( hNew, ptrNew );
     }
     release_icon_ptr( hIcon, ptrOld );
-    if (hNew) USER_Driver->pCreateCursorIcon( hNew );
     return hNew;
 }
 
@@ -2212,7 +2210,6 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo)
         }
 
         release_icon_ptr( hObj, info );
-        USER_Driver->pCreateCursorIcon( hObj );
     }
     return hObj;
 }
diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
index 6a6241c..4cfc552 100644
--- a/dlls/user32/driver.c
+++ b/dlls/user32/driver.c
@@ -67,7 +67,6 @@ static const USER_DRIVER *load_driver(void)
         GET_USER_FUNC(UnloadKeyboardLayout);
         GET_USER_FUNC(UnregisterHotKey);
         GET_USER_FUNC(VkKeyScanEx);
-        GET_USER_FUNC(CreateCursorIcon);
         GET_USER_FUNC(DestroyCursorIcon);
         GET_USER_FUNC(SetCursor);
         GET_USER_FUNC(GetCursorPos);
@@ -205,10 +204,6 @@ static SHORT CDECL nulldrv_VkKeyScanEx( WCHAR ch, HKL layout )
     return -1;
 }
 
-static void CDECL nulldrv_CreateCursorIcon( HCURSOR cursor )
-{
-}
-
 static void CDECL nulldrv_DestroyCursorIcon( HCURSOR cursor )
 {
 }
@@ -439,7 +434,6 @@ static USER_DRIVER null_driver =
     nulldrv_UnregisterHotKey,
     nulldrv_VkKeyScanEx,
     /* cursor/icon functions */
-    nulldrv_CreateCursorIcon,
     nulldrv_DestroyCursorIcon,
     nulldrv_SetCursor,
     nulldrv_GetCursorPos,
@@ -559,11 +553,6 @@ static SHORT CDECL loaderdrv_VkKeyScanEx( WCHAR ch, HKL layout )
     return load_driver()->pVkKeyScanEx( ch, layout );
 }
 
-static void CDECL loaderdrv_CreateCursorIcon( HCURSOR cursor )
-{
-    load_driver()->pCreateCursorIcon( cursor );
-}
-
 static void CDECL loaderdrv_DestroyCursorIcon( HCURSOR cursor )
 {
     load_driver()->pDestroyCursorIcon( cursor );
@@ -787,7 +776,6 @@ static USER_DRIVER lazy_load_driver =
     loaderdrv_UnregisterHotKey,
     loaderdrv_VkKeyScanEx,
     /* cursor/icon functions */
-    loaderdrv_CreateCursorIcon,
     loaderdrv_DestroyCursorIcon,
     loaderdrv_SetCursor,
     loaderdrv_GetCursorPos,
diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h
index 0f86bdf..9daa9f4 100644
--- a/dlls/user32/user_private.h
+++ b/dlls/user32/user_private.h
@@ -73,7 +73,6 @@ typedef struct tagUSER_DRIVER {
     void   (CDECL *pUnregisterHotKey)(HWND, UINT, UINT);
     SHORT  (CDECL *pVkKeyScanEx)(WCHAR, HKL);
     /* cursor/icon functions */
-    void   (CDECL *pCreateCursorIcon)(HCURSOR);
     void   (CDECL *pDestroyCursorIcon)(HCURSOR);
     void   (CDECL *pSetCursor)(HCURSOR);
     BOOL   (CDECL *pGetCursorPos)(LPPOINT);




More information about the wine-cvs mailing list