February 2017 - Wine-commits

Huw Davies : gdi32/tests: Test blitting from a D3DKMT bitmap to a regular bitmap.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: be908f2f269bae42e089f49b9b7a7e796913ae43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be908f2f269bae42e089f49b9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 13 14:08:05 2017 +0000 gdi32/tests: Test blitting from a D3DKMT bitmap to a regular bitmap. Based on a patch by Henri Verbeet. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/bitmap.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 1c1db17..a4002c8 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -5663,8 +5663,10 @@ static void test_D3DKMTCreateDCFromMemory( void ) HGDIOBJ *bitmap; DIBSECTION dib; BOOL fail, ret; - DWORD type; + DWORD type, pixel; int size; + HDC bmp_dc; + HBITMAP bmp; static const struct { @@ -5859,6 +5861,15 @@ static void test_D3DKMTCreateDCFromMemory( void ) ret = BitBlt( create_desc.hDc, 1, 1, 2, 2, NULL, 0, 0, WHITENESS ); ok(ret, "Failed to blit.\n"); + /* Also test blitting to a regular bitmap */ + bmp_dc = CreateCompatibleDC( create_desc.hDeviceDc ); + ok(bmp_dc != NULL, "failed to create DC\n"); + bmp = CreateCompatibleBitmap( bmp_dc, create_desc.Width, create_desc.Height ); + ok(bmp != NULL, "failed to create bmp\n"); + bmp = SelectObject( bmp_dc, bmp ); + ret = BitBlt( bmp_dc, 0, 0, create_desc.Width, create_desc.Height, create_desc.hDc, 0, 0, SRCCOPY ); + ok(ret, "Failed to blit.\n"); + destroy_desc.hDc = create_desc.hDc; destroy_desc.hBitmap = create_desc.hBitmap; @@ -5891,8 +5902,25 @@ static void test_D3DKMTCreateDCFromMemory( void ) test_data[i].name, colour, x, y, expected); if (colour != expected) fail = TRUE; + + /* 'Xn' or 'An' formats don't successfully blit to the regular bmp */ + if (test_data[i].format == D3DDDIFMT_R8G8B8 || test_data[i].format == D3DDDIFMT_R5G6B5) + { + pixel = GetPixel( bmp_dc, x, y ); + if ((x == 1 || x == 2) && (y == 1 || y == 2)) + expected = 0x00ffffff; + else if (x < create_desc.Width && y < create_desc.Height) + expected = 0x00000000; + else + expected = CLR_INVALID; + ok(pixel == expected, "%s: got 0x%08x at %u, %u, expect 0x%08x\n", test_data[i].name, + pixel, x, y, expected); + } } } + + DeleteObject( SelectObject( bmp_dc, bmp ) ); + DeleteDC( bmp_dc ); } }

1 0

