Ros-diffs

ros-diffs@reactos.org

14 participants
81070 discussions

[reactos] 01/01: [MSPAINT] Add border width to tool box (#5780)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=611d89eb8bf30edd09a1b… commit 611d89eb8bf30edd09a1b3b41f3044fdb969093e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Oct 9 08:37:31 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 9 08:37:31 2023 +0900 [MSPAINT] Add border width to tool box (#5780) Make tool box pixel-perfect. Add two border widths to the tool box. CORE-19217 --- base/applications/mspaint/toolbox.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/base/applications/mspaint/toolbox.cpp b/base/applications/mspaint/toolbox.cpp index 54d5bd8c2a4..891093f3f77 100644 --- a/base/applications/mspaint/toolbox.cpp +++ b/base/applications/mspaint/toolbox.cpp @@ -34,7 +34,12 @@ CPaintToolBar::ToolBarWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam BOOL CPaintToolBar::DoCreate(HWND hwndParent) { // NOTE: The horizontal line above the toolbar is hidden by CCS_NODIVIDER style. - RECT toolbarPos = { 0, 0, CX_TOOLBAR, CY_TOOLBAR }; + RECT toolbarPos = + { + 0, 0, + CX_TOOLBAR + 2 * GetSystemMetrics(SM_CXBORDER), + CY_TOOLBAR + 2 * GetSystemMetrics(SM_CYBORDER) + }; DWORD style = WS_CHILD | WS_VISIBLE | CCS_NOPARENTALIGN | CCS_VERT | CCS_NORESIZE | TBSTYLE_TOOLTIPS | TBSTYLE_FLAT; if (!CWindow::Create(TOOLBARCLASSNAME, hwndParent, toolbarPos, NULL, style))

1 year, 3 months

[reactos] 01/01: [T2EMBED] Improve spec file

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63aef3e1fc8a9e549539a… commit 63aef3e1fc8a9e549539a38cfb44e26436f7da2d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Aug 6 14:43:56 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Oct 9 02:34:30 2023 +0300 [T2EMBED] Improve spec file - Only export stdcall annotated functions on x86 - Turn annotated stubs / forwarders into normal exports - Note: MSVC removes decorated exports / forwarders, as soon as the undecorated version is exported, even when _declspec(dllexport) is used, no idea how to fix that. --- dll/win32/t2embed/t2embed.spec | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dll/win32/t2embed/t2embed.spec b/dll/win32/t2embed/t2embed.spec index 9b74715f081..6eae6be2f5d 100644 --- a/dll/win32/t2embed/t2embed.spec +++ b/dll/win32/t2embed/t2embed.spec @@ -9,17 +9,17 @@ @ stdcall TTIsEmbeddingEnabledForFacename(str ptr) @ stdcall TTLoadEmbeddedFont(ptr long ptr long ptr ptr ptr wstr str ptr) @ stdcall TTRunValidationTests(ptr ptr) -@ stub _TTCharToUnicode@24 -@ stub _TTDeleteEmbeddedFont@12 -@ stdcall _TTEmbedFont@44(long long long ptr ptr ptr ptr ptr long long ptr) TTEmbedFont -@ stub _TTEmbedFontFromFileA@52 -@ stub _TTEnableEmbeddingForFacename@8 -@ stub _TTGetEmbeddedFontInfo@28 -@ stdcall _TTGetEmbeddingType@8(long ptr) TTGetEmbeddingType -@ stdcall _TTIsEmbeddingEnabled@8(long ptr) TTIsEmbeddingEnabled -@ stdcall _TTIsEmbeddingEnabledForFacename@8(str ptr) TTIsEmbeddingEnabledForFacename -@ stdcall _TTLoadEmbeddedFont@40(ptr long ptr long ptr ptr ptr wstr str ptr) TTLoadEmbeddedFont -@ stub _TTRunValidationTests@8 +@ stdcall -i386 _TTCharToUnicode@24(ptr ptr long ptr long long) +@ stdcall -i386 _TTDeleteEmbeddedFont@12(long long ptr) +@ stdcall -i386 _TTEmbedFont@44(long long long ptr ptr ptr ptr ptr long long ptr) +@ stdcall -i386 _TTEmbedFontFromFileA@52(ptr str long long long ptr ptr ptr ptr ptr long long ptr) +@ stdcall -i386 _TTEnableEmbeddingForFacename@8(str long) +@ stdcall -i386 _TTGetEmbeddedFontInfo@28(long ptr long ptr ptr ptr ptr) +@ stdcall -i386 _TTGetEmbeddingType@8(long ptr) +@ stdcall -i386 _TTIsEmbeddingEnabled@8(long ptr) +@ stdcall -i386 _TTIsEmbeddingEnabledForFacename@8(str ptr) +@ stdcall -i386 _TTLoadEmbeddedFont@40(ptr long ptr long ptr ptr ptr wstr str ptr) +@ stdcall -i386 _TTRunValidationTests@8(ptr ptr) @ stdcall TTEmbedFontEx(ptr long long ptr ptr ptr ptr ptr long long ptr) @ stdcall TTRunValidationTestsEx(ptr ptr) @ stdcall TTGetNewFontName(ptr wstr long str long)

1 year, 3 months

[reactos] 01/01: [MSPAINT] Zoom tool shouldn't use undo buffer (#5778)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d8f4d328c8d6a663107c… commit 8d8f4d328c8d6a663107cfc6c28a554e3e60d71c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Oct 9 08:07:02 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 9 08:07:02 2023 +0900 [MSPAINT] Zoom tool shouldn't use undo buffer (#5778) Remove PushImageForUndo call in Zoom tool. CORE-19214 --- base/applications/mspaint/mouse.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 8412cc027c0..20a8e2157e4 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -571,7 +571,6 @@ struct ZoomTool : ToolBase void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { - imageModel.PushImageForUndo(); if (bLeftButton) { if (toolsModel.GetZoom() < MAX_ZOOM)

1 year, 3 months

[reactos] 02/02: [WSHTCPIP] Remove unneeded headers + Fix bugs.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=11b706429c9e817b03717… commit 11b706429c9e817b03717fe09564a96f75c8702d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Oct 7 22:12:34 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 8 17:11:26 2023 +0200 [WSHTCPIP] Remove unneeded headers + Fix bugs. - Mismatch NTSTATUS/DWORD for win32 errors; - Close handle returned from openTcpFile() with closeTcpFile(). --- dll/win32/wshtcpip/iflist.c | 40 +++++++++++++++++++--------------------- dll/win32/wshtcpip/wshtcpip.c | 2 +- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dll/win32/wshtcpip/iflist.c b/dll/win32/wshtcpip/iflist.c index 637552f08d2..44c685a5ad5 100644 --- a/dll/win32/wshtcpip/iflist.c +++ b/dll/win32/wshtcpip/iflist.c @@ -8,9 +8,6 @@ #include "wshtcpip.h" -#define WIN32_NO_STATUS /* Tell Windows headers you'll use ntstatus.s from NDK */ -#include <windows.h> /* Declare Windows Headers like you normally would */ -#include <ntndk.h> /* Declare the NDK Headers */ #include <iptypes.h> #include <wine/list.h> @@ -29,7 +26,7 @@ BOOL AllocAndGetEntityArray( ULONG outBufLen, outBufLenNeeded; void* outBuf = NULL; TCP_REQUEST_QUERY_INFORMATION_EX inTcpReq; - NTSTATUS Status; + DWORD dwError; TDIEntityID *pEntities; /* Set up Request */ @@ -62,7 +59,7 @@ BOOL AllocAndGetEntityArray( if (outBuf == NULL) break; - Status = NO_ERROR; + dwError = NO_ERROR; if (!DeviceIoControl( TcpFile, IOCTL_TCP_QUERY_INFORMATION_EX, @@ -72,16 +69,18 @@ BOOL AllocAndGetEntityArray( outBufLen, &outBufLenNeeded, NULL)) - Status = GetLastError(); + { + dwError = GetLastError(); + } /* We need TDI_SUCCESS and the outBufLenNeeded must be equal or smaller than our buffer (outBufLen). */ - if (Status != NO_ERROR) + if (dwError != NO_ERROR) { HeapFree(hHeap, 0, outBuf); break; } - /* status = Success; was the buffer large enough? */ + /* dwError = Success; was the buffer large enough? */ if (outBufLenNeeded <= outBufLen) { result = TRUE; @@ -134,7 +133,7 @@ INT GetIPSNMPInfo( &BufLenNeeded, NULL)) { - DPRINT("DeviceIoControl (IPSNMPInfo) failed, Status %li!\n", GetLastError()); + DPRINT("DeviceIoControl (IPSNMPInfo) failed, Error %ld!\n", GetLastError()); return WSAEFAULT; } @@ -164,7 +163,7 @@ INT GetTdiEntityType( &BufLenNeeded, NULL)) { - DPRINT("DeviceIoControl (TdiEntityType) failed, Status %li!\n", GetLastError()); + DPRINT("DeviceIoControl (TdiEntityType) failed, Error %ld!\n", GetLastError()); return WSAEFAULT; } @@ -195,7 +194,7 @@ INT GetIFEntry( &BufLenNeeded, NULL)) { - DPRINT("DeviceIoControl (IFEntry) failed, Status %li!\n", GetLastError()); + DPRINT("DeviceIoControl (IFEntry) failed, Error %ld!\n", GetLastError()); return WSAEFAULT; } @@ -230,20 +229,20 @@ WSHIoctl_GetInterfaceList( DWORD outIDCount, i1, iAddr; DWORD bCastAddr, outNumberOfBytes; ULONG BufLenNeeded, BufLen, IFEntryLen, TdiType; - HANDLE TcpFile = 0; + HANDLE TcpFile = NULL; HANDLE hHeap = GetProcessHeap(); - DWORD LastErr; - INT res = -1; + NTSTATUS Status; + INT res; /* Init Interface-ID-List */ IntfIDList = HeapAlloc(hHeap, 0, sizeof(*IntfIDList)); list_init(&IntfIDList->entry); /* open tcp-driver */ - LastErr = openTcpFile(&TcpFile, FILE_READ_DATA | FILE_WRITE_DATA); - if (!NT_SUCCESS(LastErr)) + Status = openTcpFile(&TcpFile, FILE_READ_DATA | FILE_WRITE_DATA); + if (!NT_SUCCESS(Status)) { - res = (INT)LastErr; + res = RtlNtStatusToDosError(Status); goto cleanup; } @@ -330,8 +329,7 @@ WSHIoctl_GetInterfaceList( &BufLenNeeded, NULL)) { - LastErr = GetLastError(); - DPRINT("DeviceIoControl failed, Status %li!\n", LastErr); + DPRINT("DeviceIoControl failed, Error %ld!\n", GetLastError()); res = WSAEFAULT; goto cleanup; } @@ -426,8 +424,8 @@ WSHIoctl_GetInterfaceList( res = NO_ERROR; cleanup: DPRINT("WSHIoctl_GetInterfaceList - CLEANUP\n"); - if (TcpFile != 0) - NtClose(TcpFile); + if (TcpFile != NULL) + closeTcpFile(TcpFile); if (pIFEntry != NULL) HeapFree(hHeap, 0, pIFEntry); LIST_FOR_EACH_ENTRY_SAFE_REV(pIntfIDItem, pIntfIDNext, diff --git a/dll/win32/wshtcpip/wshtcpip.c b/dll/win32/wshtcpip/wshtcpip.c index a66166c2e8f..b1e822620b5 100644 --- a/dll/win32/wshtcpip/wshtcpip.c +++ b/dll/win32/wshtcpip/wshtcpip.c @@ -417,7 +417,7 @@ SendRequest( closeTcpFile(TcpCC); - DPRINT("DeviceIoControl: %ld\n", ((Success != FALSE) ? 0 : GetLastError())); + DPRINT("DeviceIoControl: %ld\n", (Success ? NO_ERROR : GetLastError())); if (!Success) return WSAEINVAL;

1 year, 3 months

[reactos] 01/02: [NDK] Fix weird "ntstatus.s" statement (#5771)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9021a14f4af8eff8cf990… commit 9021a14f4af8eff8cf990a2812876505a10c0887 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Oct 7 22:11:39 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Oct 8 17:11:25 2023 +0200 [NDK] Fix weird "ntstatus.s" statement (#5771) Spotted by Serge Gautherie. --- sdk/include/ndk/readme.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/ndk/readme.txt b/sdk/include/ndk/readme.txt index 0b67c2dd0bc..b9fe54b90d7 100644 --- a/sdk/include/ndk/readme.txt +++ b/sdk/include/ndk/readme.txt @@ -172,7 +172,7 @@ remain anonymous, simply do not include this statement. * User Mode Application requiring Native Types: - #define WIN32_NO_STATUS /* Tell Windows headers you'll use ntstatus.s from NDK */ + #define WIN32_NO_STATUS /* Tell Windows headers you'll use ntstatus.h from PSDK */ #include "windows.h" /* Declare Windows Headers like you normally would */ #include "ntndk.h" /* Declare the NDK Headers */ @@ -188,7 +188,7 @@ remain anonymous, simply do not include this statement. * You may also include only the files you need (example for User-Mode application): - #define WIN32_NO_STATUS /* Tell Windows headers you'll use ntstatus.s from NDK */ + #define WIN32_NO_STATUS /* Tell Windows headers you'll use ntstatus.h from PSDK */ #include "windows.h" /* Declare Windows Headers like you normally would */ #include "rtlfuncs.h" /* Declare the Rtl* Functions */

1 year, 3 months

[reactos] 01/01: [TASKMGR] *.rc: Fix accelerator collisions &Priority <-> &Properties (#5758)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42c93e3cbb78773eac14a… commit 42c93e3cbb78773eac14ad4c33545ff7a09ef3b0 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Sun Oct 8 01:03:47 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Oct 7 23:03:47 2023 +0000 [TASKMGR] *.rc: Fix accelerator collisions &Priority <-> &Properties (#5758) We had collisions in many languages. For most languages (which are derived from en-US) we should use &Priority P&roperties We introduced the collisions during 0.4.15-dev'ing when MENUITEM ID_PROCESS_PAGE_PROPERTIES and MENUITEM ID_PROCESS_PAGE_OPENFILELOCATION were added. We verified Win7-en and Win2k3-en to behave as proposed in this PR (R for properties, P for priority). But *french* Windows (I believe Hermes picture was from WinVista-fr or Win7-fr or Win10-fr maybe) does it differently. the existing de-DE also has been double-checked to exactly match MS with the accelerators in that menu. --- base/applications/taskmgr/lang/bg-BG.rc | 2 +- base/applications/taskmgr/lang/cs-CZ.rc | 2 +- base/applications/taskmgr/lang/da-DK.rc | 2 +- base/applications/taskmgr/lang/el-GR.rc | 4 ++-- base/applications/taskmgr/lang/en-US.rc | 4 ++-- base/applications/taskmgr/lang/es-ES.rc | 2 +- base/applications/taskmgr/lang/et-EE.rc | 2 +- base/applications/taskmgr/lang/he-IL.rc | 2 +- base/applications/taskmgr/lang/hu-HU.rc | 2 +- base/applications/taskmgr/lang/id-ID.rc | 2 +- base/applications/taskmgr/lang/it-IT.rc | 2 +- base/applications/taskmgr/lang/ja-JP.rc | 2 +- base/applications/taskmgr/lang/ko-KR.rc | 2 +- base/applications/taskmgr/lang/nl-NL.rc | 8 ++++---- base/applications/taskmgr/lang/no-NO.rc | 2 +- base/applications/taskmgr/lang/pl-PL.rc | 2 +- base/applications/taskmgr/lang/pt-BR.rc | 2 +- base/applications/taskmgr/lang/pt-PT.rc | 4 ++-- base/applications/taskmgr/lang/ro-RO.rc | 2 +- base/applications/taskmgr/lang/sk-SK.rc | 2 +- base/applications/taskmgr/lang/sq-AL.rc | 2 +- base/applications/taskmgr/lang/sv-SE.rc | 2 +- base/applications/taskmgr/lang/tr-TR.rc | 2 +- base/applications/taskmgr/lang/uk-UA.rc | 2 +- base/applications/taskmgr/lang/zh-CN.rc | 4 ++-- base/applications/taskmgr/lang/zh-HK.rc | 4 ++-- base/applications/taskmgr/lang/zh-TW.rc | 4 ++-- 27 files changed, 36 insertions(+), 36 deletions(-) diff --git a/base/applications/taskmgr/lang/bg-BG.rc b/base/applications/taskmgr/lang/bg-BG.rc index e8505c05b0e..69bbd1ab122 100644 --- a/base/applications/taskmgr/lang/bg-BG.rc +++ b/base/applications/taskmgr/lang/bg-BG.rc @@ -136,7 +136,7 @@ BEGIN END MENUITEM "Установяване на с&родство...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/cs-CZ.rc b/base/applications/taskmgr/lang/cs-CZ.rc index f15c3b3b7f5..280d0e6aa3a 100644 --- a/base/applications/taskmgr/lang/cs-CZ.rc +++ b/base/applications/taskmgr/lang/cs-CZ.rc @@ -136,7 +136,7 @@ BEGIN END MENUITEM "Nastavit &afinitu...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/da-DK.rc b/base/applications/taskmgr/lang/da-DK.rc index 42162b6c048..7af08f234b9 100644 --- a/base/applications/taskmgr/lang/da-DK.rc +++ b/base/applications/taskmgr/lang/da-DK.rc @@ -136,7 +136,7 @@ BEGIN END MENUITEM "Sæt &Affinitet...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/el-GR.rc b/base/applications/taskmgr/lang/el-GR.rc index f5a3a34598b..0d9068e83f4 100644 --- a/base/applications/taskmgr/lang/el-GR.rc +++ b/base/applications/taskmgr/lang/el-GR.rc @@ -127,7 +127,7 @@ BEGIN MENUITEM "End Process &Tree", ID_PROCESS_PAGE_ENDPROCESSTREE MENUITEM "&Debug", ID_PROCESS_PAGE_DEBUG MENUITEM SEPARATOR - POPUP "Set P&riority" + POPUP "Set &Priority" BEGIN MENUITEM "&Realtime", ID_PROCESS_PAGE_SETPRIORITY_REALTIME MENUITEM "&High", ID_PROCESS_PAGE_SETPRIORITY_HIGH @@ -138,7 +138,7 @@ BEGIN END MENUITEM "Set &Affinity...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/en-US.rc b/base/applications/taskmgr/lang/en-US.rc index d6d45afc0e6..8f7e588b6e2 100644 --- a/base/applications/taskmgr/lang/en-US.rc +++ b/base/applications/taskmgr/lang/en-US.rc @@ -125,7 +125,7 @@ BEGIN MENUITEM "End Process &Tree", ID_PROCESS_PAGE_ENDPROCESSTREE MENUITEM "&Debug", ID_PROCESS_PAGE_DEBUG MENUITEM SEPARATOR - POPUP "Set P&riority" + POPUP "Set &Priority" BEGIN MENUITEM "&Realtime", ID_PROCESS_PAGE_SETPRIORITY_REALTIME MENUITEM "&High", ID_PROCESS_PAGE_SETPRIORITY_HIGH @@ -136,7 +136,7 @@ BEGIN END MENUITEM "Set &Affinity...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/es-ES.rc b/base/applications/taskmgr/lang/es-ES.rc index 6a0f4780a53..35cce6c9f33 100644 --- a/base/applications/taskmgr/lang/es-ES.rc +++ b/base/applications/taskmgr/lang/es-ES.rc @@ -138,7 +138,7 @@ BEGIN END MENUITEM "Establecer &afinidad...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/et-EE.rc b/base/applications/taskmgr/lang/et-EE.rc index ed6eef05a74..5f2af96aedd 100644 --- a/base/applications/taskmgr/lang/et-EE.rc +++ b/base/applications/taskmgr/lang/et-EE.rc @@ -142,7 +142,7 @@ BEGIN END MENUITEM "Määra &ühtivus...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "Prop&erties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/he-IL.rc b/base/applications/taskmgr/lang/he-IL.rc index dea754e3d91..49dc0ff2ec1 100644 --- a/base/applications/taskmgr/lang/he-IL.rc +++ b/base/applications/taskmgr/lang/he-IL.rc @@ -138,7 +138,7 @@ BEGIN END MENUITEM "הגדרת &קירבה", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/hu-HU.rc b/base/applications/taskmgr/lang/hu-HU.rc index 99a18e3eba4..0f240685e7b 100644 --- a/base/applications/taskmgr/lang/hu-HU.rc +++ b/base/applications/taskmgr/lang/hu-HU.rc @@ -139,7 +139,7 @@ BEGIN MENUITEM "&Processzorok használata...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR MENUITEM "&Tulajdonságok", ID_PROCESS_PAGE_PROPERTIES - MENUITEM "Fájl &helyének megnyitása", ID_PROCESS_PAGE_OPENFILELOCATION + MENUITEM "Fájl h&elyének megnyitása", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/id-ID.rc b/base/applications/taskmgr/lang/id-ID.rc index 2052bdd0891..d9c8a1eda13 100644 --- a/base/applications/taskmgr/lang/id-ID.rc +++ b/base/applications/taskmgr/lang/id-ID.rc @@ -138,7 +138,7 @@ BEGIN END MENUITEM "Setel &Afinitas...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/it-IT.rc b/base/applications/taskmgr/lang/it-IT.rc index 2785ef8715d..57d40137744 100644 --- a/base/applications/taskmgr/lang/it-IT.rc +++ b/base/applications/taskmgr/lang/it-IT.rc @@ -136,7 +136,7 @@ BEGIN END MENUITEM "Definisci &Affinità...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/ja-JP.rc b/base/applications/taskmgr/lang/ja-JP.rc index 4565f6cc044..d545e88c677 100644 --- a/base/applications/taskmgr/lang/ja-JP.rc +++ b/base/applications/taskmgr/lang/ja-JP.rc @@ -136,7 +136,7 @@ BEGIN END MENUITEM "関係の設定(&A)...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/ko-KR.rc b/base/applications/taskmgr/lang/ko-KR.rc index d3dd75b0c40..d2dd50f36a1 100644 --- a/base/applications/taskmgr/lang/ko-KR.rc +++ b/base/applications/taskmgr/lang/ko-KR.rc @@ -138,7 +138,7 @@ BEGIN END MENUITEM "선호도 설정(&A)", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/nl-NL.rc b/base/applications/taskmgr/lang/nl-NL.rc index 06702663f7c..19838770442 100644 --- a/base/applications/taskmgr/lang/nl-NL.rc +++ b/base/applications/taskmgr/lang/nl-NL.rc @@ -15,7 +15,7 @@ BEGIN MENUITEM "&Verbergen indien geminimaliseerd", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED MENUITEM "16-&bits taken weergeven", ID_OPTIONS_SHOW16BITTASKS, CHECKED END - POPUP "&Beeld" + POPUP "B&eeld" BEGIN MENUITEM "&Nu vernieuwen", ID_VIEW_REFRESH POPUP "Bijwerk&snelheid" @@ -121,11 +121,11 @@ IDR_PROCESS_PAGE_CONTEXT MENU BEGIN POPUP "DUMMY" BEGIN - MENUITEM "&Proces beëindigen", ID_PROCESS_PAGE_ENDPROCESS + MENUITEM "Pro&ces beëindigen", ID_PROCESS_PAGE_ENDPROCESS MENUITEM "Process&tructuur beëindigen", ID_PROCESS_PAGE_ENDPROCESSTREE MENUITEM "&Fouten opsporen", ID_PROCESS_PAGE_DEBUG MENUITEM SEPARATOR - POPUP "P&rioriteit instellen" + POPUP "&Prioriteit instellen" BEGIN MENUITEM "&Realtime", ID_PROCESS_PAGE_SETPRIORITY_REALTIME MENUITEM "&Hoog", ID_PROCESS_PAGE_SETPRIORITY_HIGH @@ -136,7 +136,7 @@ BEGIN END MENUITEM "&Affiniteit instellen...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/no-NO.rc b/base/applications/taskmgr/lang/no-NO.rc index 7b1a2715f53..31b01b6d973 100644 --- a/base/applications/taskmgr/lang/no-NO.rc +++ b/base/applications/taskmgr/lang/no-NO.rc @@ -136,7 +136,7 @@ BEGIN END MENUITEM "Sett &tiltrekning ...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/pl-PL.rc b/base/applications/taskmgr/lang/pl-PL.rc index ab60fa53be0..ae4b327ea71 100644 --- a/base/applications/taskmgr/lang/pl-PL.rc +++ b/base/applications/taskmgr/lang/pl-PL.rc @@ -143,7 +143,7 @@ BEGIN END MENUITEM "Ustaw &koligację...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/pt-BR.rc b/base/applications/taskmgr/lang/pt-BR.rc index a63fd2319d1..ca351367f6a 100644 --- a/base/applications/taskmgr/lang/pt-BR.rc +++ b/base/applications/taskmgr/lang/pt-BR.rc @@ -136,7 +136,7 @@ BEGIN END MENUITEM "Definir &afinidade...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/pt-PT.rc b/base/applications/taskmgr/lang/pt-PT.rc index 0fe5288defd..3ffd856374e 100644 --- a/base/applications/taskmgr/lang/pt-PT.rc +++ b/base/applications/taskmgr/lang/pt-PT.rc @@ -1,4 +1,4 @@ -/* Translation and UTF-8 Conversion by Gabriel Aguiar(fgsoftware1) <fgygh5804@gmail.com,fgsoftwarestudio@gmail.com> (July, 2021) */ +/* TRANSLATOR: 2021 Gabriel Aguiar <fgygh5804@gmail.com,fgsoftwarestudio@gmail.com> */ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL @@ -138,7 +138,7 @@ BEGIN END MENUITEM "Definir &afinidade...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Propriedades", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&ropriedades", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Abrir localização do ficheiro", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/ro-RO.rc b/base/applications/taskmgr/lang/ro-RO.rc index 9cba5a635f4..84573a284c9 100644 --- a/base/applications/taskmgr/lang/ro-RO.rc +++ b/base/applications/taskmgr/lang/ro-RO.rc @@ -141,7 +141,7 @@ BEGIN END MENUITEM "A&finitate…", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/sk-SK.rc b/base/applications/taskmgr/lang/sk-SK.rc index 75982e1f7f4..67afcebfda8 100644 --- a/base/applications/taskmgr/lang/sk-SK.rc +++ b/base/applications/taskmgr/lang/sk-SK.rc @@ -138,7 +138,7 @@ BEGIN END MENUITEM "Nastaviť &afinitu...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/sq-AL.rc b/base/applications/taskmgr/lang/sq-AL.rc index d0753d2889b..a22ff20f7ba 100644 --- a/base/applications/taskmgr/lang/sq-AL.rc +++ b/base/applications/taskmgr/lang/sq-AL.rc @@ -139,7 +139,7 @@ BEGIN END MENUITEM "Vendos prirje...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/sv-SE.rc b/base/applications/taskmgr/lang/sv-SE.rc index 9e5315c58c1..aefb89ba2e4 100644 --- a/base/applications/taskmgr/lang/sv-SE.rc +++ b/base/applications/taskmgr/lang/sv-SE.rc @@ -138,7 +138,7 @@ BEGIN END MENUITEM "Välj &källa (FIXME)...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/tr-TR.rc b/base/applications/taskmgr/lang/tr-TR.rc index 201bc7c4498..d55c1118996 100644 --- a/base/applications/taskmgr/lang/tr-TR.rc +++ b/base/applications/taskmgr/lang/tr-TR.rc @@ -138,7 +138,7 @@ BEGIN END MENUITEM "İ&lişkiyi Ayarla...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/uk-UA.rc b/base/applications/taskmgr/lang/uk-UA.rc index 59372ae4607..340e631ce8f 100644 --- a/base/applications/taskmgr/lang/uk-UA.rc +++ b/base/applications/taskmgr/lang/uk-UA.rc @@ -136,7 +136,7 @@ BEGIN END MENUITEM "У&становити відповідність...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "P&roperties", ID_PROCESS_PAGE_PROPERTIES MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/zh-CN.rc b/base/applications/taskmgr/lang/zh-CN.rc index d81a7ce540f..5be7e478ead 100644 --- a/base/applications/taskmgr/lang/zh-CN.rc +++ b/base/applications/taskmgr/lang/zh-CN.rc @@ -143,8 +143,8 @@ BEGIN END MENUITEM "关系设置(&A)...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES - MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION + MENUITEM "Properties(&R)", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "Open File Location(&O)", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/zh-HK.rc b/base/applications/taskmgr/lang/zh-HK.rc index e50b521c256..65a336bc9f0 100644 --- a/base/applications/taskmgr/lang/zh-HK.rc +++ b/base/applications/taskmgr/lang/zh-HK.rc @@ -144,8 +144,8 @@ BEGIN END MENUITEM "親和性設定(&A)...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES - MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION + MENUITEM "Properties(&R)", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "Open File Location(&O)", ID_PROCESS_PAGE_OPENFILELOCATION END END diff --git a/base/applications/taskmgr/lang/zh-TW.rc b/base/applications/taskmgr/lang/zh-TW.rc index 0c10bb3afd7..dad1b8ae772 100644 --- a/base/applications/taskmgr/lang/zh-TW.rc +++ b/base/applications/taskmgr/lang/zh-TW.rc @@ -144,8 +144,8 @@ BEGIN END MENUITEM "親和性設定(&A)...", ID_PROCESS_PAGE_SETAFFINITY MENUITEM SEPARATOR - MENUITEM "&Properties", ID_PROCESS_PAGE_PROPERTIES - MENUITEM "&Open File Location", ID_PROCESS_PAGE_OPENFILELOCATION + MENUITEM "Properties(&R)", ID_PROCESS_PAGE_PROPERTIES + MENUITEM "Open File Location(&O)", ID_PROCESS_PAGE_OPENFILELOCATION END END

1 year, 3 months

[reactos] 01/01: [DESK] Use MultiByteToWideChar instead of the private pSetupMultiByteToUnicode function (#5765)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce08851758fa938650fd3… commit ce08851758fa938650fd3faae7d9b2ef499175e1 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Oct 5 22:41:16 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 7 22:17:58 2023 +0200 [DESK] Use MultiByteToWideChar instead of the private pSetupMultiByteToUnicode function (#5765) This avoids having desk.cpl depend on a private function that may change or disappear, and increase the probability of being able to use that CPL across different Windows versions. (Note: this pSetupMultiByteToUnicode was one of those whose name changed between Windows 2000 and XP+) --- dll/cpl/desk/desk.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dll/cpl/desk/desk.c b/dll/cpl/desk/desk.c index 7a34e2420b4..0bbfc7a4a0e 100644 --- a/dll/cpl/desk/desk.c +++ b/dll/cpl/desk/desk.c @@ -8,8 +8,11 @@ */ #include "desk.h" + #include <shellapi.h> #include <cplext.h> +#include <winnls.h> + #include <debug.h> #define NUM_APPLETS (1) @@ -364,6 +367,7 @@ InstallScreenSaverA( IN UINT nCmdShow) { LPWSTR lpwString; + int nLength; if (!pszFile) { @@ -371,16 +375,32 @@ InstallScreenSaverA( SetLastError(ERROR_INVALID_PARAMETER); return; } - DPRINT("InstallScreenSaver() Install from file %s\n", pszFile); - lpwString = pSetupMultiByteToUnicode(pszFile, 0); + + /* Convert the string to unicode */ + lpwString = NULL; + nLength = MultiByteToWideChar(CP_ACP, 0, pszFile, -1, NULL, 0); + if (nLength != 0) + { + lpwString = LocalAlloc(LMEM_FIXED, nLength * sizeof(WCHAR)); + if (lpwString) + { + if (!MultiByteToWideChar(CP_ACP, 0, pszFile, -1, lpwString, nLength)) + { + LocalFree(lpwString); + lpwString = NULL; + } + } + } if (!lpwString) { DPRINT("InstallScreenSaver() not enough memory to convert string to unicode\n"); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); return; } + + /* Call the unicode function */ InstallScreenSaverW(hWindow, hInstance, lpwString, nCmdShow); - MyFree(lpwString); + + LocalFree(lpwString); } BOOL WINAPI

1 year, 3 months

[reactos] 01/01: [DESK][SHELLBTRFS] Fix typo in WIN32_NO_STATUS

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4608f7450b3e1daedd7a… commit e4608f7450b3e1daedd7abce40d5f7fcaed68077 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Oct 5 22:17:38 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 7 22:15:12 2023 +0200 [DESK][SHELLBTRFS] Fix typo in WIN32_NO_STATUS --- dll/cpl/desk/guid.c | 2 +- dll/shellext/shellbtrfs/guid.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/desk/guid.c b/dll/cpl/desk/guid.c index 90adf666482..c30d002fbf3 100644 --- a/dll/cpl/desk/guid.c +++ b/dll/cpl/desk/guid.c @@ -1,6 +1,6 @@ /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ -#define WIN32_NO_STATuS +#define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H diff --git a/dll/shellext/shellbtrfs/guid.c b/dll/shellext/shellbtrfs/guid.c index 2396fb1c59b..e360d3ae72f 100644 --- a/dll/shellext/shellbtrfs/guid.c +++ b/dll/shellext/shellbtrfs/guid.c @@ -1,6 +1,6 @@ /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ -#define WIN32_NO_STATuS +#define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H

1 year, 3 months

[reactos] 01/01: [NETID] Simplify IsUserAdmin() helper implementation (#5763)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d0b43a399f47eeb21c44a… commit d0b43a399f47eeb21c44a353a96d402bc8332601 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Oct 6 14:45:52 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Oct 7 21:52:36 2023 +0200 [NETID] Simplify IsUserAdmin() helper implementation (#5763) Addendum to commit 8c4b0c914. Base ourselves on pSetupIsUserAdmin() and other similar functions in our codebase. Note that what we are actually interested here, is whether the current thread runs with Administrator privileges. (As noticed by contributor 'whindsaks', "Not only is this code simpler, it now will correctly handle deny-only SIDs in the token!") --- dll/win32/netid/netid.c | 58 ++++++++++--------------------------------------- 1 file changed, 11 insertions(+), 47 deletions(-) diff --git a/dll/win32/netid/netid.c b/dll/win32/netid/netid.c index ce3dfb6f417..1e2b08740c8 100644 --- a/dll/win32/netid/netid.c +++ b/dll/win32/netid/netid.c @@ -162,58 +162,22 @@ GetComputerNames( static BOOL IsUserAdmin(VOID) { + BOOL bIsAdmin; SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY}; - PSID pAdminsSid = NULL; - HANDLE hToken = NULL; - PTOKEN_GROUPS pGroups = NULL; - BOOL bIsAdmin = FALSE; - DWORD dwSize, i; - - if (!AllocateAndInitializeSid(&Authority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, - &pAdminsSid)) - return FALSE; - - if (!OpenProcessToken(GetCurrentProcess(), - TOKEN_QUERY, - &hToken)) - goto done; + PSID pAdminsSid; - if (GetTokenInformation(hToken, TokenGroups, NULL, 0, &dwSize) || - GetLastError() != ERROR_INSUFFICIENT_BUFFER) - { - goto done; - } - - pGroups = HeapAlloc(GetProcessHeap(), 0, dwSize); - if (pGroups == NULL) - goto done; - - if (!GetTokenInformation(hToken, - TokenGroups, - pGroups, - dwSize, - &dwSize)) - goto done; - - for (i = 0; i < pGroups->GroupCount; i++) + if (!AllocateAndInitializeSid(&Authority, 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, + &pAdminsSid)) { - if (EqualSid(pGroups->Groups[i].Sid, pAdminsSid)) - { - bIsAdmin = TRUE; - break; - } + return FALSE; } -done: - if (pGroups != NULL) - HeapFree(GetProcessHeap(), 0, pGroups); - - if (hToken != NULL) - CloseHandle(hToken); - - if (pAdminsSid != NULL) - FreeSid(pAdminsSid); + if (!CheckTokenMembership(NULL, pAdminsSid, &bIsAdmin)) + bIsAdmin = FALSE; + FreeSid(pAdminsSid); return bIsAdmin; }

1 year, 3 months

[reactos] 01/01: [NTOS:MM/x64] Temporarily release AddressCreationLock in MmCreateVirtualMappingUnsafeEx

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e685b25e35c9d6dfbe213… commit e685b25e35c9d6dfbe2139ac71f7378b1f9e6d0f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Sep 28 20:29:43 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Oct 7 10:58:30 2023 +0300 [NTOS:MM/x64] Temporarily release AddressCreationLock in MmCreateVirtualMappingUnsafeEx This is a hack, because the kernel mode path can incur a recursive page fault with the AddressCreationLock acquired, which would lead to a recursive acquisition, once we do proper locking in MmAccessFault. To properly fix this the PDE must be made valid, similar to the user mode path, but that is not that simple... --- ntoskrnl/mm/i386/page.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/ntoskrnl/mm/i386/page.c b/ntoskrnl/mm/i386/page.c index df13cb013e2..eeccef94346 100644 --- a/ntoskrnl/mm/i386/page.c +++ b/ntoskrnl/mm/i386/page.c @@ -637,6 +637,9 @@ MmCreateVirtualMappingUnsafeEx( PMMPTE PointerPte; MMPTE TempPte; ULONG_PTR Pte; +#ifdef _M_AMD64 + BOOLEAN LockReleased = FALSE; +#endif DPRINT("MmCreateVirtualMappingUnsafe(%p, %p, %lu, %x)\n", Process, Address, flProtect, Page); @@ -665,6 +668,15 @@ MmCreateVirtualMappingUnsafeEx( if (!MiSynchronizeSystemPde(MiAddressToPde(Address))) MiFillSystemPageDirectory(Address, PAGE_SIZE); #endif + +#ifdef _M_AMD64 + /* This is a temporary hack, because we can incur a recursive page fault when accessing the PDE */ + if (PsIdleProcess->AddressCreationLock.Owner == KeGetCurrentThread()) + { + MmUnlockAddressSpace(MmGetKernelAddressSpace()); + LockReleased = TRUE; + } +#endif } else { @@ -715,6 +727,15 @@ MmCreateVirtualMappingUnsafeEx( MiIncrementPageTableReferences(Address); MiUnlockProcessWorkingSetUnsafe(Process, PsGetCurrentThread()); } +#ifdef _M_AMD64 + else + { + if (LockReleased) + { + MmLockAddressSpace(MmGetKernelAddressSpace()); + } + } +#endif return(STATUS_SUCCESS); }

1 year, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs