Removed implementation of LoadDIBIconHandler16 and

dlls/kernel/kernel32.spec

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

dlls/user/cursoricon.c

@@ -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"
 
@@ -1657,53 +1656,6 @@ HGLOBAL16 WINAPI LoadCursorIconHandler16( HGLOBAL16 hResource, HMODULE16 hModule
 }
 
 /**********************************************************************
- *              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)
  */
 HICON16 WINAPI LoadIconHandler16( HGLOBAL16 hResource, BOOL16 bNew )

dlls/user/user16.c

@@ -944,6 +944,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)
  */
 BOOL16 WINAPI IsMenu16( HMENU16 hmenu )

include/module.h

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