March 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : dsdmo: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: fe60d1cfdee27b415994404220526037dfef7e32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe60d1cfdee27b4159944042… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:54:13 2021 +0100 dsdmo: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/Makefile.in | 2 +- dlls/dsdmo/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in index d86dbbd804a..d6702984785 100644 --- a/dlls/dsdmo/Makefile.in +++ b/dlls/dsdmo/Makefile.in @@ -1,7 +1,7 @@ MODULE = dsdmo.dll IMPORTS = dmoguids strmiids uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 57214b32752..c6fc30dc2c4 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -803,8 +803,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { switch(reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: dsdmo_instance = instance; DisableThreadLibraryCalls(dsdmo_instance);

1 0

Alexandre Julliard : comsvcs: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 0ed2adf60f87e9c698759a915b16aeceef945acc URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ed2adf60f87e9c698759a91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:53:55 2021 +0100 comsvcs: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/Makefile.in | 2 +- dlls/comsvcs/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in index 7845400cb2e..54d4e6a9ded 100644 --- a/dlls/comsvcs/Makefile.in +++ b/dlls/comsvcs/Makefile.in @@ -2,7 +2,7 @@ MODULE = comsvcs.dll IMPORTLIB = comsvcs IMPORTS = ole32 uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 74704077ecb..3023783bdf5 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -360,8 +360,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID lpv) { switch(reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: COMSVCS_hInstance = hinst; DisableThreadLibraryCalls(hinst);

1 0

Alexandre Julliard : inseng: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 57e79a632e6b8d59bb629816b2ae13f818dba924 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57e79a632e6b8d59bb629816… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:54:32 2021 +0100 inseng: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inseng/Makefile.in | 2 +- dlls/inseng/inseng_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in index 797a0d2b46f..d3f29328f67 100644 --- a/dlls/inseng/Makefile.in +++ b/dlls/inseng/Makefile.in @@ -1,7 +1,7 @@ MODULE = inseng.dll IMPORTS = uuid ole32 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = inseng_main.c diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index 631a9364e39..c9a5988478c 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -362,8 +362,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { switch(fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL);

1 0

Alexandre Julliard : infosoft: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: e00035f982db5d0fe35162dc0538acbf1c210490 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e00035f982db5d0fe35162dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:54:25 2021 +0100 infosoft: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/infosoft/Makefile.in | 2 +- dlls/infosoft/infosoft_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/infosoft/Makefile.in b/dlls/infosoft/Makefile.in index 813e65d8376..485b0b69341 100644 --- a/dlls/infosoft/Makefile.in +++ b/dlls/infosoft/Makefile.in @@ -1,7 +1,7 @@ MODULE = infosoft.dll IMPORTS = uuid advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ infosoft_main.c \ diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c index 1d93b4923bd..d12f6520cce 100644 --- a/dlls/infosoft/infosoft_main.c +++ b/dlls/infosoft/infosoft_main.c @@ -43,8 +43,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { switch(fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL);

1 0

Alexandre Julliard : mf: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 93e23c5d407844706e5d0463348c644473e82ccb URL: https://source.winehq.org/git/wine.git/?a=commit;h=93e23c5d407844706e5d0463… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:54:42 2021 +0100 mf: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 2 +- dlls/mf/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index cd50a849b7c..f60e337b386 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -3,7 +3,7 @@ IMPORTLIB = mf IMPORTS = advapi32 mfplat ole32 uuid mfuuid strmiids DELAYIMPORTS = evr -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ copier.c \ diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 2caf50c54e0..bf7066ad032 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1076,8 +1076,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: mf_instance = instance; DisableThreadLibraryCalls(instance);

1 0

Alexandre Julliard : mfreadwrite: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 768ff9ab12c349099561abc8f28c218badf30e73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=768ff9ab12c349099561abc8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:54:47 2021 +0100 mfreadwrite: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/Makefile.in | 2 +- dlls/mfreadwrite/reader.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in index 733732b431e..191cfc20f0b 100644 --- a/dlls/mfreadwrite/Makefile.in +++ b/dlls/mfreadwrite/Makefile.in @@ -2,7 +2,7 @@ MODULE = mfreadwrite.dll IMPORTLIB = mfreadwrite IMPORTS = mfuuid uuid mfplat ole32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ reader.c \ diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 9903898a155..ab959c26165 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -51,8 +51,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: mfinstance = instance; DisableThreadLibraryCalls(instance);

1 0

Alexandre Julliard : dpvoice: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 15da5be4664bcfbed8d7fb07d6e5d653ed62b684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15da5be4664bcfbed8d7fb07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:54:07 2021 +0100 dpvoice: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpvoice/Makefile.in | 2 +- dlls/dpvoice/main.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/dpvoice/Makefile.in b/dlls/dpvoice/Makefile.in index 38e934dda16..872080fa310 100644 --- a/dlls/dpvoice/Makefile.in +++ b/dlls/dpvoice/Makefile.in @@ -1,7 +1,7 @@ MODULE = dpvoice.dll IMPORTS = dxguid uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ client.c \ diff --git a/dlls/dpvoice/main.c b/dlls/dpvoice/main.c index 73441a80e05..66d67586276 100644 --- a/dlls/dpvoice/main.c +++ b/dlls/dpvoice/main.c @@ -109,13 +109,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - DPVOICE_hInstance = hinstDLL; - switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + DPVOICE_hInstance = hinstDLL; DisableThreadLibraryCalls(hinstDLL); break; default:

1 0

Alexandre Julliard : directmanipulation: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: wine Branch: master Commit: 79aa19c10d5054ad3c94c8ec691890991515b57c URL: https://source.winehq.org/git/wine.git/?a=commit;h=79aa19c10d5054ad3c94c8ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:54:01 2021 +0100 directmanipulation: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/Makefile.in | 2 +- dlls/directmanipulation/directmanipulation.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/directmanipulation/Makefile.in b/dlls/directmanipulation/Makefile.in index d67a21eb779..258d3c67177 100644 --- a/dlls/directmanipulation/Makefile.in +++ b/dlls/directmanipulation/Makefile.in @@ -1,7 +1,7 @@ MODULE = directmanipulation.dll IMPORTS = uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native IDL_SRCS = directmanip.idl diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index 5bb3461d443..5db998ee9c8 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -38,8 +38,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: dm_instance = instance; DisableThreadLibraryCalls(instance);

1 0

Zebediah Figura : vkd3d-shader: Factor out hlsl_new_loop().
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: vkd3d Branch: master Commit: 0f4d62b09d424f9233ec58c6e2fd078611fcaa30 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0f4d62b09d424f9233ec58c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Feb 27 18:03:14 2021 -0600 vkd3d-shader: Factor out hlsl_new_loop(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 11 +++++++++++ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 4 +--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 1b388d5..4e73060 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -510,6 +510,17 @@ struct hlsl_ir_jump *hlsl_new_jump(enum hlsl_ir_jump_type type, struct vkd3d_sha return jump; } +struct hlsl_ir_loop *hlsl_new_loop(struct vkd3d_shader_location loc) +{ + struct hlsl_ir_loop *loop; + + if (!(loop = vkd3d_calloc(1, sizeof(*loop)))) + return NULL; + init_node(&loop->node, HLSL_IR_LOOP, NULL, loc); + list_init(&loop->body); + return loop; +} + bool hlsl_type_is_void(const struct hlsl_type *type) { return type->type == HLSL_CLASS_OBJECT && type->base_type == HLSL_TYPE_VOID; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index c3b5d56..36e7dd0 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -530,6 +530,7 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hl struct list *parameters, const char *semantic, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_if *hlsl_new_if(struct hlsl_ir_node *condition, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_jump *hlsl_new_jump(enum hlsl_ir_jump_type type, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; +struct hlsl_ir_loop *hlsl_new_loop(struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_assignment *hlsl_new_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) DECLSPEC_HIDDEN; struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, struct list *fields) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 45b9742..1341de1 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -403,11 +403,9 @@ static struct list *create_loop(enum loop_type type, struct list *init, struct l if (init) list_move_head(list, init); - if (!(loop = vkd3d_calloc(1, sizeof(*loop)))) + if (!(loop = hlsl_new_loop(loc))) goto oom; - init_node(&loop->node, HLSL_IR_LOOP, NULL, loc); list_add_tail(list, &loop->node.entry); - list_init(&loop->body); if (!append_conditional_break(cond)) goto oom;

1 0

Zebediah Figura : vkd3d-shader: Assert that we don't read out of bounds of the base_types array.
by Alexandre Julliard March 2, 2021

March 2, 2021

Module: vkd3d Branch: master Commit: 8d444ebbfc37b6f4f6f843e9a4798acb2d82a7a7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8d444ebbfc37b6f4f6f843e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Feb 27 18:03:11 2021 -0600 vkd3d-shader: Assert that we don't read out of bounds of the base_types array. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index fbbe001..1d76777 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -675,14 +675,17 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct vkd3d_string_buffer_cache switch (type->type) { case HLSL_CLASS_SCALAR: + assert(type->base_type < ARRAY_SIZE(base_types)); vkd3d_string_buffer_printf(string, "%s", base_types[type->base_type]); return string; case HLSL_CLASS_VECTOR: + assert(type->base_type < ARRAY_SIZE(base_types)); vkd3d_string_buffer_printf(string, "%s%u", base_types[type->base_type], type->dimx); return string; case HLSL_CLASS_MATRIX: + assert(type->base_type < ARRAY_SIZE(base_types)); vkd3d_string_buffer_printf(string, "%s%ux%u", base_types[type->base_type], type->dimx, type->dimy); return string;

1 0