May 2022 - Wine-commits - list.winehq.org

Zebediah Figura : wined3d: Trace bind flags in wined3d_texture_init().
by Alexandre Julliard 12 May '22

12 May '22

Module: wine Branch: master Commit: b646682a3da1d3e02a3224d5be85c92e61308141 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b646682a3da1d3e02a3224d5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 10 15:02:57 2022 -0500 wined3d: Trace bind flags in wined3d_texture_init(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 49650f2839e..35688fcd0d9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3805,10 +3805,10 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc HRESULT hr; TRACE("texture %p, resource_type %s, format %s, multisample_type %#x, multisample_quality %#x, " - "usage %s, access %s, width %u, height %u, depth %u, layer_count %u, level_count %u, " + "usage %s, bind_flags %s, access %s, width %u, height %u, depth %u, layer_count %u, level_count %u, " "flags %#x, device %p, parent %p, parent_ops %p, sub_resources %p, texture_ops %p.\n", - texture, debug_d3dresourcetype(desc->resource_type), debug_d3dformat(desc->format), - desc->multisample_type, desc->multisample_quality, debug_d3dusage(desc->usage), + texture, debug_d3dresourcetype(desc->resource_type), debug_d3dformat(desc->format), desc->multisample_type, + desc->multisample_quality, debug_d3dusage(desc->usage), wined3d_debug_bind_flags(desc->bind_flags), wined3d_debug_resource_access(desc->access), desc->width, desc->height, desc->depth, layer_count, level_count, flags, device, parent, parent_ops, sub_resources, texture_ops);

1 0

Ziqing Hui : include: Add defines for D2D1_PROPERTY_BINDING.
by Alexandre Julliard 12 May '22

12 May '22

Module: wine Branch: master Commit: 950c2da65b1dbd26f4f2a569e3d61221f3dfc7bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=950c2da65b1dbd26f4f2a569… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed May 11 19:56:01 2022 +0800 include: Add defines for D2D1_PROPERTY_BINDING. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effectauthor.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index b53aa515e85..a58ec35b4b5 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -18,6 +18,12 @@ import "d2d1_1.idl"; +typedef HRESULT (__stdcall *PD2D1_PROPERTY_SET_FUNCTION)(IUnknown *effect, + const BYTE *data, UINT32 data_size); + +typedef HRESULT (__stdcall *PD2D1_PROPERTY_GET_FUNCTION)(const IUnknown *effect, + BYTE *data, UINT32 data_size, UINT32 *actual_size); + typedef enum D2D1_FILTER { D2D1_FILTER_MIN_MAG_MIP_POINT = 0x00, @@ -39,6 +45,13 @@ typedef enum D2D1_FEATURE D2D1_FEATURE_FORCE_DWORD = 0xffffffff } D2D1_FEATURE; +typedef struct D2D1_PROPERTY_BINDING +{ + const WCHAR *propertyName; + PD2D1_PROPERTY_SET_FUNCTION setFunction; + PD2D1_PROPERTY_GET_FUNCTION getFunction; +} D2D1_PROPERTY_BINDING; + typedef enum D2D1_CHANNEL_DEPTH { D2D1_CHANNEL_DEPTH_DEFAULT = 0x0,

1 0

Gabriel Ivăncescu : mshtml/tests: Fix Number toLocaleString test on updated Win 8.1.
by Alexandre Julliard 12 May '22

12 May '22

Module: wine Branch: master Commit: 83651996dbe146d09481409b564045d09194b805 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83651996dbe146d09481409b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 12 12:56:03 2022 +0200 mshtml/tests: Fix Number toLocaleString test on updated Win 8.1. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52969 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/es5.js | 21 ++++++++++++++------- dlls/mshtml/tests/winetest.js | 5 +++++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 8238e5d26f9..0f9df4cb8ea 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -150,10 +150,14 @@ sync_test("Number toLocaleString", function() { ]; if(external.isEnglish) { - for(var i = 0; i < tests.length; i++) { - r = Number.prototype.toLocaleString.call(tests[i][0]); - ok(r === tests[i][1], "[" + i + "] got " + r); - } + /* Some recent Win8.1 updates have old jscript behavior */ + if(Number.prototype.toLocaleString.call(0.0) === "0.00") + win_skip("skipping tests due to old behavior"); + else + for(var i = 0; i < tests.length; i++) { + r = Number.prototype.toLocaleString.call(tests[i][0]); + ok(r === tests[i][1], "[" + i + "] got " + r); + } } try { @@ -161,21 +165,24 @@ sync_test("Number toLocaleString", function() { ok(false, "expected exception calling it on string"); }catch(ex) { var n = ex.number >>> 0; - ok(n === JS_E_WRONG_THIS, "called on string threw " + n); + ok(n === JS_E_WRONG_THIS || broken(n === JS_E_NUMBER_EXPECTED) /* newer Win8.1 */, + "called on string threw " + n); } try { Number.prototype.toLocaleString.call(undefined); ok(false, "expected exception calling it on undefined"); }catch(ex) { var n = ex.number >>> 0; - ok(n === JS_E_WRONG_THIS, "called on undefined threw " + n); + ok(n === JS_E_WRONG_THIS || broken(n === JS_E_NUMBER_EXPECTED) /* newer Win8.1 */, + "called on undefined threw " + n); } try { Number.prototype.toLocaleString.call(external.nullDisp); ok(false, "expected exception calling it on nullDisp"); }catch(ex) { var n = ex.number >>> 0; - ok(n === JS_E_WRONG_THIS, "called on nullDisp threw " + n); + ok(n === JS_E_WRONG_THIS || broken(n === JS_E_NUMBER_EXPECTED) /* newer Win8.1 */, + "called on nullDisp threw " + n); } }); diff --git a/dlls/mshtml/tests/winetest.js b/dlls/mshtml/tests/winetest.js index ca7f2aab4c2..bdebb2fa173 100644 --- a/dlls/mshtml/tests/winetest.js +++ b/dlls/mshtml/tests/winetest.js @@ -54,6 +54,11 @@ function win_skip(m) { external.win_skip(m); } +function broken(e) +{ + return external.broken(e); +} + function reportSuccess() { external.reportSuccess(); }

1 0

Alistair Leslie-Hughes : include: Add TF_TMF/TMAW defines.
by Alexandre Julliard 12 May '22

12 May '22

Module: wine Branch: master Commit: 5d5b2acf983dba5b44190c8b353e88444db670c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d5b2acf983dba5b44190c8b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 11 08:40:11 2022 +1000 include: Add TF_TMF/TMAW defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msctf.idl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/msctf.idl b/include/msctf.idl index 5ef33119fd8..dd9997211a4 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -85,6 +85,23 @@ cpp_quote("#define TF_PROFILETYPE_KEYBOARDLAYOUT 0x0002") cpp_quote("#define TF_IPSINK_FLAG_ACTIVE 0x0001") +cpp_quote("#define TF_TMAE_NOACTIVATETIP 0x00000001") +cpp_quote("#define TF_TMAE_SECUREMODE 0x00000002") +cpp_quote("#define TF_TMAE_UIELEMENTENABLEDONLY 0x00000004") +cpp_quote("#define TF_TMAE_COMLESS 0x00000008") +cpp_quote("#define TF_TMAE_WOW16 0x00000010") +cpp_quote("#define TF_TMAE_NOACTIVATEKEYBOARDLAYOUT 0x00000020") +cpp_quote("#define TF_TMAE_CONSOLE 0x00000040") + +cpp_quote("#define TF_TMF_NOACTIVATETIP TF_TMAE_NOACTIVATETIP") +cpp_quote("#define TF_TMF_SECUREMODE TF_TMAE_SECUREMODE") +cpp_quote("#define TF_TMF_UIELEMENTENABLEDONLY TF_TMAE_UIELEMENTENABLEDONLY") +cpp_quote("#define TF_TMF_COMLESS TF_TMAE_COMLESS") +cpp_quote("#define TF_TMF_WOW16 TF_TMAE_WOW16") +cpp_quote("#define TF_TMF_CONSOLE TF_TMAE_CONSOLE") +cpp_quote("#define TF_TMF_IMMERSIVEMODE 0x40000000") +cpp_quote("#define TF_TMF_ACTIVATED 0x80000000") + interface ITfDocumentMgr; interface ITfContext; interface IEnumTfDocumentMgrs;

1 0

Piotr Caban : msvcr110/tests: Fix setlocale test failure on systems with UTF-8 locales enabled.
by Alexandre Julliard 12 May '22

12 May '22

Module: wine Branch: master Commit: fac521ee33aa9ca793967d6e3a89821f760ab262 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fac521ee33aa9ca793967d6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 12 16:53:57 2022 +0200 msvcr110/tests: Fix setlocale test failure on systems with UTF-8 locales enabled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52937 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/tests/msvcr110.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index f88e3122ac9..55d077c6de9 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -132,7 +132,15 @@ static void test_setlocale(void) for(i=0; i<ARRAY_SIZE(names); i++) { ret = p_setlocale(LC_ALL, names[i]); ok(ret != NULL, "expected success, but got NULL\n"); - ok(!strcmp(ret, names[i]), "expected %s, got %s\n", names[i], ret); + if(!strcmp(names[i], "syr-SY") && GetACP() == CP_UTF8) + { + todo_wine ok(!strcmp(ret, "LC_COLLATE=syr-SY;LC_CTYPE=EN-US;LC_MONETARY=syr-SY;" + "LC_NUMERIC=syr-SY;LC_TIME=syr-SY"), "got %s\n", ret); + } + else + { + ok(!strcmp(ret, names[i]), "expected %s, got %s\n", names[i], ret); + } } ret = p_setlocale(LC_ALL, "en-us.1250");

1 0

Piotr Caban : msvcrt: Reject UTF-8 locales in setlocale function.
by Alexandre Julliard 12 May '22

12 May '22

Module: wine Branch: master Commit: b35faeb5035a8ed1480577a34603170fc0e2f901 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b35faeb5035a8ed1480577a3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 12 16:54:03 2022 +0200 msvcrt: Reject UTF-8 locales in setlocale function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/tests/msvcr110.c | 2 +- dlls/msvcrt/locale.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index 55d077c6de9..d6502b0f0fa 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -134,7 +134,7 @@ static void test_setlocale(void) ok(ret != NULL, "expected success, but got NULL\n"); if(!strcmp(names[i], "syr-SY") && GetACP() == CP_UTF8) { - todo_wine ok(!strcmp(ret, "LC_COLLATE=syr-SY;LC_CTYPE=EN-US;LC_MONETARY=syr-SY;" + ok(!strcmp(ret, "LC_COLLATE=syr-SY;LC_CTYPE=EN-US;LC_MONETARY=syr-SY;" "LC_NUMERIC=syr-SY;LC_TIME=syr-SY"), "got %s\n", ret); } else diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 0fd99a40c86..16ed68cdebd 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1334,6 +1334,14 @@ static pthreadlocinfo create_locinfo(int category, } for(i=1; i<6; i++) { +#if _MSVCR_VER < 140 + if(i==LC_CTYPE && cp[i]==CP_UTF8) { + locale_name[i] = NULL; + locale_len[i] = 0; + lcid[i] = old_locinfo ? old_locinfo->lc_handle[i] : 0; + cp[i] = old_locinfo ? old_locinfo->lc_id[i].wCodePage : 0; + } +#endif if(category!=LC_ALL && category!=i) { if(old_locinfo) { lcid[i] = old_locinfo->lc_handle[i];

1 0

Zebediah Figura : wineusb.sys: Expose composite device interfaces.
by Alexandre Julliard 12 May '22

12 May '22

Module: wine Branch: master Commit: 4e5eaba51f447100f19a92e3756c44bec1df2bff URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e5eaba51f447100f19a92e3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 11 19:01:50 2022 -0500 wineusb.sys: Expose composite device interfaces. On Windows this is the job of usbccgp.sys, a separate driver that layers on top of the base USB driver. While we could take this approach as well, implementing usbccgp is a lot more work, whereas interface support is effectively built into libusb. This patch helps us get closer to installing and running the Hauppauge cx231xx drivers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 115 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 100 insertions(+), 15 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 612c62f3f5f..87669b5c65d 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -73,6 +73,13 @@ struct usb_device DEVICE_OBJECT *device_obj; + /* Points to the parent USB device if this is a USB interface; otherwise + * NULL. */ + struct usb_device *parent; + uint8_t interface_index; + + uint8_t class, subclass, protocol; + libusb_device *libusb_device; libusb_device_handle *handle; @@ -84,9 +91,39 @@ static DEVICE_OBJECT *bus_fdo, *bus_pdo; static libusb_hotplug_callback_handle hotplug_cb_handle; +static void add_usb_interface(struct usb_device *parent, const struct libusb_interface_descriptor *desc) +{ + struct usb_device *device; + DEVICE_OBJECT *device_obj; + NTSTATUS status; + + if ((status = IoCreateDevice(driver_obj, sizeof(*device), NULL, + FILE_DEVICE_USB, FILE_AUTOGENERATED_DEVICE_NAME, FALSE, &device_obj))) + { + ERR("Failed to create device, status %#x.\n", status); + return; + } + + device = device_obj->DeviceExtension; + device->device_obj = device_obj; + device->parent = parent; + device->handle = parent->handle; + device->libusb_device = parent->libusb_device; + device->interface_index = desc->bInterfaceNumber; + device->class = desc->bInterfaceClass; + device->subclass = desc->bInterfaceSubClass; + device->protocol = desc->bInterfaceProtocol; + InitializeListHead(&device->irp_list); + + EnterCriticalSection(&wineusb_cs); + list_add_tail(&device_list, &device->entry); + LeaveCriticalSection(&wineusb_cs); +} + static void add_usb_device(libusb_device *libusb_device) { static const WCHAR formatW[] = {'\\','D','e','v','i','c','e','\\','U','S','B','P','D','O','-','%','u',0}; + struct libusb_config_descriptor *config_desc; struct libusb_device_descriptor device_desc; static unsigned int name_index; libusb_device_handle *handle; @@ -129,6 +166,43 @@ static void add_usb_device(libusb_device *libusb_device) device->removed = FALSE; LeaveCriticalSection(&wineusb_cs); + device->class = device_desc.bDeviceClass; + device->subclass = device_desc.bDeviceSubClass; + device->protocol = device_desc.bDeviceProtocol; + + if (!(ret = libusb_get_active_config_descriptor(libusb_device, &config_desc))) + { + /* Create new devices for interfaces of composite devices. + * + * On Windows this is the job of usbccgp.sys, a separate driver that + * layers on top of the base USB driver. While we could take this + * approach as well, implementing usbccgp is a lot more work, whereas + * interface support is effectively built into libusb. + * + * FIXME: usbccgp does not create separate interfaces in some cases, + * e.g. when there is an interface association descriptor available. + */ + if (config_desc->bNumInterfaces > 1) + { + uint8_t i; + + for (i = 0; i < config_desc->bNumInterfaces; ++i) + { + const struct libusb_interface *interface = &config_desc->interface[i]; + + if (interface->num_altsetting != 1) + FIXME("Interface %u has %u alternate settings; using the first one.\n", + i, interface->num_altsetting); + add_usb_interface(device, &interface->altsetting[0]); + } + } + libusb_free_config_descriptor(config_desc); + } + else + { + ERR("Failed to get configuration descriptor: %s\n", libusb_strerror(ret)); + } + IoInvalidateDeviceRelations(bus_pdo, BusRelations); } @@ -277,8 +351,11 @@ static NTSTATUS fdo_pnp(IRP *irp) LIST_FOR_EACH_ENTRY_SAFE(device, cursor, &device_list, struct usb_device, entry) { assert(!device->removed); - libusb_unref_device(device->libusb_device); - libusb_close(device->handle); + if (!device->parent) + { + libusb_unref_device(device->libusb_device); + libusb_close(device->handle); + } list_remove(&device->entry); IoDeleteDevice(device->device_obj); } @@ -338,23 +415,33 @@ static const WCHAR emptyW[] = {0}; static void get_device_id(const struct usb_device *device, struct string_buffer *buffer) { + static const WCHAR interface_formatW[] = {'U','S','B','\\','V','I','D','_','%','0','4','X', + '&','P','I','D','_','%','0','4','X','&','M','I','_','%','0','2','X',0}; static const WCHAR formatW[] = {'U','S','B','\\','V','I','D','_','%','0','4','X', '&','P','I','D','_','%','0','4','X',0}; struct libusb_device_descriptor desc; libusb_get_device_descriptor(device->libusb_device, &desc); - append_id(buffer, formatW, desc.idVendor, desc.idProduct); + if (device->parent) + append_id(buffer, interface_formatW, desc.idVendor, desc.idProduct, device->interface_index); + else + append_id(buffer, formatW, desc.idVendor, desc.idProduct); } static void get_hardware_ids(const struct usb_device *device, struct string_buffer *buffer) { + static const WCHAR interface_formatW[] = {'U','S','B','\\','V','I','D','_','%','0','4','X', + '&','P','I','D','_','%','0','4','X','&','R','E','V','_','%','0','4','X','&','M','I','_','%','0','2','X',0}; static const WCHAR formatW[] = {'U','S','B','\\','V','I','D','_','%','0','4','X', '&','P','I','D','_','%','0','4','X','&','R','E','V','_','%','0','4','X',0}; struct libusb_device_descriptor desc; libusb_get_device_descriptor(device->libusb_device, &desc); - append_id(buffer, formatW, desc.idVendor, desc.idProduct, desc.bcdDevice); + if (device->parent) + append_id(buffer, interface_formatW, desc.idVendor, desc.idProduct, desc.bcdDevice, device->interface_index); + else + append_id(buffer, formatW, desc.idVendor, desc.idProduct, desc.bcdDevice); get_device_id(device, buffer); append_id(buffer, emptyW); } @@ -368,18 +455,13 @@ static void get_compatible_ids(const struct usb_device *device, struct string_bu '&','S','u','b','C','l','a','s','s','_','%','0','2','x',0}; static const WCHAR class_format[] = {'U','S','B','\\','C','l','a','s','s','_','%','0','2','x',0}; - struct libusb_device_descriptor device_desc; - - libusb_get_device_descriptor(device->libusb_device, &device_desc); - - append_id(buffer, prot_format, device_desc.bDeviceClass, - device_desc.bDeviceSubClass, device_desc.bDeviceProtocol); - append_id(buffer, subclass_format, device_desc.bDeviceClass, device_desc.bDeviceSubClass); - append_id(buffer, class_format, device_desc.bDeviceClass); + append_id(buffer, prot_format, device->class, device->subclass, device->protocol); + append_id(buffer, subclass_format, device->class, device->subclass); + append_id(buffer, class_format, device->class); append_id(buffer, emptyW); } -static NTSTATUS query_id(const struct usb_device *device, IRP *irp, BUS_QUERY_ID_TYPE type) +static NTSTATUS query_id(struct usb_device *device, IRP *irp, BUS_QUERY_ID_TYPE type) { static const WCHAR instance_idW[] = {'0',0}; struct string_buffer buffer = {0}; @@ -474,8 +556,11 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) assert(device->removed); remove_pending_irps(device); - libusb_unref_device(device->libusb_device); - libusb_close(device->handle); + if (!device->parent) + { + libusb_unref_device(device->libusb_device); + libusb_close(device->handle); + } IoDeleteDevice(device->device_obj); ret = STATUS_SUCCESS;

1 0

Nikolay Sivov : kernelbase/tests: Close mapping in MapViewOfFile3 test.
by Alexandre Julliard 12 May '22

12 May '22

Module: wine Branch: master Commit: 1336f5966f99caafeacd7a0f98f177aa0391dc3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1336f5966f99caafeacd7a0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 12 09:12:54 2022 +0300 kernelbase/tests: Close mapping in MapViewOfFile3 test. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52970 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/process.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c index 077ee1082dd..bacf9057836 100644 --- a/dlls/kernelbase/tests/process.c +++ b/dlls/kernelbase/tests/process.c @@ -96,6 +96,7 @@ static void test_MapViewOfFile3(void) static const char testfile[] = "testfile.xxx"; HANDLE file, mapping; void *ptr; + BOOL ret; if (!pMapViewOfFile3) { @@ -118,8 +119,10 @@ static void test_MapViewOfFile3(void) ok( ptr != NULL, "MapViewOfFile FILE_MAP_READ error %lu\n", GetLastError() ); UnmapViewOfFile( ptr ); + CloseHandle( mapping ); CloseHandle( file ); - DeleteFileA( testfile ); + ret = DeleteFileA( testfile ); + ok(ret, "Failed to delete a test file.\n"); } START_TEST(process)

1 0

Nikolay Sivov : mfplat: Allow NULL size pointer in IMFAttributes::GetAllocatedBlob().
by Alexandre Julliard 12 May '22

12 May '22

Module: wine Branch: master Commit: e3f226fde01d96c5e7799884ed4da5324adceca9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3f226fde01d96c5e7799884… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 12 09:13:29 2022 +0300 mfplat: Allow NULL size pointer in IMFAttributes::GetAllocatedBlob(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 3 ++- dlls/mfplat/tests/mfplat.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 08195bca448..24d39d81b62 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2743,7 +2743,8 @@ HRESULT attributes_GetAllocatedBlob(struct attributes *attributes, REFGUID key, if (SUCCEEDED(hr)) { *buf = attrval.caub.pElems; - *size = attrval.caub.cElems; + if (size) + *size = attrval.caub.cElems; } return hr; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 8f18fcb293d..3f7ab161b59 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1749,6 +1749,11 @@ static void test_attributes(void) ok(!memcmp(blob_buf, blob, size), "Unexpected blob.\n"); CoTaskMemFree(blob_buf); + hr = IMFAttributes_GetAllocatedBlob(attributes, &DUMMY_GUID1, &blob_buf, NULL); + ok(hr == S_OK, "Failed to get allocated blob, hr %#lx.\n", hr); + ok(!memcmp(blob_buf, blob, size), "Unexpected blob.\n"); + CoTaskMemFree(blob_buf); + hr = IMFAttributes_GetAllocatedBlob(attributes, &DUMMY_GUID2, &blob_buf, &size); ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr);

1 0

Eric Pouech : capi2032: Enable compilation with long types.
by Alexandre Julliard 12 May '22

12 May '22

Module: wine Branch: master Commit: f8733138bd58871b2456ad6ee181143da9664f52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8733138bd58871b2456ad6e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu May 12 08:54:36 2022 +0200 capi2032: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/capi2032/Makefile.in | 1 - dlls/capi2032/cap20wxx.c | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/capi2032/Makefile.in b/dlls/capi2032/Makefile.in index cf9bf97ce5c..9e9ba285498 100644 --- a/dlls/capi2032/Makefile.in +++ b/dlls/capi2032/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = capi2032.dll UNIXLIB = capi2032.so IMPORTLIB = capi2032 diff --git a/dlls/capi2032/cap20wxx.c b/dlls/capi2032/cap20wxx.c index 4983dc0e480..96007f51e96 100644 --- a/dlls/capi2032/cap20wxx.c +++ b/dlls/capi2032/cap20wxx.c @@ -55,7 +55,7 @@ DWORD WINAPI CAPI_REGISTER (DWORD MessageBufferSize, DWORD maxLogicalConnection, DWORD fret; fret = CAPI_CALL( register, &params ); - TRACE ( "(%x) -> %x\n", *pApplID, fret); + TRACE ( "(%lx) -> %lx\n", *pApplID, fret); return fret; } @@ -66,7 +66,7 @@ DWORD WINAPI CAPI_RELEASE (DWORD ApplID) { DWORD fret; fret = CAPI_CALL( release, &params ); - TRACE ("(%x) -> %x\n", ApplID, fret); + TRACE ("(%lx) -> %lx\n", ApplID, fret); return fret; } @@ -77,7 +77,7 @@ DWORD WINAPI CAPI_PUT_MESSAGE (DWORD ApplID, PVOID pCAPIMessage) { DWORD fret; fret = CAPI_CALL( put_message, &params ); - TRACE ("(%x) -> %x\n", ApplID, fret); + TRACE ("(%lx) -> %lx\n", ApplID, fret); return fret; } @@ -88,7 +88,7 @@ DWORD WINAPI CAPI_GET_MESSAGE (DWORD ApplID, PVOID *ppCAPIMessage) { DWORD fret; fret = CAPI_CALL( get_message, &params ); - TRACE ("(%x) -> %x\n", ApplID, fret); + TRACE ("(%lx) -> %lx\n", ApplID, fret); return fret; } @@ -96,7 +96,7 @@ DWORD WINAPI CAPI_GET_MESSAGE (DWORD ApplID, PVOID *ppCAPIMessage) { \*---------------------------------------------------------------------------*/ DWORD WINAPI CAPI_WAIT_FOR_SIGNAL (DWORD ApplID) { struct waitformessage_params params = { ApplID }; - TRACE ("(%x)\n", ApplID); + TRACE ("(%lx)\n", ApplID); return CAPI_CALL( waitformessage, &params ); } @@ -111,7 +111,7 @@ DWORD WINAPI CAPI_GET_MANUFACTURER (char *SzBuffer) { if (!strncmp (SzBuffer, "AVM", 3)) { strcpy (SzBuffer, "AVM-GmbH"); } - TRACE ("(%s) -> %x\n", SzBuffer, fret); + TRACE ("(%s) -> %lx\n", SzBuffer, fret); return fret; } @@ -122,7 +122,7 @@ DWORD WINAPI CAPI_GET_VERSION (DWORD *pCAPIMajor, DWORD *pCAPIMinor, DWORD *pMan DWORD fret; fret = CAPI_CALL( get_version, &params ); - TRACE ("(%x.%x,%x.%x) -> %x\n", *pCAPIMajor, *pCAPIMinor, *pManufacturerMajor, + TRACE ("(%lx.%lx,%lx.%lx) -> %lx\n", *pCAPIMajor, *pCAPIMinor, *pManufacturerMajor, *pManufacturerMinor, fret); return fret; } @@ -134,7 +134,7 @@ DWORD WINAPI CAPI_GET_SERIAL_NUMBER (char *SzBuffer) { DWORD fret; fret = CAPI_CALL( get_serial_number, &params ); - TRACE ("(%s) -> %x\n", SzBuffer, fret); + TRACE ("(%s) -> %lx\n", SzBuffer, fret); return fret; } @@ -145,7 +145,7 @@ DWORD WINAPI CAPI_GET_PROFILE (PVOID SzBuffer, DWORD CtlrNr) { DWORD fret; fret = CAPI_CALL( get_profile, &params ); - TRACE ("(%x,%x) -> %x\n", CtlrNr, *(unsigned short *)SzBuffer, fret); + TRACE ("(%lx,%x) -> %lx\n", CtlrNr, *(unsigned short *)SzBuffer, fret); return fret; } @@ -155,7 +155,7 @@ DWORD WINAPI CAPI_INSTALLED (void) { DWORD fret; fret = CAPI_CALL( isinstalled, NULL ); - TRACE ("() -> %x\n", fret); + TRACE ("() -> %lx\n", fret); return fret; }

1 0