- Wine-Commits - list.winehq.org

Gabriel Ivăncescu : jscript: Implement WeakMap.set().
by Alexandre Julliard July 20, 2023

July 20, 2023

1 0

Gabriel Ivăncescu : jscript: Convert unlink_props to a helper that unlinks the entire object.
by Alexandre Julliard July 20, 2023

July 20, 2023

Module: wine Branch: master Commit: 3f20b8aa3ec8381db17e6f5813e65b8ac98c273c URL: https://gitlab.winehq.org/wine/wine/-/commit/3f20b8aa3ec8381db17e6f5813e65b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 20 16:59:46 2023 +0300 jscript: Convert unlink_props to a helper that unlinks the entire object. It will be useful for other cases, and we don't need the gc_ctx for unlinking. Also set the PROP_PROTREFs to PROP_DELETED since we're unliking the prototype. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index b5fc3699212..9e87c38004f 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -665,14 +665,13 @@ static HRESULT fill_protrefs(jsdisp_t *This) return S_OK; } -static void unlink_props(jsdisp_t *jsdisp) +static void unlink_jsdisp(jsdisp_t *jsdisp) { dispex_prop_t *prop = jsdisp->props, *end; for(end = prop + jsdisp->prop_cnt; prop < end; prop++) { switch(prop->type) { case PROP_DELETED: - case PROP_PROTREF: continue; case PROP_JSVAL: jsval_release(prop->u.val); @@ -688,6 +687,14 @@ static void unlink_props(jsdisp_t *jsdisp) } prop->type = PROP_DELETED; } + + if(jsdisp->prototype) { + jsdisp_release(jsdisp->prototype); + jsdisp->prototype = NULL; + } + + if(jsdisp->builtin_info->gc_traverse) + jsdisp->builtin_info->gc_traverse(NULL, GC_TRAVERSE_UNLINK, jsdisp); } @@ -927,15 +934,7 @@ HRESULT gc_run(script_ctx_t *ctx) /* Grab it since it gets removed when unlinked */ jsdisp_addref(obj); - unlink_props(obj); - - if(obj->prototype) { - jsdisp_release(obj->prototype); - obj->prototype = NULL; - } - - if(obj->builtin_info->gc_traverse) - obj->builtin_info->gc_traverse(&gc_ctx, GC_TRAVERSE_UNLINK, obj); + unlink_jsdisp(obj); /* Releasing unlinked object should not delete any other object, so we can safely obtain the next pointer now */

1 0

Yuxuan Shui : msvcrt: Fix out-of-bound access in create_locinfo.
by Alexandre Julliard July 20, 2023

July 20, 2023

Module: wine Branch: master Commit: f66c8972129e81707292a210ef4989a9ad57da89 URL: https://gitlab.winehq.org/wine/wine/-/commit/f66c8972129e81707292a210ef4989… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Wed Jul 19 22:17:25 2023 +0100 msvcrt: Fix out-of-bound access in create_locinfo. Fixes regression introduced by 24a2b625545f1875b5c3177f2b9. Signed-off-by: Yuxuan Shui <yshui(a)codeweavers.com> --- dlls/msvcrt/locale.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 9fa6ba76143..10682990bfc 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1226,7 +1226,7 @@ static __lc_time_data* create_time_data(WCHAR *sname) int i, ret, size; LCID lcid = LocaleNameToLCID(sname, LCID_CONVERSION_FLAGS); - size = sizeof(__lc_time_data); + size = 0; for(i=0; i<ARRAY_SIZE(time_data); i++) { ret = GetLocaleInfoA(lcid, time_data[i], NULL, 0); if(!ret) @@ -1241,10 +1241,10 @@ static __lc_time_data* create_time_data(WCHAR *sname) #endif } #if _MSVCR_VER >= 110 - size += wcslen(sname)*sizeof(wchar_t); + size += (wcslen(sname) + 1) * sizeof(wchar_t); #endif - cur = malloc(size); + cur = malloc(FIELD_OFFSET(__lc_time_data, data[size])); if(!cur) return NULL; @@ -1256,13 +1256,13 @@ static __lc_time_data* create_time_data(WCHAR *sname) #if _MSVCR_VER == 0 || _MSVCR_VER >= 100 for(i=0; i<ARRAY_SIZE(time_data); i++) { cur->wstr.wstr[i] = (wchar_t*)&cur->data[ret]; - ret += GetLocaleInfoEx(sname, time_data[i], - (wchar_t*)&cur->data[ret], size-ret)*sizeof(wchar_t); + ret += GetLocaleInfoEx(sname, time_data[i], (wchar_t*)&cur->data[ret], + (size - ret) / sizeof(wchar_t)) * sizeof(wchar_t); } #endif #if _MSVCR_VER >= 110 cur->locname = (wchar_t*)&cur->data[ret]; - wcsncpy((wchar_t *) &cur->data[ret], sname, size-ret); + wcscpy((wchar_t*)&cur->data[ret], sname); #else cur->lcid = lcid; #endif

