From 5891249f1b1b540382ada57ce69192ac70af35e7 Mon Sep 17 00:00:00 2001 From: Raphael Junqueira Date: Wed, 7 Apr 2004 18:59:53 +0000 Subject: [PATCH] Correct dplay8 headers for future use. --- include/dpaddr.h | 15 ++++++++------- include/dplay8.h | 12 +++++------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/include/dpaddr.h b/include/dpaddr.h index 84706b145ea..5e029f17d87 100644 --- a/include/dpaddr.h +++ b/include/dpaddr.h @@ -121,9 +121,9 @@ typedef struct sockaddr SOCKADDR; DEFINE_GUID(CLSID_DirectPlay8Address, 0x934a9523, 0xa3ca, 0x4bc5, 0xad, 0xa0, 0xd6, 0xd9, 0x5d, 0x97, 0x94, 0x21); DEFINE_GUID(IID_IDirectPlay8Address, 0x83783300, 0x4063, 0x4c8a, 0x9d, 0xb3, 0x82, 0x83, 0xa, 0x7f, 0xeb, 0x31); -typedef struct IDirectPlay8Address *PDIRECTPLAY8ADDRESS, *LPDIRECTPLAY8ADDRESS; +typedef struct IDirectPlay8Address IDirectPlay8Address, *PDIRECTPLAY8ADDRESS, *LPDIRECTPLAY8ADDRESS; DEFINE_GUID(IID_IDirectPlay8AddressIP, 0xe5a0e990, 0x2bad, 0x430b, 0x87, 0xda, 0xa1, 0x42, 0xcf, 0x75, 0xde, 0x58); -typedef struct IDirectPlay8AddressIP *PDIRECTPLAY8ADDRESSIP, *LPDIRECTPLAY8ADDRESSIP; +typedef struct IDirectPlay8AddressIP IDirectPlay8AddressIP, *PDIRECTPLAY8ADDRESSIP, *LPDIRECTPLAY8ADDRESSIP; /***************************************************************************** @@ -136,24 +136,25 @@ typedef struct IDirectPlay8AddressIP *PDIRECTPLAY8ADDRESSIP, *LPDIRECTPLAY STDMETHOD(BuildFromURLA)(THIS_ CHAR* pszSourceURL) PURE; \ STDMETHOD(Duplicate)(THIS_ PDIRECTPLAY8ADDRESS* ppdpaNewAddress) PURE; \ STDMETHOD(SetEqual)(THIS_ PDIRECTPLAY8ADDRESS pdpaAddress) PURE; \ - STDMETHOD(IsEqual)(THIS_ PDIRECTPLAY8ADDRESS pdpaAddress) PURE; \ + STDMETHOD(IsEqual)(THIS_ PDIRECTPLAY8ADDRESS pdpaAddress) PURE; \ STDMETHOD(Clear)(THIS) PURE; \ STDMETHOD(GetURLW)(THIS_ WCHAR* pwszURL, PDWORD pdwNumChars) PURE; \ STDMETHOD(GetURLA)(THIS_ CHAR* pszURL, PDWORD pdwNumChars) PURE; \ STDMETHOD(GetSP)(THIS_ GUID* pguidSP) PURE; \ - STDMETHOD(GetUserData)(THIS_ void* pvUserData, PDWORD pdwBufferSize) PURE; \ + STDMETHOD(GetUserData)(THIS_ LPVOID pvUserData, PDWORD pdwBufferSize) PURE; \ STDMETHOD(SetSP)(THIS_ CONST GUID* CONST pguidSP) PURE; \ STDMETHOD(SetUserData)(THIS_ CONST void* CONST pvUserData, CONST DWORD dwDataSize) PURE; \ STDMETHOD(GetNumComponents)(THIS_ PDWORD pdwNumComponents) PURE; \ - STDMETHOD(GetComponentByName)(THIS_ CONST WCHAR* CONST pwszName, void* pvBuffer, PDWORD pdwBufferSize, PDWORD pdwDataType) PURE; \ + STDMETHOD(GetComponentByName)(THIS_ CONST WCHAR* CONST pwszName, LPVOID pvBuffer, PDWORD pdwBufferSize, PDWORD pdwDataType) PURE; \ STDMETHOD(GetComponentByIndex)(THIS_ CONST DWORD dwComponentID, WCHAR* pwszName, PDWORD pdwNameLen, void* pvBuffer, PDWORD pdwBufferSize, PDWORD pdwDataType) PURE; \ STDMETHOD(AddComponent)(THIS_ CONST WCHAR* CONST pwszName, CONST void* CONST lpvData, CONST DWORD dwDataSize, CONST DWORD dwDataType) PURE; \ STDMETHOD(GetDevice)(THIS_ GUID* pDevGuid) PURE; \ STDMETHOD(SetDevice)(THIS_ CONST GUID* CONST devGuid) PURE; \ STDMETHOD(BuildFromDirectPlay4Address)(THIS_ LPVOID pvAddress, DWORD dwDataSize) PURE; -COM_DEFINE(IDirectPlay8Address,IUnknown) +ICOM_DEFINE(IDirectPlay8Address,IUnknown) #undef INTERFACE + #ifdef COBJMACROS /*** IUnknown methods ***/ #define IDirectPlay8Address_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) @@ -193,7 +194,7 @@ COM_DEFINE(IDirectPlay8Address,IUnknown) STDMETHOD(GetSockAddress)(THIS_ SOCKADDR* pSockAddr, PDWORD) PURE; \ STDMETHOD(GetLocalAddress)(THIS_ GUID* pguidAdapter, USHORT* pusPort) PURE; \ STDMETHOD(GetAddress)(THIS_ WCHAR* wszAddress, PDWORD pdwAddressLength, USHORT* psPort) PURE; -COM_DEFINE(IDirectPlay8AddressIP,IUnknown) +ICOM_DEFINE(IDirectPlay8AddressIP,IUnknown) #undef INTERFACE #ifdef COBJMACROS diff --git a/include/dplay8.h b/include/dplay8.h index 64d3ddce9b0..7da3d76d203 100644 --- a/include/dplay8.h +++ b/include/dplay8.h @@ -217,7 +217,7 @@ typedef struct _DPN_APPLICATION_DESC { typedef struct _BUFFERDESC { DWORD dwBufferSize; BYTE* pBufferData; -} BUFFERDESC, DPN_BUFFER_DESC, *PDPN_BUFFER_DESC, FAR * PBUFFERDESC; +} BUFFERDESC, DPN_BUFFER_DESC, *PDPN_BUFFER_DESC, *PBUFFERDESC; typedef struct _DPN_CAPS { DWORD dwSize; @@ -463,20 +463,18 @@ DEFINE_GUID(CLSID_DirectPlay8Client, 0x743f1dc6,0x5aba,0x429f,0x8b,0xdf,0xc5,0 DEFINE_GUID(CLSID_DirectPlay8Server, 0xda825e1b,0x6830,0x43d7,0x83,0x5d,0xb,0x5a,0xd8,0x29,0x56,0xa2); DEFINE_GUID(IID_IDirectPlay8Peer, 0x5102dacf,0x241b,0x11d3,0xae,0xa7,0x0,0x60,0x97,0xb0,0x14,0x11); -typedef struct IDirectPlay8Peer *PDIRECTPLAY8PEER; +typedef struct IDirectPlay8Peer IDirectPlay8Peer, *PDIRECTPLAY8PEER; DEFINE_GUID(IID_IDirectPlay8Client, 0x5102dacd,0x241b,0x11d3,0xae,0xa7,0x0,0x60,0x97,0xb0,0x14,0x11); -typedef struct IDirectPlay8Client *PDIRECTPLAY8CLIENT; +typedef struct IDirectPlay8Client IDirectPlay8Client, *PDIRECTPLAY8CLIENT; DEFINE_GUID(IID_IDirectPlay8Server, 0x5102dace,0x241b,0x11d3,0xae,0xa7,0x0,0x60,0x97,0xb0,0x14,0x11); -typedef struct IDirectPlay8Server *PDIRECTPLAY8SERVER; +typedef struct IDirectPlay8Server IDirectPlay8Server, *PDIRECTPLAY8SERVER; DEFINE_GUID(CLSID_DP8SP_IPX, 0x53934290,0x628d,0x11d2,0xae,0xf,0x0,0x60,0x97,0xb0,0x14,0x11); DEFINE_GUID(CLSID_DP8SP_TCPIP, 0xebfe7ba0,0x628d,0x11d2,0xae,0xf,0x0,0x60,0x97,0xb0,0x14,0x11); DEFINE_GUID(CLSID_DP8SP_SERIAL, 0x743b5d60,0x628d,0x11d2,0xae,0xf,0x0,0x60,0x97,0xb0,0x14,0x11); DEFINE_GUID(CLSID_DP8SP_MODEM, 0x6d4a3650,0x628d,0x11d2,0xae,0xf,0x0,0x60,0x97,0xb0,0x14,0x11); - -typedef struct IDirectPlay8LobbiedApplication *PDNLOBBIEDAPPLICATION; -typedef struct IDirectPlay8Address IDirectPlay8Address; +typedef struct IDirectPlay8LobbiedApplication *PIDirectPlay8LobbiedApplication, DNLOBBIEDAPPLICATION; /*****************************************************************************