May 2023 - Wine-commits - list.winehq.org

Rémi Bernon : mf/tests: Add H264 decoder tests with concatenated streams.
by Alexandre Julliard 31 May '23

31 May '23

Module: wine Branch: master Commit: 6184ac8c9fa0b201ca7c20ee01d3b54abb6a7512 URL: https://gitlab.winehq.org/wine/wine/-/commit/6184ac8c9fa0b201ca7c20ee01d3b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 17 10:01:32 2023 +0200 mf/tests: Add H264 decoder tests with concatenated streams. --- dlls/mf/tests/h264data-1.bin | Bin 0 -> 1597 bytes dlls/mf/tests/h264data-2.bin | Bin 0 -> 1717 bytes dlls/mf/tests/mf_test.h | 1 + dlls/mf/tests/resource.rc | 18 ++++ dlls/mf/tests/transform.c | 243 ++++++++++++++++++++++++++++++++++++++++--- 5 files changed, 248 insertions(+), 14 deletions(-)

1 0

Rémi Bernon : winegstreamer: Use an IMFMediaType for the internal stream type.
by Alexandre Julliard 31 May '23

31 May '23

Module: wine Branch: master Commit: 8caaca177e7b3545296a099a0dd43a375cb13cdf URL: https://gitlab.winehq.org/wine/wine/-/commit/8caaca177e7b3545296a099a0dd43a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 25 13:39:33 2023 +0200 winegstreamer: Use an IMFMediaType for the internal stream type. --- dlls/winegstreamer/h264_decoder.c | 93 +++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 44 deletions(-)

1 0

Rémi Bernon : winegstreamer: Generate H264 timestamps using the input type frame rate.
by Alexandre Julliard 31 May '23

31 May '23

Module: wine Branch: master Commit: 52387aa1a4e25ee2dec4117201658b32b160a4ca URL: https://gitlab.winehq.org/wine/wine/-/commit/52387aa1a4e25ee2dec4117201658b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 25 14:42:28 2023 +0200 winegstreamer: Generate H264 timestamps using the input type frame rate. And remove h264parse element requirement. --- dlls/mf/tests/mf_test.h | 1 - dlls/mf/tests/transform.c | 20 +++----------------- dlls/winegstreamer/h264_decoder.c | 16 +++++++++++++++- dlls/winegstreamer/wg_transform.c | 3 --- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/mf/tests/mf_test.h b/dlls/mf/tests/mf_test.h index 05aa34e3d28..e48204224b4 100644 --- a/dlls/mf/tests/mf_test.h +++ b/dlls/mf/tests/mf_test.h @@ -95,7 +95,6 @@ struct sample_desc DWORD repeat_count; BOOL todo_length; BOOL todo_duration; - LONGLONG todo_time; }; #define check_mf_sample_collection(a, b, c) check_mf_sample_collection_(__FILE__, __LINE__, a, b, c) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 04c59bbdffc..c7b001bfb11 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -1205,7 +1205,6 @@ static DWORD check_mf_sample_(const char *file, int line, IMFSample *sample, con timestamp = 0xdeadbeef; hr = IMFSample_GetSampleTime(sample, &timestamp); ok_(file, line)(hr == S_OK, "GetSampleTime returned %#lx\n", hr); - todo_wine_if(expect->todo_time && (timestamp == expect->todo_time || expect->todo_time == -1)) ok_(file, line)(llabs(timestamp - expect->sample_time) <= 50, "got sample time %I64d\n", timestamp); @@ -3711,7 +3710,7 @@ static void test_h264_decoder(void) const struct sample_desc expect_output_sample_i420 = { .attributes = output_sample_attributes, - .sample_time = 333667, .sample_duration = 333667, .todo_time = 1334666 /* with VA-API */, + .sample_time = 333667, .sample_duration = 333667, .buffer_count = 1, .buffers = &output_buffer_desc_i420, }; @@ -4037,26 +4036,13 @@ static void test_h264_decoder_concat_streams(void) { .attributes = output_sample_attributes + 0, .sample_time = 0, .sample_duration = 400000, - .todo_duration = 333666, - .buffer_count = 1, .buffers = output_buffer_desc + 0, - }, - { - .attributes = output_sample_attributes + 0, - .sample_time = 400000, .sample_duration = 400000, - .buffer_count = 1, .buffers = output_buffer_desc + 0, .repeat_count = 26, - .todo_time = -1, .todo_duration = 333666, - }, - { - .attributes = output_sample_attributes + 0, - .sample_time = 11200000, .sample_duration = 400000, - .buffer_count = 1, .buffers = output_buffer_desc + 0, .repeat_count = 1, - .todo_time = -1, .todo_duration = 333666, + .buffer_count = 1, .buffers = output_buffer_desc + 0, .repeat_count = 29, }, { .attributes = output_sample_attributes + 0, .sample_time = 12000000, .sample_duration = 400000, .buffer_count = 1, .buffers = output_buffer_desc + 2, .repeat_count = 29, - .todo_time = -1, .todo_duration = 333666, .todo_length = TRUE, + .todo_length = TRUE, }, { .attributes = output_sample_attributes + 0, diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 8eeeb52fd60..97289f69a4d 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -53,6 +53,7 @@ struct h264_decoder IMFAttributes *attributes; IMFAttributes *output_attributes; + UINT64 sample_time; IMFMediaType *input_type; MFT_INPUT_STREAM_INFO input_info; IMFMediaType *output_type; @@ -700,8 +701,9 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, struct h264_decoder *decoder = impl_from_IMFTransform(iface); struct wg_format wg_format; UINT32 sample_size; + LONGLONG duration; IMFSample *sample; - UINT64 frame_size; + UINT64 frame_size, frame_rate; GUID subtype; DWORD size; HRESULT hr; @@ -748,8 +750,20 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, if (SUCCEEDED(hr = wg_transform_read_mf(decoder->wg_transform, sample, sample_size, &wg_format, &samples->dwStatus))) + { wg_sample_queue_flush(decoder->wg_sample_queue, false); + if (FAILED(IMFMediaType_GetUINT64(decoder->input_type, &MF_MT_FRAME_RATE, &frame_rate))) + frame_rate = (UINT64)30000 << 32 | 1001; + + duration = (UINT64)10000000 * (UINT32)frame_rate / (frame_rate >> 32); + if (FAILED(IMFSample_SetSampleTime(sample, decoder->sample_time))) + WARN("Failed to set sample time\n"); + if (FAILED(IMFSample_SetSampleDuration(sample, duration))) + WARN("Failed to set sample duration\n"); + decoder->sample_time += duration; + } + if (hr == MF_E_TRANSFORM_STREAM_CHANGE) { samples[0].dwStatus |= MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE; diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 559e8f976d2..d0f94ed7649 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -342,9 +342,6 @@ NTSTATUS wg_transform_create(void *args) */ transform->input_max_length = 16; transform->output_plane_align = 15; - if (!(element = create_element("h264parse", "base")) - || !append_element(transform->container, element, &first, &last)) - goto out; /* fallthrough */ case WG_MAJOR_TYPE_AUDIO_MPEG1: case WG_MAJOR_TYPE_AUDIO_MPEG4:

