March 2019 - Wine-Commits - list.winehq.org

Sebastian Lackner : xaudio2: Use assembly wrapper to call OnVoiceProcessingPassStart callback.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: afb233e448c8f011ed066c8fd4bcd34d87303d71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afb233e448c8f011ed066c8f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 1 10:32:38 2018 -0500 xaudio2: Use assembly wrapper to call OnVoiceProcessingPassStart callback. During a callback function, some games use the wrong function signature for an xaudio2 function, which changed between xaudio2 versions. As a result, the EDI and ESI registers are overwritten by the game. Apparently Windows's implementation happens not to use these registers in a way that causes the crash. This patch pushes EDI and ESI onto the stack before calling the callback, then pops them back after the callback exits. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42520 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43358 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c649ec3a02a7574578180e1228dacb6f3a511c55) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index bc5cf1c..5f126a3 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" #include <stdarg.h> #define NONAMELESSUNION @@ -50,6 +51,37 @@ static HINSTANCE instance; #define COMPAT_E_DEVICE_INVALIDATED XAUDIO2_E_DEVICE_INVALIDATED #endif +#if XAUDIO2_VER != 0 && defined(__i386__) +/* EVE Online uses an OnVoiceProcessingPassStart callback which corrupts %esi. */ +#define IXAudio2VoiceCallback_OnVoiceProcessingPassStart(a, b) call_on_voice_processing_pass_start(a, b) +extern void call_on_voice_processing_pass_start(IXAudio2VoiceCallback *This, UINT32 BytesRequired); +__ASM_GLOBAL_FUNC( call_on_voice_processing_pass_start, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-4\n\t") + "pushl %edi\n\t" + __ASM_CFI(".cfi_rel_offset %edi,-8\n\t") + "subl $8,%esp\n\t" + "pushl 12(%ebp)\n\t" /* BytesRequired */ + "pushl 8(%ebp)\n\t" /* This */ + "movl 8(%ebp),%eax\n\t" + "movl 0(%eax),%eax\n\t" + "call *0(%eax)\n\t" /* This->lpVtbl->OnVoiceProcessingPassStart */ + "leal -8(%ebp),%esp\n\t" + "popl %edi\n\t" + __ASM_CFI(".cfi_same_value %edi\n\t") + "popl %esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") + "popl %ebp\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) +#endif + static void dump_fmt(const WAVEFORMATEX *fmt) { TRACE("wFormatTag: 0x%x (", fmt->wFormatTag);

1 0

Brendan McGrath : dinput: Use the same GUID for Instance and Product.
by Alexandre Julliard March 3, 2019

March 3, 2019

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

