October 2020 - Wine-Commits

Nikolay Sivov : evr/presenter: Update cached native size on format negotiation.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: 59f3337a394271cf729977a77fefb9950cf460d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59f3337a394271cf729977a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 7 11:40:21 2020 +0300 evr/presenter: Update cached native size on format negotiation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 118 +++++++++++++++++++++++++++++++-------------------- dlls/evr/tests/evr.c | 2 - 2 files changed, 71 insertions(+), 49 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index ba9e09c4e3..ecfa923442 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -103,6 +103,58 @@ static struct video_presenter *impl_from_IMFGetService(IMFGetService *iface) return CONTAINING_RECORD(iface, struct video_presenter, IMFGetService_iface); } +static unsigned int get_gcd(unsigned int a, unsigned int b) +{ + unsigned int m; + + while (b) + { + m = a % b; + a = b; + b = m; + } + + return a; +} + +static void video_presenter_get_native_video_size(struct video_presenter *presenter) +{ + IMFMediaType *media_type; + UINT64 frame_size = 0; + + memset(&presenter->native_size, 0, sizeof(presenter->native_size)); + memset(&presenter->native_ratio, 0, sizeof(presenter->native_ratio)); + + if (!presenter->mixer) + return; + + if (FAILED(IMFTransform_GetInputCurrentType(presenter->mixer, 0, &media_type))) + return; + + if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size))) + { + unsigned int gcd; + + presenter->native_size.cx = frame_size >> 32; + presenter->native_size.cy = frame_size; + + if ((gcd = get_gcd(presenter->native_size.cx, presenter->native_size.cy))) + { + presenter->native_ratio.cx = presenter->native_size.cx / gcd; + presenter->native_ratio.cy = presenter->native_size.cy / gcd; + } + } + + IMFMediaType_Release(media_type); +} + +static HRESULT video_presenter_invalidate_media_type(struct video_presenter *presenter) +{ + video_presenter_get_native_video_size(presenter); + + return S_OK; +} + static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { struct video_presenter *presenter = impl_from_IUnknown(iface); @@ -277,9 +329,26 @@ static HRESULT WINAPI video_presenter_OnClockSetRate(IMFVideoPresenter *iface, M static HRESULT WINAPI video_presenter_ProcessMessage(IMFVideoPresenter *iface, MFVP_MESSAGE_TYPE message, ULONG_PTR param) { - FIXME("%p, %d, %lu.\n", iface, message, param); + struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %d, %lu.\n", iface, message, param); + + EnterCriticalSection(&presenter->cs); + + switch (message) + { + case MFVP_MESSAGE_INVALIDATEMEDIATYPE: + hr = video_presenter_invalidate_media_type(presenter); + break; + default: + FIXME("Unsupported message %u.\n", message); + hr = E_NOTIMPL; + } + + LeaveCriticalSection(&presenter->cs); + + return hr; } static HRESULT WINAPI video_presenter_GetCurrentMediaType(IMFVideoPresenter *iface, IMFVideoMediaType **media_type) @@ -379,51 +448,6 @@ static void video_presenter_set_mixer_rect(struct video_presenter *presenter) } } -static unsigned int get_gcd(unsigned int a, unsigned int b) -{ - unsigned int m; - - while (b) - { - m = a % b; - a = b; - b = m; - } - - return a; -} - -static void video_presenter_get_native_video_size(struct video_presenter *presenter) -{ - IMFMediaType *media_type; - UINT64 frame_size = 0; - - memset(&presenter->native_size, 0, sizeof(presenter->native_size)); - memset(&presenter->native_ratio, 0, sizeof(presenter->native_ratio)); - - if (!presenter->mixer) - return; - - if (FAILED(IMFTransform_GetInputCurrentType(presenter->mixer, 0, &media_type))) - return; - - if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size))) - { - unsigned int gcd; - - presenter->native_size.cx = frame_size >> 32; - presenter->native_size.cy = frame_size; - - if ((gcd = get_gcd(presenter->native_size.cx, presenter->native_size.cy))) - { - presenter->native_ratio.cx = presenter->native_size.cx / gcd; - presenter->native_ratio.cy = presenter->native_size.cy / gcd; - } - } - - IMFMediaType_Release(media_type); -} - static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, IMFTopologyServiceLookup *service_lookup) { IMFVideoDeviceID *device_id; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 39d2ed72a0..e7eabc5971 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1640,12 +1640,10 @@ static void test_presenter_native_video_size(void) /* Negotiating types updates native video size. */ hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(size.cx == 320 && size.cy == 240, "Unexpected size %u x %u.\n", size.cx, size.cy); ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy);

1 0

Nikolay Sivov : evr/presenter: Request original reference frame size when attaching the mixer.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: 95dcc559fcd9b5f7e6a492e51781c95a257d2dc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95dcc559fcd9b5f7e6a492e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 7 11:40:20 2020 +0300 evr/presenter: Request original reference frame size when attaching the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/evr/tests/evr.c | 17 +++++--------- 2 files changed, 68 insertions(+), 13 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 15ebcd80ac..ba9e09c4e3 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -62,6 +62,8 @@ struct video_presenter MFVideoNormalizedRect src_rect; RECT dst_rect; DWORD rendering_prefs; + SIZE native_size; + SIZE native_ratio; unsigned int state; CRITICAL_SECTION cs; }; @@ -377,6 +379,51 @@ static void video_presenter_set_mixer_rect(struct video_presenter *presenter) } } +static unsigned int get_gcd(unsigned int a, unsigned int b) +{ + unsigned int m; + + while (b) + { + m = a % b; + a = b; + b = m; + } + + return a; +} + +static void video_presenter_get_native_video_size(struct video_presenter *presenter) +{ + IMFMediaType *media_type; + UINT64 frame_size = 0; + + memset(&presenter->native_size, 0, sizeof(presenter->native_size)); + memset(&presenter->native_ratio, 0, sizeof(presenter->native_ratio)); + + if (!presenter->mixer) + return; + + if (FAILED(IMFTransform_GetInputCurrentType(presenter->mixer, 0, &media_type))) + return; + + if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size))) + { + unsigned int gcd; + + presenter->native_size.cx = frame_size >> 32; + presenter->native_size.cy = frame_size; + + if ((gcd = get_gcd(presenter->native_size.cx, presenter->native_size.cy))) + { + presenter->native_ratio.cx = presenter->native_size.cx / gcd; + presenter->native_ratio.cy = presenter->native_size.cy / gcd; + } + } + + IMFMediaType_Release(media_type); +} + static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, IMFTopologyServiceLookup *service_lookup) { IMFVideoDeviceID *device_id; @@ -410,6 +457,7 @@ static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, I } video_presenter_set_mixer_rect(presenter); + video_presenter_get_native_video_size(presenter); return hr; } @@ -508,9 +556,21 @@ static ULONG WINAPI video_presenter_control_Release(IMFVideoDisplayControl *ifac static HRESULT WINAPI video_presenter_control_GetNativeVideoSize(IMFVideoDisplayControl *iface, SIZE *video_size, SIZE *aspect_ratio) { - FIXME("%p, %p, %p.\n", iface, video_size, aspect_ratio); + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, video_size, aspect_ratio); + + if (!video_size && !aspect_ratio) + return E_POINTER; + + EnterCriticalSection(&presenter->cs); + if (video_size) + *video_size = presenter->native_size; + if (aspect_ratio) + *aspect_ratio = presenter->native_ratio; + LeaveCriticalSection(&presenter->cs); + + return S_OK; } static HRESULT WINAPI video_presenter_control_GetIdealVideoSize(IMFVideoDisplayControl *iface, SIZE *min_size, diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index ce2803bcb3..39d2ed72a0 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1578,21 +1578,18 @@ static void test_presenter_native_video_size(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, NULL, NULL); -todo_wine ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); memset(&size, 0xcc, sizeof(size)); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, NULL); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(size.cx == 0 && size.cy == 0, "Unexpected size.\n"); -} + memset(&ratio, 0xcc, sizeof(ratio)); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, NULL, &ratio); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(ratio.cx == 0 && ratio.cy == 0, "Unexpected ratio.\n"); -} + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -1623,12 +1620,11 @@ todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(size.cx == 640 && size.cy == 480, "Unexpected size %u x %u.\n", size.cx, size.cy); ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); -} + /* Update input type. */ hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)320 << 32 | 240); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -1637,24 +1633,23 @@ todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(size.cx == 640 && size.cy == 480, "Unexpected size %u x %u.\n", size.cx, size.cy); ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); -} + /* Negotiating types updates native video size. */ hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine ok(size.cx == 320 && size.cy == 240, "Unexpected size %u x %u.\n", size.cx, size.cy); ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); -} + IMFVideoMediaType_Release(video_type); IMFVideoDisplayControl_Release(display_control); IMFVideoPresenter_Release(presenter);

