Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 05/11: [SHELL32_APITEST] Disable CUserNotification test
by Timo Kreuzer 16 Apr '23

16 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=53d481993d74c8a01f72d… commit 53d481993d74c8a01f72df35e65e5a9a38401ac9 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Feb 2 13:48:56 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Apr 17 00:41:31 2023 +0300 [SHELL32_APITEST] Disable CUserNotification test The test doesn't work on Windows 2003, because the balloon window does not close itself. --- modules/rostests/apitests/shell32/testlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index 1fdf7ca44d2..2c65335551f 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -45,7 +45,7 @@ const struct test winetest_testlist[] = { "CommandLineToArgvW", func_CommandLineToArgvW }, { "CShellDesktop", func_CShellDesktop }, { "CShellLink", func_CShellLink }, - { "CUserNotification", func_CUserNotification }, + //{ "CUserNotification", func_CUserNotification }, // Test is broken on Win 2003 { "DragDrop", func_DragDrop }, { "ExtractIconEx", func_ExtractIconEx }, { "FindExecutable", func_FindExecutable },

1 0

[reactos] 04/11: [KERNEL32_APITEST] Make tests pass on Windows 2003
by Timo Kreuzer 16 Apr '23

16 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01815608487cfe499afaa… commit 01815608487cfe499afaaded39ddcbe5503620dc Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Feb 2 12:04:54 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Apr 17 00:41:31 2023 +0300 [KERNEL32_APITEST] Make tests pass on Windows 2003 --- modules/rostests/apitests/kernel32/FindFiles.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/rostests/apitests/kernel32/FindFiles.c b/modules/rostests/apitests/kernel32/FindFiles.c index 27a2fde1f9e..a927d0c5929 100644 --- a/modules/rostests/apitests/kernel32/FindFiles.c +++ b/modules/rostests/apitests/kernel32/FindFiles.c @@ -117,7 +117,7 @@ static void Test_FindFirstFileA(void) testType2_A("C:\\*", 0xdeadbeef, INVALID_HANDLE_VALUE, 0xdeadbeef); testType1_A("\\", 0xdeadbeef, INVALID_HANDLE_VALUE, ERROR_FILE_NOT_FOUND, TRUE); - testType1_A("\\\\", 0xdeadbeef, INVALID_HANDLE_VALUE, IsWindows7OrGreater() ? ERROR_INVALID_NAME : ERROR_BAD_NETPATH, TRUE); + testType1_A("\\\\", 0xdeadbeef, INVALID_HANDLE_VALUE, ERROR_INVALID_NAME, TRUE); testType2_A("\\*", 0xdeadbeef, INVALID_HANDLE_VALUE, 0xdeadbeef); /* Restore the old current directory */ @@ -135,7 +135,7 @@ static void Test_FindFirstFileA(void) testType2_A("C:\\*", 0xdeadbeef, INVALID_HANDLE_VALUE, 0xdeadbeef); testType1_A("\\", 0xdeadbeef, INVALID_HANDLE_VALUE, ERROR_FILE_NOT_FOUND, TRUE); - testType1_A("\\\\", 0xdeadbeef, INVALID_HANDLE_VALUE, IsWindows7OrGreater() ? ERROR_INVALID_NAME : ERROR_BAD_NETPATH, TRUE); + testType1_A("\\\\", 0xdeadbeef, INVALID_HANDLE_VALUE, ERROR_INVALID_NAME, TRUE); testType2_A("\\*", 0xdeadbeef, INVALID_HANDLE_VALUE, 0xdeadbeef); /* Restore the old current directory */ @@ -308,7 +308,7 @@ static void Test_FindFirstFileW(void) testType2_W(L"C:\\*", 0xdeadbeef, INVALID_HANDLE_VALUE, 0xdeadbeef); testType1_W(L"\\", 0xdeadbeef, INVALID_HANDLE_VALUE, ERROR_FILE_NOT_FOUND, TRUE); - testType1_W(L"\\\\", 0xdeadbeef, INVALID_HANDLE_VALUE, IsWindows7OrGreater() ? ERROR_INVALID_NAME : ERROR_BAD_NETPATH, TRUE); + testType1_W(L"\\\\", 0xdeadbeef, INVALID_HANDLE_VALUE, ERROR_INVALID_NAME, TRUE); testType2_W(L"\\*", 0xdeadbeef, INVALID_HANDLE_VALUE, 0xdeadbeef); /* Restore the old current directory */ @@ -326,7 +326,7 @@ static void Test_FindFirstFileW(void) testType2_W(L"C:\\*", 0xdeadbeef, INVALID_HANDLE_VALUE, 0xdeadbeef); testType1_W(L"\\", 0xdeadbeef, INVALID_HANDLE_VALUE, ERROR_FILE_NOT_FOUND, TRUE); - testType1_W(L"\\\\", 0xdeadbeef, INVALID_HANDLE_VALUE, IsWindows7OrGreater() ? ERROR_INVALID_NAME : ERROR_BAD_NETPATH, TRUE); + testType1_W(L"\\\\", 0xdeadbeef, INVALID_HANDLE_VALUE, ERROR_INVALID_NAME, TRUE); testType2_W(L"\\*", 0xdeadbeef, INVALID_HANDLE_VALUE, 0xdeadbeef); /* Restore the old current directory */

