Changeset 945 for trunk/include/win/dplobby.h

Timestamp:

Sep 15, 1999, 10:14:51 PM (26 years ago)

Author:

phaller

Message:

Fix: update + fixes for port

File:

• trunk/include/win/dplobby.h (modified) (7 diffs)

trunk/include/win/dplobby.h

@@ -1 @@
-/* $Id: dplobby.h,v 1.1 1999-05-24 20:19:11 ktk Exp $ */
-
 #ifndef __WINE_DPLOBBY_H
 #define __WINE_DPLOBBY_H
@@ -6 +4 @@
 #include "dplay.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* defined(__cplusplus) */
 
-#pragma pack(1)
+#include "pshpack1.h"
 
 /*****************************************************************************
@@ -33 +34 @@
 typedef struct tagDPLAPPINFO
 {
-    DWORD       dwSize;            
-    GUID        guidApplication;   
+    DWORD       dwSize;
+    GUID        guidApplication;
 
     union appName
     {
-        LPSTR   lpszAppNameA;      
+        LPSTR   lpszAppNameA;
         LPWSTR  lpszAppName;
     };
@@ -75 +76 @@
     DWORD           dwFlags );
 
+#include "poppack.h"
 
 /*****************************************************************************
@@ -81 +83 @@
 #define ICOM_INTERFACE IDirectPlayLobby
 #define IDirectPlayLobby_METHODS \
-    ICOM_METHOD3(HRESULT,Connect,               DWORD,, LPDIRECTPLAY2*,, IUnknown*,) \
-    ICOM_METHOD6(HRESULT,CreateAddress,         REFGUID,, REFGUID,, LPCVOID,, DWORD,, LPVOID,, LPDWORD,) \
-    ICOM_METHOD4(HRESULT,EnumAddress,           LPDPENUMADDRESSCALLBACK,, LPCVOID,, DWORD,, LPVOID,) \
-    ICOM_METHOD4(HRESULT,EnumAddressTypes,      LPDPLENUMADDRESSTYPESCALLBACK,, REFGUID,, LPVOID,, DWORD,) \
-    ICOM_METHOD3(HRESULT,EnumLocalApplications, LPDPLENUMLOCALAPPLICATIONSCALLBACK,, LPVOID,, DWORD,) \
-    ICOM_METHOD3(HRESULT,GetConnectionSettings, DWORD,, LPVOID,, LPDWORD,) \
-    ICOM_METHOD5(HRESULT,ReceiveLobbyMessage,   DWORD,, DWORD,, LPDWORD,, LPVOID,, LPDWORD,) \
-    ICOM_METHOD4(HRESULT,RunApplication,        DWORD,, LPDWORD,, LPDPLCONNECTION,, HANDLE,) \
-    ICOM_METHOD4(HRESULT,SendLobbyMessage,      DWORD,, DWORD,, LPVOID,, DWORD,) \
-    ICOM_METHOD3(HRESULT,SetConnectionSettings, DWORD,, DWORD,, LPDPLCONNECTION,) \
-    ICOM_METHOD3(HRESULT,SetLobbyMessageEvent,  DWORD,, DWORD,, HANDLE,)
+    ICOM_METHOD3(HRESULT,Connect,               DWORD,arg1, LPDIRECTPLAY2*,arg2, IUnknown*,arg3) \
+    ICOM_METHOD6(HRESULT,CreateAddress,         REFGUID,arg1, REFGUID,arg2, LPCVOID,arg3, DWORD,arg4, LPVOID,arg5, LPDWORD,arg6) \
+    ICOM_METHOD4(HRESULT,EnumAddress,           LPDPENUMADDRESSCALLBACK,arg1, LPCVOID,arg2, DWORD,arg3, LPVOID,arg4) \
+    ICOM_METHOD4(HRESULT,EnumAddressTypes,      LPDPLENUMADDRESSTYPESCALLBACK,arg1, REFGUID,arg2, LPVOID,arg3, DWORD,arg4) \
+    ICOM_METHOD3(HRESULT,EnumLocalApplications, LPDPLENUMLOCALAPPLICATIONSCALLBACK,arg1, LPVOID,arg2, DWORD,arg3) \
+    ICOM_METHOD3(HRESULT,GetConnectionSettings, DWORD,arg1, LPVOID,arg2, LPDWORD,arg3) \
+    ICOM_METHOD5(HRESULT,ReceiveLobbyMessage,   DWORD,arg1, DWORD,arg2, LPDWORD,arg3, LPVOID,arg4, LPDWORD,arg5) \
+    ICOM_METHOD4(HRESULT,RunApplication,        DWORD,arg1, LPDWORD,arg2, LPDPLCONNECTION,arg3, HANDLE,arg4) \
+    ICOM_METHOD4(HRESULT,SendLobbyMessage,      DWORD,arg1, DWORD,arg2, LPVOID,arg3, DWORD,arg4) \
+    ICOM_METHOD3(HRESULT,SetConnectionSettings, DWORD,arg1, DWORD,arg2, LPDPLCONNECTION,arg3) \
+    ICOM_METHOD3(HRESULT,SetLobbyMessageEvent,  DWORD,arg1, DWORD,arg2, HANDLE,arg3)
 #define IDirectPlayLobby_IMETHODS \
     IUnknown_IMETHODS \
@@ -123 +125 @@
 #define ICOM_INTERFACE IDirectPlayLobby2
 #define IDirectPlayLobby2_METHODS \
-    ICOM_METHOD4(HRESULT,CreateCompoundAddress, LPCDPCOMPOUNDADDRESSELEMENT,, DWORD,, LPVOID,, LPDWORD,)
+    ICOM_METHOD4(HRESULT,CreateCompoundAddress, LPCDPCOMPOUNDADDRESSELEMENT,arg1, DWORD,arg2, LPVOID,arg3, LPDWORD,arg4)
 #define IDirectPlayLobby2_IMETHODS \
     IDirectPlayLobby_IMETHODS \
@@ -151 +153 @@
 #endif
 
-#pragma pack(4)
-
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* defined(__cplusplus) */
 
 #endif /* __WINE_DPLOBBY_H */