October 2020 - Wine-Commits

Nikolay Sivov : mfplat: Implement MFCreateDXSurfaceBuffer().
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 23a656a083df15aeb7d4656b700e3ea9fed6b390 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23a656a083df15aeb7d4656b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:41 2020 +0300 mfplat: Implement MFCreateDXSurfaceBuffer(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 308 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 11 +- 3 files changed, 319 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=23a656a083df15aeb7d4…

1 0

Nikolay Sivov : evr: Add MFCreateDXSurfaceBuffer() forward.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 13aa1e12e0304108a366378eee6c285148a2158f URL: https://source.winehq.org/git/wine.git/?a=commit;h=13aa1e12e0304108a366378e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:43 2020 +0300 evr: Add MFCreateDXSurfaceBuffer() forward. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/evr.spec b/dlls/evr/evr.spec index dcf062cf5aa..67eee3122cf 100644 --- a/dlls/evr/evr.spec +++ b/dlls/evr/evr.spec @@ -7,7 +7,7 @@ @ stub MFConvertFromFP16Array @ stub MFConvertToFP16Array @ stdcall -import MFCopyImage(ptr long ptr long long long) -@ stub MFCreateDXSurfaceBuffer +@ stdcall -import MFCreateDXSurfaceBuffer(ptr ptr long ptr) @ stub MFCreateVideoMediaType @ stub MFCreateVideoMediaTypeFromBitMapInfoHeader @ stdcall -import MFCreateVideoMediaTypeFromSubtype(ptr ptr)

1 0

Nikolay Sivov : mf/evr: Pass incoming samples to the mixer.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 41fe1ac058756611b1215d2b60871272f6d143f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41fe1ac058756611b1215d2b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:46 2020 +0300 mf/evr: Pass incoming samples to the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 4dca8515c94..618bbf8924f 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -335,19 +335,36 @@ static HRESULT WINAPI video_stream_sink_GetMediaTypeHandler(IMFStreamSink *iface static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFSample *sample) { struct video_stream *stream = impl_from_IMFStreamSink(iface); + LONGLONG timestamp; + HRESULT hr = S_OK; - FIXME("%p, %p.\n", iface, sample); + TRACE("%p, %p.\n", iface, sample); EnterCriticalSection(&stream->cs); - if (stream->flags & EVR_STREAM_PREROLLING) + + if (!stream->parent) + hr = MF_E_STREAMSINK_REMOVED; + else if (!stream->parent->clock) + hr = MF_E_NO_CLOCK; + else if (FAILED(hr = IMFSample_GetSampleTime(sample, &timestamp))) + { + WARN("No sample timestamp, hr %#x.\n", hr); + } + else if (stream->parent->state == EVR_STATE_RUNNING) { - IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkPrerolled, &GUID_NULL, S_OK, NULL); - stream->flags &= ~EVR_STREAM_PREROLLING; - stream->flags |= EVR_STREAM_PREROLLED; + IMFTransform_ProcessInput(stream->parent->mixer, stream->id, sample, 0); + + if (stream->flags & EVR_STREAM_PREROLLING) + { + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkPrerolled, &GUID_NULL, S_OK, NULL); + stream->flags &= ~EVR_STREAM_PREROLLING; + stream->flags |= EVR_STREAM_PREROLLED; + } } + LeaveCriticalSection(&stream->cs); - return E_NOTIMPL; + return hr; } static HRESULT WINAPI video_stream_sink_PlaceMarker(IMFStreamSink *iface, MFSTREAMSINK_MARKER_TYPE marker_type,

1 0

Zhiyi Zhang : d3d8/tests: Restore display modes at the end of test_wndproc().
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 5715b77e87de175464c68fa412c821a63e9f079e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5715b77e87de175464c68fa4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 14:45:00 2020 +0800 d3d8/tests: Restore display modes at the end of test_wndproc(). test_wndproc() makes a series of ChangeDisplaySettings() calls that could make the current display mode no longer match the registry display mode. Restore display modes at the end of test_wndproc() so that other tests are not affected. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 4c567a47603..3e933143332 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3361,6 +3361,8 @@ done: DestroyWindow(device_window); DestroyWindow(focus_window); UnregisterClassA("d3d8_test_wndproc_wc", GetModuleHandleA(NULL)); + change_ret = ChangeDisplaySettingsExW(NULL, NULL, NULL, 0, NULL); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %d.\n", change_ret); } static void test_wndproc_windowed(void)

1 0

Derek Lesho : winegstreamer: Implement IMFMediaStream::RequestSample.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 03eaa2cc93e5e2ea4c36495870c268797aea3ca8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03eaa2cc93e5e2ea4c364958… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Oct 30 13:57:19 2020 -0500 winegstreamer: Implement IMFMediaStream::RequestSample. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 19 +++++--- dlls/mfreadwrite/tests/mfplat.c | 16 ++++++- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/media_source.c | 94 ++++++++++++++++++++++++++++++++++++++- dlls/winegstreamer/mfplat.c | 69 ++++++++++++++++++++++++++++ 5 files changed, 191 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=03eaa2cc93e5e2ea4c36…

1 0

Derek Lesho : winegstreamer: Implement IMFMediaSource::Start.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 12f1afbffed35cf9dcc18f5dbf33633aa9a7d2ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=12f1afbffed35cf9dcc18f5d… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Oct 30 10:58:14 2020 -0500 winegstreamer: Implement IMFMediaSource::Start. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 8 +- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/media_source.c | 307 +++++++++++++++++++++++++++++++++++++- dlls/winegstreamer/mfplat.c | 130 ++++++++++++++++ 4 files changed, 438 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12f1afbffed35cf9dcc1…

1 0

Zhiyi Zhang : dxgi/tests: Test display mode restoration.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: ef81152c8cd17f1bfb2950753428a95a81728c97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef81152c8cd17f1bfb295075… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 14:49:00 2020 +0800 dxgi/tests: Test display mode restoration. Mostly to test that when doing mode restoration, all display outputs get restored to their display settings in the registry, not just one output gets restored. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 427 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 427 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef81152c8cd17f1bfb29…

1 0

Nikolay Sivov : mf/evr: Notify presenter on new input.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 3641c80244445a8f5dd54232cdce4397c4b78cdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3641c80244445a8f5dd54232… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:47 2020 +0300 mf/evr: Notify presenter on new input. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 618bbf8924f..f5bbfffc4a5 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -352,7 +352,8 @@ static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFS } else if (stream->parent->state == EVR_STATE_RUNNING) { - IMFTransform_ProcessInput(stream->parent->mixer, stream->id, sample, 0); + if (SUCCEEDED(IMFTransform_ProcessInput(stream->parent->mixer, stream->id, sample, 0))) + IMFVideoPresenter_ProcessMessage(stream->parent->presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0); if (stream->flags & EVR_STREAM_PREROLLING) {

1 0

Nikolay Sivov : evr/allocator: Use different buffer implementation for surface buffers.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 959279413ee363293ceb270dc115835893fb7f85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=959279413ee363293ceb270d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:42 2020 +0300 evr/allocator: Use different buffer implementation for surface buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 31 ++++++++++++++++--------------- dlls/evr/tests/evr.c | 6 +----- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index b65cc45a662..39520cb6020 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -306,27 +306,28 @@ static HRESULT sample_allocator_create_samples(struct sample_allocator *allocato for (i = 0; i < sample_count; ++i) { struct queued_sample *queued_sample = heap_alloc(sizeof(*queued_sample)); + IMFMediaBuffer *buffer; - if (service) + if (SUCCEEDED(hr = MFCreateVideoSampleFromSurface(NULL, &sample))) { - if (SUCCEEDED(hr = IDirectXVideoProcessorService_CreateSurface(service, width, height, 0, format, - D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL))) + if (service) { - hr = MFCreateVideoSampleFromSurface((IUnknown *)surface, &sample); - IDirect3DSurface9_Release(surface); + if (SUCCEEDED(hr = IDirectXVideoProcessorService_CreateSurface(service, width, height, + 0, format, D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL))) + { + hr = MFCreateDXSurfaceBuffer(&IID_IDirect3DSurface9, (IUnknown *)surface, FALSE, &buffer); + IDirect3DSurface9_Release(surface); + } + } + else + { + hr = MFCreate2DMediaBuffer(width, height, format, FALSE, &buffer); } - } - else - { - IMFMediaBuffer *buffer; - if (SUCCEEDED(hr = MFCreateVideoSampleFromSurface(NULL, &sample))) + if (SUCCEEDED(hr)) { - if (SUCCEEDED(hr = MFCreate2DMediaBuffer(width, height, format, FALSE, &buffer))) - { - hr = IMFSample_AddBuffer(sample, buffer); - IMFMediaBuffer_Release(buffer); - } + hr = IMFSample_AddBuffer(sample, buffer); + IMFMediaBuffer_Release(buffer); } } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index e4f45396ae8..a711be7ad21 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1468,17 +1468,13 @@ todo_wine IDirect3DSurface9_Release(surface); hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&unk); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(unk); hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaBuffer_Unlock(buffer); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFSample_Release(sample);

1 0

Zhiyi Zhang : d3d8/tests: Test display mode restoration.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: e166f6d07e436e4d769c80bd2aaf821961c9c9fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e166f6d07e436e4d769c80bd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 14:48:31 2020 +0800 d3d8/tests: Test display mode restoration. Mostly to test that when doing mode restoration, all display outputs get restored to their display settings in the registry, not just one output gets restored. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 408 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 398 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e166f6d07e436e4d769c…

1 0

Zhiyi Zhang : ddraw/tests: Test display mode restoration.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 1a4f2e23c00eaed3e9a4a5d77941b89f972cda89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a4f2e23c00eaed3e9a4a5d7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 14:45:26 2020 +0800 ddraw/tests: Test display mode restoration. Mostly to test that when doing mode restoration, all display outputs get restored to their display settings in the registry, not just one output gets restored. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 396 ++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 397 +++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 396 ++++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 396 ++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 1581 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a4f2e23c00eaed3e9a4…

1 0

Zhiyi Zhang : d3d9/tests: Restore display modes at the end of test_wndproc().
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: ddf1967fd030e66c8a842c109a5a00387168016f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddf1967fd030e66c8a842c10… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 14:45:15 2020 +0800 d3d9/tests: Restore display modes at the end of test_wndproc(). test_wndproc() makes a series of ChangeDisplaySettings() calls that could make the current display mode no longer match the registry display mode. Restore display modes at the end of test_wndproc() so that other tests are not affected. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 53a83ad887b..2efb6ddc2e5 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4435,6 +4435,8 @@ done: CloseHandle(thread_params.test_finished); CloseHandle(thread_params.window_created); UnregisterClassA("d3d9_test_wndproc_wc", GetModuleHandleA(NULL)); + change_ret = ChangeDisplaySettingsExW(NULL, NULL, NULL, 0, NULL); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %d.\n", change_ret); } static void test_wndproc_windowed(void)

1 0

Zhiyi Zhang : d3d9/tests: Test display mode restoration.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: df90c0ef7ea053606e684901073b26368f34ac26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df90c0ef7ea053606e684901… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 14:48:45 2020 +0800 d3d9/tests: Test display mode restoration. Mostly to test that when doing mode restoration, all display outputs get restored to their display settings in the registry, not just one output gets restored. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 411 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 400 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=df90c0ef7ea053606e68…

1 0

Nikolay Sivov : mf/copier: Move sample copier to its own file.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: f64d046117903b25a5545f0683aec4b8a3ed7a03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f64d046117903b25a5545f06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:45 2020 +0300 mf/copier: Move sample copier to its own file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 1 + dlls/mf/copier.c | 593 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/main.c | 565 ------------------------------------------------- 3 files changed, 594 insertions(+), 565 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f64d046117903b25a554…

1 0

Nikolay Sivov : evr/presenter: Set mixer output type on type negotiation.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 30727decff4bdd1a97a6f545e98254f5175031c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30727decff4bdd1a97a6f545… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 30 16:50:44 2020 +0300 evr/presenter: Set mixer output type on type negotiation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 96eaa4426fc..54ad9fee994 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -157,9 +157,31 @@ static void video_presenter_get_native_video_size(struct video_presenter *presen static HRESULT video_presenter_invalidate_media_type(struct video_presenter *presenter) { + IMFMediaType *media_type; + unsigned int idx = 0; + HRESULT hr; + video_presenter_get_native_video_size(presenter); - return S_OK; + while (SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(presenter->mixer, 0, idx++, &media_type))) + { + /* FIXME: check that d3d device supports this format */ + + /* FIXME: potentially adjust frame size */ + + if (SUCCEEDED(IMFTransform_SetOutputType(presenter->mixer, 0, media_type, MFT_SET_TYPE_TEST_ONLY))) + { + /* FIXME: should keep a copy internally too */ + + hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, 0); + IMFMediaType_Release(media_type); + break; + } + + IMFMediaType_Release(media_type); + } + + return hr; } static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj)

1 0

Derek Lesho : mfreadwrite: Abort ReadSample when unable to request any samples.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 9d7f98ee7f3b078df8fafaa3b3b7b59b81492d53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d7f98ee7f3b078df8fafaa3… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Oct 30 18:18:27 2020 +0300 mfreadwrite: Abort ReadSample when unable to request any samples. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 13 ++++++++++--- dlls/mfreadwrite/tests/mfplat.c | 26 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 96a82b798ab..cc1b29a2b6a 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -439,7 +439,8 @@ static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IM } if (reader->streams[i].requests) - source_reader_request_sample(reader, &reader->streams[i]); + if (FAILED(source_reader_request_sample(reader, &reader->streams[i]))) + WakeAllConditionVariable(&reader->sample_event); } break; } @@ -1780,10 +1781,16 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind stream->requests++; if (FAILED(hr = source_reader_request_sample(reader, stream))) WARN("Failed to request a sample, hr %#x.\n", hr); + if (stream->stream && !(stream->flags & STREAM_FLAG_SAMPLE_REQUESTED)) + { + *stream_flags = MF_SOURCE_READERF_ERROR; + *timestamp = 0; + break; + } SleepConditionVariableCS(&reader->sample_event, &reader->cs, INFINITE); } - - source_reader_get_read_result(reader, stream, flags, &hr, actual_index, stream_flags, + if (SUCCEEDED(hr)) + source_reader_get_read_result(reader, stream, flags, &hr, actual_index, stream_flags, timestamp, sample); } } diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index cfe68cb6736..0e5053f905f 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -158,6 +158,8 @@ static HRESULT WINAPI test_media_stream_GetStreamDescriptor(IMFMediaStream *ifac return S_OK; } +static BOOL fail_request_sample; + static HRESULT WINAPI test_media_stream_RequestSample(IMFMediaStream *iface, IUnknown *token) { struct test_media_stream *stream = impl_from_IMFMediaStream(iface); @@ -165,6 +167,9 @@ static HRESULT WINAPI test_media_stream_RequestSample(IMFMediaStream *iface, IUn IMFSample *sample; HRESULT hr; + if (fail_request_sample) + return E_NOTIMPL; + hr = MFCreateSample(&sample); ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); hr = IMFSample_SetSampleTime(sample, 123); @@ -977,6 +982,27 @@ static void test_source_reader_from_media_source(void) ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#x.\n", hr); IMFSourceReader_Release(reader); + IMFMediaSource_Release(source); + + /* RequestSample failure. */ + source = create_test_source(); + ok(!!source, "Failed to create test source.\n"); + + fail_request_sample = TRUE; + + hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); + ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + + hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); + ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + + hr = IMFSourceReader_ReadSample(reader, 0, 0, &actual_index, &stream_flags, &timestamp, &sample); + ok(hr == E_NOTIMPL, "Unexpected ReadSample result, hr %#x.\n", hr); + + IMFSourceReader_Release(reader); + IMFMediaSource_Release(source); + + fail_request_sample = FALSE; } START_TEST(mfplat)

1 0

Alexandre Julliard : gdi32: Make the family replacement point to the family object.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 74ea8d8c427e1885d00a9e3c68f402b3748a87e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74ea8d8c427e1885d00a9e3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 14:39:07 2020 +0100 gdi32: Make the family replacement point to the family object. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 6 ++++-- dlls/gdi32/freetype.c | 6 ++---- dlls/gdi32/gdi_private.h | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 806ff0d1d91..c49186efb94 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -517,7 +517,7 @@ struct gdi_font_family *create_family( const WCHAR *name, const WCHAR *second_na } else family->second_name[0] = 0; list_init( &family->faces ); - family->replacement = &family->faces; + family->replacement = NULL; list_add_tail( &font_list, &family->entry ); return family; } @@ -527,6 +527,7 @@ void release_family( struct gdi_font_family *family ) if (--family->refcount) return; assert( list_empty( &family->faces )); list_remove( &family->entry ); + if (family->replacement) release_family( family->replacement ); HeapFree( GetProcessHeap(), 0, family ); } @@ -564,7 +565,8 @@ static BOOL add_family_replacement( const WCHAR *new_name, const WCHAR *replace } if (!(new_family = create_family( new_name, NULL ))) return FALSE; - new_family->replacement = &family->faces; + new_family->replacement = family; + family->refcount++; TRACE( "mapping %s to %s\n", debugstr_w(replace), debugstr_w(new_name) ); /* also add replacement for vertical font if necessary */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index afc9add629c..d4e593b1211 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -662,10 +662,8 @@ static BOOL is_subpixel_rendering_enabled( void ) static const struct list *get_face_list_from_family(const Family *family) { - if (!list_empty(&family->faces)) - return &family->faces; - else - return family->replacement; + if (family->replacement) return &family->replacement->faces; + return &family->faces; } static Face *find_face_from_filename(const WCHAR *file_name, const WCHAR *face_name) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 63e76e4df69..ab1b66b591c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -307,12 +307,12 @@ struct glyph_metrics; struct gdi_font_family { - struct list entry; - unsigned int refcount; - WCHAR family_name[LF_FACESIZE]; - WCHAR second_name[LF_FACESIZE]; - struct list faces; - struct list *replacement; + struct list entry; + unsigned int refcount; + WCHAR family_name[LF_FACESIZE]; + WCHAR second_name[LF_FACESIZE]; + struct list faces; + struct gdi_font_family *replacement; }; struct bitmap_font_size

1 0

Daniel Lehman : tzres: Add Saint Pierre Standard Time Zone.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: b5d39469b84b3efcf63be0fcbab4119438e6e952 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5d39469b84b3efcf63be0fc… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Oct 29 22:57:44 2020 -0700 tzres: Add Saint Pierre Standard Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 10 +++++ po/ar.po | 106 ++++++++++++++++++++++++++++----------------------- po/ast.po | 106 ++++++++++++++++++++++++++++----------------------- po/bg.po | 102 ++++++++++++++++++++++++++----------------------- po/ca.po | 106 ++++++++++++++++++++++++++++----------------------- po/cs.po | 106 ++++++++++++++++++++++++++++----------------------- po/da.po | 106 ++++++++++++++++++++++++++++----------------------- po/de.po | 106 ++++++++++++++++++++++++++++----------------------- po/el.po | 102 ++++++++++++++++++++++++++----------------------- po/en.po | 102 ++++++++++++++++++++++++++----------------------- po/en_US.po | 102 ++++++++++++++++++++++++++----------------------- po/eo.po | 106 ++++++++++++++++++++++++++++----------------------- po/es.po | 106 ++++++++++++++++++++++++++++----------------------- po/fa.po | 104 +++++++++++++++++++++++++++----------------------- po/fi.po | 106 ++++++++++++++++++++++++++++----------------------- po/fr.po | 106 ++++++++++++++++++++++++++++----------------------- po/he.po | 106 ++++++++++++++++++++++++++++----------------------- po/hi.po | 102 ++++++++++++++++++++++++++----------------------- po/hr.po | 106 ++++++++++++++++++++++++++++----------------------- po/hu.po | 106 ++++++++++++++++++++++++++++----------------------- po/it.po | 106 ++++++++++++++++++++++++++++----------------------- po/ja.po | 106 ++++++++++++++++++++++++++++----------------------- po/ko.po | 106 ++++++++++++++++++++++++++++----------------------- po/lt.po | 106 ++++++++++++++++++++++++++++----------------------- po/ml.po | 102 ++++++++++++++++++++++++++----------------------- po/nb_NO.po | 106 ++++++++++++++++++++++++++++----------------------- po/nl.po | 106 ++++++++++++++++++++++++++++----------------------- po/or.po | 102 ++++++++++++++++++++++++++----------------------- po/pa.po | 102 ++++++++++++++++++++++++++----------------------- po/pl.po | 106 ++++++++++++++++++++++++++++----------------------- po/pt_BR.po | 106 ++++++++++++++++++++++++++++----------------------- po/pt_PT.po | 106 ++++++++++++++++++++++++++++----------------------- po/rm.po | 102 ++++++++++++++++++++++++++----------------------- po/ro.po | 106 ++++++++++++++++++++++++++++----------------------- po/ru.po | 102 ++++++++++++++++++++++++++----------------------- po/si.po | 106 ++++++++++++++++++++++++++++----------------------- po/sk.po | 106 ++++++++++++++++++++++++++++----------------------- po/sl.po | 106 ++++++++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 104 +++++++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 104 +++++++++++++++++++++++++++----------------------- po/sv.po | 106 ++++++++++++++++++++++++++++----------------------- po/ta.po | 102 ++++++++++++++++++++++++++----------------------- po/te.po | 102 ++++++++++++++++++++++++++----------------------- po/th.po | 104 +++++++++++++++++++++++++++----------------------- po/tr.po | 106 ++++++++++++++++++++++++++++----------------------- po/uk.po | 102 ++++++++++++++++++++++++++----------------------- po/wa.po | 104 +++++++++++++++++++++++++++----------------------- po/wine.pot | 102 ++++++++++++++++++++++++++----------------------- po/zh_CN.po | 106 ++++++++++++++++++++++++++++----------------------- po/zh_TW.po | 106 ++++++++++++++++++++++++++++----------------------- 51 files changed, 2837 insertions(+), 2303 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b5d39469b84b3efcf63b…

1 0

Alexandre Julliard : gdi32: Move the face data structure out of freetype.c.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 5537f38e97e21f4e689680ef0895e0261a6ea5bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=5537f38e97e21f4e689680ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 14:31:13 2020 +0100 gdi32: Move the face data structure out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 20 +++++ dlls/gdi32/freetype.c | 189 +++++++++++++---------------------------------- dlls/gdi32/gdi_private.h | 39 ++++++++++ 3 files changed, 111 insertions(+), 137 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5537f38e97e21f4e6896…

1 0

Alexandre Julliard : gdi32: Move the font family list out of freetype.c.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 6a1cdd98fa9805baa321d0941c79170362bac040 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a1cdd98fa9805baa321d094… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 14:22:51 2020 +0100 gdi32: Move the font family list out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 53 +++++++++++++++++++++++++++++++++++++- dlls/gdi32/freetype.c | 66 ++---------------------------------------------- dlls/gdi32/gdi_private.h | 17 ++++++++++++- 3 files changed, 70 insertions(+), 66 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b48491b4ab0..8c567351c19 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -443,7 +443,7 @@ const WCHAR *get_gdi_font_subst( const WCHAR *from_name, int from_charset, int * return NULL; } -BOOL add_gdi_font_subst( const WCHAR *from_name, int from_charset, const WCHAR *to_name, int to_charset ) +static BOOL add_gdi_font_subst( const WCHAR *from_name, int from_charset, const WCHAR *to_name, int to_charset ) { struct gdi_font_subst *subst; int len = strlenW( from_name ) + strlenW( to_name ) + 2; @@ -500,6 +500,57 @@ void load_gdi_font_subst(void) RegCloseKey( hkey ); } +/* font families */ + +struct list font_list = LIST_INIT(font_list); + +struct gdi_font_family *create_family( const WCHAR *name, const WCHAR *second_name ) +{ + struct gdi_font_family *family = HeapAlloc( GetProcessHeap(), 0, sizeof(*family) ); + + family->refcount = 1; + lstrcpynW( family->family_name, name, LF_FACESIZE ); + if (second_name && second_name[0]) + { + lstrcpynW( family->second_name, second_name, LF_FACESIZE ); + add_gdi_font_subst( second_name, -1, name, -1 ); + } + else family->second_name[0] = 0; + list_init( &family->faces ); + family->replacement = &family->faces; + list_add_tail( &font_list, &family->entry ); + return family; +} + +void release_family( struct gdi_font_family *family ) +{ + if (--family->refcount) return; + assert( list_empty( &family->faces )); + list_remove( &family->entry ); + HeapFree( GetProcessHeap(), 0, family ); +} + +struct gdi_font_family *find_family_from_name( const WCHAR *name ) +{ + struct gdi_font_family *family; + + LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + if (!strncmpiW( family->family_name, name, LF_FACESIZE - 1 )) return family; + return NULL; +} + +struct gdi_font_family *find_family_from_any_name( const WCHAR *name ) +{ + struct gdi_font_family *family; + + LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + { + if (!strncmpiW( family->family_name, name, LF_FACESIZE - 1 )) return family; + if (!strncmpiW( family->second_name, name, LF_FACESIZE - 1 )) return family; + } + return NULL; +} + /* realized font objects */ #define FIRST_FONT_HANDLE 1 diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 20ada389631..8b9b223b964 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -265,21 +265,14 @@ typedef struct tagFace { BOOL scalable; Bitmap_Size size; /* set if face is a bitmap */ DWORD flags; /* ADDFONT flags */ - struct tagFamily *family; + struct gdi_font_family *family; /* Cached data for Enum */ struct enum_data *cached_enum_data; } Face; #define FS_DBCS_MASK (FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB) -typedef struct tagFamily { - struct list entry; - unsigned int refcount; - WCHAR family_name[LF_FACESIZE]; - WCHAR second_name[LF_FACESIZE]; - struct list faces; - struct list *replacement; -} Family; +typedef struct gdi_font_family Family; typedef struct { struct list entry; @@ -317,8 +310,6 @@ struct enum_charset_list { static struct list system_links = LIST_INIT(system_links); -static struct list font_list = LIST_INIT(font_list); - static const struct font_backend_funcs font_funcs; static const WCHAR win9x_font_reg_key[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', @@ -745,29 +736,6 @@ static Face *find_face_from_filename(const WCHAR *file_name, const WCHAR *face_n return NULL; } -static Family *find_family_from_name(const WCHAR *name) -{ - Family *family; - - LIST_FOR_EACH_ENTRY(family, &font_list, Family, entry) - if (!strncmpiW( family->family_name, name, LF_FACESIZE - 1 )) return family; - - return NULL; -} - -static Family *find_family_from_any_name(const WCHAR *name) -{ - Family *family; - - LIST_FOR_EACH_ENTRY(family, &font_list, Family, entry) - { - if (!strncmpiW( family->family_name, name, LF_FACESIZE - 1 )) return family; - if (!strncmpiW( family->second_name, name, LF_FACESIZE - 1 )) return family; - } - - return NULL; -} - static LPWSTR strdupW(LPCWSTR p) { LPWSTR ret; @@ -1076,14 +1044,6 @@ static inline BOOL faces_equal( const Face *f1, const Face *f2 ) return !memcmp( &f1->fs, &f2->fs, sizeof(f1->fs) ); } -static void release_family( Family *family ) -{ - if (--family->refcount) return; - assert( list_empty( &family->faces )); - list_remove( &family->entry ); - HeapFree( GetProcessHeap(), 0, family ); -} - static void release_face( Face *face ) { if (--face->refcount) return; @@ -1168,28 +1128,6 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) return TRUE; } -/**************************************************************** - * NB This function stores the ptrs to the strings to save copying. - * Don't free them after calling. - */ -static Family *create_family( WCHAR *family_name, WCHAR *second_name ) -{ - Family * const family = HeapAlloc( GetProcessHeap(), 0, sizeof(*family) ); - family->refcount = 1; - lstrcpynW( family->family_name, family_name, LF_FACESIZE ); - if (second_name) - { - lstrcpynW( family->second_name, second_name, LF_FACESIZE ); - add_gdi_font_subst( second_name, -1, family_name, -1 ); - } - else family->second_name[0] = 0; - list_init( &family->faces ); - family->replacement = &family->faces; - list_add_tail( &font_list, &family->entry ); - - return family; -} - struct cached_face { DWORD index; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 7adfb2ade40..ecad4f09357 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -305,6 +305,16 @@ typedef struct { FLOAT eM11, eM12, eM21, eM22; } FMAT2; struct glyph_metrics; +struct gdi_font_family +{ + struct list entry; + unsigned int refcount; + WCHAR family_name[LF_FACESIZE]; + WCHAR second_name[LF_FACESIZE]; + struct list faces; + struct list *replacement; +}; + struct gdi_font { struct list entry; @@ -396,9 +406,14 @@ extern void load_file_system_fonts(void) DECLSPEC_HIDDEN; extern void load_registry_fonts(void) DECLSPEC_HIDDEN; extern const WCHAR *get_gdi_font_subst( const WCHAR *from_name, int from_charset, int *to_charset ) DECLSPEC_HIDDEN; -extern BOOL add_gdi_font_subst( const WCHAR *from_name, int from_charset, const WCHAR *to_name, int to_charset ) DECLSPEC_HIDDEN; extern void load_gdi_font_subst(void) DECLSPEC_HIDDEN; +extern struct list font_list DECLSPEC_HIDDEN; +extern struct gdi_font_family *create_family( const WCHAR *name, const WCHAR *second_name ) DECLSPEC_HIDDEN; +extern void release_family( struct gdi_font_family *family ) DECLSPEC_HIDDEN; +extern struct gdi_font_family *find_family_from_name( const WCHAR *name ) DECLSPEC_HIDDEN; +extern struct gdi_font_family *find_family_from_any_name( const WCHAR *name ) DECLSPEC_HIDDEN; + extern struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_size ) DECLSPEC_HIDDEN; extern void free_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN; extern void cache_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Move the font substitution list out of freetype.c.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 7e51cc8308bd828d8d8a90aea35170c68d4b1bb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e51cc8308bd828d8d8a90ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 14:15:34 2020 +0100 gdi32: Move the font substitution list out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 105 +++++++++++++++++++ dlls/gdi32/freetype.c | 265 +++++++++-------------------------------------- dlls/gdi32/gdi_private.h | 4 + 3 files changed, 156 insertions(+), 218 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e51cc8308bd828d8d8a…

1 0

