wine-commits June 2024

wine-commits@winehq.org

1 participants
613 discussions

Rémi Bernon : winemac: Remove unused macdrv_get_surface_display_image copy_data parameter.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: 446c8ff670547343f686a52382ea2ed01b43d4d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/446c8ff670547343f686a52382ea2e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 30 13:28:41 2024 +0200 winemac: Remove unused macdrv_get_surface_display_image copy_data parameter. --- dlls/winemac.drv/cocoa_window.m | 2 +- dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/surface.c | 12 ++---------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index f4a6dce89b6..e370ea81334 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -532,7 +532,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi imageRect.origin.y *= layer.contentsScale; imageRect.size.width *= layer.contentsScale; imageRect.size.height *= layer.contentsScale; - image = macdrv_get_surface_display_image(window.surface, &imageRect, FALSE, window.colorKeyed, + image = macdrv_get_surface_display_image(window.surface, &imageRect, window.colorKeyed, window.colorKeyRed, window.colorKeyGreen, window.colorKeyBlue); if (image) diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index ba5803f88dc..bdc7d9980e1 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -553,7 +553,7 @@ extern void macdrv_set_cocoa_window_frame(macdrv_window w, const CGRect* new_fra extern void macdrv_get_cocoa_window_frame(macdrv_window w, CGRect* out_frame); extern void macdrv_set_cocoa_parent_window(macdrv_window w, macdrv_window parent); extern void macdrv_set_window_surface(macdrv_window w, struct window_surface *window_surface); -extern CGImageRef macdrv_get_surface_display_image(struct window_surface *window_surface, CGRect *rect, int copy_data, int color_keyed, +extern CGImageRef macdrv_get_surface_display_image(struct window_surface *window_surface, CGRect *rect, int color_keyed, CGFloat key_red, CGFloat key_green, CGFloat key_blue); extern void macdrv_window_needs_display(macdrv_window w, CGRect rect); extern void macdrv_set_window_shape(macdrv_window w, const CGRect *rects, int count); diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index bd40a2a2db2..d70a8d993bb 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -191,7 +191,7 @@ void set_surface_use_alpha(struct window_surface *window_surface, BOOL use_alpha * must not use Win32 or Wine functions, including debug * logging. */ -CGImageRef macdrv_get_surface_display_image(struct window_surface *window_surface, CGRect *rect, int copy_data, int color_keyed, +CGImageRef macdrv_get_surface_display_image(struct window_surface *window_surface, CGRect *rect, int color_keyed, CGFloat key_red, CGFloat key_green, CGFloat key_blue) { CGImageRef cgimage = NULL; @@ -220,15 +220,7 @@ CGImageRef macdrv_get_surface_display_image(struct window_surface *window_surfac offset = CGRectGetMinX(visrect) * 4 + CGRectGetMinY(visrect) * bytes_per_row; size = min(CGRectGetHeight(visrect) * bytes_per_row, surface->info.bmiHeader.biSizeImage - offset); - - if (copy_data) - { - CFDataRef data = CFDataCreate(NULL, (UInt8 *)window_surface->color_bits + offset, size); - provider = CGDataProviderCreateWithCFData(data); - CFRelease(data); - } - else - provider = CGDataProviderCreateWithData(NULL, (UInt8 *)window_surface->color_bits + offset, size, NULL); + provider = CGDataProviderCreateWithData(NULL, (UInt8 *)window_surface->color_bits + offset, size, NULL); alphaInfo = surface->use_alpha ? kCGImageAlphaPremultipliedFirst : kCGImageAlphaNoneSkipFirst; cgimage = CGImageCreate(CGRectGetWidth(visrect), CGRectGetHeight(visrect),

1 0

Ilia Docin : sane.ds: Improve color mode and paper source detection.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: 9cf95e76ef7a89f4d93506ad561f3a9629b4b62b URL: https://gitlab.winehq.org/wine/wine/-/commit/9cf95e76ef7a89f4d93506ad561f3a… Author: Ilia Docin <ilya.docin(a)contentai.ru> Date: Fri Jun 21 21:23:45 2024 +0300 sane.ds: Improve color mode and paper source detection. --- dlls/sane.ds/capability.c | 154 ++++++++++++++++++++++++++++++---------------- dlls/sane.ds/options.c | 39 +++++++----- dlls/sane.ds/sane_i.h | 2 +- 3 files changed, 126 insertions(+), 69 deletions(-)

1 0

Vijay Kiran Kamuju : wevtapi: Add stub EvtCreateRenderContext().
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: 49457ccf213fe36550ecf60437c2ec270722fc1d URL: https://gitlab.winehq.org/wine/wine/-/commit/49457ccf213fe36550ecf60437c2ec… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Apr 19 22:41:07 2024 +0200 wevtapi: Add stub EvtCreateRenderContext(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52879 --- dlls/wevtapi/main.c | 7 +++++++ dlls/wevtapi/wevtapi.spec | 2 +- include/winevt.h | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index fa860e2a54f..8222a958e9e 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -148,3 +148,10 @@ EVT_HANDLE WINAPI EvtCreateBookmark(const WCHAR *bookmark_xml) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return NULL; } + +EVT_HANDLE WINAPI EvtCreateRenderContext(DWORD pathcount, const WCHAR **paths, DWORD flags) +{ + FIXME("(%lu %p %#lx) stub!\n", pathcount, paths, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index 16c06685257..c7bf94b451a 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -3,7 +3,7 @@ @ stub EvtClearLog @ stdcall EvtClose(ptr) @ stdcall EvtCreateBookmark(wstr) -@ stub EvtCreateRenderContext +@ stdcall EvtCreateRenderContext(long ptr long) @ stdcall EvtExportLog(ptr wstr wstr wstr long) @ stub EvtFormatMessage @ stdcall EvtGetChannelConfigProperty(ptr long long long ptr ptr) diff --git a/include/winevt.h b/include/winevt.h index 4f0e7d52a0e..25bd4efc20c 100644 --- a/include/winevt.h +++ b/include/winevt.h @@ -144,6 +144,8 @@ typedef struct _EVT_VARIANT { typedef DWORD (WINAPI *EVT_SUBSCRIBE_CALLBACK)(EVT_SUBSCRIBE_NOTIFY_ACTION Action, PVOID UserContext, EVT_HANDLE Event); +EVT_HANDLE WINAPI EvtCreateBookmark(LPCWSTR); +EVT_HANDLE WINAPI EvtCreateRenderContext(DWORD,LPCWSTR*,DWORD); BOOL WINAPI EvtClose(EVT_HANDLE); BOOL WINAPI EvtExportLog(EVT_HANDLE session, const WCHAR *path, const WCHAR *query, const WCHAR *file, DWORD flags); @@ -159,7 +161,7 @@ EVT_HANDLE WINAPI EvtSubscribe(EVT_HANDLE Session, HANDLE SignalEvent, LPCWSTR C LPCWSTR Query, EVT_HANDLE Bookmark, PVOID context, EVT_SUBSCRIBE_CALLBACK Callback, DWORD Flags); EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, DWORD Flags); -BOOL WINAPI EvtSaveChannelConfig(EVT_HANDLE, DWORD); +BOOL WINAPI EvtSaveChannelConfig(EVT_HANDLE,DWORD); #ifdef __cplusplus } /* extern "C" */

1 0

Marc-Aurel Zent : winemac.drv: Give dead keys a friendly name in GetKeyNameText.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: d09e423e618e36223c189f80f31a43f5ee037ca9 URL: https://gitlab.winehq.org/wine/wine/-/commit/d09e423e618e36223c189f80f31a43… Author: Marc-Aurel Zent <mzent(a)codeweavers.com> Date: Sat Mar 9 07:49:30 2024 +0100 winemac.drv: Give dead keys a friendly name in GetKeyNameText. --- dlls/winemac.drv/keyboard.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index db97582df25..0431cc22150 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -398,6 +398,27 @@ static const struct { { VK_VOLUME_UP | 0x100, "Volume Up" }, }; + +static const struct { + WCHAR wchar; + const char *name; +} dead_key_names[] = { + { '^', "CIRCUMFLEX ACCENT" }, + { '`', "GRAVE ACCENT" }, + { 0x00B4, "ACUTE ACCENT" }, + { '~', "TILDE" }, + { 0x00A8, "DIAERESIS" }, + { 0x00B8, "CEDILLA" }, + { 0x02D8, "BREVE" }, + { 0x02D9, "DOT ABOVE" }, + { 0x00AF, "MACRON" }, + { 0x02DA, "RING ABOVE" }, + { 0x02DB, "OGONEK" }, + { 0x02DC, "SMALL TILDE" }, + { 0x02DD, "DOUBLE ACUTE ACCENT" }, +}; + + static Boolean char_matches_string(WCHAR wchar, UniChar *string, CollatorRef collatorRef) { Boolean equivalent; @@ -1386,6 +1407,20 @@ INT macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) if (!len) break; + if (status == noErr && deadKeyState) + { + for (i = 0; i < ARRAY_SIZE(dead_key_names); i++) + { + if (dead_key_names[i].wchar == buffer[0]) + { + len = min(strlen(dead_key_names[i].name) + 1, size); + ascii_to_unicode(buffer, dead_key_names[i].name, len); + if (len) buffer[--len] = 0; + break; + } + } + } + if (status == noErr && len == 1 && buffer[0] >= 'a' && buffer[0] <= 'z') buffer[0] += 'A' - 'a';

1 0

Marc-Aurel Zent : winemac.drv: Add additional German symbol vkeys.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: 2d319acccdb826ab776cc39cb4c6f78f543df49a URL: https://gitlab.winehq.org/wine/wine/-/commit/2d319acccdb826ab776cc39cb4c6f7… Author: Marc-Aurel Zent <mzent(a)codeweavers.com> Date: Sat Mar 9 05:26:08 2024 +0100 winemac.drv: Add additional German symbol vkeys. --- dlls/winemac.drv/keyboard.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index d1092f0a381..db97582df25 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -689,6 +689,10 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) { '`', VK_OEM_3 }, { '[', VK_OEM_4 }, { '~', VK_OEM_3 }, + { 0x00DF, VK_OEM_4 }, /* 0x00DF is ESZETT */ + { 0x00FC, VK_OEM_1 }, /* 0x00FC is German U Umlaut */ + { 0x00F6, VK_OEM_3 }, /* 0x00F6 is German O Umlaut */ + { 0x00E4, VK_OEM_7 }, /* 0x00B4 is German A Umlaut */ { '?', VK_OEM_2 }, { ']', VK_OEM_6 }, { '/', VK_OEM_2 }, @@ -711,6 +715,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) { '^', VK_OEM_6 }, { '*', VK_OEM_2 }, { '{', VK_OEM_6 }, + { 0x00B4, VK_OEM_6 }, { '~', VK_OEM_1 }, { '?', VK_OEM_PLUS }, { '?', VK_OEM_4 }, @@ -720,6 +725,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) { ']', VK_OEM_4 }, { '\'', VK_OEM_3 }, { 0x00A7, VK_OEM_7 }, + { '<', VK_OEM_102 }, }; int i;

1 0

Marc-Aurel Zent : winemac.drv: Resolve symbol vkeys first without modifiers.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: c579dcc471f90d43268b9cf55c4b7e65acbb6819 URL: https://gitlab.winehq.org/wine/wine/-/commit/c579dcc471f90d43268b9cf55c4b7e… Author: Marc-Aurel Zent <mzent(a)codeweavers.com> Date: Sat Mar 9 05:24:48 2024 +0100 winemac.drv: Resolve symbol vkeys first without modifiers. --- dlls/winemac.drv/keyboard.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index a86ec910fb1..d1092f0a381 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -874,15 +874,15 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) /* Now try to match key codes for certain common punctuation characters to the most common OEM vkeys (e.g. '.' to VK_OEM_PERIOD). */ - for (i = 0; i < ARRAY_SIZE(symbol_vkeys); i++) + for (combo = 0; combo < ARRAY_SIZE(modifier_combos); combo++) { - vkey = symbol_vkeys[i].vkey; + for (i = 0; i < ARRAY_SIZE(symbol_vkeys); i++) + { + vkey = symbol_vkeys[i].vkey; - if (vkey_used[vkey]) - continue; + if (vkey_used[vkey]) + continue; - for (combo = 0; combo < ARRAY_SIZE(modifier_combos); combo++) - { for (keyc = 0; keyc < ARRAY_SIZE(map); keyc++) { if (!thread_data->keyc2scan[keyc]) continue; /* not a known Mac key code */ @@ -898,9 +898,6 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) break; } } - - if (vkey_used[vkey]) - break; } }

1 0

Marc-Aurel Zent : winemac.drv: Use UCCompareText in char_matches_string.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: c9d9ff6129c584a482cc7fe693799b5ba54b3975 URL: https://gitlab.winehq.org/wine/wine/-/commit/c9d9ff6129c584a482cc7fe693799b… Author: Marc-Aurel Zent <mzent(a)codeweavers.com> Date: Fri Mar 15 09:02:48 2024 +0100 winemac.drv: Use UCCompareText in char_matches_string. --- dlls/winemac.drv/keyboard.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 5d911217a57..a86ec910fb1 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -398,18 +398,18 @@ static const struct { { VK_VOLUME_UP | 0x100, "Volume Up" }, }; -static BOOL char_matches_string(WCHAR wchar, UniChar *string, BOOL ignore_diacritics) +static Boolean char_matches_string(WCHAR wchar, UniChar *string, CollatorRef collatorRef) { - BOOL ret; - CFStringRef s1 = CFStringCreateWithCharactersNoCopy(NULL, (UniChar*)&wchar, 1, kCFAllocatorNull); - CFStringRef s2 = CFStringCreateWithCharactersNoCopy(NULL, string, wcslen(string), kCFAllocatorNull); - CFStringCompareFlags flags = kCFCompareCaseInsensitive | kCFCompareNonliteral | kCFCompareWidthInsensitive; - if (ignore_diacritics) - flags |= kCFCompareDiacriticInsensitive; - ret = (CFStringCompare(s1, s2, flags) == kCFCompareEqualTo); - CFRelease(s1); - CFRelease(s2); - return ret; + Boolean equivalent; + OSStatus status; + + status = UCCompareText(collatorRef, (UniChar*)&wchar, 1, string, wcslen(string), &equivalent, NULL); + if (status != noErr) + { + WARN("Failed to compare %s to %s\n", debugstr_wn(&wchar, 1), debugstr_w(string)); + return FALSE; + } + return equivalent; } @@ -657,6 +657,9 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) int keyc; WCHAR vkey; const UCKeyboardLayout *uchr; + LocaleRef localeRef; + CollatorRef collatorRef, caseInsensitiveCollatorRef, diacriticInsensitiveCollatorRef; + UCCollateOptions collateOptions = 0; const UInt32 modifier_combos[] = { 0, shiftKey >> 8, @@ -778,6 +781,13 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) uchr = (const UCKeyboardLayout*)CFDataGetBytePtr(thread_data->keyboard_layout_uchr); + LocaleRefFromLocaleString("POSIX", &localeRef); + UCCreateCollator(localeRef, 0, collateOptions, &collatorRef); + collateOptions |= kUCCollateComposeInsensitiveMask | kUCCollateWidthInsensitiveMask | kUCCollateCaseInsensitiveMask; + UCCreateCollator(localeRef, 0, collateOptions, &caseInsensitiveCollatorRef); + collateOptions |= kUCCollateDiacritInsensitiveMask; + UCCreateCollator(localeRef, 0, collateOptions, &diacriticInsensitiveCollatorRef); + /* Using the keyboard layout, build a map of key code + modifiers -> characters. */ memset(map, 0, sizeof(map)); for (keyc = 0; keyc < ARRAY_SIZE(map); keyc++) @@ -824,7 +834,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) if (thread_data->keyc2vkey[keyc] || !map[keyc][combo][0]) continue; - if (char_matches_string(vkey, map[keyc][combo], ignore_diacritics)) + if (char_matches_string(vkey, map[keyc][combo], ignore_diacritics ? diacriticInsensitiveCollatorRef : caseInsensitiveCollatorRef)) { thread_data->keyc2vkey[keyc] = vkey; vkey_used[vkey] = 1; @@ -850,7 +860,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) if (thread_data->keyc2vkey[keyc] || !map[keyc][combo][0]) continue; - if (char_matches_string(vkey, map[keyc][combo], FALSE)) + if (char_matches_string(vkey, map[keyc][combo], collatorRef)) { thread_data->keyc2vkey[keyc] = vkey; vkey_used[vkey] = 1; @@ -879,7 +889,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) if (thread_data->keyc2vkey[keyc] || !map[keyc][combo][0]) continue; - if (char_matches_string(symbol_vkeys[i].wchar, map[keyc][combo], FALSE)) + if (char_matches_string(symbol_vkeys[i].wchar, map[keyc][combo], collatorRef)) { thread_data->keyc2vkey[keyc] = vkey; vkey_used[vkey] = 1; @@ -982,6 +992,10 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) vkey_used[vkey] = 1; TRACE("keyc 0x%04x -> vkey 0x%04x (spare vkey)\n", keyc, vkey); } + + UCDisposeCollator(&collatorRef); + UCDisposeCollator(&caseInsensitiveCollatorRef); + UCDisposeCollator(&diacriticInsensitiveCollatorRef); }

1 0

Marc-Aurel Zent : winemac.drv: Uppercase single keys in GetKeyNameText.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: 5a97ad97dc58edcec0a3f21ca7359b26ed6a3ce0 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a97ad97dc58edcec0a3f21ca7359b… Author: Marc-Aurel Zent <mzent(a)codeweavers.com> Date: Fri Mar 15 08:56:18 2024 +0100 winemac.drv: Uppercase single keys in GetKeyNameText. --- 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 281085ca979..5d911217a57 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1369,6 +1369,9 @@ INT macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) if (!len) break; + if (status == noErr && len == 1 && buffer[0] >= 'a' && buffer[0] <= 'z') + buffer[0] += 'A' - 'a'; + TRACE("lparam 0x%08x -> %s\n", (unsigned int)lparam, debugstr_w(buffer)); return len; }

1 0

Marc-Aurel Zent : winemac.drv: Do not append " dead" to dead keycodes in GetKeyNameText.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: 7a3e09640ba4389833f62107eb8819ba55cf4b8a URL: https://gitlab.winehq.org/wine/wine/-/commit/7a3e09640ba4389833f62107eb8819… Author: Marc-Aurel Zent <mzent(a)codeweavers.com> Date: Fri Mar 15 08:55:16 2024 +0100 winemac.drv: Do not append " dead" to dead keycodes in GetKeyNameText. --- dlls/winemac.drv/keyboard.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 7f8148bdf24..281085ca979 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1310,7 +1310,6 @@ INT macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) { if (thread_data->keyc2scan[keyc] == scan) { - static const WCHAR dead[] = {' ','d','e','a','d',0}; const UCKeyboardLayout *uchr; UInt32 deadKeyState = 0; UniCharCount len; @@ -1370,12 +1369,6 @@ INT macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) if (!len) break; - if (status == noErr && deadKeyState) - { - lstrcpynW(buffer + len, dead, size - len); - len = wcslen(buffer); - } - TRACE("lparam 0x%08x -> %s\n", (unsigned int)lparam, debugstr_w(buffer)); return len; }

1 0

Marc-Aurel Zent : winemac.drv: Handle length of dead keycodes in ToUnicodeEx correctly.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: 3b40b49c915ffdba00eda4e82d3ab5fea24230b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b40b49c915ffdba00eda4e82d3ab5… Author: Marc-Aurel Zent <mzent(a)codeweavers.com> Date: Fri Mar 8 22:06:37 2024 +0100 winemac.drv: Handle length of dead keycodes in ToUnicodeEx correctly. --- dlls/winemac.drv/keyboard.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 474ca499961..7f8148bdf24 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1622,7 +1622,7 @@ INT macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, UInt32 modifierKeyState; OptionBits options; UInt32 deadKeyState, savedDeadKeyState; - UniCharCount len; + UniCharCount len = 0; BOOL dead = FALSE; TRACE_(key)("virtKey 0x%04x scanCode 0x%04x lpKeyState %p bufW %p bufW_size %d flags 0x%08x hkl %p\n", @@ -1758,7 +1758,7 @@ INT macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, &savedDeadKeyState, bufW_size, &len, bufW); if (status != noErr) { - ERR_(key)("Couldn't translate keycode 0x%04x, status %d\n", keyc, status); + ERR_(key)("Couldn't translate dead keycode 0x%04x, status %d\n", keyc, status); goto done; } @@ -1768,8 +1768,7 @@ INT macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, if (len > 0) len = strip_apple_private_chars(bufW, len); - if (dead && len > 0) ret = -1; - else ret = len; + ret = dead ? -len : len; /* Control-Return produces line feed instead of carriage return. */ if (ret > 0 && (lpKeyState[VK_CONTROL] & 0x80) && virtKey == VK_RETURN) @@ -1783,10 +1782,10 @@ INT macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, done: /* Null-terminate the buffer, if there's room. MSDN clearly states that the caller must not assume this is done, but some programs (e.g. Audiosurf) do. */ - if (1 <= ret && ret < bufW_size) - bufW[ret] = 0; + if (len < bufW_size) + bufW[len] = 0; - TRACE_(key)("returning %d / %s\n", ret, debugstr_wn(bufW, abs(ret))); + TRACE_(key)("returning %d / %s\n", ret, debugstr_wn(bufW, len)); return ret; }

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
62
Older →

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 June 2024