1 0

Rémi Bernon : winegstreamer: Use the output wg_format in CAPS sink query.
by Alexandre Julliard 31 May '23

31 May '23

Module: wine Branch: master Commit: 4d1a331c6619703e5766d50ddf0399eaa079ffe3 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d1a331c6619703e5766d50ddf0399… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 25 15:03:22 2023 +0200 winegstreamer: Use the output wg_format in CAPS sink query. Instead of constraining the output caps to the current resolution, which breaks when streams with different resolutions are concatenated. --- dlls/mf/tests/mf_test.h | 1 + dlls/mf/tests/transform.c | 15 ++++++++++++--- dlls/winegstreamer/wg_transform.c | 6 +++++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/mf_test.h b/dlls/mf/tests/mf_test.h index e48204224b4..47b05e14777 100644 --- a/dlls/mf/tests/mf_test.h +++ b/dlls/mf/tests/mf_test.h @@ -95,6 +95,7 @@ struct sample_desc DWORD repeat_count; BOOL todo_length; BOOL todo_duration; + BOOL todo_time; }; #define check_mf_sample_collection(a, b, c) check_mf_sample_collection_(__FILE__, __LINE__, a, b, c) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index c7b001bfb11..85102bee70d 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -1205,6 +1205,7 @@ static DWORD check_mf_sample_(const char *file, int line, IMFSample *sample, con timestamp = 0xdeadbeef; hr = IMFSample_GetSampleTime(sample, &timestamp); ok_(file, line)(hr == S_OK, "GetSampleTime returned %#lx\n", hr); + todo_wine_if(expect->todo_time) ok_(file, line)(llabs(timestamp - expect->sample_time) <= 50, "got sample time %I64d\n", timestamp); @@ -4024,7 +4025,7 @@ static void test_h264_decoder_concat_streams(void) { {.length = 0x3600}, {.length = 0x4980}, - {.length = 0x4980, .todo_length = TRUE}, + {.length = 0, .todo_length = TRUE}, }; const struct attribute_desc output_sample_attributes[] = { @@ -4041,18 +4042,26 @@ static void test_h264_decoder_concat_streams(void) { .attributes = output_sample_attributes + 0, .sample_time = 12000000, .sample_duration = 400000, - .buffer_count = 1, .buffers = output_buffer_desc + 2, .repeat_count = 29, - .todo_length = TRUE, + .buffer_count = 1, .buffers = output_buffer_desc + 1, .repeat_count = 29, }, { .attributes = output_sample_attributes + 0, .sample_time = 0, .sample_duration = 400000, .buffer_count = 1, .buffers = output_buffer_desc + 0, .repeat_count = 29, + .todo_time = TRUE, }, { .attributes = output_sample_attributes + 0, .sample_time = 12000000, .sample_duration = 400000, .buffer_count = 1, .buffers = output_buffer_desc + 1, .repeat_count = 6, + .todo_time = TRUE, + }, + { + /* Wine outputs spurious buffers */ + .attributes = output_sample_attributes + 0, + .sample_time = 0, .sample_duration = 400000, + .buffer_count = 1, .buffers = output_buffer_desc + 2, .repeat_count = 22, + .todo_time = TRUE, .todo_length = TRUE, }, {0}, }; diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index d0f94ed7649..8f1f595ea76 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -56,6 +56,7 @@ struct wg_transform GstElement *video_flip; guint output_plane_align; + struct wg_format output_format; struct wg_sample *output_wg_sample; GstAtomicQueue *output_queue; GstSample *output_sample; @@ -174,7 +175,8 @@ static gboolean transform_sink_query_cb(GstPad *pad, GstObject *parent, GstQuery gchar *str; gst_query_parse_caps(query, &filter); - caps = gst_caps_ref(transform->output_caps); + if (!(caps = wg_format_to_caps(&transform->output_format))) + break; if (filter) { @@ -300,6 +302,7 @@ NTSTATUS wg_transform_create(void *args) goto out; transform->input_max_length = 1; transform->output_plane_align = 0; + transform->output_format = output_format; if (!(src_caps = wg_format_to_caps(&input_format))) goto out; @@ -493,6 +496,7 @@ NTSTATUS wg_transform_set_output_format(void *args) GST_ERROR("Failed to convert format %p to caps.", format); return STATUS_UNSUCCESSFUL; } + transform->output_format = *format; if (gst_caps_is_always_compatible(transform->output_caps, caps)) {

1 0

Paul Gofman : winegstreamer: Don't pre-check sample size in wg_transform_read_mf().
by Alexandre Julliard 31 May '23

31 May '23

Module: wine Branch: master Commit: 596dfad38b9cb327b73c6b2f1c42e42080218cb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/596dfad38b9cb327b73c6b2f1c42e4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 28 12:07:55 2023 -0600 winegstreamer: Don't pre-check sample size in wg_transform_read_mf(). --- dlls/mf/tests/transform.c | 1 - dlls/winegstreamer/wg_sample.c | 5 ----- dlls/winegstreamer/wg_transform.c | 38 +++++++++++++++++++++----------------- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 85102bee70d..8d01a7480a2 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -4133,7 +4133,6 @@ static void test_h264_decoder_concat_streams(void) { MFT_OUTPUT_DATA_BUFFER data = {.pSample = create_sample(NULL, 1)}; hr = IMFTransform_ProcessOutput(transform, 0, 1, &data, &output_status); - todo_wine ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#lx\n", hr); IMFSample_Release(data.pSample); hr = S_OK; diff --git a/dlls/winegstreamer/wg_sample.c b/dlls/winegstreamer/wg_sample.c index ea83440d9ad..c7d79b5b575 100644 --- a/dlls/winegstreamer/wg_sample.c +++ b/dlls/winegstreamer/wg_sample.c @@ -358,11 +358,6 @@ HRESULT wg_transform_read_mf(struct wg_transform *transform, IMFSample *sample, return hr; wg_sample->size = 0; - if (wg_sample->max_size < sample_size) - { - wg_sample_release(wg_sample); - return MF_E_BUFFERTOOSMALL; - } if (FAILED(hr = wg_transform_read_data(transform, wg_sample, format))) { diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 8f1f595ea76..19ce2a1013f 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -594,19 +594,19 @@ NTSTATUS wg_transform_push_data(void *args) return STATUS_SUCCESS; } -static bool copy_video_buffer(GstBuffer *buffer, GstCaps *caps, gsize plane_align, +static NTSTATUS copy_video_buffer(GstBuffer *buffer, GstCaps *caps, gsize plane_align, struct wg_sample *sample, gsize *total_size) { + NTSTATUS status = STATUS_UNSUCCESSFUL; GstVideoFrame src_frame, dst_frame; GstVideoInfo src_info, dst_info; GstVideoAlignment align; GstBuffer *dst_buffer; - bool ret = false; if (!gst_video_info_from_caps(&src_info, caps)) { GST_ERROR("Failed to get video info from caps."); - return false; + return STATUS_UNSUCCESSFUL; } dst_info = src_info; @@ -615,14 +615,14 @@ static bool copy_video_buffer(GstBuffer *buffer, GstCaps *caps, gsize plane_alig if (sample->max_size < dst_info.size) { GST_ERROR("Output buffer is too small."); - return false; + return STATUS_BUFFER_TOO_SMALL; } if (!(dst_buffer = gst_buffer_new_wrapped_full(0, sample->data, sample->max_size, 0, sample->max_size, 0, NULL))) { GST_ERROR("Failed to wrap wg_sample into GstBuffer"); - return false; + return STATUS_UNSUCCESSFUL; } gst_buffer_set_size(dst_buffer, dst_info.size); *total_size = sample->size = dst_info.size; @@ -635,7 +635,9 @@ static bool copy_video_buffer(GstBuffer *buffer, GstCaps *caps, gsize plane_alig GST_ERROR("Failed to map destination frame."); else { - if (!(ret = gst_video_frame_copy(&dst_frame, &src_frame))) + if (gst_video_frame_copy(&dst_frame, &src_frame)) + status = STATUS_SUCCESS; + else GST_ERROR("Failed to copy video frame."); gst_video_frame_unmap(&dst_frame); } @@ -643,16 +645,16 @@ static bool copy_video_buffer(GstBuffer *buffer, GstCaps *caps, gsize plane_alig } gst_buffer_unref(dst_buffer); - return ret; + return status; } -static bool copy_buffer(GstBuffer *buffer, GstCaps *caps, struct wg_sample *sample, +static NTSTATUS copy_buffer(GstBuffer *buffer, GstCaps *caps, struct wg_sample *sample, gsize *total_size) { GstMapInfo info; if (!gst_buffer_map(buffer, &info, GST_MAP_READ)) - return false; + return STATUS_UNSUCCESSFUL; if (sample->max_size >= info.size) sample->size = info.size; @@ -669,14 +671,15 @@ static bool copy_buffer(GstBuffer *buffer, GstCaps *caps, struct wg_sample *samp gst_buffer_resize(buffer, sample->size, -1); *total_size = info.size; - return true; + return STATUS_SUCCESS; } static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsize plane_align, struct wg_sample *sample) { - bool ret, needs_copy; gsize total_size; + bool needs_copy; + NTSTATUS status; GstMapInfo info; if (!gst_buffer_map(buffer, &info, GST_MAP_READ)) @@ -686,20 +689,21 @@ static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsi return STATUS_UNSUCCESSFUL; } needs_copy = info.data != sample->data; + total_size = sample->size = info.size; gst_buffer_unmap(buffer, &info); - if ((ret = !needs_copy)) - total_size = sample->size = info.size; + if (!needs_copy) + status = STATUS_SUCCESS; else if (stream_type_from_caps(caps) == GST_STREAM_TYPE_VIDEO) - ret = copy_video_buffer(buffer, caps, plane_align, sample, &total_size); + status = copy_video_buffer(buffer, caps, plane_align, sample, &total_size); else - ret = copy_buffer(buffer, caps, sample, &total_size); + status = copy_buffer(buffer, caps, sample, &total_size); - if (!ret) + if (status) { GST_ERROR("Failed to copy buffer %p", buffer); sample->size = 0; - return STATUS_UNSUCCESSFUL; + return status; } if (GST_BUFFER_PTS_IS_VALID(buffer))

