Ros-diffs April 2021

ros-diffs@reactos.org

21 participants
173 discussions

[reactos] 01/01: [NTOS:SE] Lock the token in SeQueryInformationToken and do some cleanup

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d8dd932b1d4f60344f37… commit 3d8dd932b1d4f60344f372323ec353396bcdda9b Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Thu Apr 15 16:42:28 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Apr 18 13:56:37 2021 +0200 [NTOS:SE] Lock the token in SeQueryInformationToken and do some cleanup * Guard the token in a lock whilst querying stuff * Remove the piece of code that checks if the information class provided is above the maximum information class threshold. That code literally duplicates the inner functionality of the default case in the switch block, where the code falls in that case if an invalid information class is provided anyway. * Remove the redundant information classes. Internally, this function in Windows has 12 switch case blocks (11 token info classes + the default case) and the other classes are supported in NtQueryInformationToken only so it doesn't make any logical sense to keep them in the codebase. * Annotate the argument parameters with SAL and add documentation header --- ntoskrnl/se/token.c | 126 +++++++++++++--------------------------------------- 1 file changed, 32 insertions(+), 94 deletions(-) diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index 31601411b07..d38fe29517e 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -1685,17 +1685,37 @@ SeFilterToken(IN PACCESS_TOKEN ExistingToken, return STATUS_NOT_IMPLEMENTED; } -/* - * @implemented +/** + * @brief + * Queries information details about the given token to the call. The difference + * between NtQueryInformationToken and this routine is that the system call has + * user mode buffer data probing and additional protection checks whereas this + * routine doesn't have any of these. The routine is used exclusively in kernel + * mode. + * + * @param[in] AccessToken + * An access token to be given. * - * NOTE: SeQueryInformationToken is just NtQueryInformationToken without all - * the bells and whistles needed for user-mode buffer access protection. + * @param[in] TokenInformationClass + * Token information class. + * + * @param[out] TokenInformation + * Buffer with retrieved information. Such information is arbitrary, depending + * on the requested information class. + * + * @return + * Returns STATUS_SUCCESS if the operation to query the desired information + * has completed successfully. STATUS_INSUFFICIENT_RESOURCES is returned if + * pool memory allocation has failed to satisfy an operation. Otherwise + * STATUS_INVALID_INFO_CLASS is returned indicating that the information + * class provided is not supported by the routine. */ NTSTATUS NTAPI -SeQueryInformationToken(IN PACCESS_TOKEN AccessToken, - IN TOKEN_INFORMATION_CLASS TokenInformationClass, - OUT PVOID *TokenInformation) +SeQueryInformationToken( + _In_ PACCESS_TOKEN AccessToken, + _In_ TOKEN_INFORMATION_CLASS TokenInformationClass, + _Outptr_result_buffer_(_Inexpressible_(token-dependent)) PVOID *TokenInformation) { NTSTATUS Status; PTOKEN Token = (PTOKEN)AccessToken; @@ -1708,13 +1728,8 @@ SeQueryInformationToken(IN PACCESS_TOKEN AccessToken, PAGED_CODE(); - if (TokenInformationClass >= MaxTokenInfoClass) - { - DPRINT1("SeQueryInformationToken(%d) invalid information class\n", TokenInformationClass); - return STATUS_INVALID_INFO_CLASS; - } - - // TODO: Lock the token + /* Lock the token */ + SepAcquireTokenLockShared(Token); switch (TokenInformationClass) { @@ -2014,86 +2029,6 @@ SeQueryInformationToken(IN PACCESS_TOKEN AccessToken, break; } -/* - * The following 4 cases are only implemented in NtQueryInformationToken - */ -#if 0 - - case TokenOrigin: - { - PTOKEN_ORIGIN to; - - DPRINT("SeQueryInformationToken(TokenOrigin)\n"); - RequiredLength = sizeof(TOKEN_ORIGIN); - - /* Allocate the output buffer */ - to = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (to == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - RtlCopyLuid(&to->OriginatingLogonSession, - &Token->AuthenticationId); - - /* Return the structure */ - *TokenInformation = to; - Status = STATUS_SUCCESS; - break; - } - - case TokenGroupsAndPrivileges: - DPRINT1("SeQueryInformationToken(TokenGroupsAndPrivileges) not implemented\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - - case TokenRestrictedSids: - { - PTOKEN_GROUPS tg = (PTOKEN_GROUPS)TokenInformation; - ULONG SidLen; - PSID Sid; - - DPRINT("SeQueryInformationToken(TokenRestrictedSids)\n"); - RequiredLength = sizeof(tg->GroupCount) + - RtlLengthSidAndAttributes(Token->RestrictedSidCount, Token->RestrictedSids); - - SidLen = RequiredLength - sizeof(tg->GroupCount) - - (Token->RestrictedSidCount * sizeof(SID_AND_ATTRIBUTES)); - - /* Allocate the output buffer */ - tg = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_SE); - if (tg == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - - Sid = (PSID)((ULONG_PTR)tg + sizeof(tg->GroupCount) + - (Token->RestrictedSidCount * sizeof(SID_AND_ATTRIBUTES))); - - tg->GroupCount = Token->RestrictedSidCount; - Status = RtlCopySidAndAttributesArray(Token->RestrictedSidCount, - Token->RestrictedSids, - SidLen, - &tg->Groups[0], - Sid, - &Unused.PSid, - &Unused.Ulong); - - /* Return the structure */ - *TokenInformation = tg; - Status = STATUS_SUCCESS; - break; - } - - case TokenSandBoxInert: - DPRINT1("SeQueryInformationToken(TokenSandboxInert) not implemented\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - -#endif - case TokenSessionId: { DPRINT("SeQueryInformationToken(TokenSessionId)\n"); @@ -2107,6 +2042,9 @@ SeQueryInformationToken(IN PACCESS_TOKEN AccessToken, break; } + /* Release the lock of the token */ + SepReleaseTokenLock(Token); + return Status; }

3 years, 8 months

[reactos] 01/01: [CONFIGURE] Fix warnings shown when parsing cmdline

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3feb0cfb9fca759405f6b… commit 3feb0cfb9fca759405f6ba434423f30c3214dc72 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Apr 11 14:25:08 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 18 13:40:30 2021 +0200 [CONFIGURE] Fix warnings shown when parsing cmdline --- configure.cmd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.cmd b/configure.cmd index 2d780760681..813fb48f2e3 100755 --- a/configure.cmd +++ b/configure.cmd @@ -87,8 +87,8 @@ REM Parse command line parameters echo Please run this command in a [Developer] Command Prompt for Visual Studio. goto quit ) else if /I "%1" NEQ "" ( - echo %1| find /I "-D" > NUL - if %ERRORLEVEL% == 0 ( + echo.%1| find /I "-D" >nul 2>&1 + if not errorlevel 1 ( REM User is passing a switch to CMake REM Ignore it, and ignore the next parameter that follows Shift @@ -123,8 +123,8 @@ REM Parse command line parameters set CMAKE_ARCH=-A ARM ) ) else if /I "%1" NEQ "" ( - echo %1| find /I "-D" > NUL - if %ERRORLEVEL% == 0 ( + echo.%1| find /I "-D" >nul 2>&1 + if not errorlevel 1 ( REM User is passing a switch to CMake REM Ignore it, and ignore the next parameter that follows Shift

3 years, 8 months

[reactos] 01/01: [WS2_32] Create registry keys Protocol_Catalog9/NameSpace_Catalog5 if needed

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af9df932748d3aaa2f334… commit af9df932748d3aaa2f334e0f430d35723fa46651 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Apr 17 23:06:53 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Apr 17 23:57:41 2021 +0200 [WS2_32] Create registry keys Protocol_Catalog9/NameSpace_Catalog5 if needed This fixes networking in LiveCD and installation in 2nd stage. CORE-17514 --- dll/win32/ws2_32/src/dcatalog.c | 54 ++++++++++++++++++++++++----------------- dll/win32/ws2_32/src/nscatalo.c | 54 ++++++++++++++++++++++++----------------- 2 files changed, 64 insertions(+), 44 deletions(-) diff --git a/dll/win32/ws2_32/src/dcatalog.c b/dll/win32/ws2_32/src/dcatalog.c index c53e6c4faec..eb56765e40f 100644 --- a/dll/win32/ws2_32/src/dcatalog.c +++ b/dll/win32/ws2_32/src/dcatalog.c @@ -59,34 +59,44 @@ WsTcOpen(IN PTCATALOG Catalog, &RegType, NULL, &RegSize); - if (ErrorCode != ERROR_SUCCESS) + if (ErrorCode == ERROR_FILE_NOT_FOUND) { - DPRINT1("Failed to get protocol catalog name: %d.\n", ErrorCode); - return FALSE; + static const CHAR DefaultCatalogName[] = "Protocol_Catalog9"; + RegSize = sizeof(DefaultCatalogName); + CatalogKeyName = HeapAlloc(WsSockHeap, 0, RegSize); + memcpy(CatalogKeyName, DefaultCatalogName, RegSize); } - - if (RegType != REG_SZ) + else { - DPRINT1("Protocol catalog name is not a string (Type %d).\n", RegType); - return FALSE; - } + if (ErrorCode != ERROR_SUCCESS) + { + DPRINT1("Failed to get protocol catalog name: %d.\n", ErrorCode); + return FALSE; + } - CatalogKeyName = HeapAlloc(WsSockHeap, 0, RegSize); + if (RegType != REG_SZ) + { + DPRINT1("Protocol catalog name is not a string (Type %d).\n", RegType); + return FALSE; + } - /* Read the catalog name */ - ErrorCode = RegQueryValueEx(ParentKey, - "Current_Protocol_Catalog", - 0, - &RegType, - (LPBYTE)CatalogKeyName, - &RegSize); + CatalogKeyName = HeapAlloc(WsSockHeap, 0, RegSize); - /* Open the Catalog Key */ - ErrorCode = RegOpenKeyEx(ParentKey, - CatalogKeyName, - 0, - MAXIMUM_ALLOWED, - &CatalogKey); + /* Read the catalog name */ + ErrorCode = RegQueryValueEx(ParentKey, + "Current_Protocol_Catalog", + 0, + &RegType, + (LPBYTE)CatalogKeyName, + &RegSize); + + /* Open the Catalog Key */ + ErrorCode = RegOpenKeyEx(ParentKey, + CatalogKeyName, + 0, + MAXIMUM_ALLOWED, + &CatalogKey); + } /* If we didn't find the key, create it */ if (ErrorCode == ERROR_SUCCESS) diff --git a/dll/win32/ws2_32/src/nscatalo.c b/dll/win32/ws2_32/src/nscatalo.c index fe4d9cb28cf..32cee959c89 100644 --- a/dll/win32/ws2_32/src/nscatalo.c +++ b/dll/win32/ws2_32/src/nscatalo.c @@ -58,34 +58,44 @@ WsNcOpen(IN PNSCATALOG Catalog, &RegType, NULL, &RegSize); - if (ErrorCode != ERROR_SUCCESS) + if (ErrorCode == ERROR_FILE_NOT_FOUND) { - DPRINT1("Failed to get namespace catalog name: %d.\n", ErrorCode); - return FALSE; + static const CHAR DefaultCatalogName[] = "NameSpace_Catalog5"; + RegSize = sizeof(DefaultCatalogName); + CatalogKeyName = HeapAlloc(WsSockHeap, 0, RegSize); + memcpy(CatalogKeyName, DefaultCatalogName, RegSize); } - - if (RegType != REG_SZ) + else { - DPRINT1("Namespace catalog name is not a string (Type %d).\n", RegType); - return FALSE; - } + if (ErrorCode != ERROR_SUCCESS) + { + DPRINT1("Failed to get namespace catalog name: %d.\n", ErrorCode); + return FALSE; + } - CatalogKeyName = HeapAlloc(WsSockHeap, 0, RegSize); + if (RegType != REG_SZ) + { + DPRINT1("Namespace catalog name is not a string (Type %d).\n", RegType); + return FALSE; + } - /* Read the catalog name */ - ErrorCode = RegQueryValueEx(ParentKey, - "Current_NameSpace_Catalog", - 0, - &RegType, - (LPBYTE)CatalogKeyName, - &RegSize); + CatalogKeyName = HeapAlloc(WsSockHeap, 0, RegSize); - /* Open the Catalog Key */ - ErrorCode = RegOpenKeyEx(ParentKey, - CatalogKeyName, - 0, - MAXIMUM_ALLOWED, - &CatalogKey); + /* Read the catalog name */ + ErrorCode = RegQueryValueEx(ParentKey, + "Current_NameSpace_Catalog", + 0, + &RegType, + (LPBYTE)CatalogKeyName, + &RegSize); + + /* Open the Catalog Key */ + ErrorCode = RegOpenKeyEx(ParentKey, + CatalogKeyName, + 0, + MAXIMUM_ALLOWED, + &CatalogKey); + } /* If we didn't find the key, create it */ if (ErrorCode == ERROR_SUCCESS)

3 years, 8 months

[reactos] 01/01: [DEVMGR] Get rid of the unknown device class hack

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9e947e2b2be05d01590f4… commit 9e947e2b2be05d01590f42741413b8b90f911071 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Apr 16 23:45:08 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Apr 16 23:45:08 2021 +0200 [DEVMGR] Get rid of the unknown device class hack Treat the unknown device class like any other device class. CORE-17527 --- dll/win32/devmgr/devmgmt/DeviceView.cpp | 39 +++++---------------------------- 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/dll/win32/devmgr/devmgmt/DeviceView.cpp b/dll/win32/devmgr/devmgmt/DeviceView.cpp index 1bb0fab7dee..a0906e1657a 100644 --- a/dll/win32/devmgr/devmgmt/DeviceView.cpp +++ b/dll/win32/devmgr/devmgmt/DeviceView.cpp @@ -351,23 +351,11 @@ CDeviceView::GetNextClass( if (cr != CR_SUCCESS) return false; - // Check if this is the unknown class - if (IsEqualGUID(*ClassGuid, GUID_DEVCLASS_UNKNOWN)) - { - // Get device info for all devices - *hDevInfo = SetupDiGetClassDevsW(NULL, - NULL, - NULL, - DIGCF_ALLCLASSES); - } - else - { - // We only want the devices for this class - *hDevInfo = SetupDiGetClassDevsW(ClassGuid, - NULL, - NULL, - DIGCF_PRESENT); - } + // We only want the devices for this class + *hDevInfo = SetupDiGetClassDevsW(ClassGuid, + NULL, + NULL, + DIGCF_PRESENT); return (hDevInfo != INVALID_HANDLE_VALUE); } @@ -449,7 +437,6 @@ CDeviceView::ListDevicesByType() bClassSuccess = GetNextClass(ClassIndex, &ClassGuid, &hDevInfo); if (bClassSuccess) { - bool bClassUnknown = false; bool AddedParent = false; INT DeviceIndex = 0; bool MoreItems = false; @@ -462,10 +449,6 @@ CDeviceView::ListDevicesByType() continue; } - // Set a flag is this is the (special case) unknown class - if (IsEqualGUID(ClassGuid, GUID_DEVCLASS_UNKNOWN)) - bClassUnknown = true; - // Check if this is a hidden class if (IsEqualGUID(ClassGuid, GUID_DEVCLASS_LEGACYDRIVER) || IsEqualGUID(ClassGuid, GUID_DEVCLASS_VOLUME)) @@ -494,18 +477,6 @@ CDeviceView::ListDevicesByType() { MoreItems = true; - // The unknown class handle contains all devices on the system, - // and we're just looking for the ones with a null GUID - if (bClassUnknown) - { - if (IsEqualGUID(DeviceInfoData.ClassGuid, GUID_NULL) == FALSE) - { - // This is a known device, we aren't interested in it - DeviceIndex++; - continue; - } - } - // Get the cached device node DeviceNode = GetDeviceNode(DeviceInfoData.DevInst); if (DeviceNode == nullptr)

3 years, 8 months

[reactos] 01/01: [CMAKE] winetests/: Move '/wd4133' to gdiplus/ only

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d77ec28f7f8135db4ad9… commit 7d77ec28f7f8135db4ad96c240700ab7213f4a79 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 12 01:22:46 2020 +0100 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Fri Apr 16 15:00:03 2021 +0300 [CMAKE] winetests/: Move '/wd4133' to gdiplus/ only Addendum to 42d2d5e. CORE-7538 --- modules/rostests/winetests/CMakeLists.txt | 1 - modules/rostests/winetests/gdiplus/CMakeLists.txt | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/winetests/CMakeLists.txt b/modules/rostests/winetests/CMakeLists.txt index abf5f5efe4b..e9a5b33613b 100644 --- a/modules/rostests/winetests/CMakeLists.txt +++ b/modules/rostests/winetests/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions(-D__ROS_LONG64__) if(MSVC) add_compile_options( /wd4090 # C4090: 'function': different 'const' qualifiers - /wd4133 # C4133: 'function': incompatible types - from '<enum> *' to 'UINT *' /wd4146 # C4146: unary minus operator applied to unsigned type, result still unsigned /wd4189 # C4189: 'x': local variable is initialized but not referenced /wd4267 # C4267: '=': conversion from 'size_t' to 'int', possible loss of data diff --git a/modules/rostests/winetests/gdiplus/CMakeLists.txt b/modules/rostests/winetests/gdiplus/CMakeLists.txt index df3cbc98e07..e0fc7fcb6bd 100644 --- a/modules/rostests/winetests/gdiplus/CMakeLists.txt +++ b/modules/rostests/winetests/gdiplus/CMakeLists.txt @@ -32,4 +32,5 @@ add_rostests_file(TARGET gdiplus_winetest) if(MSVC) # error C4133: 'function': incompatible types - from 'ImageFlags *' to 'UINT *' remove_target_compile_option(gdiplus_winetest "/we4133") + target_compile_options(gdiplus_winetest PRIVATE /wd4133) endif()

3 years, 8 months

[reactos] 01/01: [NEWDEV] When a device install fails, set the 'Unknown' device class for that device

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fa57b8ff7fcee47b8e2e… commit 3fa57b8ff7fcee47b8e2ed869aecaf4515603f3f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Apr 15 21:49:32 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Apr 15 21:49:32 2021 +0200 [NEWDEV] When a device install fails, set the 'Unknown' device class for that device CORE-17527 --- dll/win32/newdev/wizard.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/dll/win32/newdev/wizard.c b/dll/win32/newdev/wizard.c index 739795fef6e..9cf56a74c48 100644 --- a/dll/win32/newdev/wizard.c +++ b/dll/win32/newdev/wizard.c @@ -87,6 +87,26 @@ SetFailedInstall( return FALSE; } + if (Set) + { + /* Set the 'Unknown' device class */ + PWSTR pszUnknown = L"Unknown"; + SetupDiSetDeviceRegistryPropertyW(DeviceInfoSet, + DevInfoData, + SPDRP_CLASS, + (PBYTE)pszUnknown, + (wcslen(pszUnknown) + 1) * sizeof(WCHAR)); + + PWSTR pszUnknownGuid = L"{4D36E97E-E325-11CE-BFC1-08002BE10318}"; + SetupDiSetDeviceRegistryPropertyW(DeviceInfoSet, + DevInfoData, + SPDRP_CLASSGUID, + (PBYTE)pszUnknownGuid, + (wcslen(pszUnknownGuid) + 1) * sizeof(WCHAR)); + + /* FIXME: Set device problem code 28 (CM_PROB_FAILED_INSTALL) */ + } + return TRUE; } @@ -213,7 +233,6 @@ FindDriverProc( IN LPVOID lpParam) { PDEVINSTDATA DevInstData; - DWORD config_flags; BOOL result = FALSE; DevInstData = (PDEVINSTDATA)lpParam; @@ -227,22 +246,9 @@ FindDriverProc( else { /* Update device configuration */ - if (SetupDiGetDeviceRegistryProperty( - DevInstData->hDevInfo, - &DevInstData->devInfoData, - SPDRP_CONFIGFLAGS, - NULL, - (BYTE *)&config_flags, - sizeof(config_flags), - NULL)) - { - config_flags |= CONFIGFLAG_FAILEDINSTALL; - SetupDiSetDeviceRegistryPropertyW( - DevInstData->hDevInfo, - &DevInstData->devInfoData, - SPDRP_CONFIGFLAGS, - (BYTE *)&config_flags, sizeof(config_flags)); - } + SetFailedInstall(DevInstData->hDevInfo, + &DevInstData->devInfoData, + TRUE); PostMessage(DevInstData->hDialog, WM_SEARCH_FINISHED, 0, 0); }

3 years, 8 months

[reactos] 01/01: [TRANSLATION][RAPPS] Fix the unrecognised escape sequence in the Hungarian translation

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e3fce082e7e2dbeed35d… commit 0e3fce082e7e2dbeed35d6b77e5593573ae3562f Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Thu Apr 15 17:23:25 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Thu Apr 15 17:23:25 2021 +0200 [TRANSLATION][RAPPS] Fix the unrecognised escape sequence in the Hungarian translation This is an addendum to ea04edc. The author has forgotten the newline escape sequence, whoops... --- base/applications/rapps/lang/hu-HU.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/rapps/lang/hu-HU.rc b/base/applications/rapps/lang/hu-HU.rc index e4b05291b63..db86756feef 100644 --- a/base/applications/rapps/lang/hu-HU.rc +++ b/base/applications/rapps/lang/hu-HU.rc @@ -126,7 +126,7 @@ END STRINGTABLE BEGIN - IDS_INFO_VERSION "\Verzió: " + IDS_INFO_VERSION "\nVerzió: " IDS_INFO_DESCRIPTION "\nLeírás: " IDS_INFO_PUBLISHER "\nKiadó: " IDS_INFO_HELPLINK "\nSúgó hivatkozás: "

3 years, 8 months

[reactos] 01/01: [UDFS] Remove /Gz flag from options on MSVC

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7194f2f044e03c57c7f03… commit 7194f2f044e03c57c7f03be412e9c57b1bafc06a Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Apr 15 06:45:54 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Apr 15 06:45:54 2021 +0300 [UDFS] Remove /Gz flag from options on MSVC --- drivers/filesystems/udfs/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/filesystems/udfs/CMakeLists.txt b/drivers/filesystems/udfs/CMakeLists.txt index dd1b7a5694a..1c4a396b879 100644 --- a/drivers/filesystems/udfs/CMakeLists.txt +++ b/drivers/filesystems/udfs/CMakeLists.txt @@ -42,8 +42,6 @@ list(APPEND SOURCE add_library(udfs MODULE ${SOURCE} udffs.rc) if(MSVC) - # FIXME: Make sure we marked all what needs to be marked with stdcall before removing this. - target_compile_options(udfs PRIVATE "/Gz") if(USE_CLANG_CL) target_compile_options(udfs PRIVATE -Wno-extern-c-compat -Wno-unused-value) target_compile_options(udfs PRIVATE -Wno-tautological-constant-out-of-range-compare)

3 years, 8 months

[reactos] 03/03: [CMAKE] Rely less on CMAKE_BUILD_TYPE variable

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d10728a64589cb87a1b47… commit d10728a64589cb87a1b47ba9c39b40b1d0f1212e Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Apr 15 04:52:59 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Apr 15 06:44:56 2021 +0300 [CMAKE] Rely less on CMAKE_BUILD_TYPE variable Having conditional statements with CMAKE_BUILD_TYPE is an antipattern See https://stackoverflow.com/questions/66079007/having-conditional-statements-… We use both single- and multi-config generators (Ninja and VS), so we can't really rely on CMAKE_BUILD_TYPE, because it's not always set. This commit alters some conditional flags to use <$CONFIG:...> generator expression, but is still not complete. Also, our default optimization level (4) now has what was always a de-facto flags --- CMakeLists.txt | 10 ++++++++++ sdk/cmake/msvc.cmake | 21 +++++++-------------- toolchain-gcc.cmake | 6 ------ toolchain-msvc.cmake | 6 ------ 4 files changed, 17 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8796992b5e2..ac31959a410 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,6 +49,16 @@ else() set(WINARCH ${ARCH}) endif() +# set CMAKE_BUILD_TYPE if not set +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + message(STATUS "Setting build type to Debug as none was specified.") + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Choose the type of build." FORCE) + # Set the possible values of build type for cmake-gui + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Release" "MinSizeRel" "RelWithDebInfo") +endif() + # Versioning include(sdk/include/reactos/version.cmake) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 43a2c8a7fdc..aad75ebcc4d 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -1,9 +1,5 @@ -#if(${CMAKE_BUILD_TYPE} STREQUAL "Debug") -if(CMAKE_BUILD_TYPE STREQUAL "Debug") - # no optimization - add_compile_options(/Ob0 /Od) -elseif(CMAKE_BUILD_TYPE STREQUAL "Release") +if(CMAKE_BUILD_TYPE STREQUAL "Release") add_compile_options(/Ox /Ob2 /Ot /Oy /GT) elseif(OPTIMIZE STREQUAL "1") add_compile_options(/O1) @@ -12,7 +8,7 @@ elseif(OPTIMIZE STREQUAL "2") elseif(OPTIMIZE STREQUAL "3") add_compile_options(/Ot /Ox /GS-) elseif(OPTIMIZE STREQUAL "4") - add_compile_options(/Os /Ox /GS-) + add_compile_options(/Ob0 /Od) elseif(OPTIMIZE STREQUAL "5") add_compile_options(/Gy /Ob2 /Os /Ox /GS-) endif() @@ -116,8 +112,8 @@ add_compile_options(/wd4018) add_compile_options(/we4013 /we4020 /we4022 /we4028 /we4047 /we4098 /we4101 /we4113 /we4129 /we4133 /we4163 /we4229 /we4311 /we4312 /we4313 /we4477 /we4603 /we4700 /we4715 /we4716) # - C4189: local variable initialized but not referenced -# Not in Release mode -if(NOT CMAKE_BUILD_TYPE STREQUAL "Release") +# Not in Release mode, msbuild generator doesn't like CMAKE_BUILD_TYPE +if(MSVC_IDE OR CMAKE_BUILD_TYPE STREQUAL "Debug") add_compile_options(/we4189) endif() @@ -130,13 +126,10 @@ if(USE_CLANG_CL) endif() # Debugging -if(CMAKE_BUILD_TYPE STREQUAL "Debug") - if(NOT (_PREFAST_ OR _VS_ANALYZE_)) - add_compile_options(/Zi) - endif() -elseif(CMAKE_BUILD_TYPE STREQUAL "Release") - add_definitions("/D NDEBUG") +if(NOT (_PREFAST_ OR _VS_ANALYZE_)) + add_compile_options($<$<CONFIG:Debug>:/Zi>) endif() +add_compile_definitions($<$<CONFIG:Release>:NDEBUG>) # Hotpatchable images if(ARCH STREQUAL "i386") diff --git a/toolchain-gcc.cmake b/toolchain-gcc.cmake index 9d2a51899ee..f6ca04a8000 100644 --- a/toolchain-gcc.cmake +++ b/toolchain-gcc.cmake @@ -1,10 +1,4 @@ -# Default to Debug for the build type -if(NOT DEFINED CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "Debug" CACHE STRING - "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.") -endif() - # pass variables necessary for the toolchain (needed for try_compile) set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES ARCH) diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake index 9de8fca31e9..97921b216f7 100644 --- a/toolchain-msvc.cmake +++ b/toolchain-msvc.cmake @@ -1,10 +1,4 @@ -# Default to Debug for the build type -if(NOT DEFINED CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "Debug" CACHE STRING - "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.") -endif() - # pass variables necessary for the toolchain (needed for try_compile) set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES ARCH USE_CLANG_CL)

3 years, 8 months

[reactos] 02/03: [CMAKE] Require ARCH variable to be specified explicitly

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0b53998c81f7db0c2aa8… commit f0b53998c81f7db0c2aa8106f82fe91841c22457 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Apr 15 04:50:12 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Apr 15 06:44:55 2021 +0300 [CMAKE] Require ARCH variable to be specified explicitly Also, use CMAKE_TRY_COMPILE_PLATFORM_VARIABLES in toolchain files to solve issues with ARCH not being passed during try_compile --- CMakeLists.txt | 6 +++++- toolchain-clang.cmake | 9 ++++----- toolchain-gcc.cmake | 7 +++---- toolchain-msvc.cmake | 7 +++---- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eca63cb4723..8796992b5e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,8 +28,9 @@ set(CMAKE_C_STANDARD 99) set(CMAKE_CXX_STANDARD 11) #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) +# check that the ARCH (target architecture) variable is defined if(NOT ARCH) - set(ARCH i386) + message(FATAL_ERROR "Target architecture (ARCH) is not defined. Please, choose one of: i386, amd64, arm") endif() # Now the ARCH variable will be in lowercase. # It is needed because STREQUAL comparison @@ -38,6 +39,9 @@ endif() # for more information. string(TOLOWER ${ARCH} ARCH) +# set possible values for cmake GUI +set_property(CACHE ARCH PROPERTY STRINGS "i386" "amd64" "arm") + # Alternative WinNT-compatible architecture string if(ARCH STREQUAL "i386") set(WINARCH "x86") diff --git a/toolchain-clang.cmake b/toolchain-clang.cmake index e181bf0baf4..e06a4116438 100644 --- a/toolchain-clang.cmake +++ b/toolchain-clang.cmake @@ -1,12 +1,11 @@ -if(NOT ARCH) - set(ARCH i386) -endif() - if(DEFINED ENV{_ROSBE_ROSSCRIPTDIR}) set(CMAKE_SYSROOT $ENV{_ROSBE_ROSSCRIPTDIR}/$ENV{ROS_ARCH}) endif() +# pass variables necessary for the toolchain (needed for try_compile) +set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES ARCH CLANG_VERSION) + # The name of the target operating system set(CMAKE_SYSTEM_NAME Windows) # The processor we are targeting @@ -17,7 +16,7 @@ elseif (ARCH STREQUAL "amd64") elseif(ARCH STREQUAL "arm") set(CMAKE_SYSTEM_PROCESSOR arm) else() - message(ERROR "Unsupported ARCH: ${ARCH}") + message(FATAL_ERROR "Unsupported ARCH: ${ARCH}") endif() if (DEFINED CLANG_VERSION) diff --git a/toolchain-gcc.cmake b/toolchain-gcc.cmake index 44f6d0ce166..9d2a51899ee 100644 --- a/toolchain-gcc.cmake +++ b/toolchain-gcc.cmake @@ -1,14 +1,13 @@ -if(NOT ARCH) - set(ARCH i386) -endif() - # Default to Debug for the build type if(NOT DEFINED CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.") endif() +# pass variables necessary for the toolchain (needed for try_compile) +set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES ARCH) + # Choose the right MinGW toolchain prefix if(NOT DEFINED MINGW_TOOLCHAIN_PREFIX) if(ARCH STREQUAL "i386") diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake index 2aae2edbdd4..9de8fca31e9 100644 --- a/toolchain-msvc.cmake +++ b/toolchain-msvc.cmake @@ -1,14 +1,13 @@ -if(NOT ARCH) - set(ARCH i386) -endif() - # Default to Debug for the build type if(NOT DEFINED CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.") endif() +# pass variables necessary for the toolchain (needed for try_compile) +set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES ARCH USE_CLANG_CL) + # the name of the target operating system set(CMAKE_SYSTEM_NAME Windows) set(CMAKE_SYSTEM_PROCESSOR i686)

3 years, 8 months

← Newer
1
...
6
7
8
9
10
11
12
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2021