1 0

Gabriel Ivăncescu : jscript: Implement WeakMap instance stub and constructor.
by Alexandre Julliard July 20, 2023

July 20, 2023

Module: wine Branch: master Commit: b8dbee6916520fcbbfbe82dae1b701f587f1a4ce URL: https://gitlab.winehq.org/wine/wine/-/commit/b8dbee6916520fcbbfbe82dae1b701… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jul 20 16:59:46 2023 +0300 jscript: Implement WeakMap instance stub and constructor. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jscript.h | 6 ++- dlls/jscript/object.c | 1 + dlls/jscript/set.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 139 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 46644b8247b..d907da3a36c 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -117,6 +117,7 @@ typedef enum { JSCLASS_JSON, JSCLASS_MAP, JSCLASS_SET, + JSCLASS_WEAKMAP, } jsclass_t; jsdisp_t *iface_to_jsdisp(IDispatch*); @@ -418,11 +419,12 @@ struct _script_ctx_t { jsdisp_t *vbarray_constr; jsdisp_t *map_prototype; jsdisp_t *set_prototype; + jsdisp_t *weakmap_prototype; }; - jsdisp_t *global_objects[22]; + jsdisp_t *global_objects[23]; }; }; -C_ASSERT(RTL_SIZEOF_THROUGH_FIELD(script_ctx_t, set_prototype) == RTL_SIZEOF_THROUGH_FIELD(script_ctx_t, global_objects)); +C_ASSERT(RTL_SIZEOF_THROUGH_FIELD(script_ctx_t, weakmap_prototype) == RTL_SIZEOF_THROUGH_FIELD(script_ctx_t, global_objects)); void script_release(script_ctx_t*); diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 4f6acacbc95..65b25cab239 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -51,6 +51,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns L"[object Object]", L"[object Object]", L"[object Object]", + L"[object Object]", L"[object Object]" }; diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index eca26a890f7..2afb763f4d7 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -614,6 +614,125 @@ static HRESULT Set_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns } } +typedef struct { + jsdisp_t dispex; +} WeakMapInstance; + +static HRESULT WeakMap_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WeakMap_delete(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WeakMap_get(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WeakMap_set(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WeakMap_has(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WeakMap_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static void WeakMap_destructor(jsdisp_t *dispex) +{ + WeakMapInstance *weakmap = (WeakMapInstance*)dispex; + + free(weakmap); +} + +static HRESULT WeakMap_gc_traverse(struct gc_ctx *gc_ctx, enum gc_traverse_op op, jsdisp_t *dispex) +{ + return S_OK; +} + +static const builtin_prop_t WeakMap_prototype_props[] = { + {L"clear", WeakMap_clear, PROPF_METHOD}, + {L"delete", WeakMap_delete, PROPF_METHOD|1}, + {L"get", WeakMap_get, PROPF_METHOD|1}, + {L"has", WeakMap_has, PROPF_METHOD|1}, + {L"set", WeakMap_set, PROPF_METHOD|2}, +}; + +static const builtin_info_t WeakMap_prototype_info = { + JSCLASS_OBJECT, + WeakMap_value, + ARRAY_SIZE(WeakMap_prototype_props), + WeakMap_prototype_props, + NULL, + NULL +}; + +static const builtin_info_t WeakMap_info = { + JSCLASS_WEAKMAP, + WeakMap_value, + 0, + NULL, + WeakMap_destructor, + NULL, + NULL, + NULL, + NULL, + WeakMap_gc_traverse +}; + +static HRESULT WeakMap_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + WeakMapInstance *weakmap; + HRESULT hres; + + switch(flags) { + case DISPATCH_CONSTRUCT: + TRACE("\n"); + + if(!r) + return S_OK; + if(!(weakmap = calloc(1, sizeof(*weakmap)))) + return E_OUTOFMEMORY; + + hres = init_dispex(&weakmap->dispex, ctx, &WeakMap_info, ctx->weakmap_prototype); + if(FAILED(hres)) + return hres; + + *r = jsval_obj(&weakmap->dispex); + return S_OK; + + case DISPATCH_METHOD: + return throw_error(ctx, JS_E_WRONG_THIS, L"WeakMap"); + + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } +} + HRESULT init_set_constructor(script_ctx_t *ctx) { jsdisp_t *constructor; @@ -649,5 +768,20 @@ HRESULT init_set_constructor(script_ctx_t *ctx) hres = jsdisp_define_data_property(ctx->global, L"Map", PROPF_WRITABLE, jsval_obj(constructor)); jsdisp_release(constructor); + if(FAILED(hres)) + return hres; + + hres = create_dispex(ctx, &WeakMap_prototype_info, ctx->object_prototype, &ctx->weakmap_prototype); + if(FAILED(hres)) + return hres; + + hres = create_builtin_constructor(ctx, WeakMap_constructor, L"WeakMap", NULL, + PROPF_CONSTR, ctx->weakmap_prototype, &constructor); + if(FAILED(hres)) + return hres; + + hres = jsdisp_define_data_property(ctx->global, L"WeakMap", PROPF_WRITABLE, + jsval_obj(constructor)); + jsdisp_release(constructor); return hres; }

