February 2021 - Wine-devel - list.winehq.org

[PATCH] widl: Fix handling of output_name in option parsing
by Andrew Boyarshin 08 Feb '21

08 Feb '21

Do not overwrite explicitly stated paths, such as header_name or proxy_name. Instead, use output_name when specified as a fallback. Drop inferring output_name from input_name which never worked, because input_name is not yet assigned at the moment of use. This leads to names like "widl.tab" (dup_basename fallbacks to that when given nullptr). Signed-off-by: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> --- tools/widl/widl.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 333351bc11bc..e8240b38584a 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -823,19 +823,20 @@ int main(int argc,char *argv[]) set_everything(TRUE); } - if (!output_name) output_name = dup_basename(input_name, ".idl"); - - if (do_header + do_typelib + do_proxies + do_client + - do_server + do_regscript + do_idfile + do_dlldata == 1) + if (output_name) { - if (do_header) header_name = output_name; - else if (do_typelib) typelib_name = output_name; - else if (do_proxies) proxy_name = output_name; - else if (do_client) client_name = output_name; - else if (do_server) server_name = output_name; - else if (do_regscript) regscript_name = output_name; - else if (do_idfile) idfile_name = output_name; - else if (do_dlldata) dlldata_name = output_name; + if (do_header + do_typelib + do_proxies + do_client + + do_server + do_regscript + do_idfile + do_dlldata == 1) + { + if (do_header && !header_name) header_name = output_name; + else if (do_typelib && !typelib_name) typelib_name = output_name; + else if (do_proxies && !proxy_name) proxy_name = output_name; + else if (do_client && !client_name) client_name = output_name; + else if (do_server && !server_name) server_name = output_name; + else if (do_regscript && !regscript_name) regscript_name = output_name; + else if (do_idfile && !idfile_name) idfile_name = output_name; + else if (do_dlldata && !dlldata_name) dlldata_name = output_name; + } } if (!dlldata_name && do_dlldata) -- 2.30.0.windows.1

1 0

[PATCH] widl: Add an option to specify wpp temporary files folder
by Andrew Boyarshin 08 Feb '21

08 Feb '21