Nikolay Sivov : pstorec: Fix QueryInterface() of IPStore.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 8d3af5690493a515f60adfbb77b6232baf7faaa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d3af5690493a515f60adfbb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 13 16:57:12 2017 +0300 pstorec: Fix QueryInterface() of IPStore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/pstorec/pstorec.c | 7 ++-- dlls/pstorec/tests/Makefile.in | 4 +++ dlls/pstorec/tests/pstorec.c | 72 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 82 insertions(+), 3 deletions(-) diff --git a/configure b/configure index b2abca4..35273b0 100755 --- a/configure +++ b/configure @@ -18249,6 +18249,7 @@ wine_fn_config_test dlls/propsys/tests propsys_test wine_fn_config_dll psapi enable_psapi implib wine_fn_config_test dlls/psapi/tests psapi_test wine_fn_config_dll pstorec enable_pstorec clean +wine_fn_config_test dlls/pstorec/tests pstorec_test wine_fn_config_dll qcap enable_qcap wine_fn_config_test dlls/qcap/tests qcap_test wine_fn_config_dll qedit enable_qedit clean diff --git a/configure.ac b/configure.ac index 8bffab9..367851d 100644 --- a/configure.ac +++ b/configure.ac @@ -3306,6 +3306,7 @@ WINE_CONFIG_TEST(dlls/propsys/tests) WINE_CONFIG_DLL(psapi,,[implib]) WINE_CONFIG_TEST(dlls/psapi/tests) WINE_CONFIG_DLL(pstorec,,[clean]) +WINE_CONFIG_TEST(dlls/pstorec/tests) WINE_CONFIG_DLL(qcap) WINE_CONFIG_TEST(dlls/qcap/tests) WINE_CONFIG_DLL(qedit,,[clean]) diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c index 593629b..02cd803 100644 --- a/dlls/pstorec/pstorec.c +++ b/dlls/pstorec/pstorec.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "initguid.h" #include "ole2.h" #include "pstore.h" @@ -67,13 +68,13 @@ static HRESULT WINAPI PStore_fnQueryInterface( { PStore_impl *This = impl_from_IPStore(iface); - TRACE("%p %s\n",This,debugstr_guid(riid)); + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObj); *ppvObj = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) + if (IsEqualIID(riid, &IID_IPStore) || IsEqualIID(riid, &IID_IUnknown)) { - *ppvObj = This; + *ppvObj = &This->IPStore_iface; } if (*ppvObj) diff --git a/dlls/pstorec/tests/Makefile.in b/dlls/pstorec/tests/Makefile.in new file mode 100644 index 0000000..2287f0f --- /dev/null +++ b/dlls/pstorec/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = pstorec.dll + +C_SRCS = \ + pstorec.c diff --git a/dlls/pstorec/tests/pstorec.c b/dlls/pstorec/tests/pstorec.c new file mode 100644 index 0000000..bc30b19 --- /dev/null +++ b/dlls/pstorec/tests/pstorec.c @@ -0,0 +1,72 @@ +/* + * Protected Storage Tests + * + * Copyright 2017 Nikolay Sivov + * + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "initguid.h" +#include "ole2.h" +#include "pstore.h" + +#include "wine/test.h" + +static HRESULT (WINAPI *pPStoreCreateInstance)(IPStore **store, PST_PROVIDERID *id, void *reserved, DWORD flags); + +static void test_PStoreCreateInstance(void) +{ + IPStore *store; + IUnknown *unk; + HRESULT hr; + + if (!pPStoreCreateInstance) + { + win_skip("PStoreCreateInstance is not available\n"); + return; + } + + hr = pPStoreCreateInstance(&store, NULL, NULL, 0); + if (hr == E_NOTIMPL) + { + /* this function does not work starting with Win8 */ + win_skip("PStoreCreateInstance is not implemented on this system\n"); + return; + } + ok(hr == S_OK, "Unexpected return value %#x.\n", hr); + + hr = IPStore_QueryInterface(store, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Unexpected return value %#x.\n", hr); + IUnknown_Release(unk); + + hr = IPStore_QueryInterface(store, &IID_IPStore, (void **)&unk); + ok(hr == S_OK, "Unexpected return value %#x.\n", hr); + IUnknown_Release(unk); + + IPStore_Release(store); +} + +START_TEST(pstorec) +{ + HMODULE module = LoadLibraryA("pstorec"); + + pPStoreCreateInstance = (void *)GetProcAddress(module, "PStoreCreateInstance"); + + test_PStoreCreateInstance(); +}

1 0

