Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 21/29: [CRT] Do not include unneeded PSEH header
by Jérôme Gardou 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d31856cda15b477ab597c… commit d31856cda15b477ab597c039f782df97b208c805 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Apr 23 16:22:01 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [CRT] Do not include unneeded PSEH header --- sdk/lib/crt/include/internal/wine/cppexcept.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sdk/lib/crt/include/internal/wine/cppexcept.h b/sdk/lib/crt/include/internal/wine/cppexcept.h index d4dbbee2f34..b2c98ddc7ac 100644 --- a/sdk/lib/crt/include/internal/wine/cppexcept.h +++ b/sdk/lib/crt/include/internal/wine/cppexcept.h @@ -21,8 +21,6 @@ #ifndef __MSVCRT_CPPEXCEPT_H #define __MSVCRT_CPPEXCEPT_H -#include <pseh/pseh2.h> - #define CXX_FRAME_MAGIC_VC6 0x19930520 #define CXX_FRAME_MAGIC_VC7 0x19930521 #define CXX_FRAME_MAGIC_VC8 0x19930522

1 0

[reactos] 20/29: [REACTOS] Explicitly link against pseh & include pseh headers in a few places
by Jérôme Gardou 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e470b583761e392641def… commit e470b583761e392641defc5b9b029e2889d02afc Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Apr 22 17:28:52 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [REACTOS] Explicitly link against pseh & include pseh headers in a few places --- base/applications/mscutils/eventvwr/eventvwr.c | 20 +++++++++++--------- base/system/services/CMakeLists.txt | 5 +---- base/system/services/rpcserver.c | 2 ++ dll/np/nfs/nfs41_np.c | 2 ++ dll/win32/advapi32/service/sctrl.c | 2 ++ dll/win32/kernel32/CMakeLists.txt | 2 +- dll/win32/lsasrv/database.c | 2 ++ dll/win32/olecli32/CMakeLists.txt | 2 +- dll/win32/samsrv/database.c | 2 ++ dll/win32/setupapi/cfgmgr.c | 2 ++ dll/win32/setupapi/devinst.c | 2 ++ modules/rostests/apitests/apphelp/apphelp.c | 4 +++- modules/rostests/apitests/apphelp/db.cpp | 8 +++++--- modules/rostests/apitests/apphelp/env.c | 2 ++ .../rostests/apitests/compiler/ms/seh/CMakeLists.txt | 1 + modules/rostests/apitests/gdi32/AddFontResourceEx.c | 2 ++ modules/rostests/apitests/gdi32/CreateDIBitmap.c | 2 ++ modules/rostests/apitests/gdi32/ExtCreatePen.c | 2 ++ modules/rostests/apitests/gdi32/GetObject.c | 2 ++ modules/rostests/apitests/gdi32/SetBrushOrgEx.c | 2 ++ modules/rostests/apitests/kernel32/FLS.c | 2 ++ modules/rostests/apitests/kernel32/SystemFirmware.c | 2 ++ .../rostests/apitests/localspl/dll/fpEnumPrinters.c | 2 ++ modules/rostests/apitests/ntdll/LdrEnumResources.c | 2 ++ .../apitests/ntdll/NtAllocateVirtualMemory.c | 2 ++ modules/rostests/apitests/ntdll/NtMapViewOfSection.c | 2 ++ modules/rostests/apitests/ntdll/RtlAllocateHeap.c | 2 ++ modules/rostests/apitests/ntdll/RtlBitmap.c | 2 ++ .../apitests/ntdll/RtlMultipleAllocateHeap.c | 2 ++ modules/rostests/apitests/ntdll/StackOverflow.c | 2 ++ modules/rostests/apitests/ntdll/load_notifications.c | 2 ++ modules/rostests/apitests/sdk/delayimp.cpp | 6 ++++-- modules/rostests/apitests/shlwapi/PathFindOnPath.c | 2 ++ modules/rostests/apitests/shlwapi/SHAreIconsEqual.c | 2 ++ .../rostests/apitests/shlwapi/SHLoadIndirectString.c | 2 ++ modules/rostests/apitests/spoolss/ReallocSplStr.c | 2 ++ modules/rostests/winetests/kernel32/CMakeLists.txt | 1 + modules/rostests/winetests/ntdll/CMakeLists.txt | 2 ++ sdk/lib/atl/CMakeLists.txt | 2 ++ sdk/lib/atl/atlcom.h | 1 + sdk/lib/crt/crt.cmake | 2 +- sdk/lib/drivers/copysup/CMakeLists.txt | 1 + sdk/lib/drivers/rdbsslib/CMakeLists.txt | 1 + sdk/lib/drivers/rxce/CMakeLists.txt | 1 + sdk/lib/rtl/CMakeLists.txt | 2 ++ win32ss/gdi/gdi32/objects/bitmap.c | 2 ++ win32ss/gdi/gdi32/wine/CMakeLists.txt | 1 + win32ss/printing/base/winspool/utils.c | 4 +++- win32ss/user/winsrv/consrv.cmake | 1 + win32ss/user/winsrv/usersrv.cmake | 1 + 50 files changed, 103 insertions(+), 23 deletions(-) diff --git a/base/applications/mscutils/eventvwr/eventvwr.c b/base/applications/mscutils/eventvwr/eventvwr.c index 5bc96ced583..94e67095b73 100644 --- a/base/applications/mscutils/eventvwr/eventvwr.c +++ b/base/applications/mscutils/eventvwr/eventvwr.c @@ -33,6 +33,8 @@ #include <shellapi.h> #include <shlwapi.h> +#include <pseh/pseh2.h> + // #include "resource.h" #define LVM_PROGRESS (WM_APP + 1) // Used by the subclassed ListView @@ -3895,7 +3897,7 @@ InitPropertiesDlg(HWND hDlg, PEVENTLOG EventLog) /* By default, it is 604800 (secs) == 7 days. On Server, the retention is zeroed out. */ dwRetention = 0; } - /* Convert in days, rounded up */ + /* Convert in days, rounded up */ if (dwRetention != INFINITE) dwRetention = (dwRetention + 24*3600 - 1) / (24*3600); @@ -4023,7 +4025,7 @@ SavePropertiesDlg(HWND hDlg, PEVENTLOG EventLog) LONG Result; DWORD dwMaxSize = 0, dwRetention = 0; HKEY hLogKey; - WCHAR *KeyPath; + WCHAR *KeyPath; SIZE_T cbKeyPath; if (!EventLog->Permanent) @@ -4054,7 +4056,7 @@ SavePropertiesDlg(HWND hDlg, PEVENTLOG EventLog) 0, REG_DWORD, (LPBYTE)&dwMaxSize, - sizeof(dwMaxSize)); + sizeof(dwMaxSize)); if (IsDlgButtonChecked(hDlg, IDC_OVERWRITE_AS_NEEDED) == BST_CHECKED) dwRetention = 0; @@ -4069,7 +4071,7 @@ SavePropertiesDlg(HWND hDlg, PEVENTLOG EventLog) REG_DWORD, (LPBYTE)&dwRetention, sizeof(dwRetention)); - + RegCloseKey(hLogKey); } @@ -4100,14 +4102,14 @@ EventLogPropProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_NOTIFY: switch (((LPNMHDR)lParam)->code) - { + { case PSN_APPLY: PropSheet_UnChanged(GetParent(hDlg), hDlg); SavePropertiesDlg(hDlg, EventLog); return (INT_PTR)TRUE; } break; - + case WM_COMMAND: switch (LOWORD(wParam)) { @@ -4126,7 +4128,7 @@ EventLogPropProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) } return (INT_PTR)TRUE; } - + case IDC_EDIT_EVENTS_AGE: case IDC_EDIT_MAXLOGSIZE: if (HIWORD(wParam) == EN_CHANGE) @@ -4134,7 +4136,7 @@ EventLogPropProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) PropSheet_Changed(GetParent(hDlg), hDlg); } return (INT_PTR)TRUE; - + case IDC_OVERWRITE_AS_NEEDED: { CheckRadioButton(hDlg, IDC_OVERWRITE_AS_NEEDED, IDC_NO_OVERWRITE, IDC_OVERWRITE_AS_NEEDED); @@ -4161,7 +4163,7 @@ EventLogPropProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) PropSheet_Changed(GetParent(hDlg), hDlg); return (INT_PTR)TRUE; } - + case IDC_RESTOREDEFAULTS: { LoadStringW(hInst, IDS_RESTOREDEFAULTS, szText, _countof(szText)); diff --git a/base/system/services/CMakeLists.txt b/base/system/services/CMakeLists.txt index 0005294b04b..ba38f656da2 100644 --- a/base/system/services/CMakeLists.txt +++ b/base/system/services/CMakeLists.txt @@ -20,10 +20,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/svcctl_s.c) add_executable(services ${SOURCE} services.rc) - -if(NOT MSVC) - target_link_libraries(services ${PSEH_LIB}) -endif() +target_link_libraries(services ${PSEH_LIB}) set_module_type(services win32gui UNICODE) add_importlibs(services userenv user32 advapi32 rpcrt4 msvcrt kernel32 ntdll) diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index 0c1dbcfb08a..136d86b1e50 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -15,6 +15,8 @@ #include <winnls.h> #include <strsafe.h> +#include <pseh/pseh2.h> + #define NDEBUG #include <debug.h> diff --git a/dll/np/nfs/nfs41_np.c b/dll/np/nfs/nfs41_np.c index ce03c419996..161f7407e6c 100644 --- a/dll/np/nfs/nfs41_np.c +++ b/dll/np/nfs/nfs41_np.c @@ -28,6 +28,8 @@ #include "nfs41_np.h" #include "options.h" +#include <pseh/pseh2.h> + #ifdef DBG #define DbgP(_x_) NFS41DbgPrint _x_ #else diff --git a/dll/win32/advapi32/service/sctrl.c b/dll/win32/advapi32/service/sctrl.c index c0cf0f42288..f437d8e6ecc 100644 --- a/dll/win32/advapi32/service/sctrl.c +++ b/dll/win32/advapi32/service/sctrl.c @@ -12,6 +12,8 @@ /* INCLUDES ******************************************************************/ #include <advapi32.h> +#include <pseh/pseh2.h> + WINE_DEFAULT_DEBUG_CHANNEL(advapi); diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt index 4f4eddc4f8f..11339a91e60 100644 --- a/dll/win32/kernel32/CMakeLists.txt +++ b/dll/win32/kernel32/CMakeLists.txt @@ -10,7 +10,7 @@ add_library(kernel32_shared client/shared_utils.c client/file/fileutils.c ) - +target_link_libraries(kernel32_shared PRIVATE pseh) add_dependencies(kernel32_shared psdk) list(APPEND SOURCE diff --git a/dll/win32/lsasrv/database.c b/dll/win32/lsasrv/database.c index af35f3a9b5f..591cb0131e9 100644 --- a/dll/win32/lsasrv/database.c +++ b/dll/win32/lsasrv/database.c @@ -8,6 +8,8 @@ #include "lsasrv.h" +#include <pseh/pseh2.h> + /* GLOBALS *****************************************************************/ static HANDLE SecurityKeyHandle = NULL; diff --git a/dll/win32/olecli32/CMakeLists.txt b/dll/win32/olecli32/CMakeLists.txt index 5ade3f7433b..e9f3f0cdc65 100644 --- a/dll/win32/olecli32/CMakeLists.txt +++ b/dll/win32/olecli32/CMakeLists.txt @@ -10,6 +10,6 @@ list(APPEND SOURCE add_library(olecli32 MODULE ${SOURCE}) set_module_type(olecli32 win32dll) -target_link_libraries(olecli32 wine) +target_link_libraries(olecli32 wine ${PSEH_LIB}) add_importlibs(olecli32 ole32 gdi32 msvcrt kernel32 ntdll) add_cd_file(TARGET olecli32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/samsrv/database.c b/dll/win32/samsrv/database.c index 512e7e1f8a2..7887f613db7 100644 --- a/dll/win32/samsrv/database.c +++ b/dll/win32/samsrv/database.c @@ -8,6 +8,8 @@ #include "samsrv.h" +#include <pseh/pseh2.h> + /* GLOBALS *****************************************************************/ static HANDLE SamKeyHandle = NULL; diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index b63feb46c44..923f16c2b2c 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -25,6 +25,8 @@ #include <pnp_c.h> #include <winsvc.h> +#include <pseh/pseh2.h> + #include "rpc_private.h" DWORD diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c index a20c96b9c07..c3d4a68f977 100644 --- a/dll/win32/setupapi/devinst.c +++ b/dll/win32/setupapi/devinst.c @@ -21,6 +21,8 @@ #include "setupapi_private.h" +#include <pseh/pseh2.h> + /* Unicode constants */ static const WCHAR BackSlash[] = {'\\',0}; static const WCHAR DateFormat[] = {'%','u','-','%','u','-','%','u',0}; diff --git a/modules/rostests/apitests/apphelp/apphelp.c b/modules/rostests/apitests/apphelp/apphelp.c index 7f4151289b9..13a52ca0f6f 100644 --- a/modules/rostests/apitests/apphelp/apphelp.c +++ b/modules/rostests/apitests/apphelp/apphelp.c @@ -24,6 +24,8 @@ #include <shlguid.h> #include <shobjidl.h> +#include <pseh/pseh2.h> + #include "wine/test.h" #include "apphelp_apitest.h" @@ -299,7 +301,7 @@ static struct "PROBLEMSEVERITY", "LANGID", "VER_LANGUAGE", "InvalidTag", "ENGINE", "HTMLHELPID", "INDEX_FLAGS", "FLAGS", "DATA_VALUETYPE", "DATA_DWORD", "LAYER_TAGID", "MSI_TRANSFORM_TAGID", "LINKER_VERSION", "LINK_DATE", "UPTO_LINK_DATE", "OS_SERVICE_PACK", "FLAG_TAGID", "RUNTIME_PLATFORM", "OS_SKU", "OS_PLATFORM", "APP_NAME_RC_ID", "VENDOR_NAME_RC_ID", "SUMMARY_MSG_RC_ID", "VISTA_SKU", - "DESCRIPTION_RC_ID", "PARAMETER1_RC_ID", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", + "DESCRIPTION_RC_ID", "PARAMETER1_RC_ID", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", "InvalidTag", "CONTEXT_TAGID", "EXE_WRAPPER", "URL_ID", NULL } }, diff --git a/modules/rostests/apitests/apphelp/db.cpp b/modules/rostests/apitests/apphelp/db.cpp index 4f6f3b76423..a96fb463901 100644 --- a/modules/rostests/apitests/apphelp/db.cpp +++ b/modules/rostests/apitests/apphelp/db.cpp @@ -22,6 +22,8 @@ #include <stdio.h> #include <initguid.h> +#include <pseh/pseh2.h> + #include "wine/test.h" #include "apphelp_apitest.h" @@ -1081,7 +1083,7 @@ static void test_GetDatabaseInformation(PDB pdb) ok(pInfo[1].dwSomething == 0xdededede, "Cookie1 corrupt: 0x%x\n", pInfo[1].dwSomething); ok(pInfo[1].dwMajor == 0xdededede, "Cookie2 corrupt: 0x%x\n", pInfo[1].dwMajor); } - + } free(pInfo); } @@ -1185,7 +1187,7 @@ static BOOL IsUserAdmin() { BOOL Result; SID_IDENTIFIER_AUTHORITY NtAuthority = { SECURITY_NT_AUTHORITY }; - PSID AdministratorsGroup; + PSID AdministratorsGroup; Result = AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, @@ -1196,7 +1198,7 @@ static BOOL IsUserAdmin() { if (!CheckTokenMembership( NULL, AdministratorsGroup, &Result)) Result = FALSE; - FreeSid(AdministratorsGroup); + FreeSid(AdministratorsGroup); } return Result; diff --git a/modules/rostests/apitests/apphelp/env.c b/modules/rostests/apitests/apphelp/env.c index 74e7d3b5dc1..26fcadbb611 100644 --- a/modules/rostests/apitests/apphelp/env.c +++ b/modules/rostests/apitests/apphelp/env.c @@ -21,6 +21,8 @@ #include "wine/test.h" +#include <pseh/pseh2.h> + #include "apphelp_apitest.h" typedef void* HSDB; diff --git a/modules/rostests/apitests/compiler/ms/seh/CMakeLists.txt b/modules/rostests/apitests/compiler/ms/seh/CMakeLists.txt index 34da6e3e4bc..46df43a266a 100644 --- a/modules/rostests/apitests/compiler/ms/seh/CMakeLists.txt +++ b/modules/rostests/apitests/compiler/ms/seh/CMakeLists.txt @@ -12,6 +12,7 @@ foreach(num RANGE 10 58) endforeach() add_library(ms_seh_test ${SOURCE}) +target_link_libraries(ms_seh_test pseh) add_dependencies(ms_seh_test psdk) if(MSVC) diff --git a/modules/rostests/apitests/gdi32/AddFontResourceEx.c b/modules/rostests/apitests/gdi32/AddFontResourceEx.c index 9448a6ff1c6..c65a00090d4 100644 --- a/modules/rostests/apitests/gdi32/AddFontResourceEx.c +++ b/modules/rostests/apitests/gdi32/AddFontResourceEx.c @@ -7,6 +7,8 @@ #include "precomp.h" +#include <pseh/pseh2.h> + void Test_AddFontResourceExW() { WCHAR szFileName[MAX_PATH]; diff --git a/modules/rostests/apitests/gdi32/CreateDIBitmap.c b/modules/rostests/apitests/gdi32/CreateDIBitmap.c index cee2bb476d6..cc11cab28c5 100644 --- a/modules/rostests/apitests/gdi32/CreateDIBitmap.c +++ b/modules/rostests/apitests/gdi32/CreateDIBitmap.c @@ -9,6 +9,8 @@ #include "init.h" +#include <pseh/pseh2.h> + #define CBM_CREATDIB 2 #define INVALID_POINTER ((PVOID)(ULONG_PTR)0xC0000000C0000000ULL) diff --git a/modules/rostests/apitests/gdi32/ExtCreatePen.c b/modules/rostests/apitests/gdi32/ExtCreatePen.c index d565ad9306e..b82c34b8f23 100644 --- a/modules/rostests/apitests/gdi32/ExtCreatePen.c +++ b/modules/rostests/apitests/gdi32/ExtCreatePen.c @@ -7,6 +7,8 @@ #include "precomp.h" +#include <pseh/pseh2.h> + #define ok_lasterror(err) \ ok(GetLastError() == err, "expected last error " #err " but got 0x%lx\n", GetLastError()); diff --git a/modules/rostests/apitests/gdi32/GetObject.c b/modules/rostests/apitests/gdi32/GetObject.c index df2a87170f7..6cd0d1c8ac5 100644 --- a/modules/rostests/apitests/gdi32/GetObject.c +++ b/modules/rostests/apitests/gdi32/GetObject.c @@ -7,6 +7,8 @@ #include "precomp.h" +#include <pseh/pseh2.h> + #define INVALID_POINTER ((PVOID)(ULONG_PTR)0xdeadbeefdeadbeefULL) void diff --git a/modules/rostests/apitests/gdi32/SetBrushOrgEx.c b/modules/rostests/apitests/gdi32/SetBrushOrgEx.c index e708fef180d..9d510ab4ce8 100644 --- a/modules/rostests/apitests/gdi32/SetBrushOrgEx.c +++ b/modules/rostests/apitests/gdi32/SetBrushOrgEx.c @@ -7,6 +7,8 @@ #include "precomp.h" +#include <pseh/pseh2.h> + void Test_Set(ULONG ulLine, HDC hdc, INT x, INT y, LPPOINT ppt, BOOL bExp, DWORD dwErrExp) { BOOL bResult; diff --git a/modules/rostests/apitests/kernel32/FLS.c b/modules/rostests/apitests/kernel32/FLS.c index 712a87403e8..44241b1e5a8 100644 --- a/modules/rostests/apitests/kernel32/FLS.c +++ b/modules/rostests/apitests/kernel32/FLS.c @@ -9,6 +9,8 @@ #include <ndk/pstypes.h> #include <ndk/rtlfuncs.h> +#include <pseh/pseh2.h> + /* XP does not have these functions */ static DWORD (WINAPI *pFlsAlloc)(PFLS_CALLBACK_FUNCTION); static BOOL (WINAPI *pFlsFree)(DWORD); diff --git a/modules/rostests/apitests/kernel32/SystemFirmware.c b/modules/rostests/apitests/kernel32/SystemFirmware.c index 47ef3a33bac..8a1ee03af4e 100644 --- a/modules/rostests/apitests/kernel32/SystemFirmware.c +++ b/modules/rostests/apitests/kernel32/SystemFirmware.c @@ -8,6 +8,8 @@ #include "precomp.h" +#include <pseh/pseh2.h> + static UINT (WINAPI * pEnumSystemFirmwareTables)(DWORD, PVOID, DWORD); static UINT (WINAPI * pGetSystemFirmwareTable)(DWORD, DWORD, PVOID, DWORD); diff --git a/modules/rostests/apitests/localspl/dll/fpEnumPrinters.c b/modules/rostests/apitests/localspl/dll/fpEnumPrinters.c index b3d1625687d..346682ca946 100644 --- a/modules/rostests/apitests/localspl/dll/fpEnumPrinters.c +++ b/modules/rostests/apitests/localspl/dll/fpEnumPrinters.c @@ -15,6 +15,8 @@ #include <winspool.h> #include <winsplp.h> +#include <pseh/pseh2.h> + #include "../localspl_apitest.h" #include <spoolss.h> diff --git a/modules/rostests/apitests/ntdll/LdrEnumResources.c b/modules/rostests/apitests/ntdll/LdrEnumResources.c index e20cfd2bef5..1e0a0787f08 100644 --- a/modules/rostests/apitests/ntdll/LdrEnumResources.c +++ b/modules/rostests/apitests/ntdll/LdrEnumResources.c @@ -7,6 +7,8 @@ #include "precomp.h" +#include <pseh/pseh2.h> + typedef struct _TEST_RESOURCES { IMAGE_RESOURCE_DIRECTORY TypeDirectory; diff --git a/modules/rostests/apitests/ntdll/NtAllocateVirtualMemory.c b/modules/rostests/apitests/ntdll/NtAllocateVirtualMemory.c index aae94052e6b..235eaaf0095 100644 --- a/modules/rostests/apitests/ntdll/NtAllocateVirtualMemory.c +++ b/modules/rostests/apitests/ntdll/NtAllocateVirtualMemory.c @@ -10,6 +10,8 @@ #include "precomp.h" +#include <pseh/pseh2.h> + static PVOID Allocations[4096] = { NULL }; static ULONG CurrentAllocation = 0; diff --git a/modules/rostests/apitests/ntdll/NtMapViewOfSection.c b/modules/rostests/apitests/ntdll/NtMapViewOfSection.c index a191126df20..8723696c924 100644 --- a/modules/rostests/apitests/ntdll/NtMapViewOfSection.c +++ b/modules/rostests/apitests/ntdll/NtMapViewOfSection.c @@ -8,6 +8,8 @@ #include "precomp.h" +#include <pseh/pseh2.h> + void Test_PageFileSection(void) { diff --git a/modules/rostests/apitests/ntdll/RtlAllocateHeap.c b/modules/rostests/apitests/ntdll/RtlAllocateHeap.c index 6a327bb09f0..af3a8a7aecd 100644 --- a/modules/rostests/apitests/ntdll/RtlAllocateHeap.c +++ b/modules/rostests/apitests/ntdll/RtlAllocateHeap.c @@ -7,6 +7,8 @@ #include "precomp.h" +#include <pseh/pseh2.h> + PVOID Buffers[0x100]; START_TEST(RtlAllocateHeap) diff --git a/modules/rostests/apitests/ntdll/RtlBitmap.c b/modules/rostests/apitests/ntdll/RtlBitmap.c index 3b224be1e66..0c6bc7d59e5 100644 --- a/modules/rostests/apitests/ntdll/RtlBitmap.c +++ b/modules/rostests/apitests/ntdll/RtlBitmap.c @@ -2,6 +2,8 @@ #include "precomp.h" #include <versionhelpers.h> +#include <pseh/pseh2.h> + static BOOL IsBroken = FALSE; void diff --git a/modules/rostests/apitests/ntdll/RtlMultipleAllocateHeap.c b/modules/rostests/apitests/ntdll/RtlMultipleAllocateHeap.c index b2eb3132afa..1ae645facf5 100644 --- a/modules/rostests/apitests/ntdll/RtlMultipleAllocateHeap.c +++ b/modules/rostests/apitests/ntdll/RtlMultipleAllocateHeap.c @@ -6,6 +6,8 @@ */ #include "precomp.h" +#include <pseh/pseh2.h> + typedef ULONG (NTAPI *FN_RtlMultipleAllocateHeap)(IN PVOID, IN ULONG, IN SIZE_T, IN ULONG, OUT PVOID *); typedef ULONG (NTAPI *FN_RtlMultipleFreeHeap)(IN PVOID, IN ULONG, IN ULONG, OUT PVOID *); diff --git a/modules/rostests/apitests/ntdll/StackOverflow.c b/modules/rostests/apitests/ntdll/StackOverflow.c index 175142d01a3..1c3007079ee 100644 --- a/modules/rostests/apitests/ntdll/StackOverflow.c +++ b/modules/rostests/apitests/ntdll/StackOverflow.c @@ -7,6 +7,8 @@ #include "precomp.h" +#include <pseh/pseh2.h> + #ifdef _MSC_VER #pragma warning(disable : 4717) // disable warning about recursive function #endif diff --git a/modules/rostests/apitests/ntdll/load_notifications.c b/modules/rostests/apitests/ntdll/load_notifications.c index 8543f2f478a..6fca52939a5 100644 --- a/modules/rostests/apitests/ntdll/load_notifications.c +++ b/modules/rostests/apitests/ntdll/load_notifications.c @@ -7,6 +7,8 @@ #include "precomp.h" +#include <pseh/pseh2.h> + WCHAR dllpath[MAX_PATH]; LONG g_TlsCalled = 0; diff --git a/modules/rostests/apitests/sdk/delayimp.cpp b/modules/rostests/apitests/sdk/delayimp.cpp index ca8c76e1ffe..7073f001932 100644 --- a/modules/rostests/apitests/sdk/delayimp.cpp +++ b/modules/rostests/apitests/sdk/delayimp.cpp @@ -20,6 +20,8 @@ #include <imagehlp.h> #include <mmddk.h> +#include <pseh/pseh2.h> + /* Compatibility with the MS defines */ #ifndef FACILITY_VISUALCPP @@ -198,7 +200,7 @@ FARPROC WINAPI DliHook(unsigned dliNotify, PDelayLoadInfo pdli) g_VersionDll = LoadLibraryA("version.dll"); return (FARPROC)1; } - + } else if (dliNotify == dliNotePreGetProcAddress) { @@ -482,7 +484,7 @@ START_TEST(delayimp) ok(err == MMSYSERR_INVALHANDLE, "Expected err to be MMSYSERR_INVALHANDLE, was 0x%lx\n", err); CheckDliDone(); ok(g_BreakFunctionName == false, "Expected the functionname to be changed\n"); - + /* Make the LoadLib fail, manually load the library in the Failure Hook, Respond to the dliNotePreGetProcAddress with an alternate function address */ SetExpectedDli(g_sfc_key); diff --git a/modules/rostests/apitests/shlwapi/PathFindOnPath.c b/modules/rostests/apitests/shlwapi/PathFindOnPath.c index 9a4ba21ed6b..4b4f67d67b2 100644 --- a/modules/rostests/apitests/shlwapi/PathFindOnPath.c +++ b/modules/rostests/apitests/shlwapi/PathFindOnPath.c @@ -20,6 +20,8 @@ #include <shlwapi.h> #include <assert.h> +#include <pseh/pseh2.h> + #define EF_FULLPATH 1 #define EF_TESTDATA 2 #define EF_WIN_DIR 4 diff --git a/modules/rostests/apitests/shlwapi/SHAreIconsEqual.c b/modules/rostests/apitests/shlwapi/SHAreIconsEqual.c index 27592325c79..efaaea4d688 100644 --- a/modules/rostests/apitests/shlwapi/SHAreIconsEqual.c +++ b/modules/rostests/apitests/shlwapi/SHAreIconsEqual.c @@ -9,6 +9,8 @@ #include <shlwapi.h> #include "resource.h" +#include <pseh/pseh2.h> + static BOOL (WINAPI *pSHAreIconsEqual)(HICON hIcon1, HICON hIcon2); static const char* names[] = diff --git a/modules/rostests/apitests/shlwapi/SHLoadIndirectString.c b/modules/rostests/apitests/shlwapi/SHLoadIndirectString.c index 0eac5b04db6..5aeef6de517 100644 --- a/modules/rostests/apitests/shlwapi/SHLoadIndirectString.c +++ b/modules/rostests/apitests/shlwapi/SHLoadIndirectString.c @@ -9,6 +9,8 @@ #include <shlwapi.h> #include "resource.h" +#include <pseh/pseh2.h> + static void execute_test(LPCWSTR DllFile) { WCHAR DllBuffer[MAX_PATH + 20]; diff --git a/modules/rostests/apitests/spoolss/ReallocSplStr.c b/modules/rostests/apitests/spoolss/ReallocSplStr.c index 161d07070a9..a19aab3acbb 100644 --- a/modules/rostests/apitests/spoolss/ReallocSplStr.c +++ b/modules/rostests/apitests/spoolss/ReallocSplStr.c @@ -12,6 +12,8 @@ #include <winbase.h> #include <spoolss.h> +#include <pseh/pseh2.h> + START_TEST(ReallocSplStr) { const WCHAR wszTestString1[] = L"Test"; diff --git a/modules/rostests/winetests/kernel32/CMakeLists.txt b/modules/rostests/winetests/kernel32/CMakeLists.txt index d652970ff98..c46d3fdf669 100644 --- a/modules/rostests/winetests/kernel32/CMakeLists.txt +++ b/modules/rostests/winetests/kernel32/CMakeLists.txt @@ -55,6 +55,7 @@ if(USE_CLANG_CL OR (NOT MSVC)) endif() set_module_type(kernel32_winetest win32cui) +target_link_libraries(kernel32_winetest pseh) add_importlibs(kernel32_winetest user32 advapi32 msvcrt kernel32 ntdll) add_pch(kernel32_winetest precomp.h "${PCH_SKIP_SOURCE}") add_rostests_file(TARGET kernel32_winetest) diff --git a/modules/rostests/winetests/ntdll/CMakeLists.txt b/modules/rostests/winetests/ntdll/CMakeLists.txt index 21b6b7bdc97..33863166474 100644 --- a/modules/rostests/winetests/ntdll/CMakeLists.txt +++ b/modules/rostests/winetests/ntdll/CMakeLists.txt @@ -36,6 +36,8 @@ add_executable(ntdll_winetest ${SOURCE} ${PCH_SKIP_SOURCE}) +target_link_libraries(ntdll_winetest pseh) + if(USE_CLANG_CL OR (NOT MSVC)) target_compile_options(ntdll_winetest PRIVATE "-Wno-format") endif() diff --git a/sdk/lib/atl/CMakeLists.txt b/sdk/lib/atl/CMakeLists.txt index 3a0fb3ce0dc..9fb5d548228 100644 --- a/sdk/lib/atl/CMakeLists.txt +++ b/sdk/lib/atl/CMakeLists.txt @@ -9,3 +9,5 @@ target_include_directories(atl_classes INTERFACE target_compile_definitions(atl_classes INTERFACE "$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<NOT:$<BOOL:$<TARGET_PROPERTY:WITH_CXX_EXCEPTIONS>>>>:_ATL_NO_EXCEPTIONS>") + +target_link_libraries(atl_classes INTERFACE pseh) diff --git a/sdk/lib/atl/atlcom.h b/sdk/lib/atl/atlcom.h index 544de73244c..c9d92edbd9c 100644 --- a/sdk/lib/atl/atlcom.h +++ b/sdk/lib/atl/atlcom.h @@ -22,6 +22,7 @@ #pragma once #include <cguid.h> // for GUID_NULL +#include <pseh/pseh2.h> namespace ATL { diff --git a/sdk/lib/crt/crt.cmake b/sdk/lib/crt/crt.cmake index 3997ea778a9..6a1111789d7 100644 --- a/sdk/lib/crt/crt.cmake +++ b/sdk/lib/crt/crt.cmake @@ -603,7 +603,7 @@ if(USE_CLANG_CL) endif() add_library(crt ${CRT_SOURCE} ${CRT_WINE_SOURCE} ${crt_asm}) -target_link_libraries(crt chkstk) +target_link_libraries(crt chkstk ${PSEH_LIB}) target_compile_definitions(crt PRIVATE __MINGW_IMPORT=extern USE_MSVCRT_PREFIX diff --git a/sdk/lib/drivers/copysup/CMakeLists.txt b/sdk/lib/drivers/copysup/CMakeLists.txt index c84d41ed97d..fb009964639 100644 --- a/sdk/lib/drivers/copysup/CMakeLists.txt +++ b/sdk/lib/drivers/copysup/CMakeLists.txt @@ -4,4 +4,5 @@ list(APPEND SOURCE copysup.c) add_library(copysup ${SOURCE}) +target_link_libraries(copysup PRIVATE pseh) add_dependencies(copysup bugcodes xdk) diff --git a/sdk/lib/drivers/rdbsslib/CMakeLists.txt b/sdk/lib/drivers/rdbsslib/CMakeLists.txt index 7b6ec545500..5c1b9005f8c 100644 --- a/sdk/lib/drivers/rdbsslib/CMakeLists.txt +++ b/sdk/lib/drivers/rdbsslib/CMakeLists.txt @@ -7,4 +7,5 @@ list(APPEND SOURCE rdbss.c) add_library(rdbsslib ${SOURCE}) +target_link_libraries(rdbsslib PRIVATE pseh) add_dependencies(rdbsslib bugcodes xdk) diff --git a/sdk/lib/drivers/rxce/CMakeLists.txt b/sdk/lib/drivers/rxce/CMakeLists.txt index 38168bf6022..905c08b8136 100644 --- a/sdk/lib/drivers/rxce/CMakeLists.txt +++ b/sdk/lib/drivers/rxce/CMakeLists.txt @@ -6,4 +6,5 @@ list(APPEND SOURCE rxce.c) add_library(rxce ${SOURCE}) +target_link_libraries(rxce PRIVATE pseh) add_dependencies(rxce bugcodes xdk) diff --git a/sdk/lib/rtl/CMakeLists.txt b/sdk/lib/rtl/CMakeLists.txt index 1fe48a7817c..c2b2e5d1025 100644 --- a/sdk/lib/rtl/CMakeLists.txt +++ b/sdk/lib/rtl/CMakeLists.txt @@ -112,6 +112,7 @@ endif() add_asm_files(rtl_asm ${ASM_SOURCE}) add_library(rtl ${SOURCE} ${rtl_asm}) +target_link_libraries(rtl PRIVATE pseh) add_pch(rtl rtl.h SOURCE) add_dependencies(rtl psdk asm) @@ -124,3 +125,4 @@ list(APPEND SOURCE_VISTA add_library(rtl_vista ${SOURCE_VISTA}) add_pch(rtl_vista rtl_vista.h SOURCE_VISTA) add_dependencies(rtl_vista psdk) +target_link_libraries(rtl_vista PRIVATE pseh) diff --git a/win32ss/gdi/gdi32/objects/bitmap.c b/win32ss/gdi/gdi32/objects/bitmap.c index 3e56194ce95..91e8a0be9ee 100644 --- a/win32ss/gdi/gdi32/objects/bitmap.c +++ b/win32ss/gdi/gdi32/objects/bitmap.c @@ -1,5 +1,7 @@ #include <precomp.h> +#include <pseh/pseh2.h> + #define NDEBUG #include <debug.h> diff --git a/win32ss/gdi/gdi32/wine/CMakeLists.txt b/win32ss/gdi/gdi32/wine/CMakeLists.txt index 63e139cd8c9..4f70a336d05 100644 --- a/win32ss/gdi/gdi32/wine/CMakeLists.txt +++ b/win32ss/gdi/gdi32/wine/CMakeLists.txt @@ -23,4 +23,5 @@ list(APPEND SOURCE rosglue.c) add_library(winegdi ${SOURCE}) +target_link_libraries(winegdi PRIVATE pseh) add_dependencies(winegdi psdk) diff --git a/win32ss/printing/base/winspool/utils.c b/win32ss/printing/base/winspool/utils.c index 3fa4a37ef2d..1128f3d801e 100644 --- a/win32ss/printing/base/winspool/utils.c +++ b/win32ss/printing/base/winspool/utils.c @@ -9,6 +9,8 @@ #include <shlobj.h> #include <undocshell.h> +#include <pseh/pseh2.h> + #define MAX_GETPRINTER_SIZE 4096 - MAX_PATH typedef void (WINAPI *PPfpSHChangeNotify)(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID dwItem2); @@ -160,7 +162,7 @@ IntProtectHandle( HANDLE hSpooler, BOOL Close ) // 2 : Close and/or shared // 1 : Failed Handle // 0 : In use. - return Ret; + return Ret; } // // This one too. diff --git a/win32ss/user/winsrv/consrv.cmake b/win32ss/user/winsrv/consrv.cmake index 48fb96d2de2..d2ef3a2b5ec 100644 --- a/win32ss/user/winsrv/consrv.cmake +++ b/win32ss/user/winsrv/consrv.cmake @@ -53,6 +53,7 @@ else() endif() add_library(consrv ${CONSRV_SOURCE}) +target_link_libraries(consrv pseh) add_dependencies(consrv psdk) add_pch(consrv consrv/consrv.h CONSRV_SOURCE) #add_object_library(consrv ${CONSRV_SOURCE}) diff --git a/win32ss/user/winsrv/usersrv.cmake b/win32ss/user/winsrv/usersrv.cmake index e7cbb1bae13..8db138e5a27 100644 --- a/win32ss/user/winsrv/usersrv.cmake +++ b/win32ss/user/winsrv/usersrv.cmake @@ -10,6 +10,7 @@ list(APPEND USERSRV_SOURCE usersrv/usersrv.h) add_library(usersrv ${USERSRV_SOURCE}) +target_link_libraries(usersrv pseh) add_dependencies(usersrv xdk) add_pch(usersrv usersrv/usersrv.h USERSRV_SOURCE) #add_object_library(usersrv ${USERSRV_SOURCE})

