diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index 2467ccf..1a7da3b 100644
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -3761,7 +3761,7 @@ static HRESULT WINAPI DirectPlay3AImpl_EnumConnections
 
       /* The enumeration will return FALSE if we are not to continue */
       if( !lpEnumCallback( &serviceProviderGUID, lpAddressBuffer, dwAddressBufferSize,
-                           &dpName, DPCONNECTION_DIRECTPLAY, lpContext ) )
+                           &dpName, dwFlags, lpContext ) )
       {
          return DP_OK;
       }
@@ -3869,7 +3869,7 @@ static HRESULT WINAPI DirectPlay3AImpl_EnumConnections
 
       /* The enumeration will return FALSE if we are not to continue */
       if( !lpEnumCallback( &serviceProviderGUID, lpAddressBuffer, dwAddressBufferSize,
-                           &dpName, DPCONNECTION_DIRECTPLAYLOBBY, lpContext ) )
+                           &dpName, dwFlags, lpContext ) )
       {
          HeapFree( GetProcessHeap(), 0, lpAddressBuffer );
          return DP_OK;
diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c
index 8df72fa..d59f11f 100644
--- a/dlls/dplayx/tests/dplayx.c
+++ b/dlls/dplayx/tests/dplayx.c
@@ -25,16 +25,44 @@
 #include <dplobby.h>
 
 
+#define check(expected, result)                 \
+    ok( (expected) == (result),                 \
+        "expected=%d got=%d\n",                 \
+        expected, result );
 #define checkHR(expected, result)                       \
     ok( (expected) == (result),                         \
         "expected=%s got=%s\n",                         \
         dpResult2str(expected), dpResult2str(result) );
+#define checkFlags(expected, result, flags)     \
+    ok( (expected) == (result),                 \
+        "expected=0x%08x(%s) got=0x%08x(%s)\n", \
+        expected, dwFlags2str(expected, flags), \
+        result, dwFlags2str(result, flags) );
+#define checkGuid(expected, result)             \
+    ok( IsEqualGUID(expected, result),          \
+        "expected=%s got=%s\n",                 \
+        Guid2str(expected), Guid2str(result) );
 
 
+
+/* GUID of the "Simple Connect" sample, from dx7 documentation */
+GUID appGuid = { 0xc6334fc0, 0x3b80, 0x4fed,
+                 { 0x89, 0xf1, 0xa4, 0xde, 0xfe, 0xb6, 0xdb, 0x20 } };
 GUID _GUID_NULL = { 0x00000000, 0x0000, 0x0000,
                     { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } };
 
 
+typedef struct tagCallbackData
+{
+    LPDIRECTPLAY4 pDP;
+    UINT dwCounter1, dwCounter2;
+    DWORD dwFlags;
+    char szTrace1[1024], szTrace2[1024];
+    DPID *dpid;
+    UINT dpidSize;
+} CallbackData, *lpCallbackData;
+
+
 static LPSTR get_temp_buffer()
 {
     static UINT index = 0;
@@ -47,6 +75,54 @@ static LPSTR get_temp_buffer()
 }
 
 
+static LPCSTR Guid2str(const GUID *guid)
+{
+    LPSTR buffer = get_temp_buffer();
+
+    if (!guid) return "(null)";
+
+    /* Service providers */
+    if (IsEqualGUID(guid, &DPSPGUID_IPX))
+        return "DPSPGUID_IPX";
+    if (IsEqualGUID(guid, &DPSPGUID_TCPIP))
+        return "DPSPGUID_TCPIP";
+    if (IsEqualGUID(guid, &DPSPGUID_SERIAL))
+        return "DPSPGUID_SERIAL";
+    if (IsEqualGUID(guid, &DPSPGUID_MODEM))
+        return "DPSPGUID_MODEM";
+    /* DirectPlay Address ID's */
+    if (IsEqualGUID(guid, &DPAID_TotalSize))
+        return "DPAID_TotalSize";
+    if (IsEqualGUID(guid, &DPAID_ServiceProvider))
+        return "DPAID_ServiceProvider";
+    if (IsEqualGUID(guid, &DPAID_LobbyProvider))
+        return "DPAID_LobbyProvider";
+    if (IsEqualGUID(guid, &DPAID_Phone))
+        return "DPAID_Phone";
+    if (IsEqualGUID(guid, &DPAID_PhoneW))
+        return "DPAID_PhoneW";
+    if (IsEqualGUID(guid, &DPAID_Modem))
+        return "DPAID_Modem";
+    if (IsEqualGUID(guid, &DPAID_ModemW))
+        return "DPAID_ModemW";
+    if (IsEqualGUID(guid, &DPAID_INet))
+        return "DPAID_INet";
+    if (IsEqualGUID(guid, &DPAID_INetW))
+        return "DPAID_INetW";
+    if (IsEqualGUID(guid, &DPAID_INetPort))
+        return "DPAID_INetPort";
+    if (IsEqualGUID(guid, &DPAID_ComPort))
+        return "DPAID_ComPort";
+
+    sprintf( buffer, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
+             guid->Data1, guid->Data2, guid->Data3,
+             guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
+             guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] );
+    return buffer;
+
+}
+
+
 static LPCSTR dpResult2str(HRESULT hr)
 {
     switch (hr)
@@ -129,6 +205,335 @@ static LPCSTR dpResult2str(HRESULT hr)
     }
 }
 
