Changeset 945 for trunk/include

Timestamp:

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

Author:

phaller

Message:

Fix: update + fixes for port

Location:

trunk/include/win

Files:

• dplay.h (modified) (9 diffs)
• dplobby.h (modified) (7 diffs)

trunk/include/win/dplay.h

@@ -1 @@
-/* $Id: dplay.h,v 1.1 1999-05-24 20:19:11 ktk Exp $ */
-
 #ifndef __WINE_DPLAY_H
 #define __WINE_DPLAY_H
 
 #include "wine/obj_base.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* defined(__cplusplus) */
 
 #include "pshpack1.h"
@@ -129 +131 @@
 {
     DWORD dwSize;               /* Size of structure in bytes */
-    DWORD dwFlags;              
-    DWORD dwMaxBufferSize;      
+    DWORD dwFlags;
+    DWORD dwMaxBufferSize;
     DWORD dwMaxQueueSize;       /* Obsolete. */
     DWORD dwMaxPlayers;         /* Maximum players/groups (local + remote) */
     DWORD dwHundredBaud;        /* Bandwidth in 100 bits per second units;
-                                 * i.e. 24 is 2400, 96 is 9600, etc. 
+                                 * i.e. 24 is 2400, 96 is 9600, etc.
                                  */
     DWORD dwLatency;            /* Estimated latency; 0 = unknown */
@@ -147 +149 @@
 typedef struct tagDPNAME
 {
-    DWORD   dwSize;             
+    DWORD   dwSize;
     DWORD   dwFlags;            /* Not used must be 0 */
 
     union /*playerShortName */      /* Player's Handle? */
-    {                           
-        LPWSTR  lpszShortName;  
-        LPSTR   lpszShortNameA; 
+    {
+        LPWSTR  lpszShortName;
+        LPSTR   lpszShortNameA;
     }psn;
 
     union /*playerLongName */       /* Player's formal/real name */
-    {                         
-        LPWSTR  lpszLongName;  
-        LPSTR   lpszLongNameA;  
+    {
+        LPWSTR  lpszLongName;
+        LPSTR   lpszLongNameA;
     }pln;
 
@@ -191 +193 @@
 typedef struct tagDPSESSIONDESC2
 {
-    DWORD   dwSize;             
-    DWORD   dwFlags;           
-    GUID    guidInstance;      
+    DWORD   dwSize;
+    DWORD   dwFlags;
+    GUID    guidInstance;
     GUID    guidApplication;   /* GUID of the DP application, GUID_NULL if
                                 * all applications! */
-                               
-    DWORD   dwMaxPlayers;      
+
+    DWORD   dwMaxPlayers;
     DWORD   dwCurrentPlayers;   /* (read only value) */
 
     union  /* Session name */
-    {                             
-        LPWSTR  lpszSessionName;  
-        LPSTR   lpszSessionNameA; 
+    {
+        LPWSTR  lpszSessionName;
+        LPSTR   lpszSessionNameA;
     }sess;
 
     union  /* Optional password */
-    {                           
-        LPWSTR  lpszPassword;   
-        LPSTR   lpszPasswordA;  
+    {
+        LPWSTR  lpszPassword;
+        LPSTR   lpszPasswordA;
     }pass;
 
-    DWORD   dwReserved1;       
+    DWORD   dwReserved1;
     DWORD   dwReserved2;
 
-    DWORD   dwUser1;        /* For use by the application */  
+    DWORD   dwUser1;        /* For use by the application */
     DWORD   dwUser2;
     DWORD   dwUser3;
@@ -240 +242 @@
 typedef struct tagDPLCONNECTION
 {
-    DWORD               dwSize;          
-    DWORD               dwFlags;          
-    LPDPSESSIONDESC2    lpSessionDesc;  /* Ptr to session desc to use for connect */  
+    DWORD               dwSize;
+    DWORD               dwFlags;
+    LPDPSESSIONDESC2    lpSessionDesc;  /* Ptr to session desc to use for connect */
     LPDPNAME            lpPlayerName;   /* Ptr to player name structure */
-    GUID                guidSP;         /* GUID of Service Provider to use */ 
+    GUID                guidSP;         /* GUID of Service Provider to use */
     LPVOID              lpAddress;      /* Ptr to Address of Service Provider to use */
     DWORD               dwAddressSize;  /* Size of address data */
@@ -320 +322 @@
     LPSTR       lpSPName,       /* ptr to str w/ driver description */
     DWORD       dwMajorVersion, /* Major # of driver spec in lpguidSP */
-    DWORD       dwMinorVersion, /* Minor # of driver spec in lpguidSP */ 
+    DWORD       dwMinorVersion, /* Minor # of driver spec in lpguidSP */
     LPVOID      lpContext);     /* User given */
 
@@ -365 +367 @@
     LPVOID              lpContext );
 
+#include "poppack.h"
 
 /*****************************************************************************
@@ -373 +376 @@
     ICOM_METHOD2(HRESULT,AddPlayerToGroup,      DPID,idGroup, DPID,idPlayer) \
     ICOM_METHOD (HRESULT,Close) \
-    ICOM_METHOD4(HRESULT,CreatePlayer,          LPDPID,lpidPlayer, LPSTR,lpPlayerName, LPSTR,, LPHANDLE,) \
-    ICOM_METHOD3(HRESULT,CreateGroup,           LPDPID,lpidGroup, LPSTR,lpGroupName, LPSTR,) \
+    ICOM_METHOD4(HRESULT,CreatePlayer,          LPDPID,lpidPlayer, LPSTR,lpPlayerName, LPSTR,arg3, LPHANDLE,arg4) \
+    ICOM_METHOD3(HRESULT,CreateGroup,           LPDPID,lpidGroup, LPSTR,lpGroupName, LPSTR,arg3) \
     ICOM_METHOD2(HRESULT,DeletePlayerFromGroup, DPID,idGroup, DPID,idPlayer) \
     ICOM_METHOD1(HRESULT,DestroyPlayer,         DPID,idPlayer) \
     ICOM_METHOD1(HRESULT,DestroyGroup,          DPID,idGroup) \
-    ICOM_METHOD1(HRESULT,EnableNewPlayers,      BOOL,) \
+    ICOM_METHOD1(HRESULT,EnableNewPlayers,      BOOL,arg1) \
     ICOM_METHOD4(HRESULT,EnumGroupPlayers,      DPID,idGroup, LPDPENUMPLAYERSCALLBACK,lpEnumPlayersCallback, LPVOID,lpContext, DWORD,dwFlags) \
-    ICOM_METHOD4(HRESULT,EnumGroups,            DWORD,, LPDPENUMPLAYERSCALLBACK,lpEnumPlayersCallback, LPVOID,lpContext, DWORD,dwFlags) \
-    ICOM_METHOD4(HRESULT,EnumPlayers,           DWORD,, LPDPENUMPLAYERSCALLBACK,lpEnumPlayersCallback, LPVOID,lpContext, DWORD,dwFlags) \
+    ICOM_METHOD4(HRESULT,EnumGroups,            DWORD,arg1, LPDPENUMPLAYERSCALLBACK,lpEnumPlayersCallback, LPVOID,lpContext, DWORD,dwFlags) \
+    ICOM_METHOD4(HRESULT,EnumPlayers,           DWORD,arg1, LPDPENUMPLAYERSCALLBACK,lpEnumPlayersCallback, LPVOID,lpContext, DWORD,dwFlags) \
     ICOM_METHOD5(HRESULT,EnumSessions,          LPDPSESSIONDESC,lpsd, DWORD,dwTimeout, LPDPENUMSESSIONSCALLBACK,lpEnumSessionsCallback, LPVOID,lpContext, DWORD,dwFlags) \
     ICOM_METHOD1(HRESULT,GetCaps,               LPDPCAPS,lpDPCaps) \
     ICOM_METHOD2(HRESULT,GetMessageCount,       DPID,idPlayer, LPDWORD,lpdwCount) \
     ICOM_METHOD2(HRESULT,GetPlayerCaps,         DPID,idPlayer, LPDPCAPS,lpPlayerCaps) \
-    ICOM_METHOD5(HRESULT,GetPlayerName,         DPID,idPlayer, LPSTR,, LPDWORD,, LPSTR,, LPDWORD,) \
+    ICOM_METHOD5(HRESULT,GetPlayerName,         DPID,idPlayer, LPSTR,arg2, LPDWORD,arg3, LPSTR,arg4, LPDWORD,arg5) \
     ICOM_METHOD1(HRESULT,Initialize,            LPGUID,lpGUID) \
     ICOM_METHOD1(HRESULT,Open,                  LPDPSESSIONDESC,lpsd) \
     ICOM_METHOD5(HRESULT,Receive,               LPDPID,lpidFrom, LPDPID,lpidTo, DWORD,dwFlags, LPVOID,lpData, LPDWORD,lpdwDataSize) \
-    ICOM_METHOD1(HRESULT,SaveSession,           LPSTR,) \
+    ICOM_METHOD1(HRESULT,SaveSession,           LPSTR,arg1) \
     ICOM_METHOD5(HRESULT,Send,                  DPID,idFrom, DPID,idTo, DWORD,dwFlags, LPVOID,lpData, DWORD,dwDataSize) \
-    ICOM_METHOD3(HRESULT,SetPlayerName,         DPID,idPlayer, LPSTR,lpPlayerName, LPSTR,)
+    ICOM_METHOD3(HRESULT,SetPlayerName,         DPID,idPlayer, LPSTR,lpPlayerName, LPSTR,arg3)
 #define IDirectPlay_IMETHODS \
     IUnknown_IMETHODS \
@@ -587 +590 @@
 #endif
 
-
-#include "poppack.h"
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* defined(__cplusplus) */
 
 #endif /* __WINE_DPLAY_H */

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 */