Francois Gouget : winetest: Allow sending the report to another server.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: a83c650362d81fdd25d3cba0d10fa8f76ea6552d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83c650362d81fdd25d3cba0d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 10 16:42:48 2017 +0100 winetest: Allow sending the report to another server. This makes it possible to send the reports to both the official server and a test server. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 22 +++++++++++----- programs/winetest/send.c | 62 ++++++++++++++++++++++++++++++++++++++------ programs/winetest/winetest.h | 2 +- 3 files changed, 71 insertions(+), 15 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 4d1fa28..9c32573 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1227,6 +1227,7 @@ usage (void) " -q quiet mode, no output at all\n" " -o FILE put report into FILE, do not submit\n" " -s FILE submit FILE, do not run tests\n" +" -S URL URL to submit the results to\n" " -t TAG include TAG of characters [-.0-9a-zA-Z] in the report\n" " -u URL include TestBot URL in the report\n" " -x DIR Extract tests to DIR (default: .\\wct) and exit\n"); @@ -1237,7 +1238,7 @@ int main( int argc, char *argv[] ) BOOL (WINAPI *pIsWow64Process)(HANDLE hProcess, PBOOL Wow64Process); char *logname = NULL, *outdir = NULL; const char *extract = NULL; - const char *cp, *submit = NULL; + const char *cp, *submit = NULL, *submiturl = NULL; int reset_env = 1; int poweroff = 0; int interactive = 1; @@ -1308,9 +1309,13 @@ int main( int argc, char *argv[] ) usage(); exit( 2 ); } - if (tag) - report (R_WARNING, "ignoring tag for submission"); - send_file (submit); + break; + case 'S': + if (!(submiturl = argv[++i])) + { + usage(); + exit( 2 ); + } break; case 'o': if (!(logname = argv[++i])) @@ -1358,7 +1363,12 @@ int main( int argc, char *argv[] ) exit (2); } } - if (!submit && !extract) { + if (submit) { + if (tag) + report (R_WARNING, "ignoring tag for submission"); + send_file (submiturl, submit); + + } else if (!extract) { int is_win9x = (GetVersion() & 0x80000000) != 0; report (R_STATUS, "Starting up"); @@ -1424,7 +1434,7 @@ int main( int argc, char *argv[] ) if (build_id[0] && nr_of_skips <= SKIP_LIMIT && failures <= FAILURES_LIMIT && !nr_native_dlls && !is_win9x && report (R_ASK, MB_YESNO, "Do you want to submit the test results?") == IDYES) - if (!send_file (logname) && !DeleteFileA(logname)) + if (!send_file (submiturl, logname) && !DeleteFileA(logname)) report (R_WARNING, "Can't remove logfile: %u", GetLastError()); } else run_tests (logname, outdir); report (R_STATUS, "Finished - %u failures", failures); diff --git a/programs/winetest/send.c b/programs/winetest/send.c index a419b16..1b0b94a 100644 --- a/programs/winetest/send.c +++ b/programs/winetest/send.c @@ -121,7 +121,7 @@ send_str (SOCKET s, ...) } static int -send_file_direct (const char *name) +send_file_direct (const char * url, const char *name) { SOCKET s; HANDLE file; @@ -139,6 +139,11 @@ send_file_direct (const char *name) CONTENT_HEADERS "\r\n"; + if (url) { + report (R_WARNING, "Can't submit to an alternative URL"); + return 0; + } + s = open_http (SERVER_NAME); if (s == INVALID_SOCKET) return 1; @@ -243,7 +248,7 @@ send_file_direct (const char *name) } static int -send_file_wininet (const char *name) +send_file_wininet (const char *url, const char *name) { int ret = 0; HMODULE wininet_mod = NULL; @@ -264,6 +269,7 @@ send_file_wininet (const char *name) HINTERNET request = NULL; INTERNET_BUFFERSA buffers_in = { 0 }; char buffer[BUFLEN+1]; + URL_COMPONENTSA uc = { 0 }; static const char extra_headers[] = CONTENT_HEADERS; @@ -283,6 +289,38 @@ send_file_wininet (const char *name) pInternetWriteFile == NULL || pInternetReadFile == NULL || pInternetCloseHandle == NULL) { goto done; } + if (url) { + BOOL (WINAPI *pInternetCrackUrlA)(const char *url, DWORD url_length, DWORD flags, URL_COMPONENTSA *ret_comp); + pInternetCrackUrlA = (void *)GetProcAddress(wininet_mod, "InternetCrackUrlA"); + if (pInternetCrackUrlA == NULL) + goto done; + uc.dwStructSize = sizeof(uc); + uc.dwSchemeLength = uc.dwHostNameLength = uc.dwUserNameLength = + uc.dwPasswordLength = uc.dwUrlPathLength = uc.dwExtraInfoLength = + strlen(url) + 1; + uc.lpszScheme = heap_alloc (uc.dwSchemeLength); + uc.lpszHostName = heap_alloc (uc.dwHostNameLength); + uc.lpszUserName = heap_alloc (uc.dwUserNameLength); + uc.lpszPassword = heap_alloc (uc.dwPasswordLength); + uc.lpszUrlPath = heap_alloc (uc.dwUrlPathLength); + uc.lpszExtraInfo = heap_alloc (uc.dwExtraInfoLength); + if (!pInternetCrackUrlA(url, 0, 0, &uc)) { + report (R_WARNING, "Can't parse submit URL '%s'", url); + goto done; + } + if ((uc.nScheme != INTERNET_SCHEME_HTTP && uc.nScheme != INTERNET_SCHEME_HTTPS) || *uc.lpszExtraInfo) { + report (R_WARNING, "Can't submit report to scheme %s or extra info '%s'", uc.lpszScheme, uc.lpszExtraInfo); + goto done; + } + + } else { + uc.nScheme = INTERNET_SCHEME_HTTP; + uc.lpszHostName = heap_strdup (SERVER_NAME); + uc.nPort = INTERNET_DEFAULT_HTTP_PORT; + uc.lpszUserName = heap_strdup (""); + uc.lpszPassword = heap_strdup (""); + uc.lpszUrlPath = heap_strdup (URL_PATH); + } ret = 1; @@ -310,20 +348,22 @@ send_file_wininet (const char *name) filesize = 1.5*1024*1024; } - report (R_STATUS, "Opening HTTP connection to " SERVER_NAME); + report (R_STATUS, "Opening %s connection to %s:%d", + (uc.nScheme == INTERNET_SCHEME_HTTP ? "http" : "https"), + uc.lpszHostName, uc.nPort); session = pInternetOpen (USER_AGENT, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); if (session == NULL) { report (R_WARNING, "Unable to open connection, error %u", GetLastError()); goto done; } - connection = pInternetConnect (session, SERVER_NAME, INTERNET_DEFAULT_HTTP_PORT, "", "", INTERNET_SERVICE_HTTP, 0, 0); + connection = pInternetConnect (session, uc.lpszHostName, uc.nPort, uc.lpszUserName, uc.lpszPassword, INTERNET_SERVICE_HTTP, 0, 0); if (connection == NULL) { report (R_WARNING, "Unable to connect, error %u", GetLastError()); goto done; } - request = pHttpOpenRequest (connection, "POST", URL_PATH, NULL, NULL, NULL, + request = pHttpOpenRequest (connection, "POST", uc.lpszUrlPath, NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE | INTERNET_FLAG_NO_COOKIES | INTERNET_FLAG_NO_UI | - INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_RELOAD, 0); + INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_RELOAD | (uc.nScheme == INTERNET_SCHEME_HTTPS ? INTERNET_FLAG_SECURE : 0), 0); if (request == NULL) { report (R_WARNING, "Unable to open request, error %u", GetLastError()); goto done; @@ -396,6 +436,12 @@ send_file_wininet (const char *name) } done: + heap_free (uc.lpszScheme); + heap_free (uc.lpszHostName); + heap_free (uc.lpszUserName); + heap_free (uc.lpszPassword); + heap_free (uc.lpszUrlPath); + heap_free (uc.lpszExtraInfo); heap_free((void *)buffers_in.lpcszHeader); heap_free(str); if (pInternetCloseHandle != NULL && request != NULL) @@ -413,7 +459,7 @@ send_file_wininet (const char *name) } int -send_file (const char *name) +send_file (const char *url, const char *name) { - return send_file_wininet( name ) || send_file_direct( name ); + return send_file_wininet( url, name ) || send_file_direct( url, name ); } diff --git a/programs/winetest/winetest.h b/programs/winetest/winetest.h index 2b9046c..e74f126 100644 --- a/programs/winetest/winetest.h +++ b/programs/winetest/winetest.h @@ -34,7 +34,7 @@ char *strmake (size_t *lenp, ...); int goodtagchar (char c); const char *findbadtagchar (const char *tag); -int send_file (const char *name); +int send_file (const char *url, const char *name); extern HANDLE logfile;

1 0

André Hentschel : iphlpapi/tests: Add tests for GetUnicastIpAddressEntry.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: eaa5450ccd2abfb1b2946bb668cbfe45b7a50945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa5450ccd2abfb1b2946bb66… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 10 18:31:36 2017 +0100 iphlpapi/tests: Add tests for GetUnicastIpAddressEntry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 113 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index e4a5864..e0701a3 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -75,6 +75,7 @@ static DWORD (WINAPI *pGetTcpTable)(PMIB_TCPTABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetUdpTable)(PMIB_UDPTABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetPerAdapterInfo)(ULONG,PIP_PER_ADAPTER_INFO,PULONG); static DWORD (WINAPI *pGetAdaptersAddresses)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); +static DWORD (WINAPI *pGetUnicastIpAddressEntry)(MIB_UNICASTIPADDRESS_ROW*); static DWORD (WINAPI *pNotifyAddrChange)(PHANDLE,LPOVERLAPPED); static BOOL (WINAPI *pCancelIPChangeNotify)(LPOVERLAPPED); static DWORD (WINAPI *pGetExtendedTcpTable)(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CLASS,ULONG); @@ -123,6 +124,7 @@ static void loadIPHlpApi(void) pGetUdpTable = (void *)GetProcAddress(hLibrary, "GetUdpTable"); pGetPerAdapterInfo = (void *)GetProcAddress(hLibrary, "GetPerAdapterInfo"); pGetAdaptersAddresses = (void *)GetProcAddress(hLibrary, "GetAdaptersAddresses"); + pGetUnicastIpAddressEntry = (void *)GetProcAddress(hLibrary, "GetUnicastIpAddressEntry"); pNotifyAddrChange = (void *)GetProcAddress(hLibrary, "NotifyAddrChange"); pCancelIPChangeNotify = (void *)GetProcAddress(hLibrary, "CancelIPChangeNotify"); pGetExtendedTcpTable = (void *)GetProcAddress(hLibrary, "GetExtendedTcpTable"); @@ -1965,6 +1967,116 @@ static void test_GetIfTable2(void) pFreeMibTable( table ); } +static void test_GetUnicastIpAddressEntry(void) +{ + IP_ADAPTER_ADDRESSES *aa, *ptr; + MIB_UNICASTIPADDRESS_ROW row; + DWORD ret, size; + + if (!pGetUnicastIpAddressEntry) + { + win_skip( "GetUnicastIpAddressEntry not available\n" ); + return; + } + + ret = pGetUnicastIpAddressEntry( NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + memset( &row, 0, sizeof(row) ); + ret = pGetUnicastIpAddressEntry( &row ); + todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + memset( &row, 0, sizeof(row) ); + row.Address.Ipv4.sin_family = AF_INET; + row.Address.Ipv4.sin_port = 0; + row.Address.Ipv4.sin_addr.S_un.S_addr = 0x01020304; + ret = pGetUnicastIpAddressEntry( &row ); + ok( ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret ); + + memset( &row, 0, sizeof(row) ); + row.InterfaceIndex = 123; + ret = pGetUnicastIpAddressEntry( &row ); + todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + memset( &row, 0, sizeof(row) ); + row.InterfaceIndex = get_interface_index(); + row.Address.Ipv4.sin_family = AF_INET; + row.Address.Ipv4.sin_port = 0; + row.Address.Ipv4.sin_addr.S_un.S_addr = 0x01020304; + ret = pGetUnicastIpAddressEntry( &row ); + ok( ret == ERROR_NOT_FOUND, "got %u\n", ret ); + + memset( &row, 0, sizeof(row) ); + row.InterfaceIndex = 123; + row.Address.Ipv4.sin_family = AF_INET; + row.Address.Ipv4.sin_port = 0; + row.Address.Ipv4.sin_addr.S_un.S_addr = 0x01020304; + ret = pGetUnicastIpAddressEntry( &row ); + ok( ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret ); + + ret = pGetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES, NULL, NULL, &size); + ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); + if (ret != ERROR_BUFFER_OVERFLOW) return; + + ptr = HeapAlloc(GetProcessHeap(), 0, size); + ret = pGetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES, NULL, ptr, &size); + ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); + + for (aa = ptr; !ret && aa; aa = aa->Next) + { + IP_ADAPTER_UNICAST_ADDRESS *ua; + + ua = aa->FirstUnicastAddress; + while (ua) + { + /* test with luid */ + memset( &row, 0, sizeof(row) ); + memcpy(&row.InterfaceLuid, &aa->Luid, sizeof(aa->Luid)); + memcpy(&row.Address, ua->Address.lpSockaddr, ua->Address.iSockaddrLength); + ret = pGetUnicastIpAddressEntry( &row ); + ok( ret == NO_ERROR, "got %u\n", ret ); + + /* test with index */ + memset( &row, 0, sizeof(row) ); + row.InterfaceIndex = S(U(*aa)).IfIndex; + memcpy(&row.Address, ua->Address.lpSockaddr, ua->Address.iSockaddrLength); + ret = pGetUnicastIpAddressEntry( &row ); + ok( ret == NO_ERROR, "got %u\n", ret ); + if (ret == NO_ERROR) + { + ok(row.InterfaceLuid.Info.Reserved == aa->Luid.Info.Reserved, "Expected %d, got %d\n", + aa->Luid.Info.Reserved, row.InterfaceLuid.Info.Reserved); + ok(row.InterfaceLuid.Info.NetLuidIndex == aa->Luid.Info.NetLuidIndex, "Expected %d, got %d\n", + aa->Luid.Info.NetLuidIndex, row.InterfaceLuid.Info.NetLuidIndex); + ok(row.InterfaceLuid.Info.IfType == aa->Luid.Info.IfType, "Expected %d, got %d\n", + aa->Luid.Info.IfType, row.InterfaceLuid.Info.IfType); + ok(row.InterfaceIndex == S(U(*aa)).IfIndex, "Expected %d, got %d\n", + S(U(*aa)).IfIndex, row.InterfaceIndex); + ok(row.PrefixOrigin == ua->PrefixOrigin, "Expected %d, got %d\n", + ua->PrefixOrigin, row.PrefixOrigin); + ok(row.SuffixOrigin == ua->SuffixOrigin, "Expected %d, got %d\n", + ua->SuffixOrigin, row.SuffixOrigin); + ok(row.ValidLifetime == ua->ValidLifetime, "Expected %d, got %d\n", + ua->ValidLifetime, row.ValidLifetime); + ok(row.PreferredLifetime == ua->PreferredLifetime, "Expected %d, got %d\n", + ua->PreferredLifetime, row.PreferredLifetime); + ok(row.OnLinkPrefixLength == ua->OnLinkPrefixLength, "Expected %d, got %d\n", + ua->OnLinkPrefixLength, row.OnLinkPrefixLength); + ok(row.SkipAsSource == 0, "Expected 0, got %d\n", row.SkipAsSource); + ok(row.DadState == ua->DadState, "Expected %d, got %d\n", ua->DadState, row.DadState); + if (row.Address.si_family == AF_INET6) + ok(row.ScopeId.Value == row.Address.Ipv6.sin6_scope_id, "Expected %d, got %d\n", + row.Address.Ipv6.sin6_scope_id, row.ScopeId.Value); + else + ok(row.ScopeId.Value == 0, "Expected 0, got %d\n", row.ScopeId.Value); + ok(row.CreationTimeStamp.QuadPart, "CreationTimeStamp is 0\n"); + } + ua = ua->Next; + } + } + HeapFree(GetProcessHeap(), 0, ptr); +} + START_TEST(iphlpapi) { @@ -1989,6 +2101,7 @@ START_TEST(iphlpapi) test_interface_identifier_conversion(); test_GetIfEntry2(); test_GetIfTable2(); + test_GetUnicastIpAddressEntry(); freeIPHlpApi(); } }