1 0

[reactos] 19/29: [CMAKE] Introduce a GCC plugin for helping with amd64 SEH implementation
by Jérôme Gardou 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=37bc01f42b6d940c763b0… commit 37bc01f42b6d940c763b0d346f44971c7abe08d9 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Apr 22 10:37:50 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [CMAKE] Introduce a GCC plugin for helping with amd64 SEH implementation \#pragma REACTOS SEH(except) \#pragma REACTOS SEH(finally) What it does is counting the number of SEH __try blocks and emit the proper assembly statements at function prologue It also checks for mixing C++ & SEH exception handling, which wouldn't work --- sdk/cmake/host-tools.cmake | 23 ++++- sdk/tools/CMakeLists.txt | 8 ++ sdk/tools/gcc_plugin_seh/CMakeLists.txt | 4 + sdk/tools/gcc_plugin_seh/main.cpp | 177 ++++++++++++++++++++++++++++++++ 4 files changed, 211 insertions(+), 1 deletion(-) diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index a738ff64c09..4633b1097d1 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -6,6 +6,13 @@ function(setup_host_tools) if(NOT MSVC) list(APPEND HOST_TOOLS rsym pefixup) endif() + if ((ARCH STREQUAL "amd64") AND (CMAKE_C_COMPILER_ID STREQUAL "GNU")) + execute_process( + COMMAND ${CMAKE_C_COMPILER} --print-file-name=plugin + OUTPUT_VARIABLE GCC_PLUGIN_DIR) + string(STRIP ${GCC_PLUGIN_DIR} GCC_PLUGIN_DIR) + list(APPEND HOST_MODULES gcc_plugin_seh) + endif() list(TRANSFORM HOST_TOOLS PREPEND "${REACTOS_BINARY_DIR}/host-tools/bin/" OUTPUT_VARIABLE HOST_TOOLS_OUTPUT) if (CMAKE_HOST_WIN32) list(TRANSFORM HOST_TOOLS_OUTPUT APPEND ".exe") @@ -13,13 +20,21 @@ function(setup_host_tools) set(HOST_EXTRA_DIR "$(ConfigurationName)/") endif() set(HOST_EXE_SUFFIX ".exe") + set(HOST_MODULE_SUFFIX ".dll") + else() + set(HOST_MODULE_SUFFIX ".so") endif() ExternalProject_Add(host-tools SOURCE_DIR ${REACTOS_SOURCE_DIR} PREFIX ${REACTOS_BINARY_DIR}/host-tools BINARY_DIR ${REACTOS_BINARY_DIR}/host-tools/bin - CMAKE_ARGS -UCMAKE_TOOLCHAIN_FILE -DARCH:STRING=${ARCH} -DCMAKE_INSTALL_PREFIX=${REACTOS_BINARY_DIR}/host-tools -DTOOLS_FOLDER=${REACTOS_BINARY_DIR}/host-tools/bin + CMAKE_ARGS + -UCMAKE_TOOLCHAIN_FILE + -DARCH:STRING=${ARCH} + -DCMAKE_INSTALL_PREFIX=${REACTOS_BINARY_DIR}/host-tools + -DTOOLS_FOLDER=${REACTOS_BINARY_DIR}/host-tools/bin + -DGCC_PLUGIN_DIR=${GCC_PLUGIN_DIR} BUILD_ALWAYS TRUE INSTALL_COMMAND ${CMAKE_COMMAND} -E true BUILD_BYPRODUCTS ${HOST_TOOLS_OUTPUT} @@ -32,4 +47,10 @@ function(setup_host_tools) set_target_properties(native-${_tool} PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/bin/${HOST_EXTRA_DIR}${_tool}${HOST_EXE_SUFFIX}) add_dependencies(native-${_tool} host-tools ${INSTALL_DIR}/bin/${HOST_EXTRA_DIR}${_tool}${HOST_EXE_SUFFIX}) endforeach() + + foreach(_module ${HOST_MODULES}) + add_library(native-${_module} MODULE IMPORTED) + set_target_properties(native-${_module} PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/bin/${HOST_EXTRA_DIR}${_module}${HOST_MODULE_SUFFIX}) + add_dependencies(native-${_module} host-tools ${INSTALL_DIR}/bin/${HOST_EXTRA_DIR}${_module}${HOST_MODULE_SUFFIX}) + endforeach() endfunction() diff --git a/sdk/tools/CMakeLists.txt b/sdk/tools/CMakeLists.txt index 3f836f8e9bf..956a6dc7060 100644 --- a/sdk/tools/CMakeLists.txt +++ b/sdk/tools/CMakeLists.txt @@ -4,6 +4,11 @@ function(add_host_tool _tool) set_target_properties(${_tool} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TOOLS_FOLDER}) endfunction() +function(add_host_module _module) + add_library(${_module} MODULE ${ARGN}) + set_target_properties(${_module} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${TOOLS_FOLDER}) +endfunction() + if(MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_IO_H=1) add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:/EHsc>") @@ -38,6 +43,9 @@ add_subdirectory(xml2sdb) if(NOT MSVC) add_subdirectory(log2lines) add_subdirectory(rsym) +if (ARCH STREQUAL "amd64") + add_subdirectory(gcc_plugin_seh) +endif() add_host_tool(pefixup pefixup.c) if (ARCH STREQUAL "amd64") diff --git a/sdk/tools/gcc_plugin_seh/CMakeLists.txt b/sdk/tools/gcc_plugin_seh/CMakeLists.txt new file mode 100644 index 00000000000..b96571f7fbe --- /dev/null +++ b/sdk/tools/gcc_plugin_seh/CMakeLists.txt @@ -0,0 +1,4 @@ + +add_host_module(gcc_plugin_seh main.cpp) +target_include_directories(gcc_plugin_seh PRIVATE ${GCC_PLUGIN_DIR}/include) +set_target_properties(gcc_plugin_seh PROPERTIES POSITION_INDEPENDENT_CODE ON) diff --git a/sdk/tools/gcc_plugin_seh/main.cpp b/sdk/tools/gcc_plugin_seh/main.cpp new file mode 100644 index 00000000000..22df978e0c6 --- /dev/null +++ b/sdk/tools/gcc_plugin_seh/main.cpp @@ -0,0 +1,177 @@ +/* + * PROJECT: ReactOS SDK + * LICENSE: BSD Zero Clause License (https://spdx.org/licenses/0BSD.html) + * PURPOSE: Helper pragma implementation for pseh library (amd64) + * COPYRIGHT: Copyright 2021 Jérôme Gardou + */ + +#include <gcc-plugin.h> +#include <plugin-version.h> +#include <function.h> +#include <tree.h> +#include <c-family/c-pragma.h> +#include <c-family/c-common.h> + +#include <iostream> +#include <sstream> +#include <unordered_map> +#include <vector> + +#define is_alpha(c) (((c)>64 && (c)<91) || ((c)>96 && (c)<123)) + +#if defined(_WIN32) || defined(WIN32) +#define VISIBLE __decspec(dllexport) +#else +#define VISIBLE __attribute__((__visibility__("default"))) +#endif + +#define UNUSED __attribute__((__unused__)) + +int +VISIBLE +plugin_is_GPL_compatible = 1; + +struct seh_function +{ + bool unwind; + bool except; + tree asm_header_text; + tree asm_header; + size_t count; + + seh_function(struct function* fun) + : unwind(false) + , except(false) + , count(0) + { + /* Reserve space for our header statement */ + char buf[256]; + memset(buf, 0, sizeof(buf)); + asm_header_text = build_string(sizeof(buf), buf); + asm_header = build_stmt(fun->function_start_locus, ASM_EXPR, asm_header_text, NULL_TREE, NULL_TREE, NULL_TREE, NULL_TREE); + ASM_VOLATILE_P(asm_header) = 1; + add_stmt(asm_header); + } +}; + +static std::unordered_map<struct function*, struct seh_function*> func_seh_map = {}; + +static +struct seh_function* +get_seh_function() +{ + auto search = func_seh_map.find(cfun); + if (search != func_seh_map.end()) + return search->second; + + auto seh_fun = new seh_function(cfun); + func_seh_map.insert({cfun, seh_fun}); + + return seh_fun; +} + +static +void +handle_seh_pragma(cpp_reader* UNUSED parser) +{ + tree x, arg; + std::stringstream label_decl; + + if (!cfun) + { + error("%<#pragma REACTOS seh%> is not allowed outside functions"); + return; + } + + if ((pragma_lex(&x) != CPP_OPEN_PAREN) || + (pragma_lex(&arg) != CPP_NAME) || + (pragma_lex(&x) != CPP_CLOSE_PAREN) || + (pragma_lex(&x) != CPP_EOF)) + { + error("%<#pragma REACTOS seh%> needs one parameter%>"); + return; + } + + const char* op = IDENTIFIER_POINTER(arg); + + seh_function* seh_fun = get_seh_function(); + if (strcmp(op, "except") == 0) + seh_fun->except = true; + else if (strcmp(op, "finally") == 0) + seh_fun->unwind = true; + else + { + error("Wrong argument for %<#pragma REACTOS seh%>. Expected \"except\" or \"finally\""); + return; + } + seh_fun->count++; + + /* Make sure we use a frame pointer. REACTOS' PSEH depends on this */ + cfun->machine->accesses_prev_frame = 1; +} + +static +void +finish_seh_function(void* event_data, void* UNUSED user_data) +{ + tree fndef = (tree)event_data; + struct function* fun = DECL_STRUCT_FUNCTION(fndef); + + auto search = func_seh_map.find(fun); + if (search == func_seh_map.end()) + return; + + /* Get our SEH details and remove us from the map */ + seh_function* seh_fun = search->second; + func_seh_map.erase(search); + + if (DECL_FUNCTION_PERSONALITY(fndef) != nullptr) + { + error("Function %s has a personality. Are you mixing SEH with C++ exceptions ?", + IDENTIFIER_POINTER(fndef)); + return; + } + + /* Update asm statement */ + std::stringstream asm_str; + asm_str << ".seh_handler __C_specific_handler"; + if (seh_fun->unwind) + asm_str << ", @unwind"; + if (seh_fun->except) + asm_str << ", @except"; + asm_str << "\n"; + asm_str << "\t.seh_handlerdata\n"; + asm_str << "\t.long " << seh_fun->count << "\n"; + asm_str << "\t.seh_code"; + + strncpy(const_cast<char*>(TREE_STRING_POINTER(seh_fun->asm_header_text)), + asm_str.str().c_str(), + TREE_STRING_LENGTH(seh_fun->asm_header_text)); + + delete seh_fun; +} + +static +void +register_seh_pragmas(void* UNUSED event_data, void* UNUSED user_data) +{ + c_register_pragma("REACTOS", "seh", handle_seh_pragma); +} + +/* Return 0 on success or error code on failure */ +extern "C" +VISIBLE +int plugin_init(struct plugin_name_args *info, /* Argument infor */ + struct plugin_gcc_version *version) /* Version of GCC */ +{ + if (!plugin_default_version_check (version, &gcc_version)) + { + std::cerr << "This GCC plugin is for version " << GCCPLUGIN_VERSION_MAJOR << "." << GCCPLUGIN_VERSION_MINOR << "\n"; + return 1; + } + + register_callback(info->base_name, PLUGIN_PRAGMAS, register_seh_pragmas, NULL); + register_callback(info->base_name, PLUGIN_FINISH_PARSE_FUNCTION, finish_seh_function, NULL); + + return 0; +}

