system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-06 02:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

user32: Remove the CURSORICONINFO parameter in the CreateCursorIcon driver entry point.

Browse source
This commit is contained in:
Alexandre Julliard 2010-05-21 13:30:15 +02:00
parent e25049e879
commit 86c4a3694d
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/user32/cursoricon.c
View file

@ -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;
}

6
dlls/user32/driver.c
View file

@ -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 )

4
dlls/user32/user_private.h
View file

@ -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);