marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved macro DECLARE_HANDLE() (in msacm.h and wtypes.h) to windef.h, 

then deleted the duplicated typedefs (in imm.h and mmsystem.h).
oldstable
Jiuming Luo 1999-03-28 12:39:18 +00:00 committed by Alexandre Julliard
parent 7f73a082a1
commit 2840d1b7a9
5 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/imm.h
View File

@ -14,7 +14,6 @@ extern "C" {
typedef HANDLE HIMC;
typedef HANDLE HIMCC;
typedef HKL *LPHKL;
typedef int (CALLBACK *REGISTERWORDENUMPROCA)(LPCSTR, DWORD, LPCSTR, LPVOID);
typedef int (CALLBACK *REGISTERWORDENUMPROCW)(LPCWSTR, DWORD, LPCWSTR, LPVOID);

6
include/mmsystem.h
View File

@ -199,12 +199,8 @@ BOOL WINAPI PlaySoundW(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound);
#define WAVERR_SYNC (WAVERR_BASE + 3) /* device is synchronous */
#define WAVERR_LASTERROR (WAVERR_BASE + 3) /* last error in range */
typedef HWAVEIN16 *LPHWAVEIN16;
typedef HWAVEOUT16 *LPHWAVEOUT16;
typedef LPDRVCALLBACK16 LPWAVECALLBACK16;
typedef LPDRVCALLBACK LPWAVECALLBACK;
typedef HMIXER16 *LPHMIXER16;
typedef HMIXER *LPHMIXER;
#define WOM_OPEN MM_WOM_OPEN
#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_LASTERROR (MIDIERR_BASE + 5) /* last error in range */
typedef HMIDIIN16 *LPHMIDIIN16;
typedef HMIDIOUT16 *LPHMIDIOUT16;
typedef LPDRVCALLBACK16 LPMIDICALLBACK16;
typedef LPDRVCALLBACK LPMIDICALLBACK;
#define MIDIPATCHSIZE 128

21
include/msacm.h
View File

@ -10,27 +10,6 @@
#include "mmsystem.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
*/

17
include/windef.h
View File

@ -183,7 +183,20 @@ typedef void* SEGPTR;
/* 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(HBITMAP);
DECLARE_HANDLE(HBRUSH);
@ -501,4 +514,4 @@ typedef const RECTL *LPCRECTL;
}
#endif
#endif /* __WINE_WINTYPES_H */
#endif /* __WINE_WINDEF_H */

4
include/wtypes.h
View File

@ -82,10 +82,6 @@ typedef enum tagSTGC
STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE = 4
} STGC;
#define DECLARE_HANDLE(a) typedef HANDLE16 a##16; typedef HANDLE a
DECLARE_HANDLE(HMETAFILEPICT);
#undef DECLARE_HANDLE
typedef struct _COAUTHIDENTITY
{
USHORT* User;