1 0

[reactos] 18/29: [RTL] Use addressing relative to rip
by Jérôme Gardou 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8abcd187423ca52235302… commit 8abcd187423ca5223530252d26e71531a523276e Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Apr 21 19:52:58 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [RTL] Use addressing relative to rip --- sdk/lib/rtl/amd64/slist.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/lib/rtl/amd64/slist.S b/sdk/lib/rtl/amd64/slist.S index 928cb52cd43..08eb382351d 100644 --- a/sdk/lib/rtl/amd64/slist.S +++ b/sdk/lib/rtl/amd64/slist.S @@ -102,7 +102,7 @@ ExpInterlockedPopEntrySList: mov rax, [rcx] /* Check for 16 byte SList support */ - cmp byte ptr [RtlpUse16ByteSLists], 0 + cmp byte ptr [rip+RtlpUse16ByteSLists], 0 jne RtlInterlockedPopEntrySList16 /* Use the 8 byte header */ @@ -233,7 +233,7 @@ ExpInterlockedPushEntrySList: ExpInterlockedPushEntrySListChecked: /* Make sure RtlpUse16ByteSLists is initialized */ - cmp byte ptr [RtlpUse16ByteSLists], HEX(FF) + cmp byte ptr [rip+RtlpUse16ByteSLists], HEX(FF) jne ExpInterlockedPushEntrySListChecked2 /* Not initialized, raise an assertion */ int HEX(2C) @@ -247,7 +247,7 @@ ExpInterlockedPushEntrySListChecked2: mov r9, [rcx + 8] /* Check for 16 byte SList support */ - cmp byte ptr [RtlpUse16ByteSLists], 0 + cmp byte ptr [rip+RtlpUse16ByteSLists], 0 jne RtlInterlockedPushEntrySList16 /* Use the 8 byte header */ @@ -368,7 +368,7 @@ ExpInterlockedFlushSList: mov rax, [rcx] /* Check for 16 byte SList support */ - cmp byte ptr [RtlpUse16ByteSLists], 0 + cmp byte ptr [rip+RtlpUse16ByteSLists], 0 jne RtlInterlockedFlushSList16 /* Use the 8 byte header */

