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

Alexandre Julliard : dpvoice: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 02 Mar '21

02 Mar '21

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 : dsdmo: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 02 Mar '21

02 Mar '21

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 : dx8vb: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 095b40f40c1b4c14541764099eac17eb34305228 URL: https://source.winehq.org/git/wine.git/?a=commit;h=095b40f40c1b4c1454176409… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:54:18 2021 +0100 dx8vb: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dx8vb/Makefile.in | 2 +- dlls/dx8vb/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/dx8vb/Makefile.in b/dlls/dx8vb/Makefile.in index 727265c6983..184d2a3c367 100644 --- a/dlls/dx8vb/Makefile.in +++ b/dlls/dx8vb/Makefile.in @@ -1,7 +1,7 @@ MODULE = dx8vb.dll IMPORTS = uuid ole32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/dx8vb/main.c b/dlls/dx8vb/main.c index 7dbe47d25af..4784c84e203 100644 --- a/dlls/dx8vb/main.c +++ b/dlls/dx8vb/main.c @@ -44,8 +44,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: DisableThreadLibraryCalls(instance); instance_dx8vb = instance;

1 0

Alexandre Julliard : infosoft: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 02 Mar '21

02 Mar '21

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 : inseng: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 02 Mar '21

02 Mar '21

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 : mf: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 02 Mar '21

02 Mar '21

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 02 Mar '21

02 Mar '21

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 : mmcndmgr: Use --prefer_native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: af904dd33f6e243988fff5e6d4feacb7210982bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=af904dd33f6e243988fff5e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 10:54:53 2021 +0100 mmcndmgr: Use --prefer_native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmcndmgr/Makefile.in | 2 +- dlls/mmcndmgr/mmcndmgr.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mmcndmgr/Makefile.in b/dlls/mmcndmgr/Makefile.in index 3bc8209fc5c..4a038fa4c61 100644 --- a/dlls/mmcndmgr/Makefile.in +++ b/dlls/mmcndmgr/Makefile.in @@ -1,7 +1,7 @@ MODULE = mmcndmgr.dll IMPORTS = uuid oleaut32 ole32 user32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ mmcndmgr.c diff --git a/dlls/mmcndmgr/mmcndmgr.c b/dlls/mmcndmgr/mmcndmgr.c index 4e6e2e6d2ba..82f866860d6 100644 --- a/dlls/mmcndmgr/mmcndmgr.c +++ b/dlls/mmcndmgr/mmcndmgr.c @@ -177,8 +177,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: MMC_hInstance = hinstDLL; break;

1 0

Zebediah Figura : vkd3d-shader: Return a vkd3d_string_buffer from hlsl_type_to_string().
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: vkd3d Branch: master Commit: 48a1db2976301cd111557fc1ed2924eef72ac517 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=48a1db2976301cd111557fc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Feb 27 18:03:09 2021 -0600 vkd3d-shader: Return a vkd3d_string_buffer from hlsl_type_to_string(). 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 | 62 +++++++++++++++++--------------- libs/vkd3d-shader/hlsl.h | 4 ++- libs/vkd3d-shader/hlsl.y | 20 ++++++----- libs/vkd3d-shader/vkd3d_shader_main.c | 60 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 11 ++++++ 5 files changed, 120 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=48a1db2976301cd1115…

1 0

