From 231dfa2af91f3ad5e779483ec2af0abcf8b620d4 Mon Sep 17 00:00:00 2001 From: Bertho Stultiens Date: Sat, 13 Feb 1999 17:56:28 +0000 Subject: [PATCH] Fixed a couple of faulty names used in wine and typos so that it will compile again after conversion from 32[AW] naming to [AW] naming. --- dlls/shell32/shell32_main.h | 1 - include/mmsystem.h | 11 +++++------ include/ole.h | 16 ++++++++-------- include/wingdi.h | 2 +- include/winsock.h | 14 +++++++------- 5 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 3310e44c545..3e23e610161 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -87,7 +87,6 @@ extern LPEXTRACTICON IExtractIcon_Constructor(LPITEMIDLIST); /* FIXME should be moved to a header file. IsEqualGUID is declared but not exported in compobj.c !!!*/ -#define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID))) #define IsEqualIID(riid1, riid2) IsEqualGUID(riid1, riid2) #define IsEqualCLSID(rclsid1, rclsid2) IsEqualGUID(rclsid1, rclsid2) diff --git a/include/mmsystem.h b/include/mmsystem.h index 5fac504db41..4fcdf85a68c 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -437,7 +437,7 @@ UINT32 WINAPI waveInOpen32(HWAVEIN32*,UINT32,const LPWAVEFORMAT,DWORD,DWORD,DWOR #define waveInOpen WINELIB_NAME(waveInOpen) UINT16 WINAPI waveInClose16(HWAVEIN16); UINT32 WINAPI waveInClose32(HWAVEIN32); -#define waveInClose WINELIB_TYPE(waveInClose) +#define waveInClose WINELIB_NAME(waveInClose) UINT16 WINAPI waveInPrepareHeader16(HWAVEIN16,WAVEHDR*,UINT16); UINT32 WINAPI waveInPrepareHeader32(HWAVEIN32,WAVEHDR*,UINT32); #define waveInPrepareHeader WINELIB_NAME(waveInPrepareHeader) @@ -1534,9 +1534,8 @@ UINT32 WINAPI mixerGetControlDetails32A(HMIXEROBJ32,LPMIXERCONTROLDETAILS32,DWOR UINT32 WINAPI mixerGetControlDetails32W(HMIXEROBJ32,LPMIXERCONTROLDETAILS32,DWORD); #define mixerGetControlDetails WINELIB_NAME_AW(mixerGetControlDetails) UINT16 WINAPI mixerSetControlDetails16(HMIXEROBJ16,LPMIXERCONTROLDETAILS16,DWORD); -UINT32 WINAPI mixerSetControlDetails32A(HMIXEROBJ16,LPMIXERCONTROLDETAILS32,DWORD); -UINT32 WINAPI mixerSetControlDetails32W(HMIXEROBJ16,LPMIXERCONTROLDETAILS32,DWORD); -#define mixerSetControlDetails WINELIB_NAME_AW(mixerSetControlDetails) +UINT32 WINAPI mixerSetControlDetails32(HMIXEROBJ32,LPMIXERCONTROLDETAILS32,DWORD); +#define mixerSetControlDetails WINELIB_NAME(mixerSetControlDetails) #define MMIOERR_BASE 256 #define MMIOERR_FILENOTFOUND (MMIOERR_BASE + 1) /* file not found */ @@ -1720,7 +1719,7 @@ MMRESULT32 WINAPI mmioSetInfo32(HMMIO32,const MMIOINFO32*,UINT32); #define mmioSetInfo WINELIB_NAME(mmioSetInfo) UINT16 WINAPI mmioSetBuffer16(HMMIO16,LPSTR,LONG,UINT16); UINT32 WINAPI mmioSetBuffer32(HMMIO32,LPSTR,LONG,UINT32); -#define mmioSetBuffer WINELIB_NAME(mmioSetInfo) +#define mmioSetBuffer WINELIB_NAME(mmioSetBuffer) UINT16 WINAPI mmioFlush16(HMMIO16,UINT16); UINT32 WINAPI mmioFlush32(HMMIO32,UINT32); #define mmioFlush WINELIB_NAME(mmioFlush) @@ -1735,7 +1734,7 @@ UINT32 WINAPI mmioAscend32(HMMIO32,MMCKINFO*,UINT32); #define mmioAscend WINELIB_NAME(mmioAscend) UINT16 WINAPI mmioCreateChunk16(HMMIO16,MMCKINFO*,UINT16); UINT32 WINAPI mmioCreateChunk32(HMMIO32,MMCKINFO*,UINT32); -#define mmioCreateChunk WINELIB_NAME(mmioAscend) +#define mmioCreateChunk WINELIB_NAME(mmioCreateChunk) typedef UINT16 (CALLBACK *YIELDPROC)(UINT16,DWORD); diff --git a/include/ole.h b/include/ole.h index ab01f85b832..f6246202ef5 100644 --- a/include/ole.h +++ b/include/ole.h @@ -266,14 +266,14 @@ typedef struct _OLEOBJECT { } OLEOBJECT; -OLESTATUS WINAPI OleRegisterServer(LPCSTR,LPOLESERVER,LHSERVER *,HINSTANCE16,OLE_SERVER_USE); -OLESTATUS WINAPI OleUnblockServer(LHSERVER,BOOL16 *); -OLESTATUS WINAPI OleRegisterServerDoc(LHSERVER,LPCSTR,LPOLESERVERDOC,LHSERVERDOC *); -OLESTATUS WINAPI OleRegisterClientDoc(LPCSTR,LPCSTR,LONG,LHCLIENTDOC *); -OLESTATUS WINAPI OleRenameClientDoc(LHCLIENTDOC,LPCSTR); -OLESTATUS WINAPI OleRevokeServerDoc(LHSERVERDOC); -OLESTATUS WINAPI OleRevokeClientDoc(LHCLIENTDOC); -OLESTATUS WINAPI OleRevokeServer(LHSERVER); +OLESTATUS WINAPI OleRegisterServer16(LPCSTR,LPOLESERVER,LHSERVER *,HINSTANCE16,OLE_SERVER_USE); +OLESTATUS WINAPI OleUnblockServer16(LHSERVER,BOOL16 *); +OLESTATUS WINAPI OleRegisterServerDoc16(LHSERVER,LPCSTR,LPOLESERVERDOC,LHSERVERDOC *); +OLESTATUS WINAPI OleRegisterClientDoc16(LPCSTR,LPCSTR,LONG,LHCLIENTDOC *); +OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC,LPCSTR); +OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC); +OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC); +OLESTATUS WINAPI OleRevokeServer16(LHSERVER); /* com functions */ void WINAPI CoFreeUnusedLibraries(void); diff --git a/include/wingdi.h b/include/wingdi.h index 68266e31f13..7345b9daa77 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -2145,7 +2145,7 @@ DWORD WINAPI MoveTo(HDC16,INT16,INT16); DWORD WINAPI OffsetViewportOrg(HDC16,INT16,INT16); INT16 WINAPI OffsetVisRgn(HDC16,INT16,INT16); DWORD WINAPI OffsetWindowOrg(HDC16,INT16,INT16); -BOOL32 WINAPI PlgBlt(HDC32,const POINT32*,HDC32,INT32,INT32,INT32,INT32,HBITMAP32,INT32,INT32); +BOOL32 WINAPI PlgBlt32(HDC32,const POINT32*,HDC32,INT32,INT32,INT32,INT32,HBITMAP32,INT32,INT32); BOOL32 WINAPI PolyDraw32(HDC32,const POINT32*,const BYTE*,DWORD); UINT16 WINAPI RealizeDefaultPalette(HDC16); INT16 WINAPI RestoreVisRgn(HDC16); diff --git a/include/winsock.h b/include/winsock.h index 22b73633f43..13c9b0e3895 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -86,7 +86,7 @@ typedef struct INT16 WINAPI __WSAFDIsSet16( SOCKET16, ws_fd_set16 * ); INT32 WINAPI __WSAFDIsSet32( SOCKET32, ws_fd_set32 * ); -#define __WSAFDIsSet WINELIB_NAME(__WSAFDIsSet); +#define __WSAFDIsSet WINELIB_NAME(__WSAFDIsSet) #define __WS_FD_CLR(fd, set, cast) do { \ UINT16 __i; \ @@ -107,7 +107,7 @@ INT32 WINAPI __WSAFDIsSet32( SOCKET32, ws_fd_set32 * ); } while(0) #define WS_FD_CLR16(fd, set) __WS_FD_CLR((fd),(set), ws_fd_set16) #define WS_FD_CLR32(fd, set) __WS_FD_CLR((fd),(set), ws_fd_set32) -#define WS_FD_CLR WINELIB_NAME(WS_FD_CLR); +#define WS_FD_CLR WINELIB_NAME(WS_FD_CLR) #define __WS_FD_SET(fd, set, cast) do { \ if (((cast*)(set))->fd_count < FD_SETSIZE) \ @@ -115,15 +115,15 @@ INT32 WINAPI __WSAFDIsSet32( SOCKET32, ws_fd_set32 * ); } while(0) #define WS_FD_SET16(fd, set) __WS_FD_SET((fd),(set), ws_fd_set16) #define WS_FD_SET32(fd, set) __WS_FD_SET((fd),(set), ws_fd_set32) -#define WS_FD_SET WINELIB_NAME(WS_FD_SET); +#define WS_FD_SET WINELIB_NAME(WS_FD_SET) #define WS_FD_ZERO16(set) (((ws_fd_set16*)(set))->fd_count=0) #define WS_FD_ZERO32(set) (((ws_fd_set32*)(set))->fd_count=0) -#define WS_FD_ZERO WINELIB_NAME(WS_FD_ZERO); +#define WS_FD_ZERO WINELIB_NAME(WS_FD_ZERO) #define WS_FD_ISSET16(fd, set) __WSAFDIsSet16((SOCKET16)(fd), (ws_fd_set16*)(set)) #define WS_FD_ISSET32(fd, set) __WSAFDIsSet32((SOCKET32)(fd), (ws_fd_set32*)(set)) -#define WS_FD_ISSET WINELIB_NAME(WS_FD_ISSET); +#define WS_FD_ISSET WINELIB_NAME(WS_FD_ISSET) /* * Internet address (old style... should be updated) @@ -371,10 +371,10 @@ extern "C" { INT16 WINAPI WSAStartup16(UINT16 wVersionRequired, LPWSADATA lpWSAData); INT32 WINAPI WSAStartup32(UINT32 wVersionRequired, LPWSADATA lpWSAData); -#define WSAStartup WINELIB_NAME(WSAStartup); +#define WSAStartup WINELIB_NAME(WSAStartup) void WINAPI WSASetLastError16(INT16 iError); void WINAPI WSASetLastError32(INT32 iError); -#define WSASetLastError WINELIB_NAME(WSASetLastError); +#define WSASetLastError WINELIB_NAME(WSASetLastError) INT32 WINAPI WSACleanup(void); INT32 WINAPI WSAGetLastError(void); BOOL32 WINAPI WSAIsBlocking(void);