Alexandre Julliard : d3dcompiler: Make varargs functions WINAPIV.
Module: wine Branch: master Commit: 43df1ed406143b9a9ba5b2450c21fece6563aa2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=43df1ed406143b9a9ba5b2450... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jul 7 08:02:55 2019 +0200 d3dcompiler: Make varargs functions WINAPIV. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47473 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/asmshader.y | 2 +- dlls/d3dcompiler_43/compiler.c | 6 +++--- dlls/d3dcompiler_43/d3dcompiler_private.h | 6 +++--- dlls/d3dcompiler_43/hlsl.y | 4 ++-- dlls/d3dcompiler_43/ppl.l | 2 +- dlls/d3dcompiler_43/preproc.c | 2 +- dlls/d3dcompiler_43/wpp_private.h | 8 ++++---- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/d3dcompiler_43/asmshader.y b/dlls/d3dcompiler_43/asmshader.y index f5dbb6c..32b37d0 100644 --- a/dlls/d3dcompiler_43/asmshader.y +++ b/dlls/d3dcompiler_43/asmshader.y @@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(asmshader); struct asm_parser asm_ctx; -void __cdecl asmparser_message(struct asm_parser *ctx, const char *fmt, ...) +void WINAPIV asmparser_message(struct asm_parser *ctx, const char *fmt, ...) { __ms_va_list args; diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 1b2107c..73f8c70 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -123,7 +123,7 @@ static void wpp_write_message(const char *fmt, __ms_va_list args) } } -static void __cdecl PRINTF_ATTR(1,2) wpp_write_message_var(const char *fmt, ...) +static void WINAPIV PRINTF_ATTR(1,2) wpp_write_message_var(const char *fmt, ...) { __ms_va_list args; @@ -132,7 +132,7 @@ static void __cdecl PRINTF_ATTR(1,2) wpp_write_message_var(const char *fmt, ...) __ms_va_end(args); } -int __cdecl ppy_error(const char *msg, ...) +int WINAPIV ppy_error(const char *msg, ...) { __ms_va_list ap; __ms_va_start(ap, msg); @@ -146,7 +146,7 @@ int __cdecl ppy_error(const char *msg, ...) return 1; } -int __cdecl ppy_warning(const char *msg, ...) +int WINAPIV ppy_warning(const char *msg, ...) { __ms_va_list ap; __ms_va_start(ap, msg); diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index d2162c8..e165f21 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -286,7 +286,7 @@ struct bwriter_shader *parse_asm_shader(char **messages) DECLSPEC_HIDDEN; #endif void compilation_message(struct compilation_messages *msg, const char *fmt, __ms_va_list args) DECLSPEC_HIDDEN; -void __cdecl asmparser_message(struct asm_parser *ctx, const char *fmt, ...) PRINTF_ATTR(2,3) DECLSPEC_HIDDEN; +void WINAPIV asmparser_message(struct asm_parser *ctx, const char *fmt, ...) PRINTF_ATTR(2,3) DECLSPEC_HIDDEN; static inline void set_parse_status(enum parse_status *current, enum parse_status update) { if (update == PARSE_ERR) @@ -1055,8 +1055,8 @@ enum hlsl_error_level HLSL_LEVEL_NOTE, }; -void __cdecl hlsl_message(const char *fmt, ...) PRINTF_ATTR(1,2) DECLSPEC_HIDDEN; -void __cdecl hlsl_report_message(const char *filename, DWORD line, DWORD column, +void WINAPIV hlsl_message(const char *fmt, ...) PRINTF_ATTR(1,2) DECLSPEC_HIDDEN; +void WINAPIV hlsl_report_message(const char *filename, DWORD line, DWORD column, enum hlsl_error_level level, const char *fmt, ...) PRINTF_ATTR(5,6) DECLSPEC_HIDDEN; static inline struct hlsl_ir_var *var_from_node(const struct hlsl_ir_node *node) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 139ab4c..4ece669 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -34,7 +34,7 @@ struct hlsl_parse_ctx hlsl_ctx; struct YYLTYPE; static void set_location(struct source_location *loc, const struct YYLTYPE *l); -void __cdecl hlsl_message(const char *fmt, ...) +void WINAPIV hlsl_message(const char *fmt, ...) { __ms_va_list args; @@ -54,7 +54,7 @@ static const char *hlsl_get_error_level_name(enum hlsl_error_level level) return names[level]; } -void __cdecl hlsl_report_message(const char *filename, DWORD line, DWORD column, +void WINAPIV hlsl_report_message(const char *filename, DWORD line, DWORD column, enum hlsl_error_level level, const char *fmt, ...) { __ms_va_list args; diff --git a/dlls/d3dcompiler_43/ppl.l b/dlls/d3dcompiler_43/ppl.l index 2fd8c65..568ccb4 100644 --- a/dlls/d3dcompiler_43/ppl.l +++ b/dlls/d3dcompiler_43/ppl.l @@ -285,7 +285,7 @@ includelogicentry_t *pp_includelogiclist = NULL; #define BUFFERINITIALCAPACITY 256 -void __cdecl pp_writestring(const char *format, ...) +void WINAPIV pp_writestring(const char *format, ...) { __ms_va_list valist; int len; diff --git a/dlls/d3dcompiler_43/preproc.c b/dlls/d3dcompiler_43/preproc.c index 43a7d24..be98e6f 100644 --- a/dlls/d3dcompiler_43/preproc.c +++ b/dlls/d3dcompiler_43/preproc.c @@ -435,7 +435,7 @@ int pp_get_if_depth(void) return if_stack_idx; } -void __cdecl pp_internal_error(const char *file, int line, const char *s, ...) +void WINAPIV pp_internal_error(const char *file, int line, const char *s, ...) { __ms_va_list ap; __ms_va_start(ap, s); diff --git a/dlls/d3dcompiler_43/wpp_private.h b/dlls/d3dcompiler_43/wpp_private.h index 77025db..325c7f1 100644 --- a/dlls/d3dcompiler_43/wpp_private.h +++ b/dlls/d3dcompiler_43/wpp_private.h @@ -209,9 +209,9 @@ int pp_get_if_depth(void); extern const struct wpp_callbacks *wpp_callbacks; -int __cdecl ppy_error(const char *s, ...) __attribute__((format (printf, 1, 2))); -int __cdecl ppy_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); -void __cdecl pp_internal_error(const char *file, int line, const char *s, ...) __attribute__((format (printf, 3, 4))); +int WINAPIV ppy_error(const char *s, ...) __attribute__((format (printf, 1, 2))); +int WINAPIV ppy_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); +void WINAPIV pp_internal_error(const char *file, int line, const char *s, ...) __attribute__((format (printf, 3, 4))); /* current preprocessor state */ /* everything is in this structure to avoid polluting the global symbol space */ @@ -240,7 +240,7 @@ void pp_do_include(char *fname, int type); void pp_push_ignore_state(void); void pp_pop_ignore_state(void); -void __cdecl pp_writestring(const char *format, ...) __attribute__((format (printf, 1, 2))); +void WINAPIV pp_writestring(const char *format, ...) __attribute__((format (printf, 1, 2))); /* * From ppy.y
participants (1)
-
Alexandre Julliard