wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Andrew Eikum : hid: Shift usage values to LSB.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: daa9906cce1add57e1ce8c43f8721c9d7a73ca3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=daa9906cce1add57e1ce8c43… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 6 08:46:42 2019 -0500 hid: Shift usage values to LSB. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 2c4e98a..6a686d4 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -49,32 +49,27 @@ static NTSTATUS get_report_data(BYTE *report, INT reportLength, INT startBit, IN ULONG byte_index = startBit / 8; ULONG bit_index = startBit - (byte_index * 8); INT mask = (1 << bit_index); - *value = (report[byte_index] & mask); + *value = !!(report[byte_index] & mask); } else { + ULONG remaining_bits = valueSize; ULONG byte_index = startBit / 8; + ULONG bit_index = startBit % 8; ULONG data = 0; - ULONG remainingBits = valueSize; ULONG shift = 0; - ULONG begin_offset = startBit % 8; - while (remainingBits) + while (remaining_bits) { - if (remainingBits >= 8) - { - BYTE mask = 0xff << begin_offset; - data |= (report[byte_index] & mask) << shift; - byte_index ++; - remainingBits -= (8-begin_offset); - shift += (8-begin_offset); - begin_offset = 0; - } - else if (remainingBits > 0) - { - BYTE mask = (0xff >> (8-remainingBits)) << begin_offset; - data |= (report[byte_index] & mask) << shift; - remainingBits = 0; - } + ULONG copy_bits = 8 - bit_index; + if (remaining_bits < copy_bits) + copy_bits = remaining_bits; + + data |= ((report[byte_index] >> bit_index) & ((2 << copy_bits) - 1)) << shift; + + shift += copy_bits; + bit_index = 0; + byte_index++; + remaining_bits -= copy_bits; } *value = data; }

1 0

Andrew Eikum : winebus.sys: Fix ball value reporting.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: ec7bdf6154aa79670667b9153b2f8b09ea0691b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec7bdf6154aa79670667b915… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 6 08:46:12 2019 -0500 winebus.sys: Fix ball value reporting. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 4cbf561..49ec699 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -275,8 +275,8 @@ static void set_ball_value(struct platform_private *ext, int index, int value1, 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; + *((WORD*)&ext->report_buffer[offset]) = LE_WORD(value1); + *((WORD*)&ext->report_buffer[offset + sizeof(WORD)]) = LE_WORD(value2); } static void set_hat_value(struct platform_private *ext, int index, int value) @@ -400,7 +400,7 @@ static BOOL build_report_descriptor(struct platform_private *ext) descript_size += sizeof(REPORT_AXIS_HEADER); descript_size += (sizeof(REPORT_AXIS_USAGE) * ball_count * 2); descript_size += sizeof(REPORT_REL_AXIS_TAIL); - report_size += (sizeof(WORD) * ball_count); + report_size += (sizeof(WORD) * 2 * ball_count); } hat_count = pSDL_JoystickNumHats(ext->sdl_joystick);

1 0

