February 2018 - Wine-commits

Aric Stewart : winebus.sys: Do not depend on USB devices.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: 164517fe575564daa44f74cc3bc4a6bbdd7d3f3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=164517fe575564daa44f74cc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 20 13:53:19 2018 -0600 winebus.sys: Do not depend on USB devices. Allows for bluetooth devices to work as well Based on work and testing by Michael Menegakis <arxeio(a)gmail.com>. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 93 +++++++++++++++++++++++++++++++++------------ 1 file changed, 69 insertions(+), 24 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 417573f..7e26493 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -23,6 +23,7 @@ #include <fcntl.h> #include <stdarg.h> #include <stdlib.h> +#include <stdio.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -617,17 +618,6 @@ static inline WCHAR *strdupAtoW(const char *src) return dst; } -static DWORD get_sysattr_dword(struct udev_device *dev, const char *sysattr, int base) -{ - const char *attr = udev_device_get_sysattr_value(dev, sysattr); - if (!attr) - { - WARN("Could not get %s from device\n", sysattr); - return 0; - } - return strtol(attr, NULL, base); -} - static WCHAR *get_sysattr_string(struct udev_device *dev, const char *sysattr) { const char *attr = udev_device_get_sysattr_value(dev, sysattr); @@ -680,23 +670,23 @@ static NTSTATUS hidraw_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, static NTSTATUS hidraw_get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length) { - struct udev_device *usbdev; + struct udev_device *hiddev; struct platform_private *private = impl_from_DEVICE_OBJECT(device); WCHAR *str = NULL; - usbdev = udev_device_get_parent_with_subsystem_devtype(private->udev_device, "usb", "usb_device"); - if (usbdev) + hiddev = udev_device_get_parent_with_subsystem_devtype(private->udev_device, "hid", NULL); + if (hiddev) { switch (index) { case HID_STRING_ID_IPRODUCT: - str = get_sysattr_string(usbdev, "product"); + str = get_sysattr_string(hiddev, "product"); break; case HID_STRING_ID_IMANUFACTURER: - str = get_sysattr_string(usbdev, "manufacturer"); + str = get_sysattr_string(hiddev, "manufacturer"); break; case HID_STRING_ID_ISERIALNUMBER: - str = get_sysattr_string(usbdev, "serial"); + str = get_sysattr_string(hiddev, "serial"); break; default: ERR("Unhandled string index %08x\n", index); @@ -1049,16 +1039,71 @@ static int check_same_device(DEVICE_OBJECT *device, void* context) return !compare_platform_device(device, context); } +static int parse_uevent_info(const char *uevent, DWORD *vendor_id, + DWORD *product_id, WCHAR **serial_number) +{ + DWORD bus_type; + char *tmp = strdup(uevent); + char *saveptr = NULL; + char *line; + char *key; + char *value; + + int found_id = 0; + int found_serial = 0; + + line = strtok_r(tmp, "\n", &saveptr); + while (line != NULL) + { + /* line: "KEY=value" */ + key = line; + value = strchr(line, '='); + if (!value) + { + goto next_line; + } + *value = '\0'; + value++; + + if (strcmp(key, "HID_ID") == 0) + { + /** + * type vendor product + * HID_ID=0003:000005AC:00008242 + **/ + int ret = sscanf(value, "%x:%x:%x", &bus_type, vendor_id, product_id); + if (ret == 3) + found_id = 1; + } + else if (strcmp(key, "HID_UNIQ") == 0) + { + /* The caller has to free the serial number */ + if (strlen(value)) + { + *serial_number = (WCHAR*)strdupAtoW(value); + found_serial = 1; + } + } + +next_line: + line = strtok_r(NULL, "\n", &saveptr); + } + + free(tmp); + return (found_id && found_serial); +} + static void try_add_device(struct udev_device *dev) { DWORD vid = 0, pid = 0, version = 0; - struct udev_device *usbdev = NULL; + struct udev_device *hiddev = NULL; DEVICE_OBJECT *device = NULL; const char *subsystem; const char *devnode; WCHAR *serial = NULL; BOOL is_gamepad = FALSE; int fd; + static const CHAR *base_serial = "0000"; if (!(devnode = udev_device_get_devnode(dev))) return; @@ -1070,8 +1115,8 @@ static void try_add_device(struct udev_device *dev) } subsystem = udev_device_get_subsystem(dev); - usbdev = udev_device_get_parent_with_subsystem_devtype(dev, "usb", "usb_device"); - if (usbdev) + hiddev = udev_device_get_parent_with_subsystem_devtype(dev, "hid", NULL); + if (hiddev) { #ifdef HAS_PROPER_INPUT_HEADER const platform_vtbl *other_vtbl = NULL; @@ -1090,10 +1135,10 @@ static void try_add_device(struct udev_device *dev) return; } #endif - vid = get_sysattr_dword(usbdev, "idVendor", 16); - pid = get_sysattr_dword(usbdev, "idProduct", 16); - version = get_sysattr_dword(usbdev, "version", 10); - serial = get_sysattr_string(usbdev, "serial"); + parse_uevent_info(udev_device_get_sysattr_value(hiddev, "uevent"), + &vid, &pid, &serial); + if (serial == NULL) + serial = strdupAtoW(base_serial); } #ifdef HAS_PROPER_INPUT_HEADER else

1 0

Aric Stewart : winebus.sys: Process SDL device reports.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: 67ce6235e8b0280df18131cd1e8d1070b767224a URL: https://source.winehq.org/git/wine.git/?a=commit;h=67ce6235e8b0280df18131cd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 21 06:56:46 2018 -0600 winebus.sys: Process SDL device reports. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 120 ++++++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/bus_udev.c | 19 +------ dlls/winebus.sys/controller.h | 16 ++++++ 3 files changed, 137 insertions(+), 18 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 0091132..7318320 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -85,6 +85,8 @@ MAKE_FUNCPTR(SDL_WaitEvent); MAKE_FUNCPTR(SDL_JoystickNumButtons); MAKE_FUNCPTR(SDL_JoystickNumBalls); MAKE_FUNCPTR(SDL_JoystickNumHats); +MAKE_FUNCPTR(SDL_JoystickGetAxis); +MAKE_FUNCPTR(SDL_JoystickGetHat); #endif static Uint16 (*pSDL_JoystickGetProduct)(SDL_Joystick * joystick); static Uint16 (*pSDL_JoystickGetProductVersion)(SDL_Joystick * joystick); @@ -101,6 +103,9 @@ struct platform_private int report_descriptor_size; BYTE *report_descriptor; + + int buffer_length; + BYTE *report_buffer; }; static inline struct platform_private *impl_from_DEVICE_OBJECT(DEVICE_OBJECT *device) @@ -146,6 +151,43 @@ static BYTE *add_axis_block(BYTE *report_ptr, BYTE count, BYTE page, const BYTE return report_ptr; } +static void set_axis_value(struct platform_private *ext, int index, short value) +{ + int offset; + offset = ext->axis_start + index * 2; + *((WORD*)&ext->report_buffer[offset]) = LE_WORD(value); +} + +static void set_ball_value(struct platform_private *ext, int index, int value1, int value2) +{ + int offset; + offset = ext->ball_start + (index * 2); + if (value1 > 127) value1 = 127; + if (value1 < -127) value1 = -127; + if (value2 > 127) value2 = 127; + if (value2 < -127) value2 = -127; + ext->report_buffer[offset] = value1; + ext->report_buffer[offset + 1] = value2; +} + +static void set_hat_value(struct platform_private *ext, int index, int value) +{ + int offset; + offset = ext->hat_start + index; + switch (value) + { + case SDL_HAT_CENTERED: ext->report_buffer[offset] = 8; break; + case SDL_HAT_UP: ext->report_buffer[offset] = 0; break; + case SDL_HAT_RIGHTUP: ext->report_buffer[offset] = 1; break; + case SDL_HAT_RIGHT: ext->report_buffer[offset] = 2; break; + case SDL_HAT_RIGHTDOWN: ext->report_buffer[offset] = 3; break; + case SDL_HAT_DOWN: ext->report_buffer[offset] = 4; break; + case SDL_HAT_LEFTDOWN: ext->report_buffer[offset] = 5; break; + case SDL_HAT_LEFT: ext->report_buffer[offset] = 6; break; + case SDL_HAT_LEFTUP: ext->report_buffer[offset] = 7; break; + } +} + static BOOL build_report_descriptor(struct platform_private *ext) { BYTE *report_ptr; @@ -269,6 +311,20 @@ static BOOL build_report_descriptor(struct platform_private *ext) memcpy(report_ptr, REPORT_TAIL, sizeof(REPORT_TAIL)); ext->report_descriptor_size = descript_size; + ext->buffer_length = report_size; + ext->report_buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, report_size); + if (ext->report_buffer == NULL) + { + ERR("Failed to alloc report buffer\n"); + HeapFree(GetProcessHeap(), 0, ext->report_descriptor); + return FALSE; + } + + /* Initialize axis in the report */ + for (i = 0; i < axis_count; i++) + set_axis_value(ext, i, pSDL_JoystickGetAxis(ext->sdl_joystick, i)); + for (i = 0; i < hat_count; i++) + set_hat_value(ext, i, pSDL_JoystickGetHat(ext->sdl_joystick, i)); return TRUE; } @@ -356,6 +412,66 @@ static const platform_vtbl sdl_vtbl = set_feature_report, }; +static BOOL set_report_from_event(SDL_Event *event) +{ + DEVICE_OBJECT *device; + struct platform_private *private; + /* All the events coming in will have 'which' as a 3rd field */ + SDL_JoystickID index = ((SDL_JoyButtonEvent*)event)->which; + + device = bus_find_hid_device(&sdl_vtbl, ULongToPtr(index)); + if (!device) + { + ERR("Failed to find device at index %i\n",index); + return FALSE; + } + private = impl_from_DEVICE_OBJECT(device); + + switch(event->type) + { + case SDL_JOYBUTTONDOWN: + case SDL_JOYBUTTONUP: + { + SDL_JoyButtonEvent *ie = &event->jbutton; + + set_button_value(ie->button, ie->state, private->report_buffer); + + process_hid_report(device, private->report_buffer, private->buffer_length); + break; + } + case SDL_JOYAXISMOTION: + { + SDL_JoyAxisEvent *ie = &event->jaxis; + + if (ie->axis < 6) + { + set_axis_value(private, ie->axis, ie->value); + process_hid_report(device, private->report_buffer, private->buffer_length); + } + break; + } + case SDL_JOYBALLMOTION: + { + SDL_JoyBallEvent *ie = &event->jball; + + set_ball_value(private, ie->ball, ie->xrel, ie->yrel); + process_hid_report(device, private->report_buffer, private->buffer_length); + break; + } + case SDL_JOYHATMOTION: + { + SDL_JoyHatEvent *ie = &event->jhat; + + set_hat_value(private, ie->hat, ie->value); + process_hid_report(device, private->report_buffer, private->buffer_length); + break; + } + default: + ERR("TODO: Process Report (%x)\n",event->type); + } + return FALSE; +} + static void try_remove_device(SDL_JoystickID index) { DEVICE_OBJECT *device = NULL; @@ -441,6 +557,8 @@ static void process_device_event(SDL_Event *event) try_add_device(((SDL_JoyDeviceEvent*)event)->which); else if (event->type == SDL_JOYDEVICEREMOVED) try_remove_device(((SDL_JoyDeviceEvent*)event)->which); + else if (event->type >= SDL_JOYAXISMOTION && event->type <= SDL_JOYBUTTONUP) + set_report_from_event(event); } static DWORD CALLBACK deviceloop_thread(void *args) @@ -494,6 +612,8 @@ NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_ LOAD_FUNCPTR(SDL_JoystickNumButtons); LOAD_FUNCPTR(SDL_JoystickNumBalls); LOAD_FUNCPTR(SDL_JoystickNumHats); + LOAD_FUNCPTR(SDL_JoystickGetAxis); + LOAD_FUNCPTR(SDL_JoystickGetHat); #undef LOAD_FUNCPTR pSDL_JoystickGetProduct = wine_dlsym(sdl_handle, "SDL_JoystickGetProduct", NULL, 0); pSDL_JoystickGetProductVersion = wine_dlsym(sdl_handle, "SDL_JoystickGetProductVersion", NULL, 0); diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 9d78f19..417573f 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -271,23 +271,6 @@ static const BYTE* what_am_I(struct udev_device *dev) return Unknown; } -static void set_button_value(struct wine_input_private *ext, int code, int value) -{ - int index = ext->button_map[code]; - int bindex = index / 8; - int b = index % 8; - BYTE mask; - - mask = 1<<b; - if (value) - ext->current_report_buffer[bindex] = ext->current_report_buffer[bindex] | mask; - else - { - mask = ~mask; - ext->current_report_buffer[bindex] = ext->current_report_buffer[bindex] & mask; - } -} - static void set_abs_axis_value(struct wine_input_private *ext, int code, int value) { int index; @@ -608,7 +591,7 @@ static BOOL set_report_from_event(struct wine_input_private *ext, struct input_e return FALSE; #endif case EV_KEY: - set_button_value(ext, ie->code, ie->value); + set_button_value(ext->button_map[ie->code], ie->value, ext->current_report_buffer); return FALSE; case EV_ABS: set_abs_axis_value(ext, ie->code, ie->value); diff --git a/dlls/winebus.sys/controller.h b/dlls/winebus.sys/controller.h index a4fc36e..9546fe9 100644 --- a/dlls/winebus.sys/controller.h +++ b/dlls/winebus.sys/controller.h @@ -113,3 +113,19 @@ static inline BYTE *add_hatswitch(BYTE *report_ptr, INT count) report_ptr[IDX_HATSWITCH_COUNT] = count; return report_ptr + sizeof(REPORT_HATSWITCH); } + +static inline void set_button_value(int index, int value, BYTE* buffer) +{ + int bindex = index / 8; + int b = index % 8; + BYTE mask; + + mask = 1<<b; + if (value) + buffer[bindex] = buffer[bindex] | mask; + else + { + mask = ~mask; + buffer[bindex] = buffer[bindex] & mask; + } +}

