Ros-diffs November 2021

ros-diffs@reactos.org

23 participants
97 discussions

[reactos] 01/01: [BOOTDATA] Update some time zones for East Europe (#4029)

by Chan Chilung

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d2382e78efc190997aad2… commit d2382e78efc190997aad22b82178fd7165690aaf Author: Chan Chilung <48596398+eason329(a)users.noreply.github.com> AuthorDate: Thu Nov 18 18:26:06 2021 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 18 13:26:06 2021 +0300 [BOOTDATA] Update some time zones for East Europe (#4029) - Remove Minsk from GMT+02:00 (is now GMT+03:00) - Change description for all GMT+02:00 time zones - Add Turkey time GMT+03:00 CORE-12025 --- boot/bootdata/hivesft.inf | 50 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index 95adc1c2233..29d99e3e584 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -1130,6 +1130,15 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Arabic Standard Ti 0x00,0x00,0x0a,0x00,0x00,0x00,0x01,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x04,0x00,0x00,0x00,0x01,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Turkey Standard Time","Display",0x00000000,%GMT_PLUS_03_F_DESC% +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Turkey Standard Time","Dlt",0x00000000,%GMT_PLUS_03_F_DAYLIGHT% +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Turkey Standard Time","Std",0x00000000,%GMT_PLUS_03_F_STANDARD% +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Turkey Standard Time","Index",0x00010001,157 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Turkey Standard Time","TZI",0x00000001,\ +0x4c,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xc4,0xff,0xff,0xff,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 + HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Iran Standard Time","Display",0x00000000,%GMT_PLUS_0330_A_DESC% HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Iran Standard Time","Dlt",0x00000000,%GMT_PLUS_0330_A_DAYLIGHT% HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Iran Standard Time","Std",0x00000000,%GMT_PLUS_0330_A_STANDARD% @@ -2203,7 +2212,7 @@ GMT_PLUS_01_D_DESC ="(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vi GMT_PLUS_01_D_DAYLIGHT="W. Europe Daylight Time" GMT_PLUS_01_D_STANDARD="W. Europe Standard Time" -GMT_PLUS_02_A_DESC ="(GMT+02:00) Minsk" +GMT_PLUS_02_A_DESC ="(GMT+02:00) Chisinau" GMT_PLUS_02_A_DAYLIGHT="E. Europe Daylight Time" GMT_PLUS_02_A_STANDARD="E. Europe Standard Time" @@ -2215,7 +2224,7 @@ GMT_PLUS_02_C_DESC ="(GMT+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilniu GMT_PLUS_02_C_DAYLIGHT="FLE Daylight Time" GMT_PLUS_02_C_STANDARD="FLE Standard Time" -GMT_PLUS_02_D_DESC ="(GMT+02:00) Athens, Bucharest, Istanbul" +GMT_PLUS_02_D_DESC ="(GMT+02:00) Athens, Bucharest" GMT_PLUS_02_D_DAYLIGHT="GTB Daylight Time" GMT_PLUS_02_D_STANDARD="GTB Standard Time" @@ -2251,6 +2260,10 @@ GMT_PLUS_03_E_DESC ="(GMT+03:00) Baghdad" GMT_PLUS_03_E_DAYLIGHT="Arabic Daylight Time" GMT_PLUS_03_E_STANDARD="Arabic Standard Time" +GMT_PLUS_03_F_DESC ="(GMT+03:00) Istanbul" +GMT_PLUS_03_F_DAYLIGHT="Turkey Daylight Time" +GMT_PLUS_03_F_STANDARD="Turkey Standard Time" + GMT_PLUS_0330_A_DESC ="(GMT+03:30) Tehran" GMT_PLUS_0330_A_DAYLIGHT="Iran Daylight Time" GMT_PLUS_0330_A_STANDARD="Iran Standard Time" @@ -3195,7 +3208,7 @@ GMT_PLUS_01_D_DESC ="(GMT+01:00) Amsterdam, Berlin, Berno, Rzym, Sztokholm, W GMT_PLUS_01_D_DAYLIGHT="Europa Zachodnia (czas letni)" GMT_PLUS_01_D_STANDARD="Europa Zachodnia (czas standardowy)" -GMT_PLUS_02_A_DESC ="(GMT+02:00) Mińsk" +GMT_PLUS_02_A_DESC ="(GMT+02:00) Kiszyniów" GMT_PLUS_02_A_DAYLIGHT="Europa Wschodnia (czas letni)" GMT_PLUS_02_A_STANDARD="Europa Wschodnia (czas standardowy)" @@ -3207,7 +3220,7 @@ GMT_PLUS_02_C_DESC ="(GMT+02:00) Helsinki, Kijów, Ryga, Sofia, Talin, Wilno" GMT_PLUS_02_C_DAYLIGHT="FLE (czas letni)" GMT_PLUS_02_C_STANDARD="FLE (czas standardowy)" -GMT_PLUS_02_D_DESC ="(GMT+02:00) Ateny, Bukareszt, Stambuł" +GMT_PLUS_02_D_DESC ="(GMT+02:00) Ateny, Bukareszt" GMT_PLUS_02_D_DAYLIGHT="GTB (czas letni)" GMT_PLUS_02_D_STANDARD="GTB (czas standardowy)" @@ -3243,6 +3256,10 @@ GMT_PLUS_03_E_DESC ="(GMT+03:00) Bagdad" GMT_PLUS_03_E_DAYLIGHT="Arabski czas letni" GMT_PLUS_03_E_STANDARD="Arabski czas standardowy" +GMT_PLUS_03_F_DESC ="(GMT+03:00) Stambuł" +GMT_PLUS_03_F_DAYLIGHT="Turcja (czas letni)" +GMT_PLUS_03_F_STANDARD="Turcja (czas standardowy)" + GMT_PLUS_0330_A_DESC ="(GMT+03:30) Teheran" GMT_PLUS_0330_A_DAYLIGHT="Iran (czas letni)" GMT_PLUS_0330_A_STANDARD="Iran (czas standardowy)" @@ -3779,7 +3796,7 @@ GMT_PLUS_01_D_DESC ="(UTC+01:00) Amsterdam, Berlin, Berna, Roma, Stockholm, V GMT_PLUS_01_D_DAYLIGHT="Ora Europei de Vest diurnă" GMT_PLUS_01_D_STANDARD="Ora Europei de Vest standard" -GMT_PLUS_02_A_DESC ="(UTC+02:00) Minsk" +GMT_PLUS_02_A_DESC ="(UTC+02:00) Chisinau" GMT_PLUS_02_A_DAYLIGHT="Ora Europei de Est diurnă" GMT_PLUS_02_A_STANDARD="Ora Europei de Est standard" @@ -3791,7 +3808,7 @@ GMT_PLUS_02_C_DESC ="(UTC+02:00) Helsinki, Kiev, Riga, Sofia, Tallinn, Vilniu GMT_PLUS_02_C_DAYLIGHT="Ora FLE diurnă" GMT_PLUS_02_C_STANDARD="Ora FLE standard" -GMT_PLUS_02_D_DESC ="(UTC+02:00) Atena, București, Istanbul" +GMT_PLUS_02_D_DESC ="(UTC+02:00) Atena, București" GMT_PLUS_02_D_DAYLIGHT="Ora GTB diurnă" GMT_PLUS_02_D_STANDARD="Ora GTB standard" @@ -3827,6 +3844,10 @@ GMT_PLUS_03_E_DESC ="(UTC+03:00) Bagdad" GMT_PLUS_03_E_DAYLIGHT="Oră arabă diurnă" GMT_PLUS_03_E_STANDARD="Oră arabă standard" +GMT_PLUS_03_F_DESC ="(GMT+03:00) Istanbul" +GMT_PLUS_03_F_DAYLIGHT="Oră de Turcia diurnă" +GMT_PLUS_03_F_STANDARD="Oră de Turcia standard" + GMT_PLUS_0330_A_DESC ="(UTC+03:30) Teheran" GMT_PLUS_0330_A_DAYLIGHT="Ora Iranului diurnă" GMT_PLUS_0330_A_STANDARD="Ora Iranului standard" @@ -4270,10 +4291,10 @@ GMT_PLUS_01_A_DESC ="(GMT+01:00) Белград, Братислава, Бу GMT_PLUS_01_B_DESC ="(GMT+01:00) Варшава, Загреб, Сараево, Скопье" GMT_PLUS_01_C_DESC ="(GMT+01:00) Брюссель, Копенгаген, Мадрид, Париж" GMT_PLUS_01_D_DESC ="(GMT+01:00) Амстердам, Берлин, Брен, Вена, Рим, Стокгольм" -GMT_PLUS_02_A_DESC ="(GMT+02:00) Минск" +GMT_PLUS_02_A_DESC ="(GMT+02:00) Кишинэу" GMT_PLUS_02_B_DESC ="(GMT+02:00) Каир" GMT_PLUS_02_C_DESC ="(GMT+02:00) Вильнюс, Киев, Рига, София, Таллин, Хельсинки" -GMT_PLUS_02_D_DESC ="(GMT+02:00) Афины, Бухарест, Стамбул" +GMT_PLUS_02_D_DESC ="(GMT+02:00) Афины, Бухарест" GMT_PLUS_02_E_DESC ="(GMT+02:00) Иерусалим" GMT_PLUS_02_F_DESC ="(GMT+02:00) Хараре, Претория" GMT_PLUS_02_G_DESC ="(GMT+02:00) Калининград" @@ -4282,6 +4303,7 @@ GMT_PLUS_03_B_DESC ="(GMT+03:00) Москва, Санкт-Петербур GMT_PLUS_03_C_DESC ="(GMT+03:00) Кувейт, Эр-Рияд" GMT_PLUS_03_D_DESC ="(GMT+03:00) Найроби" GMT_PLUS_03_E_DESC ="(GMT+03:00) Багдад" +GMT_PLUS_03_F_DESC ="(GMT+03:00) Стамбул" GMT_PLUS_0330_A_DESC ="(GMT+03:30) Тегеран" GMT_PLUS_04_A_DESC ="(GMT+04:00) Абу-Даби, Мускат" GMT_PLUS_04_B_DESC ="(GMT+04:00) Ереван" @@ -5201,7 +5223,7 @@ GMT_PLUS_01_D_DESC ="(GMT+01:00) Amsterdam, Berlin, Bern, Roma, Stockholm, Vi GMT_PLUS_01_D_DAYLIGHT="Batı Avrupa Yaz Saati" GMT_PLUS_01_D_STANDARD="Batı Avrupa Standart Saati" -GMT_PLUS_02_A_DESC ="(GMT+02:00) Minsk" +GMT_PLUS_02_A_DESC ="(GMT+02:00) Kişinev" GMT_PLUS_02_A_DAYLIGHT="Doğu Avrupa Yaz Saati" GMT_PLUS_02_A_STANDARD="Doğu Avrupa Standart Saati" @@ -5229,9 +5251,9 @@ GMT_PLUS_02_G_DESC ="(GMT+02:00) Kaliningrad" GMT_PLUS_02_G_DAYLIGHT="RTZ 1 Yaz Saati" GMT_PLUS_02_G_STANDARD="RTZ 1 Standart Saati" -GMT_PLUS_03_A_DESC ="(GMT+03:00) Minsk, İstanbul" -GMT_PLUS_03_A_DAYLIGHT="Belarus-Türkiye Yaz Saati" -GMT_PLUS_03_A_STANDARD="Belarus-Türkiye Standart Saati" +GMT_PLUS_03_A_DESC ="(GMT+03:00) Minsk" +GMT_PLUS_03_A_DAYLIGHT="Belarus Yaz Saati" +GMT_PLUS_03_A_STANDARD="Belarus Standart Saati" GMT_PLUS_03_B_DESC ="(GMT+03:00) Moskova, St. Petersburg" GMT_PLUS_03_B_DAYLIGHT="RTZ 2 Yaz Saati" @@ -5249,6 +5271,10 @@ GMT_PLUS_03_E_DESC ="(GMT+03:00) Bağdat" GMT_PLUS_03_E_DAYLIGHT="Arap Yaz Saati" GMT_PLUS_03_E_STANDARD="Arap Standart Saati" +GMT_PLUS_03_F_DESC ="(GMT+03:00) İstanbul" +GMT_PLUS_03_F_DAYLIGHT="Türkiye Yaz Saati" +GMT_PLUS_03_F_STANDARD="Türkiye Standart Saati" + GMT_PLUS_0330_A_DESC ="(GMT+03:30) Tahran" GMT_PLUS_0330_A_DAYLIGHT="İran Yaz Saati" GMT_PLUS_0330_A_STANDARD="İran Standart Saati"

2 years, 10 months

[reactos] 01/01: [SHELL32] Drop a shortcut of the drive (#4072)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f5fb4785b0dec64bef15… commit 0f5fb4785b0dec64bef15413d0e8bd18b2844901 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 18 17:11:24 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 18 17:11:24 2021 +0900 [SHELL32] Drop a shortcut of the drive (#4072) - If the Right-dropped item was a drive, then get the display name of the drive and use it. - Use FAILED_UNEXPECTEDLY instead of FAILED macro. - Accept ::{GUID}. CORE-17813 --- dll/win32/shell32/droptargets/CFSDropTarget.cpp | 135 ++++++++++++++---------- dll/win32/shell32/droptargets/CFSDropTarget.h | 2 +- 2 files changed, 79 insertions(+), 58 deletions(-) diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp index 2660ff84785..14d1d20a67d 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CFSDropTarget.cpp @@ -134,7 +134,7 @@ CFSDropTarget::~CFSDropTarget() } BOOL -CFSDropTarget::_GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut) +CFSDropTarget::_GetUniqueFileName(LPCWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut) { WCHAR wszLink[40]; @@ -549,104 +549,125 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject, if (bLinking) { - WCHAR wszTargetPath[MAX_PATH]; WCHAR wszPath[MAX_PATH]; WCHAR wszTarget[MAX_PATH]; - wcscpy(wszTargetPath, m_sPathTarget); - - TRACE("target path = %s", debugstr_w(wszTargetPath)); + TRACE("target path = %s\n", debugstr_w(m_sPathTarget)); /* We need to create a link for each pidl in the copied items, so step through the pidls from the clipboard */ for (UINT i = 0; i < lpcida->cidl; i++) { - //Find out which file we're copying + // Find out which file we're linking. STRRET strFile; hr = psfFrom->GetDisplayNameOf(apidl[i], SHGDN_FORPARSING, &strFile); - if (FAILED(hr)) - { - ERR("Error source obtaining path"); + if (FAILED_UNEXPECTEDLY(hr)) break; - } hr = StrRetToBufW(&strFile, apidl[i], wszPath, _countof(wszPath)); - if (FAILED(hr)) - { - ERR("Error putting source path into buffer"); + if (FAILED_UNEXPECTEDLY(hr)) break; - } - TRACE("source path = %s", debugstr_w(wszPath)); - // Creating a buffer to hold the combined path - WCHAR buffer_1[MAX_PATH] = L""; - WCHAR *lpStr1; - lpStr1 = buffer_1; + TRACE("source path = %s\n", debugstr_w(wszPath)); + WCHAR wszDisplayName[MAX_PATH]; LPWSTR pwszFileName = PathFindFileNameW(wszPath); - LPWSTR pwszExt = PathFindExtensionW(wszPath); - LPWSTR placementPath = PathCombineW(lpStr1, m_sPathTarget, pwszFileName); - CComPtr<IPersistFile> ppf; - - //Check to see if it's already a link. - if (!wcsicmp(pwszExt, L".lnk")) + if (PathIsRootW(wszPath)) // Drive? { - //It's a link so, we create a new one which copies the old. - if(!_GetUniqueFileName(placementPath, pwszExt, wszTarget, TRUE)) - { - ERR("Error getting unique file name"); - hr = E_FAIL; + hr = psfFrom->GetDisplayNameOf(apidl[i], SHGDN_NORMAL, &strFile); + if (FAILED_UNEXPECTEDLY(hr)) break; - } - hr = IShellLink_ConstructFromPath(wszPath, IID_PPV_ARG(IPersistFile, &ppf)); - if (FAILED(hr)) { - ERR("Error constructing link from file"); + + hr = StrRetToBufW(&strFile, apidl[i], wszDisplayName, _countof(wszDisplayName)); + if (FAILED_UNEXPECTEDLY(hr)) break; + + // Delete a ':' in wszDisplayName. + LPWSTR pch0 = wcschr(wszDisplayName, L':'); + if (pch0) + { + do + { + *pch0 = *(pch0 + 1); + ++pch0; + } while (*pch0); } - hr = ppf->Save(wszTarget, FALSE); - if (FAILED(hr)) - break; - SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL); + pwszFileName = wszDisplayName; // Use wszDisplayName } - else + else if (wszPath[0] == L':' && wszPath[1] == L':') // ::{GUID}? { - //It's not a link, so build a new link using the creator class and fill it in. - //Create a file name for the link - if (!_GetUniqueFileName(placementPath, L".lnk", wszTarget, TRUE)) + CLSID clsid; + hr = ::CLSIDFromString(&wszPath[2], &clsid); + if (SUCCEEDED(hr)) { - ERR("Error creating unique file name"); - hr = E_FAIL; - break; + LPITEMIDLIST pidl = ILCreateFromPathW(wszPath); + if (pidl) + { + SHFILEINFOW fi = { NULL }; + SHGetFileInfoW((LPCWSTR)pidl, 0, &fi, sizeof(fi), + SHGFI_DISPLAYNAME | SHGFI_PIDL); + if (fi.szDisplayName[0]) + { + lstrcpynW(wszDisplayName, fi.szDisplayName, _countof(wszDisplayName)); + pwszFileName = wszDisplayName; // Use wszDisplayName + } + ILFree(pidl); + } } + } + // Creating a buffer to hold the combined path. + WCHAR wszCombined[MAX_PATH]; + PathCombineW(wszCombined, m_sPathTarget, pwszFileName); + + // Check to see if the source is a link + BOOL fSourceIsLink = FALSE; + if (!wcsicmp(PathFindExtensionW(wszPath), L".lnk")) + { + fSourceIsLink = TRUE; + PathRemoveExtensionW(wszCombined); + } + + // Create a pathname to save the new link. + _GetUniqueFileName(wszCombined, L".lnk", wszTarget, TRUE); + + CComPtr<IPersistFile> ppf; + if (fSourceIsLink) + { + hr = IShellLink_ConstructFromPath(wszPath, IID_PPV_ARG(IPersistFile, &ppf)); + if (FAILED_UNEXPECTEDLY(hr)) + break; + } + else + { CComPtr<IShellLinkW> pLink; hr = CShellLink::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IShellLinkW, &pLink)); - if (FAILED(hr)) { - ERR("Error instantiating IShellLinkW"); + if (FAILED_UNEXPECTEDLY(hr)) break; - } WCHAR szDirPath[MAX_PATH], *pwszFile; GetFullPathName(wszPath, MAX_PATH, szDirPath, &pwszFile); - if (pwszFile) pwszFile[0] = 0; + if (pwszFile) + pwszFile[0] = 0; hr = pLink->SetPath(wszPath); - if(FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) break; hr = pLink->SetWorkingDirectory(szDirPath); - if(FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) break; hr = pLink->QueryInterface(IID_PPV_ARG(IPersistFile, &ppf)); - if(FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) break; - - hr = ppf->Save(wszTarget, TRUE); - if (FAILED(hr)) - break; - SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL); } + + hr = ppf->Save(wszTarget, !fSourceIsLink); + if (FAILED_UNEXPECTEDLY(hr)) + break; + + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL); } } else diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.h b/dll/win32/shell32/droptargets/CFSDropTarget.h index 3da45bae68d..6d0cd9691cd 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.h +++ b/dll/win32/shell32/droptargets/CFSDropTarget.h @@ -40,7 +40,7 @@ class CFSDropTarget : BOOL _QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); HRESULT _DoDrop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); HRESULT _CopyItems(IShellFolder *pSFFrom, UINT cidl, LPCITEMIDLIST *apidl, BOOL bCopy); - BOOL _GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut); + BOOL _GetUniqueFileName(LPCWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut); static DWORD WINAPI _DoDropThreadProc(LPVOID lpParameter); HRESULT _GetEffectFromMenu(IDataObject *pDataObject, POINTL pt, DWORD *pdwEffect, DWORD dwAvailableEffects); HRESULT _RepositionItems(IShellFolderView *psfv, IDataObject *pDataObject, POINTL pt);

2 years, 10 months

[reactos] 01/01: [GITHUB] Applications, CPL, and rosapps modules are building for ARM now

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f8010947fefc802c99f31… commit f8010947fefc802c99f315f60d18d746b8a7f13e Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Nov 17 15:12:17 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Nov 17 19:18:18 2021 +0300 [GITHUB] Applications, CPL, and rosapps modules are building for ARM now Also add debug and release builds. Addendum to c1538a82 and 1f44552d. CORE-17517 CORE-17604 --- .github/workflows/build.yml | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 54fd58b7893..9ebc9bd4964 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -137,6 +137,7 @@ jobs: matrix: toolset: ['14.2', '14.1'] # VS 2019, 2017 arch: [arm] + config: [Debug, Release] fail-fast: false runs-on: windows-latest steps: @@ -159,9 +160,40 @@ jobs: with: path: src - name: Configure - run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 - - name: Build rapps - run: cmake --build build --target rapps + run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 + - name: Build applications + run: cmake --build build --target base/applications/all + - name: Build control panel applets + run: cmake --build build --target dll/cpl/all + - name: Build rosapps + run: cmake --build build --target modules/rosapps/all + - name: Upload compiled binaries + uses: actions/upload-artifact@v2 + with: + name: reactos-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}} + path: | + build/base/applications + build/dll/cpl + build/modules/rosapps + !**/CMakeFiles + !**/cmake_install.cmake + !**/*.asm + !**/*.bin + !**/*.c + !**/*.def + !**/*.exp + !**/*.h + !**/*.lib + !**/*.mc + !**/*.obj + !**/*.rc + !**/*.tlb + - name: Upload debug symbols + if: ${{ matrix.config == 'Debug' }} + uses: actions/upload-artifact@v2 + with: + name: reactos-syms-msvc${{matrix.toolset}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}} + path: build/msvc_pdb build-clang-cl: strategy:

2 years, 10 months

[reactos] 01/01: [HHPCOMP] Check return value when calling chdir (#4073)

by Sergey Valentei

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84ed4a79dc6f5d913eace… commit 84ed4a79dc6f5d913eace09b1fdb57404d69dcf2 Author: Sergey Valentei <ihsinme(a)gmail.com> AuthorDate: Mon Oct 25 12:12:37 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Nov 17 14:28:12 2021 +0300 [HHPCOMP] Check return value when calling chdir (#4073) Signed-off-by: Sergey Valentei <ihsinme(a)gmail.com> --- sdk/tools/hhpcomp/hhpcomp.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk/tools/hhpcomp/hhpcomp.cpp b/sdk/tools/hhpcomp/hhpcomp.cpp index 7510a92eb12..18a8661c8af 100644 --- a/sdk/tools/hhpcomp/hhpcomp.cpp +++ b/sdk/tools/hhpcomp/hhpcomp.cpp @@ -56,7 +56,11 @@ int main(int argc, char** argv) string absolute_name = replace_backslashes(real_path(argv[1])); int prefixlen = absolute_name.find_last_of('/'); clog << prefixlen << endl; - chdir(absolute_name.substr(0, prefixlen).c_str()); // change to the project file's directory + if (chdir(absolute_name.substr(0, prefixlen).c_str()) == -1) // change to the project file's directory + { + cerr << "chdir: working directory couldn't be changed" << endl; + exit(0); + } hhp_reader project_file(absolute_name); struct chmcFile chm;

2 years, 10 months

[reactos] 01/01: [CRT] Add setjmp for the arm64 architecture (#4088)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=51ce0c5150e88c3ce853f… commit 51ce0c5150e88c3ce853f2a7b16f0b6efff5b36b Author: Justin Miller <justinmiller100(a)gmail.com> AuthorDate: Wed Nov 17 03:24:07 2021 -0800 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 17 14:24:07 2021 +0300 [CRT] Add setjmp for the arm64 architecture (#4088) CORE-17622 CORE-17518 --- sdk/include/crt/setjmp.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/sdk/include/crt/setjmp.h b/sdk/include/crt/setjmp.h index 13f22fabe98..80e90f75b9b 100644 --- a/sdk/include/crt/setjmp.h +++ b/sdk/include/crt/setjmp.h @@ -150,6 +150,32 @@ extern "C" { unsigned long long D[8]; // D8-D15 VFP/NEON regs } _JUMP_BUFFER; +#elif defined(_M_ARM64) + +#define _JBLEN 24 +#define _JBTYPE unsigned __int64 + +typedef struct __JUMP_BUFFER { + unsigned __int64 Frame; + unsigned __int64 Reserved; + unsigned __int64 X19; + unsigned __int64 X20; + unsigned __int64 X21; + unsigned __int64 X22; + unsigned __int64 X23; + unsigned __int64 X24; + unsigned __int64 X25; + unsigned __int64 X26; + unsigned __int64 X27; + unsigned __int64 X28; + unsigned __int64 Fp; + unsigned __int64 Lr; + unsigned __int64 Sp; + unsigned long Fpcr; + unsigned long Fpsr; + double D[8]; + } _JUMP_BUFFER; + #else #error Define Setjmp for this architecture!

2 years, 10 months

[reactos] 01/01: [SDK][CMAKE] config.cmake: Add ARM64 compiler options (#4050)

by Konrad Dybcio

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5e57a8523ad995aabf60… commit b5e57a8523ad995aabf6043e14f56c14c66c7410 Author: Konrad Dybcio <konrad.dybcio(a)somainline.org> AuthorDate: Wed Oct 20 12:19:27 2021 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Nov 17 14:18:06 2021 +0300 [SDK][CMAKE] config.cmake: Add ARM64 compiler options (#4050) Add generic compiler options for ARM64. Signed-off-by: Konrad Dybcio <konrad.dybcio(a)somainline.org> --- sdk/cmake/config.cmake | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sdk/cmake/config.cmake b/sdk/cmake/config.cmake index f0c2850c86c..020f0c7eda4 100644 --- a/sdk/cmake/config.cmake +++ b/sdk/cmake/config.cmake @@ -10,6 +10,12 @@ elseif(ARCH STREQUAL "arm") set(SARCH "omap3-zoom2" CACHE STRING "Sub-architecture (board) to build for. Specify one of: kurobox versatile omap3-zoom2 omap3-beagle") +elseif(ARCH STREQUAL "arm64") + # By design, arm64 kernels and OSes should be intercompatible, but + # due to SoC vendors seemingly not being able to follow ARM design guidelines + # properly, there might be a need for board-specific builds later on... + set(SARCH "" CACHE STRING + "Sub-architecture (board) to build for.") endif() if(ARCH STREQUAL "i386") @@ -24,6 +30,12 @@ elseif(ARCH STREQUAL "arm") set(OARCH "armv7-a" CACHE STRING "Generate instructions for this CPU type. Specify one of: armv5te armv7-a") +elseif(ARCH STREQUAL "arm64") + # This should not be bumped unless REALLY needed, because (as of 2021) + # there are still new designs using the original A53 cores w/ armv8.0. + set(OARCH "armv8-a" CACHE STRING + "Generate instructions for this CPU type. Specify one of: + armv8-a armv8.1-a armv8.2-a armv8.3-a armv8.4-a armv8.5-a armv8.6-a") endif() if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") @@ -32,6 +44,9 @@ if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") elseif(ARCH STREQUAL "arm") set(TUNE "generic-armv7-a" CACHE STRING "Which CPU ReactOS should be optimized for.") +elseif(ARCH STREQUAL "arm64") + set(TUNE "generic" CACHE STRING + "Which CPU ReactOS should be optimized for.") endif() set(OPTIMIZE "4" CACHE STRING

2 years, 10 months

[reactos] 01/01: [THEMES][LUNAR] Fix line endings problem

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3eb4f4d450a6ce100a572… commit 3eb4f4d450a6ce100a5724ee01d5282e12b285ba Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Nov 17 14:12:02 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Nov 17 14:12:02 2021 +0300 [THEMES][LUNAR] Fix line endings problem --- media/themes/Lunar/lunar.msstyles/lang/ru-RU.rc | 74 ++++++++++++------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/media/themes/Lunar/lunar.msstyles/lang/ru-RU.rc b/media/themes/Lunar/lunar.msstyles/lang/ru-RU.rc index d740c61892f..ad4d2b5f11a 100644 --- a/media/themes/Lunar/lunar.msstyles/lang/ru-RU.rc +++ b/media/themes/Lunar/lunar.msstyles/lang/ru-RU.rc @@ -1,37 +1,37 @@ -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ -1000, "ReactOS" -} - -STRINGTABLE -{ -2000, "Lunar ReactOS" -} - -STRINGTABLE -{ -3000, "Обычный" -3001, "Крупный шрифт" -3002, "Огромный шрифт" -} - -STRINGTABLE -{ -4000, "Обычный" -4001, "Крупный шрифт" -4002, "Огромный шрифт" -} - -STRINGTABLE -{ -5000, "Lunar" -5001, "Визуальный Стиль" -5002, "Команда ReactOS" -5003, "Cernodile и Illen, основан на Lautus" -5004, "Выпущен под GNU/GPL 2.0, 2019" -5005, "https://reactos.org/" -5006, "1.1" -5007, "Визуальный стиль для ReactOS" -} +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ +1000, "ReactOS" +} + +STRINGTABLE +{ +2000, "Lunar ReactOS" +} + +STRINGTABLE +{ +3000, "Обычный" +3001, "Крупный шрифт" +3002, "Огромный шрифт" +} + +STRINGTABLE +{ +4000, "Обычный" +4001, "Крупный шрифт" +4002, "Огромный шрифт" +} + +STRINGTABLE +{ +5000, "Lunar" +5001, "Визуальный Стиль" +5002, "Команда ReactOS" +5003, "Cernodile и Illen, основан на Lautus" +5004, "Выпущен под GNU/GPL 2.0, 2019" +5005, "https://reactos.org/" +5006, "1.1" +5007, "Визуальный стиль для ReactOS" +}

2 years, 10 months

[reactos] 01/01: [THEMES][LUNAR] Add Russian translation (#4100)

by Nikki Next

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=577fb37a8aeb0bdbf5331… commit 577fb37a8aeb0bdbf53315e4bfe364d71afb9259 Author: Nikki Next <nikki_next(a)yahoo.com> AuthorDate: Wed Nov 17 15:58:56 2021 +0500 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 17 13:58:56 2021 +0300 [THEMES][LUNAR] Add Russian translation (#4100) --- media/themes/Lunar/lunar.msstyles/lang/ru-RU.rc | 37 +++++++++++++++++++++++++ media/themes/Lunar/lunar.msstyles/lunar.rc | 3 ++ 2 files changed, 40 insertions(+) diff --git a/media/themes/Lunar/lunar.msstyles/lang/ru-RU.rc b/media/themes/Lunar/lunar.msstyles/lang/ru-RU.rc new file mode 100644 index 00000000000..d740c61892f --- /dev/null +++ b/media/themes/Lunar/lunar.msstyles/lang/ru-RU.rc @@ -0,0 +1,37 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ +1000, "ReactOS" +} + +STRINGTABLE +{ +2000, "Lunar ReactOS" +} + +STRINGTABLE +{ +3000, "Обычный" +3001, "Крупный шрифт" +3002, "Огромный шрифт" +} + +STRINGTABLE +{ +4000, "Обычный" +4001, "Крупный шрифт" +4002, "Огромный шрифт" +} + +STRINGTABLE +{ +5000, "Lunar" +5001, "Визуальный Стиль" +5002, "Команда ReactOS" +5003, "Cernodile и Illen, основан на Lautus" +5004, "Выпущен под GNU/GPL 2.0, 2019" +5005, "https://reactos.org/" +5006, "1.1" +5007, "Визуальный стиль для ReactOS" +} diff --git a/media/themes/Lunar/lunar.msstyles/lunar.rc b/media/themes/Lunar/lunar.msstyles/lunar.rc index 6eebefb5b2a..aff691ee655 100644 --- a/media/themes/Lunar/lunar.msstyles/lunar.rc +++ b/media/themes/Lunar/lunar.msstyles/lunar.rc @@ -193,6 +193,9 @@ NORMAL_NORMALGROUPEXPAND_BMP BITMAP "bitmaps/dummy.bmp" #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" #endif

2 years, 10 months

[reactos] 01/01: [ISAPNP] Add support for NEC PC-98 series

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84fabd819dcc7130f26d6… commit 84fabd819dcc7130f26d6e7bccee84f72e191d78 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Tue Nov 9 23:01:14 2021 +0600 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Nov 17 13:56:29 2021 +0300 [ISAPNP] Add support for NEC PC-98 series --- boot/bootdata/hivesys.inf | 9 +++++++++ drivers/bus/isapnp/isapnphw.h | 5 +++++ media/inf/machine.inf | 15 +++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 74d6df755ef..fa6c21b9261 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -23,6 +23,15 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0604","Clas HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0601","Service",0x00000000,"isapnp" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0601","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#VEN_1033&DEV_0001","Service",0x00000000,"isapnp" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#VEN_1033&DEV_0001","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}" + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#VEN_1033&DEV_002D","Service",0x00000000,"isapnp" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#VEN_1033&DEV_002D","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}" + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#VEN_1033&DEV_003B","Service",0x00000000,"isapnp" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#VEN_1033&DEV_003B","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}" + HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","Service",0x00000000,"acpi" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}" diff --git a/drivers/bus/isapnp/isapnphw.h b/drivers/bus/isapnp/isapnphw.h index 0023aac4fdf..3c5a2590729 100644 --- a/drivers/bus/isapnp/isapnphw.h +++ b/drivers/bus/isapnp/isapnphw.h @@ -13,8 +13,13 @@ extern "C" { #endif +#if defined(SARCH_PC98) +#define ISAPNP_ADDRESS 0x259 +#define ISAPNP_WRITE_DATA 0xA59 +#else #define ISAPNP_ADDRESS 0x279 #define ISAPNP_WRITE_DATA 0xA79 +#endif #define ISAPNP_READPORT 0x00 #define ISAPNP_SERIALISOLATION 0x01 diff --git a/media/inf/machine.inf b/media/inf/machine.inf index 7f11fa803a2..5013ceca5eb 100644 --- a/media/inf/machine.inf +++ b/media/inf/machine.inf @@ -24,6 +24,7 @@ HKR, , Icon, 0, "-27" [Manufacturer] %GenericMfg% = GenericMfg %IntelMfg% = IntelMfg +%NecMfg% = NecMfg %nVidiaMfg% = nVidiaMfg [GenericMfg] @@ -70,6 +71,13 @@ HKR, , Icon, 0, "-27" %PCI\VEN_8086&DEV_7190.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7190 %PCI\VEN_8086&DEV_7192.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7192 +[NecMfg] +%NecCb.DeviceDesc% = PCI_ISA_Inst,PCI\VEN_1033&DEV_0001 +%NecVl.DeviceDesc% = NO_DRV,PCI\VEN_1033&DEV_0002 +%NecVl.DeviceDesc% = NO_DRV,PCI\VEN_1033&DEV_0016 +%NecCb.DeviceDesc% = PCI_ISA_Inst,PCI\VEN_1033&DEV_002D +%NecCb.DeviceDesc% = PCI_ISA_Inst,PCI\VEN_1033&DEV_003B + [nVidiaMfg] %PCI\VEN_10DE&DEV_01B2.DeviceDesc% = PCI_ISA_Inst,PCI\VEN_10DE&DEV_01B2 %PCI\VEN_10DE&DEV_01B4.DeviceDesc% = NO_DRV,PCI\VEN_10DE&DEV_01B4 @@ -201,6 +209,10 @@ PCI\VEN_8086&DEV_7180.DeviceDesc = "Intel 82443LX/EX Pentium(R) II CPU to PCI Br PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI Bridge" PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI Bridge" +NecMfg = "NEC" +NecCb.DeviceDesc = "NEC PCI to C-bus Bridge" +NecVl.DeviceDesc = "NEC PCI to VL bus Bridge" + nVidiaMfg = "nVidia" PCI\VEN_10DE&DEV_01B2.DeviceDesc = "nVidia nForce PCI to ISA Bridge" PCI\VEN_10DE&DEV_01B4.DeviceDesc = "nVidia nForce SMBus Controller" @@ -662,6 +674,9 @@ PCI\VEN_8086&DEV_7180.DeviceDesc = "Intel 82443LX/EX Pentium(R) II мост CPU PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II мост CPU - PCI" PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II мост CPU - PCI" +NecCb.DeviceDesc = "NEC мост PCI - C-bus" +NecVl.DeviceDesc = "NEC мост PCI - VL" + PCI\VEN_10DE&DEV_01B2.DeviceDesc = "nVidia nForce мост PCI - ISA" PCI\VEN_10DE&DEV_01B4.DeviceDesc = "nVidia nForce контроллер SMBus" PCI\VEN_10DE&DEV_01B7.DeviceDesc = "nVidia nForce мост AGP - PCI"

2 years, 10 months

[reactos] 01/01: [NTOS:SE] Validate the SID lengths when capturing them

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f909e8762d18825b1ba21… commit f909e8762d18825b1ba21ba340e0f394a1c93d64 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Tue Nov 9 21:34:36 2021 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Tue Nov 16 10:55:44 2021 +0100 [NTOS:SE] Validate the SID lengths when capturing them SIDs are variadic by nature which means their lengths can vary in a given amount of time and certain factors that allow for this happen. This also especially can lead to issues when capturing SIDs and attributes because SeCaptureSidAndAttributesArray might end up overwriting the buffer during the time it's been called. Therefore when we're copying the SIDs, validate their lengths. In addition to that, update the documentation header accordingly and add some debug prints in code. --- ntoskrnl/include/internal/tag.h | 1 + ntoskrnl/se/sid.c | 138 +++++++++++++++++++++++++++++++++------- 2 files changed, 116 insertions(+), 23 deletions(-) diff --git a/ntoskrnl/include/internal/tag.h b/ntoskrnl/include/internal/tag.h index b92b4e99edf..38c26245023 100644 --- a/ntoskrnl/include/internal/tag.h +++ b/ntoskrnl/include/internal/tag.h @@ -186,6 +186,7 @@ #define TAG_LOGON_SESSION 'sLeS' #define TAG_LOGON_NOTIFICATION 'nLeS' #define TAG_SID_AND_ATTRIBUTES 'aSeS' +#define TAG_SID_VALIDATE 'vSeS' /* LPC Tags */ #define TAG_LPC_MESSAGE 'McpL' diff --git a/ntoskrnl/se/sid.c b/ntoskrnl/se/sid.c index 8d9e701f245..509b3777488 100644 --- a/ntoskrnl/se/sid.c +++ b/ntoskrnl/se/sid.c @@ -52,6 +52,12 @@ PSID SeAnonymousLogonSid = NULL; PSID SeLocalServiceSid = NULL; PSID SeNetworkServiceSid = NULL; +typedef struct _SID_VALIDATE +{ + UCHAR SubAuthorityCount; + PISID ProbeSid; +} SID_VALIDATE, *PSID_VALIDATE; + /* FUNCTIONS ******************************************************************/ /** @@ -450,8 +456,29 @@ SepReleaseSid( * avoiding integer overflows. STATUS_INSUFFICIENT_RESOURCES * is returned if memory pool allocation for the captured SID has failed. * STATUS_BUFFER_TOO_SMALL is returned if the length of the allocated - * buffer is less than the required size. A failure NTSTATUS code is - * returned otherwise. + * buffer is less than the required size. STATUS_INVALID_SID is returned + * if a SID doesn't meet certain requirements to be considered a valid + * SID by the security manager. A failure NTSTATUS code is returned + * otherwise. + * + * @remarks + * A security identifier (SID) is a variable-length data structure that + * can change in size over time, depending on the factors that influence + * this effect in question. An attacker can take advantage of this fact + * and can potentially modify certain properties of a SID making it + * different in size than it was originally before. This is what we'd + * call, a TOCTOU vulnerability. + * + * For this reason, the logic of copying the SIDs and their attributes + * into a new buffer goes like this: first, allocate a buffer array + * that just holds the lengths and subauthority count of each SID. + * Such information is copied in the first loop. Then in a second loop, + * iterate over the array with SID provided and copy them into the final + * array. The moment we're doing this, validate the lengths of each SID + * basing upon the captured lengths we've got before. In this way we + * ensure that the SIDs have remained intact. The validation checks are + * done in user mode as a general rule that we just cannot trust UM and + * whatever data is coming from it. */ NTSTATUS NTAPI @@ -467,12 +494,16 @@ SeCaptureSidAndAttributesArray( _Out_ PULONG ResultLength) { ULONG ArraySize, RequiredLength, SidLength, i; + ULONG TempArrayValidate, TempLengthValidate; PSID_AND_ATTRIBUTES SidAndAttributes; + _SEH2_VOLATILE PSID_VALIDATE ValidateArray; PUCHAR CurrentDest; PISID Sid; NTSTATUS Status; PAGED_CODE(); + ValidateArray = NULL; + SidAndAttributes = NULL; *CapturedSidAndAttributes = NULL; *ResultLength = 0; @@ -483,6 +514,7 @@ SeCaptureSidAndAttributesArray( if (AttributeCount > SE_MAXIMUM_GROUP_LIMIT) { + DPRINT1("SeCaptureSidAndAttributesArray(): Maximum group limit exceeded!\n"); return STATUS_INVALID_PARAMETER; } @@ -495,14 +527,28 @@ SeCaptureSidAndAttributesArray( ArraySize = AttributeCount * sizeof(SID_AND_ATTRIBUTES); RequiredLength = ALIGN_UP_BY(ArraySize, sizeof(ULONG)); - /* Check for user mode data */ if (PreviousMode != KernelMode) { + /* Check for user mode data */ _SEH2_TRY { /* First probe the whole array */ ProbeForRead(SrcSidAndAttributes, ArraySize, sizeof(ULONG)); + /* We're in user mode, set up the size for the temporary array */ + TempArrayValidate = AttributeCount * sizeof(SID_VALIDATE); + TempLengthValidate = ALIGN_UP_BY(TempArrayValidate, sizeof(ULONG)); + + /* + * Allocate a buffer for the array that we're going to + * temporarily hold the subauthority count and the SID + * elements. We'll be going to use this array to perform + * validation checks later. + */ + ValidateArray = ExAllocatePoolWithTag(PoolType | POOL_RAISE_IF_ALLOCATION_FAILURE, + TempLengthValidate, + TAG_SID_VALIDATE); + /* Loop the array elements */ for (i = 0; i < AttributeCount; i++) { @@ -510,16 +556,20 @@ SeCaptureSidAndAttributesArray( Sid = SrcSidAndAttributes[i].Sid; ProbeForRead(Sid, sizeof(*Sid), sizeof(ULONG)); - /* Verify that the SID is valid */ - if (((Sid->Revision & 0xF) != SID_REVISION) || - (Sid->SubAuthorityCount > SID_MAX_SUB_AUTHORITIES)) - { - _SEH2_YIELD(return STATUS_INVALID_SID); - } + /* + * Capture the subauthority count and hold it + * into the temporary array for later validation. + * This way we ensure that the said count of each + * SID has remained the same. + */ + ValidateArray[i].SubAuthorityCount = Sid->SubAuthorityCount; + + /* Capture the SID */ + ValidateArray[i].ProbeSid = Sid; /* Calculate the SID length and probe the full SID */ - SidLength = RtlLengthRequiredSid(Sid->SubAuthorityCount); - ProbeForRead(Sid, SidLength, sizeof(ULONG)); + SidLength = RtlLengthRequiredSid(ValidateArray[i].SubAuthorityCount); + ProbeForRead(ValidateArray[i].ProbeSid, SidLength, sizeof(ULONG)); /* Add the aligned length to the required length */ RequiredLength += ALIGN_UP_BY(SidLength, sizeof(ULONG)); @@ -527,7 +577,8 @@ SeCaptureSidAndAttributesArray( } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - _SEH2_YIELD(return _SEH2_GetExceptionCode()); + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(goto Cleanup); } _SEH2_END; } @@ -558,7 +609,9 @@ SeCaptureSidAndAttributesArray( TAG_SID_AND_ATTRIBUTES); if (SidAndAttributes == NULL) { - return STATUS_INSUFFICIENT_RESOURCES; + DPRINT1("SeCaptureSidAndAttributesArray(): Failed to allocate memory for SID and attributes array (requested size -> %lu)!\n", RequiredLength); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; } } /* Otherwise check if the buffer is large enough */ @@ -570,7 +623,9 @@ SeCaptureSidAndAttributesArray( else { /* Buffer is too small, fail */ - return STATUS_BUFFER_TOO_SMALL; + DPRINT1("SeCaptureSidAndAttributesArray(): The provided buffer is small (expected size -> %lu || current size -> %lu)!\n", RequiredLength, AllocatedLength); + Status = STATUS_BUFFER_TOO_SMALL; + goto Cleanup; } *CapturedSidAndAttributes = SidAndAttributes; @@ -587,20 +642,50 @@ SeCaptureSidAndAttributesArray( /* Loop the array elements */ for (i = 0; i < AttributeCount; i++) { - /* Get the SID and it's length */ - Sid = SrcSidAndAttributes[i].Sid; - SidLength = RtlLengthRequiredSid(Sid->SubAuthorityCount); + /* + * Get the SID length from the subauthority + * count we've captured before. + */ + SidLength = RtlLengthRequiredSid(ValidateArray[i].SubAuthorityCount); /* Copy attributes */ SidAndAttributes[i].Attributes = SrcSidAndAttributes[i].Attributes; /* Copy the SID to the current destination address */ SidAndAttributes[i].Sid = (PSID)CurrentDest; - RtlCopyMemory(CurrentDest, SrcSidAndAttributes[i].Sid, SidLength); + RtlCopyMemory(CurrentDest, ValidateArray[i].ProbeSid, SidLength); - /* Sanity checks */ - ASSERT(RtlLengthSid(SidAndAttributes[i].Sid) == SidLength); - ASSERT(RtlValidSid(SidAndAttributes[i].Sid)); + /* Obtain the SID we've captured before for validation */ + Sid = SidAndAttributes[i].Sid; + + /* Validate that the subauthority count hasn't changed */ + if (ValidateArray[i].SubAuthorityCount != + Sid->SubAuthorityCount) + { + /* It's changed, bail out */ + DPRINT1("SeCaptureSidAndAttributesArray(): The subauthority counts have changed (captured count -> %u || current count -> %u)\n", + ValidateArray[i].SubAuthorityCount, Sid->SubAuthorityCount); + Status = STATUS_INVALID_SID; + goto Cleanup; + } + + /* Validate that the SID length is the same */ + if (SidLength != RtlLengthSid(Sid)) + { + /* They're no longer the same, bail out */ + DPRINT1("SeCaptureSidAndAttributesArray(): The SID lengths have changed (captured length -> %lu || current length -> %lu)\n", + SidLength, RtlLengthSid(Sid)); + Status = STATUS_INVALID_SID; + goto Cleanup; + } + + /* Check that the SID is valid */ + if (!RtlValidSid(Sid)) + { + DPRINT1("SeCaptureSidAndAttributesArray(): The SID is not valid!\n"); + Status = STATUS_INVALID_SID; + goto Cleanup; + } /* Update the current destination address */ CurrentDest += ALIGN_UP_BY(SidLength, sizeof(ULONG)); @@ -637,18 +722,25 @@ SeCaptureSidAndAttributesArray( } } +Cleanup: /* Check for failure */ if (!NT_SUCCESS(Status)) { /* Check if we allocated a new array */ - if (SidAndAttributes != AllocatedMem) + if ((SidAndAttributes != AllocatedMem) && (SidAndAttributes != NULL)) { /* Free the array */ ExFreePoolWithTag(SidAndAttributes, TAG_SID_AND_ATTRIBUTES); } /* Set returned address to NULL */ - *CapturedSidAndAttributes = NULL ; + *CapturedSidAndAttributes = NULL; + } + + /* Free the temporary validation array */ + if ((PreviousMode != KernelMode) && (ValidateArray != NULL)) + { + ExFreePoolWithTag(ValidateArray, TAG_SID_VALIDATE); } return Status;

2 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2021