October 2019 - Wine-Commits

Nikolay Sivov : dwrite: Update to IDWriteFontCollection3.
by Alexandre Julliard Oct. 8, 2019

Oct. 8, 2019

Module: wine Branch: master Commit: 3360dfec40815779bc8a6500c80da3d9fe35782d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3360dfec40815779bc8a6500… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 8 13:04:34 2019 +0300 dwrite: Update to IDWriteFontCollection3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 7 ++- dlls/dwrite/font.c | 147 +++++++++++++++++++++++++++++-------------- dlls/dwrite/main.c | 8 +-- dlls/dwrite/tests/font.c | 15 +++++ include/dwrite_3.idl | 2 +- 5 files changed, 125 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3360dfec40815779bc8a…

1 0

Nikolay Sivov : mf/tests: Use separate session instance for events tests.
by Alexandre Julliard Oct. 8, 2019

Oct. 8, 2019

Module: wine Branch: master Commit: 34c52b946ad7526d20ca0fa79c17740fea1f8869 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34c52b946ad7526d20ca0fa7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 8 15:58:54 2019 +0300 mf/tests: Use separate session instance for events tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2a5efc99e8..038bfeacd1 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1041,8 +1041,6 @@ todo_wine IMFGetService_Release(gs); - test_session_events(session); - IMFMediaSession_Release(session); hr = MFCreateMediaSession(NULL, &session); @@ -1077,6 +1075,14 @@ todo_wine IMFAttributes_Release(attributes); + /* Basic events behavior. */ + hr = MFCreateMediaSession(NULL, &session); + ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); + + test_session_events(session); + + IMFMediaSession_Release(session); + hr = MFShutdown(); ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); }

1 0

Evgeny Litvinenko : ntdll: Solaris requires sys/regset.h.
by Alexandre Julliard Oct. 8, 2019

Oct. 8, 2019

Module: wine Branch: master Commit: 893e9d1b72cb31212b07d3261d589a2b7d65ff7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=893e9d1b72cb31212b07d326… Author: Evgeny Litvinenko <evgeny.v.litvinenko(a)gmail.com> Date: Sun Oct 6 23:18:18 2019 +0300 ntdll: Solaris requires sys/regset.h. Signed-off-by: Evgeny Litvinenko <evgeny.v.litvinenko(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 534b05c717..fd761246c5 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -272,8 +272,11 @@ typedef struct trapframe ucontext_t; #elif defined(__svr4__) || defined(_SCO_DS) || defined(__sun) -#ifdef _SCO_DS +#if defined(_SCO_DS) || defined(__sun) #include <sys/regset.h> +#endif + +#ifdef _SCO_DS #define gregs regs #endif

1 0

Zebediah Figura : strmbase: Correctly implement IVideoWindow::put_Owner().
by Alexandre Julliard Oct. 8, 2019

Oct. 8, 2019

Module: wine Branch: master Commit: 9b98246e82fabed674d04a7e637dd78ae0e8b3fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b98246e82fabed674d04a7e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 7 18:55:45 2019 -0500 strmbase: Correctly implement IVideoWindow::put_Owner(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/strmbase/window.c | 27 +++++++++++++-------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index ae467ed71a..f4c3f92e28 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1795,9 +1795,9 @@ static void test_video_window_owner(IVideoWindow *window, HWND hwnd, HWND our_hw parent = GetAncestor(hwnd, GA_PARENT); ok(parent == our_hwnd, "Got parent %p.\n", parent); style = GetWindowLongA(hwnd, GWL_STYLE); - todo_wine ok((style & WS_CHILD), "Got style %#x.\n", style); + ok((style & WS_CHILD), "Got style %#x.\n", style); - todo_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); + ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); top_hwnd = get_top_window(); ok(top_hwnd == our_hwnd, "Got top window %p.\n", top_hwnd); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index f280b323ab..446c389220 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -558,23 +558,22 @@ HRESULT WINAPI BaseControlWindowImpl_get_Height(IVideoWindow *iface, LONG *pHeig return S_OK; } -HRESULT WINAPI BaseControlWindowImpl_put_Owner(IVideoWindow *iface, OAHWND Owner) +HRESULT WINAPI BaseControlWindowImpl_put_Owner(IVideoWindow *iface, OAHWND owner) { - BaseControlWindow* This = impl_from_IVideoWindow(iface); + BaseControlWindow *window = impl_from_IVideoWindow(iface); + HWND hwnd = window->baseWindow.hWnd; - TRACE("(%p/%p)->(%08x)\n", This, iface, (DWORD) Owner); + TRACE("window %p, owner %#lx.\n", window, owner); - This->hwndOwner = (HWND)Owner; - SetParent(This->baseWindow.hWnd, This->hwndOwner); - if (This->baseWindow.WindowStyles & WS_CHILD) - { - LONG old = GetWindowLongW(This->baseWindow.hWnd, GWL_STYLE); - if (old != This->baseWindow.WindowStyles) - { - SetWindowLongW(This->baseWindow.hWnd, GWL_STYLE, This->baseWindow.WindowStyles); - SetWindowPos(This->baseWindow.hWnd,0,0,0,0,0,SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOZORDER); - } - } + /* Make sure we are marked as WS_CHILD before reparenting ourselves, so that + * we do not steal focus. LEGO Island depends on this. */ + + window->hwndOwner = (HWND)owner; + if (owner) + SetWindowLongPtrW(hwnd, GWL_STYLE, GetWindowLongPtrW(hwnd, GWL_STYLE) | WS_CHILD); + else + SetWindowLongPtrW(hwnd, GWL_STYLE, GetWindowLongPtrW(hwnd, GWL_STYLE) & ~WS_CHILD); + SetParent(hwnd, (HWND)owner); return S_OK; }

1 0

Alistair Leslie-Hughes : dinput/tests: Add checks for Acquire/Unacquire.
by Alexandre Julliard Oct. 8, 2019

Oct. 8, 2019

Module: wine Branch: master Commit: 0555209757e842818c16c6868e73bf076daa349b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0555209757e842818c16c686… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 7 22:56:06 2019 +0000 dinput/tests: Add checks for Acquire/Unacquire. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/mouse.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index e4d24e8916..11da951d10 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -148,15 +148,20 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); mouse_event(MOUSEEVENTF_MOVE, 10, 10, 0, 0); - IDirectInputDevice_Unacquire(pMouse); + hr = IDirectInputDevice_Unacquire(pMouse); + ok(hr == S_OK, "Failed: %08x\n", hr); cnt = 1; hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); - IDirectInputDevice_Acquire(pMouse); + hr = IDirectInputDevice_Acquire(pMouse); + ok(hr == S_OK, "Failed: %08x\n", hr); mouse_event(MOUSEEVENTF_MOVE, 10, 10, 0, 0); - IDirectInputDevice_Unacquire(pMouse); - IDirectInputDevice_Acquire(pMouse); + hr = IDirectInputDevice_Unacquire(pMouse); + ok(hr == S_OK, "Failed: %08x\n", hr); + + hr = IDirectInputDevice_Acquire(pMouse); + ok(hr == S_OK, "Failed: %08x\n", hr); cnt = 1; hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt);