Michael Stefaniuc : include: Add a generic available ARRAY_SIZE().
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: eb5de88738da819c0c0c5f39643e36c3ccd78728 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb5de88738da819c0c0c5f39… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 4 01:10:37 2018 +0200 include: Add a generic available ARRAY_SIZE(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 962b31c80b74cfc479da386a8c76d55d26aed752) Conflicts: dlls/advapi32/advapi32_misc.h dlls/d3d12/d3d12_main.c dlls/d3d9/d3d9_private.h dlls/winevulkan/vulkan_private.h dlls/xmllite/xmllite_private.h programs/regedit/main.h programs/winedbg/debugger.h Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 4 ---- dlls/d3d11/d3d11_private.h | 4 ---- dlls/d3drm/d3drm_private.h | 4 ---- dlls/d3dx9_36/d3dx9_private.h | 2 -- dlls/ddraw/ddraw_private.h | 2 -- dlls/dmloader/dmloader_private.h | 1 - dlls/msi/tokenize.c | 2 -- dlls/usp10/usp10_internal.h | 4 ---- dlls/wined3d/wined3d_private.h | 4 ---- dlls/xmllite/writer.c | 2 -- include/wine/test.h | 4 +++- include/winnt.h | 4 ++++ programs/notepad/main.h | 2 -- programs/reg/reg.h | 1 - programs/regedit/regproc.c | 2 -- tools/make_xftmpl.c | 2 -- 16 files changed, 7 insertions(+), 37 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 98298f8..760bff6 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -30,10 +30,6 @@ #endif #include "dwrite_2.h" -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - enum d2d_brush_type { D2D_BRUSH_TYPE_SOLID, diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index e7fd3a7..3f9bed2 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -37,10 +37,6 @@ #include "wine/winedxgi.h" #include "wine/rbtree.h" -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - #define MAKE_TAG(ch0, ch1, ch2, ch3) \ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 65e0016..2f3269e 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -32,10 +32,6 @@ #include "wine/debug.h" #include "wine/list.h" -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a))) -#endif - struct d3drm_object { LONG ref; diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 5ac5e63..0dbd160 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -30,8 +30,6 @@ #define ULONG64_MAX (~(ULONG64)0) -#define ARRAY_SIZE(array) (sizeof(array)/sizeof(*array)) - struct vec4 { float x, y, z, w; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 0b6666a..34e221a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -38,8 +38,6 @@ #include "wine/list.h" #include "wine/wined3d.h" -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) - extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN; extern DWORD force_refresh_rate DECLSPEC_HIDDEN; diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h index ecda299..36e2bd8 100644 --- a/dlls/dmloader/dmloader_private.h +++ b/dlls/dmloader/dmloader_private.h @@ -42,7 +42,6 @@ #include "dmusicf.h" #include "dmusics.h" -#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) /* dmloader.dll global (for DllCanUnloadNow) */ diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 1656fd8..d1c2da9 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -77,8 +77,6 @@ static const WCHAR updateW[] = {'U','P','D','A','T','E'}; static const WCHAR valuesW[] = {'V','A','L','U','E','S'}; static const WCHAR whereW[] = {'W','H','E','R','E'}; -#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) - /* ** These are the keywords ** They MUST be in alphabetical order diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 2dfca86..f48838e 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -24,10 +24,6 @@ ( (ULONG)_x2 << 8 ) | \ (ULONG)_x1 ) -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - enum usp10_script { Script_Undefined = 0x00, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 56b0f90..004bcd6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -57,10 +57,6 @@ #include "wine/rbtree.h" #include "wine/wgl_driver.h" -#ifndef ARRAY_SIZE -#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) -#endif - #define MAKEDWORD_VERSION(maj, min) (((maj & 0xffffu) << 16) | (min & 0xffffu)) /* Driver quirks */ diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 9bf7e63..88f75b6 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -37,8 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(xmllite); /* not defined in public headers */ DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, 0x33, 0x24, 0x51, 0xbc, 0x1a); -#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) - static const WCHAR closeelementW[] = {'<','/'}; static const WCHAR closetagW[] = {' ','/','>'}; static const WCHAR closepiW[] = {'?','>'}; diff --git a/include/wine/test.h b/include/wine/test.h index d3ccd09..fd427b5 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -127,7 +127,9 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) WINETEST_PRI #define todo_wine_if(is_todo) todo_if((is_todo) && !strcmp(winetest_platform, "wine")) -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#ifndef ARRAY_SIZE +# define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#endif #ifdef NONAMELESSUNION # define U(x) (x).u diff --git a/include/winnt.h b/include/winnt.h index 3eac94d..053bef3 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -759,6 +759,10 @@ typedef struct _MEMORY_BASIC_INFORMATION #define CONTAINING_RECORD(address, type, field) \ ((type *)((PCHAR)(address) - offsetof(type, field))) +#ifdef __WINESRC__ +# define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#endif + /* Types */ typedef struct _LIST_ENTRY { diff --git a/programs/notepad/main.h b/programs/notepad/main.h index b672be6..e0efef0 100644 --- a/programs/notepad/main.h +++ b/programs/notepad/main.h @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define ARRAY_SIZE(a) sizeof(a)/sizeof((a)[0]) - #include "notepad_res.h" #define MAX_STRING_LEN 255 diff --git a/programs/reg/reg.h b/programs/reg/reg.h index eb792bb..42001c7 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -21,7 +21,6 @@ #include "resource.h" -#define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) #define MAX_SUBKEY_LEN 257 /* reg.c */ diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 5866ad0..a6183c9 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -42,8 +42,6 @@ static HKEY reg_class_keys[] = { HKEY_CURRENT_CONFIG, HKEY_CURRENT_USER, HKEY_DYN_DATA }; -#define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) - void *heap_xalloc(size_t size) { void *buf = HeapAlloc(GetProcessHeap(), 0, size); diff --git a/tools/make_xftmpl.c b/tools/make_xftmpl.c index 6a22fef..49a1273 100644 --- a/tools/make_xftmpl.c +++ b/tools/make_xftmpl.c @@ -35,8 +35,6 @@ #include "windef.h" #include "guiddef.h" -#define ARRAY_SIZE(array) (sizeof(array)/sizeof(array[0])) - #define TOKEN_NAME 1 #define TOKEN_STRING 2 #define TOKEN_INTEGER 3

