August 2021 - Wine-commits - list.winehq.org

Jacek Caban : gdi32: Merge enhmfdrv/init.c into emfdc.c.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: 67bbaaf9216ce9e3cf1d0b8935f2b5d561dc2d69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67bbaaf9216ce9e3cf1d0b89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 24 13:39:59 2021 +0200 gdi32: Merge enhmfdrv/init.c into emfdc.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/emfdc.c | 291 +++++++++++++++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/init.c | 333 --------------------------------------------- 3 files changed, 291 insertions(+), 334 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=67bbaaf9216ce9e3cf1d…

1 0

Jacek Caban : gdi32: Merge enhmfdrv/objects.c into emfdc.c.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: 1d940b62d10f6cc10f64fefdb8bfb6f6c31b793e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d940b62d10f6cc10f64fefd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 24 13:40:13 2021 +0200 gdi32: Merge enhmfdrv/objects.c into emfdc.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/emfdc.c | 433 +++++++++++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/objects.c | 514 ------------------------------------------ 3 files changed, 433 insertions(+), 515 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1d940b62d10f6cc10f64…

1 0

Jacek Caban : gdi32: Merge enhmfdrv/graphics.c into emfdc.c.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: b793a8a2da7db12c3dd13c05b78a596e7fcce9a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b793a8a2da7db12c3dd13c05… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 24 13:40:30 2021 +0200 gdi32: Merge enhmfdrv/graphics.c into emfdc.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/emfdc.c | 699 ++++++++++++++++++++++++++++- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 834 ----------------------------------- 4 files changed, 698 insertions(+), 837 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b793a8a2da7db12c3dd1…

1 0

Jacek Caban : gdi32: Merge enhmfdrv/bitblt.c into emfdc.c.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: 580099aae868e576689719c8012ca80a3ffe6a2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=580099aae868e576689719c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 24 13:40:41 2021 +0200 gdi32: Merge enhmfdrv/bitblt.c into emfdc.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/emfdc.c | 297 ++++++++++++++++++++++++++++++- dlls/gdi32/enhmfdrv/bitblt.c | 326 ----------------------------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 3 - 4 files changed, 295 insertions(+), 332 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=580099aae868e5766897…

1 0