1 0

Zebediah Figura : strmbase: Do not activate the window when changing its position.
by Alexandre Julliard Oct. 8, 2019

Oct. 8, 2019

Module: wine Branch: master Commit: 47ec8ce9113d875b0d4ac1d4f68c3dfc890ef140 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47ec8ce9113d875b0d4ac1d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 7 18:55:46 2019 -0500 strmbase: Do not activate the window when changing its position. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=10440 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/strmbase/window.c | 14 +++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index f4c3f92e28..f1f901d164 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1762,9 +1762,9 @@ static void test_video_window_position(IVideoWindow *window, HWND hwnd, HWND our ok(rect.right == 400, "Got window right %d.\n", rect.right); ok(rect.bottom == 600, "Got window bottom %d.\n", rect.bottom); - todo_wine ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); + ok(GetActiveWindow() == our_hwnd, "Got active window %p.\n", GetActiveWindow()); top_hwnd = get_top_window(); - todo_wine ok(top_hwnd == our_hwnd, "Got top window %p.\n", top_hwnd); + ok(top_hwnd == our_hwnd, "Got top window %p.\n", top_hwnd); } static void test_video_window_owner(IVideoWindow *window, HWND hwnd, HWND our_hwnd) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 446c389220..cb41aee2f4 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -462,7 +462,8 @@ HRESULT WINAPI BaseControlWindowImpl_put_Left(IVideoWindow *iface, LONG Left) TRACE("(%p/%p)->(%d)\n", This, iface, Left); GetWindowRect(This->baseWindow.hWnd, &WindowPos); - if (!SetWindowPos(This->baseWindow.hWnd, NULL, Left, WindowPos.top, 0, 0, SWP_NOZORDER|SWP_NOSIZE)) + if (!SetWindowPos(This->baseWindow.hWnd, NULL, Left, WindowPos.top, 0, 0, + SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE)) return E_FAIL; return S_OK; @@ -487,7 +488,8 @@ HRESULT WINAPI BaseControlWindowImpl_put_Width(IVideoWindow *iface, LONG Width) TRACE("(%p/%p)->(%d)\n", This, iface, Width); - if (!SetWindowPos(This->baseWindow.hWnd, NULL, 0, 0, Width, This->baseWindow.Height, SWP_NOZORDER|SWP_NOMOVE)) + if (!SetWindowPos(This->baseWindow.hWnd, NULL, 0, 0, Width, This->baseWindow.Height, + SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE)) return E_FAIL; This->baseWindow.Width = Width; @@ -514,7 +516,8 @@ HRESULT WINAPI BaseControlWindowImpl_put_Top(IVideoWindow *iface, LONG Top) TRACE("(%p/%p)->(%d)\n", This, iface, Top); GetWindowRect(This->baseWindow.hWnd, &WindowPos); - if (!SetWindowPos(This->baseWindow.hWnd, NULL, WindowPos.left, Top, 0, 0, SWP_NOZORDER|SWP_NOSIZE)) + if (!SetWindowPos(This->baseWindow.hWnd, NULL, WindowPos.left, Top, 0, 0, + SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE)) return E_FAIL; return S_OK; @@ -539,7 +542,8 @@ HRESULT WINAPI BaseControlWindowImpl_put_Height(IVideoWindow *iface, LONG Height TRACE("(%p/%p)->(%d)\n", This, iface, Height); - if (!SetWindowPos(This->baseWindow.hWnd, NULL, 0, 0, This->baseWindow.Width, Height, SWP_NOZORDER|SWP_NOMOVE)) + if (!SetWindowPos(This->baseWindow.hWnd, NULL, 0, 0, This->baseWindow.Width, + Height, SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE)) return E_FAIL; This->baseWindow.Height = Height; @@ -675,7 +679,7 @@ HRESULT WINAPI BaseControlWindowImpl_SetWindowPosition(IVideoWindow *iface, LONG TRACE("(%p/%p)->(%d, %d, %d, %d)\n", This, iface, Left, Top, Width, Height); - if (!SetWindowPos(This->baseWindow.hWnd, NULL, Left, Top, Width, Height, SWP_NOZORDER)) + if (!SetWindowPos(This->baseWindow.hWnd, NULL, Left, Top, Width, Height, SWP_NOACTIVATE | SWP_NOZORDER)) return E_FAIL; This->baseWindow.Width = Width;

1 0

Zebediah Figura : strmbase: IVideoWindow::SetWindowForeground takes OATRUE, not TRUE.
by Alexandre Julliard Oct. 8, 2019

Oct. 8, 2019

Module: wine Branch: master Commit: ed1c18e8c98b551b9b409fddb512074b1687f34f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed1c18e8c98b551b9b409fdd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 7 18:55:44 2019 -0500 strmbase: IVideoWindow::SetWindowForeground takes OATRUE, not TRUE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 18 +++++++++--------- dlls/strmbase/window.c | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index cd8fa4d511..ae467ed71a 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1609,17 +1609,17 @@ static void test_video_window_state(IVideoWindow *window, HWND hwnd, HWND our_hw hr = IVideoWindow_put_WindowState(window, SW_SHOWNA); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IVideoWindow_SetWindowForeground(window, TRUE); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + SetWindowPos(our_hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); hr = IVideoWindow_SetWindowForeground(window, OATRUE); - todo_wine - { - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(GetActiveWindow() == hwnd, "Got active window %p.\n", GetActiveWindow()); - ok(GetFocus() == hwnd, "Got focus window %p.\n", GetFocus()); - ok(GetForegroundWindow() == hwnd, "Got foreground window %p.\n", GetForegroundWindow()); - top = get_top_window(); - ok(top == hwnd, "Got top window %p.\n", top); - } + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(GetActiveWindow() == hwnd, "Got active window %p.\n", GetActiveWindow()); + ok(GetFocus() == hwnd, "Got focus window %p.\n", GetFocus()); + ok(GetForegroundWindow() == hwnd, "Got foreground window %p.\n", GetForegroundWindow()); + top = get_top_window(); + todo_wine ok(top == hwnd, "Got top window %p.\n", top); hr = IVideoWindow_SetWindowForeground(window, OAFALSE); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 4ecc81c24e..f280b323ab 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -652,7 +652,7 @@ HRESULT WINAPI BaseControlWindowImpl_SetWindowForeground(IVideoWindow *iface, LO TRACE("(%p/%p)->(%d)\n", This, iface, Focus); - if ((Focus != FALSE) && (Focus != TRUE)) + if ((Focus != OAFALSE) && (Focus != OATRUE)) return E_INVALIDARG; hr = IPin_ConnectedTo(&This->pPin->IPin_iface, &pPin);

1 0

Zebediah Figura : quartz/tests: Add tests for IVideoWindow on the video renderer.
by Alexandre Julliard Oct. 8, 2019

Oct. 8, 2019

Module: wine Branch: master Commit: 9cb8fd4e6b93dedb006846eeb2a149003596f272 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cb8fd4e6b93dedb006846ee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 7 18:55:43 2019 -0500 quartz/tests: Add tests for IVideoWindow on the video renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 735 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 735 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9cb8fd4e6b93dedb0068…

1 0

Nikolay Sivov : dwrite/tests: Remove test failing on RTL locales.
by Alexandre Julliard Oct. 8, 2019

Oct. 8, 2019

Module: wine Branch: master Commit: 16c8b2569dca5f4ccb69e5fa5a9f961670cf99f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16c8b2569dca5f4ccb69e5fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 8 13:04:32 2019 +0300 dwrite/tests: Remove test failing on RTL locales. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 2c90e31a85..b153bcbb69 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1702,14 +1702,6 @@ static const struct drawcall_entry draw_ltr_reordered_run_seq[] = { { DRAW_LAST_KIND } }; -static const struct drawcall_entry draw_rtl_reordered_run_seq[] = { - { DRAW_GLYPHRUN, {'1','2','3','-','5','2',0}, {'r','u',0}, 6, 2 }, - { DRAW_GLYPHRUN, {0x64a,0x64f,0x633,0x627,0x648,0x650,0x64a,0}, {'r','u',0}, 7, 1 }, - { DRAW_GLYPHRUN, {'7','1',0}, {'r','u',0}, 2, 2 }, - { DRAW_GLYPHRUN, {'.',0}, {'r','u',0}, 1, 1 }, - { DRAW_LAST_KIND } -}; - static void test_Draw(void) { static const WCHAR str3W[] = {'1','2','3','-','5','2',0x64a,0x64f,0x633,0x627,0x648,0x650, @@ -1916,14 +1908,6 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok_sequence(sequences, RENDERER_ID, draw_ltr_reordered_run_seq, "draw test 11", FALSE); - hr = IDWriteTextLayout_SetReadingDirection(layout, DWRITE_READING_DIRECTION_RIGHT_TO_LEFT); - ok(hr == S_OK, "Failed to set reading direction, hr %#x.\n", hr); - - flush_sequence(sequences, RENDERER_ID); - hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0f, 0.0f); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, RENDERER_ID, draw_rtl_reordered_run_seq, "draw test 12", FALSE); - IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format);

1 0

Zebediah Figura : strmbase: Fix implementation of IVideoWindow::get_Caption().
by Alexandre Julliard Oct. 8, 2019

Oct. 8, 2019

Module: wine Branch: master Commit: 058926db97d657b3b2907e12a3cc8906c524d82e URL: https://source.winehq.org/git/wine.git/?a=commit;h=058926db97d657b3b2907e12… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 7 18:55:42 2019 -0500 strmbase: Fix implementation of IVideoWindow::get_Caption(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/window.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index b7c0bae47b..4ecc81c24e 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -297,15 +297,24 @@ HRESULT WINAPI BaseControlWindowImpl_put_Caption(IVideoWindow *iface, BSTR strCa return S_OK; } -HRESULT WINAPI BaseControlWindowImpl_get_Caption(IVideoWindow *iface, BSTR *strCaption) +HRESULT WINAPI BaseControlWindowImpl_get_Caption(IVideoWindow *iface, BSTR *caption) { - BaseControlWindow* This = impl_from_IVideoWindow(iface); + BaseControlWindow *window = impl_from_IVideoWindow(iface); + WCHAR *str; + int len; - TRACE("(%p/%p)->(%p)\n", This, iface, strCaption); + TRACE("window %p, caption %p.\n", window, caption); - GetWindowTextW(This->baseWindow.hWnd, (LPWSTR)strCaption, 100); + *caption = NULL; - return S_OK; + len = GetWindowTextLengthW(window->baseWindow.hWnd) + 1; + if (!(str = heap_alloc(len * sizeof(WCHAR)))) + return E_OUTOFMEMORY; + + GetWindowTextW(window->baseWindow.hWnd, str, len); + *caption = SysAllocString(str); + heap_free(str); + return *caption ? S_OK : E_OUTOFMEMORY; } HRESULT WINAPI BaseControlWindowImpl_put_WindowStyle(IVideoWindow *iface, LONG WindowStyle)

1 0