March 2022 - Wine-Commits - list.winehq.org

Eric Pouech : msvfw32/tests: Enable compilation with long types.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: ce19b2f3c16b270a9b447308908d46c837c27034 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce19b2f3c16b270a9b447308… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:34:43 2022 +0100 msvfw32/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/tests/Makefile.in | 1 - dlls/msvfw32/tests/mciwnd.c | 12 +-- dlls/msvfw32/tests/msvfw.c | 178 ++++++++++++++++++++--------------------- 3 files changed, 95 insertions(+), 96 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ce19b2f3c16b270a9b44…

1 0

Eric Pouech : mp3dmod/tests: Enable compilation with long types.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: b38dbf931d014ac07e182182992e7e72cdb9008c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b38dbf931d014ac07e182182… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:33:13 2022 +0100 mp3dmod/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/tests/Makefile.in | 1 - dlls/mp3dmod/tests/mp3dmod.c | 218 ++++++++++++++++++++--------------------- 2 files changed, 109 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b38dbf931d014ac07e18…

1 0

Eric Pouech : mmcndmgr/tests: Enable compilation with long types.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: dec26005f69a848fdafa2243a2f5e2ee73398090 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dec26005f69a848fdafa2243… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:33:01 2022 +0100 mmcndmgr/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmcndmgr/tests/Makefile.in | 1 - dlls/mmcndmgr/tests/mmcndmgr.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mmcndmgr/tests/Makefile.in b/dlls/mmcndmgr/tests/Makefile.in index 3e595d6fe4a..22d79ebb65b 100644 --- a/dlls/mmcndmgr/tests/Makefile.in +++ b/dlls/mmcndmgr/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = mmcndmgr.dll IMPORTS = ole32 shlwapi uuid diff --git a/dlls/mmcndmgr/tests/mmcndmgr.c b/dlls/mmcndmgr/tests/mmcndmgr.c index 07d905e762d..b1cc6d9e085 100644 --- a/dlls/mmcndmgr/tests/mmcndmgr.c +++ b/dlls/mmcndmgr/tests/mmcndmgr.c @@ -44,9 +44,9 @@ static void test_get_version(void) LONG lMajor, lMinor; hr = IMMCVersionInfo_GetMMCVersion(ver_info, &lMajor, &lMinor); - ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(hr == S_OK, "got 0x%08lx, expected 0x%08lx\n", hr, S_OK); if (hr == S_OK) - trace("MMC Version is %d.%d\n", lMajor, lMinor); + trace("MMC Version is %ld.%ld\n", lMajor, lMinor); } if (ver_info)

1 0

Eric Pouech : mlang/tests: Enable compilation with long types.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 9de5da92f1854944ddb68bb92d164a5453aa1756 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9de5da92f1854944ddb68bb9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:32:55 2022 +0100 mlang/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/tests/Makefile.in | 1 - dlls/mlang/tests/mlang.c | 446 +++++++++++++++++++++---------------------- 2 files changed, 223 insertions(+), 224 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9de5da92f1854944ddb6…

1 0

