November 2022 - Wine-commits

Nikolay Sivov : d3d10/effect: Add min/max instructions support for expressions.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 854ecc773cc0273db71a0c90ad74ea635f3eb17e URL: https://gitlab.winehq.org/wine/wine/-/commit/854ecc773cc0273db71a0c90ad74ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 27 20:08:05 2022 +0300 d3d10/effect: Add min/max instructions support for expressions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 23 +++++++- dlls/d3d10/tests/effect.c | 147 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 159 insertions(+), 11 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add 'neg' instruction support for expressions.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: eb3e4b79acb73d9724dc6f978f927c4f9a3c3181 URL: https://gitlab.winehq.org/wine/wine/-/commit/eb3e4b79acb73d9724dc6f978f927c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 30 17:26:34 2022 +0300 d3d10/effect: Add 'neg' instruction support for expressions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 10 ++++++++++ dlls/d3d10/tests/effect.c | 39 ++++++++++++++++++++------------------- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 7afd5da3e4b..a0759514494 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -207,6 +207,15 @@ struct preshader_instr typedef void (*pres_op_func)(float **args, unsigned int n, const struct preshader_instr *instr); +static void pres_neg(float **args, unsigned int n, const struct preshader_instr *instr) +{ + float *retval = args[1]; + unsigned int i; + + for (i = 0; i < instr->comp_count; ++i) + retval[i] = -args[0][i]; +} + static void pres_ftou(float **args, unsigned int n, const struct preshader_instr *instr) { float *retval = args[1]; @@ -255,6 +264,7 @@ struct preshader_op_info static const struct preshader_op_info preshader_ops[] = { + { 0x101, "neg", pres_neg }, { 0x133, "ftou", pres_ftou }, { 0x200, "min", pres_min }, { 0x201, "max", pres_max }, diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 77d0c2e2d60..5d1c2d47699 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -8142,7 +8142,7 @@ technique10 tech { pass p0 { - SetBlendState( NULL, g_var + 0.1f + g_var2, 0 ); + SetBlendState( NULL, -g_var + 0.1f + g_var2, 0 ); } pass p1 { @@ -8164,23 +8164,24 @@ technique10 tech #endif static DWORD fx_test_value_expression[] = { - 0x43425844, 0x20f6c3c9, 0x33c16d9f, 0xa04ed2e5, 0xf3d9ceb1, 0x00000001, 0x00000a01, 0x00000001, - 0x00000024, 0x30315846, 0x000009d5, 0xfeff1001, 0x00000001, 0x00000002, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000001, 0x00000801, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x43425844, 0x88394383, 0x834c826b, 0xb85f55f9, 0xe141c400, 0x00000001, 0x00000a21, 0x00000001, + 0x00000024, 0x30315846, 0x000009f5, 0xfeff1001, 0x00000001, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00000821, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6f6c4724, 0x736c6162, 0x6f6c6600, 0x00347461, 0x0000000d, 0x00000001, 0x00000000, 0x00000010, 0x00000010, - 0x00000010, 0x0000210a, 0x61765f67, 0x5f670072, 0x32726176, 0x63657400, 0x30700068, 0x00016000, - 0x42584400, 0x312ce543, 0xc3ebc897, 0xea47c0a2, 0x8a710323, 0x000001d2, 0x00016000, 0x00000300, + 0x00000010, 0x0000210a, 0x61765f67, 0x5f670072, 0x32726176, 0x63657400, 0x30700068, 0x00018000, + 0x42584400, 0x042b4d43, 0x89240778, 0x7627fdd4, 0xd3b7fecb, 0x0000014d, 0x00018000, 0x00000300, 0x00002c00, 0x0000d400, 0x0000f000, 0x41544300, 0x0000a042, 0x00001c00, 0x00007700, 0x58040000, 0x00000246, 0x00001c00, 0x00010000, 0x00007400, 0x00004400, 0x00000200, 0x00000100, 0x00004c00, 0x00000000, 0x00005c00, 0x01000200, 0x00000100, 0x00006400, 0x00000000, 0x765f6700, 0xab007261, 0x030001ab, 0x04000100, 0x00000100, 0x00000000, 0x765f6700, 0x00327261, 0x030001ab, 0x04000100, 0x00000100, 0x00000000, 0x00787400, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x494c43ab, 0x00001434, 0x00000400, - 0xcccccd00, 0x0000003d, 0x00000000, 0x00000000, 0x4c584600, 0x00006843, 0x00000200, 0x40000400, - 0x00000220, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000200, 0x00000400, 0x00000000, - 0x00000700, 0x00000000, 0x40000400, 0x000002a0, 0x00000000, 0x00000100, 0x00000000, 0x00000000, - 0x00000700, 0x00000000, 0x00000000, 0x00000400, 0x00000000, 0xf0f0f000, 0x0f0f0ff0, 0x00ffff0f, + 0xcccccd00, 0x0000003d, 0x00000000, 0x00000000, 0x4c584600, 0x00008843, 0x00000300, 0x10000400, + 0x00000110, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000700, 0x00000000, 0x40000400, + 0x00000220, 0x00000000, 0x00000700, 0x00000000, 0x00000000, 0x00000200, 0x00000400, 0x00000000, + 0x00000700, 0x00000400, 0x40000400, 0x000002a0, 0x00000000, 0x00000100, 0x00000000, 0x00000000, + 0x00000700, 0x00000400, 0x00000000, 0x00000400, 0x00000000, 0xf0f0f000, 0x0f0f0ff0, 0x00ffff0f, 0x00000100, 0x00000200, 0x00000000, 0x00000100, 0x00000200, 0x00000000, 0x00317000, 0x00000150, 0x43425844, 0xc6a29e4c, 0x6292ed35, 0xd90bb8cb, 0x50dcd25f, 0x00000001, 0x00000150, 0x00000003, 0x0000002c, 0x000000d4, 0x000000e0, 0x42415443, 0x000000a0, 0x0000001c, 0x00000077, 0x46580400, @@ -8235,15 +8236,15 @@ static DWORD fx_test_value_expression[] = 0x00000000, 0x00000200, 0xffffff00, 0x000000ff, 0x00003000, 0x00001400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00003600, 0x00001400, 0x00000000, 0x00001000, 0x00000000, 0x00000000, 0x00000000, 0x00003d00, 0x00000500, 0x00000000, 0x00004200, 0x00000300, 0x00000000, - 0x00000a00, 0x00000000, 0x00000600, 0x00004500, 0x00000b00, 0x00000000, 0x00000100, 0x0001a900, - 0x00000200, 0x00000000, 0x00000100, 0x0001b500, 0x0001c100, 0x00000300, 0x00000000, 0x00000a00, - 0x00000000, 0x00000600, 0x0001c400, 0x00000b00, 0x00000000, 0x00000100, 0x00031800, 0x00000200, - 0x00000000, 0x00000100, 0x00032400, 0x00033000, 0x00000300, 0x00000000, 0x00000a00, 0x00000000, - 0x00000600, 0x00033300, 0x00000b00, 0x00000000, 0x00000100, 0x00056300, 0x00000200, 0x00000000, - 0x00000100, 0x00056f00, 0x00057b00, 0x00000300, 0x00000000, 0x00000a00, 0x00000000, 0x00000600, - 0x00057e00, 0x00000b00, 0x00000000, 0x00000100, 0x0006a600, 0x00000200, 0x00000000, 0x00000100, - 0x0006b200, 0x0006be00, 0x00000300, 0x00000000, 0x00000a00, 0x00000000, 0x00000600, 0x0006c100, - 0x00000b00, 0x00000000, 0x00000100, 0x0007e900, 0x00000200, 0x00000000, 0x00000100, 0x0007f500, + 0x00000a00, 0x00000000, 0x00000600, 0x00004500, 0x00000b00, 0x00000000, 0x00000100, 0x0001c900, + 0x00000200, 0x00000000, 0x00000100, 0x0001d500, 0x0001e100, 0x00000300, 0x00000000, 0x00000a00, + 0x00000000, 0x00000600, 0x0001e400, 0x00000b00, 0x00000000, 0x00000100, 0x00033800, 0x00000200, + 0x00000000, 0x00000100, 0x00034400, 0x00035000, 0x00000300, 0x00000000, 0x00000a00, 0x00000000, + 0x00000600, 0x00035300, 0x00000b00, 0x00000000, 0x00000100, 0x00058300, 0x00000200, 0x00000000, + 0x00000100, 0x00058f00, 0x00059b00, 0x00000300, 0x00000000, 0x00000a00, 0x00000000, 0x00000600, + 0x00059e00, 0x00000b00, 0x00000000, 0x00000100, 0x0006c600, 0x00000200, 0x00000000, 0x00000100, + 0x0006d200, 0x0006de00, 0x00000300, 0x00000000, 0x00000a00, 0x00000000, 0x00000600, 0x0006e100, + 0x00000b00, 0x00000000, 0x00000100, 0x00080900, 0x00000200, 0x00000000, 0x00000100, 0x00081500, 0x00000000, };

