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

[PATCH 3/6] advapi32: Improve parameter sanity checks in RegLoadMUIString.
by Akihiro Sagawa 07 May '19

07 May '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/advapi32/registry.c | 2 +- dlls/advapi32/tests/registry.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)

2 1

[PATCH 2/6] advapi32: Support the base directory parameter in RegLoadMUIString.
by Akihiro Sagawa 07 May '19

07 May '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/advapi32/registry.c | 36 +++++++++++++++++++++++++----------- dlls/advapi32/tests/registry.c | 2 +- dlls/kernel32/time.c | 2 +- 3 files changed, 27 insertions(+), 13 deletions(-)

2 1

[PATCH 1/6] advapi32/tests: Add basic RegLoadMUIString tests.
by Akihiro Sagawa 07 May '19

07 May '19

Motivation: Before adding cache mechanism in RegLoadMUIString, I'll add some conformance tests for the function and fix its implementation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/advapi32/tests/registry.c | 115 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+)

1 0

[PATCH] ntoskrnl.exe/tests: Add more overlapped tests.
by Jacek Caban 07 May '19

07 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 45 ++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 6 deletions(-)

2 1

[PATCH] dinput: Use heuristics to guess if a device is a gamepad or a joystick
by Andrew Eikum 07 May '19

07 May '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47123 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- Applies on top of Alistair's series. dlls/dinput/dinput_private.h | 2 +- dlls/dinput/joystick.c | 6 +++- dlls/dinput/joystick_linux.c | 46 +++++++++++++++++++++++++++++-- dlls/dinput/joystick_linuxinput.c | 27 ++++++++++++++++-- dlls/dinput/joystick_osx.c | 20 ++++++++++++-- 5 files changed, 91 insertions(+), 10 deletions(-) diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index c97a49334ad..289b2f1f63d 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -81,7 +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; +extern DWORD get_device_type(DWORD version, BOOL is_joystick) DECLSPEC_HIDDEN; #define IS_DIPROP(x) (((ULONG_PTR)(x) >> 16) == 0) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 5129bb85457..8b3edb2c540 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -76,8 +76,12 @@ DWORD typeFromGUID(REFGUID guid) } } -DWORD get_device_type(DWORD version) +DWORD get_device_type(DWORD version, BOOL is_joystick) { + if (is_joystick) + return version >= 0x0800 ? DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8) : + DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + return version >= 0x0800 ? DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8) : DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); } diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 2644ed66a4e..b708db3e81c 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -84,6 +84,8 @@ struct JoyDev int *dev_axes_map; WORD vendor_id, product_id, bus_type; + + BOOL is_joystick; }; typedef struct JoystickImpl JoystickImpl; @@ -177,6 +179,7 @@ static INT find_joystick_devices(void) int fd; struct JoyDev joydev, *new_joydevs; BYTE axes_map[ABS_MAX + 1]; + SHORT btn_map[KEY_MAX - BTN_MISC + 1]; snprintf(joydev.device, sizeof(joydev.device), "%s%d", JOYDEV_NEW, i); if ((fd = open(joydev.device, O_RDONLY)) == -1) @@ -220,6 +223,42 @@ static INT find_joystick_devices(void) joydev.button_count = 2; #endif + joydev.is_joystick = FALSE; + if (ioctl(fd, JSIOCGBTNMAP, btn_map) < 0) + { + WARN("ioctl(%s,JSIOCGBTNMAP) failed: %s\n", joydev.device, strerror(errno)); + } + else + { + INT j; + /* in lieu of properly reporting HID usage, detect presence of + * "joystick buttons" and report those devices as joysticks instead of + * gamepads */ + for (j = 0; !joydev.is_joystick && j < joydev.button_count; j++) + { + switch (btn_map[j]) + { + case BTN_TRIGGER: + case BTN_THUMB: + case BTN_THUMB2: + case BTN_TOP: + case BTN_TOP2: + case BTN_PINKIE: + case BTN_BASE: + case BTN_BASE2: + case BTN_BASE3: + case BTN_BASE4: + case BTN_BASE5: + case BTN_BASE6: + case BTN_DEAD: + joydev.is_joystick = TRUE; + break; + default: + break; + } + } + } + if (ioctl(fd, JSIOCGAXMAP, axes_map) < 0) { WARN("ioctl(%s,JSIOCGAXMAP) failed: %s\n", joydev.device, strerror(errno)); @@ -322,7 +361,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; - lpddi->dwDevType = get_device_type(version); + lpddi->dwDevType = get_device_type(version, joystick_devices[id].is_joystick); /* 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 && @@ -330,7 +369,10 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver { lpddi->dwDevType |= DIDEVTYPE_HID; lpddi->wUsagePage = 0x01; /* Desktop */ - lpddi->wUsage = 0x05; /* Game Pad */ + if (joystick_devices[id].is_joystick) + lpddi->wUsage = 0x04; /* Joystick */ + else + lpddi->wUsage = 0x05; /* Game Pad */ } MultiByteToWideChar(CP_ACP, 0, joystick_devices[id].name, -1, lpddi->tszInstanceName, MAX_PATH); diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index c742c151c7a..d4512dc5ec1 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -100,7 +100,7 @@ struct JoyDev { GUID guid; GUID guid_product; - BOOL has_ff; + BOOL has_ff, is_joystick; int num_effects; /* data returned by EVIOCGBIT for caps, EV_ABS, EV_KEY, and EV_FF */ @@ -243,6 +243,24 @@ static void find_joydevs(void) continue; } + /* in lieu of properly reporting HID usage, detect presence of + * "joystick buttons" and report those devices as joysticks instead of + * gamepads */ + joydev.is_joystick = + test_bit(joydev.keybits, BTN_TRIGGER) || + test_bit(joydev.keybits, BTN_THUMB) || + test_bit(joydev.keybits, BTN_THUMB2) || + test_bit(joydev.keybits, BTN_TOP) || + test_bit(joydev.keybits, BTN_TOP2) || + test_bit(joydev.keybits, BTN_PINKIE) || + test_bit(joydev.keybits, BTN_BASE) || + test_bit(joydev.keybits, BTN_BASE2) || + test_bit(joydev.keybits, BTN_BASE3) || + test_bit(joydev.keybits, BTN_BASE4) || + test_bit(joydev.keybits, BTN_BASE5) || + test_bit(joydev.keybits, BTN_BASE6) || + test_bit(joydev.keybits, BTN_DEAD); + if (!(joydev.device = HeapAlloc(GetProcessHeap(), 0, strlen(buf) + 1))) { close(fd); @@ -350,7 +368,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; - lpddi->dwDevType = get_device_type(version); + lpddi->dwDevType = get_device_type(version, joydevs[id].is_joystick); /* 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 && @@ -358,7 +376,10 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver { lpddi->dwDevType |= DIDEVTYPE_HID; lpddi->wUsagePage = 0x01; /* Desktop */ - lpddi->wUsage = 0x05; /* Game Pad */ + if (joydevs[id].is_joystick) + lpddi->wUsage = 0x04; /* Joystick */ + else + lpddi->wUsage = 0x05; /* Game Pad */ } MultiByteToWideChar(CP_ACP, 0, joydevs[id].name, -1, lpddi->tszInstanceName, MAX_PATH); diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index aad60765cfb..a448818bb9c 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -945,6 +945,7 @@ static DWORD make_vid_pid(IOHIDDeviceRef device) static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { IOHIDDeviceRef device; + BOOL is_joystick; TRACE("dwDevType %u dwFlags 0x%08x version 0x%04x id %d\n", dwDevType, dwFlags, version, id); @@ -962,15 +963,19 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS if(get_ff(device, NULL) != S_OK) return S_FALSE; } + is_joystick = get_device_property_long(device, CFSTR(kIOHIDDeviceUsageKey)) == kHIDUsage_GD_Joystick; /* Return joystick */ lpddi->guidInstance = DInput_Wine_OsX_Joystick_GUID; lpddi->guidInstance.Data3 = id; lpddi->guidProduct = DInput_Wine_OsX_Joystick_GUID; lpddi->guidProduct.Data1 = make_vid_pid(device); - lpddi->dwDevType = get_device_type(version); + lpddi->dwDevType = get_device_type(version, is_joystick); lpddi->dwDevType |= DIDEVTYPE_HID; lpddi->wUsagePage = 0x01; /* Desktop */ - lpddi->wUsage = 0x05; /* Game Pad */ + if (is_joystick) + lpddi->wUsage = 0x04; /* Joystick */ + else + lpddi->wUsage = 0x05; /* Game Pad */ sprintf(lpddi->tszInstanceName, "Joystick %d", id); /* get the device name */ @@ -988,6 +993,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS char name[MAX_PATH]; char friendly[32]; IOHIDDeviceRef device; + BOOL is_joystick; TRACE("dwDevType %u dwFlags 0x%08x version 0x%04x id %d\n", dwDevType, dwFlags, version, id); @@ -1005,14 +1011,22 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS if(get_ff(device, NULL) != S_OK) return S_FALSE; } + is_joystick = get_device_property_long(device, CFSTR(kIOHIDDeviceUsageKey)) == kHIDUsage_GD_Joystick; /* Return joystick */ lpddi->guidInstance = DInput_Wine_OsX_Joystick_GUID; lpddi->guidInstance.Data3 = id; lpddi->guidProduct = DInput_Wine_OsX_Joystick_GUID; lpddi->guidProduct.Data1 = make_vid_pid(device); - lpddi->dwDevType = get_device_type(version); + lpddi->dwDevType = get_device_type(version, is_joystick); + lpddi->dwDevType |= DIDEVTYPE_HID; + lpddi->wUsagePage = 0x01; /* Desktop */ + if (is_joystick) + lpddi->wUsage = 0x04; /* Joystick */ + else + lpddi->wUsage = 0x05; /* Game Pad */ sprintf(friendly, "Joystick %d", id); MultiByteToWideChar(CP_ACP, 0, friendly, -1, lpddi->tszInstanceName, MAX_PATH); + /* get the device name */ get_osx_device_name(id, name, MAX_PATH); -- 2.21.0

