January 2018 - Wine-commits

Alex Henrie : shell32/tests: Drop progman DDE test workarounds for Windows <= 2000.
by Alexandre Julliard 09 Jan '18

09 Jan '18

Module: wine Branch: master Commit: 946b4ad2703569f14a255051449b2f6c09a40f17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=946b4ad2703569f14a255051… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jan 8 21:48:52 2018 -0700 shell32/tests: Drop progman DDE test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/progman_dde.c | 46 +++------------------------------------- 1 file changed, 3 insertions(+), 43 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 0bb4960..62ed413 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -35,8 +35,6 @@ #include "shlobj.h" static HRESULT (WINAPI *pSHGetLocalizedName)(LPCWSTR, LPWSTR, UINT, int *); -static BOOL (WINAPI *pSHGetSpecialFolderPathA)(HWND, LPSTR, int, BOOL); -static BOOL (WINAPI *pReadCabinetState)(CABINETSTATE *, int); static void init_function_pointers(void) { @@ -44,10 +42,6 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("shell32.dll"); pSHGetLocalizedName = (void*)GetProcAddress(hmod, "SHGetLocalizedName"); - pSHGetSpecialFolderPathA = (void*)GetProcAddress(hmod, "SHGetSpecialFolderPathA"); - pReadCabinetState = (void*)GetProcAddress(hmod, "ReadCabinetState"); - if (!pReadCabinetState) - pReadCabinetState = (void*)GetProcAddress(hmod, (LPSTR)651); } static BOOL use_common(void) @@ -88,21 +82,7 @@ static BOOL full_title(void) CABINETSTATE cs; memset(&cs, 0, sizeof(cs)); - if (pReadCabinetState) - { - pReadCabinetState(&cs, sizeof(cs)); - } - else - { - HKEY key; - DWORD size; - - win_skip("ReadCabinetState is not available, reading registry directly\n"); - RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", &key); - size = sizeof(cs); - RegQueryValueExA(key, "Settings", NULL, NULL, (LPBYTE)&cs, &size); - RegCloseKey(key); - } + ReadCabinetState(&cs, sizeof(cs)); return (cs.fFullPathTitle == -1); } @@ -114,28 +94,8 @@ static void init_strings(void) char commonprograms[MAX_PATH]; char programs[MAX_PATH]; - if (pSHGetSpecialFolderPathA) - { - pSHGetSpecialFolderPathA(NULL, programs, CSIDL_PROGRAMS, FALSE); - pSHGetSpecialFolderPathA(NULL, commonprograms, CSIDL_COMMON_PROGRAMS, FALSE); - } - else - { - HKEY key; - DWORD size; - - /* Older Win9x and NT4 */ - - RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key); - size = sizeof(programs); - RegQueryValueExA(key, "Programs", NULL, NULL, (LPBYTE)&programs, &size); - RegCloseKey(key); - - RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key); - size = sizeof(commonprograms); - RegQueryValueExA(key, "Common Programs", NULL, NULL, (LPBYTE)&commonprograms, &size); - RegCloseKey(key); - } + SHGetSpecialFolderPathA(NULL, programs, CSIDL_PROGRAMS, FALSE); + SHGetSpecialFolderPathA(NULL, commonprograms, CSIDL_COMMON_PROGRAMS, FALSE); /* ProgramsDir on Vista+ is always the users one (CSIDL_PROGRAMS). Before Vista * it depends on whether the user is an administrator (CSIDL_COMMON_PROGRAMS) or

1 0

Wei Xie : wininet/tests: Check null pointer in InternetGetSecurityInfoByURLW.
by Alexandre Julliard 09 Jan '18

09 Jan '18

