Moved some handle declarations to the right headers.

include/mmsystem.h

@@ -13,7 +13,19 @@ extern "C" {
 
 typedef LPSTR		HPSTR;          /* a huge version of LPSTR */
 typedef LPCSTR		HPCSTR;         /* a huge version of LPCSTR */
-   
+
+DECLARE_OLD_HANDLE(HDRVR);
+DECLARE_OLD_HANDLE(HWAVE);
+DECLARE_OLD_HANDLE(HWAVEIN);
+DECLARE_OLD_HANDLE(HWAVEOUT);
+DECLARE_OLD_HANDLE(HMIDI);
+DECLARE_OLD_HANDLE(HMIDIIN);
+DECLARE_OLD_HANDLE(HMIDIOUT);
+DECLARE_OLD_HANDLE(HMIDISTRM);
+DECLARE_OLD_HANDLE(HMIXER);
+DECLARE_OLD_HANDLE(HMIXEROBJ);
+DECLARE_OLD_HANDLE(HMMIO);
+
 #include "pshpack1.h"
    
 typedef LRESULT CALLBACK (*DRIVERPROC)(DWORD,HDRVR,UINT,LPARAM,LPARAM);

include/msacm.h

@@ -190,6 +190,13 @@ static const WCHAR ACMHELPMSGCONTEXTHELPW[] = { 'a','c','m',
 
 #define ACMDM_DRIVER_ABOUT          (ACMDM_BASE + 11)
 
+/* handles */
+
+DECLARE_OLD_HANDLE(HACMDRIVERID);
+DECLARE_OLD_HANDLE(HACMDRIVER);
+DECLARE_OLD_HANDLE(HACMSTREAM);
+DECLARE_OLD_HANDLE(HACMOBJ);
+
 /***********************************************************************
  * Callbacks
  */

include/windef.h

@@ -44,56 +44,40 @@ extern "C" {
 #endif  /* __WINE__ */
 
 
-/* Integer types. These are the same for emulator and library. */
+/* Integer types */
 typedef UINT            WPARAM;
 typedef LONG            LPARAM;
 typedef LONG            LRESULT;
 typedef WORD            ATOM;
 typedef WORD            CATCHBUF[9];
 typedef WORD           *LPCATCHBUF;
-typedef HANDLE          HHOOK;
-typedef HANDLE          HMONITOR;
 
 /* Handle types that exist both in Win16 and Win32. */
 
-DECLARE_OLD_HANDLE(HACMDRIVERID);
-DECLARE_OLD_HANDLE(HACMDRIVER);
-DECLARE_OLD_HANDLE(HACMOBJ);
-DECLARE_OLD_HANDLE(HACMSTREAM);
-
+typedef int HFILE;
 DECLARE_OLD_HANDLE(HACCEL);
 DECLARE_OLD_HANDLE(HBITMAP);
 DECLARE_OLD_HANDLE(HBRUSH);
 DECLARE_HANDLE(HCOLORSPACE);
 DECLARE_OLD_HANDLE(HDC);
-DECLARE_OLD_HANDLE(HDRVR);
+DECLARE_HANDLE(HDESK);
 DECLARE_OLD_HANDLE(HENHMETAFILE);
-typedef int HFILE;
 DECLARE_OLD_HANDLE(HFONT);
+DECLARE_OLD_HANDLE(HHOOK);
 DECLARE_OLD_HANDLE(HICON);
 DECLARE_OLD_HANDLE(HINSTANCE);
 DECLARE_OLD_HANDLE(HKEY);
+DECLARE_OLD_HANDLE(HKL);
 DECLARE_OLD_HANDLE(HMENU);
 DECLARE_OLD_HANDLE(HMETAFILE);
-DECLARE_OLD_HANDLE(HMIDI);
-DECLARE_OLD_HANDLE(HMIDIIN);
-DECLARE_OLD_HANDLE(HMIDIOUT);
-DECLARE_OLD_HANDLE(HMIDISTRM);
-DECLARE_OLD_HANDLE(HMIXER);
-DECLARE_OLD_HANDLE(HMIXEROBJ);
-DECLARE_OLD_HANDLE(HMMIO);
+DECLARE_OLD_HANDLE(HMONITOR);
 DECLARE_OLD_HANDLE(HPALETTE);
 DECLARE_OLD_HANDLE(HPEN);
 DECLARE_OLD_HANDLE(HRGN);
 DECLARE_OLD_HANDLE(HRSRC);
 DECLARE_OLD_HANDLE(HTASK);
-DECLARE_OLD_HANDLE(HWAVE);
-DECLARE_OLD_HANDLE(HWAVEIN);
-DECLARE_OLD_HANDLE(HWAVEOUT);
 DECLARE_HANDLE(HWINSTA);
-DECLARE_HANDLE(HDESK);
 DECLARE_OLD_HANDLE(HWND);
-DECLARE_OLD_HANDLE(HKL);
 
 /* Handle types that must remain interchangeable even with strict on */