1 0

[PATCH vkd3d 5/6] vkd3d: Try to guess application name.
by Józef Kucia 07 May '19

07 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 7 +++++-- libs/vkd3d/utils.c | 31 +++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 2 ++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3476fdead708..4b5e4492ac3f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -527,8 +527,6 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, application_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; application_info.pNext = NULL; - application_info.pApplicationName = NULL; - application_info.applicationVersion = 0; application_info.pEngineName = PACKAGE_NAME; application_info.engineVersion = vkd3d_get_vk_version(); application_info.apiVersion = VK_API_VERSION_1_0; @@ -543,6 +541,11 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, application_info.engineVersion = vkd3d_application_info->engine_version; } } + else + { + application_info.pApplicationName = vkd3d_get_program_name(); + application_info.applicationVersion = 0; + } if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) { diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index ea468b37d37d..21919815537a 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -602,6 +602,37 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, return S_OK; } +const char *vkd3d_get_program_name(void) +{ +#ifdef _GNU_SOURCE + char *name; + + if ((name = strrchr(program_invocation_name, '/'))) + { + const char *path = realpath("/proc/self/exe", NULL); + + /* Try to strip command line arguments. */ + if (path && !strncmp(path, program_invocation_name, strlen(path))) + { + const char *p = strrchr(path, '/'); + + if (p) + return p + 1; + } + + return name + 1; + } + + if ((name = strrchr(program_invocation_name, '\\'))) + return name + 1; + + return program_invocation_name; + +#else + return NULL; +#endif +} + static struct vkd3d_private_data *vkd3d_private_store_get_private_data( const struct vkd3d_private_store *store, const GUID *tag) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 057a0a7c0dea..da177d346ec9 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1126,6 +1126,8 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, extern const char vkd3d_build[]; +const char *vkd3d_get_program_name(void) DECLSPEC_HIDDEN; + static inline void vkd3d_set_thread_name(const char *name) { #if defined(HAVE_PTHREAD_SETNAME_NP_2) -- 2.21.0

1 0

[PATCH vkd3d 4/6] vkd3d: Introduce vkd3d_application_info.
by Józef Kucia 07 May '19

07 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d.h | 14 ++++++++++++++ libs/vkd3d/device.c | 35 ++++++++++++++++++++++++++++++++--- tests/vkd3d_api.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+), 3 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 24cb34eb3c34..b78076e43927 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -43,6 +43,7 @@ enum vkd3d_structure_type VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO, VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_EXTENSIONS_INFO, + VKD3D_STRUCTURE_TYPE_APPLICATION_INFO, VKD3D_FORCE_32_BIT_ENUM(VKD3D_STRUCTURE_TYPE), }; @@ -83,6 +84,19 @@ struct vkd3d_optional_instance_extensions_info uint32_t extension_count; }; +/* Extends vkd3d_instance_create_info. */ +struct vkd3d_application_info +{ + enum vkd3d_structure_type type; + const void *next; + + const char *application_name; + uint32_t application_version; + + const char *engine_name; /* "vkd3d" if NULL */ + uint32_t engine_version; /* vkd3d version if engine_name is NULL */ +}; + struct vkd3d_device_create_info { enum vkd3d_structure_type type; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index a107e1e6414c..3476fdead708 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -18,6 +18,8 @@ #include "vkd3d_private.h" +#include <ctype.h> + #ifdef HAVE_DLFCN_H #include <dlfcn.h> @@ -104,6 +106,21 @@ static void *vk_find_struct_(struct vk_struct *chain, VkStructureType sType) return NULL; } +static uint32_t vkd3d_get_vk_version(void) +{ + const char *ptr = PACKAGE_VERSION; + int major, minor; + + major = atoi(ptr); + + while (isdigit(*ptr) || *ptr == '.') + ++ptr; + + minor = atoi(ptr); + + return VK_MAKE_VERSION(major, minor, 0); +} + struct vkd3d_optional_extension_info { const char *extension_name; @@ -459,6 +476,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, { const struct vkd3d_vk_global_procs *vk_global_procs = &instance->vk_global_procs; const struct vkd3d_optional_instance_extensions_info *optional_extensions; + const struct vkd3d_application_info *vkd3d_application_info; bool *user_extension_supported = NULL; VkApplicationInfo application_info; VkInstanceCreateInfo instance_info; @@ -509,12 +527,23 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, application_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; application_info.pNext = NULL; - application_info.pApplicationName = PACKAGE_NAME; + application_info.pApplicationName = NULL; application_info.applicationVersion = 0; - application_info.pEngineName = NULL; - application_info.engineVersion = 0; + application_info.pEngineName = PACKAGE_NAME; + application_info.engineVersion = vkd3d_get_vk_version(); application_info.apiVersion = VK_API_VERSION_1_0; + if ((vkd3d_application_info = vkd3d_find_struct(create_info->next, APPLICATION_INFO))) + { + application_info.pApplicationName = vkd3d_application_info->application_name; + application_info.applicationVersion = vkd3d_application_info->application_version; + if (vkd3d_application_info->engine_name) + { + application_info.pEngineName = vkd3d_application_info->engine_name; + application_info.engineVersion = vkd3d_application_info->engine_version; + } + } + if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) { if (instance->libvulkan) diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 14d0914512bc..5acec56d8646 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -1052,6 +1052,49 @@ static void test_formats(void) } } +static void test_application_info(void) +{ + struct vkd3d_instance_create_info create_info; + struct vkd3d_application_info app_info; + struct vkd3d_instance *instance; + ULONG refcount; + HRESULT hr; + + app_info.type = VKD3D_STRUCTURE_TYPE_APPLICATION_INFO; + app_info.next = NULL; + app_info.engine_name = NULL; + app_info.engine_version = 0; + app_info.application_name = NULL; + app_info.application_version = 0; + + create_info = instance_default_create_info; + create_info.next = &app_info; + hr = vkd3d_create_instance(&create_info, &instance); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + refcount = vkd3d_instance_decref(instance); + ok(!refcount, "Instance has %u references left.\n", refcount); + + app_info.application_name = "vkd3d_api_tests"; + app_info.application_version = 0xdeadbeef; + hr = vkd3d_create_instance(&create_info, &instance); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + refcount = vkd3d_instance_decref(instance); + ok(!refcount, "Instance has %u references left.\n", refcount); + + app_info.engine_name = "engine_name"; + hr = vkd3d_create_instance(&create_info, &instance); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + refcount = vkd3d_instance_decref(instance); + ok(!refcount, "Instance has %u references left.\n", refcount); + + app_info.engine_name = "engine_name"; + app_info.engine_version = 2; + hr = vkd3d_create_instance(&create_info, &instance); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + refcount = vkd3d_instance_decref(instance); + ok(!refcount, "Instance has %u references left.\n", refcount); +} + static bool have_d3d12_device(void) { ID3D12Device *device; @@ -1083,4 +1126,5 @@ START_TEST(vkd3d_api) run_test(test_external_resource_map); run_test(test_external_resource_present_state); run_test(test_formats); + run_test(test_application_info); } -- 2.21.0

1 0

[PATCH 1/4] mfplat: Write attribute store when registering MFT.
by Nikolay Sivov 07 May '19

07 May '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 68 ++++++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 26 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 61521ce779..4f634e0d82 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -70,6 +70,7 @@ static const WCHAR categories_keyW[] = {'M','e','d','i','a','F','o','u','n','d', 'C','a','t','e','g','o','r','i','e','s',0}; static const WCHAR inputtypesW[] = {'I','n','p','u','t','T','y','p','e','s',0}; static const WCHAR outputtypesW[] = {'O','u','t','p','u','t','T','y','p','e','s',0}; +static const WCHAR attributesW[] = {'A','t','t','r','i','b','u','t','e','s',0}; static const WCHAR szGUIDFmt[] = { '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0', @@ -166,46 +167,65 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } -static HRESULT register_transform(CLSID *clsid, WCHAR *name, - UINT32 cinput, MFT_REGISTER_TYPE_INFO *input_types, - UINT32 coutput, MFT_REGISTER_TYPE_INFO *output_types) +static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, + UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, + const MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes) { static const WCHAR reg_format[] = {'%','s','\\','%','s',0}; + HRESULT hr = S_OK; HKEY hclsid = 0; WCHAR buffer[64]; - DWORD size; + DWORD size, ret; WCHAR str[250]; + UINT8 *blob; GUIDToString(buffer, clsid); sprintfW(str, reg_format, transform_keyW, buffer); - if (RegCreateKeyW(HKEY_CLASSES_ROOT, str, &hclsid)) - return E_FAIL; + if ((ret = RegCreateKeyW(HKEY_CLASSES_ROOT, str, &hclsid))) + hr = HRESULT_FROM_WIN32(ret); - size = (strlenW(name) + 1) * sizeof(WCHAR); - if (RegSetValueExW(hclsid, NULL, 0, REG_SZ, (BYTE *)name, size)) - goto err; + if (SUCCEEDED(hr)) + { + size = (strlenW(name) + 1) * sizeof(WCHAR); + if ((ret = RegSetValueExW(hclsid, NULL, 0, REG_SZ, (BYTE *)name, size))) + hr = HRESULT_FROM_WIN32(ret); + } - if (cinput && input_types) + if (SUCCEEDED(hr) && cinput && input_types) { size = cinput * sizeof(MFT_REGISTER_TYPE_INFO); - if (RegSetValueExW(hclsid, inputtypesW, 0, REG_BINARY, (BYTE *)input_types, size)) - goto err; + if ((ret = RegSetValueExW(hclsid, inputtypesW, 0, REG_BINARY, (BYTE *)input_types, size))) + hr = HRESULT_FROM_WIN32(ret); } - if (coutput && output_types) + if (SUCCEEDED(hr) && coutput && output_types) { size = coutput * sizeof(MFT_REGISTER_TYPE_INFO); - if (RegSetValueExW(hclsid, outputtypesW, 0, REG_BINARY, (BYTE *)output_types, size)) - goto err; + if ((ret = RegSetValueExW(hclsid, outputtypesW, 0, REG_BINARY, (BYTE *)output_types, size))) + hr = HRESULT_FROM_WIN32(ret); } - RegCloseKey(hclsid); - return S_OK; + if (SUCCEEDED(hr) && attributes) + { + if (SUCCEEDED(hr = MFGetAttributesAsBlobSize(attributes, &size))) + { + if ((blob = heap_alloc(size))) + { + if (SUCCEEDED(hr = MFGetAttributesAsBlob(attributes, blob, size))) + { + if ((ret = RegSetValueExW(hclsid, attributesW, 0, REG_BINARY, blob, size))) + hr = HRESULT_FROM_WIN32(ret); + } + heap_free(blob); + } + else + hr = E_OUTOFMEMORY; + } + } -err: RegCloseKey(hclsid); - return E_FAIL; + return hr; } static HRESULT register_category(CLSID *clsid, GUID *category) @@ -236,17 +256,13 @@ HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags { HRESULT hr; - TRACE("(%s, %s, %s, %x, %u, %p, %u, %p, %p)\n", debugstr_guid(&clsid), debugstr_guid(&category), - debugstr_w(name), flags, cinput, input_types, - coutput, output_types, attributes); - - if (attributes) - FIXME("attributes not yet supported.\n"); + TRACE("%s, %s, %s, %#x, %u, %p, %u, %p, %p.\n", debugstr_guid(&clsid), debugstr_guid(&category), + debugstr_w(name), flags, cinput, input_types, coutput, output_types, attributes); if (flags) FIXME("flags not yet supported.\n"); - hr = register_transform(&clsid, name, cinput, input_types, coutput, output_types); + hr = register_transform(&clsid, name, cinput, input_types, coutput, output_types, attributes); if(FAILED(hr)) ERR("Failed to write register transform\n"); -- 2.20.1

2 4

[PATCH] mshtml: Implement HTMLStyleSheetRulesCollection::item.
by Jacek Caban 07 May '19

07 May '19

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstylesheet.c | 188 +++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/dom.c | 16 +++ dlls/mshtml/tests/elements.js | 19 ++++ 4 files changed, 223 insertions(+), 2 deletions(-)

1 0

[PATCH] mshtml: Implement HTMLStyleSheetRulesCollection::item.
by Jacek Caban 07 May '19

07 May '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstylesheet.c | 188 +++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/dom.c | 16 +++ dlls/mshtml/tests/elements.js | 19 ++++ 4 files changed, 223 insertions(+), 2 deletions(-)

1 1