1 0

Piotr Caban : msvcp140: Add _Winerror_map implementation.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: de1c2809f88aaa38ca098ec0fb4a737c4e4839fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=de1c2809f88aaa38ca098ec0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 5 20:21:27 2018 +0100 msvcp140: Add _Winerror_map implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8d0ef952e247e16ff9bbb60e18fc24855b0a789d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/msvcp90/misc.c | 65 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 66c23e6..afd63f1 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1669,7 +1669,7 @@ @ stub -arch=arm ?_W_Gettnames(a)_Locinfo@std@@QBA?AV_Timevec(a)2@XZ @ stub -arch=i386 ?_W_Gettnames(a)_Locinfo@std@@QBE?AV_Timevec(a)2@XZ @ stub -arch=win64 ?_W_Gettnames(a)_Locinfo@std@@QEBA?AV_Timevec(a)2@XZ -@ stub ?_Winerror_map(a)std@@YAHH(a)Z +@ cdecl ?_Winerror_map(a)std@@YAHH(a)Z(long) _Winerror_map @ cdecl -arch=win32 ?_Winerror_message(a)std@@YAKKPADK(a)Z(long ptr long) _Winerror_message @ cdecl -arch=win64 ?_Winerror_message(a)std@@YAKKPEADK(a)Z(long ptr long) _Winerror_message @ stub ?_XGetLastError(a)std@@YAXXZ diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 606fb83..4be4d88 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <errno.h> #include <stdio.h> #include "windef.h" @@ -192,6 +193,7 @@ static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); static int (__cdecl *p_Unlink)(WCHAR const*); static ULONG (__cdecl *p__Winerror_message)(ULONG, char*, ULONG); +static int (__cdecl *p__Winerror_map)(int); static BOOLEAN (WINAPI *pCreateSymbolicLinkW)(const WCHAR *, const WCHAR *, DWORD); @@ -212,6 +214,7 @@ static BOOL init(void) SET(p__Thrd_id, "_Thrd_id"); SET(p__Task_impl_base__IsNonBlockingThread, "?_IsNonBlockingThread(a)_Task_impl_base@details(a)Concurrency@@SA_NXZ"); SET(p__ContextCallback__IsCurrentOriginSTA, "?_IsCurrentOriginSTA(a)_ContextCallback@details(a)Concurrency@@CA_NXZ"); + SET(p__Winerror_map, "?_Winerror_map(a)std@@YAHH(a)Z"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_task_continuation_context_ctor, "??0task_continuation_context(a)Concurrency@@AEAA(a)XZ"); @@ -1304,6 +1307,60 @@ static void test__Winerror_message(void) ok(buf[0] == 'a', "buf = %s\n", buf); } +static void test__Winerror_map(void) +{ + static struct { + int winerr, doserr; + BOOL broken; + } tests[] = { + {ERROR_INVALID_FUNCTION, ENOSYS}, {ERROR_FILE_NOT_FOUND, ENOENT}, + {ERROR_PATH_NOT_FOUND, ENOENT}, {ERROR_TOO_MANY_OPEN_FILES, EMFILE}, + {ERROR_ACCESS_DENIED, EACCES}, {ERROR_INVALID_HANDLE, EINVAL}, + {ERROR_NOT_ENOUGH_MEMORY, ENOMEM}, {ERROR_INVALID_ACCESS, EACCES}, + {ERROR_OUTOFMEMORY, ENOMEM}, {ERROR_INVALID_DRIVE, ENODEV}, + {ERROR_CURRENT_DIRECTORY, EACCES}, {ERROR_NOT_SAME_DEVICE, EXDEV}, + {ERROR_WRITE_PROTECT, EACCES}, {ERROR_BAD_UNIT, ENODEV}, + {ERROR_NOT_READY, EAGAIN}, {ERROR_SEEK, EIO}, {ERROR_WRITE_FAULT, EIO}, + {ERROR_READ_FAULT, EIO}, {ERROR_SHARING_VIOLATION, EACCES}, + {ERROR_LOCK_VIOLATION, ENOLCK}, {ERROR_HANDLE_DISK_FULL, ENOSPC}, + {ERROR_NOT_SUPPORTED, ENOTSUP, TRUE}, {ERROR_DEV_NOT_EXIST, ENODEV}, + {ERROR_FILE_EXISTS, EEXIST}, {ERROR_CANNOT_MAKE, EACCES}, + {ERROR_INVALID_PARAMETER, EINVAL, TRUE}, {ERROR_OPEN_FAILED, EIO}, + {ERROR_BUFFER_OVERFLOW, ENAMETOOLONG}, {ERROR_DISK_FULL, ENOSPC}, + {ERROR_INVALID_NAME, EINVAL}, {ERROR_NEGATIVE_SEEK, EINVAL}, + {ERROR_BUSY_DRIVE, EBUSY}, {ERROR_DIR_NOT_EMPTY, ENOTEMPTY}, + {ERROR_BUSY, EBUSY}, {ERROR_ALREADY_EXISTS, EEXIST}, + {ERROR_LOCKED, ENOLCK}, {ERROR_DIRECTORY, EINVAL}, + {ERROR_OPERATION_ABORTED, ECANCELED}, {ERROR_NOACCESS, EACCES}, + {ERROR_CANTOPEN, EIO}, {ERROR_CANTREAD, EIO}, {ERROR_CANTWRITE, EIO}, + {ERROR_RETRY, EAGAIN}, {ERROR_OPEN_FILES, EBUSY}, + {ERROR_DEVICE_IN_USE, EBUSY}, {ERROR_REPARSE_TAG_INVALID, EINVAL, TRUE}, + {WSAEINTR, EINTR}, {WSAEBADF, EBADF}, {WSAEACCES, EACCES}, + {WSAEFAULT, EFAULT}, {WSAEINVAL, EINVAL}, {WSAEMFILE, EMFILE}, + {WSAEWOULDBLOCK, EWOULDBLOCK}, {WSAEINPROGRESS, EINPROGRESS}, + {WSAEALREADY, EALREADY}, {WSAENOTSOCK, ENOTSOCK}, + {WSAEDESTADDRREQ, EDESTADDRREQ}, {WSAEMSGSIZE, EMSGSIZE}, + {WSAEPROTOTYPE, EPROTOTYPE}, {WSAENOPROTOOPT, ENOPROTOOPT}, + {WSAEPROTONOSUPPORT, EPROTONOSUPPORT}, {WSAEOPNOTSUPP, EOPNOTSUPP}, + {WSAEAFNOSUPPORT, EAFNOSUPPORT}, {WSAEADDRINUSE, EADDRINUSE}, + {WSAEADDRNOTAVAIL, EADDRNOTAVAIL}, {WSAENETDOWN, ENETDOWN}, + {WSAENETUNREACH, ENETUNREACH}, {WSAENETRESET, ENETRESET}, + {WSAECONNABORTED, ECONNABORTED}, {WSAECONNRESET, ECONNRESET}, + {WSAENOBUFS, ENOBUFS}, {WSAEISCONN, EISCONN}, {WSAENOTCONN, ENOTCONN}, + {WSAETIMEDOUT, ETIMEDOUT}, {WSAECONNREFUSED, ECONNREFUSED}, + {WSAENAMETOOLONG, ENAMETOOLONG}, {WSAEHOSTUNREACH, EHOSTUNREACH} + }; + int i, ret; + + for(i=0; i<ARRAY_SIZE(tests); i++) + { + ret = p__Winerror_map(tests[i].winerr); + ok(ret == tests[i].doserr || broken(tests[i].broken && !ret), + "_Winerror_map(%d) returned %d, expected %d\n", + tests[i].winerr, ret, tests[i].doserr); + } +} + START_TEST(msvcp140) { if(!init()) return; @@ -1326,5 +1383,6 @@ START_TEST(msvcp140) test_Rename(); test_Last_write_time(); test__Winerror_message(); + test__Winerror_map(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 89dfc45..2529224 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -197,6 +197,51 @@ static struct { }; #endif +#if _MSVCP_VER >= 140 +static struct { + int winerr; + int doserr; +} winerror_map[] = +{ + {ERROR_INVALID_FUNCTION, ENOSYS}, {ERROR_FILE_NOT_FOUND, ENOENT}, + {ERROR_PATH_NOT_FOUND, ENOENT}, {ERROR_TOO_MANY_OPEN_FILES, EMFILE}, + {ERROR_ACCESS_DENIED, EACCES}, {ERROR_INVALID_HANDLE, EINVAL}, + {ERROR_NOT_ENOUGH_MEMORY, ENOMEM}, {ERROR_INVALID_ACCESS, EACCES}, + {ERROR_OUTOFMEMORY, ENOMEM}, {ERROR_INVALID_DRIVE, ENODEV}, + {ERROR_CURRENT_DIRECTORY, EACCES}, {ERROR_NOT_SAME_DEVICE, EXDEV}, + {ERROR_WRITE_PROTECT, EACCES}, {ERROR_BAD_UNIT, ENODEV}, + {ERROR_NOT_READY, EAGAIN}, {ERROR_SEEK, EIO}, {ERROR_WRITE_FAULT, EIO}, + {ERROR_READ_FAULT, EIO}, {ERROR_SHARING_VIOLATION, EACCES}, + {ERROR_LOCK_VIOLATION, ENOLCK}, {ERROR_HANDLE_DISK_FULL, ENOSPC}, + {ERROR_NOT_SUPPORTED, ENOTSUP}, {ERROR_DEV_NOT_EXIST, ENODEV}, + {ERROR_FILE_EXISTS, EEXIST}, {ERROR_CANNOT_MAKE, EACCES}, + {ERROR_INVALID_PARAMETER, EINVAL}, {ERROR_OPEN_FAILED, EIO}, + {ERROR_BUFFER_OVERFLOW, ENAMETOOLONG}, {ERROR_DISK_FULL, ENOSPC}, + {ERROR_INVALID_NAME, EINVAL}, {ERROR_NEGATIVE_SEEK, EINVAL}, + {ERROR_BUSY_DRIVE, EBUSY}, {ERROR_DIR_NOT_EMPTY, ENOTEMPTY}, + {ERROR_BUSY, EBUSY}, {ERROR_ALREADY_EXISTS, EEXIST}, + {ERROR_LOCKED, ENOLCK}, {ERROR_DIRECTORY, EINVAL}, + {ERROR_OPERATION_ABORTED, ECANCELED}, {ERROR_NOACCESS, EACCES}, + {ERROR_CANTOPEN, EIO}, {ERROR_CANTREAD, EIO}, {ERROR_CANTWRITE, EIO}, + {ERROR_RETRY, EAGAIN}, {ERROR_OPEN_FILES, EBUSY}, + {ERROR_DEVICE_IN_USE, EBUSY}, {ERROR_REPARSE_TAG_INVALID, EINVAL}, + {WSAEINTR, EINTR}, {WSAEBADF, EBADF}, {WSAEACCES, EACCES}, + {WSAEFAULT, EFAULT}, {WSAEINVAL, EINVAL}, {WSAEMFILE, EMFILE}, + {WSAEWOULDBLOCK, EWOULDBLOCK}, {WSAEINPROGRESS, EINPROGRESS}, + {WSAEALREADY, EALREADY}, {WSAENOTSOCK, ENOTSOCK}, + {WSAEDESTADDRREQ, EDESTADDRREQ}, {WSAEMSGSIZE, EMSGSIZE}, + {WSAEPROTOTYPE, EPROTOTYPE}, {WSAENOPROTOOPT, ENOPROTOOPT}, + {WSAEPROTONOSUPPORT, EPROTONOSUPPORT}, {WSAEOPNOTSUPP, EOPNOTSUPP}, + {WSAEAFNOSUPPORT, EAFNOSUPPORT}, {WSAEADDRINUSE, EADDRINUSE}, + {WSAEADDRNOTAVAIL, EADDRNOTAVAIL}, {WSAENETDOWN, ENETDOWN}, + {WSAENETUNREACH, ENETUNREACH}, {WSAENETRESET, ENETRESET}, + {WSAECONNABORTED, ECONNABORTED}, {WSAECONNRESET, ECONNRESET}, + {WSAENOBUFS, ENOBUFS}, {WSAEISCONN, EISCONN}, {WSAENOTCONN, ENOTCONN}, + {WSAETIMEDOUT, ETIMEDOUT}, {WSAECONNREFUSED, ECONNREFUSED}, + {WSAENAMETOOLONG, ENAMETOOLONG}, {WSAEHOSTUNREACH, EHOSTUNREACH} +}; +#endif + struct __Container_proxy; typedef struct { @@ -2152,4 +2197,24 @@ ULONG __cdecl _Winerror_message(ULONG err, char *buf, ULONG size) return FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, err, 0, buf, size, NULL); } + +/* ?_Winerror_map(a)std@@YAHH(a)Z */ +int __cdecl _Winerror_map(int err) +{ + int low = 0, high = ARRAY_SIZE(winerror_map) - 1, mid; + + while(low <= high) + { + mid = (low + high) / 2; + + if(err == winerror_map[mid].winerr) + return winerror_map[mid].doserr; + if(err > winerror_map[mid].winerr) + low = mid + 1; + else + high = mid - 1; + } + + return 0; +} #endif