1 0

[reactos] 03/11: [USER32_APITEST] Remove "ugly ros hack"
by Timo Kreuzer 16 Apr '23

16 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e536256e0a33914bed61e… commit e536256e0a33914bed61e622b4dd74dbf0a9f308 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Feb 2 00:16:19 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Apr 17 00:41:31 2023 +0300 [USER32_APITEST] Remove "ugly ros hack" This hack corrupts memory and causes test failures on Windows. --- modules/rostests/apitests/user32/AttachThreadInput.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/rostests/apitests/user32/AttachThreadInput.c b/modules/rostests/apitests/user32/AttachThreadInput.c index 0249678f0f3..6329778b8e6 100644 --- a/modules/rostests/apitests/user32/AttachThreadInput.c +++ b/modules/rostests/apitests/user32/AttachThreadInput.c @@ -193,9 +193,6 @@ BOOLEAN InitThreads() /* create thread2(same desktop) */ if(!CreateTestThread(2, NULL)) return FALSE; - /* ugly ros hack to bypass desktop crapiness */ - if(!CreateTestThread(6, L"ThreadTestDesktop")) return FALSE; - /* create thread3(different desktop) */ if(!CreateTestThread(3, L"ThreadTestDesktop")) return FALSE;

1 0

[reactos] 02/11: [IPHLPAPI_APITEST] Fix tests so they pass on Windows 2003 and Windows 10
by Timo Kreuzer 16 Apr '23