Module: wine Branch: master Commit: 3f06a09604f8c2364dfbf6e6987d991f140544bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f06a09604f8c2364dfbf6e6… Author: Wei Xie <xiewei(a)deepin.com> Date: Tue Jan 9 12:06:25 2018 +0100 wininet/tests: Check null pointer in InternetGetSecurityInfoByURLW. Signed-off-by: Wei xie <xiewei(a)linuxdeepin.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 15 ++++++++------- dlls/wininet/tests/http.c | 12 ++++++++++++ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 1f1bbbd..699962c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4462,6 +4462,11 @@ BOOL WINAPI InternetGetSecurityInfoByURLW(LPCWSTR lpszURL, PCCERT_CHAIN_CONTEXT TRACE("(%s %p %p)\n", debugstr_w(lpszURL), ppCertChain, pdwSecureFlags); + if (!ppCertChain && !pdwSecureFlags) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + url.dwHostNameLength = 1; res = InternetCrackUrlW(lpszURL, 0, 0, &url); if(!res || url.nScheme != INTERNET_SCHEME_HTTPS) { @@ -4476,15 +4481,11 @@ BOOL WINAPI InternetGetSecurityInfoByURLW(LPCWSTR lpszURL, PCCERT_CHAIN_CONTEXT } if(server->cert_chain) { - const CERT_CHAIN_CONTEXT *chain_dup; - - chain_dup = CertDuplicateCertificateChain(server->cert_chain); - if(chain_dup) { - *ppCertChain = chain_dup; + if(pdwSecureFlags) *pdwSecureFlags = server->security_flags & _SECURITY_ERROR_FLAGS_MASK; - }else { + + if(ppCertChain && !(*ppCertChain = CertDuplicateCertificateChain(server->cert_chain))) res = FALSE; - } }else { SetLastError(ERROR_INTERNET_ITEM_NOT_FOUND); res = FALSE; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 1c2aadb..af78704 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5593,6 +5593,18 @@ static void _test_security_info(unsigned line, const char *urlc, DWORD error, DW ok_(__FILE__,line)(chain != NULL, "chain = NULL\n"); ok_(__FILE__,line)(flags == ex_flags, "flags = %x\n", flags); CertFreeCertificateChain(chain); + + SetLastError(0xdeadbeef); + res = pInternetGetSecurityInfoByURLA(url, NULL, NULL); + ok_(__FILE__,line)(!res && GetLastError() == ERROR_INVALID_PARAMETER, + "InternetGetSecurityInfoByURLA returned: %x(%u)\n", res, GetLastError()); + + res = pInternetGetSecurityInfoByURLA(url, &chain, NULL); + ok_(__FILE__,line)(res, "InternetGetSecurityInfoByURLA failed: %u\n", GetLastError()); + CertFreeCertificateChain(chain); + + res = pInternetGetSecurityInfoByURLA(url, NULL, &flags); + ok_(__FILE__,line)(res, "InternetGetSecurityInfoByURLA failed: %u\n", GetLastError()); }else { ok_(__FILE__,line)(!res && GetLastError() == error, "InternetGetSecurityInfoByURLA returned: %x(%u), expected %u\n", res, GetLastError(), error);

1 0

Zebediah Figura : schtasks/tests: Clean up the tasks directory.
by Alexandre Julliard 09 Jan '18

09 Jan '18

Module: wine Branch: master Commit: 8e5a86c303fc8f0ac98def8a7f8977e22434e40f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e5a86c303fc8f0ac98def8a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 9 10:28:03 2018 -0600 schtasks/tests: Clean up the tasks directory. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/tests/schtasks.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/schtasks/tests/schtasks.c b/programs/schtasks/tests/schtasks.c index b65025f..03f4e43 100644 --- a/programs/schtasks/tests/schtasks.c +++ b/programs/schtasks/tests/schtasks.c @@ -152,6 +152,8 @@ static BOOL initialize_task_service(void) START_TEST(schtasks) { + static WCHAR wineW[] = {'\\','w','i','n','e',0}; + static WCHAR wine_testW[] = {'\\','w','i','n','e','\\','t','e','s','t',0}; DWORD r; CoInitialize(NULL); @@ -183,6 +185,8 @@ START_TEST(schtasks) r = run_command("schtasks /Change /tn wine\\test\\winetest /enable"); ok(r == 1, "r = %u\n", r); + ITaskFolder_DeleteFolder(root, wine_testW, 0); + ITaskFolder_DeleteFolder(root, wineW, 0); ITaskFolder_Release(root); ITaskService_Release(service); CoUninitialize();

1 0

Józef Kucia : dxgi/tests: Skip tests if DXGI_ERROR_NOT_CURRENTLY_AVAILABLE is returned.
by Alexandre Julliard 09 Jan '18

09 Jan '18

Module: wine Branch: master Commit: e8aaad290a480ae7a16779bc694d9cb1fd1060f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8aaad290a480ae7a16779bc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 9 15:10:04 2018 +0100 dxgi/tests: Skip tests if DXGI_ERROR_NOT_CURRENTLY_AVAILABLE is returned. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 2bc0ff4..a102ed8 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1494,7 +1494,13 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain, ok(SUCCEEDED(hr), "GetContainingOutput failed, hr %#x.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + skip("Could not change fullscreen state.\n"); + IDXGIOutput_Release(expected_state.target); + return; + } check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL);

1 0

Józef Kucia : include/d3d11: Fix ID3D11Device5_OpenSharedFence() declaration.
by Alexandre Julliard 09 Jan '18

09 Jan '18

Module: wine Branch: master Commit: e9e6a535024dbc35445de94a5ab73c9a33ac980d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9e6a535024dbc35445de94a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 9 15:10:05 2018 +0100 include/d3d11: Fix ID3D11Device5_OpenSharedFence() declaration. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11_4.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d3d11_4.idl b/include/d3d11_4.idl index d00ee49..f98a7b8 100644 --- a/include/d3d11_4.idl +++ b/include/d3d11_4.idl @@ -53,7 +53,7 @@ interface ID3D11Device4 : ID3D11Device3 interface ID3D11Device5 : ID3D11Device4 { HRESULT OpenSharedFence( - [in] HANDLE fence, + [in] HANDLE handle, [in] REFIID iid, [out] void **fence );

1 0

Józef Kucia : wined3d: Load buffer before applying state for indirect draws.
by Alexandre Julliard 09 Jan '18

09 Jan '18

Module: wine Branch: master Commit: 6280926e3b7e7a270498b2181823162e79caf9ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=6280926e3b7e7a270498b218… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 9 15:10:06 2018 +0100 wined3d: Load buffer before applying state for indirect draws. wined3d_load_buffer() might invalidate the current state. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 95e79f7..17ce16a 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -407,7 +407,6 @@ static void draw_indirect(struct wined3d_context *context, const struct wined3d_ return; } - wined3d_buffer_load(buffer, context, state); GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, buffer->buffer_object)); if (idx_size) @@ -572,6 +571,9 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s wined3d_rendertarget_view_prepare_location(dsv, context, location); } + if (parameters->indirect) + wined3d_buffer_load(parameters->u.indirect.buffer, context, state); + if (!context_apply_draw_state(context, device, state)) { context_release(context);

1 0

Józef Kucia : wined3d: Load buffer before applying state for indirect dispatches.
by Alexandre Julliard 09 Jan '18

09 Jan '18

Module: wine Branch: master Commit: ca11278067fb09491ad41ef5b64b296d49a879cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca11278067fb09491ad41ef5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 9 15:10:07 2018 +0100 wined3d: Load buffer before applying state for indirect dispatches. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 17ce16a..7eccc8f 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -750,6 +750,9 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state return; } + if (parameters->indirect) + wined3d_buffer_load(parameters->u.indirect.buffer, context, state); + context_apply_compute_state(context, device, state); if (!state->shader[WINED3D_SHADER_TYPE_COMPUTE]) @@ -764,7 +767,6 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state const struct wined3d_indirect_dispatch_parameters *indirect = &parameters->u.indirect; struct wined3d_buffer *buffer = indirect->buffer; - wined3d_buffer_load(buffer, context, state); GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, buffer->buffer_object)); GL_EXTCALL(glDispatchComputeIndirect((GLintptr)indirect->offset)); GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, 0));

