wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Nikolay Sivov : combase: Build without WINE_NO_LONG_TYPES.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 652aef3007c518f268aec3543a40f36574545fa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=652aef3007c518f268aec354… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 8 15:04:29 2022 +0300 combase: Build without WINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/Makefile.in | 1 - dlls/combase/apartment.c | 18 +++---- dlls/combase/combase.c | 60 +++++++++++------------ dlls/combase/errorinfo.c | 10 ++-- dlls/combase/hglobalstream.c | 10 ++-- dlls/combase/malloc.c | 4 +- dlls/combase/marshal.c | 111 +++++++++++++++++++++---------------------- dlls/combase/roapi.c | 4 +- dlls/combase/rpc.c | 60 +++++++++++------------ dlls/combase/stubmanager.c | 22 ++++----- dlls/combase/usrmarshal.c | 18 +++---- 11 files changed, 157 insertions(+), 161 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=652aef3007c518f268ae…

1 0

Zebediah Figura : wined3d: Use the chunk allocator for GL pixel unpack buffers.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 1e72b622f0343d91a35ec809f8ea1fb28bb892c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e72b622f0343d91a35ec809… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 15:28:31 2022 -0600 wined3d: Use the chunk allocator for GL pixel unpack buffers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 587dc3059ca..2d37e29a655 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3131,6 +3131,7 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei { case GL_ATOMIC_COUNTER_BUFFER: case GL_DRAW_INDIRECT_BUFFER: + case GL_PIXEL_UNPACK_BUFFER: if ((memory = wined3d_context_gl_allocate_memory(context_gl, memory_type_idx, size, &id))) buffer_offset = memory->offset; break;

1 0

Zebediah Figura : wined3d: Use the chunk allocator for GL atomic counter buffers.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 5fb6d5cc3112c700be25d76e4c875e64dc2021c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fb6d5cc3112c700be25d76e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 15:28:30 2022 -0600 wined3d: Use the chunk allocator for GL atomic counter buffers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 9b8a887bd92..587dc3059ca 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3129,6 +3129,7 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei { switch (binding) { + case GL_ATOMIC_COUNTER_BUFFER: case GL_DRAW_INDIRECT_BUFFER: if ((memory = wined3d_context_gl_allocate_memory(context_gl, memory_type_idx, size, &id))) buffer_offset = memory->offset;

1 0

Henri Verbeet : wined3d: Use the chunk allocator for GL indirect draw buffers.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 7c844cd3c9c465bdeaf3d98d6da5f2f5e460e650 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c844cd3c9c465bdeaf3d98d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 1 15:28:29 2022 -0600 wined3d: Use the chunk allocator for GL indirect draw buffers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/context_gl.c | 254 +++++++++++++++++++++++++++++++++++++---- dlls/wined3d/device.c | 110 ++++++++++++++++++ dlls/wined3d/wined3d_private.h | 66 ++++++++--- 4 files changed, 388 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7c844cd3c9c465bdeaf3…

1 0

Andrey Gusev : winegstreamer: Handle EnableDiscreteOutput and SpeakerConfig settings in WMSyncReader_SetOutputSetting().
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 766617d6f0e50b03e9fd43b4bc29bdcddb19daf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=766617d6f0e50b03e9fd43b4… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Feb 8 13:45:52 2022 +0200 winegstreamer: Handle EnableDiscreteOutput and SpeakerConfig settings in WMSyncReader_SetOutputSetting(). Resident Evil 5 cutscenes have audio and don't hang. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_syncreader.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index e86645a207a..55940e2b370 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -271,6 +271,16 @@ static HRESULT WINAPI WMSyncReader_SetOutputSetting(IWMSyncReader2 *iface, DWORD FIXME("Ignoring VideoSampleDurations setting.\n"); return S_OK; } + if (!wcscmp(name, L"EnableDiscreteOutput")) + { + FIXME("Ignoring EnableDiscreteOutput setting.\n"); + return S_OK; + } + if (!wcscmp(name, L"SpeakerConfig")) + { + FIXME("Ignoring SpeakerConfig setting.\n"); + return S_OK; + } else { FIXME("Unknown setting %s; returning E_NOTIMPL.\n", debugstr_w(name));

1 0

Alexandre Julliard : tools: Consistently use xmalloc/xrealloc/xstrdup everywhere.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 62f9bd39a23400b674c7192ee750f45e162ac8ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=62f9bd39a23400b674c7192e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 8 18:03:23 2022 +0100 tools: Consistently use xmalloc/xrealloc/xstrdup everywhere. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 6 +++--- tools/widl/widl.c | 4 ++-- tools/winedump/msc.c | 6 ++---- tools/winedump/msmangle.c | 2 -- tools/winegcc/winegcc.c | 22 +++++++++++----------- tools/wmc/wmc.c | 4 ++-- tools/wrc/wrc.c | 6 +++--- 7 files changed, 23 insertions(+), 27 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d6ac73cbf00..9b71cbedf6d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -521,7 +521,7 @@ arg_list: arg { check_arg_attrs($1); $$ = append_var( NULL, $1 ); } ; args: arg_list - | arg_list ',' ELLIPSIS { $$ = append_var( $1, make_var(strdup("...")) ); } + | arg_list ',' ELLIPSIS { $$ = append_var( $1, make_var(xstrdup("...")) ); } ; /* split into two rules to get bison to resolve a tVOID conflict */ @@ -3107,9 +3107,9 @@ static void check_async_uuid(type_t *iface) if (args) LIST_FOR_EACH_ENTRY(arg, args, var_t, entry) { if (is_attr(arg->attrs, ATTR_IN) || !is_attr(arg->attrs, ATTR_OUT)) - begin_args = append_var(begin_args, copy_var(arg, strdup(arg->name), arg_in_attrs)); + begin_args = append_var(begin_args, copy_var(arg, xstrdup(arg->name), arg_in_attrs)); if (is_attr(arg->attrs, ATTR_OUT)) - finish_args = append_var(finish_args, copy_var(arg, strdup(arg->name), arg_out_attrs)); + finish_args = append_var(finish_args, copy_var(arg, xstrdup(arg->name), arg_out_attrs)); } begin_func = copy_var(func, strmake("Begin_%s", func->name), NULL); diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 7686594b7d3..7b2276b0a41 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -489,8 +489,8 @@ static void init_argv0_dir( const char *argv0 ) #elif defined (__FreeBSD__) || defined(__DragonFly__) static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; size_t path_size = PATH_MAX; - char *path = malloc( path_size ); - if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) + char *path = xmalloc( path_size ); + if (!sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) dir = realpath( path, NULL ); free( path ); #else diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 3c632ec19e9..160ed07892e 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1319,15 +1319,13 @@ static void init_symbol_dumper(struct symbol_dumper* sd) { sd->depth = 0; sd->alloc = 16; - sd->stack = malloc(sd->alloc * sizeof(sd->stack[0])); + sd->stack = xmalloc(sd->alloc * sizeof(sd->stack[0])); } static void push_symbol_dumper(struct symbol_dumper* sd, const union codeview_symbol* sym, unsigned end) { if (!sd->stack) return; - if (sd->depth >= sd->alloc && - !(sd->stack = realloc(sd->stack, (sd->alloc *= 2) * sizeof(sd->stack[0])))) - return; + if (sd->depth >= sd->alloc) sd->stack = xrealloc(sd->stack, (sd->alloc *= 2) * sizeof(sd->stack[0])); sd->stack[sd->depth].end = end; sd->stack[sd->depth].sym = sym; sd->depth++; diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index ee7b033f757..f9440c04a45 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -490,8 +490,6 @@ static char *demangle_datatype (char **str, compound_type *ct, iter++; /* Apply our constraints to the base type (struct xxx *) */ stripped = xstrdup (sym->arg_text [0]); - if (!stripped) - fatal ("Out of Memory"); /* If we're a reference, re-use the pointer already in the type */ if (!(ct->flags & CT_BY_REFERENCE)) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 2eb0bdbcf3b..9bee77e3b66 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -657,8 +657,8 @@ static void init_argv0_dir( const char *argv0 ) #elif defined (__FreeBSD__) || defined(__DragonFly__) static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; size_t path_size = PATH_MAX; - char *path = malloc( path_size ); - if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) + char *path = xmalloc( path_size ); + if (!sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) dir = realpath( path, NULL ); free( path ); #else @@ -1114,7 +1114,7 @@ static void build(struct options* opts) * -xlll: lll is the language (c, c++, etc.) */ - output_file = strdup( opts->output_name ? opts->output_name : "a.out" ); + output_file = xstrdup( opts->output_name ? opts->output_name : "a.out" ); /* 'winegcc -o app xxx.exe.so' only creates the load script */ if (opts->files.count == 1 && strendswith(opts->files.str[0], ".exe.so")) @@ -1648,7 +1648,7 @@ int main(int argc, char **argv) switch (opts.args.str[i][1]) { case 'B': - str = strdup(option_arg); + str = xstrdup(option_arg); if (strendswith(str, "/")) str[strlen(str) - 1] = 0; strarray_add(&opts.prefix, str); raw_linker_arg = 1; @@ -1824,17 +1824,17 @@ int main(int argc, char **argv) { if (!strcmp(Wl.str[j], "--image-base") && j < Wl.count - 1) { - opts.image_base = strdup( Wl.str[++j] ); + opts.image_base = xstrdup( Wl.str[++j] ); continue; } if (!strcmp(Wl.str[j], "--section-alignment") && j < Wl.count - 1) { - opts.section_align = strdup( Wl.str[++j] ); + opts.section_align = xstrdup( Wl.str[++j] ); continue; } if (!strcmp(Wl.str[j], "--file-alignment") && j < Wl.count - 1) { - opts.file_align = strdup( Wl.str[++j] ); + opts.file_align = xstrdup( Wl.str[++j] ); continue; } if (!strcmp(Wl.str[j], "--large-address-aware")) @@ -1849,12 +1849,12 @@ int main(int argc, char **argv) } if (!strcmp(Wl.str[j], "--subsystem") && j < Wl.count - 1) { - opts.subsystem = strdup( Wl.str[++j] ); + opts.subsystem = xstrdup( Wl.str[++j] ); continue; } if (!strcmp(Wl.str[j], "--entry") && j < Wl.count - 1) { - opts.entry_point = strdup( Wl.str[++j] ); + opts.entry_point = xstrdup( Wl.str[++j] ); continue; } if (!strcmp(Wl.str[j], "-delayload") && j < Wl.count - 1) @@ -1864,7 +1864,7 @@ int main(int argc, char **argv) } if (!strcmp(Wl.str[j], "--debug-file") && j < Wl.count - 1) { - opts.debug_file = strdup( Wl.str[++j] ); + opts.debug_file = xstrdup( Wl.str[++j] ); continue; } if (!strcmp(Wl.str[j], "--whole-archive") || @@ -1877,7 +1877,7 @@ int main(int argc, char **argv) } if (!strcmp(Wl.str[j], "--out-implib")) { - opts.out_implib = strdup( Wl.str[++j] ); + opts.out_implib = xstrdup( Wl.str[++j] ); continue; } if (!strcmp(Wl.str[j], "-static")) linking = -1; diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index f3cd8840276..7ca339fbeef 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -157,8 +157,8 @@ static void init_argv0_dir( const char *argv0 ) #elif defined (__FreeBSD__) || defined(__DragonFly__) static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; size_t path_size = PATH_MAX; - char *path = malloc( path_size ); - if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) + char *path = xmalloc( path_size ); + if (!sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) dir = realpath( path, NULL ); free( path ); #else diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 41207120237..c80827127fe 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -307,8 +307,8 @@ static void init_argv0_dir( const char *argv0 ) #elif defined (__FreeBSD__) || defined(__DragonFly__) static int pathname[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; size_t path_size = PATH_MAX; - char *path = malloc( path_size ); - if (path && !sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) + char *path = xmalloc( path_size ); + if (!sysctl( pathname, sizeof(pathname)/sizeof(pathname[0]), path, &path_size, NULL, 0 )) dir = realpath( path, NULL ); free( path ); #else @@ -401,7 +401,7 @@ static void option_callback( int optc, char *optarg ) optarg++; /* fall through */ case 'o': - if (!output_name) output_name = strdup(optarg); + if (!output_name) output_name = xstrdup(optarg); else error("Too many output files.\n"); break; case 'O':

1 0

Alexandre Julliard : wrc: Use compare_name_id() for resource translations.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 78ef8cf44348f99c929679d5ca32c3c70bd42b8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=78ef8cf44348f99c929679d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 8 18:01:38 2022 +0100 wrc: Use compare_name_id() for resource translations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/translation.c | 26 +++++--------------------- tools/wrc/utils.c | 48 ++++++++++++++++++++++++++---------------------- 2 files changed, 31 insertions(+), 43 deletions(-) diff --git a/tools/wrc/translation.c b/tools/wrc/translation.c index eb0047c10b5..831daba2b85 100644 --- a/tools/wrc/translation.c +++ b/tools/wrc/translation.c @@ -274,18 +274,12 @@ static int compare_cursor_group(cursor_group_t *cursor_group1, cursor_group_t *c static int compare_control(control_t *control1, control_t *control2) { int different = 0; - char *nameid = NULL; int ignore_style; if(((control1 && !control2) || (!control1 && control2))) different = 1; if(different || !control1 || !control2) return different; - nameid = strdup(get_nameid_str(control1->ctlclass)); - if(strcmp(nameid, get_nameid_str(control2->ctlclass))) - different = 1; - free(nameid); - if (different) - return different; + if (compare_name_id( control1->ctlclass, control2->ctlclass )) return 1; /* allow the translators to set some styles */ ignore_style = 0; @@ -324,7 +318,6 @@ static int compare_control(control_t *control1, control_t *control2) { static int compare_dialog(dialog_t *dialog1, dialog_t *dialog2) { int different = 0; - char *nameid = NULL; control_t *ctrl1, *ctrl2; if(((dialog1->memopt != dialog2->memopt) || (dialog1->lvc.version != dialog2->lvc.version) || @@ -355,14 +348,9 @@ static int compare_dialog(dialog_t *dialog1, dialog_t *dialog2) { ((dialog1->gothelpid && !dialog2->gothelpid) || (!dialog1->gothelpid && dialog2->gothelpid))) different = 1; - nameid = strdup(get_nameid_str(dialog1->menu)); - if(!different && strcmp(nameid, get_nameid_str(dialog2->menu))) - different = 1; - free(nameid); - nameid = strdup(get_nameid_str(dialog1->dlgclass)); - if(!different && strcmp(nameid, get_nameid_str(dialog2->dlgclass))) - different = 1; - free(nameid); + + if (!different && compare_name_id( dialog1->menu, dialog2->menu )) return 1; + if (!different && compare_name_id( dialog1->dlgclass, dialog2->dlgclass )) return 1; ctrl1 = dialog1->controls; ctrl2 = dialog2->controls; @@ -570,15 +558,11 @@ static int compare_stringtable(stringtable_t *stringtable1, stringtable_t *strin static int compare_user(user_t *user1, user_t *user2) { int different = 0; - char *nameid = NULL; if(((user1->memopt != user2->memopt) || (user1->data->lvc.version != user2->data->lvc.version) || (user1->data->lvc.characts != user2->data->lvc.characts))) different = 1; - nameid = strdup(get_nameid_str(user1->type)); - if(!different && strcmp(nameid, get_nameid_str(user2->type))) - different = 1; - free(nameid); + if (!different) different = compare_name_id( user1->type, user2->type ); return different; } diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index b37bb226319..647505f50f4 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -153,6 +153,19 @@ int compare_striW( const WCHAR *str1, const WCHAR *str2 ) } } +int compare_striAW( const char *str1, const WCHAR *str2 ) +{ + for (;;) + { + /* only the A-Z range is case-insensitive */ + WCHAR ch1 = (*str1 >= 'a' && *str1 <= 'z') ? *str1 + 'A' - 'a' : (unsigned char)*str1; + WCHAR ch2 = (*str2 >= 'a' && *str2 <= 'z') ? *str2 + 'A' - 'a' : *str2; + if (!ch1 || ch1 != ch2) return ch1 - ch2; + str1++; + str2++; + } +} + /* ***************************************************************************** * Function : compare_name_id @@ -165,30 +178,21 @@ int compare_striW( const WCHAR *str1, const WCHAR *str2 ) */ int compare_name_id(const name_id_t *n1, const name_id_t *n2) { - switch (n1->type) - { - case name_ord: - if (n2->type == name_ord) return n1->name.i_name - n2->name.i_name; - return 1; + if (n1->type != n2->type) return n1->type == name_ord ? 1 : -1; + if (n1->type == name_ord) return n1->name.i_name - n2->name.i_name; - case name_str: - if (n2->type == name_str) - { - if(n1->name.s_name->type == str_char - && n2->name.s_name->type == str_char) - { - return compare_striA(n1->name.s_name->str.cstr, n2->name.s_name->str.cstr); - } - else - { - assert( n1->name.s_name->type == str_unicode ); - assert( n2->name.s_name->type == str_unicode ); - return compare_striW(n1->name.s_name->str.wstr, n2->name.s_name->str.wstr); - } - } - return -1; + if (n1->name.s_name->type == str_char) + { + if (n2->name.s_name->type == str_char) + return compare_striA(n1->name.s_name->str.cstr, n2->name.s_name->str.cstr); + return compare_striAW(n1->name.s_name->str.cstr, n2->name.s_name->str.wstr); + } + else + { + if (n2->name.s_name->type == str_char) + return -compare_striAW(n2->name.s_name->str.cstr, n1->name.s_name->str.wstr); + return compare_striW(n1->name.s_name->str.wstr, n2->name.s_name->str.wstr); } - return 0; /* Keep the compiler happy */ } #ifdef _WIN32

1 0

Alexandre Julliard : winebuild: Store length of Unicode strings explicitly.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 2c42d8b9a55558ed75ae5289d0c9ed8b538f3f83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c42d8b9a55558ed75ae5289… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 8 17:44:58 2022 +0100 winebuild: Store length of Unicode strings explicitly. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/res32.c | 82 ++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index a0209ad6f2a..80890f55458 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -35,6 +35,7 @@ typedef unsigned short WCHAR; struct string_id { WCHAR *str; /* ptr to Unicode string */ + unsigned int len; /* len in characters */ unsigned short id; /* integer id if str is NULL */ }; @@ -92,19 +93,6 @@ static inline struct resource *add_resource( DLLSPEC *spec ) return &spec->resources[spec->nb_resources++]; } -static inline unsigned int strlenW( const WCHAR *str ) -{ - const WCHAR *s = str; - while (*s) s++; - return s - str; -} - -static inline int strcmpW( const WCHAR *str1, const WCHAR *str2 ) -{ - while (*str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - static struct res_name *add_name( struct res_type *type, struct resource *res ) { struct res_name *name; @@ -132,8 +120,11 @@ static struct res_type *add_type( struct res_tree *tree, struct resource *res ) /* get a string from the current resource file */ static void get_string( struct string_id *str ) { + unsigned int i = 0; + size_t start_pos = input_buffer_pos; WCHAR wc = get_word(); + str->len = 0; if (wc == 0xffff) { str->str = NULL; @@ -141,10 +132,11 @@ static void get_string( struct string_id *str ) } else { - WCHAR *p = xmalloc( (strlenW( (const WCHAR *)(input_buffer + input_buffer_pos) - 1) + 1) * sizeof(WCHAR) ); - str->str = p; - str->id = 0; - if ((*p++ = wc)) while ((*p++ = get_word())); + input_buffer_pos = start_pos; + while (get_word()) str->len++; + str->str = xmalloc( str->len * sizeof(WCHAR) ); + input_buffer_pos = start_pos; + while ((wc = get_word())) str->str[i++] = wc; } } @@ -153,8 +145,8 @@ static void put_string( const struct string_id *str ) { if (str->str) { - const WCHAR *p = str->str; - while (*p) put_word( *p++ ); + unsigned int i; + for (i = 0; i < str->len; i++) put_word( str->str[i] ); put_word( 0 ); } else @@ -253,13 +245,18 @@ int load_res32_file( const char *name, DLLSPEC *spec ) /* compare two unicode strings/ids */ static int cmp_string( const struct string_id *str1, const struct string_id *str2 ) { + unsigned int i; + if (!str1->str) { if (!str2->str) return str1->id - str2->id; return 1; /* an id compares larger than a string */ } if (!str2->str) return -1; - return strcmpW( str1->str, str2->str ); + + for (i = 0; i < str1->len && i < str2->len; i++) + if (str1->str[i] != str2->str[i]) return str1->str[i] - str2->str[i]; + return str1->len - str2->len; } /* compare two resources for sorting the resource directory */ @@ -278,11 +275,13 @@ static int cmp_res( const void *ptr1, const void *ptr2 ) static char *format_res_string( const struct string_id *str ) { - int i, len = str->str ? strlenW(str->str) + 1 : 5; - char *ret = xmalloc( len ); + unsigned int i; + char *ret; - if (!str->str) sprintf( ret, "%04x", str->id ); - else for (i = 0; i < len; i++) ret[i] = str->str[i]; /* dumb W->A conversion */ + if (!str->str) return strmake( "#%04x", str->id ); + ret = xmalloc( str->len + 1 ); + for (i = 0; i < str->len; i++) ret[i] = str->str[i]; /* dumb W->A conversion */ + ret[i] = 0; return ret; } @@ -365,7 +364,7 @@ static struct res_tree *build_resource_tree( DLLSPEC *spec, unsigned int *dir_si if (type->type->str) { type->name_offset = offset | 0x80000000; - offset += (strlenW(type->type->str)+1) * sizeof(WCHAR); + offset += (type->type->len + 1) * sizeof(WCHAR); } else type->name_offset = type->type->id; @@ -374,7 +373,7 @@ static struct res_tree *build_resource_tree( DLLSPEC *spec, unsigned int *dir_si if (name->name->str) { name->name_offset = offset | 0x80000000; - offset += (strlenW(name->name->str)+1) * sizeof(WCHAR); + offset += (name->name->len + 1) * sizeof(WCHAR); } else name->name_offset = name->name->id; for (k = 0, res = name->res; k < name->nb_languages; k++, res++) @@ -399,13 +398,13 @@ static void free_resource_tree( struct res_tree *tree ) } /* output a Unicode string */ -static void output_string( const WCHAR *name ) +static void output_string( const struct string_id *str ) { - int i, len = strlenW(name); - output( "\t.short 0x%04x", len ); - for (i = 0; i < len; i++) output( ",0x%04x", name[i] ); + unsigned int i; + output( "\t.short 0x%04x", str->len ); + for (i = 0; i < str->len; i++) output( ",0x%04x", str->str[i] ); output( " /* " ); - for (i = 0; i < len; i++) output( "%c", isprint((char)name[i]) ? (char)name[i] : '?' ); + for (i = 0; i < str->len; i++) output( "%c", isprint((char)str->str[i]) ? (char)str->str[i] : '?' ); output( " */\n" ); } @@ -480,9 +479,9 @@ void output_resources( DLLSPEC *spec ) for (i = 0, type = tree->types; i < tree->nb_types; i++, type++) { - if (type->type->str) output_string( type->type->str ); + if (type->type->str) output_string( type->type ); for (n = 0, name = type->names; n < type->nb_names; n++, name++) - if (name->name->str) output_string( name->name->str ); + if (name->name->str) output_string( name->name ); } /* resource data */ @@ -503,11 +502,12 @@ void output_resources( DLLSPEC *spec ) } /* output a Unicode string in binary format */ -static void output_bin_string( const WCHAR *name ) +static void output_bin_string( const struct string_id *str ) { - int i, len = strlenW(name); - put_word( len ); - for (i = 0; i < len; i++) put_word( name[i] ); + unsigned int i; + + put_word( str->len ); + for (i = 0; i < str->len; i++) put_word( str->str[i] ); } /* output a resource directory in binary format */ @@ -588,9 +588,9 @@ void output_bin_resources( DLLSPEC *spec, unsigned int start_rva ) for (i = 0, type = tree->types; i < tree->nb_types; i++, type++) { - if (type->type->str) output_bin_string( type->type->str ); + if (type->type->str) output_bin_string( type->type ); for (n = 0, name = type->names; n < type->nb_names; n++, name++) - if (name->name->str) output_bin_string( name->name->str ); + if (name->name->str) output_bin_string( name->name ); } /* resource data */ @@ -610,10 +610,10 @@ static unsigned int get_resource_header_size( const struct resource *res ) unsigned int size = 5 * sizeof(unsigned int) + 2 * sizeof(unsigned short); if (!res->type.str) size += 2 * sizeof(unsigned short); - else size += (strlenW(res->type.str) + 1) * sizeof(WCHAR); + else size += (res->type.len + 1) * sizeof(WCHAR); if (!res->name.str) size += 2 * sizeof(unsigned short); - else size += (strlenW(res->name.str) + 1) * sizeof(WCHAR); + else size += (res->name.len + 1) * sizeof(WCHAR); return size; }

1 0

Alexandre Julliard : make_xftmpl: Use the standard output buffer routines.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 7d3938e81146e99b5b188aa49eb1b3345c697db7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d3938e81146e99b5b188aa4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 8 17:40:53 2022 +0100 make_xftmpl: Use the standard output buffer routines. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_xftmpl.c | 167 ++++++++++++++++++++++------------------------------ 1 file changed, 69 insertions(+), 98 deletions(-) diff --git a/tools/make_xftmpl.c b/tools/make_xftmpl.c index b7f964c28d7..d707dc06cd2 100644 --- a/tools/make_xftmpl.c +++ b/tools/make_xftmpl.c @@ -93,8 +93,10 @@ static FILE *infile; static int line_no; static const char *infile_name; static FILE *outfile; -static BYTE *output_data; -static UINT output_pos, output_size; + +unsigned char *output_buffer = NULL; +size_t output_buffer_pos = 0; +size_t output_buffer_size = 0; static void fatal_error( const char *msg, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); @@ -136,63 +138,33 @@ static inline BOOL read_bytes( void *data, DWORD size ) static BOOL write_c_hex_bytes(void) { UINT i; - for (i = 0; i < output_pos; i++) + for (i = 0; i < output_buffer_pos; i++) { if (i % 12 == 0) fprintf(outfile, "\n "); - fprintf(outfile, " 0x%02x,", output_data[i]); + fprintf(outfile, " 0x%02x,", output_buffer[i]); } return TRUE; } static BOOL write_raw_bytes(void) { - return fwrite(output_data, output_pos, 1, outfile) > 0; -} - -static inline BOOL write_bytes(const void *data, DWORD size) -{ - if (output_pos + size > output_size) - { - output_size = max( output_size * 2, size ); - output_data = realloc( output_data, output_size ); - if (!output_data) return FALSE; - } - memcpy( output_data + output_pos, data, size ); - output_pos += size; - return TRUE; -} - -static inline BOOL write_byte(BYTE value) -{ - return write_bytes( &value, sizeof(value) ); + return fwrite(output_buffer, output_buffer_pos, 1, outfile) > 0; } -static inline BOOL write_word(WORD value) -{ - return write_byte( value ) && - write_byte( value >> 8 ); -} - -static inline BOOL write_dword(DWORD value) -{ - return write_word( value ) && - write_word( value >> 16 ); -} - -static inline BOOL write_float(float value) +static inline void put_float(float value) { DWORD val; memcpy( &val, &value, sizeof(value) ); - return write_dword( val ); + return put_dword( val ); } -static inline BOOL write_guid(const GUID *guid) +static inline void put_guid(const GUID *guid) { - return write_dword( guid->Data1 ) && - write_word( guid->Data2 ) && - write_word( guid->Data3 ) && - write_bytes( guid->Data4, sizeof(guid->Data4) ); + put_dword( guid->Data1 ); + put_word( guid->Data2 ); + put_word( guid->Data3 ); + put_data( guid->Data4, sizeof(guid->Data4) ); } static int compare_names(const void *a, const void *b) @@ -209,10 +181,11 @@ static BOOL parse_keyword( const char *name ) if (!keyword) return FALSE; - return write_word(keyword->token); + put_word(keyword->token); + return TRUE; } -static BOOL parse_guid(void) +static void parse_guid(void) { char buf[39]; GUID guid; @@ -238,11 +211,11 @@ static BOOL parse_guid(void) guid.Data4[6] = tab[8]; guid.Data4[7] = tab[9]; - return write_word(TOKEN_GUID) && - write_guid(&guid); + put_word(TOKEN_GUID); + put_guid(&guid); } -static BOOL parse_name(void) +static void parse_name(void) { char c; int len = 0; @@ -257,16 +230,15 @@ static BOOL parse_name(void) unread_byte(c); name[len] = 0; - if (parse_keyword(name)) { - return TRUE; - } else { - return write_word(TOKEN_NAME) && - write_dword(len) && - write_bytes(name, len); + if (!parse_keyword(name)) + { + put_word(TOKEN_NAME); + put_dword(len); + put_data(name, len); } } -static BOOL parse_number(void) +static void parse_number(void) { int len = 0; char c; @@ -289,17 +261,15 @@ static BOOL parse_number(void) float value; ret = sscanf(buffer, "%f", &value); if (!ret) fatal_error( "invalid float token\n" ); - ret = write_word(TOKEN_FLOAT) && - write_float(value); + put_word(TOKEN_FLOAT); + put_float(value); } else { int value; ret = sscanf(buffer, "%d", &value); if (!ret) fatal_error( "invalid integer token\n" ); - ret = write_word(TOKEN_INTEGER) && - write_dword(value); + put_word(TOKEN_INTEGER); + put_dword(value); } - - return ret; } static BOOL parse_token(void) @@ -317,17 +287,17 @@ static BOOL parse_token(void) case '\r': case ' ': case '\t': - return TRUE; - - case '{': return write_word(TOKEN_OBRACE); - case '}': return write_word(TOKEN_CBRACE); - case '[': return write_word(TOKEN_OBRACKET); - case ']': return write_word(TOKEN_CBRACKET); - case '(': return write_word(TOKEN_OPAREN); - case ')': return write_word(TOKEN_CPAREN); - case ',': return write_word(TOKEN_COMMA); - case ';': return write_word(TOKEN_SEMICOLON); - case '.': return write_word(TOKEN_DOT); + break; + + case '{': put_word(TOKEN_OBRACE); break; + case '}': put_word(TOKEN_CBRACE); break; + case '[': put_word(TOKEN_OBRACKET); break; + case ']': put_word(TOKEN_CBRACKET); break; + case '(': put_word(TOKEN_OPAREN); break; + case ')': put_word(TOKEN_CPAREN); break; + case ',': put_word(TOKEN_COMMA); break; + case ';': put_word(TOKEN_SEMICOLON); break; + case '.': put_word(TOKEN_DOT); break; case '/': if (!read_byte(&c) || c != '/') @@ -342,11 +312,11 @@ static BOOL parse_token(void) if (c != '\n') fatal_error( "line too long\n" ); buffer[len] = 0; tok = strtok( buffer, " \t" ); - if (!tok || strcmp( tok, "pragma" )) return TRUE; + if (!tok || strcmp( tok, "pragma" )) break; tok = strtok( NULL, " \t" ); - if (!tok || strcmp( tok, "xftmpl" )) return TRUE; + if (!tok || strcmp( tok, "xftmpl" )) break; tok = strtok( NULL, " \t" ); - if (!tok) return TRUE; + if (!tok) break; if (!strcmp( tok, "name" )) { tok = strtok( NULL, " \t" ); @@ -357,10 +327,11 @@ static BOOL parse_token(void) tok = strtok( NULL, " \t" ); if (tok && !option_inc_size_name) option_inc_size_name = xstrdup( tok ); } - return TRUE; + break; case '<': - return parse_guid(); + parse_guid(); + break; case '"': len = 0; @@ -371,17 +342,16 @@ static BOOL parse_token(void) buffer[len++] = c; } if (c != '"') fatal_error( "unterminated string\n" ); - return write_word(TOKEN_STRING) && - write_dword(len) && - write_bytes(buffer, len); + put_word(TOKEN_STRING); + put_dword(len); + put_data(buffer, len); + break; default: unread_byte(c); - if (isdigit(c) || c == '-') - return parse_number(); - if (isalpha(c) || c == '_') - return parse_name(); - fatal_error( "invalid character '%c' to start token\n", c ); + if (isdigit(c) || c == '-') parse_number(); + else if (isalpha(c) || c == '_') parse_name(); + else fatal_error( "invalid character '%c' to start token\n", c ); } return TRUE; @@ -489,6 +459,19 @@ int main(int argc, char **argv) goto error; } + init_output_buffer(); + put_data("xof 0302bin 0064", 16); + + line_no = 1; + while (parse_token()); + + if (ferror(infile)) + { + perror(infile_name); + return 1; + } + fclose(infile); + if (!strcmp(option_outfile_name, "-")) { option_outfile_name = "stdout"; outfile = stdout; @@ -506,13 +489,7 @@ int main(int argc, char **argv) } } - if (!write_bytes("xof 0302bin 0064", 16)) - goto error; - - line_no = 1; - while (parse_token()); - - if (ferror(outfile) || ferror(infile)) + if (ferror(outfile)) goto error; if (option_header) @@ -543,24 +520,18 @@ int main(int argc, char **argv) write_c_hex_bytes(); fprintf(outfile, "\n};\n\n"); if (option_inc_size_name) - fprintf(outfile, "#define %s %u\n\n", option_inc_size_name, output_pos); + fprintf(outfile, "#define %s %u\n\n", option_inc_size_name, (unsigned int)output_buffer_pos); fprintf(outfile, "#endif /* __WINE_%s */\n", header_name); if (ferror(outfile)) goto error; } else write_raw_bytes(); - fclose(infile); fclose(outfile); output_file = NULL; return 0; error: - if (infile) { - if (ferror(infile)) - perror(infile_name); - fclose(infile); - } if (outfile) { if (ferror(outfile)) perror(option_outfile_name);

1 0

Alex Henrie : user32/tests: Expect DialogBoxParam to set ERROR_CANNOT_FIND_WND_CLASS.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 62910fffa407fd5cdb84e313867665909615a694 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62910fffa407fd5cdb84e313… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 7 22:12:59 2022 -0700 user32/tests: Expect DialogBoxParam to set ERROR_CANNOT_FIND_WND_CLASS. Fixes a testbot failure. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 24aced8e192..f2bc30ff921 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1851,7 +1851,10 @@ static void test_DialogBoxParam(void) SetLastError(0xdeadbeef); ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_DIALOG_INVALID_CLASS", 0, DestroyDlgWinProc, 0); ok(ret == -1, "DialogBoxParamA returned %ld, expected -1\n", ret); - ok(GetLastError() == 0, "got %d\n", GetLastError()); + todo_wine + ok(GetLastError() == ERROR_CANNOT_FIND_WND_CLASS || + broken(GetLastError() == ERROR_SUCCESS) /* < win10 21H1 */, + "got %u, expected ERROR_CANNOT_FIND_WND_CLASS\n", GetLastError()); SetLastError(0xdeadbeef); ret = DefDlgProcA(0, WM_ERASEBKGND, 0, 0);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022