November 2021 - Wine-commits

Torge Matthies : shell32: Fix getting file attributes from the file system in SHELL32_GetItemAttributes.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: 3dbce69fd4cc8f4802479939d2cf50905b79f5a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dbce69fd4cc8f4802479939… Author: Torge Matthies <openglfreak(a)googlemail.com> Date: Thu Nov 11 00:18:22 2021 +0100 shell32: Fix getting file attributes from the file system in SHELL32_GetItemAttributes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52017 Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlfolder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index ce7fc072fa3..10aafc160c0 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -417,7 +417,7 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder2 *psf, LPCITEMIDLIST pidl, LPDWO } else if (_ILGetDataPointer (pidl)) { DWORD file_attr = _ILGetFileAttributes (pidl, NULL, 0); - if (!file_attr && has_guid) { + if (!file_attr) { WCHAR path[MAX_PATH]; STRRET strret;

1 0

Zebediah Figura : winegstreamer: Implement IWMReaderAdvanced::SetAllocateForOutput().
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: 2f7e7d284bddd27d98a17beca4da0b6525d72913 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f7e7d284bddd27d98a17bec… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 10 19:05:46 2021 -0600 winegstreamer: Implement IWMReaderAdvanced::SetAllocateForOutput(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 8 +++- dlls/winegstreamer/wm_asyncreader.c | 17 ++++++-- dlls/winegstreamer/wm_reader.c | 84 +++++++++++++++++++++++++++++++------ 3 files changed, 91 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index e1dec7b755c..f1862515ebc 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -120,10 +120,11 @@ struct wm_stream { struct wm_reader *reader; struct wg_parser_stream *wg_stream; - WORD index; - bool eos; struct wg_format format; WMT_STREAM_SELECTION selection; + WORD index; + bool eos; + bool allocate_output; }; struct wm_reader @@ -148,6 +149,8 @@ struct wm_reader struct wm_stream *streams; WORD stream_count; + IWMReaderCallbackAdvanced *callback_advanced; + const struct wm_reader_ops *ops; }; @@ -174,6 +177,7 @@ void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops); HRESULT wm_reader_open_file(struct wm_reader *reader, const WCHAR *filename); HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream); void wm_reader_seek(struct wm_reader *reader, QWORD start, LONGLONG duration); +HRESULT wm_reader_set_allocate_for_output(struct wm_reader *reader, DWORD output, BOOL allocate); HRESULT wm_reader_set_output_props(struct wm_reader *reader, DWORD output, IWMOutputMediaProps *props); HRESULT wm_reader_set_streams_selected(struct wm_reader *reader, WORD count, diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 35ed8221aa0..e0547dfda60 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -57,10 +57,16 @@ static REFERENCE_TIME get_current_time(const struct async_reader *reader) static void open_stream(struct async_reader *reader, IWMReaderCallback *callback, void *context) { static const DWORD zero; + HRESULT hr; IWMReaderCallback_AddRef(reader->callback = callback); reader->context = context; IWMReaderCallback_OnStatus(callback, WMT_OPENED, S_OK, WMT_TYPE_DWORD, (BYTE *)&zero, context); + + if (FAILED(hr = IWMReaderCallback_QueryInterface(callback, + &IID_IWMReaderCallbackAdvanced, (void **)&reader->reader.callback_advanced))) + reader->reader.callback_advanced = NULL; + TRACE("Querying for IWMReaderCallbackAdvanced returned %#x.\n", hr); } static DWORD WINAPI stream_thread(void *arg) @@ -497,11 +503,14 @@ static HRESULT WINAPI WMReaderAdvanced_GetReceiveStreamSamples(IWMReaderAdvanced return E_NOTIMPL; } -static HRESULT WINAPI WMReaderAdvanced_SetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output_num, BOOL allocate) +static HRESULT WINAPI WMReaderAdvanced_SetAllocateForOutput(IWMReaderAdvanced6 *iface, + DWORD output, BOOL allocate) { - struct async_reader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %x)\n", This, output_num, allocate); - return E_NOTIMPL; + struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface); + + TRACE("reader %p, output %u, allocate %d.\n", reader, output, allocate); + + return wm_reader_set_allocate_for_output(&reader->reader, output, allocate); } static HRESULT WINAPI WMReaderAdvanced_GetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output_num, BOOL *allocate) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 0e0c639d504..810a800f016 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1532,6 +1532,10 @@ HRESULT wm_reader_close(struct wm_reader *reader) CloseHandle(reader->read_thread); reader->read_thread = NULL; + if (reader->callback_advanced) + IWMReaderCallbackAdvanced_Release(reader->callback_advanced); + reader->callback_advanced = NULL; + wg_parser_destroy(reader->wg_parser); reader->wg_parser = NULL; @@ -1736,9 +1740,9 @@ static const char *get_major_type_string(enum wg_major_type type) HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags) { + IWMReaderCallbackAdvanced *callback_advanced = stream->reader->callback_advanced; struct wg_parser_stream *wg_stream = stream->wg_stream; struct wg_parser_event event; - struct buffer *object; if (stream->selection == WMT_OFF) return NS_E_INVALID_REQUEST; @@ -1746,6 +1750,9 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, if (stream->eos) return NS_E_NO_MORE_SAMPLES; + if (!stream->allocate_output) + callback_advanced = NULL; + for (;;) { if (!wg_parser_stream_get_event(wg_stream, &event)) @@ -1760,24 +1767,59 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, switch (event.type) { case WG_PARSER_EVENT_BUFFER: - /* FIXME: Should these be pooled? */ - if (!(object = calloc(1, offsetof(struct buffer, data[event.u.buffer.size])))) + { + DWORD size, capacity; + INSSBuffer *sample; + HRESULT hr; + BYTE *data; + + if (callback_advanced) { - wg_parser_stream_release_buffer(wg_stream); - return E_OUTOFMEMORY; + if (FAILED(hr = IWMReaderCallbackAdvanced_AllocateForOutput(callback_advanced, + stream->index, event.u.buffer.size, &sample, NULL))) + { + ERR("Failed to allocate sample of %u bytes, hr %#x.\n", event.u.buffer.size, hr); + wg_parser_stream_release_buffer(wg_stream); + return hr; + } + } + else + { + struct buffer *object; + + /* FIXME: Should these be pooled? */ + if (!(object = calloc(1, offsetof(struct buffer, data[event.u.buffer.size])))) + { + wg_parser_stream_release_buffer(wg_stream); + return E_OUTOFMEMORY; + } + + object->INSSBuffer_iface.lpVtbl = &buffer_vtbl; + object->refcount = 1; + object->capacity = event.u.buffer.size; + + TRACE("Created buffer %p.\n", object); + sample = &object->INSSBuffer_iface; } - object->INSSBuffer_iface.lpVtbl = &buffer_vtbl; - object->refcount = 1; - object->capacity = object->size = event.u.buffer.size; + if (FAILED(hr = INSSBuffer_GetBufferAndLength(sample, &data, &size))) + ERR("Failed to get data pointer, hr %#x.\n", hr); + if (FAILED(hr = INSSBuffer_GetMaxLength(sample, &capacity))) + ERR("Failed to get capacity, hr %#x.\n", hr); + if (event.u.buffer.size > capacity) + ERR("Returned capacity %u is less than requested capacity %u.\n", + capacity, event.u.buffer.size); - if (!wg_parser_stream_copy_buffer(wg_stream, object->data, 0, object->size)) + if (!wg_parser_stream_copy_buffer(wg_stream, data, 0, event.u.buffer.size)) { /* The GStreamer pin has been flushed. */ - free(object); + INSSBuffer_Release(sample); break; } + if (FAILED(hr = INSSBuffer_SetLength(sample, event.u.buffer.size))) + ERR("Failed to set size %u, hr %#x.\n", event.u.buffer.size, hr); + wg_parser_stream_release_buffer(wg_stream); if (!event.u.buffer.has_pts) @@ -1793,9 +1835,9 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, if (!event.u.buffer.delta) *flags |= WM_SF_CLEANPOINT; - TRACE("Created buffer %p.\n", object); - *ret_sample = &object->INSSBuffer_iface; + *ret_sample = sample; return S_OK; + } case WG_PARSER_EVENT_EOS: stream->eos = true; @@ -1891,6 +1933,24 @@ HRESULT wm_reader_get_stream_selection(struct wm_reader *reader, return S_OK; } +HRESULT wm_reader_set_allocate_for_output(struct wm_reader *reader, DWORD output, BOOL allocate) +{ + struct wm_stream *stream; + + EnterCriticalSection(&reader->cs); + + if (!(stream = get_stream_by_output_number(reader, output))) + { + LeaveCriticalSection(&reader->cs); + return E_INVALIDARG; + } + + stream->allocate_output = !!allocate; + + LeaveCriticalSection(&reader->cs); + return S_OK; +} + void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) { reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl;

1 0

Zebediah Figura : wmvcore/tests: Add tests for user-allocated samples.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: 42da77bbcfeae16b5f138ad3f2a3e3030ae0844b URL: https://source.winehq.org/git/wine.git/?a=commit;h=42da77bbcfeae16b5f138ad3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 10 19:05:47 2021 -0600 wmvcore/tests: Add tests for user-allocated samples. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 434 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 415 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=42da77bbcfeae16b5f13…

1 0

Zebediah Figura : winegstreamer: Implement IWMReaderAdvanced::SetReceiveStreamSamples().
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: 894e0712459ec2d48b1298724776134d2a966f66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=894e0712459ec2d48b129872… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 10 19:05:48 2021 -0600 winegstreamer: Implement IWMReaderAdvanced::SetReceiveStreamSamples(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 7 ++++ dlls/winegstreamer/wm_asyncreader.c | 20 +++++++---- dlls/winegstreamer/wm_reader.c | 23 +++++++++--- dlls/wmvcore/tests/wmvcore.c | 71 +++++++++++++++++++++++++++++++------ 4 files changed, 100 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=894e0712459ec2d48b12…

1 0

Zebediah Figura : winegstreamer: Implement IWMReaderAdvanced::SetAllocateForStream().
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: cad38401bf091917396b24ad9c92091760cc696f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cad38401bf091917396b24ad… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 10 19:05:49 2021 -0600 winegstreamer: Implement IWMReaderAdvanced::SetAllocateForStream(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 2 + dlls/winegstreamer/wm_asyncreader.c | 11 ++-- dlls/winegstreamer/wm_reader.c | 32 ++++++++++- dlls/wmvcore/tests/wmvcore.c | 108 ++++++++++++++++++++++++++++++++---- 4 files changed, 136 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cad38401bf091917396b…

1 0

Zebediah Figura : winegstreamer: Implement IWMSyncReader::SetReadStreamSamples().
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: 54f825d237c1dcb0774fd3e3f4cfafb7c243aab5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54f825d237c1dcb0774fd3e3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 10 19:05:50 2021 -0600 winegstreamer: Implement IWMSyncReader::SetReadStreamSamples(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_syncreader.c | 10 +++++---- dlls/wmvcore/tests/wmvcore.c | 43 +++++++++++++++++++++++++++++++++++--- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/wm_syncreader.c b/dlls/winegstreamer/wm_syncreader.c index 73bbf18898f..96754d107de 100644 --- a/dlls/winegstreamer/wm_syncreader.c +++ b/dlls/winegstreamer/wm_syncreader.c @@ -296,11 +296,13 @@ static HRESULT WINAPI WMSyncReader_SetRangeByFrame(IWMSyncReader2 *iface, WORD s return E_NOTIMPL; } -static HRESULT WINAPI WMSyncReader_SetReadStreamSamples(IWMSyncReader2 *iface, WORD stream_num, BOOL compressed) +static HRESULT WINAPI WMSyncReader_SetReadStreamSamples(IWMSyncReader2 *iface, WORD stream_number, BOOL compressed) { - struct sync_reader *This = impl_from_IWMSyncReader2(iface); - FIXME("(%p)->(%u %x): stub!\n", This, stream_num, compressed); - return E_NOTIMPL; + struct sync_reader *reader = impl_from_IWMSyncReader2(iface); + + TRACE("reader %p, stream_index %u, compressed %d.\n", reader, stream_number, compressed); + + return wm_reader_set_read_compressed(&reader->reader, stream_number, compressed); } static HRESULT WINAPI WMSyncReader_SetStreamsSelected(IWMSyncReader2 *iface, diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 8e10d9f5e89..9ddd53ab9e7 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -821,6 +821,45 @@ static void test_sync_reader_selection(IWMSyncReader *reader) ok(hr == S_OK, "Got hr %#x.\n", hr); } +static void test_sync_reader_compressed(IWMSyncReader *reader) +{ + QWORD pts, duration; + INSSBuffer *sample; + WORD stream_number; + DWORD flags; + HRESULT hr; + + hr = IWMSyncReader_SetReadStreamSamples(reader, 0, TRUE); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + hr = IWMSyncReader_SetReadStreamSamples(reader, 1, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IWMSyncReader_SetReadStreamSamples(reader, 2, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IWMSyncReader_SetReadStreamSamples(reader, 3, TRUE); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IWMSyncReader_SetRange(reader, 0, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, &stream_number); + ok(hr == S_OK, "Got hr %#x.\n", hr); + INSSBuffer_Release(sample); + + for (;;) + { + hr = IWMSyncReader_GetNextSample(reader, 0, &sample, &pts, &duration, &flags, NULL, &stream_number); + if (hr == NS_E_NO_MORE_SAMPLES) + break; + ok(hr == S_OK, "Got hr %#x.\n", hr); + INSSBuffer_Release(sample); + } + + hr = IWMSyncReader_SetReadStreamSamples(reader, 1, FALSE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IWMSyncReader_SetReadStreamSamples(reader, 2, FALSE); + ok(hr == S_OK, "Got hr %#x.\n", hr); +} + static void test_sync_reader_streaming(void) { DWORD size, capacity, flags, output_number, expect_output_number; @@ -883,9 +922,6 @@ static void test_sync_reader_streaming(void) ref = IWMStreamConfig_Release(config); ok(!ref, "Got outstanding refcount %d.\n", ref); - - hr = IWMSyncReader_SetReadStreamSamples(reader, stream_numbers[i], FALSE); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); } hr = IWMProfile_GetStream(profile, 2, &config); @@ -1028,6 +1064,7 @@ static void test_sync_reader_streaming(void) ok(hr == S_OK, "Got hr %#x.\n", hr); test_sync_reader_selection(reader); + test_sync_reader_compressed(reader); test_reader_attributes(profile);

1 0

Zhiyi Zhang : comctl32/button: Use correct state for BS_3STATE and BS_AUTO3STATE buttons.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: a7f6d78406b536bd87b608856628f93d94e7a8dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7f6d78406b536bd87b60885… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 11 15:03:45 2021 +0800 comctl32/button: Use correct state for BS_3STATE and BS_AUTO3STATE buttons. BS_3STATE and BS_AUTO3STATE are check boxes. Fix BS_3STATE and BS_AUTO3STATE buttons drawing indeterminate state as unchecked. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 19febd8b6ac..b612273c0c1 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -427,10 +427,10 @@ static int get_draw_state(const BUTTON_INFO *infoPtr) return pb_states[state]; case BS_CHECKBOX: case BS_AUTOCHECKBOX: - return cb_states[check_state][state]; - case BS_RADIOBUTTON: case BS_3STATE: case BS_AUTO3STATE: + return cb_states[check_state][state]; + case BS_RADIOBUTTON: case BS_AUTORADIOBUTTON: return rb_states[check_state][state]; case BS_GROUPBOX:

1 0

Zhiyi Zhang : comctl32/button: Use correct state for default buttons.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: ed06aa2f7efc045f6f9914c817c255085e9d1daf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed06aa2f7efc045f6f9914c8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 11 15:03:51 2021 +0800 comctl32/button: Use correct state for default buttons. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index b612273c0c1..93f6c21bab1 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -410,7 +410,8 @@ static int get_draw_state(const BUTTON_INFO *infoPtr) state = STATE_PRESSED; else if (infoPtr->state & BST_HOT) state = STATE_HOT; - else if (infoPtr->state & BST_FOCUS) + else if (infoPtr->state & BST_FOCUS || type == BS_DEFPUSHBUTTON || type == BS_DEFSPLITBUTTON + || (type == BS_DEFCOMMANDLINK && !(style & BS_PUSHLIKE))) state = STATE_DEFAULTED; else state = STATE_NORMAL;

1 0

Zhiyi Zhang : comctl32/button: Support BS_PUSHLIKE for themed check boxes and radio buttons.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: fcd63df4213342a26687eaa9bf17d9aff9ab177c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcd63df4213342a26687eaa9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 11 15:03:58 2021 +0800 comctl32/button: Support BS_PUSHLIKE for themed check boxes and radio buttons. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 93f6c21bab1..af2fefabe2b 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -393,11 +393,22 @@ static int get_draw_state(const BUTTON_INFO *infoPtr) { CBS_CHECKEDNORMAL, CBS_CHECKEDDISABLED, CBS_CHECKEDHOT, CBS_CHECKEDPRESSED, CBS_CHECKEDNORMAL }, { CBS_MIXEDNORMAL, CBS_MIXEDDISABLED, CBS_MIXEDHOT, CBS_MIXEDPRESSED, CBS_MIXEDNORMAL } }; + static const int pushlike_cb_states[3][DRAW_STATE_COUNT] = + { + { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_NORMAL }, + { PBS_PRESSED, PBS_PRESSED, PBS_HOT, PBS_PRESSED, PBS_PRESSED }, + { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_NORMAL } + }; static const int rb_states[2][DRAW_STATE_COUNT] = { { RBS_UNCHECKEDNORMAL, RBS_UNCHECKEDDISABLED, RBS_UNCHECKEDHOT, RBS_UNCHECKEDPRESSED, RBS_UNCHECKEDNORMAL }, { RBS_CHECKEDNORMAL, RBS_CHECKEDDISABLED, RBS_CHECKEDHOT, RBS_CHECKEDPRESSED, RBS_CHECKEDNORMAL } }; + static const int pushlike_rb_states[2][DRAW_STATE_COUNT] = + { + { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_NORMAL }, + { PBS_PRESSED, PBS_PRESSED, PBS_HOT, PBS_PRESSED, PBS_PRESSED } + }; static const int gb_states[DRAW_STATE_COUNT] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); UINT type = get_button_type(style); @@ -430,10 +441,12 @@ static int get_draw_state(const BUTTON_INFO *infoPtr) case BS_AUTOCHECKBOX: case BS_3STATE: case BS_AUTO3STATE: - return cb_states[check_state][state]; + return style & BS_PUSHLIKE ? pushlike_cb_states[check_state][state] + : cb_states[check_state][state]; case BS_RADIOBUTTON: case BS_AUTORADIOBUTTON: - return rb_states[check_state][state]; + return style & BS_PUSHLIKE ? pushlike_rb_states[check_state][state] + : rb_states[check_state][state]; case BS_GROUPBOX: return gb_states[state]; default: @@ -2763,8 +2776,15 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in int text_offset; SIZE box_size; HRGN region; + HRESULT hr; + + if (dwStyle & BS_PUSHLIKE) + { + PB_ThemedPaint(theme, infoPtr, hDC, state, dtFlags, focused); + return; + } - HRESULT hr = GetThemeFont(theme, hDC, part, state, TMT_FONT, &lf); + hr = GetThemeFont(theme, hDC, part, state, TMT_FONT, &lf); if (SUCCEEDED(hr)) { font = CreateFontIndirectW(&lf); if (!font)

1 0

Zhiyi Zhang : comctl32/button: Correctly align parts in group boxes with BS_PUSHLIKE when theming is off.
by Alexandre Julliard 11 Nov '21

11 Nov '21

Module: wine Branch: master Commit: 9e9448e72b132e97b74b3f8b603c7a83682eced6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e9448e72b132e97b74b3f8b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 11 15:04:06 2021 +0800 comctl32/button: Correctly align parts in group boxes with BS_PUSHLIKE when theming is off. Parts in group boxes with BS_PUSHLIKE can be at the bottom, center and top when theming is off. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index af2fefabe2b..74de83b461a 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1589,6 +1589,11 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la split_style = infoPtr->imagelist.himl ? BUTTON_ILStoBS(infoPtr->imagelist.uAlign) : style; dtStyle = BUTTON_BStoDT(style, ex_style); + /* Group boxes are top aligned unless BS_PUSHLIKE is set and it's not themed */ + if (get_button_type(style) == BS_GROUPBOX + && (!(style & BS_PUSHLIKE) || GetWindowTheme(infoPtr->hwnd))) + style &= ~BS_VCENTER | BS_TOP; + SetRect(&imageRect, 0, 0, imageSize.cx, imageSize.cy); imageRectWithMargin = imageRect; if (infoPtr->imagelist.himl) @@ -1670,11 +1675,7 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la /* Show text only */ else { - if (get_button_type(style) != BS_GROUPBOX) - BUTTON_PositionRect(style, labelRc, &textRect, textMargin); - else - /* GroupBox is always top aligned */ - BUTTON_PositionRect((style & ~BS_VCENTER) | BS_TOP, labelRc, &textRect, textMargin); + BUTTON_PositionRect(style, labelRc, &textRect, textMargin); labelRect = textRect; SetRectEmpty(&imageRect); }

1 0