May 2019 - Wine-devel - list.winehq.org

[PATCH v2 4/4] dinput: Support DIDEVICEINSTANCE_DX3 for Mouse GetDeviceInfo
by Alistair Leslie-Hughes 04 May '19

04 May '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/mouse.c | 5 ----- dlls/dinput/tests/mouse.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index f3ec8e4f03..58c78a5cc7 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -765,11 +765,6 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceInfo( SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); TRACE("(this=%p,%p)\n", This, pdidi); - if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEA)) { - WARN(" dinput3 not supported yet...\n"); - return DI_OK; - } - fill_mouse_dideviceinstanceA(pdidi, This->base.dinput->dwVersion); return DI_OK; diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index c2d0226487..c1a7ff7dec 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -198,6 +198,35 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) DestroyWindow( hwnd2 ); } +static void test_GetDeviceInfo(IDirectInputA *pDI) +{ + HRESULT hr; + IDirectInputDeviceA *pMouse = NULL; + DIDEVICEINSTANCEA instA; + DIDEVICEINSTANCE_DX3A inst3A; + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pMouse, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + if (FAILED(hr)) return; + + instA.dwSize = sizeof(instA); + hr = IDirectInputDevice_GetDeviceInfo(pMouse, &instA); + ok(SUCCEEDED(hr), "got %08x\n", hr); + + inst3A.dwSize = sizeof(inst3A); + hr = IDirectInputDevice_GetDeviceInfo(pMouse, (DIDEVICEINSTANCEA *)&inst3A); + ok(SUCCEEDED(hr), "got %08x\n", hr); + + ok(instA.dwSize != inst3A.dwSize, "got %d, %d \n", instA.dwSize, inst3A.dwSize); + ok(IsEqualGUID(&instA.guidInstance, &inst3A.guidInstance), "got %s, %s\n", + wine_dbgstr_guid(&instA.guidInstance), wine_dbgstr_guid(&inst3A.guidInstance) ); + ok(IsEqualGUID(&instA.guidProduct, &inst3A.guidProduct), "got %s, %s\n", + wine_dbgstr_guid(&instA.guidProduct), wine_dbgstr_guid(&inst3A.guidProduct) ); + ok(instA.dwDevType == inst3A.dwDevType, "got %d, %d\n", instA.dwDevType, inst3A.dwDevType); + + if (pMouse) IUnknown_Release(pMouse); +} + static void mouse_tests(void) { HRESULT hr; @@ -224,6 +253,7 @@ static void mouse_tests(void) test_set_coop(pDI, hwnd); test_acquire(pDI, hwnd); + test_GetDeviceInfo(pDI); DestroyWindow(hwnd); } -- 2.20.1

2 1

[PATCH v2 2/4] dinput: Dont report we cannot open a device
by Alistair Leslie-Hughes 04 May '19

04 May '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/joystick_linuxinput.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index cea669b90c..320696fa4b 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -211,10 +211,7 @@ static void find_joydevs(void) } if (fd == -1) - { - WARN("Failed to open \"%s\": %d %s\n", buf, errno, strerror(errno)); continue; - } if (ioctl(fd, EVIOCGBIT(0, sizeof(joydev.evbits)), joydev.evbits) == -1) { -- 2.20.1

2 1

[PATCH v2 3/4] dinput: Improve EnumDevice tracing
by Alistair Leslie-Hughes 04 May '19

04 May '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/dinput_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index e32ccae3df..0929961209 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -467,9 +467,10 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { if (!dinput_devices[i]->enum_deviceA) continue; + + TRACE(" Checking device %u ('%s')\n", i, dinput_devices[i]->name); for (j = 0, r = S_OK; SUCCEEDED(r); j++) { devInstance.dwSize = sizeof(devInstance); - TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); r = dinput_devices[i]->enum_deviceA(dwDevType, dwFlags, &devInstance, This->dwVersion, j); if (r == S_OK) if (enum_callback_wrapper(lpCallback, &devInstance, pvRef) == DIENUM_STOP) -- 2.20.1