Zebediah Figura : vkd3d-shader: Return a vkd3d_string_buffer from hlsl_modifiers_to_string().
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: vkd3d Branch: master Commit: 35105d4e292b0404be49aa4b6dcd49932227e26d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=35105d4e292b0404be49aa4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Feb 27 18:03:10 2021 -0600 vkd3d-shader: Return a vkd3d_string_buffer from hlsl_modifiers_to_string(). 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 | 54 +++++++++++++++++++++++++----------------------- libs/vkd3d-shader/hlsl.h | 3 ++- libs/vkd3d-shader/hlsl.y | 16 +++++++------- 3 files changed, 38 insertions(+), 35 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index e2a7770..fbbe001 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -730,46 +730,45 @@ const char *debug_hlsl_type(const struct hlsl_type *type) return ret; } -char *hlsl_modifiers_to_string(unsigned int modifiers) +struct vkd3d_string_buffer *hlsl_modifiers_to_string(struct vkd3d_string_buffer_cache *string_buffers, + unsigned int modifiers) { - char *string; - size_t len; + struct vkd3d_string_buffer *string; - if (!(string = vkd3d_malloc(110))) + if (!(string = vkd3d_string_buffer_get(string_buffers))) return NULL; - string[0] = 0; if (modifiers & HLSL_STORAGE_EXTERN) - strcat(string, "extern "); /* 7 */ + vkd3d_string_buffer_printf(string, "extern "); if (modifiers & HLSL_STORAGE_NOINTERPOLATION) - strcat(string, "nointerpolation "); /* 16 */ + vkd3d_string_buffer_printf(string, "nointerpolation "); if (modifiers & HLSL_MODIFIER_PRECISE) - strcat(string, "precise "); /* 8 */ + vkd3d_string_buffer_printf(string, "precise "); if (modifiers & HLSL_STORAGE_SHARED) - strcat(string, "shared "); /* 7 */ + vkd3d_string_buffer_printf(string, "shared "); if (modifiers & HLSL_STORAGE_GROUPSHARED) - strcat(string, "groupshared "); /* 12 */ + vkd3d_string_buffer_printf(string, "groupshared "); if (modifiers & HLSL_STORAGE_STATIC) - strcat(string, "static "); /* 7 */ + vkd3d_string_buffer_printf(string, "static "); if (modifiers & HLSL_STORAGE_UNIFORM) - strcat(string, "uniform "); /* 8 */ + vkd3d_string_buffer_printf(string, "uniform "); if (modifiers & HLSL_STORAGE_VOLATILE) - strcat(string, "volatile "); /* 9 */ + vkd3d_string_buffer_printf(string, "volatile "); if (modifiers & HLSL_MODIFIER_CONST) - strcat(string, "const "); /* 6 */ + vkd3d_string_buffer_printf(string, "const "); if (modifiers & HLSL_MODIFIER_ROW_MAJOR) - strcat(string, "row_major "); /* 10 */ + vkd3d_string_buffer_printf(string, "row_major "); if (modifiers & HLSL_MODIFIER_COLUMN_MAJOR) - strcat(string, "column_major "); /* 13 */ + vkd3d_string_buffer_printf(string, "column_major "); if ((modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)) == (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)) - strcat(string, "inout "); /* 6 */ + vkd3d_string_buffer_printf(string, "inout "); else if (modifiers & HLSL_STORAGE_IN) - strcat(string, "in "); /* 3 */ + vkd3d_string_buffer_printf(string, "in "); else if (modifiers & HLSL_STORAGE_OUT) - strcat(string, "out "); /* 4 */ + vkd3d_string_buffer_printf(string, "out "); - if ((len = strlen(string))) - string[len - 1] = 0; + if (string->content_size) + string->buffer[--string->content_size] = 0; return string; } @@ -818,11 +817,14 @@ static void dump_ir_var(struct vkd3d_string_buffer *buffer, const struct hlsl_ir { if (var->modifiers) { - char *string; - - if ((string = hlsl_modifiers_to_string(var->modifiers))) - vkd3d_string_buffer_printf(buffer, "%s ", string); - vkd3d_free(string); + struct vkd3d_string_buffer_cache string_buffers; + struct vkd3d_string_buffer *string; + + vkd3d_string_buffer_cache_init(&string_buffers); + if ((string = hlsl_modifiers_to_string(&string_buffers, var->modifiers))) + vkd3d_string_buffer_printf(buffer, "%s ", string->buffer); + vkd3d_string_buffer_release(&string_buffers, string); + vkd3d_string_buffer_cache_cleanup(&string_buffers); } vkd3d_string_buffer_printf(buffer, "%s %s", debug_hlsl_type(var->data_type), var->name); if (var->semantic) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 5a0470b..8107b26 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -499,7 +499,8 @@ const char *debug_hlsl_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; struct vkd3d_string_buffer *hlsl_type_to_string(struct vkd3d_string_buffer_cache *string_buffers, const struct hlsl_type *type) DECLSPEC_HIDDEN; -char *hlsl_modifiers_to_string(unsigned int modifiers) DECLSPEC_HIDDEN; +struct vkd3d_string_buffer *hlsl_modifiers_to_string(struct vkd3d_string_buffer_cache *string_buffers, + unsigned int modifiers) DECLSPEC_HIDDEN; const char *hlsl_node_type_to_string(enum hlsl_ir_node_type type) DECLSPEC_HIDDEN; void hlsl_add_function(struct rb_tree *funcs, char *name, struct hlsl_ir_function_decl *decl, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1fb1b7f..dd15f62 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -291,12 +291,12 @@ static bool declare_variable(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, boo if (invalid) { - char *string; + struct vkd3d_string_buffer *string; - if ((string = hlsl_modifiers_to_string(invalid))) + if ((string = hlsl_modifiers_to_string(&ctx->string_buffers, invalid))) hlsl_error(ctx, decl->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Modifiers '%s' are not allowed on local variables.", string); - vkd3d_free(string); + "Modifiers '%s' are not allowed on local variables.", string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, string); } if (decl->semantic) @@ -332,12 +332,12 @@ static DWORD add_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, DWORD mod, con { if (modifiers & mod) { - char *string; + struct vkd3d_string_buffer *string; - if ((string = hlsl_modifiers_to_string(mod))) + if ((string = hlsl_modifiers_to_string(&ctx->string_buffers, mod))) hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Modifier '%s' was already specified.", string); - vkd3d_free(string); + "Modifier '%s' was already specified.", string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, string); return modifiers; } if ((mod & HLSL_MODIFIERS_MAJORITY_MASK) && (modifiers & HLSL_MODIFIERS_MAJORITY_MASK))

1 0