Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [KMTESTS:FSRTL] Add a few more tests matching MS FastFAT.
by Pierre Schweitzer 21 Feb '18

21 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22037684e42e29abc99a9… commit 22037684e42e29abc99a9a280278b16305eaa2e2 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Feb 21 22:50:23 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Feb 21 22:53:30 2018 +0100 [KMTESTS:FSRTL] Add a few more tests matching MS FastFAT. CORE-11819 --- modules/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c | 29 ++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/modules/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c b/modules/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c index 54ead1c989..8f833d6208 100644 --- a/modules/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c +++ b/modules/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c @@ -687,9 +687,38 @@ static VOID FsRtlLargeMcbTestsExt2() FsRtlUninitializeLargeMcb(&FirstMcb); } +static VOID FsRtlLargeMcbTestsFastFat() +{ + LARGE_MCB FirstMcb; + LONGLONG Lbn, Vbn, SectorCount; + ULONG Index; + BOOLEAN Result; + + FsRtlInitializeLargeMcb(&FirstMcb, PagedPool); + + Lbn = -1; + SectorCount = -1; + Result = FsRtlLookupLargeMcbEntry(&FirstMcb, 8388607LL, &Lbn, &SectorCount, NULL, NULL, NULL); + ok(Result = TRUE, "Expected TRUE, got FALSE\n"); + ok(Lbn == -1, "Expected Lbn 44, got: %I64d\n", Lbn); + ok(SectorCount == -1, "Expected SectorCount 44, got: %I64d\n", SectorCount); + + Vbn = -1; + Lbn = -1; + Index = -1; + Result = FsRtlLookupLastLargeMcbEntryAndIndex(&FirstMcb, &Vbn, &Lbn, &Index); + ok(Result = TRUE, "Expected TRUE, got FALSE\n"); + ok(Vbn == -1, "Expected Vbn 0, got: %I64d\n", Vbn); + ok(Lbn == -1, "Expected Lbn 0, got: %I64d\n", Lbn); + ok(Index == -1, "Expected Index 0, got: %d\n", Index); + + FsRtlUninitializeLargeMcb(&FirstMcb); +} + START_TEST(FsRtlMcb) { FsRtlMcbTest(); FsRtlLargeMcbTest(); FsRtlLargeMcbTestsExt2(); + FsRtlLargeMcbTestsFastFat(); }

1 0

01/01: [IPHLPAPI] Fix memory leak in getNumRoutes. CORE-14353
by Thomas Faber 21 Feb '18

21 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=182a31074f610715fd286… commit 182a31074f610715fd286582ffc6f7fb71fee73b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Feb 21 18:40:23 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Feb 21 18:42:43 2018 +0100 [IPHLPAPI] Fix memory leak in getNumRoutes. CORE-14353 --- dll/win32/iphlpapi/ipstats_reactos.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/win32/iphlpapi/ipstats_reactos.c b/dll/win32/iphlpapi/ipstats_reactos.c index e416d4842b..2b981c1112 100644 --- a/dll/win32/iphlpapi/ipstats_reactos.c +++ b/dll/win32/iphlpapi/ipstats_reactos.c @@ -397,6 +397,7 @@ DWORD getNumRoutes(void) TRACE("numRoutes: %d\n", (int)numRoutes); + tdiFreeThingSet( entitySet ); closeTcpFile( tcpFile ); return numRoutes;

1 0

01/01: [KMTESTS:FSRTL] Avoid writing to string literals. ROSTESTS-298
by Thomas Faber 21 Feb '18

21 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4487284c177cf4a6f396e… commit 4487284c177cf4a6f396e3446d3a5a88a00ffd42 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Feb 21 15:16:47 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Feb 21 15:17:58 2018 +0100 [KMTESTS:FSRTL] Avoid writing to string literals. ROSTESTS-298 --- modules/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c | 62 ++++++++++++----------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/modules/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c b/modules/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c index 206b3c80ce..7919b3ad2a 100644 --- a/modules/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c +++ b/modules/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c @@ -233,63 +233,67 @@ void DuplicatesTest() START_TEST(FsRtlTunnel) { - PUNICODE_STRING s_name; - PUNICODE_STRING l_name; - PUNICODE_STRING name; - PUNICODE_STRING a; + UNICODE_STRING s_name; + UNICODE_STRING l_name; + UNICODE_STRING name; + UNICODE_STRING a; BOOLEAN is; //Initialize Cash TestFsRtlInitializeTunnelCache(); - s_name = (PUNICODE_STRING)ExAllocatePool(PagedPool,sizeof(UNICODE_STRING)); - ok(s_name != NULL, "s_name in TestFsRtlAddToTunnelCache is NULL after allocated memory\n"); - RtlInitUnicodeString(s_name, L"smal"); + s_name.Length = 0; + s_name.MaximumLength = 64 * sizeof(WCHAR); + s_name.Buffer = ExAllocatePoolWithTag(PagedPool, s_name.MaximumLength, 'sFmK'); + ok(s_name.Buffer != NULL, "s_name.Buffer in TestFsRtlAddToTunnelCache is NULL after allocated memory\n"); + RtlAppendUnicodeToString(&s_name, L"smal"); - l_name = (PUNICODE_STRING)ExAllocatePool(PagedPool,sizeof(UNICODE_STRING)); - ok(l_name != NULL, "l_name in TestFsRtlAddToTunnelCache is NULL after allocated memory\n"); - RtlInitUnicodeString(l_name, L"bigbigbigbigbig"); + l_name.Length = 0; + l_name.MaximumLength = 64 * sizeof(WCHAR); + l_name.Buffer = ExAllocatePoolWithTag(PagedPool, l_name.MaximumLength, 'lFmK'); + ok(l_name.Buffer != NULL, "l_name.Buffer in TestFsRtlAddToTunnelCache is NULL after allocated memory\n"); + RtlAppendUnicodeToString(&l_name, L"bigbigbigbigbig"); // Add elem - TestFsRtlAddToTunnelCache(12345, s_name, l_name, TRUE); + TestFsRtlAddToTunnelCache(12345, &s_name, &l_name, TRUE); - name = (PUNICODE_STRING)ExAllocatePool(PagedPool,sizeof(UNICODE_STRING)); - ok(name != NULL, "name in FsRtlFindInTunnelCache is NULL after allocated memory\n"); - RtlInitUnicodeString(name, L"smal"); + name.Length = 0; + name.MaximumLength = 64 * sizeof(WCHAR); + name.Buffer = ExAllocatePoolWithTag(PagedPool, name.MaximumLength, 'nFmK'); + ok(name.Buffer != NULL, "name.Buffer in FsRtlFindInTunnelCache is NULL after allocated memory\n"); + RtlAppendUnicodeToString(&name, L"smal"); // Find - is = TestFsRtlFindInTunnelCache(12345, name, s_name, l_name); + is = TestFsRtlFindInTunnelCache(12345, &name, &s_name, &l_name); ok(is == TRUE, "FsRtlFindInTunnelCache dosn't find elem id = 12345\n"); TestFsRtlDeleteKeyFromTunnelCache(12345); //Delete - is = TestFsRtlFindInTunnelCache(12345, name, s_name, l_name); + is = TestFsRtlFindInTunnelCache(12345, &name, &s_name, &l_name); ok(is == FALSE, "TestFsRtlDeleteKeyFromTunnelCache dosn't delete elem id = 12345\n"); - is = TestFsRtlFindInTunnelCache(12347, name, s_name, l_name); + is = TestFsRtlFindInTunnelCache(12347, &name, &s_name, &l_name); ok(is == FALSE, "FsRtlDeleteTunnelCache dosn't clear cash\n"); - TestFsRtlAddToTunnelCache(12345, s_name, l_name, TRUE); - TestFsRtlAddToTunnelCache(12347, s_name, l_name, TRUE); - a = (PUNICODE_STRING)ExAllocatePool(PagedPool,sizeof(UNICODE_STRING)); - RtlInitUnicodeString(a, NULL); - TestFsRtlAddToTunnelCache(12346, a, l_name, FALSE); + TestFsRtlAddToTunnelCache(12345, &s_name, &l_name, TRUE); + TestFsRtlAddToTunnelCache(12347, &s_name, &l_name, TRUE); + RtlInitUnicodeString(&a, NULL); + TestFsRtlAddToTunnelCache(12346, &a, &l_name, FALSE); //Clear all FsRtlDeleteTunnelCache(T); - is = TestFsRtlFindInTunnelCache(12345, name, s_name, l_name); + is = TestFsRtlFindInTunnelCache(12345, &name, &s_name, &l_name); ok(is == FALSE, "FsRtlDeleteTunnelCache dosn't clear cash\n"); - is = TestFsRtlFindInTunnelCache(12346, name, a, l_name); + is = TestFsRtlFindInTunnelCache(12346, &name, &a, &l_name); ok(is == FALSE, "FsRtlDeleteTunnelCache dosn't clear cash\n"); - is = TestFsRtlFindInTunnelCache(12347, name, s_name, l_name); + is = TestFsRtlFindInTunnelCache(12347, &name, &s_name, &l_name); ok(is == FALSE, "FsRtlDeleteTunnelCache dosn't clear cash\n"); - ExFreePool(a); - ExFreePool(name); - ExFreePool(l_name); - ExFreePool(s_name); + ExFreePoolWithTag(name.Buffer, 'nFmK'); + ExFreePoolWithTag(l_name.Buffer, 'lFmK'); + ExFreePoolWithTag(s_name.Buffer, 'sFmK'); ExFreePool(Tb); ExFreePool(T);

1 0

01/01: [VFATLIB] Fix FAT partitions formatting in a non clean fashion.
by Pierre Schweitzer 20 Feb '18

20 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ff94017e45a810acf73e… commit 6ff94017e45a810acf73e0b5e4f39b3c8f822c83 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Feb 21 00:16:36 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Feb 21 00:26:13 2018 +0100 [VFATLIB] Fix FAT partitions formatting in a non clean fashion. (So the fun begins) In spite of what VFATLIB headers pretend, there's not magic in FAT boot sector. The 3 first bytes are just the jump instruction (to the boot code). No jump, no boot. Also, some (many?) FAT implementations rely on the jump code to help detecting that a FAT volume is really a FAT volume. Like MS FastFAT. Or our own FAT recognizer in FS_REC. The story is that, up to that commit, we zeroed the 3 first bytes; leading to broken FAT volumes. This got hidden in most cases by the fact that during setup, when we install boot loader, we erase parts of the boot sector, including the jump instruction, making the volume valid again. But that wouldn't fix secondary volumes where the boot loader isn't installed. And, also, imagine a scenario where you want to install ReactOS on a newly formatted volume with MS FastFAT instead of our own implementation... That would simply not work to the fact that the driver wouldn't recognize the fresh formatted volume! (So the non fashion begins) Fix this by putting a not that valid jump into the boot sector when formatting our partitions. That way, our volume is always regarding a FAT view point. But, instead of putting values that mean (nearly) nothing. We should also put a dummy bootloader displaying the user and error message, as done by dosfstools. (So the hope begins) This opens the way for trying to install ReactOS with MS FastFAT (doesn't work yet). CORE-11819 CORE-14362 --- sdk/lib/fslib/vfatlib/fat12.c | 10 +++++++--- sdk/lib/fslib/vfatlib/fat16.c | 10 +++++++--- sdk/lib/fslib/vfatlib/fat32.c | 10 +++++++--- sdk/lib/fslib/vfatlib/vfatlib.h | 8 ++------ 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/sdk/lib/fslib/vfatlib/fat12.c b/sdk/lib/fslib/vfatlib/fat12.c index d3cffdd145..bf96f8d2ec 100644 --- a/sdk/lib/fslib/vfatlib/fat12.c +++ b/sdk/lib/fslib/vfatlib/fat12.c @@ -38,9 +38,9 @@ Fat12WriteBootSector(IN HANDLE FileHandle, RtlZeroMemory(NewBootSector, BootSector->BytesPerSector); /* Copy FAT16 BPB to new bootsector */ - memcpy(&NewBootSector->OEMName[0], - &BootSector->OEMName[0], - FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, OEMName)); + memcpy(&NewBootSector->Jump[0], + &BootSector->Jump[0], + FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, Jump)); /* FAT16 BPB length (up to (not including) Res2) */ /* Write the boot sector signature */ @@ -276,6 +276,10 @@ Fat12Format(IN HANDLE FileHandle, RtlZeroMemory(&BootSector, sizeof(FAT16_BOOT_SECTOR)); memcpy(&BootSector.OEMName[0], "MSWIN4.1", 8); + /* FIXME: Add dummy bootloader for real */ + BootSector.Jump[0] = 0xeb; + BootSector.Jump[1] = 0x3c; + BootSector.Jump[2] = 0x90; BootSector.BytesPerSector = DiskGeometry->BytesPerSector; BootSector.SectorsPerCluster = ClusterSize / BootSector.BytesPerSector; BootSector.ReservedSectors = 1; diff --git a/sdk/lib/fslib/vfatlib/fat16.c b/sdk/lib/fslib/vfatlib/fat16.c index d0beaa3945..1438532390 100644 --- a/sdk/lib/fslib/vfatlib/fat16.c +++ b/sdk/lib/fslib/vfatlib/fat16.c @@ -38,9 +38,9 @@ Fat16WriteBootSector(IN HANDLE FileHandle, RtlZeroMemory(NewBootSector, BootSector->BytesPerSector); /* Copy FAT16 BPB to new bootsector */ - memcpy(&NewBootSector->OEMName[0], - &BootSector->OEMName[0], - FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, OEMName)); + memcpy(&NewBootSector->Jump[0], + &BootSector->Jump[0], + FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, Jump)); /* FAT16 BPB length (up to (not including) Res2) */ /* Write the boot sector signature */ @@ -283,6 +283,10 @@ Fat16Format(IN HANDLE FileHandle, RtlZeroMemory(&BootSector, sizeof(FAT16_BOOT_SECTOR)); memcpy(&BootSector.OEMName[0], "MSWIN4.1", 8); + /* FIXME: Add dummy bootloader for real */ + BootSector.Jump[0] = 0xeb; + BootSector.Jump[1] = 0x3c; + BootSector.Jump[2] = 0x90; BootSector.BytesPerSector = DiskGeometry->BytesPerSector; BootSector.SectorsPerCluster = ClusterSize / BootSector.BytesPerSector; BootSector.ReservedSectors = 1; diff --git a/sdk/lib/fslib/vfatlib/fat32.c b/sdk/lib/fslib/vfatlib/fat32.c index 030f1206b6..1987af4fdd 100644 --- a/sdk/lib/fslib/vfatlib/fat32.c +++ b/sdk/lib/fslib/vfatlib/fat32.c @@ -38,9 +38,9 @@ Fat32WriteBootSector(IN HANDLE FileHandle, RtlZeroMemory(NewBootSector, BootSector->BytesPerSector); /* Copy FAT32 BPB to new bootsector */ - memcpy(&NewBootSector->OEMName[0], - &BootSector->OEMName[0], - FIELD_OFFSET(FAT32_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT32_BOOT_SECTOR, OEMName)); + memcpy(&NewBootSector->Jump[0], + &BootSector->Jump[0], + FIELD_OFFSET(FAT32_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT32_BOOT_SECTOR, Jump)); /* FAT32 BPB length (up to (not including) Res2) */ /* Write the boot sector signature */ @@ -428,6 +428,10 @@ Fat32Format(IN HANDLE FileHandle, RtlZeroMemory(&BootSector, sizeof(FAT32_BOOT_SECTOR)); memcpy(&BootSector.OEMName[0], "MSWIN4.1", 8); + /* FIXME: Add dummy bootloader for real */ + BootSector.Jump[0] = 0xeb; + BootSector.Jump[1] = 0x58; + BootSector.Jump[2] = 0x90; BootSector.BytesPerSector = DiskGeometry->BytesPerSector; BootSector.SectorsPerCluster = ClusterSize / BootSector.BytesPerSector; BootSector.ReservedSectors = 32; diff --git a/sdk/lib/fslib/vfatlib/vfatlib.h b/sdk/lib/fslib/vfatlib/vfatlib.h index 40b1de376e..20788510a7 100644 --- a/sdk/lib/fslib/vfatlib/vfatlib.h +++ b/sdk/lib/fslib/vfatlib/vfatlib.h @@ -27,9 +27,7 @@ #include <pshpack1.h> typedef struct _FAT16_BOOT_SECTOR { - unsigned char magic0; // 0 - unsigned char res0; // 1 - unsigned char magic1; // 2 + unsigned char Jump[3]; // 0 unsigned char OEMName[8]; // 3 unsigned short BytesPerSector; // 11 unsigned char SectorsPerCluster; // 13 @@ -55,9 +53,7 @@ typedef struct _FAT16_BOOT_SECTOR typedef struct _FAT32_BOOT_SECTOR { - unsigned char magic0; // 0 - unsigned char res0; // 1 - unsigned char magic1; // 2 + unsigned char Jump[3]; // 0 unsigned char OEMName[8]; // 3 unsigned short BytesPerSector; // 11 unsigned char SectorsPerCluster; // 13

1 0

01/01: [SC] Addendum to 4728157: Add missed values to query errors and usage output. (#387)
by Serge Gautherie 20 Feb '18

20 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e1bd79e3df9a8a31652fd… commit e1bd79e3df9a8a31652fda867a3a80b775e2a488 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Tue Feb 20 19:45:55 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Feb 20 19:45:55 2018 +0100 [SC] Addendum to 4728157: Add missed values to query errors and usage output. (#387) --- base/applications/sc/query.c | 4 ++-- base/applications/sc/usage.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/sc/query.c b/base/applications/sc/query.c index 54e04277b2..87b2468cfd 100644 --- a/base/applications/sc/query.c +++ b/base/applications/sc/query.c @@ -191,7 +191,7 @@ ParseQueryArguments( } else { - _tprintf(_T("ERROR following \"type=\"!\nMust be \"driver\" or \"service\"\n")); + _tprintf(_T("ERROR following \"type=\"!\nMust be one of: all, driver, interact, service.\n")); return FALSE; } @@ -220,7 +220,7 @@ ParseQueryArguments( } else { - _tprintf(_T("ERROR following \"state=\"!\nMust be \"inactive\" or \"all\"\n")); + _tprintf(_T("ERROR following \"state=\"!\nMust be one of: active, all, inactive.\n")); return FALSE; } diff --git a/base/applications/sc/usage.c b/base/applications/sc/usage.c index b1b4a04925..ec431f6856 100644 --- a/base/applications/sc/usage.c +++ b/base/applications/sc/usage.c @@ -66,7 +66,7 @@ VOID MainUsage(VOID) _T(" the options listed below, the services are enumerated.\n") _T(" type= Type of services to enumerate (driver, service, interact, all)\n") _T(" (default = service)\n") - _T(" state= State of services to enumerate (inactive, all)\n") + _T(" state= State of services to enumerate (active, all, inactive)\n") _T(" (default = active)\n") _T(" bufsize= The size (in bytes) of the enumeration buffer\n") _T(" (default = 4096)\n")

1 0

01/01: [SHELL32] CShellItem: Fix GetDisplayName and Compare The two methods were completely broken because they passed a full pidl to the parent folder (and not desktop folder). Compile SHGetNameFromIDList to use it in CShellItem but don't export it.
by Giannis Adamopoulos 20 Feb '18

20 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3263303844bd1b8f622e2… commit 3263303844bd1b8f622e2366e1a5538accb6f5eb Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Feb 20 16:59:00 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Feb 20 16:59:00 2018 +0200 [SHELL32] CShellItem: Fix GetDisplayName and Compare The two methods were completely broken because they passed a full pidl to the parent folder (and not desktop folder). Compile SHGetNameFromIDList to use it in CShellItem but don't export it. --- dll/win32/shell32/CShellItem.cpp | 55 ++++------------------------------------ dll/win32/shell32/wine/pidl.c | 4 +-- 2 files changed, 7 insertions(+), 52 deletions(-) diff --git a/dll/win32/shell32/CShellItem.cpp b/dll/win32/shell32/CShellItem.cpp index f0a6ee650a..d403adcf02 100644 --- a/dll/win32/shell32/CShellItem.cpp +++ b/dll/win32/shell32/CShellItem.cpp @@ -159,52 +159,7 @@ HRESULT WINAPI CShellItem::GetParent(IShellItem **ppsi) HRESULT WINAPI CShellItem::GetDisplayName(SIGDN sigdnName, LPWSTR *ppszName) { - HRESULT hr; - CComPtr<IShellFolder> parent_folder; - STRRET name; - DWORD uFlags; - - TRACE("(%p,%x,%p)\n", this, sigdnName, ppszName); - - if (sigdnName & SIGDN_URL) - return E_NOTIMPL; - - if (ppszName == NULL) - return E_POINTER; - - *ppszName = NULL; - - hr = get_parent_shellfolder(&parent_folder); - if (SUCCEEDED(hr)) - { - switch (sigdnName) - { - case SIGDN_PARENTRELATIVEEDITING: - uFlags = SHGDN_FOREDITING | SHGDN_INFOLDER; - break; - case SIGDN_DESKTOPABSOLUTEEDITING: - uFlags = SHGDN_FOREDITING; - break; - case SIGDN_PARENTRELATIVEPARSING: - uFlags = SHGDN_FORPARSING | SHGDN_INFOLDER; - break; - case SIGDN_DESKTOPABSOLUTEPARSING: - uFlags = SHGDN_FORPARSING; - break; - default: - uFlags = SHGDN_NORMAL; - break; - } - - hr = parent_folder->GetDisplayNameOf(m_pidl, uFlags, &name); - if (SUCCEEDED(hr)) - { - StrRetToStrW(&name, m_pidl, ppszName); - return S_OK; - } - } - - return hr; + return SHGetNameFromIDList(m_pidl, sigdnName, ppszName); } HRESULT WINAPI CShellItem::GetAttributes(SFGAOF sfgaoMask, SFGAOF *psfgaoAttribs) @@ -237,7 +192,7 @@ HRESULT WINAPI CShellItem::Compare(IShellItem *oth, SICHINTF hint, int *piOrder) { HRESULT hr; CComPtr<IPersistIDList> pIDList; - CComPtr<IShellFolder> parent_folder; + CComPtr<IShellFolder> psfDesktop; LPITEMIDLIST pidl; TRACE("(%p,%p,%x,%p)\n", this, oth, hint, piOrder); @@ -251,11 +206,11 @@ HRESULT WINAPI CShellItem::Compare(IShellItem *oth, SICHINTF hint, int *piOrder) hr = pIDList->GetIDList(&pidl); if (SUCCEEDED(hr)) { - hr = get_parent_shellfolder(&parent_folder); + hr = SHGetDesktopFolder(&psfDesktop); if (SUCCEEDED(hr)) { - hr = parent_folder->CompareIDs(hint, m_pidl, pidl); - *piOrder = static_cast<int>(SCODE_CODE(hr)); + hr = psfDesktop->CompareIDs(hint, m_pidl, pidl); + *piOrder = (int)(short)SCODE_CODE(hr); } ILFree(pidl); } diff --git a/dll/win32/shell32/wine/pidl.c b/dll/win32/shell32/wine/pidl.c index 15faf04981..4f917e1629 100644 --- a/dll/win32/shell32/wine/pidl.c +++ b/dll/win32/shell32/wine/pidl.c @@ -1403,8 +1403,6 @@ HRESULT WINAPI SHParseDisplayName(LPCWSTR pszName, IBindCtx *pbc, return hr; } -#ifndef __REACTOS__ - /************************************************************************* * SHGetNameFromIDList [SHELL32.@] */ @@ -1466,6 +1464,8 @@ HRESULT WINAPI SHGetNameFromIDList(PCIDLIST_ABSOLUTE pidl, SIGDN sigdnName, PWST return ret; } +#ifndef __REACTOS__ + /************************************************************************* * SHGetIDListFromObject [SHELL32.@] */

1 0

01/01: [SHELL32] CShellItem: Implement BindToHandler and improve GetAttributes based on wine Fixes lots of tests.
by Giannis Adamopoulos 20 Feb '18

20 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d7313273c50358922b7d… commit 9d7313273c50358922b7d2e253c186d0081ec0e0 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Feb 20 16:31:28 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Feb 20 16:33:30 2018 +0200 [SHELL32] CShellItem: Implement BindToHandler and improve GetAttributes based on wine Fixes lots of tests. --- dll/win32/shell32/CShellItem.cpp | 82 +++++++++++++++++++++++++++++++++++----- dll/win32/shell32/CShellItem.h | 1 + 2 files changed, 73 insertions(+), 10 deletions(-) diff --git a/dll/win32/shell32/CShellItem.cpp b/dll/win32/shell32/CShellItem.cpp index 5ef965de47..f0a6ee650a 100644 --- a/dll/win32/shell32/CShellItem.cpp +++ b/dll/win32/shell32/CShellItem.cpp @@ -76,13 +76,68 @@ HRESULT CShellItem::get_parent_shellfolder(IShellFolder **ppsf) return hr; } +HRESULT CShellItem::get_shellfolder(IBindCtx *pbc, REFIID riid, void **ppvOut) +{ + CComPtr<IShellFolder> psf; + CComPtr<IShellFolder> psfDesktop; + HRESULT ret; + + ret = SHGetDesktopFolder(&psfDesktop); + if (FAILED_UNEXPECTEDLY(ret)) + return ret; + + if (_ILIsDesktop(m_pidl)) + psf = psfDesktop; + else + { + ret = psfDesktop->BindToObject(m_pidl, pbc, IID_PPV_ARG(IShellFolder, &psf)); + if (FAILED_UNEXPECTEDLY(ret)) + return ret; + } + + return psf->QueryInterface(riid, ppvOut); +} + HRESULT WINAPI CShellItem::BindToHandler(IBindCtx *pbc, REFGUID rbhid, REFIID riid, void **ppvOut) { - FIXME("(%p,%p,%s,%p,%p)\n", this, pbc, shdebugstr_guid(&rbhid), riid, ppvOut); + HRESULT ret; + TRACE("(%p, %p,%s,%p,%p)\n", this, pbc, shdebugstr_guid(&rbhid), riid, ppvOut); *ppvOut = NULL; + if (IsEqualGUID(rbhid, BHID_SFObject)) + { + return get_shellfolder(pbc, riid, ppvOut); + } + else if (IsEqualGUID(rbhid, BHID_SFUIObject)) + { + CComPtr<IShellFolder> psf_parent; + if (_ILIsDesktop(m_pidl)) + ret = SHGetDesktopFolder(&psf_parent); + else + ret = get_parent_shellfolder(&psf_parent); + if (FAILED_UNEXPECTEDLY(ret)) + return ret; - return E_NOTIMPL; + LPCITEMIDLIST pidl = ILFindLastID(m_pidl); + return psf_parent->GetUIObjectOf(NULL, 1, &pidl, riid, NULL, ppvOut); + } + else if (IsEqualGUID(rbhid, BHID_DataObject)) + { + return BindToHandler(pbc, BHID_SFUIObject, IID_IDataObject, ppvOut); + } + else if (IsEqualGUID(rbhid, BHID_SFViewObject)) + { + CComPtr<IShellFolder> psf; + ret = get_shellfolder(NULL, IID_PPV_ARG(IShellFolder, &psf)); + if (FAILED_UNEXPECTEDLY(ret)) + return ret; + + return psf->CreateViewObject(NULL, riid, ppvOut); + } + + FIXME("Unsupported BHID %s.\n", debugstr_guid(&rbhid)); + + return MK_E_NOOBJECT; } HRESULT WINAPI CShellItem::GetParent(IShellItem **ppsi) @@ -160,15 +215,22 @@ HRESULT WINAPI CShellItem::GetAttributes(SFGAOF sfgaoMask, SFGAOF *psfgaoAttribs TRACE("(%p,%x,%p)\n", this, sfgaoMask, psfgaoAttribs); - hr = get_parent_shellfolder(&parent_folder); - if (SUCCEEDED(hr)) - { - child_pidl = ILFindLastID(m_pidl); - *psfgaoAttribs = sfgaoMask; - hr = parent_folder->GetAttributesOf(1, &child_pidl, psfgaoAttribs); - } + if (_ILIsDesktop(m_pidl)) + hr = SHGetDesktopFolder(&parent_folder); + else + hr = get_parent_shellfolder(&parent_folder); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - return hr; + child_pidl = ILFindLastID(m_pidl); + *psfgaoAttribs = sfgaoMask; + hr = parent_folder->GetAttributesOf(1, &child_pidl, psfgaoAttribs); + *psfgaoAttribs &= sfgaoMask; + + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return (sfgaoMask == *psfgaoAttribs) ? S_OK : S_FALSE; } HRESULT WINAPI CShellItem::Compare(IShellItem *oth, SICHINTF hint, int *piOrder) diff --git a/dll/win32/shell32/CShellItem.h b/dll/win32/shell32/CShellItem.h index a75698edfa..57c318523d 100644 --- a/dll/win32/shell32/CShellItem.h +++ b/dll/win32/shell32/CShellItem.h @@ -36,6 +36,7 @@ public: ~CShellItem(); HRESULT get_parent_pidl(LPITEMIDLIST *parent_pidl); HRESULT get_parent_shellfolder(IShellFolder **ppsf); + HRESULT get_shellfolder(IBindCtx *pbc, REFIID riid, void **ppvOut); // IShellItem virtual HRESULT WINAPI BindToHandler(IBindCtx *pbc, REFGUID rbhid, REFIID riid, void **ppvOut);

1 0

01/01: [SHELL32] CShellItem: Fix return value of Compare method
by Giannis Adamopoulos 20 Feb '18

20 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af97de39a2bc350928656… commit af97de39a2bc3509286565f670a9feef723deaf3 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Feb 20 14:36:31 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Feb 20 14:36:31 2018 +0200 [SHELL32] CShellItem: Fix return value of Compare method --- dll/win32/shell32/CShellItem.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/CShellItem.cpp b/dll/win32/shell32/CShellItem.cpp index 1e06c8cff8..5ef965de47 100644 --- a/dll/win32/shell32/CShellItem.cpp +++ b/dll/win32/shell32/CShellItem.cpp @@ -199,9 +199,13 @@ HRESULT WINAPI CShellItem::Compare(IShellItem *oth, SICHINTF hint, int *piOrder) } } - if (SUCCEEDED(hr)) + if(FAILED(hr)) + return hr; + + if(*piOrder) + return S_FALSE; + else return S_OK; - return hr; } HRESULT WINAPI CShellItem::GetClassID(CLSID *pClassID)