1 0

Alistair Leslie-Hughes : ddraw: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 20, 2023

July 20, 2023

Module: wine Branch: master Commit: 964025e279db2dd9853df8a1eaa8dd18d9bcda57 URL: https://gitlab.winehq.org/wine/wine/-/commit/964025e279db2dd9853df8a1eaa8dd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 17:41:26 2023 +1000 ddraw: Remove DECLSPEC_HIDDEN usage. --- dlls/ddraw/ddraw_private.h | 138 ++++++++++++++++++++++----------------------- 1 file changed, 69 insertions(+), 69 deletions(-)

1 0

Alistair Leslie-Hughes : d3dx9_36: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 20, 2023

July 20, 2023

Module: wine Branch: master Commit: 36ef8327ac5bdfaba9200a86391d79ce575dee1d URL: https://gitlab.winehq.org/wine/wine/-/commit/36ef8327ac5bdfaba9200a86391d79… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 17:41:26 2023 +1000 d3dx9_36: Remove DECLSPEC_HIDDEN usage. --- dlls/d3dx9_36/d3dx9_private.h | 60 +++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 34ce272de1a..5d8f5b332f8 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -72,8 +72,8 @@ struct d3dx_include_from_file ID3DXInclude ID3DXInclude_iface; }; -extern CRITICAL_SECTION from_file_mutex DECLSPEC_HIDDEN; -extern const struct ID3DXIncludeVtbl d3dx_include_from_file_vtbl DECLSPEC_HIDDEN; +extern CRITICAL_SECTION from_file_mutex; +extern const struct ID3DXIncludeVtbl d3dx_include_from_file_vtbl; static inline BOOL is_conversion_from_supported(const struct pixel_format_desc *format) { @@ -91,50 +91,50 @@ static inline BOOL is_conversion_to_supported(const struct pixel_format_desc *fo return !!format->from_rgba; } -HRESULT map_view_of_file(const WCHAR *filename, void **buffer, DWORD *length) DECLSPEC_HIDDEN; -HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, void **buffer, DWORD *length) DECLSPEC_HIDDEN; +HRESULT map_view_of_file(const WCHAR *filename, void **buffer, DWORD *length); +HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, void **buffer, DWORD *length); -HRESULT write_buffer_to_file(const WCHAR *filename, ID3DXBuffer *buffer) DECLSPEC_HIDDEN; +HRESULT write_buffer_to_file(const WCHAR *filename, ID3DXBuffer *buffer); -const struct pixel_format_desc *get_format_info(D3DFORMAT format) DECLSPEC_HIDDEN; -const struct pixel_format_desc *get_format_info_idx(int idx) DECLSPEC_HIDDEN; +const struct pixel_format_desc *get_format_info(D3DFORMAT format); +const struct pixel_format_desc *get_format_info_idx(int idx); void format_to_vec4(const struct pixel_format_desc *format, const BYTE *src, struct vec4 *dst); void copy_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *size, - const struct pixel_format_desc *format) DECLSPEC_HIDDEN; + const struct pixel_format_desc *format); void convert_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, const struct volume *src_size, const struct pixel_format_desc *src_format, BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *dst_size, - const struct pixel_format_desc *dst_format, D3DCOLOR color_key, const PALETTEENTRY *palette) DECLSPEC_HIDDEN; + const struct pixel_format_desc *dst_format, D3DCOLOR color_key, const PALETTEENTRY *palette); void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, const struct volume *src_size, const struct pixel_format_desc *src_format, BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *dst_size, - const struct pixel_format_desc *dst_format, D3DCOLOR color_key, const PALETTEENTRY *palette) DECLSPEC_HIDDEN; + const struct pixel_format_desc *dst_format, D3DCOLOR color_key, const PALETTEENTRY *palette); HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info, unsigned int skip_levels, - unsigned int *loaded_miplevels) DECLSPEC_HIDDEN; + unsigned int *loaded_miplevels); HRESULT load_cube_texture_from_dds(IDirect3DCubeTexture9 *cube_texture, const void *src_data, - const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; + const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info); HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette, const D3DBOX *dst_box, const void *src_data, const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key, - const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; + const D3DXIMAGE_INFO *src_info); HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9 *volume_texture, const void *src_data, - const PALETTEENTRY *palette, DWORD filter, DWORD color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; + const PALETTEENTRY *palette, DWORD filter, DWORD color_key, const D3DXIMAGE_INFO *src_info); HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLOCKED_RECT *lock, - IDirect3DSurface9 **temp_surface, BOOL write) DECLSPEC_HIDDEN; + IDirect3DSurface9 **temp_surface, BOOL write); HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, - IDirect3DSurface9 *temp_surface, BOOL update) DECLSPEC_HIDDEN; + IDirect3DSurface9 *temp_surface, BOOL update); -unsigned short float_32_to_16(const float in) DECLSPEC_HIDDEN; -float float_16_to_32(const unsigned short in) DECLSPEC_HIDDEN; +unsigned short float_32_to_16(const float in); +float float_16_to_32(const unsigned short in); /* debug helpers */ -const char *debug_d3dxparameter_class(D3DXPARAMETER_CLASS c) DECLSPEC_HIDDEN; -const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t) DECLSPEC_HIDDEN; -const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN; +const char *debug_d3dxparameter_class(D3DXPARAMETER_CLASS c); +const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t); +const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r); /* parameter type conversion helpers */ static inline BOOL get_bool(D3DXPARAMETER_TYPE type, const void *data) @@ -396,10 +396,10 @@ struct d3dx_parameters_store unsigned int full_name_tmp_size; }; -HRESULT d3dx_init_parameters_store(struct d3dx_parameters_store *store, unsigned int count) DECLSPEC_HIDDEN; -void d3dx_parameters_store_cleanup(struct d3dx_parameters_store *store) DECLSPEC_HIDDEN; +HRESULT d3dx_init_parameters_store(struct d3dx_parameters_store *store, unsigned int count); +void d3dx_parameters_store_cleanup(struct d3dx_parameters_store *store); struct d3dx_parameter *get_parameter_by_name(struct d3dx_parameters_store *store, - struct d3dx_parameter *parameter, const char *name) DECLSPEC_HIDDEN; + struct d3dx_parameter *parameter, const char *name); #define SET_D3D_STATE_(manager, device, method, ...) (manager ? manager->lpVtbl->method(manager, __VA_ARGS__) \ : device->lpVtbl->method(device, __VA_ARGS__)) @@ -408,13 +408,13 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx_parameters_store *store HRESULT d3dx_create_param_eval(struct d3dx_parameters_store *parameters, void *byte_code, unsigned int byte_code_size, D3DXPARAMETER_TYPE type, struct d3dx_param_eval **peval, ULONG64 *version_counter, - const char **skip_constants, unsigned int skip_constants_count) DECLSPEC_HIDDEN; -void d3dx_free_param_eval(struct d3dx_param_eval *peval) DECLSPEC_HIDDEN; + const char **skip_constants, unsigned int skip_constants_count); +void d3dx_free_param_eval(struct d3dx_param_eval *peval); HRESULT d3dx_evaluate_parameter(struct d3dx_param_eval *peval, - const struct d3dx_parameter *param, void *param_value) DECLSPEC_HIDDEN; + const struct d3dx_parameter *param, void *param_value); HRESULT d3dx_param_eval_set_shader_constants(ID3DXEffectStateManager *manager, struct IDirect3DDevice9 *device, - struct d3dx_param_eval *peval, BOOL update_all) DECLSPEC_HIDDEN; -BOOL is_param_eval_input_dirty(struct d3dx_param_eval *peval, ULONG64 update_version) DECLSPEC_HIDDEN; + struct d3dx_param_eval *peval, BOOL update_all); +BOOL is_param_eval_input_dirty(struct d3dx_param_eval *peval, ULONG64 update_version); struct ctab_constant { D3DXCONSTANT_DESC desc; @@ -423,6 +423,6 @@ struct ctab_constant { }; const struct ctab_constant *d3dx_shader_get_ctab_constant(ID3DXConstantTable *iface, - D3DXHANDLE constant) DECLSPEC_HIDDEN; + D3DXHANDLE constant); #endif /* __WINE_D3DX9_PRIVATE_H */

