February 2019 - Wine-commits

Zebediah Figura : quartz/tests/avisplit: Add some tests for querying pin information.
by Alexandre Julliard 27 Feb '19

27 Feb '19

Module: wine Branch: master Commit: eabd670c03a6abc6e364a8fbe6a76d56989152d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eabd670c03a6abc6e364a8fb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 26 22:56:30 2019 -0600 quartz/tests/avisplit: Add some tests for querying pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 76 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index a13660f..633f164 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -333,6 +333,81 @@ todo_wine ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +static void test_pin_info(void) +{ + const WCHAR *filename = load_resource(avifile); + IBaseFilter *filter = create_avi_splitter(); + ULONG ref, expect_ref; + IFilterGraph2 *graph; + PIN_DIRECTION dir; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + IPin *pin; + BOOL ret; + + graph = connect_input(filter, filename); + + hr = IBaseFilter_FindPin(filter, sink_name, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + expect_ref = get_refcount(filter); + ref = get_refcount(pin); + ok(ref == expect_ref, "Got unexpected refcount %d.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, sink_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); +todo_wine + ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, sink_name), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, source0_name, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_interface(pin, &IID_IPin, TRUE); + check_interface(pin, &IID_IMediaSeeking, TRUE); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, source0_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, source0_name), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + IPin_Release(pin); + + IFilterGraph2_Release(graph); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + static void test_filter_graph(void) { IFileSourceFilter *pfile = NULL; @@ -582,6 +657,7 @@ START_TEST(avisplit) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); test_filter_graph(); CoUninitialize();

1 0

Hans Leidekker : fusion: Use bcrypt to compute the assembly token.
by Alexandre Julliard 27 Feb '19

27 Feb '19

Module: wine Branch: master Commit: 358fb2f4d83345cb97a66e4072fe4d2d70f58349 URL: https://source.winehq.org/git/wine.git/?a=commit;h=358fb2f4d83345cb97a66e40… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 27 11:36:02 2019 +0100 fusion: Use bcrypt to compute the assembly token. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46728 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/Makefile.in | 2 +- dlls/fusion/assembly.c | 35 ++++++++++------------------------- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/fusion/Makefile.in b/dlls/fusion/Makefile.in index 50815df..093b64c 100644 --- a/dlls/fusion/Makefile.in +++ b/dlls/fusion/Makefile.in @@ -1,5 +1,5 @@ MODULE = fusion.dll -IMPORTS = advapi32 dbghelp shlwapi version user32 +IMPORTS = bcrypt dbghelp shlwapi version user32 C_SRCS = \ asmcache.c \ diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index ec380ef..78f5278 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -21,11 +21,13 @@ #include <stdarg.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winuser.h" #include "winver.h" -#include "wincrypt.h" +#include "bcrypt.h" #include "dbghelp.h" #include "ole2.h" #include "fusion.h" @@ -807,9 +809,8 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) { ULONG i, size; LONG offset; - BYTE *hashdata, *pubkey, *ptr; - HCRYPTPROV crypt; - HCRYPTHASH hash; + BYTE hashdata[20], *pubkey, *ptr; + BCRYPT_ALG_HANDLE alg; BYTE tokbytes[BYTES_PER_TOKEN]; HRESULT hr = E_FAIL; LPWSTR tok; @@ -833,29 +834,16 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) pubkey = assembly_get_blob(assembly, idx, &size); - if (!CryptAcquireContextA(&crypt, NULL, NULL, PROV_RSA_FULL, - CRYPT_VERIFYCONTEXT)) + if (BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA1_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0) != STATUS_SUCCESS) return E_FAIL; - if (!CryptCreateHash(crypt, CALG_SHA1, 0, 0, &hash)) - return E_FAIL; - - if (!CryptHashData(hash, pubkey, size, 0)) - return E_FAIL; - - size = 0; - if (!CryptGetHashParam(hash, HP_HASHVAL, NULL, &size, 0)) - return E_FAIL; - - if (!(hashdata = heap_alloc(size))) + if (BCryptHash(alg, NULL, 0, pubkey, size, hashdata, sizeof(hashdata)) != STATUS_SUCCESS) { - hr = E_OUTOFMEMORY; + hr = E_FAIL; goto done; } - if (!CryptGetHashParam(hash, HP_HASHVAL, hashdata, &size, 0)) - goto done; - + size = sizeof(hashdata); for (i = size - 1; i >= size - 8; i--) tokbytes[size - i - 1] = hashdata[i]; @@ -871,10 +859,7 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) hr = S_OK; done: - heap_free(hashdata); - CryptDestroyHash(hash); - CryptReleaseContext(crypt, 0); - + BCryptCloseAlgorithmProvider(alg, 0); return hr; }

1 0

Piotr Caban : msvcrt: Fix buffer overflow in _get_tzname.
by Alexandre Julliard 27 Feb '19

27 Feb '19

Module: wine Branch: master Commit: 79188582f067b16e3aaebfad4a853d84f3a310cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=79188582f067b16e3aaebfad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 27 18:37:10 2019 +0100 msvcrt: Fix buffer overflow in _get_tzname. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46481 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 14f4ba0..e6493b0 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -939,6 +939,11 @@ int CDECL MSVCRT__get_tzname(MSVCRT_size_t *ret, char *buf, MSVCRT_size_t bufsiz *ret = strlen(timezone)+1; if(!buf && !bufsize) return 0; + if(*ret > bufsize) + { + buf[0] = 0; + return MSVCRT_ERANGE; + } strcpy(buf, timezone); return 0;

1 0

Michael Stefaniuc : crypt32: Remove an unused return variable (coccinelle) .
by Alexandre Julliard 27 Feb '19

27 Feb '19

Module: wine Branch: master Commit: 3e8720ae5ac0e19b26965f0b11fbf2ea9144431f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e8720ae5ac0e19b26965f0b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 26 23:14:56 2019 +0100 crypt32: Remove an unused return variable (coccinelle). returnvar.cocci from the Linux kernel. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/oid.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 6dc894e..bf0ad32 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -190,7 +190,6 @@ static char *CRYPT_GetKeyName(DWORD dwEncodingType, LPCSTR pszFuncName, BOOL WINAPI CryptGetDefaultOIDDllList(HCRYPTOIDFUNCSET hFuncSet, DWORD dwEncodingType, LPWSTR pwszDllList, DWORD *pcchDllList) { - BOOL ret = TRUE; struct OIDFunctionSet *set = hFuncSet; char *keyName; HKEY key; @@ -228,7 +227,7 @@ BOOL WINAPI CryptGetDefaultOIDDllList(HCRYPTOIDFUNCSET hFuncSet, } CryptMemFree(keyName); - return ret; + return TRUE; } BOOL WINAPI CryptInstallOIDFunctionAddress(HMODULE hModule,

1 0

Michael Stefaniuc : gdi.exe16: Remove an unused return variable ( coccinelle).
by Alexandre Julliard 27 Feb '19

27 Feb '19

Module: wine Branch: master Commit: 7272bd8994ea2cfeecf8a2d2c2bdf10d5e175761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7272bd8994ea2cfeecf8a2d2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 26 23:14:57 2019 +0100 gdi.exe16: Remove an unused return variable (coccinelle). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi.exe16/printdrv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c index bd7f053..2e1ace8 100644 --- a/dlls/gdi.exe16/printdrv.c +++ b/dlls/gdi.exe16/printdrv.c @@ -518,9 +518,8 @@ INT16 WINAPI EndSpoolPage16(HPJOB16 hJob) */ DWORD WINAPI GetSpoolJob16(int nOption, LONG param) { - DWORD retval = 0; TRACE("In GetSpoolJob param 0x%x noption %d\n",param, nOption); - return retval; + return 0; }

1 0

Vijay Kiran Kamuju : user32: Add DlgDirList wildcard checks.
by Alexandre Julliard 27 Feb '19

27 Feb '19

Module: wine Branch: master Commit: 7a6b00dc25880bd7e8515551b7c3fa7917776eaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a6b00dc25880bd7e8515551… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Feb 22 14:25:59 2019 +0100 user32: Add DlgDirList wildcard checks. Based on a patch from Christian Lupien. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8226 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 6 +++--- dlls/user32/dialog.c | 9 ++++++++- dlls/user32/tests/listbox.c | 6 +++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index de73ad2..70e2128 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -1941,7 +1941,7 @@ static void test_listbox_dlgdir(void) strcpy(pathBuffer, "C:\\"); res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); ok(res, "DlgDirList failed to list C:\\ folders\n"); - todo_wine ok(!strcmp(pathBuffer, "*"), "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); + ok(!strcmp(pathBuffer, "*"), "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); strcpy(pathBuffer, "C:\\*"); res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); @@ -1952,8 +1952,8 @@ static void test_listbox_dlgdir(void) SetLastError(0xdeadbeef); strcpy(pathBuffer, "C:\\INVALID$$DIR"); res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); - todo_wine ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); - todo_wine ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, + ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); + ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, "GetLastError should return 0x589, got 0x%X\n",GetLastError()); DestroyWindow(hWnd); diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index deaeb84..88c2930 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1821,6 +1821,7 @@ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox, HWND hwnd; LPWSTR orig_spec = spec; WCHAR any[] = {'*','.','*',0}; + WCHAR star[] = {'*',0}; #define SENDMSG(msg,wparam,lparam) \ ((attrib & DDL_POSTMSGS) ? PostMessageW( hwnd, msg, wparam, lparam ) \ @@ -1829,10 +1830,16 @@ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox, TRACE("%p %s %d %d %04x\n", hDlg, debugstr_w(spec), idLBox, idStatic, attrib ); /* If the path exists and is a directory, chdir to it */ - if (!spec || !spec[0] || SetCurrentDirectoryW( spec )) spec = any; + if (!spec || !spec[0] || SetCurrentDirectoryW( spec )) spec = star; else { WCHAR *p, *p2; + + if (!strchrW(spec, '*') && !strchrW(spec, '?')) + { + SetLastError(ERROR_NO_WILDCARD_CHARACTERS); + return FALSE; + } p = spec; if ((p2 = strchrW( p, ':' ))) p = p2 + 1; if ((p2 = strrchrW( p, '\\' ))) p = p2; diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index d15b18a..8d81151 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1836,7 +1836,7 @@ static void test_listbox_dlgdir(void) strcpy(pathBuffer, "C:\\"); res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\ folders\n"); - todo_wine ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, + ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); strcpy(pathBuffer, "C:\\*"); @@ -1849,8 +1849,8 @@ static void test_listbox_dlgdir(void) SetLastError(0xdeadbeef); strcpy(pathBuffer, "C:\\INVALID$$DIR"); res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); - todo_wine ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); - todo_wine ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, + ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); + ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, "GetLastError should return 0x589, got 0x%X\n",GetLastError()); DestroyWindow(hWnd);

1 0

Jacek Caban : ntoskrnl.exe: Implement file object constructor.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: 637e01e217bd579ef67b1f61da421769357ae4dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=637e01e217bd579ef67b1f61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 26 13:39:57 2019 +0100 ntoskrnl.exe: Implement file object constructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 +++++++++++- dlls/ntoskrnl.exe/tests/driver.c | 4 ++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1a8a433..010f9f7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -369,16 +369,26 @@ NTSTATUS WINAPI ObReferenceObjectByHandle( HANDLE handle, ACCESS_MASK access, } +static void *create_file_object( HANDLE handle ); + static const WCHAR file_type_name[] = {'F','i','l','e',0}; static struct _OBJECT_TYPE file_type = { file_type_name, - NULL, + create_file_object, free_kernel_object }; POBJECT_TYPE IoFileObjectType = &file_type; +static void *create_file_object( HANDLE handle ) +{ + FILE_OBJECT *file; + if (!(file = alloc_kernel_object( IoFileObjectType, sizeof(*file), 0 ))) return NULL; + file->Type = 5; /* MSDN */ + file->Size = sizeof(*file); + return file; +} /* transfer result of IRP back to wineserver */ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index aae5839..2fbe493 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -664,6 +664,7 @@ static void test_ob_reference(const WCHAR *test_path) { OBJECT_ATTRIBUTES attr = { sizeof(attr) }; HANDLE event_handle, file_handle, file_handle2, thread_handle; + FILE_OBJECT *file; void *obj1, *obj2; UNICODE_STRING pathU; IO_STATUS_BLOCK io; @@ -732,6 +733,9 @@ static void test_ob_reference(const WCHAR *test_path) todo_wine ok(obj1 == obj2, "obj1 != obj2\n"); + file = obj1; + ok(file->Type == 5, "Type = %u\n", file->Type); + ObDereferenceObject(obj1); ObDereferenceObject(obj2);

1 0

Nikolay Sivov : mf/tests: Fix typos in test messages.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: 22b304fd1d83f8d7f3cd3da8188856f2a2a45e85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22b304fd1d83f8d7f3cd3da8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 26 16:06:28 2019 +0300 mf/tests: Fix typos in test messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c56428d..ba11a27 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -297,7 +297,7 @@ static void test_topology(void) IMFCollection_Release(collection); hr = IMFTopology_GetOutputNodeCollection(topology, &collection); - ok(hr == S_OK || broken(hr == E_FAIL) /* before Win8 */, "Failed to get source node collection, hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL) /* before Win8 */, "Failed to get output node collection, hr %#x.\n", hr); if (SUCCEEDED(hr)) { ok(!!collection, "Unexpected object pointer.\n"); @@ -313,7 +313,7 @@ static void test_topology(void) IMFTopologyNode_Release(node); hr = IMFTopology_GetOutputNodeCollection(topology, &collection); - ok(hr == S_OK, "Failed to get source node collection, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get output node collection, hr %#x.\n", hr); ok(!!collection, "Unexpected object pointer.\n"); hr = IMFCollection_GetElementCount(collection, &size); ok(hr == S_OK, "Failed to get item count, hr %#x.\n", hr);

1 0

Huw Davies : server: Add new pipe servers to the end of the servers list.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: e4ca5dbec056c977bffce31bd7901aaec884f199 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4ca5dbec056c977bffce31b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 26 11:06:25 2019 +0000 server: Add new pipe servers to the end of the servers list. This ensures instances created first will be connected to first. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41670 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 38 ++++++++++++++++++++++++++++++++++++++ server/named_pipe.c | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 5bf27fa..5dc6ace 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3671,6 +3671,43 @@ static void test_namedpipe_session_id(void) CloseHandle(server); } +static void test_multiple_instances(void) +{ + HANDLE server[2], client; + int i; + BOOL ret; + OVERLAPPED ov; + + for (i = 0; i < ARRAY_SIZE(server); i++) + { + server[i] = CreateNamedPipeA(PIPENAME, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_READMODE_BYTE | PIPE_WAIT, 2, 1024, 1024, + NMPWAIT_USE_DEFAULT_WAIT, NULL); + ok(server[i] != INVALID_HANDLE_VALUE, "got invalid handle\n"); + } + + client = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(client != INVALID_HANDLE_VALUE, "got invalid handle\n"); + + /* Show that this has connected to server[0] not server[1] */ + + memset(&ov, 0, sizeof(ov)); + ret = ConnectNamedPipe(server[1], &ov); + ok(ret == FALSE, "got %d\n", ret); + ok(GetLastError() == ERROR_IO_PENDING, "got %d\n", GetLastError()); + + memset(&ov, 0, sizeof(ov)); + ret = ConnectNamedPipe(server[0], &ov); + ok(ret == FALSE, "got %d\n", ret); + ok(GetLastError() == ERROR_PIPE_CONNECTED, "got %d\n", GetLastError()); + + DisconnectNamedPipe(server[1]); + DisconnectNamedPipe(server[0]); + CloseHandle(client); + CloseHandle(server[1]); + CloseHandle(server[0]); +} + START_TEST(pipe) { char **argv; @@ -3736,4 +3773,5 @@ START_TEST(pipe) test_TransactNamedPipe(); test_namedpipe_process_id(); test_namedpipe_session_id(); + test_multiple_instances(); } diff --git a/server/named_pipe.c b/server/named_pipe.c index 101ff63..9e33032 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1162,7 +1162,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned server->pipe_end.server_pid = get_process_id( current->process ); init_async_queue( &server->listen_q ); - list_add_head( &pipe->servers, &server->entry ); + list_add_tail( &pipe->servers, &server->entry ); if (!(server->pipe_end.fd = alloc_pseudo_fd( &pipe_server_fd_ops, &server->pipe_end.obj, options ))) { release_object( server );

1 0

Matteo Bruni : d3d8/tests: Fix device tests on Windows 10.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: cf11ddfe416642e1f7e02e15ec168c9626468acd URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf11ddfe416642e1f7e02e15… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 25 19:00:43 2019 +0100 d3d8/tests: Fix device tests on Windows 10. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 4dbe168..a647369 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3049,8 +3049,9 @@ static void test_wndproc(void) /* Remove the maximized state from the SYSCOMMAND test while we're not * interfering with a device. */ ShowWindow(focus_window, SW_SHOWNORMAL); - filter_messages = focus_window; + /* On Windows 10 style change messages are delivered on device + * creation. */ device_desc.device_window = focus_window; if (!(device = create_device(d3d8, focus_window, &device_desc))) { @@ -3065,7 +3066,6 @@ static void test_wndproc(void) SetForegroundWindow(GetDesktopWindow()); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", expect_messages->message, expect_messages->window); - ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it.\n"); expect_messages = NULL; /* The window is iconic even though no message was sent. */ @@ -3121,6 +3121,7 @@ static void test_wndproc(void) hr = IDirect3DDevice8_TestCooperativeLevel(device); ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + filter_messages = NULL; hr = reset_device(device, &device_desc); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr);

1 0