All 3 usages of mkstemps now respect a new option that enables customizing temporary files root. This is useful in build systems, where it can simplify running widl using relative paths without polluting source directories. The behavior when a new option is not specified is identical to the one before the patch. Also added a way to identify failing mkstemps by using specialized log messages for each call to mkstemps. Signed-off-by: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> --- tools/widl/parser.l | 33 +++++++++++++++++++++++++++++---- tools/widl/widl.c | 25 ++++++++++++++++++++++--- tools/widl/widl.h | 1 + 3 files changed, 52 insertions(+), 7 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 7e20d30e7f08..2b8389dbd4a7 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -531,6 +531,7 @@ int do_import(char *fname) struct imports *import; int ptr = import_stack_ptr; int ret, fd; + char* base_fname = dup_basename(fname, ".idl"); import = first_import; while (import && strcmp(import->name, fname)) @@ -559,9 +560,22 @@ int do_import(char *fname) input_name = path; line_number = 1; - name = xstrdup( "widl.XXXXXX" ); + name = xmalloc( (temp_dir_name ? strlen(temp_dir_name) : 0) + strlen(base_fname) + 15); + + if (temp_dir_name) + { + strcpy( name, temp_dir_name ); + strcat( name, base_fname ); + } + else + { + strcpy( name, base_fname ); + } + + strcat( name, "_import.XXXXXX" ); + if((fd = mkstemps( name, 0 )) == -1) - error("Could not generate a temp name from %s\n", name); + error("Could not generate an import temp name from %s\n", name); temp_name = name; if (!(f = fdopen(fd, "wt"))) @@ -600,9 +614,20 @@ static void switch_to_acf(void) acf_name = NULL; line_number = 1; - name = xstrdup( "widl.XXXXXX" ); + name = xmalloc( (temp_dir_name ? strlen(temp_dir_name) : 0) + 16 ); + + if (temp_dir_name) + { + strcpy( name, temp_dir_name ); + strcat( name, "widl_acf.XXXXXX" ); + } + else + { + strcpy( name, "widl_acf.XXXXXX" ); + } + if((fd = mkstemps( name, 0 )) == -1) - error("Could not generate a temp name from %s\n", name); + error("Could not generate an ACF temp name from %s\n", name); temp_name = name; if (!(f = fdopen(fd, "wt"))) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 333351bc11bc..ebc55e1864df 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -74,6 +74,7 @@ static const char usage[] = " --sysroot=DIR Prefix include paths with DIR\n" " -s Generate server stub\n" " -t Generate typelib\n" +" --tmp=dir Path to the directory for WPP temporary files\n" " -u Generate interface identifiers file\n" " -V Print version and exit\n" " -W Enable pedantic warnings\n" @@ -151,6 +152,7 @@ char *temp_name; const char *prefix_client = ""; const char *prefix_server = ""; static const char *includedir; +char *temp_dir_name; int line_number = 1; @@ -176,6 +178,7 @@ enum { RT_OPTION, ROBUST_OPTION, SYSROOT_OPTION, + TMP_WPP_OPTION, WIN32_OPTION, WIN64_OPTION, WIN32_ALIGN_OPTION, @@ -201,6 +204,7 @@ static const struct option long_options[] = { { "robust", 0, NULL, ROBUST_OPTION }, { "sysroot", 1, NULL, SYSROOT_OPTION }, { "target", 0, NULL, 'b' }, + { "tmp", 1, NULL, TMP_WPP_OPTION }, { "winrt", 0, NULL, RT_OPTION }, { "win32", 0, NULL, WIN32_OPTION }, { "win64", 0, NULL, WIN64_OPTION }, @@ -647,6 +651,9 @@ int main(int argc,char *argv[]) case SYSROOT_OPTION: sysroot = xstrdup(optarg); break; + case TMP_WPP_OPTION: + temp_dir_name = xstrdup(optarg); + break; case WIN32_OPTION: pointer_size = 4; break; @@ -928,13 +935,25 @@ int main(int argc,char *argv[]) { FILE *output; int fd; - char *name = xmalloc( strlen(header_name) + 8 ); + char* base_input_name = dup_basename(input_name, ".idl"); + char *name = xmalloc( (temp_dir_name ? strlen(temp_dir_name) : 0) + strlen(base_input_name) + 8 ); + + if (temp_dir_name) + { + strcpy( name, temp_dir_name ); + strcat( name, base_input_name ); + } + else + { + strcpy( name, base_input_name ); + } - strcpy( name, header_name ); strcat( name, ".XXXXXX" ); + free(base_input_name); + if ((fd = mkstemps( name, 0 )) == -1) - error("Could not generate a temp name from %s\n", name); + error("Could not generate a root temp name from %s\n", name); temp_name = name; if (!(output = fdopen(fd, "wt"))) diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 4f4252e3ea3a..f35c54210c6c 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -66,6 +66,7 @@ extern char *server_name; extern char *server_token; extern char *regscript_name; extern char *regscript_token; +extern char *temp_dir_name; extern const char *prefix_client; extern const char *prefix_server; extern unsigned int pointer_size; -- 2.30.0.windows.1

1 0

[PATCH] dwrite: Adjust comment regarding digits substitution during shaping.
by Nikolay Sivov 08 Feb '21

08 Feb '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Testing with Arabic font with a glyph for 0x660 removed gives notdef (0) for '0', when used with Arabic substitution locale. dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 2f254607653..7dc4a1f7b55 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -5929,7 +5929,7 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c context->glyph_infos[i].mask |= rtlm_mask; } - /* TODO: should this check for glyph availability? */ + /* Glyph availability is not tested for a replacement digit. */ if (*context->u.subst.digits && codepoint >= '0' && codepoint <= '9') codepoint = context->u.subst.digits[codepoint - '0']; -- 2.30.0

1 0

[tools 1/2] testbot/reporttest: Remove tests for legacy TestLauncher and Wine versions.
by Francois Gouget 08 Feb '21

08 Feb '21

Remove tests for line formats that neither the TestBot nor the WineTest website support anymore. This is the case of lines missing pids, run times or using signed exit codes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/reporttest/report.template | 64 +++++--------------------- 1 file changed, 12 insertions(+), 52 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index b541e41d8..c08b4d47c 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -313,29 +313,10 @@ advpack:install start dlls/advpack/tests/install.c - 07b0:install: unhandled exception c0000005 at 0040167C advpack:install:07b0 done (-1073741819) in 0s -amstream:amstream start dlls/amstream/tests/amstream.c - ------ No pid at all ------ Expected assessement: Success -amstream: 152 tests executed (0 marked as todo, 0 failures), 0 skipped. -amstream:amstream done (0) in 0s - -apphelp:apphelp start dlls/apphelp/tests/apphelp.c - ------ A test unit with no execution time ------ Expected assessement: Success -0860:apphelp: 15 tests executed (0 marked as todo, 0 failures), 0 skipped. -apphelp:apphelp:0860 done (0) - -atl:atl_ax start dlls/atl/tests/atl_ax.c - ------ Pid on the test summary line, but no pid on the done one ------ Expected assessement: Success -0938:atl_ax: 12 tests executed (0 marked as todo, 0 failures), 0 skipped. -atl:atl_ax done (0) in 0s - -atl:module start dlls/atl/tests/module.c - ------ Pid on the done line, but no pid on the test summary line ------ Expected assessement: Success -module: 544 tests executed (0 marked as todo, 0 failures), 0 skipped. -atl:module:0920 done (0) in 0s +stub amstream:amstream +stub apphelp:apphelp +stub atl:atl_ax +stub atl:module atl:registrar start dlls/atl/tests/registrar.c - ----- A test unit with a foreign test summary line @@ -481,10 +462,7 @@ comctl32:progress start dlls/comctl32/tests/progress.c - 0148:progress: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. comctl32:progress:0148 done (0) in 9s -comctl32:propsheet start dlls/comctl32/tests/propsheet.c - ------ A test unit with no main process test summary line and no pid anywhere ------ Expected assessement: "Missing test summary" error -comctl32:propsheet done (0) in 9s +stub comctl32:propsheet comctl32:rebar start dlls/comctl32/tests/rebar.c - ----- A test unit with an unreported crash in a subprocess @@ -499,22 +477,16 @@ subprocess crashes either. This is why the error is "Zero exit code" and not 07b0:rebar: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. comctl32:rebar:07b0 done (0) in 0s -comctl32:status start dlls/comctl32/tests/status.c - ------ A test unit with a subprocess crash but no pid ------ Expected assessement: "Zero exit code" error -See the comctl32:rebar comment. -status: unhandled exception c0000005 at 0040167C -status: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. -comctl32:status:07b0 done (0) in 0s +stub comctl32:status comctl32:subclass start dlls/comctl32/tests/subclass.c - ------ A test unit with a subprocess crash, no pid and a non-zero exit code +----- A test unit with a subprocess crash, and a non-zero exit code ----- Expected assessement: 1 failure See the comctl32:rebar comment. Then note that here the main process does not claim success. Also note that the exit code does not correspond to that of a crashed process which makes sense since it did not crash. -subclass: unhandled exception c0000005 at 0040167C -subclass: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. +1234:subclass: unhandled exception c0000005 at 0040167C +07b0:subclass: 2251 tests executed (0 marked as todo, 0 failures), 0 skipped. comctl32:subclass:07b0 done (1) in 0s comctl32:syslink start dlls/comctl32/tests/syslink.c - @@ -534,28 +506,16 @@ Do not cut 07b0:syslink: 2251 tests executed (1 marked as todo, 2 failures), 1 s me off comctl32:syslink:07b0 done (2) in 0s -comctl32:tab start dlls/comctl32/tests/tab.c - ------ A test unit crash with no pid ------ Expected assessement: crashed -tab: unhandled exception c0000005 at 0040167C -comctl32:tab done (-1073741819) in 0s +stub comctl32:tab -comctl32:taskdialog start dlls/comctl32/tests/taskdialog.c - ------ A test unit crash with unsigned exit code (TestLauncher) ------ Expected assessement: crashed -taskdialog: unhandled exception c0000005 at 0040167C -comctl32:taskdialog done (3221225477) in 0s +stub comctl32:taskdialog comctl32:toolbar start dlls/comctl32/tests/toolbar.c - ----- A test unit crash with no unhandled exception line ----- Expected assessement: crashed comctl32:toolbar done (-1073741819) in 0s -comctl32:tooltips start dlls/comctl32/tests/toolbar.c - ------ A test unit crash with no unhandled exception line ------ and an unsigned exit code. ------ Expected assessement: crashed -comctl32:tooltips done (3221225477) in 0s +stub comctl32:tooltips comctl32:trackbar start dlls/comctl32/tests/trackbar.c - ----- A test unit with a subtest -- 2.20.1

1 1

[tools] testbot/TestWTBS: Update the description in the usage message.
by Francois Gouget 08 Feb '21

08 Feb '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 1cbec2e94..4a4aba962 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -165,7 +165,12 @@ if (defined $Usage) } print "Usage: $name0 [--jobs RANGES] [--mbox FILE] [--help]\n"; print "\n"; - print "Tests the Patches subject parser.\n"; + print "Automate checking the Wine TestBot test Suite results.\n"; + print "\n"; + print "The expectations are described in the form of directives that specify\n"; + print "expected job, task, patch or webpatch property values; and errors or strings in\n"; + print "logs and reports.\n"; + print "For more details, see the documentation in the $name0 source.\n"; print "\n"; print "Where:\n"; print " --jobs RANGES Only check the jobs in one of the specified comma-separated\n"; -- 2.20.1

1 0

[tools] testbot/TestWTBS: Allow side-loading of the TestWTBS directives.
by Francois Gouget 08 Feb '21

08 Feb '21

This allows checking the results of non-patch jobs, such as reporttest.exe runs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/tests/TestWTBS | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 4a4aba962..48376649e 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -108,6 +108,7 @@ sub check_opt_val($$) } my $OptJobs; +my %OptJobInfoPath; my $OptMbox; while (@ARGV) { @@ -120,6 +121,15 @@ while (@ARGV) { $OptMbox = check_opt_val($Arg, $OptMbox); } + elsif ($Arg eq "--job-wtbs") + { + my $JobId = check_opt_val($Arg, undef); + if ($JobId) + { + my $Path = check_opt_val("$Arg $JobId", $OptJobInfoPath{$JobId}); + $OptJobInfoPath{$JobId} = $Path if ($Path); + } + } elsif ($Arg eq "--help") { $Usage = 0; @@ -163,7 +173,7 @@ if (defined $Usage) error("try '$name0 --help' for more information\n"); exit $Usage; } - print "Usage: $name0 [--jobs RANGES] [--mbox FILE] [--help]\n"; + print "Usage: $name0 [--jobs RANGES] [--job-wtbs ID PATH] [--mbox FILE] [--help]\n"; print "\n"; print "Automate checking the Wine TestBot test Suite results.\n"; print "\n"; @@ -179,6 +189,8 @@ if (defined $Usage) print " or of the form 'FIRST..LAST' where FIRST and LAST are either the\n"; print " empty string or a job id.\n"; print " --mbox FILE Check the TestBot's emails in this mbox-format file.\n"; + print " --job-wtbs ID PATH Use the specified file to load the directives for job ID.\n"; + print " This option can be specified multiple times.\n"; print " --help Shows this usage message.\n"; exit 0; } @@ -1057,6 +1069,11 @@ sub CheckJobTree($;$) return if ($CheckedJobs{$JobId}); $CheckedJobs{$JobId} = 1; + if (!$TestInfo and $OptJobInfoPath{$JobId}) + { + $TestInfo = LoadTestInfo($OptJobInfoPath{$JobId}); + } + my ($HasTask, $HasNewFailures); my $TestUnits = {}; my $Email = $Emails{$JobId}; -- 2.20.1

1 0

[PATCH 1/6] widl: Add explicit namespace parameter to find_type_or_error.
by Rémi Bernon 08 Feb '21

08 Feb '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/parser.y | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 2d527805c14..17a3727b114 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -75,7 +75,7 @@ static void append_chain_callconv(type_t *chain, char *callconv); static warning_list_t *append_warning(warning_list_t *, int); static type_t *reg_typedefs(decl_spec_t *decl_spec, var_list_t *names, attr_list_t *attrs); -static type_t *find_type_or_error(const char *name); +static type_t *find_type_or_error(struct namespace *parent, const char *name); static var_t *reg_const(var_t *var); @@ -858,17 +858,17 @@ typename: aIDENTIFIER ident: typename { $$ = make_var($1); } ; -base_type: tBYTE { $$ = find_type_or_error($<str>1); } - | tWCHAR { $$ = find_type_or_error($<str>1); } +base_type: tBYTE { $$ = find_type_or_error(NULL, $<str>1); } + | tWCHAR { $$ = find_type_or_error(NULL, $<str>1); } | int_std | tSIGNED int_std { $$ = type_new_int(type_basic_get_type($2), -1); } | tUNSIGNED int_std { $$ = type_new_int(type_basic_get_type($2), 1); } | tUNSIGNED { $$ = type_new_int(TYPE_BASIC_INT, 1); } - | tFLOAT { $$ = find_type_or_error($<str>1); } - | tDOUBLE { $$ = find_type_or_error($<str>1); } - | tBOOLEAN { $$ = find_type_or_error($<str>1); } - | tERRORSTATUST { $$ = find_type_or_error($<str>1); } - | tHANDLET { $$ = find_type_or_error($<str>1); } + | tFLOAT { $$ = find_type_or_error(NULL, $<str>1); } + | tDOUBLE { $$ = find_type_or_error(NULL, $<str>1); } + | tBOOLEAN { $$ = find_type_or_error(NULL, $<str>1); } + | tERRORSTATUST { $$ = find_type_or_error(NULL, $<str>1); } + | tHANDLET { $$ = find_type_or_error(NULL, $<str>1); } ; m_int: @@ -887,12 +887,12 @@ int_std: tINT { $$ = type_new_int(TYPE_BASIC_INT, 0); } ; qualified_seq: - aKNOWNTYPE { $$ = find_type_or_error($1); } + aKNOWNTYPE { $$ = find_type_or_error(lookup_namespace, $1); } | aIDENTIFIER '.' { push_lookup_namespace($1); } qualified_seq { $$ = $4; } ; qualified_type: - aKNOWNTYPE { $$ = find_type_or_error($1); } + aKNOWNTYPE { $$ = find_type_or_error(current_namespace, $1); } | aNAMESPACE '.' { init_lookup_namespace($1); } qualified_seq { $$ = $4; } ; @@ -965,7 +965,7 @@ interfacedef: attributes interface inherit * definition of a derived class, I'll try to support it with this rule */ | attributes interface ':' aIDENTIFIER '{' import int_statements '}' - semicolon_opt { $$ = type_interface_define($2, $1, find_type_or_error($4), $7); } + semicolon_opt { $$ = type_interface_define($2, $1, find_type_or_error(current_namespace, $4), $7); } | dispinterfacedef semicolon_opt { $$ = $1; } ; @@ -1189,14 +1189,14 @@ acf_int_statements acf_int_statement : tTYPEDEF acf_attributes aKNOWNTYPE ';' - { type_t *type = find_type_or_error($3); + { type_t *type = find_type_or_error(current_namespace, $3); type->attrs = append_attr_list(type->attrs, $2); } ; acf_interface : acf_attributes tINTERFACE aKNOWNTYPE '{' acf_int_statements '}' - { type_t *iface = find_type_or_error($3); + { type_t *iface = find_type_or_error(current_namespace, $3); if (type_get_type(iface) != TYPE_INTERFACE) error_loc("%s is not an interface\n", iface->name); iface->attrs = append_attr_list(iface->attrs, $1); @@ -2034,13 +2034,12 @@ type_t *find_type(const char *name, struct namespace *namespace, int t) return NULL; } -static type_t *find_type_or_error(const char *name) +static type_t *find_type_or_error(struct namespace *namespace, const char *name) { type_t *type; - if (!(type = find_type(name, current_namespace, 0)) && - !(type = find_type(name, lookup_namespace, 0))) + if (!(type = find_type(name, namespace, 0))) { - error_loc("type '%s' not found\n", name); + error_loc("type '%s' not found in %s namespace\n", name, namespace && namespace->name ? namespace->name : "global"); return NULL; } return type; @@ -2851,7 +2850,7 @@ static void add_explicit_handle_if_necessary(const type_t *iface, var_t *func) * function */ var_t *idl_handle = make_var(xstrdup("IDL_handle")); idl_handle->attrs = append_attr(NULL, make_attr(ATTR_IN)); - idl_handle->declspec.type = find_type_or_error("handle_t"); + idl_handle->declspec.type = find_type_or_error(NULL, "handle_t"); type_function_add_head_arg(func->declspec.type, idl_handle); } } @@ -3141,7 +3140,7 @@ static statement_t *make_statement_typedef(declarator_list_t *decls, int declonl LIST_FOR_EACH_ENTRY_SAFE( decl, next, decls, declarator_t, entry ) { var_t *var = decl->var; - type_t *type = find_type_or_error(var->name); + type_t *type = find_type_or_error(current_namespace, var->name); *type_list = xmalloc(sizeof(type_list_t)); (*type_list)->type = type; (*type_list)->next = NULL; -- 2.30.0

2 11

[PATCH v2 1/4] wined3d: Align vertex attribute offsets to their size, if smaller than 4.
by Jan Sikorski 08 Feb '21

08 Feb '21

This should not change behavior for d3d9 and earlier, where all formats have sizes that are multiples of 4. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43422 Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/vertexdeclaration.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index c5df45541e4..ec8e2bc1d24 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -200,6 +200,7 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara for (i = 0; i < element_count; ++i) { struct wined3d_vertex_declaration_element *e = &declaration->elements[i]; + unsigned int alignment; e->format = wined3d_get_format(adapter, elements[i].format, 0); e->ffp_valid = declaration_element_valid_ffp(&elements[i]); @@ -212,6 +213,9 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara e->usage = elements[i].usage; e->usage_idx = elements[i].usage_idx; + alignment = e->format->byte_count; + if (alignment > 4) alignment = 4; + if (e->usage == WINED3D_DECL_USAGE_POSITIONT) declaration->position_transformed = TRUE; @@ -239,15 +243,15 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara prev = &declaration->elements[i - j]; if (prev->input_slot == e->input_slot) { - e->offset = (prev->offset + prev->format->byte_count + 3) & ~3; + e->offset = (prev->offset + prev->format->byte_count + alignment - 1) & ~(alignment - 1); break; } } } - if (e->offset & 0x3) - { - WARN("Declaration element %u is not 4 byte aligned(%u), returning E_FAIL.\n", i, e->offset); + if (e->offset & (alignment - 1)) { + WARN("Declaration element %u with format %s is not %d byte aligned(%u). returning E_FAIL.\n", + i, debug_d3dformat(elements[i].format), alignment, e->offset); heap_free(declaration->elements); return E_FAIL; } -- 2.30.0

2 4

[PATCH] wldap32: Convert berval structures.
by Hans Leidekker 08 Feb '21

08 Feb '21

The layout is different on 64-bit. As a side effect this patch fixes bug 50622 because we no longer include the Windows header. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50622 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wldap32/ber.c | 158 ++++++++++++++++++++++++--------- dlls/wldap32/page.c | 54 +++++++---- dlls/wldap32/winldap_private.h | 18 ++-- dlls/wldap32/wldap32.h | 115 +++++++++++++++++++++--- 4 files changed, 265 insertions(+), 80 deletions(-) diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index c4c77d68da8..7f39b9cfe17 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -21,18 +21,21 @@ #include "config.h" #include <stdarg.h> +#ifdef HAVE_LDAP_H +#include <ldap.h> +#endif + #include "windef.h" #include "winbase.h" -#include "winldap.h" +#include "winldap_private.h" +#include "wldap32.h" #include "wine/debug.h" #ifdef HAVE_LDAP WINE_DEFAULT_DEBUG_CHANNEL(wldap32); #endif -#ifndef LBER_ERROR -# define LBER_ERROR (~0U) -#endif +#define WLDAP32_LBER_ERROR (~0U) /*********************************************************************** * ber_alloc_t (WLDAP32.@) @@ -49,7 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); * NOTES * Free the berelement structure with ber_free. */ -BerElement * CDECL WLDAP32_ber_alloc_t( INT options ) +WLDAP32_BerElement * CDECL WLDAP32_ber_alloc_t( INT options ) { #ifdef HAVE_LDAP return ber_alloc_t( options ); @@ -76,11 +79,7 @@ BerElement * CDECL WLDAP32_ber_alloc_t( INT options ) */ BERVAL * CDECL WLDAP32_ber_bvdup( BERVAL *berval ) { -#ifdef HAVE_LDAP - return ber_bvdup( berval ); -#else - return NULL; -#endif + return bervalWtoW( berval ); } @@ -101,9 +100,7 @@ BERVAL * CDECL WLDAP32_ber_bvdup( BERVAL *berval ) */ void CDECL WLDAP32_ber_bvecfree( PBERVAL *berval ) { -#ifdef HAVE_LDAP - ber_bvecfree( berval ); -#endif + bvarrayfreeW( berval ); } @@ -124,9 +121,7 @@ void CDECL WLDAP32_ber_bvecfree( PBERVAL *berval ) */ void CDECL WLDAP32_ber_bvfree( BERVAL *berval ) { -#ifdef HAVE_LDAP - ber_bvfree( berval ); -#endif + heap_free( berval ); } @@ -147,12 +142,25 @@ void CDECL WLDAP32_ber_bvfree( BERVAL *berval ) * NOTES * len and cookie should be passed to ber_next_element. */ -ULONG CDECL WLDAP32_ber_first_element( BerElement *berelement, ULONG *len, CHAR **opaque ) +ULONG CDECL WLDAP32_ber_first_element( WLDAP32_BerElement *berelement, ULONG *ret_len, CHAR **opaque ) { #ifdef HAVE_LDAP - return ber_first_element( berelement, len, opaque ); + ber_len_t len; + ber_tag_t ret; + + if ((ret = ber_first_element( berelement, &len, opaque )) != LBER_ERROR) + { + if (len > ~0u) + { + ERR( "len too large\n" ); + return WLDAP32_LBER_ERROR; + } + *ret_len = len; + } + return ret; + #else - return LBER_ERROR; + return WLDAP32_LBER_ERROR; #endif } @@ -173,12 +181,22 @@ ULONG CDECL WLDAP32_ber_first_element( BerElement *berelement, ULONG *len, CHAR * NOTES * Free the berval structure with ber_bvfree. */ -INT CDECL WLDAP32_ber_flatten( BerElement *berelement, PBERVAL *berval ) +INT CDECL WLDAP32_ber_flatten( WLDAP32_BerElement *berelement, PBERVAL *berval ) { #ifdef HAVE_LDAP - return ber_flatten( berelement, berval ); + struct berval *bervalU; + struct WLDAP32_berval *bervalW; + + if (ber_flatten( berelement, &bervalU )) return WLDAP32_LBER_ERROR; + + bervalW = bervalUtoW( bervalU ); + ber_bvfree( bervalU ); + if (!bervalW) return WLDAP32_LBER_ERROR; + *berval = bervalW; + return 0; + #else - return LBER_ERROR; + return WLDAP32_LBER_ERROR; #endif } @@ -199,7 +217,7 @@ INT CDECL WLDAP32_ber_flatten( BerElement *berelement, PBERVAL *berval ) * Set buf to 0 if the berelement was allocated with ldap_first_attribute * or ldap_next_attribute, otherwise set it to 1. */ -void CDECL WLDAP32_ber_free( BerElement *berelement, INT buf ) +void CDECL WLDAP32_ber_free( WLDAP32_BerElement *berelement, INT buf ) { #ifdef HAVE_LDAP ber_free( berelement, buf ); @@ -222,10 +240,16 @@ void CDECL WLDAP32_ber_free( BerElement *berelement, INT buf ) * NOTES * Call ber_free to free the returned berelement structure. */ -BerElement * CDECL WLDAP32_ber_init( BERVAL *berval ) +WLDAP32_BerElement * CDECL WLDAP32_ber_init( BERVAL *berval ) { #ifdef HAVE_LDAP - return ber_init( berval ); + struct berval *bervalU; + WLDAP32_BerElement *ret; + + if (!(bervalU = bervalWtoU( berval ))) return NULL; + ret = ber_init( bervalU ); + heap_free( bervalU ); + return ret; #else return NULL; #endif @@ -250,12 +274,25 @@ BerElement * CDECL WLDAP32_ber_init( BERVAL *berval ) * len and cookie are initialized by ber_first_element and should * be passed on in subsequent calls to ber_next_element. */ -ULONG CDECL WLDAP32_ber_next_element( BerElement *berelement, ULONG *len, CHAR *opaque ) +ULONG CDECL WLDAP32_ber_next_element( WLDAP32_BerElement *berelement, ULONG *ret_len, CHAR *opaque ) { #ifdef HAVE_LDAP - return ber_next_element( berelement, len, opaque ); + ber_len_t len; + ber_tag_t ret; + + if ((ret = ber_next_element( berelement, &len, opaque )) != LBER_ERROR) + { + if (len > ~0u) + { + ERR( "len too large\n" ); + return WLDAP32_LBER_ERROR; + } + *ret_len = len; + } + return ret; + #else - return LBER_ERROR; + return WLDAP32_LBER_ERROR; #endif } @@ -273,12 +310,25 @@ ULONG CDECL WLDAP32_ber_next_element( BerElement *berelement, ULONG *len, CHAR * * Success: Tag of the next element. * Failure: LBER_DEFAULT (no more data). */ -ULONG CDECL WLDAP32_ber_peek_tag( BerElement *berelement, ULONG *len ) +ULONG CDECL WLDAP32_ber_peek_tag( WLDAP32_BerElement *berelement, ULONG *ret_len ) { #ifdef HAVE_LDAP - return ber_peek_tag( berelement, len ); + ber_len_t len; + ber_tag_t ret; + + if ((ret = ber_peek_tag( berelement, &len )) != LBER_ERROR) + { + if (len > ~0u) + { + ERR( "len too large\n" ); + return WLDAP32_LBER_ERROR; + } + *ret_len = len; + } + return ret; + #else - return LBER_ERROR; + return WLDAP32_LBER_ERROR; #endif } @@ -296,12 +346,25 @@ ULONG CDECL WLDAP32_ber_peek_tag( BerElement *berelement, ULONG *len ) * Success: Tag of the next element. * Failure: LBER_DEFAULT (no more data). */ -ULONG CDECL WLDAP32_ber_skip_tag( BerElement *berelement, ULONG *len ) +ULONG CDECL WLDAP32_ber_skip_tag( WLDAP32_BerElement *berelement, ULONG *ret_len ) { #ifdef HAVE_LDAP - return ber_skip_tag( berelement, len ); + ber_len_t len; + ber_tag_t ret; + + if ((ret = ber_skip_tag( berelement, &len )) != LBER_ERROR) + { + if (len > ~0u) + { + ERR( "len too large\n" ); + return WLDAP32_LBER_ERROR; + } + *ret_len = len; + } + return ret; + #else - return LBER_ERROR; + return WLDAP32_LBER_ERROR; #endif } @@ -324,7 +387,7 @@ ULONG CDECL WLDAP32_ber_skip_tag( BerElement *berelement, ULONG *len ) * berelement must have been allocated with ber_alloc_t. This function * can be called multiple times to append data. */ -INT WINAPIV WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) +INT WINAPIV WLDAP32_ber_printf( WLDAP32_BerElement *berelement, PCHAR fmt, ... ) { #ifdef HAVE_LDAP __ms_va_list list; @@ -367,8 +430,15 @@ INT WINAPIV WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) } case 'V': { - struct berval **array = va_arg( list, struct berval ** ); - ret = ber_printf( berelement, new_fmt, array ); + struct WLDAP32_berval **array = va_arg( list, struct WLDAP32_berval ** ); + struct berval **arrayU; + if (!(arrayU = bvarrayWtoU( array ))) + { + ret = -1; + break; + } + ret = ber_printf( berelement, new_fmt, arrayU ); + bvarrayfreeU( arrayU ); break; } case 'X': @@ -396,7 +466,7 @@ INT WINAPIV WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) __ms_va_end( list ); return ret; #else - return LBER_ERROR; + return WLDAP32_LBER_ERROR; #endif } @@ -419,7 +489,7 @@ INT WINAPIV WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) * berelement must have been allocated with ber_init. This function * can be called multiple times to decode data. */ -INT WINAPIV WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... ) +INT WINAPIV WLDAP32_ber_scanf( WLDAP32_BerElement *berelement, PCHAR fmt, ... ) { #ifdef HAVE_LDAP __ms_va_list list; @@ -474,8 +544,12 @@ INT WINAPIV WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... ) } case 'V': { - struct berval ***array = va_arg( list, struct berval *** ); - ret = ber_scanf( berelement, new_fmt, array ); + struct WLDAP32_berval **arrayW, ***array = va_arg( list, struct WLDAP32_berval *** ); + struct berval **arrayU; + if ((ret = ber_scanf( berelement, new_fmt, &arrayU )) == -1) break; + if ((arrayW = bvarrayUtoW( arrayU ))) *array = arrayW; + else ret = -1; + bvarrayfreeU( arrayU ); break; } case 'n': @@ -496,6 +570,6 @@ INT WINAPIV WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... ) __ms_va_end( list ); return ret; #else - return LBER_ERROR; + return WLDAP32_LBER_ERROR; #endif } diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 959567c2bfd..a16ea52409e 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -40,7 +40,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); #ifdef HAVE_LDAP -static struct berval null_cookie = { 0, NULL }; +static struct berval null_cookieU = { 0, NULL }; +static struct WLDAP32_berval null_cookieW = { 0, NULL }; #endif /*********************************************************************** @@ -75,7 +76,7 @@ ULONG CDECL ldap_create_page_controlA( WLDAP32_LDAP *ld, ULONG pagesize, #ifdef HAVE_LDAP /* create a page control by hand */ -static ULONG create_page_control( ULONG pagesize, struct WLDAP32_berval *cookie, +static ULONG create_page_control( ULONG pagesize, struct berval *cookie, UCHAR critical, PLDAPControlW *control ) { LDAPControlW *ctrl; @@ -91,7 +92,7 @@ static ULONG create_page_control( ULONG pagesize, struct WLDAP32_berval *cookie, if (cookie) tag = ber_printf( ber, "{iO}", (ber_int_t)pagesize, cookie ); else - tag = ber_printf( ber, "{iO}", (ber_int_t)pagesize, &null_cookie ); + tag = ber_printf( ber, "{iO}", (ber_int_t)pagesize, &null_cookieU ); ret = ber_flatten( ber, &berval ); ber_free( ber, 1 ); @@ -149,13 +150,19 @@ ULONG CDECL ldap_create_page_controlW( WLDAP32_LDAP *ld, ULONG pagesize, struct WLDAP32_berval *cookie, UCHAR critical, PLDAPControlW *control ) { #ifdef HAVE_LDAP + struct berval *cookieU = NULL; + ULONG ret; + TRACE( "(%p, 0x%08x, %p, 0x%02x, %p)\n", ld, pagesize, cookie, critical, control ); if (!ld || !control || pagesize > LDAP_MAXINT) return WLDAP32_LDAP_PARAM_ERROR; - return create_page_control( pagesize, cookie, critical, control ); + if (cookie && !(cookieU = bervalWtoU( cookie ))) return WLDAP32_LDAP_NO_MEMORY; + ret = create_page_control( pagesize, cookieU, critical, control ); + heap_free( cookieU ); + return ret; #else return WLDAP32_LDAP_NOT_SUPPORTED; @@ -197,7 +204,7 @@ ULONG CDECL ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search, } TRACE("search->cookie: %s\n", search->cookie ? debugstr_an(search->cookie->bv_val, search->cookie->bv_len) : "NULL"); - ret = ldap_create_page_controlW( ld, pagesize, (struct WLDAP32_berval *)search->cookie, 1, &search->serverctrls[0] ); + ret = ldap_create_page_controlW( ld, pagesize, search->cookie, 1, &search->serverctrls[0] ); if (ret != WLDAP32_LDAP_SUCCESS) return ret; ret = ldap_search_ext_sW( ld, search->dn, search->scope, @@ -230,17 +237,17 @@ ULONG CDECL ldap_get_paged_count( WLDAP32_LDAP *ld, PLDAPSearch search, if (!server_ctrls) /* assume end of paged results */ { - search->cookie = &null_cookie; + search->cookie = &null_cookieW; return WLDAP32_LDAP_SUCCESS; } if (search->cookie) { - ber_bvfree( search->cookie ); + heap_free( search->cookie ); search->cookie = NULL; } - ret = ldap_parse_page_controlW( ld, server_ctrls, count, (struct WLDAP32_berval **)&search->cookie ); + ret = ldap_parse_page_controlW( ld, server_ctrls, count, &search->cookie ); if (ret == WLDAP32_LDAP_SUCCESS) TRACE("new search->cookie: %s, count %u\n", debugstr_an(search->cookie->bv_val, search->cookie->bv_len), *count); @@ -286,6 +293,7 @@ ULONG CDECL ldap_parse_page_controlW( WLDAP32_LDAP *ld, PLDAPControlW *ctrls, ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP LDAPControlW *control = NULL; + struct berval *cookieU = NULL, *valueU; BerElement *ber; ber_tag_t tag; ULONG i; @@ -302,20 +310,34 @@ ULONG CDECL ldap_parse_page_controlW( WLDAP32_LDAP *ld, PLDAPControlW *ctrls, } if (!control) - return WLDAP32_LDAP_CONTROL_NOT_FOUND; - - ber = ber_init( &((LDAPControl *)control)->ldctl_value ); + return WLDAP32_LDAP_CONTROL_NOT_FOUND; + + if (cookie && !(cookieU = bervalWtoU( *cookie ))) + return WLDAP32_LDAP_NO_MEMORY; + + if (!(valueU = bervalWtoU( &control->ldctl_value ))) + { + heap_free( cookieU ); + return WLDAP32_LDAP_NO_MEMORY; + } + + ber = ber_init( valueU ); + heap_free( valueU ); if (!ber) + { + heap_free( cookieU ); return WLDAP32_LDAP_NO_MEMORY; + } - tag = ber_scanf( ber, "{iO}", count, cookie ); - if ( tag == LBER_ERROR ) + tag = ber_scanf( ber, "{iO}", count, &cookieU ); + if (tag == LBER_ERROR) ret = WLDAP32_LDAP_DECODING_ERROR; else ret = WLDAP32_LDAP_SUCCESS; + heap_free( cookieU ); ber_free( ber, 1 ); - + #endif return ret; } @@ -338,8 +360,8 @@ ULONG CDECL ldap_search_abandon_page( WLDAP32_LDAP *ld, PLDAPSearch search ) while (*ctrls) controlfreeW( *ctrls++ ); heap_free( search->serverctrls ); controlarrayfreeW( search->clientctrls ); - if (search->cookie && search->cookie != &null_cookie) - ber_bvfree( search->cookie ); + if (search->cookie && search->cookie != &null_cookieW) + heap_free( search->cookie ); heap_free( search ); return WLDAP32_LDAP_SUCCESS; diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 69035050961..8cd546b88b5 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -103,6 +103,12 @@ typedef struct berelement #define WLDAP32_LDAP_AUTH_NEGOTIATE 0x486 +typedef struct WLDAP32_berval +{ + ULONG bv_len; + PCHAR bv_val; +} LDAP_BERVAL, *PLDAP_BERVAL, BERVAL, *PBERVAL, WLDAP32_BerValue; + typedef struct wldap32 { #ifdef HAVE_LDAP @@ -139,7 +145,7 @@ typedef struct ldapmodA { PCHAR mod_type; union { PCHAR *modv_strvals; - struct berval **modv_bvals; + struct WLDAP32_berval **modv_bvals; } mod_vals; } LDAPModA, *PLDAPModA; @@ -148,7 +154,7 @@ typedef struct ldapmodW { PWCHAR mod_type; union { PWCHAR *modv_strvals; - struct berval **modv_bvals; + struct WLDAP32_berval **modv_bvals; } mod_vals; } LDAPModW, *PLDAPModW; @@ -188,12 +194,6 @@ typedef struct ldap_version_info ULONG lv_minor; } LDAP_VERSION_INFO, *PLDAP_VERSION_INFO; -typedef struct WLDAP32_berval -{ - ULONG bv_len; - PCHAR bv_val; -} LDAP_BERVAL, *PLDAP_BERVAL, BERVAL, *PBERVAL, WLDAP32_BerValue; - #define LDAP_PAGED_RESULT_OID_STRING "1.2.840.113556.1.4.319" #define LDAP_SERVER_RESP_SORT_OID "1.2.840.113556.1.4.474" #define LDAP_CONTROL_VLVRESPONSE "2.16.840.1.113730.3.4.10" @@ -242,7 +242,7 @@ typedef struct ldapsearch LDAPControlW **clientctrls; struct l_timeval timeout; ULONG sizelimit; - struct berval *cookie; + struct WLDAP32_berval *cookie; } LDAPSearch, *PLDAPSearch; typedef struct ldapsortkeyA diff --git a/dlls/wldap32/wldap32.h b/dlls/wldap32/wldap32.h index 3059df8603e..5b099c9fabc 100644 --- a/dlls/wldap32/wldap32.h +++ b/dlls/wldap32/wldap32.h @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include "wine/heap.h" #include "wine/unicode.h" @@ -293,16 +294,39 @@ static inline void strarrayfreeU( char **strarray ) } } +static inline struct WLDAP32_berval *bervalWtoW( struct WLDAP32_berval *bv ) +{ + struct WLDAP32_berval *berval; + DWORD size = sizeof(*berval) + bv->bv_len; + + if ((berval = heap_alloc( size ))) + { + char *val = (char *)(berval + 1); + + berval->bv_len = bv->bv_len; + berval->bv_val = val; + memcpy( val, bv->bv_val, bv->bv_len ); + } + return berval; +} + +static inline void bvarrayfreeW( struct WLDAP32_berval **bv ) +{ + struct WLDAP32_berval **p = bv; + while (*p) heap_free( *p++ ); + heap_free( bv ); +} + #ifdef HAVE_LDAP -static inline struct berval *bvdup( struct berval *bv ) +static inline struct berval *bervalWtoU( struct WLDAP32_berval *bv ) { struct berval *berval; - DWORD size = sizeof(struct berval) + bv->bv_len; + DWORD size = sizeof(*berval) + bv->bv_len; if ((berval = heap_alloc( size ))) { - char *val = (char *)berval + sizeof(struct berval); + char *val = (char *)(berval + 1); berval->bv_len = bv->bv_len; berval->bv_val = val; @@ -311,34 +335,99 @@ static inline struct berval *bvdup( struct berval *bv ) return berval; } -static inline DWORD bvarraylen( struct berval **bv ) +static inline struct WLDAP32_berval *bervalUtoW( struct berval *bv ) +{ + struct WLDAP32_berval *berval; + DWORD size = sizeof(*berval) + bv->bv_len; + + assert( bv->bv_len <= ~0u ); + + if ((berval = heap_alloc( size ))) + { + char *val = (char *)(berval + 1); + + berval->bv_len = bv->bv_len; + berval->bv_val = val; + memcpy( val, bv->bv_val, bv->bv_len ); + } + return berval; +} + +static inline DWORD bvarraylenU( struct berval **bv ) { struct berval **p = bv; while (*p) p++; return p - bv; } -static inline struct berval **bvarraydup( struct berval **bv ) +static inline DWORD bvarraylenW( struct WLDAP32_berval **bv ) +{ + struct WLDAP32_berval **p = bv; + while (*p) p++; + return p - bv; +} + +static inline struct WLDAP32_berval **bvarrayWtoW( struct WLDAP32_berval **bv ) +{ + struct WLDAP32_berval **berval = NULL; + DWORD size; + + if (bv) + { + size = sizeof(*berval) * (bvarraylenW( bv ) + 1); + if ((berval = heap_alloc( size ))) + { + struct WLDAP32_berval **p = bv; + struct WLDAP32_berval **q = berval; + + while (*p) *q++ = bervalWtoW( *p++ ); + *q = NULL; + } + } + return berval; +} + +static inline struct berval **bvarrayWtoU( struct WLDAP32_berval **bv ) { struct berval **berval = NULL; DWORD size; if (bv) { - size = sizeof(struct berval *) * (bvarraylen( bv ) + 1); + size = sizeof(*berval) * (bvarraylenW( bv ) + 1); if ((berval = heap_alloc( size ))) { - struct berval **p = bv; + struct WLDAP32_berval **p = bv; struct berval **q = berval; - while (*p) *q++ = bvdup( *p++ ); + while (*p) *q++ = bervalWtoU( *p++ ); + *q = NULL; + } + } + return berval; +} + +static inline struct WLDAP32_berval **bvarrayUtoW( struct berval **bv ) +{ + struct WLDAP32_berval **berval = NULL; + DWORD size; + + if (bv) + { + size = sizeof(*berval) * (bvarraylenU( bv ) + 1); + if ((berval = heap_alloc( size ))) + { + struct berval **p = bv; + struct WLDAP32_berval **q = berval; + + while (*p) *q++ = bervalUtoW( *p++ ); *q = NULL; } } return berval; } -static inline void bvarrayfree( struct berval **bv ) +static inline void bvarrayfreeU( struct berval **bv ) { struct berval **p = bv; while (*p) heap_free( *p++ ); @@ -355,7 +444,7 @@ static inline LDAPModW *modAtoW( LDAPModA *mod ) modW->mod_type = strAtoW( mod->mod_type ); if (mod->mod_op & LDAP_MOD_BVALUES) - modW->mod_vals.modv_bvals = bvarraydup( mod->mod_vals.modv_bvals ); + modW->mod_vals.modv_bvals = bvarrayWtoW( mod->mod_vals.modv_bvals ); else modW->mod_vals.modv_strvals = strarrayAtoW( mod->mod_vals.modv_strvals ); } @@ -372,7 +461,7 @@ static inline LDAPMod *modWtoU( LDAPModW *mod ) modU->mod_type = strWtoU( mod->mod_type ); if (mod->mod_op & LDAP_MOD_BVALUES) - modU->mod_vals.modv_bvals = bvarraydup( mod->mod_vals.modv_bvals ); + modU->mod_vals.modv_bvals = bvarrayWtoU( mod->mod_vals.modv_bvals ); else modU->mod_vals.modv_strvals = strarrayWtoU( mod->mod_vals.modv_strvals ); } @@ -382,7 +471,7 @@ static inline LDAPMod *modWtoU( LDAPModW *mod ) static inline void modfreeW( LDAPModW *mod ) { if (mod->mod_op & LDAP_MOD_BVALUES) - bvarrayfree( mod->mod_vals.modv_bvals ); + bvarrayfreeW( mod->mod_vals.modv_bvals ); else strarrayfreeW( mod->mod_vals.modv_strvals ); heap_free( mod ); @@ -391,7 +480,7 @@ static inline void modfreeW( LDAPModW *mod ) static inline void modfreeU( LDAPMod *mod ) { if (mod->mod_op & LDAP_MOD_BVALUES) - bvarrayfree( mod->mod_vals.modv_bvals ); + bvarrayfreeU( mod->mod_vals.modv_bvals ); else strarrayfreeU( mod->mod_vals.modv_strvals ); heap_free( mod ); -- 2.30.0

1 0

[PATCH] server: Grow rawinput buffer instead of allocating its maximum size.
by Rémi Bernon 08 Feb '21

08 Feb '21

Call of Duty: WWII call GetRawInputBuffer with very large client buffer, so the maximum buffer size may be large and it causes an unnecessary load on wineserver when it allocates and clears the reply buffer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I sent another version for this some time ago, but this time I'm only growing the buffer as needed instead of precomputing the exact required length. It is a smaller change and probably more acceptable, and should be enough to reduce the load, as it is mainly induced by mem_alloc calling mark_block_uninitialized calls, that is memseting the whole buffer. server/queue.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/server/queue.c b/server/queue.c index ad886a3ba80..e47980a4aa8 100644 --- a/server/queue.c +++ b/server/queue.c @@ -3256,12 +3256,11 @@ DECL_HANDLER(get_rawinput_buffer) struct thread_input *input = current->queue->input; data_size_t size = 0, next_size = 0; struct list *ptr; - char *buf, *cur; - int count = 0; + char *buf, *cur, *tmp; + int count = 0, buf_size = 16 * sizeof(struct hardware_msg_data); if (!req->buffer_size) buf = NULL; - else if (!(buf = mem_alloc( get_reply_max_size() ))) - return; + else if (!(buf = mem_alloc( buf_size ))) return; cur = buf; ptr = list_head( &input->msg_list ); @@ -3276,6 +3275,17 @@ DECL_HANDLER(get_rawinput_buffer) next_size = req->rawinput_size; if (size + next_size > req->buffer_size) break; if (cur + sizeof(*data) > buf + get_reply_max_size()) break; + if (cur + sizeof(*data) > buf + buf_size) + { + buf_size += buf_size / 2; + if (!(tmp = realloc( buf, buf_size ))) + { + set_error( STATUS_NO_MEMORY ); + return; + } + cur = tmp + (cur - buf); + buf = tmp; + } memcpy(cur, data, sizeof(*data)); list_remove( &msg->entry ); -- 2.30.0

1 0