1 0

Nikolay Sivov : evr/tests: Add some tests for presenter's GetNativeVideoSize().
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: d2beff26236258a9c8853d0a54534a79d595ae7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2beff26236258a9c8853d0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 7 11:40:19 2020 +0300 evr/tests: Add some tests for presenter's GetNativeVideoSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/Makefile.in | 2 +- dlls/evr/tests/evr.c | 55 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/evr/tests/Makefile.in b/dlls/evr/tests/Makefile.in index 5bd82277d1..c5db2226eb 100644 --- a/dlls/evr/tests/Makefile.in +++ b/dlls/evr/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = evr.dll -IMPORTS = dxva2 mfplat mfuuid strmiids uuid dxguid ole32 oleaut32 evr d3d9 user32 +IMPORTS = dxva2 mfplat mfuuid mf strmiids uuid dxguid ole32 oleaut32 evr d3d9 user32 C_SRCS = \ evr.c diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 70c7053efd..ce2803bcb3 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1562,6 +1562,8 @@ static void test_presenter_native_video_size(void) IMFTransform *mixer; SIZE size, ratio; HRESULT hr; + IMFVideoMediaType *video_type; + IDirect3DDeviceManager9 *dm; hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); @@ -1594,6 +1596,27 @@ todo_wine { hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + /* Configure mixer primary stream. */ + hr = MFGetService((IUnknown *)presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, (void **)&dm); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)dm); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDirect3DDeviceManager9_Release(dm); + + hr = pMFCreateVideoMediaTypeFromSubtype(&MFVideoFormat_RGB32, &video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)640 << 32 | 480); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(mixer, 0, (IMFMediaType *)video_type, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Native video size is cached on initialization. */ init_test_host(&host, mixer, presenter); hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, &host.IMFTopologyServiceLookup_iface); @@ -1602,9 +1625,37 @@ todo_wine { hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(size.cx == 0 && size.cy == 0, "Unexpected size.\n"); - ok(ratio.cx == 0 && ratio.cy == 0, "Unexpected ratio.\n"); + ok(size.cx == 640 && size.cy == 480, "Unexpected size %u x %u.\n", size.cx, size.cy); + ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, + "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); +} + /* Update input type. */ + hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)320 << 32 | 240); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(mixer, 0, (IMFMediaType *)video_type, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size.cx == 640 && size.cy == 480, "Unexpected size %u x %u.\n", size.cx, size.cy); + ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, + "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); } + /* Negotiating types updates native video size. */ + hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size.cx == 320 && size.cy == 240, "Unexpected size %u x %u.\n", size.cx, size.cy); + ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, + "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); +} + IMFVideoMediaType_Release(video_type); IMFVideoDisplayControl_Release(display_control); IMFVideoPresenter_Release(presenter); IMFTransform_Release(mixer);

1 0

Daniel Lehman : tzres: Add Cuba Time Zone.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: 3d268f1fdc7798a9b0cce4e1e7f5f279ebc13842 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d268f1fdc7798a9b0cce4e1… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Oct 6 23:13:29 2020 -0700 tzres: Add Cuba 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 | 18 +++ po/ar.po | 310 ++++++++++++++++++++++++++------------------------- po/ast.po | 310 ++++++++++++++++++++++++++------------------------- po/bg.po | 306 +++++++++++++++++++++++++------------------------- po/ca.po | 310 ++++++++++++++++++++++++++------------------------- po/cs.po | 310 ++++++++++++++++++++++++++------------------------- po/da.po | 310 ++++++++++++++++++++++++++------------------------- po/de.po | 310 ++++++++++++++++++++++++++------------------------- po/el.po | 306 +++++++++++++++++++++++++------------------------- po/en.po | 306 +++++++++++++++++++++++++------------------------- po/en_US.po | 306 +++++++++++++++++++++++++------------------------- po/eo.po | 310 ++++++++++++++++++++++++++------------------------- po/es.po | 310 ++++++++++++++++++++++++++------------------------- po/fa.po | 308 +++++++++++++++++++++++++------------------------- po/fi.po | 310 ++++++++++++++++++++++++++------------------------- po/fr.po | 310 ++++++++++++++++++++++++++------------------------- po/he.po | 310 ++++++++++++++++++++++++++------------------------- po/hi.po | 306 +++++++++++++++++++++++++------------------------- po/hr.po | 310 ++++++++++++++++++++++++++------------------------- po/hu.po | 310 ++++++++++++++++++++++++++------------------------- po/it.po | 310 ++++++++++++++++++++++++++------------------------- po/ja.po | 310 ++++++++++++++++++++++++++------------------------- po/ko.po | 310 ++++++++++++++++++++++++++------------------------- po/lt.po | 310 ++++++++++++++++++++++++++------------------------- po/ml.po | 306 +++++++++++++++++++++++++------------------------- po/nb_NO.po | 310 ++++++++++++++++++++++++++------------------------- po/nl.po | 310 ++++++++++++++++++++++++++------------------------- po/or.po | 306 +++++++++++++++++++++++++------------------------- po/pa.po | 306 +++++++++++++++++++++++++------------------------- po/pl.po | 310 ++++++++++++++++++++++++++------------------------- po/pt_BR.po | 310 ++++++++++++++++++++++++++------------------------- po/pt_PT.po | 310 ++++++++++++++++++++++++++------------------------- po/rm.po | 306 +++++++++++++++++++++++++------------------------- po/ro.po | 310 ++++++++++++++++++++++++++------------------------- po/ru.po | 306 +++++++++++++++++++++++++------------------------- po/si.po | 310 ++++++++++++++++++++++++++------------------------- po/sk.po | 310 ++++++++++++++++++++++++++------------------------- po/sl.po | 310 ++++++++++++++++++++++++++------------------------- po/sr_RS(a)cyrillic.po | 308 +++++++++++++++++++++++++------------------------- po/sr_RS(a)latin.po | 308 +++++++++++++++++++++++++------------------------- po/sv.po | 310 ++++++++++++++++++++++++++------------------------- po/ta.po | 306 +++++++++++++++++++++++++------------------------- po/te.po | 306 +++++++++++++++++++++++++------------------------- po/th.po | 308 +++++++++++++++++++++++++------------------------- po/tr.po | 310 ++++++++++++++++++++++++++------------------------- po/uk.po | 306 +++++++++++++++++++++++++------------------------- po/wa.po | 308 +++++++++++++++++++++++++------------------------- po/wine.pot | 306 +++++++++++++++++++++++++------------------------- po/zh_CN.po | 310 ++++++++++++++++++++++++++------------------------- po/zh_TW.po | 310 ++++++++++++++++++++++++++------------------------- 51 files changed, 7843 insertions(+), 7301 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d268f1fdc7798a9b0cc…

