- Wine-Commits - list.winehq.org

Brendan Shanks : winealsa: Set zero_bits correctly for large address aware applications on Wow64.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: 5cf597ba09f4e479ac2d8d7312e2b65748c1b1c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/5cf597ba09f4e479ac2d8d7312e2b6… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jul 7 14:39:57 2023 -0700 winealsa: Set zero_bits correctly for large address aware applications on Wow64. --- dlls/winealsa.drv/alsa.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 0f2211d77e7..17737012579 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -91,6 +91,8 @@ static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', 'w','i','n','e','a','l','s','a','.','d','r','v'}; +static ULONG_PTR zero_bits = 0; + static NTSTATUS alsa_not_implemented(void *args) { return STATUS_SUCCESS; @@ -476,6 +478,20 @@ static WCHAR *alsa_get_card_name(int card) return ret; } +static NTSTATUS alsa_process_attach(void *args) +{ +#ifdef _WIN64 + if (NtCurrentTeb()->WowTebOffset) + { + SYSTEM_BASIC_INFORMATION info; + + NtQuerySystemInformation(SystemEmulationBasicInformation, &info, sizeof(info), NULL); + zero_bits = (ULONG_PTR)info.HighestUserAddress | 0x7fffffff; + } +#endif + return STATUS_SUCCESS; +} + static NTSTATUS alsa_main_loop(void *args) { struct main_loop_params *params = args; @@ -781,15 +797,6 @@ static void silence_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 fram memset(buffer, 0, frames * stream->fmt->nBlockAlign); } -static ULONG_PTR zero_bits(void) -{ -#ifdef _WIN64 - return !NtCurrentTeb()->WowTebOffset ? 0 : 0x7fffffff; -#else - return 0; -#endif -} - static NTSTATUS alsa_create_stream(void *args) { struct create_stream_params *params = args; @@ -1004,7 +1011,7 @@ static NTSTATUS alsa_create_stream(void *args) stream->fmt = &fmtex->Format; size = stream->bufsize_frames * params->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits(), &size, + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)){ params->result = E_OUTOFMEMORY; goto exit; @@ -1718,7 +1725,7 @@ static NTSTATUS alsa_get_render_buffer(void *args) stream->tmp_buffer = NULL; } size = frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), &size, + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; return alsa_unlock_result(stream, &params->result, E_OUTOFMEMORY); @@ -1821,7 +1828,7 @@ static NTSTATUS alsa_get_capture_buffer(void *args) stream->tmp_buffer = NULL; } size = *frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), &size, + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; return alsa_unlock_result(stream, &params->result, E_OUTOFMEMORY); @@ -2499,7 +2506,7 @@ static NTSTATUS alsa_get_prop_value(void *args) unixlib_entry_t __wine_unix_call_funcs[] = { - alsa_not_implemented, + alsa_process_attach, alsa_not_implemented, alsa_main_loop, alsa_get_endpoint_ids, @@ -2953,7 +2960,7 @@ static NTSTATUS alsa_wow64_get_prop_value(void *args) unixlib_entry_t __wine_unix_call_wow64_funcs[] = { - alsa_not_implemented, + alsa_process_attach, alsa_not_implemented, alsa_wow64_main_loop, alsa_wow64_get_endpoint_ids,

1 0

Brendan Shanks : winecoreaudio: Set zero_bits correctly for large address aware applications on Wow64.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: 73fc9e749372c06cff4e744e92a9de6ee60cc405 URL: https://gitlab.winehq.org/wine/wine/-/commit/73fc9e749372c06cff4e744e92a9de… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jul 7 14:30:45 2023 -0700 winecoreaudio: Set zero_bits correctly for large address aware applications on Wow64. --- dlls/winecoreaudio.drv/coreaudio.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 1e712a624cb..fcf02401429 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -103,6 +103,8 @@ struct coreaudio_stream static const REFERENCE_TIME def_period = 100000; static const REFERENCE_TIME min_period = 50000; +static ULONG_PTR zero_bits = 0; + static NTSTATUS unix_not_implemented(void *args) { return STATUS_SUCCESS; @@ -196,6 +198,20 @@ static BOOL device_has_channels(AudioDeviceID device, EDataFlow flow) return ret; } +static NTSTATUS unix_process_attach(void *args) +{ +#ifdef _WIN64 + if (NtCurrentTeb()->WowTebOffset) + { + SYSTEM_BASIC_INFORMATION info; + + NtQuerySystemInformation(SystemEmulationBasicInformation, &info, sizeof(info), NULL); + zero_bits = (ULONG_PTR)info.HighestUserAddress | 0x7fffffff; + } +#endif + return STATUS_SUCCESS; +} + static NTSTATUS unix_main_loop(void *args) { struct main_loop_params *params = args; @@ -639,15 +655,6 @@ static HRESULT ca_setup_audiounit(EDataFlow dataflow, AudioComponentInstance uni return S_OK; } -static ULONG_PTR zero_bits(void) -{ -#ifdef _WIN64 - return !NtCurrentTeb()->WowTebOffset ? 0 : 0x7fffffff; -#else - return 0; -#endif -} - static AudioDeviceID dev_id_from_device(const char *device) { return strtoul(device, NULL, 10); @@ -757,7 +764,7 @@ static NTSTATUS unix_create_stream(void *args) } size = stream->bufsize_frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits(), + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)){ params->result = E_OUTOFMEMORY; goto end; @@ -1497,7 +1504,7 @@ static NTSTATUS unix_get_render_buffer(void *args) stream->tmp_buffer = NULL; } size = params->frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; params->result = E_OUTOFMEMORY; @@ -1595,7 +1602,7 @@ static NTSTATUS unix_get_capture_buffer(void *args) chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; if(!stream->tmp_buffer){ size = stream->period_frames * stream->fmt->nBlockAlign; - NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), + NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE); } *params->data = stream->tmp_buffer; @@ -1782,7 +1789,7 @@ static NTSTATUS unix_set_event_handle(void *args) unixlib_entry_t __wine_unix_call_funcs[] = { - unix_not_implemented, + unix_process_attach, unix_not_implemented, unix_main_loop, unix_get_endpoint_ids, @@ -2177,7 +2184,7 @@ static NTSTATUS unix_wow64_set_event_handle(void *args) unixlib_entry_t __wine_unix_call_wow64_funcs[] = { - unix_not_implemented, + unix_process_attach, unix_not_implemented, unix_wow64_main_loop, unix_wow64_get_endpoint_ids,