1 0

Rémi Bernon : win32u: Move some window functions to window.c.
by Alexandre Julliard 31 May '23

31 May '23

Module: wine Branch: master Commit: c22c10d6e923ea3fb53412b3f218bf9eeeef4cb2 URL: https://gitlab.winehq.org/wine/wine/-/commit/c22c10d6e923ea3fb53412b3f218bf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 26 22:03:34 2023 +0200 win32u: Move some window functions to window.c. --- dlls/win32u/input.c | 112 ------------------------------------------ dlls/win32u/win32u_private.h | 10 ++-- dlls/win32u/window.c | 113 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+), 117 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index f75ca3b0a64..d4bc76874ea 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2468,115 +2468,3 @@ BOOL WINAPI NtUserGetPointerInfoList( UINT32 id, POINTER_INPUT_TYPE type, UINT_P RtlSetLastWin32Error( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } - -HWND get_shell_window(void) -{ - HWND hwnd = 0; - - SERVER_START_REQ(set_global_windows) - { - req->flags = 0; - if (!wine_server_call_err(req)) - hwnd = wine_server_ptr_handle( reply->old_shell_window ); - } - SERVER_END_REQ; - - return hwnd; -} - -/*********************************************************************** -* NtUserSetShellWindowEx (win32u.@) -*/ -BOOL WINAPI NtUserSetShellWindowEx( HWND shell, HWND list_view ) -{ - BOOL ret; - - /* shell = Progman[Program Manager] - * |-> SHELLDLL_DefView - * list_view = | |-> SysListView32 - * | | |-> tooltips_class32 - * | | - * | |-> SysHeader32 - * | - * |-> ProxyTarget - */ - - if (get_shell_window()) - return FALSE; - - if (get_window_long( shell, GWL_EXSTYLE ) & WS_EX_TOPMOST) - return FALSE; - - if (list_view != shell && (get_window_long( list_view, GWL_EXSTYLE ) & WS_EX_TOPMOST)) - return FALSE; - - if (list_view && list_view != shell) - NtUserSetWindowPos( list_view, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE ); - - NtUserSetWindowPos( shell, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE ); - - SERVER_START_REQ(set_global_windows) - { - req->flags = SET_GLOBAL_SHELL_WINDOWS; - req->shell_window = wine_server_user_handle( shell ); - req->shell_listview = wine_server_user_handle( list_view ); - ret = !wine_server_call_err(req); - } - SERVER_END_REQ; - return ret; -} - -HWND get_progman_window(void) -{ - HWND ret = 0; - - SERVER_START_REQ(set_global_windows) - { - req->flags = 0; - if (!wine_server_call_err(req)) - ret = wine_server_ptr_handle( reply->old_progman_window ); - } - SERVER_END_REQ; - return ret; -} - -HWND set_progman_window( HWND hwnd ) -{ - SERVER_START_REQ(set_global_windows) - { - req->flags = SET_GLOBAL_PROGMAN_WINDOW; - req->progman_window = wine_server_user_handle( hwnd ); - if (wine_server_call_err( req )) hwnd = 0; - } - SERVER_END_REQ; - return hwnd; -} - -HWND get_taskman_window(void) -{ - HWND ret = 0; - - SERVER_START_REQ(set_global_windows) - { - req->flags = 0; - if (!wine_server_call_err(req)) - ret = wine_server_ptr_handle( reply->old_taskman_window ); - } - SERVER_END_REQ; - return ret; -} - -HWND set_taskman_window( HWND hwnd ) -{ - /* hwnd = MSTaskSwWClass - * |-> SysTabControl32 - */ - SERVER_START_REQ(set_global_windows) - { - req->flags = SET_GLOBAL_TASKMAN_WINDOW; - req->taskman_window = wine_server_user_handle( hwnd ); - if (wine_server_call_err( req )) hwnd = 0; - } - SERVER_END_REQ; - return hwnd; -} diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 4f648993199..bd0adba276c 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -94,16 +94,11 @@ extern HWND get_capture(void) DECLSPEC_HIDDEN; extern BOOL get_cursor_pos( POINT *pt ) DECLSPEC_HIDDEN; extern HWND get_focus(void) DECLSPEC_HIDDEN; extern DWORD get_input_state(void) DECLSPEC_HIDDEN; -extern HWND get_progman_window(void) DECLSPEC_HIDDEN; -extern HWND get_shell_window(void) DECLSPEC_HIDDEN; -extern HWND get_taskman_window(void) DECLSPEC_HIDDEN; extern BOOL release_capture(void) DECLSPEC_HIDDEN; extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN; extern BOOL set_caret_blink_time( unsigned int time ) DECLSPEC_HIDDEN; extern BOOL set_caret_pos( int x, int y ) DECLSPEC_HIDDEN; extern BOOL set_foreground_window( HWND hwnd, BOOL mouse ) DECLSPEC_HIDDEN; -extern HWND set_progman_window( HWND hwnd ) DECLSPEC_HIDDEN; -extern HWND set_taskman_window( HWND hwnd ) DECLSPEC_HIDDEN; extern void toggle_caret( HWND hwnd ) DECLSPEC_HIDDEN; extern void update_mouse_tracking_info( HWND hwnd ) DECLSPEC_HIDDEN; @@ -232,6 +227,11 @@ extern ULONG set_window_style( HWND hwnd, ULONG set_bits, ULONG clear_bits ) DEC extern BOOL show_owned_popups( HWND owner, BOOL show ) DECLSPEC_HIDDEN; extern void update_window_state( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND window_from_point( HWND hwnd, POINT pt, INT *hittest ) DECLSPEC_HIDDEN; +extern HWND get_shell_window(void) DECLSPEC_HIDDEN; +extern HWND get_progman_window(void) DECLSPEC_HIDDEN; +extern HWND set_progman_window( HWND hwnd ) DECLSPEC_HIDDEN; +extern HWND get_taskman_window(void) DECLSPEC_HIDDEN; +extern HWND set_taskman_window( HWND hwnd ) DECLSPEC_HIDDEN; /* to release pointers retrieved by win_get_ptr */ static inline void release_win_ptr( struct tagWND *ptr ) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index e1cd80f8a36..871227645a7 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5644,3 +5644,116 @@ DWORD WINAPI NtUserDragObject( HWND parent, HWND hwnd, UINT fmt, ULONG_PTR data, return 0; } + + +HWND get_shell_window(void) +{ + HWND hwnd = 0; + + SERVER_START_REQ(set_global_windows) + { + req->flags = 0; + if (!wine_server_call_err(req)) + hwnd = wine_server_ptr_handle( reply->old_shell_window ); + } + SERVER_END_REQ; + + return hwnd; +} + +/*********************************************************************** +* NtUserSetShellWindowEx (win32u.@) +*/ +BOOL WINAPI NtUserSetShellWindowEx( HWND shell, HWND list_view ) +{ + BOOL ret; + + /* shell = Progman[Program Manager] + * |-> SHELLDLL_DefView + * list_view = | |-> SysListView32 + * | | |-> tooltips_class32 + * | | + * | |-> SysHeader32 + * | + * |-> ProxyTarget + */ + + if (get_shell_window()) + return FALSE; + + if (get_window_long( shell, GWL_EXSTYLE ) & WS_EX_TOPMOST) + return FALSE; + + if (list_view != shell && (get_window_long( list_view, GWL_EXSTYLE ) & WS_EX_TOPMOST)) + return FALSE; + + if (list_view && list_view != shell) + NtUserSetWindowPos( list_view, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE ); + + NtUserSetWindowPos( shell, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE ); + + SERVER_START_REQ(set_global_windows) + { + req->flags = SET_GLOBAL_SHELL_WINDOWS; + req->shell_window = wine_server_user_handle( shell ); + req->shell_listview = wine_server_user_handle( list_view ); + ret = !wine_server_call_err(req); + } + SERVER_END_REQ; + return ret; +} + +HWND get_progman_window(void) +{ + HWND ret = 0; + + SERVER_START_REQ(set_global_windows) + { + req->flags = 0; + if (!wine_server_call_err(req)) + ret = wine_server_ptr_handle( reply->old_progman_window ); + } + SERVER_END_REQ; + return ret; +} + +HWND set_progman_window( HWND hwnd ) +{ + SERVER_START_REQ(set_global_windows) + { + req->flags = SET_GLOBAL_PROGMAN_WINDOW; + req->progman_window = wine_server_user_handle( hwnd ); + if (wine_server_call_err( req )) hwnd = 0; + } + SERVER_END_REQ; + return hwnd; +} + +HWND get_taskman_window(void) +{ + HWND ret = 0; + + SERVER_START_REQ(set_global_windows) + { + req->flags = 0; + if (!wine_server_call_err(req)) + ret = wine_server_ptr_handle( reply->old_taskman_window ); + } + SERVER_END_REQ; + return ret; +} + +HWND set_taskman_window( HWND hwnd ) +{ + /* hwnd = MSTaskSwWClass + * |-> SysTabControl32 + */ + SERVER_START_REQ(set_global_windows) + { + req->flags = SET_GLOBAL_TASKMAN_WINDOW; + req->taskman_window = wine_server_user_handle( hwnd ); + if (wine_server_call_err( req )) hwnd = 0; + } + SERVER_END_REQ; + return hwnd; +}