1 0

Jacek Caban : conhost: Scroll window to cursor position when needed.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: a90017845d2f65ecd8c1bd32c3019bcd2b13ecd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a90017845d2f65ecd8c1bd32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 6 18:53:30 2020 +0200 conhost: Scroll window to cursor position when needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index a54238c80f..7d3564a120 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -392,6 +392,24 @@ static void empty_update_rect( struct screen_buffer *screen_buffer, RECT *rect ) SetRect( rect, screen_buffer->width, screen_buffer->height, 0, 0 ); } +static void scroll_to_cursor( struct screen_buffer *screen_buffer ) +{ + int w = screen_buffer->win.right - screen_buffer->win.left + 1; + int h = screen_buffer->win.bottom - screen_buffer->win.top + 1; + + if (screen_buffer->cursor_x < screen_buffer->win.left) + screen_buffer->win.left = min( screen_buffer->cursor_x, screen_buffer->width - w ); + else if (screen_buffer->cursor_x > screen_buffer->win.right) + screen_buffer->win.left = max( screen_buffer->cursor_x, w ) - w + 1; + screen_buffer->win.right = screen_buffer->win.left + w - 1; + + if (screen_buffer->cursor_y < screen_buffer->win.top) + screen_buffer->win.top = min( screen_buffer->cursor_y, screen_buffer->height - h ); + else if (screen_buffer->cursor_y > screen_buffer->win.bottom) + screen_buffer->win.top = max( screen_buffer->cursor_y, h ) - h + 1; + screen_buffer->win.bottom = screen_buffer->win.top + h - 1; +} + static void update_output( struct screen_buffer *screen_buffer, RECT *rect ) { int x, y, size, trailing_spaces; @@ -1237,6 +1255,7 @@ static void update_read_output( struct console *console ) if (console->is_unix) set_tty_cursor_relative( screen_buffer->console, update_rect.left, update_rect.top ); update_output( screen_buffer, &update_rect ); + scroll_to_cursor( screen_buffer ); } if (console->is_unix) set_tty_cursor_relative( screen_buffer->console, screen_buffer->cursor_x, screen_buffer->cursor_y ); @@ -1825,6 +1844,7 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, { screen_buffer->cursor_x = info->cursor_x; screen_buffer->cursor_y = info->cursor_y; + scroll_to_cursor( screen_buffer ); } } if (params->mask & SET_CONSOLE_OUTPUT_INFO_SIZE) @@ -1972,6 +1992,7 @@ static NTSTATUS write_console( struct screen_buffer *screen_buffer, const WCHAR else screen_buffer->cursor_x = update_rect.left; } + scroll_to_cursor( screen_buffer ); update_output( screen_buffer, &update_rect ); tty_sync( screen_buffer->console ); return STATUS_SUCCESS;

1 0

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

Oct. 7, 2020

