[PATCH] dpwsockx: Implementation of GetCaps callback

[Alistair Leslie-Hughes]

Based on patch by Ismael Barros

Changes
- Removed todo_wine from tests
- Adjusted the DPWS_GUARANTEED_MAXBUFFERSIZE and DPWS_MAXBUFFERSIZE
   to be the correct values
- Remove unused defines.
- Remove Adjustment of dwMaxBufferSize by sizeof(DPSP_MSG_HEADER)
- Added check for structure size.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
---
 dlls/dplayx/dplay.c           |  3 +++
 dlls/dplayx/tests/dplayx.c    |  6 ++----
 dlls/dpwsockx/dpwsockx_dll.h  | 10 ++++++++++
 dlls/dpwsockx/dpwsockx_main.c | 27 +++++++++++++++++++++++++--
 4 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index f4d934f..b8d2f15 100644
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -2894,6 +2894,9 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerCaps( IDirectPlay4 *iface, DPID
     if ( This->dp2->connectionInitialized == NO_PROVIDER )
         return DPERR_UNINITIALIZED;
 
+    if( caps->dwSize != sizeof(DPCAPS) )
+        return DPERR_INVALIDPARAMS;
+
     /* Query the service provider */
     data.idPlayer = player;
     data.dwFlags = flags;
diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c
index de392aa..32e5e1f 100644
--- a/dlls/dplayx/tests/dplayx.c
+++ b/dlls/dplayx/tests/dplayx.c
@@ -1088,7 +1088,7 @@ static void test_GetCaps(void)
 
     /* dpcaps not ininitialized */
     hr = IDirectPlayX_GetCaps( pDP, &dpcaps, 0 );
-    todo_wine checkHR( DPERR_INVALIDPARAMS, hr );
+    checkHR( DPERR_INVALIDPARAMS, hr );
 
     dpcaps.dwSize = sizeof(DPCAPS);
 
@@ -1098,9 +1098,7 @@ static void test_GetCaps(void)
     {
 
         hr = IDirectPlayX_GetCaps( pDP, &dpcaps, dwFlags );
-        todo_wine checkHR( DP_OK, hr );
-
-
+        checkHR( DP_OK, hr );
         if ( hr == DP_OK )
         {
             check( sizeof(DPCAPS), dpcaps.dwSize );
diff --git a/dlls/dpwsockx/dpwsockx_dll.h b/dlls/dpwsockx/dpwsockx_dll.h
index 1a6ad6c..debcc11 100644
--- a/dlls/dpwsockx/dpwsockx_dll.h
+++ b/dlls/dpwsockx/dpwsockx_dll.h
@@ -26,6 +26,16 @@
 #include "wine/dplaysp.h"
 
 
+#define DPWS_MAXQUEUESIZE             0
+#define DPWS_HUNDREDBAUD              0
+#define DPWS_LATENCY                  500
+#define DPWS_MAXLOCALPLAYERS          65536
+#define DPWS_TIMEOUT                  5000
+#define DPWS_MAXBUFFERSIZE            65479
+#define DPWS_MAXPLAYERS               65536
+#define DPWS_GUARANTEED_MAXBUFFERSIZE 1048547
+#define DPWS_GUARANTEED_MAXPLAYERS    64
+
 typedef struct tagDPWS_THREADDATA
 {
     BOOL           is_running;
diff --git a/dlls/dpwsockx/dpwsockx_main.c b/dlls/dpwsockx/dpwsockx_main.c
index 548f37e..9606d73 100644
--- a/dlls/dpwsockx/dpwsockx_main.c
+++ b/dlls/dpwsockx/dpwsockx_main.c
@@ -100,9 +100,32 @@ static HRESULT WINAPI DPWSCB_GetAddress( LPDPSP_GETADDRESSDATA data )
 
 static HRESULT WINAPI DPWSCB_GetCaps( LPDPSP_GETCAPSDATA data )
 {
-    FIXME( "(%d,%p,0x%08x,%p)\n",
+    TRACE( "(%d,%p,0x%08x,%p)\n",
            data->idPlayer, data->lpCaps, data->dwFlags, data->lpISP );
-    return DPERR_UNSUPPORTED;
+
+    data->lpCaps->dwFlags = ( DPCAPS_ASYNCSUPPORTED |
+                              DPCAPS_GUARANTEEDOPTIMIZED |
+                              DPCAPS_GUARANTEEDSUPPORTED );
+
+    data->lpCaps->dwMaxQueueSize    = DPWS_MAXQUEUESIZE;
+    data->lpCaps->dwHundredBaud     = DPWS_HUNDREDBAUD;
+    data->lpCaps->dwLatency         = DPWS_LATENCY;
+    data->lpCaps->dwMaxLocalPlayers = DPWS_MAXLOCALPLAYERS;
+    data->lpCaps->dwHeaderLength    = sizeof(DPSP_MSG_HEADER);
+    data->lpCaps->dwTimeout         = DPWS_TIMEOUT;
+
+    if ( data->dwFlags & DPGETCAPS_GUARANTEED )
+    {
+        data->lpCaps->dwMaxBufferSize = DPWS_GUARANTEED_MAXBUFFERSIZE;
+        data->lpCaps->dwMaxPlayers    = DPWS_GUARANTEED_MAXPLAYERS;
+    }
+    else
+    {
+        data->lpCaps->dwMaxBufferSize = DPWS_MAXBUFFERSIZE;
+        data->lpCaps->dwMaxPlayers    = DPWS_MAXPLAYERS;
+    }
+
+    return DP_OK;
 }
 
 static HRESULT WINAPI DPWSCB_Open( LPDPSP_OPENDATA data )
-- 
1.9.1