1 0

Rémi Bernon : win32u: Move cursor clipping functions to input.c.
by Alexandre Julliard 31 May '23

31 May '23

Module: wine Branch: master Commit: 1cea2be9e822d25b508f8b709d58602768b37d2d URL: https://gitlab.winehq.org/wine/wine/-/commit/1cea2be9e822d25b508f8b709d5860… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 26 22:04:20 2023 +0200 win32u: Move cursor clipping functions to input.c. --- dlls/win32u/cursoricon.c | 75 -------------------------------------------- dlls/win32u/input.c | 75 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 2 +- 3 files changed, 76 insertions(+), 76 deletions(-) diff --git a/dlls/win32u/cursoricon.c b/dlls/win32u/cursoricon.c index 584a2cffca7..ae9dc6f6b8b 100644 --- a/dlls/win32u/cursoricon.c +++ b/dlls/win32u/cursoricon.c @@ -150,81 +150,6 @@ HCURSOR WINAPI NtUserGetCursor(void) return ret; } -/*********************************************************************** - * NtUserClipCursor (win32u.@) - */ -BOOL WINAPI NtUserClipCursor( const RECT *rect ) -{ - UINT dpi; - BOOL ret; - RECT new_rect; - - TRACE( "Clipping to %s\n", wine_dbgstr_rect(rect) ); - - if (rect) - { - if (rect->left > rect->right || rect->top > rect->bottom) return FALSE; - if ((dpi = get_thread_dpi())) - { - HMONITOR monitor = monitor_from_rect( rect, MONITOR_DEFAULTTOPRIMARY, dpi ); - new_rect = map_dpi_rect( *rect, dpi, get_monitor_dpi( monitor )); - rect = &new_rect; - } - } - - SERVER_START_REQ( set_cursor ) - { - if (rect) - { - req->flags = SET_CURSOR_CLIP; - req->clip.left = rect->left; - req->clip.top = rect->top; - req->clip.right = rect->right; - req->clip.bottom = rect->bottom; - } - else req->flags = SET_CURSOR_NOCLIP; - - if ((ret = !wine_server_call( req ))) - { - new_rect.left = reply->new_clip.left; - new_rect.top = reply->new_clip.top; - new_rect.right = reply->new_clip.right; - new_rect.bottom = reply->new_clip.bottom; - } - } - SERVER_END_REQ; - if (ret) user_driver->pClipCursor( &new_rect ); - return ret; -} - -BOOL get_clip_cursor( RECT *rect ) -{ - UINT dpi; - BOOL ret; - - if (!rect) return FALSE; - - SERVER_START_REQ( set_cursor ) - { - req->flags = 0; - if ((ret = !wine_server_call( req ))) - { - rect->left = reply->new_clip.left; - rect->top = reply->new_clip.top; - rect->right = reply->new_clip.right; - rect->bottom = reply->new_clip.bottom; - } - } - SERVER_END_REQ; - - if (ret && (dpi = get_thread_dpi())) - { - HMONITOR monitor = monitor_from_rect( rect, MONITOR_DEFAULTTOPRIMARY, 0 ); - *rect = map_dpi_rect( *rect, get_monitor_dpi( monitor ), dpi ); - } - return ret; -} - HICON alloc_cursoricon_handle( BOOL is_icon ) { struct cursoricon_object *obj; diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index d4bc76874ea..3fc7c85aaa2 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2468,3 +2468,78 @@ BOOL WINAPI NtUserGetPointerInfoList( UINT32 id, POINTER_INPUT_TYPE type, UINT_P RtlSetLastWin32Error( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + +BOOL get_clip_cursor( RECT *rect ) +{ + UINT dpi; + BOOL ret; + + if (!rect) return FALSE; + + SERVER_START_REQ( set_cursor ) + { + req->flags = 0; + if ((ret = !wine_server_call( req ))) + { + rect->left = reply->new_clip.left; + rect->top = reply->new_clip.top; + rect->right = reply->new_clip.right; + rect->bottom = reply->new_clip.bottom; + } + } + SERVER_END_REQ; + + if (ret && (dpi = get_thread_dpi())) + { + HMONITOR monitor = monitor_from_rect( rect, MONITOR_DEFAULTTOPRIMARY, 0 ); + *rect = map_dpi_rect( *rect, get_monitor_dpi( monitor ), dpi ); + } + return ret; +} + +/*********************************************************************** + * NtUserClipCursor (win32u.@) + */ +BOOL WINAPI NtUserClipCursor( const RECT *rect ) +{ + UINT dpi; + BOOL ret; + RECT new_rect; + + TRACE( "Clipping to %s\n", wine_dbgstr_rect(rect) ); + + if (rect) + { + if (rect->left > rect->right || rect->top > rect->bottom) return FALSE; + if ((dpi = get_thread_dpi())) + { + HMONITOR monitor = monitor_from_rect( rect, MONITOR_DEFAULTTOPRIMARY, dpi ); + new_rect = map_dpi_rect( *rect, dpi, get_monitor_dpi( monitor )); + rect = &new_rect; + } + } + + SERVER_START_REQ( set_cursor ) + { + if (rect) + { + req->flags = SET_CURSOR_CLIP; + req->clip.left = rect->left; + req->clip.top = rect->top; + req->clip.right = rect->right; + req->clip.bottom = rect->bottom; + } + else req->flags = SET_CURSOR_NOCLIP; + + if ((ret = !wine_server_call( req ))) + { + new_rect.left = reply->new_clip.left; + new_rect.top = reply->new_clip.top; + new_rect.right = reply->new_clip.right; + new_rect.bottom = reply->new_clip.bottom; + } + } + SERVER_END_REQ; + if (ret) user_driver->pClipCursor( &new_rect ); + return ret; +} diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index bd0adba276c..4116cda449a 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -39,7 +39,6 @@ extern void release_clipboard_owner( HWND hwnd ) DECLSPEC_HIDDEN; /* cursoricon.c */ extern HICON alloc_cursoricon_handle( BOOL is_icon ) DECLSPEC_HIDDEN; -extern BOOL get_clip_cursor( RECT *rect ) DECLSPEC_HIDDEN; extern ULONG_PTR get_icon_param( HICON handle ) DECLSPEC_HIDDEN; extern ULONG_PTR set_icon_param( HICON handle, ULONG_PTR param ) DECLSPEC_HIDDEN; @@ -101,6 +100,7 @@ extern BOOL set_caret_pos( int x, int y ) DECLSPEC_HIDDEN; extern BOOL set_foreground_window( HWND hwnd, BOOL mouse ) DECLSPEC_HIDDEN; extern void toggle_caret( HWND hwnd ) DECLSPEC_HIDDEN; extern void update_mouse_tracking_info( HWND hwnd ) DECLSPEC_HIDDEN; +extern BOOL get_clip_cursor( RECT *rect ) DECLSPEC_HIDDEN; /* menu.c */ extern HMENU create_menu( BOOL is_popup ) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : win32u: Add a separate function to process WM_WINE_CLIPCURSOR.
by Alexandre Julliard 31 May '23