+static LPCSTR dwFlags2str(DWORD dwFlags, DWORD flagType)
+{
+
+#define FLAGS_DPCONNECTION     1
+#define FLAGS_DPENUMPLAYERS    1<<1
+#define FLAGS_DPENUMGROUPS     1<<2
+#define FLAGS_DPPLAYER         1<<3
+#define FLAGS_DPGROUP          1<<4
+#define FLAGS_DPENUMSESSIONS   1<<5
+#define FLAGS_DPGETCAPS        1<<6
+#define FLAGS_DPGET            1<<7
+#define FLAGS_DPRECEIVE        1<<8
+#define FLAGS_DPSEND           1<<9
+#define FLAGS_DPSET            1<<10
+#define FLAGS_DPMESSAGEQUEUE   1<<11
+#define FLAGS_DPCONNECT        1<<12
+#define FLAGS_DPOPEN           1<<13
+#define FLAGS_DPSESSION        1<<14
+#define FLAGS_DPLCONNECTION    1<<15
+#define FLAGS_DPESC            1<<16
+#define FLAGS_DPCAPS           1<<17
+
+    LPSTR flags = get_temp_buffer();
+
+    /* EnumConnections */
+
+    if (flagType & FLAGS_DPCONNECTION)
+    {
+        if (dwFlags & DPCONNECTION_DIRECTPLAY)
+            strcat(flags, "DPCONNECTION_DIRECTPLAY,");
+        if (dwFlags & DPCONNECTION_DIRECTPLAYLOBBY)
+            strcat(flags, "DPCONNECTION_DIRECTPLAYLOBBY,");
+    }
+
+    /* EnumPlayers,
+       EnumGroups */
+
+    if (flagType & FLAGS_DPENUMPLAYERS)
+    {
+        if (dwFlags == DPENUMPLAYERS_ALL)
+            strcat(flags, "DPENUMPLAYERS_ALL,");
+        if (dwFlags & DPENUMPLAYERS_LOCAL)
+            strcat(flags, "DPENUMPLAYERS_LOCAL,");
+        if (dwFlags & DPENUMPLAYERS_REMOTE)
+            strcat(flags, "DPENUMPLAYERS_REMOTE,");
+        if (dwFlags & DPENUMPLAYERS_GROUP)
+            strcat(flags, "DPENUMPLAYERS_GROUP,");
+        if (dwFlags & DPENUMPLAYERS_SESSION)
+            strcat(flags, "DPENUMPLAYERS_SESSION,");
+        if (dwFlags & DPENUMPLAYERS_SERVERPLAYER)
+            strcat(flags, "DPENUMPLAYERS_SERVERPLAYER,");
+        if (dwFlags & DPENUMPLAYERS_SPECTATOR)
+            strcat(flags, "DPENUMPLAYERS_SPECTATOR,");
+        if (dwFlags & DPENUMPLAYERS_OWNER)
+            strcat(flags, "DPENUMPLAYERS_OWNER,");
+    }
+    if (flagType & FLAGS_DPENUMGROUPS)
+    {
+        if (dwFlags == DPENUMGROUPS_ALL)
+            strcat(flags, "DPENUMGROUPS_ALL,");
+        if (dwFlags & DPENUMPLAYERS_LOCAL)
+            strcat(flags, "DPENUMGROUPS_LOCAL,");
+        if (dwFlags & DPENUMPLAYERS_REMOTE)
+            strcat(flags, "DPENUMGROUPS_REMOTE,");
+        if (dwFlags & DPENUMPLAYERS_GROUP)
+            strcat(flags, "DPENUMGROUPS_GROUP,");
+        if (dwFlags & DPENUMPLAYERS_SESSION)
+            strcat(flags, "DPENUMGROUPS_SESSION,");
+        if (dwFlags & DPENUMGROUPS_SHORTCUT)
+            strcat(flags, "DPENUMGROUPS_SHORTCUT,");
+        if (dwFlags & DPENUMGROUPS_STAGINGAREA)
+            strcat(flags, "DPENUMGROUPS_STAGINGAREA,");
+        if (dwFlags & DPENUMGROUPS_HIDDEN)
+            strcat(flags, "DPENUMGROUPS_HIDDEN,");
+    }
+
+    /* CreatePlayer */
+
+    if (flagType & FLAGS_DPPLAYER)
+    {
+        if (dwFlags & DPPLAYER_SERVERPLAYER)
+            strcat(flags, "DPPLAYER_SERVERPLAYER,");
+        if (dwFlags & DPPLAYER_SPECTATOR)
+            strcat(flags, "DPPLAYER_SPECTATOR,");
+        if (dwFlags & DPPLAYER_LOCAL)
+            strcat(flags, "DPPLAYER_LOCAL,");
+        if (dwFlags & DPPLAYER_OWNER)
+            strcat(flags, "DPPLAYER_OWNER,");
+    }
+
+    /* CreateGroup */
+
+    if (flagType & FLAGS_DPGROUP)
+    {
+        if (dwFlags & DPGROUP_STAGINGAREA)
+            strcat(flags, "DPGROUP_STAGINGAREA,");
+        if (dwFlags & DPGROUP_LOCAL)
+            strcat(flags, "DPGROUP_LOCAL,");
+        if (dwFlags & DPGROUP_HIDDEN)
+            strcat(flags, "DPGROUP_HIDDEN,");
+    }
+
+    /* EnumSessions */
+
+    if (flagType & FLAGS_DPENUMSESSIONS)
+    {
+        if (dwFlags & DPENUMSESSIONS_AVAILABLE)
+            strcat(flags, "DPENUMSESSIONS_AVAILABLE,");
+        if (dwFlags &  DPENUMSESSIONS_ALL)
+            strcat(flags, "DPENUMSESSIONS_ALL,");
+        if (dwFlags & DPENUMSESSIONS_ASYNC)
+            strcat(flags, "DPENUMSESSIONS_ASYNC,");
+        if (dwFlags & DPENUMSESSIONS_STOPASYNC)
+            strcat(flags, "DPENUMSESSIONS_STOPASYNC,");
+        if (dwFlags & DPENUMSESSIONS_PASSWORDREQUIRED)
+            strcat(flags, "DPENUMSESSIONS_PASSWORDREQUIRED,");
+        if (dwFlags & DPENUMSESSIONS_RETURNSTATUS)
+            strcat(flags, "DPENUMSESSIONS_RETURNSTATUS,");
+    }
+
+    /* GetCaps,
+       GetPlayerCaps */
+
+    if (flagType & FLAGS_DPGETCAPS)
+    {
+        if (dwFlags & DPGETCAPS_GUARANTEED)
+            strcat(flags, "DPGETCAPS_GUARANTEED,");
+    }
+
+    /* GetGroupData,
+       GetPlayerData */
+
+    if (flagType & FLAGS_DPGET)
+    {
+        if (dwFlags == DPGET_REMOTE)
+            strcat(flags, "DPGET_REMOTE,");
+        if (dwFlags & DPGET_LOCAL)
+            strcat(flags, "DPGET_LOCAL,");
+    }
+
+    /* Receive */
+
+    if (flagType & FLAGS_DPRECEIVE)
+    {
+        if (dwFlags & DPRECEIVE_ALL)
+            strcat(flags, "DPRECEIVE_ALL,");
+        if (dwFlags & DPRECEIVE_TOPLAYER)
+            strcat(flags, "DPRECEIVE_TOPLAYER,");
+        if (dwFlags & DPRECEIVE_FROMPLAYER)
+            strcat(flags, "DPRECEIVE_FROMPLAYER,");
+        if (dwFlags & DPRECEIVE_PEEK)
+            strcat(flags, "DPRECEIVE_PEEK,");
+    }
+
+    /* Send */
+
+    if (flagType & FLAGS_DPSEND)
+    {
+        /*if (dwFlags == DPSEND_NONGUARANTEED)
+          strcat(flags, "DPSEND_NONGUARANTEED,");*/
+        if (dwFlags == DPSEND_MAX_PRIORITY) /* = DPSEND_MAX_PRI */
+        {
+            strcat(flags, "DPSEND_MAX_PRIORITY,");
+        }
+        else
+        {
+            if (dwFlags & DPSEND_GUARANTEED)
+                strcat(flags, "DPSEND_GUARANTEED,");
+            if (dwFlags & DPSEND_HIGHPRIORITY)
+                strcat(flags, "DPSEND_HIGHPRIORITY,");
+            if (dwFlags & DPSEND_OPENSTREAM)
+                strcat(flags, "DPSEND_OPENSTREAM,");
+            if (dwFlags & DPSEND_CLOSESTREAM)
+                strcat(flags, "DPSEND_CLOSESTREAM,");
+            if (dwFlags & DPSEND_SIGNED)
+                strcat(flags, "DPSEND_SIGNED,");
+            if (dwFlags & DPSEND_ENCRYPTED)
+                strcat(flags, "DPSEND_ENCRYPTED,");
+            if (dwFlags & DPSEND_LOBBYSYSTEMMESSAGE)
+                strcat(flags, "DPSEND_LOBBYSYSTEMMESSAGE,");
+            if (dwFlags & DPSEND_ASYNC)
+                strcat(flags, "DPSEND_ASYNC,");
+            if (dwFlags & DPSEND_NOSENDCOMPLETEMSG)
+                strcat(flags, "DPSEND_NOSENDCOMPLETEMSG,");
+        }
+    }
+
+    /* SetGroupData,
+       SetGroupName,
+       SetPlayerData,
+       SetPlayerName,
+       SetSessionDesc */
+
+    if (flagType & FLAGS_DPSET)
+    {
+        if (dwFlags == DPSET_REMOTE)
+            strcat(flags, "DPSET_REMOTE,");
+        if (dwFlags & DPSET_LOCAL)
+            strcat(flags, "DPSET_LOCAL,");
+        if (dwFlags & DPSET_GUARANTEED)
+            strcat(flags, "DPSET_GUARANTEED,");
+    }
+
+    /* GetMessageQueue */
+
+    if (flagType & FLAGS_DPMESSAGEQUEUE)
+    {
+        if (dwFlags & DPMESSAGEQUEUE_SEND)
+            strcat(flags, "DPMESSAGEQUEUE_SEND,");
+        if (dwFlags & DPMESSAGEQUEUE_RECEIVE)
+            strcat(flags, "DPMESSAGEQUEUE_RECEIVE,");
+    }
+
+    /* Connect */
+
+    if (flagType & FLAGS_DPCONNECT)
+    {
+        if (dwFlags & DPCONNECT_RETURNSTATUS)
+            strcat(flags, "DPCONNECT_RETURNSTATUS,");
+    }
+
+    /* Open */
+
+    if (flagType & FLAGS_DPOPEN)
+    {
+        if (dwFlags & DPOPEN_JOIN)
+            strcat(flags, "DPOPEN_JOIN,");
+        if (dwFlags & DPOPEN_CREATE)
+            strcat(flags, "DPOPEN_CREATE,");
+        if (dwFlags & DPOPEN_RETURNSTATUS)
+            strcat(flags, "DPOPEN_RETURNSTATUS,");
+    }
+
+    /* DPSESSIONDESC2 */
+
+    if (flagType & FLAGS_DPSESSION)
+    {
+        if (dwFlags & DPSESSION_NEWPLAYERSDISABLED)
+            strcat(flags, "DPSESSION_NEWPLAYERSDISABLED,");
+        if (dwFlags & DPSESSION_MIGRATEHOST)
+            strcat(flags, "DPSESSION_MIGRATEHOST,");
+        if (dwFlags & DPSESSION_NOMESSAGEID)
+            strcat(flags, "DPSESSION_NOMESSAGEID,");
+        if (dwFlags & DPSESSION_JOINDISABLED)
+            strcat(flags, "DPSESSION_JOINDISABLED,");
+        if (dwFlags & DPSESSION_KEEPALIVE)
+            strcat(flags, "DPSESSION_KEEPALIVE,");
+        if (dwFlags & DPSESSION_NODATAMESSAGES)
+            strcat(flags, "DPSESSION_NODATAMESSAGES,");
+        if (dwFlags & DPSESSION_SECURESERVER)
+            strcat(flags, "DPSESSION_SECURESERVER,");
+        if (dwFlags & DPSESSION_PRIVATE)
+            strcat(flags, "DPSESSION_PRIVATE,");
+        if (dwFlags & DPSESSION_PASSWORDREQUIRED)
+            strcat(flags, "DPSESSION_PASSWORDREQUIRED,");
+        if (dwFlags & DPSESSION_MULTICASTSERVER)
+            strcat(flags, "DPSESSION_MULTICASTSERVER,");
+        if (dwFlags & DPSESSION_CLIENTSERVER)
+            strcat(flags, "DPSESSION_CLIENTSERVER,");
+
+        if (dwFlags & DPSESSION_DIRECTPLAYPROTOCOL)
+            strcat(flags, "DPSESSION_DIRECTPLAYPROTOCOL,");
+        if (dwFlags & DPSESSION_NOPRESERVEORDER)
+            strcat(flags, "DPSESSION_NOPRESERVEORDER,");
+        if (dwFlags & DPSESSION_OPTIMIZELATENCY)
+            strcat(flags, "DPSESSION_OPTIMIZELATENCY,");
+
+    }
+
+    /* DPLCONNECTION */
+
+    if (flagType & FLAGS_DPLCONNECTION)
+    {
+        if (dwFlags & DPLCONNECTION_CREATESESSION)
+            strcat(flags, "DPLCONNECTION_CREATESESSION,");
+        if (dwFlags & DPLCONNECTION_JOINSESSION)
+            strcat(flags, "DPLCONNECTION_JOINSESSION,");
+    }
+
+    /* EnumSessionsCallback2 */
+
+    if (flagType & FLAGS_DPESC)
+    {
+        if (dwFlags & DPESC_TIMEDOUT)
+            strcat(flags, "DPESC_TIMEDOUT,");
+    }
+
+    /* GetCaps,
+       GetPlayerCaps */
+
+    if (flagType & FLAGS_DPCAPS)
+    {
+        if (dwFlags & DPCAPS_ISHOST)
+            strcat(flags, "DPCAPS_ISHOST,");
+        if (dwFlags & DPCAPS_GROUPOPTIMIZED)
+            strcat(flags, "DPCAPS_GROUPOPTIMIZED,");
+        if (dwFlags & DPCAPS_KEEPALIVEOPTIMIZED)
+            strcat(flags, "DPCAPS_KEEPALIVEOPTIMIZED,");
+        if (dwFlags & DPCAPS_GUARANTEEDOPTIMIZED)
+            strcat(flags, "DPCAPS_GUARANTEEDOPTIMIZED,");
+        if (dwFlags & DPCAPS_GUARANTEEDSUPPORTED)
+            strcat(flags, "DPCAPS_GUARANTEEDSUPPORTED,");
+        if (dwFlags & DPCAPS_SIGNINGSUPPORTED)
+            strcat(flags, "DPCAPS_SIGNINGSUPPORTED,");
+        if (dwFlags & DPCAPS_ENCRYPTIONSUPPORTED)
+            strcat(flags, "DPCAPS_ENCRYPTIONSUPPORTED,");
+        if (dwFlags & DPCAPS_ASYNCCANCELSUPPORTED)
+            strcat(flags, "DPCAPS_ASYNCCANCELSUPPORTED,");
+        if (dwFlags & DPCAPS_ASYNCCANCELALLSUPPORTED)
+            strcat(flags, "DPCAPS_ASYNCCANCELALLSUPPORTED,");
+        if (dwFlags & DPCAPS_SENDTIMEOUTSUPPORTED)
+            strcat(flags, "DPCAPS_SENDTIMEOUTSUPPORTED,");
+        if (dwFlags & DPCAPS_SENDPRIORITYSUPPORTED)
+            strcat(flags, "DPCAPS_SENDPRIORITYSUPPORTED,");
+        if (dwFlags & DPCAPS_ASYNCSUPPORTED)
+            strcat(flags, "DPCAPS_ASYNCSUPPORTED,");
+
+        if (dwFlags & DPPLAYERCAPS_LOCAL)
+            strcat(flags, "DPPLAYERCAPS_LOCAL,");
+    }
+
+    if ((strlen(flags) == 0) && (dwFlags != 0))
+        strcpy(flags, "UNKNOWN");
+    else
+        flags[strlen(flags)-1] = '\0';
+
+    return flags;
+}
+
 
 /* DirectPlayCreate */
 