1 0

Józef Kucia : d3d10core/tests: Use global memory allocation helpers.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: d985fa01d486dceb5fd55bafad096edf67c81b4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d985fa01d486dceb5fd55baf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 20 23:59:42 2018 +0100 d3d10core/tests: Use global memory allocation helpers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 2a8169a..7b28e01 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -20,6 +20,7 @@ #define COBJMACROS #include "initguid.h" #include "d3d11_4.h" +#include "wine/heap.h" #include "wine/test.h" #include <limits.h> @@ -2567,7 +2568,7 @@ static void test_render_target_views(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; - data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, texture_desc.Width * texture_desc.Height * 4); + data = heap_alloc_zero(texture_desc.Width * texture_desc.Height * 4); ok(!!data, "Failed to allocate memory.\n"); for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -2608,7 +2609,7 @@ static void test_render_target_views(void) ID3D10Texture2D_Release(texture); } - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); release_test_context(&test_context); } @@ -8421,7 +8422,7 @@ static void test_resource_access(void) data.SysMemPitch = 0; data.SysMemSlicePitch = 0; - data.pSysMem = HeapAlloc(GetProcessHeap(), 0, 10240); + data.pSysMem = heap_alloc(10240); ok(!!data.pSysMem, "Failed to allocate memory.\n"); for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -8568,7 +8569,7 @@ static void test_resource_access(void) } } - HeapFree(GetProcessHeap(), 0, (void *)data.pSysMem); + heap_free((void *)data.pSysMem); refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); @@ -12760,7 +12761,7 @@ static void test_buffer_srv(void) resource_data.SysMemSlicePitch = 0; if (current_buffer->data_offset) { - data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, current_buffer->byte_count); + data = heap_alloc_zero(current_buffer->byte_count); ok(!!data, "Failed to allocate memory.\n"); memcpy(data + current_buffer->data_offset, current_buffer->data, current_buffer->byte_count - current_buffer->data_offset); @@ -12772,7 +12773,7 @@ static void test_buffer_srv(void) } hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &resource_data, &buffer); ok(SUCCEEDED(hr), "Test %u: Failed to create buffer, hr %#x.\n", i, hr); - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); } else { @@ -14401,7 +14402,7 @@ static void test_generate_mips(void) ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); ID3D10Device_PSSetSamplers(device, 0, 1, &sampler_state); - data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) * 32 * 32 * 32); + data = heap_alloc(sizeof(*data) * 32 * 32 * 32); for (z = 0; z < 32; ++z) { @@ -14428,7 +14429,7 @@ static void test_generate_mips(void) } } - zero_data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*zero_data) * 16 * 16 * 16); + zero_data = heap_alloc_zero(sizeof(*zero_data) * 16 * 16 * 16); for (i = 0; i < ARRAY_SIZE(resource_types); ++i) { @@ -14590,8 +14591,8 @@ static void test_generate_mips(void) if (is_warp_device(device)) { win_skip("Creating the next texture crashes WARP on some testbot boxes.\n"); - HeapFree(GetProcessHeap(), 0, zero_data); - HeapFree(GetProcessHeap(), 0, data); + heap_free(zero_data); + heap_free(data); ID3D10SamplerState_Release(sampler_state); ID3D10PixelShader_Release(ps_3d); ID3D10PixelShader_Release(ps); @@ -14689,8 +14690,8 @@ static void test_generate_mips(void) ID3D10Resource_Release(resource); - HeapFree(GetProcessHeap(), 0, zero_data); - HeapFree(GetProcessHeap(), 0, data); + heap_free(zero_data); + heap_free(data); ID3D10SamplerState_Release(sampler_state); ID3D10PixelShader_Release(ps_3d);