1 0

Brendan Shanks : wineoss: Set zero_bits correctly for large address aware applications on Wow64.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: e0727a40fb3c83d9c74fd5839803081cf36fea49 URL: https://gitlab.winehq.org/wine/wine/-/commit/e0727a40fb3c83d9c74fd583980308… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jul 7 14:41:39 2023 -0700 wineoss: Set zero_bits correctly for large address aware applications on Wow64. --- dlls/wineoss.drv/oss.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 2097137f749..097e048d03b 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -72,6 +72,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(oss); static const REFERENCE_TIME def_period = 100000; static const REFERENCE_TIME min_period = 50000; +static ULONG_PTR zero_bits = 0; + static NTSTATUS oss_not_implemented(void *args) { return STATUS_SUCCESS; @@ -221,6 +223,20 @@ static void get_default_device(EDataFlow flow, char device[OSS_DEVNODE_SIZE]) return; } +static NTSTATUS oss_process_attach(void *args) +{ +#ifdef _WIN64 + if (NtCurrentTeb()->WowTebOffset) + { + SYSTEM_BASIC_INFORMATION info; + + NtQuerySystemInformation(SystemEmulationBasicInformation, &info, sizeof(info), NULL); + zero_bits = (ULONG_PTR)info.HighestUserAddress | 0x7fffffff; + } +#endif + return STATUS_SUCCESS; +} + static NTSTATUS oss_main_loop(void *args) { struct main_loop_params *params = args; @@ -550,15 +566,6 @@ static HRESULT setup_oss_device(AUDCLNT_SHAREMODE share, int fd, return ret; } -static ULONG_PTR zero_bits(void) -{ -#ifdef _WIN64 - return !NtCurrentTeb()->WowTebOffset ? 0 : 0x7fffffff; -#else - return 0; -#endif -} - static NTSTATUS oss_create_stream(void *args) { struct create_stream_params *params = args; @@ -653,7 +660,7 @@ static NTSTATUS oss_create_stream(void *args) if(params->share == AUDCLNT_SHAREMODE_EXCLUSIVE) stream->bufsize_frames -= stream->bufsize_frames % stream->period_frames; size = stream->bufsize_frames * params->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits(), + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)){ params->result = E_OUTOFMEMORY; goto exit; @@ -988,7 +995,7 @@ static NTSTATUS oss_get_render_buffer(void *args) stream->tmp_buffer = NULL; } size = frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; return oss_unlock_result(stream, &params->result, E_OUTOFMEMORY); @@ -1098,7 +1105,7 @@ static NTSTATUS oss_get_capture_buffer(void *args) stream->tmp_buffer = NULL; } size = *frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; return oss_unlock_result(stream, &params->result, E_OUTOFMEMORY); @@ -1690,7 +1697,7 @@ static NTSTATUS oss_aux_message(void *args) unixlib_entry_t __wine_unix_call_funcs[] = { - oss_not_implemented, + oss_process_attach, oss_not_implemented, oss_main_loop, oss_get_endpoint_ids, @@ -2127,7 +2134,7 @@ static NTSTATUS oss_wow64_aux_message(void *args) unixlib_entry_t __wine_unix_call_wow64_funcs[] = { - oss_not_implemented, + oss_process_attach, oss_not_implemented, oss_wow64_main_loop, oss_wow64_get_endpoint_ids,

1 0

