dplayx: Constify some variables

Andrew Talbot Andrew.Talbot at talbotville.com
Thu Apr 26 16:45:27 CDT 2007


Changelog:
    dplayx: Constify some variables.

diff -urN a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
--- a/dlls/dplayx/dplay.c	2007-04-07 19:01:33.000000000 +0100
+++ b/dlls/dplayx/dplay.c	2007-04-26 21:32:24.000000000 +0100
@@ -54,12 +54,12 @@
 static lpPlayerData DP_CreatePlayer( IDirectPlay2Impl* iface, LPDPID lpid,
                                      LPDPNAME lpName, DWORD dwFlags,
                                      HANDLE hEvent, BOOL bAnsi );
-static BOOL DP_CopyDPNAMEStruct( LPDPNAME lpDst, LPDPNAME lpSrc, BOOL bAnsi );
+static BOOL DP_CopyDPNAMEStruct( LPDPNAME lpDst, const DPNAME *lpSrc, BOOL bAnsi );
 static void DP_SetPlayerData( lpPlayerData lpPData, DWORD dwFlags,
                               LPVOID lpData, DWORD dwDataSize );
 
-static lpGroupData DP_CreateGroup( IDirectPlay2AImpl* iface, LPDPID lpid,
-                                   LPDPNAME lpName, DWORD dwFlags,
+static lpGroupData DP_CreateGroup( IDirectPlay2AImpl* iface, const DPID *lpid,
+                                   const DPNAME *lpName, DWORD dwFlags,
                                    DPID idParent, BOOL bAnsi );
 static void DP_SetGroupData( lpGroupData lpGData, DWORD dwFlags,
                              LPVOID lpData, DWORD dwDataSize );
@@ -919,8 +919,8 @@
 }
 
 static
-lpGroupData DP_CreateGroup( IDirectPlay2AImpl* This, LPDPID lpid,
-                            LPDPNAME lpName, DWORD dwFlags,
+lpGroupData DP_CreateGroup( IDirectPlay2AImpl* This, const DPID *lpid,
+                            const DPNAME *lpName, DWORD dwFlags,
                             DPID idParent, BOOL bAnsi )
 {
   lpGroupData lpGData;
@@ -1290,7 +1290,7 @@
 }
 
 /* Basic area for Dst must already be allocated */
-static BOOL DP_CopyDPNAMEStruct( LPDPNAME lpDst, LPDPNAME lpSrc, BOOL bAnsi )
+static BOOL DP_CopyDPNAMEStruct( LPDPNAME lpDst, const DPNAME *lpSrc, BOOL bAnsi )
 {
   if( lpSrc == NULL )
   {
diff -urN a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c
--- a/dlls/dplayx/dplayx_global.c	2007-04-26 17:40:54.000000000 +0100
+++ b/dlls/dplayx/dplayx_global.c	2007-04-26 21:46:33.000000000 +0100
@@ -199,10 +199,10 @@
 /* static DPSESSIONDESC2* sessionData[ numSupportedSessions ]; */
 
 /* Function prototypes */
-static DWORD DPLAYX_SizeOfLobbyDataA( LPDPLCONNECTION lpDplData );
-static DWORD DPLAYX_SizeOfLobbyDataW( LPDPLCONNECTION lpDplData );
-static void DPLAYX_CopyConnStructA( LPDPLCONNECTION dest, LPDPLCONNECTION src );
-static void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, LPDPLCONNECTION src );
+static DWORD DPLAYX_SizeOfLobbyDataA( const DPLCONNECTION *lpDplData );
+static DWORD DPLAYX_SizeOfLobbyDataW( const DPLCONNECTION *lpDplData );
+static void DPLAYX_CopyConnStructA( LPDPLCONNECTION dest, const DPLCONNECTION *src );
+static void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, const DPLCONNECTION *src );
 static BOOL DPLAYX_IsAppIdLobbied( DWORD dwAppId, LPDPLAYX_LOBBYDATA* dplData );
 static void DPLAYX_InitializeLobbyDataEntry( LPDPLAYX_LOBBYDATA lpData );
 static BOOL DPLAYX_CopyIntoSessionDesc2A( LPDPSESSIONDESC2  lpSessionDest,
@@ -658,7 +658,7 @@
 }
 
 /* Assumption: Enough contiguous space was allocated at dest */
-void DPLAYX_CopyConnStructA( LPDPLCONNECTION dest, LPDPLCONNECTION src )
+void DPLAYX_CopyConnStructA( LPDPLCONNECTION dest, const DPLCONNECTION *src )
 {
   BYTE* lpStartOfFreeSpace;
 
@@ -780,7 +780,7 @@
 }
 
 /* Assumption: Enough contiguous space was allocated at dest */
-void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, LPDPLCONNECTION src )
+void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, const DPLCONNECTION *src )
 {
   BYTE*              lpStartOfFreeSpace;
 
@@ -855,7 +855,7 @@
 HRESULT DPLAYX_SetConnectionSettingsA
 ( DWORD dwFlags,
   DWORD dwAppID,
-  LPDPLCONNECTION lpConn )
+  const DPLCONNECTION *lpConn )
 {
   LPDPLAYX_LOBBYDATA lpDplData;
 
@@ -917,7 +917,7 @@
 HRESULT DPLAYX_SetConnectionSettingsW
 ( DWORD dwFlags,
   DWORD dwAppID,
-  LPDPLCONNECTION lpConn )
+  const DPLCONNECTION *lpConn )
 {
   LPDPLAYX_LOBBYDATA lpDplData;
 
@@ -961,7 +961,7 @@
   return DP_OK;
 }
 