1 0

Zebediah Figura : wined3d: Use unsigned int for "refcount" variables.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: f5ce9f63121950007b3ce0b8a6e81b88586047b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5ce9f63121950007b3ce0b8a6e81b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 30 10:35:03 2022 -0600 wined3d: Use unsigned int for "refcount" variables. --- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/cs.c | 4 ++-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/palette.c | 4 ++-- dlls/wined3d/query.c | 4 ++-- dlls/wined3d/sampler.c | 4 ++-- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/state.c | 12 ++++++------ dlls/wined3d/stateblock.c | 4 ++-- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/texture.c | 5 ++--- dlls/wined3d/vertexdeclaration.c | 4 ++-- dlls/wined3d/view.c | 12 ++++++------ 14 files changed, 36 insertions(+), 37 deletions(-)

1 0

Ivo Ivanov : wineusb.sys: Move event handling to a single thread.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 46360dd73279c5bdd9a8e9e1e793bf7f34151f6d URL: https://gitlab.winehq.org/wine/wine/-/commit/46360dd73279c5bdd9a8e9e1e793bf… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Sun Sep 4 11:47:37 2022 +0300 wineusb.sys: Move event handling to a single thread. Also fixes a segmentation fault on exit of winedevice.exe. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52213 --- dlls/wineusb.sys/unixlib.c | 57 +++++++++++++++++++++++----------------------- dlls/wineusb.sys/unixlib.h | 5 ++-- dlls/wineusb.sys/wineusb.c | 37 +++++++++++------------------- 3 files changed, 43 insertions(+), 56 deletions(-) diff --git a/dlls/wineusb.sys/unixlib.c b/dlls/wineusb.sys/unixlib.c index f269d3e96fd..278750c37f6 100644 --- a/dlls/wineusb.sys/unixlib.c +++ b/dlls/wineusb.sys/unixlib.c @@ -51,10 +51,7 @@ struct unix_device static libusb_hotplug_callback_handle hotplug_cb_handle; -static bool thread_shutdown; - -static pthread_cond_t event_cond = PTHREAD_COND_INITIALIZER; -static pthread_mutex_t event_mutex = PTHREAD_MUTEX_INITIALIZER; +static volatile bool thread_shutdown; static struct usb_event *usb_events; static size_t usb_event_count, usb_events_capacity; @@ -92,28 +89,21 @@ static bool array_reserve(void **elements, size_t *capacity, size_t count, size_ static void queue_event(const struct usb_event *event) { - pthread_mutex_lock(&event_mutex); if (array_reserve((void **)&usb_events, &usb_events_capacity, usb_event_count + 1, sizeof(*usb_events))) usb_events[usb_event_count++] = *event; else ERR("Failed to queue event.\n"); - pthread_mutex_unlock(&event_mutex); - pthread_cond_signal(&event_cond); } -static NTSTATUS usb_get_event(void *args) +static bool get_event(struct usb_event *event) { - const struct usb_get_event_params *params = args; + if (!usb_event_count) return false; - pthread_mutex_lock(&event_mutex); - while (!usb_event_count) - pthread_cond_wait(&event_cond, &event_mutex); - *params->event = usb_events[0]; + *event = usb_events[0]; if (--usb_event_count) memmove(usb_events, usb_events + 1, usb_event_count * sizeof(*usb_events)); - pthread_mutex_unlock(&event_mutex); - return STATUS_SUCCESS; + return true; } static void add_usb_device(libusb_device *libusb_device) @@ -239,10 +229,30 @@ static int LIBUSB_CALL hotplug_cb(libusb_context *context, libusb_device *device static NTSTATUS usb_main_loop(void *args) { - static const struct usb_event shutdown_event = {.type = USB_EVENT_SHUTDOWN}; + const struct usb_main_loop_params *params = args; int ret; - TRACE("Starting libusb event thread.\n"); + while (!thread_shutdown) + { + if (get_event(params->event)) return STATUS_PENDING; + + if ((ret = libusb_handle_events(NULL))) + ERR("Error handling events: %s\n", libusb_strerror(ret)); + } + + libusb_exit(NULL); + free(usb_events); + usb_events = NULL; + usb_event_count = usb_events_capacity = 0; + thread_shutdown = false; + + TRACE("USB main loop exiting.\n"); + return STATUS_SUCCESS; +} + +static NTSTATUS usb_init(void *args) +{ + int ret; if ((ret = libusb_init(NULL))) { @@ -260,17 +270,6 @@ static NTSTATUS usb_main_loop(void *args) return STATUS_UNSUCCESSFUL; } - while (!thread_shutdown) - { - if ((ret = libusb_handle_events(NULL))) - ERR("Error handling events: %s\n", libusb_strerror(ret)); - } - - libusb_exit(NULL); - - queue_event(&shutdown_event); - - TRACE("Shutting down libusb event thread.\n"); return STATUS_SUCCESS; } @@ -566,8 +565,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = { #define X(name) [unix_ ## name] = name X(usb_main_loop), + X(usb_init), X(usb_exit), - X(usb_get_event), X(usb_submit_urb), X(usb_cancel_transfer), X(usb_destroy_device), diff --git a/dlls/wineusb.sys/unixlib.h b/dlls/wineusb.sys/unixlib.h index 0c3319969b7..eee16c8fc2b 100644 --- a/dlls/wineusb.sys/unixlib.h +++ b/dlls/wineusb.sys/unixlib.h @@ -31,7 +31,6 @@ enum usb_event_type USB_EVENT_ADD_DEVICE, USB_EVENT_REMOVE_DEVICE, USB_EVENT_TRANSFER_COMPLETE, - USB_EVENT_SHUTDOWN, }; struct usb_event @@ -53,7 +52,7 @@ struct usb_event } u; }; -struct usb_get_event_params +struct usb_main_loop_params { struct usb_event *event; }; @@ -77,8 +76,8 @@ struct usb_destroy_device_params enum unix_funcs { unix_usb_main_loop, + unix_usb_init, unix_usb_exit, - unix_usb_get_event, unix_usb_submit_urb, unix_usb_cancel_transfer, unix_usb_destroy_device, diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index e9e91326a84..7848b31105e 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -165,14 +165,7 @@ static void remove_unix_device(struct unix_device *unix_device) IoInvalidateDeviceRelations(bus_pdo, BusRelations); } -static HANDLE libusb_event_thread, event_thread; - -static DWORD CALLBACK libusb_event_thread_proc(void *arg) -{ - WINE_UNIX_CALL(unix_usb_main_loop, NULL); - - return 0; -} +static HANDLE event_thread; static void complete_irp(IRP *irp) { @@ -187,18 +180,18 @@ static void complete_irp(IRP *irp) static DWORD CALLBACK event_thread_proc(void *arg) { struct usb_event event; - - TRACE("Starting client event thread.\n"); - - for (;;) + struct usb_main_loop_params params = { - struct usb_get_event_params params = - { - .event = &event, - }; + .event = &event, + }; - WINE_UNIX_CALL(unix_usb_get_event, &params); + TRACE("Starting event thread.\n"); + if (WINE_UNIX_CALL(unix_usb_init, NULL) != STATUS_SUCCESS) + return 0; + + while (WINE_UNIX_CALL(unix_usb_main_loop, &params) == STATUS_PENDING) + { switch (event.type) { case USB_EVENT_ADD_DEVICE: @@ -212,12 +205,11 @@ static DWORD CALLBACK event_thread_proc(void *arg) case USB_EVENT_TRANSFER_COMPLETE: complete_irp(event.u.completed_irp); break; - - case USB_EVENT_SHUTDOWN: - TRACE("Shutting down client event thread.\n"); - return 0; } } + + TRACE("Shutting down event thread.\n"); + return 0; } static NTSTATUS fdo_pnp(IRP *irp) @@ -266,7 +258,6 @@ static NTSTATUS fdo_pnp(IRP *irp) } case IRP_MN_START_DEVICE: - libusb_event_thread = CreateThread(NULL, 0, libusb_event_thread_proc, NULL, 0, NULL); event_thread = CreateThread(NULL, 0, event_thread_proc, NULL, 0, NULL); irp->IoStatus.Status = STATUS_SUCCESS; @@ -281,8 +272,6 @@ static NTSTATUS fdo_pnp(IRP *irp) struct usb_device *device, *cursor; WINE_UNIX_CALL(unix_usb_exit, NULL); - WaitForSingleObject(libusb_event_thread, INFINITE); - CloseHandle(libusb_event_thread); WaitForSingleObject(event_thread, INFINITE); CloseHandle(event_thread);