Jeff Smith : gdiplus: Dash pattern scaling does not shrink below line width 1.0.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: abdde73a1c143a47a11fda24632102a2d50573c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/abdde73a1c143a47a11fda24632102… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Mar 5 14:00:47 2020 -0600 gdiplus: Dash pattern scaling does not shrink below line width 1.0. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/graphicspath.c | 3 ++- dlls/gdiplus/tests/graphicspath.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index ad4dde58ccd..85e0f7d5777 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2295,6 +2295,7 @@ static void widen_dashed_figure(GpPath *path, int start, int end, int closed, int dash_index=0; const REAL *dash_pattern; REAL *dash_pattern_scaled; + REAL dash_pattern_scaling = max(pen->width, 1.0); int dash_count; GpPointF *tmp_points; REAL segment_dy; @@ -2337,7 +2338,7 @@ static void widen_dashed_figure(GpPath *path, int start, int end, int closed, if (!dash_pattern_scaled) return; for (i = 0; i < dash_count; i++) - dash_pattern_scaled[i] = pen->width * dash_pattern[i]; + dash_pattern_scaled[i] = dash_pattern_scaling * dash_pattern[i]; tmp_points = heap_alloc_zero((end - start + 2) * sizeof(GpPoint)); if (!tmp_points) { diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 5082f0671d2..7cbcb51edfc 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1278,6 +1278,17 @@ static path_test_t widenline_dash_path[] = { {45.0, 10.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*7*/ }; +static path_test_t widenline_thin_dash_path[] = { + {5.0, 4.75, PathPointTypeStart, 0, 0}, /*0*/ + {8.0, 4.75, PathPointTypeLine, 0, 0}, /*1*/ + {8.0, 5.25, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 5.25, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*3*/ + {9.0, 4.75, PathPointTypeStart, 0, 0}, /*4*/ + {9.5, 4.75, PathPointTypeLine, 0, 0}, /*5*/ + {9.5, 5.25, PathPointTypeLine, 0, 0}, /*6*/ + {9.0, 5.25, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0}, /*7*/ + }; + static path_test_t widenline_unit_path[] = { {5.0, 9.5, PathPointTypeStart, 0, 0}, /*0*/ {50.0, 9.5, PathPointTypeLine, 0, 0}, /*1*/ @@ -1375,6 +1386,18 @@ static void test_widen(void) status = GdipSetPenDashStyle(pen, DashStyleSolid); expect(Ok, status); + /* dashed line less than 1 pixel wide */ + GdipDeletePen(pen); + GdipCreatePen1(0xffffffff, 0.5, UnitPixel, &pen); + GdipSetPenDashStyle(pen, DashStyleDash); + + GdipResetPath(path); + GdipAddPathLine(path, 5.0, 5.0, 9.5, 5.0); + + status = GdipWidenPath(path, pen, m, 1.0); + expect(Ok, status); + ok_path_fudge(path, widenline_thin_dash_path, ARRAY_SIZE(widenline_thin_dash_path), FALSE, 0.000005); + /* pen width in UnitWorld */ GdipDeletePen(pen); status = GdipCreatePen1(0xffffffff, 10.0, UnitWorld, &pen);

1 0

Ekaterine Papava : po: Add Georgian translation.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: 36b715c5c0fa2677033304bc2cfc7fe8874cff01 URL: https://gitlab.winehq.org/wine/wine/-/commit/36b715c5c0fa2677033304bc2cfc7f… Author: Ekaterine Papava <papava.e(a)gtu.ge> Date: Mon Jul 10 16:23:28 2023 +0200 po: Add Georgian translation. --- po/Makefile.in | 1 + po/ka.po | 19028 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 19029 insertions(+)

1 0

Kurt Kartaltepe : winegstreamer: Implement Wow64 entrypoints in the Unix library.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: 3347af2e7c6eec8be224953ee7e51f0218a2ef6f URL: https://gitlab.winehq.org/wine/wine/-/commit/3347af2e7c6eec8be224953ee7e51f… Author: Kurt Kartaltepe <kkartaltepe(a)gmail.com> Date: Fri Jul 7 20:41:52 2023 -0700 winegstreamer: Implement Wow64 entrypoints in the Unix library. --- dlls/winegstreamer/wg_parser.c | 249 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 249 insertions(+) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 76977ba0c0d..9c020cbf055 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1956,3 +1956,252 @@ const unixlib_entry_t __wine_unix_call_funcs[] = X(wg_transform_drain), X(wg_transform_flush), }; + +#ifdef _WIN64 + +typedef ULONG PTR32; + +static NTSTATUS wow64_wg_parser_push_data(void *args) { + struct + { + wg_parser_t parser; + PTR32 data; + UINT32 size; + } *params32 = args; + struct wg_parser_push_data_params params = + { + .parser = params32->parser, + .data = ULongToPtr(params32->data), + .size = params32->size, + }; + + return wg_parser_push_data(&params); +} + +static NTSTATUS wow64_wg_parser_stream_get_preferred_format(void *args) +{ + struct + { + wg_parser_stream_t stream; + PTR32 format; + } *params32 = args; + struct wg_parser_stream_get_preferred_format_params params = + { + .stream = params32->stream, + .format = ULongToPtr(params32->format), + }; + + return wg_parser_stream_get_preferred_format(&params); +} + +static NTSTATUS wow64_wg_parser_stream_get_codec_format(void *args) +{ + struct + { + wg_parser_stream_t stream; + PTR32 format; + } *params32 = args; + struct wg_parser_stream_get_codec_format_params params = + { + .stream = params32->stream, + .format = ULongToPtr(params32->format), + }; + + return wg_parser_stream_get_codec_format(&params); +} + +static NTSTATUS wow64_wg_parser_stream_enable(void *args) +{ + struct + { + wg_parser_stream_t stream; + PTR32 format; + } *params32 = args; + struct wg_parser_stream_enable_params params = + { + .stream = params32->stream, + .format = ULongToPtr(params32->format), + }; + + return wg_parser_stream_enable(&params); +} + +static NTSTATUS wow64_wg_parser_stream_get_buffer(void *args) +{ + struct + { + wg_parser_t parser; + wg_parser_stream_t stream; + PTR32 buffer; + } *params32 = args; + struct wg_parser_stream_get_buffer_params params = + { + .parser = params32->parser, + .stream = params32->stream, + .buffer = ULongToPtr(params32->buffer), + }; + return wg_parser_stream_get_buffer(&params); +} + +static NTSTATUS wow64_wg_parser_stream_copy_buffer(void *args) +{ + struct + { + wg_parser_stream_t stream; + PTR32 data; + UINT32 offset; + UINT32 size; + } *params32 = args; + struct wg_parser_stream_copy_buffer_params params = + { + .stream = params32->stream, + .data = ULongToPtr(params32->data), + .offset = params32->offset, + .size = params32->size, + }; + return wg_parser_stream_copy_buffer(&params); +} + + +static NTSTATUS wow64_wg_parser_stream_get_tag(void *args) +{ + struct + { + wg_parser_stream_t stream; + wg_parser_tag tag; + PTR32 buffer; + PTR32 size; + } *params32 = args; + struct wg_parser_stream_get_tag_params params = + { + .stream = params32->stream, + .tag = params32->tag, + .buffer = ULongToPtr(params32->buffer), + .size = ULongToPtr(params32->size), + }; + + return wg_parser_stream_get_tag(&params); +} + +NTSTATUS wow64_wg_transform_create(void *args) +{ + struct + { + wg_transform_t transform; + PTR32 input_format; + PTR32 output_format; + PTR32 attrs; + } *params32 = args; + struct wg_transform_create_params params = + { + .input_format = ULongToPtr(params32->input_format), + .output_format = ULongToPtr(params32->output_format), + .attrs = ULongToPtr(params32->attrs), + }; + NTSTATUS ret; + + ret = wg_transform_create(&params); + params32->transform = params.transform; + return ret; +} + +NTSTATUS wow64_wg_transform_set_output_format(void *args) +{ + struct + { + wg_transform_t transform; + PTR32 format; + } *params32 = args; + struct wg_transform_set_output_format_params params = + { + .transform = params32->transform, + .format = ULongToPtr(params32->format), + }; + return wg_transform_set_output_format(&params); +} + +NTSTATUS wow64_wg_transform_push_data(void *args) +{ + struct + { + wg_transform_t transform; + PTR32 sample; + HRESULT result; + } *params32 = args; + struct wg_transform_push_data_params params = + { + .transform = params32->transform, + .sample = ULongToPtr(params32->sample), + }; + NTSTATUS ret; + + ret = wg_transform_push_data(&params); + params32->result = params.result; + return ret; +} + +NTSTATUS wow64_wg_transform_read_data(void *args) +{ + struct + { + wg_transform_t transform; + PTR32 sample; + PTR32 format; + HRESULT result; + } *params32 = args; + struct wg_transform_read_data_params params = + { + .transform = params32->transform, + .sample = ULongToPtr(params32->sample), + .format = ULongToPtr(params32->format), + }; + NTSTATUS ret; + + ret = wg_transform_read_data(&params); + params32->result = params.result; + return ret; +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ +#define X64(name) [unix_ ## name] = wow64_ ## name + X(wg_init_gstreamer), + + X(wg_parser_create), + X(wg_parser_destroy), + + X(wg_parser_connect), + X(wg_parser_disconnect), + + X(wg_parser_get_next_read_offset), + X64(wg_parser_push_data), + + X(wg_parser_get_stream_count), + X(wg_parser_get_stream), + + X64(wg_parser_stream_get_preferred_format), + X64(wg_parser_stream_get_codec_format), + X64(wg_parser_stream_enable), + X(wg_parser_stream_disable), + + X64(wg_parser_stream_get_buffer), + X64(wg_parser_stream_copy_buffer), + X(wg_parser_stream_release_buffer), + X(wg_parser_stream_notify_qos), + + X(wg_parser_stream_get_duration), + X64(wg_parser_stream_get_tag), + X(wg_parser_stream_seek), + + X64(wg_transform_create), + X(wg_transform_destroy), + X64(wg_transform_set_output_format), + + X64(wg_transform_push_data), + X64(wg_transform_read_data), + X(wg_transform_get_status), + X(wg_transform_drain), + X(wg_transform_flush), +}; + +#endif /* _WIN64 */

1 0

Kurt Kartaltepe : winegstreamer: Replace pointers with handles in PE->Unix transition.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: 18e79f813b51056534ef3ca3de000cab62436c6b URL: https://gitlab.winehq.org/wine/wine/-/commit/18e79f813b51056534ef3ca3de000c… Author: Kurt Kartaltepe <kkartaltepe(a)gmail.com> Date: Fri Jul 7 20:32:21 2023 -0700 winegstreamer: Replace pointers with handles in PE->Unix transition. Converts struct pointers in syscalls to 64bit opaque handles. This makes future wow64 thunking simpler and should avoid dereferencing Unix pointers in the PE code. --- dlls/winegstreamer/aac_decoder.c | 6 +- dlls/winegstreamer/color_convert.c | 6 +- dlls/winegstreamer/gst_private.h | 62 ++++++++--------- dlls/winegstreamer/h264_decoder.c | 6 +- dlls/winegstreamer/main.c | 126 +++++++++++++++++----------------- dlls/winegstreamer/media_source.c | 14 ++-- dlls/winegstreamer/quartz_parser.c | 20 +++--- dlls/winegstreamer/quartz_transform.c | 6 +- dlls/winegstreamer/resampler.c | 6 +- dlls/winegstreamer/unixlib.h | 48 +++++++------ dlls/winegstreamer/video_decoder.c | 4 +- dlls/winegstreamer/video_processor.c | 6 +- dlls/winegstreamer/wg_parser.c | 62 ++++++++++------- dlls/winegstreamer/wg_sample.c | 28 ++++---- dlls/winegstreamer/wg_transform.c | 23 ++++--- dlls/winegstreamer/wm_reader.c | 12 ++-- dlls/winegstreamer/wma_decoder.c | 6 +- dlls/winegstreamer/wmv_decoder.c | 12 ++-- 18 files changed, 236 insertions(+), 217 deletions(-)

1 0

Kurt Kartaltepe : winegstreamer: Replace ambiguously sized/aligned elements.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: 6987f565e012b176d19e807eb6f35d9daaea9eb1 URL: https://gitlab.winehq.org/wine/wine/-/commit/6987f565e012b176d19e807eb6f35d… Author: Kurt Kartaltepe <kkartaltepe(a)gmail.com> Date: Fri Jul 7 20:41:36 2023 -0700 winegstreamer: Replace ambiguously sized/aligned elements. Replaces bool and enum elements in syscalls with fixed sized UINT64 and UINT8 to avoid ambiguity in size or alignment in future wow64 thunks. --- dlls/winegstreamer/unix_private.h | 1 + dlls/winegstreamer/unixlib.h | 131 +++++++++++++++++++++----------------- 2 files changed, 73 insertions(+), 59 deletions(-) diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h index f1847eb27ef..527822cf15b 100644 --- a/dlls/winegstreamer/unix_private.h +++ b/dlls/winegstreamer/unix_private.h @@ -23,6 +23,7 @@ #include "unixlib.h" +#include <stdbool.h> #include <gst/gst.h> /* unixlib.c */ diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 36abb098127..39391b44735 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -21,7 +21,6 @@ #ifndef __WINE_WINEGSTREAMER_UNIXLIB_H #define __WINE_WINEGSTREAMER_UNIXLIB_H -#include <stdbool.h> #include <stdint.h> #include "windef.h" #include "winternl.h" @@ -30,37 +29,74 @@ #include "wine/unixlib.h" +typedef UINT32 wg_major_type; +enum wg_major_type +{ + WG_MAJOR_TYPE_UNKNOWN = 0, + WG_MAJOR_TYPE_AUDIO, + WG_MAJOR_TYPE_AUDIO_MPEG1, + WG_MAJOR_TYPE_AUDIO_MPEG4, + WG_MAJOR_TYPE_AUDIO_WMA, + WG_MAJOR_TYPE_VIDEO, + WG_MAJOR_TYPE_VIDEO_CINEPAK, + WG_MAJOR_TYPE_VIDEO_H264, + WG_MAJOR_TYPE_VIDEO_WMV, + WG_MAJOR_TYPE_VIDEO_INDEO, +}; + +typedef UINT32 wg_audio_format; +enum wg_audio_format +{ + WG_AUDIO_FORMAT_UNKNOWN, + + WG_AUDIO_FORMAT_U8, + WG_AUDIO_FORMAT_S16LE, + WG_AUDIO_FORMAT_S24LE, + WG_AUDIO_FORMAT_S32LE, + WG_AUDIO_FORMAT_F32LE, + WG_AUDIO_FORMAT_F64LE, +}; + +typedef UINT32 wg_video_format; +enum wg_video_format +{ + WG_VIDEO_FORMAT_UNKNOWN, + + WG_VIDEO_FORMAT_BGRA, + WG_VIDEO_FORMAT_BGRx, + WG_VIDEO_FORMAT_BGR, + WG_VIDEO_FORMAT_RGB15, + WG_VIDEO_FORMAT_RGB16, + + WG_VIDEO_FORMAT_AYUV, + WG_VIDEO_FORMAT_I420, + WG_VIDEO_FORMAT_NV12, + WG_VIDEO_FORMAT_UYVY, + WG_VIDEO_FORMAT_YUY2, + WG_VIDEO_FORMAT_YV12, + WG_VIDEO_FORMAT_YVYU, +}; + +typedef UINT32 wg_wmv_video_format; +enum wg_wmv_video_format +{ + WG_WMV_VIDEO_FORMAT_UNKNOWN, + WG_WMV_VIDEO_FORMAT_WMV1, + WG_WMV_VIDEO_FORMAT_WMV2, + WG_WMV_VIDEO_FORMAT_WMV3, + WG_WMV_VIDEO_FORMAT_WMVA, + WG_WMV_VIDEO_FORMAT_WVC1, +}; + struct wg_format { - enum wg_major_type - { - WG_MAJOR_TYPE_UNKNOWN = 0, - WG_MAJOR_TYPE_AUDIO, - WG_MAJOR_TYPE_AUDIO_MPEG1, - WG_MAJOR_TYPE_AUDIO_MPEG4, - WG_MAJOR_TYPE_AUDIO_WMA, - WG_MAJOR_TYPE_VIDEO, - WG_MAJOR_TYPE_VIDEO_CINEPAK, - WG_MAJOR_TYPE_VIDEO_H264, - WG_MAJOR_TYPE_VIDEO_WMV, - WG_MAJOR_TYPE_VIDEO_INDEO, - } major_type; + wg_major_type major_type; union { struct { - enum wg_audio_format - { - WG_AUDIO_FORMAT_UNKNOWN, - - WG_AUDIO_FORMAT_U8, - WG_AUDIO_FORMAT_S16LE, - WG_AUDIO_FORMAT_S24LE, - WG_AUDIO_FORMAT_S32LE, - WG_AUDIO_FORMAT_F32LE, - WG_AUDIO_FORMAT_F64LE, - } format; + wg_audio_format format; uint32_t channels; uint32_t channel_mask; /* In WinMM format. */ @@ -92,24 +128,7 @@ struct wg_format struct { - enum wg_video_format - { - WG_VIDEO_FORMAT_UNKNOWN, - - WG_VIDEO_FORMAT_BGRA, - WG_VIDEO_FORMAT_BGRx, - WG_VIDEO_FORMAT_BGR, - WG_VIDEO_FORMAT_RGB15, - WG_VIDEO_FORMAT_RGB16, - - WG_VIDEO_FORMAT_AYUV, - WG_VIDEO_FORMAT_I420, - WG_VIDEO_FORMAT_NV12, - WG_VIDEO_FORMAT_UYVY, - WG_VIDEO_FORMAT_YUY2, - WG_VIDEO_FORMAT_YV12, - WG_VIDEO_FORMAT_YVYU, - } format; + wg_video_format format; /* Positive height indicates top-down video; negative height * indicates bottom-up video. */ int32_t width, height; @@ -132,15 +151,7 @@ struct wg_format } video_h264; struct { - enum wg_wmv_video_format - { - WG_WMV_VIDEO_FORMAT_UNKNOWN, - WG_WMV_VIDEO_FORMAT_WMV1, - WG_WMV_VIDEO_FORMAT_WMV2, - WG_WMV_VIDEO_FORMAT_WMV3, - WG_WMV_VIDEO_FORMAT_WMVA, - WG_WMV_VIDEO_FORMAT_WVC1, - } format; + wg_wmv_video_format format; int32_t width, height; uint32_t fps_n, fps_d; } video_wmv; @@ -180,10 +191,11 @@ struct wg_parser_buffer UINT64 pts, duration; UINT32 size; UINT32 stream; - bool discontinuity, preroll, delta, has_pts, has_duration; + UINT8 discontinuity, preroll, delta, has_pts, has_duration; }; C_ASSERT(sizeof(struct wg_parser_buffer) == 32); +typedef UINT32 wg_parser_type; enum wg_parser_type { WG_PARSER_DECODEBIN, @@ -199,10 +211,10 @@ typedef UINT64 wg_transform_t; struct wg_parser_create_params { wg_parser_t parser; - enum wg_parser_type type; - bool unlimited_buffering; - bool err_on; - bool warn_on; + wg_parser_type type; + UINT8 unlimited_buffering; + UINT8 err_on; + UINT8 warn_on; }; struct wg_parser_connect_params @@ -274,7 +286,7 @@ struct wg_parser_stream_copy_buffer_params struct wg_parser_stream_notify_qos_params { wg_parser_stream_t stream; - bool underflow; + UINT8 underflow; DOUBLE proportion; INT64 diff; UINT64 timestamp; @@ -286,6 +298,7 @@ struct wg_parser_stream_get_duration_params UINT64 duration; }; +typedef UINT64 wg_parser_tag; enum wg_parser_tag { WG_PARSER_TAG_LANGUAGE, @@ -296,7 +309,7 @@ enum wg_parser_tag struct wg_parser_stream_get_tag_params { wg_parser_stream_t stream; - enum wg_parser_tag tag; + wg_parser_tag tag; char *buffer; UINT32 *size; };

1 0

Jacek Caban : win32u: Return result from dispatch_win_proc_params.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: 0958278fc7d3e404f1d6b9d95eb8cb5769544008 URL: https://gitlab.winehq.org/wine/wine/-/commit/0958278fc7d3e404f1d6b9d95eb8cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 10 13:45:12 2023 +0200 win32u: Return result from dispatch_win_proc_params. --- dlls/win32u/message.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index c3f8b65833e..091f5cadc34 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -225,8 +225,7 @@ static BOOL init_win_proc_params( struct win_proc_params *params, HWND hwnd, UIN } static BOOL init_window_call_params( struct win_proc_params *params, HWND hwnd, UINT msg, WPARAM wParam, - LPARAM lParam, LRESULT *result, BOOL ansi, - enum wm_char_mapping mapping ) + LPARAM lParam, BOOL ansi, enum wm_char_mapping mapping ) { BOOL is_dialog; WND *win; @@ -249,7 +248,7 @@ static BOOL init_window_call_params( struct win_proc_params *params, HWND hwnd, params->msg = msg; params->wparam = wParam; params->lparam = lParam; - params->result = result; + params->result = NULL; params->ansi = ansi; params->needs_unpack = FALSE; params->mapping = mapping; @@ -258,20 +257,22 @@ static BOOL init_window_call_params( struct win_proc_params *params, HWND hwnd, return TRUE; } -static BOOL dispatch_win_proc_params( struct win_proc_params *params, size_t size ) +static LRESULT dispatch_win_proc_params( struct win_proc_params *params, size_t size ) { struct ntuser_thread_info *thread_info = NtUserGetThreadInfo(); + LRESULT result = 0; void *ret_ptr; ULONG ret_len; - if (thread_info->recursion_count > MAX_WINPROC_RECURSION) return FALSE; + if (thread_info->recursion_count > MAX_WINPROC_RECURSION) return 0; thread_info->recursion_count++; + params->result = &result; KeUserModeCallback( NtUserCallWinProc, params, size, &ret_ptr, &ret_len ); - if (ret_len == sizeof(*params->result)) *params->result = *(LRESULT *)ret_ptr; + if (ret_len == sizeof(result)) result = *(LRESULT *)ret_ptr; thread_info->recursion_count--; - return TRUE; + return result; } /* add a data field to a packed message */ @@ -1394,7 +1395,7 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar call_hooks( WH_CALLWNDPROC, HC_ACTION, same_thread, (LPARAM)&cwp, sizeof(cwp) ); if (size && !(params = malloc( sizeof(*params) + size ))) return 0; - if (!init_window_call_params( params, hwnd, msg, wparam, lparam, &result, !unicode, mapping )) + if (!init_window_call_params( params, hwnd, msg, wparam, lparam, !unicode, mapping )) { if (params != &p) free( params ); return 0; @@ -1406,7 +1407,7 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar params->ansi = FALSE; if (size) memcpy( params + 1, buffer, size ); } - dispatch_win_proc_params( params, sizeof(*params) + size ); + result = dispatch_win_proc_params( params, sizeof(*params) + size ); if (params != &p) free( params ); /* and finally the WH_CALLWNDPROCRET hook */ @@ -2750,12 +2751,10 @@ LRESULT WINAPI NtUserDispatchMessage( const MSG *msg ) if (msg->lParam && msg->message == WM_TIMER) { params.func = (WNDPROC)msg->lParam; - params.result = &retval; /* FIXME */ if (!init_win_proc_params( &params, msg->hwnd, msg->message, msg->wParam, NtGetTickCount(), FALSE )) return 0; - dispatch_win_proc_params( &params, sizeof(params) ); - return retval; + return dispatch_win_proc_params( &params, sizeof(params) ); } if (msg->message == WM_SYSTIMER) { @@ -2776,8 +2775,8 @@ LRESULT WINAPI NtUserDispatchMessage( const MSG *msg ) spy_enter_message( SPY_DISPATCHMESSAGE, msg->hwnd, msg->message, msg->wParam, msg->lParam ); if (init_window_call_params( &params, msg->hwnd, msg->message, msg->wParam, msg->lParam, - &retval, FALSE, WMCHAR_MAP_DISPATCHMESSAGE )) - dispatch_win_proc_params( &params, sizeof(params) ); + FALSE, WMCHAR_MAP_DISPATCHMESSAGE )) + retval = dispatch_win_proc_params( &params, sizeof(params) ); else if (!is_window( msg->hwnd )) RtlSetLastWin32Error( ERROR_INVALID_WINDOW_HANDLE ); else RtlSetLastWin32Error( ERROR_MESSAGE_SYNC_ONLY ); @@ -3184,7 +3183,7 @@ static BOOL process_message( struct send_message_info *info, DWORD_PTR *res_ptr, /* if we're called from client side and need just a simple winproc call, * just fill dispatch params and let user32 do the rest */ return init_window_call_params( info->params, info->hwnd, info->msg, info->wparam, info->lparam, - NULL, ansi, info->wm_char ); + ansi, info->wm_char ); } thread_info->msg_source = msg_source_unavailable; @@ -3545,7 +3544,7 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa case NtUserGetDispatchParams: if (!hwnd) return FALSE; if (init_window_call_params( result_info, hwnd, msg, wparam, lparam, - NULL, ansi, WMCHAR_MAP_DISPATCHMESSAGE )) + ansi, WMCHAR_MAP_DISPATCHMESSAGE )) return TRUE; if (!is_window( hwnd )) RtlSetLastWin32Error( ERROR_INVALID_WINDOW_HANDLE ); else RtlSetLastWin32Error( ERROR_MESSAGE_SYNC_ONLY );

1 0

Jacek Caban : user32: Always use NtCallbackReturn in User32DrawText.
by Alexandre Julliard July 10, 2023

July 10, 2023

Module: wine Branch: master Commit: e0d62e85696609d6b28035ce9f8ea11bcfc174f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/e0d62e85696609d6b28035ce9f8ea1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 10 14:35:12 2023 +0200 user32: Always use NtCallbackReturn in User32DrawText. --- dlls/user32/user_main.c | 12 +++--------- dlls/win32u/font.c | 1 - dlls/wow64win/user.c | 14 +++----------- include/ntuser.h | 1 - 4 files changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 56d5849f469..ef2b94ba698 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -121,19 +121,13 @@ static NTSTATUS WINAPI User32DrawScrollBar( const struct draw_scroll_bar_params return 0; } -static NTSTATUS WINAPI User32DrawText( const struct draw_text_params *params, ULONG size ) +static NTSTATUS WINAPI User32DrawText( struct draw_text_params *params, ULONG size ) { - RECT rect = params->rect; int ret; size -= FIELD_OFFSET( struct draw_text_params, str ); - ret = DrawTextW( params->hdc, params->str, size / sizeof(WCHAR), &rect, params->flags ); - if (params->ret_rect) - { - *params->ret_rect = rect; - return ret; - } - return NtCallbackReturn( &rect, sizeof(rect), ret ); + ret = DrawTextW( params->hdc, params->str, size / sizeof(WCHAR), &params->rect, params->flags ); + return NtCallbackReturn( &params->rect, sizeof(params->rect), ret ); } static NTSTATUS WINAPI User32ImmProcessKey( const struct imm_process_key_params *params, ULONG size ) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index c5f62e76f3a..4a341453012 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -7097,7 +7097,6 @@ INT WINAPI DECLSPEC_HIDDEN DrawTextW( HDC hdc, const WCHAR *str, INT count, RECT if (!(params = malloc( size ))) return 0; params->hdc = hdc; params->rect = *rect; - params->ret_rect = rect; params->flags = flags; if (count) memcpy( params->str, str, count * sizeof(WCHAR) ); ret = KeUserModeCallback( NtUserDrawText, params, size, &ret_ptr, &ret_len ); diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index cb383fd1a50..80759765359 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -312,7 +312,6 @@ struct draw_text_params32 ULONG hdc; int count; RECT rect; - ULONG ret_rect; UINT flags; WCHAR str[1]; }; @@ -832,25 +831,18 @@ static NTSTATUS WINAPI wow64_NtUserDrawText( void *arg, ULONG size ) { struct draw_text_params *params = arg; struct draw_text_params32 *params32; - RECT *rect_ptr = params->ret_rect; + ULONG offset = offsetof( struct draw_text_params, str ) - offsetof( struct draw_text_params32, str ); ULONG ret_len; void *ret_ptr; NTSTATUS ret; - params32 = (struct draw_text_params32 *)(params + 1) - 1; + params32 = (struct draw_text_params32 *)((char *)params + offset); params32->flags = params->flags; - params32->ret_rect = 0; params32->rect = params->rect; params32->count = params->count; params32->hdc = HandleToUlong( params->hdc ); - ret = Wow64KiUserCallbackDispatcher( NtUserDrawText, params32, - size - sizeof(*params) + sizeof(*params32), &ret_ptr, &ret_len ); - if (ret_len == sizeof(RECT) && rect_ptr) - { - *rect_ptr = *(const RECT *)ret_ptr; - return ret; - } + ret = Wow64KiUserCallbackDispatcher( NtUserDrawText, params32, size - offset, &ret_ptr, &ret_len ); return NtCallbackReturn( ret_ptr, ret_len, ret ); } diff --git a/include/ntuser.h b/include/ntuser.h index 2f01f0eafb3..195d4e1322a 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -188,7 +188,6 @@ struct draw_text_params HDC hdc; int count; RECT rect; - RECT *ret_rect; /* FIXME: Use NtCallbackReturn instead */ UINT flags; WCHAR str[1]; };

1 0