winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
June 2024
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
613 discussions
Start a n
N
ew thread
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
0
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
0
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
0
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
0
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
0
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
0
0
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
0
0
Alexandre Julliard : ntdll: 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: 8c700a4e8316a1c1c2fb23a8ae61178102d5922d URL:
https://gitlab.winehq.org/wine/wine/-/commit/8c700a4e8316a1c1c2fb23a8ae6117…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 11:58:25 2024 +0200 ntdll: Build relative paths at run-time instead of depending on makedep. --- dlls/ntdll/Makefile.in | 6 +++--- dlls/ntdll/unix/loader.c | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index e17e3f72b92..37bd6c86e31 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -75,6 +75,6 @@ EXTRA_OBJS = unix/version.o unix_loader_EXTRADEFS = \ -DBINDIR=\"${bindir}\" \ - -DSYSTEMDLLPATH=\"${system_dllpath}\" \ - -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${libdir}/wine ${bindir}`\" \ - -DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\" + -DLIBDIR=\"${libdir}\" \ + -DDATADIR=\"${datadir}\" \ + -DSYSTEMDLLPATH=\"${system_dllpath}\" diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index f8420dd9e62..19fbfb2b68c 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -302,6 +302,42 @@ 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; +} /* build a path to a binary and exec it */ static int build_path_and_exec( pid_t *pid, const char *dir, const char *name, char **argv ) @@ -444,8 +480,8 @@ static void init_paths( char *argv[] ) free( path ); } #endif - if (!bin_dir) bin_dir = build_path( dll_dir, DLL_TO_BINDIR ); - data_dir = build_path( bin_dir, BIN_TO_DATADIR ); + if (!bin_dir) bin_dir = build_relative_path( dll_dir, LIBDIR "/wine", BINDIR ); + data_dir = build_relative_path( bin_dir, BINDIR, DATADIR "/wine" ); wineloader = build_path( bin_dir, basename ); } else
1
0
0
0
Alexandre Julliard : tools: Add helper functions to get the standard directories.
by Alexandre Julliard
25 Jun '24
25 Jun '24
Module: wine Branch: master Commit: 6311297c158d91459fad2b4269d9a070fabc5a5b URL:
https://gitlab.winehq.org/wine/wine/-/commit/6311297c158d91459fad2b4269d9a0…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 11:33:46 2024 +0200 tools: Add helper functions to get the standard directories. --- tools/tools.h | 82 ++++++++++++++++++++++++++++++++++++++++++++++- tools/widl/Makefile.in | 6 +--- tools/widl/widl.c | 24 ++++++-------- tools/winegcc/Makefile.in | 3 +- tools/winegcc/winegcc.c | 11 ++----- tools/wmc/Makefile.in | 4 +-- tools/wmc/wmc.c | 15 +++------ tools/wrc/Makefile.in | 6 +--- tools/wrc/wrc.c | 17 +++------- 9 files changed, 106 insertions(+), 62 deletions(-)
1
0
0
0
Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard
25 Jun '24
25 Jun '24
Module: wine Branch: master Commit: 69e3c712dca9cc697830c74725e07daa46d23bdf URL:
https://gitlab.winehq.org/wine/wine/-/commit/69e3c712dca9cc697830c74725e07d…
Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Jun 25 00:24:31 2024 +0300 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 18c43029b88..0ba83619a34 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To:
https://bugs.winehq.org\n
" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2024-04-03 22:59+0300\n" +"PO-Revision-Date: 2024-06-25 00:23+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -14582,10 +14582,8 @@ msgstr "" " šešioliktainis (0x34) arba aštuntainis (056).\n" #: programs/cmd/cmd.rc:411 -#, fuzzy -#| msgid "Syntax error\n" msgid "Syntax error: unexpected %1\n" -msgstr "Sintaksės klaida\n" +msgstr "Sintaksės klaida: netikėtas %1\n" #: programs/conhost/conhost.rc:54 msgid "Cursor size"
1
0
0
0
← Newer
1
...
9
10
11
12
13
14
15
...
62
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
Results per page:
10
25
50
100
200