1 0

Józef Kucia : d3d11/tests: Use global memory allocation helpers.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: a705a2b90dc3c60eb95a364ab90c91a702294127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a705a2b90dc3c60eb95a364a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 20 23:59:43 2018 +0100 d3d11/tests: Use global memory allocation helpers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 35551d0..5a36bc2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -25,6 +25,7 @@ #define COBJMACROS #include "initguid.h" #include "d3d11_4.h" +#include "wine/heap.h" #include "wine/test.h" #ifndef ARRAY_SIZE @@ -8198,7 +8199,7 @@ static void test_render_target_views(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; - data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, texture_desc.Width * texture_desc.Height * 4); + data = heap_alloc_zero(texture_desc.Width * texture_desc.Height * 4); ok(!!data, "Failed to allocate memory.\n"); for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -8282,7 +8283,7 @@ static void test_render_target_views(void) ID3D11Resource_Release(resource); } - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); release_test_context(&test_context); } @@ -11154,7 +11155,7 @@ static void test_resource_access(const D3D_FEATURE_LEVEL feature_level) data.SysMemPitch = 0; data.SysMemSlicePitch = 0; - data.pSysMem = HeapAlloc(GetProcessHeap(), 0, 10240); + data.pSysMem = heap_alloc(10240); ok(!!data.pSysMem, "Failed to allocate memory.\n"); for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -11339,7 +11340,7 @@ static void test_resource_access(const D3D_FEATURE_LEVEL feature_level) } } - HeapFree(GetProcessHeap(), 0, (void *)data.pSysMem); + heap_free((void *)data.pSysMem); ID3D11DeviceContext_Release(context); refcount = ID3D11Device_Release(device); @@ -19221,7 +19222,7 @@ static void test_buffer_srv(void) resource_data.SysMemSlicePitch = 0; if (current_buffer->data_offset) { - data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, current_buffer->byte_count); + data = heap_alloc_zero(current_buffer->byte_count); ok(!!data, "Failed to allocate memory.\n"); memcpy(data + current_buffer->data_offset, current_buffer->data, current_buffer->byte_count - current_buffer->data_offset); @@ -19233,7 +19234,7 @@ static void test_buffer_srv(void) } hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &buffer); ok(SUCCEEDED(hr), "Test %u: Failed to create buffer, hr %#x.\n", i, hr); - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); } else { @@ -22786,7 +22787,7 @@ static void test_depth_bias(void) rasterizer_desc.SlopeScaledDepthBias = 0.0f; rasterizer_desc.DepthClipEnable = TRUE; - depth_values = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*depth_values) * swapchain_desc.height); + depth_values = heap_calloc(swapchain_desc.height, sizeof(*depth_values)); ok(!!depth_values, "Failed to allocate memory.\n"); for (format_idx = 0; format_idx < ARRAY_SIZE(formats); ++format_idx) @@ -22988,7 +22989,7 @@ static void test_depth_bias(void) ID3D11DepthStencilView_Release(dsv); } - HeapFree(GetProcessHeap(), 0, depth_values); + heap_free(depth_values); release_test_context(&test_context); } @@ -24514,7 +24515,7 @@ static void test_generate_mips(void) ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler_state); - data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) * 32 * 32 * 32); + data = heap_alloc(sizeof(*data) * 32 * 32 * 32); for (z = 0; z < 32; ++z) { @@ -24541,7 +24542,7 @@ static void test_generate_mips(void) } } - zero_data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*zero_data) * 16 * 16 * 16); + zero_data = heap_alloc_zero(sizeof(*zero_data) * 16 * 16 * 16); for (i = 0; i < ARRAY_SIZE(resource_types); ++i) { @@ -24791,8 +24792,8 @@ static void test_generate_mips(void) ID3D11Resource_Release(resource); - HeapFree(GetProcessHeap(), 0, zero_data); - HeapFree(GetProcessHeap(), 0, data); + heap_free(zero_data); + heap_free(data); ID3D11SamplerState_Release(sampler_state); ID3D11PixelShader_Release(ps_3d);

