Alexandre Julliard : user32: Remove the CURSORICONINFO parameter in the CreateCursorIcon driver entry point .
Alexandre Julliard
julliard at winehq.org
Fri May 21 12:15:16 CDT 2010
Module: wine
Branch: master
Commit: 86c4a3694dbe2c362748cb40f7b2fb15d974d42a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c4a3694dbe2c362748cb40f7b2fb15d974d42a
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri May 21 13:30:15 2010 +0200
user32: Remove the CURSORICONINFO parameter in the CreateCursorIcon driver entry point.
---
dlls/user32/cursoricon.c | 6 +++---
dlls/user32/driver.c | 6 +++---
dlls/user32/user_private.h | 4 +---
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c
index 06a93d5..2a0feb1 100644
--- a/dlls/user32/cursoricon.c
+++ b/dlls/user32/cursoricon.c
@@ -1156,7 +1156,7 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi,
GetBitmapBits( hAndBits, sizeAnd, info + 1 );
GetBitmapBits( hXorBits, sizeXor, (char *)(info + 1) + sizeAnd );
release_icon_ptr( hObj, info );
- USER_Driver->pCreateCursorIcon( hObj, &info->data );
+ USER_Driver->pCreateCursorIcon( hObj );
}
else
{
@@ -1776,7 +1776,7 @@ HICON WINAPI CopyIcon( HICON hIcon )
ptrNew->mask = copy_bitmap( ptrOld->mask );
release_icon_ptr( hIcon, ptrOld );
release_icon_ptr( hNew, ptrNew );
- USER_Driver->pCreateCursorIcon( hNew, &ptrNew->data );
+ USER_Driver->pCreateCursorIcon( hNew );
return hNew;
}
@@ -2241,7 +2241,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo)
}
}
release_icon_ptr( hObj, info );
- USER_Driver->pCreateCursorIcon( hObj, &info->data );
+ USER_Driver->pCreateCursorIcon( hObj );
}
return hObj;
}
diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
index dc17264..f2f9892 100644
--- a/dlls/user32/driver.c
+++ b/dlls/user32/driver.c
@@ -217,7 +217,7 @@ static SHORT CDECL nulldrv_VkKeyScanEx( WCHAR ch, HKL layout )
return -1;
}
-static void CDECL nulldrv_CreateCursorIcon( HCURSOR cursor, struct tagCURSORICONINFO *info )
+static void CDECL nulldrv_CreateCursorIcon( HCURSOR cursor )
{
}
@@ -570,9 +570,9 @@ static SHORT CDECL loaderdrv_VkKeyScanEx( WCHAR ch, HKL layout )
return load_driver()->pVkKeyScanEx( ch, layout );
}
-static void CDECL loaderdrv_CreateCursorIcon( HCURSOR cursor, struct tagCURSORICONINFO *info )
+static void CDECL loaderdrv_CreateCursorIcon( HCURSOR cursor )
{
- load_driver()->pCreateCursorIcon( cursor, info );
+ load_driver()->pCreateCursorIcon( cursor );
}
static void CDECL loaderdrv_DestroyCursorIcon( HCURSOR cursor )
diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h
index 43daafd..23b4269 100644
--- a/dlls/user32/user_private.h
+++ b/dlls/user32/user_private.h
@@ -51,8 +51,6 @@ enum wine_internal_message
WM_WINE_LAST_DRIVER_MSG = 0x80001fff
};
-struct tagCURSORICONINFO;
-
typedef struct tagUSER_DRIVER {
/* keyboard functions */
HKL (CDECL *pActivateKeyboardLayout)(HKL, UINT);
@@ -68,7 +66,7 @@ typedef struct tagUSER_DRIVER {
BOOL (CDECL *pUnloadKeyboardLayout)(HKL);
SHORT (CDECL *pVkKeyScanEx)(WCHAR, HKL);
/* cursor/icon functions */
- void (CDECL *pCreateCursorIcon)(HCURSOR,struct tagCURSORICONINFO *);
+ void (CDECL *pCreateCursorIcon)(HCURSOR);
void (CDECL *pDestroyCursorIcon)(HCURSOR);
void (CDECL *pSetCursor)(HCURSOR);
BOOL (CDECL *pGetCursorPos)(LPPOINT);
More information about the wine-cvs
mailing list