Andrew Eikum : winebus.sys: Remove some magic numbers.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: e529387f67569cfa877c2185341b5cdff0e0bf39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e529387f67569cfa877c2185… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 6 08:46:07 2019 -0500 winebus.sys: Remove some magic numbers. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 724cd78..4cbf561 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -149,15 +149,17 @@ static const BYTE REPORT_AXIS_TAIL[] = { }; #define IDX_ABS_AXIS_COUNT 23 +#define CONTROLLER_NUM_BUTTONS 15 + static const BYTE CONTROLLER_BUTTONS[] = { 0x05, 0x09, /* USAGE_PAGE (Button) */ 0x19, 0x01, /* USAGE_MINIMUM (Button 1) */ - 0x29, 0x0f, /* USAGE_MAXIMUM (Button 15) */ + 0x29, CONTROLLER_NUM_BUTTONS, /* USAGE_MAXIMUM (Button 15) */ 0x15, 0x00, /* LOGICAL_MINIMUM (0) */ 0x25, 0x01, /* LOGICAL_MAXIMUM (1) */ 0x35, 0x00, /* LOGICAL_MINIMUM (0) */ 0x45, 0x01, /* LOGICAL_MAXIMUM (1) */ - 0x95, 0x0f, /* REPORT_COUNT (15) */ + 0x95, CONTROLLER_NUM_BUTTONS, /* REPORT_COUNT (15) */ 0x75, 0x01, /* REPORT_SIZE (1) */ 0x81, 0x02, /* INPUT (Data,Var,Abs) */ /* padding */ @@ -194,6 +196,8 @@ static const BYTE CONTROLLER_TRIGGERS [] = { 0x81, 0x02, /* INPUT (Data,Var,Abs) */ }; +#define CONTROLLER_NUM_AXES 6 + static const BYTE HAPTIC_RUMBLE[] = { 0x06, 0x00, 0xff, /* USAGE PAGE (vendor-defined) */ 0x09, 0x01, /* USAGE (1) */ @@ -246,7 +250,7 @@ static BYTE *add_axis_block(BYTE *report_ptr, BYTE count, BYTE page, const BYTE static void set_axis_value(struct platform_private *ext, int index, short value) { int offset; - offset = ext->axis_start + index * 2; + offset = ext->axis_start + index * sizeof(WORD); switch (index) { @@ -266,7 +270,7 @@ static void set_axis_value(struct platform_private *ext, int index, short value) static void set_ball_value(struct platform_private *ext, int index, int value1, int value2) { int offset; - offset = ext->ball_start + (index * 2); + offset = ext->ball_start + (index * sizeof(WORD)); if (value1 > 127) value1 = 127; if (value1 < -127) value1 = -127; if (value2 > 127) value2 = 127; @@ -381,7 +385,7 @@ static BOOL build_report_descriptor(struct platform_private *ext) descript_size += sizeof(REPORT_AXIS_HEADER); descript_size += (sizeof(REPORT_AXIS_USAGE) * axis_count); descript_size += sizeof(REPORT_AXIS_TAIL); - report_size += (2 * axis_count); + report_size += (sizeof(WORD) * axis_count); } ball_count = pSDL_JoystickNumBalls(ext->sdl_joystick); @@ -396,7 +400,7 @@ static BOOL build_report_descriptor(struct platform_private *ext) descript_size += sizeof(REPORT_AXIS_HEADER); descript_size += (sizeof(REPORT_AXIS_USAGE) * ball_count * 2); descript_size += sizeof(REPORT_REL_AXIS_TAIL); - report_size += (2*ball_count); + report_size += (sizeof(WORD) * ball_count); } hat_count = pSDL_JoystickNumHats(ext->sdl_joystick); @@ -404,8 +408,7 @@ static BOOL build_report_descriptor(struct platform_private *ext) if (hat_count) { descript_size += sizeof(REPORT_HATSWITCH); - for (i = 0; i < hat_count; i++) - report_size++; + report_size += hat_count; } descript_size += test_haptic(ext); @@ -482,8 +485,8 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) descript_size += sizeof(CONTROLLER_TRIGGERS); descript_size += test_haptic(ext); - ext->axis_start = 2; - ext->buffer_length = 14; + ext->axis_start = (CONTROLLER_NUM_BUTTONS + 7) / 8; + ext->buffer_length = (CONTROLLER_NUM_BUTTONS + 7) / 8 + CONTROLLER_NUM_AXES * sizeof(WORD); TRACE("Report Descriptor will be %i bytes\n", descript_size); TRACE("Report will be %i bytes\n", ext->buffer_length);

1 0