1 0

[reactos] 17/29: [PSEH] Make the dummy PSEH at least usable.
by Jérôme Gardou 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96a2b1890390d3c8451df… commit 96a2b1890390d3c8451dff6eff64ac13d6124d36 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Apr 21 19:50:31 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [PSEH] Make the dummy PSEH at least usable. Not screwing the code flow when no exception happens would be the least --- sdk/include/reactos/libs/pseh/pseh2.h | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/sdk/include/reactos/libs/pseh/pseh2.h b/sdk/include/reactos/libs/pseh/pseh2.h index 8437bbe2f7a..45f872e7757 100644 --- a/sdk/include/reactos/libs/pseh/pseh2.h +++ b/sdk/include/reactos/libs/pseh/pseh2.h @@ -42,15 +42,36 @@ extern int _SEH2_Volatile0; extern int _SEH2_VolatileExceptionCode; -#define _SEH2_TRY { -#define _SEH2_FINALLY } { -#define _SEH2_EXCEPT(...) } if (_SEH2_Volatile0 || (0 && (__VA_ARGS__))) { -#define _SEH2_END } +#define _SEH2_TRY \ +_Pragma("GCC diagnostic push") \ +_Pragma("GCC diagnostic ignored \"-Wunused-label\"")\ +{ \ + __label__ __seh2_scope_end__; + +#define _SEH2_FINALLY \ + __seh2_scope_end__:; \ + } \ + if (1) \ + { \ + __label__ __seh2_scope_end__; + +#define _SEH2_EXCEPT(...) \ + __seh2_scope_end__:; \ + } \ + if (_SEH2_Volatile0 || (0 && (__VA_ARGS__))) \ + { \ + __label__ __seh2_scope_end__; + +#define _SEH2_END \ + __seh2_scope_end__:; \ + } \ +_Pragma("GCC diagnostic pop") + #define _SEH2_GetExceptionInformation() ((struct _EXCEPTION_POINTERS*)0) #define _SEH2_GetExceptionCode() _SEH2_VolatileExceptionCode #define _SEH2_AbnormalTermination() (0) #define _SEH2_YIELD(STMT_) STMT_ -#define _SEH2_LEAVE +#define _SEH2_LEAVE goto __seh2_scope_end__; #define _SEH2_VOLATILE volatile #elif defined(_USE_PSEH3)