1 0

Rémi Bernon : kernel32/tests: Make sure the LFH is enabled for some sizes.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: b793367c676c643602f5a0986b0bbb4c9f4b0694 URL: https://gitlab.winehq.org/wine/wine/-/commit/b793367c676c643602f5a0986b0bbb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 30 12:07:48 2022 +0100 kernel32/tests: Make sure the LFH is enabled for some sizes. Making the GlobalReAlloc tests more sensible, as they fail to reallocate when the block was allocated with the LFH and the new size wouldn't. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54012 --- dlls/kernel32/tests/heap.c | 286 +++++++++++++++++++++------------------------ 1 file changed, 131 insertions(+), 155 deletions(-)

1 0

Rémi Bernon : kernel32/tests: Add more GlobalReAlloc tests with larger size.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: a568704c320fa98e087c6dc740e30dedda96d37b URL: https://gitlab.winehq.org/wine/wine/-/commit/a568704c320fa98e087c6dc740e30d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 30 15:06:21 2022 +0100 kernel32/tests: Add more GlobalReAlloc tests with larger size. In place reallocation is possible, although it depends on the underlying heap strategy. The LFH heap usually fails as it doesn't blocks to grow or shrink out of their size class. Larger block (LFH is limited to 16K blocks), more often allow in-place reallocation, and some native DLLs depend on this. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53996 --- dlls/kernel32/tests/heap.c | 284 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 282 insertions(+), 2 deletions(-)

