November 2023 - Wine-commits

Zebediah Figura : vkd3d-shader/dxil: Do not use COLOROUT for PS outputs.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: 133e313800f01b303bec5b01d72faf2a51a33a8d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/133e313800f01b303bec5b01d72fa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 24 21:09:51 2023 -0500 vkd3d-shader/dxil: Do not use COLOROUT for PS outputs. sm4 does not use this; only sm1 does. In following patches we will normalize it to OUTPUT. --- libs/vkd3d-shader/dxil.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 64bcccec..4614ed18 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2650,9 +2650,7 @@ static void sm6_parser_emit_signature(struct sm6_parser *sm6, const struct shade static void sm6_parser_init_output_signature(struct sm6_parser *sm6, const struct shader_signature *output_signature) { - sm6_parser_init_signature(sm6, output_signature, - (sm6->p.shader_version.type == VKD3D_SHADER_TYPE_PIXEL) ? VKD3DSPR_COLOROUT : VKD3DSPR_OUTPUT, - sm6->output_params); + sm6_parser_init_signature(sm6, output_signature, VKD3DSPR_OUTPUT, sm6->output_params); } static void sm6_parser_init_input_signature(struct sm6_parser *sm6, const struct shader_signature *input_signature)

1 0

Zebediah Figura : mfplat/tests: Shut down the media source in test_create_from_file_handler_callback_Invoke().
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: ee209a93cb786d120032eaa285729e28f64f5b11 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee209a93cb786d120032eaa285729e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 8 14:13:23 2023 -0600 mfplat/tests: Shut down the media source in test_create_from_file_handler_callback_Invoke(). Break its reference count cycle so that we don't leak it. --- dlls/mfplat/tests/mfplat.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 5f9460655ec..4fcf5f19558 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -781,15 +781,25 @@ static HRESULT WINAPI test_create_from_file_handler_callback_Invoke(IMFAsyncCall hr = IMFSchemeHandler_EndCreateObject(handler, result, &obj_type, &object); ok(hr == S_OK, "Failed to create an object, hr %#lx.\n", hr); + todo_wine ok(obj_type == MF_OBJECT_BYTESTREAM, "Got object type %#x.\n", obj_type); - if (SUCCEEDED(hr)) + hr = IMFAsyncResult_GetObject(result, (IUnknown **)&object2); + ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + + if (obj_type == MF_OBJECT_MEDIASOURCE) { - hr = IMFAsyncResult_GetObject(result, &object2); - ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); + IMFMediaSource *media_source; - IUnknown_Release(object); + hr = IUnknown_QueryInterface(object, &IID_IMFMediaSource, (void **)&media_source); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaSource_Shutdown(media_source); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFMediaSource_Release(media_source); } + IUnknown_Release(object); + SetEvent(callback->event); return S_OK;

1 0

Henri Verbeet : vkd3d-shader/spirv: Allow the origin of fragment coordinates to be specified.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: e7eec3e023bf669fc9a632d4390db549a2de2718 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e7eec3e023bf669fc9a632d4390db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Oct 14 18:07:38 2023 +0200 vkd3d-shader/spirv: Allow the origin of fragment coordinates to be specified. We typically want to use lower-left in OpenGL environments when rendering to FBOs. --- include/vkd3d_shader.h | 25 +++++++++++++++++++++++++ libs/vkd3d-shader/spirv.c | 13 ++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 94f79c7c..1d6cbbf8 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -173,6 +173,21 @@ enum vkd3d_shader_compile_option_backward_compatibility VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_BACKWARD_COMPATIBILITY), }; +/** + * Determines the origin of fragment coordinates. + * + * \since 1.10 + */ +enum vkd3d_shader_compile_option_fragment_coordinate_origin +{ + /** Fragment coordinates originate from the upper-left. This is the + * default; it's also the only value supported by Vulkan environments. */ + VKD3D_SHADER_COMPILE_OPTION_FRAGMENT_COORDINATE_ORIGIN_UPPER_LEFT = 0x00000000, + /** Fragment coordinates originate from the lower-left. This matches the + * traditional behaviour of OpenGL environments. */ + VKD3D_SHADER_COMPILE_OPTION_FRAGMENT_COORDINATE_ORIGIN_LOWER_LEFT = 0x00000001, +}; + enum vkd3d_shader_compile_option_name { /** @@ -220,6 +235,16 @@ enum vkd3d_shader_compile_option_name * \since 1.10 */ VKD3D_SHADER_COMPILE_OPTION_BACKWARD_COMPATIBILITY = 0x00000008, + /** + * This option specifies the origin of fragment coordinates for SPIR-V + * targets. + * + * \a value is a member of enum + * vkd3d_shader_compile_option_fragment_coordinate_origin. + * + * \since 1.10 + */ + VKD3D_SHADER_COMPILE_OPTION_FRAGMENT_COORDINATE_ORIGIN = 0x00000009, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_NAME), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 61d75757..c681b9f8 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2288,6 +2288,7 @@ struct spirv_compiler bool strip_debug; bool ssbo_uavs; bool uav_read_without_format; + SpvExecutionMode fragment_coordinate_origin; struct rb_tree symbol_table; uint32_t temp_id; @@ -2453,6 +2454,7 @@ static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_ve compiler->formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT | VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER; compiler->write_tess_geom_point_size = true; + compiler->fragment_coordinate_origin = SpvExecutionModeOriginUpperLeft; for (i = 0; i < compile_info->option_count; ++i) { @@ -2493,6 +2495,15 @@ static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_ve compiler->write_tess_geom_point_size = option->value; break; + case VKD3D_SHADER_COMPILE_OPTION_FRAGMENT_COORDINATE_ORIGIN: + if (option->value == VKD3D_SHADER_COMPILE_OPTION_FRAGMENT_COORDINATE_ORIGIN_UPPER_LEFT) + compiler->fragment_coordinate_origin = SpvExecutionModeOriginUpperLeft; + else if (option->value == VKD3D_SHADER_COMPILE_OPTION_FRAGMENT_COORDINATE_ORIGIN_LOWER_LEFT) + compiler->fragment_coordinate_origin = SpvExecutionModeOriginLowerLeft; + else + WARN("Ignoring unrecognised value %#x for option %#x.\n", option->value, option->name); + break; + default: WARN("Ignoring unrecognised option %#x with value %#x.\n", option->name, option->value); break; @@ -5358,7 +5369,7 @@ static void spirv_compiler_emit_initial_declarations(struct spirv_compiler *comp break; case VKD3D_SHADER_TYPE_PIXEL: vkd3d_spirv_set_execution_model(builder, SpvExecutionModelFragment); - spirv_compiler_emit_execution_mode(compiler, SpvExecutionModeOriginUpperLeft, NULL, 0); + spirv_compiler_emit_execution_mode(compiler, compiler->fragment_coordinate_origin, NULL, 0); break; case VKD3D_SHADER_TYPE_COMPUTE: vkd3d_spirv_set_execution_model(builder, SpvExecutionModelGLCompute);

1 0

Henri Verbeet : vkd3d-compiler: Introduce an option to specify the origin of fragment coordinates.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: 557b32a50465e3cb6ca01f64f3467e643a7d4803 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/557b32a50465e3cb6ca01f64f3467… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 5 00:12:00 2023 +0100 vkd3d-compiler: Introduce an option to specify the origin of fragment coordinates. --- programs/vkd3d-compiler/main.c | 61 +++++++++++++++++++++++++++++++++--------- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 2d10baca..4409d250 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -40,6 +40,7 @@ enum OPTION_HELP = CHAR_MAX + 1, OPTION_BUFFER_UAV, OPTION_ENTRY, + OPTION_FRAGMENT_COORDINATE_ORIGIN, OPTION_MATRIX_STORAGE_ORDER, OPTION_OUTPUT, OPTION_PRINT_SOURCE_TYPES, @@ -189,6 +190,11 @@ static void print_usage(const char *program_name) " optionally prefixed by '+' or '-'. Valid flags are\n" " 'colour', 'indent', 'offsets', 'header', and 'raw-ids'.\n" " The 'indent' and 'header' flags are enabled by default.\n" + " --fragment-coordinate-origin=<origin>\n" + " Specify the origin of fragment coordinates for SPIR-V\n" + " targets. Valid values are 'upper-left' (default) and\n" + " 'lower-left'. The only value supported by Vulkan\n" + " environments is 'upper-left'.\n" " --matrix-storage-order=<order>\n" " Specify the default matrix storage order. Valid values\n" " are 'column' (default) and 'row'.\n" @@ -337,6 +343,24 @@ static bool parse_formatting(uint32_t *formatting, bool *colour, char *arg) return true; } +static bool parse_fragment_coordinate_origin(enum vkd3d_shader_compile_option_fragment_coordinate_origin *origin, + const char *arg) +{ + if (!strcmp(arg, "upper-left")) + { + *origin = VKD3D_SHADER_COMPILE_OPTION_FRAGMENT_COORDINATE_ORIGIN_UPPER_LEFT; + return true; + } + + if (!strcmp(arg, "lower-left")) + { + *origin = VKD3D_SHADER_COMPILE_OPTION_FRAGMENT_COORDINATE_ORIGIN_LOWER_LEFT; + return true; + } + + return false; +} + static bool parse_matrix_storage_order(enum vkd3d_shader_compile_option_pack_matrix_order *order, const char *arg) { if (!strcmp(arg, "column")) @@ -441,25 +465,27 @@ static bool validate_target_type( static bool parse_command_line(int argc, char **argv, struct options *options) { enum vkd3d_shader_compile_option_pack_matrix_order pack_matrix_order; + enum vkd3d_shader_compile_option_fragment_coordinate_origin origin; enum vkd3d_shader_compile_option_buffer_uav buffer_uav; unsigned int compat_options = 0; int option; static struct option long_options[] = { - {"help", no_argument, NULL, OPTION_HELP}, - {"buffer-uav", required_argument, NULL, OPTION_BUFFER_UAV}, - {"entry", required_argument, NULL, OPTION_ENTRY}, - {"matrix-storage-order", required_argument, NULL, OPTION_MATRIX_STORAGE_ORDER}, - {"output", required_argument, NULL, OPTION_OUTPUT}, - {"formatting", required_argument, NULL, OPTION_TEXT_FORMATTING}, - {"print-source-types", no_argument, NULL, OPTION_PRINT_SOURCE_TYPES}, - {"print-target-types", no_argument, NULL, OPTION_PRINT_TARGET_TYPES}, - {"profile", required_argument, NULL, OPTION_PROFILE}, - {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, - {"version", no_argument, NULL, OPTION_VERSION}, - {"semantic-compat-map", no_argument, NULL, OPTION_SEMANTIC_COMPAT_MAP}, - {NULL, 0, NULL, 0}, + {"help", no_argument, NULL, OPTION_HELP}, + {"buffer-uav", required_argument, NULL, OPTION_BUFFER_UAV}, + {"entry", required_argument, NULL, OPTION_ENTRY}, + {"fragment-coordinate-origin", required_argument, NULL, OPTION_FRAGMENT_COORDINATE_ORIGIN}, + {"matrix-storage-order", required_argument, NULL, OPTION_MATRIX_STORAGE_ORDER}, + {"output", required_argument, NULL, OPTION_OUTPUT}, + {"formatting", required_argument, NULL, OPTION_TEXT_FORMATTING}, + {"print-source-types", no_argument, NULL, OPTION_PRINT_SOURCE_TYPES}, + {"print-target-types", no_argument, NULL, OPTION_PRINT_TARGET_TYPES}, + {"profile", required_argument, NULL, OPTION_PROFILE}, + {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, + {"version", no_argument, NULL, OPTION_VERSION}, + {"semantic-compat-map", no_argument, NULL, OPTION_SEMANTIC_COMPAT_MAP}, + {NULL, 0, NULL, 0}, }; memset(options, 0, sizeof(*options)); @@ -501,6 +527,15 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->preprocess_only = true; break; + case OPTION_FRAGMENT_COORDINATE_ORIGIN: + if (!parse_fragment_coordinate_origin(&origin, optarg)) + { + fprintf(stderr, "Invalid fragment coordinate origin '%s' specified.\n", optarg); + return false; + } + add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_FRAGMENT_COORDINATE_ORIGIN, origin); + break; + case 'h': case OPTION_HELP: options->print_help = true;

1 0

Alexandre Julliard : include: Remove DECLSPEC_HIDDEN from GUID definitions.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: 19cc2439ede6562613d03d75305ddbbe03d11152 URL: https://gitlab.winehq.org/wine/wine/-/commit/19cc2439ede6562613d03d75305ddb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 10:10:50 2023 +0100 include: Remove DECLSPEC_HIDDEN from GUID definitions. --- include/dbs.idl | 20 +++++++++----------- include/devpropdef.h | 4 +--- include/guiddef.h | 12 +----------- include/knownfolders.h | 4 +--- include/netiodef.h | 8 +++----- include/propkeydef.h | 6 +++--- include/rpcndr.h | 1 - include/rpcproxy.h | 5 ++--- 8 files changed, 20 insertions(+), 40 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index fd04f7b1ae0..f664518ca37 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -501,22 +501,20 @@ enum DBPROPENUM26 { cpp_quote("#ifdef DBINITCONSTANTS") cpp_quote("#ifdef __cplusplus") cpp_quote("#define DEFINE_DBGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \\") -cpp_quote(" EXTERN_C const GUID name DECLSPEC_HIDDEN; \\") -cpp_quote(" EXTERN_C const GUID name = \\") +cpp_quote(" EXTERN_C const GUID name = \\") cpp_quote(" { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }") cpp_quote("#else") cpp_quote("#define DEFINE_DBGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \\") -cpp_quote(" const GUID name DECLSPEC_HIDDEN; \\") -cpp_quote(" const GUID name = \\") +cpp_quote(" const GUID name = \\") cpp_quote(" { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }") cpp_quote("#endif") cpp_quote("#define DEFINE_DBID(name, dbguid, kind, val) \\") -cpp_quote(" const DBID name = { {dbguid}, kind, {(LPOLESTR)val} };") +cpp_quote(" const DBID name = { {dbguid}, kind, {(LPOLESTR)val} }") cpp_quote("#else") cpp_quote("#define DEFINE_DBGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \\") -cpp_quote(" EXTERN_C const GUID name DECLSPEC_HIDDEN") +cpp_quote(" EXTERN_C const GUID name") cpp_quote("#define DEFINE_DBID(name, dbguid, kind, val) \\") -cpp_quote(" EXTERN_C const DBID name;") +cpp_quote(" EXTERN_C const DBID name") cpp_quote("#endif") cpp_quote("#define DBCIDGUID {0x0c733a81, 0x2a1c, 0x11ce, {0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d}}") @@ -544,10 +542,10 @@ cpp_quote("DEFINE_DBGUID(DBPROPSET_SESSIONALL, 0xc8b522c7, 0x5cf3, 0x11ce cpp_quote("DEFINE_DBGUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBPROPSET_PROPERTIESINERROR, 0xc8b522d4, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") -cpp_quote("DEFINE_DBID(DB_NULLID, DB_NULLGUID, 0, 0)") -cpp_quote("DEFINE_DBID(DBCOLUMN_BASECOLUMNNAME, DBCIDGUID, DBKIND_GUID_PROPID, 10)") -cpp_quote("DEFINE_DBID(DBCOLUMN_BASETABLENAME, DBCIDGUID, DBKIND_GUID_PROPID, 11)") -cpp_quote("DEFINE_DBID(DBCOLUMN_KEYCOLUMN, DBCIDGUID, DBKIND_GUID_PROPID, 41)") +cpp_quote("DEFINE_DBID(DB_NULLID, DB_NULLGUID, 0, 0);") +cpp_quote("DEFINE_DBID(DBCOLUMN_BASECOLUMNNAME, DBCIDGUID, DBKIND_GUID_PROPID, 10);") +cpp_quote("DEFINE_DBID(DBCOLUMN_BASETABLENAME, DBCIDGUID, DBKIND_GUID_PROPID, 11);") +cpp_quote("DEFINE_DBID(DBCOLUMN_KEYCOLUMN, DBCIDGUID, DBKIND_GUID_PROPID, 41);") cpp_quote("#define DBPROMPT_PROMPT 0x01") cpp_quote("#define DBPROMPT_COMPLETE 0x02") diff --git a/include/devpropdef.h b/include/devpropdef.h index 2b0b7f4a849..94046f5bce0 100644 --- a/include/devpropdef.h +++ b/include/devpropdef.h @@ -82,18 +82,16 @@ typedef struct _DEVPROPKEY { #ifdef INITGUID #ifdef __cplusplus #define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - EXTERN_C const DEVPROPKEY name DECLSPEC_HIDDEN; \ EXTERN_C const DEVPROPKEY DECLSPEC_SELECTANY name = \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } #else #define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - extern const DEVPROPKEY name DECLSPEC_HIDDEN; \ const DEVPROPKEY DECLSPEC_SELECTANY name = \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } #endif #else #define DEFINE_DEVPROPKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - EXTERN_C const DEVPROPKEY name DECLSPEC_HIDDEN + EXTERN_C const DEVPROPKEY name #endif #ifndef IsEqualDevPropKey diff --git a/include/guiddef.h b/include/guiddef.h index 6f7e26df0c6..c5ba9635b89 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -89,29 +89,19 @@ extern "C++" { #undef DEFINE_GUID -#ifndef DECLSPEC_HIDDEN -# if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__CYGWIN__) -# define DECLSPEC_HIDDEN __attribute__((visibility ("hidden"))) -# else -# define DECLSPEC_HIDDEN -# endif -#endif - #ifdef INITGUID #ifdef __cplusplus #define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const GUID name DECLSPEC_HIDDEN; \ EXTERN_C const GUID name = \ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } #else #define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - const GUID name DECLSPEC_HIDDEN; \ const GUID name = \ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } #endif #else #define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const GUID name DECLSPEC_HIDDEN + EXTERN_C const GUID name #endif #define DEFINE_OLEGUID(name, l, w1, w2) \ diff --git a/include/knownfolders.h b/include/knownfolders.h index 1b0bb7f3c47..ca85ef04c04 100644 --- a/include/knownfolders.h +++ b/include/knownfolders.h @@ -26,18 +26,16 @@ #ifdef INITGUID #ifdef __cplusplus #define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const GUID name DECLSPEC_HIDDEN; \ EXTERN_C const GUID name = \ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } #else #define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - const GUID name DECLSPEC_HIDDEN; \ const GUID name = \ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } #endif #else #define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const GUID name DECLSPEC_HIDDEN + EXTERN_C const GUID name #endif DEFINE_KNOWN_FOLDER(FOLDERID_AccountPictures, 0x008ca0b1, 0x55b4, 0x4c56, 0xb8, 0xa8, 0x4d, 0xe4, 0xb2, 0x99, 0xd3, 0xbe); diff --git a/include/netiodef.h b/include/netiodef.h index 658dd235db0..0d0d316b8eb 100644 --- a/include/netiodef.h +++ b/include/netiodef.h @@ -60,18 +60,16 @@ static inline BOOLEAN NmrIsEqualNpiModuleId( const NPI_MODULEID *mod1, const NPI #ifdef __WINE_INIT_NPI_MODULEID #ifdef __cplusplus #define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN; \ - EXTERN_C const NPI_MODULEID name = \ + EXTERN_C const NPI_MODULEID name = \ { sizeof(NPI_MODULEID), MIT_GUID, { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } } } #else #define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - const NPI_MODULEID name DECLSPEC_HIDDEN; \ - const NPI_MODULEID name = \ + const NPI_MODULEID name = \ { sizeof(NPI_MODULEID), MIT_GUID, { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } } } #endif #else /* __WINE_INIT_MODULEID */ #define DEFINE_NPI_GUID_MODULEID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const NPI_MODULEID name DECLSPEC_HIDDEN + EXTERN_C const NPI_MODULEID name #endif /* __WINE_INIT_MODULEID */ #define DEFINE_NPI_MS_MODULEID(name, n) DEFINE_NPI_GUID_MODULEID(name, 0xeb004a00 + (n), 0x9b1a, 0x11d4, \ diff --git a/include/propkeydef.h b/include/propkeydef.h index 189af7faa26..fb3902ae35f 100644 --- a/include/propkeydef.h +++ b/include/propkeydef.h @@ -33,16 +33,16 @@ #ifdef INITGUID #ifdef __cplusplus #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - EXTERN_C const PROPERTYKEY DECLSPEC_SELECTANY name DECLSPEC_HIDDEN = \ + EXTERN_C const PROPERTYKEY DECLSPEC_SELECTANY name = \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } #else #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - const PROPERTYKEY DECLSPEC_SELECTANY name DECLSPEC_HIDDEN = \ + const PROPERTYKEY DECLSPEC_SELECTANY name = \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } #endif #else #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - EXTERN_C const PROPERTYKEY name DECLSPEC_HIDDEN + EXTERN_C const PROPERTYKEY name #endif #ifndef IsEqualPropertyKey diff --git a/include/rpcndr.h b/include/rpcndr.h index 2d836726a15..4e2a4e1ddb6 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -40,7 +40,6 @@ extern "C" { #ifndef EXTERN_GUID #ifdef __cplusplus #define EXTERN_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - EXTERN_C const GUID DECLSPEC_SELECTANY name DECLSPEC_HIDDEN; \ EXTERN_C const GUID DECLSPEC_SELECTANY name = \ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } #else diff --git a/include/rpcproxy.h b/include/rpcproxy.h index 98c9430fdcb..8d4ab259af5 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -242,11 +242,10 @@ ULONG WINAPI CStdStubBuffer2_Release(IRpcStubBuffer *This) \ /* define PROXY_CLSID_IS to specify the CLSID data of the PSFactoryBuffer */ /* define neither to use the GUID of the first interface */ #ifdef PROXY_CLSID -# define CLSID_PSFACTORYBUFFER extern CLSID PROXY_CLSID DECLSPEC_HIDDEN; +# define CLSID_PSFACTORYBUFFER extern CLSID PROXY_CLSID; #else # ifdef PROXY_CLSID_IS -# define CLSID_PSFACTORYBUFFER const CLSID CLSID_PSFactoryBuffer DECLSPEC_HIDDEN; \ - const CLSID CLSID_PSFactoryBuffer = PROXY_CLSID_IS; +# define CLSID_PSFACTORYBUFFER const CLSID CLSID_PSFactoryBuffer = PROXY_CLSID_IS; # define PROXY_CLSID CLSID_PSFactoryBuffer # else # define CLSID_PSFACTORYBUFFER

1 0

Alexandre Julliard : widl: Remove DECLSPEC_HIDDEN from generated files.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: c7a2aaf2343b218729eb640f0990512f01383b53 URL: https://gitlab.winehq.org/wine/wine/-/commit/c7a2aaf2343b218729eb640f099051… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 10:11:17 2023 +0100 widl: Remove DECLSPEC_HIDDEN from generated files. --- tools/widl/client.c | 8 ++------ tools/widl/proxy.c | 6 +----- tools/widl/server.c | 8 ++------ 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 704be91cb78..d28b605bc58 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -468,10 +468,10 @@ static void write_clientinterfacedecl(type_t *iface) indent--; print_client("};\n"); if (old_names) - print_client("RPC_IF_HANDLE %s_ClientIfHandle DECLSPEC_HIDDEN = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n", + print_client("RPC_IF_HANDLE %s_ClientIfHandle = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n", iface->name, iface->name); else - print_client("RPC_IF_HANDLE %s%s_v%d_%d_c_ifspec DECLSPEC_HIDDEN = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n", + print_client("RPC_IF_HANDLE %s%s_v%d_%d_c_ifspec = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n", prefix_client, iface->name, MAJORVERSION(ver), MINORVERSION(ver), iface->name); fprintf(client, "\n"); } @@ -500,10 +500,6 @@ static void init_client(void) print_client( "\n"); print_client("#include \"%s\"\n", header_name); print_client( "\n"); - print_client( "#ifndef DECLSPEC_HIDDEN\n"); - print_client( "#define DECLSPEC_HIDDEN\n"); - print_client( "#endif\n"); - print_client( "\n"); } diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 3d55cd73ee7..8fed948d8de 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -86,10 +86,6 @@ static void init_proxy(const statement_list_t *stmts) print_proxy( "#define __midl_proxy\n"); print_proxy( "#include \"objbase.h\"\n"); print_proxy( "\n"); - print_proxy( "#ifndef DECLSPEC_HIDDEN\n"); - print_proxy( "#define DECLSPEC_HIDDEN\n"); - print_proxy( "#endif\n"); - print_proxy( "\n"); } static void clear_output_vars( const var_list_t *args ) @@ -1026,7 +1022,7 @@ static void write_proxy_routines(const statement_list_t *stmts) fprintf(proxy, "\n"); } - fprintf(proxy, "const ExtendedProxyFileInfo %s_ProxyFileInfo DECLSPEC_HIDDEN =\n", file_id); + fprintf(proxy, "const ExtendedProxyFileInfo %s_ProxyFileInfo =\n", file_id); fprintf(proxy, "{\n"); fprintf(proxy, " (const PCInterfaceProxyVtblList*)_%s_ProxyVtblList,\n", file_id); fprintf(proxy, " (const PCInterfaceStubVtblList*)_%s_StubVtblList,\n", file_id); diff --git a/tools/widl/server.c b/tools/widl/server.c index 1d8ab41185d..c7ecb656bfb 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -433,10 +433,10 @@ static void write_serverinterfacedecl(type_t *iface) indent--; print_server("};\n"); if (old_names) - print_server("RPC_IF_HANDLE %s_ServerIfHandle DECLSPEC_HIDDEN = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n", + print_server("RPC_IF_HANDLE %s_ServerIfHandle = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n", iface->name, iface->name); else - print_server("RPC_IF_HANDLE %s%s_v%d_%d_s_ifspec DECLSPEC_HIDDEN = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n", + print_server("RPC_IF_HANDLE %s%s_v%d_%d_s_ifspec = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n", prefix_server, iface->name, MAJORVERSION(ver), MINORVERSION(ver), iface->name); fprintf(server, "\n"); } @@ -453,10 +453,6 @@ static void init_server(void) print_server("#include <string.h>\n"); fprintf(server, "\n"); print_server("#include \"%s\"\n", header_name); - print_server("\n"); - print_server( "#ifndef DECLSPEC_HIDDEN\n"); - print_server( "#define DECLSPEC_HIDDEN\n"); - print_server( "#endif\n"); print_server( "\n"); }

1 0

Alexandre Julliard : configure: Use hidden visibility also when building Unix libraries.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: 4502eb56baca156f9b0817806f81b5dde2163801 URL: https://gitlab.winehq.org/wine/wine/-/commit/4502eb56baca156f9b0817806f81b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 10:27:08 2023 +0100 configure: Use hidden visibility also when building Unix libraries. --- configure | 56 ++++++++++++++++++++++++------------------------ configure.ac | 2 +- dlls/ntdll/unix/loader.c | 2 +- include/dde.h | 2 +- include/ddeml.h | 2 +- include/ntgdi.h | 2 +- include/ntuser.h | 2 +- include/rpc.h | 2 +- include/wine/debug.h | 10 ++++----- include/wine/unixlib.h | 4 ++-- include/wingdi.h | 2 +- include/winnt.h | 2 +- include/winuser.h | 2 +- loader/main.c | 2 +- 14 files changed, 46 insertions(+), 46 deletions(-) diff --git a/configure b/configure index 646f44ede24..d91a345acfe 100755 --- a/configure +++ b/configure @@ -18654,6 +18654,34 @@ printf "%s\n" "$ac_cv_cflags__fcf_protection_none" >&6; } if test "x$ac_cv_cflags__fcf_protection_none" = xyes then : EXTRACFLAGS="$EXTRACFLAGS -fcf-protection=none" +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fvisibility=hidden" >&5 +printf %s "checking whether the compiler supports -fvisibility=hidden... " >&6; } +if test ${ac_cv_cflags__fvisibility_hidden+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -fvisibility=hidden" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_cflags__fvisibility_hidden=yes +else $as_nop + ac_cv_cflags__fvisibility_hidden=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fvisibility_hidden" >&5 +printf "%s\n" "$ac_cv_cflags__fvisibility_hidden" >&6; } +if test "x$ac_cv_cflags__fvisibility_hidden" = xyes +then : + EXTRACFLAGS="$EXTRACFLAGS -fvisibility=hidden" fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-stack-protector" >&5 printf %s "checking whether the compiler supports -fno-stack-protector... " >&6; } @@ -19358,34 +19386,6 @@ printf "%s\n" "$ac_cv_cflags__fshort_wchar" >&6; } if test "x$ac_cv_cflags__fshort_wchar" = xyes then : MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar" -fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fvisibility=hidden" >&5 -printf %s "checking whether the compiler supports -fvisibility=hidden... " >&6; } -if test ${ac_cv_cflags__fvisibility_hidden+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -fvisibility=hidden" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_cflags__fvisibility_hidden=yes -else $as_nop - ac_cv_cflags__fvisibility_hidden=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fvisibility_hidden" >&5 -printf "%s\n" "$ac_cv_cflags__fvisibility_hidden" >&6; } -if test "x$ac_cv_cflags__fvisibility_hidden" = xyes -then : - MSVCRTFLAGS="$MSVCRTFLAGS -fvisibility=hidden" fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-format" >&5 printf %s "checking whether the compiler supports -Wno-format... " >&6; } diff --git a/configure.ac b/configure.ac index fd1a58b9170..8a58ef8a5b5 100644 --- a/configure.ac +++ b/configure.ac @@ -1841,6 +1841,7 @@ then WINE_TRY_CFLAGS([-Werror=unused-command-line-argument],[CFLAGS="$CFLAGS -Werror=unused-command-line-argument"]) WINE_TRY_CFLAGS([-Werror=ignored-optimization-argument],[CFLAGS="$CFLAGS -Werror=ignored-optimization-argument"]) WINE_TRY_CFLAGS([-fcf-protection=none]) + WINE_TRY_CFLAGS([-fvisibility=hidden]) WINE_TRY_CFLAGS([-fno-stack-protector]) WINE_TRY_CFLAGS([-fno-strict-aliasing]) WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) @@ -1922,7 +1923,6 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= *) MSVCRTFLAGS="-D_WIN32" WINE_TRY_CFLAGS([-fno-builtin],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin"]) WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) - WINE_TRY_CFLAGS([-fvisibility=hidden],[MSVCRTFLAGS="$MSVCRTFLAGS -fvisibility=hidden"]) WINE_TRY_CFLAGS([-Wno-format],[MSVCRTFLAGS="$MSVCRTFLAGS -Wno-format"]) ;; esac diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0db25f88527..875e2f48cc7 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2305,7 +2305,7 @@ static void check_command_line( int argc, char *argv[] ) * * Main entry point called by the wine loader. */ -void __wine_main( int argc, char *argv[], char *envp[] ) +DECLSPEC_EXPORT void __wine_main( int argc, char *argv[], char *envp[] ) { init_paths( argv ); diff --git a/include/dde.h b/include/dde.h index fda798b06f4..7b236414dac 100644 --- a/include/dde.h +++ b/include/dde.h @@ -30,7 +30,7 @@ extern "C" { #ifndef WINUSERAPI #if defined(_USER32_) || defined(WINE_UNIX_LIB) -#define WINUSERAPI +#define WINUSERAPI DECLSPEC_EXPORT #else #define WINUSERAPI DECLSPEC_IMPORT #endif diff --git a/include/ddeml.h b/include/ddeml.h index 41c43e6b321..0bffa851c79 100644 --- a/include/ddeml.h +++ b/include/ddeml.h @@ -28,7 +28,7 @@ extern "C" { #ifndef WINUSERAPI #if defined(_USER32_) || defined(WINE_UNIX_LIB) -#define WINUSERAPI +#define WINUSERAPI DECLSPEC_EXPORT #else #define WINUSERAPI DECLSPEC_IMPORT #endif diff --git a/include/ntgdi.h b/include/ntgdi.h index 95aba913c05..c2cb1924730 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -26,7 +26,7 @@ #ifndef W32KAPI # if defined(_WIN32U_) || defined(WINE_UNIX_LIB) -# define W32KAPI +# define W32KAPI DECLSPEC_EXPORT # else # define W32KAPI DECLSPEC_IMPORT # endif diff --git a/include/ntuser.h b/include/ntuser.h index 1fed42e38df..def89a82aff 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -27,7 +27,7 @@ #ifndef W32KAPI # if defined(_WIN32U_) || defined(WINE_UNIX_LIB) -# define W32KAPI +# define W32KAPI DECLSPEC_EXPORT # else # define W32KAPI DECLSPEC_IMPORT # endif diff --git a/include/rpc.h b/include/rpc.h index 0b029532655..2d4323428c4 100644 --- a/include/rpc.h +++ b/include/rpc.h @@ -43,7 +43,7 @@ #if !defined(_RPCRT4_) && !defined(_KRPCENV_) #define RPCRTAPI DECLSPEC_IMPORT #else -#define RPCRTAPI +#define RPCRTAPI DECLSPEC_EXPORT #endif #endif diff --git a/include/wine/debug.h b/include/wine/debug.h index 281666fbff1..86e008a1408 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -109,11 +109,11 @@ struct __wine_debug_channel #endif NTSYSAPI int WINAPI __wine_dbg_write( const char *str, unsigned int len ); -extern unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ); -extern const char * __cdecl __wine_dbg_strdup( const char *str ); -extern int __cdecl __wine_dbg_output( const char *str ); -extern int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_channel *channel, - const char *function ); +extern DECLSPEC_EXPORT unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ); +extern DECLSPEC_EXPORT const char * __cdecl __wine_dbg_strdup( const char *str ); +extern DECLSPEC_EXPORT int __cdecl __wine_dbg_output( const char *str ); +extern DECLSPEC_EXPORT int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *function ); /* * Exported definitions and macros diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 46b5e982943..81c59e732ba 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -29,8 +29,8 @@ typedef UINT64 unixlib_handle_t; typedef NTSTATUS (*unixlib_entry_t)( void *args ); -extern const unixlib_entry_t __wine_unix_call_funcs[]; -extern const unixlib_entry_t __wine_unix_call_wow64_funcs[]; +extern DECLSPEC_EXPORT const unixlib_entry_t __wine_unix_call_funcs[]; +extern DECLSPEC_EXPORT const unixlib_entry_t __wine_unix_call_wow64_funcs[]; /* some useful helpers from ntdll */ NTSYSAPI const char *ntdll_get_build_dir(void); diff --git a/include/wingdi.h b/include/wingdi.h index 6ae9409803c..ff0bbb6fc85 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -26,7 +26,7 @@ extern "C" { #ifndef WINGDIAPI #if defined(_GDI32_) || defined(WINE_UNIX_LIB) -#define WINGDIAPI +#define WINGDIAPI DECLSPEC_EXPORT #else #define WINGDIAPI DECLSPEC_IMPORT #endif diff --git a/include/winnt.h b/include/winnt.h index 7bbf224e3c9..4739f9a1a0f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -43,7 +43,7 @@ extern "C" { #endif #if defined(_NTSYSTEM_) || defined(WINE_UNIX_LIB) -#define NTSYSAPI +#define NTSYSAPI DECLSPEC_EXPORT #else #define NTSYSAPI DECLSPEC_IMPORT #endif diff --git a/include/winuser.h b/include/winuser.h index c0736502a2e..73e7919aaea 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -23,7 +23,7 @@ #if !defined(_USER32_) && !defined(WINE_UNIX_LIB) #define WINUSERAPI DECLSPEC_IMPORT #else -#define WINUSERAPI +#define WINUSERAPI DECLSPEC_EXPORT #endif #endif diff --git a/loader/main.c b/loader/main.c index 242ff15accd..c258e025183 100644 --- a/loader/main.c +++ b/loader/main.c @@ -39,7 +39,7 @@ extern char **environ; /* the preloader will set this variable */ -const struct wine_preload_info *wine_main_preload_info = NULL; +const __attribute((visibility("default"))) struct wine_preload_info *wine_main_preload_info = NULL; /* canonicalize path and return its directory name */ static char *realpath_dirname( const char *name )

1 0

Eric Pouech : winscard: Use SecureZeroMemory() to clear magic fields.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: c20a0dc6a4540b2733cdfececa7759914e56c218 URL: https://gitlab.winehq.org/wine/wine/-/commit/c20a0dc6a4540b2733cdfececa7759… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Nov 8 09:27:08 2023 +0100 winscard: Use SecureZeroMemory() to clear magic fields. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/winscard/winscard.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index d0c7f412a6c..7e53fba45f6 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -205,7 +205,8 @@ LONG WINAPI SCardReleaseContext( SCARDCONTEXT context ) params.handle = handle->unix_handle; ret = UNIX_CALL( scard_release_context, &params ); - handle->magic = 0; + /* Ensure compiler doesn't optimize out the assignment with 0. */ + SecureZeroMemory( &handle->magic, sizeof(handle->magic) ); free( handle ); TRACE( "returning %#lx\n", ret ); @@ -794,7 +795,8 @@ LONG WINAPI SCardDisconnect( SCARDHANDLE connect, DWORD disposition ) params.disposition = disposition; if (!(ret = UNIX_CALL( scard_disconnect, &params ))) { - handle->magic = 0; + /* Ensure compiler doesn't optimize out the assignment with 0. */ + SecureZeroMemory( &handle->magic, sizeof(handle->magic) ); free( handle ); } TRACE( "returning %#lx\n", ret );

1 0

Eric Pouech : wintrust: Use SecureZeroMemory() to clear magic fields.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: fce67d1ec2d3b82c0d07c2a905192363fd9d1955 URL: https://gitlab.winehq.org/wine/wine/-/commit/fce67d1ec2d3b82c0d07c2a9051923… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Nov 8 09:27:26 2023 +0100 wintrust: Use SecureZeroMemory() to clear magic fields. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/wintrust/crypt.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index dec945fe1e5..7321b84eea4 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -424,7 +424,8 @@ BOOL WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN hCatAdmin, SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - ci->magic = 0; + /* Ensure compiler doesn't optimize out the assignment with 0. */ + SecureZeroMemory(&ci->magic, sizeof(ci->magic)); free(ci); return TRUE; } @@ -455,7 +456,8 @@ BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN hCatAdmin, DWORD dwFlags ) return FALSE; } if (ca->find != INVALID_HANDLE_VALUE) FindClose(ca->find); - ca->magic = 0; + /* Ensure compiler doesn't optimize out the assignment with 0. */ + SecureZeroMemory(&ca->magic, sizeof(ca->magic)); free(ca); return TRUE; } @@ -555,7 +557,8 @@ BOOL WINAPI CryptCATClose(HANDLE hCatalog) free(cc->inner); CryptMsgClose(cc->msg); - cc->magic = 0; + /* Ensure compiler doesn't optimize out the assignment with 0. */ + SecureZeroMemory(&cc->magic, sizeof(cc->magic)); free(cc); return TRUE; }

1 0

Eric Pouech : wsdapi: Use SecureZeroMemory() to clear magic fields.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: wine Branch: master Commit: 8c259abbe56e98855fa2e13fcb295d8f8e6422fd URL: https://gitlab.winehq.org/wine/wine/-/commit/8c259abbe56e98855fa2e13fcb295d… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Nov 8 09:27:39 2023 +0100 wsdapi: Use SecureZeroMemory() to clear magic fields. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/wsdapi/memory.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/memory.c b/dlls/wsdapi/memory.c index ad4d2eefdf9..7003f0aa4cb 100644 --- a/dlls/wsdapi/memory.c +++ b/dlls/wsdapi/memory.c @@ -73,7 +73,8 @@ static void free_allocation(struct memory_allocation *item) } list_remove(&item->entry); - item->magic = 0; + /* Ensure compiler doesn't optimize out the assignment with 0. */ + SecureZeroMemory(&item->magic, sizeof(item->magic)); free(item); }

1 0