1 0

[reactos] 16/29: [HALX86] Use addressing relative to RIP
by Jérôme Gardou 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=617c7cc377017a58ca64a… commit 617c7cc377017a58ca64a1e9155d1b765564ccd4 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Apr 21 19:46:59 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [HALX86] Use addressing relative to RIP --- hal/halx86/apic/tsccal.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hal/halx86/apic/tsccal.S b/hal/halx86/apic/tsccal.S index 66bde94896b..7fc28ce7393 100644 --- a/hal/halx86/apic/tsccal.S +++ b/hal/halx86/apic/tsccal.S @@ -69,7 +69,7 @@ FUNC TscCalibrationISR rdtsc /* Read the current phase */ - movzx rcx, byte ptr [TscCalibrationPhase] + movzx rcx, byte ptr [rip+TscCalibrationPhase] /* Check if we're already done */ cmp cl, NUM_SAMPLES @@ -77,12 +77,12 @@ FUNC TscCalibrationISR /* Store the current value */ shl rcx, 3 - lea rbx, [TscCalibrationArray] + lea rbx, [rip+TscCalibrationArray] mov dword ptr [rbx + rcx], eax mov dword ptr [rbx + rcx + 4], edx /* Advance phase */ - inc byte ptr [TscCalibrationPhase] + inc byte ptr [rip+TscCalibrationPhase] CalibrationISR_Exit: /* Read CMOS register C */