@@ -162,6 +567,152 @@ static void test_DirectPlayCreate()
 
 }
 
+/* EnumConnections */
+
+static BOOL FAR PASCAL EnumAddress_cb2( REFGUID guidDataType,
+                                        DWORD dwDataSize,
+                                        LPCVOID lpData,
+                                        LPVOID lpContext )
+{
+    lpCallbackData callbackData = (lpCallbackData) lpContext;
+
+    static REFGUID types[] = { &DPAID_TotalSize,
+                               &DPAID_ServiceProvider,
+                               &_GUID_NULL };
+    static DWORD sizes[] = { 4, 16, 0  };
+    static REFGUID sps[] = { &DPSPGUID_SERIAL, &DPSPGUID_MODEM,
+                             &DPSPGUID_IPX, &DPSPGUID_TCPIP };
+
+
+    checkGuid( types[ callbackData->dwCounter2 ], guidDataType );
+    check( sizes[ callbackData->dwCounter2 ], dwDataSize );
+
+    if ( IsEqualGUID( types[0], guidDataType ) )
+    {
+        todo_wine check( 80, *((LPDWORD) lpData) );
+    }
+    else if ( IsEqualGUID( types[1], guidDataType ) )
+    {
+        todo_wine checkGuid( sps[ callbackData->dwCounter1 ], (LPGUID) lpData );
+    }
+
+    callbackData->dwCounter2++;
+
+    return TRUE;
+}
+
+static BOOL CALLBACK EnumConnections_cb( LPCGUID lpguidSP,
+                                         LPVOID lpConnection,
+                                         DWORD dwConnectionSize,
+                                         LPCDPNAME lpName,
+                                         DWORD dwFlags,
+                                         LPVOID lpContext )
+{
+
+    lpCallbackData callbackData = (lpCallbackData) lpContext;
+    LPDIRECTPLAYLOBBY pDPL;
+
+
+    if (!callbackData->dwFlags)
+    {
+        callbackData->dwFlags = DPCONNECTION_DIRECTPLAY;
+    }
+
+    checkFlags( callbackData->dwFlags, dwFlags, FLAGS_DPCONNECTION );
+
+    /* Get info from lpConnection */
+    CoCreateInstance( &CLSID_DirectPlayLobby, NULL, CLSCTX_ALL,
+                      &IID_IDirectPlayLobby3A, (LPVOID*) &pDPL );
+
+    callbackData->dwCounter2 = 0;
+    IDirectPlayLobby_EnumAddress( pDPL, EnumAddress_cb2,
+                                  (LPCVOID) lpConnection,
+                                  dwConnectionSize,
+                                  (LPVOID) callbackData );
+    todo_wine check( 3, callbackData->dwCounter2 );
+
+    callbackData->dwCounter1++;
+
+    return TRUE;
+}
+
+static void test_EnumConnections()
+{
+
+    LPDIRECTPLAY4 pDP;
+    CallbackData callbackData;
+    HRESULT hr;
+
+
+    CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL,
+                      &IID_IDirectPlay4A, (LPVOID*) &pDP );
+
+
+    callbackData.dwCounter1 = 0;
+    callbackData.dwFlags = 0;
+    hr = IDirectPlayX_EnumConnections( pDP, &appGuid, EnumConnections_cb,
+                                       (LPVOID) &callbackData,
+                                       callbackData.dwFlags );
+    checkHR( DP_OK, hr );
+    check( 4, callbackData.dwCounter1 );
+
+    callbackData.dwCounter1 = 0;
+    callbackData.dwFlags = 0;
+    hr = IDirectPlayX_EnumConnections( pDP, NULL, EnumConnections_cb,
+                                       (LPVOID) &callbackData,
+                                       callbackData.dwFlags );
+    checkHR( DP_OK, hr );
+    check( 4, callbackData.dwCounter1 );
+
+    callbackData.dwCounter1 = 0;
+    callbackData.dwFlags = 0;
+    hr = IDirectPlayX_EnumConnections( pDP, &appGuid, NULL,
+                                       (LPVOID) &callbackData,
+                                       callbackData.dwFlags );
+    checkHR( DPERR_INVALIDPARAMS, hr );
+    check( 0, callbackData.dwCounter1 );
+
+
+    /* Flag tests */
+    callbackData.dwCounter1 = 0;
+    callbackData.dwFlags = DPCONNECTION_DIRECTPLAY;
+    hr = IDirectPlayX_EnumConnections( pDP, &appGuid, EnumConnections_cb,
+                                       (LPVOID) &callbackData,
+                                       callbackData.dwFlags );
+    checkHR( DP_OK, hr );
+    check( 4, callbackData.dwCounter1 );
+
+    callbackData.dwCounter1 = 0;
+    callbackData.dwFlags = DPCONNECTION_DIRECTPLAYLOBBY;
+    hr = IDirectPlayX_EnumConnections( pDP, &appGuid, EnumConnections_cb,
+                                       (LPVOID) &callbackData,
+                                       callbackData.dwFlags );
+    checkHR( DP_OK, hr );
+    check( 0, callbackData.dwCounter1 );
+
+    callbackData.dwCounter1 = 0;
+    callbackData.dwFlags = ( DPCONNECTION_DIRECTPLAY |
+                             DPCONNECTION_DIRECTPLAYLOBBY );
+    hr = IDirectPlayX_EnumConnections( pDP, &appGuid, EnumConnections_cb,
+                                       (LPVOID) &callbackData,
+                                       callbackData.dwFlags );
+    checkHR( DP_OK, hr );
+    check( 4, callbackData.dwCounter1 );
+
+    callbackData.dwCounter1 = 0;
+    callbackData.dwFlags = ~( DPCONNECTION_DIRECTPLAY |
+                              DPCONNECTION_DIRECTPLAYLOBBY );
+    hr = IDirectPlayX_EnumConnections( pDP, &appGuid, EnumConnections_cb,
+                                       (LPVOID) &callbackData,
+                                       callbackData.dwFlags );
+    checkHR( DPERR_INVALIDFLAGS, hr );
+    check( 0, callbackData.dwCounter1 );
+
+
+    IDirectPlayX_Release( pDP );
+
+}
+
 
 START_TEST(dplayx)
 {
@@ -169,6 +720,7 @@ START_TEST(dplayx)
 
 
     test_DirectPlayCreate();
+    test_EnumConnections();
 
 
     CoUninitialize();
diff --git a/include/dplay.h b/include/dplay.h
index e9c8c2e..2294ba8 100644
--- a/include/dplay.h
+++ b/include/dplay.h
@@ -275,6 +275,9 @@ typedef const DPSESSIONDESC2* LPCDPSESSIONDESC2;
 #define DPSESSION_PASSWORDREQUIRED      0x00000400
 #define DPSESSION_MULTICASTSERVER       0x00000800
 #define DPSESSION_CLIENTSERVER          0x00001000
+#define DPSESSION_DIRECTPLAYPROTOCOL    0x00002000
+#define DPSESSION_NOPRESERVEORDER       0x00004000
+#define DPSESSION_OPTIMIZELATENCY       0x00008000
 
 typedef struct tagDPLCONNECTION
 {
@@ -1061,6 +1064,20 @@ DECLARE_INTERFACE_(IDirectPlay4,IDirectPlay3)
 /* DirectPlay::Connect */
 #define DPCONNECT_RETURNSTATUS  (DPENUMSESSIONS_RETURNSTATUS)
 
+/* DirectPlay::GetCaps and DirectPlay::GetPlayerCaps */
+#define DPCAPS_ISHOST                  0x00000002
+#define DPCAPS_GROUPOPTIMIZED          0x00000008
+#define DPCAPS_KEEPALIVEOPTIMIZED      0x00000010
+#define DPCAPS_GUARANTEEDOPTIMIZED     0x00000020
+#define DPCAPS_GUARANTEEDSUPPORTED     0x00000040
+#define DPCAPS_SIGNINGSUPPORTED        0x00000080
+#define DPCAPS_ENCRYPTIONSUPPORTED     0x00000100
+#define DPPLAYERCAPS_LOCAL             0x00000800
+#define DPCAPS_ASYNCCANCELSUPPORTED    0x00001000
+#define DPCAPS_ASYNCCANCELALLSUPPORTED 0x00002000
+#define DPCAPS_SENDTIMEOUTSUPPORTED    0x00004000
+#define DPCAPS_SENDPRIORITYSUPPORTED   0x00008000
+#define DPCAPS_ASYNCSUPPORTED          0x00010000
 
 /** DirectPlay system messages **/