February 2022 - Wine-Commits

Eric Pouech : d3d10: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: 96b08eaecbd583b674780dd202369ada1c6a4c38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b08eaecbd583b674780dd2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 8 19:48:47 2022 +0100 d3d10: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/Makefile.in | 2 +- dlls/d3d10/d3d10_main.c | 24 ++--- dlls/d3d10/effect.c | 228 +++++++++++++++++++-------------------- dlls/d3d10/shader.c | 2 +- dlls/d3d10/stateblock.c | 4 +- dlls/d3dcompiler_43/reflection.c | 7 +- dlls/d3dcompiler_43/utils.c | 3 + 7 files changed, 138 insertions(+), 132 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=96b08eaecbd583b67478…

1 0

Eric Pouech : msvcr: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: 9b802a3d5649c71b9294dfe5a050099f47d9c872 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b802a3d5649c71b9294dfe5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 8 19:38:40 2022 +0100 msvcr: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/Makefile.in | 1 - dlls/crtdll/Makefile.in | 2 +- dlls/msvcr100/Makefile.in | 2 +- dlls/msvcr110/Makefile.in | 2 +- dlls/msvcr120/Makefile.in | 2 +- dlls/msvcr70/Makefile.in | 2 +- dlls/msvcr71/Makefile.in | 2 +- dlls/msvcr80/Makefile.in | 2 +- dlls/msvcr90/Makefile.in | 2 +- dlls/msvcrt/Makefile.in | 2 +- dlls/msvcrt/concurrency.c | 4 +-- dlls/msvcrt/console.c | 2 +- dlls/msvcrt/except.c | 2 +- dlls/msvcrt/except_i386.c | 18 +++++----- dlls/msvcrt/except_x86_64.c | 12 +++---- dlls/msvcrt/file.c | 87 +++++++++++++++++++++++---------------------- dlls/msvcrt/locale.c | 14 ++++---- dlls/msvcrt/main.c | 2 +- dlls/msvcrt/math.c | 2 +- dlls/msvcrt/mbcs.c | 10 ++++-- dlls/msvcrt/misc.c | 6 ++-- dlls/msvcrt/thread.c | 4 +-- dlls/msvcrtd/Makefile.in | 2 +- dlls/ucrtbase/Makefile.in | 2 +- 24 files changed, 96 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9b802a3d5649c71b9294…

1 0

Alexandre Julliard : wrc: Use compare_name_id() for resource translations.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

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 : tools: Consistently use xmalloc/xrealloc/xstrdup everywhere.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

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

Zebediah Figura : wined3d: Use the chunk allocator for GL pixel unpack buffers.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

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

Nikolay Sivov : combase: Build without WINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

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