1 0

[PATCH v2 1/4] dinput: Return E_NOINTERFACE from IDirectInputDevice2 QueryInterface
by Alistair Leslie-Hughes 04 May '19

04 May '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 6c446163d1..cfade08433 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1203,7 +1203,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface(LPDIRECTINPUTDEVICE8W ifa } WARN("Unsupported interface!\n"); - return E_FAIL; + return E_NOINTERFACE; } HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface(LPDIRECTINPUTDEVICE8A iface, REFIID riid, LPVOID *ppobj) -- 2.20.1

1 0

[PATCH] winemac.drv: Allow mac IME to clear text in system input method
by Aric Stewart 04 May '19

04 May '19

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.m | 16 ++++++++++++++++ dlls/winemac.drv/ime.c | 2 +- dlls/winemac.drv/macdrv_cocoa.h | 2 ++ 3 files changed, 19 insertions(+), 1 deletion(-)

2 1

[PATCH v3 2/2] po: Update French translation.
by Isira Seneviratne 04 May '19

04 May '19

1 0

[PATCH v3 1/2] po: Update Sinhala translation.
by Isira Seneviratne 04 May '19

04 May '19

1 0

[PATCH vkd3d 1/8] readme: Update build requirements.
by Józef Kucia 03 May '19

03 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- README | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index bec91a949080..be329e19f947 100644 --- a/README +++ b/README @@ -9,14 +9,14 @@ similar, but not identical, to Direct3D 12. Building vkd3d ============== -Vkd3d depends on SPIRV-Headers and Vulkan-Headers (>= 1.1.88). +Vkd3d depends on SPIRV-Headers and Vulkan-Headers (>= 1.1.101). Vkd3d generates some of its headers from IDL files. If you are using the release tarballs, then these headers are pre-generated and are included. If you are building from git, then they will be generated at build-time using widl. By default, vkd3d will use the widl found in `PATH'. If widl is not -available or is not recent (>= 3.0 or so), then you can build Wine with -`make tools/widl' to avoid building all of Wine. You can then point vkd3d's +available or is not recent (>= 3.20), then you can build Wine with `make +tools/widl' to avoid building all of Wine. You can then point vkd3d's configure at that widl binary with `WIDL="/path/to/widl"'. =========== -- 2.21.0

3 4

[PATCH] ntdll: Mark NtCompareTokens as stub in spec file
by Vijay Kiran Kamuju 03 May '19

03 May '19

This is available and documented since Windows XP Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/ntdll/ntdll.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 292b0f6a9f1..76412ceb407 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -127,7 +127,7 @@ @ stdcall NtClose(long) @ stub NtCloseObjectAuditAlarm # @ stub NtCompactKeys -# @ stub NtCompareTokens +@ stub NtCompareTokens @ stdcall NtCompleteConnectPort(ptr) # @ stub NtCompressKey @ stdcall NtConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) -- 2.17.0

2 6

[PATCH] mfplat/tests: Remove a duplicated ok() check
by Michael Stefaniuc 03 May '19

03 May '19

Also fix the text of the first ok() call. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 0a378b55b4..744bdf5674 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -192,12 +192,11 @@ if(0) count = 0; ret = MFTEnum(MFT_CATEGORY_OTHER, 0, NULL, NULL, NULL, NULL, &count); ok(ret == E_POINTER, "Failed to enumerate filters: %x\n", ret); - ok(count == 0, "Expected count > 0\n"); + ok(count == 0, "Expected count == 0\n"); clsids = NULL; ret = MFTEnum(MFT_CATEGORY_OTHER, 0, NULL, NULL, NULL, &clsids, NULL); ok(ret == E_POINTER, "Failed to enumerate filters: %x\n", ret); - ok(count == 0, "Expected count > 0\n"); } count = 0; -- 2.20.1

2 1