wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Pierre Schweitzer : msi: Don' t consider read-only drives when enumerating volumes.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: bbf222c900eaa92988bb7f0d05a9fe0921123927 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbf222c900eaa92988bb7f0d… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Sat Nov 3 18:33:16 2018 +0100 msi: Don't consider read-only drives when enumerating volumes. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0dd0d879a1c487dcefedd44762d4ea0fcebd98fe) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/dialog.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 61fb0b3..abecde1 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3220,7 +3220,7 @@ static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control WCHAR cost_text[MAX_PATH]; LPWSTR drives, ptr; LVITEMW lvitem; - DWORD size; + DWORD size, flags; int i = 0; cost = msi_vcl_get_cost(dialog); @@ -3237,6 +3237,13 @@ static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control ptr = drives; while (*ptr) { + if (GetVolumeInformationW(ptr, NULL, 0, NULL, 0, &flags, NULL, 0) && + flags & FILE_READ_ONLY_VOLUME) + { + ptr += lstrlenW(ptr) + 1; + continue; + } + lvitem.mask = LVIF_TEXT; lvitem.iItem = i; lvitem.iSubItem = 0;

1 0

Brendan McGrath : dinput: Use the same GUID for Instance and Product.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 6a8bb514e29c25f81f0147d444728b3d6375de13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a8bb514e29c25f81f0147d4… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Wed Oct 31 21:01:41 2018 +1100 dinput: Use the same GUID for Instance and Product. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3a2834b3a42e869b7d450074c29cd7089bfef015) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/device_private.h | 3 --- dlls/dinput/dinput_main.c | 6 ++---- dlls/dinput/keyboard.c | 11 +++-------- dlls/dinput/mouse.c | 11 +++-------- dlls/dinput/tests/dinput.c | 1 - dlls/dinput8/tests/dinput.c | 1 - 6 files changed, 8 insertions(+), 25 deletions(-) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 52bbec4..d9e2997 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -114,9 +114,6 @@ typedef struct LPDIRECTINPUTEFFECT ref; } effect_list_item; -extern const GUID DInput_Wine_Keyboard_GUID DECLSPEC_HIDDEN; -extern const GUID DInput_Wine_Mouse_GUID DECLSPEC_HIDDEN; - /* Various debug tools */ extern void _dump_DIPROPHEADER(LPCDIPROPHEADER diph) DECLSPEC_HIDDEN; extern void _dump_OBJECTINSTANCEA(const DIDEVICEOBJECTINSTANCEA *ddoi) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index a592174..d137935 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1688,12 +1688,10 @@ static DWORD WINAPI hook_thread_proc(void *param) { if (!dev->acquired || !dev->event_proc) continue; - if (IsEqualGUID( &dev->guid, &GUID_SysKeyboard ) || - IsEqualGUID( &dev->guid, &DInput_Wine_Keyboard_GUID )) + if (IsEqualGUID( &dev->guid, &GUID_SysKeyboard )) kbd_cnt++; else - if (IsEqualGUID( &dev->guid, &GUID_SysMouse ) || - IsEqualGUID( &dev->guid, &DInput_Wine_Mouse_GUID )) + if (IsEqualGUID( &dev->guid, &GUID_SysMouse )) mice_cnt++; } LeaveCriticalSection( &dinput->crit ); diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index d213368..5d21fde 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -117,10 +117,6 @@ static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM return ret; } -const GUID DInput_Wine_Keyboard_GUID = { /* 0ab8648a-7735-11d2-8c73-71df54a96441 */ - 0x0ab8648a, 0x7735, 0x11d2, {0x8c, 0x73, 0x71, 0xdf, 0x54, 0xa9, 0x64, 0x41} -}; - static DWORD get_keyboard_subtype(void) { DWORD kbd_type, kbd_subtype, dev_subtype; @@ -151,7 +147,7 @@ static void fill_keyboard_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD ver ddi.dwSize = dwSize; ddi.guidInstance = GUID_SysKeyboard;/* DInput's GUID */ - ddi.guidProduct = DInput_Wine_Keyboard_GUID; /* Vendor's GUID */ + ddi.guidProduct = GUID_SysKeyboard; if (version >= 0x0800) ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (subtype << 8); else @@ -175,7 +171,7 @@ static void fill_keyboard_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver ddi.dwSize = dwSize; ddi.guidInstance = GUID_SysKeyboard;/* DInput's GUID */ - ddi.guidProduct = DInput_Wine_Keyboard_GUID; /* Vendor's GUID */ + ddi.guidProduct = GUID_SysKeyboard; if (version >= 0x0800) ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (subtype << 8); else @@ -278,8 +274,7 @@ static HRESULT keyboarddev_create_device(IDirectInputImpl *dinput, REFGUID rguid TRACE("%p %s %s %p %i\n", dinput, debugstr_guid(rguid), debugstr_guid(riid), pdev, unicode); *pdev = NULL; - if (IsEqualGUID(&GUID_SysKeyboard, rguid) || /* Generic Keyboard */ - IsEqualGUID(&DInput_Wine_Keyboard_GUID, rguid)) /* Wine Keyboard */ + if (IsEqualGUID(&GUID_SysKeyboard, rguid)) /* Wine Keyboard */ { SysKeyboardImpl *This; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 6d3eff5..7133359 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -93,10 +93,6 @@ static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(SysMouseImpl static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ); -const GUID DInput_Wine_Mouse_GUID = { /* 9e573ed8-7734-11d2-8d4a-23903fb6bdf7 */ - 0x9e573ed8, 0x7734, 0x11d2, {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} -}; - static void _dump_mouse_state(const DIMOUSESTATE2 *m_state) { int i; @@ -121,7 +117,7 @@ static void fill_mouse_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD versio ddi.dwSize = dwSize; ddi.guidInstance = GUID_SysMouse;/* DInput's GUID */ - ddi.guidProduct = DInput_Wine_Mouse_GUID; /* Vendor's GUID */ + ddi.guidProduct = GUID_SysMouse; if (version >= 0x0800) ddi.dwDevType = DI8DEVTYPE_MOUSE | (DI8DEVTYPEMOUSE_TRADITIONAL << 8); else @@ -145,7 +141,7 @@ static void fill_mouse_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD versio ddi.dwSize = dwSize; ddi.guidInstance = GUID_SysMouse;/* DInput's GUID */ - ddi.guidProduct = DInput_Wine_Mouse_GUID; /* Vendor's GUID */ + ddi.guidProduct = GUID_SysMouse; if (version >= 0x0800) ddi.dwDevType = DI8DEVTYPE_MOUSE | (DI8DEVTYPEMOUSE_TRADITIONAL << 8); else @@ -257,8 +253,7 @@ static HRESULT mousedev_create_device(IDirectInputImpl *dinput, REFGUID rguid, R TRACE("%p %s %s %p %i\n", dinput, debugstr_guid(rguid), debugstr_guid(riid), pdev, unicode); *pdev = NULL; - if (IsEqualGUID(&GUID_SysMouse, rguid) || /* Generic Mouse */ - IsEqualGUID(&DInput_Wine_Mouse_GUID, rguid)) /* Wine Mouse */ + if (IsEqualGUID(&GUID_SysMouse, rguid)) /* Wine Mouse */ { SysMouseImpl *This; diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index f30d2cc..9bd1951 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -396,7 +396,6 @@ static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, vo (instance->dwDevType & 0xff) == DIDEVTYPE_MOUSE) { const char *device = ((instance->dwDevType & 0xff) == DIDEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse"; - todo_wine ok(IsEqualGUID(&instance->guidInstance, &instance->guidProduct), "%s guidInstance (%s) does not match guidProduct (%s)\n", device, wine_dbgstr_guid(&instance->guidInstance), diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index 43bac03..1cc3ddc 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -381,7 +381,6 @@ static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, vo (instance->dwDevType & 0xff) == DI8DEVTYPE_MOUSE) { const char *device = ((instance->dwDevType & 0xff) == DI8DEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse"; - todo_wine ok(IsEqualGUID(&instance->guidInstance, &instance->guidProduct), "%s guidInstance (%s) does not match guidProduct (%s)\n", device, wine_dbgstr_guid(&instance->guidInstance),

1 0

Brendan McGrath : dinput/tests: Test that the GUID is the same for Instance and Product.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 99bced7b47cd55834373a1881c5378e3c5b9e38f URL: https://source.winehq.org/git/wine.git/?a=commit;h=99bced7b47cd55834373a188… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Wed Oct 31 21:01:40 2018 +1100 dinput/tests: Test that the GUID is the same for Instance and Product. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c357f3670f71f3fc40aad0d89f3c9553e653c246) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/tests/dinput.c | 11 +++++++++++ dlls/dinput8/tests/dinput.c | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index a5f7c0c..f30d2cc 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -392,6 +392,17 @@ static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, vo { struct enum_devices_test *enum_test = context; + if ((instance->dwDevType & 0xff) == DIDEVTYPE_KEYBOARD || + (instance->dwDevType & 0xff) == DIDEVTYPE_MOUSE) { + const char *device = ((instance->dwDevType & 0xff) == + DIDEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse"; + todo_wine + ok(IsEqualGUID(&instance->guidInstance, &instance->guidProduct), + "%s guidInstance (%s) does not match guidProduct (%s)\n", + device, wine_dbgstr_guid(&instance->guidInstance), + wine_dbgstr_guid(&instance->guidProduct)); + } + enum_test->device_count++; return enum_test->return_value; } diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index e16542a..43bac03 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -377,6 +377,17 @@ static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, vo instance->wUsagePage, instance->wUsage); + if ((instance->dwDevType & 0xff) == DI8DEVTYPE_KEYBOARD || + (instance->dwDevType & 0xff) == DI8DEVTYPE_MOUSE) { + const char *device = ((instance->dwDevType & 0xff) == + DI8DEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse"; + todo_wine + ok(IsEqualGUID(&instance->guidInstance, &instance->guidProduct), + "%s guidInstance (%s) does not match guidProduct (%s)\n", + device, wine_dbgstr_guid(&instance->guidInstance), + wine_dbgstr_guid(&instance->guidProduct)); + } + enum_test->device_count++; return enum_test->return_value; }

1 0

Akihiro Sagawa : dinput: Return DIDEVTYPEKEYBOARD_JAPAN106 subtype when it is used.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 868efb90225cc51e13e7278d58335d057146559f URL: https://source.winehq.org/git/wine.git/?a=commit;h=868efb90225cc51e13e7278d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 17 17:14:54 2018 +0900 dinput: Return DIDEVTYPEKEYBOARD_JAPAN106 subtype when it is used. For the further improvments, subtype is a member of SysKeyboardImpl structure. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8001dda1172dc0cff3da600d3f327f59f647f722) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/keyboard.c | 43 +++++++++++++++++++++++++++++++------------ dlls/dinput/tests/keyboard.c | 2 +- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index e1ba15e..d213368 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -48,6 +48,7 @@ struct SysKeyboardImpl { struct IDirectInputDeviceImpl base; BYTE DInputKeyState[WINE_DINPUT_KEYBOARD_MAX_KEYS]; + DWORD subtype; }; static inline SysKeyboardImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) @@ -120,7 +121,24 @@ const GUID DInput_Wine_Keyboard_GUID = { /* 0ab8648a-7735-11d2-8c73-71df54a96441 0x0ab8648a, 0x7735, 0x11d2, {0x8c, 0x73, 0x71, 0xdf, 0x54, 0xa9, 0x64, 0x41} }; -static void fill_keyboard_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD version) { +static DWORD get_keyboard_subtype(void) +{ + DWORD kbd_type, kbd_subtype, dev_subtype; + kbd_type = GetKeyboardType(0); + kbd_subtype = GetKeyboardType(1); + + if (kbd_type == 4 || (kbd_type == 7 && kbd_subtype == 0)) + dev_subtype = DIDEVTYPEKEYBOARD_PCENH; + else if (kbd_type == 7 && kbd_subtype == 2) + dev_subtype = DIDEVTYPEKEYBOARD_JAPAN106; + else { + FIXME("Unknown keyboard type=%u, subtype=%u\n", kbd_type, kbd_subtype); + dev_subtype = DIDEVTYPEKEYBOARD_PCENH; + } + return dev_subtype; +} + +static void fill_keyboard_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD version, DWORD subtype) { DWORD dwSize; DIDEVICEINSTANCEA ddi; @@ -135,16 +153,16 @@ static void fill_keyboard_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD ver ddi.guidInstance = GUID_SysKeyboard;/* DInput's GUID */ ddi.guidProduct = DInput_Wine_Keyboard_GUID; /* Vendor's GUID */ if (version >= 0x0800) - ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (DI8DEVTYPEKEYBOARD_UNKNOWN << 8); + ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (subtype << 8); else - ddi.dwDevType = DIDEVTYPE_KEYBOARD | (DIDEVTYPEKEYBOARD_UNKNOWN << 8); + ddi.dwDevType = DIDEVTYPE_KEYBOARD | (subtype << 8); strcpy(ddi.tszInstanceName, "Keyboard"); strcpy(ddi.tszProductName, "Wine Keyboard"); memcpy(lpddi, &ddi, (dwSize < sizeof(ddi) ? dwSize : sizeof(ddi))); } -static void fill_keyboard_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD version) { +static void fill_keyboard_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD version, DWORD subtype) { DWORD dwSize; DIDEVICEINSTANCEW ddi; @@ -159,9 +177,9 @@ static void fill_keyboard_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver ddi.guidInstance = GUID_SysKeyboard;/* DInput's GUID */ ddi.guidProduct = DInput_Wine_Keyboard_GUID; /* Vendor's GUID */ if (version >= 0x0800) - ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (DI8DEVTYPEKEYBOARD_UNKNOWN << 8); + ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (subtype << 8); else - ddi.dwDevType = DIDEVTYPE_KEYBOARD | (DIDEVTYPEKEYBOARD_UNKNOWN << 8); + ddi.dwDevType = DIDEVTYPE_KEYBOARD | (subtype << 8); MultiByteToWideChar(CP_ACP, 0, "Keyboard", -1, ddi.tszInstanceName, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, "Wine Keyboard", -1, ddi.tszProductName, MAX_PATH); @@ -178,7 +196,7 @@ static HRESULT keyboarddev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVI (((dwDevType == DI8DEVCLASS_KEYBOARD) || (dwDevType == DI8DEVTYPE_KEYBOARD)) && (version >= 0x0800))) { TRACE("Enumerating the Keyboard device\n"); - fill_keyboard_dideviceinstanceA(lpddi, version); + fill_keyboard_dideviceinstanceA(lpddi, version, get_keyboard_subtype()); return S_OK; } @@ -196,7 +214,7 @@ static HRESULT keyboarddev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVI (((dwDevType == DI8DEVCLASS_KEYBOARD) || (dwDevType == DI8DEVTYPE_KEYBOARD)) && (version >= 0x0800))) { TRACE("Enumerating the Keyboard device\n"); - fill_keyboard_dideviceinstanceW(lpddi, version); + fill_keyboard_dideviceinstanceW(lpddi, version, get_keyboard_subtype()); return S_OK; } @@ -219,6 +237,7 @@ static SysKeyboardImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) newDevice->base.event_proc = KeyboardCallback; InitializeCriticalSection(&newDevice->base.crit); newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysKeyboardImpl*->base.crit"); + newDevice->subtype = get_keyboard_subtype(); /* Create copy of default data format */ if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIKeyboard.dwSize))) goto failed; @@ -361,9 +380,9 @@ static HRESULT WINAPI SysKeyboardWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W ifa devcaps.dwSize = lpDIDevCaps->dwSize; devcaps.dwFlags = DIDC_ATTACHED | DIDC_EMULATED; if (This->base.dinput->dwVersion >= 0x0800) - devcaps.dwDevType = DI8DEVTYPE_KEYBOARD | (DI8DEVTYPEKEYBOARD_PCENH << 8); + devcaps.dwDevType = DI8DEVTYPE_KEYBOARD | (This->subtype << 8); else - devcaps.dwDevType = DIDEVTYPE_KEYBOARD | (DIDEVTYPEKEYBOARD_PCENH << 8); + devcaps.dwDevType = DIDEVTYPE_KEYBOARD | (This->subtype << 8); devcaps.dwAxes = 0; devcaps.dwButtons = This->base.data_format.wine_df->dwNumObjs; devcaps.dwPOVs = 0; @@ -447,7 +466,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceInfo( return DI_OK; } - fill_keyboard_dideviceinstanceA(pdidi, This->base.dinput->dwVersion); + fill_keyboard_dideviceinstanceA(pdidi, This->base.dinput->dwVersion, This->subtype); return DI_OK; } @@ -462,7 +481,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface return DI_OK; } - fill_keyboard_dideviceinstanceW(pdidi, This->base.dinput->dwVersion); + fill_keyboard_dideviceinstanceW(pdidi, This->base.dinput->dwVersion, This->subtype); return DI_OK; } diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index a60342d..9405596 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -228,7 +228,7 @@ static void test_capabilities(IDirectInputA *pDI, HWND hwnd) "GetCapabilities invalid device subtype for dwDevType: 0x%08x (%04x:%04x)\n", caps.dwDevType, kbd_type, kbd_subtype); else if (kbd_type == 7 && kbd_subtype == 2) - todo_wine ok (dev_subtype == DIDEVTYPEKEYBOARD_JAPAN106, + ok (dev_subtype == DIDEVTYPEKEYBOARD_JAPAN106, "GetCapabilities invalid device subtype for dwDevType: 0x%08x (%04x:%04x)\n", caps.dwDevType, kbd_type, kbd_subtype); else

1 0

Akihiro Sagawa : dinput/tests: Add more tests for keyboard subtypes.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: af11076a4096e16acb208278e91cf3c376c94e3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=af11076a4096e16acb208278… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 17 17:14:52 2018 +0900 dinput/tests: Add more tests for keyboard subtypes. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 937dcde349781025ea4d6aa9e4d928f3d9836ac8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/tests/keyboard.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 72b23e7..a60342d 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -207,6 +207,7 @@ static void test_capabilities(IDirectInputA *pDI, HWND hwnd) HRESULT hr; IDirectInputDeviceA *pKeyboard = NULL; DIDEVCAPS caps; + int kbd_type, kbd_subtype, dev_subtype; hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); @@ -219,8 +220,21 @@ static void test_capabilities(IDirectInputA *pDI, HWND hwnd) ok (caps.dwFlags & DIDC_ATTACHED, "GetCapabilities dwFlags: 0x%08x\n", caps.dwFlags); ok (GET_DIDEVICE_TYPE(caps.dwDevType) == DIDEVTYPE_KEYBOARD, "GetCapabilities invalid device type for dwDevType: 0x%08x\n", caps.dwDevType); - ok (GET_DIDEVICE_SUBTYPE(caps.dwDevType) != DIDEVTYPEKEYBOARD_UNKNOWN, - "GetCapabilities invalid device subtype for dwDevType: 0x%08x\n", caps.dwDevType); + kbd_type = GetKeyboardType(0); + kbd_subtype = GetKeyboardType(1); + dev_subtype = GET_DIDEVICE_SUBTYPE(caps.dwDevType); + if (kbd_type == 4 || (kbd_type == 7 && kbd_subtype == 0)) + ok (dev_subtype == DIDEVTYPEKEYBOARD_PCENH, + "GetCapabilities invalid device subtype for dwDevType: 0x%08x (%04x:%04x)\n", + caps.dwDevType, kbd_type, kbd_subtype); + else if (kbd_type == 7 && kbd_subtype == 2) + todo_wine ok (dev_subtype == DIDEVTYPEKEYBOARD_JAPAN106, + "GetCapabilities invalid device subtype for dwDevType: 0x%08x (%04x:%04x)\n", + caps.dwDevType, kbd_type, kbd_subtype); + else + ok (dev_subtype != DIDEVTYPEKEYBOARD_UNKNOWN, + "GetCapabilities invalid device subtype for dwDevType: 0x%08x (%04x:%04x)\n", + caps.dwDevType, kbd_type, kbd_subtype); IUnknown_Release(pKeyboard); }

1 0

Akihiro Sagawa : dinput/tests: Use GET_DIDEVICE_SUBTYPE macro in keyboard type tests.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: d72d3a3652012d3d7e3cdef7e050350ce828f5d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d72d3a3652012d3d7e3cdef7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 17 17:14:51 2018 +0900 dinput/tests: Use GET_DIDEVICE_SUBTYPE macro in keyboard type tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 75a2893fca830dd93f506486b26abc07dde06d9f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/tests/keyboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index e51e332..72b23e7 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -217,9 +217,9 @@ static void test_capabilities(IDirectInputA *pDI, HWND hwnd) ok (SUCCEEDED(hr), "GetCapabilities failed: 0x%08x\n", hr); ok (caps.dwFlags & DIDC_ATTACHED, "GetCapabilities dwFlags: 0x%08x\n", caps.dwFlags); - ok (LOWORD(LOBYTE(caps.dwDevType)) == DIDEVTYPE_KEYBOARD, + ok (GET_DIDEVICE_TYPE(caps.dwDevType) == DIDEVTYPE_KEYBOARD, "GetCapabilities invalid device type for dwDevType: 0x%08x\n", caps.dwDevType); - ok (LOWORD(HIBYTE(caps.dwDevType)) != DIDEVTYPEKEYBOARD_UNKNOWN, + ok (GET_DIDEVICE_SUBTYPE(caps.dwDevType) != DIDEVTYPEKEYBOARD_UNKNOWN, "GetCapabilities invalid device subtype for dwDevType: 0x%08x\n", caps.dwDevType); IUnknown_Release(pKeyboard);

1 0

Brendan McGrath : advapi32: Don't create a WoW6432 MachineGuid.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 36a15c9b1fe376b8e8e1367859b27f58ab63b594 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36a15c9b1fe376b8e8e13678… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Wed Oct 17 21:01:02 2018 +1100 advapi32: Don't create a WoW6432 MachineGuid. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c970b263c0329bcb47d0ea492b823bda7dc7c0f3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 01d5880..ab1e598 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -281,7 +281,7 @@ static void CRYPT_CreateMachineGuid(void) LONG r; HKEY key; - r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, cryptographyW, 0, KEY_ALL_ACCESS, + r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, cryptographyW, 0, KEY_ALL_ACCESS | KEY_WOW64_64KEY, &key); if (!r) {

1 0

Alistair Leslie-Hughes : ntdll: Support TokenVirtualizationEnabled in NtQueryInformationToken.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 5fe0041b6ab8b1850d3852aacc7a4aa178c8b2b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fe0041b6ab8b1850d3852aa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 29 03:59:29 2018 +0000 ntdll: Support TokenVirtualizationEnabled in NtQueryInformationToken. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 84a317c738e2e59e59120ab10eaebd4f570b0867) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/nt.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index c408deb..60d3427 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -280,7 +280,7 @@ NTSTATUS WINAPI NtQueryInformationToken( 0, /* TokenHasRestrictions */ 0, /* TokenAccessInformation */ 0, /* TokenVirtualizationAllowed */ - 0, /* TokenVirtualizationEnabled */ + sizeof(DWORD), /* TokenVirtualizationEnabled */ sizeof(TOKEN_MANDATORY_LABEL) + sizeof(SID), /* TokenIntegrityLevel [sizeof(SID) includes one SubAuthority] */ 0, /* TokenUIAccess */ 0, /* TokenMandatoryPolicy */ @@ -525,6 +525,12 @@ NTSTATUS WINAPI NtQueryInformationToken( FIXME("QueryInformationToken( ..., TokenSessionId, ...) semi-stub\n"); } break; + case TokenVirtualizationEnabled: + { + *(DWORD *)tokeninfo = 0; + TRACE("QueryInformationToken( ..., TokenVirtualizationEnabled, ...) semi-stub\n"); + } + break; case TokenIntegrityLevel: { /* report always "S-1-16-12288" (high mandatory level) for now */

1 0

Piotr Caban : msvcrt: Support "China" country name in setlocale function.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: bafcf5bcdb50db6345e1b9bed42e40722e9ac3d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bafcf5bcdb50db6345e1b9be… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 5 23:13:51 2018 +0200 msvcrt: Support "China" country name in setlocale function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8905bd92aa61ed5493844cbe65db4eedca6839c7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/locale.c | 3 +++ dlls/msvcrt/tests/locale.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 088e1b7..6314840 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -249,6 +249,9 @@ LCID MSVCRT_locale_to_LCID(const char *locale, unsigned short *codepage) if(!search.search_country[0] && !search.search_codepage[0]) remap_synonym(search.search_language); + if(!strcasecmp(search.search_country, "China")) + strcpy(search.search_country, "People's Republic of China"); + EnumResourceLanguagesA(GetModuleHandleA("KERNEL32"), (LPSTR)RT_STRING, (LPCSTR)LOCALE_ILANGUAGE,find_best_locale_proc, (LONG_PTR)&search); diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index f87a791..8717fea 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -144,12 +144,10 @@ static void test_setlocale(void) || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret); ret = setlocale(LC_ALL, "Chinese_China.936"); -todo_wine ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) { trace("Chinese_China.936=%s\n", ret); -todo_wine ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") /* Vista - Win7 */ || !strcmp(ret, "Chinese (Simplified)_China.936") /* Win8 - Win10 */ || broken(!strcmp(ret, "Chinese_People's Republic of China.936")), "ret = %s\n", ret);

1 0

Nikolay Sivov : gdiplus: Implement GdipScalePenTransform().
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 588ed43d945c5d74cc5c62c531b6d34e325cfbd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=588ed43d945c5d74cc5c62c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 16 10:04:28 2018 +0300 gdiplus: Implement GdipScalePenTransform(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 417e94f19936c738a274a2ae879fc6c17db113e1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/pen.c | 7 +---- dlls/gdiplus/tests/pen.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index b86808b..1f18f3f 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -470,17 +470,12 @@ GpStatus WINGDIPAPI GdipTranslatePenTransform(GpPen *pen, REAL dx, REAL dy, GpMa GpStatus WINGDIPAPI GdipScalePenTransform(GpPen *pen, REAL sx, REAL sy, GpMatrixOrder order) { - static int calls; - TRACE("(%p,%0.2f,%0.2f,%u)\n", pen, sx, sy, order); if(!pen) return InvalidParameter; - if(!(calls++)) - FIXME("(%p, %.2f, %.2f, %d) stub\n", pen, sx, sy, order); - - return NotImplemented; + return GdipScaleMatrix(&pen->transform, sx, sy, order); } GpStatus WINGDIPAPI GdipRotatePenTransform(GpPen *pen, REAL angle, GpMatrixOrder order) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index be3d76d6..6f69c3b 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -389,6 +389,22 @@ todo_wine { GdipDeletePen(pen); } +static void get_pen_transform(GpPen *pen, REAL *values) +{ + GpMatrix *matrix; + GpStatus status; + + status = GdipCreateMatrix(&matrix); + expect(Ok, status); + + status = GdipGetPenTransform(pen, matrix); + expect(Ok, status); + status = GdipGetMatrixElements(matrix, values); + expect(Ok, status); + + GdipDeleteMatrix(matrix); +} + static void test_transform(void) { GpStatus status; @@ -478,6 +494,65 @@ static void test_transform(void) expectf(0.0, values[4]); expectf(0.0, values[5]); + /* Scale */ + status = GdipScalePenTransform(NULL, 1.0, 1.0, MatrixOrderPrepend); + expect(InvalidParameter, status); + + status = GdipScalePenTransform(pen, 1.0, 1.0, MatrixOrderPrepend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(1.0, values[0]); + expectf(0.0, values[1]); + expectf(0.0, values[2]); + expectf(1.0, values[3]); + expectf(0.0, values[4]); + expectf(0.0, values[5]); + + status = GdipScalePenTransform(pen, 2.0, -10.0, MatrixOrderPrepend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(2.0, values[0]); + expectf(0.0, values[1]); + expectf(0.0, values[2]); + expectf(-10.0, values[3]); + expectf(0.0, values[4]); + expectf(0.0, values[5]); + + status = GdipScalePenTransform(pen, 2.0, -10.0, MatrixOrderAppend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(4.0, values[0]); + expectf(0.0, values[1]); + expectf(0.0, values[2]); + expectf(100.0, values[3]); + expectf(0.0, values[4]); + expectf(0.0, values[5]); + + status = GdipTranslatePenTransform(pen, 1.0, -2.0, MatrixOrderAppend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(4.0, values[0]); + expectf(0.0, values[1]); + expectf(0.0, values[2]); + expectf(100.0, values[3]); + expectf(1.0, values[4]); + expectf(-2.0, values[5]); + + status = GdipScalePenTransform(pen, 2.0, -10.0, MatrixOrderPrepend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(8.0, values[0]); + expectf(0.0, values[1]); + expectf(0.0, values[2]); + expectf(-1000.0, values[3]); + expectf(1.0, values[4]); + expectf(-2.0, values[5]); + GdipDeletePen(pen); GdipDeleteMatrix(matrix);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2019