[PATCH 0/2] MR3207: Remove DECLSPEC_HIDDEN from scripting DLL (VBSCript/JScript)

List overview All Threads

newer

older

[PATCH 0/1] MR3214: win32u:...

[PATCH 0/1] MR3213: ntoskrnl.exe:...

Alistair Leslie-Hughes (＠alesliehughes)

1 Jul 2023 1 Jul '23

12:26 a.m.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3207

Show replies by date

Alistair Leslie-Hughes

1 Jul 1 Jul

12:26 a.m.

New subject: [PATCH 1/2] jscript: Remove DECLSPEC_HIDDEN usage.

From: Alistair Leslie-Hughes leslie_alistair@hotmail.com

diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 68b60401063..2e041df35a0 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -183,8 +183,8 @@ typedef struct _function_code_t { bytecode_t *bytecode; } function_code_t;

-IDispatch *lookup_global_host(script_ctx_t*) DECLSPEC_HIDDEN; -local_ref_t *lookup_local(const function_code_t*,const WCHAR*,unsigned int) DECLSPEC_HIDDEN; +IDispatch *lookup_global_host(script_ctx_t*) ; +local_ref_t *lookup_local(const function_code_t*,const WCHAR*,unsigned int) ;

struct _bytecode_t { LONG ref; @@ -211,10 +211,10 @@ struct _bytecode_t { struct list entry; };

-HRESULT compile_script(script_ctx_t*,const WCHAR*,UINT64,unsigned,const WCHAR*,const WCHAR*,BOOL,BOOL,named_item_t*,bytecode_t**) DECLSPEC_HIDDEN; -void release_bytecode(bytecode_t*) DECLSPEC_HIDDEN; +HRESULT compile_script(script_ctx_t*,const WCHAR*,UINT64,unsigned,const WCHAR*,const WCHAR*,BOOL,BOOL,named_item_t*,bytecode_t**) ; +void release_bytecode(bytecode_t*) ;

-unsigned get_location_line(bytecode_t *code, unsigned loc, unsigned *char_pos) DECLSPEC_HIDDEN; +unsigned get_location_line(bytecode_t *code, unsigned loc, unsigned *char_pos) ;

static inline bytecode_t *bytecode_addref(bytecode_t *code) { @@ -265,10 +265,10 @@ struct _jsexcept_t { jsexcept_t *prev; };

-void enter_script(script_ctx_t*,jsexcept_t*) DECLSPEC_HIDDEN; -HRESULT leave_script(script_ctx_t*,HRESULT) DECLSPEC_HIDDEN; -void reset_ei(jsexcept_t*) DECLSPEC_HIDDEN; -void set_error_location(jsexcept_t*,bytecode_t*,unsigned,unsigned,jsstr_t*) DECLSPEC_HIDDEN; +void enter_script(script_ctx_t*,jsexcept_t*) ; +HRESULT leave_script(script_ctx_t*,HRESULT) ; +void reset_ei(jsexcept_t*) ; +void set_error_location(jsexcept_t*,bytecode_t*,unsigned,unsigned,jsstr_t*) ;

typedef struct _except_frame_t except_frame_t; struct _parser_ctx_t; @@ -306,8 +306,8 @@ typedef struct _call_frame_t { #define EXEC_EVAL 0x0008

HRESULT exec_source(script_ctx_t*,DWORD,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*, - jsdisp_t*,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; + jsdisp_t*,unsigned,jsval_t*,jsval_t*) ;

-HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT setup_arguments_object(script_ctx_t*,call_frame_t*) DECLSPEC_HIDDEN; -void detach_arguments_object(call_frame_t*) DECLSPEC_HIDDEN; +HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) ; +HRESULT setup_arguments_object(script_ctx_t*,call_frame_t*) ; +void detach_arguments_object(call_frame_t*) ; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index bd80528c020..41d075b0990 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -62,17 +62,17 @@ typedef struct { struct list custom_blocks; } heap_pool_t;

-void heap_pool_init(heap_pool_t*) DECLSPEC_HIDDEN; -void *heap_pool_alloc(heap_pool_t*,DWORD) __WINE_ALLOC_SIZE(2) DECLSPEC_HIDDEN; -void *heap_pool_grow(heap_pool_t*,void*,DWORD,DWORD) DECLSPEC_HIDDEN; -void heap_pool_clear(heap_pool_t*) DECLSPEC_HIDDEN; -void heap_pool_free(heap_pool_t*) DECLSPEC_HIDDEN; -heap_pool_t *heap_pool_mark(heap_pool_t*) DECLSPEC_HIDDEN; +void heap_pool_init(heap_pool_t*) ; +void *heap_pool_alloc(heap_pool_t*,DWORD) __WINE_ALLOC_SIZE(2) ; +void *heap_pool_grow(heap_pool_t*,void*,DWORD,DWORD) ; +void heap_pool_clear(heap_pool_t*) ; +void heap_pool_free(heap_pool_t*) ; +heap_pool_t *heap_pool_mark(heap_pool_t*) ;

typedef struct jsdisp_t jsdisp_t;

-extern HINSTANCE jscript_hinstance DECLSPEC_HIDDEN; -HRESULT get_dispatch_typeinfo(ITypeInfo**) DECLSPEC_HIDDEN; +extern HINSTANCE jscript_hinstance ; +HRESULT get_dispatch_typeinfo(ITypeInfo**) ;

#define PROPF_ARGMASK 0x00ff #define PROPF_METHOD 0x0100 @@ -119,13 +119,13 @@ typedef enum { JSCLASS_SET, } jsclass_t;

-jsdisp_t *iface_to_jsdisp(IDispatch*) DECLSPEC_HIDDEN; +jsdisp_t *iface_to_jsdisp(IDispatch*) ;

typedef HRESULT (*builtin_invoke_t)(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*); typedef HRESULT (*builtin_getter_t)(script_ctx_t*,jsdisp_t*,jsval_t*); typedef HRESULT (*builtin_setter_t)(script_ctx_t*,jsdisp_t*,jsval_t);

-HRESULT builtin_set_const(script_ctx_t*,jsdisp_t*,jsval_t) DECLSPEC_HIDDEN; +HRESULT builtin_set_const(script_ctx_t*,jsdisp_t*,jsval_t) ;

typedef struct named_item_t { jsdisp_t *script_obj; @@ -145,12 +145,12 @@ enum gc_traverse_op { GC_TRAVERSE };

-HRESULT create_named_item_script_obj(script_ctx_t*,named_item_t*) DECLSPEC_HIDDEN; -named_item_t *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; -void release_named_item(named_item_t*) DECLSPEC_HIDDEN; -HRESULT gc_run(script_ctx_t*) DECLSPEC_HIDDEN; -HRESULT gc_process_linked_obj(struct gc_ctx*,enum gc_traverse_op,jsdisp_t*,jsdisp_t*,void**) DECLSPEC_HIDDEN; -HRESULT gc_process_linked_val(struct gc_ctx*,enum gc_traverse_op,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT create_named_item_script_obj(script_ctx_t*,named_item_t*) ; +named_item_t *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) ; +void release_named_item(named_item_t*) ; +HRESULT gc_run(script_ctx_t*) ; +HRESULT gc_process_linked_obj(struct gc_ctx*,enum gc_traverse_op,jsdisp_t*,jsdisp_t*,void**) ; +HRESULT gc_process_linked_val(struct gc_ctx*,enum gc_traverse_op,jsdisp_t*,jsval_t*) ;

typedef struct { const WCHAR *name; @@ -197,9 +197,9 @@ static inline IDispatch *to_disp(jsdisp_t *jsdisp) return (IDispatch*)&jsdisp->IDispatchEx_iface; }

-jsdisp_t *as_jsdisp(IDispatch*) DECLSPEC_HIDDEN; -jsdisp_t *to_jsdisp(IDispatch*) DECLSPEC_HIDDEN; -void jsdisp_free(jsdisp_t*) DECLSPEC_HIDDEN; +jsdisp_t *as_jsdisp(IDispatch*) ; +jsdisp_t *to_jsdisp(IDispatch*) ; +void jsdisp_free(jsdisp_t*) ;

#ifndef TRACE_REFCNT

@@ -223,8 +223,8 @@ static inline void jsdisp_release(jsdisp_t *jsdisp)

#else

-jsdisp_t *jsdisp_addref(jsdisp_t*) DECLSPEC_HIDDEN; -void jsdisp_release(jsdisp_t*) DECLSPEC_HIDDEN; +jsdisp_t *jsdisp_addref(jsdisp_t*) ; +void jsdisp_release(jsdisp_t*) ;

#endif

@@ -234,62 +234,62 @@ enum jsdisp_enum_type { JSDISP_ENUM_OWN_ENUMERABLE };

-HRESULT create_dispex(script_ctx_t*,const builtin_info_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT init_dispex(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) DECLSPEC_HIDDEN; -HRESULT init_dispex_from_constr(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) DECLSPEC_HIDDEN; - -HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; -HRESULT disp_call_name(script_ctx_t*,IDispatch*,const WCHAR*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; -HRESULT disp_call_value_with_caller(script_ctx_t*,IDispatch*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*,IServiceProvider*) DECLSPEC_HIDDEN; -HRESULT jsdisp_call_value(jsdisp_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_call(jsdisp_t*,DISPID,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_call_name(jsdisp_t*,const WCHAR*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; -HRESULT disp_propget(script_ctx_t*,IDispatch*,DISPID,jsval_t*) DECLSPEC_HIDDEN; -HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,jsval_t) DECLSPEC_HIDDEN; -HRESULT disp_propput_name(script_ctx_t*,IDispatch*,const WCHAR*,jsval_t) DECLSPEC_HIDDEN; -HRESULT jsdisp_propget(jsdisp_t*,DISPID,jsval_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_propput(jsdisp_t*,const WCHAR*,DWORD,BOOL,jsval_t) DECLSPEC_HIDDEN; -HRESULT jsdisp_propput_name(jsdisp_t*,const WCHAR*,jsval_t) DECLSPEC_HIDDEN; -HRESULT jsdisp_propput_idx(jsdisp_t*,DWORD,jsval_t) DECLSPEC_HIDDEN; -HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,jsval_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,jsval_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN; -HRESULT jsdisp_get_idx_id(jsdisp_t*,DWORD,DISPID*) DECLSPEC_HIDDEN; -HRESULT disp_delete(IDispatch*,DISPID,BOOL*) DECLSPEC_HIDDEN; -HRESULT disp_delete_name(script_ctx_t*,IDispatch*,jsstr_t*,BOOL*) DECLSPEC_HIDDEN; -HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; -HRESULT jsdisp_get_own_property(jsdisp_t*,const WCHAR*,BOOL,property_desc_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_define_property(jsdisp_t*,const WCHAR*,property_desc_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_define_data_property(jsdisp_t*,const WCHAR*,unsigned,jsval_t) DECLSPEC_HIDDEN; -HRESULT jsdisp_next_prop(jsdisp_t*,DISPID,enum jsdisp_enum_type,DISPID*) DECLSPEC_HIDDEN; +HRESULT create_dispex(script_ctx_t*,const builtin_info_t*,jsdisp_t*,jsdisp_t**) ; +HRESULT init_dispex(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) ; +HRESULT init_dispex_from_constr(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) ; + +HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,WORD,unsigned,jsval_t*,jsval_t*) ; +HRESULT disp_call_name(script_ctx_t*,IDispatch*,const WCHAR*,WORD,unsigned,jsval_t*,jsval_t*) ; +HRESULT disp_call_value_with_caller(script_ctx_t*,IDispatch*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*,IServiceProvider*) ; +HRESULT jsdisp_call_value(jsdisp_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) ; +HRESULT jsdisp_call(jsdisp_t*,DISPID,WORD,unsigned,jsval_t*,jsval_t*) ; +HRESULT jsdisp_call_name(jsdisp_t*,const WCHAR*,WORD,unsigned,jsval_t*,jsval_t*) ; +HRESULT disp_propget(script_ctx_t*,IDispatch*,DISPID,jsval_t*) ; +HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,jsval_t) ; +HRESULT disp_propput_name(script_ctx_t*,IDispatch*,const WCHAR*,jsval_t) ; +HRESULT jsdisp_propget(jsdisp_t*,DISPID,jsval_t*) ; +HRESULT jsdisp_propput(jsdisp_t*,const WCHAR*,DWORD,BOOL,jsval_t) ; +HRESULT jsdisp_propput_name(jsdisp_t*,const WCHAR*,jsval_t) ; +HRESULT jsdisp_propput_idx(jsdisp_t*,DWORD,jsval_t) ; +HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,jsval_t*) ; +HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,jsval_t*) ; +HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) ; +HRESULT jsdisp_get_idx_id(jsdisp_t*,DWORD,DISPID*) ; +HRESULT disp_delete(IDispatch*,DISPID,BOOL*) ; +HRESULT disp_delete_name(script_ctx_t*,IDispatch*,jsstr_t*,BOOL*) ; +HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) ; +HRESULT jsdisp_get_own_property(jsdisp_t*,const WCHAR*,BOOL,property_desc_t*) ; +HRESULT jsdisp_define_property(jsdisp_t*,const WCHAR*,property_desc_t*) ; +HRESULT jsdisp_define_data_property(jsdisp_t*,const WCHAR*,unsigned,jsval_t) ; +HRESULT jsdisp_next_prop(jsdisp_t*,DISPID,enum jsdisp_enum_type,DISPID*) ; HRESULT jsdisp_get_prop_name(jsdisp_t*,DISPID,jsstr_t**); -HRESULT jsdisp_change_prototype(jsdisp_t*,jsdisp_t*) DECLSPEC_HIDDEN; -void jsdisp_freeze(jsdisp_t*,BOOL) DECLSPEC_HIDDEN; -BOOL jsdisp_is_frozen(jsdisp_t*,BOOL) DECLSPEC_HIDDEN; +HRESULT jsdisp_change_prototype(jsdisp_t*,jsdisp_t*) ; +void jsdisp_freeze(jsdisp_t*,BOOL) ; +BOOL jsdisp_is_frozen(jsdisp_t*,BOOL) ;

HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, - jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; + jsdisp_t*,jsdisp_t**) ; HRESULT create_builtin_constructor(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, - jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT Function_invoke(jsdisp_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; - -HRESULT Function_value(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; -HRESULT Function_get_value(script_ctx_t*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; -struct _function_code_t *Function_get_code(jsdisp_t*) DECLSPEC_HIDDEN; - -HRESULT throw_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; -jsdisp_t *create_builtin_error(script_ctx_t *ctx) DECLSPEC_HIDDEN; - -HRESULT create_object(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_math(script_ctx_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_array(script_ctx_t*,DWORD,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_regexp(script_ctx_t*,jsstr_t*,DWORD,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_regexp_var(script_ctx_t*,jsval_t,jsval_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_string(script_ctx_t*,jsstr_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_bool(script_ctx_t*,BOOL,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_number(script_ctx_t*,double,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_vbarray(script_ctx_t*,SAFEARRAY*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_json(script_ctx_t*,jsdisp_t**) DECLSPEC_HIDDEN; + jsdisp_t*,jsdisp_t**) ; +HRESULT Function_invoke(jsdisp_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) ; + +HRESULT Function_value(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) ; +HRESULT Function_get_value(script_ctx_t*,jsdisp_t*,jsval_t*) ; +struct _function_code_t *Function_get_code(jsdisp_t*) ; + +HRESULT throw_error(script_ctx_t*,HRESULT,const WCHAR*) ; +jsdisp_t *create_builtin_error(script_ctx_t *ctx) ; + +HRESULT create_object(script_ctx_t*,jsdisp_t*,jsdisp_t**) ; +HRESULT create_math(script_ctx_t*,jsdisp_t**) ; +HRESULT create_array(script_ctx_t*,DWORD,jsdisp_t**) ; +HRESULT create_regexp(script_ctx_t*,jsstr_t*,DWORD,jsdisp_t**) ; +HRESULT create_regexp_var(script_ctx_t*,jsval_t,jsval_t*,jsdisp_t**) ; +HRESULT create_string(script_ctx_t*,jsstr_t*,jsdisp_t**) ; +HRESULT create_bool(script_ctx_t*,BOOL,jsdisp_t**) ; +HRESULT create_number(script_ctx_t*,double,jsdisp_t**) ; +HRESULT create_vbarray(script_ctx_t*,SAFEARRAY*,jsdisp_t**) ; +HRESULT create_json(script_ctx_t*,jsdisp_t**) ;

typedef enum { NO_HINT, @@ -297,27 +297,27 @@ typedef enum { HINT_NUMBER } hint_t;

-HRESULT to_primitive(script_ctx_t*,jsval_t,jsval_t*, hint_t) DECLSPEC_HIDDEN; -HRESULT to_boolean(jsval_t,BOOL*) DECLSPEC_HIDDEN; -HRESULT to_number(script_ctx_t*,jsval_t,double*) DECLSPEC_HIDDEN; -HRESULT to_integer(script_ctx_t*,jsval_t,double*) DECLSPEC_HIDDEN; -HRESULT to_int32(script_ctx_t*,jsval_t,INT*) DECLSPEC_HIDDEN; -HRESULT to_long(script_ctx_t*,jsval_t,LONG*) DECLSPEC_HIDDEN; -HRESULT to_uint32(script_ctx_t*,jsval_t,UINT32*) DECLSPEC_HIDDEN; -HRESULT to_string(script_ctx_t*,jsval_t,jsstr_t**) DECLSPEC_HIDDEN; -HRESULT to_flat_string(script_ctx_t*,jsval_t,jsstr_t**,const WCHAR**) DECLSPEC_HIDDEN; -HRESULT to_object(script_ctx_t*,jsval_t,IDispatch**) DECLSPEC_HIDDEN; +HRESULT to_primitive(script_ctx_t*,jsval_t,jsval_t*, hint_t) ; +HRESULT to_boolean(jsval_t,BOOL*) ; +HRESULT to_number(script_ctx_t*,jsval_t,double*) ; +HRESULT to_integer(script_ctx_t*,jsval_t,double*) ; +HRESULT to_int32(script_ctx_t*,jsval_t,INT*) ; +HRESULT to_long(script_ctx_t*,jsval_t,LONG*) ; +HRESULT to_uint32(script_ctx_t*,jsval_t,UINT32*) ; +HRESULT to_string(script_ctx_t*,jsval_t,jsstr_t**) ; +HRESULT to_flat_string(script_ctx_t*,jsval_t,jsstr_t**,const WCHAR**) ; +HRESULT to_object(script_ctx_t*,jsval_t,IDispatch**) ;

-HRESULT jsval_strict_equal(jsval_t,jsval_t,BOOL*) DECLSPEC_HIDDEN; +HRESULT jsval_strict_equal(jsval_t,jsval_t,BOOL*) ;

-HRESULT variant_change_type(script_ctx_t*,VARIANT*,VARIANT*,VARTYPE) DECLSPEC_HIDDEN; -HRESULT variant_date_to_number(double,double*) DECLSPEC_HIDDEN; -HRESULT variant_date_to_string(script_ctx_t*,double,jsstr_t**) DECLSPEC_HIDDEN; +HRESULT variant_change_type(script_ctx_t*,VARIANT*,VARIANT*,VARTYPE) ; +HRESULT variant_date_to_number(double,double*) ; +HRESULT variant_date_to_string(script_ctx_t*,double,jsstr_t**) ;

-HRESULT decode_source(WCHAR*) DECLSPEC_HIDDEN; +HRESULT decode_source(WCHAR*) ;

-HRESULT double_to_string(double,jsstr_t**) DECLSPEC_HIDDEN; -WCHAR *idx_to_str(DWORD,WCHAR*) DECLSPEC_HIDDEN; +HRESULT double_to_string(double,jsstr_t**) ; +WCHAR *idx_to_str(DWORD,WCHAR*) ;

static inline BOOL is_digit(WCHAR c) { @@ -330,7 +330,7 @@ typedef struct { cc_var_t *vars; } cc_ctx_t;

-void release_cc(cc_ctx_t*) DECLSPEC_HIDDEN; +void release_cc(cc_ctx_t*) ;

#define SP_CALLER_UNINITIALIZED ((IServiceProvider*)IntToPtr(-1))

@@ -424,32 +424,32 @@ struct _script_ctx_t { }; C_ASSERT(RTL_SIZEOF_THROUGH_FIELD(script_ctx_t, set_prototype) == RTL_SIZEOF_THROUGH_FIELD(script_ctx_t, global_objects));

-void script_release(script_ctx_t*) DECLSPEC_HIDDEN; +void script_release(script_ctx_t*) ;

static inline void script_addref(script_ctx_t *ctx) { ctx->ref++; }

-HRESULT init_global(script_ctx_t*) DECLSPEC_HIDDEN; -HRESULT init_function_constr(script_ctx_t*,jsdisp_t*) DECLSPEC_HIDDEN; -HRESULT create_object_prototype(script_ctx_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT init_set_constructor(script_ctx_t*) DECLSPEC_HIDDEN; - -HRESULT create_activex_constr(script_ctx_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_array_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_bool_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_date_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT init_error_constr(script_ctx_t*,jsdisp_t*) DECLSPEC_HIDDEN; -HRESULT create_enumerator_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_number_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_object_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_regexp_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_string_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_vbarray_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; - -IUnknown *create_ax_site(script_ctx_t*) DECLSPEC_HIDDEN; -HRESULT create_jscaller(script_ctx_t*) DECLSPEC_HIDDEN; +HRESULT init_global(script_ctx_t*) ; +HRESULT init_function_constr(script_ctx_t*,jsdisp_t*) ; +HRESULT create_object_prototype(script_ctx_t*,jsdisp_t**) ; +HRESULT init_set_constructor(script_ctx_t*) ; + +HRESULT create_activex_constr(script_ctx_t*,jsdisp_t**) ; +HRESULT create_array_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) ; +HRESULT create_bool_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) ; +HRESULT create_date_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) ; +HRESULT init_error_constr(script_ctx_t*,jsdisp_t*) ; +HRESULT create_enumerator_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) ; +HRESULT create_number_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) ; +HRESULT create_object_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) ; +HRESULT create_regexp_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) ; +HRESULT create_string_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) ; +HRESULT create_vbarray_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) ; + +IUnknown *create_ax_site(script_ctx_t*) ; +HRESULT create_jscaller(script_ctx_t*) ;

#define REM_CHECK_GLOBAL 0x0001 #define REM_RESET_INDEX 0x0002 @@ -457,19 +457,19 @@ HRESULT create_jscaller(script_ctx_t*) DECLSPEC_HIDDEN; #define REM_ALLOC_RESULT 0x0008 #define REM_NO_PARENS 0x0010 struct match_state_t; -HRESULT regexp_match_next(script_ctx_t*,jsdisp_t*,DWORD,jsstr_t*,struct match_state_t**) DECLSPEC_HIDDEN; -HRESULT parse_regexp_flags(const WCHAR*,DWORD,DWORD*) DECLSPEC_HIDDEN; -HRESULT regexp_string_match(script_ctx_t*,jsdisp_t*,jsstr_t*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT regexp_match_next(script_ctx_t*,jsdisp_t*,DWORD,jsstr_t*,struct match_state_t**) ; +HRESULT parse_regexp_flags(const WCHAR*,DWORD,DWORD*) ; +HRESULT regexp_string_match(script_ctx_t*,jsdisp_t*,jsstr_t*,jsval_t*) ;

-BOOL bool_obj_value(jsdisp_t*) DECLSPEC_HIDDEN; -unsigned array_get_length(jsdisp_t*) DECLSPEC_HIDDEN; -HRESULT localize_number(script_ctx_t*,DOUBLE,BOOL,jsstr_t**) DECLSPEC_HIDDEN; +BOOL bool_obj_value(jsdisp_t*) ; +unsigned array_get_length(jsdisp_t*) ; +HRESULT localize_number(script_ctx_t*,DOUBLE,BOOL,jsstr_t**) ;

-BOOL is_builtin_eval_func(jsdisp_t*) DECLSPEC_HIDDEN; -HRESULT builtin_eval(script_ctx_t*,struct _call_frame_t*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; -HRESULT JSGlobal_eval(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; -HRESULT Object_get_proto_(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; -HRESULT Object_set_proto_(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; +BOOL is_builtin_eval_func(jsdisp_t*) ; +HRESULT builtin_eval(script_ctx_t*,struct _call_frame_t*,WORD,unsigned,jsval_t*,jsval_t*) ; +HRESULT JSGlobal_eval(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) ; +HRESULT Object_get_proto_(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) ; +HRESULT Object_set_proto_(script_ctx_t*,jsval_t,WORD,unsigned,jsval_t*,jsval_t*) ;

static inline BOOL is_class(jsdisp_t *jsdisp, jsclass_t class) { @@ -556,11 +556,11 @@ static inline BOOL is_jscript_error(HRESULT hres) return HRESULT_FACILITY(hres) == FACILITY_JSCRIPT; }

-const char *debugstr_jsval(const jsval_t) DECLSPEC_HIDDEN; +const char *debugstr_jsval(const jsval_t) ;

-HRESULT create_jscript_object(BOOL,REFIID,void**) DECLSPEC_HIDDEN; +HRESULT create_jscript_object(BOOL,REFIID,void**) ;

-extern LONG module_ref DECLSPEC_HIDDEN; +extern LONG module_ref ;

static inline void lock_module(void) { diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index 290ca6e8119..23a11f6302f 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -94,15 +94,15 @@ typedef struct { unsigned depth; } jsstr_rope_t;

-jsstr_t *jsstr_alloc_len(const WCHAR*,unsigned) DECLSPEC_HIDDEN; -jsstr_t *jsstr_alloc_buf(unsigned,WCHAR**) DECLSPEC_HIDDEN; +jsstr_t *jsstr_alloc_len(const WCHAR*,unsigned) ; +jsstr_t *jsstr_alloc_buf(unsigned,WCHAR**) ;

static inline jsstr_t *jsstr_alloc(const WCHAR *str) { return jsstr_alloc_len(str, lstrlenW(str)); }

-void jsstr_free(jsstr_t*) DECLSPEC_HIDDEN; +void jsstr_free(jsstr_t*) ;

static inline void jsstr_release(jsstr_t *str) { @@ -131,7 +131,7 @@ static inline jsstr_rope_t *jsstr_as_rope(jsstr_t *str) return CONTAINING_RECORD(str, jsstr_rope_t, str); }

-const WCHAR *jsstr_rope_flatten(jsstr_rope_t*) DECLSPEC_HIDDEN; +const WCHAR *jsstr_rope_flatten(jsstr_rope_t*) ;

static inline const WCHAR *jsstr_flatten(jsstr_t *str) { @@ -140,7 +140,7 @@ static inline const WCHAR *jsstr_flatten(jsstr_t *str) : jsstr_rope_flatten(jsstr_as_rope(str)); }

-void jsstr_extract(jsstr_t*,unsigned,unsigned,WCHAR*) DECLSPEC_HIDDEN; +void jsstr_extract(jsstr_t*,unsigned,unsigned,WCHAR*) ;

static inline unsigned jsstr_flush(jsstr_t *str, WCHAR *buf) { @@ -168,23 +168,23 @@ static inline jsstr_t *jsstr_substr(jsstr_t *str, unsigned off, unsigned len) return ret; }

-int jsstr_cmp(jsstr_t*,jsstr_t*) DECLSPEC_HIDDEN; +int jsstr_cmp(jsstr_t*,jsstr_t*) ;

static inline BOOL jsstr_eq(jsstr_t *left, jsstr_t *right) { return jsstr_length(left) == jsstr_length(right) && !jsstr_cmp(left, right); }

-jsstr_t *jsstr_concat(jsstr_t*,jsstr_t*) DECLSPEC_HIDDEN; +jsstr_t *jsstr_concat(jsstr_t*,jsstr_t*) ;

-jsstr_t *jsstr_nan(void) DECLSPEC_HIDDEN; -jsstr_t *jsstr_empty(void) DECLSPEC_HIDDEN; -jsstr_t *jsstr_undefined(void) DECLSPEC_HIDDEN; +jsstr_t *jsstr_nan(void) ; +jsstr_t *jsstr_empty(void) ; +jsstr_t *jsstr_undefined(void) ;

-jsstr_t *jsstr_null_bstr(void) DECLSPEC_HIDDEN; -HRESULT jsstr_to_bstr(jsstr_t *str, BSTR *r) DECLSPEC_HIDDEN; +jsstr_t *jsstr_null_bstr(void) ; +HRESULT jsstr_to_bstr(jsstr_t *str, BSTR *r) ;

-BOOL init_strings(void) DECLSPEC_HIDDEN; -void free_strings(void) DECLSPEC_HIDDEN; +BOOL init_strings(void) ; +void free_strings(void) ;

-const char *debugstr_jsstr(jsstr_t*) DECLSPEC_HIDDEN; +const char *debugstr_jsstr(jsstr_t*) ; diff --git a/dlls/jscript/jsval.h b/dlls/jscript/jsval.h index 25177457cbb..64c7653cc27 100644 --- a/dlls/jscript/jsval.h +++ b/dlls/jscript/jsval.h @@ -250,9 +250,9 @@ static inline BOOL get_bool(jsval_t v) return __JSVAL_BOOL(v); }

-HRESULT variant_to_jsval(script_ctx_t*,VARIANT*,jsval_t*) DECLSPEC_HIDDEN; -HRESULT jsval_to_variant(jsval_t,VARIANT*) DECLSPEC_HIDDEN; -void jsval_release(jsval_t) DECLSPEC_HIDDEN; -HRESULT jsval_copy(jsval_t,jsval_t*) DECLSPEC_HIDDEN; +HRESULT variant_to_jsval(script_ctx_t*,VARIANT*,jsval_t*) ; +HRESULT jsval_to_variant(jsval_t,VARIANT*) ; +void jsval_release(jsval_t) ; +HRESULT jsval_copy(jsval_t,jsval_t*) ;

#endif diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index 9e212138480..344e86717e7 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -50,10 +50,10 @@ typedef struct _parser_ctx_t { heap_pool_t heap; } parser_ctx_t;

-HRESULT script_parse(script_ctx_t*,struct _compiler_ctx_t*,struct _bytecode_t*,const WCHAR*,BOOL,parser_ctx_t**) DECLSPEC_HIDDEN; -void parser_release(parser_ctx_t*) DECLSPEC_HIDDEN; +HRESULT script_parse(script_ctx_t*,struct _compiler_ctx_t*,struct _bytecode_t*,const WCHAR*,BOOL,parser_ctx_t**) ; +void parser_release(parser_ctx_t*) ;

-int parser_lex(void*,unsigned*,parser_ctx_t*) DECLSPEC_HIDDEN; +int parser_lex(void*,unsigned*,parser_ctx_t*) ;

static inline void *parser_alloc(parser_ctx_t *ctx, DWORD size) { @@ -65,9 +65,9 @@ static inline void *parser_alloc_tmp(parser_ctx_t *ctx, DWORD size) return heap_pool_alloc(&ctx->script->tmp_heap, size); }

-BOOL is_identifier_char(WCHAR) DECLSPEC_HIDDEN; -BOOL unescape(WCHAR*,size_t*) DECLSPEC_HIDDEN; -HRESULT parse_decimal(const WCHAR**,const WCHAR*,double*) DECLSPEC_HIDDEN; +BOOL is_identifier_char(WCHAR) ; +BOOL unescape(WCHAR*,size_t*) ; +HRESULT parse_decimal(const WCHAR**,const WCHAR*,double*) ;

typedef enum { LT_DOUBLE, @@ -90,8 +90,8 @@ typedef struct { } u; } literal_t;

-literal_t *parse_regexp(parser_ctx_t*) DECLSPEC_HIDDEN; -literal_t *new_boolean_literal(parser_ctx_t*,BOOL) DECLSPEC_HIDDEN; +literal_t *parse_regexp(parser_ctx_t*) ; +literal_t *new_boolean_literal(parser_ctx_t*,BOOL) ;

typedef struct _variable_declaration_t { const WCHAR *identifier; @@ -378,8 +378,8 @@ typedef struct { property_definition_t *property_list; } property_value_expression_t;

-BOOL try_parse_ccval(parser_ctx_t*,ccval_t*) DECLSPEC_HIDDEN; -BOOL parse_cc_expr(parser_ctx_t*) DECLSPEC_HIDDEN; +BOOL try_parse_ccval(parser_ctx_t*,ccval_t*) ; +BOOL parse_cc_expr(parser_ctx_t*) ;

static inline ccval_t ccval_num(double n) { @@ -407,4 +407,4 @@ static inline double get_ccnum(ccval_t v) return v.is_num ? v.u.n : v.u.b; }

-jsstr_t *compiler_alloc_string_len(struct _compiler_ctx_t*,const WCHAR *,unsigned) DECLSPEC_HIDDEN; +jsstr_t *compiler_alloc_string_len(struct _compiler_ctx_t*,const WCHAR *,unsigned) ; diff --git a/dlls/jscript/regexp.h b/dlls/jscript/regexp.h index 67cf8ecef13..27c0c2063fd 100644 --- a/dlls/jscript/regexp.h +++ b/dlls/jscript/regexp.h @@ -61,10 +61,10 @@ typedef struct regexp_t { jsbytecode program[1]; /* regular expression bytecode */ } regexp_t;

-regexp_t* regexp_new(void*, heap_pool_t*, const WCHAR*, DWORD, WORD, BOOL) DECLSPEC_HIDDEN; -void regexp_destroy(regexp_t*) DECLSPEC_HIDDEN; +regexp_t* regexp_new(void*, heap_pool_t*, const WCHAR*, DWORD, WORD, BOOL) ; +void regexp_destroy(regexp_t*) ; HRESULT regexp_execute(regexp_t*, void*, heap_pool_t*, const WCHAR*, - DWORD, match_state_t*) DECLSPEC_HIDDEN; + DWORD, match_state_t*) ;

static inline match_state_t* alloc_match_state(regexp_t *regexp, heap_pool_t *pool, const WCHAR *pos)

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3207

Alistair Leslie-Hughes

12:26 a.m.

New subject: [PATCH 2/2] vbscript: Remove DECLSPEC_HIDDEN usage.

From: Alistair Leslie-Hughes leslie_alistair@hotmail.com

--- dlls/vbscript/parse.h | 8 ++-- dlls/vbscript/regexp.h | 8 ++-- dlls/vbscript/vbscript.h | 80 ++++++++++++++++++++-------------------- 3 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 7c13ad72bf6..1e51523c211 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -310,7 +310,7 @@ typedef struct { heap_pool_t heap; } parser_ctx_t;

-HRESULT parse_script(parser_ctx_t*,const WCHAR*,const WCHAR*,DWORD) DECLSPEC_HIDDEN; -void parser_release(parser_ctx_t*) DECLSPEC_HIDDEN; -int parser_lex(void*,unsigned*,parser_ctx_t*) DECLSPEC_HIDDEN; -void *parser_alloc(parser_ctx_t*,size_t) DECLSPEC_HIDDEN; +HRESULT parse_script(parser_ctx_t*,const WCHAR*,const WCHAR*,DWORD) ; +void parser_release(parser_ctx_t*) ; +int parser_lex(void*,unsigned*,parser_ctx_t*) ; +void *parser_alloc(parser_ctx_t*,size_t) ; diff --git a/dlls/vbscript/regexp.h b/dlls/vbscript/regexp.h index e0faa80cc67..130e69d484b 100644 --- a/dlls/vbscript/regexp.h +++ b/dlls/vbscript/regexp.h @@ -61,11 +61,11 @@ typedef struct regexp_t { jsbytecode program[1]; /* regular expression bytecode */ } regexp_t;

static inline match_state_t* alloc_match_state(regexp_t *regexp, heap_pool_t *pool, const WCHAR *pos) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 13bcf704bf0..adcb8202f95 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -42,12 +42,12 @@ typedef struct { struct list custom_blocks; } heap_pool_t;

-void heap_pool_init(heap_pool_t*) DECLSPEC_HIDDEN; -void *heap_pool_alloc(heap_pool_t*,size_t) __WINE_ALLOC_SIZE(2) DECLSPEC_HIDDEN; -void *heap_pool_grow(heap_pool_t*,void*,DWORD,DWORD) DECLSPEC_HIDDEN; -void heap_pool_clear(heap_pool_t*) DECLSPEC_HIDDEN; -void heap_pool_free(heap_pool_t*) DECLSPEC_HIDDEN; -heap_pool_t *heap_pool_mark(heap_pool_t*) DECLSPEC_HIDDEN; +void heap_pool_init(heap_pool_t*) ; +void *heap_pool_alloc(heap_pool_t*,size_t) __WINE_ALLOC_SIZE(2) ; +void *heap_pool_grow(heap_pool_t*,void*,DWORD,DWORD) ; +void heap_pool_clear(heap_pool_t*) ; +void heap_pool_free(heap_pool_t*) ; +heap_pool_t *heap_pool_mark(heap_pool_t*) ;

typedef struct _function_t function_t; typedef struct _vbscode_t vbscode_t; @@ -159,16 +159,16 @@ typedef struct named_item_t { struct list entry; } named_item_t;

-HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**) DECLSPEC_HIDDEN; -HRESULT disp_get_id(IDispatch*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC_HIDDEN; -HRESULT vbdisp_get_id(vbdisp_t*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC_HIDDEN; -HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,WORD,DISPPARAMS*) DECLSPEC_HIDDEN; -HRESULT get_disp_value(script_ctx_t*,IDispatch*,VARIANT*) DECLSPEC_HIDDEN; -void collect_objects(script_ctx_t*) DECLSPEC_HIDDEN; -HRESULT create_script_disp(script_ctx_t*,ScriptDisp**) DECLSPEC_HIDDEN; +HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**) ; +HRESULT disp_get_id(IDispatch*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) ; +HRESULT vbdisp_get_id(vbdisp_t*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) ; +HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*) ; +HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,WORD,DISPPARAMS*) ; +HRESULT get_disp_value(script_ctx_t*,IDispatch*,VARIANT*) ; +void collect_objects(script_ctx_t*) ; +HRESULT create_script_disp(script_ctx_t*,ScriptDisp**) ;

-HRESULT to_int(VARIANT*,int*) DECLSPEC_HIDDEN; +HRESULT to_int(VARIANT*,int*) ;

static inline unsigned arg_cnt(const DISPPARAMS *dp) { @@ -213,10 +213,10 @@ struct _script_ctx_t { struct list named_items; };

-HRESULT init_global(script_ctx_t*) DECLSPEC_HIDDEN; -HRESULT init_err(script_ctx_t*) DECLSPEC_HIDDEN; +HRESULT init_global(script_ctx_t*) ; +HRESULT init_err(script_ctx_t*) ;

-IUnknown *create_ax_site(script_ctx_t*) DECLSPEC_HIDDEN; +IUnknown *create_ax_site(script_ctx_t*) ;

typedef enum { ARG_NONE = 0, @@ -384,21 +384,21 @@ static inline void grab_vbscode(vbscode_t *code) code->ref++; }

-void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; -HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigned,DWORD,vbscode_t**) DECLSPEC_HIDDEN; -HRESULT compile_procedure(script_ctx_t*,const WCHAR*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigned,DWORD,class_desc_t**) DECLSPEC_HIDDEN; -HRESULT exec_script(script_ctx_t*,BOOL,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; -void release_dynamic_var(dynamic_var_t*) DECLSPEC_HIDDEN; -named_item_t *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; -void release_named_item(named_item_t*) DECLSPEC_HIDDEN; -void clear_ei(EXCEPINFO*) DECLSPEC_HIDDEN; -HRESULT report_script_error(script_ctx_t*,const vbscode_t*,unsigned) DECLSPEC_HIDDEN; -void detach_global_objects(script_ctx_t*) DECLSPEC_HIDDEN; -HRESULT get_builtin_id(BuiltinDisp*,const WCHAR*,DISPID*) DECLSPEC_HIDDEN; -HRESULT array_access(SAFEARRAY *array, DISPPARAMS *dp, VARIANT **ret) DECLSPEC_HIDDEN; - -void release_regexp_typelib(void) DECLSPEC_HIDDEN; -HRESULT get_dispatch_typeinfo(ITypeInfo**) DECLSPEC_HIDDEN; +void release_vbscode(vbscode_t*) ; +HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigned,DWORD,vbscode_t**) ; +HRESULT compile_procedure(script_ctx_t*,const WCHAR*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigned,DWORD,class_desc_t**) ; +HRESULT exec_script(script_ctx_t*,BOOL,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) ; +void release_dynamic_var(dynamic_var_t*) ; +named_item_t *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) ; +void release_named_item(named_item_t*) ; +void clear_ei(EXCEPINFO*) ; +HRESULT report_script_error(script_ctx_t*,const vbscode_t*,unsigned) ; +void detach_global_objects(script_ctx_t*) ; +HRESULT get_builtin_id(BuiltinDisp*,const WCHAR*,DISPID*) ; +HRESULT array_access(SAFEARRAY *array, DISPPARAMS *dp, VARIANT **ret) ; + +void release_regexp_typelib(void) ; +HRESULT get_dispatch_typeinfo(ITypeInfo**) ;

static inline BOOL is_int32(double d) { @@ -410,20 +410,20 @@ static inline BOOL is_digit(WCHAR c) return '0' <= c && c <= '9'; }

-HRESULT create_regexp(IDispatch**) DECLSPEC_HIDDEN; -BSTR string_replace(BSTR,BSTR,BSTR,int,int,int) DECLSPEC_HIDDEN; +HRESULT create_regexp(IDispatch**) ; +BSTR string_replace(BSTR,BSTR,BSTR,int,int,int) ;

-void map_vbs_exception(EXCEPINFO *) DECLSPEC_HIDDEN; +void map_vbs_exception(EXCEPINFO *) ;

-HRESULT create_safearray_iter(SAFEARRAY *sa, BOOL owned, IEnumVARIANT **ev) DECLSPEC_HIDDEN; +HRESULT create_safearray_iter(SAFEARRAY *sa, BOOL owned, IEnumVARIANT **ev) ;

#define FACILITY_VBS 0xa #define MAKE_VBSERROR(code) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_VBS, code)

-HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; +HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) ; +HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) ;

-BSTR get_vbscript_string(int) DECLSPEC_HIDDEN; +BSTR get_vbscript_string(int) ;

#define VBSCRIPT_BUILD_VERSION 16978 #define VBSCRIPT_MAJOR_VERSION 5

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3207

Gabriel Ivăncescu (＠insn)

4:53 p.m.

There's a space between the closing parenthesis and the semi-colon in both commits.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3207#note_37528

585

Age (days ago)

585

Last active (days ago)

wine-gitlab@winehq.org

3 comments

3 participants

tags (0)

participants (3)

Alistair Leslie-Hughes
Alistair Leslie-Hughes (＠alesliehughes)
Gabriel Ivăncescu (＠insn)