commit 8eeed94f5f31c6a6b727072e51b96f0e8515c136
author Alexandre Julliard <julliard@winehq.org> Mon Dec 17 21:40:56 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Dec 17 21:40:56 2001 +0000
tree 263fc557e2b203dc798cb13ae3761a470c5d258a
parent 7e49205d5abc8b3c5e54e7ef28c328b670cb1f9e

Export DestroyIcon32 from user32 and use GetProcAddress to call it
from FreeResource16.

loader/resource.c

diff --git a/loader/resource.c b/loader/resource.c
index b3d0c1e..2f8b4fd 100644
--- a/loader/resource.c
+++ b/loader/resource.c
@@ -17,7 +17,6 @@
 #include "wine/winbase16.h"
 #include "wine/exception.h"
 #include "heap.h"
-#include "callback.h"
 #include "cursoricon.h"
 #include "module.h"
 #include "file.h"
@@ -409,6 +408,9 @@
     return LockResource16( handle );
 }
 
+typedef WORD WINAPI (*pDestroyIcon32Proc)( HGLOBAL16 handle, UINT16 flags );
+
+
 /**********************************************************************
  *          FreeResource     (KERNEL.63)
  *          FreeResource16   (KERNEL32.@)
@@ -428,8 +430,11 @@
        GlobalFree16() */
     if ( retv )
     {
-        if ( Callout.DestroyIcon32 )
-            retv = Callout.DestroyIcon32( handle, CID_RESOURCE );
+        pDestroyIcon32Proc proc;
+        HMODULE user = GetModuleHandleA( "user32.dll" );
+
+        if (user && (proc = (pDestroyIcon32Proc)GetProcAddress( user, "DestroyIcon32" )))
+            retv = proc( handle, CID_RESOURCE );
         else
             retv = GlobalFree16( handle );
     }