Andrew Eikum : winebus.sys: Fix udev report descriptor length.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 277822b3843898ff26e5c90735d0afd5c297349e URL: https://source.winehq.org/git/wine.git/?a=commit;h=277822b3843898ff26e5c907… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 6 08:46:03 2019 -0500 winebus.sys: Fix udev report descriptor length. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.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 | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index e8e837a..a2c7240 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -422,11 +422,6 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ abs_pages[ABS_TO_HID_MAP[i][0]][abs_pages[ABS_TO_HID_MAP[i][0]][0]] = i; ioctl(ext->base.device_fd, EVIOCGABS(i), &(ext->abs_map[i])); - if (abs_pages[ABS_TO_HID_MAP[i][0]][0] == 1) - { - descript_size += sizeof(REPORT_AXIS_HEADER); - descript_size += sizeof(REPORT_ABS_AXIS_TAIL); - } } /* Skip page 0, aka HID_USAGE_PAGE_UNDEFINED */ for (i = 1; i < TOP_ABS_PAGE; i++) @@ -441,6 +436,8 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ } abs_count++; } + descript_size += sizeof(REPORT_AXIS_HEADER) * abs_count; + descript_size += sizeof(REPORT_ABS_AXIS_TAIL) * abs_count; rel_count = 0; memset(rel_pages, 0, sizeof(rel_pages)); @@ -449,11 +446,6 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ { rel_pages[REL_TO_HID_MAP[i][0]][0]++; rel_pages[REL_TO_HID_MAP[i][0]][rel_pages[REL_TO_HID_MAP[i][0]][0]] = i; - if (rel_pages[REL_TO_HID_MAP[i][0]][0] == 1) - { - descript_size += sizeof(REPORT_AXIS_HEADER); - descript_size += sizeof(REPORT_REL_AXIS_TAIL); - } } /* Skip page 0, aka HID_USAGE_PAGE_UNDEFINED */ for (i = 1; i < TOP_REL_PAGE; i++) @@ -468,6 +460,8 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ } rel_count++; } + descript_size += sizeof(REPORT_AXIS_HEADER) * rel_count; + descript_size += sizeof(REPORT_REL_AXIS_TAIL) * rel_count; hat_count = 0; for (i = ABS_HAT0X; i <=ABS_HAT3X; i+=2) @@ -479,6 +473,8 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ report_size++; hat_count++; } + if (hat_count > 0) + descript_size += sizeof(REPORT_HATSWITCH); TRACE("Report Descriptor will be %i bytes\n", descript_size); TRACE("Report will be %i bytes\n", report_size);

1 0

Andrew Eikum : winebus.sys: Fix some report descriptors.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 3039eeb72ebbe901a6c5fbc212616da77fc1e1ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=3039eeb72ebbe901a6c5fbc2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 6 08:45:59 2019 -0500 winebus.sys: Fix some report descriptors. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 2 +- dlls/winebus.sys/controller.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index b774df7..724cd78 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -147,7 +147,7 @@ static const BYTE REPORT_AXIS_TAIL[] = { 0x95, 0x00, /* REPORT_COUNT (?) */ 0x81, 0x02, /* INPUT (Data,Var,Abs) */ }; -#define IDX_ABS_AXIS_COUNT 15 +#define IDX_ABS_AXIS_COUNT 23 static const BYTE CONTROLLER_BUTTONS[] = { 0x05, 0x09, /* USAGE_PAGE (Button) */ diff --git a/dlls/winebus.sys/controller.h b/dlls/winebus.sys/controller.h index 9546fe9..80e9c78 100644 --- a/dlls/winebus.sys/controller.h +++ b/dlls/winebus.sys/controller.h @@ -36,15 +36,15 @@ static const BYTE REPORT_BUTTONS[] = { 0x29, 0x03, /* USAGE_MAXIMUM (Button 3) */ 0x15, 0x00, /* LOGICAL_MINIMUM (0) */ 0x25, 0x01, /* LOGICAL_MAXIMUM (1) */ - 0x35, 0x00, /* LOGICAL_MINIMUM (0) */ - 0x45, 0x01, /* LOGICAL_MAXIMUM (1) */ + 0x35, 0x00, /* PHYSICAL_MINIMUM (0) */ + 0x45, 0x01, /* PHYSICAL_MAXIMUM (1) */ 0x95, 0x03, /* REPORT_COUNT (3) */ 0x75, 0x01, /* REPORT_SIZE (1) */ 0x81, 0x02, /* INPUT (Data,Var,Abs) */ }; #define IDX_BUTTON_MIN_USAGE 3 #define IDX_BUTTON_MAX_USAGE 5 -#define IDX_BUTTON_COUNT 11 +#define IDX_BUTTON_COUNT 15 static const BYTE REPORT_PADDING[] = { 0x95, 0x03, /* REPORT_COUNT (3) */