1 0

Stefan Dösinger : ntdll: Avoid more race conditions in RtlDeregisterWaitEx.
by Alexandre Julliard March 3, 2019

March 3, 2019

Module: wine Branch: oldstable Commit: 8f7aafa9e5ab0ba8f588a356df22240f947dbd43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f7aafa9e5ab0ba8f588a356… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Oct 28 22:14:14 2018 +0100 ntdll: Avoid more race conditions in RtlDeregisterWaitEx. af35aada9b078f8dc71dcc85e505da8eee4571da left some issues unfixed. Instead of running the callback and returning a retval that indicates the callback is not running, we sometimes wait for it when we are not supposed to. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 759e6f1d8d5c531291440299bad0c1ab5ae53d05) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/threadpool.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 1b0546a..bf7449c 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -81,7 +81,7 @@ struct wait_work_item ULONG Flags; HANDLE CompletionEvent; LONG DeleteCount; - BOOLEAN CallbackInProgress; + int CallbackInProgress; }; struct timer_queue; @@ -530,9 +530,14 @@ static DWORD CALLBACK wait_thread_proc(LPVOID Arg) wait_work_item->Context ); TimerOrWaitFired = TRUE; } - wait_work_item->CallbackInProgress = TRUE; + interlocked_xchg( &wait_work_item->CallbackInProgress, TRUE ); + if (wait_work_item->CompletionEvent) + { + TRACE( "Work has been canceled.\n" ); + break; + } wait_work_item->Callback( wait_work_item->Context, TimerOrWaitFired ); - wait_work_item->CallbackInProgress = FALSE; + interlocked_xchg( &wait_work_item->CallbackInProgress, FALSE ); if (wait_work_item->Flags & WT_EXECUTEONLYONCE) break; @@ -546,7 +551,8 @@ static DWORD CALLBACK wait_thread_proc(LPVOID Arg) { completion_event = wait_work_item->CompletionEvent; delete_wait_work_item( wait_work_item ); - if (completion_event) NtSetEvent( completion_event, NULL ); + if (completion_event && completion_event != INVALID_HANDLE_VALUE) + NtSetEvent( completion_event, NULL ); } return 0; @@ -637,14 +643,16 @@ NTSTATUS WINAPI RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent) struct wait_work_item *wait_work_item = WaitHandle; NTSTATUS status; HANDLE LocalEvent = NULL; - BOOLEAN CallbackInProgress; + int CallbackInProgress; TRACE( "(%p %p)\n", WaitHandle, CompletionEvent ); if (WaitHandle == NULL) return STATUS_INVALID_HANDLE; + interlocked_xchg_ptr( &wait_work_item->CompletionEvent, INVALID_HANDLE_VALUE ); CallbackInProgress = wait_work_item->CallbackInProgress; + TRACE( "callback in progress %u\n", CallbackInProgress ); if (CompletionEvent == INVALID_HANDLE_VALUE || !CallbackInProgress) { status = NtCreateEvent( &LocalEvent, EVENT_ALL_ACCESS, NULL, NotificationEvent, FALSE ); @@ -666,6 +674,7 @@ NTSTATUS WINAPI RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent) } else if (LocalEvent) { + TRACE( "Waiting for completion event\n" ); NtWaitForSingleObject( LocalEvent, FALSE, NULL ); status = STATUS_SUCCESS; }

1 0

Alistair Leslie-Hughes : ntdll: Support TokenVirtualizationEnabled in NtQueryInformationToken.
by Alexandre Julliard March 3, 2019

March 3, 2019

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

Nikolay Sivov : gdiplus: Implement GdipScalePenTransform().
by Alexandre Julliard March 3, 2019

March 3, 2019

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

Akihiro Sagawa : dinput: Return DIDEVTYPEKEYBOARD_JAPAN106 subtype when it is used.
by Alexandre Julliard March 3, 2019

March 3, 2019

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: Use GET_DIDEVICE_SUBTYPE macro in keyboard type tests.
by Alexandre Julliard March 3, 2019

March 3, 2019

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 March 3, 2019

March 3, 2019

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