user32: Get rid of the CreateCursorIcon driver entry point.
This commit is contained in:
parent
639c202ea7
commit
a897e13fba
|
@ -972,7 +972,6 @@ done:
|
||||||
list_add_head( &icon_cache, &info->entry );
|
list_add_head( &icon_cache, &info->entry );
|
||||||
}
|
}
|
||||||
release_icon_ptr( hObj, info );
|
release_icon_ptr( hObj, info );
|
||||||
USER_Driver->pCreateCursorIcon( hObj );
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -1609,7 +1608,6 @@ HICON WINAPI CopyIcon( HICON hIcon )
|
||||||
release_icon_ptr( hNew, ptrNew );
|
release_icon_ptr( hNew, ptrNew );
|
||||||
}
|
}
|
||||||
release_icon_ptr( hIcon, ptrOld );
|
release_icon_ptr( hIcon, ptrOld );
|
||||||
if (hNew) USER_Driver->pCreateCursorIcon( hNew );
|
|
||||||
return hNew;
|
return hNew;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2212,7 +2210,6 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo)
|
||||||
}
|
}
|
||||||
|
|
||||||
release_icon_ptr( hObj, info );
|
release_icon_ptr( hObj, info );
|
||||||
USER_Driver->pCreateCursorIcon( hObj );
|
|
||||||
}
|
}
|
||||||
return hObj;
|
return hObj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -67,7 +67,6 @@ static const USER_DRIVER *load_driver(void)
|
||||||
GET_USER_FUNC(UnloadKeyboardLayout);
|
GET_USER_FUNC(UnloadKeyboardLayout);
|
||||||
GET_USER_FUNC(UnregisterHotKey);
|
GET_USER_FUNC(UnregisterHotKey);
|
||||||
GET_USER_FUNC(VkKeyScanEx);
|
GET_USER_FUNC(VkKeyScanEx);
|
||||||
GET_USER_FUNC(CreateCursorIcon);
|
|
||||||
GET_USER_FUNC(DestroyCursorIcon);
|
GET_USER_FUNC(DestroyCursorIcon);
|
||||||
GET_USER_FUNC(SetCursor);
|
GET_USER_FUNC(SetCursor);
|
||||||
GET_USER_FUNC(GetCursorPos);
|
GET_USER_FUNC(GetCursorPos);
|
||||||
|
@ -205,10 +204,6 @@ static SHORT CDECL nulldrv_VkKeyScanEx( WCHAR ch, HKL layout )
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void CDECL nulldrv_CreateCursorIcon( HCURSOR cursor )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static void CDECL nulldrv_DestroyCursorIcon( HCURSOR cursor )
|
static void CDECL nulldrv_DestroyCursorIcon( HCURSOR cursor )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -439,7 +434,6 @@ static USER_DRIVER null_driver =
|
||||||
nulldrv_UnregisterHotKey,
|
nulldrv_UnregisterHotKey,
|
||||||
nulldrv_VkKeyScanEx,
|
nulldrv_VkKeyScanEx,
|
||||||
/* cursor/icon functions */
|
/* cursor/icon functions */
|
||||||
nulldrv_CreateCursorIcon,
|
|
||||||
nulldrv_DestroyCursorIcon,
|
nulldrv_DestroyCursorIcon,
|
||||||
nulldrv_SetCursor,
|
nulldrv_SetCursor,
|
||||||
nulldrv_GetCursorPos,
|
nulldrv_GetCursorPos,
|
||||||
|
@ -559,11 +553,6 @@ static SHORT CDECL loaderdrv_VkKeyScanEx( WCHAR ch, HKL layout )
|
||||||
return load_driver()->pVkKeyScanEx( ch, 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 )
|
static void CDECL loaderdrv_DestroyCursorIcon( HCURSOR cursor )
|
||||||
{
|
{
|
||||||
load_driver()->pDestroyCursorIcon( cursor );
|
load_driver()->pDestroyCursorIcon( cursor );
|
||||||
|
@ -787,7 +776,6 @@ static USER_DRIVER lazy_load_driver =
|
||||||
loaderdrv_UnregisterHotKey,
|
loaderdrv_UnregisterHotKey,
|
||||||
loaderdrv_VkKeyScanEx,
|
loaderdrv_VkKeyScanEx,
|
||||||
/* cursor/icon functions */
|
/* cursor/icon functions */
|
||||||
loaderdrv_CreateCursorIcon,
|
|
||||||
loaderdrv_DestroyCursorIcon,
|
loaderdrv_DestroyCursorIcon,
|
||||||
loaderdrv_SetCursor,
|
loaderdrv_SetCursor,
|
||||||
loaderdrv_GetCursorPos,
|
loaderdrv_GetCursorPos,
|
||||||
|
|
|
@ -73,7 +73,6 @@ typedef struct tagUSER_DRIVER {
|
||||||
void (CDECL *pUnregisterHotKey)(HWND, UINT, UINT);
|
void (CDECL *pUnregisterHotKey)(HWND, UINT, UINT);
|
||||||
SHORT (CDECL *pVkKeyScanEx)(WCHAR, HKL);
|
SHORT (CDECL *pVkKeyScanEx)(WCHAR, HKL);
|
||||||
/* cursor/icon functions */
|
/* cursor/icon functions */
|
||||||
void (CDECL *pCreateCursorIcon)(HCURSOR);
|
|
||||||
void (CDECL *pDestroyCursorIcon)(HCURSOR);
|
void (CDECL *pDestroyCursorIcon)(HCURSOR);
|
||||||
void (CDECL *pSetCursor)(HCURSOR);
|
void (CDECL *pSetCursor)(HCURSOR);
|
||||||
BOOL (CDECL *pGetCursorPos)(LPPOINT);
|
BOOL (CDECL *pGetCursorPos)(LPPOINT);
|
||||||
|
|
Loading…
Reference in New Issue