1 0

Aric Stewart : winemac.drv: Allow mac IME to clear text in system input method.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: db3864e5b3804b1b7b5bb6ea9f032472e959856d URL: https://source.winehq.org/git/wine.git/?a=commit;h=db3864e5b3804b1b7b5bb6ea… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon May 6 11:30:14 2019 -0500 winemac.drv: Allow mac IME to clear text in system input method. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 26 +++++++++++++++++++++++--- dlls/winemac.drv/ime.c | 2 +- dlls/winemac.drv/macdrv_cocoa.h | 2 ++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index f43b26b..0bc4d38 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -702,6 +702,13 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self invalidateHasGLDescendant]; } + - (void) clearMarkedText + { + [markedText deleteCharactersInRange:NSMakeRange(0, [markedText length])]; + markedTextSelection = NSMakeRange(0, 0); + [[self inputContext] discardMarkedText]; + } + - (void) completeText:(NSString*)text { macdrv_event* event; @@ -716,9 +723,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi macdrv_release_event(event); - [markedText deleteCharactersInRange:NSMakeRange(0, [markedText length])]; - markedTextSelection = NSMakeRange(0, 0); - [[self inputContext] discardMarkedText]; + [self clearMarkedText]; } - (void) didAddSubview:(NSView*)subview @@ -3907,3 +3912,18 @@ void macdrv_send_text_input_event(int pressed, unsigned int flags, int repeat, i macdrv_release_event(event); }); } + +void macdrv_clear_ime_text(void) +{ + OnMainThreadAsync(^{ + WineWindow* window = (WineWindow*)[NSApp keyWindow]; + if (![window isKindOfClass:[WineWindow class]]) + { + window = (WineWindow*)[NSApp mainWindow]; + if (![window isKindOfClass:[WineWindow class]]) + window = [[WineApplicationController sharedController] frontWineWindow]; + } + if (window) + [[window contentView] clearMarkedText]; + }); +} diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 4d95275..1f5cb6b 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -76,7 +76,6 @@ static UINT WM_MSIME_RECONVERT; static UINT WM_MSIME_QUERYPOSITION; static UINT WM_MSIME_DOCUMENTFEED; - static HIMC RealIMC(HIMC hIMC) { if (hIMC == FROM_MACDRV) @@ -840,6 +839,7 @@ BOOL WINAPI NotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) TRACE("NI_COMPOSITIONSTR: CPS_CANCEL\n"); + macdrv_clear_ime_text(); if (lpIMC->hCompStr) ImmDestroyIMCC(lpIMC->hCompStr); diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 6165dc5..8ca9b9a 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -580,4 +580,6 @@ extern void macdrv_destroy_status_item(macdrv_status_item s) DECLSPEC_HIDDEN; extern void macdrv_set_status_item_image(macdrv_status_item s, CGImageRef cgimage) DECLSPEC_HIDDEN; extern void macdrv_set_status_item_tooltip(macdrv_status_item s, CFStringRef cftip) DECLSPEC_HIDDEN; +extern void macdrv_clear_ime_text(void) DECLSPEC_HIDDEN; + #endif /* __WINE_MACDRV_COCOA_H */

1 0

