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

[PATCH 3/4] hidclass.sys: Set LinkUsage field in build_elements function.
by Piotr Caban May 6, 2019

May 6, 2019

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/hidclass.sys/descriptor.c | 2 ++ 1 file changed, 2 insertions(+)

2 1

[PATCH 2/4] hidclass.sys: Set LinkUsagePage field in build_elements function.
by Piotr Caban May 6, 2019

May 6, 2019

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/hidclass.sys/descriptor.c | 2 ++ 1 file changed, 2 insertions(+)

2 1

[PATCH 1/4] hidclass.sys: Set LinkCollection field in build_elements function.
by Piotr Caban May 6, 2019

May 6, 2019

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/hidclass.sys/descriptor.c | 2 ++ 1 file changed, 2 insertions(+)

2 1

[PATCH 3/3] hid: Only set first usage in an array in HidP_SetUsageValue.
by Piotr Caban May 6, 2019

May 6, 2019

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/hid/hidp.c | 1 + 1 file changed, 1 insertion(+)

2 1

[PATCH 2/3] hid: Add support for ranges in find_value.
by Piotr Caban May 6, 2019

May 6, 2019

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/hid/hidp.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-)

2 1

[PATCH 1/3] hid: Add HidP_SetUsages implementation.
by Piotr Caban May 6, 2019

May 6, 2019

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-)

2 1

[PATCH] dinput: Use a helper function to get device type.
by Alistair Leslie-Hughes May 6, 2019

May 6, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/dinput_private.h | 1 + dlls/dinput/joystick.c | 6 ++++++ dlls/dinput/joystick_linux.c | 6 +----- dlls/dinput/joystick_linuxinput.c | 6 +----- dlls/dinput/joystick_osx.c | 12 ++---------- 5 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index acda6c8..c97a493 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -81,6 +81,7 @@ extern void _copy_diactionformatWtoA(LPDIACTIONFORMATA, LPDIACTIONFORMATW) DECLS extern HRESULT _configure_devices(IDirectInput8W *iface, LPDICONFIGUREDEVICESCALLBACK lpdiCallback, LPDICONFIGUREDEVICESPARAMSW lpdiCDParams, DWORD dwFlags, LPVOID pvRefData) DECLSPEC_HIDDEN; extern WCHAR* get_mapping_path(const WCHAR *device, const WCHAR *username) DECLSPEC_HIDDEN; +extern DWORD get_device_type(DWORD version) DECLSPEC_HIDDEN; #define IS_DIPROP(x) (((ULONG_PTR)(x) >> 16) == 0) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 0ec1ceb..9240ba3 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -76,6 +76,12 @@ DWORD typeFromGUID(REFGUID guid) } } +DWORD get_device_type(DWORD version) +{ + return version >= 0x0800 ? DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8) : + DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); +} + static void _dump_DIEFFECT_flags(DWORD dwFlags) { if (TRACE_ON(dinput)) { diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index f93fc2f..fb1b878 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -322,11 +322,7 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver lpddi->guidInstance = DInput_Wine_Joystick_GUID; lpddi->guidInstance.Data3 = id; lpddi->guidProduct = joystick_devices[id].guid_product; - /* we only support traditional joysticks for now */ - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); + lpddi->dwDevType = get_device_type(version); /* Assume the joystick as HID if it is attached to USB bus and has a valid VID/PID */ if (joystick_devices[id].bus_type == BUS_USB && diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index cea669b..c93d255 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -353,11 +353,7 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver lpddi->guidInstance = joydevs[id].guid; lpddi->guidProduct = joydevs[id].guid_product; lpddi->guidFFDriver = GUID_NULL; - - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); + lpddi->dwDevType = get_device_type(version); /* Assume the joystick as HID if it is attached to USB bus and has a valid VID/PID */ if (joydevs[id].bus_type == BUS_USB && diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index daef1a1..cb88b2f 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -967,11 +967,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS lpddi->guidInstance.Data3 = id; lpddi->guidProduct = DInput_Wine_OsX_Joystick_GUID; lpddi->guidProduct.Data1 = make_vid_pid(device); - /* we only support traditional joysticks for now */ - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); + lpddi->dwDevType = get_device_type(version); lpddi->dwDevType |= DIDEVTYPE_HID; lpddi->wUsagePage = 0x01; /* Desktop */ lpddi->wUsage = 0x05; /* Game Pad */ @@ -1014,11 +1010,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS lpddi->guidInstance.Data3 = id; lpddi->guidProduct = DInput_Wine_OsX_Joystick_GUID; lpddi->guidProduct.Data1 = make_vid_pid(device); - /* we only support traditional joysticks for now */ - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + lpddi->dwDevType = get_device_type(version); sprintf(friendly, "Joystick %d", id); MultiByteToWideChar(CP_ACP, 0, friendly, -1, lpddi->tszInstanceName, MAX_PATH); /* get the device name */ -- 1.9.1

