September 2021 - Wine-commits

Nikolay Sivov : widl: Write default values for VARIANT arguments.
by Alexandre Julliard 08 Sep '21

08 Sep '21

Module: wine Branch: master Commit: ec9892585eb36ec62c39458a1ffb0c0bdffef558 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec9892585eb36ec62c39458a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 8 13:20:50 2021 +0300 widl: Write default values for VARIANT arguments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index c39f38249c8..228f58e2649 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1221,7 +1221,8 @@ static void write_default_value(msft_typelib_t *typelib, type_t *type, expr_t *e int vt; if (expr->type == EXPR_STRLIT || expr->type == EXPR_WSTRLIT) { - if (get_type_vt(type) != VT_BSTR) + vt = get_type_vt(type); + if (vt != VT_BSTR && vt != VT_VARIANT) error("string default value applied to non-string type\n"); chat("default value '%s'\n", expr->u.sval); write_string_value(typelib, out, expr->u.sval); @@ -1251,6 +1252,20 @@ static void write_default_value(msft_typelib_t *typelib, type_t *type, expr_t *e case VT_UINT: case VT_HRESULT: break; + case VT_VARIANT: { + switch (expr->type) { + case EXPR_DOUBLE: + vt = VT_R4; + break; + case EXPR_NUM: + vt = VT_I4; + break; + default: + warning("can't write default VT_VARIANT value for expression type %d.\n", expr->type); + return; + } + break; + } default: warning("can't write value of type %d yet\n", vt); return;

1 0

Rémi Bernon : winebus.sys: Return an event from SDL bus wait on device creation.
by Alexandre Julliard 08 Sep '21

08 Sep '21

Module: wine Branch: master Commit: 507a3076ded1e381233c0d0358ea455bd5ec052f URL: https://source.winehq.org/git/wine.git/?a=commit;h=507a3076ded1e381233c0d03… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 6 09:17:31 2021 +0200 winebus.sys: Return an event from SDL bus wait on device creation. Instead of calling bus_create_hid_device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 14 ++++---------- dlls/winebus.sys/main.c | 10 ++++++++++ dlls/winebus.sys/unix_private.h | 1 + dlls/winebus.sys/unixlib.c | 14 ++++++++++++++ dlls/winebus.sys/unixlib.h | 7 +++++++ 5 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 1f7cf237e25..80252e7e6b1 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -741,7 +741,6 @@ static void sdl_add_device(unsigned int index) .serial = {'0','0','0','0',0}, }; struct platform_private *private; - DEVICE_OBJECT *device = NULL; char guid_str[34]; SDL_Joystick* joystick; @@ -791,16 +790,11 @@ static void sdl_add_device(unsigned int index) if (!(private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*private)))) return; private->unix_device.vtbl = &sdl_device_vtbl; + private->sdl_joystick = joystick; + private->sdl_controller = controller; + private->id = id; - device = bus_create_hid_device(&desc, &private->unix_device); - if (!device) HeapFree(GetProcessHeap(), 0, private); - else - { - private->sdl_joystick = joystick; - private->sdl_controller = controller; - private->id = id; - IoInvalidateDeviceRelations(bus_pdo, BusRelations); - } + bus_event_queue_device_created(&event_queue, &private->unix_device, &desc); } static void process_device_event(SDL_Event *event) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 6093a0b79eb..8a565bc3c46 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -578,6 +578,16 @@ static DWORD CALLBACK bus_main_thread(void *args) LeaveCriticalSection(&device_list_cs); IoInvalidateDeviceRelations(bus_pdo, BusRelations); break; + case BUS_EVENT_TYPE_DEVICE_CREATED: + device = bus_create_hid_device(&event->device_created.desc, event->device_created.device); + if (device) IoInvalidateDeviceRelations(bus_pdo, BusRelations); + else + { + WARN("failed to create device for %s bus device %p\n", + debugstr_w(bus.name), event->device_created.device); + winebus_call(device_remove, event->device_created.device); + } + break; } } diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 81c4658068b..5cf999fff86 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -61,6 +61,7 @@ extern NTSTATUS iohid_bus_stop(void *) DECLSPEC_HIDDEN; extern void bus_event_queue_destroy(struct list *queue) DECLSPEC_HIDDEN; extern BOOL bus_event_queue_device_removed(struct list *queue, const WCHAR *bus_id, void *context) DECLSPEC_HIDDEN; +extern BOOL bus_event_queue_device_created(struct list *queue, struct unix_device *device, struct device_desc *desc) DECLSPEC_HIDDEN; extern BOOL bus_event_queue_pop(struct list *queue, struct bus_event *event) DECLSPEC_HIDDEN; struct hid_descriptor diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 2337cb3706d..9b0ccc0ae1a 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -327,6 +327,20 @@ BOOL bus_event_queue_device_removed(struct list *queue, const WCHAR *bus_id, voi return TRUE; } +BOOL bus_event_queue_device_created(struct list *queue, struct unix_device *device, struct device_desc *desc) +{ + ULONG size = sizeof(struct bus_event); + struct bus_event *event = HeapAlloc(GetProcessHeap(), 0, size); + if (!event) return FALSE; + + event->type = BUS_EVENT_TYPE_DEVICE_CREATED; + event->device_created.device = device; + event->device_created.desc = *desc; + list_add_tail(queue, &event->entry); + + return TRUE; +} + BOOL bus_event_queue_pop(struct list *queue, struct bus_event *event) { struct list *entry = list_head(queue); diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index 96671de0cac..85a03dd17ee 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -65,6 +65,7 @@ enum bus_event_type { BUS_EVENT_TYPE_NONE, BUS_EVENT_TYPE_DEVICE_REMOVED, + BUS_EVENT_TYPE_DEVICE_CREATED, }; struct bus_event @@ -79,6 +80,12 @@ struct bus_event const WCHAR *bus_id; void *context; } device_removed; + + struct + { + struct unix_device *device; + struct device_desc desc; + } device_created; }; };

1 0

Rémi Bernon : winebus.sys: Return an event from UDEV bus wait on device creation.
by Alexandre Julliard 08 Sep '21

08 Sep '21

Module: wine Branch: master Commit: f7be0f5edf51a54fd992c3144ea35a58fdd9750d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7be0f5edf51a54fd992c314… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 6 09:17:32 2021 +0200 winebus.sys: Return an event from UDEV bus wait on device creation. And queued events generated from initial device enumeration. Instead of calling bus_create_hid_device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index cca1bf5e168..78e74de842a 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1098,7 +1098,6 @@ static void udev_add_device(struct udev_device *dev) .input = -1, }; struct platform_private *private; - DEVICE_OBJECT *device = NULL; const char *subsystem; const char *devnode; int fd; @@ -1182,9 +1181,10 @@ static void udev_add_device(struct udev_device *dev) EnterCriticalSection(&udev_cs); list_add_tail(&device_list, &private->unix_device.entry); LeaveCriticalSection(&udev_cs); + private->udev_device = udev_device_ref(dev); + private->device_fd = fd; - device = bus_create_hid_device(&desc, &private->unix_device); - if (!device) HeapFree(GetProcessHeap(), 0, private); + bus_event_queue_device_created(&event_queue, &private->unix_device, &desc); } #ifdef HAS_PROPER_INPUT_HEADER else if (strcmp(subsystem, "input") == 0) @@ -1195,23 +1195,12 @@ static void udev_add_device(struct udev_device *dev) EnterCriticalSection(&udev_cs); list_add_tail(&device_list, &private->unix_device.entry); LeaveCriticalSection(&udev_cs); - - device = bus_create_hid_device(&desc, &private->unix_device); - if (!device) HeapFree(GetProcessHeap(), 0, private); - } -#endif - - if (device) - { private->udev_device = udev_device_ref(dev); private->device_fd = fd; - IoInvalidateDeviceRelations(bus_pdo, BusRelations); - } - else - { - WARN("Ignoring device %s with subsystem %s\n", debugstr_a(devnode), subsystem); - close(fd); + + bus_event_queue_device_created(&event_queue, &private->unix_device, &desc); } +#endif } static void try_remove_device(struct udev_device *dev)

1 0

Rémi Bernon : winebus.sys: Return an event from IOHID bus wait on device creation.
by Alexandre Julliard 08 Sep '21

08 Sep '21

Module: wine Branch: master Commit: 83f0de44878bbf0e77d7c5f80d1d4261596f20b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83f0de44878bbf0e77d7c5f8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 6 09:17:33 2021 +0200 winebus.sys: Return an event from IOHID bus wait on device creation. Instead of calling bus_create_hid_device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 2 -- dlls/winebus.sys/bus_iohid.c | 12 +++--------- dlls/winebus.sys/main.c | 4 ++-- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 15238538328..75ff218c26d 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -30,7 +30,6 @@ struct unix_device *get_unix_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; /* HID Plug and Play Bus */ -DEVICE_OBJECT *bus_create_hid_device(struct device_desc *desc, struct unix_device *unix_device) DECLSPEC_HIDDEN; DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) DECLSPEC_HIDDEN; void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) DECLSPEC_HIDDEN; @@ -38,4 +37,3 @@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) DECLS BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; extern HANDLE driver_key DECLSPEC_HIDDEN; -extern DEVICE_OBJECT *bus_pdo DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 9a2a6f1ec8b..3df60a1b516 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -297,7 +297,6 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * .serial = {'0','0','0','0',0}, }; struct platform_private *private; - DEVICE_OBJECT *device; CFStringRef str = NULL; desc.vid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVendorIDKey))); @@ -364,15 +363,10 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * if (!(private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct platform_private)))) return; private->unix_device.vtbl = &iohid_device_vtbl; + private->device = IOHIDDevice; + private->buffer = NULL; - device = bus_create_hid_device(&desc, &private->unix_device); - if (!device) HeapFree(GetProcessHeap(), 0, private); - else - { - private->device = IOHIDDevice; - private->buffer = NULL; - IoInvalidateDeviceRelations(bus_pdo, BusRelations); - } + bus_event_queue_device_created(&event_queue, &private->unix_device, &desc); } static void handle_RemovalCallback(void *context, IOReturn result, void *sender, IOHIDDeviceRef IOHIDDevice) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 8a565bc3c46..42614b09f3a 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -98,7 +98,7 @@ static DEVICE_OBJECT *mouse_obj; static DEVICE_OBJECT *keyboard_obj; /* The root-enumerated device stack. */ -DEVICE_OBJECT *bus_pdo; +static DEVICE_OBJECT *bus_pdo; static DEVICE_OBJECT *bus_fdo; HANDLE driver_key; @@ -341,7 +341,7 @@ static void remove_pending_irps(DEVICE_OBJECT *device) } } -DEVICE_OBJECT *bus_create_hid_device(struct device_desc *desc, struct unix_device *unix_device) +static DEVICE_OBJECT *bus_create_hid_device(struct device_desc *desc, struct unix_device *unix_device) { static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e','\\','%','s','#','%','p',0}; struct device_extension *ext;

1 0

Bernhard Übelacker : attrib: Avoid crash when called without parameter.
by Alexandre Julliard 08 Sep '21

08 Sep '21

Module: wine Branch: master Commit: 5ec15243266b19970875770da1576d826d0be7a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ec15243266b19970875770d… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Wed Sep 8 14:55:43 2021 +0200 attrib: Avoid crash when called without parameter. If attrib is called without any parameter the variable originalname is used uninitialized. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/attrib/attrib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 4813443449b..13fedad4e34 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -252,7 +252,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) } /* By default all files from current directory are taken into account */ - lstrcpyW(name, L"*"); + lstrcpyW(originalname, L".\\*"); while (i < argc) { WCHAR *param = argv[i++];

1 0

Bernhard Übelacker : cmd/tests: Add test for attrib without parameter.
by Alexandre Julliard 08 Sep '21

08 Sep '21

Module: wine Branch: master Commit: 36cc3d4c9cdcb3d9ed7bf75721cdf31d51ff7bf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36cc3d4c9cdcb3d9ed7bf757… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Wed Sep 8 14:55:44 2021 +0200 cmd/tests: Add test for attrib without parameter. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 1 + programs/cmd/tests/test_builtins.cmd.exp | 1 + 2 files changed, 2 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 7cd806c3d54..47b028207ac 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -2360,6 +2360,7 @@ echo ------------ Testing attrib ------------ rem FIXME Add tests for archive, hidden and system attributes + mixed attributes modifications mkdir foobar & cd foobar echo foo original contents> foo +attrib attrib foo echo > bar echo --- read-only attribute diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index bf5fcddeb9d..4c7bc3e0c02 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1431,6 +1431,7 @@ bar\baz removed @pwd@ ------------ Testing attrib ------------ A(a)spaces@@drive@@path(a)foobar\foo(a)or_broken@A I(a)spaces@@drive@@path(a)foobar\foo +A(a)spaces@@drive@@path(a)foobar\foo(a)or_broken@A I(a)spaces@@drive@@path(a)foobar\foo --- read-only attribute A R(a)spaces@@drive@@path(a)foobar\foo(a)or_broken@A R I(a)spaces@@drive@@path(a)foobar\foo foo

1 0

Zhiyi Zhang : wineboot: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard 08 Sep '21

08 Sep '21

Module: wine Branch: master Commit: 7ba8481f323762a66435cc4112110c440d3a8f45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ba8481f323762a66435cc41… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 8 10:24:43 2021 +0800 wineboot: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/wineboot/wineboot.manifest b/programs/wineboot/wineboot.manifest index 6e5892ae6ac..2ac376230bc 100644 --- a/programs/wineboot/wineboot.manifest +++ b/programs/wineboot/wineboot.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Zhiyi Zhang : winecfg: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard 08 Sep '21

08 Sep '21

Module: wine Branch: master Commit: 757be2748179914fd052e829bb5c0839959ff9de URL: https://source.winehq.org/git/wine.git/?a=commit;h=757be2748179914fd052e829… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 8 10:24:54 2021 +0800 winecfg: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/winecfg.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/winecfg/winecfg.manifest b/programs/winecfg/winecfg.manifest index 900887751ab..a0f08603ba2 100644 --- a/programs/winecfg/winecfg.manifest +++ b/programs/winecfg/winecfg.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Zhiyi Zhang : winedbg: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard 08 Sep '21

08 Sep '21

Module: wine Branch: master Commit: dacf456ca66df56386014bab0d657e1bb30d4dbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=dacf456ca66df56386014bab… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 8 10:25:07 2021 +0800 winedbg: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/winedbg.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/winedbg/winedbg.manifest b/programs/winedbg/winedbg.manifest index 5061d141f16..5746534b076 100644 --- a/programs/winedbg/winedbg.manifest +++ b/programs/winedbg/winedbg.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0

Zhiyi Zhang : winefile: Add system DPI awareness settings to the application manifest.
by Alexandre Julliard 08 Sep '21

08 Sep '21

Module: wine Branch: master Commit: 838e7bcd1b20e5cb005b0dea06e0c76631a1b9fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=838e7bcd1b20e5cb005b0dea… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 8 10:25:15 2021 +0800 winefile: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winefile/winefile.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/winefile/winefile.manifest b/programs/winefile/winefile.manifest index 4ebd48c8933..d4ae2d1b3f0 100644 --- a/programs/winefile/winefile.manifest +++ b/programs/winefile/winefile.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly>

1 0