Aric Stewart : winemac.drv: Set done if macdrv_process_text_input is not processing input.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 3736c36736cf285c1ea9cf4efa272868bb7afceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3736c36736cf285c1ea9cf4e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon May 6 09:33:56 2019 -0500 winemac.drv: Set done if macdrv_process_text_input is not processing input. Prevents an input lockup in this case. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/keyboard.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index aa47b95..aed4ff0 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1147,7 +1147,10 @@ void macdrv_process_text_input(UINT vkey, UINT scan, UINT repeat, const BYTE *ke if (thread_data->keyc2vkey[keyc] == vkey) break; if (keyc >= ARRAY_SIZE(thread_data->keyc2vkey)) + { + *done = -1; return; + } TRACE("flags 0x%08x keyc 0x%04x\n", flags, keyc);

1 0

Rafał Harabień : ntoskrnl.exe: Fix handling relocations on page boundary.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 6c0a8c3592148759a26126bd48ec0cd053932223 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c0a8c3592148759a26126bd… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Sat May 4 13:55:53 2019 +0000 ntoskrnl.exe: Fix handling relocations on page boundary. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28254 Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 111 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 89 insertions(+), 22 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index cf5cde9..86111b4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3674,6 +3674,84 @@ static LDR_MODULE *find_ldr_module( HMODULE module ) return ldr; } +/* convert PE image VirtualAddress to Real Address */ +static inline void *get_rva( HMODULE module, DWORD va ) +{ + return (void *)((char *)module + va); +} + +/* Copied from ntdll with checks for page alignment and characteristics removed */ +static NTSTATUS perform_relocations( void *module, SIZE_T len ) +{ + IMAGE_NT_HEADERS *nt; + char *base; + IMAGE_BASE_RELOCATION *rel, *end; + const IMAGE_DATA_DIRECTORY *relocs; + const IMAGE_SECTION_HEADER *sec; + INT_PTR delta; + ULONG protect_old[96], i; + + nt = RtlImageNtHeader( module ); + base = (char *)nt->OptionalHeader.ImageBase; + + assert( module != base ); + + relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; + + if (nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) + { + WARN( "Need to relocate module from %p to %p, but there are no relocation records\n", + base, module ); + return STATUS_CONFLICTING_ADDRESSES; + } + + if (!relocs->Size) return STATUS_SUCCESS; + if (!relocs->VirtualAddress) return STATUS_CONFLICTING_ADDRESSES; + + if (nt->FileHeader.NumberOfSections > ARRAY_SIZE( protect_old )) + return STATUS_INVALID_IMAGE_FORMAT; + + sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + + nt->FileHeader.SizeOfOptionalHeader); + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, PAGE_READWRITE, &protect_old[i] ); + } + + TRACE( "relocating from %p-%p to %p-%p\n", + base, base + len, module, (char *)module + len ); + + rel = get_rva( module, relocs->VirtualAddress ); + end = get_rva( module, relocs->VirtualAddress + relocs->Size ); + delta = (char *)module - base; + + while (rel < end - 1 && rel->SizeOfBlock) + { + if (rel->VirtualAddress >= len) + { + WARN( "invalid address %p in relocation %p\n", get_rva( module, rel->VirtualAddress ), rel ); + return STATUS_ACCESS_VIOLATION; + } + rel = LdrProcessRelocationBlock( get_rva( module, rel->VirtualAddress ), + (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), + (USHORT *)(rel + 1), delta ); + if (!rel) return STATUS_INVALID_IMAGE_FORMAT; + } + + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, protect_old[i], &protect_old[i] ); + } + + return STATUS_SUCCESS; +} + /* load the driver module file */ static HMODULE load_driver_module( const WCHAR *name ) { @@ -3683,6 +3761,8 @@ static HMODULE load_driver_module( const WCHAR *name ) int i; INT_PTR delta; ULONG size; + DWORD old; + NTSTATUS status; HMODULE module = LoadLibraryW( name ); if (!module) return NULL; @@ -3697,28 +3777,15 @@ static HMODULE load_driver_module( const WCHAR *name ) if (nt->OptionalHeader.SectionAlignment < info.PageSize || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { - DWORD old; - IMAGE_BASE_RELOCATION *rel, *end; - - if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) - { - TRACE( "%s: relocating from %p to %p\n", wine_dbgstr_w(name), (char *)module - delta, module ); - end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); - while (rel < end && rel->SizeOfBlock) - { - void *page = (char *)module + rel->VirtualAddress; - VirtualProtect( page, info.PageSize, PAGE_EXECUTE_READWRITE, &old ); - rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), - (USHORT *)(rel + 1), delta ); - if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, &old ); - if (!rel) goto error; - } - /* make sure we don't try again */ - size = FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) + nt->FileHeader.SizeOfOptionalHeader; - VirtualProtect( nt, size, PAGE_READWRITE, &old ); - nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = 0; - VirtualProtect( nt, size, old, &old ); - } + status = perform_relocations(module, nt->OptionalHeader.SizeOfImage); + if (status != STATUS_SUCCESS) + goto error; + + /* make sure we don't try again */ + size = FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) + nt->FileHeader.SizeOfOptionalHeader; + VirtualProtect( nt, size, PAGE_READWRITE, &old ); + nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size = 0; + VirtualProtect( nt, size, old, &old ); } /* make sure imports are relocated too */

