June 2024 - Wine-commits - list.winehq.org

Alexandre Julliard : loader: Build relative paths at run-time instead of depending on makedep.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: 06fdcba7cf08dca73f7b273d1798c9cb19397506 URL: https://gitlab.winehq.org/wine/wine/-/commit/06fdcba7cf08dca73f7b273d1798c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 11:58:36 2024 +0200 loader: Build relative paths at run-time instead of depending on makedep. --- loader/Makefile.in | 2 +- loader/main.c | 46 +++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/loader/Makefile.in b/loader/Makefile.in index 5a9fdabfd97..191ab81e1d2 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -16,7 +16,7 @@ UNIX_CFLAGS = -fPIE preloader_EXTRADEFS = -fno-builtin -main_EXTRADEFS = -DDLLDIR=\"${libdir}/wine\" -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${libdir}/wine`\" +main_EXTRADEFS = -DBINDIR=\"${bindir}\" -DLIBDIR=\"${libdir}\" wine_OBJS = main.o wine_DEPS = $(WINELOADER_DEPENDS) diff --git a/loader/main.c b/loader/main.c index b241dbb454d..e5de4750015 100644 --- a/loader/main.c +++ b/loader/main.c @@ -125,6 +125,43 @@ static char *build_path( const char *dir, const char *name ) return ret; } +/* build a path with the relative dir from 'from' to 'dest' appended to base */ +static char *build_relative_path( const char *base, const char *from, const char *dest ) +{ + const char *start; + char *ret; + unsigned int dotdots = 0; + + for (;;) + { + while (*from == '/') from++; + while (*dest == '/') dest++; + start = dest; /* save start of next path element */ + if (!*from) break; + + while (*from && *from != '/' && *from == *dest) { from++; dest++; } + if ((!*from || *from == '/') && (!*dest || *dest == '/')) continue; + + do /* count remaining elements in 'from' */ + { + dotdots++; + while (*from && *from != '/') from++; + while (*from == '/') from++; + } + while (*from); + break; + } + + ret = malloc( strlen(base) + 3 * dotdots + strlen(start) + 2 ); + strcpy( ret, base ); + while (dotdots--) strcat( ret, "/.." ); + + if (!start[0]) return ret; + strcat( ret, "/" ); + strcat( ret, start ); + return ret; +} + static const char *get_self_exe( char *argv0 ) { #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) @@ -187,11 +224,10 @@ static void *load_ntdll( char *argv0 ) if (self && ((path = realpath_dirname( self )))) { if ((p = remove_tail( path, "/loader" ))) - { handle = try_dlopen( p, "dlls/ntdll/ntdll.so" ); - free( p ); - } - else handle = try_dlopen( path, BIN_TO_DLLDIR "/" SO_DIR "ntdll.so" ); + else if ((p = build_relative_path( path, BINDIR, LIBDIR ))) + handle = try_dlopen( p, "wine/" SO_DIR "ntdll.so" ); + free( p ); free( path ); } @@ -207,7 +243,7 @@ static void *load_ntdll( char *argv0 ) free( path ); } - if (!handle && !self) handle = try_dlopen( DLLDIR, SO_DIR "ntdll.so" ); + if (!handle && !self) handle = try_dlopen( LIBDIR, "wine/" SO_DIR "ntdll.so" ); return handle; }

1 0

Alexandre Julliard : server: Build relative paths at run-time instead of depending on makedep.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: fcc5629f7e6ec5b180ab8dba5f7f63a1e3a6a278 URL: https://gitlab.winehq.org/wine/wine/-/commit/fcc5629f7e6ec5b180ab8dba5f7f63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 11:58:44 2024 +0200 server: Build relative paths at run-time instead of depending on makedep. --- server/Makefile.in | 2 +- server/unicode.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/server/Makefile.in b/server/Makefile.in index 8ba6baf0c30..7e571ac2ba6 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -49,4 +49,4 @@ SOURCES = \ UNIX_LIBS = $(LDEXECFLAGS) $(RT_LIBS) $(INOTIFY_LIBS) $(PROCSTAT_LIBS) -unicode_EXTRADEFS = -DNLSDIR="\"${datadir}/wine/nls\"" -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine/nls`\" +unicode_EXTRADEFS = -DBINDIR="\"${bindir}\"" -DDATADIR="\"${datadir}\"" diff --git a/server/unicode.c b/server/unicode.c index cae9df7da65..b4864310f83 100644 --- a/server/unicode.c +++ b/server/unicode.c @@ -235,10 +235,46 @@ int dump_strW( const WCHAR *str, data_size_t len, FILE *f, const char escape[2] return count; } +/* build a path with the relative dir from 'from' to 'dest' appended to base */ +static char *build_relative_path( const char *base, const char *from, const char *dest ) +{ + const char *start; + char *ret; + unsigned int dotdots = 0; + + for (;;) + { + while (*from == '/') from++; + while (*dest == '/') dest++; + start = dest; /* save start of next path element */ + if (!*from) break; + + while (*from && *from != '/' && *from == *dest) { from++; dest++; } + if ((!*from || *from == '/') && (!*dest || *dest == '/')) continue; + + do /* count remaining elements in 'from' */ + { + dotdots++; + while (*from && *from != '/') from++; + while (*from == '/') from++; + } + while (*from); + break; + } + + ret = malloc( strlen(base) + 3 * dotdots + strlen(start) + 2 ); + strcpy( ret, base ); + while (dotdots--) strcat( ret, "/.." ); + + if (!start[0]) return ret; + strcat( ret, "/" ); + strcat( ret, start ); + return ret; +} + static char *get_nls_dir(void) { char *p, *dir, *ret; - const char *nlsdir = BIN_TO_NLSDIR; #if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) dir = realpath( "/proc/self/exe", NULL ); @@ -264,8 +300,12 @@ static char *get_nls_dir(void) return NULL; } *(++p) = 0; - if (p > dir + 8 && !strcmp( p - 8, "/server/" )) nlsdir = "../nls"; /* inside build tree */ - asprintf( &ret, "%s%s", dir, nlsdir ); + if (p > dir + 8 && !strcmp( p - 8, "/server/" )) /* inside build tree */ + { + strcpy( p - 8, "/nls" ); + return dir; + } + ret = build_relative_path( dir, BINDIR, DATADIR "/wine/nls" ); free( dir ); return ret; } @@ -273,7 +313,7 @@ static char *get_nls_dir(void) /* load the case mapping table */ struct fd *load_intl_file(void) { - static const char *nls_dirs[] = { NULL, NLSDIR, "/usr/local/share/wine/nls", "/usr/share/wine/nls" }; + static const char *nls_dirs[] = { NULL, DATADIR "/wine/nls", "/usr/local/share/wine/nls", "/usr/share/wine/nls" }; static const WCHAR nt_pathW[] = {'C',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','t','e','m','3','2','\\','l','_','i','n','t','l','.','n','l','s',0}; static const struct unicode_str nt_name = { nt_pathW, sizeof(nt_pathW) };

1 0

Alexandre Julliard : makefiles: No longer ignore makedep.c.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: d9b364f6f53bd253ec802ce2dd6f585649b482b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/d9b364f6f53bd253ec802ce2dd6f58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 17:37:00 2024 +0200 makefiles: No longer ignore makedep.c. --- tools/Makefile.in | 2 +- tools/make_makefiles | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/Makefile.in b/tools/Makefile.in index 71bd896b8a0..453d41e06e1 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -3,8 +3,8 @@ PROGRAMS = \ make_xftmpl SOURCES = \ - makedep.c \ make_xftmpl.c \ + makedep.c \ wineapploader.in makedep_OBJS = makedep.o diff --git a/tools/make_makefiles b/tools/make_makefiles index f3f9329fe63..646a70d18f4 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -41,7 +41,6 @@ my %modules16 = my %ignored_source_files = ( "dlls/wineps.drv/afm2c.c" => 1, "dlls/wineps.drv/mkagl.c" => 1, - "tools/makedep.c" => 1, ); my (@makefiles, %makefiles);

1 0

Elizabeth Figura : widl: Do not allow "lu" as an integer suffix.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: 992cafc9edf53749db78b319100d201966249aae URL: https://gitlab.winehq.org/wine/wine/-/commit/992cafc9edf53749db78b319100d20… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Jun 21 16:37:11 2024 -0500 widl: Do not allow "lu" as an integer suffix. MIDL does not. --- tools/widl/parser.l | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 7a1ae18abdc..75cdae22550 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -431,8 +431,8 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; [a-zA-Z_][0-9a-zA-Z_]* { return token_ident( yytext, yylval ); } - 0[xX]{hd}+([lL][uU]?|[uU][lL]?)? { return token_num( aHEXNUM, yytext, yylval ); } - [0-9]+([lL][uU]?|[uU][lL]?)? { return token_num( aNUM, yytext, yylval ); } + 0[xX]{hd}+[uU]?[lL]? { return token_num( aHEXNUM, yytext, yylval ); } + [0-9]+[uU]?[lL]? { return token_num( aNUM, yytext, yylval ); } L\"(\\.|[^"\\])*\" { return token_str( aWSTRING, yytext + 1, yylval ); } \"(\\.|[^"\\])*\" { return token_str( aSTRING, yytext, yylval ); }

1 0

Elizabeth Figura : widl: Store the hexadecimal flag inside of the expr_t union.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: 22929dd8af7bbe9cf4f5f6c75adf2d2e511f3184 URL: https://gitlab.winehq.org/wine/wine/-/commit/22929dd8af7bbe9cf4f5f6c75adf2d… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Jun 21 18:28:36 2024 -0500 widl: Store the hexadecimal flag inside of the expr_t union. --- tools/widl/expr.c | 35 +++++++++++++------------------ tools/widl/expr.h | 2 +- tools/widl/header.c | 4 ++-- tools/widl/parser.y | 56 ++++++++++++++++++++++++++++++------------------- tools/widl/widltypes.h | 9 ++++++-- tools/widl/write_msft.c | 7 +++---- tools/widl/write_sltg.c | 2 +- 7 files changed, 63 insertions(+), 52 deletions(-)

1 0

Elizabeth Figura : widl: Use struct integer for the aNUM and aHEXNUM tokens.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: e261f187ad143d5dda806da62aedd9691b2ecab3 URL: https://gitlab.winehq.org/wine/wine/-/commit/e261f187ad143d5dda806da62aedd9… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Jun 21 18:36:54 2024 -0500 widl: Use struct integer for the aNUM and aHEXNUM tokens. --- tools/widl/parser.l | 11 ++++++----- tools/widl/parser.y | 23 +++++++++++------------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 75cdae22550..1e7c543e8af 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -154,10 +154,11 @@ static int token_str( int token, const char *str, YYSTYPE *yylval ) return token; } -static int token_num( int token, const char *yytext, YYSTYPE *yylval ) +static int token_num( const char *yytext, YYSTYPE *yylval, int is_hex ) { - yylval->num = xstrtoul( yytext, NULL, 0 ); - return token; + yylval->integer.value = xstrtoul( yytext, NULL, 0 ); + yylval->integer.is_hex = is_hex; + return is_hex ? aHEXNUM : aNUM; } static int token_ident( const char *str, YYSTYPE *yylval ) @@ -431,8 +432,8 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; [a-zA-Z_][0-9a-zA-Z_]* { return token_ident( yytext, yylval ); } - 0[xX]{hd}+[uU]?[lL]? { return token_num( aHEXNUM, yytext, yylval ); } - [0-9]+[uU]?[lL]? { return token_num( aNUM, yytext, yylval ); } + 0[xX]{hd}+[uU]?[lL]? { return token_num( yytext, yylval, TRUE ); } + [0-9]+[uU]?[lL]? { return token_num( yytext, yylval, FALSE ); } L\"(\\.|[^"\\])*\" { return token_str( aWSTRING, yytext + 1, yylval ); } \"(\\.|[^"\\])*\" { return token_str( aSTRING, yytext, yylval ); } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 3d64587d526..062edfd2079 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -151,6 +151,7 @@ PARSER_LTYPE pop_import(void); char *str; struct uuid *uuid; unsigned int num; + struct integer integer; double dbl; typelib_t *typelib; struct _import_t *import; @@ -163,7 +164,7 @@ PARSER_LTYPE pop_import(void); %token <str> aIDENTIFIER aPRAGMA %token <str> aKNOWNTYPE -%token <num> aNUM aHEXNUM +%token <integer> aNUM aHEXNUM %token <dbl> aDOUBLE %token <str> aSTRING aWSTRING aSQSTRING %token <str> tCDECL @@ -494,8 +495,8 @@ pragma_warning: tPRAGMA_WARNING '(' aIDENTIFIER ':' warnings ')' ; warnings: - aNUM { $$ = append_warning(NULL, $1); } - | warnings aNUM { $$ = append_warning($1, $2); } + aNUM { $$ = append_warning(NULL, $1.value); } + | warnings aNUM { $$ = append_warning($1, $2.value); } ; typedecl: @@ -591,8 +592,8 @@ marshaling_behavior: ; contract_ver: - aNUM { $$ = MAKEVERSION(0, $1); } - | aNUM '.' aNUM { $$ = MAKEVERSION($3, $1); } + aNUM { $$ = MAKEVERSION(0, $1.value); } + | aNUM '.' aNUM { $$ = MAKEVERSION($3.value, $1.value); } ; contract_req @@ -844,10 +845,8 @@ m_expr | expr ; -expr: aNUM { struct integer integer = {.value = $1}; - $$ = make_exprl(EXPR_NUM, &integer); } - | aHEXNUM { struct integer integer = {.value = $1, .is_hex = TRUE}; - $$ = make_exprl(EXPR_NUM, &integer); } +expr: aNUM { $$ = make_exprl(EXPR_NUM, &$1); } + | aHEXNUM { $$ = make_exprl(EXPR_NUM, &$1); } | aDOUBLE { $$ = make_exprd(EXPR_DOUBLE, $1); } | tFALSE { struct integer integer = {.value = 0}; $$ = make_exprl(EXPR_TRUEFALSE, &integer); } @@ -1385,9 +1384,9 @@ uniondef: tUNION m_typename '{' ne_union_fields '}' ; version: - aNUM { $$ = MAKEVERSION($1, 0); } - | aNUM '.' aNUM { $$ = MAKEVERSION($1, $3); } - | aHEXNUM { $$ = $1; } + aNUM { $$ = MAKEVERSION($1.value, 0); } + | aNUM '.' aNUM { $$ = MAKEVERSION($1.value, $3.value); } + | aHEXNUM { $$ = $1.value; } ; acf_statements

