June 2023 - Wine-Commits - list.winehq.org

Davide Beatrici : winepulse: Move AudioClient's Release, AddRef into mmdevapi.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: f37d21db9de4fc696317158136630b6481ec8b7c URL: https://gitlab.winehq.org/wine/wine/-/commit/f37d21db9de4fc696317158136630b… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Mon Jun 26 23:24:27 2023 +0200 winepulse: Move AudioClient's Release, AddRef into mmdevapi. --- dlls/mmdevapi/client.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/mmdevdrv.c | 38 ++++---------------------------------- 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index 9ef508d8c47..bec3e440b7c 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -406,6 +406,42 @@ const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = capture_GetNextPacketSize }; +ULONG WINAPI client_AddRef(IAudioClient3 *iface) +{ + struct audio_client *This = impl_from_IAudioClient3(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) Refcount now %lu\n", This, ref); + return ref; +} + +ULONG WINAPI client_Release(IAudioClient3 *iface) +{ + struct audio_client *This = impl_from_IAudioClient3(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) Refcount now %lu\n", This, ref); + + if (!ref) { + IAudioClient3_Stop(iface); + IMMDevice_Release(This->parent); + IUnknown_Release(This->marshal); + + if (This->session) { + sessions_lock(); + list_remove(&This->entry); + sessions_unlock(); + } + + free(This->vols); + + if (This->stream) + stream_release(This->stream, This->timer_thread); + + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + HRESULT WINAPI client_Initialize(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, REFERENCE_TIME period, const WAVEFORMATEX *fmt, const GUID *sessionguid) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 9e233cb845e..cdf5920d985 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -131,8 +131,6 @@ extern const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; -extern HRESULT stream_release(stream_handle stream, HANDLE timer_thread); - static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) { return CONTAINING_RECORD(iface, ACImpl, IAudioClient3_iface); @@ -407,37 +405,9 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient3 *iface, return E_NOINTERFACE; } -static ULONG WINAPI AudioClient_AddRef(IAudioClient3 *iface) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - ULONG ref; - ref = InterlockedIncrement(&This->ref); - TRACE("(%p) Refcount now %lu\n", This, ref); - return ref; -} +extern ULONG WINAPI client_AddRef(IAudioClient3 *iface); -static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - ULONG ref; - ref = InterlockedDecrement(&This->ref); - TRACE("(%p) Refcount now %lu\n", This, ref); - if (!ref) { - IAudioClient3_Stop(iface); - IMMDevice_Release(This->parent); - IUnknown_Release(This->marshal); - if (This->session) { - sessions_lock(); - list_remove(&This->entry); - sessions_unlock(); - } - free(This->vols); - if (This->stream) - stream_release(This->stream, This->timer_thread); - HeapFree(GetProcessHeap(), 0, This); - } - return ref; -} +extern ULONG WINAPI client_Release(IAudioClient3 *iface); static void session_init_vols(AudioSession *session, UINT channels) { @@ -578,8 +548,8 @@ extern HRESULT WINAPI client_InitializeSharedAudioStream(IAudioClient3 *iface, static const IAudioClient3Vtbl AudioClient3_Vtbl = { AudioClient_QueryInterface, - AudioClient_AddRef, - AudioClient_Release, + client_AddRef, + client_Release, client_Initialize, client_GetBufferSize, client_GetStreamLatency,

1 0

Davide Beatrici : winecoreaudio: Use mmdevapi's AudioClient's Release, AddRef.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: aedd34dd3c1ac20a126728fc0c7d14d5c6350304 URL: https://gitlab.winehq.org/wine/wine/-/commit/aedd34dd3c1ac20a126728fc0c7d14… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Mon Jun 26 23:25:12 2023 +0200 winecoreaudio: Use mmdevapi's AudioClient's Release, AddRef. --- dlls/winecoreaudio.drv/mmdevdrv.c | 38 ++++---------------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 764f9e83752..2762abb7552 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -73,8 +73,6 @@ static struct list g_sessions = LIST_INIT(g_sessions); extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; -extern HRESULT stream_release(stream_handle stream, HANDLE timer_thread); - void DECLSPEC_HIDDEN sessions_lock(void) { EnterCriticalSection(&g_sessions_lock); @@ -386,37 +384,9 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient3 *iface, return E_NOINTERFACE; } -static ULONG WINAPI AudioClient_AddRef(IAudioClient3 *iface) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - ULONG ref; - ref = InterlockedIncrement(&This->ref); - TRACE("(%p) Refcount now %lu\n", This, ref); - return ref; -} +extern ULONG WINAPI client_AddRef(IAudioClient3 *iface); -static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - ULONG ref; - ref = InterlockedDecrement(&This->ref); - TRACE("(%p) Refcount now %lu\n", This, ref); - if(!ref){ - IAudioClient3_Stop(iface); - IMMDevice_Release(This->parent); - IUnknown_Release(This->marshal); - if(This->session){ - sessions_lock(); - list_remove(&This->entry); - sessions_unlock(); - } - free(This->vols); - if(This->stream) - stream_release(This->stream, This->timer_thread); - HeapFree(GetProcessHeap(), 0, This); - } - return ref; -} +extern ULONG WINAPI client_Release(IAudioClient3 *iface); static void session_init_vols(AudioSession *session, UINT channels) { @@ -557,8 +527,8 @@ extern HRESULT WINAPI client_InitializeSharedAudioStream(IAudioClient3 *iface, static const IAudioClient3Vtbl AudioClient3_Vtbl = { AudioClient_QueryInterface, - AudioClient_AddRef, - AudioClient_Release, + client_AddRef, + client_Release, client_Initialize, client_GetBufferSize, client_GetStreamLatency,

1 0

Davide Beatrici : winealsa: Use mmdevapi's AudioClient's Release, AddRef.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 3c8e2c32768a6acedcfeebce0061dea3a6d9655f URL: https://gitlab.winehq.org/wine/wine/-/commit/3c8e2c32768a6acedcfeebce0061de… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Mon Jun 26 23:24:54 2023 +0200 winealsa: Use mmdevapi's AudioClient's Release, AddRef. --- dlls/winealsa.drv/mmdevdrv.c | 39 ++++----------------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index cff2aff261d..fee1c196186 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -79,8 +79,6 @@ extern const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; -extern HRESULT stream_release(stream_handle stream, HANDLE timer_thread); - void DECLSPEC_HIDDEN sessions_lock(void) { EnterCriticalSection(&g_sessions_lock); @@ -390,38 +388,9 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient3 *iface, return E_NOINTERFACE; } -static ULONG WINAPI AudioClient_AddRef(IAudioClient3 *iface) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - ULONG ref; - ref = InterlockedIncrement(&This->ref); - TRACE("(%p) Refcount now %lu\n", This, ref); - return ref; -} +extern ULONG WINAPI client_AddRef(IAudioClient3 *iface); -static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - ULONG ref; - - ref = InterlockedDecrement(&This->ref); - TRACE("(%p) Refcount now %lu\n", This, ref); - if(!ref){ - IAudioClient3_Stop(iface); - IMMDevice_Release(This->parent); - IUnknown_Release(This->marshal); - if(This->session){ - sessions_lock(); - list_remove(&This->entry); - sessions_unlock(); - } - free(This->vols); - if (This->stream) - stream_release(This->stream, This->timer_thread); - HeapFree(GetProcessHeap(), 0, This); - } - return ref; -} +extern ULONG WINAPI client_Release(IAudioClient3 *iface); static void session_init_vols(AudioSession *session, UINT channels) { @@ -562,8 +531,8 @@ extern HRESULT WINAPI client_InitializeSharedAudioStream(IAudioClient3 *iface, static const IAudioClient3Vtbl AudioClient3_Vtbl = { AudioClient_QueryInterface, - AudioClient_AddRef, - AudioClient_Release, + client_AddRef, + client_Release, client_Initialize, client_GetBufferSize, client_GetStreamLatency,

1 0

Davide Beatrici : winepulse: Refactor AudioClient's Release to match other drivers.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 33685372dda6e17ece18d538b649b6022ca1af36 URL: https://gitlab.winehq.org/wine/wine/-/commit/33685372dda6e17ece18d538b649b6… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Mon Jun 26 23:14:00 2023 +0200 winepulse: Refactor AudioClient's Release to match other drivers. --- dlls/winepulse.drv/mmdevdrv.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 4631c5ab60e..9e233cb845e 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -423,15 +423,17 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) ref = InterlockedDecrement(&This->ref); TRACE("(%p) Refcount now %lu\n", This, ref); if (!ref) { - if (This->stream) { - stream_release(This->stream, This->timer_thread); - This->stream = 0; + IAudioClient3_Stop(iface); + IMMDevice_Release(This->parent); + IUnknown_Release(This->marshal); + if (This->session) { sessions_lock(); list_remove(&This->entry); sessions_unlock(); } - IUnknown_Release(This->marshal); - IMMDevice_Release(This->parent); + free(This->vols); + if (This->stream) + stream_release(This->stream, This->timer_thread); HeapFree(GetProcessHeap(), 0, This); } return ref;

1 0

Davide Beatrici : winecoreaudio: Refactor AudioClient's Release to match other drivers.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 5069c2ad9054f94ab143d62462ed924f8e98798e URL: https://gitlab.winehq.org/wine/wine/-/commit/5069c2ad9054f94ab143d62462ed92… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Mon Jun 26 23:13:31 2023 +0200 winecoreaudio: Refactor AudioClient's Release to match other drivers. --- dlls/winecoreaudio.drv/mmdevdrv.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index b8c320563e6..764f9e83752 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -402,17 +402,17 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) ref = InterlockedDecrement(&This->ref); TRACE("(%p) Refcount now %lu\n", This, ref); if(!ref){ - if(This->stream){ - stream_release(This->stream, This->timer_thread); - This->stream = 0; - + IAudioClient3_Stop(iface); + IMMDevice_Release(This->parent); + IUnknown_Release(This->marshal); + if(This->session){ sessions_lock(); list_remove(&This->entry); sessions_unlock(); } free(This->vols); - IMMDevice_Release(This->parent); - IUnknown_Release(This->marshal); + if(This->stream) + stream_release(This->stream, This->timer_thread); HeapFree(GetProcessHeap(), 0, This); } return ref;

1 0

Alistair Leslie-Hughes : wined3d: Rename shader_extract_from_dxbc to wined3d_shader_extract_from_dxbc.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 0f41f29a22421a15f8e775a8927b8d249cf054f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f41f29a22421a15f8e775a8927b8d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 17 17:46:24 2023 +1000 wined3d: Rename shader_extract_from_dxbc to wined3d_shader_extract_from_dxbc. Stops a linker error of duplicate name when using upstream vkd3d. --- dlls/wined3d/shader.c | 2 +- dlls/wined3d/shader_sm4.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b4df79508ec..2728929045f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2481,7 +2481,7 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device shader->byte_code_size = desc->byte_code_size; max_version = shader_max_version_from_feature_level(device->cs->c.state->feature_level); - if (FAILED(hr = shader_extract_from_dxbc(shader, max_version, &source_type))) + if (FAILED(hr = wined3d_shader_extract_from_dxbc(shader, max_version, &source_type))) goto fail; if (!(shader->frontend = shader_select_frontend(source_type))) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 78abdbe81ac..74391cc1be8 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -2077,7 +2077,7 @@ static HRESULT shader_dxbc_process_section(struct wined3d_shader *shader, unsign return S_OK; } -HRESULT shader_extract_from_dxbc(struct wined3d_shader *shader, +HRESULT wined3d_shader_extract_from_dxbc(struct wined3d_shader *shader, unsigned int max_shader_version, enum vkd3d_shader_source_type *source_type) { const struct vkd3d_shader_code dxbc = {.code = shader->byte_code, .size = shader->byte_code_size}; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a586d6847bf..001534e8c38 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1466,7 +1466,7 @@ struct wined3d_shader_frontend extern const struct wined3d_shader_frontend sm1_shader_frontend DECLSPEC_HIDDEN; extern const struct wined3d_shader_frontend sm4_shader_frontend DECLSPEC_HIDDEN; -HRESULT shader_extract_from_dxbc(struct wined3d_shader *shader, +HRESULT wined3d_shader_extract_from_dxbc(struct wined3d_shader *shader, unsigned int max_shader_version, enum vkd3d_shader_source_type *source_type) DECLSPEC_HIDDEN; BOOL shader_get_stream_output_register_info(const struct wined3d_shader *shader, const struct wined3d_stream_output_element *so_element, unsigned int *register_idx,

1 0

Stefan Dösinger : vkd3d-shader/hlsl: Make sure variants is initialized in declare_predefined_types().
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: vkd3d Branch: master Commit: 5e88ab22aab49d33f7cc3a5337f3a7719cfa2833 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5e88ab22aab49d33f7cc3a5337f3a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 25 12:44:26 2023 +0200 vkd3d-shader/hlsl: Make sure variants is initialized in declare_predefined_types(). MSVC is too stupid to see it is unused when n_variants=0. --- libs/vkd3d-shader/hlsl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index ba5bcfbf..faeddb7e 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3127,8 +3127,8 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) for (bt = 0; bt <= HLSL_TYPE_LAST_SCALAR; ++bt) { - unsigned int n_variants = 0; const char *const *variants; + unsigned int n_variants; switch (bt) { @@ -3148,6 +3148,8 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) break; default: + n_variants = 0; + variants = NULL; break; }

1 0

Jacek Caban : make_unicode: Don't use DECLSPEC_HIDDEN.
by Alexandre Julliard June 26, 2023

June 26, 2023

Module: wine Branch: master Commit: a5f62b3ef7d286b1a2b205bf236921be5ba16e55 URL: https://gitlab.winehq.org/wine/wine/-/commit/a5f62b3ef7d286b1a2b205bf236921… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 13:08:45 2023 +0200 make_unicode: Don't use DECLSPEC_HIDDEN. --- dlls/dwrite/bracket.c | 2 +- dlls/dwrite/direction.c | 2 +- dlls/dwrite/linebreak.c | 2 +- dlls/dwrite/mirror.c | 2 +- dlls/dwrite/scripts.c | 2 +- dlls/dwrite/shapers/arabic_table.c | 2 +- dlls/gdi32/uniscribe/bracket.c | 2 +- dlls/gdi32/uniscribe/direction.c | 2 +- dlls/gdi32/uniscribe/indicsyllable.c | 2 +- dlls/gdi32/uniscribe/linebreak.c | 2 +- dlls/gdi32/uniscribe/mirror.c | 2 +- dlls/gdi32/uniscribe/shaping.c | 4 ++-- dlls/win32u/vertical.c | 2 +- dlls/wineps.drv/direction.c | 2 +- dlls/wineps.drv/vertical.c | 2 +- tools/make_unicode | 6 +++--- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/bracket.c b/dlls/dwrite/bracket.c index 4c74da996ec..2e513bf6560 100644 --- a/dlls/dwrite/bracket.c +++ b/dlls/dwrite/bracket.c @@ -4,7 +4,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN bidi_bracket_table[572] = +const unsigned short bidi_bracket_table[572] = { /* level 1 offsets */ 0x0100, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, diff --git a/dlls/dwrite/direction.c b/dlls/dwrite/direction.c index 721ffbe6281..12e62d01f4b 100644 --- a/dlls/dwrite/direction.c +++ b/dlls/dwrite/direction.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN bidi_direction_table[5631] = +const unsigned short bidi_direction_table[5631] = { /* level 1 offsets */ 0x0110, 0x0120, 0x0130, 0x0140, 0x0144, 0x0152, 0x0152, 0x0152, diff --git a/dlls/dwrite/linebreak.c b/dlls/dwrite/linebreak.c index 637dd7e5440..29707e4135b 100644 --- a/dlls/dwrite/linebreak.c +++ b/dlls/dwrite/linebreak.c @@ -4,7 +4,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[9976] = +const unsigned short wine_linebreak_table[9976] = { /* level 1 offsets */ 0x0110, 0x0120, 0x0130, 0x0140, 0x0143, 0x0151, 0x0151, 0x0151, diff --git a/dlls/dwrite/mirror.c b/dlls/dwrite/mirror.c index 42e1d794064..fb9b66fb563 100644 --- a/dlls/dwrite/mirror.c +++ b/dlls/dwrite/mirror.c @@ -4,7 +4,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN wine_mirror_map[1428] = +const unsigned short wine_mirror_map[1428] = { /* level 1 offsets */ 0x0100, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, diff --git a/dlls/dwrite/scripts.c b/dlls/dwrite/scripts.c index cc020f399a4..623a1cb76a3 100644 --- a/dlls/dwrite/scripts.c +++ b/dlls/dwrite/scripts.c @@ -4,7 +4,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN wine_scripts_table[10323] = +const unsigned short wine_scripts_table[10323] = { /* level 1 offsets */ 0x0110, 0x0120, 0x0130, 0x0140, 0x0144, 0x0152, 0x0152, 0x0152, diff --git a/dlls/dwrite/shapers/arabic_table.c b/dlls/dwrite/shapers/arabic_table.c index 4e65ff7c0ad..f266ccea0e3 100644 --- a/dlls/dwrite/shapers/arabic_table.c +++ b/dlls/dwrite/shapers/arabic_table.c @@ -4,7 +4,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN arabic_shaping_table[3547] = +const unsigned short arabic_shaping_table[3547] = { /* level 1 offsets */ 0x0110, 0x0120, 0x0130, 0x0140, 0x0141, 0x0141, 0x0141, 0x0141, diff --git a/dlls/gdi32/uniscribe/bracket.c b/dlls/gdi32/uniscribe/bracket.c index 4c74da996ec..2e513bf6560 100644 --- a/dlls/gdi32/uniscribe/bracket.c +++ b/dlls/gdi32/uniscribe/bracket.c @@ -4,7 +4,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN bidi_bracket_table[572] = +const unsigned short bidi_bracket_table[572] = { /* level 1 offsets */ 0x0100, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, diff --git a/dlls/gdi32/uniscribe/direction.c b/dlls/gdi32/uniscribe/direction.c index 721ffbe6281..12e62d01f4b 100644 --- a/dlls/gdi32/uniscribe/direction.c +++ b/dlls/gdi32/uniscribe/direction.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN bidi_direction_table[5631] = +const unsigned short bidi_direction_table[5631] = { /* level 1 offsets */ 0x0110, 0x0120, 0x0130, 0x0140, 0x0144, 0x0152, 0x0152, 0x0152, diff --git a/dlls/gdi32/uniscribe/indicsyllable.c b/dlls/gdi32/uniscribe/indicsyllable.c index 8924ed2b78d..62671f76df3 100644 --- a/dlls/gdi32/uniscribe/indicsyllable.c +++ b/dlls/gdi32/uniscribe/indicsyllable.c @@ -5,7 +5,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3033] = +const unsigned short indic_syllabic_table[3033] = { /* level 1 offsets */ 0x0100, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, 0x010e, diff --git a/dlls/gdi32/uniscribe/linebreak.c b/dlls/gdi32/uniscribe/linebreak.c index 637dd7e5440..29707e4135b 100644 --- a/dlls/gdi32/uniscribe/linebreak.c +++ b/dlls/gdi32/uniscribe/linebreak.c @@ -4,7 +4,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[9976] = +const unsigned short wine_linebreak_table[9976] = { /* level 1 offsets */ 0x0110, 0x0120, 0x0130, 0x0140, 0x0143, 0x0151, 0x0151, 0x0151, diff --git a/dlls/gdi32/uniscribe/mirror.c b/dlls/gdi32/uniscribe/mirror.c index 42e1d794064..fb9b66fb563 100644 --- a/dlls/gdi32/uniscribe/mirror.c +++ b/dlls/gdi32/uniscribe/mirror.c @@ -4,7 +4,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN wine_mirror_map[1428] = +const unsigned short wine_mirror_map[1428] = { /* level 1 offsets */ 0x0100, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, 0x010c, diff --git a/dlls/gdi32/uniscribe/shaping.c b/dlls/gdi32/uniscribe/shaping.c index 8eed3d629f0..11dbd808edc 100644 --- a/dlls/gdi32/uniscribe/shaping.c +++ b/dlls/gdi32/uniscribe/shaping.c @@ -4,7 +4,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2114] = +const unsigned short wine_shaping_table[2114] = { /* level 1 offsets */ 0x0100, 0x010b, 0x010b, 0x011b, 0x0123, 0x012c, 0x013b, 0x014b, @@ -276,7 +276,7 @@ const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2114] = 0x0006, 0x0000, 0x0000, 0x0000, 0x0000 }; -const unsigned short DECLSPEC_HIDDEN wine_shaping_forms[256][4] = +const unsigned short wine_shaping_forms[256][4] = { { 0x0600, 0x0600, 0x0600, 0x0600 }, { 0x0601, 0x0601, 0x0601, 0x0601 }, diff --git a/dlls/win32u/vertical.c b/dlls/win32u/vertical.c index a992d0364f6..c273f8e3f3d 100644 --- a/dlls/win32u/vertical.c +++ b/dlls/win32u/vertical.c @@ -8,7 +8,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1248] = +const unsigned short vertical_orientation_table[1248] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0112, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, diff --git a/dlls/wineps.drv/direction.c b/dlls/wineps.drv/direction.c index 721ffbe6281..12e62d01f4b 100644 --- a/dlls/wineps.drv/direction.c +++ b/dlls/wineps.drv/direction.c @@ -3,7 +3,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN bidi_direction_table[5631] = +const unsigned short bidi_direction_table[5631] = { /* level 1 offsets */ 0x0110, 0x0120, 0x0130, 0x0140, 0x0144, 0x0152, 0x0152, 0x0152, diff --git a/dlls/wineps.drv/vertical.c b/dlls/wineps.drv/vertical.c index 101511cde57..2a36d19c20a 100644 --- a/dlls/wineps.drv/vertical.c +++ b/dlls/wineps.drv/vertical.c @@ -4,7 +4,7 @@ #include "windef.h" -const unsigned short DECLSPEC_HIDDEN vertical_orientation_table[1248] = +const unsigned short vertical_orientation_table[1248] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0112, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, diff --git a/tools/make_unicode b/tools/make_unicode index 69dce31df47..48d63773810 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -3115,7 +3115,7 @@ sub dump_shaping($) dump_two_level_mapping( "wine_shaping_table", 0, 16, @joining_table ); - print OUTPUT "\nconst unsigned short DECLSPEC_HIDDEN wine_shaping_forms[256][4] =\n{\n"; + print OUTPUT "\nconst unsigned short wine_shaping_forms[256][4] =\n{\n"; for (my $i = 0x600; $i <= 0x6ff; $i++) { printf OUTPUT " { 0x%04x, 0x%04x, 0x%04x, 0x%04x },\n", @@ -3283,7 +3283,7 @@ sub dump_two_level_mapping($$$@) for (my $i = 0; $i < @row_data; $i++) { $row_data[$i] += @row_data + 256 - 4096; } - printf OUTPUT "const %s DECLSPEC_HIDDEN %s[%d] =\n{\n", $type, $name, @array + @row_data + @data; + printf OUTPUT "const %s %s[%d] =\n{\n", $type, $name, @array + @row_data + @data; printf OUTPUT " /* level 1 offsets */\n%s,\n", dump_array( $size, 0, @array ); printf OUTPUT " /* level 2 offsets */\n%s,\n", dump_array( $size, 0, @row_data ); printf OUTPUT " /* values */\n%s\n};\n", dump_array( $size, 0, @data ); @@ -3307,7 +3307,7 @@ sub dump_three_level_mapping($$@) for (my $i = $level2; $i < @array2; $i++) { $array2[$i] += @array1 + @array2 - $level2 - $level3; } for (my $i = $level1; $i < @array1; $i++) { $array1[$i] += @array1 - $level2; } - printf OUTPUT "const %s DECLSPEC_HIDDEN %s[%u] =\n{\n", $type, $name, @array1 + (@array2 - $level2) + (@array3 - $level3); + printf OUTPUT "const %s %s[%u] =\n{\n", $type, $name, @array1 + (@array2 - $level2) + (@array3 - $level3); printf OUTPUT " /* level 1 offsets */\n%s,\n", dump_array( $size, 0, @array1[0..$level1-1] ); printf OUTPUT " /* level 2 offsets */\n%s,\n", dump_array( $size, 0, @array1[$level1..$#array1] ); printf OUTPUT " /* level 3 offsets */\n%s,\n", dump_array( $size, 0, @array2[$level2..$#array2] );

1 0

Jacek Caban : gdi32/uniscribe: Don't use DECLSPEC_HIDDEN.
by Alexandre Julliard June 26, 2023

June 26, 2023

Module: wine Branch: master Commit: a312a8e29afe97457a3b26e3b3bb06ae77968362 URL: https://gitlab.winehq.org/wine/wine/-/commit/a312a8e29afe97457a3b26e3b3bb06… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 12:07:23 2023 +0200 gdi32/uniscribe: Don't use DECLSPEC_HIDDEN. --- dlls/gdi32/uniscribe/bidi.c | 4 +- dlls/gdi32/uniscribe/breaking.c | 2 +- dlls/gdi32/uniscribe/shape.c | 6 +-- dlls/gdi32/uniscribe/usp10.c | 2 +- dlls/gdi32/uniscribe/usp10_internal.h | 77 ++++++++++++++++++++++------------- 5 files changed, 56 insertions(+), 35 deletions(-)

1 0

Eric Pouech : dbghelp/tests: Don't call SymSetExtendedOption() directly.
by Alexandre Julliard June 26, 2023

June 26, 2023

Module: wine Branch: master Commit: 1d281c620d3062c2f30cdf533fe4ac06905a07b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d281c620d3062c2f30cdf533fe4ac… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jun 26 18:34:46 2023 +0200 dbghelp/tests: Don't call SymSetExtendedOption() directly. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55128 Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/tests/dbghelp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 575b9f76d20..c456a99d370 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -318,10 +318,17 @@ static unsigned get_module_count(HANDLE proc) static unsigned get_native_module_count(HANDLE proc) { + static BOOL (*WINAPI pSymSetExtendedOption)(IMAGEHLP_EXTENDED_OPTIONS option, BOOL value); unsigned count = 0; BOOL old, ret; - old = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); + if (!pSymSetExtendedOption) + { + pSymSetExtendedOption = (void*)GetProcAddress(GetModuleHandleA("dbghelp.dll"), "SymSetExtendedOption"); + ok(pSymSetExtendedOption != NULL, "SymSetExtendedOption should be present on Wine\n"); + } + + old = pSymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); ret = SymEnumerateModules64(proc, count_native_module_cb, &count); ok(ret, "SymEnumerateModules64 failed: %lu\n", GetLastError()); SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, old);

1 0