mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-05 22:11:18 +00:00
Moved macro DECLARE_HANDLE() (in msacm.h and wtypes.h) to windef.h,
then deleted the duplicated typedefs (in imm.h and mmsystem.h).
This commit is contained in:
parent
7f73a082a1
commit
2840d1b7a9
|
@ -14,7 +14,6 @@ extern "C" {
|
||||||
typedef HANDLE HIMC;
|
typedef HANDLE HIMC;
|
||||||
typedef HANDLE HIMCC;
|
typedef HANDLE HIMCC;
|
||||||
|
|
||||||
typedef HKL *LPHKL;
|
|
||||||
|
|
||||||
typedef int (CALLBACK *REGISTERWORDENUMPROCA)(LPCSTR, DWORD, LPCSTR, LPVOID);
|
typedef int (CALLBACK *REGISTERWORDENUMPROCA)(LPCSTR, DWORD, LPCSTR, LPVOID);
|
||||||
typedef int (CALLBACK *REGISTERWORDENUMPROCW)(LPCWSTR, DWORD, LPCWSTR, LPVOID);
|
typedef int (CALLBACK *REGISTERWORDENUMPROCW)(LPCWSTR, DWORD, LPCWSTR, LPVOID);
|
||||||
|
|
|
@ -199,12 +199,8 @@ BOOL WINAPI PlaySoundW(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound);
|
||||||
#define WAVERR_SYNC (WAVERR_BASE + 3) /* device is synchronous */
|
#define WAVERR_SYNC (WAVERR_BASE + 3) /* device is synchronous */
|
||||||
#define WAVERR_LASTERROR (WAVERR_BASE + 3) /* last error in range */
|
#define WAVERR_LASTERROR (WAVERR_BASE + 3) /* last error in range */
|
||||||
|
|
||||||
typedef HWAVEIN16 *LPHWAVEIN16;
|
|
||||||
typedef HWAVEOUT16 *LPHWAVEOUT16;
|
|
||||||
typedef LPDRVCALLBACK16 LPWAVECALLBACK16;
|
typedef LPDRVCALLBACK16 LPWAVECALLBACK16;
|
||||||
typedef LPDRVCALLBACK LPWAVECALLBACK;
|
typedef LPDRVCALLBACK LPWAVECALLBACK;
|
||||||
typedef HMIXER16 *LPHMIXER16;
|
|
||||||
typedef HMIXER *LPHMIXER;
|
|
||||||
|
|
||||||
#define WOM_OPEN MM_WOM_OPEN
|
#define WOM_OPEN MM_WOM_OPEN
|
||||||
#define WOM_CLOSE MM_WOM_CLOSE
|
#define WOM_CLOSE MM_WOM_CLOSE
|
||||||
|
@ -440,8 +436,6 @@ DWORD WINAPI waveInMessage(HWAVEIN,UINT,DWORD,DWORD);
|
||||||
#define MIDIERR_INVALIDSETUP (MIDIERR_BASE + 5) /* invalid setup */
|
#define MIDIERR_INVALIDSETUP (MIDIERR_BASE + 5) /* invalid setup */
|
||||||
#define MIDIERR_LASTERROR (MIDIERR_BASE + 5) /* last error in range */
|
#define MIDIERR_LASTERROR (MIDIERR_BASE + 5) /* last error in range */
|
||||||
|
|
||||||
typedef HMIDIIN16 *LPHMIDIIN16;
|
|
||||||
typedef HMIDIOUT16 *LPHMIDIOUT16;
|
|
||||||
typedef LPDRVCALLBACK16 LPMIDICALLBACK16;
|
typedef LPDRVCALLBACK16 LPMIDICALLBACK16;
|
||||||
typedef LPDRVCALLBACK LPMIDICALLBACK;
|
typedef LPDRVCALLBACK LPMIDICALLBACK;
|
||||||
#define MIDIPATCHSIZE 128
|
#define MIDIPATCHSIZE 128
|
||||||
|
|
|
@ -10,27 +10,6 @@
|
||||||
#include "mmsystem.h"
|
#include "mmsystem.h"
|
||||||
#include "mmreg.h"
|
#include "mmreg.h"
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* Types
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* FIXME: Move to windef.h */
|
|
||||||
#define DECLARE_HANDLE(a) \
|
|
||||||
typedef HANDLE16 a##16; \
|
|
||||||
typedef HANDLE a; \
|
|
||||||
typedef a##16 *P##a##16; \
|
|
||||||
typedef a##16 *NP##a##16; \
|
|
||||||
typedef a##16 *LP##a##16; \
|
|
||||||
typedef a *P##a;
|
|
||||||
|
|
||||||
DECLARE_HANDLE(HACMDRIVERID)
|
|
||||||
DECLARE_HANDLE(HACMDRIVER)
|
|
||||||
DECLARE_HANDLE(HACMSTREAM)
|
|
||||||
DECLARE_HANDLE(HACMOBJ)
|
|
||||||
|
|
||||||
/* FIXME: Remove when define moved to windef.h */
|
|
||||||
#undef DECLARE_HANDLE
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* Defines/Enums
|
* Defines/Enums
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -183,7 +183,20 @@ typedef void* SEGPTR;
|
||||||
|
|
||||||
/* Handle types that exist both in Win16 and Win32. */
|
/* Handle types that exist both in Win16 and Win32. */
|
||||||
|
|
||||||
#define DECLARE_HANDLE(a) typedef HANDLE16 a##16; typedef HANDLE a
|
#define DECLARE_HANDLE(a) \
|
||||||
|
typedef HANDLE16 a##16; \
|
||||||
|
typedef HANDLE a; \
|
||||||
|
typedef a##16 *P##a##16; \
|
||||||
|
typedef a##16 *NP##a##16; \
|
||||||
|
typedef a##16 *LP##a##16; \
|
||||||
|
typedef a *P##a; \
|
||||||
|
typedef a *LP##a
|
||||||
|
DECLARE_HANDLE(HACMDRIVERID);
|
||||||
|
DECLARE_HANDLE(HACMDRIVER);
|
||||||
|
DECLARE_HANDLE(HACMOBJ);
|
||||||
|
DECLARE_HANDLE(HACMSTREAM);
|
||||||
|
DECLARE_HANDLE(HMETAFILEPICT);
|
||||||
|
|
||||||
DECLARE_HANDLE(HACCEL);
|
DECLARE_HANDLE(HACCEL);
|
||||||
DECLARE_HANDLE(HBITMAP);
|
DECLARE_HANDLE(HBITMAP);
|
||||||
DECLARE_HANDLE(HBRUSH);
|
DECLARE_HANDLE(HBRUSH);
|
||||||
|
@ -501,4 +514,4 @@ typedef const RECTL *LPCRECTL;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* __WINE_WINTYPES_H */
|
#endif /* __WINE_WINDEF_H */
|
||||||
|
|
|
@ -82,10 +82,6 @@ typedef enum tagSTGC
|
||||||
STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE = 4
|
STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE = 4
|
||||||
} STGC;
|
} STGC;
|
||||||
|
|
||||||
#define DECLARE_HANDLE(a) typedef HANDLE16 a##16; typedef HANDLE a
|
|
||||||
DECLARE_HANDLE(HMETAFILEPICT);
|
|
||||||
#undef DECLARE_HANDLE
|
|
||||||
|
|
||||||
typedef struct _COAUTHIDENTITY
|
typedef struct _COAUTHIDENTITY
|
||||||
{
|
{
|
||||||
USHORT* User;
|
USHORT* User;
|
||||||
|
|
Loading…
Reference in a new issue