Ros-diffs December 2017

ros-diffs@reactos.org

26 participants
355 discussions

[reactos] 06/14: [NTOS:MM] Quick fix: use SIZE_T instead of ULONG, because ULONG is 32-bit and on 64-bit truncates values

by Ivan Labutin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d35d59fb9e0a6311f1a6… commit 4d35d59fb9e0a6311f1a621ca1234b2d583ef98e Author: Ivan Labutin <linuxrf(a)gmail.com> AuthorDate: Fri Nov 10 20:19:45 2017 +0300 [NTOS:MM] Quick fix: use SIZE_T instead of ULONG, because ULONG is 32-bit and on 64-bit truncates values --- ntoskrnl/mm/mminit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/mminit.c b/ntoskrnl/mm/mminit.c index 5e066c426b..3fff72b771 100644 --- a/ntoskrnl/mm/mminit.c +++ b/ntoskrnl/mm/mminit.c @@ -45,7 +45,7 @@ extern NTSTATUS MiRosTrimCache(ULONG Target, ULONG Priority, PULONG NrFreed); VOID INIT_FUNCTION NTAPI -MiCreateArm3StaticMemoryArea(PVOID BaseAddress, ULONG Size, BOOLEAN Executable) +MiCreateArm3StaticMemoryArea(PVOID BaseAddress, SIZE_T Size, BOOLEAN Executable) { const ULONG Protection = Executable ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE; PVOID pBaseAddress = BaseAddress;

6 years, 9 months

[reactos] 05/14: [NTOS:KE] Improve readability of CPU flag checks and fix error checking wrong register for HT support

by Ivan Labutin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ede3f4d44958c1f9cd22b… commit ede3f4d44958c1f9cd22bbd5553bcbfe0700d510 Author: Ivan Labutin <linuxrf(a)gmail.com> AuthorDate: Fri Nov 10 19:44:30 2017 +0300 [NTOS:KE] Improve readability of CPU flag checks and fix error checking wrong register for HT support --- ntoskrnl/include/internal/amd64/ke.h | 25 ++++++++++++++++++- ntoskrnl/ke/amd64/cpu.c | 48 ++++++++++++++++++------------------ 2 files changed, 48 insertions(+), 25 deletions(-) diff --git a/ntoskrnl/include/internal/amd64/ke.h b/ntoskrnl/include/internal/amd64/ke.h index 7cd8da44a5..977a8f8598 100644 --- a/ntoskrnl/include/internal/amd64/ke.h +++ b/ntoskrnl/include/internal/amd64/ke.h @@ -22,19 +22,42 @@ #define X86_CR4_OSFXSR 0x00000200 /* enable FXSAVE/FXRSTOR instructions */ #define X86_CR4_OSXMMEXCPT 0x00000400 /* enable #XF exception */ +/* EDX flags */ +#define X86_FEATURE_FPU 0x00000001 /* x87 FPU is present */ #define X86_FEATURE_VME 0x00000002 /* Virtual 8086 Extensions are present */ +#define X86_FEATURE_DBG 0x00000004 /* Debugging extensions are present */ +#define X86_FEATURE_PSE 0x00000008 /* Page Size Extension is present */ #define X86_FEATURE_TSC 0x00000010 /* time stamp counters are present */ #define X86_FEATURE_PAE 0x00000040 /* physical address extension is present */ #define X86_FEATURE_CX8 0x00000100 /* CMPXCHG8B instruction present */ #define X86_FEATURE_SYSCALL 0x00000800 /* SYSCALL/SYSRET support present */ +#define X86_FEATURE_MTTR 0x00001000 /* Memory type range registers are present */ #define X86_FEATURE_PGE 0x00002000 /* Page Global Enable */ -#define X86_FEATURE_NX 0x00100000 /* NX support present */ +#define X86_FEATURE_CMOV 0x00008000 /* "Conditional move" instruction supported */ +#define X86_FEATURE_PAT 0x00010000 /* Page Attribute Table is supported */ +#define X86_FEATURE_DS 0x00200000 /* Debug Store is present */ #define X86_FEATURE_MMX 0x00800000 /* MMX extension present */ #define X86_FEATURE_FXSR 0x01000000 /* FXSAVE/FXRSTOR instructions present */ #define X86_FEATURE_SSE 0x02000000 /* SSE extension present */ #define X86_FEATURE_SSE2 0x04000000 /* SSE2 extension present */ #define X86_FEATURE_HT 0x10000000 /* Hyper-Threading present */ +/* ECX flags */ +#define X86_FEATURE_SSE3 0x00000001 /* SSE3 is supported */ +#define X86_FEATURE_MONITOR 0x00000008 /* SSE3 Monitor instructions supported */ +#define X86_FEATURE_VMX 0x00000020 /* Virtual Machine eXtensions are available */ +#define X86_FEATURE_SSSE3 0x00000200 /* Supplemental SSE3 are available */ +#define X86_FEATURE_FMA3 0x00001000 /* Fused multiple-add supported */ +#define X86_FEATURE_CX16 0x00002000 /* CMPXCHG16B instruction are available */ +#define X86_FEATURE_PCID 0x00020000 /* Process Context IDentifiers are supported */ +#define X86_FEATURE_SSE41 0x00080000 /* SSE 4.1 is supported */ +#define X86_FEATURE_SSE42 0x00100000 /* SSE 4.2 is supported */ +#define X86_FEATURE_POPCNT 0x00800000 /* POPCNT instruction is available */ +#define X86_FEATURE_XSAVE 0x04000000 /* XSAVE family are available */ + +/* EDX extended flags */ +#define X86_FEATURE_NX 0x00100000 /* NX support present */ + #define X86_EXT_FEATURE_SSE3 0x00000001 /* SSE3 extension present */ #define X86_EXT_FEATURE_3DNOW 0x40000000 /* 3DNOW! extension present */ diff --git a/ntoskrnl/ke/amd64/cpu.c b/ntoskrnl/ke/amd64/cpu.c index cc0e2cd0ad..730bda1d9a 100644 --- a/ntoskrnl/ke/amd64/cpu.c +++ b/ntoskrnl/ke/amd64/cpu.c @@ -152,31 +152,31 @@ KiGetFeatureBits(VOID) Prcb->InitialApicId = (UCHAR)(CpuInfo.Ebx >> 24); /* Convert all CPUID Feature bits into our format */ - if (CpuInfo.Edx & 0x00000002) FeatureBits |= KF_V86_VIS | KF_CR4; - if (CpuInfo.Edx & 0x00000008) FeatureBits |= KF_LARGE_PAGE | KF_CR4; - if (CpuInfo.Edx & 0x00000010) FeatureBits |= KF_RDTSC; - if (CpuInfo.Edx & 0x00000100) FeatureBits |= KF_CMPXCHG8B; - if (CpuInfo.Edx & 0x00000800) FeatureBits |= KF_FAST_SYSCALL; - if (CpuInfo.Edx & 0x00001000) FeatureBits |= KF_MTRR; - if (CpuInfo.Edx & 0x00002000) FeatureBits |= KF_GLOBAL_PAGE | KF_CR4; - if (CpuInfo.Edx & 0x00008000) FeatureBits |= KF_CMOV; - if (CpuInfo.Edx & 0x00010000) FeatureBits |= KF_PAT; - if (CpuInfo.Edx & 0x00200000) FeatureBits |= KF_DTS; - if (CpuInfo.Edx & 0x00800000) FeatureBits |= KF_MMX; - if (CpuInfo.Edx & 0x01000000) FeatureBits |= KF_FXSR; - if (CpuInfo.Edx & 0x02000000) FeatureBits |= KF_XMMI; - if (CpuInfo.Edx & 0x04000000) FeatureBits |= KF_XMMI64; - - if (CpuInfo.Ecx & 0x00000001) FeatureBits |= KF_SSE3; - //if (CpuInfo.Ecx & 0x00000008) FeatureBits |= KF_MONITOR; - //if (CpuInfo.Ecx & 0x00000200) FeatureBits |= KF_SSE3SUP; - if (CpuInfo.Ecx & 0x00002000) FeatureBits |= KF_CMPXCHG16B; - //if (CpuInfo.Ecx & 0x00080000) FeatureBits |= KF_SSE41; - //if (CpuInfo.Ecx & 0x00800000) FeatureBits |= KF_POPCNT; - if (CpuInfo.Ecx & 0x04000000) FeatureBits |= KF_XSTATE; + if (CpuInfo.Edx & X86_FEATURE_VME) FeatureBits |= KF_V86_VIS | KF_CR4; + if (CpuInfo.Edx & X86_FEATURE_PSE) FeatureBits |= KF_LARGE_PAGE | KF_CR4; + if (CpuInfo.Edx & X86_FEATURE_TSC) FeatureBits |= KF_RDTSC; + if (CpuInfo.Edx & X86_FEATURE_CX8) FeatureBits |= KF_CMPXCHG8B; + if (CpuInfo.Edx & X86_FEATURE_SYSCALL) FeatureBits |= KF_FAST_SYSCALL; + if (CpuInfo.Edx & X86_FEATURE_MTTR) FeatureBits |= KF_MTRR; + if (CpuInfo.Edx & X86_FEATURE_PGE) FeatureBits |= KF_GLOBAL_PAGE | KF_CR4; + if (CpuInfo.Edx & X86_FEATURE_CMOV) FeatureBits |= KF_CMOV; + if (CpuInfo.Edx & X86_FEATURE_PAT) FeatureBits |= KF_PAT; + if (CpuInfo.Edx & X86_FEATURE_DS) FeatureBits |= KF_DTS; + if (CpuInfo.Edx & X86_FEATURE_MMX) FeatureBits |= KF_MMX; + if (CpuInfo.Edx & X86_FEATURE_FXSR) FeatureBits |= KF_FXSR; + if (CpuInfo.Edx & X86_FEATURE_SSE) FeatureBits |= KF_XMMI; + if (CpuInfo.Edx & X86_FEATURE_SSE2) FeatureBits |= KF_XMMI64; + + if (CpuInfo.Ecx & X86_FEATURE_SSE3) FeatureBits |= KF_SSE3; + //if (CpuInfo.Ecx & X86_FEATURE_MONITOR) FeatureBits |= KF_MONITOR; + //if (CpuInfo.Ecx & X86_FEATURE_SSSE3) FeatureBits |= KF_SSE3SUP; + if (CpuInfo.Ecx & X86_FEATURE_CX16) FeatureBits |= KF_CMPXCHG16B; + //if (CpuInfo.Ecx & X86_FEATURE_SSE41) FeatureBits |= KF_SSE41; + //if (CpuInfo.Ecx & X86_FEATURE_POPCNT) FeatureBits |= KF_POPCNT; + if (CpuInfo.Ecx & X86_FEATURE_XSAVE) FeatureBits |= KF_XSTATE; /* Check if the CPU has hyper-threading */ - if (CpuInfo.Ecx & 0x10000000) + if (CpuInfo.Edx & X86_FEATURE_HT) { /* Set the number of logical CPUs */ Prcb->LogicalProcessorsPerPhysicalProcessor = (UCHAR)(CpuInfo.Ebx >> 16); @@ -203,7 +203,7 @@ KiGetFeatureBits(VOID) KiCpuId(&CpuInfo, 0x80000001); /* Check if NX-bit is supported */ - if (CpuInfo.Edx & 0x00100000) FeatureBits |= KF_NX_BIT; + if (CpuInfo.Edx & X86_FEATURE_NX) FeatureBits |= KF_NX_BIT; /* Now handle each features for each CPU Vendor */ switch (Vendor)

6 years, 9 months

[reactos] 04/14: [NTOS:KE] Remove duplicate NX enabling

by Ivan Labutin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5857733996211fab549ee… commit 5857733996211fab549ee8b8c2b051546c2face5 Author: Ivan Labutin <linuxrf(a)gmail.com> AuthorDate: Thu Nov 9 23:33:47 2017 +0100 [NTOS:KE] Remove duplicate NX enabling --- ntoskrnl/mm/amd64/init.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/ntoskrnl/mm/amd64/init.c b/ntoskrnl/mm/amd64/init.c index f8d820acb7..2acdf596e6 100644 --- a/ntoskrnl/mm/amd64/init.c +++ b/ntoskrnl/mm/amd64/init.c @@ -203,9 +203,6 @@ MiInitializePageTable(VOID) __writecr4(__readcr4() | CR4_PGE); ASSERT(__readcr4() & CR4_PGE); - /* Enable no execute */ - __writemsr(X86_MSR_EFER, __readmsr(X86_MSR_EFER) | EFER_NXE); - /* Loop the user mode PXEs */ for (PointerPxe = MiAddressToPxe(0); PointerPxe <= MiAddressToPxe(MmHighestUserAddress);

6 years, 9 months

[reactos] 03/14: [NTOS:MM] Comment out debug code for x86 that should not run on x64

by Ivan Labutin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=39dd47cebbca33850ffad… commit 39dd47cebbca33850ffadcd9c55d4a89da88a8bd Author: Ivan Labutin <linuxrf(a)gmail.com> AuthorDate: Fri Nov 10 01:30:57 2017 +0300 [NTOS:MM] Comment out debug code for x86 that should not run on x64 --- ntoskrnl/mm/ARM3/mminit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ntoskrnl/mm/ARM3/mminit.c b/ntoskrnl/mm/ARM3/mminit.c index c92db6ca1d..0ed42eb14a 100644 --- a/ntoskrnl/mm/ARM3/mminit.c +++ b/ntoskrnl/mm/ARM3/mminit.c @@ -2118,6 +2118,7 @@ MmArmInitSystem(IN ULONG Phase, TestPte = MiProtoPteToPte(&TempPte); ASSERT(PointerPte == TestPte); +#ifndef _M_AMD64 // Not working on x64 for obvoius reason /* Try a bunch of random addresses near the end of the address space */ PointerPte = (PMMPTE)0xFFFC8000; for (j = 0; j < 20; j += 1) @@ -2133,6 +2134,7 @@ MmArmInitSystem(IN ULONG Phase, MI_MAKE_SUBSECTION_PTE(&TempPte, PointerPte); TestPte = MiSubsectionPteToSubsection(&TempPte); ASSERT(PointerPte == TestPte); +#endif #endif /* Loop all 8 standby lists */

6 years, 9 months

[reactos] 02/14: [NTOS:KE] Move RtlpUse16ByteSLists initialization into KiInitializeKernel

by Ivan Labutin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1aa70ef6d13991cf8d56a… commit 1aa70ef6d13991cf8d56a9bad8a3ba0de3d8af86 Author: Ivan Labutin <linuxrf(a)gmail.com> AuthorDate: Fri Nov 10 01:23:55 2017 +0300 [NTOS:KE] Move RtlpUse16ByteSLists initialization into KiInitializeKernel --- ntoskrnl/ke/amd64/kiinit.c | 4 ---- ntoskrnl/ke/amd64/krnlinit.c | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/ke/amd64/kiinit.c b/ntoskrnl/ke/amd64/kiinit.c index 0ca55f346b..a8647203ce 100644 --- a/ntoskrnl/ke/amd64/kiinit.c +++ b/ntoskrnl/ke/amd64/kiinit.c @@ -19,8 +19,6 @@ /* GLOBALS *******************************************************************/ -extern BOOLEAN RtlpUse16ByteSLists; - /* Function pointer for early debug prints */ ULONG (*FrLdrDbgPrint)(const char *Format, ...); @@ -84,8 +82,6 @@ KiInitMachineDependent(VOID) // KeBugCheckEx(NO_PAGES_AVAILABLE, 2, PAGE_SIZE * 2, 0, 0); // } - /* Initialize 8/16 bit SList support */ - RtlpUse16ByteSLists = (KeFeatureBits & KF_CMPXCHG16B) ? TRUE: FALSE; } VOID diff --git a/ntoskrnl/ke/amd64/krnlinit.c b/ntoskrnl/ke/amd64/krnlinit.c index 456bc713f4..22833e0726 100644 --- a/ntoskrnl/ke/amd64/krnlinit.c +++ b/ntoskrnl/ke/amd64/krnlinit.c @@ -16,6 +16,8 @@ extern ULONG_PTR MainSSDT[]; extern UCHAR MainSSPT[]; +extern BOOLEAN RtlpUse16ByteSLists; + /* FUNCTIONS *****************************************************************/ VOID @@ -153,6 +155,9 @@ KiInitializeKernel(IN PKPROCESS InitProcess, /* Set boot-level flags */ KeFeatureBits = Prcb->FeatureBits; + /* Initialize 8/16 bit SList support */ + RtlpUse16ByteSLists = (KeFeatureBits & KF_CMPXCHG16B) ? TRUE : FALSE; + /* Set the current MP Master KPRCB to the Boot PRCB */ Prcb->MultiThreadSetMaster = Prcb;

6 years, 9 months

[reactos] 01/14: [NTOS:KE] EFER constants fix

by Ivan Labutin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9f592c054482c89375d3… commit b9f592c054482c89375d35e3a1a68267d5085d45 Author: Ivan Labutin <linuxrf(a)gmail.com> AuthorDate: Fri Nov 10 01:06:30 2017 +0300 [NTOS:KE] EFER constants fix --- ntoskrnl/include/internal/amd64/ke.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/include/internal/amd64/ke.h b/ntoskrnl/include/internal/amd64/ke.h index 250a87f838..7cd8da44a5 100644 --- a/ntoskrnl/include/internal/amd64/ke.h +++ b/ntoskrnl/include/internal/amd64/ke.h @@ -28,6 +28,7 @@ #define X86_FEATURE_CX8 0x00000100 /* CMPXCHG8B instruction present */ #define X86_FEATURE_SYSCALL 0x00000800 /* SYSCALL/SYSRET support present */ #define X86_FEATURE_PGE 0x00002000 /* Page Global Enable */ +#define X86_FEATURE_NX 0x00100000 /* NX support present */ #define X86_FEATURE_MMX 0x00800000 /* MMX extension present */ #define X86_FEATURE_FXSR 0x01000000 /* FXSAVE/FXRSTOR instructions present */ #define X86_FEATURE_SSE 0x02000000 /* SSE extension present */ @@ -47,12 +48,12 @@ #define X86_MSR_CSTAR 0xC0000083 #define X86_MSR_SFMASK 0xC0000084 -#define EFER_SCE 0x01 -#define EFER_LME 0x10 -#define EFER_LMA 0x40 -#define EFER_NXE 0x80 -#define EFER_SVME 0x100 -#define EFER_FFXSR 0x400 +#define EFER_SCE 0x0001 +#define EFER_LME 0x0100 +#define EFER_LMA 0x0400 +#define EFER_NXE 0x0800 +#define EFER_SVME 0x1000 +#define EFER_FFXSR 0x4000 #define AMD64_TSS 9

6 years, 9 months

[reactos] 01/01: [NTOSKRNL] Fix return of uninitialized variable in PspSetQuotaLimits CID-1322247

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=92b8d327b9225d8cb5ed8… commit 92b8d327b9225d8cb5ed84c90d200239c564d2d8 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Oct 11 15:33:15 2017 +0200 [NTOSKRNL] Fix return of uninitialized variable in PspSetQuotaLimits CID-1322247 --- ntoskrnl/ps/quota.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ntoskrnl/ps/quota.c b/ntoskrnl/ps/quota.c index de05a92a48..f955818f78 100644 --- a/ntoskrnl/ps/quota.c +++ b/ntoskrnl/ps/quota.c @@ -444,6 +444,10 @@ PspSetQuotaLimits( Status = STATUS_SUCCESS; } + else + { + Status = STATUS_SUCCESS; + } return Status; }

6 years, 9 months

[reactos] 03/03: [BROWSEUI] Implement ACLCustomMRU. CORE-9281

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad181d892cc5349bba1ac… commit ad181d892cc5349bba1ac74378a71d7d3d5258cf Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Dec 17 15:29:30 2017 +0100 [BROWSEUI] Implement ACLCustomMRU. CORE-9281 --- dll/win32/browseui/ACLCustomMRU.cpp | 133 +++++++++++++++++++++++++++++++++++ dll/win32/browseui/ACLCustomMRU.h | 41 +++++++++++ dll/win32/browseui/CMakeLists.txt | 5 ++ dll/win32/browseui/browseui.cpp | 1 + dll/win32/browseui/browseui.rc | 1 + dll/win32/browseui/precomp.h | 2 + dll/win32/browseui/res/custommru.rgs | 13 ++++ dll/win32/browseui/resource.h | 1 + sdk/include/reactos/browseui_undoc.h | 15 ++++ sdk/include/reactos/shlguid_undoc.h | 2 + 10 files changed, 214 insertions(+) diff --git a/dll/win32/browseui/ACLCustomMRU.cpp b/dll/win32/browseui/ACLCustomMRU.cpp new file mode 100644 index 0000000000..1f0f03f29e --- /dev/null +++ b/dll/win32/browseui/ACLCustomMRU.cpp @@ -0,0 +1,133 @@ +/* + * PROJECT: ReactOS browseui + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Custom MRU AutoComplete List + * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "precomp.h" + +CACLCustomMRU::CACLCustomMRU() + :m_bDirty(false) +{ +} + +CACLCustomMRU::~CACLCustomMRU() +{ + PersistMRU(); + m_Key.Close(); +} + +void CACLCustomMRU::PersistMRU() +{ + WCHAR Key[2] = { 0, 0 }; + + if (!m_bDirty) + return; + m_bDirty = false; + + if (m_Key.m_hKey) + { + m_Key.SetStringValue(L"MRUList", m_MRUList); + for (int Index = 0; Index < m_MRUList.GetLength(); ++Index) + { + Key[0] = Index + 'a'; + m_Key.SetStringValue(Key, m_MRUData[Index]); + } + } +} + +// *** IACLCustomMRU methods *** +HRESULT STDMETHODCALLTYPE CACLCustomMRU::Initialize(LPCWSTR pwszMRURegKey, DWORD dwMax) +{ + LSTATUS Status = m_Key.Create(HKEY_CURRENT_USER, pwszMRURegKey); + if (Status != ERROR_SUCCESS) + return HRESULT_FROM_WIN32(Status); + + m_MRUData.RemoveAll(); + dwMax = max(0, dwMax); + dwMax = min(29, dwMax); + while (dwMax--) + m_MRUData.Add(CStringW()); + + WCHAR MRUList[40]; + ULONG nChars = _countof(MRUList); + + Status = m_Key.QueryStringValue(L"MRUList", MRUList, &nChars); + if (Status != ERROR_SUCCESS) + return S_OK; + + if (nChars > 0 && MRUList[nChars-1] == '\0') + nChars--; + + if (nChars > (ULONG)m_MRUData.GetSize()) + return S_OK; + + for (ULONG n = 0; n < nChars; ++n) + { + if (MRUList[n] >= 'a' && MRUList[n] <= '}' && m_MRUList.Find(MRUList[n]) < 0) + { + WCHAR Key[2] = { MRUList[n], NULL }; + WCHAR Value[MAX_PATH * 2]; + ULONG nValueChars = _countof(Value); + + m_MRUList += MRUList[n]; + int Index = MRUList[n] - 'a'; + + if (Index < m_MRUData.GetSize()) + { + Status = m_Key.QueryStringValue(Key, Value, &nValueChars); + if (Status == ERROR_SUCCESS) + { + m_MRUData[Index] = CStringW(Value, nValueChars); + } + } + } + } + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CACLCustomMRU::AddMRUString(LPCWSTR pwszEntry) +{ + ATLASSERT(m_MRUData.GetSize() <= m_MRUList.GetLength()); + + m_bDirty = true; + + CStringW NewElement = pwszEntry; + WCHAR Key[2] = { 0, 0 }; + int Index = m_MRUData.Find(NewElement); + if (Index >= 0) + { + /* Move the key to the front */ + Key[0] = Index + 'a'; + m_MRUList.Replace(Key, L""); + m_MRUList = Key + m_MRUList; + return S_OK; + } + + int TotalLen = m_MRUList.GetLength(); + if (m_MRUData.GetSize() == TotalLen) + { + /* Find oldest element, move that to the front */ + Key[0] = m_MRUList[TotalLen-1]; + m_MRUList = Key + m_MRUList.Left(TotalLen-1); + Index = Key[0] - 'a'; + } + else + { + /* Find the first empty entry */ + for (Index = 0; Index < m_MRUData.GetSize(); ++Index) + { + if (m_MRUData[Index].IsEmpty()) + break; + } + Key[0] = Index + 'a'; + m_MRUList = Key + m_MRUList; + } + m_MRUData[Index] = NewElement; + + PersistMRU(); + return S_OK; +} + diff --git a/dll/win32/browseui/ACLCustomMRU.h b/dll/win32/browseui/ACLCustomMRU.h new file mode 100644 index 0000000000..7aa9c9b2e6 --- /dev/null +++ b/dll/win32/browseui/ACLCustomMRU.h @@ -0,0 +1,41 @@ +/* + * PROJECT: ReactOS browseui + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Custom MRU AutoComplete List + * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#pragma once + +class CACLCustomMRU : + public CComCoClass<CACLCustomMRU, &CLSID_ACLCustomMRU>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IACLCustomMRU +{ +private: + CRegKey m_Key; + CStringW m_MRUList; + CSimpleArray<CStringW> m_MRUData; + bool m_bDirty; + + void PersistMRU(); + +public: + CACLCustomMRU(); + ~CACLCustomMRU(); + + // *** IACLCustomMRU methods *** + virtual HRESULT STDMETHODCALLTYPE Initialize(LPCWSTR pwszMRURegKey, DWORD dwMax); + virtual HRESULT STDMETHODCALLTYPE AddMRUString(LPCWSTR pwszEntry); + +public: + + DECLARE_REGISTRY_RESOURCEID(IDR_ACLCUSTOMMRU) + DECLARE_NOT_AGGREGATABLE(CACLCustomMRU) + + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CACLCustomMRU) + COM_INTERFACE_ENTRY_IID(IID_IACLCustomMRU, IACLCustomMRU) + END_COM_MAP() +}; diff --git a/dll/win32/browseui/CMakeLists.txt b/dll/win32/browseui/CMakeLists.txt index 45afa685c4..161c45fb59 100644 --- a/dll/win32/browseui/CMakeLists.txt +++ b/dll/win32/browseui/CMakeLists.txt @@ -4,10 +4,15 @@ add_subdirectory(shellbars) set_cpp(WITH_RUNTIME) +add_definitions( + -D_ATL_NO_EXCEPTIONS) + include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) spec2def(browseui.dll browseui.spec ADD_IMPORTLIB) list(APPEND SOURCE + ACLCustomMRU.cpp + ACLCustomMRU.h aclistisf.cpp aclmulti.cpp addressband.cpp diff --git a/dll/win32/browseui/browseui.cpp b/dll/win32/browseui/browseui.cpp index 68326784ba..98a94c2369 100644 --- a/dll/win32/browseui/browseui.cpp +++ b/dll/win32/browseui/browseui.cpp @@ -127,6 +127,7 @@ public: BEGIN_OBJECT_MAP(ObjectMap) +OBJECT_ENTRY(CLSID_ACLCustomMRU, CACLCustomMRU) OBJECT_ENTRY(CLSID_AutoComplete, CAutoComplete) OBJECT_ENTRY(CLSID_ACLMulti, CACLMulti) OBJECT_ENTRY(CLSID_ACListISF, CACListISF) diff --git a/dll/win32/browseui/browseui.rc b/dll/win32/browseui/browseui.rc index 6badbc9fb0..bece75e0c5 100644 --- a/dll/win32/browseui/browseui.rc +++ b/dll/win32/browseui/browseui.rc @@ -46,6 +46,7 @@ IDR_PROGRESSDIALOG REGISTRY "res/progressdialog.rgs" IDR_AUTOCOMPLETE REGISTRY "res/autocomplete.rgs" IDR_ACLISTISF REGISTRY "res/shellautocomplete.rgs" IDR_ISFBAND REGISTRY "res/isfband.rgs" +IDR_ACLCUSTOMMRU REGISTRY "res/custommru.rgs" #include <reactos/manifest_dll.rc> diff --git a/dll/win32/browseui/precomp.h b/dll/win32/browseui/precomp.h index 3303834b13..5ee3ee0745 100644 --- a/dll/win32/browseui/precomp.h +++ b/dll/win32/browseui/precomp.h @@ -22,6 +22,7 @@ #include <atlcom.h> #include <atlwin.h> #include <atlsimpcoll.h> +#include <atlstr.h> #include <undocuser.h> #include <perhist.h> #include <exdispid.h> @@ -35,6 +36,7 @@ #include "resource.h" +#include "ACLCustomMRU.h" #include "aclistisf.h" #include "aclmulti.h" #include "addressband.h" diff --git a/dll/win32/browseui/res/custommru.rgs b/dll/win32/browseui/res/custommru.rgs new file mode 100644 index 0000000000..a5d12faf5d --- /dev/null +++ b/dll/win32/browseui/res/custommru.rgs @@ -0,0 +1,13 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {6935DB93-21E8-4CCC-BEB9-9FE3C77A297A} = s 'Custom MRU AutoComplete List' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + } + } +} diff --git a/dll/win32/browseui/resource.h b/dll/win32/browseui/resource.h index 24303de229..b974515bf2 100644 --- a/dll/win32/browseui/resource.h +++ b/dll/win32/browseui/resource.h @@ -103,6 +103,7 @@ #define IDR_AUTOCOMPLETE 141 #define IDR_ACLISTISF 142 #define IDR_ISFBAND 143 +#define IDR_ACLCUSTOMMRU 144 #define IDS_SMALLICONS 12301 #define IDS_LARGEICONS 12302 diff --git a/sdk/include/reactos/browseui_undoc.h b/sdk/include/reactos/browseui_undoc.h index bd6d6fbc81..4ea2dcf605 100644 --- a/sdk/include/reactos/browseui_undoc.h +++ b/sdk/include/reactos/browseui_undoc.h @@ -129,6 +129,21 @@ HRESULT WINAPI SHWriteClassesOfCategories(long param8, long paramC, long param10 BOOL WINAPI SHIsExplorerBrowser(void); HRESULT WINAPI SHOpenNewFrame(LPITEMIDLIST pidl, IUnknown *paramC, long param10, DWORD dwFlags); + +#define INTERFACE IACLCustomMRU +DECLARE_INTERFACE_IID_(IACLCustomMRU, IUnknown, "F729FC5E-8769-4F3E-BDB2-D7B50FD2275B") +{ + // *** IUnknown methods *** + STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG, AddRef) (THIS)PURE; + STDMETHOD_(ULONG, Release) (THIS)PURE; + + // *** IACLCustomMRU specific methods *** + STDMETHOD(Initialize) (THIS_ LPCWSTR pwszMRURegKey, DWORD dwMax) PURE; + STDMETHOD(AddMRUString) (THIS_ LPCWSTR pwszEntry) PURE; +}; +#undef INTERFACE + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */ diff --git a/sdk/include/reactos/shlguid_undoc.h b/sdk/include/reactos/shlguid_undoc.h index 99dc9ec8e9..aaca7a5f42 100644 --- a/sdk/include/reactos/shlguid_undoc.h +++ b/sdk/include/reactos/shlguid_undoc.h @@ -47,6 +47,8 @@ DEFINE_GUID(CLSID_BrowserBar, 0x9581015C, 0xD08E, 0x11D0, 0x8D, 0x3 DEFINE_GUID(CGID_DefViewFrame, 0x710EB7A1, 0x45ED, 0x11D0, 0x92, 0x4A, 0x00, 0x20, 0xAF, 0xC7, 0xAC, 0x4D); // browseui.dll +DEFINE_GUID(IID_IACLCustomMRU, 0xf729fc5e, 0x8769, 0x4f3e, 0xbd, 0xb2, 0xd7, 0xb5, 0x0f, 0xd2, 0x27, 0x5b); + DEFINE_GUID(CLSID_SH_AddressBand, 0x01E04581, 0x4EEE, 0x11D0, 0xBF, 0xE9, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); DEFINE_GUID(CLSID_AddressEditBox, 0xA08C11D2, 0xA228, 0x11D0, 0x82, 0x5B, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); DEFINE_GUID(IID_IAddressEditBox, 0xA08C11D1, 0xA228, 0x11D0, 0x82, 0x5B, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83);

6 years, 9 months

[reactos] 02/03: [BROWSEUI_APITEST] Add tests for IACLCustomMRU. CORE-9281

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cba274350e6d17a835635… commit cba274350e6d17a8356357fadb8ccb13d0c7531f Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Dec 16 17:22:48 2017 +0100 [BROWSEUI_APITEST] Add tests for IACLCustomMRU. CORE-9281 --- modules/rostests/apitests/browseui/CMakeLists.txt | 3 +- .../rostests/apitests/browseui/IACLCustomMRU.cpp | 417 +++++++++++++++++++++ modules/rostests/apitests/browseui/testlist.c | 2 + 3 files changed, 421 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/browseui/CMakeLists.txt b/modules/rostests/apitests/browseui/CMakeLists.txt index 120b951955..e60f659961 100644 --- a/modules/rostests/apitests/browseui/CMakeLists.txt +++ b/modules/rostests/apitests/browseui/CMakeLists.txt @@ -11,11 +11,12 @@ include_directories( list(APPEND SOURCE ACListISF.cpp + IACLCustomMRU.cpp SHExplorerParseCmdLine.c testlist.c) add_executable(browseui_apitest ${SOURCE}) target_link_libraries(browseui_apitest uuid wine) set_module_type(browseui_apitest win32cui) -add_importlibs(browseui_apitest shell32 ole32 shlwapi msvcrt kernel32 ntdll) +add_importlibs(browseui_apitest advapi32 shell32 ole32 shlwapi msvcrt kernel32 ntdll) add_rostests_file(TARGET browseui_apitest) diff --git a/modules/rostests/apitests/browseui/IACLCustomMRU.cpp b/modules/rostests/apitests/browseui/IACLCustomMRU.cpp new file mode 100644 index 0000000000..1f2025daca --- /dev/null +++ b/modules/rostests/apitests/browseui/IACLCustomMRU.cpp @@ -0,0 +1,417 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test for IACLCustomMRU objects + * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#define _UNICODE +#define UNICODE +#include <apitest.h> +#include <shlobj.h> +#include <atlbase.h> +#include <atlstr.h> +#include <atlcom.h> +#include <atlwin.h> + +// Yes, gcc at it again, let's validate everything found inside unused templates! +ULONG DbgPrint(PCH Format,...); + +#include <shellutils.h> +#include <shlwapi.h> +#include <strsafe.h> +#include <initguid.h> + +#define ok_hex_(file, line, key, expression, result) \ + do { \ + int _value = (expression); \ + ok_(file, line)(_value == (result), "Wrong value for '%s', expected: " #result " (0x%x), got: 0x%x for %c\n", \ + #expression, (int)(result), _value, (char)key); \ + } while (0) + + + +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"; + +#undef INTERFACE +#define INTERFACE IACLCustomMRU + +/* based on https://msdn.microsoft.com/en-gb/library/windows/desktop/bb776380(v=vs.85).… */ +DECLARE_INTERFACE_IID_(IACLCustomMRU, IUnknown, "F729FC5E-8769-4F3E-BDB2-D7B50FD2275B") +{ + // *** IUnknown methods *** + STDMETHOD(QueryInterface) (THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG, AddRef) (THIS)PURE; + STDMETHOD_(ULONG, Release) (THIS)PURE; + + // *** IACLCustomMRU methods *** + STDMETHOD(Initialize) (THIS_ LPCWSTR pwszMRURegKey, DWORD dwMax) PURE; + STDMETHOD(AddMRUString) (THIS_ LPCWSTR pwszEntry) PURE; +}; + + +static void Cleanup_Testdata() +{ + CRegKey tmp; + if (!tmp.Open(HKEY_CURRENT_USER, NULL, KEY_READ | KEY_WRITE)) + tmp.DeleteSubKey(szTestPath); +} + +#define verify_mru(mru, ...) verify_mru_(__FILE__, __LINE__, mru, __VA_ARGS__, NULL) +static void verify_mru_(const char* file, int line, IACLCustomMRU* mru, PCWSTR MRUString, ...) +{ + + CRegKey key; + key.Open(HKEY_CURRENT_USER, szTestPath); + + va_list args; + va_start(args, MRUString); + PCWSTR Entry; + WCHAR Key = L'a'; + while ((Entry = va_arg(args, PCWSTR))) + { + WCHAR Value[MAX_PATH]; + ULONG nChars = _countof(Value); + CStringW tmp; + tmp += Key; + LSTATUS Status = key.QueryStringValue(tmp, Value, &nChars); + ok_hex_(file, line, Key, Status, ERROR_SUCCESS); + if (Status == ERROR_SUCCESS) + { + ok_(file, line)(!wcscmp(Value, Entry), "Expected value %c to be %S, was %S\n", (char)Key, Entry, Value); + } + Key++; + } + va_end(args); + + if (Key != L'a') + { + WCHAR Value[MAX_PATH]; + ULONG nChars = _countof(Value); + LSTATUS Status = key.QueryStringValue(L"MRUList", Value, &nChars); + ok_hex_(file, line, Key, Status, ERROR_SUCCESS); + if (Status == ERROR_SUCCESS) + { + ok_(file, line)(!wcscmp(Value, MRUString), "Expected MRUList to be %S, was %S\n", MRUString, Value); + } + } +} + + +static void +test_IACLCustomMRU_Basics() +{ + CComPtr<IACLCustomMRU> CustomMRU; + HRESULT hr = CoCreateInstance(CLSID_ACLCustomMRU, NULL, CLSCTX_ALL, IID_PPV_ARG(IACLCustomMRU, &CustomMRU)); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + Cleanup_Testdata(); + + /* Initialize with a NULL name will cause an AV */ + //hr = CustomMRU->Initialize(NULL, 0); + + hr = CustomMRU->Initialize(szTestPath, 0); + ok_hex(hr, S_OK); + /* Adding an entry with a dwMax of 0 will cause an AV */ + + /* Calling it again will resize */ + hr = CustomMRU->Initialize(szTestPath, 3); + ok_hex(hr, S_OK); + verify_mru(CustomMRU, L""); + + hr = CustomMRU->AddMRUString(L"FIRST_ENTRY"); + ok_hex(hr, S_OK); + verify_mru(CustomMRU, L"a", L"FIRST_ENTRY"); + + hr = CustomMRU->AddMRUString(L"SECOND_ENTRY"); + ok_hex(hr, S_OK); + verify_mru(CustomMRU, L"ba", L"FIRST_ENTRY", L"SECOND_ENTRY"); + + hr = CustomMRU->AddMRUString(L"THIRD_ENTRY"); + ok_hex(hr, S_OK); + verify_mru(CustomMRU, L"cba", L"FIRST_ENTRY", L"SECOND_ENTRY", L"THIRD_ENTRY"); + + /* First entry is replaced */ + hr = CustomMRU->AddMRUString(L"FOURTH_ENTRY"); + ok_hex(hr, S_OK); + verify_mru(CustomMRU, L"acb", L"FOURTH_ENTRY", L"SECOND_ENTRY", L"THIRD_ENTRY"); + + /* Second entry is replaced */ + hr = CustomMRU->AddMRUString(L"FIFTH_ENTRY"); + ok_hex(hr, S_OK); + verify_mru(CustomMRU, L"bac", L"FOURTH_ENTRY", L"FIFTH_ENTRY", L"THIRD_ENTRY"); +} + + +static void FillDefault(IACLCustomMRU* CustomMRU) +{ + Cleanup_Testdata(); + HRESULT hr = CustomMRU->Initialize(szTestPath, 3); + ok_hex(hr, S_OK); + hr = CustomMRU->AddMRUString(L"FIRST_ENTRY"); + ok_hex(hr, S_OK); + hr = CustomMRU->AddMRUString(L"SECOND_ENTRY"); + ok_hex(hr, S_OK); + hr = CustomMRU->AddMRUString(L"THIRD_ENTRY"); + ok_hex(hr, S_OK); +} + +static void +test_IACLCustomMRU_UpdateOrder() +{ + CComPtr<IACLCustomMRU> CustomMRU; + HRESULT hr = CoCreateInstance(CLSID_ACLCustomMRU, NULL, CLSCTX_ALL, IID_PPV_ARG(IACLCustomMRU, &CustomMRU)); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + Cleanup_Testdata(); + FillDefault(CustomMRU); + verify_mru(CustomMRU, L"cba", L"FIRST_ENTRY", L"SECOND_ENTRY", L"THIRD_ENTRY"); + + /* Add the first entry again */ + hr = CustomMRU->AddMRUString(L"FIRST_ENTRY"); + ok_hex(hr, S_OK); + /* No change */ + verify_mru(CustomMRU, L"cba", L"FIRST_ENTRY", L"SECOND_ENTRY", L"THIRD_ENTRY"); + + CustomMRU.Release(); + /* Now the order is updated */ + verify_mru(NULL, L"acb", L"FIRST_ENTRY", L"SECOND_ENTRY", L"THIRD_ENTRY"); + + + hr = CoCreateInstance(CLSID_ACLCustomMRU, NULL, CLSCTX_ALL, IID_PPV_ARG(IACLCustomMRU, &CustomMRU)); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + Cleanup_Testdata(); + FillDefault(CustomMRU); + verify_mru(CustomMRU, L"cba", L"FIRST_ENTRY", L"SECOND_ENTRY", L"THIRD_ENTRY"); + + + /* Add the first entry again */ + hr = CustomMRU->AddMRUString(L"FIRST_ENTRY"); + ok_hex(hr, S_OK); + /* No change */ + verify_mru(CustomMRU, L"cba", L"FIRST_ENTRY", L"SECOND_ENTRY", L"THIRD_ENTRY"); + + hr = CustomMRU->AddMRUString(L"SOMETHING_ELSE"); + ok_hex(hr, S_OK); + /* Now all changes are persisted */ + verify_mru(CustomMRU, L"bac", L"FIRST_ENTRY", L"SOMETHING_ELSE", L"THIRD_ENTRY"); +} + +static void +test_IACLCustomMRU_ExtraChars() +{ + CComPtr<IACLCustomMRU> CustomMRU; + HRESULT hr = CoCreateInstance(CLSID_ACLCustomMRU, NULL, CLSCTX_ALL, IID_PPV_ARG(IACLCustomMRU, &CustomMRU)); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + Cleanup_Testdata(); + + /* Still returnes success */ + hr = CustomMRU->Initialize(szTestPath, 30); + ok_hex(hr, S_OK); + + for (int n = 0; n < 30; ++n) + { + CStringW tmp; + tmp.Format(L"%d", n); + + hr = CustomMRU->AddMRUString(tmp); + ok_hex(hr, S_OK); + } + /* But is starting to wrap around */ + verify_mru(CustomMRU, L"a}|{zyxwvutsrqponmlkjihgfedcb", L"29", + L"1", L"2", L"3", L"4", L"5", L"6", L"7", L"8", L"9", + L"10", L"11", L"12", L"13", L"14", L"15", L"16", L"17", L"18", L"19", + L"20", L"21", L"22", L"23", L"24", L"25", L"26", L"27", L"28"); + + Cleanup_Testdata(); +} + +static void +test_IACLCustomMRU_Continue() +{ + CComPtr<IACLCustomMRU> CustomMRU; + HRESULT hr = CoCreateInstance(CLSID_ACLCustomMRU, NULL, CLSCTX_ALL, IID_PPV_ARG(IACLCustomMRU, &CustomMRU)); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + Cleanup_Testdata(); + FillDefault(CustomMRU); + verify_mru(CustomMRU, L"cba", L"FIRST_ENTRY", L"SECOND_ENTRY", L"THIRD_ENTRY"); + + CustomMRU.Release(); + + hr = CoCreateInstance(CLSID_ACLCustomMRU, NULL, CLSCTX_ALL, IID_PPV_ARG(IACLCustomMRU, &CustomMRU)); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + hr = CustomMRU->Initialize(szTestPath, 3); + ok_hex(hr, S_OK); + + /* First entry is replaced */ + hr = CustomMRU->AddMRUString(L"FOURTH_ENTRY"); + ok_hex(hr, S_OK); + verify_mru(CustomMRU, L"acb", L"FOURTH_ENTRY", L"SECOND_ENTRY", L"THIRD_ENTRY"); + + CustomMRU.Release(); + + hr = CoCreateInstance(CLSID_ACLCustomMRU, NULL, CLSCTX_ALL, IID_PPV_ARG(IACLCustomMRU, &CustomMRU)); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + hr = CustomMRU->Initialize(szTestPath, 3); + ok_hex(hr, S_OK); + + /* Second entry is replaced */ + hr = CustomMRU->AddMRUString(L"FIFTH_ENTRY"); + ok_hex(hr, S_OK); + verify_mru(CustomMRU, L"bac", L"FOURTH_ENTRY", L"FIFTH_ENTRY", L"THIRD_ENTRY"); + + CustomMRU.Release(); + + hr = CoCreateInstance(CLSID_ACLCustomMRU, NULL, CLSCTX_ALL, IID_PPV_ARG(IACLCustomMRU, &CustomMRU)); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + + /* Save some garbage */ + CRegKey key; + key.Open(HKEY_CURRENT_USER, szTestPath); + key.SetStringValue(L"MRUList", L"b**"); + key.Close(); + + hr = CustomMRU->Initialize(szTestPath, 3); + ok_hex(hr, S_OK); + + CustomMRU.Release(); + + /* Not cleaned up */ + verify_mru(CustomMRU, L"b**", L"FOURTH_ENTRY", L"FIFTH_ENTRY", L"THIRD_ENTRY"); + + hr = CoCreateInstance(CLSID_ACLCustomMRU, NULL, CLSCTX_ALL, IID_PPV_ARG(IACLCustomMRU, &CustomMRU)); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + hr = CustomMRU->Initialize(szTestPath, 3); + ok_hex(hr, S_OK); + + /* Now it's just cleaned up */ + hr = CustomMRU->AddMRUString(L"SIXTH_ENTRY"); + ok_hex(hr, S_OK); + verify_mru(CustomMRU, L"ab", L"SIXTH_ENTRY"); + + CustomMRU.Release(); + + hr = CoCreateInstance(CLSID_ACLCustomMRU, NULL, CLSCTX_ALL, IID_PPV_ARG(IACLCustomMRU, &CustomMRU)); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + Cleanup_Testdata(); + FillDefault(CustomMRU); + verify_mru(CustomMRU, L"cba", L"FIRST_ENTRY", L"SECOND_ENTRY", L"THIRD_ENTRY"); + + CustomMRU.Release(); + + hr = CoCreateInstance(CLSID_ACLCustomMRU, NULL, CLSCTX_ALL, IID_PPV_ARG(IACLCustomMRU, &CustomMRU)); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + key.Open(HKEY_CURRENT_USER, szTestPath); + key.SetStringValue(L"MRUList", L"baccccc"); + key.Close(); + + hr = CustomMRU->Initialize(szTestPath, 3); + ok_hex(hr, S_OK); + CustomMRU.Release(); + + verify_mru(CustomMRU, L"baccccc", L"FIRST_ENTRY", L"SECOND_ENTRY", L"THIRD_ENTRY"); + + hr = CoCreateInstance(CLSID_ACLCustomMRU, NULL, CLSCTX_ALL, IID_PPV_ARG(IACLCustomMRU, &CustomMRU)); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + hr = CustomMRU->Initialize(szTestPath, 3); + ok_hex(hr, S_OK); + + hr = CustomMRU->AddMRUString(L"FOURTH_ENTRY"); + ok_hex(hr, S_OK); + verify_mru(CustomMRU, L"a", L"FOURTH_ENTRY", L"SECOND_ENTRY", L"THIRD_ENTRY"); + + CustomMRU.Release(); + Cleanup_Testdata(); + + hr = CoCreateInstance(CLSID_ACLCustomMRU, NULL, CLSCTX_ALL, IID_PPV_ARG(IACLCustomMRU, &CustomMRU)); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + hr = CustomMRU->Initialize(szTestPath, 3); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + hr = CustomMRU->AddMRUString(L"FIRST_ENTRY"); + ok_hex(hr, S_OK); + verify_mru(CustomMRU, L"a", L"FIRST_ENTRY"); + + CustomMRU.Release(); + + key.Open(HKEY_CURRENT_USER, szTestPath); + key.SetStringValue(L"MRUList", L"aaa"); + key.Close(); + + hr = CoCreateInstance(CLSID_ACLCustomMRU, NULL, CLSCTX_ALL, IID_PPV_ARG(IACLCustomMRU, &CustomMRU)); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + hr = CustomMRU->Initialize(szTestPath, 3); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + hr = CustomMRU->AddMRUString(L"SECOND_ENTRY"); + ok_hex(hr, S_OK); + verify_mru(CustomMRU, L"ba", L"FIRST_ENTRY", L"SECOND_ENTRY"); +} + +START_TEST(IACLCustomMRU) +{ + CCoInit init; + ok_hex(init.hres, S_OK); + if (!SUCCEEDED(init.hres)) + return; + + test_IACLCustomMRU_Basics(); + test_IACLCustomMRU_UpdateOrder(); + test_IACLCustomMRU_ExtraChars(); + test_IACLCustomMRU_Continue(); + + Cleanup_Testdata(); +} diff --git a/modules/rostests/apitests/browseui/testlist.c b/modules/rostests/apitests/browseui/testlist.c index 0684387d42..60a522860c 100644 --- a/modules/rostests/apitests/browseui/testlist.c +++ b/modules/rostests/apitests/browseui/testlist.c @@ -4,11 +4,13 @@ #include <apitest.h> extern void func_ACListISF(void); +extern void func_IACLCustomMRU(void); extern void func_SHExplorerParseCmdLine(void); const struct test winetest_testlist[] = { { "ACListISF", func_ACListISF }, + { "IACLCustomMRU", func_IACLCustomMRU }, { "SHExplorerParseCmdLine", func_SHExplorerParseCmdLine }, { 0, 0 }

6 years, 9 months

[reactos] 01/03: [COM_APITEST] Add IACLCustomMRU

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8aaa5eea75121fcce0617… commit 8aaa5eea75121fcce0617ff2f55d4227180cb11c Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Dec 16 14:50:49 2017 +0100 [COM_APITEST] Add IACLCustomMRU --- modules/rostests/apitests/com/browseui.c | 2 ++ modules/rostests/apitests/com/com_apitest.c | 1 + modules/rostests/apitests/com/com_apitest.h | 1 + 3 files changed, 4 insertions(+) diff --git a/modules/rostests/apitests/com/browseui.c b/modules/rostests/apitests/com/browseui.c index 253cbd08c8..6550ffb3cb 100644 --- a/modules/rostests/apitests/com/browseui.c +++ b/modules/rostests/apitests/com/browseui.c @@ -18,6 +18,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0x0, &IID_IEnumString }, { 0x0, &IID_IUnknown }, { 0x4, &IID_IACList }, + { 0x8, &IID_IACLCustomMRU }, }, }, { @@ -33,6 +34,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0x0, &IID_IEnumString }, { 0x0, &IID_IUnknown }, { 0x4, &IID_IACList }, + { 0x8, &IID_IACLCustomMRU }, }, }, { diff --git a/modules/rostests/apitests/com/com_apitest.c b/modules/rostests/apitests/com/com_apitest.c index 1add9839b0..1627084a3d 100644 --- a/modules/rostests/apitests/com/com_apitest.c +++ b/modules/rostests/apitests/com/com_apitest.c @@ -48,6 +48,7 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IAccessibleHandler) }, { ID_NAME(IID_IAccessControl), TRUE }, { ID_NAME(IID_IAccessor) }, + { ID_NAME(IID_IACLCustomMRU) }, { ID_NAME(IID_IActiveDesktop), TRUE }, { ID_NAME(IID_IActiveDesktopP), TRUE }, { ID_NAME(IID_IActionProgress) }, diff --git a/modules/rostests/apitests/com/com_apitest.h b/modules/rostests/apitests/com/com_apitest.h index 8820da294d..715213a725 100644 --- a/modules/rostests/apitests/com/com_apitest.h +++ b/modules/rostests/apitests/com/com_apitest.h @@ -107,6 +107,7 @@ DEFINE_GUID(CLSID_AttachmentServices, 0x4125dd96, 0xe03a, 0x4103, 0x8f, 0x7 DEFINE_GUID(IID_IADesktopP2, 0xb22754e2, 0x4574, 0x11d1, 0x98, 0x88, 0x00, 0x60, 0x97, 0xde, 0xac, 0xf9); DEFINE_GUID(IID_IAccessControl, 0xeedd23e0, 0x8410, 0x11ce, 0xa1, 0xc3, 0x08, 0x00, 0x2b, 0x2b, 0x8d, 0x8f); DEFINE_GUID(IID_IAccessor, 0x0c733a8c, 0x2a1c, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(IID_IACLCustomMRU, 0xf729fc5e, 0x8769, 0x4f3e, 0xbd, 0xb2, 0xd7, 0xb5, 0x0f, 0xd2, 0x27, 0x5b); DEFINE_GUID(IID_IActionProgress, 0x49ff1173, 0xeadc, 0x446d, 0x92, 0x85, 0x15, 0x64, 0x53, 0xa6, 0x43, 0x1c); DEFINE_GUID(IID_IActionProgressDialog, 0x49ff1172, 0xeadc, 0x446d, 0x92, 0x85, 0x15, 0x64, 0x53, 0xa6, 0x43, 0x1c); DEFINE_GUID(IID_IActiveDesktop, 0xf490eb00, 0x1240, 0x11d1, 0x98, 0x88, 0x00, 0x60, 0x97, 0xde, 0xac, 0xf9);

6 years, 9 months

← Newer
1
...
11
12
13
14
15
16
17
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2017