Jacek Caban : gdi32: Merge enhmetafiledrv.h into emfdc.c.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: 7e67cc996f33c735deada95159f28f2fba5d119c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e67cc996f33c735deada951… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 24 13:40:52 2021 +0200 gdi32: Merge enhmetafiledrv.h into emfdc.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/emfdc.c | 35 ++++++++++++++++++-------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 49 ------------------------------------ 2 files changed, 25 insertions(+), 59 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 477d0445bc7..479e0caa6b6 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -22,7 +22,8 @@ #include <assert.h> -#include "enhmfdrv/enhmetafiledrv.h" +#include "gdi_private.h" +#include "ntgdi_private.h" #include "winnls.h" #include "wine/debug.h" @@ -30,6 +31,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); +struct emf +{ + ENHMETAHEADER *emh; + DC_ATTR *dc_attr; + UINT handles_size, cur_handles; + HGDIOBJ *handles; + HANDLE file; + HBRUSH dc_brush; + HPEN dc_pen; + BOOL path; +}; + +#define HANDLE_LIST_INC 20 static const RECTL empty_bounds = { 0, 0, -1, -1 }; static BOOL emfdc_record( struct emf *emf, EMR *emr ) @@ -1880,7 +1894,7 @@ void EMFDC_DeleteDC( DC_ATTR *dc_attr ) HeapFree( GetProcessHeap(), 0, emf->emh ); for (index = 0; index < emf->handles_size; index++) if (emf->handles[index]) - GDI_hdc_not_using_object( emf->handles[index], dc_attr->hdc ); + GDI_hdc_not_using_object( emf->handles[index], emf->dc_attr->hdc ); HeapFree( GetProcessHeap(), 0, emf->handles ); } @@ -1970,6 +1984,7 @@ HDC WINAPI CreateEnhMetaFileW( HDC hdc, const WCHAR *filename, const RECT *rect, return 0; } + emf->dc_attr = dc_attr; dc_attr->emf = emf; if (description) /* App name\0Title\0\0 */ @@ -1992,7 +2007,7 @@ HDC WINAPI CreateEnhMetaFileW( HDC hdc, const WCHAR *filename, const RECT *rect, HANDLE_LIST_INC * sizeof(emf->handles[0]) ); emf->handles_size = HANDLE_LIST_INC; emf->cur_handles = 1; - emf->hFile = 0; + emf->file = 0; emf->dc_brush = 0; emf->dc_pen = 0; emf->path = FALSE; @@ -2052,7 +2067,7 @@ HDC WINAPI CreateEnhMetaFileW( HDC hdc, const WCHAR *filename, const RECT *rect, DeleteDC( ret ); return 0; } - emf->hFile = file; + emf->file = file; } TRACE( "returning %p\n", ret ); @@ -2103,23 +2118,23 @@ HENHMETAFILE WINAPI CloseEnhMetaFile( HDC hdc ) emf->emh->szlMillimeters.cy * 100 / emf->emh->szlDevice.cy; } - if (emf->hFile) /* disk based metafile */ + if (emf->file) /* disk based metafile */ { - if (!WriteFile( emf->hFile, emf->emh, emf->emh->nBytes, NULL, NULL )) + if (!WriteFile( emf->file, emf->emh, emf->emh->nBytes, NULL, NULL )) { - CloseHandle( emf->hFile ); + CloseHandle( emf->file ); return 0; } HeapFree( GetProcessHeap(), 0, emf->emh ); - mapping = CreateFileMappingA( emf->hFile, NULL, PAGE_READONLY, 0, 0, NULL ); + mapping = CreateFileMappingA( emf->file, NULL, PAGE_READONLY, 0, 0, NULL ); TRACE( "mapping = %p\n", mapping ); emf->emh = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); TRACE( "view = %p\n", emf->emh ); CloseHandle( mapping ); - CloseHandle( emf->hFile ); + CloseHandle( emf->file ); } - hmf = EMF_Create_HENHMETAFILE( emf->emh, emf->emh->nBytes, emf->hFile != 0 ); + hmf = EMF_Create_HENHMETAFILE( emf->emh, emf->emh->nBytes, emf->file != 0 ); emf->emh = NULL; /* So it won't be deleted */ DeleteDC( hdc ); return hmf; diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h deleted file mode 100644 index f9f9e1a1a93..00000000000 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Enhanced MetaFile driver definitions - * - * Copyright 1999 Huw D M Davies - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_ENHMETAFILEDRV_H -#define __WINE_ENHMETAFILEDRV_H - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "ntgdi_private.h" -#include "gdi_private.h" - -/* Enhanced Metafile driver physical DC */ - -struct emf -{ - ENHMETAHEADER *emh; /* Pointer to enhanced metafile header */ - DC_ATTR *dc_attr; - UINT handles_size, cur_handles; - HGDIOBJ *handles; - HANDLE hFile; /* Handle for disk based MetaFile */ - HBRUSH dc_brush; - HPEN dc_pen; - BOOL path; -}; - -#define HANDLE_LIST_INC 20 - - -#endif /* __WINE_METAFILEDRV_H */

1 0

