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

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

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

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

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

Alexandre Julliard : cmd: Explicitly mark qsort() callback funtions cdecl.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 7f0272a59ab0780086051e6396949fe784503837 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f0272a59ab0780086051e63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 6 03:40:25 2019 -0500 cmd: Explicitly mark qsort() callback funtions cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- programs/cmd/directory.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5fc1921..62ae19a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3562,7 +3562,7 @@ void WCMD_setshow_date (void) { * Note: Native displays 'fred' before 'fred ', so need to only compare up to * the equals sign. */ -static int WCMD_compare( const void *a, const void *b ) +static int __cdecl WCMD_compare( const void *a, const void *b ) { int r; const WCHAR * const *str_a = a, * const *str_b = b; diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 02ea487..c38bdfc 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -101,7 +101,7 @@ static WCHAR * WCMD_filesize64 (ULONGLONG n) { * * Sort based on the /O options supplied on the command line */ -static int WCMD_dir_sort (const void *a, const void *b) +static int __cdecl WCMD_dir_sort (const void *a, const void *b) { const WIN32_FIND_DATAW *filea = (const WIN32_FIND_DATAW *)a; const WIN32_FIND_DATAW *fileb = (const WIN32_FIND_DATAW *)b;

1 0

Alexandre Julliard : services: Explicitly mark a qsort() callback funtion cdecl.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 4b69b6710a806a8234788b3c97a90a3104fbe27b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b69b6710a806a8234788b3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 6 03:40:48 2019 -0500 services: Explicitly mark a qsort() callback funtion cdecl. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47122 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/services/services.c b/programs/services/services.c index 971be4d..0634c83 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -322,7 +322,7 @@ static void scmdatabase_remove_service(struct scmdatabase *db, struct service_en service->entry.next = service->entry.prev = NULL; } -static int compare_tags(const void *a, const void *b) +static int __cdecl compare_tags(const void *a, const void *b) { struct service_entry *service_a = *(struct service_entry **)a; struct service_entry *service_b = *(struct service_entry **)b;

1 0

Alexandre Julliard : uninstaller: Explicitly mark a qsort() callback funtion cdecl.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 89cbab5d518fda590a5fb45a1bbd300b0bcb4c69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89cbab5d518fda590a5fb45a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 6 03:40:58 2019 -0500 uninstaller: Explicitly mark a qsort() callback funtion cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/uninstaller/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index fa9a23c..5e48306 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -46,7 +46,6 @@ static WCHAR *sFilter; static int FetchUninstallInformation(void); static void UninstallProgram(void); -static int cmp_by_name(const void *a, const void *b); static const WCHAR DisplayNameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; static const WCHAR PathUninstallW[] = { @@ -233,7 +232,7 @@ int wmain(int argc, WCHAR *argv[]) /** * Used to sort entries by name. */ -static int cmp_by_name(const void *a, const void *b) +static int __cdecl cmp_by_name(const void *a, const void *b) { return lstrcmpiW(((const uninst_entry *)a)->descr, ((const uninst_entry *)b)->descr); }

1 0

Alexandre Julliard : winefile: Explicitly mark qsort() callback funtions cdecl.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 50af5c83371703016f759abfdc0dc654ae888b84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50af5c83371703016f759abf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 6 03:41:07 2019 -0500 winefile: Explicitly mark qsort() callback funtions cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winefile/winefile.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index d69cbcb..fa78237 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -855,7 +855,7 @@ static int compareType(const WIN32_FIND_DATAW* fd1, const WIN32_FIND_DATAW* fd2) } -static int compareName(const void* arg1, const void* arg2) +static int __cdecl compareName(const void* arg1, const void* arg2) { const WIN32_FIND_DATAW* fd1 = &(*(const Entry* const*)arg1)->data; const WIN32_FIND_DATAW* fd2 = &(*(const Entry* const*)arg2)->data; @@ -867,7 +867,7 @@ static int compareName(const void* arg1, const void* arg2) return lstrcmpiW(fd1->cFileName, fd2->cFileName); } -static int compareExt(const void* arg1, const void* arg2) +static int __cdecl compareExt(const void* arg1, const void* arg2) { const WIN32_FIND_DATAW* fd1 = &(*(const Entry* const*)arg1)->data; const WIN32_FIND_DATAW* fd2 = &(*(const Entry* const*)arg2)->data; @@ -900,7 +900,7 @@ static int compareExt(const void* arg1, const void* arg2) return lstrcmpiW(name1, name2); } -static int compareSize(const void* arg1, const void* arg2) +static int __cdecl compareSize(const void* arg1, const void* arg2) { const WIN32_FIND_DATAW* fd1 = &(*(const Entry* const*)arg1)->data; const WIN32_FIND_DATAW* fd2 = &(*(const Entry* const*)arg2)->data; @@ -921,7 +921,7 @@ static int compareSize(const void* arg1, const void* arg2) return cmp<0? -1: cmp>0? 1: 0; } -static int compareDate(const void* arg1, const void* arg2) +static int __cdecl compareDate(const void* arg1, const void* arg2) { const WIN32_FIND_DATAW* fd1 = &(*(const Entry* const*)arg1)->data; const WIN32_FIND_DATAW* fd2 = &(*(const Entry* const*)arg2)->data; @@ -934,7 +934,7 @@ static int compareDate(const void* arg1, const void* arg2) } -static int (*sortFunctions[])(const void* arg1, const void* arg2) = { +static int (CDECL *sortFunctions[])(const void* arg1, const void* arg2) = { compareName, /* SORT_NAME */ compareExt, /* SORT_EXT */ compareSize, /* SORT_SIZE */

1 0

Alexandre Julliard : winhttp/tests: Get a test file from the WineHQ tests subdirectory.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 4cc3ef939143118b226b4a2e9193776e3e2119d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cc3ef939143118b226b4a2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 6 03:41:14 2019 -0500 winhttp/tests: Get a test file from the WineHQ tests subdirectory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 3a28acf..dfd3c4d 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -4637,7 +4637,7 @@ static void test_WinHttpGetProxyForUrl(void) static void test_chunked_read(void) { - static const WCHAR verb[] = {'/','t','e','s','t','c','h','u','n','k','e','d',0}; + static const WCHAR verb[] = {'/','t','e','s','t','s','/','c','h','u','n','k','e','d',0}; static const WCHAR chunked[] = {'c','h','u','n','k','e','d',0}; WCHAR header[32]; DWORD len, err;

1 0

Vijay Kiran Kamuju : wpcap: Fix compile warnings for redefinition of PCAP_OPENFLAG_PROMISCUOUS.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 660399b8fd905a208f192781723f7fe881b132fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=660399b8fd905a208f192781… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri May 3 18:49:48 2019 +0200 wpcap: Fix compile warnings for redefinition of PCAP_OPENFLAG_PROMISCUOUS. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index f163235..6450a0e 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -254,7 +254,9 @@ int CDECL wine_pcap_next_ex(pcap_t *p, struct pcap_pkthdr **pkt_header, const un return pcap_next_ex(p, pkt_header, pkt_data); } +#ifndef PCAP_OPENFLAG_PROMISCUOUS #define PCAP_OPENFLAG_PROMISCUOUS 1 +#endif pcap_t* CDECL wine_pcap_open(const char *source, int snaplen, int flags, int read_timeout, void *auth, char *errbuf)

1 0