Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [TASKMGR] Simplify status-bar display when menus are shown (#5578) CORE-19061

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cdba812252d807c8aa64b… commit cdba812252d807c8aa64bc586055c03e9c39ff5a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 16 17:01:13 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 24 16:47:32 2023 +0200 [TASKMGR] Simplify status-bar display when menus are shown (#5578) CORE-19061 Following PR #5571 (commit 2d53e953c), it became apparent that the management of the status-bar when showing the menu hints could be simplified further. Use "simple-text" status-bar display mode when showing menu hints. The original status-bar panes state is "remembered" and are automatically restored when the "simple-text" mode is disabled. --- base/applications/taskmgr/perfpage.c | 10 ++-- base/applications/taskmgr/taskmgr.c | 95 +++++++++++++++--------------------- base/applications/taskmgr/taskmgr.h | 2 - 3 files changed, 43 insertions(+), 64 deletions(-) diff --git a/base/applications/taskmgr/perfpage.c b/base/applications/taskmgr/perfpage.c index 9e601041bd4..c9abb74cd15 100644 --- a/base/applications/taskmgr/perfpage.c +++ b/base/applications/taskmgr/perfpage.c @@ -8,8 +8,6 @@ #include "precomp.h" #include <shlwapi.h> -extern BOOL bInMenuLoop; /* Tells us if we are in the menu loop - from taskmgr.c */ - TM_GRAPH_CONTROL PerformancePageCpuUsageHistoryGraph; TM_GRAPH_CONTROL PerformancePageMemUsageHistoryGraph; @@ -328,6 +326,8 @@ DWORD WINAPI PerformancePageRefreshThread(PVOID Parameter) while (1) { + extern BOOL bTrackMenu; // From taskmgr.c + int nBarsUsed1; int nBarsUsed2; @@ -361,7 +361,7 @@ DWORD WINAPI PerformancePageRefreshThread(PVOID Parameter) szChargeLimitFormat, ARRAYSIZE(szChargeLimitFormat)); - if (!bInMenuLoop) + if (!bTrackMenu) { wsprintfW(Text, szMemUsage, szChargeTotalFormat, szChargeLimitFormat, (CommitChargeLimit ? ((CommitChargeTotal * 100) / CommitChargeLimit) : 0)); @@ -406,7 +406,7 @@ DWORD WINAPI PerformancePageRefreshThread(PVOID Parameter) SetWindowTextW(hTotalsThreadCountEdit, Text); _ultow(TotalProcesses, Text, 10); SetWindowTextW(hTotalsProcessCountEdit, Text); - if (!bInMenuLoop) + if (!bTrackMenu) { wsprintfW(Text, szProcesses, TotalProcesses); SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)Text); @@ -424,7 +424,7 @@ DWORD WINAPI PerformancePageRefreshThread(PVOID Parameter) CpuUsage = PerfDataGetProcessorUsage(); CpuKernelUsage = PerfDataGetProcessorSystemUsage(); - if (!bInMenuLoop) + if (!bTrackMenu) { wsprintfW(Text, szCpuUsage, CpuUsage); SendMessageW(hStatusWnd, SB_SETTEXT, 1, (LPARAM)Text); diff --git a/base/applications/taskmgr/taskmgr.c b/base/applications/taskmgr/taskmgr.c index 6cbf8c7994e..bf24eef8b39 100644 --- a/base/applications/taskmgr/taskmgr.c +++ b/base/applications/taskmgr/taskmgr.c @@ -31,7 +31,7 @@ int nMinimumHeight; /* Minimum height of the dialog (OnSize()'s cy) int nOldWidth; /* Holds the previous client area width */ int nOldHeight; /* Holds the previous client area height */ -BOOL bInMenuLoop = FALSE; /* Tells us if we are in the menu loop */ +BOOL bTrackMenu = FALSE; /* Signals when we display menu hints */ BOOL bWasKeyboardInput = FALSE; /* TabChange by Keyboard or Mouse ? */ TASKMANAGER_SETTINGS TaskManagerSettings; @@ -482,24 +482,10 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) TrayIcon_UpdateIcon(); break; - case WM_INITMENUPOPUP: - /* Do not disable the status bar if we opened the system menu */ - if (!HIWORD(lParam)) - TaskManager_DisableStatusBar(hDlg); - else - TaskManager_EnableStatusBar(hDlg); - break; - case WM_ENTERMENULOOP: - bInMenuLoop = TRUE; - break; - case WM_EXITMENULOOP: - bInMenuLoop = FALSE; - TaskManager_EnableStatusBar(hDlg); - break; case WM_MENUSELECT: - if (!(HIWORD(wParam) & MF_SYSMENU)) - TaskManager_OnMenuSelect(hDlg, LOWORD(wParam), HIWORD(wParam), (HMENU)lParam); + TaskManager_OnMenuSelect(hDlg, LOWORD(wParam), HIWORD(wParam), (HMENU)lParam); break; + case WM_SYSCOLORCHANGE: /* Forward WM_SYSCOLORCHANGE to common controls */ SendMessage(hApplicationPageListCtrl, WM_SYSCOLORCHANGE, 0, 0); @@ -569,7 +555,7 @@ BOOL OnCreate(HWND hWnd) nParts[0] = STATUS_SIZE1; nParts[1] = STATUS_SIZE2; nParts[2] = STATUS_SIZE3; - SendMessageW(hStatusWnd, SB_SETPARTS, 3, (LPARAM) (LPINT) nParts); + SendMessageW(hStatusWnd, SB_SETPARTS, _countof(nParts), (LPARAM)(LPINT)nParts); /* Create tab pages */ hTabWnd = GetDlgItem(hWnd, IDC_TAB); @@ -758,10 +744,8 @@ void OnSize( WPARAM nType, int cx, int cy ) if (nType == SIZE_MINIMIZED) { - if(TaskManagerSettings.HideWhenMinimized) - { - ShowWindow(hMainWnd, SW_HIDE); - } + if (TaskManagerSettings.HideWhenMinimized) + ShowWindow(hMainWnd, SW_HIDE); return; } @@ -775,10 +759,10 @@ void OnSize( WPARAM nType, int cx, int cy ) SendMessageW(hStatusWnd, WM_SIZE, nType, MAKELPARAM(cx,rc.bottom - rc.top)); /* Update the status bar pane sizes */ - nParts[0] = bInMenuLoop ? -1 : STATUS_SIZE1; + nParts[0] = STATUS_SIZE1; nParts[1] = STATUS_SIZE2; nParts[2] = cx; - SendMessageW(hStatusWnd, SB_SETPARTS, bInMenuLoop ? 1 : 3, (LPARAM) (LPINT) nParts); + SendMessageW(hStatusWnd, SB_SETPARTS, _countof(nParts), (LPARAM)(LPINT)nParts); /* Resize the tab control */ GetWindowRect(hTabWnd, &rc); @@ -896,46 +880,43 @@ void TaskManager_OnRestoreMainWindow(void) SetWindowPos(hMainWnd, (OnTop ? HWND_TOPMOST : HWND_TOP), 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_SHOWWINDOW); } -void TaskManager_DisableStatusBar(HWND hWnd) -{ - int nParts; - - /* Update the status bar pane sizes */ - nParts = -1; - SendMessageW(hStatusWnd, SB_SETPARTS, 1, (LPARAM) (LPINT)&nParts); - SendMessageW(hStatusWnd, SB_SETTEXT, (WPARAM)0, (LPARAM)L""); -} - -void TaskManager_EnableStatusBar(HWND hWnd) +void TaskManager_OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu) { - RECT rc; - int nParts[3]; + WCHAR str[100] = L""; - /* Update the status bar pane sizes */ - GetClientRect(hWnd, &rc); - nParts[0] = STATUS_SIZE1; - nParts[1] = STATUS_SIZE2; - nParts[2] = rc.right; - SendMessageW(hStatusWnd, SB_SETPARTS, 3, (LPARAM) (LPINT) nParts); + /* + * Reset the status bar if we close the current menu, or + * we open the system menu or hover above a menu separator. + * Adapted from comctl32!MenuHelp(). + */ + if ((LOWORD(nFlags) == 0xFFFF && hSysMenu == NULL) || + (nFlags & (MF_SEPARATOR | MF_SYSMENU))) + { + /* Set the status bar for multiple-parts output */ + SendMessageW(hStatusWnd, SB_SIMPLE, (WPARAM)FALSE, (LPARAM)0); + bTrackMenu = FALSE; - /* trigger update of status bar columns and performance page asynchronously */ - RefreshPerformancePage(); -} + /* Trigger update of status bar columns and performance page asynchronously */ + RefreshPerformancePage(); + return; + } -void TaskManager_OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu) -{ - WCHAR str[100]; - - wcscpy(str, L""); - if (LoadStringW(hInst, nItemID, str, 100)) { - /* load appropriate string */ - LPWSTR lpsz = str; - /* first newline terminates actual string */ - lpsz = wcschr(lpsz, '\n'); + /* Otherwise, retrieve the appropriate menu hint string */ + if (LoadStringW(hInst, nItemID, str, _countof(str))) + { + /* First newline terminates actual string */ + LPWSTR lpsz = wcschr(str, '\n'); if (lpsz != NULL) *lpsz = '\0'; } - SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)str); + + /* Set the status bar for single-part output, if needed... */ + if (!bTrackMenu) + SendMessageW(hStatusWnd, SB_SIMPLE, (WPARAM)TRUE, (LPARAM)0); + bTrackMenu = TRUE; + + /* ... and display the menu hint */ + SendMessageW(hStatusWnd, SB_SETTEXT, SB_SIMPLEID | SBT_NOBORDERS, (LPARAM)str); } void TaskManager_OnViewUpdateSpeed(DWORD dwSpeed) diff --git a/base/applications/taskmgr/taskmgr.h b/base/applications/taskmgr/taskmgr.h index a3b6220e8b9..e65ef30221f 100644 --- a/base/applications/taskmgr/taskmgr.h +++ b/base/applications/taskmgr/taskmgr.h @@ -94,8 +94,6 @@ void FillSolidRect(HDC hDC, LPCRECT lpRect, COLORREF clr); void LoadSettings(void); void SaveSettings(void); void TaskManager_OnRestoreMainWindow(void); -void TaskManager_DisableStatusBar(HWND hWnd); -void TaskManager_EnableStatusBar(HWND hWnd); void TaskManager_OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu); void TaskManager_OnViewUpdateSpeed(DWORD); void TaskManager_OnTabWndSelChange(void);

1 year, 10 months

[reactos] 02/02: [NTUSER] Set correct lParam for WM_(UN)INITMENUPOPUP (#5573)

by Egor Ananyin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ae0ccdccb6566ba49ccc… commit 3ae0ccdccb6566ba49ccc803dab7733ce574f820 Author: Egor Ananyin <ananinegor(a)gmail.com> AuthorDate: Sun Aug 13 10:45:30 2023 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 24 16:33:03 2023 +0200 [NTUSER] Set correct lParam for WM_(UN)INITMENUPOPUP (#5573) This is needed to allow apps to detect whether the opened menu is a system menu or a user menu. CORE-19061 --- win32ss/user/ntuser/menu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index ebade16f1b7..869b9bb4cc4 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -58,7 +58,7 @@ BOOL fInEndMenu = FALSE; #define MII_STATE_MASK (MFS_GRAYED|MFS_CHECKED|MFS_HILITE|MFS_DEFAULT) #define IS_SYSTEM_MENU(MenuInfo) \ - (!((MenuInfo)->fFlags & MNF_POPUP) && ((MenuInfo)->fFlags & MNF_SYSMENU)) + (!!((MenuInfo)->fFlags & MNF_SYSMENU)) #define IS_MAGIC_BITMAP(id) ((id) && ((INT_PTR)(id) < 12) && ((INT_PTR)(id) >= -1)) #define IS_STRING_ITEM(flags) (MF_STRING == MENU_ITEM_TYPE(flags)) @@ -3292,7 +3292,7 @@ static void FASTCALL MENU_HideSubPopups(PWND pWndOwner, PMENU Menu, if (!(wFlags & TPM_NONOTIFY)) { co_IntSendMessage( UserHMGetHandle(pWndOwner), WM_UNINITMENUPOPUP, (WPARAM)UserHMGetHandle(Item->spSubMenu), - MAKELPARAM(0, IS_SYSTEM_MENU(Item->spSubMenu)) ); + MAKELPARAM(0, IS_SYSTEM_MENU(Item->spSubMenu) ? MF_SYSMENU : 0)); } //// // Call WM_UNINITMENUPOPUP FIRST before destroy!! @@ -4362,7 +4362,7 @@ static INT FASTCALL MENU_TrackMenu(PMENU pmenu, UINT wFlags, INT x, INT y, if (!(wFlags & TPM_NONOTIFY)) { co_IntSendMessage( UserHMGetHandle(mt.OwnerWnd), WM_UNINITMENUPOPUP, (WPARAM)UserHMGetHandle(mt.TopMenu), - MAKELPARAM(0, IS_SYSTEM_MENU(mt.TopMenu)) ); + MAKELPARAM(0, IS_SYSTEM_MENU(mt.TopMenu) ? MF_SYSMENU : 0)); } } MENU_SelectItem( mt.OwnerWnd, mt.TopMenu, NO_SELECTED_ITEM, FALSE, 0 ); @@ -4585,7 +4585,7 @@ BOOL WINAPI IntTrackPopupMenuEx( PMENU menu, UINT wFlags, int x, int y, /* Send WM_INITMENUPOPUP message only if TPM_NONOTIFY flag is not specified */ if (!(wFlags & TPM_NONOTIFY)) { - co_IntSendMessage( UserHMGetHandle(pWnd), WM_INITMENUPOPUP, (WPARAM) UserHMGetHandle(menu), 0); + co_IntSendMessage( UserHMGetHandle(pWnd), WM_INITMENUPOPUP, (WPARAM) UserHMGetHandle(menu), MAKELPARAM(0, IS_SYSTEM_MENU(menu))); } if (menu->fFlags & MNF_SYSMENU) @@ -4615,7 +4615,7 @@ BOOL WINAPI IntTrackPopupMenuEx( PMENU menu, UINT wFlags, int x, int y, if (!(wFlags & TPM_NONOTIFY)) { co_IntSendMessage( UserHMGetHandle(pWnd), WM_UNINITMENUPOPUP, (WPARAM)UserHMGetHandle(menu), - MAKELPARAM(0, IS_SYSTEM_MENU(menu)) ); + MAKELPARAM(0, IS_SYSTEM_MENU(menu) ? MF_SYSMENU : 0)); } } }

1 year, 10 months

[reactos] 01/02: [USER32_APITEST] Add a test for system menu messages (#5573)

by Egor Ananyin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26ffe2f826c9c3e98023d… commit 26ffe2f826c9c3e98023d3274fa681d2f66c988b Author: Egor Ananyin <ananinegor(a)gmail.com> AuthorDate: Sat Aug 19 10:13:43 2023 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 24 16:33:03 2023 +0200 [USER32_APITEST] Add a test for system menu messages (#5573) Based on msg.c Wine test. CORE-19061 --- modules/rostests/apitests/user32/CMakeLists.txt | 1 + modules/rostests/apitests/user32/SystemMenu.c | 777 ++++++++++++++++++++++++ modules/rostests/apitests/user32/testlist.c | 2 + 3 files changed, 780 insertions(+) diff --git a/modules/rostests/apitests/user32/CMakeLists.txt b/modules/rostests/apitests/user32/CMakeLists.txt index 4ab323f327c..4ecc693f1ed 100644 --- a/modules/rostests/apitests/user32/CMakeLists.txt +++ b/modules/rostests/apitests/user32/CMakeLists.txt @@ -50,6 +50,7 @@ list(APPEND SOURCE SetScrollRange.c ShowWindow.c SwitchToThisWindow.c + SystemMenu.c SystemParametersInfo.c TrackMouseEvent.c VirtualKey.c diff --git a/modules/rostests/apitests/user32/SystemMenu.c b/modules/rostests/apitests/user32/SystemMenu.c new file mode 100644 index 00000000000..8d07ccf3bf5 --- /dev/null +++ b/modules/rostests/apitests/user32/SystemMenu.c @@ -0,0 +1,777 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Tests for system menu messages, based on msg.c Wine test + * COPYRIGHT: Copyright 1999 Ove Kaaven <ovek(a)transgaming.com> + * Copyright 2003 Dimitrie O. Paun <dimi(a)lattica.com> + * Copyright 2004-2005, 2016 Dmitry Timoshkov <dmitry(a)baikal.ru> + * Copyright 2023 Egor Ananyin <ananinegor(a)gmail.com> + */ + +#include "precomp.h" + +#define WND_PARENT_ID 1 +#define WND_POPUP_ID 2 + +static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); +static BOOL (WINAPI *pQueryActCtxW)(DWORD, HANDLE, void *, ULONG, void *, SIZE_T, SIZE_T *); + +static BOOL test_DestroyWindow_flag; +static HWINEVENTHOOK hEvent_hook; +static HHOOK hKBD_hook; +static HHOOK hCBT_hook; +static DWORD cbt_hook_thread_id; + +typedef enum +{ + sent = 0x1, + posted = 0x2, + parent = 0x4, + wparam = 0x8, + lparam = 0x10, + defwinproc = 0x20, + beginpaint = 0x40, + optional = 0x80, + hook = 0x100, + winevent_hook = 0x200, + kbd_hook = 0x400 +} msg_flags_t; + +struct message +{ + UINT message; /* the WM_* code */ + msg_flags_t flags; /* message props */ + WPARAM wParam; /* expected value of wParam */ + LPARAM lParam; /* expected value of lParam */ + WPARAM wp_mask; /* mask for wParam checks */ + LPARAM lp_mask; /* mask for lParam checks */ +}; + +struct recvd_message +{ + UINT message; /* the WM_* code */ + msg_flags_t flags; /* message props */ + HWND hwnd; /* window that received the message */ + WPARAM wParam; /* expected value of wParam */ + LPARAM lParam; /* expected value of lParam */ + int line; /* source line where logged */ + const char *descr; /* description for trace output */ + char output[512]; /* trace output */ +}; + +static int sequence_cnt, sequence_size; +static struct recvd_message* sequence; +static CRITICAL_SECTION sequence_cs; + +/* user32 functions */ +static HWND (WINAPI *pGetAncestor)(HWND, UINT); +static BOOL (WINAPI *pUnhookWinEvent)(HWINEVENTHOOK); + +static void init_procs(void) +{ + HMODULE user32 = GetModuleHandleA("user32.dll"); + +#define GET_PROC(dll, func) \ + p ## func = (void*)GetProcAddress(dll, #func); \ + if (!p ## func) { \ + trace("GetProcAddress(%s) failed\n", #func); \ + } + + GET_PROC(user32, GetAncestor) + GET_PROC(user32, UnhookWinEvent) + +#undef GET_PROC +} + +static BOOL ignore_message(UINT message) +{ + /* these are always ignored */ + return (message >= 0xc000 || + message == WM_GETICON || + message == WM_GETOBJECT || + message == WM_TIMECHANGE || + message == WM_DISPLAYCHANGE || + message == WM_DEVICECHANGE || + message == WM_DWMNCRENDERINGCHANGED); +} + +#define add_message(msg) add_message_(__LINE__, msg); +static void add_message_(int line, const struct recvd_message *msg) +{ + struct recvd_message *seq; + + EnterCriticalSection(&sequence_cs); + if (!sequence) + { + sequence_size = 10; + sequence = HeapAlloc(GetProcessHeap(), 0, sequence_size * sizeof(*sequence)); + } + if (sequence_cnt == sequence_size) + { + sequence_size *= 2; + sequence = HeapReAlloc(GetProcessHeap(), 0, sequence, sequence_size * sizeof(*sequence)); + } + assert(sequence); + + seq = &sequence[sequence_cnt++]; + seq->hwnd = msg->hwnd; + seq->message = msg->message; + seq->flags = msg->flags; + seq->wParam = msg->wParam; + seq->lParam = msg->lParam; + seq->line = line; + seq->descr = msg->descr; + seq->output[0] = 0; + LeaveCriticalSection(&sequence_cs); + + if (msg->descr) + { + if (msg->flags & hook) + { + static const char * const CBT_code_name[10] = + { + "HCBT_MOVESIZE", + "HCBT_MINMAX", + "HCBT_QS", + "HCBT_CREATEWND", + "HCBT_DESTROYWND", + "HCBT_ACTIVATE", + "HCBT_CLICKSKIPPED", + "HCBT_KEYSKIPPED", + "HCBT_SYSCOMMAND", + "HCBT_SETFOCUS" + }; + const char *code_name = (msg->message <= HCBT_SETFOCUS ? CBT_code_name[msg->message] : "Unknown"); + + sprintf(seq->output, "%s: hook %d (%s) wp %08Ix lp %08Ix", + msg->descr, msg->message, code_name, msg->wParam, msg->lParam); + } + else if (msg->flags & winevent_hook) + { + sprintf(seq->output, "%s: winevent %p %08x %08Ix %08Ix", + msg->descr, msg->hwnd, msg->message, msg->wParam, msg->lParam); + } + else + { + if (msg->message >= 0xc000) + return; /* ignore registered messages */ + sprintf(seq->output, "%s: %p %04x wp %08Ix lp %08Ix", + msg->descr, msg->hwnd, msg->message, msg->wParam, msg->lParam); + if (msg->flags & (sent | posted | parent | defwinproc | beginpaint)) + sprintf(seq->output + strlen(seq->output), " (flags %x)", msg->flags); + } + } +} + +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) + break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + diff = time - GetTickCount(); + } +} + +static void flush_sequence(void) +{ + EnterCriticalSection(&sequence_cs); + HeapFree(GetProcessHeap(), 0, sequence); + sequence = 0; + sequence_cnt = sequence_size = 0; + LeaveCriticalSection(&sequence_cs); +} + +static void dump_sequence(const struct message *expected, const char *context, const char *file, int line) +{ + const struct recvd_message *actual = sequence; + unsigned int count = 0; + + trace_(file, line)("Failed sequence %s:\n", context); + + while (expected->message && actual->message) + { + if (actual->output[0]) + { + if (expected->flags & hook) + { + trace_(file, line)(" %u: expected: hook %04x - actual: %s\n", + count, expected->message, actual->output); + } + else if (expected->flags & winevent_hook) + { + trace_(file, line)(" %u: expected: winevent %04x - actual: %s\n", + count, expected->message, actual->output); + } + else if (expected->flags & kbd_hook) + { + trace_(file, line)(" %u: expected: kbd %04x - actual: %s\n", + count, expected->message, actual->output); + } + else + { + trace_(file, line)(" %u: expected: msg %04x - actual: %s\n", + count, expected->message, actual->output); + } + } + + if (expected->message == actual->message) + { + if ((expected->flags & defwinproc) != (actual->flags & defwinproc) && + (expected->flags & optional)) + { + /* don't match messages if their defwinproc status differs */ + expected++; + } + else + { + expected++; + actual++; + } + } + /* silently drop winevent messages if there is no support for them */ + else if ((expected->flags & optional) || ((expected->flags & winevent_hook) && !hEvent_hook)) + expected++; + else + { + expected++; + actual++; + } + + count++; + } + + /* optional trailing messages */ + while (expected->message && ((expected->flags & optional) || + ((expected->flags & winevent_hook) && !hEvent_hook))) + { + trace_(file, line)(" %u: expected: msg %04x - actual: nothing\n", count, expected->message); + expected++; + count++; + } + + if (expected->message) + { + trace_(file, line)(" %u: expected: msg %04x - actual: nothing\n", count, expected->message); + return; + } + + while (actual->message && actual->output[0]) + { + trace_(file, line)(" %u: expected: nothing - actual: %s\n", count, actual->output); + actual++; + count++; + } +} + +#define ok_sequence(exp, contx, todo) \ + ok_sequence_((exp), (contx), (todo), __FILE__, __LINE__) + + +static void ok_sequence_(const struct message *expected_list, const char *context, BOOL todo, + const char *file, int line) +{ + static const struct recvd_message end_of_sequence; + const struct message *expected = expected_list; + const struct recvd_message *actual; + int failcount = 0, dump = 0; + unsigned int count = 0; + + add_message(&end_of_sequence); + + actual = sequence; + + while (expected->message && actual->message) + { + if (expected->message == actual->message && + !((expected->flags ^ actual->flags) & (hook | winevent_hook | kbd_hook))) + { + if (expected->flags & wparam) + { + if (((expected->wParam ^ actual->wParam) & ~expected->wp_mask) && todo) + { + todo_wine + { + failcount++; + if (strcmp(winetest_platform, "wine")) + dump++; + ok_( file, line) (FALSE, + "%s: %u: in msg 0x%04x expecting wParam 0x%x got 0x%x\n", + context, count, expected->message, expected->wParam, actual->wParam); + } + } + else + { + ok_( file, line)(((expected->wParam ^ actual->wParam) & ~expected->wp_mask) == 0, + "%s: %u: in msg 0x%04x expecting wParam 0x%x got 0x%x\n", + context, count, expected->message, expected->wParam, actual->wParam); + if ((expected->wParam ^ actual->wParam) & ~expected->wp_mask) + dump++; + } + } + + if (expected->flags & lparam) + { + if (((expected->lParam ^ actual->lParam) & ~expected->lp_mask) && todo) + { + todo_wine + { + failcount++; + if (strcmp(winetest_platform, "wine")) + dump++; + ok_( file, line) (FALSE, + "%s: %u: in msg 0x%04x expecting lParam 0x%lx got 0x%lx\n", + context, count, expected->message, expected->lParam, actual->lParam); + } + } + else + { + ok_( file, line)(((expected->lParam ^ actual->lParam) & ~expected->lp_mask) == 0, + "%s: %u: in msg 0x%04x expecting lParam 0x%lx got 0x%lx\n", + context, count, expected->message, expected->lParam, actual->lParam); + if ((expected->lParam ^ actual->lParam) & ~expected->lp_mask) + dump++; + } + } + if ((expected->flags & optional) && + ((expected->flags ^ actual->flags) & (defwinproc | parent))) + { + /* don't match optional messages if their defwinproc or parent status differs */ + expected++; + count++; + continue; + } + if ((expected->flags & defwinproc) != (actual->flags & defwinproc) && todo) + { + todo_wine + { + failcount++; + if (strcmp(winetest_platform, "wine")) + dump++; + ok_(file, line) (FALSE, + "%s: %u: the msg 0x%04x should %shave been sent by DefWindowProc\n", + context, count, expected->message, (expected->flags & defwinproc) ? "" : "NOT "); + } + } + else + { + ok_(file, line) ((expected->flags & defwinproc) == (actual->flags & defwinproc), + "%s: %u: the msg 0x%04x should %shave been sent by DefWindowProc\n", + context, count, expected->message, (expected->flags & defwinproc) ? "" : "NOT "); + if ((expected->flags & defwinproc) != (actual->flags & defwinproc)) + dump++; + } + + ok_(file, line) ((expected->flags & beginpaint) == (actual->flags & beginpaint), + "%s: %u: the msg 0x%04x should %shave been sent by BeginPaint\n", + context, count, expected->message, (expected->flags & beginpaint) ? "" : "NOT "); + if ((expected->flags & beginpaint) != (actual->flags & beginpaint)) + dump++; + + ok_(file, line) ((expected->flags & (sent | posted)) == (actual->flags & (sent | posted)), + "%s: %u: the msg 0x%04x should have been %s\n", + context, count, expected->message, (expected->flags & posted) ? "posted" : "sent"); + if ((expected->flags & (sent | posted)) != (actual->flags & (sent | posted))) + dump++; + + ok_(file, line) ((expected->flags & parent) == (actual->flags & parent), + "%s: %u: the msg 0x%04x was expected in %s\n", + context, count, expected->message, (expected->flags & parent) ? "parent" : "child"); + if ((expected->flags & parent) != (actual->flags & parent)) + dump++; + + ok_(file, line) ((expected->flags & hook) == (actual->flags & hook), + "%s: %u: the msg 0x%04x should have been sent by a hook\n", + context, count, expected->message); + if ((expected->flags & hook) != (actual->flags & hook)) + dump++; + + ok_(file, line) ((expected->flags & winevent_hook) == (actual->flags & winevent_hook), + "%s: %u: the msg 0x%04x should have been sent by a winevent hook\n", + context, count, expected->message); + if ((expected->flags & winevent_hook) != (actual->flags & winevent_hook)) + dump++; + + ok_(file, line) ((expected->flags & kbd_hook) == (actual->flags & kbd_hook), + "%s: %u: the msg 0x%04x should have been sent by a keyboard hook\n", + context, count, expected->message); + if ((expected->flags & kbd_hook) != (actual->flags & kbd_hook)) + dump++; + + expected++; + actual++; + } + /* silently drop hook messages if there is no support for them */ + else if ((expected->flags & optional) || + ((expected->flags & hook) && !hCBT_hook) || + ((expected->flags & winevent_hook) && !hEvent_hook) || + ((expected->flags & kbd_hook) && !hKBD_hook)) + expected++; + else if (todo) + { + failcount++; + todo_wine + { + if (strcmp(winetest_platform, "wine")) + dump++; + ok_(file, line) (FALSE, "%s: %u: the msg 0x%04x was expected, but got msg 0x%04x instead\n", + context, count, expected->message, actual->message); + } + goto done; + } + else + { + ok_(file, line) (FALSE, "%s: %u: the msg 0x%04x was expected, but got msg 0x%04x instead\n", + context, count, expected->message, actual->message); + dump++; + expected++; + actual++; + } + count++; + } + + /* skip all optional trailing messages */ + while (expected->message && ((expected->flags & optional) || + ((expected->flags & hook) && !hCBT_hook) || + ((expected->flags & winevent_hook) && !hEvent_hook))) + expected++; + + if (todo) + { + todo_wine + { + if (expected->message || actual->message) + { + failcount++; + if (strcmp(winetest_platform, "wine")) + dump++; + ok_(file, line) (FALSE, "%s: %u: the msg sequence is not complete: expected %04x - actual %04x\n", + context, count, expected->message, actual->message); + } + } + } + else + { + if (expected->message || actual->message) + { + dump++; + ok_(file, line) (FALSE, "%s: %u: the msg sequence is not complete: expected %04x - actual %04x\n", + context, count, expected->message, actual->message); + } + } + if (todo && !failcount) /* succeeded yet marked todo */ + todo_wine + { + if (!strcmp(winetest_platform, "wine")) + dump++; + ok_(file, line) (TRUE, "%s: marked \"todo_wine\" but succeeds\n", context); + } + +done: + if (dump) dump_sequence(expected_list, context, file, line); + flush_sequence(); +} + +#define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) + +/************* window procedures ********************/ + +static LRESULT MsgCheckProc(BOOL unicode, HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter = 0; + static LONG beginpaint_counter = 0; + LRESULT ret; + struct recvd_message msg; + + if (ignore_message(message)) return 0; + + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent | wparam | lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + if (beginpaint_counter) msg.flags |= beginpaint; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "MsgCheckProc"; + add_message(&msg); + + defwndproc_counter++; + ret = unicode ? DefWindowProcW(hwnd, message, wParam, lParam) + : DefWindowProcA(hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + +static LRESULT WINAPI MsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + return MsgCheckProc(FALSE, hwnd, message, wParam, lParam); +} + +static BOOL RegisterWindowClasses(void) +{ + WNDCLASSA cls; + + cls.style = 0; + cls.lpfnWndProc = MsgCheckProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "TestWindowClass"; + if (!RegisterClassA(&cls)) return FALSE; + + return TRUE; +} + +static BOOL is_our_logged_class(HWND hwnd) +{ + char buf[256]; + + if (GetClassNameA(hwnd, buf, sizeof(buf))) + { + if (!lstrcmpiA(buf, "TestWindowClass") || + !lstrcmpiA(buf, "ShowWindowClass") || + !lstrcmpiA(buf, "RecursiveActivationClass") || + !lstrcmpiA(buf, "TestParentClass") || + !lstrcmpiA(buf, "TestPopupClass") || + !lstrcmpiA(buf, "SimpleWindowClass") || + !lstrcmpiA(buf, "TestDialogClass") || + !lstrcmpiA(buf, "MDI_frame_class") || + !lstrcmpiA(buf, "MDI_client_class") || + !lstrcmpiA(buf, "MDI_child_class") || + !lstrcmpiA(buf, "my_button_class") || + !lstrcmpiA(buf, "my_edit_class") || + !lstrcmpiA(buf, "static") || + !lstrcmpiA(buf, "ListBox") || + !lstrcmpiA(buf, "ComboBox") || + !lstrcmpiA(buf, "MyDialogClass") || + !lstrcmpiA(buf, "#32770") || + !lstrcmpiA(buf, "#32768")) + return TRUE; + } + return FALSE; +} + +static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) +{ + HWND hwnd; + + ok(cbt_hook_thread_id == GetCurrentThreadId(), "we didn't ask for events from other threads\n"); + + if (nCode == HCBT_CLICKSKIPPED) + { + /* ignore this event, XP sends it a lot when switching focus between windows */ + return CallNextHookEx(hCBT_hook, nCode, wParam, lParam); + } + + if (nCode == HCBT_SYSCOMMAND || nCode == HCBT_KEYSKIPPED) + { + struct recvd_message msg; + + msg.hwnd = 0; + msg.message = nCode; + msg.flags = hook | wparam | lparam; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "CBT"; + add_message(&msg); + + return CallNextHookEx(hCBT_hook, nCode, wParam, lParam); + } + + if (nCode == HCBT_DESTROYWND) + { + if (test_DestroyWindow_flag) + { + DWORD style = GetWindowLongA((HWND)wParam, GWL_STYLE); + if (style & WS_CHILD) + lParam = GetWindowLongPtrA((HWND)wParam, GWLP_ID); + else if (style & WS_POPUP) + lParam = WND_POPUP_ID; + else + lParam = WND_PARENT_ID; + } + } + + /* Log also SetFocus(0) calls */ + hwnd = wParam ? (HWND)wParam : (HWND)lParam; + + if (is_our_logged_class(hwnd)) + { + struct recvd_message msg; + + msg.hwnd = hwnd; + msg.message = nCode; + msg.flags = hook | wparam | lparam; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "CBT"; + add_message(&msg); + } + return CallNextHookEx(hCBT_hook, nCode, wParam, lParam); +} + +/*************************** Menu test ******************************/ + +static const struct message wm_popup_menu_4[] = +{ + { HCBT_CREATEWND, hook }, + { WM_ENTERMENULOOP, sent | wparam | lparam, 0, 0 }, + { WM_INITMENU, sent | lparam, 0, 0 }, + { WM_INITMENUPOPUP, sent | lparam, 0, 0x10000 }, + { HCBT_KEYSKIPPED, hook | wparam | lparam | optional, VK_DOWN, 0x10000001 }, + { WM_MENUSELECT, sent, MAKEWPARAM(0,0xffff), 0 }, + { HCBT_KEYSKIPPED, hook | wparam | lparam | optional, VK_DOWN, 0xd0000001 }, + { HCBT_KEYSKIPPED, hook | wparam | lparam | optional, VK_ESCAPE, 0x10000001 }, + { HCBT_DESTROYWND, hook }, + { WM_UNINITMENUPOPUP, sent | lparam, 0, 0x20000000 }, + { WM_MENUSELECT, sent, MAKEWPARAM(0,0xffff), 0 }, + { WM_EXITMENULOOP, sent | wparam | lparam, 0, 0 }, + { HCBT_KEYSKIPPED, hook | wparam | lparam | optional, VK_ESCAPE, 0xc0000001 }, + { WM_KEYUP, sent | wparam | lparam, VK_ESCAPE, 0xc0000001 }, + { 0 } +}; + +static LRESULT WINAPI parent_menu_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) +{ + if (message == WM_ENTERIDLE || + message == WM_INITMENU || + message == WM_INITMENUPOPUP || + message == WM_MENUSELECT || + message == WM_PARENTNOTIFY || + message == WM_ENTERMENULOOP || + message == WM_EXITMENULOOP || + message == WM_UNINITMENUPOPUP || + message == WM_KEYDOWN || + message == WM_KEYUP || + message == WM_CHAR || + message == WM_SYSKEYDOWN || + message == WM_SYSKEYUP || + message == WM_SYSCHAR || + message == WM_COMMAND || + message == WM_MENUCOMMAND) + { + struct recvd_message msg; + + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent | wparam | lparam; + msg.wParam = wp; + msg.lParam = lp; + msg.descr = "parent_menu_proc"; + add_message(&msg); + } + + return DefWindowProcA(hwnd, message, wp, lp); +} + +static void test_menu_messages(void) +{ + MSG msg; + WNDCLASSA cls; + HWND hwnd; + RECT rect; + + cls.style = 0; + cls.lpfnWndProc = parent_menu_proc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "TestMenuClass"; + UnregisterClassA(cls.lpszClassName, cls.hInstance); + if (!RegisterClassA(&cls)) + assert(0); + + SetLastError(0xdeadbeef); + hwnd = CreateWindowExA(0, "TestMenuClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(hwnd != 0, "LoadMenuA error %lu\n", GetLastError()); + + SetForegroundWindow(hwnd); + flush_events(); + + trace("testing system menu\n"); + GetWindowRect(hwnd, &rect); + SetCursorPos(rect.left + 30, rect.top + 10); + flush_sequence(); + mouse_event(MOUSEEVENTF_RIGHTDOWN, 0, 0, 0, 0); + mouse_event(MOUSEEVENTF_RIGHTUP, 0, 0, 0, 0); + keybd_event(VK_DOWN, 0, 0, 0); + keybd_event(VK_DOWN, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_ESCAPE, 0, 0, 0); + keybd_event(VK_ESCAPE, 0, KEYEVENTF_KEYUP, 0); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + ok_sequence(wm_popup_menu_4, "system menu command", FALSE); + + DestroyWindow(hwnd); +} + +static void init_funcs(void) +{ + HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hKernel32, #f) + X(GetCurrentActCtx); + X(QueryActCtxW); +#undef X +} + +static void init_tests() +{ + init_funcs(); + + InitializeCriticalSection(&sequence_cs); + init_procs(); + + if (!RegisterWindowClasses()) + assert(0); + + cbt_hook_thread_id = GetCurrentThreadId(); + hCBT_hook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); + if (!hCBT_hook) + win_skip("cannot set global hook, will skip hook tests\n"); +} + +static void cleanup_tests() +{ + BOOL ret; + UnhookWindowsHookEx(hCBT_hook); + if (pUnhookWinEvent && hEvent_hook) + { + ret = pUnhookWinEvent(hEvent_hook); + ok(ret, "UnhookWinEvent error %ld\n", GetLastError()); + SetLastError(0xdeadbeef); + ok(!pUnhookWinEvent(hEvent_hook), "UnhookWinEvent succeeded\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE || /* Win2k */ + GetLastError() == 0xdeadbeef, /* Win9x */ + "unexpected error %ld\n", GetLastError()); + } + DeleteCriticalSection(&sequence_cs); +} + +START_TEST(SystemMenu) +{ + init_tests(); + test_menu_messages(); + cleanup_tests(); +} diff --git a/modules/rostests/apitests/user32/testlist.c b/modules/rostests/apitests/user32/testlist.c index ee6f6970d76..0ff533691b8 100644 --- a/modules/rostests/apitests/user32/testlist.c +++ b/modules/rostests/apitests/user32/testlist.c @@ -53,6 +53,7 @@ extern void func_SetScrollRange(void); extern void func_ShowWindow(void); extern void func_SwitchToThisWindow(void); extern void func_SystemParametersInfo(void); +extern void func_SystemMenu(void); extern void func_TrackMouseEvent(void); extern void func_VirtualKey(void); extern void func_WndProc(void); @@ -109,6 +110,7 @@ const struct test winetest_testlist[] = { "SetScrollRange", func_SetScrollRange }, { "ShowWindow", func_ShowWindow }, { "SwitchToThisWindow", func_SwitchToThisWindow }, + { "SystemMenu", func_SystemMenu }, { "SystemParametersInfo", func_SystemParametersInfo }, { "TrackMouseEvent", func_TrackMouseEvent }, { "VirtualKey", func_VirtualKey },

1 year, 10 months

[reactos] 01/01: [CPPRT][CRT][MSVCRT] Move __CxxFrameHandler3 to crt and export it on NT6

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce848e5c11f435f045b67… commit ce848e5c11f435f045b6709dac39de496e6e434d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Sep 24 07:49:16 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Aug 23 20:43:53 2023 +0300 [CPPRT][CRT][MSVCRT] Move __CxxFrameHandler3 to crt and export it on NT6 Previously it was in cpprt, which is a support library for C++, containing functions that are not exported by msvcrt. But since Vista __CxxFrameHandler3 is exported by msvcrt. Therefore move it to crt, and to satisfy pre-Vista configurations, also add it to msvcrtex. --- dll/win32/msvcrt/msvcrt.spec | 3 ++- sdk/lib/cpprt/CMakeLists.txt | 1 - sdk/lib/cpprt/amd64/cpprt.s | 3 --- sdk/lib/cpprt/i386/cpprt.s | 17 -------------- sdk/lib/crt/except/amd64/__CxxFrameHandler3.s | 15 +++++++++++++ sdk/lib/crt/except/except.cmake | 4 ++++ .../except/i386/CxxHandleV8Frame.c} | 0 sdk/lib/crt/except/i386/__CxxFrameHandler3.s | 26 ++++++++++++++++++++++ sdk/lib/crt/msvcrtex.cmake | 11 +++++++++ 9 files changed, 58 insertions(+), 22 deletions(-) diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index edff9b16392..0d5ab41eeee 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -241,7 +241,8 @@ @ cdecl -arch=i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler @ cdecl -version=0x600+ -arch=x86_64 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler @ cdecl -arch=arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) -#@ cdecl -version=0x600+ -arch=i386,x86_64 -norelay -private __CxxFrameHandler3(ptr ptr ptr ptr) # Commented out for now, as it causes linker errors +@ cdecl -version=0x600+ -arch=i386 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) +@ cdecl -version=0x600+ -arch=x86_64 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler @ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) @ cdecl -arch=i386 __CxxQueryExceptionSize() @ cdecl -arch=i386 __CxxRegisterExceptionObject() diff --git a/sdk/lib/cpprt/CMakeLists.txt b/sdk/lib/cpprt/CMakeLists.txt index 7db6f5c1ea4..94632d39ea5 100644 --- a/sdk/lib/cpprt/CMakeLists.txt +++ b/sdk/lib/cpprt/CMakeLists.txt @@ -11,7 +11,6 @@ list(APPEND SOURCE if(ARCH STREQUAL "i386") add_asm_files(cpprt_asm i386/cpprt.s) - list(APPEND SOURCE i386/framehandler.c) elseif(ARCH STREQUAL "amd64") add_asm_files(cpprt_asm amd64/cpprt.s) elseif(ARCH STREQUAL "arm") diff --git a/sdk/lib/cpprt/amd64/cpprt.s b/sdk/lib/cpprt/amd64/cpprt.s index 36c09fb80d8..aaf839ac991 100644 --- a/sdk/lib/cpprt/amd64/cpprt.s +++ b/sdk/lib/cpprt/amd64/cpprt.s @@ -19,9 +19,6 @@ DEFINE_ALIAS ??_M@YAXPEAX_K1P6AX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@ ; void __cdecl `eh vector destructor iterator'(void * __ptr64,unsigned __int64,int,void (__cdecl*)(void * __ptr64)) DEFINE_ALIAS ??_M@YAXPEAX_KHP6AX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YAXPEAX_KHP6AX0@Z@Z -; These are the same -DEFINE_ALIAS __CxxFrameHandler3, __CxxFrameHandler - ; void __cdecl operator delete(void * __ptr64,struct std::nothrow_t const & __ptr64) DEFINE_ALIAS ??3@YAXPEAXAEBUnothrow_t@std@@@Z, ??3@YAXPEAX@Z diff --git a/sdk/lib/cpprt/i386/cpprt.s b/sdk/lib/cpprt/i386/cpprt.s index eeaf87f5d6a..b2c4832b0da 100644 --- a/sdk/lib/cpprt/i386/cpprt.s +++ b/sdk/lib/cpprt/i386/cpprt.s @@ -7,23 +7,6 @@ EXTERN &orig : PROC ALIAS <&alias> = <&orig> ENDM -EXTERN _CxxHandleV8Frame@20 : PROC -PUBLIC ___CxxFrameHandler3 -___CxxFrameHandler3: - push eax - push dword ptr [esp + 20] - push dword ptr [esp + 20] - push dword ptr [esp + 20] - push dword ptr [esp + 20] - call _CxxHandleV8Frame@20 - ret - -EXTERN ___CxxFrameHandler : PROC -PUBLIC _CallCxxFrameHandler -_CallCxxFrameHandler: - mov eax, dword ptr [esp + 20] - jmp ___CxxFrameHandler - ; void __stdcall `eh vector constructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *),void (__thiscall*)(void *)) DEFINE_ALIAS ??_L@YGXPAXIHP6EX0@Z1@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YGXPAXIHP6EX0@Z1@Z diff --git a/sdk/lib/crt/except/amd64/__CxxFrameHandler3.s b/sdk/lib/crt/except/amd64/__CxxFrameHandler3.s new file mode 100644 index 00000000000..a41cb2b9cdc --- /dev/null +++ b/sdk/lib/crt/except/amd64/__CxxFrameHandler3.s @@ -0,0 +1,15 @@ + +#include <asm.inc> + +.code64 +.align 4 + +MACRO(DEFINE_ALIAS, alias, orig) +EXTERN &orig : PROC +ALIAS <&alias> = <&orig> +ENDM + +; These are the same +DEFINE_ALIAS __CxxFrameHandler3, __CxxFrameHandler + +END diff --git a/sdk/lib/crt/except/except.cmake b/sdk/lib/crt/except/except.cmake index 418bbcdeb9b..656853c097c 100644 --- a/sdk/lib/crt/except/except.cmake +++ b/sdk/lib/crt/except/except.cmake @@ -4,9 +4,13 @@ if(ARCH STREQUAL "i386") except/i386/chkstk_asm.s ) list(APPEND CRT_EXCEPT_ASM_SOURCE + except/i386/__CxxFrameHandler3.s except/i386/chkesp.s except/i386/prolog.s ) + list(APPEND CRT_EXCEPT_SOURCE + except/i386/CxxHandleV8Frame.c + ) if(MSVC) list(APPEND CRT_EXCEPT_ASM_SOURCE except/i386/cpp.s) diff --git a/sdk/lib/cpprt/i386/framehandler.c b/sdk/lib/crt/except/i386/CxxHandleV8Frame.c similarity index 100% rename from sdk/lib/cpprt/i386/framehandler.c rename to sdk/lib/crt/except/i386/CxxHandleV8Frame.c diff --git a/sdk/lib/crt/except/i386/__CxxFrameHandler3.s b/sdk/lib/crt/except/i386/__CxxFrameHandler3.s new file mode 100644 index 00000000000..580fae2ad05 --- /dev/null +++ b/sdk/lib/crt/except/i386/__CxxFrameHandler3.s @@ -0,0 +1,26 @@ + + +#include <asm.inc> + +.code +.align 4 + +EXTERN _CxxHandleV8Frame@20 : PROC +PUBLIC ___CxxFrameHandler3 +___CxxFrameHandler3: + push eax + push dword ptr [esp + 20] + push dword ptr [esp + 20] + push dword ptr [esp + 20] + push dword ptr [esp + 20] + call _CxxHandleV8Frame@20 + ret + +EXTERN ___CxxFrameHandler : PROC +PUBLIC _CallCxxFrameHandler +_CallCxxFrameHandler: + mov eax, dword ptr [esp + 20] + jmp ___CxxFrameHandler + +END + diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index d7a513012b4..4ecfd4db6f8 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -36,9 +36,20 @@ if(ARCH STREQUAL "i386") list(APPEND MSVCRTEX_SOURCE math/i386/sqrtf.c) endif() + if(MSVC AND DLL_EXPORT_VERSION LESS 0x600) + list(APPEND MSVCRTEX_ASM_SOURCE + except/i386/__CxxFrameHandler3.s) + list(APPEND MSVCRTEX_SOURCE + except/i386/CxxHandleV8Frame.c) + endif() elseif(ARCH STREQUAL "amd64") list(APPEND MSVCRTEX_ASM_SOURCE except/amd64/chkstk_ms.s) + if(MSVC AND DLL_EXPORT_VERSION LESS 0x600) + list(APPEND MSVCRTEX_ASM_SOURCE + except/amd64/__CxxFrameHandler3.s + ) + endif() elseif(ARCH STREQUAL "arm") list(APPEND MSVCRTEX_SOURCE math/arm/__rt_sdiv.c

1 year, 10 months

[reactos] 01/01: [NTOS:SE] Let SepGetSidFromAce figure out the ACE type

by unknown

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=310563aece3399ad226d4… commit 310563aece3399ad226d4fb8b8eba9c5fc634c99 Author: unknown <george.bisoc(a)reactos.org> AuthorDate: Tue Aug 22 22:21:13 2023 +0200 Commit: unknown <george.bisoc(a)reactos.org> CommitDate: Wed Aug 23 17:54:47 2023 +0200 [NTOS:SE] Let SepGetSidFromAce figure out the ACE type As the commit title says. Instead of having the caller figuring out what the ACE type should be of the ACE. --- ntoskrnl/include/internal/se.h | 1 - ntoskrnl/se/accesschk.c | 16 ++++++++-------- ntoskrnl/se/debug.c | 2 +- ntoskrnl/se/sid.c | 12 ++---------- 4 files changed, 11 insertions(+), 20 deletions(-) diff --git a/ntoskrnl/include/internal/se.h b/ntoskrnl/include/internal/se.h index db32e6bff73..1679d2fe86a 100644 --- a/ntoskrnl/include/internal/se.h +++ b/ntoskrnl/include/internal/se.h @@ -634,7 +634,6 @@ SepSidInTokenEx( PSID NTAPI SepGetSidFromAce( - _In_ UCHAR AceType, _In_ PACE Ace); NTSTATUS diff --git a/ntoskrnl/se/accesschk.c b/ntoskrnl/se/accesschk.c index d63e07429e8..eaf159f8ce1 100644 --- a/ntoskrnl/se/accesschk.c +++ b/ntoskrnl/se/accesschk.c @@ -517,7 +517,7 @@ SepAnalyzeAcesFromDacl( if (CurrentAce->Header.AceType == ACCESS_DENIED_ACE_TYPE) { /* Get the SID from this ACE */ - Sid = SepGetSidFromAce(ACCESS_DENIED_ACE_TYPE, CurrentAce); + Sid = SepGetSidFromAce(CurrentAce); ASSERT(Sid); if (SepSidInTokenEx(AccessToken, PrincipalSelfSid, Sid, TRUE, IsTokenRestricted)) @@ -539,7 +539,7 @@ SepAnalyzeAcesFromDacl( else if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE) { /* Get the SID from this ACE */ - Sid = SepGetSidFromAce(ACCESS_ALLOWED_ACE_TYPE, CurrentAce); + Sid = SepGetSidFromAce(CurrentAce); ASSERT(Sid); if (SepSidInTokenEx(AccessToken, PrincipalSelfSid, Sid, FALSE, IsTokenRestricted)) @@ -561,7 +561,7 @@ SepAnalyzeAcesFromDacl( else if (CurrentAce->Header.AceType == ACCESS_DENIED_OBJECT_ACE_TYPE) { /* Get the SID and object type from this ACE */ - Sid = SepGetSidFromAce(ACCESS_DENIED_OBJECT_ACE_TYPE, CurrentAce); + Sid = SepGetSidFromAce(CurrentAce); ObjectTypeGuid = SepGetObjectTypeGuidFromAce(CurrentAce, TRUE); ASSERT(Sid); @@ -610,7 +610,7 @@ SepAnalyzeAcesFromDacl( else if (CurrentAce->Header.AceType == ACCESS_ALLOWED_OBJECT_ACE_TYPE) { /* Get the SID and object type from this ACE */ - Sid = SepGetSidFromAce(ACCESS_ALLOWED_OBJECT_ACE_TYPE, CurrentAce); + Sid = SepGetSidFromAce(CurrentAce); ObjectTypeGuid = SepGetObjectTypeGuidFromAce(CurrentAce, FALSE); ASSERT(Sid); @@ -705,7 +705,7 @@ SepAnalyzeAcesFromDacl( if (CurrentAce->Header.AceType == ACCESS_DENIED_ACE_TYPE) { /* Get the SID from this ACE */ - Sid = SepGetSidFromAce(ACCESS_DENIED_ACE_TYPE, CurrentAce); + Sid = SepGetSidFromAce(CurrentAce); ASSERT(Sid); if (SepSidInTokenEx(AccessToken, PrincipalSelfSid, Sid, TRUE, IsTokenRestricted)) @@ -735,7 +735,7 @@ SepAnalyzeAcesFromDacl( else if (CurrentAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE) { /* Get the SID from this ACE */ - Sid = SepGetSidFromAce(ACCESS_ALLOWED_ACE_TYPE, CurrentAce); + Sid = SepGetSidFromAce(CurrentAce); ASSERT(Sid); if (SepSidInTokenEx(AccessToken, PrincipalSelfSid, Sid, FALSE, IsTokenRestricted)) @@ -761,7 +761,7 @@ SepAnalyzeAcesFromDacl( else if (CurrentAce->Header.AceType == ACCESS_DENIED_OBJECT_ACE_TYPE) { /* Get the SID and object type from this ACE */ - Sid = SepGetSidFromAce(ACCESS_DENIED_OBJECT_ACE_TYPE, CurrentAce); + Sid = SepGetSidFromAce(CurrentAce); ObjectTypeGuid = SepGetObjectTypeGuidFromAce(CurrentAce, TRUE); ASSERT(Sid); @@ -811,7 +811,7 @@ SepAnalyzeAcesFromDacl( else if (CurrentAce->Header.AceType == ACCESS_ALLOWED_OBJECT_ACE_TYPE) { /* Get the SID and object type from this ACE */ - Sid = SepGetSidFromAce(ACCESS_ALLOWED_OBJECT_ACE_TYPE, CurrentAce); + Sid = SepGetSidFromAce(CurrentAce); ObjectTypeGuid = SepGetObjectTypeGuidFromAce(CurrentAce, FALSE); ASSERT(Sid); diff --git a/ntoskrnl/se/debug.c b/ntoskrnl/se/debug.c index 1f038ac0702..bed647b18b8 100644 --- a/ntoskrnl/se/debug.c +++ b/ntoskrnl/se/debug.c @@ -118,7 +118,7 @@ SepDumpAces( DbgPrint("Ace->Header.AceType -> %s\n", SepGetAceTypeString(Ace->Header.AceType)); DbgPrint("Ace->AccessMask -> 0x%08lx\n", Ace->AccessMask); - Sid = SepGetSidFromAce(Ace->Header.AceType, Ace); + Sid = SepGetSidFromAce(Ace); ASSERT(Sid); RtlConvertSidToUnicodeString(&SidString, Sid, TRUE); DbgPrint("Ace SID -> %wZ\n", &SidString); diff --git a/ntoskrnl/se/sid.c b/ntoskrnl/se/sid.c index 033d322d708..6de4b991f3b 100644 --- a/ntoskrnl/se/sid.c +++ b/ntoskrnl/se/sid.c @@ -558,13 +558,6 @@ SepSidInToken( * given access control entry. This identifier * is valid for the whole of its lifetime. * - * @param[in] AceType - * The type of an access control entry. This - * type that is given by the calling thread - * must coincide with the actual ACE that is - * given in the second parameter otherwise this - * can potentially lead to UNDEFINED behavior! - * * @param[in] Ace * A pointer to an access control entry, which * can be obtained from a DACL. @@ -577,7 +570,6 @@ SepSidInToken( PSID NTAPI SepGetSidFromAce( - _In_ UCHAR AceType, _In_ PACE Ace) { PULONG Flags; @@ -589,7 +581,7 @@ SepGetSidFromAce( ASSERT(Ace); /* Obtain the SID based upon ACE type */ - switch (AceType) + switch (Ace->Header.AceType) { case ACCESS_DENIED_ACE_TYPE: case ACCESS_ALLOWED_ACE_TYPE: @@ -620,7 +612,7 @@ SepGetSidFromAce( default: { - DPRINT1("SepGetSidFromAce(): Unknown ACE type (Ace 0x%p, Type %u)\n", Ace, AceType); + DPRINT1("SepGetSidFromAce(): Unknown ACE type (Ace 0x%p, Type %u)\n", Ace, Ace->Header.AceType); break; } }

1 year, 10 months

[reactos] 01/01: [DXGTHK] Fix EngCreateBitmap exported parameters (#5606)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4b0899ca167182b8b351… commit a4b0899ca167182b8b35173231e93a8045f56f2c Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Wed Aug 23 17:53:22 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 23 17:53:22 2023 +0200 [DXGTHK] Fix EngCreateBitmap exported parameters (#5606) Use two longs instead of one for the first parameter of EngCreateBitmap export. Make it same as win32k export. MSDN documentation says that 1st parameter is SIZEL (SIZE) structure, which actually contains 2 longs inside. Sice it is passed by value, it needs to take enough memory when export in dxgthk and redirect to win32k (since it's actually a win32k function). Fixes the compilation of our dxg.sys when calling dxgthk!EngCreateBitmap from it. Found during my DirectX investigations. --- win32ss/reactx/dxgthk/dxgthk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/reactx/dxgthk/dxgthk.spec b/win32ss/reactx/dxgthk/dxgthk.spec index a95e685a2da..481520bcd85 100644 --- a/win32ss/reactx/dxgthk/dxgthk.spec +++ b/win32ss/reactx/dxgthk/dxgthk.spec @@ -2,7 +2,7 @@ @ stdcall EngAllocMem(long long long) win32k.EngAllocMem @ stdcall EngAllocUserMem(long long) win32k.EngAllocUserMem @ stdcall EngCopyBits(ptr ptr ptr ptr ptr ptr) win32k.EngCopyBits -@ stdcall EngCreateBitmap(long long long long ptr) win32k.EngCreateBitmap +@ stdcall EngCreateBitmap(long long long long long ptr) win32k.EngCreateBitmap @ stdcall EngCreatePalette(long long long long long long) win32k.EngCreatePalette @ stdcall EngCreateSemaphore() win32k.EngCreateSemaphore @ stdcall EngDeletePalette(ptr) win32k.EngDeletePalette

1 year, 10 months

[reactos] 01/01: [MKISOFS] Silence prototype warnings (#5603)

by William Kent

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e3bf252d83171f1f0ae9… commit 4e3bf252d83171f1f0ae9260af622675e8ddd8a1 Author: William Kent <wjk011(a)gmail.com> AuthorDate: Wed Aug 23 08:37:15 2023 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 23 14:37:15 2023 +0200 [MKISOFS] Silence prototype warnings (#5603) mkisofs and its components uses K&R-style function definitions to support very old compilers. Modern compilers consider K&R syntax to be deprecated. Clang therefore emits a large number of warnings over this. --- sdk/tools/mkisofs/CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sdk/tools/mkisofs/CMakeLists.txt b/sdk/tools/mkisofs/CMakeLists.txt index 86cd3270b0b..bd25bf36403 100644 --- a/sdk/tools/mkisofs/CMakeLists.txt +++ b/sdk/tools/mkisofs/CMakeLists.txt @@ -106,4 +106,11 @@ else() # libschily implements an own printf function with support for the %r formatter. # Silence compilers checking for invalid formatting sequences. target_compile_options(libschily PRIVATE "-Wno-format") + + # mkisofs uses K&R-style function definitions to support very old compilers. + # This causes warnings with modern compilers. + target_compile_options(libmdigest PRIVATE "-Wno-deprecated-non-prototype") + target_compile_options(libschily PRIVATE "-Wno-deprecated-non-prototype") + target_compile_options(libsiconv PRIVATE "-Wno-deprecated-non-prototype") + target_compile_options(mkisofs PRIVATE "-Wno-deprecated-non-prototype") endif()

1 year, 10 months

[reactos] 01/01: [SHLWAPI][SDK] Implement SHGetViewStatePropertyBag Part 1 (#5605)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21925d935cf991be7db64… commit 21925d935cf991be7db64c593a061a13ae6d708a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 23 15:00:07 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 23 15:00:07 2023 +0900 [SHLWAPI][SDK] Implement SHGetViewStatePropertyBag Part 1 (#5605) Follow-up to #5590. - Add CViewStatePropertyBag class. - Add SHGetViewStatePropertyBag definition. - Add FreeViewStatePropertyBagCache function and use it in DllMain to free the cache. CORE-9283 --- dll/win32/shlwapi/ordinal.c | 2 + dll/win32/shlwapi/propbag.cpp | 341 +++++++++++++++++++++++++++++++++++++++ dll/win32/shlwapi/shlwapi_main.c | 12 ++ sdk/include/psdk/shlwapi.h | 4 +- 4 files changed, 357 insertions(+), 2 deletions(-) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index 985b79a9f40..37181442f48 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -5105,6 +5105,7 @@ HRESULT WINAPI SHCreatePropertyBagOnRegKey (HKEY hKey, LPCWSTR subkey, } #endif +#ifndef __REACTOS__ /* See propbag.cpp */ /*********************************************************************** * SHGetViewStatePropertyBag [SHLWAPI.515] * @@ -5131,6 +5132,7 @@ HRESULT WINAPI SHGetViewStatePropertyBag(LPCITEMIDLIST pidl, LPWSTR bag_name, return E_NOTIMPL; } +#endif /*********************************************************************** * SHFormatDateTimeW [SHLWAPI.354] diff --git a/dll/win32/shlwapi/propbag.cpp b/dll/win32/shlwapi/propbag.cpp index fbd5b87a49b..3a937019a51 100644 --- a/dll/win32/shlwapi/propbag.cpp +++ b/dll/win32/shlwapi/propbag.cpp @@ -1188,3 +1188,344 @@ HRESULT SHGetDesktopUpgradePropertyBag(REFIID riid, void **ppvObj) CComPtr<CDesktopUpgradePropertyBag> pPropBag(new CDesktopUpgradePropertyBag()); return pPropBag->QueryInterface(riid, ppvObj); } + +class CViewStatePropertyBag : public CBasePropertyBag +{ +protected: + LPITEMIDLIST m_pidl = NULL; + LPWSTR m_pszPath = NULL; + DWORD m_dwVspbFlags = 0; // SHGVSPB_... flags + CComPtr<IPropertyBag> m_pPidlBag; + CComPtr<IPropertyBag> m_pUpgradeBag; + CComPtr<IPropertyBag> m_pInheritBag; + CComPtr<IPropertyBag> m_pUserDefaultsBag; + CComPtr<IPropertyBag> m_pFolderDefaultsBag; + CComPtr<IPropertyBag> m_pGlobalDefaultsBag; + CComPtr<IPropertyBag> m_pReadBag; + CComPtr<IPropertyBag> m_pWriteBag; + BOOL m_bPidlBag = FALSE; + BOOL m_bUpgradeBag = FALSE; + BOOL m_bInheritBag = FALSE; + BOOL m_bUserDefaultsBag = FALSE; + BOOL m_bFolderDefaultsBag = FALSE; + BOOL m_bGlobalDefaultsBag = FALSE; + BOOL m_bReadBag = FALSE; + BOOL m_bWriteBag = FALSE; + + BOOL _IsSamePidl(LPCITEMIDLIST pidlOther) const; + BOOL _IsSystemFolder() const; + BOOL _CanAccessPidlBag() const; + BOOL _CanAccessUserDefaultsBag() const; + BOOL _CanAccessFolderDefaultsBag() const; + BOOL _CanAccessGlobalDefaultsBag() const; + BOOL _CanAccessInheritBag() const; + BOOL _CanAccessUpgradeBag() const; + + HKEY _GetHKey(DWORD dwVspbFlags); + + HRESULT _GetRegKey( + LPCITEMIDLIST pidl, + LPCWSTR pszBagName, + DWORD dwFlags, + char unknown, + HKEY hKey, + LPWSTR pszDest, + INT cchDest); + + HRESULT _CreateBag( + LPITEMIDLIST pidl, + LPCWSTR pszPath, + DWORD dwVspbFlags, + DWORD dwMode, + REFIID riid, + void **ppvObj); + + void _ResetTryAgainFlag(); + +public: + CViewStatePropertyBag() : CBasePropertyBag(0) + { + } + + ~CViewStatePropertyBag() override + { + ::ILFree(m_pidl); + ::LocalFree(m_pszPath); + } + + HRESULT Init(_In_opt_ LPCITEMIDLIST pidl, _In_opt_ LPCWSTR pszPath, _In_ DWORD dwVspbFlags); + BOOL IsSameBag(LPCITEMIDLIST pidl, LPCWSTR pszPath, DWORD dwVspbFlags) const; + + STDMETHODIMP Read( + _In_z_ LPCWSTR pszPropName, + _Inout_ VARIANT *pvari, + _Inout_opt_ IErrorLog *pErrorLog) override; + + STDMETHODIMP Write(_In_z_ LPCWSTR pszPropName, _In_ VARIANT *pvari) override + { + ERR("%p: %s: Read-only\n", this, debugstr_w(pszPropName)); + return E_NOTIMPL; + } +}; + +// CViewStatePropertyBag is cached +CComPtr<CViewStatePropertyBag> g_pCachedBag; +extern "C" +{ + CRITICAL_SECTION g_csBagCacheLock; +} + +HRESULT +CViewStatePropertyBag::Init( + _In_opt_ LPCITEMIDLIST pidl, + _In_opt_ LPCWSTR pszPath, + _In_ DWORD dwVspbFlags) +{ + if (pidl) + { + m_pidl = ILClone(pidl); + if (!m_pidl) + return E_OUTOFMEMORY; + } + + if (pszPath) + { + m_pszPath = StrDupW(pszPath); + if (!m_pszPath) + return E_OUTOFMEMORY; + + m_dwVspbFlags = dwVspbFlags; + } + + return S_OK; +} + +BOOL CViewStatePropertyBag::_IsSamePidl(LPCITEMIDLIST pidlOther) const +{ + if (!pidlOther && !m_pidl) + return TRUE; + + return (pidlOther && m_pidl && ILIsEqual(pidlOther, m_pidl)); +} + +BOOL CViewStatePropertyBag::IsSameBag(LPCITEMIDLIST pidl, LPCWSTR pszPath, DWORD dwVspbFlags) const +{ + return (dwVspbFlags == m_dwVspbFlags && StrCmpW(pszPath, m_pszPath) == 0 && _IsSamePidl(pidl)); +} + +BOOL CViewStatePropertyBag::_IsSystemFolder() const +{ + LPCITEMIDLIST ppidlLast; + CComPtr<IShellFolder> psf; + + HRESULT hr = SHBindToParent(m_pidl, IID_IShellFolder, (void **)&psf, &ppidlLast); + if (FAILED(hr)) + return FALSE; + + WIN32_FIND_DATAW FindData; + hr = SHGetDataFromIDListW(psf, ppidlLast, SHGDFIL_FINDDATA, &FindData, sizeof(FindData)); + if (FAILED(hr)) + return FALSE; + + return PathIsSystemFolderW(NULL, FindData.dwFileAttributes); +} + +BOOL CViewStatePropertyBag::_CanAccessPidlBag() const +{ + return ((m_dwVspbFlags & SHGVSPB_FOLDER) == SHGVSPB_FOLDER); +} + +BOOL CViewStatePropertyBag::_CanAccessUserDefaultsBag() const +{ + if (_CanAccessPidlBag()) + return TRUE; + + return ((m_dwVspbFlags & SHGVSPB_USERDEFAULTS) == SHGVSPB_USERDEFAULTS); +} + +BOOL CViewStatePropertyBag::_CanAccessFolderDefaultsBag() const +{ + if (_CanAccessUserDefaultsBag()) + return TRUE; + + return ((m_dwVspbFlags & SHGVSPB_ALLUSERS) && (m_dwVspbFlags & SHGVSPB_PERFOLDER)); +} + +BOOL CViewStatePropertyBag::_CanAccessGlobalDefaultsBag() const +{ + if (_CanAccessFolderDefaultsBag()) + return TRUE; + + return ((m_dwVspbFlags & SHGVSPB_GLOBALDEAFAULTS) == SHGVSPB_GLOBALDEAFAULTS); +} + +BOOL CViewStatePropertyBag::_CanAccessInheritBag() const +{ + return (_CanAccessPidlBag() || (m_dwVspbFlags & SHGVSPB_INHERIT)); +} + +BOOL CViewStatePropertyBag::_CanAccessUpgradeBag() const +{ + return StrCmpW(m_pszPath, L"Desktop") == 0; +} + +void CViewStatePropertyBag::_ResetTryAgainFlag() +{ + if (m_dwVspbFlags & SHGVSPB_NOAUTODEFAULTS) + m_bReadBag = FALSE; + else if ((m_dwVspbFlags & SHGVSPB_FOLDER) == SHGVSPB_FOLDER) + m_bPidlBag = FALSE; + else if (m_dwVspbFlags & SHGVSPB_INHERIT) + m_bInheritBag = FALSE; + else if ((m_dwVspbFlags & SHGVSPB_USERDEFAULTS) == SHGVSPB_USERDEFAULTS) + m_bUserDefaultsBag = FALSE; + else if ((m_dwVspbFlags & SHGVSPB_ALLUSERS) && (m_dwVspbFlags & SHGVSPB_PERFOLDER)) + m_bFolderDefaultsBag = FALSE; + else if ((m_dwVspbFlags & SHGVSPB_GLOBALDEAFAULTS) == SHGVSPB_GLOBALDEAFAULTS) + m_bGlobalDefaultsBag = FALSE; +} + +HKEY CViewStatePropertyBag::_GetHKey(DWORD dwVspbFlags) +{ + if (!(dwVspbFlags & (SHGVSPB_INHERIT | SHGVSPB_PERUSER))) + return SHGetShellKey((SHKEY_Key_Shell | SHKEY_Root_HKLM), NULL, TRUE); + + if ((m_dwVspbFlags & SHGVSPB_ROAM) && (dwVspbFlags & SHGVSPB_PERFOLDER)) + return SHGetShellKey((SHKEY_Key_Shell | SHKEY_Root_HKCU), NULL, TRUE); + + return SHGetShellKey(SHKEY_Key_ShellNoRoam | SHKEY_Root_HKCU, NULL, TRUE); +} + +HRESULT CViewStatePropertyBag::_GetRegKey( + LPCITEMIDLIST pidl, + LPCWSTR pszBagName, + DWORD dwFlags, + char unknown, + HKEY hKey, + LPWSTR pszDest, + INT cchDest) +{ + FIXME("Stub\n"); + return E_NOTIMPL; +} + +HRESULT +CViewStatePropertyBag::_CreateBag( + LPITEMIDLIST pidl, + LPCWSTR pszPath, + DWORD dwVspbFlags, + DWORD dwMode, + REFIID riid, + void **ppvObj) +{ + FIXME("Stub\n"); + return E_NOTIMPL; +} + +STDMETHODIMP +CViewStatePropertyBag::Read( + _In_z_ LPCWSTR pszPropName, + _Inout_ VARIANT *pvari, + _Inout_opt_ IErrorLog *pErrorLog) +{ + FIXME("Stub\n"); + return E_NOTIMPL; +} + +static BOOL SHIsRemovableDrive(LPCITEMIDLIST pidl) +{ + STRRET strret; + CComPtr<IShellFolder> psf; + WCHAR szBuff[MAX_PATH]; + LPCITEMIDLIST ppidlLast; + INT iDrive, nType; + HRESULT hr; + + hr = SHBindToParent(pidl, IID_IShellFolder, (void **)&psf, &ppidlLast); + if (FAILED(hr)) + return FALSE; + + hr = psf->GetDisplayNameOf(ppidlLast, SHGDN_FORPARSING, &strret); + if (FAILED(hr)) + return FALSE; + + hr = StrRetToBufW(&strret, ppidlLast, szBuff, _countof(szBuff)); + if (FAILED(hr)) + return FALSE; + + iDrive = PathGetDriveNumberW(szBuff); + if (iDrive < 0) + return FALSE; + + nType = RealDriveType(iDrive, FALSE); + return (nType == DRIVE_REMOVABLE || nType == DRIVE_CDROM); +} + +/************************************************************************** + * SHGetViewStatePropertyBag (SHLWAPI.515) + * + * Retrieves a property bag in which the view state information of a folder + * can be stored. + * + * @param pidl PIDL of the folder requested + * @param bag_name Name of the property bag requested + * @param flags Optional SHGVSPB_... flags + * @param riid IID of requested property bag interface + * @param ppv Address to receive pointer to the new interface + * @return An HRESULT value. S_OK on success, non-zero on failure. + * @see https://learn.microsoft.com/en-us/windows/win32/api/shlwapi/nf-shlwapi-shge… + */ +EXTERN_C HRESULT WINAPI +SHGetViewStatePropertyBag( + _In_opt_ PCIDLIST_ABSOLUTE pidl, + _In_opt_ LPCWSTR bag_name, + _In_ DWORD flags, + _In_ REFIID riid, + _Outptr_ void **ppv) +{ + HRESULT hr; + + TRACE("%p %s 0x%X %p %p\n", pidl, debugstr_w(bag_name), flags, &riid, ppv); + + *ppv = NULL; + + ::EnterCriticalSection(&g_csBagCacheLock); + + if (g_pCachedBag && g_pCachedBag->IsSameBag(pidl, bag_name, flags)) + { + hr = g_pCachedBag->QueryInterface(riid, ppv); + ::LeaveCriticalSection(&g_csBagCacheLock); + return hr; + } + + if (SHIsRemovableDrive(pidl)) + { + TRACE("pidl %p is removable\n", pidl); + ::LeaveCriticalSection(&g_csBagCacheLock); + return E_FAIL; + } + + CComPtr<CViewStatePropertyBag> pBag(new CViewStatePropertyBag()); + + hr = pBag->Init(pidl, bag_name, flags); + if (SUCCEEDED(hr)) + { + g_pCachedBag.Attach(pBag); + + hr = g_pCachedBag->QueryInterface(riid, ppv); + } + else + { + ERR("0x%08X\n", hr); + } + + ::LeaveCriticalSection(&g_csBagCacheLock); + return hr; +} + +EXTERN_C VOID FreeViewStatePropertyBagCache(VOID) +{ + ::EnterCriticalSection(&g_csBagCacheLock); + g_pCachedBag.Release(); + ::LeaveCriticalSection(&g_csBagCacheLock); +} diff --git a/dll/win32/shlwapi/shlwapi_main.c b/dll/win32/shlwapi/shlwapi_main.c index f466bb485aa..56f9b8c97c2 100644 --- a/dll/win32/shlwapi/shlwapi_main.c +++ b/dll/win32/shlwapi/shlwapi_main.c @@ -33,6 +33,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); DECLSPEC_HIDDEN HINSTANCE shlwapi_hInstance = 0; DECLSPEC_HIDDEN DWORD SHLWAPI_ThreadRef_index = TLS_OUT_OF_INDEXES; +#ifdef __REACTOS__ +extern CRITICAL_SECTION g_csBagCacheLock; +VOID FreeViewStatePropertyBagCache(VOID); +#endif + /************************************************************************* * SHLWAPI {SHLWAPI} * @@ -62,9 +67,16 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) DisableThreadLibraryCalls(hinstDLL); shlwapi_hInstance = hinstDLL; SHLWAPI_ThreadRef_index = TlsAlloc(); +#ifdef __REACTOS__ + InitializeCriticalSection(&g_csBagCacheLock); +#endif break; case DLL_PROCESS_DETACH: if (fImpLoad) break; +#ifdef __REACTOS__ + FreeViewStatePropertyBagCache(); + DeleteCriticalSection(&g_csBagCacheLock); +#endif if (SHLWAPI_ThreadRef_index != TLS_OUT_OF_INDEXES) TlsFree(SHLWAPI_ThreadRef_index); break; } diff --git a/sdk/include/psdk/shlwapi.h b/sdk/include/psdk/shlwapi.h index 84241ba4a58..801928fff4b 100644 --- a/sdk/include/psdk/shlwapi.h +++ b/sdk/include/psdk/shlwapi.h @@ -2003,8 +2003,8 @@ HRESULT WINAPI SHGetViewStatePropertyBag( _In_opt_ PCIDLIST_ABSOLUTE pidl, - _In_opt_ LPWSTR bag_name, - DWORD flags, + _In_opt_ LPCWSTR bag_name, + _In_ DWORD flags, _In_ REFIID riid, _Outptr_ void **ppv);

1 year, 10 months

[reactos] 01/01: [DISKPART][MC] Update Romanian (ro-RO) translation for message table (#5485)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d35887c02b97a7faec2b… commit 8d35887c02b97a7faec2ba6cb84ebd032a34f50f Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Tue Aug 22 22:37:14 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Aug 22 21:37:14 2023 +0200 [DISKPART][MC] Update Romanian (ro-RO) translation for message table (#5485) --- base/system/diskpart/diskpart_msg.mc | 874 ++++++++++++++++++----------------- 1 file changed, 448 insertions(+), 426 deletions(-) diff --git a/base/system/diskpart/diskpart_msg.mc b/base/system/diskpart/diskpart_msg.mc index 5fe3d2deeac..41ac3a06fd1 100644 --- a/base/system/diskpart/diskpart_msg.mc +++ b/base/system/diskpart/diskpart_msg.mc @@ -125,26 +125,27 @@ Example: ACTIVE . Language=Romanian - On disks with master boot record (MBR) disk formatting, marks - the partition with focus as active. + Pe discurile cu Registrul principal de inițializare (MBR) formatarea + discului marchează partiția în cauză ca activă. -Syntax: ACTIVE +Sintaxă: ACTIVE - Writes a value to the disk which is read by the basic input/output - system (BIOS) at boot. This value specifies that the partition is - a valid system partition. + Scrie o valoare pe disc care este citită de Sistemul de + intrare/ieșire de bază (BIOS) la inițializare. Această valoare specifică + faptul că partiția este o partiție de sistem validă. - A partition must be selected for this operation to succeed. + O partiție trebuie să fie selectată pentru această operațiune să fie cu + succes. - Caution: + Atenție: - DiskPart verifies only that the partition is capable of containing the - operating system startup files. DiskPart does not check the contents of - the partition. If you mistakenly mark a partition as active and it does - not contain the operating system startup files, your computer might not - start. + DiskPart doar verifică dacă partiția este capabilă să conțină fișierele + de pornire ale sistemului de operare. DiskPart nu verifică coținutul + partiției. Dacă ați marcat în mod eronat o partiție ca activă și nu + conține fișierele de pornire ale sistemului de operare, calculatorul + dumneavostră ar putea să nu pornească. -Example: +De exemplu: ACTIVE . @@ -285,7 +286,7 @@ Language=Portugese <Add ADD command help text here> . Language=Romanian -<Add ADD command help text here> +<Adăugați aici textul de ajutor pentru comanda ADD> . Language=Russian <Add ADD command help text here> @@ -321,7 +322,7 @@ Language=Portugese <Add ASSIGN command help text here> . Language=Romanian -<Add ASSIGN command help text here> +<Adăugați aici textul de ajutor pentru comanda ASSIGN> . Language=Russian <Add ASSIGN command help text here> @@ -357,7 +358,7 @@ Language=Portugese <Add ATTACH command help text here> . Language=Romanian -<Add ATTACH command help text here> +<Adăugați aici textul de ajutor pentru comanda ATTACH> . Language=Russian <Add ATTACH command help text here> @@ -393,7 +394,7 @@ Language=Portugese <Add ATTRIBUTES command help text here> . Language=Romanian -<Add ATTRIBUTES command help text here> +<Adăugați aici textul de ajutor pentru comanda ATTRIBUTES> . Language=Russian <Add ATTRIBUTES command help text here> @@ -429,7 +430,7 @@ Language=Portugese <Add AUTOMOUNT command help text here> . Language=Romanian -<Add AUTOMOUNT command help text here> +<Adăugați aici textul de ajutor pentru comanda AUTOMOUNT> . Language=Russian <Add AUTOMOUNT command help text here> @@ -466,7 +467,7 @@ Language=Portugese <Add BREAK command help text here> . Language=Romanian -<Add BREAK command help text here> +<Adăugați aici textul de ajutor pentru comanda BREAK> . Language=Russian <Add BREAK command help text here> @@ -576,23 +577,24 @@ Example: CLEAN . Language=Romanian - Removes any and all partition or volume formatting from the disk with - focus. + Șterge orice și întreaga formatare a partiției sau a volumului din + discul în cauză. -Syntax: CLEAN [ALL] +Sintaxă: CLEAN [ALL] - ALL Specifies that each and every byte\sector on the disk is set to - zero, which completely deletes all data contained on the disk. + ALL Specifică faptul că fiecare octet/sector de pe disc este setat + pe zero, ceea ce șterge complet toate datele conținute pe disc. - On master boot record (MBR) disks, only the MBR partitioning information - and hidden sector information are overwritten. On GUID partition table - (GPT) disks, the GPT partitioning information, including the Protective - MBR, is overwritten. If the ALL parameter is not used, the first 1MB - and the last 1MB of the disk are zeroed. This erases any disk formatting - that had been previously applied to the disk. The disk's state after - cleaning the disk is 'UNINITIALIZED'. + Pe discurile cu Registrul principal de inițializare (MBR), sunt suprascrise + numai informațiile despre partiționarea MBR și informațiile despre + sectoarele ascunse. Pe discurile cu tabel de partiție GUID (GPT), + informațiile de partiționare GPT, incluzând MBR protectiv, sunt + suprascrise. Dacă parametrul ALL nu e folosit, primul 1 Mo și ultimul 1 Mo + al discului sunt puse la valoarea zero. Aceasta șterge orice formatare a + discului ce a fost aplicată anterior discului. Starea discului după ce + este curățat discul este „UNINITIALIZED” (neinițializat). -Example: +De exemplu: CLEAN . @@ -718,7 +720,7 @@ Language=Portugese <Add COMPACT command help text here> . Language=Romanian -<Add COMPACT command help text here> +<Adăugați aici textul de ajutor pentru comanda COMPACT> . Language=Russian <Add COMPACT command help text here> @@ -754,7 +756,7 @@ Language=Portugese <Add CONVERT command help text here> . Language=Romanian -<Add CONVERT command help text here> +<Adăugați aici textul de ajutor pentru comanda CONVERT> . Language=Russian <Add CONVERT command help text here> @@ -790,7 +792,7 @@ Language=Portugese <Add CREATE PARTITION EFI command help text here> . Language=Romanian -<Add CREATE PARTITION EFI command help text here> +<Adăugați aici textul de ajutor pentru comanda CREATE PARTITION EFI> . Language=Russian <Add CREATE PARTITION EFI command help text here> @@ -972,39 +974,41 @@ Example: CREATE PARTITION EXTENDED SIZE=1000 . Language=Romanian - Creates an extended partition on the disk with focus. - Applies to master boot record (MBR) disks only. + Crează o partiție extinsă pe discul în cauză. + Se aplică doar la discurile cu Registrul principal de inițializare (MBR). -Syntax: CREATE PARTITION EXTENDED [SIZE=<N>] [OFFSET=<N>] [ALIGN=<N>] [NOERR] +Sintaxă: CREATE PARTITION EXTENDED [SIZE=<N>] [OFFSET=<N>] [ALIGN=<N>] [NOERR] - SIZE=<N> The size of the partition in megabytes (MB). If no size is - given, the partition continues until there is no more free - space in the extended partition. + SIZE=<N> Mărimea partiției în megaocteți (Mo). Dacă nu este dată nicio + mărime, partiția continuă până când nu mai este spațiu liber + în partiția extinsă. - OFFSET=<N> The offset, in kilobytes (KB), at which the partition is - created. If no offset is given, the partition will start - at the beginning of the first free space on the disk that - is large enough to hold the new partition. + OFFSET=<N> Decalajul, în kiloocteți (Ko), la care partiția este creată. + Dacă nu este dat niciun decalaj, partiția va începe de la + primul spațiu liber de pe disc ce este suficient de mare ca + să țină noua partiție. - ALIGN=<N> Typically used with hardware RAID Logical Unit Number (LUN) - arrays to improve performance. The partition offset will be - a multiple of <N>. If the OFFSET parameter is specified, it - will be rounded to the closest multiple of <N>. + ALIGN=<N> De obicei, folosit cu matrici de dispozitive cu Număr de + unitate logică (LUN) RAID pentru a îmbunătăți performanța. + Decalajul partiției va fi un multiplu a lui <N>. Dacă este + specificat parametrul OFFSET, va fi rotunjit la cel mai + apropiat multiplu a lui <N>. - NOERR For scripting only. When an error is encountered, DiskPart - continues to process commands as if the error did not occur. - Without the NOERR parameter, an error causes DiskPart to exit - with an error code. + NOERR Doar pentru scriere de fișiere script. Când apare o eroare, + programul DiskPart continuă să proceseze comenzi ca și când + eroarea nu ar fi apărut. Fără parametrul NOERR, o eroare + cauzează programul DiskPart să se închidă cu un cod de eroare. - After the partition has been created, the focus automatically shifts to the - new partition. Only one extended partition can be created per disk. This - command fails if you attempt to create an extended partition within another - extended partition. You must create an extended partition before you can - create logical partitions. + După ce a fost creată partiția, marcajul se mută automat pe noua + partiție. Doar o singură partiție extinsă poate fi creată pe un disc. + Această comandă eșuează dacă încercați să creați o partiție extinsă + în altă partiție extinsă. Trebuie să creați o partiție extinsă + înainte de a crea partiții logice. - A basic MBR disk must be selected for this operation to succeed. + Un disc MBR de bază trebuie să fie selectat pentru ca această operațiune + să aibă succes. -Example: +De exemplu: CREATE PARTITION EXTENDED SIZE=1000 . @@ -1343,38 +1347,40 @@ Example: CREATE PARTITION LOGICAL SIZE=1000 . Language=Romanian - Creates a logical partition in an extended partition. - Applies to master boot record (MBR) disks only. + Crează o partiție logică într-o partiție extinsă. + Se aplică doar la discurile cu Registrul principal de inițializare (MBR). -Syntax: CREATE PARTITION LOGICAL [SIZE=<N>] [OFFSET=<N>] [ALIGN=<N>] [NOERR] +Sintaxă: CREATE PARTITION LOGICAL [SIZE=<N>] [OFFSET=<N>] [ALIGN=<N>] [NOERR] - SIZE=<N> The size of the partition in megabytes (MB). The partition is - at least as big in bytes as the number specified by N. If you - specify a size for the logical partition, it must be smaller - than the extended partition. If no size is given, the partition - continues until there is no more free space in the extended - partition. + SIZE=<N> Mărimea partiției în megaocteți (Mo). Partiția e cel puțin + la fel de mare în octeți ca numărul specificat de N. Dacă + specificați o dimensiune pentru partiția logică, aceasta + trebuie să fie mai mică decât partiția logică. Dacă nu este + dată nicio mărime, partiția continuă până când nu mai este + spațiu liber pe partiția extinsă. - OFFSET=<N> The offset, in kilobytes (KB), at which the partition is created. - If no offset is given, the partition is placed in the first disk - extent that is large enough to hold it. + OFFSET=<N> Decalajul, în kiloocteți (Ko), la care partiția e creată. + Dacă nu este dat niciun decalaj, partiția e plasată pe prima + expansiune a discului ce e suficient de mare ca să o țină. - ALIGN=<N> Typically used with hardware RAID Logical Unit Number (LUN) - arrays to improve performance. The partition offset will be - a multiple of <N>. If the OFFSET parameter is specified, it - will be rounded to the closest multiple of <N>. + ALIGN=<N> Folosită de obicei cu Numărul unității logice (LUN) RAID + a șirurilor de dispozitive pentru a îmbunătăți performanța. + Decalajul partiției va fi un multiplu a lui <N>. Dacă + parametrul OFFSET este specificat, va fi rotunjit la cel mai + apropiat multiplu a lui <N>. + + NOERR Doar pentru scriere de fișiere script. Când apare o eroare, + programul DiskPart continuă să proceseze comenzi ca și când + eroarea nu ar fi apărut. Fără parametrul NOERR, o eroare + cauzează programul DiskPart să se închidă cu un cod de eroare. - NOERR For scripting only. When an error is encountered, DiskPart - continues to process commands as if the error did not occur. - Without the NOERR parameter, an error causes DiskPart to exit - with an error code. + După ce a fost creată partiția, marcajul se mută automat pe + noua partiție logică. - After the partition has been created, the focus automatically shifts to the - new logical partition. + Un disc MBR de bază trebuie să fie selectat pentru ca această operațiune + să reușească. - A basic MBR disk must be selected for this operation to succeed. - -Example: +De exemplu: CREATE PARTITION LOGICAL SIZE=1000 . @@ -1572,7 +1578,7 @@ Language=Portugese <Add CREATE PARTITION MSR command help text here> . Language=Romanian -<Add CREATE PARTITION MSR command help text here> +<Adăugați aici textul de ajutor pentru comanda CREATE PARTITION MSR> . Language=Russian <Add CREATE PARTITION MSR command help text here> @@ -2037,105 +2043,111 @@ Example: CREATE PARTITION PRIMARY SIZE=10000 ID=DE . Language=Romanian - Creates a primary partition on the basic disk with focus. + Crează o partiție primară pe discul de bază în cauză. -Syntax: CREATE PARTITION PRIMARY [SIZE=<N>] [OFFSET=<N>] [ID={<BYTE> | <GUID>}] +Sintaxă: CREATE PARTITION PRIMARY [SIZE=<N>] [OFFSET=<N>] [ID={<BYTE> | <GUID>}] [ALIGN=<N>] [NOERR] - SIZE=<N> The size of the partition in megabytes (MB). If no size is - given, the partition continues until there is no more - unallocated space in the current region. + SIZE=<N> Mărimea partiției în megaocteți (Mo). Dacă nu e dată nicio + mărime, partiția continuă până când nu mai este spațiu nealocat + în regiunea curentă. - OFFSET=<N> The offset, in kilobytes (KB), at which the partition is created. - If no offset is given, the partition is placed in the first disk - extent that is large enough to hold it. + OFFSET=<N> Decalajul, în kiloocteți (Ko), la care partiția este creată. + Dacă nu e dat niciun decalaj, partiția este plasată pe prima + expansiune de disc ce e suficient de mare ca să o țină. ID={<BYTE> | <GUID>} - Specifies the partition type. + Specifică tipul partiției. - Intended for Original Equipment Manufacturer (OEM) use only. + Destinat numai pentru uzul producătorilor de echipamente + originale (OEM). - For master boot record (MBR) disks, you can specify a partition - type byte, in hexadecimal form, for the partition. If this - parameter is not specified for an MBR disk, the command creates - a partition of type 0x06 (specifies no file system is installed). + Pentru discurile cu Registrul principal de inițializare (MBR), + puteți specifica un octet, în format hexazecimal, pentru un tip + de partiție. Dacă acest parametru nu e specificat pentru + un disc MBR, comanda crează o partiție de tipul 0x06 + (menționează că nu este niciun sistem de fișier instalat). - LDM data partition: + Partiția de date LDM: 0x42 - Recovery partition: + Partiția de recuperare: 0x27 - Recognized OEM Ids: + Date de identificare (ID-uri) OEM: 0x12 0x84 0xDE 0xFE 0xA0 - For GUID partition table (GPT) disks you can specify a - partition type GUID for the partition you want to create. - Recognized GUIDs include: + Pentru discurile cu tabel de partiție GUID (GPT) puteți + specifica un tip de partiție GUID pentru partiția pe care vreți + să o creați. GUID-urile recunoscute includ: - EFI System partition: + Partiția de sistem EFI: c12a7328-f81f-11d2-ba4b-00a0c93ec93b - Microsoft Reserved partition: + Partiția rezervată Microsoft: e3c9e316-0b5c-4db8-817d-f92df00215ae - Basic data partition: + Partiția de bază pentru date: ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 - LDM Metadata partition on a dynamic disk: + Partiția de metadate LDM pe un disc dinamic: 5808c8aa-7e8f-42e0-85d2-e1e90434cfb3 - LDM Data partition on a dynamic disk: + Partiția de date LDM pe un disc dinamic: af9b60a0-1431-4f62-bc68-3311714a69ad - Recovery partition: + Partiția de recuperare: de94bba4-06d1-4d40-a16a-bfd50179d6ac - If this parameter is not specified for a GPT disk, the command - creates a basic data partition. - - Any partition type byte or GUID can be specified with this - parameter. DiskPart does not check the partition type for - validity except to ensure that it is a byte in hexadecimal form - or a GUID. - - Caution: - - Creating partitions with this parameter might cause your - computer to fail or be unable to start up. Unless you are - an OEM or an IT professional experienced with GPT disks, do - not create partitions on GPT disks using this parameter. - Instead, always use the CREATE PARTITION EFI command to - create EFI System partitions, the CREATE PARTITION MSR - command to create Microsoft Reserved partitions, and the - CREATE PARTITION PRIMARY command without this parameter to - create primary partitions on GPT disks. - - ALIGN=<N> Typically used with hardware RAID Logical Unit Number (LUN) - arrays to improve performance. The partition offset will be - a multiple of <N>. If the OFFSET parameter is specified, it - will be rounded to the closest multiple of <N>. - - NOERR For scripting only. When an error is encountered, DiskPart - continues to process commands as if the error did not occur. - Without the NOERR parameter, an error causes DiskPart to exit - with an error code. - - After you create the partition, the focus automatically shifts to the new - partition. The partition does not receive a drive letter. You must use the - assign command to assign a drive letter to the partition. - - A basic disk must be selected for this operation to succeed. - - If a partition type is not specified, the disk is uninitialized and disk - size is greater than 2TB, it will be initialized to GPT. - -Example: + Dacă acest parametru nu este specificat pentru un disc GPT, + comanda crează o partiție de bază pentru date. + + Orice octet care descrie tipul de partiție sau GUID poate fi + specificat cu acest parametru. DiskPart nu verifică tipul + partiției pentru validitate, cu excepția faptului că este + un octet cu valoare în format hexazecimal sau un GUID. + + Atenție: + + Crearea de partiții cu acest parametru poate cauza + calculatorului dumneavoastră să nu mai funcționeze bine sau + să nu mai poată porni. Dacă nu sunteți un OEM sau un + profesionist cu experiență în discuri GPT, nu creați + partiții pe discuri GPT folosind acest parametru. + În schimb, folosiți întotdeauna comanda + CREATE PARTITION EFI ca să creați partiții de sistem EFI, + comanda CREATE PARTITION MSR ca să creați partiții + rezervate Microsoft, și comanda CREATE PARTITION PRIMARY + fără acest parametru ca să creați partiții primare pe + discuri GPT. + + ALIGN=<N> Folosită deobicei cu Numărul unității logice (LUN) RAID + a șirurilor de dispozitive pentru a îmbunătăți performanța. + Decalajul partiției va fi un multiplu a lui <N>. Dacă + parametrul OFFSET este specificat, va fi rotunjit la cel mai + apropiat multiplu a lui <N>. + + NOERR Doar pentru scriere de fișiere script. Când apare o eroare, + programul DiskPart continuă să proceseze comenzi ca și când + eroarea nu ar fi apărut. Fără parametrul NOERR, o eroare + cauzează programul DiskPart să se închidă cu un cod de eroare. + + După ce ați creat partiția, marcajul se mută automat pe noua partiție + logică. Partiția nu primește nicio literă de disc. Trebuie să folosiți + comanda de atribuire pentru a atribui partiției o literă de disc. + + Un disc de bază trebuie să fie selectat pentru ca această operațiune + să reușească. + + Dacă un tip de partiție nu e specificat, discul este neinițializat și + mărimea discului este mai mare de 2To, va fi inițializat cu GPT. + +De exemplu: CREATE PARTITION PRIMARY SIZE=1000 CREATE PARTITION PRIMARY SIZE=128 ID=c12a7328-f81f-11d2-ba4b-00a0c93ec93b @@ -2684,7 +2696,7 @@ Language=Portugese <Add DELETE DISK command help text here> . Language=Romanian -<Add DELETE DISK command help text here> +<Adăugați aici textul de ajutor pentru comanda DELETE DISK> . Language=Russian <Add DELETE DISK command help text here> @@ -2816,28 +2828,29 @@ Example: DELETE PARTITION . Language=Romanian -Deletes the partition with focus. - -Syntax: DELETE PARTITION [NOERR] [OVERRIDE] +Șterge partiția în cauză. - NOERR For scripting only. When an error is encountered, DiskPart - continues to process commands as if the error did not occur. - Without the NOERR parameter, an error causes DiskPart to exit - with an error code. +Sintaxă: DELETE PARTITION [NOERR] [OVERRIDE] - OVERRIDE Enables DiskPart to delete any partition regardless of type. - Typically, DiskPart only permits you to delete known data - partitions. + NOERR Doar pentru scriere de fișiere script. Când apare o eroare, + programul DiskPart continuă să proceseze comenzi ca și când + eroarea nu ar fi apărut. Fără parametrul NOERR, o eroare + cauzează programul DiskPart să se închidă cu un cod de eroare. - You cannot delete the system partition, boot partition, or any partition - that contains the active paging file or crash dump (memory dump) filed. + OVERRIDE Permite programului DiskPart să șteargă orice partiție, + indiferent de tipul său. De obicei, DiskPart vă permite doar + să ștergeți partițiile de date cunoscute. - A partition must be selected for this operation to succeed. + Nu puteți șterge partiția de sistem, partiția de inițializare sau orice + altă partiție ce conține un fișier de paginație activ sau un registru + de colaps operațional (registru de memorie) solicitat. - Partitions cannot be deleted from dynamic disks or created on dynamic - disks. + O partiție trebuie selectată pentru ca acestă operațiune să reușească. -Example: + Partițiile nu pot fi șterse de pe discurile dinamice sau create + pe discurile dinamice. + +De exemplu: DELETE PARTITION . @@ -2987,7 +3000,7 @@ Language=Portugese <Add DELETE VOLUME command help text here> . Language=Romanian -<Add DELETE VOLUME command help text here> +<Adăugați aici textul de ajutor pentru comanda DELETE VOLUME> . Language=Russian <Add DELETE VOLUME command help text here> @@ -3060,14 +3073,14 @@ Example: DETAIL DISK . Language=Romanian - Displays the properties of the selected disk and the list of volumes on - the disk. + Afișează proprietățile discului selectat și listează volumele + pe disc. -Syntax: DETAIL DISK +Sintaxă: DETAIL DISK - A disk must be selected for this operation to succeed. + Un disc trebuie să fie selectat pentru ca această operațiune să reușească. -Example: +De exemplu: DETAIL DISK . @@ -3181,11 +3194,12 @@ Example: DETAIL PARTITION . Language=Romanian - Displays the properties for the selected partition. + Afișează proprietățile pentru partiția selectată. -Syntax: DETAIL PARTITION +Sintaxă: DETAIL PARTITION - A partition must be selected for this operation to succeed. + O partiție trebuie să fie selectată pentru ca această operațiune + să reușească. Example: @@ -3301,14 +3315,14 @@ Example: DETAIL VOLUME . Language=Romanian - Displays the properties for the selected volume and the list of disks on - which the volume resides. + Afișează proprietățile pentru volumul selectat și listează discurile + pe care aparține volumul. -Syntax: DETAIL VOLUME +Sintaxă: DETAIL VOLUME - A volume must be selected for this operation to succeed. + Un volum trebuie să fie selectat pentru ca această operațiune să reușească. -Example: +De exemplu: DETAIL VOLUME . @@ -3390,7 +3404,7 @@ Language=Portugese <Add DETACH command help text here> . Language=Romanian -<Add DETACH command help text here> +<Adăugați aici textul de ajutor pentru comanda DETACH> . Language=Russian <Add DETACH command help text here> @@ -3450,11 +3464,11 @@ Example: EXIT . Language=Romanian - Exits the DiskPart command interpreter. + Iese din interpretorul de comenzi al programului DiskPart. -Syntax: EXIT +Sintaxă: EXIT -Example: +De exemplu: EXIT . @@ -3522,7 +3536,7 @@ Language=Portugese <Add EXPAND command help text here> . Language=Romanian -<Add EXPAND command help text here> +<Adăugați aici textul de ajutor pentru comanda EXPAND> . Language=Russian <Add EXPAND command help text here> @@ -3558,7 +3572,7 @@ Language=Portugese <Add EXTEND command help text here> . Language=Romanian -<Add EXTEND command help text here> +<Adăugați aici textul de ajutor pentru comanda EXTEND> . Language=Russian <Add EXTEND command help text here> @@ -3632,14 +3646,15 @@ Example: FILESYSTEMS . Language=Romanian - Displays information about the current file system for the selected - volume, and the supported file systems for formatting the volume. + Afișează informații despre sistemul actual de fișiere pentru volumul + selectat și pentru sistemele de fișiere suportate pentru formatarea + volumului. -Syntax: FILESYSTEMS +Sintaxă: FILESYSTEMS - A volume must be selected for this operation to succeed. + Un volum trebuie să fie selectat pentru ca această operațiune să reușească. -Example: +De exemplu: FILESYSTEMS . @@ -3979,68 +3994,70 @@ Examples: FORMAT RECOMMENDED OVERRIDE . Language=Romanian - Formats the specified volume for use with ReactOS. + Formatează volumul specificat pentru folosire cu ReactOS. -Syntax: FORMAT [[FS=<FS>] [REVISION=<X.XX>] | RECOMMENDED] [LABEL=<"label">] +Sintaxă: FORMAT [[FS=<FS>] [REVISION=<X.XX>] | RECOMMENDED] [LABEL=<"label">] [UNIT=<N>] [QUICK] [COMPRESS] [OVERRIDE] [DUPLICATE] [NOWAIT] [NOERR] - FS=<FS> Specifies the type of file system. If no file system is given, - the default file system displayed by the FILESYSTEMS command is - used. + FS=<FS> Specifică tipul sistemului de fișiere. Dacă nu e dat niciun + sistem de fișiere, este folosit sistemul de fișiere implicit + afișat de comanda FILESYSTEMS. REVISION=<X.XX> - Specifies the file system revision (if applicable). + Specifică revizia sistemului de fișiere (dacă este aplicabil). - RECOMMENDED If specified, use the recommended file system and revision - instead of the default if a recommendation exists. The - recommended file system (if one exists) is displayed by the - FILESYSTEMS command. - - LABEL=<"label"> + RECOMMENDED Dacă este specificat, folosiți sistemul de fișiere recomandat + și revizia în locul celui implicit dacă există o + recomandare. Sistemul de fișiere recomandat (dacă există unul) + este afișat de comanda FILESYSTEMS. - Specifies the volume label. - - UNIT=<N> Overrides the default allocation unit size. Default settings - are strongly recommended for general use. The default - allocation unit size for a particular file system is displayed - by the FILESYSTEMS command. + LABEL=<"etichetă"> - NTFS compression is not supported for allocation unit sizes - above 4096. + Specifică eticheta volumului. - QUICK Performs a quick format. + UNIT=<N> Ignoră dimensiunea implicită a unității de alocare. Setările + implicite sunt recomandate cu tărie pentru uz general. + Dimensiunea implicită a unității de alocare pentru un anumit + sistem de fișiere este afișată de comanda FILESYSTEMS. - COMPRESS NTFS only: Files created on the new volume will be compressed - by default. + Comprimarea NTFS nu este acceptată pentru dimensiunile + unităților de alocare mai mari de 4096. - OVERRIDE Forces the file system to dismount first if necessary. All - opened handles to the volume would no longer be valid. + QUICK Efectuează o formatare rapidă. - DUPLICATE UDF Only: This flag applies to UDF format, version 2.5 or - higher. - This flag instructs the format operation to duplicate the file - system meta-data to a second set of sectors on the disk. The - duplicate meta-data is used by applications, for example repair - or recovery applications. If the primary meta-data sectors are - found to be corrupted, the file system meta-data will be read - from the duplicate sectors. + COMPRESS Numai pentru formatul NTFS: Fișierele create pe noul volum + vor fi comprimate în mod implicit. + OVERRIDE Forțează mai întâi demontarea sistemului de fișiere, dacă e + necesar. Toate identificatoarele de gestiune deschise ale + volumului nu ar mai fi valabile. - NOWAIT Forces the command to return immediately while the format - process is still in progress. If NOWAIT is not specified, - DiskPart will display format progress in percentage. + DUPLICATE Numai pentru formatul UDF: Această etichetă e aplicată + formatului UDF, versiunea 2.5 sau mai nouă. Această etichetă + intruiește operațiunea de formatare să dubleze metadatele + sistemului de fișiere la cel de al doilea set de sectoare + de pe disc. Metadatele dublate sunt folosite de aplicații, + de exemplu de utilitare de reparare și de recuperare. Dacă + sectoarele primare de metadate sunt găsite ca și corupte, + metadatele sistemului de fișiere vor fi citite de sectoarele + duplicate. - NOERR For scripting only. When an error is encountered, DiskPart - continues to process commands as if the error did not occur. - Without the NOERR parameter, an error causes DiskPart to exit - with an error code. + NOWAIT Forțează comanda să se întoarcă imediat atât timp cât procesul + de formatare este încă în curs. Dacă NOWAIT nu este + specificat, programul DiskPart va afișa progesul formatării + în procente. + + NOERR Doar pentru scriere de fișiere script. Când apare o eroare, + programul DiskPart continuă să proceseze comenzi ca și când + eroarea nu ar fi apărut. Fără parametrul NOERR, o eroare + cauzează programul DiskPart să se închidă cu un cod de eroare. - A volume must be selected for this operation to succeed. + Un volum trebuie să fie selectat pentru ca această operațiune să reușească. -Examples: +De exemplu: - FORMAT FS=NTFS LABEL="New Volume" QUICK COMPRESS + FORMAT FS=NTFS LABEL="Volum nou" QUICK COMPRESS FORMAT RECOMMENDED OVERRIDE . Language=Russian @@ -4377,7 +4394,7 @@ Language=Portugese <Add GPT command help text here> . Language=Romanian -<Add GPT command help text here> +<Adăugați aici textul de ajutor pentru comanda GPT> . Language=Russian <Add GPT command help text here> @@ -4465,16 +4482,17 @@ Example: HELP CREATE PARTITION PRIMARY . Language=Romanian - Displays a list of the available commands or detailed help information for a - specified command. + Afișează o listă a comenzilor disponibile sau informații detaliate + de ajutor pentru o comandă specificată. -Syntax: HELP [<COMMAND>] +Sintaxă: HELP [<COMMAND>] - <COMMAND> The command for which to display detail help. + <COMMAND> Comanda pentru care se afișează ajutorul detaliat. - If no command is specified, HELP will display all possible commands. + Dacă nu este specificată nicio comandă, comanda HELP va afișa + toate comenzile posibile. -Example: +De exemplu: HELP HELP CREATE PARTITION PRIMARY @@ -4572,7 +4590,7 @@ Language=Portugese <Add IMPORT command help text here> . Language=Romanian -<Add IMPORT command help text here> +<Adăugați aici textul de ajutor pentru comanda IMPORT> . Language=Russian <Add IMPORT command help text here> @@ -4692,25 +4710,27 @@ Example: INACTIVE . Language=Romanian - On disks with master boot record (MBR) disk formatting, marks - the partition with focus as inactive. + Pe discurile cu formatare Registrul principal de inițializare (MBR), + marchează partiția în cauză ca inactivă. -Syntax: INACTIVE +Sintaxă: INACTIVE - The computer may start from the next option specified in the BIOS such as a - CD-ROM drive or a Pre-Boot eXecution Environment (PXE)-based boot - environment (such as Remote Installation Services (RIS)) when you restart - the computer. + Calculatorul poate începe cu următoarea opțiune specificată în BIOS cum ar + fi, un mediu de inițializare pe un disc CD-ROM sau pe un Mediu de execuție + de preinițializare (PXE) (cum ar fi, Servicii de instalare de la distanță + (RIS)) atunci când vă reporniți calculatorul. - A partition must be selected for this operation to succeed. + O partiție trebuie să fie selectată pentru ca această operațiune + să reușească. - Caution: + Atenție: - Your computer might not start without an active partition. Do not mark - a system or boot partition as inactive unless you are an experienced - user with a thorough understanding of ReactOS storage management. + Calculatorul dumneavoastră ar putea să nu pornească fără o partiție + activă. Nu marcați o partiție de sistem sau de inițializare ca inactivă + dacă nu sunteți un utilizator experimentat cu o înțelegere aprofundată + a gestionării stocării ReactOS. -Example: +De exemplu: INACTIVE . @@ -4939,27 +4959,26 @@ Example: LIST DISK . Language=Romanian - Displays a list of disks. + Afișează o listă de discuri. -Syntax: LIST DISK +Sintaxă: LIST DISK - Displays a list of disks and information about them, such as their - size, amount of available free space, whether the disk is a basic - or dynamic disk, and whether the disk uses the master boot record - (MBR) or GUID partition table (GPT) partition style. The disk marked - with an asterisk (*) has focus. + Afișează o listă de discuri și de informații despre ele, cum ar fi + mărimea lor, cantitatea de spațiu liber disponibil, dacă discul este un + disc static sau un disc dinamic și dacă discul folosește stilul de + partiționare Registrul principal de inițializare (MBR) sau tabelul de + partiționare GUID (GPT). Discul marcat cu un asterisc (*) are marcaj. - Note that the FREE column does not display the total amount of free - space on the disk, but rather the amount of usable free space left - on the disk. For example, if you have a 10GB disk with 4 primary - partitions covering 5GB, there is no usable free space left (no - more partitions may be created). Another example would be you have - a 10GB disk with 3 primary partitions and an extended partition - covering 8GB. The exended partition is of size 3GB with one logical - drive of size 2GB. The disk will show only 1GB as free - the - 1GB of free space in the extended partition. + Rețineți că coloana FREE nu afișează cantitatea totală de spațiu liber + pe disc, dar mai degrabă cantitatea de spațiu liber utilizabil rămas pe + disc. De exemplu, dacă aveți un disc de 10Go cu 4 partiții primare care + acoperă 5Go, nu este spațiu liber utilizabil rămas (nu mai pot fi create + alte partiții). Alt exemplu poate fi că aveți un disc de 10Go cu 3 partiții + primare și o partiție extinsă care acoperă 8Go. Partiția există are mărimea + de 3GB cu un disc logic demărime de 2Go. Discul va arăta numai 1Go ca + spațiu liber - spațiu liber de 1Go în partiția extinsă. -Example: +De exemplu: LIST DISK . @@ -5154,17 +5173,18 @@ Example: LIST PARTITION . Language=Romanian - Displays a list of partitions in the partition table for the selected disk. + Afișează o listă de partiții în tabelul de partiționare pentru discul + selectat. -Syntax: LIST PARTITION +Sintaxă: LIST PARTITION - On dynamic disks, the partitions do not neccessarily correspond to the - dynamic volumes on the disk. Partitions may not be created or deleted - on dynamic disks. + Pe discurile dinamice, partițiile nu corespund în mod necesar, volumelor + dinamice de pe disc. Partițiile nu pot fi create sau șterse pe discurile + dinamice. - A disk must be selected for this operation to succeed. + Un disc trebuie să fie selectat pentru ca această operațiune să reușească. -Example: +De exemplu: LIST PARTITION . @@ -5289,12 +5309,12 @@ Example: LIST VOLUME . Language=Romanian - Displays a list of basic and dynamic volumes which are installed on the local - machine. + Afișează o listă a volumelor de bază sau dinamice ce sunt instalate în + calculatorul local. + +Sintaxă: LIST VOLUME -Syntax: LIST VOLUME - -Example: +De exemplu: LIST VOLUME . @@ -5366,7 +5386,7 @@ Language=Portugese <Add LIST VDISK command help text here> . Language=Romanian -<Add LIST VDISK command help text here> +<Adăugați aici textul de ajutor pentru comanda LIST VDISK> . Language=Russian <Add LIST VDISK command help text here> @@ -5402,7 +5422,7 @@ Language=Portugese <Add MERGE command help text here> . Language=Romanian -<Add MERGE command help text here> +<Adăugați aici textul de ajutor pentru comanda MERGE> . Language=Russian <Add MERGE command help text here> @@ -5438,7 +5458,7 @@ Language=Portugese <Add OFFLINE command help text here> . Language=Romanian -<Add OFFLINE command help text here> +<Adăugați aici textul de ajutor pentru comanda OFFLINE> . Language=Russian <Add OFFLINE command help text here> @@ -5474,7 +5494,7 @@ Language=Portugese <Add ONLINE command help text here> . Language=Romanian -<Add ONLINE command help text here> +<Adăugați aici textul de ajutor pentru comanda ONLINE> . Language=Russian <Add ONLINE command help text here> @@ -5510,7 +5530,7 @@ Language=Portugese <Add RECOVER command help text here> . Language=Romanian -<Add RECOVER command help text here> +<Adăugați aici textul de ajutor pentru comanda RECOVER> . Language=Russian <Add RECOVER command help text here> @@ -5610,16 +5630,16 @@ Example: ASSIGN f: . Language=Romanian - Provides a way to add comments to a script. + Furnizează un mod de a adăuga comentarii la un script. -Syntax: REM +Sintaxă: REM -Example: +De exemplu: - In this example script, REM is used to provide a comment about what the - script does. + În acest script exemplificat, comanda REM este folosită ca să furnizeze + un comentariu despre ce face scriptul. - REM These commands set up 3 drives. + REM Aceste comenzi configurează 3 discuri. CREATE PARTITION PRIMARY SIZE=2048 ASSIGN d: CREATE PARTITION EXTEND @@ -5741,7 +5761,7 @@ Language=Portugese <Add REMOVE command help text here> . Language=Romanian -<Add REMOVE command help text here> +<Adăugați aici textul de ajutor pentru comanda REMOVE> . Language=Russian <Add REMOVE command help text here> @@ -5777,7 +5797,7 @@ Language=Portugese <Add REPAIR command help text here> . Language=Romanian -<Add REPAIR command help text here> +<Adăugați aici textul de ajutor pentru comanda REPAIR> . Language=Russian <Add REPAIR command help text here> @@ -5838,11 +5858,11 @@ Example: RESCAN . Language=Romanian - Locates new disks that may have been added to the computer. + Localizează noile discuri ce pot fi adăugate la calculator. -Syntax: RESCAN +Sintaxă: RESCAN -Example: +De exemplu: RESCAN . @@ -5910,7 +5930,7 @@ Language=Portugese <Add RETAIN command help text here> . Language=Romanian -<Add RETAIN command help text here> +<Adăugați aici textul de ajutor pentru comanda RETAIN> . Language=Russian <Add RETAIN command help text here> @@ -5946,7 +5966,7 @@ Language=Portugese <Add SAN command help text here> . Language=Romanian -<Add SAN command help text here> +<Adăugați aici textul de ajutor pentru comanda SAN> . Language=Russian <Add SAN command help text here> @@ -6143,40 +6163,40 @@ Example: SELECT DISK=PCIROOT(0)#PCI(0100)#ATA(C00T00L01) . Language=Romanian - Selects the specified disk and shifts the focus to it. + Selectează discul specificat și mută marcajul pe el. -Syntax: SELECT DISK=<N> +Sintaxă: SELECT DISK=<N> SELECT DISK=SYSTEM SELECT DISK=NEXT - SELECT DISK=<Path> + SELECT DISK=<Cale> DISK=<N> - The DiskPart disk index number of the disk to receive - focus. + Numărul indexului discului pentru programul DiskPart care + urmează să primească marcajul. - DISK=<Path> - The location path of the disk to receive focus. + DISK=<Cale> + Calea locației discului care urmează să primească marcajul. DISK=SYSTEM - On BIOS machines, BIOS disk 0 will receive focus. - On EFI machines, the disk containing the ESP partition - used for the current boot will receive focus. On EFI - machines, if there is no ESP, or there is more than - one ESP present, or the machine is booted from Windows PE, - the command will fail. + La calculatoarele cu BIOS, discul 0 din BIOS va fi marcat. + La calculatoarele EFI, discul care conține partiția ESP + folosită pentru inițializarea curentă va primi marcaj. + La calculatoarele EFI, dacă nu este ESP sau este prezent + mai mult decât un ESP sau calculatorul este inițializat din + Windows PE, comanda va eșua. DISK=NEXT - Once a disk is selected, this command is used to iterate - over all disks in the disk list. The next disk in the list - will receive focus. If the next disk is the start of the - enumeration, the command will fail and no disk will have - focus. + Odată ce discul e selectat, această comandă este folosită + pentru a fi aplicată fiecărui disc din lista de discuri. + Următorul disc din listă va primi marcaj. Dacă următorul + disc este începutul enumerării, comanda va eșua și niciun disc + nu va trebui să fie marcat. - If no options are specified, the select command lists the disk that - currently has the focus. You can view the DiskPart index numbers - for all disks on the computer by using the LIST DISK command. + Dacă nicio opțiune nu este specificată, comanda SELECT va lista discul + care este marcat în prezent. Puteți vizualiza numerele de index pentru + toate discurile din calculator folosind comanda LIST DISK. -Example: +De exemplu: SELECT DISK=1 SELECT DISK=SYSTEM @@ -6477,23 +6497,20 @@ Example: SELECT PARTITION=1 . Language=Romanian - Selects the specified partition and shifts the focus to it. + Selectează partiția specificată și mută marcajul pe ea. -Syntax: SELECT PARTITION=<N> +Sintaxă: SELECT PARTITION=<N> PARTITION=<N> - The number of the partition to receive the focus. + Numărul partiției ce urmează să primească marcajul. - If no partition is specified, the select command lists the current - partition with focus. You can specify the partition by its number. You can - view the numbers of all partitions on the current disk by using the list - partition command. - - You must first select a disk using the DiskPart select disk command before - you can select a partition. - -Example: + Dacă nicio partiție nu este specificată, comanda SELECT va lista partiția + marcată în prezent. Puteți specifica partiția prin numărul său. Puteți + vizualiza numerele tuturor partițiilor de pe discul actual folosind + comanda LIST PARTITION. + +De exemplu: SELECT PARTITION=1 . @@ -6699,22 +6716,23 @@ Example: SELECT VOLUME=C:\\MountH . Language=Romanian - Selects the specified volume and shifts the focus to it. + Selectează volumul specificat și mută marcajul pe el. -Syntax: SELECT VOLUME={<N> | <D>} +Sintaxă: SELECT VOLUME={<N> | <D>} - VOLUME=<N> The number of the volume to receive the focus. + VOLUME=<N> Numărul volumului care urmează să primească marcajul. - VOLUME=<D> The drive letter or mounted folder path of the volume - to receive the focus. + VOLUME=<D> Litera discului sau calea dosarului montat al volumului + ce urmează să primească marcajul. - If no volume is specified, the select command lists the current volume with - focus. You can specify the volume by number, drive letter, or mounted folder - path. On a basic disk, selecting a volume also gives the corresponding - partition focus. You can view the numbers of all volumes on the computer by - using the list volume command. + Dacă niciun volum nu e specificat, comanda SELECT listează volumul actual + cu marcaj. Puteți specifica volumul după număr, după litera discului sau + după calea dosarului montat. Pe un disc de bază, selectarea unui volum + oferă de asemenea, marcajul corespunzător pe partiție. Puteți + vizualiza numărul tuturor volumelor din calculator folosind comanda + LIST VOLUME. -Example: +De exemplu: SELECT VOLUME=1 SELECT VOLUME=C @@ -6847,7 +6865,7 @@ Language=Portugese <Add SELECT VDISK command help text here> . Language=Romanian -<Add SELECT VDISK command help text here> +<Adăugați aici textul de ajutor pentru comanda SELECT VDISK> . Language=Russian <Add SELECT VDISK command help text here> @@ -7219,84 +7237,88 @@ Example: SET ID=ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 . Language=Romanian - Changes the partition type field for the partition with focus. + Schimbă registrul tipului partiției pentru partiția în cauză. -Syntax: SET ID={<BYTE> | <GUID>} [OVERRIDE] [NOERR] +Sintaxă: SET ID={<BYTE> | <GUID>} [OVERRIDE] [NOERR] ID={<BYTE> | <GUID>} - Specifies the new partition type. - For master boot record (MBR) disks, you can specify a partition - type byte, in hexadecimal form, for the partition. Any - partition type byte can be specified with this parameter except - for type 0x42 (LDM partition). Note that the leading '0x' is - omitted when specifying the hexadecimal partition type. - - For GUID partition table (GPT) disks you can specify a - partition type GUID for the partition. Recognized GUIDs - include: - - EFI System partition: + Specifică noul tip al partiției. + Pentru discurile cu Registrul principal de inițializare (MBR), + puteți speciifica puteți specifica un octet, în format + hexazecimal, pentru un tip de partiție. Orice octet care + descrie tipul de partiție poate fi specificată cu acest + parametru, exceptând pentru tipul 0x42 (partiție LDM). Rețineți + că primul '0x' când este specificat în hexazecimal un tip de + partiție. + + Pentru discurile cu tabelul de partiție GUID (GPT) puteți + specifica un tip de partiție GUID pentru partiția pe care vreți + să o creați. GUID-urile recunoscute includ: + + Partiția de sistem EFI: c12a7328-f81f-11d2-ba4b-00a0c93ec93b - Basic data partition: + Partiția de bază pentru date: ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 - Any partition type GUID can be specified with this parameter - except for the following: + Orice partiție de tip GUID poate fi specificată cu acest + parametru exceptând următoarele: - Microsoft Reserved partition: + Partiția rezervată Microsoft: e3c9e316-0b5c-4db8-817d-f92df00215a - LDM Metadata partition on a dynamic disk: + Partiția de metadate LDM pe un disc dinamic: 5808c8aa-7e8f-42e0-85d2-e1e90434cfb3 - LDM Data partition on a dynamic disk: + Partiția de date LDM pe un disc dinamic: af9b60a0-1431-4f62-bc68-3311714a69ad - Cluster Metadata partition: + Partiția de metadate a grupului: db97dba9-0840-4bae-97f0-ffb9a327c7e1 - Other than the limitations mentioned, DiskPart otherwise does - not check the partition type for validity except to ensure that - it is a byte in hexadecimal form or a GUID. - - OVERRIDE Enables DiskPart to force the file system on the volume to - dismount before changing the partition type. When changing - the partition type, DiskPart will attempt to lock and dismount - the file system on the volume. If this parameter is not specified, - and the call to lock the file system fails, (because some other - application has an open handle to the volume), the entire - operation will fail. When this parameter is specified, the - dismount is forced even if the call to lock the file system - fails. When a file system is dismounted, all opened handles to - the volume will become invalid. - - NOERR For scripting only. When an error is encountered, DiskPart - continues to process commands as if the error did not occur. - Without the NOERR parameter, an error causes DiskPart to exit - with an error code. - - Intended for Original Equipment Manufacturer (OEM) use only. - - A partition must be selected for this operation to succeed. - - Caution: - - Changing partition type fields with this parameter might cause your - computer to fail or be unable to start up. Unless you are an OEM or an - IT professional experienced with GPT disks, do not change partition - type fields on GPT disks using this parameter. Instead, always use the - CREATE PARTITION EFI command to create EFI System partitions, the - CREATE PARTITION MSR command to create Microsoft Reserved partitions, - and the CREATE PARTITION PRIMARY command without the ID parameter to - create primary partitions on GPT disks. - - This command does not work on dynamic disks nor on Microsoft Reserved - partitions. - -Example: + În afară de limitările menționate, DiskPart nu verifică + valabilitatea tipului de partiție decât pentru a se asigura că + este un octet în formă hexazecimală sau un GUID. + + OVERRIDE Activează DiskPart pentru a forța sistemul de fișiere pe volum + să demonteze tipul de partiție înainte de a-l schimba. Când se + schimbă tipul de partiție, DiskPart va încerca să blocheze și + să demonteze sistemul de fișiere pe volum. Dacă acest parametru + nu este specificat și apelarea blocării sistemului de fișiere + eșuează, (deoarece alte câteva aplicații au un identificator + de gestiune deschis pentru volum), întreaga operațiune va eșua. + Când acest parametru este specificat, demontarea e forțată + chiar dacă apelarea blocării sistemului de fișiere eșuează. + Când un sistem de fișiere e demontat, toate identificatoarele + de gestiune deschise ale volumului vor deveni nevalide. + + NOERR Doar pentru scriere de fișiere script. Când apare o eroare, + programul DiskPart continuă să proceseze comenzi ca și când + eroarea nu ar fi apărut. Fără parametrul NOERR, o eroare + cauzează programul DiskPart să se închidă cu un cod de eroare. + + Destinat numai pentru utilizarea producătorilor de echipamente originale + (OEM). + + O partiție trebuie selectată pentru ca acestă operațiune să reușească. + + Atenție: + + Crearea de partiții cu acest parametru poate cauza calculatorului + dumneavoastră să eșueaze sau să nu mai poată porni. Dacă nu sunteți un + OEM sau un profesionist cu experiență în discuri GPT, nu creați + partiții pe discuri GPT folosind acest parametru. În schimb, folosiți + întotdeauna comanda CREATE PARTITION EFI ca să creați partiții de + sistem EFI, comanda CREATE PARTITION MSR ca să creați partiții + rezervate Microsoft, și comanda CREATE PARTITION PRIMARY fără acest + parametru ca să creați partiții primare pe discuri GPT. + + Această comandă nu funcționează nici pe discuri dinamice, nici pe + Partiții rezervate Microsoft. + +De exemplu: SET ID=07 OVERRIDE SET ID=ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 . @@ -7719,7 +7741,7 @@ Language=Portugese <Add SHRINK command help text here> . Language=Romanian -<Add SHRINK command help text here> +<Adăugați aici textul de ajutor pentru comanda SHRINK> . Language=Russian <Add SHRINK command help text here> @@ -7856,27 +7878,27 @@ Example: UNIQUEID DISK ID=baf784e7-6bbd-4cfb-aaac-e86c96e166ee . Language=Romanian - Displays or sets the GUID partition table (GPT) identifier or master boot - record (MBR) signature for the disk with focus. + Afișează sau setează identificatorul tabelului de partiție GUID (GPT) sau + semnătura Registrului principal de inițializare (MBR) pentru discul + în cauză. -Syntax: UNIQUEID DISK [ID={<DWORD> | <GUID>}] [NOERR] +Sintaxă: UNIQUEID DISK [ID={<DWORD> | <GUID>}] [NOERR] ID={<DWORD> | <GUID>} - For MBR disks, you can specify a four-byte (DWORD) value in - hexadecimal form for the signature. + Pentru discurile MBR, puteți specifica o valoare de patru + octeți (DWORD) formă hexazecimală pentru semnătură. - For GPT disks, specify a GUID for the identifier. + Pentru discurile GPT, specificați un GUID pentru identificator. - NOERR For scripting only. When an error is encountered, DiskPart - continues to process commands as if the error did not occur. - Without the NOERR parameter, an error causes DiskPart to exit - with an error code. + NOERR Doar pentru scriere de fișiere script. Când apare o eroare, + programul DiskPart continuă să proceseze comenzi ca și când + eroarea nu ar fi apărut. Fără parametrul NOERR, o eroare + cauzează programul DiskPart să se închidă cu un cod de eroare. - A disk must be selected for this operation to succeed. This command works - on basic and dynamic disks. + Un disc trebuie să fie selectat pentru ca această operațiune să reușească. -Example: +De exemplu: UNIQUEID DISK UNIQUEID DISK ID=5f1b2c36

1 year, 10 months

[reactos] 10/10: [NTDLL_APITEST] Write tests for NtAccessCheckByTypeResultList

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a61e1c33c78d0ac188fd… commit 8a61e1c33c78d0ac188fd2fddc96325084ff5eb0 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Fri Jul 28 10:52:18 2023 +0200 Commit: unknown <george.bisoc(a)reactos.org> CommitDate: Tue Aug 22 17:54:19 2023 +0200 [NTDLL_APITEST] Write tests for NtAccessCheckByTypeResultList --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + .../apitests/ntdll/NtAccessCheckByTypeResultList.c | 692 +++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + 3 files changed, 695 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 4cad9ae218e..14c12de120e 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -11,6 +11,7 @@ list(APPEND SOURCE locale.c NtAcceptConnectPort.c NtAccessCheckByType.c + NtAccessCheckByTypeResultList.c NtAdjustGroupsToken.c NtAdjustPrivilegesToken.c NtAllocateVirtualMemory.c diff --git a/modules/rostests/apitests/ntdll/NtAccessCheckByTypeResultList.c b/modules/rostests/apitests/ntdll/NtAccessCheckByTypeResultList.c new file mode 100644 index 00000000000..084c9ddb006 --- /dev/null +++ b/modules/rostests/apitests/ntdll/NtAccessCheckByTypeResultList.c @@ -0,0 +1,692 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for the NtAccessCheckByTypeResultList API + * COPYRIGHT: Copyright 2023 George Bișoc <george.bisoc(a)reactos.org> + */ + +#include "precomp.h" + +static GENERIC_MAPPING RegMapping = {KEY_READ, KEY_WRITE, KEY_EXECUTE, KEY_ALL_ACCESS}; +static GUID ObjectType = {0x12345678, 0x1234, 0x5678, {0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88}}; +static GUID ChildObjectType = {0x23456789, 0x2345, 0x6786, {0x2, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99}}; +static SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY}; +static SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; + +static +HANDLE +GetTokenProcess( + _In_ BOOLEAN WantImpersonateLevel, + _In_ BOOLEAN WantImpersonateType) +{ + NTSTATUS Status; + HANDLE Token; + HANDLE DuplicatedToken; + OBJECT_ATTRIBUTES ObjectAttributes; + SECURITY_QUALITY_OF_SERVICE Sqos; + + Status = NtOpenProcessToken(NtCurrentProcess(), + TOKEN_QUERY | TOKEN_DUPLICATE, + &Token); + if (!NT_SUCCESS(Status)) + { + trace("Failed to get current process token (Status 0x%08lx)\n", Status); + return NULL; + } + + Sqos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); + Sqos.ImpersonationLevel = WantImpersonateLevel ? SecurityImpersonation : SecurityAnonymous; + Sqos.ContextTrackingMode = 0; + Sqos.EffectiveOnly = FALSE; + + InitializeObjectAttributes(&ObjectAttributes, + NULL, + 0, + NULL, + NULL); + ObjectAttributes.SecurityQualityOfService = &Sqos; + + Status = NtDuplicateToken(Token, + TOKEN_QUERY | TOKEN_DUPLICATE, + &ObjectAttributes, + FALSE, + WantImpersonateType ? TokenImpersonation : TokenPrimary, + &DuplicatedToken); + if (!NT_SUCCESS(Status)) + { + trace("Failed to duplicate token (Status 0x%08lx)\n", Status); + NtClose(Token); + return NULL; + } + + return DuplicatedToken; +} + +static +VOID +ParamValidationNoObjsList(VOID) +{ + NTSTATUS Status; + NTSTATUS AccessStatus; + ACCESS_MASK GrantedAccess; + PPRIVILEGE_SET PrivilegeSet = NULL; + ULONG PrivilegeSetLength; + HANDLE Token = NULL; + SECURITY_DESCRIPTOR Sd; + + PrivilegeSetLength = FIELD_OFFSET(PRIVILEGE_SET, Privilege[16]); + PrivilegeSet = RtlAllocateHeap(RtlGetProcessHeap(), 0, PrivilegeSetLength); + if (PrivilegeSet == NULL) + { + skip("Failed to allocate PrivilegeSet, skipping tests\n"); + goto Quit; + } + + Token = GetTokenProcess(TRUE, TRUE); + if (Token == NULL) + { + skip("Failed to get token, skipping tests\n"); + goto Quit; + } + + Status = RtlCreateSecurityDescriptor(&Sd, SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) + { + skip("Failed to create a security descriptor, skipping tests\n"); + goto Quit; + } + + RtlSetGroupSecurityDescriptor(&Sd, NULL, FALSE); + RtlSetOwnerSecurityDescriptor(&Sd, NULL, FALSE); + RtlSetDaclSecurityDescriptor(&Sd, FALSE, NULL, FALSE); + + /* The function expects an object type list */ + Status = NtAccessCheckByTypeResultList(&Sd, + NULL, + Token, + MAXIMUM_ALLOWED, + NULL, + 0, + &RegMapping, + PrivilegeSet, + &PrivilegeSetLength, + &GrantedAccess, + &AccessStatus); + ok_hex(Status, STATUS_INVALID_PARAMETER); + +Quit: + if (Token) + { + NtClose(Token); + } + + if (PrivilegeSet) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, PrivilegeSet); + } +} + +static +VOID +PrintAccessStatusAndGrantedAccess( + _In_ PNTSTATUS AccessStatus, + _In_ PACCESS_MASK GrantedAccess, + _In_ ULONG ObjectTypeListLength) +{ + ULONG i; + + trace("===== OBJECT ACCESS & STATUS LIST =====\n"); + for (i = 0; i < ObjectTypeListLength; i++) + { + trace("OBJ #%lu, access status 0x%08lx, granted access 0x%08lx\n", i, AccessStatus[i], GrantedAccess[i]); + } + trace("\n"); +} + +static +VOID +GrantedAccessTests(VOID) +{ + NTSTATUS Status; + NTSTATUS AccessStatus[6]; + ACCESS_MASK GrantedAccess[6]; + PPRIVILEGE_SET PrivilegeSet = NULL; + ULONG PrivilegeSetLength; + HANDLE Token = NULL; + PACL Dacl = NULL; + ULONG DaclSize; + ULONG i; + SECURITY_DESCRIPTOR Sd; + OBJECT_TYPE_LIST ObjTypeList[6]; + PSID EveryoneSid = NULL, AdminSid = NULL, UsersSid = NULL; + GUID ChildObjectType2 = {0x34578901, 0x3456, 0x7896, {0x3, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00}}; + GUID ChildObjectType3 = {0x45678901, 0x4567, 0x1122, {0x4, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x01}}; + GUID ChildObjectType4 = {0x56788901, 0x1111, 0x2222, {0x5, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x02}}; + GUID ChildObjectType5 = {0x67901234, 0x2222, 0x3333, {0x4, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x03}}; + + /* Allocate all the stuff we need */ + PrivilegeSetLength = FIELD_OFFSET(PRIVILEGE_SET, Privilege[16]); + PrivilegeSet = RtlAllocateHeap(RtlGetProcessHeap(), 0, PrivilegeSetLength); + if (PrivilegeSet == NULL) + { + skip("Failed to allocate PrivilegeSet, skipping tests\n"); + return; + } + + Status = RtlAllocateAndInitializeSid(&WorldAuthority, + 1, + SECURITY_WORLD_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &EveryoneSid); + if (!NT_SUCCESS(Status)) + { + skip("Failed to create Everyone SID, skipping tests\n"); + goto Quit; + } + + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, + 0, + 0, + 0, + 0, + 0, + &AdminSid); + if (!NT_SUCCESS(Status)) + { + skip("Failed to create Admins SID, skipping tests\n"); + goto Quit; + } + + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_USERS, + 0, + 0, + 0, + 0, + 0, + 0, + &UsersSid); + if (!NT_SUCCESS(Status)) + { + skip("Failed to create User SID, skipping tests\n"); + goto Quit; + } + + Token = GetTokenProcess(TRUE, TRUE); + if (Token == NULL) + { + skip("Failed to get token, skipping tests\n"); + goto Quit; + } + + Status = RtlCreateSecurityDescriptor(&Sd, SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) + { + skip("Failed to create a security descriptor, skipping tests\n"); + goto Quit; + } + + DaclSize = sizeof(ACL) + + sizeof(ACCESS_ALLOWED_OBJECT_ACE) + RtlLengthSid(AdminSid) + + sizeof(ACCESS_ALLOWED_OBJECT_ACE) + RtlLengthSid(EveryoneSid) + + sizeof(ACCESS_ALLOWED_OBJECT_ACE) + RtlLengthSid(EveryoneSid); + Dacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Dacl == NULL) + { + skip("Failed to allocate memory for DACL, skipping tests\n"); + goto Quit; + } + + Status = RtlCreateAcl(Dacl, + DaclSize, + ACL_REVISION4); + if (!NT_SUCCESS(Status)) + { + skip("Failed to create DACL, skipping tests\n"); + goto Quit; + } + + /* + * Admins have full access over the key object, everyone else can only read from + * it and can only query the value from the child sub-object. + */ + Status = RtlAddAccessAllowedObjectAce(Dacl, + ACL_REVISION4, + 0, + KEY_ALL_ACCESS, + &ObjectType, + NULL, + AdminSid); + if (!NT_SUCCESS(Status)) + { + skip("Failed to add allowed object ACE for Admins SID, skipping tests\n"); + goto Quit; + } + + Status = RtlAddAccessAllowedObjectAce(Dacl, + ACL_REVISION4, + 0, + KEY_READ, + &ObjectType, + NULL, + EveryoneSid); + if (!NT_SUCCESS(Status)) + { + skip("Failed to add allowed object ACE for Everyone SID, skipping tests\n"); + goto Quit; + } + + Status = RtlAddAccessAllowedObjectAce(Dacl, + ACL_REVISION4, + 0, + KEY_QUERY_VALUE, + &ChildObjectType, + NULL, + EveryoneSid); + if (!NT_SUCCESS(Status)) + { + skip("Failed to add allowed object ACE for Everyone SID, skipping tests\n"); + goto Quit; + } + + /* Setup the descriptor */ + RtlSetGroupSecurityDescriptor(&Sd, UsersSid, FALSE); + RtlSetOwnerSecurityDescriptor(&Sd, AdminSid, FALSE); + RtlSetDaclSecurityDescriptor(&Sd, TRUE, Dacl, FALSE); + + /* Setup the object type list */ + ObjTypeList[0].Level = ACCESS_OBJECT_GUID; + ObjTypeList[0].Sbz = 0; + ObjTypeList[0].ObjectType = &ObjectType; + + ObjTypeList[1].Level = ACCESS_PROPERTY_SET_GUID; + ObjTypeList[1].Sbz = 0; + ObjTypeList[1].ObjectType = &ChildObjectType; + + ObjTypeList[2].Level = ACCESS_PROPERTY_GUID; + ObjTypeList[2].Sbz = 0; + ObjTypeList[2].ObjectType = &ChildObjectType2; + + ObjTypeList[3].Level = ACCESS_PROPERTY_GUID; + ObjTypeList[3].Sbz = 0; + ObjTypeList[3].ObjectType = &ChildObjectType3; + + ObjTypeList[4].Level = ACCESS_PROPERTY_SET_GUID; + ObjTypeList[4].Sbz = 0; + ObjTypeList[4].ObjectType = &ChildObjectType4; + + ObjTypeList[5].Level = ACCESS_PROPERTY_GUID; + ObjTypeList[5].Sbz = 0; + ObjTypeList[5].ObjectType = &ChildObjectType5; + + /* Admins should be granted every access */ + Status = NtAccessCheckByTypeResultList(&Sd, + NULL, + Token, + MAXIMUM_ALLOWED, + ObjTypeList, + RTL_NUMBER_OF(ObjTypeList), + &RegMapping, + PrivilegeSet, + &PrivilegeSetLength, + GrantedAccess, + AccessStatus); + ok_hex(Status, STATUS_SUCCESS); + + PrintAccessStatusAndGrantedAccess(AccessStatus, GrantedAccess, RTL_NUMBER_OF(ObjTypeList)); + for (i = 0; i < RTL_NUMBER_OF(ObjTypeList); i++) + { + ok(AccessStatus[i] == STATUS_SUCCESS, "Expected STATUS_SUCCESS but got 0x%08lx\n", AccessStatus[i]); + ok(GrantedAccess[i] == KEY_ALL_ACCESS, "Expected KEY_ALL_ACCESS but got 0x%08lx\n", GrantedAccess[i]); + } + + /* Everyone else can only read */ + Status = NtAccessCheckByTypeResultList(&Sd, + NULL, + Token, + KEY_READ, + ObjTypeList, + RTL_NUMBER_OF(ObjTypeList), + &RegMapping, + PrivilegeSet, + &PrivilegeSetLength, + GrantedAccess, + AccessStatus); + ok_hex(Status, STATUS_SUCCESS); + + PrintAccessStatusAndGrantedAccess(AccessStatus, GrantedAccess, RTL_NUMBER_OF(ObjTypeList)); + for (i = 0; i < RTL_NUMBER_OF(ObjTypeList); i++) + { + ok(AccessStatus[i] == STATUS_SUCCESS, "Expected STATUS_SUCCESS but got 0x%08lx\n", AccessStatus[i]); + ok(GrantedAccess[i] == KEY_READ, "Expected KEY_READ but got 0x%08lx\n", GrantedAccess[i]); + } + + /* Everyone else can only query a registry value from the child object */ + Status = NtAccessCheckByTypeResultList(&Sd, + NULL, + Token, + KEY_QUERY_VALUE, + ObjTypeList, + RTL_NUMBER_OF(ObjTypeList), + &RegMapping, + PrivilegeSet, + &PrivilegeSetLength, + GrantedAccess, + AccessStatus); + ok_hex(Status, STATUS_SUCCESS); + + PrintAccessStatusAndGrantedAccess(AccessStatus, GrantedAccess, RTL_NUMBER_OF(ObjTypeList)); + for (i = 0; i < RTL_NUMBER_OF(ObjTypeList); i++) + { + ok(AccessStatus[i] == STATUS_SUCCESS, "Expected STATUS_SUCCESS but got 0x%08lx\n", AccessStatus[i]); + ok(GrantedAccess[i] == KEY_QUERY_VALUE, "Expected KEY_QUERY_VALUE but got 0x%08lx\n", GrantedAccess[i]); + } + +Quit: + if (Dacl) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl); + } + + if (Token) + { + NtClose(Token); + } + + if (UsersSid) + { + RtlFreeSid(UsersSid); + } + + if (AdminSid) + { + RtlFreeSid(AdminSid); + } + + if (EveryoneSid) + { + RtlFreeSid(EveryoneSid); + } + + if (PrivilegeSet) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, PrivilegeSet); + } +} + +static +VOID +DenyAccessTests(VOID) +{ + NTSTATUS Status; + NTSTATUS AccessStatus[6]; + ACCESS_MASK GrantedAccess[6]; + PPRIVILEGE_SET PrivilegeSet = NULL; + ULONG PrivilegeSetLength; + HANDLE Token = NULL; + PACL Dacl = NULL; + ULONG DaclSize; + ULONG i; + SECURITY_DESCRIPTOR Sd; + OBJECT_TYPE_LIST ObjTypeList[6]; + PSID EveryoneSid = NULL, AdminSid = NULL, UsersSid = NULL; + GUID ChildObjectType2 = {0x34578901, 0x3456, 0x7896, {0x3, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0x00}}; + GUID ChildObjectType3 = {0x45678901, 0x4567, 0x1122, {0x4, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x01}}; + GUID ChildObjectType4 = {0x56788901, 0x1111, 0x2222, {0x5, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x02}}; + GUID ChildObjectType5 = {0x67901234, 0x2222, 0x3333, {0x4, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x03}}; + + /* Allocate all the stuff we need */ + PrivilegeSetLength = FIELD_OFFSET(PRIVILEGE_SET, Privilege[16]); + PrivilegeSet = RtlAllocateHeap(RtlGetProcessHeap(), 0, PrivilegeSetLength); + if (PrivilegeSet == NULL) + { + skip("Failed to allocate PrivilegeSet, skipping tests\n"); + return; + } + + Status = RtlAllocateAndInitializeSid(&WorldAuthority, + 1, + SECURITY_WORLD_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &EveryoneSid); + if (!NT_SUCCESS(Status)) + { + skip("Failed to create Everyone SID, skipping tests\n"); + goto Quit; + } + + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, + 0, + 0, + 0, + 0, + 0, + &AdminSid); + if (!NT_SUCCESS(Status)) + { + skip("Failed to create Admins SID, skipping tests\n"); + goto Quit; + } + + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_USERS, + 0, + 0, + 0, + 0, + 0, + 0, + &UsersSid); + if (!NT_SUCCESS(Status)) + { + skip("Failed to create User SID, skipping tests\n"); + goto Quit; + } + + Token = GetTokenProcess(TRUE, TRUE); + if (Token == NULL) + { + skip("Failed to get token, skipping tests\n"); + goto Quit; + } + + Status = RtlCreateSecurityDescriptor(&Sd, SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) + { + skip("Failed to create a security descriptor, skipping tests\n"); + goto Quit; + } + + DaclSize = sizeof(ACL) + + sizeof(ACCESS_DENIED_OBJECT_ACE) + RtlLengthSid(AdminSid) + + sizeof(ACCESS_DENIED_OBJECT_ACE) + RtlLengthSid(EveryoneSid) + + sizeof(ACCESS_ALLOWED_OBJECT_ACE) + RtlLengthSid(EveryoneSid); + Dacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Dacl == NULL) + { + skip("Failed to allocate memory for DACL, skipping tests\n"); + goto Quit; + } + + Status = RtlCreateAcl(Dacl, + DaclSize, + ACL_REVISION4); + if (!NT_SUCCESS(Status)) + { + skip("Failed to create DACL, skipping tests\n"); + goto Quit; + } + + /* + * Admins can't read the main object, whereas everyone else can't write + * into the child object. + */ + Status = RtlAddAccessDeniedObjectAce(Dacl, + ACL_REVISION4, + 0, + KEY_READ, + &ObjectType, + NULL, + AdminSid); + if (!NT_SUCCESS(Status)) + { + skip("Failed to add deny object ACE for Admins SID, skipping tests\n"); + goto Quit; + } + + Status = RtlAddAccessDeniedObjectAce(Dacl, + ACL_REVISION4, + 0, + KEY_WRITE, + &ChildObjectType, + NULL, + EveryoneSid); + if (!NT_SUCCESS(Status)) + { + skip("Failed to add deny object ACE for Everyone SID, skipping tests\n"); + goto Quit; + } + + /* Setup the descriptor */ + RtlSetGroupSecurityDescriptor(&Sd, UsersSid, FALSE); + RtlSetOwnerSecurityDescriptor(&Sd, AdminSid, FALSE); + RtlSetDaclSecurityDescriptor(&Sd, TRUE, Dacl, FALSE); + + /* Setup the object type list */ + ObjTypeList[0].Level = ACCESS_OBJECT_GUID; + ObjTypeList[0].Sbz = 0; + ObjTypeList[0].ObjectType = &ObjectType; + + ObjTypeList[1].Level = ACCESS_PROPERTY_SET_GUID; + ObjTypeList[1].Sbz = 0; + ObjTypeList[1].ObjectType = &ChildObjectType; + + ObjTypeList[2].Level = ACCESS_PROPERTY_GUID; + ObjTypeList[2].Sbz = 0; + ObjTypeList[2].ObjectType = &ChildObjectType2; + + ObjTypeList[3].Level = ACCESS_PROPERTY_GUID; + ObjTypeList[3].Sbz = 0; + ObjTypeList[3].ObjectType = &ChildObjectType3; + + ObjTypeList[4].Level = ACCESS_PROPERTY_SET_GUID; + ObjTypeList[4].Sbz = 0; + ObjTypeList[4].ObjectType = &ChildObjectType4; + + ObjTypeList[5].Level = ACCESS_PROPERTY_GUID; + ObjTypeList[5].Sbz = 0; + ObjTypeList[5].ObjectType = &ChildObjectType5; + + /* + * Admins shouldn't be able to read from the main object. + * NtAccessCheckByTypeResultList will return partial rights + * that have been granted to the caller even if the caller + * did not get all the rights he wanted. + */ + Status = NtAccessCheckByTypeResultList(&Sd, + NULL, + Token, + KEY_READ, + ObjTypeList, + RTL_NUMBER_OF(ObjTypeList), + &RegMapping, + PrivilegeSet, + &PrivilegeSetLength, + GrantedAccess, + AccessStatus); + ok_hex(Status, STATUS_SUCCESS); + + PrintAccessStatusAndGrantedAccess(AccessStatus, GrantedAccess, RTL_NUMBER_OF(ObjTypeList)); + for (i = 0; i < RTL_NUMBER_OF(ObjTypeList); i++) + { + ok(AccessStatus[i] == STATUS_ACCESS_DENIED, "Expected STATUS_ACCESS_DENIED but got 0x%08lx\n", AccessStatus[i]); + ok(GrantedAccess[i] == READ_CONTROL, "Expected READ_CONTROL as given partial right but got 0x%08lx\n", GrantedAccess[i]); + } + + /* Everyone else can't write into the child object */ + Status = NtAccessCheckByTypeResultList(&Sd, + NULL, + Token, + KEY_WRITE, + ObjTypeList, + RTL_NUMBER_OF(ObjTypeList), + &RegMapping, + PrivilegeSet, + &PrivilegeSetLength, + GrantedAccess, + AccessStatus); + ok_hex(Status, STATUS_SUCCESS); + + PrintAccessStatusAndGrantedAccess(AccessStatus, GrantedAccess, RTL_NUMBER_OF(ObjTypeList)); + for (i = 0; i < RTL_NUMBER_OF(ObjTypeList); i++) + { + ok(AccessStatus[i] == STATUS_ACCESS_DENIED, "Expected STATUS_ACCESS_DENIED but got 0x%08lx\n", AccessStatus[i]); + ok(GrantedAccess[i] == READ_CONTROL, "Expected READ_CONTROL as given partial right but got 0x%08lx\n", GrantedAccess[i]); + } + +Quit: + if (Dacl) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl); + } + + if (Token) + { + NtClose(Token); + } + + if (UsersSid) + { + RtlFreeSid(UsersSid); + } + + if (AdminSid) + { + RtlFreeSid(AdminSid); + } + + if (EveryoneSid) + { + RtlFreeSid(EveryoneSid); + } + + if (PrivilegeSet) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, PrivilegeSet); + } +} + +START_TEST(NtAccessCheckByTypeResultList) +{ + ParamValidationNoObjsList(); + GrantedAccessTests(); + DenyAccessTests(); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index 321b8cddf4b..7f80f42420b 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -7,6 +7,7 @@ extern void func_LdrEnumResources(void); extern void func_load_notifications(void); extern void func_NtAcceptConnectPort(void); extern void func_NtAccessCheckByType(void); +extern void func_NtAccessCheckByTypeResultList(void); extern void func_NtAdjustGroupsToken(void); extern void func_NtAdjustPrivilegesToken(void); extern void func_NtAllocateVirtualMemory(void); @@ -101,6 +102,7 @@ const struct test winetest_testlist[] = { "load_notifications", func_load_notifications }, { "NtAcceptConnectPort", func_NtAcceptConnectPort }, { "NtAccessCheckByType", func_NtAccessCheckByType }, + { "NtAccessCheckByTypeResultList", func_NtAccessCheckByTypeResultList }, { "NtAdjustGroupsToken", func_NtAdjustGroupsToken }, { "NtAdjustPrivilegesToken", func_NtAdjustPrivilegesToken }, { "NtAllocateVirtualMemory", func_NtAllocateVirtualMemory },

1 year, 10 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