1 0

[reactos] 15/29: [BTRFS] Use addressing relative to RIP
by Jérôme Gardou 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f000979eb2ffef884449… commit 6f000979eb2ffef8844494ba52a7b7ca677ab615 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Apr 21 19:46:30 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [BTRFS] Use addressing relative to RIP --- drivers/filesystems/btrfs/crc32c-amd64.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filesystems/btrfs/crc32c-amd64.S b/drivers/filesystems/btrfs/crc32c-amd64.S index adfd988384f..dbe035487c7 100644 --- a/drivers/filesystems/btrfs/crc32c-amd64.S +++ b/drivers/filesystems/btrfs/crc32c-amd64.S @@ -45,7 +45,7 @@ mov r10b, byte ptr [rdx] xor al, r10b and rax, 255 shl rax, 2 -mov r10, offset crctable +lea r10, [rip+crctable] mov eax, dword ptr [r10 + rax] xor rax, rcx

1 0

[reactos] 14/29: [KDGDB] Adapt to amd64
by Jérôme Gardou 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0eea78648ce3235fb2506… commit 0eea78648ce3235fb2506f561c0345f29fc241ee Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Apr 14 13:36:17 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [KDGDB] Adapt to amd64 --- drivers/base/kdgdb/CMakeLists.txt | 4 +- drivers/base/kdgdb/amd64_sup.c | 263 ++++++++++++++++++++++++++++++++++++++ drivers/base/kdgdb/gdb_input.c | 18 +-- drivers/base/kdgdb/kdgdb.h | 13 +- 4 files changed, 284 insertions(+), 14 deletions(-) diff --git a/drivers/base/kdgdb/CMakeLists.txt b/drivers/base/kdgdb/CMakeLists.txt index d783b3851da..05c2f8f6e2e 100644 --- a/drivers/base/kdgdb/CMakeLists.txt +++ b/drivers/base/kdgdb/CMakeLists.txt @@ -10,9 +10,11 @@ list(APPEND SOURCE utils.c kdgdb.h) -# TODO: AMD64, ARM... +# TODO: ARM... if(ARCH STREQUAL "i386") list(APPEND SOURCE i386_sup.c) +elseif(ARCH STREQUAL "amd64") + list(APPEND SOURCE amd64_sup.c) endif() add_library(kdcom MODULE diff --git a/drivers/base/kdgdb/amd64_sup.c b/drivers/base/kdgdb/amd64_sup.c new file mode 100644 index 00000000000..b497581a797 --- /dev/null +++ b/drivers/base/kdgdb/amd64_sup.c @@ -0,0 +1,263 @@ +/* + * PROJECT: ReactOS KD dll - GDB stub + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Base functions for the kernel debugger + * COPYRIGHT: Copyright 2021 Jérôme Gardou + */ + +#include "kdgdb.h" + +enum reg_name +{ + RAX, RBX, RCX, RDX, RSI, RDI, RBP, RSP, + R8, R9, R10, R11, R12, R13, R14, R15, + RIP, + EFLAGS, + CS, SS, DS, ES, FS, GS, + ST0, ST1, ST2, ST3, ST4, ST5, ST6, ST7, + FCTRL, FSTAT, FTAG, FISEG, FIOFF, FOSEG, FOOFF, FOP +}; + +static const unsigned char reg_size[] = +{ + 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, + 8, + 4, + 4, 4, 4, 4, 4, 4, + 10, 10, 10, 10, 10, 10, 10, 10, + 8, 8, 8, 8, 8, 8, 8, 8 +}; + +static +void* +ctx_to_reg(CONTEXT* ctx, enum reg_name name) +{ + switch (name) + { + case RAX: return &ctx->Rax; + case RBX: return &ctx->Rbx; + case RCX: return &ctx->Rcx; + case RDX: return &ctx->Rdx; + case RSP: return &ctx->Rsp; + case RBP: return &ctx->Rbp; + case RSI: return &ctx->Rsi; + case RDI: return &ctx->Rdi; + case RIP: return &ctx->Rip; + case R8: return &ctx->R8; + case R9: return &ctx->R9; + case R10: return &ctx->R10; + case R11: return &ctx->R11; + case R12: return &ctx->R12; + case R13: return &ctx->R13; + case R14: return &ctx->R14; + case R15: return &ctx->R15; + case EFLAGS: return &ctx->EFlags; + case CS: return &ctx->SegCs; + case DS: return &ctx->SegSs; + case ES: return &ctx->SegEs; + case FS: return &ctx->SegFs; + case GS: return &ctx->SegGs; + case SS: return &ctx->SegSs; + } +#undef return_reg + return 0; +} + +static +void* +thread_to_reg(PETHREAD Thread, enum reg_name reg_name) +{ + static const void* NullValue = NULL; + +#if 0 + if (Thread->Tcb.TrapFrame) + { + PKTRAP_FRAME TrapFrame = Thread->Tcb.TrapFrame; + + switch (reg_name) + { + case RAX: return &TrapFrame->Rax; + case RBX: return &TrapFrame->Rbx; + case RCX: return &TrapFrame->Rcx; + case RDX: return &TrapFrame->Rdx; + case RSP: return &TrapFrame->Rsp; + case RBP: return &TrapFrame->Rbp; + case RSI: return &TrapFrame->Rsi; + case RDI: return &TrapFrame->Rdi; + case RIP: return &TrapFrame->Rip; + case R8: return &TrapFrame->R8; + case R9: return &TrapFrame->R9; + case R10: return &TrapFrame->R10; + case R11: return &TrapFrame->R11; + case EFLAGS: return &TrapFrame->EFlags; + case CS: return &TrapFrame->SegCs; + case DS: return &TrapFrame->SegSs; + case ES: return &TrapFrame->SegEs; + case FS: return &TrapFrame->SegFs; + case GS: return &TrapFrame->SegGs; + case SS: return &TrapFrame->SegSs; + default: + KDDBGPRINT("Unhandled regname: %d.\n", reg_name); + } + } + else +#endif + if (!Thread->Tcb.InitialStack) + { + /* Terminated thread ? */ + switch (reg_name) + { + case RSP: + case RBP: + case RIP: + KDDBGPRINT("Returning NULL for register %d.\n", reg_name); + return &NullValue; + default: + return NULL; + } + } + else + { + switch(reg_name) + { + case RSP: return &Thread->Tcb.KernelStack; + case RIP: + { + PULONG_PTR Rsp = Thread->Tcb.KernelStack; + return &Rsp[3]; + } + case RBP: + { + PULONG_PTR Rsp = Thread->Tcb.KernelStack; + return &Rsp[4]; + } + default: + return NULL; + } + } + + return NULL; +} + +KDSTATUS +gdb_send_registers(void) +{ + CHAR RegisterStr[17]; + UCHAR* RegisterPtr; + unsigned short i; + unsigned short size; + + start_gdb_packet(); + + KDDBGPRINT("Sending registers of thread %" PRIxPTR ".\n", gdb_dbg_tid); + KDDBGPRINT("Current thread_id: %p.\n", PsGetThreadId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread)); + if (((gdb_dbg_pid == 0) && (gdb_dbg_tid == 0)) || + gdb_tid_to_handle(gdb_dbg_tid) == PsGetThreadId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread)) + { + for (i = 0; i < 24; i++) + { + RegisterPtr = ctx_to_reg(&CurrentContext, i); + size = reg_size[i] * 2; + RegisterStr[size] = 0; + while (size) + { + size--; + RegisterStr[size] = hex_chars[RegisterPtr[size/2] & 0xF]; + size--; + RegisterStr[size] = hex_chars[RegisterPtr[size/2] >> 4]; + } + + send_gdb_partial_packet(RegisterStr); + } + } + else + { + PETHREAD DbgThread; + + DbgThread = find_thread(gdb_dbg_pid, gdb_dbg_tid); + + if (DbgThread == NULL) + { + /* Thread is dead */ + send_gdb_partial_packet("E03"); + return finish_gdb_packet(); + } + + for (i = 0; i < 24; i++) + { + RegisterPtr = thread_to_reg(DbgThread, i); + size = reg_size[i] * 2; + RegisterStr[size] = 0; + + while (size) + { + if (RegisterPtr) + { + size--; + RegisterStr[size] = hex_chars[RegisterPtr[size/2] & 0xF]; + size--; + RegisterStr[size] = hex_chars[RegisterPtr[size/2] >> 4]; + } + else + { + size--; + RegisterStr[size] = 'x'; + size--; + RegisterStr[size] = 'x'; + } + } + + send_gdb_partial_packet(RegisterStr); + } + } + + return finish_gdb_packet(); +} + +KDSTATUS +gdb_send_register(void) +{ + enum reg_name reg_name; + void *ptr; + + /* Get the GDB register name (gdb_input = "pXX") */ + reg_name = (hex_value(gdb_input[1]) << 4) | hex_value(gdb_input[2]); + + if (((gdb_dbg_pid == 0) && (gdb_dbg_tid == 0)) || + gdb_tid_to_handle(gdb_dbg_tid) == PsGetThreadId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread)) + { + /* We can get it from the context of the current exception */ + ptr = ctx_to_reg(&CurrentContext, reg_name); + } + else + { + PETHREAD DbgThread; + + DbgThread = find_thread(gdb_dbg_pid, gdb_dbg_tid); + + if (DbgThread == NULL) + { + /* Thread is dead */ + return send_gdb_packet("E03"); + } + + ptr = thread_to_reg(DbgThread, reg_name); + } + + if (!ptr) + { + unsigned char size = reg_size[reg_name]; + start_gdb_packet(); + while (size--) + send_gdb_partial_packet("xx"); + return finish_gdb_packet(); + } + else + { + KDDBGPRINT("KDDBG : Sending registers as memory.\n"); + return send_gdb_memory(ptr, reg_size[reg_name]); + } +} + + diff --git a/drivers/base/kdgdb/gdb_input.c b/drivers/base/kdgdb/gdb_input.c index 3b898c46829..23f030686d4 100644 --- a/drivers/base/kdgdb/gdb_input.c +++ b/drivers/base/kdgdb/gdb_input.c @@ -301,12 +301,6 @@ handle_gdb_query(void) return gdb_send_debug_io(&String, FALSE); } - if (strncmp(gdb_input, "qOffsets", 8) == 0) - { - /* We load ntoskrnl at 0x80800000 while compiling it at 0x00800000 base address */ - return send_gdb_packet("TextSeg=80000000"); - } - if (strcmp(gdb_input, "qTStatus") == 0) { /* No tracepoint support */ @@ -323,7 +317,7 @@ handle_gdb_query(void) { static LIST_ENTRY* CurrentEntry = NULL; char str_helper[256]; - char name_helper[64]; + char name_helper[64]; ULONG_PTR Offset = hex_to_address(&gdb_input[22]); ULONG_PTR ToSend = hex_to_address(strstr(&gdb_input[22], ",") + 1); ULONG Sent = 0; @@ -381,7 +375,7 @@ handle_gdb_query(void) /* GDB doesn't load the file if you don't prefix it with a drive letter... */ mem_length = _snprintf(str_helper, 256, "<library name=\"C:\\%s\"><segment address=\"0x%p\"/></library>", &name_helper, DllBase); - + /* DLL name must be too long. */ if (mem_length < 0) { @@ -639,7 +633,7 @@ handle_gdb_write_mem( /* Nothing to do */ return LOOP_IF_SUCCESS(send_gdb_packet("OK")); } - + State->u.WriteMemory.TransferCount = BufferLength; MessageData->Length = BufferLength; MessageData->Buffer = (CHAR*)OutBuffer; @@ -794,7 +788,7 @@ RestoreBreakPointSendHandler( KDDBGPRINT("Wrong API number (%lu) after DbgKdRestoreBreakPointApi request.\n", State->ApiNumber); } - /* We ignore failure here. If DbgKdRestoreBreakPointApi fails, + /* We ignore failure here. If DbgKdRestoreBreakPointApi fails, * this means that the breakpoint was already invalid for KD. So clean it up on our side. */ for (i = 0; i < (sizeof(BreakPointHandles) / sizeof(BreakPointHandles[0])); i++) { @@ -879,7 +873,7 @@ handle_gdb_c( Status = send_gdb_packet("OK"); if (Status != KdPacketReceived) return Status; - + if (CurrentStateChange.NewState == DbgKdExceptionStateChange) { @@ -967,7 +961,7 @@ handle_gdb_v( if (strncmp(gdb_input, "vCont;s", 7) == 0) { - + return handle_gdb_s(State, MessageData, MessageLength, KdContext); } } diff --git a/drivers/base/kdgdb/kdgdb.h b/drivers/base/kdgdb/kdgdb.h index d09ef74593b..a260e570319 100644 --- a/drivers/base/kdgdb/kdgdb.h +++ b/drivers/base/kdgdb/kdgdb.h @@ -19,7 +19,7 @@ #include <pstypes.h> -// #define KDDEBUG /* uncomment to enable debugging this dll */ +#define KDDEBUG /* uncomment to enable debugging this dll */ /* To undefine once https://sourceware.org/bugzilla/show_bug.cgi?id=17397 is resolved */ #define MONOPROCESS 1 @@ -132,6 +132,17 @@ extern KDSTATUS gdb_send_registers(void); # define KD_BREAKPOINT_SIZE sizeof(UCHAR) # define KD_BREAKPOINT_VALUE 0xCC /* Single step mode */ +# define KdpSetSingleStep(Context) \ + ((Context)->EFlags |= EFLAGS_TF) +#elif defined(_M_AMD64) +# define KdpGetContextPc(Context) \ + ((Context)->Rip) +# define KdpSetContextPc(Context, ProgramCounter) \ + ((Context)->Rip = (ProgramCounter)) +# define KD_BREAKPOINT_TYPE UCHAR +# define KD_BREAKPOINT_SIZE sizeof(UCHAR) +# define KD_BREAKPOINT_VALUE 0xCC +/* Single step mode */ # define KdpSetSingleStep(Context) \ ((Context)->EFlags |= EFLAGS_TF) #else