Nikolay Sivov : oleaut32: Fully initialize VARIANT structure in VariantInit().
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: b560dbaebc125f80a8e34d4595e4eca02ae046c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b560dbaebc125f80a8e34d45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 24 16:13:05 2021 +0300 oleaut32: Fully initialize VARIANT structure in VariantInit(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 13 +++++++++---- dlls/oleaut32/variant.c | 17 +++-------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 05efb5a888b..f25a448645c 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -673,11 +673,16 @@ static void _test_bstr_var(unsigned line, const VARIANT *v, const WCHAR *str) static void test_VariantInit(void) { - VARIANT v; + VARIANT v, v2, v3; - memset(&v, -1, sizeof(v)); - VariantInit(&v); - ok(V_VT(&v) == VT_EMPTY, "VariantInit() returned vt %d\n", V_VT(&v)); + memset(&v, -1, sizeof(v)); + memset(&v2, 0, sizeof(v2)); + memset(&v3, -1, sizeof(v3)); + V_VT(&v3) = VT_EMPTY; + + VariantInit(&v); + ok(!memcmp(&v, &v2, sizeof(v)) || + broken(!memcmp(&v, &v3, sizeof(v3)) /* pre Win8 */), "Unexpected contents.\n"); } /* All possible combinations of extra V_VT() flags */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 40a1170e247..2c60f920f5e 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -545,24 +545,13 @@ static inline HRESULT VARIANT_ValidateType(VARTYPE vt) /****************************************************************************** * VariantInit [OLEAUT32.8] * - * Initialise a variant. - * - * PARAMS - * pVarg [O] Variant to initialise - * - * RETURNS - * Nothing. - * - * NOTES - * This function simply sets the type of the variant to VT_EMPTY. It does not - * free any existing value, use VariantClear() for that. + * Since Windows 8.1 whole structure is initialized, before that only type field was reset to VT_EMPTY. */ void WINAPI VariantInit(VARIANTARG* pVarg) { - TRACE("(%p)\n", pVarg); + TRACE("(%p)\n", pVarg); - /* Win8.1 zeroes whole struct. Previous implementations don't set any other fields. */ - V_VT(pVarg) = VT_EMPTY; + memset(pVarg, 0, sizeof(*pVarg)); } HRESULT VARIANT_ClearInd(VARIANTARG *pVarg)

1 0

Akihiro Sagawa : ws2_32/tests: Add socket option validity tests for a file handle.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: 2a45917ae264108f1a4ddd8adb1c65af0b73aaee URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a45917ae264108f1a4ddd8a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Aug 24 21:50:35 2021 +0900 ws2_32/tests: Add socket option validity tests for a file handle. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a8d415c3cea..d3f2459aa3a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -11691,6 +11691,15 @@ static void test_sockopt_validity(void) { IPV6_USER_MTU, 0, 0, TRUE }, {} }; + static const struct sockopt_validity_test file_handle_tests[] = + { + { -1, WSAENOTSOCK, 0, TRUE }, + { SO_TYPE, WSAENOTSOCK, 0, TRUE }, + { SO_OPENTYPE }, + {} + }; + char path[MAX_PATH]; + HANDLE file; SOCKET sock; sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -11736,6 +11745,12 @@ static void test_sockopt_validity(void) do_sockopt_validity_tests("IPv6 raw", sock, IPPROTO_IPV6, ipv6_raw_tests); closesocket(sock); } + + GetSystemWindowsDirectoryA(path, ARRAY_SIZE(path)); + strcat(path, "\\system.ini"); + file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0x0, NULL); + do_sockopt_validity_tests("file", (SOCKET)file, SOL_SOCKET, file_handle_tests); + CloseHandle(file); } START_TEST( sock )

1 0

Akihiro Sagawa : ws2_32: Explicitly return WSAENOTSOCK for a file handle in getsockopt() except SO_OPENTYPE.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: ffe20add5812fc45267af22aaa2af7d4e9a39d0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffe20add5812fc45267af22a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Aug 24 21:50:37 2021 +0900 ws2_32: Explicitly return WSAENOTSOCK for a file handle in getsockopt() except SO_OPENTYPE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51671 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 7 +++++++ dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 30f233fa78f..f58f7cea5cc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1363,6 +1363,13 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl debugstr_sockopt(level, optname), debugstr_optval(optval, 0), optlen, optlen ? *optlen : 0); + if ((level != SOL_SOCKET || optname != SO_OPENTYPE) && + !socket_list_find( s )) + { + SetLastError( WSAENOTSOCK ); + return SOCKET_ERROR; + } + switch(level) { case SOL_SOCKET: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d3f2459aa3a..ec010acebc6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -11693,8 +11693,8 @@ static void test_sockopt_validity(void) }; static const struct sockopt_validity_test file_handle_tests[] = { - { -1, WSAENOTSOCK, 0, TRUE }, - { SO_TYPE, WSAENOTSOCK, 0, TRUE }, + { -1, WSAENOTSOCK }, + { SO_TYPE, WSAENOTSOCK }, { SO_OPENTYPE }, {} };

1 0