Daniel Lehman : tzres: Add Magallanes Standard Time Zone.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: af5c7c33567812c1f0037ff011ec9c63efdb9d90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af5c7c33567812c1f0037ff0… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Oct 29 22:40:24 2020 -0700 tzres: Add Magallanes Standard Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 21 ++++++ po/ar.po | 210 +++++++++++++++++++++++++++------------------------ po/ast.po | 210 +++++++++++++++++++++++++++------------------------ po/bg.po | 206 ++++++++++++++++++++++++++------------------------ po/ca.po | 210 +++++++++++++++++++++++++++------------------------ po/cs.po | 210 +++++++++++++++++++++++++++------------------------ po/da.po | 210 +++++++++++++++++++++++++++------------------------ po/de.po | 210 +++++++++++++++++++++++++++------------------------ po/el.po | 206 ++++++++++++++++++++++++++------------------------ po/en.po | 206 ++++++++++++++++++++++++++------------------------ po/en_US.po | 206 ++++++++++++++++++++++++++------------------------ po/eo.po | 210 +++++++++++++++++++++++++++------------------------ po/es.po | 210 +++++++++++++++++++++++++++------------------------ po/fa.po | 208 ++++++++++++++++++++++++++------------------------ po/fi.po | 210 +++++++++++++++++++++++++++------------------------ po/fr.po | 210 +++++++++++++++++++++++++++------------------------ po/he.po | 210 +++++++++++++++++++++++++++------------------------ po/hi.po | 206 ++++++++++++++++++++++++++------------------------ po/hr.po | 210 +++++++++++++++++++++++++++------------------------ po/hu.po | 210 +++++++++++++++++++++++++++------------------------ po/it.po | 210 +++++++++++++++++++++++++++------------------------ po/ja.po | 210 +++++++++++++++++++++++++++------------------------ po/ko.po | 210 +++++++++++++++++++++++++++------------------------ po/lt.po | 210 +++++++++++++++++++++++++++------------------------ po/ml.po | 206 ++++++++++++++++++++++++++------------------------ po/nb_NO.po | 210 +++++++++++++++++++++++++++------------------------ po/nl.po | 210 +++++++++++++++++++++++++++------------------------ po/or.po | 206 ++++++++++++++++++++++++++------------------------ po/pa.po | 206 ++++++++++++++++++++++++++------------------------ po/pl.po | 210 +++++++++++++++++++++++++++------------------------ po/pt_BR.po | 210 +++++++++++++++++++++++++++------------------------ po/pt_PT.po | 210 +++++++++++++++++++++++++++------------------------ po/rm.po | 206 ++++++++++++++++++++++++++------------------------ po/ro.po | 210 +++++++++++++++++++++++++++------------------------ po/ru.po | 206 ++++++++++++++++++++++++++------------------------ po/si.po | 210 +++++++++++++++++++++++++++------------------------ po/sk.po | 210 +++++++++++++++++++++++++++------------------------ po/sl.po | 210 +++++++++++++++++++++++++++------------------------ po/sr_RS(a)cyrillic.po | 208 ++++++++++++++++++++++++++------------------------ po/sr_RS(a)latin.po | 208 ++++++++++++++++++++++++++------------------------ po/sv.po | 210 +++++++++++++++++++++++++++------------------------ po/ta.po | 206 ++++++++++++++++++++++++++------------------------ po/te.po | 206 ++++++++++++++++++++++++++------------------------ po/th.po | 208 ++++++++++++++++++++++++++------------------------ po/tr.po | 210 +++++++++++++++++++++++++++------------------------ po/uk.po | 206 ++++++++++++++++++++++++++------------------------ po/wa.po | 208 ++++++++++++++++++++++++++------------------------ po/wine.pot | 206 ++++++++++++++++++++++++++------------------------ po/zh_CN.po | 210 +++++++++++++++++++++++++++------------------------ po/zh_TW.po | 210 +++++++++++++++++++++++++++------------------------ 51 files changed, 5396 insertions(+), 4851 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af5c7c33567812c1f003…

1 0