1 0

Zebediah Figura : msi/tests: Use the custom DLL for testing deferred actions.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: 9d7ac35e6d0d1d68be24c3fe7b6a54301002258c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d7ac35e6d0d1d68be24c3fe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 20 09:03:19 2018 -0600 msi/tests: Use the custom DLL for testing deferred actions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/custom.c | 35 +++++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ dlls/msi/tests/install.c | 44 +++++++++++++++++++++++++++++++++----------- 3 files changed, 70 insertions(+), 11 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 0eedb8e..f504464 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -83,3 +83,38 @@ UINT WINAPI test_retval(MSIHANDLE hinst) sscanf(prop, "%u", &retval); return retval; } + +static void append_file(MSIHANDLE hinst, const char *filename, const char *text) +{ + DWORD size; + HANDLE file = CreateFileA(filename, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(hinst, file != INVALID_HANDLE_VALUE, "CreateFile failed, error %u\n", GetLastError()); + + SetFilePointer(file, 0, NULL, FILE_END); + WriteFile(file, text, strlen(text), &size, NULL); + CloseHandle(file); +} + +UINT WINAPI da_immediate(MSIHANDLE hinst) +{ + char prop[300]; + DWORD len = sizeof(prop); + + MsiGetPropertyA(hinst, "TESTPATH", prop, &len); + + append_file(hinst, prop, "one"); + + return ERROR_SUCCESS; +} + +UINT WINAPI da_deferred(MSIHANDLE hinst) +{ + char prop[300]; + DWORD len = sizeof(prop); + + MsiGetPropertyA(hinst, "CustomActionData", prop, &len); + + append_file(hinst, prop, "two"); + + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 9d1e821..bb400ff 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -1,2 +1,4 @@ @ stdcall main_test(long) @ stdcall test_retval(long) +@ stdcall da_immediate(long) +@ stdcall da_deferred(long) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 55d83d4..69095cd 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1300,12 +1300,12 @@ static const char ft_install_exec_seq_dat[] = "InstallFinalize\t\t1500\n"; static const char da_custom_action_dat[] = - "Action\tType\tSource\tTarget\tISComments\n" - "s72\ti2\tS64\tS0\tS255\n" + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" "CustomAction\tAction\n" - "deferred\t1074\tCMDEXE\t/c if exist msitest (exit 0) else (exit 1)\t\n" - "immediate\t50\tCMDEXE\t/c mkdir msitest\t\n" - "cleanup\t50\tCMDEXE\t/c rmdir msitest\t\n"; + "setprop\t51\tdeferred\t[TESTPATH]\n" + "immediate\t1\tcustom.dll\tda_immediate\n" + "deferred\t1025\tcustom.dll\tda_deferred\n"; static const char da_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" @@ -1315,10 +1315,10 @@ static const char da_install_exec_seq_dat[] = "FileCost\t\t300\n" "CostFinalize\t\t400\n" "InstallInitialize\t\t500\n" - "deferred\t\t600\n" - "immediate\t\t700\n" - "InstallFinalize\t\t1100\n" - "cleanup\t\t1200\n"; + "setprop\t\t600\n" + "deferred\t\t700\n" + "immediate\t\t800\n" + "InstallFinalize\t\t1100\n"; typedef struct _msi_table { @@ -6042,23 +6042,45 @@ static void test_feature_tree(void) DeleteFileA( msifile ); } +static void check_file_matches(const char *filename, const char *text) +{ + char buffer[200]; + HANDLE file; + DWORD size; + + file = CreateFileA(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + ReadFile(file, buffer, sizeof(buffer), &size, NULL); + ok(size == strlen(text) && !memcmp(buffer, text, size), "got %.*s\n", size, buffer); + CloseHandle(file); +} + static void test_deferred_action(void) { + char path[200], file[200], buffer[200]; UINT r; + GetTempPathA(sizeof(path), path); + GetTempFileNameA(path, "da", 0, file); + sprintf(buffer, "TESTPATH=\"%s\"", file); + create_database(msifile, da_tables, sizeof(da_tables) / sizeof(da_tables[0])); + add_custom_dll(); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); - r = MsiInstallProductA(msifile, "CMDEXE=\"cmd.exe\""); + r = MsiInstallProductA(msifile, buffer); if (r == ERROR_INSTALL_PACKAGE_REJECTED) { skip("Not enough rights to perform tests\n"); goto error; } -todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); +todo_wine + check_file_matches(file, "onetwo"); + + ok(DeleteFileA(file), "Directory not created\n"); + error: DeleteFileA(msifile); }

1 0

Hans Leidekker : kerberos: Get rid of a redundant parameter check in kerberos_SpInitLsaModeContext.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: 917bf27322c868193c4c6255517ee46f9874f5e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=917bf27322c868193c4c6255… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 21 15:22:10 2018 +0100 kerberos: Get rid of a redundant parameter check in kerberos_SpInitLsaModeContext. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 52cbe05..42474ea 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -920,7 +920,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, cred_handle = credhandle_sspi_to_gss( credential ); ctxt_handle = ctxthandle_sspi_to_gss( context ); - if (!input || (idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) input_token.length = 0; + if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) input_token.length = 0; else { input_token.length = input->pBuffers[idx].cbBuffer;

1 0

Józef Kucia : d3d10core/tests: Add option to use selected adapter.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: 094db6463948d0dcc890bf3127338ba91eafe274 URL: https://source.winehq.org/git/wine.git/?a=commit;h=094db6463948d0dcc890bf31… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 20 23:59:40 2018 +0100 d3d10core/tests: Add option to use selected adapter. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/Makefile.in | 2 +- dlls/d3d10core/tests/device.c | 65 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 64 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/tests/Makefile.in b/dlls/d3d10core/tests/Makefile.in index 386840a..6401cc8 100644 --- a/dlls/d3d10core/tests/Makefile.in +++ b/dlls/d3d10core/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3d10core.dll -IMPORTS = d3d10 user32 +IMPORTS = d3d10 dxgi user32 C_SRCS = \ device.c diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index e8f9336..6b8773a 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -19,7 +19,7 @@ #include <assert.h> #define COBJMACROS #include "initguid.h" -#include "d3d11.h" +#include "d3d11_4.h" #include "wine/test.h" #include <limits.h> @@ -862,12 +862,61 @@ static void check_texture_uvec4_(unsigned int line, ID3D10Texture2D *texture, check_texture_sub_resource_uvec4_(line, texture, sub_resource_idx, NULL, expected_value); } +static BOOL use_warp_adapter; +static unsigned int use_adapter_idx; + +static IDXGIAdapter *create_adapter(void) +{ + IDXGIFactory4 *factory4; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + HRESULT hr; + + if (!use_warp_adapter && !use_adapter_idx) + return NULL; + + if (FAILED(hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory))) + { + trace("Failed to create IDXGIFactory, hr %#x.\n", hr); + return NULL; + } + + adapter = NULL; + if (use_warp_adapter) + { + if (SUCCEEDED(hr = IDXGIFactory_QueryInterface(factory, &IID_IDXGIFactory4, (void **)&factory4))) + { + hr = IDXGIFactory4_EnumWarpAdapter(factory4, &IID_IDXGIAdapter, (void **)&adapter); + IDXGIFactory4_Release(factory4); + } + else + { + trace("Failed to get IDXGIFactory4, hr %#x.\n", hr); + } + } + else + { + hr = IDXGIFactory_EnumAdapters(factory, use_adapter_idx, &adapter); + } + IDXGIFactory_Release(factory); + if (FAILED(hr)) + trace("Failed to get adapter, hr %#x.\n", hr); + return adapter; +} + static ID3D10Device *create_device(void) { + IDXGIAdapter *adapter; ID3D10Device *device; + HRESULT hr; - if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) + adapter = create_adapter(); + hr = D3D10CreateDevice(adapter, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device); + if (adapter) + IDXGIAdapter_Release(adapter); + if (SUCCEEDED(hr)) return device; + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device))) return device; if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) @@ -14866,6 +14915,18 @@ done: START_TEST(device) { + unsigned int argc, i; + char **argv; + + argc = winetest_get_mainargs(&argv); + for (i = 2; i < argc; ++i) + { + if (!strcmp(argv[i], "--warp")) + use_warp_adapter = TRUE; + else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) + use_adapter_idx = atoi(argv[++i]); + } + print_adapter_info(); test_feature_level();

1 0

Jacek Caban : mshtml: Forward IHTMLEventObj:: toElement and fromElement implementation to IDOMMouseEvent.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: 113fc682594f9d894402943c64120af2553f1bb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=113fc682594f9d894402943c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 21 15:20:17 2018 +0100 mshtml: Forward IHTMLEventObj::toElement and fromElement implementation to IDOMMouseEvent. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0011baa..6773a53 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -511,7 +511,10 @@ static HRESULT WINAPI HTMLEventObj_get_fromElement(IHTMLEventObj *iface, IHTMLEl { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); + + if(This->event && This->event->mouse_event) + return IDOMMouseEvent_get_fromElement(&This->event->IDOMMouseEvent_iface, p); *p = NULL; return S_OK; @@ -521,7 +524,10 @@ static HRESULT WINAPI HTMLEventObj_get_toElement(IHTMLEventObj *iface, IHTMLElem { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); + + if(This->event && This->event->mouse_event) + return IDOMMouseEvent_get_toElement(&This->event->IDOMMouseEvent_iface, p); *p = NULL; return S_OK;

1 0

Aric Stewart : winebus.sys: Build SDL device report.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: eda33b4b61a8facd3007d986fa60b2a183d017d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eda33b4b61a8facd3007d986… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 21 06:56:31 2018 -0600 winebus.sys: Build SDL device report. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 197 +++++++++++++++++++++++++++++++++++++++++- dlls/winebus.sys/bus_udev.c | 95 +------------------- dlls/winebus.sys/controller.h | 115 ++++++++++++++++++++++++ 3 files changed, 312 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eda33b4b61a8facd3007…

1 0

Aric Stewart : winebus.sys: Add SDL to CriticalDeviceDatabase.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: a40ec8fcb1a9dd87f79e1163cffd7001463c681a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a40ec8fcb1a9dd87f79e1163… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 21 06:57:29 2018 -0600 winebus.sys: Add SDL to CriticalDeviceDatabase. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c03fc26..3c55125 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -473,6 +473,7 @@ HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57d HKLM,System\CurrentControlSet\Control\CriticalDeviceDatabase\HIDRAW,"Service",,"WineHID" HKLM,System\CurrentControlSet\Control\CriticalDeviceDatabase\IOHID,"Service",,"WineHID" HKLM,System\CurrentControlSet\Control\CriticalDeviceDatabase\LNXEV,"Service",,"WineHID" +HKLM,System\CurrentControlSet\Control\CriticalDeviceDatabase\SDLJOY,"Service",,"WineHID" [CurrentVersion] HKCU,%CurrentVersion%\Run,,16

1 0