1 0

01/01: [SHELL32] CDefaultContextMenu: Implement GetCommandString
by Giannis Adamopoulos 20 Feb '18

20 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c361e475b4af5dc1cfe57… commit c361e475b4af5dc1cfe57062ebc111794106fd2d Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Feb 20 13:05:59 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Feb 20 13:05:59 2018 +0200 [SHELL32] CDefaultContextMenu: Implement GetCommandString --- dll/win32/shell32/CDefaultContextMenu.cpp | 69 +++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index 0834995abd..fac9b50907 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -13,6 +13,7 @@ extern "C" //fixme: this isn't in wine's shlwapi header, and the definition doesnt match the // windows headers. When wine's header and lib are fixed this can be removed. DWORD WINAPI SHAnsiToUnicode(LPCSTR lpSrcStr, LPWSTR lpDstStr, int iLen); + INT WINAPI SHUnicodeToAnsi(LPCWSTR lpSrcStr, LPSTR lpDstStr, INT iLen); }; WINE_DEFAULT_DEBUG_CHANNEL(dmenu); @@ -47,7 +48,14 @@ struct _StaticInvokeCommandMap_ { "Print", 0 }, // Unimplemented { "Preview", 0 }, // Unimplemented { "Open", FCIDM_SHVIEW_OPEN }, - { CMDSTR_NEWFOLDERA, FCIDM_SHVIEW_NEWFOLDER } + { CMDSTR_NEWFOLDERA, FCIDM_SHVIEW_NEWFOLDER }, + { "cut", FCIDM_SHVIEW_CUT}, + { "copy", FCIDM_SHVIEW_COPY}, + { "paste", FCIDM_SHVIEW_INSERT}, + { "link", FCIDM_SHVIEW_CREATELINK}, + { "delete", FCIDM_SHVIEW_DELETE}, + { "properties", FCIDM_SHVIEW_PROPERTIES}, + { "rename", FCIDM_SHVIEW_RENAME}, }; @@ -1237,7 +1245,7 @@ CDefaultContextMenu::InvokeCommand( Result = DoCreateNewFolder(&LocalInvokeInfo); break; default: - Result = E_UNEXPECTED; + Result = E_INVALIDARG; ERR("Unhandled Verb %xl\n", LOWORD(LocalInvokeInfo.lpVerb)); break; } @@ -1256,15 +1264,68 @@ CDefaultContextMenu::GetCommandString( { /* We don't handle the help text yet */ if (uFlags == GCS_HELPTEXTA || - uFlags == GCS_HELPTEXTW) + uFlags == GCS_HELPTEXTW || + HIWORD(idCommand) != 0) { return E_NOTIMPL; } + UINT CmdId = LOWORD(idCommand); + + if (m_pDynamicEntries && CmdId >= m_iIdSHEFirst && CmdId < m_iIdSHELast) + { + idCommand -= m_iIdSHEFirst; + PDynamicShellEntry pEntry = GetDynamicEntry(idCommand); + if (!pEntry) + return E_FAIL; + + idCommand -= pEntry->iIdCmdFirst; + return pEntry->pCM->GetCommandString(idCommand, + uFlags, + lpReserved, + lpszName, + uMaxNameLen); + } + + if (m_pStaticEntries && CmdId >= m_iIdSCMFirst && CmdId < m_iIdSCMLast) + { + /* Validation just returns S_OK on a match. The id exists. */ + if (uFlags == GCS_VALIDATEA || uFlags == GCS_VALIDATEW) + return S_OK; + + CmdId -= m_iIdSCMFirst; + + PStaticShellEntry pEntry = m_pStaticEntries; + while (pEntry && (CmdId--) > 0) + pEntry = pEntry->pNext; + + if (!pEntry) + return E_INVALIDARG; + + if (uFlags == GCS_VERBW) + return StringCchCopyW((LPWSTR)lpszName, uMaxNameLen, pEntry->szVerb); + + if (uFlags == GCS_VERBA) + { + if (SHUnicodeToAnsi(pEntry->szVerb, lpszName, uMaxNameLen)) + return S_OK; + } + + return E_INVALIDARG; + } + + //FIXME: Should we handle callbacks here? + if (m_iIdDfltFirst != m_iIdDfltLast && CmdId >= m_iIdDfltFirst && CmdId < m_iIdDfltLast) + { + CmdId -= m_iIdDfltFirst; + /* See the definitions of IDM_CUT and co to see how this works */ + CmdId += 0x7000; + } + /* Loop looking for a matching Id */ for (UINT i = 0; i < _countof(g_StaticInvokeCmdMap); i++) { - if (g_StaticInvokeCmdMap[i].IntVerb == idCommand) + if (g_StaticInvokeCmdMap[i].IntVerb == CmdId) { /* Validation just returns S_OK on a match */ if (uFlags == GCS_VALIDATEA || uFlags == GCS_VALIDATEW)