Piotr Caban : msvcrt: Print 0x prefix with %#x format in traces.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: 4397d97d91d4480c995a81364f71d7f088a79510 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4397d97d91d4480c995a8136… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 8 19:39:12 2022 +0100 msvcrt: Print 0x prefix with %#x format in traces. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 2 +- dlls/msvcrt/file.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 8b6c34abf56..d1f514fd460 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -656,7 +656,7 @@ int CDECL _initterm_e(_INITTERM_E_FN *table, _INITTERM_E_FN *end) TRACE("calling %p\n", **table); res = (**table)(); if (res) - TRACE("function %p failed: 0x%x\n", *table, res); + TRACE("function %p failed: %#x\n", *table, res); } table++; diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7c39a50a656..86c67868381 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1368,7 +1368,7 @@ int CDECL _locking(int fd, int mode, __msvcrt_long nbytes) return -1; } - TRACE(":fd (%d) by 0x%lx mode %s\n", + TRACE(":fd (%d) by %#lx mode %s\n", fd, nbytes, (mode == _LK_UNLCK) ? "_LK_UNLCK" : (mode == _LK_LOCK) ? "_LK_LOCK" : (mode == _LK_NBLCK) ? "_LK_NBLCK" : @@ -1815,7 +1815,7 @@ int CDECL _fstat64(int fd, struct _stat64* buf) RtlTimeToSecondsSince1970((LARGE_INTEGER *)&basic_info.LastWriteTime, &dw); buf->st_mtime = buf->st_ctime = dw; buf->st_nlink = std_info.NumberOfLinks; - TRACE(":dwFileAttributes = 0x%lx, mode set to 0x%x\n", + TRACE(":dwFileAttributes = %#lx, mode set to %#x\n", basic_info.FileAttributes, buf->st_mode); } release_ioinfo(info); @@ -2121,7 +2121,7 @@ static unsigned split_oflags(unsigned oflags) if ((unsupp = oflags & ~(_O_BINARY | _O_TEXT | _O_APPEND | _O_TRUNC | _O_EXCL | _O_CREAT | _O_RDWR | _O_WRONLY | _O_TEMPORARY | _O_NOINHERIT | _O_SEQUENTIAL | _O_RANDOM | _O_SHORT_LIVED | _O_WTEXT | _O_U16TEXT | _O_U8TEXT))) - ERR(":unsupported oflags 0x%04x\n",unsupp); + ERR(":unsupported oflags %#x\n",unsupp); return wxflags; } @@ -2212,7 +2212,7 @@ int CDECL _wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pm int wxflag; HANDLE hand; - TRACE("path: (%s) oflags: 0x%04x shflags: 0x%04x pmode: 0x%04x fd*: %p secure: %d\n", + TRACE("path: (%s) oflags: %#x shflags: %#x pmode: %#x fd*: %p secure: %d\n", debugstr_w(path), oflags, shflags, pmode, fd, secure); if (!MSVCRT_CHECK_PMT( fd != NULL )) return EINVAL; @@ -2261,7 +2261,7 @@ int CDECL _wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pm sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; default: - ERR( "Unhandled shflags 0x%x\n", shflags ); + ERR( "Unhandled shflags %#x\n", shflags ); return EINVAL; } @@ -2547,7 +2547,7 @@ int CDECL _open_osfhandle(intptr_t handle, int oflags) flags |= split_oflags(oflags); fd = msvcrt_alloc_fd((HANDLE)handle, flags); - TRACE(":handle (%Iu) fd (%d) flags 0x%08lx\n", handle, fd, flags); + TRACE(":handle (%Iu) fd (%d) flags %#lx\n", handle, fd, flags); return fd; }

1 0

Eric Pouech : d3d10/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: 7bba86db284127942104116c695ca57fdf957496 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bba86db284127942104116c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 8 19:48:43 2022 +0100 d3d10/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/Makefile.in | 2 +- dlls/d3d10/tests/device.c | 54 +- dlls/d3d10/tests/effect.c | 1168 ++++++++++++++++---------------- dlls/d3dcompiler_43/tests/reflection.c | 3 + 4 files changed, 614 insertions(+), 613 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7bba86db284127942104…

1 0

Eric Pouech : d3dcompiler/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: 58d20aae3772473a90e43ee236b793f0421eecb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58d20aae3772473a90e43ee2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 8 19:48:44 2022 +0100 d3dcompiler/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/Makefile.in | 2 +- dlls/d3dcompiler_43/tests/asm.c | 58 ++++--- dlls/d3dcompiler_43/tests/blob.c | 290 ++++++++++++++++----------------- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 68 ++++---- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 126 +++++++------- dlls/d3dcompiler_43/tests/reflection.c | 205 ++++++++++++----------- dlls/d3dcompiler_46/tests/Makefile.in | 2 +- dlls/d3dcompiler_47/tests/Makefile.in | 2 +- 8 files changed, 378 insertions(+), 375 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=58d20aae3772473a90e4…

1 0

Henri Verbeet : d3d10: Return the read value from read_dword().
by Alexandre Julliard Feb. 8, 2022

Feb. 8, 2022

Module: wine Branch: master Commit: ee01c2022f5f4618390a3554c5a701a8a508431f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee01c2022f5f4618390a3554… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 8 19:48:45 2022 +0100 d3d10: Return the read value from read_dword(). This makes it consistent with d3dcompiler after commit e6961f6e16b35729301967b04078158cd66eaab2. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 202 +++++++++++++++++++++++++++------------------------- 1 file changed, 103 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee01c2022f5f4618390a…

1 0