Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NTOS:CM] Cleanup the hive in case linking it to master fails (#4969)
by George Bișoc 03 Jan '23

03 Jan '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0bdae2114aa2300cee183… commit 0bdae2114aa2300cee18319752f0b6acc22d93d5 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sat Dec 31 17:50:25 2022 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Tue Jan 3 16:48:03 2023 +0100 [NTOS:CM] Cleanup the hive in case linking it to master fails (#4969) Currently the failure code path doesn't do any kind of cleanup against the hive that was being linked to master. The cleanup is pretty straightforward as you just simply close the hive file handles and free the registry kernel structures. CORE-5772 CORE-17263 CORE-13559 --- ntoskrnl/config/cmapi.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/config/cmapi.c b/ntoskrnl/config/cmapi.c index 6555658435f..e21eea3b793 100644 --- a/ntoskrnl/config/cmapi.c +++ b/ntoskrnl/config/cmapi.c @@ -2121,18 +2121,24 @@ CmLoadKey(IN POBJECT_ATTRIBUTES TargetKey, /* Release the hive */ CmHive->Hive.HiveFlags &= ~HIVE_IS_UNLOADING; CmHive->CreatorOwner = NULL; - - /* Allow loads */ - ExReleasePushLock(&CmpLoadHiveLock); } else { DPRINT1("CmpLinkHiveToMaster failed, Status %lx\n", Status); - /* FIXME: TODO */ - // ASSERT(FALSE); see CORE-17263 - ExReleasePushLock(&CmpLoadHiveLock); + + /* We're touching this hive, set the loading flag */ + CmHive->HiveIsLoading = TRUE; + + /* Close associated file handles */ + CmpCloseHiveFiles(CmHive); + + /* Cleanup its resources */ + CmpDestroyHive(CmHive); } + /* Allow loads */ + ExReleasePushLock(&CmpLoadHiveLock); + /* Is this first profile load? */ if (!CmpProfileLoaded && !CmpWasSetupBoot) {

1 0

[reactos] 01/01: 🎊 🍾 🥳 Happy New Year 2023 to the ReactOS Community! 🎆 ⚛️ ☢️
by Hermès Bélusca-Maïto 31 Dec '22

31 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95e5f07084088129e3c12… commit 95e5f07084088129e3c121568ea06c7f4d0a8d41 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jan 1 00:00:00 2023 +0300 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jan 1 00:00:00 2023 +0300 🎊 🍾 🥳 Happy New Year 2023 to the ReactOS Community! 🎆 ⚛️ ☢️ .:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.: __, ,__) __, ,__) __, ,__) ░▄████▄░▄███▄░▄████▄░▄█▀▀█▄░ (--|__| _ ,_ ,_ (--|\ | _ (--\ | _ _ ,_ ░▀▀░▄██░██░██░▀▀░▄██░░░░▄█▀░ _| |(_||_)|_)(_| _| \|(/_(_|_) \|(/_(_|| ░░▄██▀░░██░██░░▄██▀░░▄░▀▀█▄░ ( | | ,_| ( (__| ░██████░▀███▀░██████░▀█▄▄█▀░ .:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.:*~*:._.: --- dll/win32/msgina/resources/reactos.bmp | Bin 89334 -> 89334 bytes dll/win32/msgina/resources/svg/reactos.svg | 2 +- dll/win32/msgina/resources/svg/rosbanner.svg | 2 +- dll/win32/shell32/res/bitmaps/reactos.bmp | Bin 89334 -> 89334 bytes dll/win32/shell32/res/bitmaps/reactosserver.bmp | Bin 89334 -> 89334 bytes .../shell32/res/bitmaps/reactosworkstation.bmp | Bin 89334 -> 89334 bytes dll/win32/syssetup/resources/reactos.bmp | Bin 89334 -> 89334 bytes ntoskrnl/inbv/resources/copyright.bmp | Bin 1850 -> 1842 bytes sdk/include/reactos/version.cmake | 2 +- 9 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/msgina/resources/reactos.bmp b/dll/win32/msgina/resources/reactos.bmp index 9c562375bfb..cb134223193 100644 Binary files a/dll/win32/msgina/resources/reactos.bmp and b/dll/win32/msgina/resources/reactos.bmp differ diff --git a/dll/win32/msgina/resources/svg/reactos.svg b/dll/win32/msgina/resources/svg/reactos.svg index 084e4504459..2bbb5a0cc3d 100644 --- a/dll/win32/msgina/resources/svg/reactos.svg +++ b/dll/win32/msgina/resources/svg/reactos.svg @@ -1928,7 +1928,7 @@ x="5.59375" y="1047.7255" style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#1e2122;fill-opacity:1;font-family:Lucida Sans Unicode;-inkscape-font-specification:Lucida Sans Unicode" - id="tspan3618">Copyright © 1996-2022 ReactOS Team & Contributors</tspan></text> + id="tspan3618">Copyright © 1996-2023 ReactOS Team & Contributors</tspan></text> <g transform="matrix(0.16958533,0,0,0.16958533,89.849943,981.79073)" id="g15501"> diff --git a/dll/win32/msgina/resources/svg/rosbanner.svg b/dll/win32/msgina/resources/svg/rosbanner.svg index 64bc94b3f70..9def54fcc05 100644 --- a/dll/win32/msgina/resources/svg/rosbanner.svg +++ b/dll/win32/msgina/resources/svg/rosbanner.svg @@ -1727,7 +1727,7 @@ id="tspan196" x="48.681915" y="18.210854" - style="font-size:2.11667px;fill:#ffffff;stroke-width:0.264583">Copyright © 1996 - 2022 ReactOS Team & Contributors</tspan></text> + style="font-size:2.11667px;fill:#ffffff;stroke-width:0.264583">Copyright © 1996 - 2023 ReactOS Team & Contributors</tspan></text> </g> <g inkscape:groupmode="layer" diff --git a/dll/win32/shell32/res/bitmaps/reactos.bmp b/dll/win32/shell32/res/bitmaps/reactos.bmp index 9c562375bfb..cb134223193 100644 Binary files a/dll/win32/shell32/res/bitmaps/reactos.bmp and b/dll/win32/shell32/res/bitmaps/reactos.bmp differ diff --git a/dll/win32/shell32/res/bitmaps/reactosserver.bmp b/dll/win32/shell32/res/bitmaps/reactosserver.bmp index 98828a54bd1..221b71642bc 100644 Binary files a/dll/win32/shell32/res/bitmaps/reactosserver.bmp and b/dll/win32/shell32/res/bitmaps/reactosserver.bmp differ diff --git a/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp b/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp index b1f36913070..c77cd5a89d6 100644 Binary files a/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp and b/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp differ diff --git a/dll/win32/syssetup/resources/reactos.bmp b/dll/win32/syssetup/resources/reactos.bmp index 9c562375bfb..cb134223193 100644 Binary files a/dll/win32/syssetup/resources/reactos.bmp and b/dll/win32/syssetup/resources/reactos.bmp differ diff --git a/ntoskrnl/inbv/resources/copyright.bmp b/ntoskrnl/inbv/resources/copyright.bmp index a79c23d38f6..67600a6c671 100644 Binary files a/ntoskrnl/inbv/resources/copyright.bmp and b/ntoskrnl/inbv/resources/copyright.bmp differ diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index 2bfda9e47af..4de44d13db4 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -9,7 +9,7 @@ endif() set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") set(KERNEL_VERSION_PATCH_LEVEL "15") -set(COPYRIGHT_YEAR "2022") +set(COPYRIGHT_YEAR "2023") # KERNEL_VERSION_BUILD_TYPE is "dev" for Git builds # or "RC1", "RC2", "" for releases.

1 0

[reactos] 01/01: [NTOBJSHEX] Return early from GetInfoFromPidl when pcidl is null in LPCITEMIDLIST (#4946)
by Muthu R Kumar 31 Dec '22

31 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7fff96e7fe64d3241c83f… commit 7fff96e7fe64d3241c83f7d866041758105b62cb Author: Muthu R Kumar <muthu90tech(a)gmail.com> AuthorDate: Sat Dec 31 07:53:02 2022 -0800 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 31 16:53:02 2022 +0100 [NTOBJSHEX] Return early from GetInfoFromPidl when pcidl is null in LPCITEMIDLIST (#4946) This fixes a crash when attempting to drag-n-drop items from NTObject Namespace and System Registry. CORE-18480, CORE-18481 --- dll/shellext/ntobjshex/ntobjfolder.cpp | 7 ++++++- dll/shellext/ntobjshex/regfolder.cpp | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dll/shellext/ntobjshex/ntobjfolder.cpp b/dll/shellext/ntobjshex/ntobjfolder.cpp index f4aef063103..32c031619da 100644 --- a/dll/shellext/ntobjshex/ntobjfolder.cpp +++ b/dll/shellext/ntobjshex/ntobjfolder.cpp @@ -516,8 +516,13 @@ BOOL CNtObjectFolder::IsFolder(const NtPidlEntry * info) HRESULT CNtObjectFolder::GetInfoFromPidl(LPCITEMIDLIST pcidl, const NtPidlEntry ** pentry) { - NtPidlEntry * entry = (NtPidlEntry*) &(pcidl->mkid); + if (!pcidl) + { + DbgPrint("PCIDL is NULL\n"); + return E_INVALIDARG; + } + NtPidlEntry * entry = (NtPidlEntry*) &(pcidl->mkid); if (entry->cb < sizeof(NtPidlEntry)) { DbgPrint("PCIDL too small %l (required %l)\n", entry->cb, sizeof(NtPidlEntry)); diff --git a/dll/shellext/ntobjshex/regfolder.cpp b/dll/shellext/ntobjshex/regfolder.cpp index 83683f05171..ace12e5f173 100644 --- a/dll/shellext/ntobjshex/regfolder.cpp +++ b/dll/shellext/ntobjshex/regfolder.cpp @@ -469,8 +469,13 @@ BOOL CRegistryFolder::IsFolder(const RegPidlEntry * info) HRESULT CRegistryFolder::GetInfoFromPidl(LPCITEMIDLIST pcidl, const RegPidlEntry ** pentry) { - RegPidlEntry * entry = (RegPidlEntry*) &(pcidl->mkid); + if (!pcidl) + { + DbgPrint("PCIDL is NULL\n"); + return E_INVALIDARG; + } + RegPidlEntry * entry = (RegPidlEntry*) &(pcidl->mkid); if (entry->cb < sizeof(RegPidlEntry)) { DbgPrint("PCIDL too small %l (required %l)\n", entry->cb, sizeof(RegPidlEntry));

1 0

[reactos] 01/01: [MSPAINT] Don't allow to set image as wallpaper if it has the wrong format (#4924)
by Egor Ananyin 31 Dec '22

31 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d395c3096752ef2b29718… commit d395c3096752ef2b297189d1c016bc9c1d6b07e5 Author: Egor Ananyin <ananinegor(a)gmail.com> AuthorDate: Sat Dec 31 18:08:14 2022 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 31 16:08:14 2022 +0100 [MSPAINT] Don't allow to set image as wallpaper if it has the wrong format (#4924) CORE-18661 Our Paint allows user to try to set a .ico file as a wallpaper, which isn't possible. Different Windows versions have different behaviour, so it was decided that the simplest fix would be to just grey out "Set as wallpaper" buttons as in 2K3 (See the Jira ticket). --- base/applications/mspaint/winproc.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 74e27a67661..640e596215b 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -280,14 +280,18 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO BOOL trueSelection = (::IsWindowVisible(selectionWindow) && ((toolsModel.GetActiveTool() == TOOL_FREESEL) || (toolsModel.GetActiveTool() == TOOL_RECTSEL))); + BOOL isBMP; switch (lParam) { case 0: /* File menu */ if ((HMENU)wParam != GetSubMenu(menu, 0)) break; - EnableMenuItem(menu, IDM_FILEASWALLPAPERPLANE, ENABLED_IF(isAFile)); - EnableMenuItem(menu, IDM_FILEASWALLPAPERCENTERED, ENABLED_IF(isAFile)); - EnableMenuItem(menu, IDM_FILEASWALLPAPERSTRETCHED, ENABLED_IF(isAFile)); + + isBMP = _wcsicmp(PathFindExtensionW(filepathname), L".bmp") == 0; + EnableMenuItem(menu, IDM_FILEASWALLPAPERPLANE, ENABLED_IF(isAFile && isBMP)); + EnableMenuItem(menu, IDM_FILEASWALLPAPERCENTERED, ENABLED_IF(isAFile && isBMP)); + EnableMenuItem(menu, IDM_FILEASWALLPAPERSTRETCHED, ENABLED_IF(isAFile && isBMP)); + RemoveMenu(menu, IDM_FILE1, MF_BYCOMMAND); RemoveMenu(menu, IDM_FILE2, MF_BYCOMMAND); RemoveMenu(menu, IDM_FILE3, MF_BYCOMMAND);

1 0

[reactos] 01/01: [SDK][CMLIB] Properly check for failure if hive free list creation fails
by George Bișoc 30 Dec '22

30 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bfe06cbfca79ba0275ce2… commit bfe06cbfca79ba0275ce2eea3a328e26fd1598a2 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Fri Dec 30 19:47:21 2022 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Fri Dec 30 19:58:37 2022 +0100 [SDK][CMLIB] Properly check for failure if hive free list creation fails HvpCreateHiveFreeCellList returns a NTSTATUS code yet the way the code path checks checks for failure is just wrong. This was spotted whilst working on #4571 PR. --- sdk/lib/cmlib/hiveinit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/cmlib/hiveinit.c b/sdk/lib/cmlib/hiveinit.c index 2b070fb4f7e..3eee62d149e 100644 --- a/sdk/lib/cmlib/hiveinit.c +++ b/sdk/lib/cmlib/hiveinit.c @@ -306,7 +306,7 @@ HvpInitializeMemoryHive( BlockIndex += Bin->Size / HBLOCK_SIZE; } - if (HvpCreateHiveFreeCellList(Hive)) + if (!NT_SUCCESS(HvpCreateHiveFreeCellList(Hive))) { HvpFreeHiveBins(Hive); Hive->Free(Hive->BaseBlock, Hive->BaseBlockAlloc);

1 0

[reactos] 09/09: [WIN32NT_APITEST] Fix entirely broken win32knt_apitest NtGdiDdQueryDirectDrawObject
by Timo Kreuzer 30 Dec '22

30 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=afbc446ec7ef81d50f30a… commit afbc446ec7ef81d50f30a5d233c074dfc4213f66 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Dec 25 09:15:46 2022 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Dec 30 11:19:26 2022 +0100 [WIN32NT_APITEST] Fix entirely broken win32knt_apitest NtGdiDdQueryDirectDrawObject --- .../apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c index 0f9bc623f31..4eeffc81c4e 100644 --- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c +++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c @@ -450,7 +450,7 @@ START_TEST(NtGdiDdQueryDirectDrawObject) RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3); RtlZeroMemory(puD3dCallbacks,sizeof(D3DNTHAL_CALLBACKS)); - RtlZeroMemory(puD3dDriverData,sizeof(D3DNTHAL_CALLBACKS)); + RtlZeroMemory(puD3dDriverData,sizeof(D3DNTHAL_GLOBALDRIVERDATA)); RTEST(NtGdiDdQueryDirectDrawObject( hDirectDraw, pHalInfo, pCallBackFlags, puD3dCallbacks, @@ -570,6 +570,7 @@ START_TEST(NtGdiDdQueryDirectDrawObject) if (puD3dDriverData->dwNumTextureFormats != 0) { puD3dTextureFormats = malloc (puD3dDriverData->dwNumTextureFormats * sizeof(DDSURFACEDESC2)); + ASSERT(puD3dTextureFormats != NULL); } RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); @@ -600,9 +601,6 @@ START_TEST(NtGdiDdQueryDirectDrawObject) RTEST(puD3dBufferCallbacks != NULL); ASSERT(puD3dDriverData != NULL); - RTEST(puD3dTextureFormats != NULL); - ASSERT(puD3dTextureFormats != NULL); - RTEST(puNumFourCC == NULL); RTEST(puFourCC == NULL); RTEST(puNumHeaps == NULL); @@ -698,9 +696,6 @@ START_TEST(NtGdiDdQueryDirectDrawObject) RTEST(puD3dBufferCallbacks != NULL); ASSERT(puD3dDriverData != NULL); - RTEST(puD3dTextureFormats != NULL); - ASSERT(puD3dTextureFormats != NULL); - RTEST(puNumHeaps != NULL); ASSERT(puNumHeaps != NULL); RTEST(NumHeaps == 0); @@ -764,9 +759,6 @@ START_TEST(NtGdiDdQueryDirectDrawObject) RTEST(puD3dBufferCallbacks != NULL); ASSERT(puD3dDriverData != NULL); - RTEST(puD3dTextureFormats != NULL); - ASSERT(puD3dTextureFormats != NULL); - RTEST(puNumHeaps != NULL); ASSERT(puNumHeaps != NULL); RTEST(NumHeaps == 0);

1 0

[reactos] 08/09: [DBGHELP_APITEST] Comment out rsym test for anything other than x86 for now
by Timo Kreuzer 30 Dec '22

30 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad8c4468142f9d2fd42a2… commit ad8c4468142f9d2fd42a2fbe5880d313c218508c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Dec 9 22:54:35 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Dec 30 11:19:26 2022 +0100 [DBGHELP_APITEST] Comment out rsym test for anything other than x86 for now --- modules/rostests/apitests/dbghelp/testlist.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/rostests/apitests/dbghelp/testlist.c b/modules/rostests/apitests/dbghelp/testlist.c index d4758e4acc8..c78a778283a 100644 --- a/modules/rostests/apitests/dbghelp/testlist.c +++ b/modules/rostests/apitests/dbghelp/testlist.c @@ -8,6 +8,8 @@ extern void func_rsym(void); const struct test winetest_testlist[] = { { "pdb", func_pdb }, +#ifdef _M_IX86 { "rsym", func_rsym }, +#endif { 0, 0 } };

1 0

[reactos] 07/09: [GDI32_APITEST] Fix test results for SetWorldTransform on Windows 2003 x64
by Timo Kreuzer 30 Dec '22

30 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64135505f27a8cc00b1c3… commit 64135505f27a8cc00b1c3546bef53d03aca9d749 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Dec 16 12:48:20 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Dec 30 11:19:26 2022 +0100 [GDI32_APITEST] Fix test results for SetWorldTransform on Windows 2003 x64 --- modules/rostests/apitests/gdi32/SetWorldTransform.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/rostests/apitests/gdi32/SetWorldTransform.c b/modules/rostests/apitests/gdi32/SetWorldTransform.c index cb82531513e..88e350f2eb0 100644 --- a/modules/rostests/apitests/gdi32/SetWorldTransform.c +++ b/modules/rostests/apitests/gdi32/SetWorldTransform.c @@ -63,7 +63,9 @@ void Test_SetWorldTransform() xform.eM22 = 1; ok(xform.eM12 != (FLOAT)1.0, "xform.eM12 shouldn't be 1.0\n"); ok(xform.eM21 != (FLOAT)1.0, "xform.eM21 shouldn't be 1.0\n"); +#if 0 // FIXME: x86 uses 80 bits internally, so the result doesn't reflect the actual FLOAT result ok(xform.eM12 * xform.eM21 != (FLOAT)1.0, "xform.eM12 * xform.eM21 shouldn't be 1.0\n"); +#endif result = SetWorldTransform(hdc, &xform); ok(result == 0, "SetWorldTransform should fail\n"); @@ -82,7 +84,9 @@ void Test_SetWorldTransform() xform.eM22 = 1.17549435e-38f; ok(xform.eM11 != (FLOAT)0.0, "xform.eM11 shouldn't be 0.0\n"); ok(xform.eM22 != (FLOAT)0.0, "xform.eM22 shouldn't be 0.0\n"); +#if 0 // FIXME: x86 uses 80 bits internally, so the result doesn't reflect the actual FLOAT result ok(xform.eM11 * xform.eM22 != (FLOAT)0.0, "xform.eM12 * xform.eM21 shouldn't be 0.0\n"); +#endif result = SetWorldTransform(hdc, &xform); ok(result == 1, "SetWorldTransform should succeed\n");

1 0

[reactos] 06/09: [GDI32_APITEST] Fix test results for CombineTransform on Windows 2003 x64
by Timo Kreuzer 30 Dec '22

30 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=284ee9dc9c5bf53f4567a… commit 284ee9dc9c5bf53f4567a76d5405565479f08268 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Dec 16 12:19:51 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Dec 30 11:19:26 2022 +0100 [GDI32_APITEST] Fix test results for CombineTransform on Windows 2003 x64 --- modules/rostests/apitests/gdi32/CombineTransform.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/gdi32/CombineTransform.c b/modules/rostests/apitests/gdi32/CombineTransform.c index d180d9e0e9f..a7c50776537 100644 --- a/modules/rostests/apitests/gdi32/CombineTransform.c +++ b/modules/rostests/apitests/gdi32/CombineTransform.c @@ -93,7 +93,17 @@ GetMaxValue(unsigned int Parameter, unsigned int Field) void Test_CombineTransform() { XFORM xform1, xform2, xform3; + BOOL IsWin64; +#ifndef _WIN64 BOOL IsWow64; +#endif + + // TODO: Check results for ARM/ARM64 +#ifdef _WIN64 + IsWin64 = TRUE; +#else + IsWin64 = (IsWow64Process(GetCurrentProcess(), &IsWow64) && IsWow64); +#endif /* Test NULL paramters */ set_xform(&xform1, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); @@ -154,7 +164,7 @@ void Test_CombineTransform() ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); ok_xform(xform3, 8.0, -2.0, 2.25, 0.0, -670.0, -340.0); - if (IsWow64Process(GetCurrentProcess(), &IsWow64) && IsWow64) + if (IsWin64) { ok_flt(GetMaxValue(0, 0), 4294967296.0); ok_flt(GetMaxValue(0, 1), 4294967296.0); @@ -218,7 +228,7 @@ void Test_CombineTransform() xform1.eM11 = (FLOAT)18446746000000000000.0; ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); - ok_long(*(DWORD*)&xform3.eM11, IsWow64 ? 0x7f800000 : 0x7f800001); + ok_long(*(DWORD*)&xform3.eM11, IsWin64 ? 0x7f800000 : 0x7f800001); /* zero matrix + 1 invalid */ set_xform(&xform1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); @@ -237,7 +247,7 @@ void Test_CombineTransform() set_xform(&xform1, 0.0, geIND, 0.0, 0.0, 0.0, 0.0); set_xform(&xform2, geIND, 0.0, 0.0, geINF, 0.0, 0.0); ok_int(CombineTransform(&xform3, &xform1, &xform2), 1); - ok_xform(xform3, IsWow64 ? geIND : 0.000000, IsWow64 ? geIND : -1.500000, geIND, geIND, 0.0, 0.0); + ok_xform(xform3, IsWin64 ? geIND : 0.000000, IsWin64 ? geIND : -1.500000, geIND, geIND, 0.0, 0.0); } void Test_CombineTransform_Inval(float eInval, float eOut)

1 0

[reactos] 05/09: [XMLLITE_WINETEST] Fix stack corruption on 64 bit
by Timo Kreuzer 30 Dec '22

30 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d1ca459341b12c8cf9a2… commit 3d1ca459341b12c8cf9a24504b493b372e3c6b21 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Aug 28 17:40:54 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Dec 30 11:19:26 2022 +0100 [XMLLITE_WINETEST] Fix stack corruption on 64 bit --- modules/rostests/winetests/xmllite/reader.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/rostests/winetests/xmllite/reader.c b/modules/rostests/winetests/xmllite/reader.c index 41adad15981..c44fed4c8c0 100644 --- a/modules/rostests/winetests/xmllite/reader.c +++ b/modules/rostests/winetests/xmllite/reader.c @@ -537,7 +537,11 @@ static void test_reader_create(void) IXmlResolver *resolver; IUnknown *input, *unk; IXmlReader *reader; +#ifdef __REACTOS__ + ULONG_PTR dtd; +#else DtdProcessing dtd; +#endif XmlNodeType nodetype; HRESULT hr; @@ -603,7 +607,7 @@ static void test_reader_create(void) dtd = 2; hr = IXmlReader_GetProperty(reader, XmlReaderProperty_DtdProcessing, (LONG_PTR*)&dtd); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(dtd == DtdProcessing_Prohibit, "got %d\n", dtd); + ok(dtd == DtdProcessing_Prohibit, "got %Id\n", dtd); dtd = 2; hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, dtd);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs