November 2021 - Wine-Commits

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

Nov. 25, 2021

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 Nov. 25, 2021

Nov. 25, 2021

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

Alexandre Julliard : mountmgr: Put the Unix helpers in a separate Unix library.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: 9d293a1e9be980b48544c92fb43a9e964331877d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d293a1e9be980b48544c92f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 25 19:00:21 2021 +0100 mountmgr: Put the Unix helpers in a separate Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/Makefile.in | 1 + dlls/mountmgr.sys/device.c | 53 ++++++++++++++++------- dlls/mountmgr.sys/mountmgr.c | 27 +++++++++--- dlls/mountmgr.sys/unixlib.c | 97 ++++++++++++++++++++++++++++--------------- dlls/mountmgr.sys/unixlib.h | 88 ++++++++++++++++++++++++++++++++++----- 5 files changed, 201 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9d293a1e9be980b48544…

1 0

Alexandre Julliard : mountmgr: Move the macOS credentials support to a separate file.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: af7b364a289dcfd09747758ca1328f4dd9787301 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af7b364a289dcfd09747758c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 25 17:35:38 2021 +0100 mountmgr: Move the macOS credentials support to a separate file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/Makefile.in | 1 + dlls/mountmgr.sys/cred.c | 633 ++++++++++++++++++++++++++++++++++++++++++ dlls/mountmgr.sys/mountmgr.c | 593 ++------------------------------------- dlls/mountmgr.sys/unixlib.h | 6 + 4 files changed, 658 insertions(+), 575 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af7b364a289dcfd09747…

1 0

Hugh McMaster : chcp: Add a help string.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

1 0

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

Nov. 24, 2021

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

Daniel Lehman : mscms: Fix uninitialized variable warning.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

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

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

Nov. 24, 2021

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

Hugh McMaster : chcp: Add internationalization support.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

1 0

Rémi Bernon : dinput8/tests: Add some GetForceFeedbackState / GetEffectStatus tests.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: 2a4242098ac27a0def589040b90dbdc10551aee1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a4242098ac27a0def589040… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 24 16:09:39 2021 +0100 dinput8/tests: Add some GetForceFeedbackState / GetEffectStatus tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52062 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 436 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 381 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2a4242098ac27a0def58…

1 0