1 0

Rémi Bernon : kernelbase: Restore HEAP_REALLOC_IN_PLACE_ONLY usage in LocalReAlloc.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 4979ae5a94188b7c1943a64a0cb8cca39bbe8fad URL: https://gitlab.winehq.org/wine/wine/-/commit/4979ae5a94188b7c1943a64a0cb8cc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 30 15:16:49 2022 +0100 kernelbase: Restore HEAP_REALLOC_IN_PLACE_ONLY usage in LocalReAlloc. This effectively reverts 2be9b0ff4a61f3738eb2c05a7f196a60a95d40c6, which incorrectly removed the flag, when the reallocation failures the tests showed were coming from an underlying LFH in-place reallocation failure. Thus, it restores todo_wine where appropriate while removing other todos for sizes outside of the LFH block size range. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53996 --- dlls/kernel32/tests/heap.c | 44 ++++++++++++++++++++++++-------------------- dlls/kernelbase/memory.c | 4 ++-- 2 files changed, 26 insertions(+), 22 deletions(-)

1 0

Robert Wilhelm : vbscript: Handle "case" statements without separators.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 39058487ecddf8e528cab226f66c99d2c4790a22 URL: https://gitlab.winehq.org/wine/wine/-/commit/39058487ecddf8e528cab226f66c99… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Wed Nov 30 14:49:10 2022 +0300 vbscript: Handle "case" statements without separators. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53678 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/parser.y | 11 +++++++---- dlls/vbscript/tests/lang.vbs | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 88f098f3714..816252eb2ec 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -323,10 +323,9 @@ Else_opt | tELSE StatementsNl_opt { $$ = $2; } CaseClausules - : /* empty */ { $$ = NULL; } - | tCASE tELSE StSep StatementsNl_opt { $$ = new_case_clausule(ctx, NULL, $4, NULL); } - | tCASE ExpressionList StSep StatementsNl_opt CaseClausules - { $$ = new_case_clausule(ctx, $2, $4, $5); } + : /* empty */ { $$ = NULL; } + | tCASE tELSE StSep_opt StatementsNl_opt { $$ = new_case_clausule(ctx, NULL, $4, NULL); } + | tCASE ExpressionList StSep_opt StatementsNl_opt CaseClausules { $$ = new_case_clausule(ctx, $2, $4, $5); } Arguments : tEMPTYBRACKETS { $$ = NULL; } @@ -513,6 +512,10 @@ Identifier | tPROPERTY { ctx->last_token = tIdentifier; $$ = $1; } | tSTEP { ctx->last_token = tIdentifier; $$ = $1; } +StSep_opt + : /* empty */ + | StSep + /* Most statements accept both new line and ':' as separators */ StSep : tNL diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index d27277508c0..3a67cd09dff 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -766,6 +766,26 @@ end select select case 0 : case 1 : case else : end select +' Case without separator +function SelectCaseTest(x) + select case x + case 0: SelectCaseTest = 100 + case 1 SelectCaseTest = 200 + case 2 + SelectCaseTest = 300 + case 3 + case 4 SelectCaseTest = 400 + case else SelectCaseTest = 500 + end select +end function + +call ok(SelectCaseTest(0) = 100, "Unexpected case " & SelectCaseTest(0)) +call ok(SelectCaseTest(1) = 200, "Unexpected case " & SelectCaseTest(1)) +call ok(SelectCaseTest(2) = 300, "Unexpected case " & SelectCaseTest(2)) +call ok(SelectCaseTest(3) = vbEmpty, "Unexpected case " & SelectCaseTest(3)) +call ok(SelectCaseTest(4) = 400, "Unexpected case " & SelectCaseTest(4)) +call ok(SelectCaseTest(5) = 500, "Unexpected case " & SelectCaseTest(5)) + if false then Sub testsub x = true