Akihiro Sagawa : ws2_32: Disallow NULL in socket lookups.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: ee2e5c0242462b0a1538253cc69c6c3043027790 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee2e5c0242462b0a1538253c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Aug 24 21:50:39 2021 +0900 ws2_32: Disallow NULL in socket lookups. NULL means an unused slot, not a valid socket. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f58f7cea5cc..bf87e7824e5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -379,6 +379,8 @@ static BOOL socket_list_find( SOCKET socket ) { unsigned int i; + if (!socket) return FALSE; + EnterCriticalSection( &cs_socket_list ); for (i = 0; i < socket_list_size; ++i) { @@ -397,6 +399,8 @@ static BOOL socket_list_remove( SOCKET socket ) { unsigned int i; + if (!socket) return FALSE; + EnterCriticalSection(&cs_socket_list); for (i = 0; i < socket_list_size; ++i) {

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Server EnumServiceProviders.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: d4565f1541b2b8fae2030cceed4487c3d8a06518 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4565f1541b2b8fae2030cce… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 24 16:43:54 2021 +1000 dpnet: Implement IDirectPlay8Server EnumServiceProviders. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/server.c | 14 ++++++-- dlls/dpnet/tests/server.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index 977771697ac..26dd76388b1 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -126,9 +126,19 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_EnumServiceProviders(IDirectPlay8Se PDWORD pcReturned, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%s %s %p %p %p %d)\n", This, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), + TRACE("(%p)->(%s %s %p %p %p %d)\n", This, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), pSPInfoBuffer, pcbEnumData, pcReturned, dwFlags); - return E_NOTIMPL; + + if(!This->msghandler) + return DPNERR_UNINITIALIZED; + + if(dwFlags) + FIXME("Unhandled flags %x\n", dwFlags); + + if(pguidApplication) + FIXME("Application guid %s is currently being ignored\n", debugstr_guid(pguidApplication)); + + return enum_services_providers(pguidServiceProvider, pSPInfoBuffer, pcbEnumData, pcReturned); } static HRESULT WINAPI IDirectPlay8ServerImpl_CancelAsyncOperation(IDirectPlay8Server *iface, DPNHANDLE hAsyncHandle, DWORD dwFlags) diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 74a0e5adfcf..4314c69ccc1 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -184,6 +184,91 @@ static void test_server_info(void) } } +static void test_enum_service_providers(void) +{ + DPN_SERVICE_PROVIDER_INFO *serv_prov_info = NULL; + IDirectPlay8Server *server = NULL; + DWORD items, size; + DWORD i; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_DirectPlay8Server, NULL, CLSCTX_ALL, &IID_IDirectPlay8Server, (LPVOID*)&server); + ok(hr == S_OK, "Failed to create IDirectPlay8Server object\n"); + if (FAILED(hr)) + return; + + size = 0; + items = 0; + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, serv_prov_info, &size, &items, 0); + ok(hr == DPNERR_UNINITIALIZED, "got %x\n", hr); + + hr = IDirectPlay8Server_Initialize(server, NULL, DirectPlayMessageHandler, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (FAILED(hr)) + { + IDirectPlay8Server_Release(server); + return; + } + + size = 0; + items = 0; + + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, NULL, &size, NULL, 0); + ok(hr == E_POINTER, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, NULL, NULL, &items, 0); + ok(hr == E_POINTER, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, NULL, &size, &items, 0); + ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + ok(size != 0, "size is unexpectedly 0\n"); + + serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); + + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, serv_prov_info, &size, &items, 0); + ok(hr == S_OK, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + ok(items != 0, "Found unexpectedly no service providers\n"); + + trace("number of items found: %d\n", items); + + for (i=0;i<items;i++) + { + trace("Found Service Provider: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); + } + + ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); + + size = 0; + items = 0; + + hr = IDirectPlay8Server_EnumServiceProviders(server, &CLSID_DP8SP_TCPIP, NULL, NULL, &size, &items, 0); + ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + ok(size != 0, "size is unexpectedly 0\n"); + + serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); + + hr = IDirectPlay8Server_EnumServiceProviders(server, &CLSID_DP8SP_TCPIP, NULL, serv_prov_info, &size, &items, 0); + ok(hr == S_OK, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + ok(items != 0, "Found unexpectedly no adapter\n"); + + + for (i=0;i<items;i++) + { + trace("Found adapter: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found adapter guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); + } + + /* Invalid GUID */ + items = 88; + hr = IDirectPlay8Server_EnumServiceProviders(server, &appguid, NULL, serv_prov_info, &size, &items, 0); + ok(hr == DPNERR_DOESNOTEXIST, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + ok(items == 88, "Found adapter %d\n", items); + + HeapFree(GetProcessHeap(), 0, serv_prov_info); + IDirectPlay8Server_Release(server); +} + BOOL is_process_elevated(void) { HANDLE token; @@ -398,6 +483,7 @@ START_TEST(server) create_server(); test_server_info(); + test_enum_service_providers(); CoUninitialize();

1 0