1 0

Andrew Eikum : hid: Pass a buffer to DeviceIoControl in HidD_SetNumInputBuffers.
by Alexandre Julliard 09 Jan '18

09 Jan '18

Module: wine Branch: master Commit: 2de3dc3dd6059a1297a698c72a92b23eda853483 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2de3dc3dd6059a1297a698c7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 9 10:28:18 2018 -0600 hid: Pass a buffer to DeviceIoControl in HidD_SetNumInputBuffers. DeviceIoControl expects a pointer, and this value gets dereferenced as a ULONG* in hidclass.sys. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 1161f0c..614e7c4 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -102,7 +102,7 @@ BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG BOOLEAN WINAPI HidD_SetNumInputBuffers(HANDLE HidDeviceObject, ULONG NumberBuffers) { TRACE("(%p %i)\n", HidDeviceObject, NumberBuffers); - return DeviceIoControl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, UlongToPtr(NumberBuffers), sizeof(NumberBuffers), NULL, 0, NULL, NULL); + return DeviceIoControl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0, NULL, NULL); } BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength)

1 0

Bob Ziuchkovski : dinput: Ignore vendor-specific usage pages for joystick elements on Mac.
by Alexandre Julliard 09 Jan '18

09 Jan '18

Module: wine Branch: master Commit: 221708d64ebf7b9c6bed3674e9363779a3ed1a4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=221708d64ebf7b9c6bed3674… Author: Bob Ziuchkovski <bob.ziuchkovski(a)gmail.com> Date: Sun Jan 7 16:26:04 2018 -0700 dinput: Ignore vendor-specific usage pages for joystick elements on Mac. Signed-off-by: Bob Ziuchkovski <bob.ziuchkovski(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_osx.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 43fa20e..b0dcdd9 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -640,14 +640,20 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) { IOHIDElementRef element = ( IOHIDElementRef ) CFArrayGetValueAtIndex( elements, idx ); int type = IOHIDElementGetType( element ); + int usage_page = IOHIDElementGetUsagePage( element ); TRACE("element %s\n", debugstr_element(element)); + if (usage_page >= kHIDPage_VendorDefinedStart) + { + /* vendor pages can repurpose type ids, resulting in incorrect case matches below (e.g. ds4 controllers) */ + continue; + } + switch(type) { case kIOHIDElementTypeInput_Button: { - int usage_page = IOHIDElementGetUsagePage( element ); TRACE("kIOHIDElementTypeInput_Button usage_page %d\n", usage_page); if (usage_page != kHIDPage_Button) {

1 0

Andrey Gusev : msi: Remove redundant comparison.
by Alexandre Julliard 09 Jan '18

09 Jan '18

Module: wine Branch: master Commit: 435be368e58ffdc033b4ca132f3ca73436881421 URL: https://source.winehq.org/git/wine.git/?a=commit;h=435be368e58ffdc033b4ca13… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jan 9 13:24:43 2018 +0200 msi: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/appsearch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index bb492f4..693da18 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -506,7 +506,7 @@ static LPWSTR get_ini_field(LPWSTR buf, int field) while ((end = strchrW(beg, ',')) && i < field) { beg = end + 1; - while (*beg && *beg == ' ') + while (*beg == ' ') beg++; i++;

1 0