2 1

[PATCH] ntoskrnl.exe: Correctly initialize two CRITICAL_SECTION_DEBUGs
by Michael Stefaniuc May 6, 2019

May 6, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index b353839c0a..73fe054259 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -293,7 +293,7 @@ static CRITICAL_SECTION obref_cs; static CRITICAL_SECTION_DEBUG obref_critsect_debug = { 0, 0, &obref_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + { &obref_critsect_debug.ProcessLocksList, &obref_critsect_debug.ProcessLocksList }, 0, 0, { (DWORD_PTR)(__FILE__ ": obref_cs") } }; static CRITICAL_SECTION obref_cs = { &obref_critsect_debug, -1, 0, 0, 0, 0 }; @@ -396,7 +396,7 @@ static CRITICAL_SECTION handle_map_cs; static CRITICAL_SECTION_DEBUG handle_map_critsect_debug = { 0, 0, &handle_map_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + { &handle_map_critsect_debug.ProcessLocksList, &handle_map_critsect_debug.ProcessLocksList }, 0, 0, { (DWORD_PTR)(__FILE__ ": handle_map_cs") } }; static CRITICAL_SECTION handle_map_cs = { &handle_map_critsect_debug, -1, 0, 0, 0, 0 }; -- 2.20.1

2 6

[PATCH] server: Use all group attributes in create_token.
by Vijay Kiran Kamuju May 6, 2019

May 6, 2019

From: Sebastian Lackner <sebastian(a)fds-team.de> From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- server/token.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/server/token.c b/server/token.c index e0f28c6da6..550018cb17 100644 --- a/server/token.c +++ b/server/token.c @@ -584,13 +584,13 @@ static struct token *create_token( unsigned primary, const SID *user, return NULL; } memcpy( &group->sid, groups[i].Sid, security_sid_len( groups[i].Sid )); - group->enabled = TRUE; - group->def = TRUE; - group->logon = (groups[i].Attributes & SE_GROUP_LOGON_ID) != 0; group->mandatory = (groups[i].Attributes & SE_GROUP_MANDATORY) != 0; - group->owner = (groups[i].Attributes & SE_GROUP_OWNER) != 0; - group->resource = FALSE; - group->deny_only = FALSE; + group->def = (groups[i].Attributes & SE_GROUP_ENABLED_BY_DEFAULT) != 0; + group->enabled = (groups[i].Attributes & SE_GROUP_ENABLED) != 0; + group->owner = (groups[i].Attributes & SE_GROUP_OWNER) != 0; + group->deny_only = (groups[i].Attributes & SE_GROUP_USE_FOR_DENY_ONLY) != 0; + group->logon = (groups[i].Attributes & SE_GROUP_LOGON_ID) != 0; + group->resource = (groups[i].Attributes & SE_GROUP_RESOURCE) != 0; list_add_tail( &token->groups, &group->entry ); /* Use first owner capable group as owner and primary group */ if (!token->primary_group && group->owner) @@ -1504,8 +1504,8 @@ DECL_HANDLER(get_token_groups) if (group->enabled) *attr_ptr |= SE_GROUP_ENABLED; if (group->owner) *attr_ptr |= SE_GROUP_OWNER; if (group->deny_only) *attr_ptr |= SE_GROUP_USE_FOR_DENY_ONLY; - if (group->resource) *attr_ptr |= SE_GROUP_RESOURCE; if (group->logon) *attr_ptr |= SE_GROUP_LOGON_ID; + if (group->resource) *attr_ptr |= SE_GROUP_RESOURCE; memcpy(sid_ptr, &group->sid, security_sid_len( &group->sid )); -- 2.21.0

2 1

[PATCH] msi: Remove registration for no longer used WineMsiRemoteCustomAction coclass.
by Zebediah Figura May 6, 2019

May 6, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/msiserver.idl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 4eb33fe4d7..1fda4fa558 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -117,11 +117,6 @@ coclass MsiPatch { } /* FIXME: unidentified class */ coclass MsiServerX3 { interface IMsiServer; } -[ - uuid(ba26e6fa-4f27-4f56-953a-3f90272018aa) -] -coclass WineMsiRemoteCustomAction { interface WineMsiRemoteCustomAction; } - [ uuid(000C1092-0000-0000-C000-000000000046), version(1.0) ] library WindowsInstaller { -- 2.21.0

2 2