1 0

Alistair Leslie-Hughes : d2d1: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 20, 2023

July 20, 2023

Module: wine Branch: master Commit: 85a88076f84b86a7c7136c4e3131f97bee8df46a URL: https://gitlab.winehq.org/wine/wine/-/commit/85a88076f84b86a7c7136c4e3131f9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 17:41:25 2023 +1000 d2d1: Remove DECLSPEC_HIDDEN usage. --- dlls/d2d1/d2d1_private.h | 134 +++++++++++++++++++++++------------------------ 1 file changed, 67 insertions(+), 67 deletions(-)

1 0

Alistair Leslie-Hughes : d3dx10_43: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 20, 2023

July 20, 2023

Module: wine Branch: master Commit: f65705df9d19efdfdd3e4ae3edca961470dcc1b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/f65705df9d19efdfdd3e4ae3edca96… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 17:41:25 2023 +1000 d3dx10_43: Remove DECLSPEC_HIDDEN usage. --- dlls/d3dx10_43/dxhelpers.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx10_43/dxhelpers.h b/dlls/d3dx10_43/dxhelpers.h index 5d0cdb54c59..50d509973cd 100644 --- a/dlls/d3dx10_43/dxhelpers.h +++ b/dlls/d3dx10_43/dxhelpers.h @@ -16,18 +16,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -extern HRESULT load_file(const WCHAR *path, void **data, DWORD *size) DECLSPEC_HIDDEN; +extern HRESULT load_file(const WCHAR *path, void **data, DWORD *size); extern HRESULT load_resourceA(HMODULE module, const char *resource, - void **data, DWORD *size) DECLSPEC_HIDDEN; + void **data, DWORD *size); extern HRESULT load_resourceW(HMODULE module, const WCHAR *resource, - void **data, DWORD *size) DECLSPEC_HIDDEN; + void **data, DWORD *size); -extern HRESULT get_image_info(const void *data, SIZE_T size, D3DX10_IMAGE_INFO *img_info) DECLSPEC_HIDDEN; +extern HRESULT get_image_info(const void *data, SIZE_T size, D3DX10_IMAGE_INFO *img_info); extern void init_load_info(const D3DX10_IMAGE_LOAD_INFO *load_info, - D3DX10_IMAGE_LOAD_INFO *out) DECLSPEC_HIDDEN; + D3DX10_IMAGE_LOAD_INFO *out); /* Returns array of D3D10_SUBRESOURCE_DATA structures followed by textures data. */ extern HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO *load_info, - D3D10_SUBRESOURCE_DATA **resource_data) DECLSPEC_HIDDEN; + D3D10_SUBRESOURCE_DATA **resource_data); extern HRESULT create_d3d_texture(ID3D10Device *device, D3DX10_IMAGE_LOAD_INFO *load_info, - D3D10_SUBRESOURCE_DATA *resource_data, ID3D10Resource **texture) DECLSPEC_HIDDEN; + D3D10_SUBRESOURCE_DATA *resource_data, ID3D10Resource **texture);