1 0

[reactos] 13/29: [REGEDIT] Fix declaration of DbgPrint
by Jérôme Gardou 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97858f3c87caacb9718ac… commit 97858f3c87caacb9718ac7df6b7f1619b010a063 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Apr 14 10:07:16 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [REGEDIT] Fix declaration of DbgPrint --- base/applications/regedit/settings.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/regedit/settings.c b/base/applications/regedit/settings.c index 5d82a64625b..ae9254d6a2f 100644 --- a/base/applications/regedit/settings.c +++ b/base/applications/regedit/settings.c @@ -23,9 +23,9 @@ #include <strsafe.h> const WCHAR g_szGeneralRegKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit"; -DECLSPEC_IMPORT ULONG WINAPIV DbgPrint(PCH Format,...); +DECLSPEC_IMPORT ULONG WINAPIV DbgPrint(PCCH Format,...); -/* +/* VV,VV,VV,VV,WA,WA,WA,WA,WB,WB,WB,WB,R1,R1,R1,R1 R2,R2,R2,R2,R3,R3,R3,R3,R4,R4,R4,r4,LL,LL,LL,LL TT,TT,TT,TT,RR,RR,RR,RR,BB,BB,BB,BB,SS,SS,SS,SS

1 0

[reactos] 12/29: [CRT] Fix __ll_lshift, __ll_rshift and __ull_rshift intrinsics on gcc-amd64
by Jérôme Gardou 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=955b5c27b19c813580070… commit 955b5c27b19c81358007003b076e60079a2e2e84 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Apr 13 10:45:10 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [CRT] Fix __ll_lshift, __ll_rshift and __ull_rshift intrinsics on gcc-amd64 --- sdk/include/crt/mingw32/intrin_x86.h | 41 ++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/sdk/include/crt/mingw32/intrin_x86.h b/sdk/include/crt/mingw32/intrin_x86.h index c772338d3fa..5cf6c2884b3 100644 --- a/sdk/include/crt/mingw32/intrin_x86.h +++ b/sdk/include/crt/mingw32/intrin_x86.h @@ -1298,6 +1298,46 @@ __INTRIN_INLINE unsigned long __cdecl _lrotr(unsigned long value, int shift) } #endif +#ifdef __x86_64__ +__INTRIN_INLINE unsigned long long __ll_lshift(unsigned long long Mask, int Bit) +{ + unsigned long long retval; + unsigned char shift = Bit & 0x3F; + + __asm__ + ( + "shlq %[shift], %[Mask]" : "=r"(retval) : [Mask] "0"(Mask), [shift] "c"(shift) + ); + + return retval; +} + +__INTRIN_INLINE long long __ll_rshift(long long Mask, int Bit) +{ + long long retval; + unsigned char shift = Bit & 0x3F; + + __asm__ + ( + "sarq %[shift], %[Mask]" : "=r"(retval) : [Mask] "0"(Mask), [shift] "c"(shift) + ); + + return retval; +} + +__INTRIN_INLINE unsigned long long __ull_rshift(unsigned long long Mask, int Bit) +{ + long long retval; + unsigned char shift = Bit & 0x3F; + + __asm__ + ( + "shrq %[shift], %[Mask]" : "=r"(retval) : [Mask] "0"(Mask), [shift] "c"(shift) + ); + + return retval; +} +#else /* NOTE: in __ll_lshift, __ll_rshift and __ull_rshift we use the "A" constraint (edx:eax) for the Mask argument, because it's the only way GCC @@ -1346,6 +1386,7 @@ __INTRIN_INLINE unsigned long long __ull_rshift(unsigned long long Mask, int Bit return retval; } +#endif __INTRIN_INLINE unsigned short __cdecl _byteswap_ushort(unsigned short value) {

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