1 0

Alistair Leslie-Hughes : dinput: Use a helper function to get device type.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 1daeef73325e9d35073231baf874600050126c7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1daeef73325e9d35073231ba… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 6 01:58:55 2019 +0000 dinput: Use a helper function to get device type. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_private.h | 1 + dlls/dinput/joystick.c | 6 ++++++ dlls/dinput/joystick_linux.c | 6 +----- dlls/dinput/joystick_linuxinput.c | 6 +----- dlls/dinput/joystick_osx.c | 12 ++---------- 5 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index acda6c8..c97a493 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -81,6 +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; #define IS_DIPROP(x) (((ULONG_PTR)(x) >> 16) == 0) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 0ec1ceb..9240ba3 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -76,6 +76,12 @@ DWORD typeFromGUID(REFGUID guid) } } +DWORD get_device_type(DWORD version) +{ + return version >= 0x0800 ? DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8) : + DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); +} + static void _dump_DIEFFECT_flags(DWORD dwFlags) { if (TRACE_ON(dinput)) { diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index f93fc2f..fb1b878 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -322,11 +322,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; - /* we only support traditional joysticks for now */ - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); + lpddi->dwDevType = get_device_type(version); /* 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 && diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 320696f..bc3c4de 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -350,11 +350,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; - - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); + lpddi->dwDevType = get_device_type(version); /* 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 && diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index daef1a1..cb88b2f 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -967,11 +967,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS lpddi->guidInstance.Data3 = id; lpddi->guidProduct = DInput_Wine_OsX_Joystick_GUID; lpddi->guidProduct.Data1 = make_vid_pid(device); - /* we only support traditional joysticks for now */ - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); + lpddi->dwDevType = get_device_type(version); lpddi->dwDevType |= DIDEVTYPE_HID; lpddi->wUsagePage = 0x01; /* Desktop */ lpddi->wUsage = 0x05; /* Game Pad */ @@ -1014,11 +1010,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS lpddi->guidInstance.Data3 = id; lpddi->guidProduct = DInput_Wine_OsX_Joystick_GUID; lpddi->guidProduct.Data1 = make_vid_pid(device); - /* we only support traditional joysticks for now */ - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + lpddi->dwDevType = get_device_type(version); sprintf(friendly, "Joystick %d", id); MultiByteToWideChar(CP_ACP, 0, friendly, -1, lpddi->tszInstanceName, MAX_PATH); /* get the device name */

1 0

Piotr Caban : hidclass.sys: Treat all one-bit fields as buttons.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 431637399820454daa3607a7f745a6884c38ea7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=431637399820454daa3607a7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 12:00:50 2019 +0200 hidclass.sys: Treat all one-bit fields as buttons. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 279d8dd..4686b71 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -707,7 +707,7 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature WINE_HID_ELEMENT *wine_element = &wine_report->Elements[wine_report->elementCount]; wine_element->valueStartBit = *bitOffset; - if (feature->caps.UsagePage == HID_USAGE_PAGE_BUTTON) + if (feature->caps.BitSize == 1) { wine_element->ElementType = ButtonElement; wine_element->caps.button.UsagePage = feature->caps.UsagePage; @@ -809,7 +809,7 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature static void count_elements(struct feature* feature, USHORT *buttons, USHORT *values) { - if (feature->caps.UsagePage == HID_USAGE_PAGE_BUTTON) + if (feature->caps.BitSize == 1) { if (feature->caps.IsRange) *buttons = *buttons + 1;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2019