Module: wine Branch: master Commit: 251d0a8a26b359fdb2af5b99e8c9949e7fbb0aeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=251d0a8a26b359fdb2af5b99… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 00:51:55 2020 +0200 winemine: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/main.c | 53 ++++++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 33 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 255d21714f..37ce192704 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -33,19 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winemine); static const DWORD wnd_style = WS_OVERLAPPEDWINDOW & ~WS_THICKFRAME & ~WS_MAXIMIZEBOX; -static const WCHAR registry_key[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','M','i','n','e',0}; - -static const WCHAR xposW[] = {'X','p','o','s',0}; -static const WCHAR yposW[] = {'Y','p','o','s',0}; -static const WCHAR heightW[] = {'H','e','i','g','h','t',0}; -static const WCHAR widthW[] = {'W','i','d','t','h',0}; -static const WCHAR minesW[] = {'M','i','n','e','s',0}; -static const WCHAR difficultyW[] = {'D','i','f','f','i','c','u','l','t','y',0}; -static const WCHAR markW[] = {'M','a','r','k',0}; -static const WCHAR nameW[] = {'N','a','m','e','%','u',0}; -static const WCHAR timeW[] = {'T','i','m','e','%','u',0}; void CheckLevel( BOARD *p_board ) { @@ -77,38 +64,38 @@ static void LoadBoard( BOARD *p_board ) WCHAR key_name[8]; unsigned i; - RegOpenKeyExW( HKEY_CURRENT_USER, registry_key, 0, KEY_QUERY_VALUE, &hkey ); + RegOpenKeyExW( HKEY_CURRENT_USER, L"Software\\Microsoft\\WinMine", 0, KEY_QUERY_VALUE, &hkey ); size = sizeof( p_board->pos.x ); - if( RegQueryValueExW( hkey, xposW, NULL, &type, (BYTE*) &p_board->pos.x, &size ) ) + if( RegQueryValueExW( hkey, L"Xpos", NULL, &type, (BYTE*) &p_board->pos.x, &size ) ) p_board->pos.x = 0; size = sizeof( p_board->pos.y ); - if( RegQueryValueExW( hkey, yposW, NULL, &type, (BYTE*) &p_board->pos.y, &size ) ) + if( RegQueryValueExW( hkey, L"Ypos", NULL, &type, (BYTE*) &p_board->pos.y, &size ) ) p_board->pos.y = 0; size = sizeof( p_board->rows ); - if( RegQueryValueExW( hkey, heightW, NULL, &type, (BYTE*) &p_board->rows, &size ) ) + if( RegQueryValueExW( hkey, L"Height", NULL, &type, (BYTE*) &p_board->rows, &size ) ) p_board->rows = BEGINNER_ROWS; size = sizeof( p_board->cols ); - if( RegQueryValueExW( hkey, widthW, NULL, &type, (BYTE*) &p_board->cols, &size ) ) + if( RegQueryValueExW( hkey, L"Width", NULL, &type, (BYTE*) &p_board->cols, &size ) ) p_board->cols = BEGINNER_COLS; size = sizeof( p_board->mines ); - if( RegQueryValueExW( hkey, minesW, NULL, &type, (BYTE*) &p_board->mines, &size ) ) + if( RegQueryValueExW( hkey, L"Mines", NULL, &type, (BYTE*) &p_board->mines, &size ) ) p_board->mines = BEGINNER_MINES; size = sizeof( p_board->difficulty ); - if( RegQueryValueExW( hkey, difficultyW, NULL, &type, (BYTE*) &p_board->difficulty, &size ) ) + if( RegQueryValueExW( hkey, L"Difficulty", NULL, &type, (BYTE*) &p_board->difficulty, &size ) ) p_board->difficulty = BEGINNER; size = sizeof( p_board->IsMarkQ ); - if( RegQueryValueExW( hkey, markW, NULL, &type, (BYTE*) &p_board->IsMarkQ, &size ) ) + if( RegQueryValueExW( hkey, L"Mark", NULL, &type, (BYTE*) &p_board->IsMarkQ, &size ) ) p_board->IsMarkQ = TRUE; for( i = 0; i < 3; i++ ) { - wsprintfW( key_name, nameW, i+1 ); + wsprintfW( key_name, L"Name%u", i+1 ); size = sizeof( data ); if( RegQueryValueExW( hkey, key_name, NULL, &type, (LPBYTE) data, &size ) == ERROR_SUCCESS ) @@ -118,7 +105,7 @@ static void LoadBoard( BOARD *p_board ) } for( i = 0; i < 3; i++ ) { - wsprintfW( key_name, timeW, i+1 ); + wsprintfW( key_name, L"Time%u", i+1 ); size = sizeof( p_board->best_time[i] ); if( RegQueryValueExW( hkey, key_name, NULL, &type, (BYTE*) &p_board->best_time[i], &size ) ) p_board->best_time[i] = 999; @@ -163,28 +150,28 @@ void SaveBoard( BOARD *p_board ) WCHAR data[MAX_PLAYER_NAME_SIZE+1]; WCHAR key_name[8]; - if( RegCreateKeyExW( HKEY_CURRENT_USER, registry_key, + if( RegCreateKeyExW( HKEY_CURRENT_USER, L"Software\\Microsoft\\WinMine", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, NULL ) != ERROR_SUCCESS) return; - RegSetValueExW( hkey, xposW, 0, REG_DWORD, (LPBYTE) &p_board->pos.x, sizeof(p_board->pos.x) ); - RegSetValueExW( hkey, yposW, 0, REG_DWORD, (LPBYTE) &p_board->pos.y, sizeof(p_board->pos.y) ); - RegSetValueExW( hkey, difficultyW, 0, REG_DWORD, (LPBYTE) &p_board->difficulty, sizeof(p_board->difficulty) ); - RegSetValueExW( hkey, heightW, 0, REG_DWORD, (LPBYTE) &p_board->rows, sizeof(p_board->rows) ); - RegSetValueExW( hkey, widthW, 0, REG_DWORD, (LPBYTE) &p_board->cols, sizeof(p_board->cols) ); - RegSetValueExW( hkey, minesW, 0, REG_DWORD, (LPBYTE) &p_board->mines, sizeof(p_board->mines) ); - RegSetValueExW( hkey, markW, 0, REG_DWORD, (LPBYTE) &p_board->IsMarkQ, sizeof(p_board->IsMarkQ) ); + RegSetValueExW( hkey, L"Xpos", 0, REG_DWORD, (BYTE*) &p_board->pos.x, sizeof(p_board->pos.x) ); + RegSetValueExW( hkey, L"Ypos", 0, REG_DWORD, (BYTE*) &p_board->pos.y, sizeof(p_board->pos.y) ); + RegSetValueExW( hkey, L"Difficulty", 0, REG_DWORD, (BYTE*) &p_board->difficulty, sizeof(p_board->difficulty) ); + RegSetValueExW( hkey, L"Height", 0, REG_DWORD, (BYTE*) &p_board->rows, sizeof(p_board->rows) ); + RegSetValueExW( hkey, L"Width", 0, REG_DWORD, (BYTE*) &p_board->cols, sizeof(p_board->cols) ); + RegSetValueExW( hkey, L"Mines", 0, REG_DWORD, (BYTE*) &p_board->mines, sizeof(p_board->mines) ); + RegSetValueExW( hkey, L"Mark", 0, REG_DWORD, (BYTE*) &p_board->IsMarkQ, sizeof(p_board->IsMarkQ) ); for( i = 0; i < 3; i++ ) { - wsprintfW( key_name, nameW, i+1 ); + wsprintfW( key_name, L"Name%u", i+1 ); lstrcpynW( data, p_board->best_name[i], ARRAY_SIZE(data)); RegSetValueExW( hkey, key_name, 0, REG_SZ, (LPBYTE) data, (lstrlenW(data)+1) * sizeof(WCHAR) ); } for( i = 0; i < 3; i++ ) { - wsprintfW( key_name, timeW, i+1 ); + wsprintfW( key_name, L"Time%u", i+1 ); RegSetValueExW( hkey, key_name, 0, REG_DWORD, (LPBYTE) &p_board->best_time[i], sizeof(p_board->best_time[i]) ); } RegCloseKey( hkey );

1 0

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

Oct. 7, 2020

Module: wine Branch: master Commit: 3180972ee2c8e67c425aa7f5279d0cd830455c3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3180972ee2c8e67c425aa7f5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 00:51:53 2020 +0200 taskkill: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskkill/taskkill.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 600bab14fd..193ed05829 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -102,12 +102,11 @@ static int WINAPIV taskkill_message_printfW(int msg, ...) static int taskkill_message(int msg) { - static const WCHAR formatW[] = {'%','1',0}; WCHAR msg_buffer[8192]; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); - return taskkill_printfW(formatW, msg_buffer); + return taskkill_printfW(L"%1", msg_buffer); } /* Post WM_CLOSE to all top-level windows belonging to the process with specified PID. */ @@ -444,12 +443,6 @@ static BOOL add_to_task_list(WCHAR *name) * options are detected as parameters when placed after options that accept one. */ static BOOL process_arguments(int argc, WCHAR *argv[]) { - static const WCHAR opForceTerminate[] = {'f',0}; - static const WCHAR opImage[] = {'i','m',0}; - static const WCHAR opPID[] = {'p','i','d',0}; - static const WCHAR opHelp[] = {'?',0}; - static const WCHAR opTerminateChildren[] = {'t',0}; - if (argc > 1) { int i; @@ -460,7 +453,7 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) if (argc == 2) { argdata = argv[1]; - if ((*argdata == '/' || *argdata == '-') && !lstrcmpW(opHelp, argdata + 1)) + if ((*argdata == '/' || *argdata == '-') && !lstrcmpW(L"?", argdata + 1)) { taskkill_message(STRING_USAGE); exit(0); @@ -476,14 +469,14 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) goto invalid; argdata++; - if (!wcsicmp(opTerminateChildren, argdata)) + if (!wcsicmp(L"t", argdata)) WINE_FIXME("argument T not supported\n"); - if (!wcsicmp(opForceTerminate, argdata)) + if (!wcsicmp(L"f", argdata)) force_termination = TRUE; /* Options /IM and /PID appear to behave identically, except for * the fact that they cannot be specified at the same time. */ - else if ((got_im = !wcsicmp(opImage, argdata)) || - (got_pid = !wcsicmp(opPID, argdata))) + else if ((got_im = !wcsicmp(L"im", argdata)) || + (got_pid = !wcsicmp(L"pid", argdata))) { if (!argv[i + 1]) {

1 0

Anton Baskanov : winegstreamer: Expose 15/16-bit RGB formats.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: 0542a34c247f029a0394f308f9f44c5c41d904fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=0542a34c247f029a0394f308… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Oct 7 01:04:59 2020 +0700 winegstreamer: Expose 15/16-bit RGB formats. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 90a129f29a..6279c2c28c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1722,6 +1722,8 @@ static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, GST_VIDEO_FORMAT_BGRA, GST_VIDEO_FORMAT_BGRx, GST_VIDEO_FORMAT_BGR, + GST_VIDEO_FORMAT_RGB16, + GST_VIDEO_FORMAT_RGB15, }; assert(caps); /* We shouldn't be able to get here if caps haven't been set. */

1 0

Anton Baskanov : winegstreamer: Use RGB15/16 formats instead of BGR15/16.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: e47b45e2f55ea33790aa60fdf207cafa53c9adb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e47b45e2f55ea33790aa60fd… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Oct 7 01:04:56 2020 +0700 winegstreamer: Use RGB15/16 formats instead of BGR15/16. Gstreamer stores the first component in the most significant bits, same as DirectShow. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index acb15dc923..5b5add409c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -194,11 +194,11 @@ static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE amt->subtype = MEDIASUBTYPE_RGB24; bih->biBitCount = 24; break; - case GST_VIDEO_FORMAT_BGR16: + case GST_VIDEO_FORMAT_RGB16: amt->subtype = MEDIASUBTYPE_RGB565; bih->biBitCount = 16; break; - case GST_VIDEO_FORMAT_BGR15: + case GST_VIDEO_FORMAT_RGB15: amt->subtype = MEDIASUBTYPE_RGB555; bih->biBitCount = 16; break; @@ -380,8 +380,8 @@ static GstCaps *amt_to_gst_caps_video(const AM_MEDIA_TYPE *mt) {&MEDIASUBTYPE_ARGB32, GST_VIDEO_FORMAT_BGRA}, {&MEDIASUBTYPE_RGB32, GST_VIDEO_FORMAT_BGRx}, {&MEDIASUBTYPE_RGB24, GST_VIDEO_FORMAT_BGR}, - {&MEDIASUBTYPE_RGB565, GST_VIDEO_FORMAT_BGR16}, - {&MEDIASUBTYPE_RGB555, GST_VIDEO_FORMAT_BGR15}, + {&MEDIASUBTYPE_RGB565, GST_VIDEO_FORMAT_RGB16}, + {&MEDIASUBTYPE_RGB555, GST_VIDEO_FORMAT_RGB15}, }; const VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)mt->pbFormat;

1 0

Jacek Caban : conhost: Use better default values in create_screen_buffer.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: 0c25f5ee466b181e9caa6b15257be1db8a66b602 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c25f5ee466b181e9caa6b15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 6 18:54:03 2020 +0200 conhost: Use better default values in create_screen_buffer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 21 +++++++++++++++++++++ programs/conhost/conhost.c | 21 ++++++++++++++++----- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 97dc9c61ce..deb5030553 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3950,6 +3950,8 @@ static void test_AllocConsole(void) static void test_pseudo_console_child(HANDLE input, HANDLE output) { + CONSOLE_SCREEN_BUFFER_INFO sb_info; + CONSOLE_CURSOR_INFO cursor_info; DWORD mode; BOOL ret; @@ -3985,6 +3987,25 @@ static void test_pseudo_console_child(HANDLE input, HANDLE output) ret = SetConsoleMode(output, mode | ENABLE_WRAP_AT_EOL_OUTPUT); ok(ret, "SetConsoleMode failed: %u\n", GetLastError()); + ret = GetConsoleScreenBufferInfo(output, &sb_info); + ok(ret, "GetConsoleScreenBufferInfo failed: %u\n", GetLastError()); + ok(sb_info.dwSize.X == 40, "dwSize.X = %u\n", sb_info.dwSize.X); + ok(sb_info.dwSize.Y == 30, "dwSize.Y = %u\n", sb_info.dwSize.Y); + ok(sb_info.dwCursorPosition.X == 0, "dwCursorPosition.X = %u\n", sb_info.dwCursorPosition.X); + ok(sb_info.dwCursorPosition.Y == 0, "dwCursorPosition.Y = %u\n", sb_info.dwCursorPosition.Y); + ok(sb_info.wAttributes == 7, "wAttributes = %x\n", sb_info.wAttributes); + ok(sb_info.srWindow.Left == 0, "srWindow.Left = %u\n", sb_info.srWindow.Left); + ok(sb_info.srWindow.Top == 0, "srWindow.Top = %u\n", sb_info.srWindow.Top); + ok(sb_info.srWindow.Right == 39, "srWindow.Right = %u\n", sb_info.srWindow.Right); + ok(sb_info.srWindow.Bottom == 29, "srWindow.Bottom = %u\n", sb_info.srWindow.Bottom); + ok(sb_info.dwMaximumWindowSize.X == 40, "dwMaximumWindowSize.X = %u\n", sb_info.dwMaximumWindowSize.X); + ok(sb_info.dwMaximumWindowSize.Y == 30, "dwMaximumWindowSize.Y = %u\n", sb_info.dwMaximumWindowSize.Y); + + ret = GetConsoleCursorInfo(output, &cursor_info); + ok(ret, "GetConsoleCursorInfo failed: %u\n", GetLastError()); + ok(cursor_info.dwSize == 25, "dwSize = %u\n", cursor_info.dwSize); + ok(cursor_info.bVisible == TRUE, "bVisible = %x\n", cursor_info.bVisible); + test_console_title(); test_WriteConsoleInputW(input); } diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 8f09ebbb3f..b91c81a5e5 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -184,19 +184,30 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->console = console; screen_buffer->id = id; screen_buffer->mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT; - screen_buffer->cursor_size = 100; + screen_buffer->cursor_size = 25; screen_buffer->cursor_visible = 1; screen_buffer->width = width; screen_buffer->height = height; screen_buffer->attr = 0x07; screen_buffer->popup_attr = 0xf5; - screen_buffer->max_width = 80; - screen_buffer->max_height = 25; - screen_buffer->win.right = min( screen_buffer->max_width - 1, width - 1 ); - screen_buffer->win.bottom = min( screen_buffer->max_height - 1, height - 1); screen_buffer->font.weight = FW_NORMAL; screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE; + if (console->active) + { + screen_buffer->max_width = console->active->max_width; + screen_buffer->max_height = console->active->max_height; + screen_buffer->win.right = console->active->win.right - console->active->win.left; + screen_buffer->win.bottom = console->active->win.bottom - console->active->win.top; + } + else + { + screen_buffer->max_width = width; + screen_buffer->max_height = height; + screen_buffer->win.right = width - 1; + screen_buffer->win.bottom = height - 1; + } + if (wine_rb_put( &screen_buffer_map, LongToPtr(id), &screen_buffer->entry )) { free( screen_buffer );

1 0

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

Oct. 7, 2020

Module: wine Branch: master Commit: 1ef8c0a1f3deb6da9addf2a8e039c9bac11aa134 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ef8c0a1f3deb6da9addf2a8… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Oct 7 10:39:54 2020 +0300 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 1ff3804ff2..b8baf6d127 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-09-21 23:29+0300\n" +"PO-Revision-Date: 2020-10-07 10:39+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -10234,16 +10234,12 @@ msgid "US Eastern Daylight Time" msgstr "JAV Rytinis vasaros laikas" #: dlls/tzres/tzres.rc:172 -#, fuzzy -#| msgid "Korea Standard Time" msgid "North Korea Standard Time" -msgstr "Korėjos juostinis laikas" +msgstr "Šiaurės Korėjos juostinis laikas" #: dlls/tzres/tzres.rc:173 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "North Korea Daylight Time" -msgstr "Korėjos vasaros laikas" +msgstr "Šiaurės Korėjos vasaros laikas" #: dlls/tzres/tzres.rc:208 msgid "Tasmania Standard Time"

1 0

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

Oct. 7, 2020

Module: wine Branch: master Commit: 568c32f381f71754b523d57a328684862bd44e6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=568c32f381f71754b523d57a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 00:51:58 2020 +0200 atl: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl.c | 20 +++++------------ dlls/atl/atl_ax.c | 35 +++++++++++++---------------- dlls/atl/registrar.c | 60 ++++++++++++++++++------------------------------- dlls/atl/tests/atl_ax.c | 3 +-- 4 files changed, 44 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=568c32f381f71754b523…

1 0

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

Oct. 7, 2020

Module: wine Branch: master Commit: 8e9b9da0f8896f819312ce3c693d2fbc0fe6b19e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e9b9da0f8896f819312ce3c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 00:51:52 2020 +0200 sc: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/sc/sc.c | 123 ++++++++++++++++++------------------------------------- 1 file changed, 40 insertions(+), 83 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8e9b9da0f8896f819312…

1 0

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

Oct. 7, 2020

Module: wine Branch: master Commit: 16abaccbe7dfa29cd13ddff073e79fd5e7eb4904 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16abaccbe7dfa29cd13ddff0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 00:51:54 2020 +0200 view: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/view/view.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index 2664eeb9b1..ad29734828 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -24,7 +24,7 @@ static HINSTANCE hInst; static HWND hMainWnd; -static WCHAR szAppName[5] = {'V','i','e','w',0}; +static const WCHAR szAppName[] = L"View"; static WCHAR szTitle[MAX_PATH]; static WCHAR szFileTitle[MAX_PATH]; @@ -52,14 +52,13 @@ typedef struct static BOOL FileOpen(HWND hWnd, WCHAR *fn, int fnsz) { WCHAR filter[120], metafileFilter[100]; - static const WCHAR filterW[] = {'%','s','%','c','*','.','w','m','f',';','*','.','e','m','f','%','c',0}; OPENFILENAMEW ofn = { sizeof(OPENFILENAMEW), 0, 0, NULL, NULL, 0, 0, NULL, fnsz, NULL, 0, NULL, NULL, OFN_SHOWHELP, 0, 0, NULL, 0, NULL }; LoadStringW( hInst, IDS_OPEN_META_STRING, metafileFilter, ARRAY_SIZE(metafileFilter) ); - swprintf( filter, ARRAY_SIZE(filter), filterW, metafileFilter, 0, 0 ); + swprintf( filter, ARRAY_SIZE(filter), L"%s%c*.wmf;*.emf%c", metafileFilter, 0, 0 ); ofn.lpstrFilter = filter; ofn.hwndOwner = hWnd; @@ -217,7 +216,6 @@ static void UpdateWindowCaption(void) { WCHAR szCaption[MAX_PATH]; WCHAR szView[MAX_PATH]; - static const WCHAR hyphenW[] = { ' ','-',' ',0 }; LoadStringW(hInst, IDS_DESCRIPTION, szView, ARRAY_SIZE(szView)); @@ -225,7 +223,7 @@ static void UpdateWindowCaption(void) { lstrcpyW(szCaption, szFileTitle); LoadStringW(hInst, IDS_DESCRIPTION, szView, ARRAY_SIZE(szView)); - lstrcatW(szCaption, hyphenW); + lstrcatW(szCaption, L" - "); lstrcatW(szCaption, szView); } else

1 0

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

Oct. 7, 2020

Module: wine Branch: master Commit: 2a2001b3002603624d2f091293b617cd47d8d6c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a2001b3002603624d2f0912… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 00:51:57 2020 +0200 advpack: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/advpack.c | 47 +++++++++--------------------------- dlls/advpack/files.c | 36 +++++++--------------------- dlls/advpack/install.c | 60 +++++++++++++--------------------------------- dlls/advpack/reg.c | 29 ++++++++-------------- dlls/advpack/tests/files.c | 7 +----- 5 files changed, 46 insertions(+), 133 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2a2001b3002603624d2f…

1 0

Jacek Caban : conhost: Don't create tty input thread if we don't have tty_input handle.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: 1d2c29dfb0bac8915b8e2ea07ecf20a33ca89527 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d2c29dfb0bac8915b8e2ea0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 6 18:53:37 2020 +0200 conhost: Don't create tty input thread if we don't have tty_input handle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 7d3564a120..8f09ebbb3f 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1719,6 +1719,7 @@ done: static BOOL ensure_tty_input_thread( struct console *console ) { + if (!console->tty_input) return TRUE; if (!console->input_thread) console->input_thread = CreateThread( NULL, 0, tty_input, console, 0, NULL ); return console->input_thread != NULL;

1 0

Jacek Caban : kernel32/tests: Move pseudo console tests before FreeConsole.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: f377ac1f2d0751c9d2d79e061b4e9c378a856bbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=f377ac1f2d0751c9d2d79e06… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 6 18:53:52 2020 +0200 kernel32/tests: Move pseudo console tests before FreeConsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 18dbbb1ff6..97dc9c61ce 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4250,9 +4250,9 @@ START_TEST(console) test_console_title(); if (!test_current) { + test_pseudo_console(); test_AttachConsole(hConOut); test_AllocConsole(); test_FreeConsole(); - test_pseudo_console(); } }

1 0

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

Oct. 7, 2020

Module: wine Branch: master Commit: 64ee238016ea70564e7623aeb2a4dc3f0188c32d URL: https://source.winehq.org/git/wine.git/?a=commit;h=64ee238016ea70564e7623ae… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 00:52:01 2020 +0200 dinput/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/dinput/tests/joystick.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index f082c612b0..8a3e5e3022 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -405,17 +405,13 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) ok(SUCCEEDED(hr), "IDirectInput_GetProperty() for DIPROP_GUIDANDPATH failed: %08x\n", hr); { - static const WCHAR formatW[] = {'\\','\\','?','\\','%','*','[','^','#',']','#','v','i','d','_', - '%','0','4','x','&','p','i','d','_','%','0','4','x',0}; - static const WCHAR miW[] = {'m','i','_',0}; - static const WCHAR igW[] = {'i','g','_',0}; int vid, pid; _wcslwr(dpg.wszPath); - count = swscanf(dpg.wszPath, formatW, &vid, &pid); + count = swscanf(dpg.wszPath, L"\\\\?\\%*[^#]#vid_%04x&pid_%04x", &vid, &pid); ok(count == 2, "DIPROP_GUIDANDPATH path has wrong format. Expected count: 2 Got: %i Path: %s\n", count, wine_dbgstr_w(dpg.wszPath)); - ok(wcsstr(dpg.wszPath, miW) != 0 || wcsstr(dpg.wszPath, igW) != 0, + ok(wcsstr(dpg.wszPath, L"mi_") != 0 || wcsstr(dpg.wszPath, L"ig_") != 0, "DIPROP_GUIDANDPATH path should contain either 'ig_' or 'mi_' substring. Path: %s\n", wine_dbgstr_w(dpg.wszPath)); }

1 0

Michael Stefaniuc : joy.cpl: Use wide-char string literals.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: 6d2c845db4d84d65152fa757dbfcc97c24373fb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d2c845db4d84d65152fa757… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 00:52:02 2020 +0200 joy.cpl: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 3921f59cbb..66ac58f703 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -38,8 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(joycpl); DECLSPEC_HIDDEN HMODULE hcpl; -static const WCHAR button_class[] = {'B','u','t','t','o','n','\0'}; - /********************************************************************* * DllMain */ @@ -169,14 +167,11 @@ static void initialize_joysticks_list(HWND hwnd, struct JoystickData *data) */ static BOOL get_app_key(HKEY *defkey, HKEY *appkey) { - static const WCHAR reg_key[] = { 'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\', - 'D','i','r','e','c','t','I','n','p','u','t','\\', - 'J','o','y','s','t','i','c','k','s','\0' }; *appkey = 0; /* Registry key can be found in HKCU\Software\Wine\DirectInput */ - if (RegCreateKeyExW(HKEY_CURRENT_USER, reg_key, 0, NULL, 0, KEY_SET_VALUE | KEY_READ, NULL, defkey, NULL)) + if (RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\Wine\\DirectInput\\Joysticks", 0, NULL, 0, + KEY_SET_VALUE | KEY_READ, NULL, defkey, NULL)) *defkey = 0; return *defkey || *appkey; @@ -215,13 +210,12 @@ static DWORD set_config_key(HKEY defkey, HKEY appkey, const WCHAR *name, const W */ static void enable_joystick(WCHAR *joy_name, BOOL enable) { - static const WCHAR disabled_str[] = {'d','i','s','a','b','l','e','d','\0'}; HKEY hkey, appkey; get_app_key(&hkey, &appkey); if (!enable) - set_config_key(hkey, appkey, joy_name, disabled_str, lstrlenW(disabled_str)); + set_config_key(hkey, appkey, joy_name, L"disabled", lstrlenW(L"disabled")); else set_config_key(hkey, appkey, joy_name, NULL, 0); @@ -231,7 +225,6 @@ static void enable_joystick(WCHAR *joy_name, BOOL enable) static void initialize_disabled_joysticks_list(HWND hwnd) { - static const WCHAR disabled_str[] = {'d','i','s','a','b','l','e','d','\0'}; HKEY hkey, appkey; DWORD values = 0; LSTATUS status; @@ -250,7 +243,7 @@ static void initialize_disabled_joysticks_list(HWND hwnd) status = RegEnumValueW(hkey, i, buf_name, &name_len, NULL, NULL, (BYTE*) buf_data, &data_len); - if (status == ERROR_SUCCESS && !lstrcmpW(disabled_str, buf_data)) + if (status == ERROR_SUCCESS && !lstrcmpW(L"disabled", buf_data)) SendDlgItemMessageW(hwnd, IDC_DISABLEDLIST, LB_ADDSTRING, 0, (LPARAM) buf_name); } @@ -492,7 +485,7 @@ static void draw_joystick_buttons(HWND hwnd, struct JoystickData* data) button_number_to_wchar(i + 1, button_label); - data->graphics.buttons[i] = CreateWindowW(button_class, button_label, WS_CHILD, + data->graphics.buttons[i] = CreateWindowW(L"Button", button_label, WS_CHILD, r.left, r.top, r.right - r.left, r.bottom - r.top, hwnd, NULL, NULL, hinst); @@ -504,8 +497,7 @@ static void draw_joystick_axes(HWND hwnd, struct JoystickData* data) { int i; HINSTANCE hinst = (HINSTANCE) GetWindowLongPtrW(hwnd, GWLP_HINSTANCE); - static const WCHAR axes_names[TEST_MAX_AXES][7] = { {'X',',','Y','\0'}, {'R','x',',','R','y','\0'}, - {'Z',',','R','z','\0'}, {'P','O','V','\0'} }; + static const WCHAR axes_names[TEST_MAX_AXES][7] = { L"X,Y", L"Rx,Ry", L"Z,Rz", L"POV"}; static const DWORD axes_idc[TEST_MAX_AXES] = { IDC_TESTGROUPXY, IDC_TESTGROUPRXRY, IDC_TESTGROUPZRZ, IDC_TESTGROUPPOV }; @@ -521,7 +513,7 @@ static void draw_joystick_axes(HWND hwnd, struct JoystickData* data) r.bottom = r.top + TEST_AXIS_SIZE_Y; MapDialogRect(hwnd, &r); - data->graphics.axes[i] = CreateWindowW( button_class, NULL, WS_CHILD | WS_VISIBLE, + data->graphics.axes[i] = CreateWindowW(L"Button", NULL, WS_CHILD | WS_VISIBLE, r.left, r.top, r.right - r.left, r.bottom - r.top, hwnd, NULL, NULL, hinst); } @@ -617,7 +609,7 @@ static void draw_ff_axis(HWND hwnd, struct JoystickData *data) MapDialogRect(hwnd, &r); /* Draw direction axis */ - data->graphics.ff_axis = CreateWindowW( button_class, NULL, WS_CHILD | WS_VISIBLE, + data->graphics.ff_axis = CreateWindowW(L"Button", NULL, WS_CHILD | WS_VISIBLE, r.left, r.top, r.right - r.left, r.bottom - r.top, hwnd, NULL, NULL, hinst); }

1 0

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

Oct. 7, 2020

Module: wine Branch: master Commit: 21e3ba96f8d2fd67e2ff961b832f98adf1255b92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21e3ba96f8d2fd67e2ff961b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 00:52:00 2020 +0200 dinput8/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/dinput8/tests/device.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 80a7fe26c3..2fc04358cc 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -627,18 +627,17 @@ static void test_mouse_keyboard(void) if (raw_devices[0].hwndTarget != NULL) { - WCHAR di_hwnd_class[] = {'D','I','E','m','W','i','n',0}; WCHAR str[16]; int i; di_hwnd = raw_devices[0].hwndTarget; i = GetClassNameW(di_hwnd, str, ARRAY_SIZE(str)); - ok(i == lstrlenW(di_hwnd_class), "GetClassName returned incorrect length\n"); - ok(!lstrcmpW(di_hwnd_class, str), "GetClassName returned incorrect name for this window's class\n"); + ok(i == lstrlenW(L"DIEmWin"), "GetClassName returned incorrect length\n"); + ok(!lstrcmpW(L"DIEmWin", str), "GetClassName returned incorrect name for this window's class\n"); i = GetWindowTextW(di_hwnd, str, ARRAY_SIZE(str)); - ok(i == lstrlenW(di_hwnd_class), "GetClassName returned incorrect length\n"); - ok(!lstrcmpW(di_hwnd_class, str), "GetClassName returned incorrect name for this window's class\n"); + ok(i == lstrlenW(L"DIEmWin"), "GetClassName returned incorrect length\n"); + ok(!lstrcmpW(L"DIEmWin", str), "GetClassName returned incorrect name for this window's class\n"); } hr = IDirectInputDevice8_Acquire(di_mouse);

1 0

Anton Baskanov : winegstreamer: Fix RGB565 conversion in amt_from_gst_video_info().
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: 9afc5ed72eaf109726be8f558294a1a21502c496 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9afc5ed72eaf109726be8f55… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Oct 7 01:04:57 2020 +0700 winegstreamer: Fix RGB565 conversion in amt_from_gst_video_info(). Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5b5add409c..e95205ca44 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -158,7 +158,7 @@ static gboolean amt_from_gst_audio_info(const GstAudioInfo *info, AM_MEDIA_TYPE static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE *amt) { - VIDEOINFOHEADER *vih; + VIDEOINFO *vih; BITMAPINFOHEADER *bih; gint32 width, height; @@ -170,7 +170,7 @@ static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE amt->formattype = FORMAT_VideoInfo; amt->pbFormat = (BYTE*)vih; - amt->cbFormat = sizeof(*vih); + amt->cbFormat = sizeof(VIDEOINFOHEADER); amt->bFixedSizeSamples = FALSE; amt->bTemporalCompression = TRUE; amt->lSampleSize = 1; @@ -180,6 +180,7 @@ static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE if (GST_VIDEO_INFO_IS_RGB(info)) { + bih->biCompression = BI_RGB; switch (GST_VIDEO_INFO_FORMAT(info)) { case GST_VIDEO_FORMAT_BGRA: @@ -196,7 +197,12 @@ static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE break; case GST_VIDEO_FORMAT_RGB16: amt->subtype = MEDIASUBTYPE_RGB565; + amt->cbFormat = offsetof(VIDEOINFO, u.dwBitMasks[3]); + vih->u.dwBitMasks[iRED] = 0xf800; + vih->u.dwBitMasks[iGREEN] = 0x07e0; + vih->u.dwBitMasks[iBLUE] = 0x001f; bih->biBitCount = 16; + bih->biCompression = BI_BITFIELDS; break; case GST_VIDEO_FORMAT_RGB15: amt->subtype = MEDIASUBTYPE_RGB555; @@ -207,7 +213,6 @@ static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE CoTaskMemFree(vih); return FALSE; } - bih->biCompression = BI_RGB; } else { amt->subtype = MEDIATYPE_Video; if (!(amt->subtype.Data1 = gst_video_format_to_fourcc(GST_VIDEO_INFO_FORMAT(info)))) @@ -2116,7 +2121,8 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, buffer_size = format->bmiHeader.biSizeImage; gst_util_set_object_arg(G_OBJECT(pin->flip), "method", - format->bmiHeader.biCompression == BI_RGB ? "vertical-flip" : "none"); + (format->bmiHeader.biCompression == BI_RGB + || format->bmiHeader.biCompression == BI_BITFIELDS) ? "vertical-flip" : "none"); } else if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_WaveFormatEx) && (IsEqualGUID(&pin->pin.pin.mt.subtype, &MEDIASUBTYPE_PCM)

1 0

Michael Stefaniuc : advpack: Don't use sizeof to calculate the length of a WCHAR string.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: 86ab6bc9a7bee8971287438bbfad337fe1ce2fb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86ab6bc9a7bee8971287438b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 00:51:56 2020 +0200 advpack: Don't use sizeof to calculate the length of a WCHAR string. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/install.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index d82de9c361..24e2c4579a 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -446,10 +446,6 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, LPCWSTR ptr, path; static const WCHAR backslash[] = {'\\',0}; - static const WCHAR default_install[] = { - 'D','e','f','a','u','l','t','I','n','s','t','a','l','l',0 - }; - if (!(ptr = wcsrchr(inf_filename, '\\'))) ptr = inf_filename; @@ -464,16 +460,16 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, /* FIXME: determine the proper platform to install (NTx86, etc) */ if (!install_sec || !*install_sec) { - len = sizeof(default_install) - 1; - ptr = default_install; + len = ARRAY_SIZE(L"DefaultInstall"); + ptr = L"DefaultInstall"; } else { - len = lstrlenW(install_sec); + len = lstrlenW(install_sec) + 1; ptr = install_sec; } - info->install_sec = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + info->install_sec = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!info->install_sec) return E_OUTOFMEMORY;

1 0

Anton Baskanov : winegstreamer: Add a second videoconvert to handle 15/16-bit RGB formats.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: e484056171bfd57473660243bc75935409320f37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e484056171bfd57473660243… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Oct 7 01:04:58 2020 +0700 winegstreamer: Add a second videoconvert to handle 15/16-bit RGB formats. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e95205ca44..90a129f29a 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1003,7 +1003,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * if (!strcmp(typename, "video/x-raw")) { - GstElement *vconv, *flip, *deinterlace; + GstElement *deinterlace, *vconv, *flip, *vconv2; /* DirectShow can express interlaced video, but downstream filters can't * necessarily consume it. In particular, the video renderer can't. */ @@ -1035,6 +1035,18 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * goto out; } + /* videoflip does not support 15 and 16-bit RGB so add a second videoconvert + * to do the final conversion. */ + if (!(vconv2 = gst_element_factory_make("videoconvert", NULL))) + { + ERR("Failed to create videoconvert, are %u-bit GStreamer \"base\" plugins installed?\n", + 8 * (int)sizeof(void *)); + goto out; + } + + /* Avoid expensive color matrix conversions. */ + gst_util_set_object_arg(G_OBJECT(vconv2), "matrix-mode", "none"); + /* The bin takes ownership of these elements. */ gst_bin_add(GST_BIN(This->container), deinterlace); gst_element_sync_state_with_parent(deinterlace); @@ -1042,12 +1054,15 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * gst_element_sync_state_with_parent(vconv); gst_bin_add(GST_BIN(This->container), flip); gst_element_sync_state_with_parent(flip); + gst_bin_add(GST_BIN(This->container), vconv2); + gst_element_sync_state_with_parent(vconv2); gst_element_link(deinterlace, vconv); gst_element_link(vconv, flip); + gst_element_link(flip, vconv2); pin->post_sink = gst_element_get_static_pad(deinterlace, "sink"); - pin->post_src = gst_element_get_static_pad(flip, "src"); + pin->post_src = gst_element_get_static_pad(vconv2, "src"); pin->flip = flip; } else if (!strcmp(typename, "audio/x-raw"))

1 0

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

Oct. 7, 2020

Module: wine Branch: master Commit: 1b9c43df16e97260e68eff3796c9d6b1a5850420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b9c43df16e97260e68eff37… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 00:51:59 2020 +0200 quartz: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 79df639ab4..cc252c0e0e 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -183,9 +183,7 @@ static BOOL process_pattern_string(const WCHAR *pattern, HANDLE file) BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID *source_clsid) { - WCHAR extensions_path[278] = {'M','e','d','i','a',' ','T','y','p','e','\\','E','x','t','e','n','s','i','o','n','s','\\',0}; - static const WCHAR wszExtensions[] = {'E','x','t','e','n','s','i','o','n','s',0}; - static const WCHAR wszMediaType[] = {'M','e','d','i','a',' ','T','y','p','e',0}; + WCHAR extensions_path[278] = L"Media Type\\Extensions\\"; DWORD majortype_idx, size; const WCHAR *ext; HKEY parent_key; @@ -223,7 +221,7 @@ BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID return FALSE; } - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszMediaType, 0, KEY_READ, &parent_key)) + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Media Type", 0, KEY_READ, &parent_key)) { CloseHandle(file); return FALSE; @@ -239,7 +237,7 @@ BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID if (RegEnumKeyExW(parent_key, majortype_idx, majortype_str, &size, NULL, NULL, NULL, NULL)) break; - if (!wcscmp(majortype_str, wszExtensions)) + if (!wcscmp(majortype_str, L"Extensions")) continue; if (RegOpenKeyExW(parent_key, majortype_str, 0, KEY_READ, &majortype_key))

1 0

Jacek Caban : kernel32/tests: Improve current console test mode.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: 06cbf1992313f4a9ef090a4d01aaab42f74e8549 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06cbf1992313f4a9ef090a4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 6 18:54:12 2020 +0200 kernel32/tests: Improve current console test mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index deb5030553..b5878fe8a2 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4086,7 +4086,7 @@ static void test_pseudo_console(void) START_TEST(console) { - HANDLE hConIn, hConOut; + HANDLE hConIn, hConOut, revert_output = NULL; BOOL ret, test_current; CONSOLE_SCREEN_BUFFER_INFO sbi; BOOL using_pseudo_console; @@ -4174,6 +4174,16 @@ START_TEST(console) } } + if (test_current) + { + HANDLE sb; + revert_output = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + sb = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + CONSOLE_TEXTMODE_BUFFER, NULL); + ok(sb != INVALID_HANDLE_VALUE, "Could not allocate screen buffer: %u\n", GetLastError()); + SetConsoleActiveScreenBuffer(sb); + } + hConIn = CreateFileA("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); hConOut = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); @@ -4240,7 +4250,7 @@ START_TEST(console) else test_GetSetConsoleInputExeName(); - test_GetConsoleProcessList(); + if (!test_current) test_GetConsoleProcessList(); test_OpenConsoleW(); test_CreateFileW(); test_OpenCON(); @@ -4260,12 +4270,15 @@ START_TEST(console) test_ReadConsoleOutputCharacterW(hConOut); test_ReadConsoleOutputAttribute(hConOut); test_ReadConsoleOutput(hConOut); - test_GetCurrentConsoleFont(hConOut); - test_GetCurrentConsoleFontEx(hConOut); - test_GetConsoleFontSize(hConOut); - test_GetLargestConsoleWindowSize(hConOut); - test_GetConsoleFontInfo(hConOut); - test_SetConsoleFont(hConOut); + if (!test_current) + { + test_GetCurrentConsoleFont(hConOut); + test_GetCurrentConsoleFontEx(hConOut); + test_GetConsoleFontSize(hConOut); + test_GetLargestConsoleWindowSize(hConOut); + test_GetConsoleFontInfo(hConOut); + test_SetConsoleFont(hConOut); + } test_GetConsoleScreenBufferInfoEx(hConOut); test_SetConsoleScreenBufferInfoEx(hConOut); test_console_title(); @@ -4276,4 +4289,6 @@ START_TEST(console) test_AllocConsole(); test_FreeConsole(); } + else if (revert_output) SetConsoleActiveScreenBuffer(revert_output); + }

1 0