reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 12:49:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed implementation of LoadDIBIconHandler16 and

Browse Source 
LoadDIBCursorHandler16 since they are no longer used, and stop
exporting NE_DefResourceHandler.
This commit is contained in:
Alexandre Julliard 2005-05-18 15:37:41 +00:00
parent 2c9cb01379
commit 90dd7f0603
4 changed files with 29 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/kernel/kernel32.spec
View File

@ -1177,4 +1177,3 @@
# Wine dll separation hacks, these will go away, don't use them
#
@ cdecl DOSMEM_AllocSelector(long)
@ stdcall NE_DefResourceHandler(long long long)

48
dlls/user/cursoricon.c
View File

@ -61,7 +61,6 @@
#include "wine/winuser16.h"
#include "wine/exception.h"
#include "cursoricon.h"
#include "module.h"
#include "wine/debug.h"
#include "user_private.h"
@ -1656,53 +1655,6 @@ HGLOBAL16 WINAPI LoadCursorIconHandler16( HGLOBAL16 hResource, HMODULE16 hModule
return (HGLOBAL16)0;
}
/**********************************************************************
* LoadDIBIconHandler (USER.357)
*
* RT_ICON resource loader, installed by USER_SignalProc when module
* is initialized.
*/
HGLOBAL16 WINAPI LoadDIBIconHandler16( HGLOBAL16 hMemObj, HMODULE16 hModule, HRSRC16 hRsrc )
{
/* If hResource is zero we must allocate a new memory block, if it's
* non-zero but GlobalLock() returns NULL then it was discarded and
* we have to recommit some memory, otherwise we just need to check
* the block size. See LoadProc() in 16-bit SDK for more.
*/
hMemObj = NE_DefResourceHandler( hMemObj, hModule, hRsrc );
if( hMemObj )
{
LPBYTE bits = (LPBYTE)GlobalLock16( hMemObj );
hMemObj = HICON_16(CURSORICON_CreateFromResource(
hModule, hMemObj, bits,
SizeofResource16(hModule, hRsrc), TRUE, 0x00030000,
GetSystemMetrics(SM_CXICON),
GetSystemMetrics(SM_CYICON), LR_DEFAULTCOLOR));
}
return hMemObj;
}
/**********************************************************************
* LoadDIBCursorHandler (USER.356)
*
* RT_CURSOR resource loader. Same as above.
*/
HGLOBAL16 WINAPI LoadDIBCursorHandler16( HGLOBAL16 hMemObj, HMODULE16 hModule, HRSRC16 hRsrc )
{
hMemObj = NE_DefResourceHandler( hMemObj, hModule, hRsrc );
if( hMemObj )
{
LPBYTE bits = (LPBYTE)GlobalLock16( hMemObj );
hMemObj = HICON_16(CURSORICON_CreateFromResource(
hModule, hMemObj, bits,
SizeofResource16(hModule, hRsrc), FALSE, 0x00030000,
GetSystemMetrics(SM_CXCURSOR),
GetSystemMetrics(SM_CYCURSOR), LR_MONOCHROME));
}
return hMemObj;
}
/**********************************************************************
* LoadIconHandler (USER.456)
*/

29
dlls/user/user16.c
View File

@ -943,6 +943,35 @@ BOOL16 WINAPI IsUserIdle16(void)
}
/**********************************************************************
* LoadDIBIconHandler (USER.357)
*
* RT_ICON resource loader, installed by USER_SignalProc when module
* is initialized.
*/
HGLOBAL16 WINAPI LoadDIBIconHandler16( HGLOBAL16 hMemObj, HMODULE16 hModule, HRSRC16 hRsrc )
{
/* If hResource is zero we must allocate a new memory block, if it's
* non-zero but GlobalLock() returns NULL then it was discarded and
* we have to recommit some memory, otherwise we just need to check
* the block size. See LoadProc() in 16-bit SDK for more.
*/
FIXME( "%x %x %x: stub, not supported anymore\n", hMemObj, hModule, hRsrc );
return 0;
}
/**********************************************************************
* LoadDIBCursorHandler (USER.356)
*
* RT_CURSOR resource loader. Same as above.
*/
HGLOBAL16 WINAPI LoadDIBCursorHandler16( HGLOBAL16 hMemObj, HMODULE16 hModule, HRSRC16 hRsrc )
{
FIXME( "%x %x %x: stub, not supported anymore\n", hMemObj, hModule, hRsrc );
return 0;
}
/**********************************************************************
* IsMenu (USER.358)
*/

3
include/module.h
View File

@ -69,9 +69,6 @@ enum loadorder_type
/* module.c */
extern NTSTATUS MODULE_DllThreadAttach( LPVOID lpReserved );
/* resource16.c */
extern HGLOBAL16 WINAPI NE_DefResourceHandler(HGLOBAL16,HMODULE16,HRSRC16);
/* loadorder.c */
extern void MODULE_GetLoadOrderW( enum loadorder_type plo[], const WCHAR *app_name,
const WCHAR *path );