1 0

Gerald Pfeifer : services/tests: Add #include <stdarg.h> to service.c.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: f353e42561ad8dc984cf6d636aee6b0f3b17729b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f353e42561ad8dc984cf6d636… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Feb 10 21:57:18 2017 +0100 services/tests: Add #include <stdarg.h> to service.c. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/tests/service.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 0e9bcd7..9841949 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + #include <windef.h> #include <winsvc.h> #include <stdio.h>

1 0

Jacob Lifshay : kernel32: Fix improper escaping of quotes in command line.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: c7ad47e9b29971509d8ea76e918b6f623ca52a17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7ad47e9b29971509d8ea76e9… Author: Jacob Lifshay <programmerjake(a)gmail.com> Date: Thu Feb 9 16:26:36 2017 -0800 kernel32: Fix improper escaping of quotes in command line. Signed-off-by: Jacob Lifshay <programmerjake(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 70c38eb..5b8a3d3 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -745,6 +745,10 @@ static void update_library_argv0( const WCHAR *argv0 ) * resulting in an odd number of '\' followed by a '"' * '\"' -> '\\\"' * '\\"' -> '\\\\\"' + * - '\'s are followed by the closing '"' must be doubled, + * resulting in an even number of '\' followed by a '"' + * ' \' -> '" \\"' + * ' \\' -> '" \\\\"' * - '\'s that are not followed by a '"' can be left as is * 'a\b' == 'a\b' * 'a\\b' == 'a\\b' @@ -787,7 +791,7 @@ static BOOL build_command_line( WCHAR **argv ) } len+=(a-*arg)+1 /* for the separating space */; if (has_space) - len+=2; /* for the quotes */ + len+=2+bcount; /* for the quotes and doubling of '\' preceding the closing quote */ } if (!(rupp->CommandLine.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR)))) @@ -800,6 +804,7 @@ static BOOL build_command_line( WCHAR **argv ) { BOOL has_space,has_quote; WCHAR* a; + int bcount; /* Check for quotes and spaces in this argument */ has_space=has_quote=FALSE; @@ -821,9 +826,7 @@ static BOOL build_command_line( WCHAR **argv ) /* Now transfer it to the command line */ if (has_space) *p++='"'; - if (has_quote) { - int bcount; - + if (has_quote || has_space) { bcount=0; a=*arg; while (*a!='\0') { @@ -849,8 +852,14 @@ static BOOL build_command_line( WCHAR **argv ) WCHAR* x = *arg; while ((*p=*x++)) p++; } - if (has_space) + if (has_space) { + int i; + + /* Double all the '\' preceding the closing quote */ + for (i=0;i<bcount;i++) + *p++='\\'; *p++='"'; + } *p++=' '; } if (p > rupp->CommandLine.Buffer)

1 0

Alistair Leslie-Hughes : dpnet: Use registry lookup in EnumServiceProviders.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: e21c573295a4fa8b00388b2c05d7c0a37bd6b161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21c573295a4fa8b00388b2c0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 9 06:45:42 2017 +0000 dpnet: Use registry lookup in EnumServiceProviders. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/peer.c | 118 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 90 insertions(+), 28 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index d7144df..461d610 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -126,63 +126,125 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_Initialize(IDirectPlay8Peer *iface, return DPN_OK; } -static HRESULT WINAPI IDirectPlay8PeerImpl_EnumServiceProviders(IDirectPlay8Peer *iface, - const GUID * const pguidServiceProvider, const GUID * const pguidApplication, - DPN_SERVICE_PROVIDER_INFO * const pSPInfoBuffer, DWORD * const pcbEnumData, - DWORD * const pcReturned, const DWORD dwFlags) +static HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER_INFO * const info_buffer, + DWORD * const buf_size, DWORD * const returned) { - static const WCHAR dp_providerW[] = {'D','i','r','e','c','t','P','l','a','y','8',' ','T','C','P','/','I','P',' ', - 'S','e','r','v','i','c','e',' ','P','r','o','v','i','d','e','r','\0'}; + static const WCHAR serviceproviders[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\', + 'D','i','r','e','c','t','P','l','a','y','8','\\', + 'S','e','r','v','i','c','e',' ','P','r','o','v','i','d','e','r','s',0}; + static const WCHAR friendly[] = {'F','r','i','e','n','d','l','y',' ','N','a','m','e',0}; static const WCHAR dp_adapterW[] = {'L','o','c','a','l',' ','A','r','e','a',' ','C','o','n','n','e','c','t','i','o','n', - ' ','-',' ','I','P','v','4','\0'}; - + ' ','-',' ','I','P','v','4',0}; static const GUID adapter_guid = {0x4ce725f6, 0xd3c0, 0xdade, {0xba, 0x6f, 0x11, 0xf9, 0x65, 0xbc, 0x42, 0x99}}; - DWORD req_size; - - TRACE("(%p)->(%p,%p,%p,%p,%p,%x): stub\n", iface, pguidServiceProvider, pguidApplication, pSPInfoBuffer, - pcbEnumData, pcReturned, dwFlags); - - if(!pcReturned || !pcbEnumData) + DWORD req_size = 0; + LONG res; + HKEY key = NULL; + LONG next_key; + DWORD index = 0; + WCHAR provider[MAX_PATH]; + DWORD size; + + if(!returned || !buf_size) return E_POINTER; - if(!pguidServiceProvider) + *returned = 0; + + if(!service) { - req_size = sizeof(DPN_SERVICE_PROVIDER_INFO) + sizeof(dp_providerW); + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, serviceproviders, 0, KEY_READ, &key); + if(res == ERROR_FILE_NOT_FOUND) + return DPNERR_DOESNOTEXIST; + + next_key = RegEnumKeyW( key, index, provider, MAX_PATH); + while(next_key == ERROR_SUCCESS) + { + res = RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, NULL, &size); + if(res == ERROR_SUCCESS) + { + req_size += sizeof(DPN_SERVICE_PROVIDER_INFO) + size; + + (*returned)++; + } + + index++; + next_key = RegEnumKeyW( key, index, provider, MAX_PATH ); + } + } - else if(IsEqualGUID(pguidServiceProvider, &CLSID_DP8SP_TCPIP)) + else if(IsEqualGUID(service, &CLSID_DP8SP_TCPIP)) { req_size = sizeof(DPN_SERVICE_PROVIDER_INFO) + sizeof(dp_adapterW); } else { FIXME("Application requested a provider we don't handle (yet)\n"); - *pcReturned = 0; return DPNERR_DOESNOTEXIST; } - if(*pcbEnumData < req_size) + if(*buf_size < req_size) { - *pcbEnumData = req_size; + RegCloseKey(key); + + *buf_size = req_size; return DPNERR_BUFFERTOOSMALL; } - pSPInfoBuffer->pwszName = (LPWSTR)(pSPInfoBuffer + 1); - - if(!pguidServiceProvider) + if(!service) { - lstrcpyW(pSPInfoBuffer->pwszName, dp_providerW); - pSPInfoBuffer->guid = CLSID_DP8SP_TCPIP; + int offset = 0; + int count = 0; + char *infoend = ((char *)info_buffer + (sizeof(DPN_SERVICE_PROVIDER_INFO) * (*returned))); + + index = 0; + next_key = RegEnumKeyW( key, index, provider, MAX_PATH); + while(next_key == ERROR_SUCCESS) + { + res = RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, NULL, &size); + if(res == ERROR_SUCCESS) + { + info_buffer[count].guid = CLSID_DP8SP_TCPIP; + info_buffer[count].pwszName = (LPWSTR)(infoend + offset); + + RegGetValueW(key, provider, friendly, RRF_RT_REG_SZ, NULL, info_buffer[count].pwszName, &size); + + offset += size; + count++; + } + + index++; + next_key = RegEnumKeyW(key, index, provider, MAX_PATH); + } } else { - lstrcpyW(pSPInfoBuffer->pwszName, dp_adapterW); - pSPInfoBuffer->guid = adapter_guid; + info_buffer->pwszName = (LPWSTR)(info_buffer + 1); + lstrcpyW(info_buffer->pwszName, dp_adapterW); + info_buffer->guid = adapter_guid; + *returned = 1; } - *pcReturned = 1; + RegCloseKey(key); + return DPN_OK; } +static HRESULT WINAPI IDirectPlay8PeerImpl_EnumServiceProviders(IDirectPlay8Peer *iface, + const GUID * const pguidServiceProvider, const GUID * const pguidApplication, + DPN_SERVICE_PROVIDER_INFO * const pSPInfoBuffer, DWORD * const pcbEnumData, + DWORD * const pcReturned, const DWORD dwFlags) +{ + TRACE("(%p)->(%s,%s,%p,%p,%p,%x)\n", iface, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), + pSPInfoBuffer, pcbEnumData, pcReturned, dwFlags); + + 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 IDirectPlay8PeerImpl_CancelAsyncOperation(IDirectPlay8Peer *iface, const DPNHANDLE hAsyncHandle, const DWORD dwFlags) {

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Client EnumServiceProviders.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: bc85fee0f162aa468dc9946dc41b6cb074fc586c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc85fee0f162aa468dc9946dc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 9 06:45:53 2017 +0000 dpnet: Implement IDirectPlay8Client EnumServiceProviders. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/client.c | 14 +++++++++++--- dlls/dpnet/dpnet_private.h | 2 ++ dlls/dpnet/peer.c | 2 +- dlls/dpnet/tests/client.c | 16 ++++++++-------- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 1fa825f..d1e6b3b 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -124,9 +124,17 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_EnumServiceProviders(IDirectPlay8Cl DPN_SERVICE_PROVIDER_INFO * const pSPInfoBuffer, PDWORD const pcbEnumData, PDWORD const pcReturned, const DWORD dwFlags) { - IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; + IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); + TRACE("(%p)->(%s,%s,%p,%p,%p,%x)\n", This, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), + pSPInfoBuffer, pcbEnumData, pcReturned, dwFlags); + + 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 IDirectPlay8ClientImpl_EnumHosts(IDirectPlay8Client *iface, diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 89e0777..256e3f4 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -137,6 +137,8 @@ extern HRESULT DPNET_CreateDirectPlay8LobbyClient(IClassFactory *iface, IUnknown extern void init_dpn_sp_caps(DPN_SP_CAPS *dpnspcaps) DECLSPEC_HIDDEN; extern void init_winsock(void) DECLSPEC_HIDDEN; +extern HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER_INFO * const info_buffer, + DWORD * const buf_size, DWORD * const returned) DECLSPEC_HIDDEN; /* used for generic dumping (copied from ddraw) */ typedef struct { diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 461d610..57f15ef 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -126,7 +126,7 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_Initialize(IDirectPlay8Peer *iface, return DPN_OK; } -static HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER_INFO * const info_buffer, +HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER_INFO * const info_buffer, DWORD * const buf_size, DWORD * const returned) { static const WCHAR serviceproviders[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\', diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index bbd77fe..a1a1fa4 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -97,20 +97,20 @@ static void test_enum_service_providers(void) items = 0; hr = IDirectPlay8Client_EnumServiceProviders(client, NULL, NULL, NULL, &size, NULL, 0); - todo_wine ok(hr == E_POINTER, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + ok(hr == E_POINTER, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); hr = IDirectPlay8Client_EnumServiceProviders(client, NULL, NULL, NULL, NULL, &items, 0); - todo_wine ok(hr == E_POINTER, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + ok(hr == E_POINTER, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); hr = IDirectPlay8Client_EnumServiceProviders(client, NULL, NULL, NULL, &size, &items, 0); - todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); - todo_wine ok(size != 0, "size is unexpectedly 0\n"); + ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + ok(size != 0, "size is unexpectedly 0\n"); serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); hr = IDirectPlay8Client_EnumServiceProviders(client, NULL, NULL, serv_prov_info, &size, &items, 0); ok(hr == S_OK, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); - todo_wine ok(items != 0, "Found unexpectedly no service providers\n"); + ok(items != 0, "Found unexpectedly no service providers\n"); trace("number of items found: %d\n", items); @@ -126,14 +126,14 @@ static void test_enum_service_providers(void) items = 0; hr = IDirectPlay8Client_EnumServiceProviders(client, &CLSID_DP8SP_TCPIP, NULL, NULL, &size, &items, 0); - todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); - todo_wine ok(size != 0, "size is unexpectedly 0\n"); + ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); + ok(size != 0, "size is unexpectedly 0\n"); serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); hr = IDirectPlay8Client_EnumServiceProviders(client, &CLSID_DP8SP_TCPIP, NULL, serv_prov_info, &size, &items, 0); ok(hr == S_OK, "IDirectPlay8Client_EnumServiceProviders failed with %x\n", hr); - todo_wine ok(items != 0, "Found unexpectedly no adapter\n"); + ok(items != 0, "Found unexpectedly no adapter\n"); for (i=0;i<items;i++)

1 0

Alistair Leslie-Hughes : dpnet: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 2a8a052bf79b3a8734a1a04e65e19f994c78052f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a8a052bf79b3a8734a1a04e6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 13 08:17:45 2017 +0000 dpnet: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/dpnet_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 256e3f4..49c3495 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -154,12 +154,12 @@ typedef struct { #define FE(x) { x, #x } #define GE(x) { &x, #x } -static inline void *heap_alloc( size_t len ) +static inline void __WINE_ALLOC_SIZE(1) *heap_alloc( size_t len ) { return HeapAlloc( GetProcessHeap(), 0, len ); } -static inline void *heap_realloc(void *mem, size_t len) +static inline void __WINE_ALLOC_SIZE(2) *heap_realloc(void *mem, size_t len) { return HeapReAlloc( GetProcessHeap(), 0, mem, len); }

1 0

Alistair Leslie-Hughes : dpnet/tests: Add IDirectPlay8Client EnumHost tests.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Module: wine Branch: master Commit: 15fe05ea768d419baf5ac21ca349ef15fea684fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=15fe05ea768d419baf5ac21ca… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 9 06:46:27 2017 +0000 dpnet/tests: Add IDirectPlay8Client EnumHost tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/client.c | 165 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 149 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=15fe05ea768d419baf5ac…

1 0