commit bc54d78532675aea30db234234f81b815099c7e6
author Michael Stefaniuc <mstefani@redhat.de> Thu Oct 10 21:22:09 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Oct 10 21:22:09 2002 +0000
tree 38c4eb63e2fbbd886ee955c01d8947283115ec1e
parent b41d4feda136ba54da07d2fcaf7dd3aeea66051c

- change the internal functions in windows/cursoricon.c to use 32bit
  handles
- move the implementation of ExtractAssociatedIcon16 to
  ExtractAssociatedIconA
- convert HICON to a void*
- fixed some handle conversions that happened to be in the way while
  doing the above

include/user.h

diff --git a/include/user.h b/include/user.h
index eb5588f..13fbbd7 100644
--- a/include/user.h
+++ b/include/user.h
@@ -142,7 +142,14 @@
 extern DWORD USER16_AlertableWait;
 
 /* HANDLE16 <-> HANDLE conversions */
-#define HACCEL_32(h16)  ((HACCEL)(ULONG_PTR)(h16))
 #define HACCEL_16(h32)  (LOWORD(h32))
+#define HBRUSH_16(h32)  (LOWORD(h32))
+#define HCURSOR_16(h32) (LOWORD(h32))
+#define HICON_16(h32)   (LOWORD(h32))
+
+#define HACCEL_32(h16)  ((HACCEL)(ULONG_PTR)(h16))
+#define HBRUSH_32(h16)  ((HBRUSH)(ULONG_PTR)(h16))
+#define HCURSOR_32(h16) ((HCURSOR)(ULONG_PTR)(h16))
+#define HICON_32(h16)   ((HICON)(ULONG_PTR)(h16))
 
 #endif  /* __WINE_USER_H */