Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [DESK] Improve Polish (pl-PL) translation (#4826)
by Piotr Hetnarowicz 02 Nov '22

02 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f11027420814388c7ee28… commit f11027420814388c7ee284c8e19d4f74b3fe3d9f Author: Piotr Hetnarowicz <piotrhwz(a)gmail.com> AuthorDate: Wed Nov 2 16:50:23 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 2 18:50:23 2022 +0300 [DESK] Improve Polish (pl-PL) translation (#4826) Reviewed-by: Stanislav Motylkov <x86corez(a)gmail.com> --- dll/cpl/desk/lang/pl-PL.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/cpl/desk/lang/pl-PL.rc b/dll/cpl/desk/lang/pl-PL.rc index 6a8a10fde5d..05a98f95dce 100644 --- a/dll/cpl/desk/lang/pl-PL.rc +++ b/dll/cpl/desk/lang/pl-PL.rc @@ -16,7 +16,7 @@ CAPTION "Kompozycje" STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Kompozycja to Tapeta, zestaw dźwięków, ikon i innych elementów, które pomogą Ci spersonalizować komputer za pomocą jednego kliknięcia.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "Kompozycja to tapeta, zestaw dźwięków, ikon i innych elementów, które pomogają spersonalizować komputer za pomocą jednego kliknięcia.", IDC_STATIC, 5, 5, 235, 30 LTEXT "Kompozycja:", IDC_STATIC, 5, 42, 55, 10 COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Z&apisz jako...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14 @@ -84,7 +84,7 @@ END IDD_ADVAPPEARANCE DIALOGEX 0, 0, 250, 239 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Ustawienia zaawansowane" +CAPTION "Wygląd zaawansowany" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 @@ -270,9 +270,9 @@ STRINGTABLE BEGIN IDS_COLOR_4BIT "16 kolorów" IDS_COLOR_8BIT "256 kolorów" - IDS_COLOR_16BIT "High Color (16 Bitów)" - IDS_COLOR_24BIT "True Color (24 Bity)" - IDS_COLOR_32BIT "True Color (32 Bity)" + IDS_COLOR_16BIT "Średnia (16 Bitów)" + IDS_COLOR_24BIT "Wysoka (24 Bity)" + IDS_COLOR_32BIT "Najwyższa (32 Bity)" IDS_PIXEL "%lux%lu pikseli" END

1 0

[reactos] 01/01: [EXPLORER] Hide Start Menu before Run dialog (#4823)
by Katayama Hirofumi MZ 02 Nov '22

02 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=802a87dfb2efcd1c1467a… commit 802a87dfb2efcd1c1467af46c3a2a709124757f6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Nov 2 11:29:08 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 2 11:29:08 2022 +0900 [EXPLORER] Hide Start Menu before Run dialog (#4823) - Add HideStartMenu helper method. - Hide Start Menu before opening Run dialog. CORE-13330 --- base/shell/explorer/traywnd.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index d3774451270..75023294696 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -850,11 +850,17 @@ public: return TRUE; } + VOID HideStartMenu() + { + m_StartMenuPopup->OnSelect(MPOS_CANCELLEVEL); + } + LRESULT HandleHotKey(DWORD id) { switch (id) { case IDHK_RUN: + HideStartMenu(); DisplayRunFileDlg(); break; case IDHK_HELP: @@ -903,6 +909,7 @@ public: // TODO: break; case TRAYCMD_RUN_DIALOG: + HideStartMenu(); DisplayRunFileDlg(); break; case TRAYCMD_LOGOFF_DIALOG: @@ -3062,13 +3069,9 @@ HandleTrayContextMenu: return FALSE; if (::IsWindowVisible(hwndStartMenu)) - { - m_StartMenuPopup->OnSelect(MPOS_CANCELLEVEL); - } + HideStartMenu(); else - { PopupStartMenu(); - } return TRUE; }

1 0

[reactos] 01/01: [RTL] Use RtlApplicationVerifierStop for DPH
by Mark Jansen 01 Nov '22

01 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3ac541360d92cd23e383… commit e3ac541360d92cd23e38383551b8bbb6e7046536 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Oct 23 21:34:04 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Nov 1 21:26:05 2022 +0100 [RTL] Use RtlApplicationVerifierStop for DPH --- sdk/include/reactos/verifier.h | 29 +++++++++++++ sdk/lib/rtl/heappage.c | 95 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 107 insertions(+), 17 deletions(-) diff --git a/sdk/include/reactos/verifier.h b/sdk/include/reactos/verifier.h index b0e8413d158..112f9dd9b92 100644 --- a/sdk/include/reactos/verifier.h +++ b/sdk/include/reactos/verifier.h @@ -83,4 +83,33 @@ typedef struct _RTL_VERIFIER_PROVIDER_DESCRIPTOR { #define RTL_VRF_DBG_ENTRYPOINT_HOOKS 0x10000 #define RTL_VRF_DBG_ENTRYPOINT_CALLS 0x20000 + +// Verifier stop codes + +#define APPLICATION_VERIFIER_CORRUPT_HEAP_POINTER 0x0006 +#define APPLICATION_VERIFIER_DOUBLE_FREE 0x0007 + +#define APPLICATION_VERIFIER_EXCEPTION_WHILE_VERIFYING_BLOCK_HEADER 0x000B +#define APPLICATION_VERIFIER_CORRUPTED_HEAP_BLOCK_AFTER_FREE 0x000D +#define APPLICATION_VERIFIER_CORRUPTED_INFIX_PATTERN 0x000E +#define APPLICATION_VERIFIER_CORRUPTED_SUFFIX_PATTERN 0x000F +#define APPLICATION_VERIFIER_CORRUPTED_START_STAMP 0x0010 +#define APPLICATION_VERIFIER_CORRUPTED_END_STAMP 0x0011 +#define APPLICATION_VERIFIER_CORRUPTED_PREFIX_PATTERN 0x0012 + + +VOID NTAPI +RtlApplicationVerifierStop( + _In_ ULONG_PTR Code, + _In_ PCSTR Message, + _In_ PVOID Value1, + _In_ PCSTR Description1, + _In_ PVOID Value2, + _In_ PCSTR Description2, + _In_ PVOID Value3, + _In_ PCSTR Description3, + _In_ PVOID Value4, + _In_ PCSTR Description4); + + #endif // REACTOS_VERIFIER_H diff --git a/sdk/lib/rtl/heappage.c b/sdk/lib/rtl/heappage.c index 724cccff73f..e15d981e4ef 100644 --- a/sdk/lib/rtl/heappage.c +++ b/sdk/lib/rtl/heappage.c @@ -15,6 +15,7 @@ #include <rtl.h> #include <heap.h> +#include <reactos/verifier.h> #define NDEBUG #include <debug.h> @@ -192,7 +193,11 @@ BOOLEAN NTAPI RtlpDphIsNormalFreeHeapBlock(PVOID Block, PULONG ValidationInformation, BOOLEAN CheckFillers); VOID NTAPI -RtlpDphReportCorruptedBlock(PDPH_HEAP_ROOT DphRoot, ULONG Reserved, PVOID Block, ULONG ValidationInfo); +RtlpDphReportCorruptedBlock( + _In_ PDPH_HEAP_ROOT DphRoot, + _In_ ULONG Reserved, + _In_ PVOID Block, + _In_ ULONG ValidationInfo); BOOLEAN NTAPI RtlpDphNormalHeapValidate(PDPH_HEAP_ROOT DphRoot, ULONG Flags, PVOID BaseAddress); @@ -231,6 +236,27 @@ RtlpDphPointerFromHandle(PVOID Handle) return NULL; } +PVOID NTAPI +RtlpDphHeapFromPointer(PDPH_HEAP_ROOT DphHeap) +{ + return ((PUCHAR)DphHeap) - PAGE_SIZE; +} + +ULONG NTAPI +RtlpDphGetBlockSizeFromCorruptedBlock(PVOID Block) +{ + PDPH_BLOCK_INFORMATION BlockInfo; + BlockInfo = (PDPH_BLOCK_INFORMATION)Block - 1; + + /* Check stamps */ + if (BlockInfo->StartStamp != DPH_FILL_START_STAMP_1 && BlockInfo->StartStamp != DPH_FILL_START_STAMP_2) + { + return 0; + } + + return BlockInfo->RequestedSize; +} + VOID NTAPI RtlpDphEnterCriticalSection(PDPH_HEAP_ROOT DphRoot, ULONG Flags) { @@ -1297,59 +1323,94 @@ RtlpDphVerifyIntegrity(PDPH_HEAP_ROOT DphRoot) } VOID NTAPI -RtlpDphReportCorruptedBlock(PDPH_HEAP_ROOT DphRoot, - ULONG Reserved, - PVOID Block, - ULONG ValidationInfo) +RtlpDphReportCorruptedBlock( + _In_ PDPH_HEAP_ROOT DphRoot, + _In_ ULONG Reserved, + _In_ PVOID Block, + _In_ ULONG ValidationInfo) { - //RtlpDphGetBlockSizeFromCorruptedBlock(); + PVOID Size = (PVOID)(ULONG_PTR)RtlpDphGetBlockSizeFromCorruptedBlock(Block); + DPH_BLOCK_INFORMATION SafeInfo = {0}; + + DPRINT1("Corrupted heap block %p\n", Block); + + _SEH2_TRY + { + PDPH_BLOCK_INFORMATION BlockInfo = (PDPH_BLOCK_INFORMATION)Block - 1; + RtlCopyMemory(&SafeInfo, BlockInfo, sizeof(SafeInfo)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DPRINT1("ERROR: Could not read DPH_BLOCK_INFORMATION\n"); + RtlZeroMemory(&SafeInfo, sizeof(SafeInfo)); + } + _SEH2_END; if (ValidationInfo & DPH_VALINFO_CORRUPTED_AFTER_FREE) { - DPRINT1("block corrupted after having been freed\n"); + RtlApplicationVerifierStop( + APPLICATION_VERIFIER_CORRUPTED_HEAP_BLOCK_AFTER_FREE, "block corrupted after having been freed", + RtlpDphHeapFromPointer(DphRoot), "Heap handle", Block, "Heap block", (PVOID)Size, "Block size", 0, ""); } if (ValidationInfo & DPH_VALINFO_ALREADY_FREED) { - DPRINT1("block already freed\n"); + RtlApplicationVerifierStop( + APPLICATION_VERIFIER_DOUBLE_FREE, "block already freed", RtlpDphHeapFromPointer(DphRoot), "Heap handle", + Block, "Heap block", Size, "Block size", 0, ""); } if (ValidationInfo & DPH_VALINFO_BAD_INFIX_PATTERN) { - DPRINT1("corrupted infix pattern for freed block\n"); + RtlApplicationVerifierStop( + APPLICATION_VERIFIER_CORRUPTED_INFIX_PATTERN, "corrupted infix pattern for freed block", + RtlpDphHeapFromPointer(DphRoot), "Heap handle", Block, "Heap block", Size, "Block size", 0, ""); } if (ValidationInfo & DPH_VALINFO_BAD_POINTER) { - DPRINT1("corrupted heap pointer or using wrong heap\n"); + RtlApplicationVerifierStop( + APPLICATION_VERIFIER_CORRUPT_HEAP_POINTER, "corrupted heap pointer or using wrong heap", + RtlpDphHeapFromPointer(DphRoot), "Heap handle used", Block, "Heap block", Size, "Block size", + SafeInfo.Heap, "Actual heap handle"); } if (ValidationInfo & DPH_VALINFO_BAD_SUFFIX_PATTERN) { - DPRINT1("corrupted suffix pattern\n"); + RtlApplicationVerifierStop( + APPLICATION_VERIFIER_CORRUPTED_SUFFIX_PATTERN, "corrupted suffix pattern", RtlpDphHeapFromPointer(DphRoot), + "Heap handle used", Block, "Heap block", Size, "Block size", 0, ""); } if (ValidationInfo & DPH_VALINFO_BAD_PREFIX_PATTERN) { - DPRINT1("corrupted prefix pattern\n"); + RtlApplicationVerifierStop( + APPLICATION_VERIFIER_CORRUPTED_PREFIX_PATTERN, "corrupted prefix pattern", RtlpDphHeapFromPointer(DphRoot), + "Heap handle used", Block, "Heap block", Size, "Block size", 0, ""); } if (ValidationInfo & DPH_VALINFO_BAD_START_STAMP) { - DPRINT1("corrupted start stamp\n"); + RtlApplicationVerifierStop( + APPLICATION_VERIFIER_CORRUPTED_START_STAMP, "corrupted start stamp", RtlpDphHeapFromPointer(DphRoot), + "Heap handle used", Block, "Heap block", Size, "Block size", (PVOID)(ULONG_PTR)SafeInfo.StartStamp, + "Corrupted start stamp"); } if (ValidationInfo & DPH_VALINFO_BAD_END_STAMP) { - DPRINT1("corrupted end stamp\n"); + RtlApplicationVerifierStop( + APPLICATION_VERIFIER_CORRUPTED_END_STAMP, "corrupted end stamp", RtlpDphHeapFromPointer(DphRoot), + "Heap handle used", Block, "Heap block", Size, "Block size", (PVOID)(ULONG_PTR)SafeInfo.EndStamp, + "Corrupted end stamp"); } if (ValidationInfo & DPH_VALINFO_EXCEPTION) { - DPRINT1("exception raised while verifying block\n"); + RtlApplicationVerifierStop( + APPLICATION_VERIFIER_EXCEPTION_WHILE_VERIFYING_BLOCK_HEADER, "exception raised while verifying block", + RtlpDphHeapFromPointer(DphRoot), "Heap handle used", Block, "Heap block", Size, "Block size", 0, ""); } - - DPRINT1("Corrupted heap block %p\n", Block); } BOOLEAN NTAPI

1 0

[reactos] 01/01: [SDK] Define CCoInit in shellutils
by Mark Jansen 01 Nov '22

01 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d82185f10451b3c6661dd… commit d82185f10451b3c6661dda8f1a30cb0da114b2ce Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Oct 23 21:16:56 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Nov 1 21:24:14 2022 +0100 [SDK] Define CCoInit in shellutils --- dll/shellext/acppage/ACPPage.cpp | 9 +-------- dll/win32/shell32/shlexec.cpp | 18 ++++-------------- modules/rostests/apitests/browseui/ACListISF.cpp | 11 ++--------- modules/rostests/apitests/browseui/IACLCustomMRU.cpp | 11 ++--------- modules/rostests/apitests/browseui/IACLHistory.cpp | 13 +++---------- modules/rostests/apitests/browseui/IAutoComplete.cpp | 8 +------- sdk/include/reactos/shellutils.h | 19 +++++++++++++++++-- 7 files changed, 30 insertions(+), 59 deletions(-) diff --git a/dll/shellext/acppage/ACPPage.cpp b/dll/shellext/acppage/ACPPage.cpp index 14f4f632b01..6c265336af0 100644 --- a/dll/shellext/acppage/ACPPage.cpp +++ b/dll/shellext/acppage/ACPPage.cpp @@ -75,18 +75,11 @@ STDAPI DllUnregisterServer() return S_OK; } -struct CCoInit -{ - CCoInit() { hres = CoInitialize(NULL); } - ~CCoInit() { if (SUCCEEDED(hres)) { CoUninitialize(); } } - HRESULT hres; -}; - EXTERN_C BOOL WINAPI GetExeFromLnk(PCWSTR pszLnk, PWSTR pszExe, size_t cchSize) { CCoInit init; - if (FAILED_UNEXPECTEDLY(init.hres)) + if (FAILED_UNEXPECTEDLY(init.hr)) return FALSE; CComPtr<IShellLinkW> spShellLink; diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index f1fce51cc9f..133c3b11c2a 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -1430,24 +1430,14 @@ end: return r; } -namespace -{ - struct CCoInit - { - CCoInit() { hres = CoInitialize(NULL); } - ~CCoInit() { if (SUCCEEDED(hres)) { CoUninitialize(); } } - HRESULT hres; - }; -} - static HRESULT shellex_load_object_and_run(HKEY hkey, LPCGUID guid, LPSHELLEXECUTEINFOW sei) { TRACE("%p %s %p\n", hkey, debugstr_guid(guid), sei); CCoInit coInit; - if (FAILED_UNEXPECTEDLY(coInit.hres)) - return coInit.hres; + if (FAILED_UNEXPECTEDLY(coInit.hr)) + return coInit.hr; CComPtr<IShellExtInit> obj; HRESULT hr = CoCreateInstance(*guid, NULL, CLSCTX_INPROC_SERVER, @@ -1519,8 +1509,8 @@ static HRESULT ShellExecute_ContextMenuVerb(LPSHELLEXECUTEINFOW sei) CCoInit coInit; - if (FAILED_UNEXPECTEDLY(coInit.hres)) - return coInit.hres; + if (FAILED_UNEXPECTEDLY(coInit.hr)) + return coInit.hr; CComPtr<IContextMenu> cm; HRESULT hr = shellex_get_contextmenu(sei, cm); diff --git a/modules/rostests/apitests/browseui/ACListISF.cpp b/modules/rostests/apitests/browseui/ACListISF.cpp index ab87cb492ef..34516bf4a50 100644 --- a/modules/rostests/apitests/browseui/ACListISF.cpp +++ b/modules/rostests/apitests/browseui/ACListISF.cpp @@ -722,19 +722,12 @@ static void GetEnvStatus() trace("Show hidden folders: %s\n", g_ShowHidden ? "yes" : "no"); } -struct CCoInit -{ - CCoInit() { hres = CoInitialize(NULL); } - ~CCoInit() { if (SUCCEEDED(hres)) { CoUninitialize(); } } - HRESULT hres; -}; - START_TEST(ACListISF) { GetEnvStatus(); CCoInit init; - ok_hr(init.hres, S_OK); - if (!SUCCEEDED(init.hres)) + ok_hr(init.hr, S_OK); + if (!SUCCEEDED(init.hr)) { skip("CoInitialize failed\n"); return; diff --git a/modules/rostests/apitests/browseui/IACLCustomMRU.cpp b/modules/rostests/apitests/browseui/IACLCustomMRU.cpp index 89eb058261d..3627a8f3591 100644 --- a/modules/rostests/apitests/browseui/IACLCustomMRU.cpp +++ b/modules/rostests/apitests/browseui/IACLCustomMRU.cpp @@ -32,13 +32,6 @@ ULONG DbgPrint(PCH Format,...); #define ok_wstri(x, y) \ ok(lstrcmpiW(x, y) == 0, "Wrong string. Expected '%S', got '%S'\n", y, x) -struct CCoInit -{ - CCoInit() { hres = CoInitialize(NULL); } - ~CCoInit() { if (SUCCEEDED(hres)) { CoUninitialize(); } } - HRESULT hres; -}; - DEFINE_GUID(IID_IACLCustomMRU, 0xf729fc5e, 0x8769, 0x4f3e, 0xbd, 0xb2, 0xd7, 0xb5, 0x0f, 0xd2, 0x27, 0x5b); static const WCHAR szTestPath[] = L"TESTPATH_BROWSEUI_APITEST"; @@ -551,8 +544,8 @@ test_IACLCustomMRU_TypedURLs() // TypedURLs is special case START_TEST(IACLCustomMRU) { CCoInit init; - ok_hex(init.hres, S_OK); - if (!SUCCEEDED(init.hres)) + ok_hex(init.hr, S_OK); + if (!SUCCEEDED(init.hr)) return; test_IACLCustomMRU_Basics(); diff --git a/modules/rostests/apitests/browseui/IACLHistory.cpp b/modules/rostests/apitests/browseui/IACLHistory.cpp index 68d25dc0a6a..e57ba165304 100644 --- a/modules/rostests/apitests/browseui/IACLHistory.cpp +++ b/modules/rostests/apitests/browseui/IACLHistory.cpp @@ -14,20 +14,13 @@ #include <stdio.h> #include <shellutils.h> -struct CCoInit -{ - CCoInit() { hres = CoInitialize(NULL); } - ~CCoInit() { if (SUCCEEDED(hres)) { CoUninitialize(); } } - HRESULT hres; -}; - START_TEST(IACLHistory) { CCoInit init; - ok_hex(init.hres, S_OK); - if (FAILED(init.hres)) + ok_hex(init.hr, S_OK); + if (FAILED(init.hr)) { - skip("CoInitialize failed with 0x%08lX\n", init.hres); + skip("CoInitialize failed with 0x%08lX\n", init.hr); return; } diff --git a/modules/rostests/apitests/browseui/IAutoComplete.cpp b/modules/rostests/apitests/browseui/IAutoComplete.cpp index d65478e2c5e..6afff3d181b 100644 --- a/modules/rostests/apitests/browseui/IAutoComplete.cpp +++ b/modules/rostests/apitests/browseui/IAutoComplete.cpp @@ -16,6 +16,7 @@ #include <atlsimpcoll.h> #include <shlwapi.h> #include <strsafe.h> +#include <shellutils.h> //#define MANUAL_DEBUGGING @@ -23,13 +24,6 @@ #define ok_wstri(x, y) \ ok(lstrcmpiW(x, y) == 0, "Wrong string. Expected '%S', got '%S'\n", y, x) -struct CCoInit -{ - CCoInit() { hr = CoInitialize(NULL); } - ~CCoInit() { if (SUCCEEDED(hr)) { CoUninitialize(); } } - HRESULT hr; -}; - // create an EDIT control static HWND MyCreateEditCtrl(INT x, INT y, INT cx, INT cy) { diff --git a/sdk/include/reactos/shellutils.h b/sdk/include/reactos/shellutils.h index f516d8c6830..9ccce4d3373 100644 --- a/sdk/include/reactos/shellutils.h +++ b/sdk/include/reactos/shellutils.h @@ -129,9 +129,8 @@ IUnknown *CComCreatorCentralInstance<T>::s_pInstance = NULL; #define DECLARE_CENTRAL_INSTANCE_NOT_AGGREGATABLE(x) \ public: \ typedef CComCreatorCentralInstance< ATL::CComObject<x> > _CreatorClass; -#endif -#ifdef __cplusplus + template <class Base> class CComDebugObject : public Base { @@ -538,6 +537,22 @@ void DumpIdList(LPCITEMIDLIST pcidl) DbgPrint("End IDList Dump.\n"); } +struct CCoInit +{ + CCoInit() + { + hr = CoInitialize(NULL); + } + ~CCoInit() + { + if (SUCCEEDED(hr)) + { + CoUninitialize(); + } + } + HRESULT hr; +}; + #endif /* __cplusplus */ #define S_LESSTHAN 0xffff

1 0

[reactos] 01/01: [IPCONFIG] Localized datetime format (#4777)
by Ratin Gao 01 Nov '22

01 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8083ef9ad77af68539cbb… commit 8083ef9ad77af68539cbb2903d7d9302a7b12d41 Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Wed Nov 2 03:56:43 2022 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Nov 1 20:56:43 2022 +0100 [IPCONFIG] Localized datetime format (#4777) IPconfig used a fixed format for time/date display (for DHCP lease), while it should respect local settings. CORE-18396 --- base/applications/network/ipconfig/ipconfig.c | 80 ++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 2 deletions(-) diff --git a/base/applications/network/ipconfig/ipconfig.c b/base/applications/network/ipconfig/ipconfig.c index d386f7d1eac..8124d8c85d2 100644 --- a/base/applications/network/ipconfig/ipconfig.c +++ b/base/applications/network/ipconfig/ipconfig.c @@ -16,6 +16,7 @@ #include <stdarg.h> #include <windef.h> #include <winbase.h> +#include <winnls.h> #include <winuser.h> #include <winreg.h> #include <stdio.h> @@ -238,6 +239,70 @@ PTCHAR PrintMacAddr(PBYTE Mac) } +/* convert time_t to localized string */ +_Ret_opt_z_ PTSTR timeToStr(_In_ time_t TimeStamp) +{ + struct tm* ptm; + SYSTEMTIME SystemTime; + INT DateCchSize, TimeCchSize, TotalCchSize, i; + PTSTR DateTimeString, psz; + + /* Convert Unix time to SYSTEMTIME */ + /* localtime_s may be preferred if available */ + ptm = localtime(&TimeStamp); + if (!ptm) + { + return NULL; + } + SystemTime.wYear = ptm->tm_year + 1900; + SystemTime.wMonth = ptm->tm_mon + 1; + SystemTime.wDay = ptm->tm_mday; + SystemTime.wHour = ptm->tm_hour; + SystemTime.wMinute = ptm->tm_min; + SystemTime.wSecond = ptm->tm_sec; + + /* Get total size in characters required of buffer */ + DateCchSize = GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &SystemTime, NULL, NULL, 0); + if (!DateCchSize) + { + return NULL; + } + TimeCchSize = GetTimeFormat(LOCALE_USER_DEFAULT, 0, &SystemTime, NULL, NULL, 0); + if (!TimeCchSize) + { + return NULL; + } + /* Two terminating null are included, the first one will be replaced by space */ + TotalCchSize = DateCchSize + TimeCchSize; + + /* Allocate buffer and format datetime string */ + DateTimeString = (PTSTR)HeapAlloc(ProcessHeap, 0, TotalCchSize * sizeof(TCHAR)); + if (!DateTimeString) + { + return NULL; + } + + /* Get date string */ + i = GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &SystemTime, NULL, DateTimeString, TotalCchSize); + if (i) + { + /* Append space and move pointer */ + DateTimeString[i - 1] = _T(' '); + psz = DateTimeString + i; + TotalCchSize -= i; + + /* Get time string */ + if (GetTimeFormat(LOCALE_USER_DEFAULT, 0, &SystemTime, NULL, psz, TotalCchSize)) + { + return DateTimeString; + } + } + + HeapFree(ProcessHeap, 0, DateTimeString); + return NULL; +} + + VOID DoFormatMessage(LONG ErrorCode) { LPVOID lpMsgBuf; @@ -686,8 +751,19 @@ VOID ShowInfo(BOOL bAll) if (pAdapter->DhcpEnabled && _tcscmp(pAdapter->DhcpServer.IpAddress.String, _T("255.255.255.255"))) { - _tprintf(_T("\tLease Obtained. . . . . . . . . . : %s"), _tasctime(localtime(&pAdapter->LeaseObtained))); - _tprintf(_T("\tLease Expires . . . . . . . . . . : %s"), _tasctime(localtime(&pAdapter->LeaseExpires))); + PTSTR DateTimeString; + DateTimeString = timeToStr(pAdapter->LeaseObtained); + _tprintf(_T("\tLease Obtained. . . . . . . . . . : %s\n"), DateTimeString ? DateTimeString : _T("N/A")); + if (DateTimeString) + { + HeapFree(ProcessHeap, 0, DateTimeString); + } + DateTimeString = timeToStr(pAdapter->LeaseExpires); + _tprintf(_T("\tLease Expires . . . . . . . . . . : %s\n"), DateTimeString ? DateTimeString : _T("N/A")); + if (DateTimeString) + { + HeapFree(ProcessHeap, 0, DateTimeString); + } } } _tprintf(_T("\n"));

1 0

[reactos] 01/01: [TRANSLATION] Minor Russian (ru-RU) translation fixes (#4835)
by Artyom Ovsyannikov 01 Nov '22

01 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b1854d7cadca728ed4396… commit b1854d7cadca728ed439655f8fc28015de52059e Author: Artyom Ovsyannikov <artemka6834(a)gmail.com> AuthorDate: Tue Nov 1 17:22:18 2022 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Nov 1 17:22:18 2022 +0300 [TRANSLATION] Minor Russian (ru-RU) translation fixes (#4835) Reviewed-by: Stanislav Motylkov <x86corez(a)gmail.com> --- dll/cpl/hdwwiz/lang/ru-RU.rc | 2 +- dll/cpl/usrmgr/lang/ru-RU.rc | 2 +- dll/win32/comdlg32/lang/cdlg_Ru.rc | 2 +- dll/win32/samsrv/lang/ru-RU.rc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/cpl/hdwwiz/lang/ru-RU.rc b/dll/cpl/hdwwiz/lang/ru-RU.rc index 899399f88b1..125e170d17e 100644 --- a/dll/cpl/hdwwiz/lang/ru-RU.rc +++ b/dll/cpl/hdwwiz/lang/ru-RU.rc @@ -138,7 +138,7 @@ BEGIN IDS_CPLNAME "Установка оборудования" IDS_CPLDESCRIPTION "Установка оборудования в компьютер" IDS_SEARCHTITLE "Подождите, выполняется поиск..." - IDS_SEARCHTEXT "Этот мастер выполняет поиск оборудования, которое недавно было подключено к компьютеру, но еще не было установлено." + IDS_SEARCHTEXT "Этот мастер выполняет поиск оборудования, которое недавно было подключено к компьютеру, но ещё не было установлено." IDS_ISCONNECTED "Подключено ли устройство?" IDS_PROBELISTTITLE "На этом компьютере уже установлено следующее оборудование" IDS_ADDNEWDEVICE "Добавление нового устройства" diff --git a/dll/cpl/usrmgr/lang/ru-RU.rc b/dll/cpl/usrmgr/lang/ru-RU.rc index 8658b458b65..2f9fa115cae 100644 --- a/dll/cpl/usrmgr/lang/ru-RU.rc +++ b/dll/cpl/usrmgr/lang/ru-RU.rc @@ -127,7 +127,7 @@ BEGIN EDITTEXT IDC_USER_NEW_PASSWORD1, 107, 67, 153, 14, ES_AUTOHSCROLL | ES_PASSWORD RTEXT "Пароль:", -1, 7, 70, 96, 8 EDITTEXT IDC_USER_NEW_PASSWORD2, 107, 85, 153, 14, ES_AUTOHSCROLL | ES_PASSWORD - RTEXT "Пароль еще раз:", -1, 7, 88, 96, 8 + RTEXT "Пароль ещё раз:", -1, 7, 88, 96, 8 AUTOCHECKBOX "Потребовать смену пароля при следующем входе в систему", IDC_USER_NEW_FORCE_CHANGE, 7, 109, 230, 10 AUTOCHECKBOX "Запретить смену пароля пользователем", IDC_USER_NEW_CANNOT_CHANGE, 7, 123, 200, 10, WS_DISABLED AUTOCHECKBOX "Срок действия пароля не ограничен", IDC_USER_NEW_NEVER_EXPIRES, 7, 137, 200, 10, WS_DISABLED diff --git a/dll/win32/comdlg32/lang/cdlg_Ru.rc b/dll/win32/comdlg32/lang/cdlg_Ru.rc index 8974c48cdb5..d1dcc1216a5 100644 --- a/dll/win32/comdlg32/lang/cdlg_Ru.rc +++ b/dll/win32/comdlg32/lang/cdlg_Ru.rc @@ -65,7 +65,7 @@ STRINGTABLE PD32_OUT_OF_MEMORY "Мало памяти." PD32_GENERIC_ERROR "Произошла ошибка." PD32_DRIVER_UNKNOWN "Неизвестный драйвер принтера." - PD32_NO_DEVICES "Перед тем как настраивать страницу печати или печатать документ нужно установить принтеры. Пожалуйста установите его и попробуйте еще раз." + PD32_NO_DEVICES "Перед тем как настраивать страницу печати или печатать документ нужно установить принтеры. Пожалуйста установите его и попробуйте ещё раз." PD32_DEFAULT_PRINTER "Принтер по умолчанию; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "Документов в очереди: %d" diff --git a/dll/win32/samsrv/lang/ru-RU.rc b/dll/win32/samsrv/lang/ru-RU.rc index 0c56af99e4f..16ec3164db8 100644 --- a/dll/win32/samsrv/lang/ru-RU.rc +++ b/dll/win32/samsrv/lang/ru-RU.rc @@ -10,7 +10,7 @@ BEGIN IDS_ALIAS_ADMINISTRATORS_NAME "Администраторы" IDS_ALIAS_ADMINISTRATORS_COMMENT "Администраторы имеют полные, ничем не ограниченные права доступа к компьютеру или домену." IDS_ALIAS_GUESTS_NAME "Гости" - IDS_ALIAS_GUESTS_COMMENT "Гости по умолчанию имеют те же права, что и пользователи, за исключением учетной записи ""Guest"", еще более ограниченной в правах." + IDS_ALIAS_GUESTS_COMMENT "Гости по умолчанию имеют те же права, что и пользователи, за исключением учётной записи ""Гость"", ещё более ограниченной в правах." IDS_ALIAS_POWER_USERS_NAME "Опытные пользователи" IDS_ALIAS_POWER_USERS_COMMENT "Категория опытных пользователей обладает ограниченными административными правами." IDS_ALIAS_USERS_NAME "Пользователи"

1 0

[reactos] 01/01: [SHELL32_APITEST] Consider more tests in PathResolve testcase
by Katayama Hirofumi MZ 01 Nov '22

01 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a17664cec2ca0f98857e4… commit a17664cec2ca0f98857e47b05d11cf5992096206 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Nov 1 11:19:55 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Nov 1 11:19:55 2022 +0900 [SHELL32_APITEST] Consider more tests in PathResolve testcase Consider: - Double-backslash. - Name with trailing backslash. - Directory with trailing backslash. - Non full path. CORE-18080 --- modules/rostests/apitests/shell32/PathResolve.cpp | 272 +++++++++++++++------- 1 file changed, 182 insertions(+), 90 deletions(-) diff --git a/modules/rostests/apitests/shell32/PathResolve.cpp b/modules/rostests/apitests/shell32/PathResolve.cpp index 7f2b62e61c8..832b801c80b 100644 --- a/modules/rostests/apitests/shell32/PathResolve.cpp +++ b/modules/rostests/apitests/shell32/PathResolve.cpp @@ -25,10 +25,13 @@ static HINSTANCE s_hShell32 = NULL; static PATHRESOLVE s_pPathResolve = NULL; static ISLFNDRIVEW s_pIsLFNDriveW = NULL; static WCHAR s_TestDir[MAX_PATH]; +static WCHAR s_TestDirWithBackslash[MAX_PATH]; static WCHAR s_ShortcutLongName[MAX_PATH]; static WCHAR s_LinkTarget[MAX_PATH]; +static WCHAR s_LinkTargetWithBackslash[MAX_PATH]; static WCHAR s_LinkTargetDoubleBackslash[MAX_PATH]; static LPWSTR s_Dirs[2] = { s_TestDir, NULL }; +static LPWSTR s_DirsWithBackslash[2] = { s_TestDirWithBackslash, NULL }; /* PathResolve flags */ #ifndef PRF_VERIFYEXISTS @@ -104,19 +107,19 @@ static const TEST_ENTRY s_LFNEntries[] = { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, NULL, NULL, FLAGS13 }, /* empty path */ { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L"", NULL, FLAGS0 }, - { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS1 }, - { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS2 }, - { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS3 }, - { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS4 }, - { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS5 }, - { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS6 }, - { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS7 }, - { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS8 }, - { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS9 }, - { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS10 }, - { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS11 }, - { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS12 }, - { __LINE__, 1, ERROR_NO_MORE_FILES, EF_FULLPATH, L"", NULL, FLAGS13 }, + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, L"", NULL, FLAGS1 }, + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, L"", NULL, FLAGS2 }, + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, L"", NULL, FLAGS3 }, + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, L"", NULL, FLAGS4 }, + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, L"", NULL, FLAGS5 }, + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, L"", NULL, FLAGS6 }, + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, L"", NULL, FLAGS7 }, + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, L"", NULL, FLAGS8 }, + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, L"", NULL, FLAGS9 }, + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, L"", NULL, FLAGS10 }, + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, L"", NULL, FLAGS11 }, + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, L"", NULL, FLAGS12 }, + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, L"", NULL, FLAGS13 }, /* invalid name */ { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS0 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS1 }, @@ -132,7 +135,7 @@ static const TEST_ENTRY s_LFNEntries[] = { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS11 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS12 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"invalid name", L"invalid name", FLAGS13 }, - /* testdata/2PRONG (path) */ + /* testdir/2PRONG (path) */ { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS0 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS1 }, { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS2 }, @@ -147,7 +150,7 @@ static const TEST_ENTRY s_LFNEntries[] = { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS11 }, { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS12 }, { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"2PRONG", L"2PRONG", FLAGS13 }, - /* testdata/2PRONG (name only) */ + /* testdir/2PRONG (name only) */ { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS0 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS1 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS2 }, @@ -162,7 +165,7 @@ static const TEST_ENTRY s_LFNEntries[] = { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS11 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS12 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS13 }, - /* testdata/2PRONG with dirs (name only) */ + /* testdir/2PRONG with dirs (name only) */ { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS0, s_Dirs }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS1, s_Dirs }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS2, s_Dirs }, @@ -177,7 +180,7 @@ static const TEST_ENTRY s_LFNEntries[] = { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS11, s_Dirs }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS12, s_Dirs }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG", NULL, FLAGS13, s_Dirs }, - /* testdata/2PRONG (name only, app path) */ + /* testdir/2PRONG (name only, app path) */ { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS0 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS1 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"2PRONG", L"2PRONG", FLAGS2 }, @@ -222,36 +225,111 @@ static const TEST_ENTRY s_LFNEntries[] = { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS11, s_Dirs }, { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS12, s_Dirs }, { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"2PRONG.txt", L"2PRONG.txt", FLAGS13, s_Dirs }, + /* 2PRONG.txt with dirs (path) */ + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS0, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS1, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS2, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS3, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS4, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS5, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS6, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS7, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS8, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS9, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS10, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS11, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS12, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS13, s_Dirs }, + /* 2PRONG.txt (with a trailing backslash) */ + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS0 }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS1 }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS2 }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS3 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_LinkTargetWithBackslash, NULL, FLAGS4 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_LinkTargetWithBackslash, NULL, FLAGS5 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_LinkTargetWithBackslash, NULL, FLAGS6 }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS7 }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS8 }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS9 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_LinkTargetWithBackslash, NULL, FLAGS10 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_LinkTargetWithBackslash, NULL, FLAGS11 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_LinkTargetWithBackslash, NULL, FLAGS12 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_LinkTargetWithBackslash, NULL, FLAGS13 }, + /* 2PRONG.txt with dirs (with a trailing backslash) */ + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS0, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS1, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS2, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS3, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS4, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS5, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS6, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS7, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS8, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS9, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS10, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS11, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS12, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS13, s_Dirs }, + /* 2PRONG.txt with dirs (with a trailing backslash) */ + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS0, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS1, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS2, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS3, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS4, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS5, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS6, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS7, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS8, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS9, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS10, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS11, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS12, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, L"2PRONG.txt", s_LinkTarget, FLAGS13, s_Dirs }, + /* 2PRONG.txt with dirs (with a trailing backslash) (s_DirsWithBackslash) */ + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS0, s_DirsWithBackslash }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS1, s_DirsWithBackslash }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS2, s_DirsWithBackslash }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS3, s_DirsWithBackslash }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS4, s_DirsWithBackslash }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS5, s_DirsWithBackslash }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS6, s_DirsWithBackslash }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS7, s_DirsWithBackslash }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS8, s_DirsWithBackslash }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS9, s_DirsWithBackslash }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS10, s_DirsWithBackslash }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS11, s_DirsWithBackslash }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS12, s_DirsWithBackslash }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetWithBackslash, s_LinkTarget, FLAGS13, s_DirsWithBackslash }, /* 2PRONG.txt (double backslash) */ - { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS0 }, - { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS1 }, - { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS2 }, - { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS3 }, - { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS4 }, - { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS5 }, - { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS6 }, - { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS7 }, - { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS8 }, - { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS9 }, - { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS10 }, - { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS11 }, - { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS12 }, - { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS13 }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS0 }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS1 }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS2 }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS3 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_LinkTargetDoubleBackslash, NULL, FLAGS4 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_LinkTargetDoubleBackslash, NULL, FLAGS5 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_LinkTargetDoubleBackslash, NULL, FLAGS6 }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS7 }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS8 }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS9 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_LinkTargetDoubleBackslash, NULL, FLAGS10 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_LinkTargetDoubleBackslash, NULL, FLAGS11 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_LinkTargetDoubleBackslash, NULL, FLAGS12 }, + { __LINE__, RAISED, ERR_DEAD, EF_FULLPATH, s_LinkTargetDoubleBackslash, NULL, FLAGS13 }, /* 2PRONG.txt with dirs (double backslash) */ - { __LINE__, 1, ERR_IGNORE, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS0, s_Dirs }, - { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS1, s_Dirs }, - { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS2, s_Dirs }, - { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS3, s_Dirs }, - { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS4, s_Dirs }, - { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS5, s_Dirs }, - { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS6, s_Dirs }, - { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS7, s_Dirs }, - { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS8, s_Dirs }, - { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS9, s_Dirs }, - { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS10, s_Dirs }, - { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS11, s_Dirs }, - { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS12, s_Dirs }, - { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS13, s_Dirs }, + { __LINE__, 1, ERR_IGNORE, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS0, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS1, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS2, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS3, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS4, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS5, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS6, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS7, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS8, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS9, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS10, s_Dirs }, + { __LINE__, 1, ERR_NO_CHANGE, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS11, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS12, s_Dirs }, + { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_FULLPATH, s_LinkTargetDoubleBackslash, s_LinkTarget, FLAGS13, s_Dirs }, /* 2PRONG.txt (name only) */ { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS0 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", NULL, FLAGS1 }, @@ -282,22 +360,22 @@ static const TEST_ENTRY s_LFNEntries[] = { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS11, s_Dirs }, { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS12, s_Dirs }, { __LINE__, 1, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"2PRONG.txt", L"2PRONG.txt", FLAGS13, s_Dirs }, - /* testdata/CmdLineUtils (path) */ + /* testdir/CmdLineUtils (path) */ { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS0 }, - { __LINE__, 1, ERROR_NO_MORE_FILES, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils.lnk", FLAGS1 }, + { __LINE__, 1, ERR_IGNORE, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils.lnk", FLAGS1 }, { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS2 }, - { __LINE__, 1, ERROR_NO_MORE_FILES, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils.lnk", FLAGS3 }, + { __LINE__, 1, ERR_IGNORE, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils.lnk", FLAGS3 }, { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS4 }, { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS5 }, { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS6 }, - { __LINE__, 1, ERROR_NO_MORE_FILES, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils.lnk", FLAGS7 }, + { __LINE__, 1, ERR_IGNORE, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils.lnk", FLAGS7 }, { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS8 }, - { __LINE__, 1, ERROR_NO_MORE_FILES, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils.lnk", FLAGS9 }, + { __LINE__, 1, ERR_IGNORE, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils.lnk", FLAGS9 }, { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS10 }, { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS11 }, { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS12 }, { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS13 }, - /* testdata/CmdLineUtils with PRF_DONTFINDLNK (path) */ + /* testdir/CmdLineUtils with PRF_DONTFINDLNK (path) */ { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS0 | PRF_DONTFINDLNK }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS1 | PRF_DONTFINDLNK }, { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS2 | PRF_DONTFINDLNK }, @@ -312,7 +390,7 @@ static const TEST_ENTRY s_LFNEntries[] = { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS11 | PRF_DONTFINDLNK }, { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS12 | PRF_DONTFINDLNK }, { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils", L"CmdLineUtils", FLAGS13 | PRF_DONTFINDLNK }, - /* testdata/CmdLineUtils (name only) */ + /* testdir/CmdLineUtils (name only) */ { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS0 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS1 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS2 }, @@ -327,7 +405,7 @@ static const TEST_ENTRY s_LFNEntries[] = { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS11 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS12 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils", NULL, FLAGS13 }, - /* testdata/CmdLineUtils.exe (path) */ + /* testdir/CmdLineUtils.exe (path) */ { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS0 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS1 }, { __LINE__, 1, ERR_NO_CHANGE, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS2 }, @@ -342,7 +420,7 @@ static const TEST_ENTRY s_LFNEntries[] = { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS11 }, { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS12 }, { __LINE__, RAISED, ERR_DEAD, EF_TESTDATA, L"CmdLineUtils.exe", L"CmdLineUtils.exe", FLAGS13 }, - /* testdata/CmdLineUtils.exe (name only) */ + /* testdir/CmdLineUtils.exe (name only) */ { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS0 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS1 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS2 }, @@ -357,7 +435,7 @@ static const TEST_ENTRY s_LFNEntries[] = { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS11 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS12 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS13 }, - /* testdata/CmdLineUtils.exe with dirs (name only) */ + /* testdir/CmdLineUtils.exe with dirs (name only) */ { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS0, s_Dirs }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS1, s_Dirs }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS2, s_Dirs }, @@ -372,7 +450,7 @@ static const TEST_ENTRY s_LFNEntries[] = { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS11, s_Dirs }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS12, s_Dirs }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS13, s_Dirs }, - /* testdata/CmdLineUtils.exe with dirs (name only) */ + /* testdir/CmdLineUtils.exe with dirs (name only) */ { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS0, s_Dirs }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS1, s_Dirs }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS2, s_Dirs }, @@ -387,7 +465,7 @@ static const TEST_ENTRY s_LFNEntries[] = { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS11, s_Dirs }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS12, s_Dirs }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY, L"CmdLineUtils.exe", NULL, FLAGS13, s_Dirs }, - /* GhostProgram.exe -> testdata/CmdLineUtils.exe (name only, app path) */ + /* GhostProgram.exe -> testdir/CmdLineUtils.exe (name only, app path) */ { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS0 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS1 }, { __LINE__, 0, ERROR_FILE_NOT_FOUND, EF_TESTDATA | EF_NAME_ONLY | EF_APP_PATH, L"GhostProgram.exe", L"CmdLineUtils.exe", FLAGS2 }, @@ -525,36 +603,40 @@ static void DoEntry(INT SectionNumber, INT LineNumber, const TEST_ENTRY *pEntry) switch (pEntry->EF_ & EF_TYPE_MASK) { - case EF_FULLPATH: - if (pEntry->NameBefore) - { - lstrcpyW(Path, pEntry->NameBefore); - } - if (pEntry->NameExpected) - { - lstrcpyW(PathExpected, pEntry->NameExpected); - } - break; + case EF_FULLPATH: + if (pEntry->NameBefore) + { + lstrcpyW(Path, pEntry->NameBefore); + } + if (pEntry->NameExpected) + { + lstrcpyW(PathExpected, pEntry->NameExpected); + } + break; - case EF_TESTDATA: - if (pEntry->EF_ & EF_NAME_ONLY) - { - lstrcpyW(Path, pEntry->NameBefore); - } - else - { - lstrcpyW(Path, s_TestDir); - lstrcatW(Path, L"\\"); - lstrcatW(Path, pEntry->NameBefore); - } + case EF_TESTDATA: + if (pEntry->EF_ & EF_NAME_ONLY) + { + lstrcpyW(Path, pEntry->NameBefore); + } + else + { + lstrcpyW(Path, s_TestDir); + lstrcatW(Path, L"\\"); + lstrcatW(Path, pEntry->NameBefore); + } - if (pEntry->NameExpected) - { - lstrcpyW(PathExpected, s_TestDir); - lstrcatW(PathExpected, L"\\"); - lstrcatW(PathExpected, pEntry->NameExpected); - } - break; + if (pEntry->NameExpected) + { + lstrcpyW(PathExpected, s_TestDir); + lstrcatW(PathExpected, L"\\"); + lstrcatW(PathExpected, pEntry->NameExpected); + } + break; + + default: + assert(0); + break; } if (pEntry->EF_ & EF_APP_PATH) @@ -602,7 +684,7 @@ static void DoEntry(INT SectionNumber, INT LineNumber, const TEST_ENTRY *pEntry) if (pEntry->NameExpected && !(pEntry->EF_ & EF_APP_PATH)) { - ok(lstrcmpW(Path, PathExpected) == 0, "Section %d, Line%d: Path expected %s, was %s.\n", + ok(lstrcmpW(Path, PathExpected) == 0, "Section %d, Line %d: Path expected %s, was %s.\n", SectionNumber, LineNumber, wine_dbgstr_w(PathExpected), wine_dbgstr_w(Path)); } } @@ -679,23 +761,27 @@ START_TEST(PathResolve) /* Get this program's path */ GetModuleFileNameW(NULL, s_TestDir, _countof(s_TestDir)); - /* Add '\testdata' to the path */ + /* Add '\testdir' to the path */ pch = wcsrchr(s_TestDir, L'\\'); if (pch == NULL) { skip("GetModuleFileName and/or wcsrchr are insane.\n"); return; } - lstrcpyW(pch, L"\\testdata"); + lstrcpyW(pch, L"\\testdir"); - /* Create the testdata directory */ + /* Create the testdir directory */ CreateDirectoryW(s_TestDir, NULL); if (GetFileAttributesW(s_TestDir) == INVALID_FILE_ATTRIBUTES) { - skip("testdata is not found.\n"); + skip("testdir is not found.\n"); return; } + /* Build s_TestDirWithBackslash path */ + lstrcpyW(s_TestDirWithBackslash, s_TestDir); + lstrcatW(s_TestDirWithBackslash, L"\\"); + /* Build s_LinkTarget path */ lstrcpyW(s_LinkTarget, s_TestDir); lstrcatW(s_LinkTarget, L"\\"); @@ -705,6 +791,12 @@ START_TEST(PathResolve) fclose(_wfopen(s_LinkTarget, L"wb")); ok(GetFileAttributesW(s_LinkTarget) != INVALID_FILE_ATTRIBUTES, "s_LinkTarget not found\n"); + /* Build s_LinkTargetWithBackslash path */ + lstrcpyW(s_LinkTargetWithBackslash, s_TestDir); + lstrcatW(s_LinkTargetWithBackslash, L"\\"); + lstrcatW(s_LinkTargetWithBackslash, L"2PRONG.txt"); + lstrcatW(s_LinkTargetWithBackslash, L"\\"); + /* Build s_LinkTargetDoubleBackslash path */ lstrcpyW(s_LinkTargetDoubleBackslash, s_TestDir); lstrcatW(s_LinkTargetDoubleBackslash, L"\\\\");

1 0

[reactos] 01/01: [PSDK] SECURITY_ATTRIBUTES: Remove size_is(nLength) (#4832)
by Serge Gautherie 01 Nov '22

01 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5fcf9fe076c5c7bd2333… commit b5fcf9fe076c5c7bd23336350dd86d04809808ce Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Nov 1 03:14:09 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Nov 1 03:14:09 2022 +0100 [PSDK] SECURITY_ATTRIBUTES: Remove size_is(nLength) (#4832) nLength is the size of the struct itself, not a number of descriptors. Addendum to 1f12113 (r26428). --- sdk/include/psdk/wtypes.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/psdk/wtypes.idl b/sdk/include/psdk/wtypes.idl index c463158b14a..579f2318e34 100644 --- a/sdk/include/psdk/wtypes.idl +++ b/sdk/include/psdk/wtypes.idl @@ -146,7 +146,7 @@ typedef struct _SECURITY_DESCRIPTOR { typedef struct _SECURITY_ATTRIBUTES { DWORD nLength; - [size_is(nLength)] LPVOID lpSecurityDescriptor; + LPVOID lpSecurityDescriptor; BOOL bInheritHandle; } SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;

1 0

[reactos] 01/01: [KERNEL32][BASESRV] Fix interoperability with Win2k3 regarding NLS section security. (#4828)
by Hermès Bélusca-Maïto 01 Nov '22

01 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8cc88ca808274a1d5961… commit d8cc88ca808274a1d5961aa1503222c34a7a9ad2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Oct 30 22:42:22 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 1 02:34:04 2022 +0100 [KERNEL32][BASESRV] Fix interoperability with Win2k3 regarding NLS section security. (#4828) Partially revert some aspects of commits 5696e4ba4 and bf40c7a31. (See PR #4340.) In order for Win2k3 kernel32.dll to operate with our basesrv.dll (or our kernel32.dll to operate with Win2k3 basesrv.dll), we need in particular to have the CreateNlsSecurityDescriptor() helper to exactly take the expected parameters. Namely, a pointer to a **user-allocated** SECURITY_DESCRIPTOR buffer, its size (and an access mask). The function expects its caller to provide all this, and the caller expects the function to initialize the security descriptor buffer. Note that the function does *NOT* allocate a new descriptor buffer to be returned! Indeed, with the way it currently is in master, using Win2k3 kernel32 with our basesrv is now failing with the errors: ``` NLSAPI: Could NOT Create ACL - c0000023. (subsystems/win/basesrv/nls.c:279) NLS: CreateNlsSecurityDescriptor FAILED!: c0000023 NLSAPI: Could NOT initialize Server - c0000023. (dll/ntdll/ldr/ldrinit.c:867) LDR: DLL_PROCESS_ATTACH for dll "kernel32.dll" (InitRoutine: 77E40D95) failed ``` (and, if we ever attempted to increase the so-claimed "dummy parameter" descriptor size in the basesrv call, we would end up with its stack corrupted and a crash). Conversely, using our kernel32 with Win2k3 basesrv, would end up with basesrv receiving a wrongly-initialized descriptor that would not work (the buffer not being initialized with the contents of a descriptor, but instead receiving some address to a descriptor allocated somewhere else). --- dll/win32/kernel32/winnls/string/nls.c | 458 +++++++++++---------------------- sdk/include/reactos/subsys/win/base.h | 8 + subsystems/win/basesrv/basesrv.h | 3 - subsystems/win/basesrv/nls.c | 16 +- 4 files changed, 172 insertions(+), 313 deletions(-) diff --git a/dll/win32/kernel32/winnls/string/nls.c b/dll/win32/kernel32/winnls/string/nls.c index d810c429069..f6fb3576f74 100644 --- a/dll/win32/kernel32/winnls/string/nls.c +++ b/dll/win32/kernel32/winnls/string/nls.c @@ -57,13 +57,89 @@ BOOL WINAPI GetCPFileNameFromRegistry(UINT CodePage, LPWSTR FileName, ULONG FileNameSize); NTSTATUS -CreateNlsDirectorySecurity(_Out_ PSECURITY_DESCRIPTOR *NlsSecurityDescriptor); - -NTSTATUS WINAPI -CreateNlsSecurityDescriptor(_Out_ PSECURITY_DESCRIPTOR *SecurityDescriptor, _In_ SIZE_T DescriptorSize, _In_ ULONG AccessMask); +WINAPI +CreateNlsSecurityDescriptor( + _Out_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ SIZE_T DescriptorSize, + _In_ ULONG AccessMask); /* PRIVATE FUNCTIONS **********************************************************/ +/** + * @brief + * Creates a security descriptor for the NLS object directory. + * + * @param[out] SecurityDescriptor + * @param[in] DescriptorSize + * Same parameters as for CreateNlsSecurityDescriptor(). + * + * @remark + * Everyone (World SID) is given read access to the NLS directory, + * whereas Admins are given full access. + */ +static NTSTATUS +CreateNlsDirectorySecurity( + _Out_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ SIZE_T DescriptorSize) +{ + static SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; + NTSTATUS Status; + PSID AdminsSid; + PACL Dacl; + BOOLEAN DaclPresent, DaclDefaulted; + + /* Give everyone basic directory access */ + Status = CreateNlsSecurityDescriptor(SecurityDescriptor, + DescriptorSize, + DIRECTORY_TRAVERSE | DIRECTORY_CREATE_OBJECT); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create basic NLS SD (Status 0x%08x)\n", Status); + return Status; + } + + /* Create the Admins SID */ + // NOTE: Win <= 2k3 uses SYSTEM instead (SECURITY_LOCAL_SYSTEM_RID with one SubAuthority) + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, + &AdminsSid); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create Admins SID (Status 0x%08x)\n", Status); + goto Quit; + } + + /* Retrieve the DACL from the descriptor */ + Status = RtlGetDaclSecurityDescriptor(SecurityDescriptor, + &DaclPresent, + &Dacl, + &DaclDefaulted); + if (!NT_SUCCESS(Status) || !DaclPresent || !Dacl) + { + DPRINT1("Failed to get DACL from descriptor (Status 0x%08x)\n", Status); + goto Quit; + } + + /* Add an allowed access ACE to the Admins SID with full access. + * The function verifies the DACL is large enough to accommodate it. */ + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + DIRECTORY_ALL_ACCESS, + AdminsSid); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to add allowed access ACE for Admins SID (Status 0x%08x)\n", Status); + goto Quit; + } + +Quit: + RtlFreeSid(AdminsSid); + return Status; +} + /** * @name NlsInit * @@ -74,11 +150,12 @@ BOOL FASTCALL NlsInit(VOID) { + NTSTATUS Status; UNICODE_STRING DirName; OBJECT_ATTRIBUTES ObjectAttributes; - PSECURITY_DESCRIPTOR NlsDirSd; HANDLE Handle; - NTSTATUS Status; + UCHAR SecurityDescriptor[NLS_SECTION_SECURITY_DESCRIPTOR_SIZE + + NLS_SIZEOF_ACE_AND_SIDS(2)]; InitializeListHead(&CodePageListHead); RtlInitializeCriticalSection(&CodePageListLock); @@ -86,12 +163,13 @@ NlsInit(VOID) /* * FIXME: Eventually this should be done only for the NLS Server * process, but since we don't have anything like that (yet?) we - * always try to create the "\Nls" directory here. + * always try to create the "\NLS" directory here. */ - RtlInitUnicodeString(&DirName, L"\\Nls"); + RtlInitUnicodeString(&DirName, L"\\NLS"); - /* Create a security descriptor for NLS directory */ - Status = CreateNlsDirectorySecurity(&NlsDirSd); + /* Create a security descriptor for the NLS directory */ + Status = CreateNlsDirectorySecurity(&SecurityDescriptor, + sizeof(SecurityDescriptor)); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create NLS directory security (Status 0x%08x)\n", Status); @@ -102,9 +180,12 @@ NlsInit(VOID) &DirName, OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, NULL, - NlsDirSd); + &SecurityDescriptor); - if (NT_SUCCESS(NtCreateDirectoryObject(&Handle, DIRECTORY_TRAVERSE | DIRECTORY_CREATE_OBJECT, &ObjectAttributes))) + Status = NtCreateDirectoryObject(&Handle, + DIRECTORY_TRAVERSE | DIRECTORY_CREATE_OBJECT, + &ObjectAttributes); + if (NT_SUCCESS(Status)) { NtClose(Handle); } @@ -128,7 +209,6 @@ NlsInit(VOID) OemCodePage.CodePage = OemCodePage.CodePageTable.CodePage; InsertTailList(&CodePageListHead, &OemCodePage.Entry); - RtlFreeHeap(RtlGetProcessHeap(), 0, NlsDirSd); return TRUE; } @@ -212,17 +292,18 @@ PCODEPAGE_ENTRY FASTCALL IntGetCodePageEntry(UINT CodePage) { - CHAR SectionName[40]; NTSTATUS Status; + CHAR SectionName[40]; HANDLE SectionHandle = INVALID_HANDLE_VALUE, FileHandle; PBYTE SectionMapping; OBJECT_ATTRIBUTES ObjectAttributes; + UCHAR SecurityDescriptor[NLS_SECTION_SECURITY_DESCRIPTOR_SIZE]; ANSI_STRING AnsiName; UNICODE_STRING UnicodeName; WCHAR FileName[MAX_PATH + 1]; UINT FileNamePos; PCODEPAGE_ENTRY CodePageEntry; - PSECURITY_DESCRIPTOR NlsSd; + if (CodePage == CP_ACP) { return &AnsiCodePage; @@ -294,17 +375,26 @@ IntGetCodePageEntry(UINT CodePage) * However since we do not do that, let the kernel32 do the job * by assigning security to NLS section names for the time being... */ - Status = CreateNlsSecurityDescriptor(&NlsSd, sizeof(SECURITY_DESCRIPTOR), SECTION_MAP_READ); + Status = CreateNlsSecurityDescriptor(&SecurityDescriptor, + sizeof(SecurityDescriptor), + SECTION_MAP_READ); if (!NT_SUCCESS(Status)) { + DPRINT1("CreateNlsSecurityDescriptor FAILED! (Status 0x%08x)\n", Status); RtlLeaveCriticalSection(&CodePageListLock); return NULL; } - InitializeObjectAttributes(&ObjectAttributes, &UnicodeName, 0, NULL, NlsSd); + InitializeObjectAttributes(&ObjectAttributes, + &UnicodeName, + OBJ_CASE_INSENSITIVE, + NULL, + SecurityDescriptor); /* Try to open the section first */ - Status = NtOpenSection(&SectionHandle, SECTION_MAP_READ, &ObjectAttributes); + Status = NtOpenSection(&SectionHandle, + SECTION_MAP_READ, + &ObjectAttributes); /* If the section doesn't exist, try to create it. */ if (Status == STATUS_UNSUCCESSFUL || @@ -349,7 +439,6 @@ IntGetCodePageEntry(UINT CodePage) } } RtlFreeUnicodeString(&UnicodeName); - HeapFree(GetProcessHeap(), 0, NlsSd); if (!NT_SUCCESS(Status)) { @@ -2274,33 +2363,49 @@ IsDBCSLeadByte(BYTE TestByte) /** * @brief - * Creates a security descriptor for the NLS object directory - * name. + * Creates a security descriptor for each NLS section. Typically used by + * BASESRV to give Everyone (World SID) read access to the sections. + * + * @param[out] SecurityDescriptor + * A pointer to a correctly sized user-allocated buffer, that receives + * a security descriptor containing one ACL with one World SID. + * Its size should be at least equal to NLS_SECTION_SECURITY_DESCRIPTOR_SIZE. * - * @param[out] SecurityDescriptor - * A pointer to an allocated and created security descriptor - * that is given to the caller. + * @param[in] DescriptorSize + * Size (in bytes) of the user-provided SecurityDescriptor buffer. + * + * @param[in] AccessMask + * An access mask that grants Everyone an access specific to that mask. * * @return * STATUS_SUCCESS is returned if the function has successfully * created a security descriptor for a NLS section name. Otherwise * a NTSTATUS failure code is returned. * - * @remarks - * Everyone (aka World SID) is given read access to the NLS directory - * whereas admins are given full power. - */ + * @remark + * This implementation has to be made compatible with NT <= 5.2 in order + * to inter-operate with BASESRV. In particular, the security descriptor + * is a user-provided buffer correctly sized. The caller is responsible + * to submit the exact size of the descriptor. + **/ NTSTATUS -CreateNlsDirectorySecurity(_Out_ PSECURITY_DESCRIPTOR *NlsSecurityDescriptor) +WINAPI +CreateNlsSecurityDescriptor( + _Out_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ SIZE_T DescriptorSize, + _In_ ULONG AccessMask) { + static SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY}; NTSTATUS Status; + PSID WorldSid; PACL Dacl; - PSID WorldSid = NULL, AdminsSid = NULL; - ULONG DaclSize, RelSdSize = 0; - PSECURITY_DESCRIPTOR RelativeSd = NULL; - SECURITY_DESCRIPTOR AbsoluteSd; - static SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY}; - static SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; + ULONG DaclSize; + + if (DescriptorSize < NLS_SECTION_SECURITY_DESCRIPTOR_SIZE) + { + DPRINT1("Security descriptor size too small\n"); + return STATUS_BUFFER_TOO_SMALL; + } /* Create the World SID */ Status = RtlAllocateAndInitializeSid(&WorldAuthority, @@ -2310,304 +2415,49 @@ CreateNlsDirectorySecurity(_Out_ PSECURITY_DESCRIPTOR *NlsSecurityDescriptor) &WorldSid); if (!NT_SUCCESS(Status)) { - DPRINT1("CreateNlsDirectorySecurity(): Failed to create world SID (Status 0x%08x)\n", Status); + DPRINT1("Failed to create World SID (Status 0x%08x)\n", Status); return Status; } - /* Create the admins SID */ - Status = RtlAllocateAndInitializeSid(&NtAuthority, - 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, - &AdminsSid); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CreateNlsDirectorySecurity(): Failed to create admins SID (Status 0x%08x)\n", Status); - goto Quit; - } - - /* Build up the size of our DACL, including the World and admins SIDs */ - DaclSize = sizeof(ACL) + - sizeof(ACCESS_ALLOWED_ACE) + RtlLengthSid(WorldSid) + - sizeof(ACCESS_ALLOWED_ACE) + RtlLengthSid(AdminsSid); - - /* Allocate memory for our DACL */ - Dacl = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, DaclSize); - if (Dacl == NULL) - { - DPRINT1("CreateNlsDirectorySecurity(): Could not allocate memory for DACL, not enough memory!\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto Quit; - } - - /* Create the DACL */ - Status = RtlCreateAcl(Dacl, DaclSize, ACL_REVISION); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CreateNlsDirectorySecurity(): Failed to create the DACL (Status 0x%08x)\n", Status); - goto Quit; - } - - /* Give everyone basic directory access */ - Status = RtlAddAccessAllowedAce(Dacl, - ACL_REVISION, - DIRECTORY_TRAVERSE | DIRECTORY_CREATE_OBJECT, - WorldSid); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CreateNlsDirectorySecurity(): Failed to insert allowed access ACE to DACL for World SID (Status 0x%08x)\n", Status); - goto Quit; - } - - /* Give admins full power */ - Status = RtlAddAccessAllowedAce(Dacl, - ACL_REVISION, - DIRECTORY_ALL_ACCESS, - AdminsSid); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CreateNlsDirectorySecurity(): Failed to insert allowed access ACE to DACL for admins SID (Status 0x%08x)\n", Status); - goto Quit; - } - /* Initialize the security descriptor */ - Status = RtlCreateSecurityDescriptor(&AbsoluteSd, + Status = RtlCreateSecurityDescriptor(SecurityDescriptor, SECURITY_DESCRIPTOR_REVISION); if (!NT_SUCCESS(Status)) { - DPRINT1("CreateNlsDirectorySecurity(): Failed to initialize the security descriptor (Status 0x%08x)\n", Status); - goto Quit; - } - - /* Set the DACL to descriptor */ - Status = RtlSetDaclSecurityDescriptor(&AbsoluteSd, - TRUE, - Dacl, - FALSE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CreateNlsDirectorySecurity(): Failed to insert DACL into the descriptor (Status 0x%08x)\n", Status); - goto Quit; - } - - /* Determine how much size is needed to convert the absolute SD into self-relative one */ - Status = RtlAbsoluteToSelfRelativeSD(&AbsoluteSd, - NULL, - &RelSdSize); - if (Status != STATUS_BUFFER_TOO_SMALL) - { - DPRINT1("CreateNlsDirectorySecurity(): Unexpected status code, must be STATUS_BUFFER_TOO_SMALL (Status 0x%08x)\n", Status); - goto Quit; - } - - /* Allocate buffer for relative SD */ - RelativeSd = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, RelSdSize); - if (RelativeSd == NULL) - { - DPRINT1("CreateNlsDirectorySecurity(): Could not allocate memory for relative SD, not enough memory!\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto Quit; - } - - /* Convert it now */ - Status = RtlAbsoluteToSelfRelativeSD(&AbsoluteSd, - RelativeSd, - &RelSdSize); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CreateNlsDirectorySecurity(): Failed to convert absolute SD to self-relative format (Status 0x%08x)\n", Status); + DPRINT1("Failed to create security descriptor (Status 0x%08x)\n", Status); goto Quit; } - /* Give the security descriptor to the caller */ - *NlsSecurityDescriptor = RelativeSd; - -Quit: - if (WorldSid != NULL) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, WorldSid); - } - - if (AdminsSid != NULL) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, AdminsSid); - } - - if (Dacl != NULL) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl); - } - - if (!NT_SUCCESS(Status)) - { - if (RelativeSd != NULL) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, RelativeSd); - } - } - - return Status; -} - -/** - * @brief - * Creates a security descriptor for each NLS section - * name. - * - * @param[in] AccessMask - * An access mask bit to supply to the function. This - * access mask grants everyone access specific to that - * bit mask. - * - * @param[out] SecurityDescriptor - * A pointer to an allocated and created security descriptor - * that is given to the caller. - * - * @return - * STATUS_SUCCESS is returned if the function has successfully - * created a security descriptor for a NLS section name. Otherwise - * a NTSTATUS failure code is returned. - * - * @remarks - * The implementation of CreateNlsSecurityDescriptor on Windows Server - * 2003 is slightly different compared to ours. The second parameter - * takes the size of a security descriptor, in bytes. This is implied - * that on Windows the caller is responsible to submit the exact - * size of the descriptor. On ReactOS we're going to do it different, - * let the function be responsible for security descriptor creation - * and its size. DescriptorSize will act like a dummy parameter for us - * in this case. Everyone (aka World SID) is given read access to each - * NLS section name. - */ -NTSTATUS WINAPI CreateNlsSecurityDescriptor(_Out_ PSECURITY_DESCRIPTOR *SecurityDescriptor, _In_ SIZE_T DescriptorSize, _In_ ULONG AccessMask) -{ - NTSTATUS Status; - PACL Dacl; - PSID WorldSid = NULL; - ULONG DaclSize, RelSdSize = 0; - PSECURITY_DESCRIPTOR RelativeSd = NULL; - SECURITY_DESCRIPTOR AbsoluteSd; - static SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY}; - - /* DescriptorSize is just a dummy parameter */ - UNREFERENCED_PARAMETER(DescriptorSize); - - /* Create the World SID */ - Status = RtlAllocateAndInitializeSid(&WorldAuthority, - 1, - SECURITY_WORLD_RID, - 0, 0, 0, 0, 0, 0, 0, - &WorldSid); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CreateNlsSecurityDescriptor(): Failed to create world SID (Status 0x%08x)\n", Status); - return Status; - } - - /* Build up the size of our DACL, including the World SID */ - DaclSize = sizeof(ACL) + - sizeof(ACCESS_ALLOWED_ACE) + RtlLengthSid(WorldSid); - - /* Allocate memory for our DACL */ - Dacl = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, DaclSize); - if (Dacl == NULL) - { - DPRINT1("CreateNlsSecurityDescriptor(): Could not allocate memory for DACL, not enough memory!\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto Quit; - } + /* The DACL follows the security descriptor, and includes the World SID */ + Dacl = (PACL)((ULONG_PTR)SecurityDescriptor + sizeof(SECURITY_DESCRIPTOR)); + DaclSize = DescriptorSize - sizeof(SECURITY_DESCRIPTOR); /* Create the DACL */ Status = RtlCreateAcl(Dacl, DaclSize, ACL_REVISION); if (!NT_SUCCESS(Status)) { - DPRINT1("CreateNlsSecurityDescriptor(): Failed to create the DACL (Status 0x%08x)\n", Status); - goto Quit; - } - - /* Add a ACE with allow access to the World SID */ - Status = RtlAddAccessAllowedAce(Dacl, - ACL_REVISION, - AccessMask, - WorldSid); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CreateNlsSecurityDescriptor(): Failed to insert allowed access ACE to DACL for World SID (Status 0x%08x)\n", Status); - goto Quit; - } - - /* Initialize the security descriptor */ - Status = RtlCreateSecurityDescriptor(&AbsoluteSd, - SECURITY_DESCRIPTOR_REVISION); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CreateNlsSecurityDescriptor(): Failed to insert allowed access ACE to DACL for World SID (Status 0x%08x)\n", Status); + DPRINT1("Failed to create DACL (Status 0x%08x)\n", Status); goto Quit; } - /* Set the DACL to descriptor */ - Status = RtlSetDaclSecurityDescriptor(&AbsoluteSd, - TRUE, - Dacl, - FALSE); + /* Add an allowed access ACE to the World SID */ + Status = RtlAddAccessAllowedAce(Dacl, ACL_REVISION, AccessMask, WorldSid); if (!NT_SUCCESS(Status)) { - DPRINT1("CreateNlsSecurityDescriptor(): Failed to insert DACL into the descriptor (Status 0x%08x)\n", Status); - goto Quit; - } - - /* Determine how much size is needed to convert the absolute SD into self-relative one */ - Status = RtlAbsoluteToSelfRelativeSD(&AbsoluteSd, - NULL, - &RelSdSize); - if (Status != STATUS_BUFFER_TOO_SMALL) - { - DPRINT1("CreateNlsSecurityDescriptor(): Unexpected status code, must be STATUS_BUFFER_TOO_SMALL (Status 0x%08x)\n", Status); - goto Quit; - } - - /* Allocate buffer for relative SD */ - RelativeSd = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, RelSdSize); - if (RelativeSd == NULL) - { - DPRINT1("CreateNlsSecurityDescriptor(): Could not allocate memory for relative SD, not enough memory!\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; + DPRINT1("Failed to add allowed access ACE for World SID (Status 0x%08x)\n", Status); goto Quit; } - /* Convert it now */ - Status = RtlAbsoluteToSelfRelativeSD(&AbsoluteSd, - RelativeSd, - &RelSdSize); + /* Set the DACL to the descriptor */ + Status = RtlSetDaclSecurityDescriptor(SecurityDescriptor, TRUE, Dacl, FALSE); if (!NT_SUCCESS(Status)) { - DPRINT1("CreateNlsSecurityDescriptor(): Failed to convert absolute SD to self-relative format (Status 0x%08x)\n", Status); + DPRINT1("Failed to set DACL into descriptor (Status 0x%08x)\n", Status); goto Quit; } - /* Give the security descriptor to the caller */ - *SecurityDescriptor = RelativeSd; - Quit: - if (WorldSid != NULL) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, WorldSid); - } - - if (Dacl != NULL) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl); - } - - if (!NT_SUCCESS(Status)) - { - if (RelativeSd != NULL) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, RelativeSd); - } - } - + RtlFreeSid(WorldSid); return Status; } diff --git a/sdk/include/reactos/subsys/win/base.h b/sdk/include/reactos/subsys/win/base.h index 61f5bfce56d..28f21bee7dd 100644 --- a/sdk/include/reactos/subsys/win/base.h +++ b/sdk/include/reactos/subsys/win/base.h @@ -23,6 +23,14 @@ VOID NTAPI BaseSetProcessCreateNotify(IN BASE_PROCESS_CREATE_NOTIFY_ROUTINE ProcessCreateNotifyProc); +#define NLS_SIZEOF_ACE_AND_SIDS(n) \ + (FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + \ + FIELD_OFFSET(SID, SubAuthority) + (n)*RTL_FIELD_SIZE(SID, SubAuthority)) + +/* Minimal size for the security descriptors of the "\NLS\NlsSection*" sections */ +#define NLS_SECTION_SECURITY_DESCRIPTOR_SIZE \ + (sizeof(SECURITY_DESCRIPTOR) + sizeof(ACL) + NLS_SIZEOF_ACE_AND_SIDS(1)) + typedef struct _NLS_USER_INFO { WCHAR sLanguage[80]; diff --git a/subsystems/win/basesrv/basesrv.h b/subsystems/win/basesrv/basesrv.h index a1180f02348..8cae7fd5fd0 100644 --- a/subsystems/win/basesrv/basesrv.h +++ b/subsystems/win/basesrv/basesrv.h @@ -58,9 +58,6 @@ typedef BOOL (WINAPI *PGET_NLS_SECTION_NAME)(UINT CodePage, ULONG ResultSize); typedef BOOL (WINAPI *PVALIDATE_LOCALE)(IN ULONG LocaleId); -typedef NTSTATUS (WINAPI *PCREATE_NLS_SECURTY_DESCRIPTOR)(_Out_ PVOID *SecurityDescriptorBuffer, - _In_ ULONG DescriptorSize, - _In_ ULONG AccessMask); /* Globals */ extern HANDLE BaseSrvHeap; diff --git a/subsystems/win/basesrv/nls.c b/subsystems/win/basesrv/nls.c index d8bcac32c48..630b94cad99 100644 --- a/subsystems/win/basesrv/nls.c +++ b/subsystems/win/basesrv/nls.c @@ -33,7 +33,12 @@ PVALIDATE_LOCALE pValidateLocale; PGET_NLS_SECTION_NAME pGetNlsSectionName; PVOID /*PGET_USER_DEFAULT_LANGID*/ pGetUserDefaultLangID; PGET_CP_FILE_NAME_FROM_REGISTRY pGetCPFileNameFromRegistry; -PCREATE_NLS_SECURTY_DESCRIPTOR pCreateNlsSecurityDescriptor; + +NTSTATUS +(WINAPI *pCreateNlsSecurityDescriptor)( + _Out_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _In_ SIZE_T DescriptorSize, + _In_ ULONG AccessMask); BASESRV_KERNEL_IMPORTS BaseSrvKernel32Imports[10] = { @@ -161,7 +166,7 @@ CSR_API(BaseSrvNlsCreateSection) ULONG LocaleId; UNICODE_STRING NlsSectionName; PWCHAR NlsFileName; - PSECURITY_DESCRIPTOR NlsSd; + UCHAR SecurityDescriptor[NLS_SECTION_SECURITY_DESCRIPTOR_SIZE]; OBJECT_ATTRIBUTES ObjectAttributes; WCHAR FileNameBuffer[32]; WCHAR NlsSectionNameBuffer[32]; @@ -271,8 +276,8 @@ CSR_API(BaseSrvNlsCreateSection) } /* Create an SD for the section object */ - Status = pCreateNlsSecurityDescriptor(&NlsSd, - sizeof(SECURITY_DESCRIPTOR), + Status = pCreateNlsSecurityDescriptor(&SecurityDescriptor, + sizeof(SecurityDescriptor), SECTION_MAP_READ); if (!NT_SUCCESS(Status)) { @@ -286,7 +291,7 @@ CSR_API(BaseSrvNlsCreateSection) &NlsSectionName, OBJ_CASE_INSENSITIVE | OBJ_PERMANENT | OBJ_OPENIF, NULL, - NlsSd); + &SecurityDescriptor); Status = NtCreateSection(&SectionHandle, SECTION_MAP_READ, &ObjectAttributes, @@ -295,7 +300,6 @@ CSR_API(BaseSrvNlsCreateSection) SEC_COMMIT, FileHandle); NtClose(FileHandle); - RtlFreeHeap(RtlGetProcessHeap(), 0, NlsSd); if (!NT_SUCCESS(Status)) { DPRINT1("NLS: Failed to create section! %lx\n", Status);

1 0

[reactos] 03/03: [KERNEL32] Minor code style changes + add documentation for BasepMoveFileDelayed().
by Hermès Bélusca-Maïto 01 Nov '22

01 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5bf0c00ddcaa747612139… commit 5bf0c00ddcaa74761213926d44e4139eb4063955 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Oct 31 20:15:34 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 1 02:29:24 2022 +0100 [KERNEL32] Minor code style changes + add documentation for BasepMoveFileDelayed(). + cut the too long lines; don't hardcode types in sizeofs; correctly specify COPY_FILE_FAIL_IF_EXISTS flag. --- dll/win32/kernel32/client/file/move.c | 221 +++++++++++++++++++++------------- 1 file changed, 140 insertions(+), 81 deletions(-) diff --git a/dll/win32/kernel32/client/file/move.c b/dll/win32/kernel32/client/file/move.c index 93827d739ba..51d2211b61b 100644 --- a/dll/win32/kernel32/client/file/move.c +++ b/dll/win32/kernel32/client/file/move.c @@ -7,17 +7,13 @@ * Gerhard W. Gruber (sparhawk_at_gmx.at) * Dmitry Philippov (shedon(a)mail.ru) * Pierre Schweitzer (pierre(a)reactos.org) - * UPDATE HISTORY: - * Created 01/11/98 - * DP (29/07/2006) - * Fix some bugs in the add_boot_rename_entry function */ /* INCLUDES *****************************************************************/ #include <k32.h> #include <malloc.h> -#include <strsafe.h> + #define NDEBUG #include <debug.h> DEBUG_CHANNEL(kernel32file); @@ -33,15 +29,67 @@ typedef struct _COPY_PROGRESS_CONTEXT } COPY_PROGRESS_CONTEXT, *PCOPY_PROGRESS_CONTEXT; /* FUNCTIONS ****************************************************************/ -/* + +/** + * @brief + * Adds an entry in the "PendingFileRenameOperations" registry value, that is + * parsed at boot-time by SMSS.EXE to check whether there are some files to be + * renamed/moved or deleted. + * + * @param[in] ExistingPath + * Full NT path to the file to rename/move or delete. + * + * @param[in] NewPath + * Full NT path to the moved/renamed file; or an empty string if the file is + * to be deleted. + * + * @param[in] KeyId + * Selects an alternate "PendingFileRenameOperationsXXX" registry value. + * + * @param[in] CreateIfNotFound + * TRUE if the file needs to be created if it does not already exist, + * FALSE if not. + * + * @remark + * If both ExistingPath and NewPath strings are non-empty, the file is moved, + * otherwise it is deleted. + * + * @note + * The registry value is a list of NULL-terminated strings, which is itself + * terminated with an empty NULL-terminated string (single 0-byte). + * When a new entry is added, if NewPath is empty, then the second entry is + * simply a single NULL. Otherwise the second file path goes there. + * Each path is in NT format (e.g. path prepended with \??\) and the second + * file path gets also a '!' as the first character if MOVEFILE_REPLACE_EXISTING + * is specified. + * + * Examples: + * + * \??\D:\test\file1[0] + * !\??\D:\test\file1_renamed[0] + * \??\D:\test\delete[0] + * [0] <- file is to be deleted, second string empty + * \??\D:\test\file2[0] + * !\??\D:\test\file2_renamed[0] + * [0] <- indicates end of strings + * + * or: + * + * \??\D:\test\file1[0] + * !\??\D:\test\file1_renamed[0] + * \??\D:\test\delete[0] + * [0] <- file is to be deleted, second string empty + * [0] <- indicates end of strings + * * @implemented - */ + **/ NTSTATUS WINAPI -BasepMoveFileDelayed(IN PUNICODE_STRING ExistingPath, - IN PUNICODE_STRING NewPath, - IN INT KeyId, - IN BOOL CreateIfNotFound) +BasepMoveFileDelayed( + _In_ PUNICODE_STRING ExistingPath, + _In_ PUNICODE_STRING NewPath, + _In_ INT KeyId, + _In_ BOOL CreateIfNotFound) { #define STRING_LENGTH 0x400 NTSTATUS Status; @@ -54,7 +102,8 @@ BasepMoveFileDelayed(IN PUNICODE_STRING ExistingPath, /* +6 because a INT shouldn't take more than 6 chars. Especially given the call path */ WCHAR PendingOperationsBuffer[sizeof(L"PendingFileRenameOperations") / sizeof(WCHAR) + 6]; - RtlInitUnicodeString(&SessionManagerString, L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Session Manager"); + RtlInitUnicodeString(&SessionManagerString, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Session Manager"); /* Select appropriate key for adding our file */ if (KeyId == 1) @@ -63,7 +112,9 @@ BasepMoveFileDelayed(IN PUNICODE_STRING ExistingPath, } else { - StringCbPrintfW(PendingOperationsBuffer, sizeof(PendingOperationsBuffer), L"PendingFileRenameOperations%d", KeyId); + RtlStringCbPrintfW(PendingOperationsBuffer, + sizeof(PendingOperationsBuffer), + L"PendingFileRenameOperations%d", KeyId); PendingOperations = PendingOperationsBuffer; } RtlInitUnicodeString(&PendingOperationsString, PendingOperations); @@ -91,7 +142,7 @@ BasepMoveFileDelayed(IN PUNICODE_STRING ExistingPath, return Status; } - /* Reserve enough to read previous string + to append our with required null chars */ + /* Reserve enough to read previous string + to append ours with required null chars */ BufferLength = NewPath->Length + ExistingPath->Length + STRING_LENGTH + 3 * sizeof(UNICODE_NULL); while (TRUE) @@ -113,7 +164,7 @@ BasepMoveFileDelayed(IN PUNICODE_STRING ExistingPath, break; } - /* If buffer was too small, then, reallocate one which is big enough */ + /* If buffer was too small, reallocate one which is big enough */ StringLength = DataSize; RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); BufferLength = ExistingPath->Length + StringLength + NewPath->Length + 3 * sizeof(UNICODE_NULL); @@ -125,7 +176,7 @@ BasepMoveFileDelayed(IN PUNICODE_STRING ExistingPath, } } - /* Check if it existed - if not, create only IF asked to */ + /* Check if it existed; if not, create only IF asked to */ if (!NT_SUCCESS(Status) && (Status != STATUS_OBJECT_NAME_NOT_FOUND || !CreateIfNotFound)) { NtClose(KeyHandle); @@ -135,7 +186,7 @@ BasepMoveFileDelayed(IN PUNICODE_STRING ExistingPath, if (!NT_SUCCESS(Status)) { - /* We didn't find any - ie, we create, so use complete buffer */ + /* We didn't find any: we create, so use complete buffer */ BufferBegin = Buffer; BufferWrite = Buffer; } @@ -143,9 +194,9 @@ BasepMoveFileDelayed(IN PUNICODE_STRING ExistingPath, { PKEY_VALUE_PARTIAL_INFORMATION PartialInfo = (PKEY_VALUE_PARTIAL_INFORMATION)Buffer; - /* Get data, our buffer begin and then where we should append data - * (- null char, this is REG_MULTI_SZ, it already includes double termination, we keep only one) - */ + /* Get data, the buffer beginning, and where data should be appended + * (minus NULL char: this is REG_MULTI_SZ, it already includes double + * termination, but we keep only one). */ BufferBegin = PartialInfo->Data; BufferWrite = (PWSTR)((ULONG_PTR)PartialInfo->Data + PartialInfo->DataLength - sizeof(UNICODE_NULL)); } @@ -191,12 +242,13 @@ BasepGetComputerNameFromNtPath(IN PUNICODE_STRING NewPath, WCHAR Letter; PWSTR AbsolutePath, EndOfName; USHORT AbsolutePathLength, NameLength; - WCHAR TargetDevice[0x105]; + WCHAR TargetDevice[MAX_PATH + 1]; WCHAR DeviceName[] = {'A', ':', '\0'}; /* Init to something, will be set later */ UNICODE_STRING UncString = RTL_CONSTANT_STRING(L"\\??\\UNC\\"); UNICODE_STRING GlobalString = RTL_CONSTANT_STRING(L"\\??\\"); - DPRINT("BasepGetComputerNameFromNtPath(%wZ, %p, %p, %lu)\n", NewPath, NewHandle, ComputerName, ComputerNameLength); + DPRINT("BasepGetComputerNameFromNtPath(%wZ, %p, %p, %lu)\n", + NewPath, NewHandle, ComputerName, ComputerNameLength); /* If it's an UNC path */ if (RtlPrefixUnicodeString(&UncString, NewPath, TRUE)) @@ -241,7 +293,7 @@ BasepGetComputerNameFromNtPath(IN PUNICODE_STRING NewPath, TargetDevice[27] == ':') { /* Check for the path begin, computer name is before */ - PWSTR Path = wcschr(&TargetDevice[28], '\\'); + PWSTR Path = wcschr(&TargetDevice[28], L'\\'); if (Path == NULL) { return ERROR_BAD_PATHNAME; @@ -299,12 +351,12 @@ BasepGetComputerNameFromNtPath(IN PUNICODE_STRING NewPath, for (NameLength = 0; NameLength < AbsolutePathLength; NameLength += sizeof(WCHAR)) { /* Look for the next \, it will be the end of computer name */ - if (EndOfName[0] == '\\') + if (EndOfName[0] == L'\\') { break; } /* Computer name cannot contain ., if we get to that point, something went wrong... */ - else if (EndOfName[0] == '.') + else if (EndOfName[0] == L'.') { return ERROR_BAD_PATHNAME; } @@ -349,7 +401,7 @@ BasepNotifyTrackingService(IN OUT PHANDLE ExistingHandle, ULONG ComputerNameLength, FileAttributes; WCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; OEM_STRING ComputerNameStringA; - CHAR ComputerNameStringBuffer[0x105]; + CHAR ComputerNameStringBuffer[MAX_PATH + 1]; UNICODE_STRING ComputerNameStringW; IO_STATUS_BLOCK IoStatusBlock; FILE_BASIC_INFORMATION FileBasicInfo; @@ -360,7 +412,8 @@ BasepNotifyTrackingService(IN OUT PHANDLE ExistingHandle, CHAR Buffer[(MAX_COMPUTERNAME_LENGTH + 1) * sizeof(WCHAR)]; } FileTrackingInfo; - DPRINT("BasepNotifyTrackingService(%p, %p, %p, %wZ)\n", *ExistingHandle, ObjectAttributes, NewHandle, NewPath); + DPRINT("BasepNotifyTrackingService(%p, %p, %p, %wZ)\n", + *ExistingHandle, ObjectAttributes, NewHandle, NewPath); Status = STATUS_SUCCESS; ComputerNameLength = ARRAYSIZE(ComputerName); @@ -374,19 +427,19 @@ BasepNotifyTrackingService(IN OUT PHANDLE ExistingHandle, else { /* Convert the retrieved computer name to ANSI and attach it to the notification */ - ComputerNameStringA.Length = 0; - ComputerNameStringA.MaximumLength = ARRAYSIZE(ComputerNameStringBuffer); - ComputerNameStringA.Buffer = ComputerNameStringBuffer; + RtlInitEmptyAnsiString(&ComputerNameStringA, + ComputerNameStringBuffer, + sizeof(ComputerNameStringBuffer)); RtlInitUnicodeString(&ComputerNameStringW, ComputerName); - Status = RtlUnicodeStringToOemString(&ComputerNameStringA, &ComputerNameStringW, 0); + Status = RtlUnicodeStringToOemString(&ComputerNameStringA, &ComputerNameStringW, FALSE); if (!NT_SUCCESS(Status)) { return Status; } RtlCopyMemory(FileTrackingInfo.ObjectInformation, ComputerNameStringA.Buffer, ComputerNameStringA.Length); - FileTrackingInfo.ObjectInformation[ComputerNameStringA.Length] = 0; + FileTrackingInfo.ObjectInformation[ComputerNameStringA.Length] = ANSI_NULL; FileTrackingInfo.ObjectInformationLength = ComputerNameStringA.Length + 1; } @@ -406,7 +459,7 @@ BasepNotifyTrackingService(IN OUT PHANDLE ExistingHandle, /* If we get here, we got access denied error, this comes from a * read-only flag. So, close the file, in order to reopen it with enough - * rights to remove said flag and reattempt notification + * rights to remove said flag and reattempt notification. */ CloseHandle(*ExistingHandle); @@ -511,9 +564,7 @@ BasepOpenFileForMove(IN LPCWSTR File, _SEH2_TRY { /* Zero output */ - RelativeNtName->Length = - RelativeNtName->MaximumLength = 0; - RelativeNtName->Buffer = NULL; + RtlInitEmptyUnicodeString(RelativeNtName, NULL, 0); *NtName = NULL; if (!RtlDosPathNameToRelativeNtPathName_U(File, RelativeNtName, NULL, &RelativeName)) @@ -533,7 +584,7 @@ BasepOpenFileForMove(IN LPCWSTR File, } else { - RelativeName.ContainingDirectory = 0; + RelativeName.ContainingDirectory = NULL; } InitializeObjectAttributes(ObjectAttributes, @@ -558,7 +609,7 @@ BasepOpenFileForMove(IN LPCWSTR File, Status = NtQueryInformationFile(*FileHandle, &IoStatusBlock, &TagInfo, - sizeof(FILE_ATTRIBUTE_TAG_INFORMATION), + sizeof(TagInfo), FileAttributeTagInformation); /* Return if failure with a status that wouldn't mean the FSD cannot support reparse points */ @@ -677,11 +728,12 @@ MoveFileWithProgressW(IN LPCWSTR lpExistingFileName, OBJECT_ATTRIBUTES ObjectAttributes; PFILE_RENAME_INFORMATION RenameInfo; UNICODE_STRING NewPathU, ExistingPathU; - FILE_ATTRIBUTE_TAG_INFORMATION FileAttrTagInfo; + FILE_ATTRIBUTE_TAG_INFORMATION TagInfo; HANDLE SourceHandle = INVALID_HANDLE_VALUE, NewHandle, ExistingHandle; BOOL Ret = FALSE, ReplaceIfExists, DelayUntilReboot, AttemptReopenWithoutReparse; - DPRINT("MoveFileWithProgressW(%S, %S, %p, %p, %x)\n", lpExistingFileName, lpNewFileName, lpProgressRoutine, lpData, dwFlags); + DPRINT("MoveFileWithProgressW(%S, %S, %p, %p, %x)\n", + lpExistingFileName, lpNewFileName, lpProgressRoutine, lpData, dwFlags); NewPathU.Buffer = NULL; ExistingPathU.Buffer = NULL; @@ -732,9 +784,8 @@ MoveFileWithProgressW(IN LPCWSTR lpExistingFileName, if (DelayUntilReboot && (Status == STATUS_SHARING_VIOLATION || Status == STATUS_OBJECT_NAME_NOT_FOUND || Status == STATUS_OBJECT_PATH_NOT_FOUND)) { - /* Here we don't fail completely, as we postpone the operation to reboot - * File might exist afterwards, and we don't need a handle here - */ + /* Here we don't fail completely, as we postpone the operation to reboot. + * File might exist afterwards, and we don't need a handle here. */ SourceHandle = INVALID_HANDLE_VALUE; AttemptReopenWithoutReparse = FALSE; } @@ -750,8 +801,8 @@ MoveFileWithProgressW(IN LPCWSTR lpExistingFileName, /* We managed to open, so query information */ Status = NtQueryInformationFile(SourceHandle, &IoStatusBlock, - &FileAttrTagInfo, - sizeof(FILE_ATTRIBUTE_TAG_INFORMATION), + &TagInfo, + sizeof(TagInfo), FileAttributeTagInformation); if (!NT_SUCCESS(Status)) { @@ -766,8 +817,8 @@ MoveFileWithProgressW(IN LPCWSTR lpExistingFileName, AttemptReopenWithoutReparse = FALSE; } /* Validate the reparse point (do we support it?) */ - else if (FileAttrTagInfo.FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT && - FileAttrTagInfo.ReparseTag != IO_REPARSE_TAG_MOUNT_POINT) + else if ((TagInfo.FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) && + (TagInfo.ReparseTag != IO_REPARSE_TAG_MOUNT_POINT)) { NtClose(SourceHandle); SourceHandle = INVALID_HANDLE_VALUE; @@ -798,10 +849,10 @@ MoveFileWithProgressW(IN LPCWSTR lpExistingFileName, /* Nullify string if we're to use it */ if (DelayUntilReboot && !lpNewFileName) { - RtlInitUnicodeString(&NewPathU, 0); + RtlInitUnicodeString(&NewPathU, NULL); } /* Check whether path exists */ - else if (!RtlDosPathNameToNtPathName_U(lpNewFileName, &NewPathU, 0, 0)) + else if (!RtlDosPathNameToNtPathName_U(lpNewFileName, &NewPathU, NULL, NULL)) { BaseSetLastNTError(STATUS_OBJECT_PATH_NOT_FOUND); _SEH2_LEAVE; @@ -829,7 +880,8 @@ MoveFileWithProgressW(IN LPCWSTR lpExistingFileName, } /* Check whether 'copy' renaming is allowed if required */ - if (RtlDetermineDosPathNameType_U(lpExistingFileName) == RtlPathTypeUncAbsolute || dwFlags & MOVEFILE_COPY_ALLOWED) + if ((RtlDetermineDosPathNameType_U(lpExistingFileName) == RtlPathTypeUncAbsolute) || + (dwFlags & MOVEFILE_COPY_ALLOWED)) { Status = STATUS_INVALID_PARAMETER; } @@ -841,7 +893,6 @@ MoveFileWithProgressW(IN LPCWSTR lpExistingFileName, { /* If doesn't exist, append to first key first, creating it if it doesn't exist */ Status = BasepMoveFileDelayed(&ExistingPathU, &NewPathU, 1, TRUE); - if (Status == STATUS_INSUFFICIENT_RESOURCES) { /* If it failed because it's too big, then create 2nd key and put it there */ @@ -865,7 +916,8 @@ MoveFileWithProgressW(IN LPCWSTR lpExistingFileName, ASSERT(SourceHandle != INVALID_HANDLE_VALUE); /* Allocate renaming buffer and fill it */ - RenameInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, NewPathU.Length + sizeof(FILE_RENAME_INFORMATION)); + RenameInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, + NewPathU.Length + sizeof(FILE_RENAME_INFORMATION)); if (RenameInfo == NULL) { BaseSetLastNTError(STATUS_NO_MEMORY); @@ -874,7 +926,7 @@ MoveFileWithProgressW(IN LPCWSTR lpExistingFileName, RtlCopyMemory(&RenameInfo->FileName, NewPathU.Buffer, NewPathU.Length); RenameInfo->ReplaceIfExists = ReplaceIfExists; - RenameInfo->RootDirectory = 0; + RenameInfo->RootDirectory = NULL; RenameInfo->FileNameLength = NewPathU.Length; /* Attempt to rename the file */ @@ -882,7 +934,8 @@ MoveFileWithProgressW(IN LPCWSTR lpExistingFileName, &IoStatusBlock, RenameInfo, NewPathU.Length + sizeof(FILE_RENAME_INFORMATION), - ((dwFlags & MOVEFILE_CREATE_HARDLINK) ? FileLinkInformation : FileRenameInformation)); + ((dwFlags & MOVEFILE_CREATE_HARDLINK) + ? FileLinkInformation : FileRenameInformation)); RtlFreeHeap(RtlGetProcessHeap(), 0, RenameInfo); if (NT_SUCCESS(Status)) { @@ -890,14 +943,13 @@ MoveFileWithProgressW(IN LPCWSTR lpExistingFileName, Ret = TRUE; _SEH2_LEAVE; } - /* If we failed for any other reason than not the same device, fail - * If we failed because of different devices, only allow renaming if user allowed copy + /* If we failed for any other reason than not the same device, fail. + * If we failed because of different devices, only allow renaming if user allowed copy. */ if (Status != STATUS_NOT_SAME_DEVICE || !(dwFlags & MOVEFILE_COPY_ALLOWED)) { - /* ReactOS hack! To be removed once all FSD have proper renaming support - * Just leave status to error and leave - */ + /* ReactOS HACK! To be removed once all FSD have proper renaming support. + * Just leave status to error and leave. */ if (Status == STATUS_NOT_IMPLEMENTED) { DPRINT1("Forcing copy, renaming not supported by FSD\n"); @@ -925,7 +977,8 @@ MoveFileWithProgressW(IN LPCWSTR lpExistingFileName, BasepMoveFileCopyProgress, &CopyContext, NULL, - (ReplaceIfExists == 0) | COPY_FILE_OPEN_SOURCE_FOR_WRITE, + (!ReplaceIfExists ? COPY_FILE_FAIL_IF_EXISTS : 0) + | COPY_FILE_OPEN_SOURCE_FOR_WRITE, 0, &ExistingHandle, &NewHandle); @@ -943,7 +996,10 @@ MoveFileWithProgressW(IN LPCWSTR lpExistingFileName, if (NewHandle != INVALID_HANDLE_VALUE) { /* If copying succeed, notify */ - Status = BasepNotifyTrackingService(&ExistingHandle, &ObjectAttributes, NewHandle, &NewPathU); + Status = BasepNotifyTrackingService(&ExistingHandle, + &ObjectAttributes, + NewHandle, + &NewPathU); if (!NT_SUCCESS(Status)) { /* Fail in case it had to succeed */ @@ -1027,7 +1083,11 @@ MoveFileWithProgressA(IN LPCSTR lpExistingFileName, NewFileNameW.Buffer = NULL; } - Ret = MoveFileWithProgressW(ExistingFileNameW.Buffer, NewFileNameW.Buffer, lpProgressRoutine, lpData, dwFlags); + Ret = MoveFileWithProgressW(ExistingFileNameW.Buffer, + NewFileNameW.Buffer, + lpProgressRoutine, + lpData, + dwFlags); RtlFreeUnicodeString(&ExistingFileNameW); RtlFreeUnicodeString(&NewFileNameW); @@ -1062,10 +1122,10 @@ MoveFileExW(IN LPCWSTR lpExistingFileName, IN DWORD dwFlags) { return MoveFileWithProgressW(lpExistingFileName, - lpNewFileName, - NULL, - NULL, - dwFlags); + lpNewFileName, + NULL, + NULL, + dwFlags); } @@ -1079,8 +1139,8 @@ MoveFileA(IN LPCSTR lpExistingFileName, { return MoveFileWithProgressA(lpExistingFileName, lpNewFileName, - NULL, - NULL, + NULL, + NULL, MOVEFILE_COPY_ALLOWED); } @@ -1116,7 +1176,8 @@ ReplaceFileA(IN LPCSTR lpReplacedFileName, BOOL Ret; UNICODE_STRING ReplacedFileNameW, ReplacementFileNameW, BackupFileNameW; - if (!lpReplacedFileName || !lpReplacementFileName || lpExclude || lpReserved || dwReplaceFlags & ~(REPLACEFILE_WRITE_THROUGH | REPLACEFILE_IGNORE_MERGE_ERRORS)) + if (!lpReplacedFileName || !lpReplacementFileName || lpExclude || lpReserved || + (dwReplaceFlags & ~(REPLACEFILE_WRITE_THROUGH | REPLACEFILE_IGNORE_MERGE_ERRORS))) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1147,7 +1208,10 @@ ReplaceFileA(IN LPCSTR lpReplacedFileName, BackupFileNameW.Buffer = NULL; } - Ret = ReplaceFileW(ReplacedFileNameW.Buffer, ReplacementFileNameW.Buffer, BackupFileNameW.Buffer, dwReplaceFlags, 0, 0); + Ret = ReplaceFileW(ReplacedFileNameW.Buffer, + ReplacementFileNameW.Buffer, + BackupFileNameW.Buffer, + dwReplaceFlags, 0, 0); if (lpBackupFileName) { @@ -1334,14 +1398,10 @@ PrivMoveFileIdentityW(IN LPCWSTR lpSource, IN LPCWSTR lpDestination, IN DWORD dw DPRINT("PrivMoveFileIdentityW(%S, %S, %x)\n", lpSource, lpDestination, dwFlags); SourceHandle = INVALID_HANDLE_VALUE; - NtSource.Length = - NtSource.MaximumLength = 0; - NtSource.Buffer = NULL; + RtlInitEmptyUnicodeString(&NtSource, NULL, 0); RelativeSource = NULL; DestinationHandle = INVALID_HANDLE_VALUE; - NtDestination.Length = - NtDestination.MaximumLength = 0; - NtDestination.Buffer = NULL; + RtlInitEmptyUnicodeString(&NtDestination, NULL, 0); RelativeDestination = NULL; /* FILE_WRITE_DATA is required for later on notification */ @@ -1354,10 +1414,10 @@ PrivMoveFileIdentityW(IN LPCWSTR lpSource, IN LPCWSTR lpDestination, IN DWORD dw _SEH2_TRY { /* We will loop twice: - * First we attempt to open with FILE_WRITE_DATA for notification + * First we attempt to open with FILE_WRITE_DATA for notification. * If it fails and we have flag for non-trackable files, we retry * without FILE_WRITE_DATA. - * If that one fails, then, we quit for real + * If that one fails, then, we quit for real. */ while (TRUE) { @@ -1404,9 +1464,8 @@ PrivMoveFileIdentityW(IN LPCWSTR lpSource, IN LPCWSTR lpDestination, IN DWORD dw } DestAccess = FILE_WRITE_ATTRIBUTES; - /* If we could preserve FILE_WRITE_DATA for source, attempt to get it for destination - * Still for notification purposes - */ + /* If we could preserve FILE_WRITE_DATA for source, attempt to + * get it for destination, still for notification purposes. */ if (SourceAccess & FILE_WRITE_DATA) { DestAccess |= FILE_WRITE_DATA;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs