wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Eric Pouech : mmcndmgr/tests: Enable compilation with long types.
by Alexandre Julliard 01 Mar '22

01 Mar '22

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 01 Mar '22

01 Mar '22

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

Eric Pouech : msftedit/tests: Enable compilation with long types.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 45062af4287022f58a2694743fe410de4b319542 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45062af4287022f58a269474… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 1 08:34:07 2022 +0100 msftedit/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msftedit/tests/Makefile.in | 1 - dlls/msftedit/tests/richole.c | 30 +++++++++++++++--------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/msftedit/tests/Makefile.in b/dlls/msftedit/tests/Makefile.in index 6609c363f22..99cc46a0076 100644 --- a/dlls/msftedit/tests/Makefile.in +++ b/dlls/msftedit/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = msftedit.dll IMPORTS = ole32 oleaut32 user32 diff --git a/dlls/msftedit/tests/richole.c b/dlls/msftedit/tests/richole.c index f7347a22348..a7fbb4d103d 100644 --- a/dlls/msftedit/tests/richole.c +++ b/dlls/msftedit/tests/richole.c @@ -40,7 +40,7 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) ULONG rc; IUnknown_AddRef(obj); rc = IUnknown_Release(obj); - ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d.\n", ref, rc); + ok_(__FILE__,line)(rc == ref, "expected refcount %ld, got %ld.\n", ref, rc); } static HWND new_window(LPCWSTR classname, DWORD dwstyle, HWND parent) @@ -83,22 +83,22 @@ static void test_Interfaces(void) EXPECT_REF(reole, 3); hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument, (void **)&txtdoc); - ok(hres == S_OK, "IRichEditOle_QueryInterface failed: 0x%08x.\n", hres); + ok(hres == S_OK, "IRichEditOle_QueryInterface failed: 0x%08lx.\n", hres); ok(txtdoc != NULL, "IRichEditOle_QueryInterface\n"); hres = ITextDocument_GetSelection(txtdoc, NULL); - ok(hres == E_INVALIDARG, "ITextDocument_GetSelection: 0x%08x.\n", hres); + ok(hres == E_INVALIDARG, "ITextDocument_GetSelection: 0x%08lx.\n", hres); EXPECT_REF(txtdoc, 4); hres = ITextDocument_GetSelection(txtdoc, &txtsel); - ok(hres == S_OK, "ITextDocument_GetSelection failed 0x%08x.\n", hres); + ok(hres == S_OK, "ITextDocument_GetSelection failed 0x%08lx.\n", hres); EXPECT_REF(txtdoc, 4); EXPECT_REF(txtsel, 2); hres = ITextDocument_GetSelection(txtdoc, &txtsel2); - ok(hres == S_OK, "ITextDocument_GetSelection failed: 0x%08x.\n", hres); + ok(hres == S_OK, "ITextDocument_GetSelection failed: 0x%08lx.\n", hres); ok(txtsel2 == txtsel, "got %p, %p\n", txtsel, txtsel2); EXPECT_REF(txtdoc, 4); @@ -108,38 +108,38 @@ static void test_Interfaces(void) punk = NULL; hres = ITextSelection_QueryInterface(txtsel, &IID_ITextSelection, (void **)&punk); - ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08x.\n", hres); + ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08lx.\n", hres); ok(punk != NULL, "ITextSelection_QueryInterface\n"); IUnknown_Release(punk); punk = NULL; hres = ITextSelection_QueryInterface(txtsel, &IID_ITextRange, (void **)&punk); - ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08x.\n", hres); + ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08lx.\n", hres); ok(punk != NULL, "ITextSelection_QueryInterface\n"); IUnknown_Release(punk); punk = NULL; hres = ITextSelection_QueryInterface(txtsel, &IID_IDispatch, (void **)&punk); - ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08x.\n", hres); + ok(hres == S_OK, "ITextSelection_QueryInterface failed: 0x%08lx.\n", hres); ok(punk != NULL, "ITextSelection_QueryInterface\n"); IUnknown_Release(punk); punk = NULL; hres = IRichEditOle_QueryInterface(reole, &IID_IOleClientSite, (void **)&punk); - ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08lx.\n", hres); punk = NULL; hres = IRichEditOle_QueryInterface(reole, &IID_IOleWindow, (void **)&punk); - ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08lx.\n", hres); punk = NULL; hres = IRichEditOle_QueryInterface(reole, &IID_IOleInPlaceSite, (void **)&punk); - ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); + ok(hres == E_NOINTERFACE, "IRichEditOle_QueryInterface: 0x%08lx.\n", hres); /* ITextDocument2 is implemented on msftedit after win8 for superseding ITextDocument2Old */ hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument2, (void **)&txtdoc2); ok(hres == S_OK || - hres == E_NOINTERFACE /* before win8 */, "IRichEditOle_QueryInterface: 0x%08x.\n", hres); + hres == E_NOINTERFACE /* before win8 */, "IRichEditOle_QueryInterface: 0x%08lx.\n", hres); if (hres != E_NOINTERFACE) { ok(txtdoc2 != NULL, "IRichEditOle_QueryInterface\n"); @@ -148,7 +148,7 @@ static void test_Interfaces(void) EXPECT_REF(reole, 5); hres = ITextDocument2_QueryInterface(txtdoc2, &IID_ITextDocument2Old, (void **)&txtdoc2old); - ok(hres == S_OK, "ITextDocument2_QueryInterface failed: 0x%08x.\n", hres); + ok(hres == S_OK, "ITextDocument2_QueryInterface failed: 0x%08lx.\n", hres); ok((ITextDocument *)txtdoc2old != txtdoc, "Interface pointer is equal.\n"); EXPECT_REF(txtdoc2, 5); EXPECT_REF(reole, 5); @@ -159,7 +159,7 @@ static void test_Interfaces(void) else { hres = IRichEditOle_QueryInterface(reole, &IID_ITextDocument2Old, (void **)&txtdoc2old); - ok(hres == S_OK, "IRichEditOle_QueryInterface failed: 0x%08x.\n", hres); + ok(hres == S_OK, "IRichEditOle_QueryInterface failed: 0x%08lx.\n", hres); ok(txtdoc2old != NULL, "IRichEditOle_QueryInterface\n"); ok((ITextDocument *)txtdoc2old == txtdoc, "Interface pointer is equal.\n"); EXPECT_REF(txtdoc2old, 5); @@ -170,7 +170,7 @@ static void test_Interfaces(void) ITextDocument_Release(txtdoc); IRichEditOle_Release(reole); refcount = IRichEditOle_Release(reole); - ok(refcount == 1, "Got wrong ref count: %d.\n", refcount); + ok(refcount == 1, "Got wrong ref count: %ld.\n", refcount); DestroyWindow(hwnd); /* Methods should return CO_E_RELEASED if the backing document has

1 0

Zhiyi Zhang : uxtheme: Search parts of any state in IsThemePartDefined().
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: f11129d9c47b6ad0f52e4d2e88d17d9a0c2fe552 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f11129d9c47b6ad0f52e4d2e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 1 15:06:38 2022 +0800 uxtheme: Search parts of any state in IsThemePartDefined(). Tests show that IsThemePartDefined() doesn't use state ID to search parts. If a part of any state is present, the part is considered as defined. For example, disabled state of part EditText of class Edit is present in theme files but there is no default state for part EditText. So IsThemePartDefined(theme, EP_EDITTEXT, 0) failed previously and it should succeed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52581 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/msstyles.c | 30 ++++++++++++++++++++++++++++++ dlls/uxtheme/msstyles.h | 1 + dlls/uxtheme/system.c | 6 +++--- dlls/uxtheme/tests/system.c | 13 +++---------- 4 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 7d3ee72efe8..9e5a79a1c69 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -452,6 +452,36 @@ static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWST return cur; } +/*********************************************************************** + * MSSTYLES_FindPart + * + * Find a part + * + * PARAMS + * tc Class to search + * iPartId Part ID to find + * + * RETURNS + * The part found, or NULL + */ +PTHEME_PARTSTATE MSSTYLES_FindPart(PTHEME_CLASS tc, int iPartId) +{ + PTHEME_PARTSTATE cur = tc->partstate; + + while (cur) + { + if (cur->iPartId == iPartId) + return cur; + + cur = cur->next; + } + + if (tc->overrides) + return MSSTYLES_FindPart(tc->overrides, iPartId); + + return NULL; +} + /*********************************************************************** * MSSTYLES_FindPartState * diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 12292cefae4..67f81315d7a 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -95,6 +95,7 @@ BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue) DECLSPE BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId) DECLSPEC_HIDDEN; PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf) DECLSPEC_HIDDEN; UINT MSSTYLES_GetThemeDPI(PTHEME_CLASS tc) DECLSPEC_HIDDEN; +PTHEME_PARTSTATE MSSTYLES_FindPart(PTHEME_CLASS tc, int iPartId) DECLSPEC_HIDDEN; PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext) DECLSPEC_HIDDEN; PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 8333d6b99ce..908451f0fe8 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -809,9 +809,9 @@ BOOL WINAPI IsThemePartDefined(HTHEME hTheme, int iPartId, int iStateId) SetLastError(E_HANDLE); return FALSE; } - if(MSSTYLES_FindPartState(hTheme, iPartId, iStateId, NULL)) - return TRUE; - return FALSE; + + SetLastError(NO_ERROR); + return !iStateId && MSSTYLES_FindPart(hTheme, iPartId); } /*********************************************************************** diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 59631f01fe9..dd118f5ab37 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -300,7 +300,6 @@ static void test_IsThemePartDefined(void) int state; BOOL defined; DWORD error; - BOOL todo; } tests[] = { @@ -311,7 +310,7 @@ static void test_IsThemePartDefined(void) {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, 0, TRUE, NO_ERROR}, {L"Edit", EP_EDITTEXT, ETS_NORMAL, FALSE, NO_ERROR}, {L"Edit", EP_EDITTEXT, ETS_FOCUSED, FALSE, NO_ERROR}, }; @@ -337,9 +336,7 @@ static void test_IsThemePartDefined(void) 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) @@ -589,12 +586,8 @@ static void test_OpenThemeData(void) SetLastError(0xdeadbeef); bTPDefined = IsThemePartDefined(hTheme, 0 , 0); todo_wine - { - ok( bTPDefined == FALSE, "Expected FALSE\n"); - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); - } + ok( bTPDefined == FALSE, "Expected FALSE\n" ); + ok( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError() ); DestroyWindow(hWnd); }

1 0

Zhiyi Zhang : uxtheme/tests: Add IsThemePartDefined() tests.
by Alexandre Julliard 01 Mar '22

01 Mar '22

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 01 Mar '22

01 Mar '22

1 0

Zhiyi Zhang : comctl32/tests: Fix a test failure when theming is active.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: 7f54c4c014782818785aa83f5bba55fdc31a17b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f54c4c014782818785aa83f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 1 15:00:39 2022 +0800 comctl32/tests: Fix a test failure when theming is active. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 0443a36718b..cfcdb44019c 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -2359,7 +2359,7 @@ static void test_visual(void) SelectObject(mem_dc2, mem_bitmap2); BitBlt(mem_dc2, 0, 0, width, height, button_dc, 0, 0, SRCCOPY); - todo_wine_if(type == BS_PUSHBOX || (is_theme_active && type == BS_GROUPBOX)) + todo_wine_if(type == BS_PUSHBOX) ok(equal_dc(mem_dc1, mem_dc2, width, height), "Type %#lx: Expected content unchanged.\n", type); DeleteObject(mem_bitmap2);

1 0

Saulius Krasuckas : ntdll: Check __WINE_PE_BUILD instead of compiler macros.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: wine Branch: master Commit: f72978ad0751159c00283406856b0c02d2b3cfca URL: https://source.winehq.org/git/wine.git/?a=commit;h=f72978ad0751159c00283406… Author: Saulius Krasuckas <saulius2(a)ar-fi.lt> Date: Tue Mar 1 02:42:05 2022 +0200 ntdll: Check __WINE_PE_BUILD instead of compiler macros. Fixes compilation on Cygwin, undeclared identifiers: _alldiv, _allmul, _allrem, _aulldiv, _aullrem. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52607 Signed-off-by: Saulius Krasuckas <saulius2(a)ar-fi.lt> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/large_int.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index 20ffd646a3e..b38074158c8 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -520,7 +520,7 @@ NTSTATUS WINAPI RtlInt64ToUnicodeString( #ifdef __i386__ /* those builtin functions use stdcall calling convention, but compilers reference them without stdcall declarations */ -#if defined(__MINGW32__) || defined(_MSC_VER) +#ifdef __WINE_PE_BUILD LONGLONG WINAPI _alldiv( LONGLONG a, LONGLONG b ) asm(__ASM_NAME("_alldiv")); LONGLONG WINAPI _allmul( LONGLONG a, LONGLONG b ) asm(__ASM_NAME("_allmul")); LONGLONG WINAPI _allrem( LONGLONG a, LONGLONG b ) asm(__ASM_NAME("_allrem"));

1 0

Henri Verbeet : vkd3d: Recognise newer memory properties in debug_vk_memory_property_flags().
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: vkd3d Branch: master Commit: ffbc40ee20a893bd97d675940ef919dac94a555a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ffbc40ee20a893bd97d6759… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 13:21:36 2022 +0100 vkd3d: Recognise newer memory properties in debug_vk_memory_property_flags(). The two _AMD properties would require bumping the version of the Vulkan headers we require; that doesn't seem worth it for making a FIXME go away. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/utils.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 873f840..5f67c8b 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -717,7 +717,7 @@ const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags) const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) { - char buffer[200]; + char buffer[320]; buffer[0] = '\0'; #define FLAG_TO_STR(f) if (flags & f) { strcat(buffer, " | "#f); flags &= ~f; } @@ -726,6 +726,11 @@ const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) FLAG_TO_STR(VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) FLAG_TO_STR(VK_MEMORY_PROPERTY_HOST_CACHED_BIT) FLAG_TO_STR(VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT) + FLAG_TO_STR(VK_MEMORY_PROPERTY_PROTECTED_BIT) +#undef FLAG_TO_STR +#define FLAG_TO_STR(f, n) if (flags & f) { strcat(buffer, " | "#n); flags &= ~f; } + FLAG_TO_STR(0x40, VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD) + FLAG_TO_STR(0x80, VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD) #undef FLAG_TO_STR if (flags) FIXME("Unrecognized flag(s) %#x.\n", flags);

1 0

Henri Verbeet : vkd3d-shader/d3d-asm: Add an l-suffix on double literals.
by Alexandre Julliard 01 Mar '22

01 Mar '22

Module: vkd3d Branch: master Commit: 8547174397261c84ea349fd8f5623a617dbbfcbc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8547174397261c84ea349fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 13:21:35 2022 +0100 vkd3d-shader/d3d-asm: Add an l-suffix on double literals. Like fxc/d3dcompiler does. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index fde704a..c292c84 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -775,7 +775,7 @@ static void shader_print_double_literal(struct vkd3d_d3d_asm_compiler *compiler, vkd3d_string_buffer_printf(&compiler->buffer, "%s%s%s", prefix, sign, compiler->colours.literal); vkd3d_string_buffer_print_f64(&compiler->buffer, d); - vkd3d_string_buffer_printf(&compiler->buffer, "%s%s", compiler->colours.reset, suffix); + vkd3d_string_buffer_printf(&compiler->buffer, "l%s%s", compiler->colours.reset, suffix); } static void shader_print_int_literal(struct vkd3d_d3d_asm_compiler *compiler,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2022