1 0

Alexandre Julliard : ntdll/tests: Use nameless unions/structs.
by Alexandre Julliard July 20, 2023

July 20, 2023

Module: wine Branch: master Commit: 59ee798d51eb4d76999de5881cce328a08506131 URL: https://gitlab.winehq.org/wine/wine/-/commit/59ee798d51eb4d76999de5881cce32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 11:38:22 2023 +0200 ntdll/tests: Use nameless unions/structs. --- dlls/ntdll/tests/change.c | 48 ++-- dlls/ntdll/tests/directory.c | 132 +++++------ dlls/ntdll/tests/file.c | 532 +++++++++++++++++++++---------------------- dlls/ntdll/tests/pipe.c | 134 +++++------ dlls/ntdll/tests/wow64.c | 16 +- 5 files changed, 431 insertions(+), 431 deletions(-)

1 0

Alistair Leslie-Hughes : dxgi: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard July 20, 2023

July 20, 2023

Module: wine Branch: master Commit: 83ea03bcc804e76e493ebb9c15e8a3358ef04ca1 URL: https://gitlab.winehq.org/wine/wine/-/commit/83ea03bcc804e76e493ebb9c15e8a3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 17:41:25 2023 +1000 dxgi: Remove DECLSPEC_HIDDEN usage. --- dlls/dxgi/dxgi_private.h | 60 ++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index fa704d28b0f..bae728abadb 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -78,36 +78,36 @@ struct dxgi_device_layer }; /* TRACE helper functions */ -const char *debug_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; -const char *debug_dxgi_mode(const DXGI_MODE_DESC *desc) DECLSPEC_HIDDEN; -const char *debug_dxgi_mode1(const DXGI_MODE_DESC1 *desc) DECLSPEC_HIDDEN; -void dump_feature_levels(const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) DECLSPEC_HIDDEN; +const char *debug_dxgi_format(DXGI_FORMAT format); +const char *debug_dxgi_mode(const DXGI_MODE_DESC *desc); +const char *debug_dxgi_mode1(const DXGI_MODE_DESC1 *desc); +void dump_feature_levels(const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count); -DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; -enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; +DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format); +enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format); void dxgi_sample_desc_from_wined3d(DXGI_SAMPLE_DESC *desc, - enum wined3d_multisample_type wined3d_type, unsigned int wined3d_quality) DECLSPEC_HIDDEN; + enum wined3d_multisample_type wined3d_type, unsigned int wined3d_quality); void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, - unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc) DECLSPEC_HIDDEN; + unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc); void wined3d_display_mode_from_dxgi(struct wined3d_display_mode *wined3d_mode, - const DXGI_MODE_DESC *mode) DECLSPEC_HIDDEN; + const DXGI_MODE_DESC *mode); void wined3d_display_mode_from_dxgi1(struct wined3d_display_mode *wined3d_mode, - const DXGI_MODE_DESC1 *mode) DECLSPEC_HIDDEN; -DXGI_USAGE dxgi_usage_from_wined3d_bind_flags(unsigned int wined3d_bind_flags) DECLSPEC_HIDDEN; -unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE usage) DECLSPEC_HIDDEN; -unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) DECLSPEC_HIDDEN; + const DXGI_MODE_DESC1 *mode); +DXGI_USAGE dxgi_usage_from_wined3d_bind_flags(unsigned int wined3d_bind_flags); +unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE usage); +unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags); HRESULT dxgi_get_output_from_window(IWineDXGIFactory *factory, HWND window, IDXGIOutput **dxgi_output) - DECLSPEC_HIDDEN; + ; HRESULT wined3d_swapchain_desc_from_dxgi(struct wined3d_swapchain_desc *wined3d_desc, IDXGIOutput *dxgi_containing_output, HWND window, const DXGI_SWAP_CHAIN_DESC1 *dxgi_desc, - const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *dxgi_fullscreen_desc) DECLSPEC_HIDDEN; + const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *dxgi_fullscreen_desc); HRESULT dxgi_get_private_data(struct wined3d_private_store *store, - REFGUID guid, UINT *data_size, void *data) DECLSPEC_HIDDEN; + REFGUID guid, UINT *data_size, void *data); HRESULT dxgi_set_private_data(struct wined3d_private_store *store, - REFGUID guid, UINT data_size, const void *data) DECLSPEC_HIDDEN; + REFGUID guid, UINT data_size, const void *data); HRESULT dxgi_set_private_data_interface(struct wined3d_private_store *store, - REFGUID guid, const IUnknown *object) DECLSPEC_HIDDEN; + REFGUID guid, const IUnknown *object); /* IDXGIFactory */ struct dxgi_factory @@ -120,9 +120,9 @@ struct dxgi_factory HWND device_window; }; -HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) DECLSPEC_HIDDEN; -HWND dxgi_factory_get_device_window(struct dxgi_factory *factory) DECLSPEC_HIDDEN; -struct dxgi_factory *unsafe_impl_from_IDXGIFactory(IDXGIFactory *iface) DECLSPEC_HIDDEN; +HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended); +HWND dxgi_factory_get_device_window(struct dxgi_factory *factory); +struct dxgi_factory *unsafe_impl_from_IDXGIFactory(IDXGIFactory *iface); /* IDXGIDevice */ struct dxgi_device @@ -139,7 +139,7 @@ struct dxgi_device HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *layer, IDXGIFactory *factory, IDXGIAdapter *adapter, - const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count) DECLSPEC_HIDDEN; + const D3D_FEATURE_LEVEL *feature_levels, unsigned int level_count); /* IDXGIOutput */ struct dxgi_output @@ -152,8 +152,8 @@ struct dxgi_output }; HRESULT dxgi_output_create(struct dxgi_adapter *adapter, unsigned int output_idx, - struct dxgi_output **output) DECLSPEC_HIDDEN; -struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface) DECLSPEC_HIDDEN; + struct dxgi_output **output); +struct dxgi_output *unsafe_impl_from_IDXGIOutput(IDXGIOutput *iface); /* IDXGIAdapter */ struct dxgi_adapter @@ -167,8 +167,8 @@ struct dxgi_adapter }; HRESULT dxgi_adapter_create(struct dxgi_factory *factory, UINT ordinal, - struct dxgi_adapter **adapter) DECLSPEC_HIDDEN; -struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter(IDXGIAdapter *iface) DECLSPEC_HIDDEN; + struct dxgi_adapter **adapter); +struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter(IDXGIAdapter *iface); /* IDXGISwapChain */ struct d3d11_swapchain @@ -187,13 +187,13 @@ struct d3d11_swapchain }; HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, - struct wined3d_swapchain_desc *desc) DECLSPEC_HIDDEN; + struct wined3d_swapchain_desc *desc); HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *queue, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, - IDXGISwapChain1 **swapchain) DECLSPEC_HIDDEN; + IDXGISwapChain1 **swapchain); -BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) DECLSPEC_HIDDEN; +BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc); /* IDXGISurface/IDXGIResource */ struct dxgi_resource @@ -210,6 +210,6 @@ struct dxgi_resource }; HRESULT dxgi_resource_init(struct dxgi_resource *resource, IDXGIDevice *device, - IUnknown *outer, BOOL needs_surface, struct wined3d_resource *wined3d_resource) DECLSPEC_HIDDEN; + IUnknown *outer, BOOL needs_surface, struct wined3d_resource *wined3d_resource); #endif /* __WINE_DXGI_PRIVATE_H */

1 0