wine-devel

wine-devel@winehq.org

4 participants
84472 discussions

[PATCH 8/8] winex11: Directly use win32u for user functions in opengl.c.
by Jacek Caban 14 Apr '22

14 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/opengl.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)

2 1

[PATCH 7/8] winex11: Directly use win32u for user functions in mouse.c.
by Jacek Caban 14 Apr '22

14 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 86 ++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 43 deletions(-)

2 1

[PATCH 6/8] win32u: Introduce NtUserGetMessagePos.
by Jacek Caban 14 Apr '22

14 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/sysparams.c | 3 +++ include/ntuser.h | 6 ++++++ 2 files changed, 9 insertions(+)

2 1

[PATCH 4/8] win32u: Introduce NtUserMapWindowPoints.
by Jacek Caban 14 Apr '22

14 Apr '22

And use it in user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winpos.c | 22 ++-------------------- dlls/win32u/window.c | 7 +++++++ include/ntuser.h | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+), 20 deletions(-)

2 1

[PATCH 3/8] win32u: Move EnableWindow implementation from user32.
by Jacek Caban 14 Apr '22

14 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 30 +----------------------------- dlls/win32u/window.c | 37 +++++++++++++++++++++++++++++++++++++ include/ntuser.h | 6 ++++++ 3 files changed, 44 insertions(+), 29 deletions(-)

2 1

[PATCH 2/8] win32u: Move NtUserChildWindowFromPointEx implementation from user32.
by Jacek Caban 14 Apr '22

14 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winpos.c | 42 +++++++---------------------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 37 ++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 ++++++++++ include/ntuser.h | 1 + 7 files changed, 58 insertions(+), 36 deletions(-)

2 1

[PATCH 1/8] win32u: Move NtUserExcludeUpdateRgn implementation from user32.
by Jacek Caban 14 Apr '22

14 Apr '22

2 1

[PATCH 01/12] regedit: Use wide character string literals in childwnd.c
by Hugh McMaster 14 Apr '22