Alexandre Julliard : gdi32: Move the loading of font replacements out of freetype.c.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: d27a9d77ee2e21dc071b9cb09af6df78ca5c0c84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d27a9d77ee2e21dc071b9cb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 14:38:02 2020 +0100 gdi32: Move the loading of font replacements out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 79 ++++++++++++++++++++++++++++++++ dlls/gdi32/freetype.c | 116 +---------------------------------------------- dlls/gdi32/gdi_private.h | 3 ++ 3 files changed, 83 insertions(+), 115 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 62f9f927ccd..806ff0d1d91 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -551,6 +551,85 @@ struct gdi_font_family *find_family_from_any_name( const WCHAR *name ) return NULL; } +static BOOL add_family_replacement( const WCHAR *new_name, const WCHAR *replace ) +{ + struct gdi_font_family *new_family, *family; + struct gdi_font_face *face; + WCHAR new_name_vert[LF_FACESIZE], replace_vert[LF_FACESIZE]; + + if (!(family = find_family_from_any_name( replace ))) + { + TRACE( "%s is not available. Skip this replacement.\n", debugstr_w(replace) ); + return FALSE; + } + + if (!(new_family = create_family( new_name, NULL ))) return FALSE; + new_family->replacement = &family->faces; + TRACE( "mapping %s to %s\n", debugstr_w(replace), debugstr_w(new_name) ); + + /* also add replacement for vertical font if necessary */ + if (replace[0] == '@') return TRUE; + if (list_empty( &family->faces )) return TRUE; + face = LIST_ENTRY( list_head(&family->faces), struct gdi_font_face, entry ); + if (!(face->fs.fsCsb[0] & FS_DBCS_MASK)) return TRUE; + + new_name_vert[0] = '@'; + lstrcpynW( new_name_vert + 1, new_name, LF_FACESIZE - 1 ); + if (find_family_from_any_name( new_name_vert )) return TRUE; /* already exists */ + + replace_vert[0] = '@'; + lstrcpynW( replace_vert + 1, replace, LF_FACESIZE - 1 ); + add_family_replacement( new_name_vert, replace_vert ); + return TRUE; +} + +/* + * The replacement list is a way to map an entire font + * family onto another family. For example adding + * + * [HKCU\Software\Wine\Fonts\Replacements] + * "Wingdings"="Winedings" + * + * would enumerate the Winedings font both as Winedings and + * Wingdings. However if a real Wingdings font is present the + * replacement does not take place. + */ +void load_gdi_font_replacements(void) +{ + HKEY hkey; + DWORD i = 0, type, dlen, vlen; + WCHAR value[LF_FACESIZE], data[1024]; + + /* @@ Wine registry key: HKCU\Software\Wine\Fonts\Replacements */ + if (RegOpenKeyA( wine_fonts_key, "Replacements", &hkey )) return; + + dlen = sizeof(data); + vlen = ARRAY_SIZE(value); + while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, (BYTE *)data, &dlen )) + { + /* "NewName"="Oldname" */ + if (!find_family_from_any_name( value )) + { + if (type == REG_MULTI_SZ) + { + WCHAR *replace = data; + while (*replace) + { + if (add_family_replacement( value, replace )) break; + replace += strlenW(replace) + 1; + } + } + else if (type == REG_SZ) add_family_replacement( value, data ); + } + else TRACE("%s is available. Skip this replacement.\n", debugstr_w(value)); + + /* reset dlen and vlen */ + dlen = sizeof(data); + vlen = ARRAY_SIZE(value); + } + RegCloseKey( hkey ); +} + struct gdi_font_face *create_face( const WCHAR *style, const WCHAR *fullname, const WCHAR *file, UINT index, FONTSIGNATURE fs, DWORD ntmflags, DWORD version, DWORD flags, const struct bitmap_font_size *size ) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 147d65d130d..afc9add629c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -235,8 +235,6 @@ typedef struct { typedef struct gdi_font_face Face; -#define FS_DBCS_MASK (FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB) - typedef struct gdi_font_family Family; typedef struct { @@ -365,7 +363,6 @@ static const WCHAR font_mutex_nameW[] = {'_','_','W','I','N','E','_','F','O','N' static const WCHAR szDefaultFallbackLink[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}; -static BOOL map_font_family(const WCHAR *orig, const WCHAR *repl); static BOOL CDECL freetype_set_outline_text_metrics( struct gdi_font *font ); static BOOL CDECL freetype_set_bitmap_text_metrics( struct gdi_font *font ); static void remove_face_from_cache( Face *face ); @@ -1735,117 +1732,6 @@ static void DumpFontList(void) } } -static BOOL map_vertical_font_family(const WCHAR *orig, const WCHAR *repl, const Family *family) -{ - Face *face; - BOOL ret = FALSE; - WCHAR *at_orig, *at_repl = NULL; - - face = LIST_ENTRY(list_head(&family->faces), Face, entry); - if (!face || !(face->fs.fsCsb[0] & FS_DBCS_MASK)) - return FALSE; - - at_orig = get_vertical_name( strdupW( orig ) ); - if (at_orig && !find_family_from_any_name(at_orig)) - { - at_repl = get_vertical_name( strdupW( repl ) ); - if (at_repl) - ret = map_font_family(at_orig, at_repl); - } - - HeapFree(GetProcessHeap(), 0, at_orig); - HeapFree(GetProcessHeap(), 0, at_repl); - - return ret; -} - -static BOOL map_font_family(const WCHAR *orig, const WCHAR *repl) -{ - Family *family = find_family_from_any_name(repl); - if (family != NULL) - { - Family *new_family = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_family)); - if (new_family != NULL) - { - TRACE("mapping %s to %s\n", debugstr_w(repl), debugstr_w(orig)); - lstrcpynW( new_family->family_name, orig, LF_FACESIZE ); - new_family->second_name[0] = 0; - list_init(&new_family->faces); - new_family->replacement = &family->faces; - list_add_tail(&font_list, &new_family->entry); - - if (repl[0] != '@') - map_vertical_font_family(orig, repl, family); - - return TRUE; - } - } - TRACE("%s is not available. Skip this replacement.\n", debugstr_w(repl)); - return FALSE; -} - -/*********************************************************** - * The replacement list is a way to map an entire font - * family onto another family. For example adding - * - * [HKCU\Software\Wine\Fonts\Replacements] - * "Wingdings"="Winedings" - * - * would enumerate the Winedings font both as Winedings and - * Wingdings. However if a real Wingdings font is present the - * replacement does not take place. - * - */ -static void LoadReplaceList(void) -{ - HKEY hkey; - DWORD valuelen, datalen, i = 0, type, dlen, vlen; - LPWSTR value; - LPVOID data; - - /* @@ Wine registry key: HKCU\Software\Wine\Fonts\Replacements */ - if(RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Fonts\\Replacements", &hkey) == ERROR_SUCCESS) - { - RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - &valuelen, &datalen, NULL, NULL); - - valuelen++; /* returned value doesn't include room for '\0' */ - value = HeapAlloc(GetProcessHeap(), 0, valuelen * sizeof(WCHAR)); - data = HeapAlloc(GetProcessHeap(), 0, datalen); - - dlen = datalen; - vlen = valuelen; - while(RegEnumValueW(hkey, i++, value, &vlen, NULL, &type, data, &dlen) == ERROR_SUCCESS) - { - /* "NewName"="Oldname" */ - if(!find_family_from_any_name(value)) - { - if (type == REG_MULTI_SZ) - { - WCHAR *replace = data; - while(*replace) - { - if (map_font_family(value, replace)) - break; - replace += strlenW(replace) + 1; - } - } - else if (type == REG_SZ) - map_font_family(value, data); - } - else - TRACE("%s is available. Skip this replacement.\n", debugstr_w(value)); - - /* reset dlen and vlen */ - dlen = datalen; - vlen = valuelen; - } - HeapFree(GetProcessHeap(), 0, data); - HeapFree(GetProcessHeap(), 0, value); - RegCloseKey(hkey); - } -} - static const WCHAR *font_links_list[] = { Lucida_Sans_Unicode, @@ -2780,7 +2666,7 @@ BOOL WineEngInit( const struct font_backend_funcs **funcs ) DumpFontList(); load_gdi_font_subst(); - LoadReplaceList(); + load_gdi_font_replacements(); if(disposition == REG_CREATED_NEW_KEY) update_reg_entries(); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 812b3f33abf..63e76e4df69 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -405,6 +405,8 @@ struct gdi_font #define MS_TTCF_TAG MS_MAKE_TAG('t', 't', 'c', 'f') #define MS_VDMX_TAG MS_MAKE_TAG('V', 'D', 'M', 'X') +#define FS_DBCS_MASK (FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG | FS_CHINESETRAD | FS_JOHAB) + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_ALLOW_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 @@ -449,6 +451,7 @@ extern struct gdi_font_family *create_family( const WCHAR *name, const WCHAR *se extern void release_family( struct gdi_font_family *family ) DECLSPEC_HIDDEN; extern struct gdi_font_family *find_family_from_name( const WCHAR *name ) DECLSPEC_HIDDEN; extern struct gdi_font_family *find_family_from_any_name( const WCHAR *name ) DECLSPEC_HIDDEN; +extern void load_gdi_font_replacements(void) DECLSPEC_HIDDEN; extern struct gdi_font_face *create_face( const WCHAR *style, const WCHAR *fullname, const WCHAR *file, UINT index, FONTSIGNATURE fs, DWORD ntmflags, DWORD version, DWORD flags, const struct bitmap_font_size *size ) DECLSPEC_HIDDEN;

1 0

Huw Davies : riched20: Use a run ptr in the rtf row handler.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 0c9d5ebf5c74d8215cbf676af3dd7e7f431afc90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c9d5ebf5c74d8215cbf676a… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 30 09:00:28 2020 +0000 riched20: Use a run ptr in the rtf row handler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 40282027dba..1f37258f345 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -987,7 +987,7 @@ void ME_RTFSpecialCharHook(RTF_Info *info) /* else fall through since v4.1 treats rtfNestRow and rtfRow the same */ case rtfRow: { - ME_DisplayItem *run; + ME_Run *run; ME_Paragraph *para; ME_Cell *cell; int i; @@ -1042,14 +1042,14 @@ void ME_RTFSpecialCharHook(RTF_Info *info) cell->nRightBoundary = tableDef->cells[i - 1].rightBoundary; } - run = ME_FindItemFwd( cell_get_di( cell) , diRun ); - if (info->editor->pCursors[0].pRun != run || + run = para_first_run( cell_first_para( cell ) ); + if (&info->editor->pCursors[0].pRun->member.run != run || info->editor->pCursors[0].nOffset) { int nOfs, nChars; /* Delete inserted cells that aren't defined. */ - info->editor->pCursors[1].pRun = run; - info->editor->pCursors[1].pPara = ME_GetParagraph(run); + info->editor->pCursors[1].pRun = run_get_di( run ); + info->editor->pCursors[1].pPara = para_get_di( run->para ); info->editor->pCursors[1].nOffset = 0; nOfs = ME_GetCursorOfs(&info->editor->pCursors[1]); nChars = ME_GetCursorOfs(&info->editor->pCursors[0]) - nOfs;

1 0

Huw Davies : riched20: Use paragraph ptrs in the enter handler.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: a0f0dc1c5b9d66a4ba6b6099c2d0a74d72208203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0f0dc1c5b9d66a4ba6b6099… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 30 09:00:27 2020 +0000 riched20: Use paragraph ptrs in the enter handler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 70 +++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2a3858ba038..40282027dba 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2484,7 +2484,7 @@ static BOOL handle_enter(ME_TextEditor *editor) static const WCHAR endl = '\r'; static const WCHAR endlv10[] = {'\r','\n'}; ME_Cursor cursor = editor->pCursors[0]; - ME_DisplayItem *para = cursor.pPara; + ME_Paragraph *para = &cursor.pPara->member.para; int from, to; ME_Style *style, *eop_style; @@ -2499,40 +2499,40 @@ static BOOL handle_enter(ME_TextEditor *editor) { if (!editor->bEmulateVersion10) /* v4.1 */ { - if (para->member.para.nFlags & MEPF_ROWEND) + if (para->nFlags & MEPF_ROWEND) { /* Add a new table row after this row. */ - para = para_get_di( table_append_row( editor, &para->member.para ) ); - para = para->member.para.next_para; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + para = table_append_row( editor, para ); + para = para_next( para ); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; ME_CommitUndo(editor); ME_UpdateRepaint(editor, FALSE); return TRUE; } - else if (para == editor->pCursors[1].pPara && - cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && - para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART && - !para->member.para.prev_para->member.para.nCharOfs) + else if (para == &editor->pCursors[1].pPara->member.para && + cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && + para_prev( para ) && para_prev( para )->nFlags & MEPF_ROWSTART && + !para_prev( para )->nCharOfs) { /* Insert a newline before the table. */ - para = para->member.para.prev_para; - para->member.para.nFlags &= ~MEPF_ROWSTART; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + para = para_prev( para ); + para->nFlags &= ~MEPF_ROWSTART; + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[1] = editor->pCursors[0]; ME_InsertTextFromCursor(editor, 0, &endl, 1, - editor->pCursors[0].pRun->member.run.style); - para = editor->pBuffer->pFirst->member.para.next_para; - editor_set_default_para_fmt( editor, &para->member.para.fmt ); - para->member.para.nFlags = 0; - para_mark_rewrap( editor, &para->member.para ); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].pRun->member.run.style); + para = editor_first_para( editor ); + editor_set_default_para_fmt( editor, &para->fmt ); + para->nFlags = 0; + para_mark_rewrap( editor, para ); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[1] = editor->pCursors[0]; - para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; + para_next( para )->nFlags |= MEPF_ROWSTART; ME_CommitCoalescingUndo(editor); ME_UpdateRepaint(editor, FALSE); return TRUE; @@ -2540,17 +2540,17 @@ static BOOL handle_enter(ME_TextEditor *editor) } else /* v1.0 - 3.0 */ { - ME_DisplayItem *para = cursor.pPara; - if (ME_IsInTable(para)) + ME_Paragraph *para = &cursor.pPara->member.para; + if (para_in_table( para )) { if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) { if (from == to) { ME_ContinueCoalescingTransaction(editor); - para = para_get_di( table_append_row( editor, &para->member.para ) ); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + para = table_append_row( editor, para ); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; ME_CommitCoalescingUndo(editor); @@ -2562,14 +2562,14 @@ static BOOL handle_enter(ME_TextEditor *editor) { ME_ContinueCoalescingTransaction(editor); if (cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && - !ME_IsInTable(para->member.para.prev_para)) + para_prev( para ) && !para_in_table( para_prev( para ) )) { /* Insert newline before table */ - cursor.pRun = ME_FindItemBack(para, diRun); + cursor.pRun = run_get_di( para_end_run( para_prev( para ) ) ); if (cursor.pRun) { editor->pCursors[0].pRun = cursor.pRun; - editor->pCursors[0].pPara = para->member.para.prev_para; + editor->pCursors[0].pPara = para_get_di( para_prev( para ) ); } editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; @@ -2579,9 +2579,9 @@ static BOOL handle_enter(ME_TextEditor *editor) else { editor->pCursors[1] = editor->pCursors[0]; - para = para_get_di( table_append_row( editor, &para->member.para ) ); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + para = table_append_row( editor, para ); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; } @@ -2597,8 +2597,8 @@ static BOOL handle_enter(ME_TextEditor *editor) /* Normally the new eop style is the insert style, however in a list it is copied from the existing eop style (this prevents the list label style changing when the new eop is inserted). No extra ref is taken here on eop_style. */ - if (para->member.para.fmt.wNumbering) - eop_style = para->member.para.eop_run->style; + if (para->fmt.wNumbering) + eop_style = para->eop_run->style; else eop_style = style; ME_ContinueCoalescingTransaction(editor);

1 0

Huw Davies : riched20: Use paragraph ptrs in the selection link check function.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 352e7664d8d1a74600ebd9dc3d3a2dcbe337d7af URL: https://source.winehq.org/git/wine.git/?a=commit;h=352e7664d8d1a74600ebd9dc… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 30 09:00:26 2020 +0000 riched20: Use paragraph ptrs in the selection link check function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 057d5a31ce6..2a3858ba038 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2426,30 +2426,27 @@ ME_FilterEvent(ME_TextEditor *editor, UINT msg, WPARAM* wParam, LPARAM* lParam) static void ME_UpdateSelectionLinkAttribute(ME_TextEditor *editor) { - ME_DisplayItem *startPara, *endPara; - ME_DisplayItem *prev_para; - ME_Cursor *from, *to; - ME_Cursor start; - int nChars; + ME_Paragraph *start_para, *end_para; + ME_Cursor *from, *to, start; + int num_chars; if (!editor->AutoURLDetect_bEnable) return; ME_GetSelection(editor, &from, &to); /* Find paragraph previous to the one that contains start cursor */ - startPara = from->pPara; - prev_para = startPara->member.para.prev_para; - if (prev_para->type == diParagraph) startPara = prev_para; + start_para = &from->pPara->member.para; + if (para_prev( start_para )) start_para = para_prev( start_para ); /* Find paragraph that contains end cursor */ - endPara = to->pPara->member.para.next_para; + end_para = para_next( &to->pPara->member.para ); - start.pPara = startPara; - start.pRun = ME_FindItemFwd(startPara, diRun); + start.pPara = para_get_di( start_para ); + start.pRun = run_get_di( para_first_run( start_para ) ); start.nOffset = 0; - nChars = endPara->member.para.nCharOfs - startPara->member.para.nCharOfs; + num_chars = end_para->nCharOfs - start_para->nCharOfs; - ME_UpdateLinkAttribute(editor, &start, nChars); + ME_UpdateLinkAttribute( editor, &start, num_chars ); } static BOOL handle_enter(ME_TextEditor *editor)

1 0

Huw Davies : riched20: Use paragraph and run ptrs in the find text function.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: cdd507eb2bdcc5f1cdcecc256f2199ce57531703 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdd507eb2bdcc5f1cdcecc25… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 30 09:00:29 2020 +0000 riched20: Use paragraph and run ptrs in the find text function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 85 +++++++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 36 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1f37258f345..c1138bd1dab 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1928,11 +1928,11 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH while (cursor.pRun && ME_GetCursorOfs(&cursor) + nLen <= nMax) { - ME_DisplayItem *pCurItem = cursor.pRun; + ME_Run *run = &cursor.pRun->member.run; int nCurStart = cursor.nOffset; int nMatched = 0; - while (pCurItem && ME_CharCompare( *get_text( &pCurItem->member.run, nCurStart + nMatched ), text[nMatched], (flags & FR_MATCHCASE))) + while (run && ME_CharCompare( *get_text( run, nCurStart + nMatched ), text[nMatched], (flags & FR_MATCHCASE))) { if ((flags & FR_WHOLEWORD) && iswalnum(wLastChar)) break; @@ -1940,21 +1940,21 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH nMatched++; if (nMatched == nLen) { - ME_DisplayItem *pNextItem = pCurItem; + ME_Run *next_run = run; int nNextStart = nCurStart; WCHAR wNextChar; /* Check to see if next character is a whitespace */ if (flags & FR_WHOLEWORD) { - if (nCurStart + nMatched == pCurItem->member.run.len) + if (nCurStart + nMatched == run->len) { - pNextItem = ME_FindItemFwd(pCurItem, diRun); + next_run = run_next_all_paras( run ); nNextStart = -nMatched; } - if (pNextItem) - wNextChar = *get_text( &pNextItem->member.run, nNextStart + nMatched ); + if (next_run) + wNextChar = *get_text( next_run, nNextStart + nMatched ); else wNextChar = ' '; @@ -1971,22 +1971,28 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH TRACE("found at %d-%d\n", cursor.nOffset, cursor.nOffset + nLen); return cursor.nOffset; } - if (nCurStart + nMatched == pCurItem->member.run.len) + if (nCurStart + nMatched == run->len) { - pCurItem = ME_FindItemFwd(pCurItem, diRun); + run = run_next_all_paras( run ); nCurStart = -nMatched; } } - if (pCurItem) - wLastChar = *get_text( &pCurItem->member.run, nCurStart + nMatched ); + if (run) + wLastChar = *get_text( run, nCurStart + nMatched ); else wLastChar = ' '; cursor.nOffset++; if (cursor.nOffset == cursor.pRun->member.run.len) { - ME_NextRun(&cursor.pPara, &cursor.pRun, TRUE); - cursor.nOffset = 0; + if (run_next_all_paras( &cursor.pRun->member.run )) + { + cursor.pRun = run_get_di( run_next_all_paras( &cursor.pRun->member.run ) ); + cursor.pPara = para_get_di( cursor.pRun->member.run.para ); + cursor.nOffset = 0; + } + else + cursor.pRun = NULL; } } } @@ -2003,19 +2009,20 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH while (cursor.pRun && ME_GetCursorOfs(&cursor) - nLen >= nMin) { - ME_DisplayItem *pCurItem = cursor.pRun; - ME_DisplayItem *pCurPara = cursor.pPara; + ME_Run *run = &cursor.pRun->member.run; + ME_Paragraph *para = &cursor.pPara->member.para; int nCurEnd = cursor.nOffset; int nMatched = 0; - if (nCurEnd == 0) + if (nCurEnd == 0 && run_prev_all_paras( run )) { - ME_PrevRun(&pCurPara, &pCurItem, TRUE); - nCurEnd = pCurItem->member.run.len; + run = run_prev_all_paras( run ); + para = run->para; + nCurEnd = run->len; } - while (pCurItem && ME_CharCompare( *get_text( &pCurItem->member.run, nCurEnd - nMatched - 1 ), - text[nLen - nMatched - 1], (flags & FR_MATCHCASE) )) + while (run && ME_CharCompare( *get_text( run, nCurEnd - nMatched - 1 ), + text[nLen - nMatched - 1], (flags & FR_MATCHCASE) )) { if ((flags & FR_WHOLEWORD) && iswalnum(wLastChar)) break; @@ -2023,7 +2030,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH nMatched++; if (nMatched == nLen) { - ME_DisplayItem *pPrevItem = pCurItem; + ME_Run *prev_run = run; int nPrevEnd = nCurEnd; WCHAR wPrevChar; int nStart; @@ -2033,22 +2040,18 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH { if (nPrevEnd - nMatched == 0) { - pPrevItem = ME_FindItemBack(pCurItem, diRun); - if (pPrevItem) - nPrevEnd = pPrevItem->member.run.len + nMatched; + prev_run = run_prev_all_paras( run ); + if (prev_run) nPrevEnd = prev_run->len + nMatched; } - if (pPrevItem) - wPrevChar = *get_text( &pPrevItem->member.run, nPrevEnd - nMatched - 1 ); - else - wPrevChar = ' '; + if (prev_run) wPrevChar = *get_text( prev_run, nPrevEnd - nMatched - 1 ); + else wPrevChar = ' '; if (iswalnum(wPrevChar)) break; } - nStart = pCurPara->member.para.nCharOfs - + pCurItem->member.run.nCharOfs + nCurEnd - nMatched; + nStart = para->nCharOfs + run->nCharOfs + nCurEnd - nMatched; if (chrgText) { chrgText->cpMin = nStart; @@ -2059,22 +2062,32 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH } if (nCurEnd - nMatched == 0) { - ME_PrevRun(&pCurPara, &pCurItem, TRUE); + if (run_prev_all_paras( run )) + { + run = run_prev_all_paras( run ); + para = run->para; + } /* Don't care about pCurItem becoming NULL here; it's already taken * care of in the exterior loop condition */ - nCurEnd = pCurItem->member.run.len + nMatched; + nCurEnd = run->len + nMatched; } } - if (pCurItem) - wLastChar = *get_text( &pCurItem->member.run, nCurEnd - nMatched - 1 ); + if (run) + wLastChar = *get_text( run, nCurEnd - nMatched - 1 ); else wLastChar = ' '; cursor.nOffset--; if (cursor.nOffset < 0) { - ME_PrevRun(&cursor.pPara, &cursor.pRun, TRUE); - cursor.nOffset = cursor.pRun->member.run.len; + if (run_prev_all_paras( &cursor.pRun->member.run ) ) + { + cursor.pRun = run_get_di( run_prev_all_paras( &cursor.pRun->member.run ) ); + cursor.pPara = para_get_di( cursor.pRun->member.run.para ); + cursor.nOffset = cursor.pRun->member.run.len; + } + else + cursor.pRun = NULL; } } }

1 0

Huw Davies : riched20: Use a paragraph ptr in the stream in function.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 2bc67cfcf9293a4bf58a7bd0de5203c1a9ffbfdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bc67cfcf9293a4bf58a7bd0… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 30 09:00:25 2020 +0000 riched20: Use a paragraph ptr in the stream in function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d1667dc9176..057d5a31ce6 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1607,29 +1607,27 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre ME_InternalDeleteText(editor, selStart, to - from, FALSE); /* Don't insert text at the end of the table row */ - if (!editor->bEmulateVersion10) { /* v4.1 */ - ME_DisplayItem *para = editor->pCursors->pPara; - if (para->member.para.nFlags & MEPF_ROWEND) - { - para = para->member.para.next_para; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - } - if (para->member.para.nFlags & MEPF_ROWSTART) + if (!editor->bEmulateVersion10) /* v4.1 */ + { + ME_Paragraph *para = &editor->pCursors->pPara->member.para; + if (para->nFlags & (MEPF_ROWSTART | MEPF_ROWEND)) { - para = para->member.para.next_para; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + para = para_next( para ); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[0].nOffset = 0; } editor->pCursors[1] = editor->pCursors[0]; - } else { /* v1.0 - 3.0 */ + } + else /* v1.0 - 3.0 */ + { if (editor->pCursors[0].pRun->member.run.nFlags & MERF_ENDPARA && - ME_IsInTable(editor->pCursors[0].pRun)) + para_in_table( &editor->pCursors[0].pPara->member.para )) return 0; } - } else { + } + else + { style = editor->pBuffer->pDefaultStyle; ME_AddRefStyle(style); set_selection_cursors(editor, 0, 0);

1 0

Zhiyi Zhang : winex11.drv: Update a comment.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 28735278198e7ef8a4d0b73e9859748eab9d6570 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28735278198e7ef8a4d0b73e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 16:20:10 2020 +0800 winex11.drv: Update a comment. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 07f7a1ad502..d21d2a7fb1b 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -702,7 +702,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) if (can_activate_window(hwnd)) { - /* simulate a mouse click on the caption to find out + /* simulate a mouse click on the menu to find out * whether the window wants to be activated */ LRESULT ma = SendMessageW( hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor( hwnd, GA_ROOT ),

1 0

Zhiyi Zhang : winemac.drv: Send HTMENU instead of HTCAPTION to query window activation.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: ce9aaf3f4250536aadf04ad77fcaa1836242b696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9aaf3f4250536aadf04ad7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 16:19:50 2020 +0800 winemac.drv: Send HTMENU instead of HTCAPTION to query window activation. Equivalent of cfcc280905b7804efde8f42bcd6bddbe5ebd8cad for winex11.drv. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 066eb553f76..e7f5327fcdc 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2348,11 +2348,11 @@ void macdrv_window_got_focus(HWND hwnd, const macdrv_event *event) if (can_activate_window(hwnd) && !(style & WS_MINIMIZE)) { - /* simulate a mouse click on the caption to find out + /* simulate a mouse click on the menu to find out * whether the window wants to be activated */ LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor(hwnd, GA_ROOT), - MAKELONG(HTCAPTION,WM_LBUTTONDOWN)); + MAKELONG(HTMENU, WM_LBUTTONDOWN)); if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) { TRACE("setting foreground window to %p\n", hwnd);

1 0

Sergei Trofimovich : aclocal.m4: Fix compatibility with upcoming autoconf-2.70.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: d7645b67c350f7179a1eba749ec4524c74948d86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7645b67c350f7179a1eba74… Author: Sergei Trofimovich <slyfox(a)gentoo.org> Date: Thu Oct 29 22:51:57 2020 +0000 aclocal.m4: Fix compatibility with upcoming autoconf-2.70. Under autoconf 2.69c (beta) `./configure` fails as: ``` ./configure ... checking for msgfmt... msgfmt ./configure: line 7441: syntax error near unexpected token `newline' ./configure: line 7441: ` ''' ``` This happens due to underquoting of a snippet argument for `AS_VAR_SET_IF` call. Signed-off-by: Sergei Trofimovich <slyfox(a)gentoo.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aclocal.m4 b/aclocal.m4 index c5edd85cee4..bd8ca6b33e5 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -28,7 +28,7 @@ dnl Like AC_CHECK_TOOL but without the broken fallback to non-prefixed name dnl AC_DEFUN([WINE_CHECK_HOST_TOOL], [AS_VAR_SET_IF([ac_tool_prefix], - AC_CHECK_PROG([$1],[${ac_tool_prefix}$2],[${ac_tool_prefix}$2],,[$4])) + [AC_CHECK_PROG([$1],[${ac_tool_prefix}$2],[${ac_tool_prefix}$2],,[$4])]) AS_VAR_IF([ac_cv_prog_$1],[], [AS_VAR_IF([cross_compiling],[yes],[], [AS_UNSET([ac_cv_prog_$1])

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 9c683cd12c927fe443224b90bd0efd57d7abe1f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c683cd12c927fe443224b90… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Oct 29 23:45:37 2020 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index fb2cd8900ff..d4733396c7e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-10-14 12:00+0300\n" +"PO-Revision-Date: 2020-10-29 23:45+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -10338,16 +10338,12 @@ msgid "Arabian Daylight Time" msgstr "Arabų vasaros laikas" #: dlls/tzres/tzres.rc:214 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Tocantins Standard Time" -msgstr "Kalnų juostinis laikas" +msgstr "Tokantinso juostinis laikas" #: dlls/tzres/tzres.rc:215 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Tocantins Daylight Time" -msgstr "Kalnų vasaros laikas" +msgstr "Tokantinso vasaros laikas" #: dlls/tzres/tzres.rc:190 msgid "Russian Standard Time"

1 0

Georg Lehmann : winevulkan: Implement VK_EXT_debug_marker.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: fc893489fe89c9fbd22f0cbe1c4327c64f05e0dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc893489fe89c9fbd22f0cbe… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Thu Oct 29 23:48:42 2020 +0100 winevulkan: Implement VK_EXT_debug_marker. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49813 Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 5 ++- dlls/winevulkan/vulkan.c | 24 +++++++++++++ dlls/winevulkan/vulkan_thunks.c | 76 +++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 44 ++++++++++++++++++++++++ include/wine/vulkan.h | 43 +++++++++++++++++++++++ 5 files changed, 191 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fc893489fe89c9fbd22f…

1 0

Zhiyi Zhang : wined3d: Store a struct wined3d pointer in struct wined3d_swapchain_state.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: c9e2deac39924473ac538ee22a2a0c0dbe3bad85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9e2deac39924473ac538ee2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 28 14:38:44 2020 +0800 wined3d: Store a struct wined3d pointer in struct wined3d_swapchain_state. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 3 ++- dlls/wined3d/wined3d_main.c | 22 +++++++++------------- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index aa56634f3f3..847907c6d4c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1319,11 +1319,12 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat } GetWindowRect(window, &state->original_window_rect); + state->wined3d = wined3d; state->device_window = window; state->parent = parent; if (desc->flags & WINED3D_SWAPCHAIN_REGISTER_STATE) - wined3d_swapchain_state_register(state, wined3d); + wined3d_swapchain_state_register(state); return hr; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 7e96f874682..e1ed86e80ed 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -59,7 +59,6 @@ struct wined3d_window_hook struct wined3d_registered_swapchain_state { struct wined3d_swapchain_state *state; - struct wined3d *wined3d; DWORD thread_id; }; @@ -574,8 +573,8 @@ static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam) { - struct wined3d_registered_swapchain_state *registered_state; struct wined3d_swapchain_desc swapchain_desc; + struct wined3d_swapchain_state *state; struct wined3d_wndproc *entry; struct wined3d_output *output; MSG *msg = (MSG *)lparam; @@ -589,26 +588,25 @@ static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam for (i = 0; i < swapchain_state_table.state_count; ++i) { - registered_state = &swapchain_state_table.states[i]; + state = swapchain_state_table.states[i].state; - if (registered_state->state->device_window != msg->hwnd) + if (state->device_window != msg->hwnd) continue; - if ((entry = wined3d_find_wndproc(msg->hwnd, registered_state->wined3d)) + if ((entry = wined3d_find_wndproc(msg->hwnd, state->wined3d)) && (entry->flags & (WINED3D_REGISTER_WINDOW_NO_WINDOW_CHANGES | WINED3D_REGISTER_WINDOW_NO_ALT_ENTER))) continue; - swapchain_desc = registered_state->state->desc; + swapchain_desc = state->desc; swapchain_desc.windowed = !swapchain_desc.windowed; - if (!(output = wined3d_get_output_from_window(registered_state->wined3d, - registered_state->state->device_window))) + if (!(output = wined3d_get_output_from_window(state->wined3d, state->device_window))) { - ERR("Failed to get output from window %p.\n", registered_state->state->device_window); + ERR("Failed to get output from window %p.\n", state->device_window); break; } swapchain_desc.output = output; - wined3d_swapchain_state_set_fullscreen(registered_state->state, &swapchain_desc, NULL); + wined3d_swapchain_state_set_fullscreen(state, &swapchain_desc, NULL); wined3d_wndproc_mutex_unlock(); @@ -774,8 +772,7 @@ static struct wined3d_window_hook *wined3d_find_hook(DWORD thread_id) return NULL; } -void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, - struct wined3d *wined3d) +void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state) { struct wined3d_registered_swapchain_state *state_entry; struct wined3d_window_hook *hook; @@ -791,7 +788,6 @@ void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, state_entry = &swapchain_state_table.states[swapchain_state_table.state_count++]; state_entry->state = state; - state_entry->wined3d = wined3d; state_entry->thread_id = GetWindowThreadProcessId(state->device_window, NULL); if ((hook = wined3d_find_hook(state_entry->thread_id))) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6d7dcbc91dd..15380f5ac81 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5072,6 +5072,7 @@ void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_vie struct wined3d_swapchain_state { + struct wined3d *wined3d; struct wined3d_swapchain_desc desc; struct wined3d_swapchain_state_parent *parent; @@ -5085,8 +5086,7 @@ struct wined3d_swapchain_state }; void wined3d_swapchain_state_cleanup(struct wined3d_swapchain_state *state) DECLSPEC_HIDDEN; -void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state, - struct wined3d *wined3d) DECLSPEC_HIDDEN; +void wined3d_swapchain_state_register(struct wined3d_swapchain_state *state) DECLSPEC_HIDDEN; void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_state *state, HWND window, const RECT *window_rect) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state,

1 0

Daniel Lehman : tzres: Add Tocantins Standard Time Zone.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: a7634295d6a73fbbf51dbaf0e6faae673ba26312 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7634295d6a73fbbf51dbaf0… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Oct 29 07:07:43 2020 -0700 tzres: Add Tocantins Standard Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 ++ loader/wine.inf.in | 12 +++++++++ po/ar.po | 70 ++++++++++++++++++++++++++++++---------------------- po/ast.po | 70 ++++++++++++++++++++++++++++++---------------------- po/bg.po | 66 +++++++++++++++++++++++++++---------------------- po/ca.po | 70 ++++++++++++++++++++++++++++++---------------------- po/cs.po | 70 ++++++++++++++++++++++++++++++---------------------- po/da.po | 70 ++++++++++++++++++++++++++++++---------------------- po/de.po | 70 ++++++++++++++++++++++++++++++---------------------- po/el.po | 66 +++++++++++++++++++++++++++---------------------- po/en.po | 66 +++++++++++++++++++++++++++---------------------- po/en_US.po | 66 +++++++++++++++++++++++++++---------------------- po/eo.po | 70 ++++++++++++++++++++++++++++++---------------------- po/es.po | 70 ++++++++++++++++++++++++++++++---------------------- po/fa.po | 68 ++++++++++++++++++++++++++++---------------------- po/fi.po | 70 ++++++++++++++++++++++++++++++---------------------- po/fr.po | 70 ++++++++++++++++++++++++++++++---------------------- po/he.po | 70 ++++++++++++++++++++++++++++++---------------------- po/hi.po | 66 +++++++++++++++++++++++++++---------------------- po/hr.po | 70 ++++++++++++++++++++++++++++++---------------------- po/hu.po | 70 ++++++++++++++++++++++++++++++---------------------- po/it.po | 70 ++++++++++++++++++++++++++++++---------------------- po/ja.po | 70 ++++++++++++++++++++++++++++++---------------------- po/ko.po | 70 ++++++++++++++++++++++++++++++---------------------- po/lt.po | 70 ++++++++++++++++++++++++++++++---------------------- po/ml.po | 66 +++++++++++++++++++++++++++---------------------- po/nb_NO.po | 70 ++++++++++++++++++++++++++++++---------------------- po/nl.po | 70 ++++++++++++++++++++++++++++++---------------------- po/or.po | 66 +++++++++++++++++++++++++++---------------------- po/pa.po | 66 +++++++++++++++++++++++++++---------------------- po/pl.po | 70 ++++++++++++++++++++++++++++++---------------------- po/pt_BR.po | 70 ++++++++++++++++++++++++++++++---------------------- po/pt_PT.po | 70 ++++++++++++++++++++++++++++++---------------------- po/rm.po | 66 +++++++++++++++++++++++++++---------------------- po/ro.po | 70 ++++++++++++++++++++++++++++++---------------------- po/ru.po | 66 +++++++++++++++++++++++++++---------------------- po/si.po | 70 ++++++++++++++++++++++++++++++---------------------- po/sk.po | 70 ++++++++++++++++++++++++++++++---------------------- po/sl.po | 70 ++++++++++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 68 ++++++++++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 68 ++++++++++++++++++++++++++++---------------------- po/sv.po | 70 ++++++++++++++++++++++++++++++---------------------- po/ta.po | 66 +++++++++++++++++++++++++++---------------------- po/te.po | 66 +++++++++++++++++++++++++++---------------------- po/th.po | 68 ++++++++++++++++++++++++++++---------------------- po/tr.po | 70 ++++++++++++++++++++++++++++++---------------------- po/uk.po | 66 +++++++++++++++++++++++++++---------------------- po/wa.po | 68 ++++++++++++++++++++++++++++---------------------- po/wine.pot | 66 +++++++++++++++++++++++++++---------------------- po/zh_CN.po | 70 ++++++++++++++++++++++++++++++---------------------- po/zh_TW.po | 70 ++++++++++++++++++++++++++++++---------------------- 51 files changed, 1957 insertions(+), 1421 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7634295d6a73fbbf51d…

1 0

Hans Leidekker : wbemprox/tests: Test more sound device properties.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 488ec98bf2080370d023211d4319beb79d58cc69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=488ec98bf2080370d023211d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 29 13:15:49 2020 +0100 wbemprox/tests: Test more sound device properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 7ba55dffdfb..191b9f6c85a 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1745,10 +1745,13 @@ static void test_Win32_SoundDevice( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; + check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); + check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + check_property( obj, L"PNPDeviceID", VT_BSTR, CIM_STRING ); check_property( obj, L"ProductName", VT_BSTR, CIM_STRING ); + check_property( obj, L"Status", VT_BSTR, CIM_STRING ); check_property( obj, L"StatusInfo", VT_I4, CIM_UINT16 ); - check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); }

1 0

Huw Davies : riched20: Use cell ptrs in the append table row function.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 77895ecdde8bb4c54bb1ae6d688ed92292c81a4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=77895ecdde8bb4c54bb1ae6d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 29 10:49:12 2020 +0000 riched20: Use cell ptrs in the append table row function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/table.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 40eef4bbd13..cc2ebb8ed50 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -429,16 +429,14 @@ ME_Paragraph* table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) { WCHAR endl = '\r', tab = '\t'; ME_Run *run; - PARAFORMAT2 *pFmt; int i; - assert(table_row); if (!editor->bEmulateVersion10) /* v4.1 */ { - ME_DisplayItem *insertedCell, *cell; - ME_Paragraph *para, *prev_table_end; + ME_Cell *new_cell, *cell; + ME_Paragraph *para, *prev_table_end, *new_row_start; - cell = ME_FindItemFwd( para_get_di( table_row_start( table_row ) ), diCell ); + cell = table_row_first_cell( table_row ); prev_table_end = table_row_end( table_row ); para = para_next( prev_table_end ); run = para_first_run( para ); @@ -446,38 +444,37 @@ ME_Paragraph* table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) editor->pCursors[0].pRun = run_get_di( run ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; - para = table_insert_row_start( editor, editor->pCursors ); - insertedCell = ME_FindItemFwd( para_get_di( para ), diCell ); + new_row_start = table_insert_row_start( editor, editor->pCursors ); + new_cell = table_row_first_cell( new_row_start ); /* Copy cell properties */ - insertedCell->member.cell.nRightBoundary = cell->member.cell.nRightBoundary; - insertedCell->member.cell.border = cell->member.cell.border; - while (cell->member.cell.next_cell) + new_cell->nRightBoundary = cell->nRightBoundary; + new_cell->border = cell->border; + while (cell_next( cell )) { - cell = cell->member.cell.next_cell; + cell = cell_next( cell ); para = table_insert_cell( editor, editor->pCursors ); - insertedCell = ME_FindItemBack( para_get_di( para ), diCell ); + new_cell = para_cell( para ); /* Copy cell properties */ - insertedCell->member.cell.nRightBoundary = cell->member.cell.nRightBoundary; - insertedCell->member.cell.border = cell->member.cell.border; + new_cell->nRightBoundary = cell->nRightBoundary; + new_cell->border = cell->border; }; para = table_insert_row_end( editor, editor->pCursors ); para->fmt = prev_table_end->fmt; /* return the table row start for the inserted paragraph */ - return para_next( &ME_FindItemFwd( cell, diParagraph )->member.para ); + return new_row_start; } else /* v1.0 - 3.0 */ { run = para_end_run( table_row ); - pFmt = &table_row->fmt; - assert(pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE); + assert( para_in_table( table_row ) ); editor->pCursors[0].pPara = para_get_di( table_row ); editor->pCursors[0].pRun = run_get_di( run ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; ME_InsertTextFromCursor( editor, 0, &endl, 1, run->style ); run = &editor->pCursors[0].pRun->member.run; - for (i = 0; i < pFmt->cTabCount; i++) - ME_InsertTextFromCursor(editor, 0, &tab, 1, run->style); + for (i = 0; i < table_row->fmt.cTabCount; i++) + ME_InsertTextFromCursor( editor, 0, &tab, 1, run->style ); return para_next( table_row ); }

1 0

Hans Leidekker : msi/tests: Use wide character string literals.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 058ca3d04a4a712d86a111a1975045be02e03133 URL: https://source.winehq.org/git/wine.git/?a=commit;h=058ca3d04a4a712d86a111a1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 29 11:47:15 2020 +0100 msi/tests: Use wide character string literals. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/automation.c | 273 ++++++++++++++++++-------------------------- dlls/msi/tests/custom.c | 81 ++++++------- dlls/msi/tests/db.c | 75 ++++-------- dlls/msi/tests/install.c | 27 ++--- dlls/msi/tests/msi.c | 30 ++--- dlls/msi/tests/package.c | 124 +++++++++----------- dlls/msi/tests/patch.c | 15 +-- dlls/msi/tests/record.c | 7 +- dlls/msi/tests/suminfo.c | 3 +- 9 files changed, 250 insertions(+), 385 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=058ca3d04a4a712d86a1…

1 0

Huw Davies : riched20: Use para and run ptrs in the table deletion function.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 20b4a0355356d7f7f8ccf914560239c46387dfb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20b4a0355356d7f7f8ccf914… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 29 10:49:11 2020 +0000 riched20: Use para and run ptrs in the table deletion function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 7 ++- dlls/riched20/editor.h | 2 +- dlls/riched20/table.c | 136 +++++++++++++++++++++++-------------------------- 3 files changed, 67 insertions(+), 78 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 8af0f1de724..68bf40c76de 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -306,12 +306,11 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, if (!bForce) { - ME_ProtectPartialTableDeletion(editor, &c, &nChars); - if (nChars == 0) - return FALSE; + table_protect_partial_deletion( editor, &c, &nChars ); + if (nChars == 0) return FALSE; } - while(nChars > 0) + while (nChars > 0) { ME_Run *run; cursor_from_char_ofs( editor, nOfs + nChars, &c ); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index ddb6d138957..6e1c639236e 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -302,12 +302,12 @@ ME_Paragraph *table_insert_row_end( ME_TextEditor *editor, ME_Cursor *cursor ) D ME_Paragraph *table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Paragraph *table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_outer_para( ME_Paragraph *para ) DECLSPEC_HIDDEN; +void table_protect_partial_deletion( ME_TextEditor *editor, ME_Cursor *c, int *num_chars ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_end( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Cell *table_row_end_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Cell *table_row_first_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_start( ME_Paragraph *para ) DECLSPEC_HIDDEN; void ME_CheckTablesForCorruption(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, ME_Cursor *c, int *nChars) DECLSPEC_HIDDEN; void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) DECLSPEC_HIDDEN; void ME_MoveCursorFromTableRowStartParagraph(ME_TextEditor *editor) DECLSPEC_HIDDEN; struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 33e89a11771..40eef4bbd13 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -315,123 +315,113 @@ BOOL ME_IsInTable(ME_DisplayItem *pItem) } /* Table rows should either be deleted completely or not at all. */ -void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, ME_Cursor *c, int *nChars) +void table_protect_partial_deletion( ME_TextEditor *editor, ME_Cursor *c, int *num_chars ) { - int nOfs = ME_GetCursorOfs(c); + int start_ofs = ME_GetCursorOfs( c ); ME_Cursor c2 = *c; - ME_DisplayItem *this_para = c->pPara; - ME_DisplayItem *end_para; + ME_Paragraph *this_para = &c->pPara->member.para, *end_para; - ME_MoveCursorChars(editor, &c2, *nChars, FALSE); - end_para = c2.pPara; - if (c2.pRun->member.run.nFlags & MERF_ENDPARA) { + ME_MoveCursorChars( editor, &c2, *num_chars, FALSE ); + end_para = &c2.pPara->member.para; + if (c2.pRun->member.run.nFlags & MERF_ENDPARA) + { /* End offset might be in the middle of the end paragraph run. * If this is the case, then we need to use the next paragraph as the last * paragraphs. */ - int remaining = nOfs + *nChars - c2.pRun->member.run.nCharOfs - - end_para->member.para.nCharOfs; + int remaining = start_ofs + *num_chars - c2.pRun->member.run.nCharOfs - end_para->nCharOfs; if (remaining) { - assert(remaining < c2.pRun->member.run.len); - end_para = end_para->member.para.next_para; + assert( remaining < c2.pRun->member.run.len ); + end_para = para_next( end_para ); } } - if (!editor->bEmulateVersion10) { /* v4.1 */ - if (this_para->member.para.pCell != end_para->member.para.pCell || - ((this_para->member.para.nFlags|end_para->member.para.nFlags) - & (MEPF_ROWSTART|MEPF_ROWEND))) + if (!editor->bEmulateVersion10) /* v4.1 */ + { + if (para_cell( this_para ) != para_cell( end_para ) || + ((this_para->nFlags | end_para->nFlags) & (MEPF_ROWSTART | MEPF_ROWEND))) { while (this_para != end_para) { - ME_DisplayItem *next_para = this_para->member.para.next_para; - BOOL bTruancateDeletion = FALSE; - if (this_para->member.para.nFlags & MEPF_ROWSTART) { + ME_Paragraph *next_para = para_next( this_para ); + BOOL truancate_del = FALSE; + if (this_para->nFlags & MEPF_ROWSTART) + { /* The following while loop assumes that next_para is MEPF_ROWSTART, - * so moving back one paragraph let's it be processed as the start + * so moving back one paragraph lets it be processed as the start * of the row. */ next_para = this_para; - this_para = this_para->member.para.prev_para; - } else if (next_para->member.para.pCell != this_para->member.para.pCell - || this_para->member.para.nFlags & MEPF_ROWEND) + this_para = para_prev( this_para ); + } + else if (para_cell( next_para) != para_cell( this_para ) || this_para->nFlags & MEPF_ROWEND) { /* Start of the deletion from after the start of the table row. */ - bTruancateDeletion = TRUE; + truancate_del = TRUE; } - while (!bTruancateDeletion && - next_para->member.para.nFlags & MEPF_ROWSTART) + while (!truancate_del && next_para->nFlags & MEPF_ROWSTART) { - next_para = table_row_end( &next_para->member.para )->next_para; - if (next_para->member.para.nCharOfs > nOfs + *nChars) + next_para = para_next( table_row_end( next_para ) ); + if (next_para->nCharOfs > start_ofs + *num_chars) { /* End of deletion is not past the end of the table row. */ - next_para = this_para->member.para.next_para; + next_para = para_next( this_para ); /* Delete the end paragraph preceding the table row if the * preceding table row will be empty. */ - if (this_para->member.para.nCharOfs >= nOfs) - { - next_para = next_para->member.para.next_para; - } - bTruancateDeletion = TRUE; - } else { - this_para = next_para->member.para.prev_para; + if (this_para->nCharOfs >= start_ofs) next_para = para_next( next_para ); + truancate_del = TRUE; } + else this_para = para_prev( next_para ); } - if (bTruancateDeletion) + if (truancate_del) { - ME_Run *end_run = &ME_FindItemBack(next_para, diRun)->member.run; - int nCharsNew = (next_para->member.para.nCharOfs - nOfs - - end_run->len); - nCharsNew = max(nCharsNew, 0); - assert(nCharsNew <= *nChars); - *nChars = nCharsNew; + ME_Run *end_run = para_end_run( para_prev( next_para ) ); + int new_chars = next_para->nCharOfs - start_ofs - end_run->len; + new_chars = max( new_chars, 0 ); + assert( new_chars <= *num_chars); + *num_chars = new_chars; break; } this_para = next_para; } } - } else { /* v1.0 - 3.0 */ - ME_DisplayItem *pRun; - int nCharsToBoundary; + } + else /* v1.0 - 3.0 */ + { + ME_Run *run; + int chars_to_boundary; - if ((this_para->member.para.nCharOfs != nOfs || this_para == end_para) && - this_para->member.para.fmt.dwMask & PFM_TABLE && - this_para->member.para.fmt.wEffects & PFE_TABLE) + if ((this_para->nCharOfs != start_ofs || this_para == end_para) && para_in_table( this_para )) { - pRun = c->pRun; + run = &c->pRun->member.run; /* Find the next tab or end paragraph to use as a delete boundary */ - while (!(pRun->member.run.nFlags & (MERF_TAB|MERF_ENDPARA))) - pRun = ME_FindItemFwd(pRun, diRun); - nCharsToBoundary = pRun->member.run.nCharOfs - - c->pRun->member.run.nCharOfs - - c->nOffset; - *nChars = min(*nChars, nCharsToBoundary); - } else if (end_para->member.para.fmt.dwMask & PFM_TABLE && - end_para->member.para.fmt.wEffects & PFE_TABLE) + while (!(run->nFlags & (MERF_TAB | MERF_ENDPARA))) + run = run_next( run ); + chars_to_boundary = run->nCharOfs - c->pRun->member.run.nCharOfs - c->nOffset; + *num_chars = min( *num_chars, chars_to_boundary ); + } + else if (para_in_table( end_para )) { /* The deletion starts from before the row, so don't join it with * previous non-empty paragraphs. */ - ME_DisplayItem *curPara; - pRun = NULL; - if (nOfs > this_para->member.para.nCharOfs) { - pRun = ME_FindItemBack(end_para, diRun); - curPara = end_para->member.para.prev_para; + ME_Paragraph *cur_para; + run = NULL; + if (start_ofs > this_para->nCharOfs) + { + cur_para = para_prev( end_para ); + run = para_end_run( cur_para ); } - if (!pRun) { - pRun = ME_FindItemFwd(end_para, diRun); - curPara = end_para; + if (!run) + { + cur_para = end_para; + run = para_first_run( end_para ); } - if (pRun) + if (run) { - nCharsToBoundary = curPara->member.para.nCharOfs - + pRun->member.run.nCharOfs - - nOfs; - if (nCharsToBoundary >= 0) - *nChars = min(*nChars, nCharsToBoundary); + chars_to_boundary = cur_para->nCharOfs + run->nCharOfs - start_ofs; + if (chars_to_boundary >= 0) *num_chars = min( *num_chars, chars_to_boundary ); } } - if (*nChars < 0) - *nChars = 0; + if (*num_chars < 0) *num_chars = 0; } }

1 0

Alexandre Julliard : winebuild: Set PE timestamps to a hash of the file name.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: d5c089f5fa71e2ae568b2f1bcb9158223c552040 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5c089f5fa71e2ae568b2f1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 16:49:29 2020 +0100 winebuild: Set PE timestamps to a hash of the file name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44061 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index efb136a8e61..ba2edfb588f 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -51,6 +51,14 @@ int needs_get_pc_thunk = 0; static const char builtin_signature[32] = "Wine builtin DLL"; static const char fakedll_signature[32] = "Wine placeholder DLL"; +static unsigned int hash_filename( const char *name ) +{ + /* FNV-1 hash */ + unsigned int ret = 2166136261u; + while (*name) ret = (ret * 16777619) ^ *name++; + return ret; +} + /* check if entry point needs a relay thunk */ static inline int needs_relay( const ORDDEF *odp ) { @@ -405,7 +413,7 @@ void output_exports( DLLSPEC *spec ) /* export directory header */ output( "\t.long 0\n" ); /* Characteristics */ - output( "\t.long 0\n" ); /* TimeDateStamp */ + output( "\t.long %u\n", hash_filename(spec->file_name) ); /* TimeDateStamp */ output( "\t.long 0\n" ); /* MajorVersion/MinorVersion */ output_rva( ".L__wine_spec_exp_names" ); /* Name */ output( "\t.long %u\n", spec->base ); /* Base */ @@ -666,7 +674,7 @@ void output_module( DLLSPEC *spec ) output( "\t.short 0x%04x\n", /* Machine */ machine ); output( "\t.short 0\n" ); /* NumberOfSections */ - output( "\t.long 0\n" ); /* TimeDateStamp */ + output( "\t.long %u\n", hash_filename(spec->file_name) ); /* TimeDateStamp */ output( "\t.long 0\n" ); /* PointerToSymbolTable */ output( "\t.long 0\n" ); /* NumberOfSymbols */ output( "\t.short %d\n", /* SizeOfOptionalHeader */ @@ -817,7 +825,7 @@ void output_fake_module( DLLSPEC *spec ) case CPU_ARM64: put_word( IMAGE_FILE_MACHINE_ARM64 ); break; } put_word( nb_sections ); /* NumberOfSections */ - put_dword( 0 ); /* TimeDateStamp */ + put_dword( hash_filename(spec->file_name) ); /* TimeDateStamp */ put_dword( 0 ); /* PointerToSymbolTable */ put_dword( 0 ); /* NumberOfSymbols */ put_word( get_ptr_size() == 8 ?

1 0

Pengpeng Dong : wbemprox: Implement Win32_SoundDevice.{DeviceID, PNPDeviceID}.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 89698cfae4d9aefd3f77c2982e64f7b98e00edf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89698cfae4d9aefd3f77c298… Author: Pengpeng Dong <dongpengpeng(a)uniontech.com> Date: Thu Oct 29 13:15:48 2020 +0100 wbemprox: Implement Win32_SoundDevice.{DeviceID, PNPDeviceID}. Signed-off-by: Pengpeng Dong <dongpengpeng(a)uniontech.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 95 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 71 insertions(+), 24 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index e35aa069e1d..be22d8d3066 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -376,8 +376,10 @@ static const struct column col_sid[] = }; static const struct column col_sounddevice[] = { + { L"DeviceID", CIM_STRING }, { L"Manufacturer", CIM_STRING }, { L"Name", CIM_STRING }, + { L"PNPDeviceID", CIM_STRING }, { L"ProductName", CIM_STRING }, { L"Status", CIM_STRING }, { L"StatusInfo", CIM_UINT16 }, @@ -766,8 +768,10 @@ struct record_sid }; struct record_sounddevice { + const WCHAR *deviceid; const WCHAR *manufacturer; const WCHAR *name; + const WCHAR *pnpdeviceid; const WCHAR *productname; const WCHAR *status; UINT16 statusinfo; @@ -886,10 +890,7 @@ static const struct record_quickfixengineering data_quickfixengineering[] = { { L"http://winehq.org", L"KB1234567" }, }; -static const struct record_sounddevice data_sounddevice[] = -{ - { L"The Wine Project", L"Wine Audio Device", L"Wine Audio Device", L"OK", 3 /* enabled */ } -}; + static const struct record_stdregprov data_stdregprov[] = { { reg_create_key, reg_enum_key, reg_enum_values, reg_get_stringvalue } @@ -3830,7 +3831,7 @@ static enum fill_status fill_systemenclosure( struct table *table, const struct return status; } -static WCHAR *get_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) +static WCHAR *get_videocontroller_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) { static const WCHAR fmtW[] = L"PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X\\0&DEADBEEF&0&DEAD"; UINT len = sizeof(fmtW) + 2; @@ -3846,7 +3847,7 @@ static WCHAR *get_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) #define HW_VENDOR_VMWARE 0x15ad #define HW_VENDOR_INTEL 0x8086 -static const WCHAR *get_installeddriver( UINT vendorid ) +static const WCHAR *get_videocontroller_installeddriver( UINT vendorid ) { /* FIXME: wined3d has a better table, but we cannot access this information through dxgi */ @@ -3856,12 +3857,32 @@ static const WCHAR *get_installeddriver( UINT vendorid ) return L"wine.dll"; } +static BOOL get_dxgi_adapter_desc( DXGI_ADAPTER_DESC *desc ) +{ + IDXGIFactory *factory; + IDXGIAdapter *adapter; + HRESULT hr; + + memset( desc, 0, sizeof(*desc) ); + hr = CreateDXGIFactory( &IID_IDXGIFactory, (void **)&factory ); + if (FAILED( hr )) return FALSE; + + hr = IDXGIFactory_EnumAdapters( factory, 0, &adapter ); + if (FAILED( hr )) + { + IDXGIFactory_Release( factory ); + return FALSE; + } + + hr = IDXGIAdapter_GetDesc( adapter, desc ); + IDXGIAdapter_Release( adapter ); + IDXGIFactory_Release( factory ); + return SUCCEEDED( hr ); +} + static enum fill_status fill_videocontroller( struct table *table, const struct expr *cond ) { struct record_videocontroller *rec; - HRESULT hr; - IDXGIFactory *factory = NULL; - IDXGIAdapter *adapter = NULL; DXGI_ADAPTER_DESC desc; UINT row = 0, hres = 1024, vres = 768, vidmem = 512 * 1024 * 1024; const WCHAR *name = L"VideoController1"; @@ -3870,22 +3891,13 @@ static enum fill_status fill_videocontroller( struct table *table, const struct if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; - memset (&desc, 0, sizeof(desc)); - hr = CreateDXGIFactory( &IID_IDXGIFactory, (void **)&factory ); - if (FAILED(hr)) goto done; - - hr = IDXGIFactory_EnumAdapters( factory, 0, &adapter ); - if (FAILED(hr)) goto done; - - hr = IDXGIAdapter_GetDesc( adapter, &desc ); - if (SUCCEEDED(hr)) + if (get_dxgi_adapter_desc( &desc )) { if (desc.DedicatedVideoMemory > UINT_MAX) vidmem = 0xfff00000; else vidmem = desc.DedicatedVideoMemory; name = desc.Description; } -done: rec = (struct record_videocontroller *)table->data; rec->adapter_compatibility = L"(Standard display types)"; rec->adapter_dactype = L"Integrated RAMDAC"; @@ -3902,9 +3914,9 @@ done: rec->device_id = L"VideoController1"; rec->driverdate = L"20170101000000.000000+000"; rec->driverversion = L"1.0"; - rec->installeddriver = get_installeddriver( desc.VendorId ); + rec->installeddriver = get_videocontroller_installeddriver( desc.VendorId ); rec->name = heap_strdupW( name ); - rec->pnpdevice_id = get_pnpdeviceid( &desc ); + rec->pnpdevice_id = get_videocontroller_pnpdeviceid( &desc ); rec->status = L"OK"; rec->videoarchitecture = 2; /* Unknown */ rec->videomemorytype = 2; /* Unknown */ @@ -3916,9 +3928,44 @@ done: TRACE("created %u rows\n", row); table->num_rows = row; + return status; +} - if (adapter) IDXGIAdapter_Release( adapter ); - if (factory) IDXGIFactory_Release( factory ); +static WCHAR *get_sounddevice_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) +{ + static const WCHAR fmtW[] = L"HDAUDIO\\FUNC_01&VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%04X\\0&DEADBEEF&0&DEAD"; + UINT len = sizeof(fmtW) + 2; + WCHAR *ret; + + if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; + swprintf( ret, len, fmtW, desc->VendorId, desc->DeviceId, desc->SubSysId, desc->Revision ); + return ret; +} + +static enum fill_status fill_sounddevice( struct table *table, const struct expr *cond ) +{ + struct record_sounddevice *rec; + DXGI_ADAPTER_DESC desc; + UINT row = 0; + enum fill_status status = FILL_STATUS_UNFILTERED; + + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + + get_dxgi_adapter_desc( &desc ); + + rec = (struct record_sounddevice *)table->data; + rec->deviceid = get_sounddevice_pnpdeviceid( &desc ); + rec->manufacturer = L"The Wine Project"; + rec->name = L"Wine Audio Device"; + rec->pnpdeviceid = get_sounddevice_pnpdeviceid( &desc ); + rec->productname = L"Wine Audio Device"; + rec->status = L"OK"; + rec->statusinfo = 3; + if (!match_row( table, row, cond, &status )) free_row_values( table, row ); + else row++; + + TRACE("created %u rows\n", row); + table->num_rows = row; return status; } @@ -3960,7 +4007,7 @@ static struct table builtin_classes[] = { L"Win32_QuickFixEngineering", C(col_quickfixengineering), D(data_quickfixengineering) }, { L"Win32_SID", C(col_sid), 0, 0, NULL, fill_sid }, { L"Win32_Service", C(col_service), 0, 0, NULL, fill_service }, - { L"Win32_SoundDevice", C(col_sounddevice), D(data_sounddevice) }, + { L"Win32_SoundDevice", C(col_sounddevice), 0, 0, NULL, fill_sounddevice }, { L"Win32_SystemEnclosure", C(col_systemenclosure), 0, 0, NULL, fill_systemenclosure }, { L"Win32_VideoController", C(col_videocontroller), 0, 0, NULL, fill_videocontroller }, { L"Win32_WinSAT", C(col_winsat), D(data_winsat) },

1 0

Huw Davies : riched20: Remove the table corruption check function.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: f2d770d4913e19136c553f5bd638a9380ea68541 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2d770d4913e19136c553f5b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 29 10:49:15 2020 +0000 riched20: Remove the table corruption check function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 3 -- dlls/riched20/editor.h | 1 - dlls/riched20/table.c | 89 -------------------------------------------------- dlls/riched20/undo.c | 2 -- 4 files changed, 95 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 797eb27b6b9..d1667dc9176 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1735,7 +1735,6 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if (parser.tableDef) parser.tableDef->row_start = NULL; } } - ME_CheckTablesForCorruption(editor); RTFDestroy(&parser); if (parser.stackTop > 0) @@ -2515,7 +2514,6 @@ static BOOL handle_enter(ME_TextEditor *editor) editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; ME_CommitUndo(editor); - ME_CheckTablesForCorruption(editor); ME_UpdateRepaint(editor, FALSE); return TRUE; } @@ -2541,7 +2539,6 @@ static BOOL handle_enter(ME_TextEditor *editor) editor->pCursors[1] = editor->pCursors[0]; para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; ME_CommitCoalescingUndo(editor); - ME_CheckTablesForCorruption(editor); ME_UpdateRepaint(editor, FALSE); return TRUE; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index b8916bc4ff3..5f93aa39db9 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -309,7 +309,6 @@ ME_Paragraph *table_row_end( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Cell *table_row_end_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Cell *table_row_first_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_start( ME_Paragraph *para ) DECLSPEC_HIDDEN; -void ME_CheckTablesForCorruption(ME_TextEditor *editor) DECLSPEC_HIDDEN; struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_InitTableDef(ME_TextEditor *editor, struct RTFTable *tableDef) DECLSPEC_HIDDEN; static inline ME_DisplayItem *cell_get_di(ME_Cell *cell) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index c262d190b79..e08876d29bd 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -54,8 +54,6 @@ #include "editor.h" #include "rtf.h" -WINE_DEFAULT_DEBUG_CHANNEL(richedit_lists); - static const WCHAR cr_lf[] = {'\r', '\n', 0}; static ME_Paragraph* table_insert_end_para( ME_TextEditor *editor, ME_Cursor *cursor, @@ -214,93 +212,6 @@ ME_Paragraph *cell_end_para( ME_Cell *cell ) return &ME_FindItemBack( cell_get_di( next ), diParagraph )->member.para; } -/* Make a bunch of assertions to make sure tables haven't been corrupted. - * - * These invariants may not hold true in the middle of streaming in rich text - * or during an undo and redo of streaming in rich text. It should be safe to - * call this method after an event is processed. - */ -void ME_CheckTablesForCorruption(ME_TextEditor *editor) -{ - if(TRACE_ON(richedit_lists)) - { - TRACE("---\n"); - ME_DumpDocument(editor->pBuffer); - } -#ifndef NDEBUG - { - ME_DisplayItem *p, *pPrev; - pPrev = editor->pBuffer->pFirst; - p = pPrev->next; - if (!editor->bEmulateVersion10) /* v4.1 */ - { - while (p->type == diParagraph) - { - assert(p->member.para.fmt.dwMask & PFM_TABLE); - assert(p->member.para.fmt.dwMask & PFM_TABLEROWDELIMITER); - if (p->member.para.pCell) - { - assert(p->member.para.nFlags & MEPF_CELL); - assert(p->member.para.fmt.wEffects & PFE_TABLE); - } - if (p->member.para.pCell != pPrev->member.para.pCell) - { - /* There must be a diCell in between the paragraphs if pCell changes. */ - ME_DisplayItem *pCell = ME_FindItemBack(p, diCell); - assert(pCell); - assert(ME_FindItemBack(p, diRun) == ME_FindItemBack(pCell, diRun)); - } - if (p->member.para.nFlags & MEPF_ROWEND) - { - /* ROWEND must come after a cell. */ - assert(pPrev->member.para.pCell); - assert(p->member.para.pCell - == pPrev->member.para.pCell->member.cell.parent_cell); - assert(p->member.para.fmt.wEffects & PFE_TABLEROWDELIMITER); - } - else if (p->member.para.pCell) - { - assert(!(p->member.para.fmt.wEffects & PFE_TABLEROWDELIMITER)); - assert(pPrev->member.para.pCell || - pPrev->member.para.nFlags & MEPF_ROWSTART); - if (pPrev->member.para.pCell && - !(pPrev->member.para.nFlags & MEPF_ROWSTART)) - { - assert(p->member.para.pCell->member.cell.parent_cell - == pPrev->member.para.pCell->member.cell.parent_cell); - if (pPrev->member.para.pCell != p->member.para.pCell) - assert(pPrev->member.para.pCell - == p->member.para.pCell->member.cell.prev_cell); - } - } - else if (!(p->member.para.nFlags & MEPF_ROWSTART)) - { - assert(!(p->member.para.fmt.wEffects & PFE_TABLEROWDELIMITER)); - /* ROWSTART must be followed by a cell. */ - assert(!(p->member.para.nFlags & MEPF_CELL)); - /* ROWSTART must be followed by a cell. */ - assert(!(pPrev->member.para.nFlags & MEPF_ROWSTART)); - } - pPrev = p; - p = p->member.para.next_para; - } - } else { /* v1.0 - 3.0 */ - while (p->type == diParagraph) - { - assert(!(p->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND|MEPF_CELL))); - assert(p->member.para.fmt.dwMask & PFM_TABLE); - assert(!(p->member.para.fmt.wEffects & PFE_TABLEROWDELIMITER)); - assert(!p->member.para.pCell); - p = p->member.para.next_para; - } - return; - } - assert(p->type == diTextEnd); - assert(!pPrev->member.para.pCell); - } -#endif -} - BOOL ME_IsInTable(ME_DisplayItem *pItem) { PARAFORMAT2 *pFmt; diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index fe0a4f721cd..884f87b56fd 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -440,7 +440,6 @@ BOOL ME_Undo(ME_TextEditor *editor) table_move_from_row_start( editor ); add_undo( editor, undo_end_transaction ); - ME_CheckTablesForCorruption(editor); editor->nUndoStackSize--; editor->nUndoMode = nMode; ME_UpdateRepaint(editor, FALSE); @@ -477,7 +476,6 @@ BOOL ME_Redo(ME_TextEditor *editor) } table_move_from_row_start( editor ); add_undo( editor, undo_end_transaction ); - ME_CheckTablesForCorruption(editor); editor->nUndoMode = nMode; ME_UpdateRepaint(editor, FALSE); return TRUE;

1 0

Huw Davies : riched20: Use paragraph ptrs in the table move from row start function.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 3ba419081a5413472aed0c6cdc1a79abf3ce9802 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ba419081a5413472aed0c6c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 29 10:49:14 2020 +0000 riched20: Use paragraph ptrs in the table move from row start function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 2 +- dlls/riched20/table.c | 15 ++++++++------- dlls/riched20/undo.c | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7687ec9d93e..797eb27b6b9 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2690,7 +2690,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) } else return TRUE; - ME_MoveCursorFromTableRowStartParagraph(editor); + table_move_from_row_start( editor ); ME_UpdateSelectionLinkAttribute(editor); ME_UpdateRepaint(editor, FALSE); ME_SendRequestResize(editor, FALSE); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index a49883c9861..b8916bc4ff3 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -302,6 +302,7 @@ ME_Paragraph *table_insert_cell( ME_TextEditor *editor, ME_Cursor *cursor ) DECL ME_Paragraph *table_insert_row_end( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Paragraph *table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Paragraph *table_insert_row_start_at_para( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; +void table_move_from_row_start( ME_TextEditor *editor ) DECLSPEC_HIDDEN; ME_Paragraph *table_outer_para( ME_Paragraph *para ) DECLSPEC_HIDDEN; void table_protect_partial_deletion( ME_TextEditor *editor, ME_Cursor *c, int *num_chars ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_end( ME_Paragraph *para ) DECLSPEC_HIDDEN; @@ -309,7 +310,6 @@ ME_Cell *table_row_end_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Cell *table_row_first_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_start( ME_Paragraph *para ) DECLSPEC_HIDDEN; void ME_CheckTablesForCorruption(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_MoveCursorFromTableRowStartParagraph(ME_TextEditor *editor) DECLSPEC_HIDDEN; struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_InitTableDef(ME_TextEditor *editor, struct RTFTable *tableDef) DECLSPEC_HIDDEN; static inline ME_DisplayItem *cell_get_di(ME_Cell *cell) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 25c4e1820ce..c262d190b79 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -629,16 +629,17 @@ void table_handle_tab( ME_TextEditor *editor, BOOL selected_row ) /* Make sure the cursor is not in the hidden table row start paragraph * without a selection. */ -void ME_MoveCursorFromTableRowStartParagraph(ME_TextEditor *editor) +void table_move_from_row_start( ME_TextEditor *editor ) { - ME_DisplayItem *para = editor->pCursors[0].pPara; - if (para == editor->pCursors[1].pPara && - para->member.para.nFlags & MEPF_ROWSTART) { + ME_Paragraph *para = &editor->pCursors[0].pPara->member.para; + + if (para == &editor->pCursors[1].pPara->member.para && para->nFlags & MEPF_ROWSTART) + { /* The cursors should not be at the hidden start row paragraph without * a selection, so the cursor is moved into the first cell. */ - para = para->member.para.next_para; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + para = para_next( para ); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; } diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index d9c5d28d6dc..fe0a4f721cd 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -438,7 +438,7 @@ BOOL ME_Undo(ME_TextEditor *editor) destroy_undo_item( undo ); } - ME_MoveCursorFromTableRowStartParagraph(editor); + table_move_from_row_start( editor ); add_undo( editor, undo_end_transaction ); ME_CheckTablesForCorruption(editor); editor->nUndoStackSize--; @@ -475,7 +475,7 @@ BOOL ME_Redo(ME_TextEditor *editor) list_remove( &undo->entry ); destroy_undo_item( undo ); } - ME_MoveCursorFromTableRowStartParagraph(editor); + table_move_from_row_start( editor ); add_undo( editor, undo_end_transaction ); ME_CheckTablesForCorruption(editor); editor->nUndoMode = nMode;

1 0

Huw Davies : riched20: Use cell ptrs in the table tab handler.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 963075706d6fcd23b9a0064ae46a210df9a4a005 URL: https://source.winehq.org/git/wine.git/?a=commit;h=963075706d6fcd23b9a0064a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 29 10:49:13 2020 +0000 riched20: Use cell ptrs in the table tab handler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 6 +-- dlls/riched20/editor.h | 2 +- dlls/riched20/table.c | 104 +++++++++++++++++++++++-------------------------- 3 files changed, 52 insertions(+), 60 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d06693232ab..7687ec9d93e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2799,7 +2799,7 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, !(ctrl_is_down && !editor->bEmulateVersion10)) { ME_DisplayItem *para; - BOOL bSelectedRow = FALSE; + BOOL selected_row = FALSE; para = cursor.pPara; if (ME_IsSelection(editor) && @@ -2808,11 +2808,11 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, para->member.para.prev_para->type == diParagraph) { para = para->member.para.prev_para; - bSelectedRow = TRUE; + selected_row = TRUE; } if (ME_IsInTable(para)) { - ME_TabPressedInTable(editor, bSelectedRow); + table_handle_tab( editor, selected_row ); ME_CommitUndo(editor); return 0; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 6e1c639236e..a49883c9861 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -297,6 +297,7 @@ ME_Paragraph *cell_first_para( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Cell *cell_next( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Cell *cell_prev( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Paragraph *table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) DECLSPEC_HIDDEN; +void table_handle_tab( ME_TextEditor *editor, BOOL selected_row ) DECLSPEC_HIDDEN; ME_Paragraph *table_insert_cell( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Paragraph *table_insert_row_end( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Paragraph *table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; @@ -308,7 +309,6 @@ ME_Cell *table_row_end_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Cell *table_row_first_cell( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_start( ME_Paragraph *para ) DECLSPEC_HIDDEN; void ME_CheckTablesForCorruption(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) DECLSPEC_HIDDEN; void ME_MoveCursorFromTableRowStartParagraph(ME_TextEditor *editor) DECLSPEC_HIDDEN; struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_InitTableDef(ME_TextEditor *editor, struct RTFTable *tableDef) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index cc2ebb8ed50..25c4e1820ce 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -481,30 +481,27 @@ ME_Paragraph* table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) } /* Selects the next table cell or appends a new table row if at end of table */ -static void ME_SelectOrInsertNextCell( ME_TextEditor *editor, ME_DisplayItem *run ) +static void table_select_next_cell_or_append( ME_TextEditor *editor, ME_Run *run ) { - ME_Paragraph *para = run->member.run.para; + ME_Paragraph *para = run->para; + ME_Cell *cell; int i; - assert(run && run->type == diRun); - assert(ME_IsInTable(run)); + assert( para_in_table( para ) ); if (!editor->bEmulateVersion10) /* v4.1 */ { - ME_DisplayItem *cell; /* Get the initial cell */ - if (para->nFlags & MEPF_ROWSTART) cell = para_next( para )->pCell; - else if (para->nFlags & MEPF_ROWEND) cell = para_prev( para )->pCell; - else cell = para->pCell; - assert(cell); + if (para->nFlags & MEPF_ROWSTART) cell = para_cell( para_next( para ) ); + else if (para->nFlags & MEPF_ROWEND) cell = para_cell( para_prev( para ) ); + else cell = para_cell( para ); /* Get the next cell. */ - if (cell->member.cell.next_cell && - cell->member.cell.next_cell->member.cell.next_cell) + if (cell_next( cell ) && cell_next( cell_next( cell ) )) + cell = cell_next( cell ); + else { - cell = cell->member.cell.next_cell; - } else { - para = para_next( table_row_end( &ME_FindItemFwd( cell, diParagraph )->member.para ) ); - if (para->nFlags & MEPF_ROWSTART) cell = para_next( para )->pCell; + para = para_next( table_row_end( para ) ); + if (para->nFlags & MEPF_ROWSTART) cell = para_cell( para_next( para ) ); else { /* Insert row */ @@ -521,38 +518,32 @@ static void ME_SelectOrInsertNextCell( ME_TextEditor *editor, ME_DisplayItem *ru } } /* Select cell */ - editor->pCursors[1].pRun = ME_FindItemFwd(cell, diRun); - editor->pCursors[1].pPara = ME_GetParagraph(editor->pCursors[1].pRun); + editor->pCursors[1].pPara = para_get_di( cell_first_para( cell ) ); + editor->pCursors[1].pRun = run_get_di( para_first_run( &editor->pCursors[1].pPara->member.para ) ); editor->pCursors[1].nOffset = 0; - assert(editor->pCursors[0].pRun); - cell = cell->member.cell.next_cell; - editor->pCursors[0].pRun = ME_FindItemBack(cell, diRun); - editor->pCursors[0].pPara = ME_GetParagraph(editor->pCursors[0].pRun); + editor->pCursors[0].pPara = para_get_di( cell_end_para( cell ) ); + editor->pCursors[0].pRun = run_get_di( para_end_run( &editor->pCursors[0].pPara->member.para ) ); editor->pCursors[0].nOffset = 0; - assert(editor->pCursors[1].pRun); } else /* v1.0 - 3.0 */ { - if (run->member.run.nFlags & MERF_ENDPARA && - ME_IsInTable(ME_FindItemFwd(run, diParagraphOrEnd))) + if (run->nFlags & MERF_ENDPARA && para_in_table( para_next( para ) )) { - run = ME_FindItemFwd(run, diRun); + run = run_next_all_paras( run ); assert(run); } for (i = 0; i < 2; i++) { - while (!(run->member.run.nFlags & MERF_TAB)) + while (!(run->nFlags & MERF_TAB)) { - run = ME_FindItemFwd(run, diRunOrParagraphOrEnd); - if (run->type != diRun) + if (!run_next( run )) { - para = &run->member.para; + para = para_next( run->para ); if (para_in_table( para )) { - run = run_get_di( para_first_run( para ) ); - assert(run); + run = para_first_run( para ); editor->pCursors[0].pPara = para_get_di( para ); - editor->pCursors[0].pRun = run; + editor->pCursors[0].pRun = run_get_di( run ); editor->pCursors[0].nOffset = 0; i = 1; } @@ -569,18 +560,18 @@ static void ME_SelectOrInsertNextCell( ME_TextEditor *editor, ME_DisplayItem *ru return; } } + else run = run_next( run ); } - if (i == 0) - run = ME_FindItemFwd(run, diRun); - editor->pCursors[i].pRun = run; - editor->pCursors[i].pPara = ME_GetParagraph(run); + if (i == 0) run = run_next_all_paras( run ); + editor->pCursors[i].pRun = run_get_di( run ); + editor->pCursors[i].pPara = para_get_di( run->para ); editor->pCursors[i].nOffset = 0; } } } -void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) +void table_handle_tab( ME_TextEditor *editor, BOOL selected_row ) { /* FIXME: Shift tab should move to the previous cell. */ ME_Cursor fromCursor, toCursor; @@ -593,7 +584,9 @@ void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) { fromCursor = editor->pCursors[0]; toCursor = editor->pCursors[1]; - } else { + } + else + { fromCursor = editor->pCursors[1]; toCursor = editor->pCursors[0]; } @@ -604,29 +597,28 @@ void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) { editor->pCursors[0] = toCursor; editor->pCursors[1] = toCursor; - } else { - ME_SelectOrInsertNextCell(editor, toCursor.pRun); } - } else { /* v1.0 - 3.0 */ - if (!ME_IsInTable(fromCursor.pRun)) { + else table_select_next_cell_or_append( editor, &toCursor.pRun->member.run ); + } + else /* v1.0 - 3.0 */ + { + if (!ME_IsInTable(fromCursor.pRun)) + { editor->pCursors[0] = fromCursor; editor->pCursors[1] = fromCursor; /* FIXME: For some reason the caret is shown at the start of the * previous paragraph in v1.0 to v3.0 */ - } else if ((bSelectedRow || !ME_IsInTable(toCursor.pRun))) { - ME_SelectOrInsertNextCell(editor, fromCursor.pRun); - } else { - if (ME_IsSelection(editor) && !toCursor.nOffset) - { - ME_DisplayItem *run; - run = ME_FindItemBack(toCursor.pRun, diRunOrParagraphOrEnd); - if (run->type == diRun && run->member.run.nFlags & MERF_TAB) - ME_SelectOrInsertNextCell(editor, run); - else - ME_SelectOrInsertNextCell(editor, toCursor.pRun); - } else { - ME_SelectOrInsertNextCell(editor, toCursor.pRun); - } + } + else if ((selected_row || !para_in_table( &toCursor.pPara->member.para ))) + table_select_next_cell_or_append( editor, &fromCursor.pRun->member.run ); + else + { + ME_Run *run = run_prev( &toCursor.pRun->member.run ); + + if (ME_IsSelection(editor) && !toCursor.nOffset && run && run->nFlags & MERF_TAB) + table_select_next_cell_or_append( editor, run ); + else + table_select_next_cell_or_append( editor, &toCursor.pRun->member.run ); } } ME_InvalidateSelection(editor);

1 0

Hans Leidekker : msi: Use wide character string literals in the remaining files.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: c4fc91f4bf0ffdc4a7dc2e582e5bd3fddca85222 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4fc91f4bf0ffdc4a7dc2e58… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 29 11:47:14 2020 +0100 msi: Use wide character string literals in the remaining files. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/appsearch.c | 101 ++++++++------------------- dlls/msi/assembly.c | 100 +++++++-------------------- dlls/msi/automation.c | 20 ++---- dlls/msi/cond.y | 75 +++++++++----------- dlls/msi/custom.c | 97 +++++++++----------------- dlls/msi/database.c | 187 ++++++++++++++++---------------------------------- dlls/msi/delete.c | 2 +- dlls/msi/distinct.c | 2 +- dlls/msi/files.c | 51 +++++--------- dlls/msi/font.c | 43 ++++-------- dlls/msi/format.c | 7 +- dlls/msi/install.c | 41 ++++++----- dlls/msi/media.c | 23 ++----- dlls/msi/msi.c | 8 +-- dlls/msi/msipriv.h | 105 ---------------------------- dlls/msi/msiquery.c | 22 +++--- dlls/msi/patch.c | 107 +++++++++-------------------- dlls/msi/record.c | 5 +- dlls/msi/script.c | 12 ++-- dlls/msi/select.c | 8 +-- dlls/msi/source.c | 72 ++++++++----------- dlls/msi/sql.y | 3 +- dlls/msi/storages.c | 6 +- dlls/msi/streams.c | 8 +-- dlls/msi/string.c | 18 ++--- dlls/msi/suminfo.c | 29 ++++---- dlls/msi/table.c | 111 +++++++++++++----------------- dlls/msi/upgrade.c | 19 +++-- dlls/msi/where.c | 2 +- 29 files changed, 420 insertions(+), 864 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c4fc91f4bf0ffdc4a7dc…

1 0

Nikolay Sivov : include: Add IMFVideoSampleAllocatorEx.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 99c1f2a0a8f3aa60728acc239e11dad669dd0bf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99c1f2a0a8f3aa60728acc23… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 29 18:03:11 2020 +0300 include: Add IMFVideoSampleAllocatorEx. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 9f2d825bd5f..dd5de8d0d2f 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1147,6 +1147,22 @@ interface IMFVideoSampleAllocatorCallback : IUnknown ); } +[ + object, + uuid(545b3a48-3283-4f62-866f-a62d8f598f9f), + local, + pointer_default(unique) +] +interface IMFVideoSampleAllocatorEx : IMFVideoSampleAllocator +{ + HRESULT InitializeSampleAllocatorEx( + DWORD initial_sample_count, + DWORD max_sample_count, + IMFAttributes *attributes, + IMFMediaType *media_type + ); +} + enum { MF_ACTIVATE_CUSTOM_MIXER_ALLOWFAIL = 0x00000001,

1 0

Nikolay Sivov : evr/tests: Add sample allocator test with surface-backed buffers.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 7aad298f7158e5b5f79a37c29626afc5b84ed784 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aad298f7158e5b5f79a37c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 29 18:03:25 2020 +0300 evr/tests: Add sample allocator test with surface-backed buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 116 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 89 insertions(+), 27 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index fbcf798157e..e4f45396ae8 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1302,13 +1302,19 @@ static void test_MFCreateVideoSampleAllocator(void) IMFVideoSampleAllocatorCallback *allocator_cb; IMFMediaType *media_type, *video_type; IMFVideoSampleAllocator *allocator; + IDirect3DDeviceManager9 *manager; IMFSample *sample, *sample2; IDirect3DSurface9 *surface; + IDirect3DDevice9 *device; IMFMediaBuffer *buffer; + unsigned int token; IMFGetService *gs; + IDirect3D9 *d3d; IUnknown *unk; + HWND window; HRESULT hr; LONG count; + BYTE *data; hr = MFCreateVideoSampleAllocator(&IID_IUnknown, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -1387,48 +1393,104 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(count == 4, "Unexpected count %d.\n", count); - if (sample) - { - hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); - hr = IMFSample_QueryInterface(sample, &IID_IMFTrackedSample, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + hr = IMFSample_QueryInterface(sample, &IID_IMFTrackedSample, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); - hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&gs); - ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#x.\n", hr); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&gs); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#x.\n", hr); - /* Device manager wasn't set, sample gets regular memory buffers. */ - if (SUCCEEDED(hr)) - { - hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); - ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); - IMFGetService_Release(gs); - } + /* Device manager wasn't set, sample gets regular memory buffers. */ + if (SUCCEEDED(hr)) + { + hr = IMFGetService_GetService(gs, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + IMFGetService_Release(gs); + } - hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); - IMFMediaBuffer_Release(buffer); + IMFMediaBuffer_Release(buffer); - IMFSample_Release(sample); - } + IMFSample_Release(sample); IMFVideoSampleAllocatorCallback_Release(allocator_cb); - IMFMediaType_Release(media_type); - IMFVideoSampleAllocator_Release(allocator); hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocatorCallback, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); + + /* Using device manager */ + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); + ok(hr == S_OK, "Failed to set a device, hr %#x.\n", hr); + + hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_SetDirectXManager(allocator, (IUnknown *)manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64) 320 << 32 | 240); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 0, video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFSample_GetBufferByIndex(sample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFGetService((IUnknown *)buffer, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&surface); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IDirect3DSurface9_Release(surface); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&unk); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); + + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFSample_Release(sample); + + IMFVideoSampleAllocator_Release(allocator); + + IMFMediaType_Release(media_type); + IDirect3DDeviceManager9_Release(manager); + IDirect3DDevice9_Release(device); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } struct test_host

1 0

Alexandre Julliard : gdi32: Add a helper to get the FreeType face and cleanup private data.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 402281b66862108bedaeb556c6efcbaf724388ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=402281b66862108bedaeb556… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 14:53:18 2020 +0100 gdi32: Add a helper to get the FreeType face and cleanup private data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 345 ++++++++++++++++++++++++-------------------------- 1 file changed, 167 insertions(+), 178 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=402281b66862108bedae…

1 0

Georg Lehmann : winevulkan: Implement VK_EXT_debug_report.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 28d75542b728fdc44e4bd4e4ab6bd74e9f9ffd23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28d75542b728fdc44e4bd4e4… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Oct 27 21:18:54 2020 +0100 winevulkan: Implement VK_EXT_debug_report. Messages from the driver/layers won't be reported twice. Messages during instance creation by the host loader won't be reported, since the information is partly wrong and the windows loader reports the correct information. Other messages by the loader will be reported twice if lunarg's vulkan-1.dll is used. This shouldn't be a problem because the messages are just used for logging/debugging. Needed for Quake2RTX. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49813 Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 14 +++--- dlls/winevulkan/vulkan.c | 105 ++++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_private.h | 26 ++++++++++ dlls/winevulkan/vulkan_thunks.c | 25 ++++++++++ dlls/winevulkan/vulkan_thunks.h | 9 ++++ include/wine/vulkan.h | 86 ++++++++++++++++++++++++++++++++ 6 files changed, 258 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=28d75542b728fdc44e4b…

1 0

Alexandre Julliard : gdi32: Store child font objects directly on the child font list.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 54bdbd3c03262868c51cf4bab4a524ea054ace2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=54bdbd3c03262868c51cf4ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 14:44:25 2020 +0100 gdi32: Store child font objects directly on the child font list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 13 ++-- dlls/gdi32/freetype.c | 167 ++++++++++++++++------------------------------- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 66 insertions(+), 116 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54bdbd3c03262868c51c…

1 0

Alexandre Julliard : gdi32: Move the GSUB table support out of freetype.c.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 8631506270ab116c6aecabe8a3159ba7d23edd67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8631506270ab116c6aecabe8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 11:10:30 2020 +0100 gdi32: Move the GSUB table support out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 336 +++++++++++++++++++++++++++++++++++++++- dlls/gdi32/freetype.c | 388 ++--------------------------------------------- dlls/gdi32/gdi_private.h | 5 + 3 files changed, 353 insertions(+), 376 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8631506270ab116c6aec…

1 0

Georg Lehmann : winevulkan: Don't use comments for object types.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 44500d3cfc288fb5afb14061cae58cc9c32de867 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44500d3cfc288fb5afb14061… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Oct 27 22:02:46 2020 +0100 winevulkan: Don't use comments for object types. We shouldn't do that according to the Vulkan xml maintainer. https://github.com/KhronosGroup/Vulkan-Docs/pull/1379 Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 7e5bd030867..771efe8f5bb 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2739,21 +2739,16 @@ class VkRegistry(object): def _match_object_types(self): """ Matches each handle with the correct object type. """ - for handle in self.handles: - if not handle.is_required() or handle.is_alias(): - continue - for value in self.enums["VkObjectType"].values: - if value.comment == handle.name: - handle.object_type = value.name - break - else: - LOGGER.warning("No object type found for {}".format(handle.name)) + # Use upper case comparison for simplicity. + object_types = {} + for value in self.enums["VkObjectType"].values: + object_name = "VK" + value.name[len("VK_OBJECT_TYPE"):].replace("_", "") + object_types[object_name] = value.name for handle in self.handles: - if not handle.is_required() or not handle.is_alias(): + if not handle.is_required(): continue - # Use the object type of the alias - handle.object_type = handle.alias.object_type + handle.object_type = object_types.get(handle.name.upper()) if not handle.object_type: LOGGER.warning("No object type found for {}".format(handle.name))

1 0

Daniel Lehman : wine.inf: Fix SA Eastern Standard Time Zone info.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 0bc752f30d79ac40b7c2588c72257ed06499cd24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bc752f30d79ac40b7c2588c… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Oct 28 21:44:44 2020 -0700 wine.inf: Fix SA Eastern Standard Time Zone info. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index fba071fe0d8..72b10d354e0 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3491,7 +3491,7 @@ HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"Dlt",,"SA Eastern D HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"MUI_Dlt",,"@tzres.dll,-40657" HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"MUI_Std",,"@tzres.dll,-40656" HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"Std",,"SA Eastern Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,03,00,00,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\SA Eastern Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"Display",,"America/Bogota" HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"Dlt",,"SA Pacific Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\SA Pacific Standard Time,"MUI_Dlt",,"@tzres.dll,-49425"

1 0

Alexandre Julliard : gdi32: Move the glyph index mapping for GetGlyphOutline() out of freetype.c.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 044315c0b3890676d9fd751d8191b0b7381e0b97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=044315c0b3890676d9fd751d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 14:47:18 2020 +0100 gdi32: Move the glyph index mapping for GetGlyphOutline() out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 155 +++++++++++++++++++++--- dlls/gdi32/freetype.c | 306 +++++++++-------------------------------------- dlls/gdi32/gdi_private.h | 10 +- 3 files changed, 198 insertions(+), 273 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=044315c0b3890676d9fd…

1 0

Georg Lehmann : winevulkan: Remove comment from VkEnumValue.
by Alexandre Julliard Oct. 29, 2020

Oct. 29, 2020

Module: wine Branch: master Commit: 4a213cae61ddb16123f94dc1b8c79e45969c4c5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a213cae61ddb16123f94dc1… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Oct 27 22:02:47 2020 +0100 winevulkan: Remove comment from VkEnumValue. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 771efe8f5bb..edd56526d58 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -380,21 +380,20 @@ class VkEnum(object): # Value is either a value or a bitpos, only one can exist. value = v.attrib.get("value") alias_name = v.attrib.get("alias") - comment = v.attrib.get("comment") if alias_name: alias = next(x for x in values if x.name == alias_name) - values.append(VkEnumValue(v.attrib.get("name"), value=alias.value, hex=alias.hex, comment=comment)) + values.append(VkEnumValue(v.attrib.get("name"), value=alias.value, hex=alias.hex)) elif value: # Some values are in hex form. We want to preserve the hex representation # at least when we convert back to a string. Internally we want to use int. if "0x" in value: - values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0), hex=True, comment=comment)) + values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0), hex=True)) else: - values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0), comment=comment)) + values.append(VkEnumValue(v.attrib.get("name"), value=int(value, 0))) else: # bitmask value = 1 << int(v.attrib.get("bitpos")) - values.append(VkEnumValue(v.attrib.get("name"), value=value, hex=True, comment=comment)) + values.append(VkEnumValue(v.attrib.get("name"), value=value, hex=True)) # vulkan.h contains a *_MAX_ENUM value set to 32-bit at the time of writing, # which is to prepare for extensions as they can add values and hence affect @@ -445,12 +444,11 @@ class VkEnum(object): class VkEnumValue(object): - def __init__(self, name, value=None, hex=False, alias=None, comment=None): + def __init__(self, name, value=None, hex=False, alias=None): self.name = name self.value = value self.hex = hex self.alias = alias - self.comment = comment def __repr__(self): if self.is_alias(): @@ -2845,12 +2843,10 @@ class VkRegistry(object): if only_aliased and not aliased: return - comment = enum_elem.attrib.get("comment") - if "bitpos" in enum_elem.keys(): # We need to add an extra value to an existing enum type. # E.g. VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG to VkFormatFeatureFlagBits. - enum.add(VkEnumValue(enum_elem.attrib["name"], value=(1 << int(enum_elem.attrib["bitpos"])), hex=True, comment=comment)) + enum.add(VkEnumValue(enum_elem.attrib["name"], value=(1 << int(enum_elem.attrib["bitpos"])), hex=True)) elif "offset" in enum_elem.keys(): # Extensions promoted to Core, have the extension number as part @@ -2867,12 +2863,12 @@ class VkRegistry(object): if direction is not None: value = -value - enum.add(VkEnumValue(enum_elem.attrib["name"], value=value, comment=comment)) + enum.add(VkEnumValue(enum_elem.attrib["name"], value=value)) elif "value" in enum_elem.keys(): - enum.add(VkEnumValue(enum_elem.attrib["name"], value=int(enum_elem.attrib["value"]), comment=comment)) + enum.add(VkEnumValue(enum_elem.attrib["name"], value=int(enum_elem.attrib["value"]))) elif "alias" in enum_elem.keys(): - enum.add(VkEnumValue(enum_elem.attrib["name"], alias=enum_elem.attrib["alias"], comment=comment)) + enum.add(VkEnumValue(enum_elem.attrib["name"], alias=enum_elem.attrib["alias"])) elif "value" in enum_elem.keys(): # Constants are not aliased, no need to add them here, they'll get added later on.

1 0

Derek Lesho : winegstreamer: Implement IMFMediaSource::CreatePresentationDescriptor.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: e2893c34524ae45f69f7bc183fa409a4049b9533 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2893c34524ae45f69f7bc18… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Oct 27 11:12:05 2020 -0500 winegstreamer: Implement IMFMediaSource::CreatePresentationDescriptor. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 1 - dlls/mfplat/tests/mfplat.c | 10 +++++----- dlls/mfreadwrite/tests/mfplat.c | 15 ++++++++++----- dlls/winegstreamer/media_source.c | 28 ++++++++++++++++++++++++++-- 4 files changed, 41 insertions(+), 13 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8c49a483f74..d304a62f08a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1452,7 +1452,6 @@ todo_wine return; hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd); -todo_wine ok(hr == S_OK, "Failed to create descriptor, hr %#x.\n", hr); if (FAILED(hr)) return; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 906454851a8..8c6cbf74661 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -574,10 +574,7 @@ static void test_source_resolver(void) ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, &descriptor); -todo_wine ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr); - if (FAILED(hr)) - goto skip_source_tests; ok(descriptor != NULL, "got %p\n", descriptor); hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(descriptor, 0, &selected, &sd); @@ -597,6 +594,7 @@ todo_wine ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr); hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &guid); ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr); +todo_wine ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid)); IMFMediaType_Release(media_type); @@ -605,7 +603,10 @@ todo_wine var.vt = VT_EMPTY; hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); +todo_wine ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); + if (FAILED(hr)) + goto skip_source_tests; get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var); ok(var.vt == VT_UNKNOWN, "Unexpected value type %u from MENewStream event.\n", var.vt); @@ -668,11 +669,10 @@ todo_wine get_event((IMFMediaEventGenerator *)mediasource, MEEndOfPresentation, NULL); +skip_source_tests: IMFMediaTypeHandler_Release(handler); IMFPresentationDescriptor_Release(descriptor); -skip_source_tests: - hr = IMFMediaSource_Shutdown(mediasource); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 84581f9be9a..cfe68cb6736 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -627,14 +627,13 @@ static void test_source_reader(void) stream = get_resource_stream("test.wav"); hr = MFCreateSourceReaderFromByteStream(stream, NULL, &reader); -todo_wine - ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); - if (FAILED(hr)) { + skip("MFCreateSourceReaderFromByteStream() failed, is G-Streamer missing?\n"); IMFByteStream_Release(stream); return; } + ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); /* Access underlying media source object. */ hr = IMFSourceReader_GetServiceForStream(reader, MF_SOURCE_READER_MEDIASOURCE, &GUID_NULL, &IID_IMFMediaSource, @@ -723,7 +722,10 @@ todo_wine hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); +todo_wine ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + if (hr != S_OK) + goto skip_read_sample; ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); IMFSample_Release(sample); @@ -784,6 +786,8 @@ todo_wine ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); ok(!sample, "Unexpected sample object.\n"); +skip_read_sample: + /* Flush. */ hr = IMFSourceReader_Flush(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); @@ -814,10 +818,11 @@ todo_wine IMFSourceReaderCallback_Release(&callback->IMFSourceReaderCallback_iface); hr = MFCreateSourceReaderFromByteStream(stream, attributes, &reader); +todo_wine ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); IMFAttributes_Release(attributes); - - IMFSourceReader_Release(reader); + if (hr == S_OK) + IMFSourceReader_Release(reader); IMFByteStream_Release(stream); } diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index d6c7837e544..9b2c2174318 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -67,6 +67,7 @@ struct media_source IMFByteStream *byte_stream; struct media_stream **streams; ULONG stream_count; + IMFPresentationDescriptor *pres_desc; GstBus *bus; GstElement *container; GstElement *decodebin; @@ -673,12 +674,12 @@ static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource * { struct media_source *source = impl_from_IMFMediaSource(iface); - FIXME("(%p)->(%p): stub\n", source, descriptor); + TRACE("(%p)->(%p)\n", source, descriptor); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; - return E_NOTIMPL; + return IMFPresentationDescriptor_Clone(source->pres_desc, descriptor); } static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationDescriptor *descriptor, @@ -741,6 +742,8 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) if (source->their_sink) gst_object_unref(GST_OBJECT(source->their_sink)); + if (source->pres_desc) + IMFPresentationDescriptor_Release(source->pres_desc); if (source->event_queue) IMFMediaEventQueue_Shutdown(source->event_queue); if (source->byte_stream) @@ -841,6 +844,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ GST_STATIC_PAD_TEMPLATE("mf_src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); struct media_source *object = heap_alloc_zero(sizeof(*object)); + IMFStreamDescriptor **descriptors = NULL; unsigned int i; HRESULT hr; int ret; @@ -928,6 +932,25 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ gst_sample_unref(preroll); } + /* init presentation descriptor */ + + descriptors = heap_alloc(object->stream_count * sizeof(IMFStreamDescriptor*)); + for (i = 0; i < object->stream_count; i++) + { + IMFMediaStream_GetStreamDescriptor(&object->streams[i]->IMFMediaStream_iface, &descriptors[i]); + } + + if (FAILED(hr = MFCreatePresentationDescriptor(object->stream_count, descriptors, &object->pres_desc))) + goto fail; + + for (i = 0; i < object->stream_count; i++) + { + IMFPresentationDescriptor_SelectStream(object->pres_desc, i); + IMFStreamDescriptor_Release(descriptors[i]); + } + heap_free(descriptors); + descriptors = NULL; + object->state = SOURCE_STOPPED; *out_media_source = object; @@ -936,6 +959,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ fail: WARN("Failed to construct MFMediaSource, hr %#x.\n", hr); + heap_free(descriptors); IMFMediaSource_Release(&object->IMFMediaSource_iface); return hr; }

1 0

Michael Stefaniuc : msxml3/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 21ca8e16485c41d21544065c211eaffd10252ec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21ca8e16485c41d21544065c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 27 00:06:36 2020 +0100 msxml3/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 13 +++---------- dlls/msxml3/tests/saxreader.c | 14 +++++++------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c19dd6c430e..02e31b4aafb 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -733,11 +733,7 @@ static void _expect_parse_error(IXMLDOMDocument *doc, HRESULT hr_exp, BOOL hr_to IXMLDOMParseError_Release(error); } -static const WCHAR szComplete1[] = { - '<','?','x','m','l',' ', - 'v','e','r','s','i','o','n','=','\'','1','.','0','\'','?','>','\n', - '<','o','p','e','n','>','<','/','o','p','e','n','>','\n',0 -}; +static const WCHAR szComplete1[] = L"<?xml version='1.0'?>\n<open></open>\n"; static const char complete4A[] = "<?xml version=\'1.0\'?>\n" "<lc dl=\'str1\'>\n" @@ -1148,10 +1144,7 @@ static const char attributes_map[] = { static const WCHAR nonexistent_fileW[] = L"c:\\Nonexistent.xml"; -static const WCHAR szElementXML4[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>', - '&','a','m','p',';','x',' ',0x2103,'<','/','E','l','e','T','e','s','t','>',0 }; - -static const WCHAR szStrangeChars[] = {'&','x',' ',0x2103, 0}; +static const WCHAR szStrangeChars[] = L"&x \x2103"; #define expect_bstr_eq_and_free(bstr, expect) { \ BSTR bstrExp = alloc_str_from_narrow(expect); \ @@ -5872,7 +5865,7 @@ static void test_xmlTypes(void) hr = IXMLDOMElement_get_xml(pElement, &str); ok(hr == S_OK, "ret %08x\n", hr ); - ok( !lstrcmpW( str, szElementXML4 ), "incorrect element xml\n"); + ok( !lstrcmpW( str, L"<EleTest Attr=\"\">&x \x2103</EleTest>" ), "incorrect element xml\n"); SysFreeString(str); hr = IXMLDOMElement_get_text(pElement, &str); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 47d158ab3ea..ab814c5f764 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1518,9 +1518,9 @@ static HRESULT WINAPI isaxattributes_getQName( const WCHAR **QName, int *QNameLength) { - static const WCHAR attrqnamesW[][15] = {{'a',':','a','t','t','r','1','j','u','n','k',0}, - {'a','t','t','r','2','j','u','n','k',0}, - {'a','t','t','r','3',0}}; + static const WCHAR attrqnamesW[][15] = {L"a:attr1junk", + L"attr2junk", + L"attr3"}; static const int attrqnamelen[] = {7, 5, 5}; ok(index >= 0 && index <= 2, "invalid index received %d\n", index); @@ -1609,9 +1609,9 @@ static HRESULT WINAPI isaxattributes_getTypeFromQName( static HRESULT WINAPI isaxattributes_getValue(ISAXAttributes* iface, int index, const WCHAR **value, int *nValue) { - static const WCHAR attrvaluesW[][10] = {{'a','1','j','u','n','k',0}, - {'a','2','j','u','n','k',0}, - {'<','&','"','>','\'',0}}; + static const WCHAR attrvaluesW[][10] = {L"a1junk", + L"a2junk", + L"<&\">'"}; static const int attrvalueslen[] = {2, 2, 5}; ok(index >= 0 && index <= 2, "invalid index received %d\n", index); @@ -3960,7 +3960,7 @@ static const struct writer_characters_t writer_characters[] = { static void test_mxwriter_characters(void) { - static const WCHAR embedded_nullbytes[] = {'a',0,'b',0,0,0,'c',0}; + static const WCHAR embedded_nullbytes[] = L"a\0b\0\0\0c"; const struct writer_characters_t *table = writer_characters; IVBSAXContentHandler *vb_content; ISAXContentHandler *content;

1 0

Hans Leidekker : msi: Use wide character string literals in classes.c.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: e7dd9b3f3694b276d50ccfb5515e7e0f70b1c555 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7dd9b3f3694b276d50ccfb5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 28 11:19:50 2020 +0100 msi: Use wide character string literals in classes.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/classes.c | 266 ++++++++++++++++++++--------------------------------- 1 file changed, 100 insertions(+), 166 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e7dd9b3f3694b276d50c…

1 0

Hans Leidekker : msi: Use wide character string literals in registry.c.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 2672646eaeb1877e0d746e8554529396ec8d9eb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2672646eaeb1877e0d746e85… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 28 11:19:49 2020 +0100 msi: Use wide character string literals in registry.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/registry.c | 349 ++++++++++++++++------------------------------------ 1 file changed, 104 insertions(+), 245 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2672646eaeb1877e0d74…

1 0

Hans Leidekker : msi: Use wide character string literals in package.c.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 731bb72c3d00b089ee23297efdfe0496733e96a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=731bb72c3d00b089ee23297e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 28 11:19:48 2020 +0100 msi: Use wide character string literals in package.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 526 ++++++++++++++++++----------------------------------- 1 file changed, 179 insertions(+), 347 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=731bb72c3d00b089ee23…

1 0

Hans Leidekker : msi: Use wide character string literals in msi.c.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 8255da2249816b77b709d1e6c888760c5e59a8f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8255da2249816b77b709d1e6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 28 11:19:47 2020 +0100 msi: Use wide character string literals in msi.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 182 ++++++++++++++++++++------------------------------------- 1 file changed, 64 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8255da2249816b77b709…

1 0

Alexandre Julliard : gdi32: Move part of the GetCharWidthInfo() implementation out of freetype.c.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 72272d0088d15e53ebafea53cdec9f908ac61c89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72272d0088d15e53ebafea53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 28 10:14:01 2020 +0100 gdi32: Move part of the GetCharWidthInfo() implementation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 8 +++++++- dlls/gdi32/freetype.c | 22 ++++++++-------------- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b74632c882b..bb1c07c6f9e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1053,13 +1053,19 @@ static BOOL CDECL font_GetCharWidth( PHYSDEV dev, UINT first, UINT last, INT *bu static BOOL CDECL font_GetCharWidthInfo( PHYSDEV dev, void *ptr ) { struct font_physdev *physdev = get_font_dev( dev ); + struct char_width_info *info = ptr; if (!physdev->font) { dev = GET_NEXT_PHYSDEV( dev, pGetCharWidthInfo ); return dev->funcs->pGetCharWidthInfo( dev, ptr ); } - return font_funcs->pGetCharWidthInfo( physdev->font, ptr ); + + info->unk = 0; + if (!physdev->font->scalable || !font_funcs->get_char_width_info( physdev->font, info )) + info->lsb = info->rsb = 0; + + return TRUE; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1d076e77cf8..82a7e6f01b7 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6654,29 +6654,23 @@ done: } /************************************************************* - * freetype_GetCharWidthInfo + * freetype_get_char_width_info */ -static BOOL CDECL freetype_GetCharWidthInfo( struct gdi_font *gdi_font, struct char_width_info *info ) +static BOOL CDECL freetype_get_char_width_info( struct gdi_font *font, struct char_width_info *info ) { - GdiFont *font = get_font_ptr(gdi_font); + FT_Face face = get_font_ptr(font)->ft_face; TT_HoriHeader *pHori; TRACE("%p, %p\n", font, info); - if (gdi_font->scalable && - (pHori = pFT_Get_Sfnt_Table(font->ft_face, ft_sfnt_hhea))) + if ((pHori = pFT_Get_Sfnt_Table(face, ft_sfnt_hhea))) { - FT_Fixed em_scale; - em_scale = MulDiv(gdi_font->ppem, 1 << 16, font->ft_face->units_per_EM); + FT_Fixed em_scale = MulDiv(font->ppem, 1 << 16, face->units_per_EM); info->lsb = (SHORT)pFT_MulFix(pHori->min_Left_Side_Bearing, em_scale); info->rsb = (SHORT)pFT_MulFix(pHori->min_Right_Side_Bearing, em_scale); + return TRUE; } - else - info->lsb = info->rsb = 0; - - info->unk = 0; - - return TRUE; + return FALSE; } @@ -6973,7 +6967,6 @@ static const struct font_backend_funcs font_funcs = { freetype_EnumFonts, freetype_FontIsLinked, - freetype_GetCharWidthInfo, freetype_SelectFont, freetype_add_font, freetype_add_mem_font, @@ -6984,6 +6977,7 @@ static const struct font_backend_funcs font_funcs = freetype_get_default_glyph, freetype_get_glyph_outline, freetype_get_unicode_ranges, + freetype_get_char_width_info, freetype_set_outline_text_metrics, freetype_set_bitmap_text_metrics, freetype_get_kerning_pairs, diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index e180121ae40..7d2f5e0240e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -366,7 +366,6 @@ struct font_backend_funcs { BOOL (CDECL *pEnumFonts)( LOGFONTW *lf, FONTENUMPROCW proc, LPARAM lparam ); BOOL (CDECL *pFontIsLinked)( struct gdi_font *font ); - BOOL (CDECL *pGetCharWidthInfo)( struct gdi_font *font, struct char_width_info *info ); struct gdi_font * (CDECL *pSelectFont)( DC *dc, HFONT hfont, UINT *aa_flags, UINT default_aa_flags ); INT (CDECL *add_font)( const WCHAR *file, DWORD flags ); @@ -381,6 +380,7 @@ struct font_backend_funcs DWORD (CDECL *get_glyph_outline)( struct gdi_font *font, UINT glyph, UINT format, GLYPHMETRICS *gm, ABC *abc, DWORD buflen, void *buf, const MAT2 *mat ); DWORD (CDECL *get_unicode_ranges)( struct gdi_font *font, GLYPHSET *gs ); + BOOL (CDECL *get_char_width_info)( struct gdi_font *font, struct char_width_info *info ); BOOL (CDECL *set_outline_text_metrics)( struct gdi_font *font ); BOOL (CDECL *set_bitmap_text_metrics)( struct gdi_font *font ); DWORD (CDECL *get_kerning_pairs)( struct gdi_font *gdi_font, KERNINGPAIR **kern_pair );

1 0

Alexandre Julliard : gdi32: Move part of the GetFontUnicodeRanges() implementation out of freetype.c.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 374944994360590cea79ebd5da42bdaf9f092d90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=374944994360590cea79ebd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 28 10:13:53 2020 +0100 gdi32: Move part of the GetFontUnicodeRanges() implementation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 12 +++++++++++- dlls/gdi32/freetype.c | 28 +++++++--------------------- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a587715d6c3..b74632c882b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1118,13 +1118,23 @@ static BOOL CDECL font_GetFontRealizationInfo( PHYSDEV dev, void *ptr ) static DWORD CDECL font_GetFontUnicodeRanges( PHYSDEV dev, GLYPHSET *glyphset ) { struct font_physdev *physdev = get_font_dev( dev ); + DWORD size, num_ranges; if (!physdev->font) { dev = GET_NEXT_PHYSDEV( dev, pGetFontUnicodeRanges ); return dev->funcs->pGetFontUnicodeRanges( dev, glyphset ); } - return font_funcs->pGetFontUnicodeRanges( physdev->font, glyphset ); + + num_ranges = font_funcs->get_unicode_ranges( physdev->font, glyphset ); + size = offsetof( GLYPHSET, ranges[num_ranges] ); + if (glyphset) + { + glyphset->cbThis = size; + glyphset->cRanges = num_ranges; + glyphset->flAccel = 0; + } + return size; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3959261e609..1d076e77cf8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6680,12 +6680,16 @@ static BOOL CDECL freetype_GetCharWidthInfo( struct gdi_font *gdi_font, struct c } -/* Retrieve a list of supported Unicode ranges for a given font. +/************************************************************* + * freetype_get_unicode_ranges + * + * Retrieve a list of supported Unicode ranges for a given font. * Can be called with NULL gs to calculate the buffer size. Returns * the number of ranges found. */ -static DWORD get_font_unicode_ranges(FT_Face face, GLYPHSET *gs) +static DWORD CDECL freetype_get_unicode_ranges( struct gdi_font *font, GLYPHSET *gs ) { + FT_Face face = get_font_ptr(font)->ft_face; DWORD num_ranges = 0; if (face->charmap->encoding == FT_ENCODING_UNICODE) @@ -6744,24 +6748,6 @@ static DWORD get_font_unicode_ranges(FT_Face face, GLYPHSET *gs) return num_ranges; } -/************************************************************* - * freetype_GetFontUnicodeRanges - */ -static DWORD CDECL freetype_GetFontUnicodeRanges( struct gdi_font *font, GLYPHSET *glyphset ) -{ - DWORD size, num_ranges; - - num_ranges = get_font_unicode_ranges(get_font_ptr(font)->ft_face, glyphset); - size = sizeof(GLYPHSET) + sizeof(WCRANGE) * (num_ranges - 1); - if (glyphset) - { - glyphset->cbThis = size; - glyphset->cRanges = num_ranges; - glyphset->flAccel = 0; - } - return size; -} - /************************************************************* * freetype_FontIsLinked */ @@ -6988,7 +6974,6 @@ static const struct font_backend_funcs font_funcs = freetype_EnumFonts, freetype_FontIsLinked, freetype_GetCharWidthInfo, - freetype_GetFontUnicodeRanges, freetype_SelectFont, freetype_add_font, freetype_add_mem_font, @@ -6998,6 +6983,7 @@ static const struct font_backend_funcs font_funcs = freetype_get_glyph_index, freetype_get_default_glyph, freetype_get_glyph_outline, + freetype_get_unicode_ranges, freetype_set_outline_text_metrics, freetype_set_bitmap_text_metrics, freetype_get_kerning_pairs, diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 6b37cf598e9..e180121ae40 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -367,7 +367,6 @@ struct font_backend_funcs BOOL (CDECL *pEnumFonts)( LOGFONTW *lf, FONTENUMPROCW proc, LPARAM lparam ); BOOL (CDECL *pFontIsLinked)( struct gdi_font *font ); BOOL (CDECL *pGetCharWidthInfo)( struct gdi_font *font, struct char_width_info *info ); - DWORD (CDECL *pGetFontUnicodeRanges)( struct gdi_font *font, GLYPHSET *glyphset ); struct gdi_font * (CDECL *pSelectFont)( DC *dc, HFONT hfont, UINT *aa_flags, UINT default_aa_flags ); INT (CDECL *add_font)( const WCHAR *file, DWORD flags ); @@ -381,6 +380,7 @@ struct font_backend_funcs UINT (CDECL *get_default_glyph)( struct gdi_font *gdi_font ); DWORD (CDECL *get_glyph_outline)( struct gdi_font *font, UINT glyph, UINT format, GLYPHMETRICS *gm, ABC *abc, DWORD buflen, void *buf, const MAT2 *mat ); + DWORD (CDECL *get_unicode_ranges)( struct gdi_font *font, GLYPHSET *gs ); BOOL (CDECL *set_outline_text_metrics)( struct gdi_font *font ); BOOL (CDECL *set_bitmap_text_metrics)( struct gdi_font *font ); DWORD (CDECL *get_kerning_pairs)( struct gdi_font *gdi_font, KERNINGPAIR **kern_pair );

1 0

Michael Stefaniuc : powrprof: Use wide-char string literals.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 6594079920602a8b1f97817a6ad27364265b2a23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6594079920602a8b1f97817a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 28 00:39:10 2020 +0100 powrprof: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/powrprof/powrprof.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 5f00c7b6317..fc6f5706f87 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -45,20 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(powrprof); * implementing these functions is going to have to wait until somebody can * cobble together some sane test input. */ -static const WCHAR szPowerCfgSubKey[] = { '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', '\\', 'C', 'o', 'n', 't', 'r', - 'o', 'l', 's', ' ', 'F', 'o', 'l', 'd', 'e', 'r', '\\', 'P', 'o', - 'w', 'e', 'r', 'C', 'f', 'g', 0 }; -static const WCHAR szSemaphoreName[] = { 'P', 'o', 'w', 'e', 'r', 'P', 'r', 'o', - 'f', 'i', 'l', 'e', 'R', 'e', 'g', 'i', 's', 't', 'r', 'y', 'S', - 'e', 'm', 'a', 'p', 'h', 'o', 'r', 'e', 0 }; -static const WCHAR szDiskMax[] = { 'D', 'i', 's', 'k', 'S', 'p', 'i', 'n', 'd', - 'o', 'w', 'n', 'M', 'a', 'x', 0 }; -static const WCHAR szDiskMin[] = { 'D', 'i', 's', 'k', 'S', 'p', 'i', 'n', 'd', - 'o', 'w', 'n', 'M', 'i', 'n', 0 }; -static const WCHAR szLastID[] = { 'L', 'a', 's', 't', 'I', 'D', 0 }; +static const WCHAR szPowerCfgSubKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg"; static HANDLE PPRegSemaphore = NULL; NTSTATUS WINAPI CallNtPowerInformation( @@ -172,7 +159,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) return TRUE; } - r = RegQueryValueExW(hKey, szDiskMax, 0, 0, lpValue, &cbValue); + r = RegQueryValueExW(hKey, L"DiskSpindownMax", 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { TRACE("Couldn't open DiskSpinDownMax: %d\n", r); TRACE("Using default: 3600\n"); @@ -183,7 +170,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) cbValue = sizeof(lpValue); - r = RegQueryValueExW(hKey, szDiskMin, 0, 0, lpValue, &cbValue); + r = RegQueryValueExW(hKey, L"DiskSpindownMin", 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { TRACE("Couldn't open DiskSpinDownMin: %d\n", r); TRACE("Using default: 3\n"); @@ -360,14 +347,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } else { BYTE lpValue[40]; DWORD cbValue = sizeof(lpValue); - r = RegQueryValueExW(hKey, szLastID, 0, 0, lpValue, &cbValue); + r = RegQueryValueExW(hKey, L"LastID", 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { TRACE("Couldn't open registry entry HKLM\\%s\\LastID, using some sane(?) defaults\n", debugstr_w(szPowerCfgSubKey)); } RegCloseKey(hKey); } - PPRegSemaphore = CreateSemaphoreW(NULL, 1, 1, szSemaphoreName); + PPRegSemaphore = CreateSemaphoreW(NULL, 1, 1, L"PowerProfileRegistrySemaphore"); if (PPRegSemaphore == NULL) { ERR("Couldn't create Semaphore: %d\n", GetLastError()); return FALSE;

1 0

Huw Davies : riched20: Use a helper to retrieve the first run.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 5d179e4b39a0c52a23d61430fc7a567fb381b22e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d179e4b39a0c52a23d61430… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 08:43:53 2020 +0000 riched20: Use a helper to retrieve the first run. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 046a7fd5423..75bbb2c05c5 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -886,7 +886,7 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag linespace = ME_GetParaLineSpace( c, para ); ME_BeginRow( &wc ); - run = &ME_FindItemFwd( para_get_di( para ), diRun )->member.run; + run = para_first_run( para ); while (run) { run = ME_WrapHandleRun( &wc, run );

1 0

Alistair Leslie-Hughes : include: Add more DBGUID_* defines.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: da9f165acb9ba92dfd2a5c7c203c7ae9980320b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da9f165acb9ba92dfd2a5c7c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 28 20:46:20 2020 +1100 include: Add more DBGUID_* defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbs.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/dbs.idl b/include/dbs.idl index 63617c88c00..19f92b3c05f 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -500,6 +500,8 @@ cpp_quote(" EXTERN_C const GUID name DECLSPEC_HIDDEN") cpp_quote("#endif") cpp_quote("DEFINE_DBGUID(DB_NULLGUID, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);") +cpp_quote("DEFINE_DBGUID(DBGUID_SQL, 0xc8b522d7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_SESSION, 0xc8b522f5, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_ROWSET, 0xc8b522f6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBGUID_ROW, 0xc8b522f7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);")

1 0

Derek Lesho : winegstreamer: Replace gst_pad_get_current_caps with gst_pad_query_caps.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: f26e81cf38b2bf0305581522d3d980d3508a43ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=f26e81cf38b2bf0305581522… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Oct 27 11:12:04 2020 -0500 winegstreamer: Replace gst_pad_get_current_caps with gst_pad_query_caps. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 0991710755c..d6c7837e544 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -388,7 +388,7 @@ static const IMFMediaStreamVtbl media_stream_vtbl = the user throws at us through gstreamer's caps negotiation. */ static HRESULT media_stream_connect_to_sink(struct media_stream *stream) { - GstCaps *source_caps = gst_pad_get_current_caps(stream->their_src); + GstCaps *source_caps = gst_pad_query_caps(stream->their_src, NULL); const gchar *stream_type; if (!source_caps)

1 0

Michael Stefaniuc : sapi/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 85458d804a5def9df5f854e518998dd189bb974e URL: https://source.winehq.org/git/wine.git/?a=commit;h=85458d804a5def9df5f854e5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 28 00:39:08 2020 +0100 sapi/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/tests/token.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 1ca49398ad1..47196d42dc7 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -54,7 +54,6 @@ static void test_token_category(void) ISpObjectTokenCategory *cat; IEnumSpObjectTokens *enum_tokens; HRESULT hr; - WCHAR bogus[] = {'b','o','g','u','s',0}; ULONG count; hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, @@ -64,7 +63,7 @@ static void test_token_category(void) hr = ISpObjectTokenCategory_EnumTokens( cat, NULL, NULL, &enum_tokens ); ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); - hr = ISpObjectTokenCategory_SetId( cat, bogus, FALSE ); + hr = ISpObjectTokenCategory_SetId( cat, L"bogus", FALSE ); ok( hr == SPERR_INVALID_REGISTRY_KEY, "got %08x\n", hr ); hr = ISpObjectTokenCategory_SetId( cat, SPCAT_VOICES, FALSE );

1 0

Nikolay Sivov : include: Remove confusing comment.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 03395fdf71b606b589b917eab5d4766842188b91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03395fdf71b606b589b917ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 28 22:58:01 2020 +0300 include: Remove confusing comment. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mlang.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mlang.idl b/include/mlang.idl index 5867648b04f..7c4398feafd 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -708,7 +708,7 @@ interface IMultiLanguage2 : IUnknown [in] LANGID LangId, [out] IEnumScript **ppEnumScript); - HRESULT ValidateCodePageEx( /* undocumented on MSDN */ + HRESULT ValidateCodePageEx( [in] UINT uiCodePage, [in] HWND hwnd, [in] DWORD dwfIODControl);

1 0

Hans Leidekker : msi: Use wide character string literals in dialog.c.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: d9fbe788af65c2b2696c446d765a34ae40e3226b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9fbe788af65c2b2696c446d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 28 11:19:46 2020 +0100 msi: Use wide character string literals in dialog.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 500 +++++++++++++++++++----------------------------------- 1 file changed, 174 insertions(+), 326 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d9fbe788af65c2b2696c…

1 0

Huw Davies : riched20: Use a helper to find the next run.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: f9a82574c906129bdc4269a4972c4ef3dafd67d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9a82574c906129bdc4269a4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 08:43:51 2020 +0000 riched20: Use a helper to find the next run. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 9e79eda274d..98ae352ab7b 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -1148,7 +1148,8 @@ static BOOL ME_StreamOutText(ME_TextEditor *editor, ME_OutStream *pStream, nChars -= nLen; cursor.nOffset = 0; - cursor.pRun = ME_FindItemFwd(cursor.pRun, diRun); + cursor.pRun = run_next_all_paras( &cursor.pRun->member.run ) ? + run_get_di( run_next_all_paras( &cursor.pRun->member.run ) ) : NULL; } heap_free(buffer);

1 0

Huw Davies : riched20: Use the paragraph from the cursor.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: 6b9b7b2d0bed6c2dc022238084fb35815c3722c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b9b7b2d0bed6c2dc0222380… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 08:43:52 2020 +0000 riched20: Use the paragraph from the cursor. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/undo.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 72e3b74f4c8..d9c5d28d6dc 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -335,13 +335,11 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) case undo_set_para_fmt: { ME_Cursor tmp; - ME_DisplayItem *para; cursor_from_char_ofs( editor, undo->u.set_para_fmt.pos, &tmp ); - para = ME_FindItemBack(tmp.pRun, diParagraph); - add_undo_set_para_fmt( editor, &para->member.para ); - para->member.para.fmt = undo->u.set_para_fmt.fmt; - para->member.para.border = undo->u.set_para_fmt.border; - para_mark_rewrap( editor, &para->member.para ); + add_undo_set_para_fmt( editor, &tmp.pPara->member.para ); + tmp.pPara->member.para.fmt = undo->u.set_para_fmt.fmt; + tmp.pPara->member.para.border = undo->u.set_para_fmt.border; + para_mark_rewrap( editor, &tmp.pPara->member.para ); break; } case undo_set_char_fmt:

1 0

Michael Stefaniuc : sapi: Zero terminate some WCHAR strings.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: cc32682130b88decf506df6dceef426c51bd3c27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc32682130b88decf506df6d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 28 00:39:09 2020 +0100 sapi: Zero terminate some WCHAR strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/token.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index b4a318b4ade..04fa3a25d6a 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -372,28 +372,28 @@ static HRESULT WINAPI token_category_EnumValues( ISpObjectTokenCategory *iface, static HRESULT parse_cat_id( const WCHAR *str, HKEY *root, const WCHAR **sub_key ) { - static const WCHAR HKLM[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\'}; - static const WCHAR HKCU[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R','\\'}; struct table { const WCHAR *name; - int size; + unsigned int len; HKEY key; } table[] = { - { HKLM, sizeof(HKLM), HKEY_LOCAL_MACHINE }, - { HKCU, sizeof(HKCU), HKEY_CURRENT_USER }, +#define X(s) s, ARRAY_SIZE(s) - 1 + { X(L"HKEY_LOCAL_MACHINE\\"), HKEY_LOCAL_MACHINE }, + { X(L"HKEY_CURRENT_USER\\"), HKEY_CURRENT_USER }, { NULL } +#undef X }; struct table *ptr; int len = lstrlenW( str ); for (ptr = table; ptr->name; ptr++) { - if (len >= ptr->size / sizeof(ptr->name[0]) && !memcmp( str, ptr->name, ptr->size )) + if (len >= ptr->len && !wcsncmp( str, ptr->name, ptr->len )) { *root = ptr->key; - *sub_key = str + ptr->size / sizeof(ptr->name[0]); + *sub_key = str + ptr->len; return S_OK; } }

1 0

Huw Davies : riched20: Use a helper function to find the first row.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: b3b3624079da3efe24beb90ef88435042c79df9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3b3624079da3efe24beb90e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 08:43:50 2020 +0000 riched20: Use a helper function to find the first row. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index d3bbbc9d672..d15c47b72aa 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -846,7 +846,7 @@ static void draw_table_borders( ME_Context *c, ME_Paragraph *para ) rowY = c->pt.y + para->pt.y; if (para->fmt.dwMask & PFM_SPACEBEFORE) rowY += ME_twips2pointsY(c, para->fmt.dySpaceBefore); - nHeight = ME_FindItemFwd( para_get_di( para ), diStartRow )->member.row.nHeight; + nHeight = para_first_row( para )->nHeight; rowBottom = rowY + nHeight; /* Draw horizontal lines */

1 0

Huw Davies : riched20: Pass para ptrs to the various para selection functions.
by Alexandre Julliard Oct. 28, 2020

Oct. 28, 2020

Module: wine Branch: master Commit: da5082912816a346a89cc84de42f77426135f451 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da5082912816a346a89cc84d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 28 08:43:49 2020 +0000 riched20: Pass para ptrs to the various para selection functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 14 +++---- dlls/riched20/editor.h | 8 ++-- dlls/riched20/editstr.h | 2 +- dlls/riched20/paint.c | 48 +++++++++++++---------- dlls/riched20/para.c | 100 ++++++++++++++++++++++++------------------------ dlls/riched20/reader.c | 2 +- 7 files changed, 90 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da5082912816a346a89c…

1 0

Austin English : d3d8thk: Add stub dll.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: f242f0ef1d6a601959f6769b44fe554b5751c97c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f242f0ef1d6a601959f6769b… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Oct 24 03:38:32 2020 -0500 d3d8thk: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/d3d8thk/Makefile.in | 8 +++++++ dlls/d3d8thk/d3d8thk.spec | 56 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d8thk/d3d8thk_main.c | 42 ++++++++++++++++++++++++++++++++++ dlls/d3d8thk/version.rc | 26 +++++++++++++++++++++ 6 files changed, 135 insertions(+) diff --git a/configure b/configure index 2686af02232..6e1290b0cf0 100755 --- a/configure +++ b/configure @@ -1189,6 +1189,7 @@ enable_d3d10core enable_d3d11 enable_d3d12 enable_d3d8 +enable_d3d8thk enable_d3d9 enable_d3dcompiler_33 enable_d3dcompiler_34 @@ -20392,6 +20393,7 @@ wine_fn_config_makefile dlls/d3d12 enable_d3d12 wine_fn_config_makefile dlls/d3d12/tests enable_tests wine_fn_config_makefile dlls/d3d8 enable_d3d8 wine_fn_config_makefile dlls/d3d8/tests enable_tests +wine_fn_config_makefile dlls/d3d8thk enable_d3d8thk wine_fn_config_makefile dlls/d3d9 enable_d3d9 wine_fn_config_makefile dlls/d3d9/tests enable_tests wine_fn_config_makefile dlls/d3dcompiler_33 enable_d3dcompiler_33 diff --git a/configure.ac b/configure.ac index 372785ee0fd..331ae064bdc 100644 --- a/configure.ac +++ b/configure.ac @@ -3137,6 +3137,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d12) WINE_CONFIG_MAKEFILE(dlls/d3d12/tests) WINE_CONFIG_MAKEFILE(dlls/d3d8) WINE_CONFIG_MAKEFILE(dlls/d3d8/tests) +WINE_CONFIG_MAKEFILE(dlls/d3d8thk) WINE_CONFIG_MAKEFILE(dlls/d3d9) WINE_CONFIG_MAKEFILE(dlls/d3d9/tests) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_33) diff --git a/dlls/d3d8thk/Makefile.in b/dlls/d3d8thk/Makefile.in new file mode 100644 index 00000000000..b84c8d171f1 --- /dev/null +++ b/dlls/d3d8thk/Makefile.in @@ -0,0 +1,8 @@ +MODULE = d3d8thk.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + d3d8thk_main.c + +RC_SRCS = version.rc diff --git a/dlls/d3d8thk/d3d8thk.spec b/dlls/d3d8thk/d3d8thk.spec new file mode 100644 index 00000000000..30b01e4c672 --- /dev/null +++ b/dlls/d3d8thk/d3d8thk.spec @@ -0,0 +1,56 @@ +@ stub OsThunkD3dContextCreate +@ stub OsThunkD3dContextDestroy +@ stub OsThunkD3dContextDestroyAll +@ stub OsThunkD3dDrawPrimitives2 +@ stub OsThunkD3dValidateTextureStageState +@ stub OsThunkDdAddAttachedSurface +@ stub OsThunkDdAlphaBlt +@ stub OsThunkDdAttachSurface +@ stub OsThunkDdBeginMoCompFrame +@ stub OsThunkDdBlt +@ stub OsThunkDdCanCreateD3DBuffer +@ stub OsThunkDdCanCreateSurface +@ stub OsThunkDdColorControl +@ stub OsThunkDdCreateD3DBuffer +@ stub OsThunkDdCreateDirectDrawObject +@ stub OsThunkDdCreateMoComp +@ stub OsThunkDdCreateSurface +@ stub OsThunkDdCreateSurfaceEx +@ stub OsThunkDdCreateSurfaceObject +@ stub OsThunkDdDeleteDirectDrawObject +@ stub OsThunkDdDeleteSurfaceObject +@ stub OsThunkDdDestroyD3DBuffer +@ stub OsThunkDdDestroyMoComp +@ stub OsThunkDdDestroySurface +@ stub OsThunkDdEndMoCompFrame +@ stub OsThunkDdFlip +@ stub OsThunkDdFlipToGDISurface +@ stub OsThunkDdGetAvailDriverMemory +@ stub OsThunkDdGetBltStatus +@ stub OsThunkDdGetDC +@ stub OsThunkDdGetDriverInfo +@ stub OsThunkDdGetDriverState +@ stub OsThunkDdGetDxHandle +@ stub OsThunkDdGetFlipStatus +@ stub OsThunkDdGetInternalMoCompInfo +@ stub OsThunkDdGetMoCompBuffInfo +@ stub OsThunkDdGetMoCompFormats +@ stub OsThunkDdGetMoCompGuids +@ stub OsThunkDdGetScanLine +@ stub OsThunkDdLock +@ stub OsThunkDdLockD3D +@ stub OsThunkDdQueryDirectDrawObject +@ stub OsThunkDdQueryMoCompStatus +@ stub OsThunkDdReenableDirectDrawObject +@ stub OsThunkDdReleaseDC +@ stub OsThunkDdRenderMoComp +@ stub OsThunkDdResetVisrgn +@ stub OsThunkDdSetColorKey +@ stub OsThunkDdSetExclusiveMode +@ stub OsThunkDdSetGammaRamp +@ stub OsThunkDdSetOverlayPosition +@ stub OsThunkDdUnattachSurface +@ stub OsThunkDdUnlock +@ stub OsThunkDdUnlockD3D +@ stub OsThunkDdUpdateOverlay +@ stub OsThunkDdWaitForVerticalBlank diff --git a/dlls/d3d8thk/d3d8thk_main.c b/dlls/d3d8thk/d3d8thk_main.c new file mode 100644 index 00000000000..1d89cb48720 --- /dev/null +++ b/dlls/d3d8thk/d3d8thk_main.c @@ -0,0 +1,42 @@ +/* + * + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d8thk); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/d3d8thk/version.rc b/dlls/d3d8thk/version.rc new file mode 100644 index 00000000000..444630a7745 --- /dev/null +++ b/dlls/d3d8thk/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine d3d8thk" +#define WINE_FILENAME_STR "d3d8thk.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Austin English : d3dim700: Add stub dll.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: edd00eb538259d85e5a1c58d857e7f2ec4700c41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=edd00eb538259d85e5a1c58d… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Oct 25 01:22:14 2020 -0500 d3dim700: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/d3dim700/Makefile.in | 8 ++++++++ dlls/d3dim700/d3dim700.spec | 18 ++++++++++++++++++ dlls/d3dim700/d3dim700_main.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3dim700/version.rc | 26 ++++++++++++++++++++++++++ 6 files changed, 97 insertions(+) diff --git a/configure b/configure index 6e1290b0cf0..ac6a7985cc7 100755 --- a/configure +++ b/configure @@ -1205,6 +1205,7 @@ enable_d3dcompiler_43 enable_d3dcompiler_46 enable_d3dcompiler_47 enable_d3dim +enable_d3dim700 enable_d3drm enable_d3dx10_33 enable_d3dx10_34 @@ -20412,6 +20413,7 @@ wine_fn_config_makefile dlls/d3dcompiler_46 enable_d3dcompiler_46 wine_fn_config_makefile dlls/d3dcompiler_47 enable_d3dcompiler_47 wine_fn_config_makefile dlls/d3dcompiler_47/tests enable_tests wine_fn_config_makefile dlls/d3dim enable_d3dim +wine_fn_config_makefile dlls/d3dim700 enable_d3dim700 wine_fn_config_makefile dlls/d3drm enable_d3drm wine_fn_config_makefile dlls/d3drm/tests enable_tests wine_fn_config_makefile dlls/d3dx10_33 enable_d3dx10_33 diff --git a/configure.ac b/configure.ac index 331ae064bdc..2f81fd22610 100644 --- a/configure.ac +++ b/configure.ac @@ -3156,6 +3156,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_46) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47/tests) WINE_CONFIG_MAKEFILE(dlls/d3dim) +WINE_CONFIG_MAKEFILE(dlls/d3dim700) WINE_CONFIG_MAKEFILE(dlls/d3drm) WINE_CONFIG_MAKEFILE(dlls/d3drm/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_33) diff --git a/dlls/d3dim700/Makefile.in b/dlls/d3dim700/Makefile.in new file mode 100644 index 00000000000..12a28ae475a --- /dev/null +++ b/dlls/d3dim700/Makefile.in @@ -0,0 +1,8 @@ +MODULE = d3dim700.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + d3dim700_main.c + +RC_SRCS = version.rc diff --git a/dlls/d3dim700/d3dim700.spec b/dlls/d3dim700/d3dim700.spec new file mode 100644 index 00000000000..3fe16bb86ed --- /dev/null +++ b/dlls/d3dim700/d3dim700.spec @@ -0,0 +1,18 @@ +@ stub D3DFree +@ stub D3DMalloc +@ stub D3DRealloc +@ stub Direct3DCreateDevice +@ stub CreateTexture +@ stub D3DBreakVBLock +@ stub D3DTextureUpdate +@ stub DestroyTexture +@ stub Direct3DCreate +@ stub Direct3D_HALCleanUp +@ stub FlushD3DDevices +@ stub GetLOD +@ stub GetPriority +@ stub PaletteAssociateNotify +@ stub PaletteUpdateNotify +@ stub SetLOD +@ stub SetPriority +@ stub SurfaceFlipNotify diff --git a/dlls/d3dim700/d3dim700_main.c b/dlls/d3dim700/d3dim700_main.c new file mode 100644 index 00000000000..18a211ccc74 --- /dev/null +++ b/dlls/d3dim700/d3dim700_main.c @@ -0,0 +1,42 @@ +/* + * + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dim700); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/d3dim700/version.rc b/dlls/d3dim700/version.rc new file mode 100644 index 00000000000..cff97677690 --- /dev/null +++ b/dlls/d3dim700/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine d3dim700" +#define WINE_FILENAME_STR "d3dim700.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Aaron Hill : qmgr/tests: Fix issues with handling of transient errors.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 2538077463e3be922fc6de576409bee09a9d5de1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2538077463e3be922fc6de57… Author: Aaron Hill <aa1ronham(a)gmail.com> Date: Sun Oct 25 23:51:25 2020 -0400 qmgr/tests: Fix issues with handling of transient errors. When a BITS job is being transferred, it may enter into the state BG_JOB_STATE_TRANSIENT_ERROR (for example, if the hostname fails to resolve). Currently, entering this state causes qmgr job tests to fail, even though it may occur due to temporary network issues out of our control. If a job enters BG_JOB_STATE_TRANSIENT_ERROR before the timeout has elapsed, attempt to resume the job using IBackgroundCopyJob_Resume. If the job is still in BG_JOB_STATE_TRANSIENT_ERROR, query BITS for detailed error information, and print it out. Additionally, ensure that we are able to transfer files on Windows 10 with a metered connection. By default, BITS will not attempt to transfer a job on a metered connection, instead failing with BG_JOB_STATE_TRANSIENT_ERROR. On newer versions of Windows, we can use IBackgroundCopyJob5 to set the transfer policy, forcing the job to run even on a metered connection. This allows qmgr job tests to pass on the testbot Windows 10 VMs, which have metered connections enabled in order to disable Windows Update. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50048 Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/qmgr_local.idl | 1 + dlls/qmgr/tests/job.c | 116 +++++++++++++++++++++++++++++++++++++++++++++-- include/Makefile.in | 1 + include/bits5_0.idl | 59 ++++++++++++++++++++++++ 4 files changed, 173 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2538077463e3be922fc6…

1 0

Eric Kohl : widl: Add the [allocate] acf attribute.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: ba72ef6c22b26ef9addc8c9af6c2e9ab88529ca5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba72ef6c22b26ef9addc8c9a… Author: Eric Kohl <eric.kohl(a)reactos.org> Date: Wed Oct 14 23:24:34 2020 +0200 widl: Add the [allocate] acf attribute. Signed-off-by: Eric Kohl <eric.kohl(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 3 +++ tools/widl/parser.y | 33 +++++++++++++++++++++++++++++---- tools/widl/typegen.c | 7 +++++++ tools/widl/widltypes.h | 1 + 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 925265d00db..f2c09cd8051 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -318,6 +318,7 @@ static const struct keyword keywords[] = { static const struct keyword attr_keywords[] = { {"aggregatable", tAGGREGATABLE}, + {"all_nodes", tALLNODES}, {"allocate", tALLOCATE}, {"annotation", tANNOTATION}, {"apartment", tAPARTMENT}, @@ -345,6 +346,7 @@ static const struct keyword attr_keywords[] = {"disable_consistency_check", tDISABLECONSISTENCYCHECK}, {"displaybind", tDISPLAYBIND}, {"dllname", tDLLNAME}, + {"dont_free", tDONTFREE}, {"dual", tDUAL}, {"enable_allocate", tENABLEALLOCATE}, {"encode", tENCODE}, @@ -406,6 +408,7 @@ static const struct keyword attr_keywords[] = {"restricted", tRESTRICTED}, {"retval", tRETVAL}, {"single", tSINGLE}, + {"single_node", tSINGLENODE}, {"size_is", tSIZEIS}, {"source", tSOURCE}, {"strict_context_handle", tSTRICTCONTEXTHANDLE}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5bc0d82703e..686aa6b58a8 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -172,7 +172,7 @@ static typelib_t *current_typelib; %token GREATEREQUAL LESSEQUAL %token LOGICALOR LOGICALAND %token ELLIPSIS -%token tAGGREGATABLE tALLOCATE tANNOTATION tAPPOBJECT tASYNC tASYNCUUID +%token tAGGREGATABLE tALLNODES tALLOCATE tANNOTATION tAPPOBJECT tASYNC tASYNCUUID %token tAUTOHANDLE tBINDABLE tBOOLEAN tBROADCAST tBYTE tBYTECOUNT %token tCALLAS tCALLBACK tCASE tCDECL tCHAR tCOCLASS tCODE tCOMMSTATUS %token tCONST tCONTEXTHANDLE tCONTEXTHANDLENOSERIALIZE @@ -183,7 +183,7 @@ static typelib_t *current_typelib; %token tDEFAULTVTABLE %token tDISABLECONSISTENCYCHECK tDISPLAYBIND %token tDISPINTERFACE -%token tDLLNAME tDOUBLE tDUAL +%token tDLLNAME tDONTFREE tDOUBLE tDUAL %token tENABLEALLOCATE tENCODE tENDPOINT %token tENTRY tENUM tERRORSTATUST %token tEXPLICITHANDLE tEXTERN @@ -235,7 +235,7 @@ static typelib_t *current_typelib; %token tRETVAL %token tSAFEARRAY %token tSHORT -%token tSIGNED +%token tSIGNED tSINGLENODE %token tSIZEIS tSIZEOF %token tSMALL %token tSOURCE @@ -296,6 +296,7 @@ static typelib_t *current_typelib; %type <statement> statement typedef pragma_warning %type <stmt_list> gbl_statements imp_statements int_statements %type <warning_list> warnings +%type <num> allocate_option_list allocate_option %left ',' %right '?' ':' @@ -1150,16 +1151,20 @@ version: acf_statements : /* empty */ | acf_interface acf_statements + ; acf_int_statements : /* empty */ | acf_int_statement acf_int_statements + ; acf_int_statement : tTYPEDEF acf_attributes aKNOWNTYPE ';' { type_t *type = find_type_or_error($3, 0); type->attrs = append_attr_list(type->attrs, $2); } + ; + acf_interface : acf_attributes tINTERFACE aKNOWNTYPE '{' acf_int_statements '}' { type_t *iface = find_type_or_error2($3, 0); @@ -1167,19 +1172,38 @@ acf_interface error_loc("%s is not an interface\n", iface->name); iface->attrs = append_attr_list(iface->attrs, $1); } + ; acf_attributes : /* empty */ { $$ = NULL; }; | '[' acf_attribute_list ']' { $$ = $2; }; + ; acf_attribute_list : acf_attribute { $$ = append_attr(NULL, $1); } | acf_attribute_list ',' acf_attribute { $$ = append_attr($1, $3); } + ; acf_attribute - : tENCODE { $$ = make_attr(ATTR_ENCODE); } + : tALLOCATE '(' allocate_option_list ')' + { $$ = make_attrv(ATTR_ALLOCATE, $3); } + | tENCODE { $$ = make_attr(ATTR_ENCODE); } | tDECODE { $$ = make_attr(ATTR_DECODE); } | tEXPLICITHANDLE { $$ = make_attr(ATTR_EXPLICIT_HANDLE); } + ; + +allocate_option_list + : allocate_option { $$ = $1; } + | allocate_option_list ',' allocate_option + { $$ = $1 | $3; } + ; + +allocate_option + : tDONTFREE { $$ = FC_DONT_FREE; } + | tFREE { $$ = 0; } + | tALLNODES { $$ = FC_ALLOCATE_ALL_NODES; } + | tSINGLENODE { $$ = 0; } + ; %% @@ -2122,6 +2146,7 @@ struct allowed_attr allowed_attr[] = { /* attr { D ACF I Fn ARG T En Enm St Un Fi L DI M C <display name> } */ /* ATTR_AGGREGATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "aggregatable" }, + /* ATTR_ALLOCATE */ { 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "allocate" }, /* ATTR_ANNOTATION */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "annotation" }, /* ATTR_APPOBJECT */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "appobject" }, /* ATTR_ASYNC */ { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "async" }, diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 04280cbb722..4874dfd6c24 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2153,6 +2153,9 @@ static unsigned int write_nonsimple_pointer(FILE *file, const attr_list_t *attrs type_t *ref = type_pointer_get_ref_type(type); if(is_declptr(ref) && !is_user_type(ref)) flags |= FC_POINTER_DEREF; + if (pointer_type != FC_RP) { + flags |= get_attrv(type->attrs, ATTR_ALLOCATE); + } } print_file(file, 2, "0x%x, 0x%x,\t\t/* %s", @@ -2165,6 +2168,10 @@ static unsigned int write_nonsimple_pointer(FILE *file, const attr_list_t *attrs fprintf(file, " [allocated_on_stack]"); if (flags & FC_POINTER_DEREF) fprintf(file, " [pointer_deref]"); + if (flags & FC_DONT_FREE) + fprintf(file, " [dont_free]"); + if (flags & FC_ALLOCATE_ALL_NODES) + fprintf(file, " [all_nodes]"); fprintf(file, " */\n"); } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 085a0ff55f5..2e2ee7a206b 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -69,6 +69,7 @@ typedef struct list warning_list_t; enum attr_type { ATTR_AGGREGATABLE, + ATTR_ALLOCATE, ATTR_ANNOTATION, ATTR_APPOBJECT, ATTR_ASYNC,

1 0

Biswapriyo Nath : mf/evr: Initialize variables which are checked conditionally.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 8c51bcb8a1d4db65fa1df9d436dc31d4c2ed890d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c51bcb8a1d4db65fa1df9d4… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat Oct 24 18:27:27 2020 +0530 mf/evr: Initialize variables which are checked conditionally. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index e408b204304..4dca8515c94 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -2057,8 +2057,8 @@ static const IMFAttributesVtbl video_renderer_attributes_vtbl = static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct video_renderer *object; - IMFVideoPresenter *presenter; - IMFTransform *mixer; + IMFVideoPresenter *presenter = NULL; + IMFTransform *mixer = NULL; HRESULT hr; TRACE("%p, %p, %p.\n", attributes, user_context, obj);

1 0

Paul Gofman : kernelbase: Align stack in GetProcAddress() on x64.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 6cf3cbe4545bb6c5eb2273ab2ab90645ec2c1469 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cf3cbe4545bb6c5eb2273ab… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 27 14:01:57 2020 +0300 kernelbase: Align stack in GetProcAddress() on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/loader.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 4b615e4a08f..fc9b0ce0083 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -447,18 +447,18 @@ __ASM_GLOBAL_FUNC( GetProcAddress, "movq %rsp,%rbp\n\t" __ASM_SEH(".seh_setframe %rbp,0\n\t") __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") - "subq $0x60,%rsp\n\t" - __ASM_SEH(".seh_stackalloc 0x60\n\t") __ASM_SEH(".seh_endprologue\n\t") - "movaps %xmm0,-0x10(%rbp)\n\t" - "movaps %xmm1,-0x20(%rbp)\n\t" - "movaps %xmm2,-0x30(%rbp)\n\t" - "movaps %xmm3,-0x40(%rbp)\n\t" + "subq $0x60,%rsp\n\t" + "andq $~15,%rsp\n\t" + "movaps %xmm0,0x20(%rsp)\n\t" + "movaps %xmm1,0x30(%rsp)\n\t" + "movaps %xmm2,0x40(%rsp)\n\t" + "movaps %xmm3,0x50(%rsp)\n\t" "call " __ASM_NAME("get_proc_address") "\n\t" - "movaps -0x40(%rbp), %xmm3\n\t" - "movaps -0x30(%rbp), %xmm2\n\t" - "movaps -0x20(%rbp), %xmm1\n\t" - "movaps -0x10(%rbp), %xmm0\n\t" + "movaps 0x50(%rsp), %xmm3\n\t" + "movaps 0x40(%rsp), %xmm2\n\t" + "movaps 0x30(%rsp), %xmm1\n\t" + "movaps 0x20(%rsp), %xmm0\n\t" "leaq 0(%rbp),%rsp\n\t" __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") "popq %rbp\n\t"

1 0

Aaron Hill : qmgr/tests: Test registering an IBackgroundCopyCallback2.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 2148167f2557cc6c7d1e2f5ffef28bd936503a9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2148167f2557cc6c7d1e2f5f… Author: Aaron Hill <aa1ronham(a)gmail.com> Date: Thu Oct 15 20:38:00 2020 -0400 qmgr/tests: Test registering an IBackgroundCopyCallback2. Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/tests/Makefile.in | 2 +- dlls/qmgr/tests/job.c | 137 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 1 deletion(-) diff --git a/dlls/qmgr/tests/Makefile.in b/dlls/qmgr/tests/Makefile.in index 6482d4d9b7a..2bf92a94019 100644 --- a/dlls/qmgr/tests/Makefile.in +++ b/dlls/qmgr/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = qmgr.dll -IMPORTS = ole32 shlwapi user32 +IMPORTS = uuid ole32 shlwapi user32 C_SRCS = \ enum_files.c \ diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 3e1aad1b26b..71da89facad 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -39,6 +39,123 @@ static IBackgroundCopyJob *test_job; static GUID test_jobId; static BG_JOB_TYPE test_type; +typedef struct IBackgroundCopyCallback2Impl { + IBackgroundCopyCallback2 IBackgroundCopyCallback2_iface; + LONG ref; +} IBackgroundCopyCallback2Impl; + +static inline IBackgroundCopyCallback2Impl *impl_from_IBackgroundCopyCallback2(IBackgroundCopyCallback2 *iface) +{ + return CONTAINING_RECORD(iface, IBackgroundCopyCallback2Impl, IBackgroundCopyCallback2_iface); +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_QueryInterface(IBackgroundCopyCallback2 *iface, REFIID riid, void **ppv) +{ + IBackgroundCopyCallback2Impl *This = impl_from_IBackgroundCopyCallback2(iface); + + if (!ppv) + { + return E_INVALIDARG; + } + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IBackgroundCopyCallback) || + IsEqualIID(riid, &IID_IBackgroundCopyCallback2)) + { + *ppv = &This->IBackgroundCopyCallback2_iface; + } + else + { + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI IBackgroundCopyCallback2Impl_AddRef(IBackgroundCopyCallback2 *iface) +{ + IBackgroundCopyCallback2Impl *This = impl_from_IBackgroundCopyCallback2(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + trace("IBackgroundCopyCallback2Impl_AddRef called (%p, ref = %d)\n", This, ref); + return ref; +} + +static ULONG WINAPI IBackgroundCopyCallback2Impl_Release(IBackgroundCopyCallback2 *iface) +{ + IBackgroundCopyCallback2Impl *This = impl_from_IBackgroundCopyCallback2(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + trace("IBackgroundCopyCallback2Impl_Release called (%p, ref = %d)\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_JobError(IBackgroundCopyCallback2 *iface, IBackgroundCopyJob *pJob, IBackgroundCopyError *pError) +{ + trace("IBackgroundCopyCallback2Impl_JobError called (%p, %p, %p)\n", iface, pJob, pError); + return S_OK; +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_JobModification(IBackgroundCopyCallback2 *iface, IBackgroundCopyJob *pJob, DWORD dwReserved) +{ + trace("IBackgroundCopyCallback2Impl_JobModification called (%p, %p)\n", iface, pJob); + return S_OK; +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_JobTransferred(IBackgroundCopyCallback2 *iface, IBackgroundCopyJob *pJob) +{ + trace("IBackgroundCopyCallback2Impl_JobTransferred called (%p, %p)\n", iface, pJob); + return S_OK; +} + +static HRESULT WINAPI IBackgroundCopyCallback2Impl_FileTransferred(IBackgroundCopyCallback2 *iface, IBackgroundCopyJob *pJob, IBackgroundCopyFile *pFile) +{ + trace("IBackgroundCopyCallback2Impl_FileTransferred called (%p, %p, %p)\n", iface, pJob, pFile); + return S_OK; +} + + +static const IBackgroundCopyCallback2Vtbl copyCallback_vtbl = +{ + IBackgroundCopyCallback2Impl_QueryInterface, + IBackgroundCopyCallback2Impl_AddRef, + IBackgroundCopyCallback2Impl_Release, + IBackgroundCopyCallback2Impl_JobTransferred, + IBackgroundCopyCallback2Impl_JobError, + IBackgroundCopyCallback2Impl_JobModification, + IBackgroundCopyCallback2Impl_FileTransferred +}; + +static BOOL create_background_copy_callback2(IBackgroundCopyCallback2 **copyCallback) +{ + IBackgroundCopyCallback2Impl *obj; + *copyCallback = NULL; + + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); + + if (!obj) + { + trace("Out of memory creating IBackgroundCopyCallback2\n"); + return FALSE; + } + + obj->IBackgroundCopyCallback2_iface.lpVtbl = &copyCallback_vtbl; + obj->ref = 1; + + *copyCallback = &obj->IBackgroundCopyCallback2_iface; + + return TRUE; +} + static HRESULT test_create_manager(void) { HRESULT hres; @@ -592,6 +709,20 @@ static void test_HttpOptions(void) unsigned int i; WCHAR *headers; ULONG flags, orig_flags; + IBackgroundCopyCallback2 *copyCallback; + IUnknown *copyCallbackUnknown; + + ok(create_background_copy_callback2(&copyCallback) == TRUE, "create_background_copy_callback2 failed\n"); + + hr = IBackgroundCopyCallback2_QueryInterface(copyCallback, &IID_IUnknown, (LPVOID*)&copyCallbackUnknown); + ok(hr == S_OK,"IBackgroundCopyCallback_QueryInterface(IID_IUnknown) failed: %08x\n", hr); + + hr = IBackgroundCopyJob_SetNotifyInterface(test_job, copyCallbackUnknown); + ok(hr == S_OK,"IBackgroundCopyCallback_SetNotifyInterface failed: %08x\n", hr); + + hr = IBackgroundCopyJob_SetNotifyFlags(test_job, BG_NOTIFY_JOB_TRANSFERRED | BG_NOTIFY_JOB_ERROR | BG_NOTIFY_DISABLE | BG_NOTIFY_JOB_MODIFICATION | BG_NOTIFY_FILE_TRANSFERRED); + ok(hr == S_OK,"IBackgroundCopyCallback_SetNotifyFlags failed: %08x\n", hr); + DeleteFileW(test_localPathA); hr = IBackgroundCopyJob_AddFile(test_job, L"http://test.winehq.org/", test_localPathA); @@ -710,6 +841,12 @@ static void test_HttpOptions(void) ok(hr == BG_E_INVALID_STATE, "got 0x%08x\n", hr); DeleteFileW(test_localPathA); + + hr = IBackgroundCopyJob_SetNotifyInterface(test_job, NULL); + ok(hr == BG_E_INVALID_STATE, "got 0x%08x\n", hr); + + IUnknown_Release(copyCallbackUnknown); + IBackgroundCopyCallback2_Release(copyCallback); } typedef void (*test_t)(void);

1 0

Nikolay Sivov : mfplat: Add IMFGetService stub for 2D memory buffer.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 77d1701b99f0a9fdfe95f9412246a8d008875591 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77d1701b99f0a9fdfe95f941… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 27 20:50:19 2020 +0300 mfplat: Add IMFGetService stub for 2D memory buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/tests/mfplat.c | 13 +++++++++++++ 2 files changed, 57 insertions(+) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index a3311bc10f1..5e969e14ec9 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -31,6 +31,7 @@ struct memory_buffer { IMFMediaBuffer IMFMediaBuffer_iface; IMF2DBuffer2 IMF2DBuffer2_iface; + IMFGetService IMFGetService_iface; LONG refcount; BYTE *data; @@ -88,6 +89,11 @@ static struct memory_buffer *impl_from_IMF2DBuffer2(IMF2DBuffer2 *iface) return CONTAINING_RECORD(iface, struct memory_buffer, IMF2DBuffer2_iface); } +static struct memory_buffer *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct memory_buffer, IMFGetService_iface); +} + static inline struct sample *impl_from_IMFSample(IMFSample *iface) { return CONTAINING_RECORD(iface, struct sample, IMFSample_iface); @@ -240,6 +246,10 @@ static HRESULT WINAPI memory_1d_2d_buffer_QueryInterface(IMFMediaBuffer *iface, { *out = &buffer->IMF2DBuffer2_iface; } + else if (IsEqualIID(riid, &IID_IMFGetService)) + { + *out = &buffer->IMFGetService_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -511,6 +521,39 @@ static const IMF2DBuffer2Vtbl memory_2d_buffer_vtbl = memory_2d_buffer_Copy2DTo, }; +static HRESULT WINAPI memory_2d_buffer_gs_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct memory_buffer *buffer = impl_from_IMFGetService(iface); + return IMFMediaBuffer_QueryInterface(&buffer->IMFMediaBuffer_iface, riid, obj); +} + +static ULONG WINAPI memory_2d_buffer_gs_AddRef(IMFGetService *iface) +{ + struct memory_buffer *buffer = impl_from_IMFGetService(iface); + return IMFMediaBuffer_AddRef(&buffer->IMFMediaBuffer_iface); +} + +static ULONG WINAPI memory_2d_buffer_gs_Release(IMFGetService *iface) +{ + struct memory_buffer *buffer = impl_from_IMFGetService(iface); + return IMFMediaBuffer_Release(&buffer->IMFMediaBuffer_iface); +} + +static HRESULT WINAPI memory_2d_buffer_gs_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static const IMFGetServiceVtbl memory_2d_buffer_gs_vtbl = +{ + memory_2d_buffer_gs_QueryInterface, + memory_2d_buffer_gs_AddRef, + memory_2d_buffer_gs_Release, + memory_2d_buffer_gs_GetService, +}; + static HRESULT memory_buffer_init(struct memory_buffer *buffer, DWORD max_length, DWORD alignment, const IMFMediaBufferVtbl *vtbl) { @@ -620,6 +663,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo } object->IMF2DBuffer2_iface.lpVtbl = &memory_2d_buffer_vtbl; + object->IMFGetService_iface.lpVtbl = &memory_2d_buffer_gs_vtbl; object->_2d.plane_size = plane_size; object->_2d.width = stride; object->_2d.height = height; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 971469ec574..906454851a8 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1818,6 +1818,7 @@ static void test_system_memory_buffer(void) HRESULT hr; DWORD length, max; BYTE *data, *data2; + IUnknown *unk; hr = MFCreateMemoryBuffer(1024, NULL); ok(hr == E_INVALIDARG || hr == E_POINTER, "got 0x%08x\n", hr); @@ -1836,6 +1837,9 @@ static void test_system_memory_buffer(void) hr = MFCreateMemoryBuffer(1024, &buffer); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + hr = IMFMediaBuffer_GetMaxLength(buffer, NULL); ok(hr == E_INVALIDARG || hr == E_POINTER, "got 0x%08x\n", hr); @@ -5155,6 +5159,7 @@ static void test_MFCreate2DMediaBuffer(void) IMF2DBuffer *_2dbuffer; IMFMediaBuffer *buffer; int i, pitch, pitch2; + IUnknown *unk; HRESULT hr; BOOL ret; @@ -5177,6 +5182,10 @@ static void test_MFCreate2DMediaBuffer(void) hr = pMFCreate2DMediaBuffer(2, 3, MAKEFOURCC('N','V','1','2'), FALSE, &buffer); ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + /* Full backing buffer size, with 64 bytes per row alignment. */ hr = IMFMediaBuffer_GetMaxLength(buffer, &max_length); ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); @@ -5405,6 +5414,7 @@ static void test_MFCreateMediaBufferFromMediaType(void) HRESULT hr; IMFMediaType *media_type; unsigned int i; + IUnknown *unk; if (!pMFCreateMediaBufferFromMediaType) { @@ -5437,6 +5447,9 @@ static void test_MFCreateMediaBufferFromMediaType(void) if (FAILED(hr)) break; + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); ok(ptr->buffer_length == length, "%d: unexpected buffer length %u, expected %u.\n", i, length, ptr->buffer_length);

1 0

Hans Leidekker : msi: Use wide character string literals in action.c.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 8e13b0b99c823bc22c7eef8b8dac04de283ca462 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e13b0b99c823bc22c7eef8b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 27 11:31:41 2020 +0100 msi: Use wide character string literals in action.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 1340 ++++++++++++++++------------------------------------- 1 file changed, 407 insertions(+), 933 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8e13b0b99c823bc22c7e…

1 0

Alexandre Julliard : gdi32: Add a helper to load a font without using a face.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 0bf2c11d43cbd36ed258c868491422083f3c7f64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bf2c11d43cbd36ed258c868… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 14:10:41 2020 +0100 gdi32: Add a helper to load a font without using a face. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 259 ++++++++++++++++++++++++-------------------------- 1 file changed, 122 insertions(+), 137 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0bf2c11d43cbd36ed258…

1 0

Alexandre Julliard : gdi32: Allocate the backend font data in the load_font() helper.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 5772b064ac0194f784640f79701e384a1ffbeb3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5772b064ac0194f784640f79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 14:25:32 2020 +0100 gdi32: Allocate the backend font data in the load_font() helper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 5 ----- dlls/gdi32/freetype.c | 20 ++++++-------------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 4e1c69d886e..02cd618f956 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -487,11 +487,6 @@ struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_ HeapFree( GetProcessHeap(), 0, font ); return NULL; } - if (font_funcs && !font_funcs->alloc_font( font )) - { - free_gdi_font( font ); - return NULL; - } return font; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b4764d1e8c9..d941fb18bf6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3666,18 +3666,6 @@ static UINT get_nearest_charset(const WCHAR *family_name, Face *face, UINT *cp) return DEFAULT_CHARSET; } -/************************************************************* - * freetype_alloc_font - */ -static BOOL CDECL freetype_alloc_font( struct gdi_font *font ) -{ - GdiFont *ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)); - list_init(&ret->child_fonts); - ret->gdi_font = font; - font->private = ret; - return TRUE; -} - /************************************************************* * freetype_destroy_font */ @@ -4325,12 +4313,17 @@ static DWORD get_ttc_offset( FT_Face ft_face, UINT face_index ) static BOOL load_font( struct gdi_font *gdi_font ) { - GdiFont *font = get_font_ptr( gdi_font ); + GdiFont *font; INT width = 0, height; FT_Face ft_face; void *data_ptr; SIZE_T data_size; + if (!(font = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*font) ))) return FALSE; + gdi_font->private = font; + font->gdi_font = gdi_font; + list_init( &font->child_fonts ); + if (gdi_font->file[0]) { char *filename = wine_get_unix_file_name( gdi_font->file ); @@ -7294,7 +7287,6 @@ static const struct font_backend_funcs font_funcs = freetype_add_font, freetype_add_mem_font, freetype_remove_font, - freetype_alloc_font, freetype_get_font_data, freetype_get_glyph_index, freetype_get_default_glyph, diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index aa6e6ddcaa9..32d50935308 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -376,7 +376,6 @@ struct font_backend_funcs INT (CDECL *add_mem_font)( void *ptr, SIZE_T size, DWORD flags ); BOOL (CDECL *remove_font)( const WCHAR *file, DWORD flags ); - BOOL (CDECL *alloc_font)( struct gdi_font *font ); DWORD (CDECL *get_font_data)( struct gdi_font *gdi_font, DWORD table, DWORD offset, void *buf, DWORD count ); BOOL (CDECL *get_glyph_index)( struct gdi_font *gdi_font, UINT *glyph );

1 0

Paul Gofman : kernel32: Align stack in get_proc_address_wrapper().
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 94f22b56a8139b9648094dad520d8a09466f6560 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94f22b56a8139b9648094dad… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Oct 27 14:01:55 2020 +0300 kernel32: Align stack in get_proc_address_wrapper(). Fixes crash on start in Nier Automata after switching kernel32 to PE. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 12100c1fe23..9b3a3952307 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -320,18 +320,18 @@ __ASM_GLOBAL_FUNC( get_proc_address_wrapper, "movq %rsp,%rbp\n\t" __ASM_SEH(".seh_setframe %rbp,0\n\t") __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") - "subq $0x40,%rsp\n\t" - __ASM_SEH(".seh_stackalloc 0x40\n\t") __ASM_SEH(".seh_endprologue\n\t") - "movaps %xmm0,-0x10(%rbp)\n\t" - "movaps %xmm1,-0x20(%rbp)\n\t" - "movaps %xmm2,-0x30(%rbp)\n\t" - "movaps %xmm3,-0x40(%rbp)\n\t" + "subq $0x60,%rsp\n\t" + "andq $~15,%rsp\n\t" + "movaps %xmm0,0x20(%rsp)\n\t" + "movaps %xmm1,0x30(%rsp)\n\t" + "movaps %xmm2,0x40(%rsp)\n\t" + "movaps %xmm3,0x50(%rsp)\n\t" "call " __ASM_NAME("get_proc_address") "\n\t" - "movaps -0x40(%rbp), %xmm3\n\t" - "movaps -0x30(%rbp), %xmm2\n\t" - "movaps -0x20(%rbp), %xmm1\n\t" - "movaps -0x10(%rbp), %xmm0\n\t" + "movaps 0x50(%rsp), %xmm3\n\t" + "movaps 0x40(%rsp), %xmm2\n\t" + "movaps 0x30(%rsp), %xmm1\n\t" + "movaps 0x20(%rsp), %xmm0\n\t" "leaq 0(%rbp),%rsp\n\t" __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") "popq %rbp\n\t"

1 0

Esme Povirk : windowscodecs: Move TIFF decoding to unix lib.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 6abf518ece5c0a8955ed5c6a343292a67d818a88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6abf518ece5c0a8955ed5c6a… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Oct 27 12:54:42 2020 -0500 windowscodecs: Move TIFF decoding to unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/decoder.c | 76 +- dlls/windowscodecs/libtiff.c | 1187 ++++++++++++++++++++++++++ dlls/windowscodecs/main.c | 32 +- dlls/windowscodecs/tiffformat.c | 1428 +------------------------------- dlls/windowscodecs/unix_iface.c | 1 + dlls/windowscodecs/unix_lib.c | 8 + dlls/windowscodecs/wincodecs_common.h | 19 + dlls/windowscodecs/wincodecs_private.h | 7 + 9 files changed, 1312 insertions(+), 1447 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6abf518ece5c0a8955ed…

1 0

Nikolay Sivov : evr: Implement sample allocator.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 26d5d384f15f5fd1080d6d8b138c211d810eb88b URL: https://source.winehq.org/git/wine.git/?a=commit;h=26d5d384f15f5fd1080d6d8b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 27 20:50:20 2020 +0300 evr: Implement sample allocator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 284 +++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/evr/tests/evr.c | 23 ++--- dlls/mf/tests/mf.c | 1 - 3 files changed, 283 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=26d5d384f15f5fd1080d…

1 0

Alexandre Julliard : gdi32: Move the CreateScalableFontResource() implementation out of freetype.c.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: ed9114c1181c1af67264433f6910039a31882052 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed9114c1181c1af67264433f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 14:25:47 2020 +0100 gdi32: Move the CreateScalableFontResource() implementation out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 249 +++++++++++++++++++++++++++++++++++++- dlls/gdi32/freetype.c | 309 ++--------------------------------------------- dlls/gdi32/gdi_private.h | 3 +- 3 files changed, 257 insertions(+), 304 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed9114c1181c1af67264…

1 0

Zhiyi Zhang : user32/tests: Test changing to a valid depth but zero width and height display mode.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 2756cabbe43afcc1b10c2156765a5a5c12e8f721 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2756cabbe43afcc1b10c2156… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 27 14:59:34 2020 +0800 user32/tests: Test changing to a valid depth but zero width and height display mode. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 119 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 0ce27455a66..d7d9086672d 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -323,6 +323,7 @@ static void test_ChangeDisplaySettingsEx(void) { static const DWORD registry_fields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; + static const DWORD depths[] = {8, 16, 32}; DPI_AWARENESS_CONTEXT context = NULL; UINT primary, device, test, mode; UINT device_size, device_count; @@ -600,9 +601,127 @@ static void test_ChangeDisplaySettingsEx(void) ok(count == old_count, "Expect monitor count %d, got %d\n", old_count, count); } + /* Test changing to a mode with depth set but with zero width and height */ + /* This test is only ran for non-primary adapters for now as it may detach the adapters on Wine */ + for (device = 1; device < device_count; ++device) + { + for (test = 0; test < ARRAY_SIZE(depths); ++test) + { + /* Find the native resolution */ + memset(&dm, 0, sizeof(dm)); + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm2, 0); ++mode) + { + if (dm2.dmBitsPerPel == depths[test] + && dm2.dmPelsWidth > dm.dmPelsWidth && dm2.dmPelsHeight > dm.dmPelsHeight) + dm = dm2; + } + if (dm.dmBitsPerPel != depths[test]) + { + skip("Depth %u is unsupported for %s.\n", depths[test], devices[device].name); + continue; + } + + /* Find the second resolution */ + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm2, 0); ++mode) + { + if (dm2.dmBitsPerPel == depths[test] + && dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) + break; + } + if (dm2.dmBitsPerPel != depths[test] + || dm2.dmPelsWidth == dm.dmPelsWidth || dm2.dmPelsHeight == dm.dmPelsHeight) + { + skip("Failed to find the second mode for %s.\n", devices[device].name); + continue; + } + + /* Find the third resolution */ + memset(&dm3, 0, sizeof(dm3)); + dm3.dmSize = sizeof(dm3); + for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm3, 0); ++mode) + { + if (dm3.dmBitsPerPel == depths[test] + && dm3.dmPelsWidth != dm.dmPelsWidth && dm3.dmPelsHeight != dm.dmPelsHeight + && dm3.dmPelsWidth != dm2.dmPelsWidth && dm3.dmPelsHeight != dm2.dmPelsHeight) + break; + } + if (dm3.dmBitsPerPel != depths[test] + || dm3.dmPelsWidth == dm.dmPelsWidth || dm3.dmPelsHeight == dm.dmPelsHeight + || dm3.dmPelsWidth == dm2.dmPelsWidth || dm3.dmPelsHeight == dm2.dmPelsHeight) + { + skip("Failed to find the third mode for %s.\n", devices[device].name); + continue; + } + + /* Change the current mode to the third mode first */ + res = ChangeDisplaySettingsExA(devices[device].name, &dm3, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL + || broken(res == DISP_CHANGE_FAILED), /* Win8 TestBots */ + "ChangeDisplaySettingsExA %s returned unexpected %d.\n", devices[device].name, res); + if (res != DISP_CHANGE_SUCCESSFUL) + { + win_skip("Failed to change display mode for %s.\n", devices[device].name); + continue; + } + flush_events(); + expect_dm(dm3, devices[device].name, test); + + /* Change the registry mode to the second mode */ + res = ChangeDisplaySettingsExA(devices[device].name, &dm2, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL + || broken(res == DISP_CHANGE_BADFLAGS), /* Win10 32bit */ + "ChangeDisplaySettingsExA %s returned unexpected %d.\n", devices[device].name, res); + + /* Change to a mode with depth set but with zero width and height */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + dm.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; + dm.dmBitsPerPel = depths[test]; + res = ChangeDisplaySettingsExA(devices[device].name, &dm, NULL, CDS_RESET, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + devices[device].name, res); + flush_events(); + + dd.cb = sizeof(dd); + res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); + ok(res, "EnumDisplayDevicesA %s failed, error %#x.\n", devices[device].name, GetLastError()); + todo_wine ok(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, "Expect %s attached.\n", + devices[device].name); + if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); + ok(res, "Device %s EnumDisplaySettingsA failed, error %#x.\n", devices[device].name, GetLastError()); + todo_wine_if(depths[test] != 32) + ok(dm.dmBitsPerPel == depths[test], "Device %s expect dmBitsPerPel %u, got %u.\n", + devices[device].name, depths[test], dm.dmBitsPerPel); + /* 2008 resets to the resolution in the registry. Newer versions of Windows doesn't + * change the current resolution */ + ok(dm.dmPelsWidth == dm3.dmPelsWidth || broken(dm.dmPelsWidth == dm2.dmPelsWidth), + "Device %s expect dmPelsWidth %u, got %u.\n", + devices[device].name, dm3.dmPelsWidth, dm.dmPelsWidth); + ok(dm.dmPelsHeight == dm3.dmPelsHeight || broken(dm.dmPelsHeight == dm2.dmPelsHeight), + "Device %s expect dmPelsHeight %u, got %u.\n", + devices[device].name, dm3.dmPelsHeight, dm.dmPelsHeight); + } + } + /* Detach all non-primary adapters to avoid position conflicts */ for (device = 1; device < device_count; ++device) { + dd.cb = sizeof(dd); + res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); + ok(res, "EnumDisplayDevicesA %s failed, error %#x.\n", devices[device].name, GetLastError()); + /* Already detached by previous tests */ + if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + old_count = GetSystemMetrics(SM_CMONITORS); memset(&dm, 0, sizeof(dm));

1 0

Zhiyi Zhang : user32: Use current width or height if a mode specifies zero width or height for ChangeDisplaySettingsExW().
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: e6b2da317350547f6d6cb6b8f52831428cf84cc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6b2da317350547f6d6cb6b8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Oct 27 15:00:47 2020 +0800 user32: Use current width or height if a mode specifies zero width or height for ChangeDisplaySettingsExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 16 ++++++++++++++++ dlls/user32/tests/monitor.c | 16 +++------------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index d4640e0068e..1381f387e03 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3182,6 +3182,22 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND return DISP_CHANGE_BADMODE; } + if (!is_detached_mode(devmode) && (!devmode->dmPelsWidth || !devmode->dmPelsHeight)) + { + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + if (!EnumDisplaySettingsExW(devname, ENUM_CURRENT_SETTINGS, &dm, 0)) + { + ERR("Current mode not found!\n"); + return DISP_CHANGE_BADMODE; + } + + if (!devmode->dmPelsWidth) + devmode->dmPelsWidth = dm.dmPelsWidth; + if (!devmode->dmPelsHeight) + devmode->dmPelsHeight = dm.dmPelsHeight; + } + ret = USER_Driver->pChangeDisplaySettingsEx(devname, devmode, hwnd, flags, lparam); if (ret != DISP_CHANGE_SUCCESSFUL) ERR("Changing %s display settings returned %d.\n", wine_dbgstr_w(devname), ret); diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index d7d9086672d..009fc0d626e 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -602,8 +602,7 @@ static void test_ChangeDisplaySettingsEx(void) } /* Test changing to a mode with depth set but with zero width and height */ - /* This test is only ran for non-primary adapters for now as it may detach the adapters on Wine */ - for (device = 1; device < device_count; ++device) + for (device = 0; device < device_count; ++device) { for (test = 0; test < ARRAY_SIZE(depths); ++test) { @@ -689,10 +688,8 @@ static void test_ChangeDisplaySettingsEx(void) dd.cb = sizeof(dd); res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); ok(res, "EnumDisplayDevicesA %s failed, error %#x.\n", devices[device].name, GetLastError()); - todo_wine ok(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, "Expect %s attached.\n", - devices[device].name); - if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) - continue; + ok(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, "Expect %s attached.\n", + devices[device].name); memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); @@ -715,13 +712,6 @@ static void test_ChangeDisplaySettingsEx(void) /* Detach all non-primary adapters to avoid position conflicts */ for (device = 1; device < device_count; ++device) { - dd.cb = sizeof(dd); - res = EnumDisplayDevicesA(NULL, devices[device].index, &dd, 0); - ok(res, "EnumDisplayDevicesA %s failed, error %#x.\n", devices[device].name, GetLastError()); - /* Already detached by previous tests */ - if (!(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) - continue; - old_count = GetSystemMetrics(SM_CMONITORS); memset(&dm, 0, sizeof(dm));

1 0

Alexandre Julliard : gdi32: Move the loading of filesystem fonts out of freetype.c.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 7b291a094d20e315d44ae88a09529581556fd9d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b291a094d20e315d44ae88a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 10:27:32 2020 +0100 gdi32: Move the loading of filesystem fonts out of freetype.c. The fonts Path value now expects DOS paths. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 68 ++++++++++++++++++++++++++++++++++---------- dlls/gdi32/freetype.c | 73 ++---------------------------------------------- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 58 insertions(+), 85 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3718d73f871..4e1c69d886e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -359,36 +359,26 @@ CRITICAL_SECTION font_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; #define WINE_FONT_DIR "fonts" #endif -void get_font_dir( WCHAR *path ) +static void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) { - static const WCHAR slashW[] = {'\\',0}; - static const WCHAR fontsW[] = {'\\','f','o','n','t','s',0}; + static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; static const WCHAR winedatadirW[] = {'W','I','N','E','D','A','T','A','D','I','R',0}; static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R',0}; if (GetEnvironmentVariableW( winedatadirW, path, MAX_PATH )) { - const char fontdir[] = WINE_FONT_DIR; - strcatW( path, slashW ); + const char fontdir[] = "\\" WINE_FONT_DIR "\\"; MultiByteToWideChar( CP_ACP, 0, fontdir, -1, path + strlenW(path), MAX_PATH - strlenW(path) ); } else if (GetEnvironmentVariableW( winebuilddirW, path, MAX_PATH )) { strcatW( path, fontsW ); } + strcatW( path, file ); if (path[5] == ':') memmove( path, path + 4, (strlenW(path) - 3) * sizeof(WCHAR) ); else path[1] = '\\'; /* change \??\ to \\?\ */ } -static void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) -{ - static const WCHAR slashW[] = {'\\',0}; - - get_font_dir( path ); - strcatW( path, slashW ); - strcatW( path, file ); -} - static void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) { static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; @@ -5402,6 +5392,56 @@ void load_system_bitmap_fonts(void) RegCloseKey( hkey ); } +static void load_directory_fonts( WCHAR *path, UINT flags ) +{ + HANDLE handle; + WIN32_FIND_DATAW data; + WCHAR *p; + + p = path + strlenW(path) - 1; + TRACE( "loading fonts from %s\n", debugstr_w(path) ); + handle = FindFirstFileW( path, &data ); + if (handle == INVALID_HANDLE_VALUE) return; + do + { + if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; + strcpyW( p, data.cFileName ); + font_funcs->add_font( path, flags ); + } while (FindNextFileW( handle, &data )); + FindClose( handle ); +} + +void load_file_system_fonts(void) +{ + static const WCHAR pathW[] = {'P','a','t','h',0}; + static const WCHAR slashstarW[] = {'\\','*',0}; + static const WCHAR starW[] = {'*',0}; + WCHAR *ptr, *next, path[MAX_PATH], value[1024]; + DWORD len = ARRAY_SIZE(value); + + /* Windows directory */ + get_fonts_win_dir_path( starW, path ); + load_directory_fonts( path, ADDFONT_ADD_TO_CACHE ); + + /* Wine data directory */ + get_fonts_data_dir_path( starW, path ); + load_directory_fonts( path, ADDFONT_ADD_TO_CACHE | ADDFONT_EXTERNAL_FONT ); + + /* custom paths */ + /* @@ Wine registry key: HKCU\Software\Wine\Fonts */ + if (!RegQueryValueExW( wine_fonts_key, pathW, NULL, NULL, (BYTE *)value, &len )) + { + for (ptr = value; ptr; ptr = next) + { + if ((next = strchrW( ptr, ';' ))) *next++ = 0; + if (next && next - ptr < 2) continue; + lstrcpynW( path, ptr, MAX_PATH - 2 ); + strcatW( path, slashstarW ); + load_directory_fonts( path, ADDFONT_ADD_TO_CACHE | ADDFONT_EXTERNAL_FONT ); + } + } +} + void load_registry_fonts(void) { static const WCHAR dot_fonW[] = {'.','f','o','n',0}; diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ee628a08304..0a5f5af491b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -329,7 +329,6 @@ static struct list font_list = LIST_INIT(font_list); static const struct font_backend_funcs font_funcs; -static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\0'}; static const WCHAR win9x_font_reg_key[] = {'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','\\', @@ -2545,6 +2544,7 @@ skip_internal: list_add_tail(&system_links, &system_font_link->entry); } +#ifdef __ANDROID__ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) { DIR *dir; @@ -2585,16 +2585,7 @@ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) closedir(dir); return TRUE; } - -static void read_font_dir( const WCHAR *dirname, BOOL external_fonts ) -{ - char *unixname = wine_get_unix_file_name( dirname ); - if (unixname) - { - ReadFontDir( unixname, external_fonts ); - HeapFree( GetProcessHeap(), 0, unixname ); - } -} +#endif #ifdef SONAME_LIBFONTCONFIG @@ -3407,24 +3398,9 @@ sym_not_found: static void init_font_list(void) { - static const WCHAR pathW[] = {'P','a','t','h',0}; - HKEY hkey; - WCHAR path[MAX_PATH]; - char *unixname; - delete_external_font_keys(); - load_system_bitmap_fonts(); - - /* load in the fonts from %WINDOWSDIR%\\Fonts first of all */ - GetWindowsDirectoryW(path, ARRAY_SIZE(path)); - strcatW(path, fontsW); - read_font_dir( path, FALSE ); - - /* load the wine fonts */ - get_font_dir( path ); - read_font_dir( path, TRUE ); - + load_file_system_fonts(); load_registry_fonts(); #ifdef SONAME_LIBFONTCONFIG @@ -3434,49 +3410,6 @@ static void init_font_list(void) #elif defined(__ANDROID__) ReadFontDir("/system/fonts", TRUE); #endif - - /* then look in any directories that we've specified in the config file */ - /* @@ Wine registry key: HKCU\Software\Wine\Fonts */ - if(RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Fonts", &hkey) == ERROR_SUCCESS) - { - DWORD len; - LPWSTR valueW; - LPSTR valueA, ptr; - - if (RegQueryValueExW( hkey, pathW, NULL, NULL, NULL, &len ) == ERROR_SUCCESS) - { - len += sizeof(WCHAR); - valueW = HeapAlloc( GetProcessHeap(), 0, len ); - if (RegQueryValueExW( hkey, pathW, NULL, NULL, (LPBYTE)valueW, &len ) == ERROR_SUCCESS) - { - len = WideCharToMultiByte( CP_UNIXCP, 0, valueW, -1, NULL, 0, NULL, NULL ); - valueA = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_UNIXCP, 0, valueW, -1, valueA, len, NULL, NULL ); - TRACE( "got font path %s\n", debugstr_a(valueA) ); - ptr = valueA; - while (ptr) - { - const char* home; - LPSTR next = strchr( ptr, ':' ); - if (next) *next++ = 0; - if (ptr[0] == '~' && ptr[1] == '/' && (home = getenv( "HOME" )) && - (unixname = HeapAlloc( GetProcessHeap(), 0, strlen(ptr) + strlen(home) ))) - { - strcpy( unixname, home ); - strcat( unixname, ptr + 1 ); - ReadFontDir( unixname, TRUE ); - HeapFree( GetProcessHeap(), 0, unixname ); - } - else - ReadFontDir( ptr, TRUE ); - ptr = next; - } - HeapFree( GetProcessHeap(), 0, valueA ); - } - HeapFree( GetProcessHeap(), 0, valueW ); - } - RegCloseKey(hkey); - } } static BOOL move_to_front(const WCHAR *name) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 080f53c1b61..aa6e6ddcaa9 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -389,8 +389,8 @@ struct font_backend_funcs void (CDECL *destroy_font)( struct gdi_font *font ); }; -extern void get_font_dir( WCHAR *path ) DECLSPEC_HIDDEN; extern void load_system_bitmap_fonts(void) DECLSPEC_HIDDEN; +extern void load_file_system_fonts(void) DECLSPEC_HIDDEN; extern void load_registry_fonts(void) DECLSPEC_HIDDEN; extern struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_size ) DECLSPEC_HIDDEN;

1 0

Huw Davies : riched20: Use row and para helpers in the extend selection function.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 245b9231c555a989138b3c97c6bef68f68973320 URL: https://source.winehq.org/git/wine.git/?a=commit;h=245b9231c555a989138b3c97… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 08:23:26 2020 +0000 riched20: Use row and para helpers in the extend selection function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 58 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 834f9fd3afe..d92b93ac2f0 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1044,37 +1044,53 @@ static void ME_ExtendAnchorSelection(ME_TextEditor *editor) { /* Extend the left side of selection */ editor->pCursors[1] = tmp_cursor; - if (editor->nSelectionType == stWord) + switch (editor->nSelectionType) + { + case stWord: ME_MoveCursorWords(editor, &editor->pCursors[1], -1); - else + break; + + case stLine: { - ME_DisplayItem *pItem; - ME_DIType searchType = ((editor->nSelectionType == stLine) ? - diStartRowOrParagraph:diParagraph); - pItem = ME_FindItemBack(editor->pCursors[1].pRun, searchType); - editor->pCursors[1].pRun = ME_FindItemFwd(pItem, diRun); - editor->pCursors[1].pPara = ME_GetParagraph(editor->pCursors[1].pRun); + ME_Row *row = row_from_cursor( editor->pCursors + 1 ); + row_first_cursor( row, editor->pCursors + 1 ); + break; + } + + case stParagraph: + editor->pCursors[1].pRun = run_get_di( para_first_run( &editor->pCursors[1].pPara->member.para ) ); editor->pCursors[1].nOffset = 0; + break; + + default: + break; } } else if (curOfs >= anchorEndOfs) { /* Extend the right side of selection */ editor->pCursors[0] = tmp_cursor; - if (editor->nSelectionType == stWord) - ME_MoveCursorWords(editor, &editor->pCursors[0], +1); - else + switch (editor->nSelectionType) { - ME_DisplayItem *pItem; - ME_DIType searchType = ((editor->nSelectionType == stLine) ? - diStartRowOrParagraphOrEnd:diParagraphOrEnd); - pItem = ME_FindItemFwd(editor->pCursors[0].pRun, searchType); - if (pItem->type == diTextEnd) - editor->pCursors[0].pRun = ME_FindItemBack(pItem, diRun); - else - editor->pCursors[0].pRun = ME_FindItemFwd(pItem, diRun); - editor->pCursors[0].pPara = ME_GetParagraph(editor->pCursors[0].pRun); - editor->pCursors[0].nOffset = 0; + case stWord: + ME_MoveCursorWords( editor, &editor->pCursors[0], +1 ); + break; + + case stLine: + { + ME_Row *row = row_from_cursor( editor->pCursors ); + row_end_cursor( row, editor->pCursors, TRUE ); + break; + } + + case stParagraph: + editor->pCursors[0].pRun = run_get_di( para_end_run( &editor->pCursors[0].pPara->member.para ) ); + editor->pCursors[0].pPara = para_get_di( editor->pCursors[0].pRun->member.run.para ); + editor->pCursors[0].nOffset = editor->pCursors[0].pRun->member.run.len; + break; + + default: + break; } } }

1 0

Alexandre Julliard : gdi32: Move the loading of registry fonts out of freetype.c.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 2c1a42bc675425f9820f05752a9904268a8a610c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c1a42bc675425f9820f0575… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 10:27:20 2020 +0100 gdi32: Move the loading of registry fonts out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 49 ++++++++++++++++++++++++++++++++++++++++++-- dlls/gdi32/freetype.c | 53 +----------------------------------------------- dlls/gdi32/gdi_private.h | 3 +-- 3 files changed, 49 insertions(+), 56 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d4ed29d7fd9..3718d73f871 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -109,6 +109,11 @@ static inline INT INTERNAL_YWSTODS(DC *dc, INT height) return pt[1].y - pt[0].y; } +static inline BOOL is_win9x(void) +{ + return GetVersion() & 0x80000000; +} + static inline WCHAR *strdupW( const WCHAR *p ) { WCHAR *ret; @@ -375,7 +380,7 @@ void get_font_dir( WCHAR *path ) else path[1] = '\\'; /* change \??\ to \\?\ */ } -void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) +static void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) { static const WCHAR slashW[] = {'\\',0}; @@ -384,7 +389,7 @@ void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) strcatW( path, file ); } -void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) +static void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) { static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; @@ -5397,6 +5402,46 @@ void load_system_bitmap_fonts(void) RegCloseKey( hkey ); } +void load_registry_fonts(void) +{ + static const WCHAR dot_fonW[] = {'.','f','o','n',0}; + static const WCHAR win9x_key[] = {'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','\\', + 'F','o','n','t','s',0}; + static const WCHAR winnt_key[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'F','o','n','t','s',0}; + WCHAR value[MAX_PATH], data[MAX_PATH]; + DWORD i = 0, type, dlen, vlen; + HKEY hkey; + + /* Look under HKLM\Software\Microsoft\Windows[ NT]\CurrentVersion\Fonts + for any fonts not installed in %WINDOWSDIR%\Fonts. They will have their + full path as the entry. Also look for any .fon fonts, since ReadFontDir + will skip these. */ + if (RegOpenKeyW( HKEY_LOCAL_MACHINE, is_win9x() ? win9x_key : winnt_key, &hkey )) + return; + + vlen = ARRAY_SIZE(value); + dlen = sizeof(data); + while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, (LPBYTE)data, &dlen )) + { + dlen /= sizeof(WCHAR); + if (data[0] && data[1] == ':') + add_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); + else if (dlen >= 6 && !strcmpiW( data + dlen - 5, dot_fonW )) + add_system_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); + + vlen = ARRAY_SIZE(value); + dlen = sizeof(data); + } + RegCloseKey( hkey ); +} + /*********************************************************************** * AddFontResourceExW (GDI32.@) */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 0a05f6a701c..ee628a08304 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -768,10 +768,6 @@ static char **expand_mac_font(const char *path) #endif /* HAVE_CARBON_CARBON_H */ -static inline BOOL is_win9x(void) -{ - return GetVersion() & 0x80000000; -} /* This function builds an FT_Fixed from a double. It fails if the absolute value of the float number is greater than 32768. @@ -3411,10 +3407,8 @@ sym_not_found: static void init_font_list(void) { - static const WCHAR dot_fonW[] = {'.','f','o','n','\0'}; static const WCHAR pathW[] = {'P','a','t','h',0}; HKEY hkey; - DWORD valuelen, datalen, i = 0, type, dlen, vlen; WCHAR path[MAX_PATH]; char *unixname; @@ -3431,52 +3425,7 @@ static void init_font_list(void) get_font_dir( path ); read_font_dir( path, TRUE ); - /* now look under HKLM\Software\Microsoft\Windows[ NT]\CurrentVersion\Fonts - for any fonts not installed in %WINDOWSDIR%\Fonts. They will have their - full path as the entry. Also look for any .fon fonts, since ReadFontDir - will skip these. */ - if(RegOpenKeyW(HKEY_LOCAL_MACHINE, - is_win9x() ? win9x_font_reg_key : winnt_font_reg_key, - &hkey) == ERROR_SUCCESS) - { - LPWSTR data, valueW; - RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - &valuelen, &datalen, NULL, NULL); - - valuelen++; /* returned value doesn't include room for '\0' */ - valueW = HeapAlloc(GetProcessHeap(), 0, valuelen * sizeof(WCHAR)); - data = HeapAlloc(GetProcessHeap(), 0, datalen * sizeof(WCHAR)); - if (valueW && data) - { - dlen = datalen * sizeof(WCHAR); - vlen = valuelen; - while(RegEnumValueW(hkey, i++, valueW, &vlen, NULL, &type, (LPBYTE)data, - &dlen) == ERROR_SUCCESS) - { - if(data[0] && (data[1] == ':')) - { - freetype_add_font( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE); - } - else if(dlen / 2 >= 6 && !strcmpiW(data + dlen / 2 - 5, dot_fonW)) - { - WCHAR pathW[MAX_PATH]; - - get_fonts_win_dir_path( data, pathW ); - if (!freetype_add_font( pathW, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE )) - { - get_fonts_data_dir_path( data, pathW ); - freetype_add_font( pathW, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); - } - } - /* reset dlen and vlen */ - dlen = datalen; - vlen = valuelen; - } - } - HeapFree(GetProcessHeap(), 0, data); - HeapFree(GetProcessHeap(), 0, valueW); - RegCloseKey(hkey); - } + load_registry_fonts(); #ifdef SONAME_LIBFONTCONFIG load_fontconfig_fonts(); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5c4da5d629d..080f53c1b61 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -390,9 +390,8 @@ struct font_backend_funcs }; extern void get_font_dir( WCHAR *path ) DECLSPEC_HIDDEN; -extern void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) DECLSPEC_HIDDEN; -extern void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) DECLSPEC_HIDDEN; extern void load_system_bitmap_fonts(void) DECLSPEC_HIDDEN; +extern void load_registry_fonts(void) DECLSPEC_HIDDEN; extern struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_size ) DECLSPEC_HIDDEN; extern void free_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Move the loading of system fonts out of freetype.c.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 131d3b1f5d371257af90593f79d1753d6d53e533 URL: https://source.winehq.org/git/wine.git/?a=commit;h=131d3b1f5d371257af90593f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 10:27:06 2020 +0100 gdi32: Move the loading of system fonts out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 22 ++++++++++++++++++++++ dlls/gdi32/freetype.c | 39 +-------------------------------------- dlls/gdi32/gdi_private.h | 1 + 3 files changed, 24 insertions(+), 38 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index af87c66498f..d4ed29d7fd9 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5375,6 +5375,28 @@ static BOOL remove_font_resource( LPCWSTR file, DWORD flags ) return ret; } +void load_system_bitmap_fonts(void) +{ + static const WCHAR keyW[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s',0}; + static const WCHAR fontsW[] = {'F','O','N','T','S','.','F','O','N',0}; + static const WCHAR oemfontW[] = {'O','E','M','F','O','N','T','.','F','O','N',0}; + static const WCHAR fixedfonW[] = {'F','I','X','E','D','F','O','N','.','F','O','N',0}; + static const WCHAR * const fonts[] = { fontsW, oemfontW, fixedfonW }; + + HKEY hkey; + WCHAR data[MAX_PATH]; + DWORD i, dlen, type; + + if (RegOpenKeyW( HKEY_CURRENT_CONFIG, keyW, &hkey )) return; + for (i = 0; i < ARRAY_SIZE(fonts); i++) + { + dlen = sizeof(data); + if (!RegQueryValueExW( hkey, fonts[i], 0, &type, (BYTE *)data, &dlen ) && type == REG_SZ) + add_system_font_resource( data, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); + } + RegCloseKey( hkey ); +} + /*********************************************************************** * AddFontResourceExW (GDI32.@) */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9ed6077443f..0a05f6a701c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -340,18 +340,6 @@ static const WCHAR winnt_font_reg_key[] = {'S','o','f','t','w','a','r','e','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'F','o','n','t','s','\0'}; -static const WCHAR system_fonts_reg_key[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; -static const WCHAR FixedSys_Value[] = {'F','I','X','E','D','F','O','N','.','F','O','N','\0'}; -static const WCHAR System_Value[] = {'F','O','N','T','S','.','F','O','N','\0'}; -static const WCHAR OEMFont_Value[] = {'O','E','M','F','O','N','T','.','F','O','N','\0'}; - -static const WCHAR * const SystemFontValues[] = { - System_Value, - OEMFont_Value, - FixedSys_Value, - NULL -}; - static const WCHAR external_fonts_reg_key[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', 'F','o','n','t','s','\\','E','x','t','e','r','n','a','l',' ','F','o','n','t','s','\0'}; @@ -2861,30 +2849,6 @@ static void load_mac_fonts(void) #endif -static void load_system_fonts(void) -{ - HKEY hkey; - WCHAR data[MAX_PATH], pathW[MAX_PATH]; - const WCHAR * const *value; - DWORD dlen, type; - - if(RegOpenKeyW(HKEY_CURRENT_CONFIG, system_fonts_reg_key, &hkey) == ERROR_SUCCESS) { - for(value = SystemFontValues; *value; value++) { - dlen = sizeof(data); - if(RegQueryValueExW(hkey, *value, 0, &type, (void*)data, &dlen) == ERROR_SUCCESS && - type == REG_SZ) { - get_fonts_win_dir_path( data, pathW ); - if (!freetype_add_font( pathW, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE )) - { - get_fonts_data_dir_path( data, pathW ); - freetype_add_font( pathW, ADDFONT_ALLOW_BITMAP | ADDFONT_ADD_TO_CACHE ); - } - } - } - RegCloseKey(hkey); - } -} - static WCHAR *get_full_path_name(const WCHAR *name) { WCHAR *full_path; @@ -3456,8 +3420,7 @@ static void init_font_list(void) delete_external_font_keys(); - /* load the system bitmap fonts */ - load_system_fonts(); + load_system_bitmap_fonts(); /* load in the fonts from %WINDOWSDIR%\\Fonts first of all */ GetWindowsDirectoryW(path, ARRAY_SIZE(path)); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 32cdace5c7d..5c4da5d629d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -392,6 +392,7 @@ struct font_backend_funcs extern void get_font_dir( WCHAR *path ) DECLSPEC_HIDDEN; extern void get_fonts_data_dir_path( const WCHAR *file, WCHAR *path ) DECLSPEC_HIDDEN; extern void get_fonts_win_dir_path( const WCHAR *file, WCHAR *path ) DECLSPEC_HIDDEN; +extern void load_system_bitmap_fonts(void) DECLSPEC_HIDDEN; extern struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_size ) DECLSPEC_HIDDEN; extern void free_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : ntdll: Don't check "info" for NULL in NtQuerySystemInformation(SystemModuleInformation).
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 6257da8b429e251637d32608f92c934c2e91ad5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6257da8b429e251637d32608… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 26 18:40:06 2020 -0500 ntdll: Don't check "info" for NULL in NtQuerySystemInformation(SystemModuleInformation). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 6ff277c2d0c..7ac084a9899 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2333,30 +2333,27 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, "\\SystemRoot\\system32\\drivers\\mountmgr.sys" }; - if (!info) ret = STATUS_ACCESS_VIOLATION; - else - { - ULONG i; - SYSTEM_MODULE_INFORMATION *smi = info; + ULONG i; + SYSTEM_MODULE_INFORMATION *smi = info; - len = offsetof( SYSTEM_MODULE_INFORMATION, Modules[ARRAY_SIZE(fake_modules)] ); - if (len <= size) + len = offsetof( SYSTEM_MODULE_INFORMATION, Modules[ARRAY_SIZE(fake_modules)] ); + if (len <= size) + { + memset( smi, 0, len ); + for (i = 0; i < ARRAY_SIZE(fake_modules); i++) { - memset( smi, 0, len ); - for (i = 0; i < ARRAY_SIZE(fake_modules); i++) - { - SYSTEM_MODULE *sm = &smi->Modules[i]; - sm->ImageBaseAddress = (char *)0x10000000 + 0x200000 * i; - sm->ImageSize = 0x200000; - sm->LoadOrderIndex = i; - sm->LoadCount = 1; - strcpy( (char *)sm->Name, fake_modules[i] ); - sm->NameOffset = strrchr( fake_modules[i], '\\' ) - fake_modules[i] + 1; - } - smi->ModulesCount = i; + SYSTEM_MODULE *sm = &smi->Modules[i]; + sm->ImageBaseAddress = (char *)0x10000000 + 0x200000 * i; + sm->ImageSize = 0x200000; + sm->LoadOrderIndex = i; + sm->LoadCount = 1; + strcpy( (char *)sm->Name, fake_modules[i] ); + sm->NameOffset = strrchr( fake_modules[i], '\\' ) - fake_modules[i] + 1; } - else ret = STATUS_INFO_LENGTH_MISMATCH; + smi->ModulesCount = i; } + else ret = STATUS_INFO_LENGTH_MISMATCH; + break; }

1 0

Huw Davies : riched20: Use a row ptr in the run drawing function.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 30ad0b936a96c403db6476ba45f2f455b613df3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=30ad0b936a96c403db6476ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 08:23:28 2020 +0000 riched20: Use a row ptr in the run drawing function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 2 +- dlls/riched20/paint.c | 41 +++++++++++++++++++++-------------------- dlls/riched20/richole.c | 2 +- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index f4484f57d39..ba1e5c169ff 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -264,7 +264,7 @@ int ME_GetParaBorderWidth(const ME_Context *c, int flags) DECLSPEC_HIDDEN; /* richole.c */ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *ppvObj) DECLSPEC_HIDDEN; -void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, BOOL selected) DECLSPEC_HIDDEN; +void draw_ole( ME_Context *c, int x, int y, ME_Run* run, BOOL selected ) DECLSPEC_HIDDEN; void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; void ME_CopyReObject(REOBJECT *dst, const REOBJECT *src, DWORD flags) DECLSPEC_HIDDEN; void ME_DeleteReObject(struct re_object *re_object) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 42f370c857c..0c37fc7c707 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -359,8 +359,8 @@ static void draw_text( ME_Context *c, ME_Run *run, int x, int y, BOOL selected, } -static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, - int nSelFrom, int nSelTo, int ymin, int cy) +static void draw_text_with_style( ME_Context *c, ME_Run *run, int x, int y, + int nSelFrom, int nSelTo, int ymin, int cy ) { HDC hDC = c->hDC; int yOffset = 0; @@ -434,16 +434,16 @@ static void ME_DebugWrite(HDC hDC, const POINT *pt, LPCWSTR szText) { SetTextColor(hDC, color); } -static void ME_DrawRun( ME_Context *c, int x, int y, ME_Run *run, ME_Paragraph *para ) +static void draw_run( ME_Context *c, int x, int y, ME_Cursor *cursor ) { - ME_DisplayItem *start; - int runofs = run->nCharOfs+para->nCharOfs; + ME_Row *row; + ME_Run *run = &cursor->pRun->member.run; + int runofs = run_char_ofs( run, cursor->nOffset ); int nSelFrom, nSelTo; - if (run->nFlags & MERF_HIDDEN) - return; + if (run->nFlags & MERF_HIDDEN) return; - start = ME_FindItemBack( run_get_di( run ), diStartRow ); + row = row_from_cursor( cursor ); ME_GetSelectionOfs(c->editor, &nSelFrom, &nSelTo); /* Draw selected end-of-paragraph mark */ @@ -452,8 +452,7 @@ static void ME_DrawRun( ME_Context *c, int x, int y, ME_Run *run, ME_Paragraph * if (runofs >= nSelFrom && runofs < nSelTo) { draw_space( c, run, x, y, TRUE, FALSE, - c->pt.y + para->pt.y + start->member.row.pt.y, - start->member.row.nHeight ); + c->pt.y + run->para->pt.y + row->pt.y, row->nHeight ); } return; } @@ -463,19 +462,15 @@ static void ME_DrawRun( ME_Context *c, int x, int y, ME_Run *run, ME_Paragraph * BOOL selected = runofs >= nSelFrom && runofs < nSelTo; draw_space( c, run, x, y, selected, TRUE, - c->pt.y + para->pt.y + start->member.row.pt.y, - start->member.row.nHeight ); + c->pt.y + run->para->pt.y + row->pt.y, row->nHeight ); return; } if (run->nFlags & MERF_GRAPHICS) - ME_DrawOLE(c, x, y, run, (runofs >= nSelFrom) && (runofs < nSelTo)); + draw_ole( c, x, y, run, (runofs >= nSelFrom) && (runofs < nSelTo) ); else - { - ME_DrawTextWithStyle(c, run, x, y, nSelFrom - runofs, nSelTo - runofs, - c->pt.y + para->pt.y + start->member.row.pt.y, - start->member.row.nHeight); - } + draw_text_with_style( c, run, x, y, nSelFrom - runofs, nSelTo - runofs, + c->pt.y + run->para->pt.y + row->pt.y, row->nHeight ); } /* The documented widths are in points (72 dpi), but converting them to @@ -1001,8 +996,14 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) FrameRect(c->hDC, &rc, GetSysColorBrush(COLOR_GRAYTEXT)); } if (visible) - ME_DrawRun( c, c->pt.x + run->pt.x, - c->pt.y + para->pt.y + run->pt.y + baseline, run, para ); + { + ME_Cursor cursor; + + cursor.pRun = run_get_di( run ); + cursor.pPara = para_get_di( para ); + cursor.nOffset = 0; + draw_run( c, c->pt.x + run->pt.x, c->pt.y + para->pt.y + run->pt.y + baseline, &cursor ); + } if (me_debug) { static const WCHAR wszRunDebug[] = {'[','%','d',':','%','x',']',' ','%','l','s',0}; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 21b63911954..015326c5abc 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5846,7 +5846,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) } } -void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) +void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) { IDataObject* ido; FORMATETC fmt;

1 0

Huw Davies : riched20: Use a run helper in the delete text function.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 0d50e0182d6c8331cc468a8b25807c33e033531a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d50e0182d6c8331cc468a8b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 27 08:23:27 2020 +0000 riched20: Use a run helper in the delete text function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index d92b93ac2f0..6a8f1e1cd71 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -405,8 +405,8 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, } if (pThisCur->nOffset == run->len) { - pThisCur->pRun = ME_FindItemFwd(pThisCur->pRun, diRunOrParagraphOrEnd); - assert(pThisCur->pRun->type == diRun); + pThisCur->pRun = run_get_di( run_next( &pThisCur->pRun->member.run ) ); + assert( pThisCur->pRun ); pThisCur->nOffset = 0; } }

1 0

Michael Stefaniuc : wmp: Use wide-char string literals.
by Alexandre Julliard Oct. 27, 2020

Oct. 27, 2020

Module: wine Branch: master Commit: 6f92e48447c3e18f5c2723dd54028045cffc1759 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f92e48447c3e18f5c2723dd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 27 00:06:37 2020 +0100 wmp: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/oleobj.c | 6 ++---- dlls/wmp/player.c | 29 ++++++++++++----------------- dlls/wmp/tests/media.c | 49 +++++++++++++++++++------------------------------ dlls/wmp/tests/oleobj.c | 8 +++----- 4 files changed, 36 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f92e48447c3e18f5c27…

1 0