1 0

Elizabeth Figura : widl: Respect u and l modifiers in expressions.
by Alexandre Julliard 25 Jun '24

25 Jun '24

Module: wine Branch: master Commit: 53c70aec87a9f7706175cd94399ef81a8e37fe25 URL: https://gitlab.winehq.org/wine/wine/-/commit/53c70aec87a9f7706175cd94399ef8… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Jun 21 19:20:38 2024 -0500 widl: Respect u and l modifiers in expressions. --- tools/widl/expr.c | 6 +++++- tools/widl/parser.l | 2 ++ tools/widl/widltypes.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/widl/expr.c b/tools/widl/expr.c index e51ed6c94c4..be818de2e83 100644 --- a/tools/widl/expr.c +++ b/tools/widl/expr.c @@ -512,7 +512,7 @@ static struct expression_type resolve_expression(const struct expr_loc *expr_loc case EXPR_NUM: case EXPR_TRUEFALSE: result.is_temporary = FALSE; - result.type = type_new_int(TYPE_BASIC_INT, 0); + result.type = type_new_int(e->u.integer.is_long ? TYPE_BASIC_LONG : TYPE_BASIC_INT, e->u.integer.is_unsigned); break; case EXPR_STRLIT: result.is_temporary = TRUE; @@ -690,6 +690,10 @@ void write_expr(FILE *h, const expr_t *e, int brackets, fprintf(h, "0x%x", e->u.integer.value); else fprintf(h, "%u", e->u.integer.value); + if (e->u.integer.is_unsigned) + fprintf(h, "u"); + if (e->u.integer.is_long) + fprintf(h, "l"); break; case EXPR_DOUBLE: fprintf(h, "%#.15g", e->u.dval); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 1e7c543e8af..87a9fc55f07 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -158,6 +158,8 @@ static int token_num( const char *yytext, YYSTYPE *yylval, int is_hex ) { yylval->integer.value = xstrtoul( yytext, NULL, 0 ); yylval->integer.is_hex = is_hex; + yylval->integer.is_long = !!strchr(yytext, 'l'); + yylval->integer.is_unsigned = !!strchr(yytext, 'u'); return is_hex ? aHEXNUM : aNUM; } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 44559e9f2ef..5ee1323793d 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -351,6 +351,8 @@ struct _attr_t { struct integer { int value; + int is_unsigned; + int is_long; int is_hex; };

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

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: 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