-DWORD DPLAYX_SizeOfLobbyDataA( LPDPLCONNECTION lpConn )
+DWORD DPLAYX_SizeOfLobbyDataA( const DPLCONNECTION *lpConn )
 {
   DWORD dwTotalSize = sizeof( DPLCONNECTION );
 
@@ -1008,7 +1008,7 @@
   return dwTotalSize;
 }
 
-DWORD DPLAYX_SizeOfLobbyDataW( LPDPLCONNECTION lpConn )
+DWORD DPLAYX_SizeOfLobbyDataW( const DPLCONNECTION *lpConn )
 {
   DWORD dwTotalSize = sizeof( DPLCONNECTION );
 
diff -urN a/dlls/dplayx/dplayx_global.h b/dlls/dplayx/dplayx_global.h
--- a/dlls/dplayx/dplayx_global.h	2007-01-08 12:37:17.000000000 +0000
+++ b/dlls/dplayx/dplayx_global.h	2007-04-26 21:54:45.000000000 +0100
@@ -38,10 +38,10 @@
 
 HRESULT DPLAYX_SetConnectionSettingsA ( DWORD dwFlags,
                                         DWORD dwAppID,
-                                        LPDPLCONNECTION lpConn );
+                                        const DPLCONNECTION *lpConn );
 HRESULT DPLAYX_SetConnectionSettingsW ( DWORD dwFlags,
                                         DWORD dwAppID,
-                                        LPDPLCONNECTION lpConn );
+                                        const DPLCONNECTION *lpConn );
 
 BOOL DPLAYX_CreateLobbyApplication( DWORD dwAppID );
 BOOL DPLAYX_DestroyLobbyApplication( DWORD dwAppID );
diff -urN a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c
--- a/dlls/dplayx/name_server.c	2007-03-23 13:37:32.000000000 +0000
+++ b/dlls/dplayx/name_server.c	2007-04-26 22:03:58.000000000 +0100
@@ -211,7 +211,7 @@
  */
 HRESULT NS_SendSessionRequestBroadcast( LPCGUID lpcGuid,
                                         DWORD dwFlags,
-                                        LPSPINITDATA lpSpData )
+                                        const SPINITDATA *lpSpData )
 
 {
   DPSP_ENUMSESSIONSDATA data;
diff -urN a/dlls/dplayx/name_server.h b/dlls/dplayx/name_server.h
--- a/dlls/dplayx/name_server.h	2006-09-10 09:33:04.000000000 +0100
+++ b/dlls/dplayx/name_server.h	2007-04-26 22:04:14.000000000 +0100
@@ -46,7 +46,7 @@
 
 HRESULT NS_SendSessionRequestBroadcast( LPCGUID lpcGuid,
                                         DWORD dwFlags,
-                                        LPSPINITDATA lpSpData );
+                                        const SPINITDATA *lpSpData );
 
 
 BOOL NS_InitializeSessionCache( LPVOID* lplpNSInfo );



More information about the wine-patches mailing list