November 2021 - Wine-commits

Piotr Caban : oleacc: Add AccessibleObjectFromPoint implementation.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 92f4f4a4c13e822cb5eb03207ec76f71640353d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92f4f4a4c13e822cb5eb0320… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 25 18:55:07 2021 +0100 oleacc: Add AccessibleObjectFromPoint implementation. Based on a patch by Alex Henrie. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/main.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 65 insertions(+), 6 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 3ce616ae0c1..d2a80cfde34 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -263,18 +263,77 @@ LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) return atom; } -HRESULT WINAPI AccessibleObjectFromPoint( POINT ptScreen, IAccessible** ppacc, VARIANT* pvarChild ) -{ - FIXME("{%d,%d} %p %p: stub\n", ptScreen.x, ptScreen.y, ppacc, pvarChild ); - return E_NOTIMPL; -} - static void variant_init_i4( VARIANT *v, int val ) { V_VT(v) = VT_I4; V_I4(v) = val; } +HRESULT WINAPI AccessibleObjectFromPoint( POINT point, IAccessible** acc, VARIANT* child_id ) +{ + IAccessible *cur; + HRESULT hr; + VARIANT v; + HWND hwnd; + + TRACE("{%d,%d} %p %p\n", point.x, point.y, acc, child_id); + + if (!acc || !child_id) + return E_INVALIDARG; + + *acc = NULL; + V_VT(child_id) = VT_EMPTY; + + hwnd = WindowFromPoint(point); + if (!hwnd) + return E_FAIL; + hwnd = GetAncestor(hwnd, GA_ROOT); + + hr = AccessibleObjectFromWindow(hwnd, OBJID_WINDOW, &IID_IAccessible, (void **)&cur); + if (FAILED(hr)) + return hr; + if (!cur) + return E_FAIL; + + V_VT(&v) = VT_EMPTY; + while (1) + { + hr = IAccessible_accHitTest(cur, point.x, point.y, &v); + if (FAILED(hr)) + { + IAccessible_Release(cur); + return hr; + } + + if (V_VT(&v) == VT_I4) + { + *acc = cur; + variant_init_i4(child_id, V_I4(&v)); + return S_OK; + } + else if (V_VT(&v) == VT_DISPATCH) + { + IAccessible_Release(cur); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&cur); + VariantClear(&v); + if (FAILED(hr)) + return hr; + if (!cur) + return E_FAIL; + } + else + { + VariantClear(&v); + IAccessible_Release(cur); + FIXME("unhandled variant type: %d\n", V_VT(&v)); + return E_NOTIMPL; + } + } + + return S_OK; +} + HRESULT WINAPI AccessibleObjectFromEvent( HWND hwnd, DWORD object_id, DWORD child_id, IAccessible **acc_out, VARIANT *child_id_out ) {

1 0

Alex Henrie : oleacc/tests: Add AccessibleObjectFromPoint tests.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 9d8bf363cf6251e54ebca29ebcdc9451c359faab URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d8bf363cf6251e54ebca29e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 25 18:55:21 2021 +0100 oleacc/tests: Add AccessibleObjectFromPoint tests. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 8c234aee8aa..1f09581f64f 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -1304,6 +1304,72 @@ static void test_default_client_accessible_object(void) IAccessible_Release(acc); } +static void test_AccessibleObjectFromPoint(void) +{ + HWND hwnd, child; + IAccessible *acc; + VARIANT cid, var; + POINT point; + HRESULT hr; + + hwnd = CreateWindowA("oleacc_test", "test", WS_POPUP | WS_VISIBLE, + 0, 0, 400, 300, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed\n"); + ok(SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)&DefWindowProcA), + "SetWindowLongPtr failed\n"); + + point.x = point.y = 0; + ok(ClientToScreen(hwnd, &point), "ClientToScreen failed\n"); + + if (WindowFromPoint(point) != hwnd) + { + win_skip("test window not returned from WindowFromPoint\n"); + return; + } + + hr = AccessibleObjectFromPoint(point, NULL, NULL); + ok(hr == E_INVALIDARG, "got %x\n", hr); + + hr = AccessibleObjectFromPoint(point, &acc, NULL); + ok(hr == E_INVALIDARG, "got %x\n", hr); + + V_VT(&cid) = VT_DISPATCH; + V_DISPATCH(&cid) = (IDispatch*)0xdeadbeef; + hr = AccessibleObjectFromPoint(point, NULL, &cid); + ok(hr == E_INVALIDARG, "got %x\n", hr); + ok(V_VT(&cid) == VT_DISPATCH, "got %#x, expected %#x\n", V_VT(&cid), VT_DISPATCH); + + hr = AccessibleObjectFromPoint(point, &acc, &cid); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); + ok(V_I4(&cid) == CHILDID_SELF, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + check_acc_hwnd((IUnknown*)acc, hwnd); + hr = IAccessible_get_accRole(acc, cid, &var); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&var) == VT_I4, "got %#x, expected %#x\n", V_VT(&var), VT_I4); + ok(V_I4(&var) == ROLE_SYSTEM_CLIENT, "got %#x, expected %#x\n", + V_I4(&var), ROLE_SYSTEM_CLIENT); + IAccessible_Release(acc); + + child = CreateWindowA("edit", "edit", WS_CHILD | WS_VISIBLE, + 0, 0, 100, 100, hwnd, NULL, NULL, NULL); + ok(child != NULL, "CreateWindow failed\n"); + + hr = AccessibleObjectFromPoint(point, &acc, &cid); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); + ok(V_I4(&cid) == CHILDID_SELF, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + check_acc_hwnd((IUnknown*)acc, child); + hr = IAccessible_get_accRole(acc, cid, &var); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&var) == VT_I4, "got %#x, expected %#x\n", V_VT(&var), VT_I4); + ok(V_I4(&var) == ROLE_SYSTEM_TEXT, "got %#x, expected %#x\n", + V_I4(&var), ROLE_SYSTEM_TEXT); + IAccessible_Release(acc); + + DestroyWindow(hwnd); +} + static void test_CAccPropServices(void) { IAccPropServices *acc_prop_services; @@ -1749,6 +1815,7 @@ START_TEST(main) test_default_client_accessible_object(); test_AccessibleChildren(&Accessible); test_AccessibleObjectFromEvent(); + test_AccessibleObjectFromPoint(); test_CreateStdAccessibleObject_classes(); test_default_edit_accessible_object();

1 0

Zhiyi Zhang : comctl32/tests: Add an optional message to avoid test failures.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 3c789e2f10b7b878a3a3607015984a608be9f9be URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c789e2f10b7b878a3a36070… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 25 14:43:07 2021 +0800 comctl32/tests: Add an optional message to avoid test failures. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/propsheet.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 9acdea85c66..3089454d18d 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -648,6 +648,7 @@ static const struct message property_sheet_seq[] = { { DM_REPOSITION, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },*/ { WM_WINDOWPOSCHANGING, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, { WM_WINDOWPOSCHANGING, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, + { WM_WINDOWPOSCHANGED, sent|id|optional, 0, 0, RECEIVER_SHEET_WINPROC }, { WM_ACTIVATEAPP, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, /*{ WM_NCACTIVATE, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, { WM_GETTEXT, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },

1 0

Zhiyi Zhang : explorerframe/tests: Add ITaskbarList tests.
by Alexandre Julliard 25 Nov '21

25 Nov '21

Module: wine Branch: master Commit: 10a3dbbd656fed4653d8e97cecd71cab5494384c URL: https://source.winehq.org/git/wine.git/?a=commit;h=10a3dbbd656fed4653d8e97c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 25 14:41:28 2021 +0800 explorerframe/tests: Add ITaskbarList tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/tests/Makefile.in | 3 +- dlls/explorerframe/tests/taskbarlist.c | 185 +++++++++++++++++++++++++++++++++ 2 files changed, 187 insertions(+), 1 deletion(-) diff --git a/dlls/explorerframe/tests/Makefile.in b/dlls/explorerframe/tests/Makefile.in index b0b88657788..ede5443bcd1 100644 --- a/dlls/explorerframe/tests/Makefile.in +++ b/dlls/explorerframe/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = explorerframe.dll IMPORTS = uuid shell32 ole32 user32 C_SRCS = \ - nstc.c + nstc.c \ + taskbarlist.c diff --git a/dlls/explorerframe/tests/taskbarlist.c b/dlls/explorerframe/tests/taskbarlist.c new file mode 100644 index 00000000000..ed1bc44a6ac --- /dev/null +++ b/dlls/explorerframe/tests/taskbarlist.c @@ -0,0 +1,185 @@ +/* + * Unit tests for ITaskbarList interface + * + * Copyright 2021 Zhiyi Zhang for CodeWeavers + * + * 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 COBJMACROS +#include <shobjidl.h> +#include <wine/test.h> + +static void test_ITaskbarList(void) +{ + ITaskbarList *taskbarlist; + ULONG ref_count; + HRESULT hr; + HWND hwnd; + + hwnd = CreateWindowA(WC_STATICA, "test", WS_POPUP | WS_VISIBLE, 0, 0, 50, 50, 0, 0, 0, NULL); + ok(hwnd != NULL, "Failed to create a test window, error %u.\n", GetLastError()); + + hr = CoCreateInstance((const CLSID *)&CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, + (const IID *)&IID_ITaskbarList, (void **)&taskbarlist); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref_count = ITaskbarList_AddRef(taskbarlist); + ok(ref_count == 2, "Got unexpected reference count %u.\n", ref_count); + ref_count = ITaskbarList_Release(taskbarlist); + ok(ref_count == 1, "Got unexpected reference count %u.\n", ref_count); + + /* Test calling methods before calling ITaskbarList::HrInit() */ + hr = ITaskbarList_AddTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_SetActiveAlt(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_ActivateTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Call ITaskbarList::HrInit() */ + hr = ITaskbarList_HrInit(taskbarlist); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test ITaskbarList::HrInit() */ + /* Call ITaskbarList::HrInit() again */ + hr = ITaskbarList_HrInit(taskbarlist); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test ITaskbarList::AddTab() */ + /* Check invalid parameters */ + hr = ITaskbarList_AddTab(taskbarlist, NULL); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_AddTab(taskbarlist, (HWND)0xdeadbeef); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Normal ITaskbarList::AddTab() */ + hr = ITaskbarList_AddTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Repeat ITaskbarList::AddTab() with the same hwnd */ + hr = ITaskbarList_AddTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test ITaskbarList::SetActiveAlt() */ + /* Check invalid parameters */ + hr = ITaskbarList_SetActiveAlt(taskbarlist, NULL); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_SetActiveAlt(taskbarlist, (HWND)0xdeadbeef); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Normal ITaskbarList::SetActiveAlt() */ + hr = ITaskbarList_AddTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_SetActiveAlt(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Repeat ITaskbarList::SetActiveAlt() with the same hwnd */ + hr = ITaskbarList_SetActiveAlt(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test ITaskbarList::ActivateTab() */ + /* Check invalid parameters */ + hr = ITaskbarList_ActivateTab(taskbarlist, NULL); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_ActivateTab(taskbarlist, (HWND)0xdeadbeef); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Normal ITaskbarList::ActivateTab() */ + hr = ITaskbarList_AddTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_ActivateTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Repeat ITaskbarList::ActivateTab() with the same hwnd */ + hr = ITaskbarList_ActivateTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Test ITaskbarList::DeleteTab() */ + /* Check invalid parameters */ + hr = ITaskbarList_DeleteTab(taskbarlist, NULL); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, (HWND)0xdeadbeef); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Normal ITaskbarList::DeleteTab() */ + hr = ITaskbarList_AddTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); + todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref_count = ITaskbarList_Release(taskbarlist); + ok(ref_count == 0, "Got unexpected reference count %u.\n", ref_count); + DestroyWindow(hwnd); +} + +START_TEST(taskbarlist) +{ + CoInitialize(NULL); + + test_ITaskbarList(); + + CoUninitialize(); +}

1 0

Hugh McMaster : chcp: Add a help string.
by Alexandre Julliard 24 Nov '21

24 Nov '21

1 0

Daniel Lehman : mscms: Fix uninitialized variable warning.
by Alexandre Julliard 24 Nov '21

24 Nov '21

Module: wine Branch: master Commit: daa0e3019f8ac2f15ed23c64287e35385716d0ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=daa0e3019f8ac2f15ed23c64… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Nov 24 09:57:08 2021 -0800 mscms: Fix uninitialized variable warning. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/profile.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 523476269f1..83bfcb50143 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1125,7 +1125,6 @@ BOOL WINAPI IsColorProfileTagPresent( HPROFILE handle, TAGTYPE type, PBOOL prese */ BOOL WINAPI IsColorProfileValid( HPROFILE handle, PBOOL valid ) { - BOOL ret; struct profile *profile = grab_profile( handle ); TRACE( "( %p, %p )\n", handle, valid ); @@ -1137,9 +1136,9 @@ BOOL WINAPI IsColorProfileValid( HPROFILE handle, PBOOL valid ) release_profile( profile ); return FALSE; } - if (profile->data) ret = *valid = TRUE; + *valid = !!profile->data; release_profile( profile ); - return ret; + return *valid; } /******************************************************************************

1 0

Michael Stefaniuc : dmloader: Drop ifdef'ed out dead code.
by Alexandre Julliard 24 Nov '21

24 Nov '21

Module: wine Branch: master Commit: 5e42498e634abda051aa59a3faeb2cf10469b1a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e42498e634abda051aa59a3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 24 19:23:16 2021 +0100 dmloader: Drop ifdef'ed out dead code. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index b90584b09a0..00170f42937 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -538,13 +538,6 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac return DMUS_E_LOADER_FAILEDOPEN; } - /* *sigh*... some ms objects have lousy implementation of ParseDescriptor that clears input descriptor :( */ -#ifdef NOW_WE_ARE_FREE - /* parse descriptor: we actually use input descriptor; fields that aren't available from stream remain, - otherwise real info is set */ - IDirectMusicObject_ParseDescriptor (pObject, pStream, pDesc); -#endif - /* hmph... due to some trouble I had with certain tests, we store current position and then set it back */ DM_STRUCT_INIT(&Desc); if (FAILED(IDirectMusicObject_ParseDescriptor (pObject, pStream, &Desc))) { IStream_Release(pStream);

1 0

Hugh McMaster : chcp: Add internationalization support.
by Alexandre Julliard 24 Nov '21

24 Nov '21

1 0

Hugh McMaster : chcp: Print the active code page after successfully setting the new one.
by Alexandre Julliard 24 Nov '21

24 Nov '21

Module: wine Branch: master Commit: ec2f579c7133f092b19c4baa3b67c2ec66107ba6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec2f579c7133f092b19c4baa… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Nov 23 23:41:39 2021 +1100 chcp: Print the active code page after successfully setting the new one. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/chcp.com/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/chcp.com/main.c b/programs/chcp.com/main.c index 5b3486a4366..cc64e044b06 100644 --- a/programs/chcp.com/main.c +++ b/programs/chcp.com/main.c @@ -102,10 +102,11 @@ int __cdecl wmain(int argc, WCHAR *argv[]) int codepage = _wtoi(argv[1]); int success = SetConsoleCP(codepage) && SetConsoleOutputCP(codepage); - if (!success) - { + if (success) + output_message(STRING_ACTIVE_CODE_PAGE, codepage); + else output_message(STRING_INVALID_CODE_PAGE); - } + return !success; }

1 0

Huw Davies : winecoreaudio: Move get_frequency to the unixlib.
by Alexandre Julliard 24 Nov '21

24 Nov '21

Module: wine Branch: master Commit: b884ca314d64911c2ba6ea801a0196649adf43db URL: https://source.winehq.org/git/wine.git/?a=commit;h=b884ca314d64911c2ba6ea80… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 24 11:26:46 2021 +0000 winecoreaudio: Move get_frequency to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 15 +++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 11 +++++------ dlls/winecoreaudio.drv/unixlib.h | 8 ++++++++ 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index d7390c5a677..f59723d48f6 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1527,6 +1527,20 @@ static NTSTATUS get_position(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_frequency(void *args) +{ + struct get_frequency_params *params = args; + struct coreaudio_stream *stream = params->stream; + + if(stream->share == AUDCLNT_SHAREMODE_SHARED) + *params->freq = (UINT64)stream->fmt->nSamplesPerSec * stream->fmt->nBlockAlign; + else + *params->freq = stream->fmt->nSamplesPerSec; + + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1546,4 +1560,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_current_padding, get_next_packet_size, get_position, + get_frequency, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index ebfc0543af8..f79d808d8ed 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1458,15 +1458,14 @@ static ULONG WINAPI AudioClock_Release(IAudioClock *iface) static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) { ACImpl *This = impl_from_IAudioClock(iface); + struct get_frequency_params params; TRACE("(%p)->(%p)\n", This, freq); - if(This->stream->share == AUDCLNT_SHAREMODE_SHARED) - *freq = (UINT64)This->stream->fmt->nSamplesPerSec * This->stream->fmt->nBlockAlign; - else - *freq = This->stream->fmt->nSamplesPerSec; - - return S_OK; + params.stream = This->stream; + params.freq = freq; + UNIX_CALL(get_frequency, &params); + return params.result; } static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index e9edaf82973..5dcefe2eb05 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -181,6 +181,13 @@ struct get_position_params UINT64 *qpctime; }; +struct get_frequency_params +{ + struct coreaudio_stream *stream; + HRESULT result; + UINT64 *freq; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -200,6 +207,7 @@ enum unix_funcs unix_get_current_padding, unix_get_next_packet_size, unix_get_position, + unix_get_frequency, }; extern unixlib_handle_t coreaudio_handle;

1 0