1 0

01/01: [SHELL32] Fix a couple of tests
by Giannis Adamopoulos 20 Feb '18

20 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e48c20b3b6b4290387ab… commit 7e48c20b3b6b4290387abbc459ac15702c8374bf Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Tue Feb 20 11:48:40 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Tue Feb 20 11:48:40 2018 +0200 [SHELL32] Fix a couple of tests --- dll/win32/shell32/CShellItem.cpp | 3 ++- dll/win32/shell32/folders/CDesktopFolder.cpp | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/CShellItem.cpp b/dll/win32/shell32/CShellItem.cpp index d684870c05..1e06c8cff8 100644 --- a/dll/win32/shell32/CShellItem.cpp +++ b/dll/win32/shell32/CShellItem.cpp @@ -250,6 +250,8 @@ HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, TRACE("(%p,%p,%p,%p)\n", pidlParent, psfParent, pidl, ppsi); + *ppsi = NULL; + if (!pidl) return E_INVALIDARG; @@ -291,7 +293,6 @@ HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, hr = CShellItem::_CreatorClass::CreateInstance(NULL, IID_PPV_ARG(IShellItem, &newShellItem)); if (FAILED(hr)) { - *ppsi = NULL; ILFree(new_pidl); return hr; } diff --git a/dll/win32/shell32/folders/CDesktopFolder.cpp b/dll/win32/shell32/folders/CDesktopFolder.cpp index fc52702696..9a1a452ea8 100644 --- a/dll/win32/shell32/folders/CDesktopFolder.cpp +++ b/dll/win32/shell32/folders/CDesktopFolder.cpp @@ -819,6 +819,9 @@ HRESULT WINAPI CDesktopFolder::Initialize(LPCITEMIDLIST pidl) { TRACE ("(%p)->(%p)\n", this, pidl); + if (!pidl) + return S_OK; + return E_INVALIDARG; }

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