1 0

Michael Stefaniuc : dmstyle: Simplify parsing of a style track list.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 8881ada9c9ebce8c6e4a92eb47a6e7243f9bea27 URL: https://gitlab.winehq.org/wine/wine/-/commit/8881ada9c9ebce8c6e4a92eb47a6e7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Nov 26 22:40:24 2022 +0100 dmstyle: Simplify parsing of a style track list. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53941 --- dlls/dmstyle/styletrack.c | 124 ++++++++-------------------------------------- 1 file changed, 22 insertions(+), 102 deletions(-) diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index bdc665fe302..b6a5ce22e44 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -303,8 +303,7 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { style_track_Join }; -static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK *pChunk, - IStream *pStm) +static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DWORD size, IStream *pStm) { DMUS_PRIVATE_CHUNK Chunk; DWORD ListSize[3], ListCount[3]; @@ -314,12 +313,7 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK IDirectMusicObject* pObject = NULL; LPDMUS_PRIVATE_STYLE_ITEM pNewItem = NULL; - if (pChunk->fccID != DMUS_FOURCC_STYLE_REF_LIST) { - ERR_(dmfile)(": %s chunk should be a STYLE list\n", debugstr_fourcc (pChunk->fccID)); - return E_FAIL; - } - - ListSize[0] = pChunk->dwSize - sizeof(FOURCC); + ListSize[0] = size - sizeof(FOURCC); ListCount[0] = 0; do { @@ -387,107 +381,33 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK return S_OK; } -static HRESULT parse_styletrack_list(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK *pChunk, - IStream *pStm) -{ - DMUS_PRIVATE_CHUNK Chunk; - DWORD ListSize[3], ListCount[3]; - LARGE_INTEGER liMove; /* used when skipping chunks */ - HRESULT hr; - - if (pChunk->fccID != DMUS_FOURCC_STYLE_TRACK_LIST) { - ERR_(dmfile)(": %s chunk should be a STYLETRACK list\n", debugstr_fourcc (pChunk->fccID)); - return E_FAIL; - } - - ListSize[0] = pChunk->dwSize - sizeof(FOURCC); - ListCount[0] = 0; - - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case FOURCC_LIST: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); - ListSize[1] = Chunk.dwSize - sizeof(FOURCC); - ListCount[1] = 0; - switch (Chunk.fccID) { - case DMUS_FOURCC_STYLE_REF_LIST: { - TRACE_(dmfile)(": STYLE_REF list\n"); - hr = parse_style_ref(This, &Chunk, pStm); - if (FAILED(hr)) return hr; - break; - } - default: { - TRACE_(dmfile)(": unknown (skipping)\n"); - liMove.QuadPart = Chunk.dwSize - sizeof(FOURCC); - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); - - return S_OK; -} - static inline IDirectMusicStyleTrack *impl_from_IPersistStream(IPersistStream *iface) { return CONTAINING_RECORD(iface, IDirectMusicStyleTrack, dmobj.IPersistStream_iface); } -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) +static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) { - IDirectMusicStyleTrack *This = impl_from_IPersistStream(iface); - DMUS_PRIVATE_CHUNK Chunk; - LARGE_INTEGER liMove; - HRESULT hr; - - FIXME("(%p, %p): Loading not fully implemented yet\n", This, pStm); - - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case FOURCC_LIST: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case DMUS_FOURCC_STYLE_TRACK_LIST: { - TRACE_(dmfile)(": Chord track list\n"); - hr = parse_styletrack_list(This, &Chunk, pStm); - if (FAILED(hr)) return hr; - break; - } - default: { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - return E_FAIL; - } - } - TRACE_(dmfile)(": reading finished\n"); - break; - } - default: { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - return E_FAIL; - } - } + IDirectMusicStyleTrack *This = impl_from_IPersistStream(iface); + struct chunk_entry track = {0}; + struct chunk_entry chunk = {.parent = &track}; + HRESULT hr; - return S_OK; + TRACE("(%p, %p): Loading\n", This, stream); + + if (!stream) + return E_POINTER; + + if (stream_get_chunk(stream, &track) != S_OK || track.id != FOURCC_LIST || + track.type != DMUS_FOURCC_STYLE_TRACK_LIST) + return DMUS_E_TRACK_NOT_FOUND; + + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_STYLE_REF_LIST) + if (FAILED(hr = parse_style_ref(This, chunk.size, stream))) + break; + + return SUCCEEDED(hr) ? S_OK : hr; } static const IPersistStreamVtbl persiststream_vtbl = {

1 0

Michael Stefaniuc : dmstyle: Simplify parsing of a style reference list.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 25de40af075062faa1c974fb21c9c9aafbcebb88 URL: https://gitlab.winehq.org/wine/wine/-/commit/25de40af075062faa1c974fb21c9c9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Nov 28 23:39:55 2022 +0100 dmstyle: Simplify parsing of a style reference list. Avoids adding an invalid style reference to the list with subsequent crash on release. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53941 --- dlls/dmstyle/dmstyle_private.h | 2 +- dlls/dmstyle/styletrack.c | 120 ++++++++++++++--------------------------- 2 files changed, 42 insertions(+), 80 deletions(-) diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 4c8dd091536..fbe635e4388 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -57,7 +57,7 @@ extern HRESULT create_dmstyletrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDE */ typedef struct _DMUS_PRIVATE_STYLE_ITEM { struct list entry; /* for listing elements */ - DWORD dwTimeStamp; + DWORD timestamp; IDirectMusicStyle8* pObject; } DMUS_PRIVATE_STYLE_ITEM, *LPDMUS_PRIVATE_STYLE_ITEM; diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index b6a5ce22e44..822072bdb27 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -23,7 +23,6 @@ #include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); -WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicStyleTrack implementation @@ -90,7 +89,7 @@ static ULONG WINAPI style_track_Release(IDirectMusicTrack8 *iface) list_remove(cursor); IDirectMusicStyle8_Release(item->pObject); - heap_free(item); + free(item); } heap_free(This); @@ -146,12 +145,10 @@ static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty if (IsEqualGUID(&GUID_IDirectMusicStyle, type)) { LIST_FOR_EACH (item, &This->Items) { DMUS_PRIVATE_STYLE_ITEM *style = LIST_ENTRY(item, DMUS_PRIVATE_STYLE_ITEM, entry); - if (style->pObject) { - IDirectMusicStyle8_AddRef(style->pObject); - *((IDirectMusicStyle8**)param) = style->pObject; + IDirectMusicStyle8_AddRef(style->pObject); + *((IDirectMusicStyle8 **)param) = style->pObject; - return S_OK; - } + return S_OK; } return DMUS_E_NOT_FOUND; @@ -303,82 +300,47 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { style_track_Join }; -static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DWORD size, IStream *pStm) +static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, IStream *stream, const struct chunk_entry *strf) { - DMUS_PRIVATE_CHUNK Chunk; - DWORD ListSize[3], ListCount[3]; - LARGE_INTEGER liMove; /* used when skipping chunks */ - HRESULT hr; - - IDirectMusicObject* pObject = NULL; - LPDMUS_PRIVATE_STYLE_ITEM pNewItem = NULL; - - ListSize[0] = size - sizeof(FOURCC); - ListCount[0] = 0; - - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case DMUS_FOURCC_TIME_STAMP_CHUNK: { - TRACE_(dmfile)(": Time Stamp chunk\n"); - pNewItem = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_STYLE_ITEM)); - if (NULL == pNewItem) { - ERR(": no more memory\n"); - return E_OUTOFMEMORY; - } - IStream_Read (pStm, &pNewItem->dwTimeStamp, sizeof(DWORD), NULL); - TRACE_(dmfile)(" - dwTimeStamp: %lu\n", pNewItem->dwTimeStamp); - list_add_tail (&This->Items, &pNewItem->entry); - break; - } - case FOURCC_LIST: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); - ListSize[1] = Chunk.dwSize - sizeof(FOURCC); - ListCount[1] = 0; - switch (Chunk.fccID) { - /** - * should be a DMRF (DirectMusic Reference) list @TODO - */ - case DMUS_FOURCC_REF_LIST: { - FIXME_(dmfile)(": DMRF (DM References) list, not yet handled\n"); - hr = IDirectMusicUtils_IPersistStream_ParseReference(&This->dmobj.IPersistStream_iface, - &Chunk, pStm, &pObject); - if (FAILED(hr)) { - ERR(": could not load Reference\n"); - return hr; - } - hr = IDirectMusicObject_QueryInterface(pObject, &IID_IDirectMusicStyle8, (LPVOID*)&pNewItem->pObject); - if (FAILED(hr)) { - ERR(": Reference not an IDirectMusicStyle, exiting\n"); - exit(-1); - return hr; - } - IDirectMusicObject_Release(pObject); - break; - } - default: { - TRACE_(dmfile)(": unknown (skipping)\n"); - liMove.QuadPart = Chunk.dwSize - sizeof(FOURCC); - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - break; + struct chunk_entry chunk = {.parent = strf}; + IDirectMusicObject *dmobj; + DMUS_PRIVATE_STYLE_ITEM *item; + HRESULT hr; + + /* First chunk is a timestamp */ + if (stream_get_chunk(stream, &chunk) != S_OK || chunk.id != DMUS_FOURCC_TIME_STAMP_CHUNK) + return DMUS_E_CHUNKNOTFOUND; + if (!(item = malloc(sizeof(*item)))) + return E_OUTOFMEMORY; + hr = stream_chunk_get_data(stream, &chunk, &item->timestamp, sizeof(item->timestamp)); + if (FAILED(hr)) + goto error; + + /* Second chunk is a reference list */ + if (stream_next_chunk(stream, &chunk) != S_OK || chunk.id != FOURCC_LIST || + chunk.type != DMUS_FOURCC_REF_LIST) { + hr = DMUS_E_INVALID_SEGMENTTRIGGERTRACK; + goto error; } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; + if (FAILED(hr = dmobj_parsereference(stream, &chunk, &dmobj))) { + WARN("Failed to load reference: %#lx\n", hr); + goto error; } + hr = IDirectMusicObject_QueryInterface(dmobj, &IID_IDirectMusicStyle8, (void **)&item->pObject); + if (FAILED(hr)) { + WARN("Reference not an IDirectMusicStyle8\n"); + IDirectMusicObject_Release(dmobj); + goto error; } - TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); - return S_OK; + list_add_tail(&This->Items, &item->entry); + TRACE("Found reference to style %p with timestamp %lu\n", item->pObject, item->timestamp); + + return S_OK; + +error: + free(item); + return hr; } static inline IDirectMusicStyleTrack *impl_from_IPersistStream(IPersistStream *iface) @@ -404,7 +366,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *st while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_STYLE_REF_LIST) - if (FAILED(hr = parse_style_ref(This, chunk.size, stream))) + if (FAILED(hr = parse_style_ref(This, stream, &chunk))) break; return SUCCEEDED(hr) ? S_OK : hr;

1 0