Zhiyi Zhang : uxtheme/tests: Add IsThemePartDefined() tests.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 6d1ad7d5e35ff526957e2ff6a98a062eab786610 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d1ad7d5e35ff526957e2ff6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 1 15:06:27 2022 +0800 uxtheme/tests: Add IsThemePartDefined() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 75 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 68 insertions(+), 7 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index c70e6c27361..59631f01fe9 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -277,20 +277,80 @@ static void test_IsThemed(void) { BOOL bThemeActive; BOOL bAppThemed; - BOOL bTPDefined; bThemeActive = IsThemeActive(); trace("Theming is %s\n", (bThemeActive) ? "active" : "inactive"); bAppThemed = IsAppThemed(); trace("Test executable is %s\n", (bAppThemed) ? "themed" : "not themed"); +} - SetLastError(0xdeadbeef); - bTPDefined = IsThemePartDefined(NULL, 0 , 0); - ok( bTPDefined == FALSE, "Expected FALSE\n"); - ok( GetLastError() == E_HANDLE, - "Expected E_HANDLE, got 0x%08x\n", - GetLastError()); +static void test_IsThemePartDefined(void) +{ + BOOL is_theme_active, ret; + HTHEME theme = NULL; + DWORD error; + HWND hwnd; + int i; + + static const struct + { + const WCHAR *class_name; + int part; + int state; + BOOL defined; + DWORD error; + BOOL todo; + } + tests[] = + { + {NULL, 0, 0, FALSE, E_HANDLE}, + {NULL, 0xdeadbeef, 0, FALSE, E_HANDLE}, + {L"Button", 0xdeadbeef, 0, FALSE, NO_ERROR}, + {L"Button", BP_PUSHBUTTON, 0, TRUE, NO_ERROR}, + {L"Button", BP_PUSHBUTTON, PBS_NORMAL, FALSE, NO_ERROR}, + {L"Button", BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING, FALSE, NO_ERROR}, + {L"Button", BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING + 1, FALSE, NO_ERROR}, + {L"Edit", EP_EDITTEXT, 0, TRUE, NO_ERROR, TRUE}, + {L"Edit", EP_EDITTEXT, ETS_NORMAL, FALSE, NO_ERROR}, + {L"Edit", EP_EDITTEXT, ETS_FOCUSED, FALSE, NO_ERROR}, + }; + + is_theme_active = IsThemeActive(); + hwnd = CreateWindowA(WC_STATICA, "", WS_POPUP, 0, 0, 1, 1, 0, 0, 0, NULL); + ok(hwnd != NULL, "CreateWindowA failed, error %#x.\n", GetLastError()); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + if (!is_theme_active && tests[i].class_name) + continue; + + winetest_push_context("class %s part %d state %d", wine_dbgstr_w(tests[i].class_name), + tests[i].part, tests[i].state); + + if (tests[i].class_name) + { + theme = OpenThemeData(hwnd, tests[i].class_name); + ok(theme != NULL, "OpenThemeData failed, error %#x.\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + ret = IsThemePartDefined(theme, tests[i].part, tests[i].state); + error = GetLastError(); + todo_wine_if(tests[i].todo) + ok(ret == tests[i].defined, "Expected %d.\n", tests[i].defined); + todo_wine_if(error == 0xdeadbeef && tests[i].error == NO_ERROR) + ok(error == tests[i].error, "Expected %#x, got %#x.\n", tests[i].error, error); + + if (theme) + { + CloseThemeData(theme); + theme = NULL; + } + winetest_pop_context(); + } + + DestroyWindow(hwnd); } static void test_GetWindowTheme(void) @@ -2205,6 +2265,7 @@ START_TEST(system) */ test_IsThemed(); + test_IsThemePartDefined(); test_GetWindowTheme(); test_SetWindowTheme(); test_OpenThemeData();

1 0

Zhiyi Zhang : light.msstyles: Remove Classic Blue variant.
by Alexandre Julliard March 1, 2022

March 1, 2022

1 0

Eric Pouech : msado15/tests: Enable compilation with long types.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 89440f588962ec0f511aa6e4a4e64f0466dcc93d URL: https://source.winehq.org/git/wine.git/?a=commit;h=89440f588962ec0f511aa6e4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:33:37 2022 +0100 msado15/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/tests/Makefile.in | 1 - dlls/msado15/tests/msado15.c | 468 ++++++++++++++++++++--------------------- 2 files changed, 234 insertions(+), 235 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=89440f588962ec0f511a…

1 0

Eric Pouech : msasn1/tests: Enable compilation with long types.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 9ceddd8d8e446f05d3e364468decce99268ea148 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ceddd8d8e446f05d3e36446… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:33:43 2022 +0100 msasn1/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/tests/Makefile.in | 1 - dlls/msasn1/tests/asn1.c | 190 +++++++++++++++++++++--------------------- 2 files changed, 95 insertions(+), 96 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9ceddd8d8e446f05d3e3…

1 0

Eric Pouech : msctf/tests: Enable compilation with long types.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 266814802b150ffcb27ab6a596907715ee47e297 URL: https://source.winehq.org/git/wine.git/?a=commit;h=266814802b150ffcb27ab6a5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:33:55 2022 +0100 msctf/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/Makefile.in | 1 - dlls/msctf/tests/inputprocessor.c | 112 +++++++++++++++++++------------------- 2 files changed, 56 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=266814802b150ffcb27a…

1 0

Eric Pouech : mspatcha/tests: Enable compilation with long types.
by Alexandre Julliard March 1, 2022

March 1, 2022

Module: wine Branch: master Commit: 184f4b59e3291443dad9aeea5d93cb351073c22a URL: https://source.winehq.org/git/wine.git/?a=commit;h=184f4b59e3291443dad9aeea… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:34:19 2022 +0100 mspatcha/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mspatcha/tests/Makefile.in | 1 - dlls/mspatcha/tests/apply_patch.c | 90 +++++++++++++++++++-------------------- 2 files changed, 45 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=184f4b59e3291443dad9…

1 0