14 Apr '22

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/childwnd.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 582f3c0c177..704299be837 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -32,12 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(regedit); ChildWnd* g_pChildWnd; static int last_split; -static const WCHAR wszLastKey[] = {'L','a','s','t','K','e','y',0}; -static const WCHAR wszKeyName[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'A','p','p','l','e','t','s','\\','R','e','g','e','d','i','t',0}; +static const WCHAR wszLastKey[] = L"LastKey"; +static const WCHAR wszKeyName[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit"; /******************************************************************************* * Local module support methods @@ -58,11 +54,7 @@ static LPCWSTR GetRootKeyName(HKEY hRootKey) if(hRootKey == HKEY_DYN_DATA) return reg_class_namesW[INDEX_HKEY_DYN_DATA]; else - { - static const WCHAR unknown_key[] = {'U','N','K','N','O','W','N',' ','H','K','E','Y',',',' ', - 'P','L','E','A','S','E',' ','R','E','P','O','R','T',0}; - return unknown_key; - } + return L"Unknown HKEY. Please report."; } static void draw_splitbar(HWND hWnd, int x) -- 2.35.2

1 11

[PATCH vkd3d 1/4] tests: Transition back to D3D12_RESOURCE_STATE_RENDER_TARGET in d3d12_runner_probe_vec4().
by Zebediah Figura 14 Apr '22

14 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- tests/shader_runner_d3d12.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 06221691e..c3eb56864 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -296,8 +296,6 @@ static void d3d12_runner_draw(struct shader_runner *r, ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, test_context->rtv, clear_color, 0, NULL); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); ID3D12GraphicsCommandList_DrawInstanced(command_list, vertex_count, 1, 0, 0); - transition_resource_state(command_list, test_context->render_target, - D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); /* Finish the command list so that we can destroy objects. */ hr = ID3D12GraphicsCommandList_Close(command_list); @@ -314,11 +312,15 @@ static void d3d12_runner_probe_vec4(struct shader_runner *r, struct test_context *test_context = &runner->test_context; struct resource_readback rb; + transition_resource_state(test_context->list, test_context->render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(test_context->render_target, 0, &rb, test_context->queue, test_context->list); check_readback_data_vec4(&rb, rect, v, ulps); release_resource_readback(&rb); reset_command_list(test_context->list, test_context->allocator); + transition_resource_state(test_context->list, test_context->render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } static const struct shader_runner_ops d3d12_runner_ops = -- 2.35.1

3 14

[PATCH 3/3] winepulse: Implement Wow64 entry points in the Unix library.
by Huw Davies 14 Apr '22

14 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winepulse.drv/pulse.c | 383 +++++++++++++++++++++++++++++++++++++ 1 file changed, 383 insertions(+) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 34955a5ee8d..6daf1650f9b 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -2306,3 +2306,386 @@ const unixlib_entry_t __wine_unix_call_funcs[] = pulse_is_started, pulse_get_prop_value, }; + +#ifdef _WIN64 + +typedef UINT PTR32; + +static NTSTATUS pulse_wow64_main_loop(void *args) +{ + struct + { + PTR32 event; + } *params32 = args; + struct main_loop_params params = + { + .event = ULongToHandle(params32->event) + }; + return pulse_main_loop(&params); +} + +static NTSTATUS pulse_wow64_get_endpoint_ids(void *args) +{ + struct + { + EDataFlow flow; + PTR32 endpoints; + unsigned int size; + HRESULT result; + unsigned int num; + unsigned int default_idx; + } *params32 = args; + struct get_endpoint_ids_params params = + { + .flow = params32->flow, + .endpoints = ULongToPtr(params32->endpoints), + .size = params32->size + }; + pulse_get_endpoint_ids(&params); + params32->size = params.size; + params32->result = params.result; + params32->num = params.num; + params32->default_idx = params.default_idx; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_create_stream(void *args) +{ + struct + { + PTR32 name; + PTR32 pulse_name; + EDataFlow dataflow; + AUDCLNT_SHAREMODE mode; + DWORD flags; + REFERENCE_TIME duration; + PTR32 fmt; + HRESULT result; + PTR32 channel_count; + PTR32 stream; + } *params32 = args; + struct create_stream_params params = + { + .name = ULongToPtr(params32->name), + .pulse_name = ULongToPtr(params32->pulse_name), + .dataflow = params32->dataflow, + .mode = params32->mode, + .flags = params32->flags, + .duration = params32->duration, + .fmt = ULongToPtr(params32->fmt), + .channel_count = ULongToPtr(params32->channel_count), + .stream = ULongToPtr(params32->stream) + }; + pulse_create_stream(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_release_stream(void *args) +{ + struct + { + unsigned int stream; + PTR32 timer; + HRESULT result; + } *params32 = args; + struct release_stream_params params = + { + .stream = params32->stream, + .timer = ULongToHandle(params32->timer) + }; + pulse_release_stream(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_get_render_buffer(void *args) +{ + struct + { + unsigned int stream; + UINT32 frames; + HRESULT result; + PTR32 data; + } *params32 = args; + BYTE *data = NULL; + struct get_render_buffer_params params = + { + .stream = params32->stream, + .frames = params32->frames, + .data = &data + }; + pulse_get_render_buffer(&params); + params32->result = params.result; + *(unsigned int *)ULongToPtr(params32->data) = PtrToUlong(data); + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_get_capture_buffer(void *args) +{ + struct + { + unsigned int stream; + HRESULT result; + PTR32 data; + PTR32 frames; + PTR32 flags; + PTR32 devpos; + PTR32 qpcpos; + } *params32 = args; + BYTE *data = NULL; + struct get_capture_buffer_params params = + { + .stream = params32->stream, + .data = &data, + .frames = ULongToPtr(params32->frames), + .flags = ULongToPtr(params32->flags), + .devpos = ULongToPtr(params32->devpos), + .qpcpos = ULongToPtr(params32->qpcpos) + }; + pulse_get_capture_buffer(&params); + params32->result = params.result; + *(unsigned int *)ULongToPtr(params32->data) = PtrToUlong(data); + return STATUS_SUCCESS; +}; + +static NTSTATUS pulse_wow64_get_buffer_size(void *args) +{ + struct + { + unsigned int stream; + HRESULT result; + PTR32 size; + } *params32 = args; + struct get_buffer_size_params params = + { + .stream = params32->stream, + .size = ULongToPtr(params32->size) + }; + pulse_get_buffer_size(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_get_latency(void *args) +{ + struct + { + unsigned int stream; + HRESULT result; + PTR32 latency; + } *params32 = args; + struct get_latency_params params = + { + .stream = params32->stream, + .latency = ULongToPtr(params32->latency) + }; + pulse_get_latency(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_get_current_padding(void *args) +{ + struct + { + unsigned int stream; + HRESULT result; + PTR32 padding; + } *params32 = args; + struct get_current_padding_params params = + { + .stream = params32->stream, + .padding = ULongToPtr(params32->padding) + }; + pulse_get_current_padding(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_get_next_packet_size(void *args) +{ + struct + { + unsigned int stream; + HRESULT result; + PTR32 frames; + } *params32 = args; + struct get_next_packet_size_params params = + { + .stream = params32->stream, + .frames = ULongToPtr(params32->frames) + }; + pulse_get_next_packet_size(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_get_frequency(void *args) +{ + struct + { + unsigned int stream; + HRESULT result; + PTR32 freq; + } *params32 = args; + struct get_frequency_params params = + { + .stream = params32->stream, + .freq = ULongToPtr(params32->freq) + }; + pulse_get_frequency(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_get_position(void *args) +{ + struct + { + unsigned int stream; + BOOL device; + HRESULT result; + PTR32 pos; + PTR32 qpctime; + } *params32 = args; + struct get_position_params params = + { + .stream = params32->stream, + .device = params32->device, + .pos = ULongToPtr(params32->pos), + .qpctime = ULongToPtr(params32->qpctime) + }; + pulse_get_position(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_set_volumes(void *args) +{ + struct + { + unsigned int stream; + float master_volume; + PTR32 volumes; + PTR32 session_volumes; + } *params32 = args; + struct set_volumes_params params = + { + .stream = params32->stream, + .master_volume = params32->master_volume, + .volumes = ULongToPtr(params32->volumes), + .session_volumes = ULongToPtr(params32->session_volumes) + }; + return pulse_set_volumes(&params); +} + +static NTSTATUS pulse_wow64_set_event_handle(void *args) +{ + struct + { + unsigned int stream; + PTR32 event; + HRESULT result; + } *params32 = args; + struct set_event_handle_params params = + { + .stream = params32->stream, + .event = ULongToHandle(params32->event) + }; + pulse_set_event_handle(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_test_connect(void *args) +{ + struct + { + PTR32 name; + HRESULT result; + PTR32 config; + } *params32 = args; + struct test_connect_params params = + { + .name = ULongToPtr(params32->name), + .config = ULongToPtr(params32->config), /* struct pulse_config is identical */ + }; + pulse_test_connect(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_wow64_get_prop_value(void *args) +{ + struct + { + PTR32 pulse_name; + PTR32 guid; + PTR32 prop; + EDataFlow flow; + HRESULT result; + VARTYPE vt; + union + { + WCHAR wstr[128]; + ULONG ulVal; + }; + } *params32 = args; + struct get_prop_value_params params = + { + .pulse_name = ULongToPtr(params32->pulse_name), + .guid = ULongToPtr(params32->guid), + .prop = ULongToPtr(params32->prop), + .flow = params32->flow, + }; + pulse_get_prop_value(&params); + params32->result = params.result; + params32->vt = params.vt; + if (SUCCEEDED(params.result)) + { + switch (params.vt) + { + case VT_UI4: + params32->ulVal = params.ulVal; + break; + case VT_LPWSTR: + wcscpy(params32->wstr, params.wstr); + break; + default: + FIXME("Unhandled vt %04x\n", params.vt); + } + } + return STATUS_SUCCESS; +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + pulse_process_attach, + pulse_process_detach, + pulse_wow64_main_loop, + pulse_wow64_get_endpoint_ids, + pulse_wow64_create_stream, + pulse_wow64_release_stream, + pulse_start, + pulse_stop, + pulse_reset, + pulse_timer_loop, + pulse_wow64_get_render_buffer, + pulse_release_render_buffer, + pulse_wow64_get_capture_buffer, + pulse_release_capture_buffer, + pulse_wow64_get_buffer_size, + pulse_wow64_get_latency, + pulse_wow64_get_current_padding, + pulse_wow64_get_next_packet_size, + pulse_wow64_get_frequency, + pulse_wow64_get_position, + pulse_wow64_set_volumes, + pulse_wow64_set_event_handle, + pulse_wow64_test_connect, + pulse_is_started, + pulse_wow64_get_prop_value, +}; + +#endif /* _WIN64 */ -- 2.25.1

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel