Removed LPxxx handle types that don't exist under Windows.
diff --git a/include/mmsystem.h b/include/mmsystem.h
index 874c676..2bae005 100644
--- a/include/mmsystem.h
+++ b/include/mmsystem.h
@@ -43,6 +43,15 @@
DECLARE_HANDLE(HMIXEROBJ);
DECLARE_HANDLE(HMMIO);
+typedef HMIDI *LPHMIDI;
+typedef HMIDIIN *LPHMIDIIN;
+typedef HMIDIOUT *LPHMIDIOUT;
+typedef HMIDISTRM *LPHMIDISTRM;
+typedef HMIXER *LPHMIXER;
+typedef HMIXEROBJ *LPHMIXEROBJ;
+typedef HWAVEIN *LPHWAVEIN;
+typedef HWAVEOUT *LPHWAVEOUT;
+
#include "pshpack1.h"
typedef LRESULT (CALLBACK *DRIVERPROC)(DWORD,HDRVR,UINT,LPARAM,LPARAM);
diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h
index 55d8e09..1eb9d91 100644
--- a/include/wine/winbase16.h
+++ b/include/wine/winbase16.h
@@ -336,12 +336,12 @@
FARPROC16 WINAPI MakeProcInstance16(FARPROC16,HANDLE16);
HFILE16 WINAPI OpenFile16(LPCSTR,OFSTRUCT*,UINT16);
DWORD WINAPI RegCloseKey16(HKEY);
-DWORD WINAPI RegCreateKey16(HKEY,LPCSTR,LPHKEY);
+DWORD WINAPI RegCreateKey16(HKEY,LPCSTR,PHKEY);
DWORD WINAPI RegDeleteKey16(HKEY,LPCSTR);
DWORD WINAPI RegDeleteValue16(HKEY,LPSTR);
DWORD WINAPI RegEnumKey16(HKEY,DWORD,LPSTR,DWORD);
DWORD WINAPI RegEnumValue16(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
-DWORD WINAPI RegOpenKey16(HKEY,LPCSTR,LPHKEY);
+DWORD WINAPI RegOpenKey16(HKEY,LPCSTR,PHKEY);
DWORD WINAPI RegQueryValue16(HKEY,LPCSTR,LPSTR,LPDWORD);
DWORD WINAPI RegQueryValueEx16(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
DWORD WINAPI RegSetValue16(HKEY,LPCSTR,DWORD,LPCSTR,DWORD);
diff --git a/include/winnt.h b/include/winnt.h
index e019e91..c3efdde 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -564,24 +564,23 @@
typedef VOID* HANDLE;
#define DECLARE_OLD_HANDLE(a) \
typedef struct a##__ { int unused; } *a; \
- typedef a *P##a, *LP##a
-
+ typedef a *P##a
#else
typedef UINT HANDLE;
#define DECLARE_OLD_HANDLE(a) \
- typedef HANDLE a; \
- typedef a *P##a, *LP##a
+ typedef HANDLE a; \
+ typedef a *P##a
#endif
typedef HANDLE *PHANDLE, *LPHANDLE;
#ifdef STRICT
#define DECLARE_HANDLE(a) \
typedef struct a##__ { int unused; } *a; \
- typedef a *P##a, *LP##a
+ typedef a *P##a
#else /*STRICT*/
#define DECLARE_HANDLE(a) \
- typedef HANDLE a; \
- typedef a *P##a, *LP##a
+ typedef HANDLE a; \
+ typedef a *P##a
#endif /*STRICT*/
/* Defines */
diff --git a/include/winreg.h b/include/winreg.h
index 1d99832..7337d1c 100644
--- a/include/winreg.h
+++ b/include/winreg.h
@@ -56,16 +56,16 @@
typedef ACCESS_MASK REGSAM;
DWORD WINAPI RegCreateKeyExA(HKEY,LPCSTR,DWORD,LPSTR,DWORD,REGSAM,
- LPSECURITY_ATTRIBUTES,LPHKEY,LPDWORD);
+ LPSECURITY_ATTRIBUTES,PHKEY,LPDWORD);
DWORD WINAPI RegCreateKeyExW(HKEY,LPCWSTR,DWORD,LPWSTR,DWORD,REGSAM,
- LPSECURITY_ATTRIBUTES,LPHKEY,LPDWORD);
+ LPSECURITY_ATTRIBUTES,PHKEY,LPDWORD);
#define RegCreateKeyEx WINELIB_NAME_AW(RegCreateKeyEx)
LONG WINAPI RegSaveKeyA(HKEY,LPCSTR,LPSECURITY_ATTRIBUTES);
LONG WINAPI RegSaveKeyW(HKEY,LPCWSTR,LPSECURITY_ATTRIBUTES);
#define RegSaveKey WINELIB_NAME_AW(RegSaveKey)
LONG WINAPI RegSetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
-LONG WINAPI RegConnectRegistryA(LPCSTR,HKEY,LPHKEY);
-LONG WINAPI RegConnectRegistryW(LPCWSTR,HKEY,LPHKEY);
+LONG WINAPI RegConnectRegistryA(LPCSTR,HKEY,PHKEY);
+LONG WINAPI RegConnectRegistryW(LPCWSTR,HKEY,PHKEY);
#define RegConnectRegistry WINELIB_NAME_AW(RegConnectRegistry)
DWORD WINAPI RegEnumKeyExA(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPSTR,
LPDWORD,LPFILETIME);
@@ -77,8 +77,8 @@
LONG WINAPI RegLoadKeyW(HKEY,LPCWSTR,LPCWSTR);
#define RegLoadKey WINELIB_NAME_AW(RegLoadKey)
LONG WINAPI RegNotifyChangeKeyValue(HKEY,BOOL,DWORD,HANDLE,BOOL);
-DWORD WINAPI RegOpenKeyExW(HKEY,LPCWSTR,DWORD,REGSAM,LPHKEY);
-DWORD WINAPI RegOpenKeyExA(HKEY,LPCSTR,DWORD,REGSAM,LPHKEY);
+DWORD WINAPI RegOpenKeyExW(HKEY,LPCWSTR,DWORD,REGSAM,PHKEY);
+DWORD WINAPI RegOpenKeyExA(HKEY,LPCSTR,DWORD,REGSAM,PHKEY);
#define RegOpenKeyEx WINELIB_NAME_AW(RegOpenKeyEx)
DWORD WINAPI RegQueryInfoKeyW(HKEY,LPWSTR,LPDWORD,LPDWORD,LPDWORD,
LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,
@@ -105,8 +105,8 @@
DWORD WINAPI RegCloseKey(HKEY);
DWORD WINAPI RegFlushKey(HKEY);
-DWORD WINAPI RegCreateKeyA(HKEY,LPCSTR,LPHKEY);
-DWORD WINAPI RegCreateKeyW(HKEY,LPCWSTR,LPHKEY);
+DWORD WINAPI RegCreateKeyA(HKEY,LPCSTR,PHKEY);
+DWORD WINAPI RegCreateKeyW(HKEY,LPCWSTR,PHKEY);
#define RegCreateKey WINELIB_NAME_AW(RegCreateKey)
DWORD WINAPI RegDeleteKeyA(HKEY,LPCSTR);
DWORD WINAPI RegDeleteKeyW(HKEY,LPCWSTR);
@@ -120,8 +120,8 @@
DWORD WINAPI RegEnumValueA(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
DWORD WINAPI RegEnumValueW(HKEY,DWORD,LPWSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
#define RegEnumValue WINELIB_NAME_AW(RegEnumValue)
-DWORD WINAPI RegOpenKeyA(HKEY,LPCSTR,LPHKEY);
-DWORD WINAPI RegOpenKeyW(HKEY,LPCWSTR,LPHKEY);
+DWORD WINAPI RegOpenKeyA(HKEY,LPCSTR,PHKEY);
+DWORD WINAPI RegOpenKeyW(HKEY,LPCWSTR,PHKEY);
#define RegOpenKey WINELIB_NAME_AW(RegOpenKey)
DWORD WINAPI RegQueryValueA(HKEY,LPCSTR,LPSTR,LPLONG);
DWORD WINAPI RegQueryValueW(HKEY,LPCWSTR,LPWSTR,LPLONG);