16 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a455da532df6fdc948ee… commit 8a455da532df6fdc948eecaf8150f72a5d3855e7 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Feb 1 16:34:08 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Apr 17 00:41:31 2023 +0300 [IPHLPAPI_APITEST] Fix tests so they pass on Windows 2003 and Windows 10 --- .../rostests/apitests/iphlpapi/GetInterfaceName.c | 86 +++++++--------------- 1 file changed, 26 insertions(+), 60 deletions(-) diff --git a/modules/rostests/apitests/iphlpapi/GetInterfaceName.c b/modules/rostests/apitests/iphlpapi/GetInterfaceName.c index d49e600d343..2228ba943e0 100644 --- a/modules/rostests/apitests/iphlpapi/GetInterfaceName.c +++ b/modules/rostests/apitests/iphlpapi/GetInterfaceName.c @@ -38,11 +38,9 @@ test_NhGetInterfaceNameFromGuid(GUID AdapterGUID, DWORD par1, DWORD par2) StartSeh() ApiReturn = pNhGetInterfaceNameFromGuid(NULL, &Name, &ulOutBufLen, par1, par2); Error = GetLastError(); - EndSeh(STATUS_SUCCESS); + EndSeh(((GetVersion() & 0xFF) >= 6) ? STATUS_SUCCESS : STATUS_ACCESS_VIOLATION); - ok(ApiReturn == ERROR_INVALID_PARAMETER, - "ApiReturn returned %ld, expected ERROR_INVALID_PARAMETER\n", - ApiReturn); + ok_long(ApiReturn, ((GetVersion() & 0xFF) >= 6) ? ERROR_INVALID_PARAMETER : ERROR_SUCCESS); ok(Error == 0xbeeffeed, "GetLastError() returned %ld, expected 0xbeeffeed\n", Error); @@ -57,12 +55,8 @@ test_NhGetInterfaceNameFromGuid(GUID AdapterGUID, DWORD par1, DWORD par2) ApiReturn = pNhGetInterfaceNameFromGuid(&AdapterGUID, NULL, &ulOutBufLen, par1, par2); Error = GetLastError(); - ok(ApiReturn == ERROR_SUCCESS, - "ApiReturn returned %ld, expected ERROR_SUCCESS\n", - ApiReturn); - ok(Error == 0xbeeffeed, - "GetLastError() returned %ld, expected 0xbeeffeed\n", - Error); + ok_long(ApiReturn, ((GetVersion() & 0xFF) >= 6) ? ERROR_INVALID_PARAMETER : ERROR_SUCCESS); + ok_long(Error, ((GetVersion() & 0xFF) >= 6) ? ERROR_SUCCESS : 0xbeeffeed); ok(ulOutBufLen > 0, "ulOutBufLen is %ld, expected > 0\n", ulOutBufLen); @@ -72,14 +66,14 @@ test_NhGetInterfaceNameFromGuid(GUID AdapterGUID, DWORD par1, DWORD par2) SetLastError(0xbeeffeed); Error = 0xbeeffeed; ZeroMemory(&Name, sizeof(Name)); - ApiReturn = ERROR_SUCCESS; + ApiReturn = 0xdeadbeef; StartSeh() ApiReturn = pNhGetInterfaceNameFromGuid(&AdapterGUID, &Name, NULL, par1, par2); Error = GetLastError(); - EndSeh(STATUS_SUCCESS); + EndSeh(STATUS_ACCESS_VIOLATION); - ok(ApiReturn == ERROR_INVALID_PARAMETER, - "ApiReturn returned %ld, expected ERROR_INVALID_PARAMETER\n", + ok(ApiReturn == 0xdeadbeef, + "ApiReturn returned %ld, expected 0xdeadbeef\n", ApiReturn); ok(Error == 0xbeeffeed, "GetLastError() returned %ld, expected 0xbeeffeed\n", @@ -99,9 +93,7 @@ test_NhGetInterfaceNameFromGuid(GUID AdapterGUID, DWORD par1, DWORD par2) ok(ApiReturn == ERROR_SUCCESS, "ApiReturn returned %ld, expected ERROR_SUCCESS\n", ApiReturn); - ok(Error == 0xbeeffeed, - "GetLastError() returned %ld, expected 0xbeeffeed\n", - Error); + ok_long(Error, ((GetVersion() & 0xFF) >= 6) ? 0 : 0xbeeffeed); ok(ulOutBufLen > 0, "ulOutBufLen is %ld, expected > 0\n", ulOutBufLen); @@ -119,12 +111,8 @@ test_NhGetInterfaceNameFromGuid(GUID AdapterGUID, DWORD par1, DWORD par2) ApiReturn = pNhGetInterfaceNameFromGuid((PVOID)&UniqueGUID, &Name, &ulOutBufLen, par1, par2); Error = GetLastError(); - ok(ApiReturn == ERROR_NOT_FOUND, - "ApiReturn returned %ld, expected ERROR_NOT_FOUND\n", - ApiReturn); - ok(Error == ERROR_PATH_NOT_FOUND, - "GetLastError() returned %ld, expected ERROR_PATH_NOT_FOUND\n", - Error); + ok_long(ApiReturn, ((GetVersion() & 0xFF) >= 6) ? ERROR_INVALID_PARAMETER : ERROR_NOT_FOUND); + ok_long(Error, 0); ok(ulOutBufLen == sizeof(Name), "ulOutBufLen is %ld, expected = sizeof(Name)\n", ulOutBufLen); @@ -137,15 +125,9 @@ test_NhGetInterfaceNameFromGuid(GUID AdapterGUID, DWORD par1, DWORD par2) ApiReturn = pNhGetInterfaceNameFromGuid(&AdapterGUID, &Name, &ulOutBufLen, par1, par2); Error = GetLastError(); - ok(ApiReturn == ERROR_INSUFFICIENT_BUFFER, - "ApiReturn returned %ld, expected ERROR_INSUFFICIENT_BUFFER\n", - ApiReturn); - ok(Error == 0xbeeffeed, - "GetLastError() returned %ld, expected 0xbeeffeed\n", - Error); - ok(ulOutBufLen == MAX_INTERFACE_NAME_LEN * 2, - "ulOutBufLen is %ld, expected = MAX_INTERFACE_NAME_LEN * 2\n", - ulOutBufLen); + ok_long(ApiReturn, ((GetVersion() & 0xFF) >= 6) ? ERROR_NOT_ENOUGH_MEMORY : ERROR_INSUFFICIENT_BUFFER); + ok_long(Error, ((GetVersion() & 0xFF) >= 6) ? 0 : 0xbeeffeed); + ok_long(ulOutBufLen, MAX_INTERFACE_NAME_LEN * 2 + ((GetVersion() & 0xFF) >= 6 ? 2 : 0)); ok_wstr(L"", Name); } @@ -172,12 +154,10 @@ test_NhGetInterfaceNameFromDeviceGuid(GUID AdapterGUID, DWORD par1, DWORD par2) StartSeh() ApiReturn = pNhGetInterfaceNameFromDeviceGuid(NULL, &Name, &ulOutBufLen, par1, par2); Error = GetLastError(); - EndSeh(STATUS_SUCCESS); + EndSeh(((GetVersion() & 0xFF) >= 6) ? STATUS_SUCCESS : STATUS_ACCESS_VIOLATION); - ok(ApiReturn == ERROR_INVALID_PARAMETER, - "ApiReturn returned %ld, expected ERROR_INVALID_PARAMETER\n", - ApiReturn); - ok(Error == ERROR_SUCCESS, + ok_long(ApiReturn, ((GetVersion() & 0xFF) >= 6) ? ERROR_INVALID_PARAMETER : 0); + ok(Error == 0xbeeffeed, "GetLastError() returned %ld, expected ERROR_SUCCESS\n", Error); ok(ulOutBufLen == sizeof(Name), @@ -193,14 +173,10 @@ test_NhGetInterfaceNameFromDeviceGuid(GUID AdapterGUID, DWORD par1, DWORD par2) StartSeh() ApiReturn = pNhGetInterfaceNameFromDeviceGuid(&AdapterGUID, NULL, &ulOutBufLen, par1, par2); Error = GetLastError(); - EndSeh(STATUS_SUCCESS); + EndSeh(((GetVersion() & 0xFF) >= 6) ? STATUS_SUCCESS : STATUS_ACCESS_VIOLATION); - ok(ApiReturn == ERROR_INVALID_PARAMETER, - "ApiReturn returned %ld, expected ERROR_INVALID_PARAMETER\n", - ApiReturn); - ok(Error == ERROR_SUCCESS, - "GetLastError() returned %ld, expected ERROR_SUCCESS\n", - Error); + ok_long(ApiReturn, ((GetVersion() & 0xFF) >= 6) ? ERROR_INVALID_PARAMETER : 0); + ok_long(Error, ((GetVersion() & 0xFF) >= 6) ? ERROR_SUCCESS : 0xbeeffeed); ok(ulOutBufLen > 0, "ulOutBufLen is %ld, expected > 0\n", ulOutBufLen); @@ -214,14 +190,10 @@ test_NhGetInterfaceNameFromDeviceGuid(GUID AdapterGUID, DWORD par1, DWORD par2) StartSeh() ApiReturn = pNhGetInterfaceNameFromDeviceGuid(&AdapterGUID, &Name, NULL, par1, par2); Error = GetLastError(); - EndSeh(STATUS_SUCCESS); + EndSeh(STATUS_ACCESS_VIOLATION); - ok(ApiReturn == ERROR_INVALID_PARAMETER, - "ApiReturn returned %ld, expected ERROR_INVALID_PARAMETER\n", - ApiReturn); - ok(Error == ERROR_SUCCESS, - "GetLastError() returned %ld, expected ERROR_SUCCESS\n", - Error); + ok_long(ApiReturn, 0); + ok_long(Error, 0xbeeffeed); ok(ulOutBufLen > 0, "ulOutBufLen is %ld, expected > 0\n", ulOutBufLen); @@ -257,9 +229,7 @@ test_NhGetInterfaceNameFromDeviceGuid(GUID AdapterGUID, DWORD par1, DWORD par2) ApiReturn = pNhGetInterfaceNameFromDeviceGuid((PVOID)&UniqueGUID, &Name, &ulOutBufLen, par1, par2); Error = GetLastError(); - ok(ApiReturn == ERROR_NOT_FOUND, - "ApiReturn returned %ld, expected ERROR_NOT_FOUND\n", - ApiReturn); + ok_long(ApiReturn, ((GetVersion() & 0xFF) >= 6) ? ERROR_INVALID_PARAMETER : ERROR_NOT_FOUND); ok(Error == ERROR_SUCCESS, "GetLastError() returned %ld, expected ERROR_SUCCESS\n", Error); @@ -275,15 +245,11 @@ test_NhGetInterfaceNameFromDeviceGuid(GUID AdapterGUID, DWORD par1, DWORD par2) ApiReturn = pNhGetInterfaceNameFromDeviceGuid(&AdapterGUID, &Name, &ulOutBufLen, par1, par2); Error = GetLastError(); - ok(ApiReturn == ERROR_INSUFFICIENT_BUFFER, - "ApiReturn returned %ld, expected ERROR_INSUFFICIENT_BUFFER\n", - ApiReturn); + ok_long(ApiReturn, ((GetVersion() & 0xFF) >= 6) ? ERROR_NOT_ENOUGH_MEMORY : ERROR_INSUFFICIENT_BUFFER); ok(Error == ERROR_SUCCESS, "GetLastError() returned %ld, expected ERROR_SUCCESS\n", Error); - ok(ulOutBufLen == MAX_INTERFACE_NAME_LEN * 2, - "ulOutBufLen is %ld, expected = MAX_INTERFACE_NAME_LEN * 2\n", - ulOutBufLen); + ok_long(ulOutBufLen, MAX_INTERFACE_NAME_LEN * 2 + (((GetVersion() & 0xFF) >= 6) ? 2 : 0)); ok_wstr(L"", Name); }

1 0

[reactos] 01/11: [GDIPLUS_WINETEST] Make tests pass on Windows 2003
by Timo Kreuzer 16 Apr '23

16 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=78a31ce423f2c92a97ab3… commit 78a31ce423f2c92a97ab3c7869294df1bb83dee4 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Jan 31 14:08:46 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Apr 17 00:41:31 2023 +0300 [GDIPLUS_WINETEST] Make tests pass on Windows 2003 --- modules/rostests/winetests/gdiplus/image.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/modules/rostests/winetests/gdiplus/image.c b/modules/rostests/winetests/gdiplus/image.c index 1ad24cc88ab..c5802f1dc56 100644 --- a/modules/rostests/winetests/gdiplus/image.c +++ b/modules/rostests/winetests/gdiplus/image.c @@ -5659,7 +5659,12 @@ static void test_tiff_color_formats(void) image = load_image(buf, sizeof(buf), TRUE, FALSE); if (!td[i].format) +#ifdef __REACTOS__ + ok(!image || (((GetVersion() & 0xFF) < 6) && + (i == 19 || i == 20)), +#else ok(!image, +#endif "%u: (%d,%d,%d) TIFF image loading should have failed\n", i, td[i].photometric, td[i].samples, td[i].bps); else ok(image != NULL || broken(!image) /* XP */, "%u: failed to load TIFF image data (%d,%d,%d)\n", @@ -5672,7 +5677,20 @@ static void test_tiff_color_formats(void) status = GdipGetImagePixelFormat(image, &format); expect(Ok, status); +#ifdef __REACTOS__ + ok(format == td[i].format || (((GetVersion() & 0xFF) < 6) && + ((i == 0 && format == 0) || + (i == 1 && format == 0) || + (i == 5 && format == 0) || + (i == 6 && format == 0) || + (i == 13 && format == 0) || + (i == 19 && format == PixelFormat32bppARGB) || + (i == 20 && format == PixelFormat32bppARGB) || + (i == 21 && format == PixelFormat32bppARGB) || + (i == 22 && format == PixelFormat32bppARGB))), +#else ok(format == td[i].format, +#endif "%u: expected %#x, got %#x\n", i, td[i].format, format); GdipDisposeImage(image);

1 0

[reactos] 01/01: [WIN32SS:ENG] Do not free LDEV if unloading a driver failed
by Hervé Poussineau 16 Apr '23

16 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49246541debf0362d027e… commit 49246541debf0362d027e6a5d7bfc6b0eac862d7 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Apr 16 18:48:15 2023 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Apr 16 19:37:05 2023 +0200 [WIN32SS:ENG] Do not free LDEV if unloading a driver failed Currently, LDEVOBJ_bUnloadImage always returns FALSE due to missing functionality in ntoskrnl. LDEVOBJ_vFreeLDEV contains an assert that driver is correctly unloaded before freeing it. Prevent this assert by calling LDEVOBJ_vFreeLDEV only if LDEVOBJ_bUnloadImage succeed. This can be easily triggered if DrvEnableDriver function (called in LDEVOBJ_bEnableDriver) fails. --- win32ss/gdi/eng/ldevobj.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/eng/ldevobj.c b/win32ss/gdi/eng/ldevobj.c index 803cbd37fe1..9582c8e943a 100644 --- a/win32ss/gdi/eng/ldevobj.c +++ b/win32ss/gdi/eng/ldevobj.c @@ -442,8 +442,10 @@ LDEVOBJ_pLoadDriver( ERR("LDEVOBJ_bEnableDriver failed\n"); /* Unload the image. */ - LDEVOBJ_bUnloadImage(pldev); - LDEVOBJ_vFreeLDEV(pldev); + if (LDEVOBJ_bUnloadImage(pldev)) + LDEVOBJ_vFreeLDEV(pldev); + else + ERR("Could not unload driver. Leaking memory\n"); pldev = NULL; goto leave; }

1 0

[reactos] 01/01: [MKISOFS] Fix MSVC build on ARM hosts
by Adam Słaboń 16 Apr '23

16 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d71456144788d18602b0… commit 7d71456144788d18602b09a1481b9950069cc00a Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Sun Mar 19 13:58:27 2023 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Apr 16 18:53:54 2023 +0200 [MKISOFS] Fix MSVC build on ARM hosts Check also for MSVC target machine macros on ARM --- sdk/tools/mkisofs/schilytools/libmdigest/byte_order.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/tools/mkisofs/schilytools/libmdigest/byte_order.h b/sdk/tools/mkisofs/schilytools/libmdigest/byte_order.h index 13477db421f..9c7bd484e36 100644 --- a/sdk/tools/mkisofs/schilytools/libmdigest/byte_order.h +++ b/sdk/tools/mkisofs/schilytools/libmdigest/byte_order.h @@ -61,7 +61,8 @@ extern "C" { __BYTE_ORDER == __LITTLE_ENDIAN) || \ defined(CPU_IA32) || defined(CPU_X64) || \ defined(__ia64) || defined(__ia64__) || defined(__alpha__) || defined(_M_ALPHA) || \ - defined(vax) || defined(MIPSEL) || defined(_ARM_) || defined(__arm64__) + defined(vax) || defined(MIPSEL) || \ + defined(_ARM_) || defined(__arm64__) || defined(_M_ARM) || defined(_M_ARM64) #define CPU_LITTLE_ENDIAN #define IS_BIG_ENDIAN 0 #define IS_LITTLE_ENDIAN 1

1 0

[reactos] 01/01: [HHCTRL.OCX] Reduce ROS diff
by Thamatip Chitpong 16 Apr '23

16 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42ef03381fbfcd1b7ef16… commit 42ef03381fbfcd1b7ef166dfe5fd939382406c4a Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Tue Mar 28 18:49:34 2023 +0700 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Apr 16 18:53:19 2023 +0200 [HHCTRL.OCX] Reduce ROS diff --- dll/win32/hhctrl.ocx/help.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/dll/win32/hhctrl.ocx/help.c b/dll/win32/hhctrl.ocx/help.c index 9696f0b846a..28b03223aad 100644 --- a/dll/win32/hhctrl.ocx/help.c +++ b/dll/win32/hhctrl.ocx/help.c @@ -173,21 +173,9 @@ static inline BOOL navigation_visible(HHInfo *info) /* Loads a string from the resource file */ #ifdef __REACTOS__ LPWSTR HH_LoadString(DWORD dwID) -{ - LPWSTR string = NULL; - LPCWSTR stringresource; - int iSize; - - iSize = LoadStringW(hhctrl_hinstance, dwID, (LPWSTR)&stringresource, 0); - - string = heap_alloc((iSize + 2) * sizeof(WCHAR)); /* some strings (tab text) needs double-null termination */ - memcpy(string, stringresource, iSize * sizeof(WCHAR)); - string[iSize] = UNICODE_NULL; - - return string; -} #else static LPWSTR HH_LoadString(DWORD dwID) +#endif { LPWSTR string = NULL; LPCWSTR stringresource; @@ -201,7 +189,6 @@ static LPWSTR HH_LoadString(DWORD dwID) return string; } -#endif static HRESULT navigate_url(HHInfo *info, LPCWSTR surl) {

1 0

[reactos] 03/03: [PSEH] Change return type of filter function prototype to avoid broken return from inside it.
by Timo Kreuzer 14 Apr '23

14 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93dface84e940b6de679e… commit 93dface84e940b6de679ef35b56b6101fb8083e6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Dec 28 15:15:28 2022 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Apr 14 11:56:08 2023 +0300 [PSEH] Change return type of filter function prototype to avoid broken return from inside it. --- sdk/lib/pseh/include/pseh/pseh3.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sdk/lib/pseh/include/pseh/pseh3.h b/sdk/lib/pseh/include/pseh/pseh3.h index 05bb3de3b87..c7286e9d7bd 100644 --- a/sdk/lib/pseh/include/pseh/pseh3.h +++ b/sdk/lib/pseh/include/pseh/pseh3.h @@ -263,6 +263,11 @@ _SEH3$_AutoCleanup( #else /* __cplusplus || __clang__ */ +typedef struct __SEH3$FILTER_RESULT +{ + int Value; +} _SEH3$FILTER_RESULT; + #define _SEH3$_DECLARE_EXCEPT_INTRINSICS() \ inline __attribute__((always_inline, gnu_inline)) \ unsigned long _exception_code() { return _SEH3$_TrylevelFrame.ExceptionCode; } @@ -276,13 +281,13 @@ _SEH3$_AutoCleanup( the function with an arbitrary base address in eax first and then use the result to calculate the correct address for a second call to the function. */ #define _SEH3$_DECLARE_FILTER_FUNC(_Name) \ - auto int __fastcall _Name(int Action) + auto _SEH3$FILTER_RESULT __fastcall _Name(int Action) #define _SEH3$_NESTED_FUNC_OPEN(_Name) \ - int __fastcall _Name(int Action) \ + _SEH3$FILTER_RESULT __fastcall _Name(int Action) \ { \ /* This is a fancy way to get information about the frame layout */ \ - if (Action == 0) return (int)&_SEH3$_TrylevelFrame; + if (Action == 0) { _SEH3$FILTER_RESULT seh3$result; seh3$result.Value = (int)&_SEH3$_TrylevelFrame; return seh3$result; } #define _SEH3$_DEFINE_FILTER_FUNC(_Name, expression) \ _SEH3$_NESTED_FUNC_OPEN(_Name) \ @@ -296,7 +301,7 @@ _Pragma("GCC diagnostic ignored \"-Wshadow\"") \ _Pragma("GCC diagnostic pop") \ \ /* Now handle the actual filter expression */ \ - return (expression); \ + { _SEH3$FILTER_RESULT seh3$result; seh3$result.Value = (expression); return seh3$result; } \ } #define _SEH3$_FINALLY_FUNC_OPEN(_Name) \ @@ -307,7 +312,7 @@ _Pragma("GCC diagnostic pop") \ \ /* This construct makes sure that the finally function returns */ \ /* a proper value at the end */ \ - for (; ; (void)({return 0; 0;})) + for (; ; (void)({ _SEH3$FILTER_RESULT seh3$result; seh3$result.Value = 0; return seh3$result; 0;})) #define _SEH3$_FILTER(_Filter, _FilterExpression) \ (__builtin_constant_p(_FilterExpression) ? (void*)(unsigned long)(unsigned char)(unsigned long)(_FilterExpression) : _Filter)

1 0

[reactos] 02/03: [NTOS/CC] Fix broken usage of _SEH2_FINALLY
by Timo Kreuzer 14 Apr '23

14 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb74d9e24ed16d3d52e1a… commit cb74d9e24ed16d3d52e1a4cff3ff3fde6bcd9bd1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Dec 27 17:43:10 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Apr 14 11:56:08 2023 +0300 [NTOS/CC] Fix broken usage of _SEH2_FINALLY Finally handlers are - unlike except blocks - not part of the function they are in, but separate functions, which are called during unwind. PSEH implements them on GCC using nested functions. While "return" from a finally handler is allowed with native SEH, it's handled by the compiler through an extra unwinding operation using _local_unwind, WHICH IS NOT SUPPORTED BY PSEH! With PSEH, returning from a finally handler does not return from the function, instead it will only return from [...] Also use _SEH_VOLATILE to make sure the variable assignment is not optimized away by the compiler and add zero out the result parameters on error. --- ntoskrnl/cc/pin.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 3d80befb660..dcd1d5483a5 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -221,7 +221,7 @@ CcpPinData( KIRQL OldIrql; ULONG VacbOffset; NTSTATUS Status; - BOOLEAN Result; + _SEH2_VOLATILE BOOLEAN Result; VacbOffset = (ULONG)(FileOffset->QuadPart % VACB_MAPPING_GRANULARITY); @@ -302,15 +302,19 @@ CcpPinData( CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> FALSE\n", SharedCacheMap->FileObject, FileOffset, Length, Flags); CcUnpinData(&NewBcb->PFCB); - return FALSE; + *Bcb = NULL; + *Buffer = NULL; } } _SEH2_END; - *Bcb = &NewBcb->PFCB; - *Buffer = (PVOID)((ULONG_PTR)NewBcb->Vacb->BaseAddress + VacbOffset); + if (Result) + { + *Bcb = &NewBcb->PFCB; + *Buffer = (PVOID)((ULONG_PTR)NewBcb->Vacb->BaseAddress + VacbOffset); + } - return TRUE; + return Result; } /* @@ -332,7 +336,7 @@ CcMapData ( PROS_SHARED_CACHE_MAP SharedCacheMap; ULONG VacbOffset; NTSTATUS Status; - BOOLEAN Result; + _SEH2_VOLATILE BOOLEAN Result; CCTRACE(CC_API_DEBUG, "CcMapData(FileObject 0x%p, FileOffset 0x%I64x, Length %lu, Flags 0x%lx," " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, @@ -406,13 +410,17 @@ CcMapData ( if (!Result) { CcpDereferenceBcb(SharedCacheMap, iBcb); - return FALSE; + *pBcb = NULL; + *pBuffer = NULL; } } _SEH2_END; - *pBcb = &iBcb->PFCB; - *pBuffer = (PVOID)((ULONG_PTR)iBcb->Vacb->BaseAddress + VacbOffset); + if (Result) + { + *pBcb = &iBcb->PFCB; + *pBuffer = (PVOID)((ULONG_PTR)iBcb->Vacb->BaseAddress + VacbOffset); + } CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> TRUE Bcb=%p, Buffer %p\n", FileObject, FileOffset, Length, Flags, *pBcb, *pBuffer);

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