31 May '23

Module: wine Branch: master Commit: 3bce247bd2c6b678d23c271fb5a8c8867a1be3f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/3bce247bd2c6b678d23c271fb5a8c8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 26 22:18:32 2023 +0200 win32u: Add a separate function to process WM_WINE_CLIPCURSOR. --- dlls/win32u/input.c | 12 ++++++++++++ dlls/win32u/message.c | 8 +------- dlls/win32u/win32u_private.h | 1 + 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 3fc7c85aaa2..22f371969b9 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -2497,6 +2497,18 @@ BOOL get_clip_cursor( RECT *rect ) return ret; } +BOOL process_wine_clipcursor( BOOL empty ) +{ + RECT rect; + + TRACE( "empty %u\n", empty ); + + if (empty) return user_driver->pClipCursor( NULL ); + + get_clip_cursor( &rect ); + return user_driver->pClipCursor( &rect ); +} + /*********************************************************************** * NtUserClipCursor (win32u.@) */ diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index b3d94120455..dfe9eadd34a 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1272,13 +1272,7 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR return call_current_hook( h_extra->handle, HC_ACTION, wparam, h_extra->lparam ); } case WM_WINE_CLIPCURSOR: - if (wparam) - { - RECT rect; - get_clip_cursor( &rect ); - return user_driver->pClipCursor( &rect ); - } - return user_driver->pClipCursor( NULL ); + return process_wine_clipcursor( !wparam ); case WM_WINE_UPDATEWINDOWSTATE: update_window_state( hwnd ); return 0; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 4116cda449a..a459db75d94 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -101,6 +101,7 @@ extern BOOL set_foreground_window( HWND hwnd, BOOL mouse ) DECLSPEC_HIDDEN; extern void toggle_caret( HWND hwnd ) DECLSPEC_HIDDEN; extern void update_mouse_tracking_info( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL get_clip_cursor( RECT *rect ) DECLSPEC_HIDDEN; +extern BOOL process_wine_clipcursor( BOOL empty ) DECLSPEC_HIDDEN; /* menu.c */ extern HMENU create_menu( BOOL is_popup ) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : win32u: Use WM_WINE_CLIPCURSOR / TRUE for empty clipping rect.
by Alexandre Julliard 31 May '23

31 May '23

Module: wine Branch: master Commit: 900ba826540f4b10ad834109e520b097e2dbf415 URL: https://gitlab.winehq.org/wine/wine/-/commit/900ba826540f4b10ad834109e520b0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 31 11:23:40 2023 +0200 win32u: Use WM_WINE_CLIPCURSOR / TRUE for empty clipping rect. --- dlls/win32u/message.c | 2 +- server/queue.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index dfe9eadd34a..44cd0640434 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1272,7 +1272,7 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR return call_current_hook( h_extra->handle, HC_ACTION, wparam, h_extra->lparam ); } case WM_WINE_CLIPCURSOR: - return process_wine_clipcursor( !wparam ); + return process_wine_clipcursor( wparam ); case WM_WINE_UPDATEWINDOWSTATE: update_window_state( hwnd ); return 0; diff --git a/server/queue.c b/server/queue.c index 746316a4286..e27727a3173 100644 --- a/server/queue.c +++ b/server/queue.c @@ -468,7 +468,7 @@ static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect } else desktop->cursor.clip = top_rect; - if (send_clip_msg) post_desktop_message( desktop, WM_WINE_CLIPCURSOR, rect != NULL, 0 ); + if (send_clip_msg) post_desktop_message( desktop, WM_WINE_CLIPCURSOR, rect == NULL, 0 ); /* warp the mouse to be inside the clip rect */ x = max( min( desktop->cursor.x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left );

1 0

Jacek Caban : wineps: Don't include gdi_driver.h from PE module.
by Alexandre Julliard 31 May '23

31 May '23

Module: wine Branch: master Commit: 7aa109501c095fcf2780e5c22c7086e287767ea2 URL: https://gitlab.winehq.org/wine/wine/-/commit/7aa109501c095fcf2780e5c22c7086… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 10:41:38 2023 +0200 wineps: Don't include gdi_driver.h from PE module. --- dlls/win32u/main.c | 1 - dlls/wineps.drv/bitblt.c | 2 +- dlls/wineps.drv/bitmap.c | 8 ++++---- dlls/wineps.drv/brush.c | 2 +- dlls/wineps.drv/pen.c | 2 +- dlls/wineps.drv/printproc.c | 24 +++++++++++----------- dlls/wineps.drv/psdrv.h | 49 ++++++++++++++++++++++++++++++++++++--------- include/wine/gdi_driver.h | 8 ++++---- 8 files changed, 62 insertions(+), 34 deletions(-)

1 0