Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 04/09: [ZIPFLDR] Fix number of menu items returned for DFM_MERGECONTEXTMENU
by Mark Jansen 19 Oct '19

19 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a99325c7168c5c3b9c1c0… commit a99325c7168c5c3b9c1c07fc139dab4290fb880e Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Sep 13 21:37:07 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Oct 19 18:42:14 2019 +0200 [ZIPFLDR] Fix number of menu items returned for DFM_MERGECONTEXTMENU --- dll/shellext/zipfldr/CZipFolder.hpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dll/shellext/zipfldr/CZipFolder.hpp b/dll/shellext/zipfldr/CZipFolder.hpp index 7b51a750eba..af70c9cb406 100644 --- a/dll/shellext/zipfldr/CZipFolder.hpp +++ b/dll/shellext/zipfldr/CZipFolder.hpp @@ -370,7 +370,7 @@ public: if (FAILED_UNEXPECTEDLY(hr)) return hr; - pqcminfo->indexMenu += HRESULT_CODE(hr); + pqcminfo->idCmdFirst += HRESULT_CODE(hr); return S_OK; } case DFM_INVOKECOMMAND: @@ -523,7 +523,7 @@ public: } STDMETHODIMP QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) { - int Entries = 0; + UINT idCmd = idCmdFirst; if (!(uFlags & CMF_DEFAULTONLY)) { @@ -532,13 +532,11 @@ public: if (indexMenu) { InsertMenuW(hmenu, indexMenu++, MF_BYPOSITION | MF_SEPARATOR, 0, NULL); - Entries++; } - InsertMenuW(hmenu, indexMenu++, MF_BYPOSITION | MF_STRING, idCmdFirst++, menuText); - Entries++; + InsertMenuW(hmenu, indexMenu++, MF_BYPOSITION | MF_STRING, idCmd++, menuText); } - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Entries); + return MAKE_HRESULT(SEVERITY_SUCCESS, FACILITY_NULL, idCmd - idCmdFirst); } // *** IShellExtInit methods ***

1 0

[reactos] 03/09: [PSDK] Add some missing defines to shlobj.h
by Mark Jansen 19 Oct '19

19 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=936b54faa301017ede671… commit 936b54faa301017ede671e97c88f90fcdabede77 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Sep 13 21:35:51 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Oct 19 18:42:14 2019 +0200 [PSDK] Add some missing defines to shlobj.h --- sdk/include/psdk/shlobj.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index 8f529cc0f79..f287ded6412 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -2382,6 +2382,20 @@ CDefFolderMenu_Create2( #define DFM_INVOKECOMMANDEX 12 #define DFM_GETDEFSTATICID 14 +#define DFM_GETHELPTEXT 5 +#define DFM_WM_MEASUREITEM 6 +#define DFM_WM_DRAWITEM 7 +#define DFM_WM_INITMENUPOPUP 8 +#define DFM_VALIDATECMD 9 +#define DFM_MERGECONTEXTMENU_TOP 10 +#define DFM_GETHELPTEXTW 11 +#define DFM_MAPCOMMANDNAME 13 +#define DFM_GETVERBW 15 +#define DFM_GETVERBA 16 +#define DFM_MERGECONTEXTMENU_BOTTOM 17 +#define DFM_MODIFYQCMFLAGS 18 + + #define DFM_CMD_DELETE ((UINT)-1) #define DFM_CMD_MOVE ((UINT)-2) #define DFM_CMD_COPY ((UINT)-3)

1 0

[reactos] 02/09: [FONTEXT_APITEST] Add simple api test showing interfaces CORE-14690
by Mark Jansen 19 Oct '19

19 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d315fd93d34009bf6e4d5… commit d315fd93d34009bf6e4d5b5dccca6a5364eb4e5b Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Aug 3 15:13:21 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Oct 19 18:42:14 2019 +0200 [FONTEXT_APITEST] Add simple api test showing interfaces CORE-14690 --- modules/rostests/apitests/CMakeLists.txt | 1 + modules/rostests/apitests/fontext/CMakeLists.txt | 22 +++ modules/rostests/apitests/fontext/shellext.cpp | 194 +++++++++++++++++++++++ modules/rostests/apitests/fontext/testlist.c | 12 ++ 4 files changed, 229 insertions(+) diff --git a/modules/rostests/apitests/CMakeLists.txt b/modules/rostests/apitests/CMakeLists.txt index 1d623104fc7..8910f89b56a 100644 --- a/modules/rostests/apitests/CMakeLists.txt +++ b/modules/rostests/apitests/CMakeLists.txt @@ -12,6 +12,7 @@ add_subdirectory(crt) add_subdirectory(dbghelp) add_subdirectory(dciman32) add_subdirectory(dnsapi) +add_subdirectory(fontext) add_subdirectory(gdi32) add_subdirectory(gditools) add_subdirectory(iphlpapi) diff --git a/modules/rostests/apitests/fontext/CMakeLists.txt b/modules/rostests/apitests/fontext/CMakeLists.txt new file mode 100644 index 00000000000..80654e4d7d5 --- /dev/null +++ b/modules/rostests/apitests/fontext/CMakeLists.txt @@ -0,0 +1,22 @@ + +add_definitions( + -D__ROS_LONG64__ + -DWINETEST_USE_DBGSTR_LONGLONG + -DUNICODE + -D_UNICODE + -D_ATL_NO_EXCEPTIONS) + +set_cpp(WITH_RUNTIME) + +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl + ${CMAKE_CURRENT_BINARY_DIR}) + +list(APPEND SOURCE + shellext.cpp + testlist.c) + +add_executable(fontext_apitest ${SOURCE}) +set_module_type(fontext_apitest win32cui) +target_link_libraries(fontext_apitest uuid ${PSEH_LIB}) +add_importlibs(fontext_apitest oleaut32 ole32 shell32 user32 msvcrt kernel32 ntdll) +add_rostests_file(TARGET fontext_apitest) diff --git a/modules/rostests/apitests/fontext/shellext.cpp b/modules/rostests/apitests/fontext/shellext.cpp new file mode 100644 index 00000000000..00480a7497c --- /dev/null +++ b/modules/rostests/apitests/fontext/shellext.cpp @@ -0,0 +1,194 @@ +/* + * PROJECT: fontext_apitest + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for fontext shell extension behavior + * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windef.h> +#include <ntndk.h> +#include <atlbase.h> +#include <atlcom.h> +#include <shellapi.h> +#include <shlobj.h> +#include <shobjidl.h> +#include <shellutils.h> +#include "wine/test.h" + +const CLSID CLSID_FontExt = { 0xBD84B380, 0x8CA2, 0x1069, { 0xAB, 0x1D, 0x08, 0x00, 0x09, 0x48, 0xF5, 0x34 } }; +static DWORD g_WinVersion; + + +static HRESULT Initialize(CComPtr<IPersistFolder>& spFolder, LPCWSTR Path) +{ + CComHeapPtr<ITEMIDLIST> pidl; + CComPtr<IShellFolder> spDesktop; + + HRESULT hr = SHGetDesktopFolder(&spDesktop); + ok_hex(hr, S_OK); + if (FAILED(hr)) + return hr; + + DWORD Attributes = 0, chEaten = 0; + hr = spDesktop->ParseDisplayName(NULL, NULL, (LPOLESTR)Path, &chEaten, &pidl, &Attributes); + ok_hex(hr, S_OK); + if (FAILED(hr)) + return hr; + + return spFolder->Initialize(pidl); +} + + +static void CreateObjectsFromPersistFolder() +{ + WCHAR Path[MAX_PATH] = { 0 }; + + CComPtr<IPersistFolder> spFolder; + HRESULT hr = CoCreateInstance(CLSID_FontExt, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IPersistFolder, &spFolder)); + ok_hex(hr, S_OK); + if (!SUCCEEDED(hr)) + return; + + hr = SHGetFolderPathW(NULL, CSIDL_WINDOWS, NULL, 0, Path); + ok_hex(hr, S_OK); + if (FAILED(hr)) + return; + + // Initializing this in another folder fails + hr = Initialize(spFolder, Path); + ok_hex(hr, E_FAIL); + + hr = SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, 0, Path); + ok_hex(hr, S_OK); + if (FAILED(hr)) + return; + + // Initializing it in the font folder works + hr = Initialize(spFolder, Path); + ok_hex(hr, S_OK); + + // For ros we do not implement the ShellView, but go directly to the ShellFolder. + // So we detect this special case + if (g_WinVersion < _WIN32_WINNT_VISTA) + { + CComPtr<IShellFolder> spShellFolder; + hr = spFolder->QueryInterface(IID_PPV_ARG(IShellFolder, &spShellFolder)); + + if (SUCCEEDED(hr)) + { + trace("Got IShellFolder on < Vista, faking 0x601\n"); + g_WinVersion = _WIN32_WINNT_WIN7; + } + } + + if (g_WinVersion < _WIN32_WINNT_VISTA) + { + // A view is present + CComPtr<IShellView> spView; + hr = spFolder->QueryInterface(IID_PPV_ARG(IShellView, &spView)); + ok_hex(hr, S_OK); + + // No shell folder + CComPtr<IShellFolder> spShellFolder; + hr = spFolder->QueryInterface(IID_PPV_ARG(IShellFolder, &spShellFolder)); + ok_hex(hr, E_NOINTERFACE); + + // Ask the view: + if (spView) + { + CComPtr<IObjectWithSite> spObjectWithSite; + hr = spView->QueryInterface(IID_PPV_ARG(IObjectWithSite, &spObjectWithSite)); + ok_hex(hr, E_NOINTERFACE); + + CComPtr<IInternetSecurityManager> spISM; + hr = spView->QueryInterface(IID_PPV_ARG(IInternetSecurityManager, &spISM)); + ok_hex(hr, E_NOINTERFACE); + } + + + CComPtr<IDropTarget> spDropTarget; + hr = spFolder->QueryInterface(IID_PPV_ARG(IDropTarget, &spDropTarget)); + ok_hex(hr, S_OK); + + CComPtr<IExtractIconW> spExtractIcon; + hr = spFolder->QueryInterface(IID_PPV_ARG(IExtractIconW, &spExtractIcon)); + ok_hex(hr, E_NOINTERFACE); + } + else + { + // Here we have a shell folder + CComPtr<IShellFolder> spShellFolder; + hr = spFolder->QueryInterface(IID_PPV_ARG(IShellFolder, &spShellFolder)); + ok_hex(hr, S_OK); + + // But no view anymore + CComPtr<IShellView> spView; + hr = spFolder->QueryInterface(IID_PPV_ARG(IShellView, &spView)); + ok_hex(hr, E_NOINTERFACE); + spView.Release(); + + + CComPtr<IDropTarget> spDropTarget; + hr = spFolder->QueryInterface(IID_PPV_ARG(IDropTarget, &spDropTarget)); + ok_hex(hr, E_NOINTERFACE); + + CComPtr<IExtractIconW> spExtractIcon; + hr = spFolder->QueryInterface(IID_PPV_ARG(IExtractIconW, &spExtractIcon)); + ok_hex(hr, E_NOINTERFACE); + } +} + + +static void CreateDropTarget() +{ + CComPtr<IDropTarget> spDropTarget; + HRESULT hr = CoCreateInstance(CLSID_FontExt, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IDropTarget, &spDropTarget)); + ok_hex(hr, E_NOINTERFACE); +} + +static void CreateExtractIcon() +{ + if (g_WinVersion < _WIN32_WINNT_VISTA) + { + CComPtr<IExtractIconA> spExtractIconA; + HRESULT hr = CoCreateInstance(CLSID_FontExt, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IExtractIconA, &spExtractIconA)); + ok_hex(hr, S_OK); + + CComPtr<IExtractIconW> spExtractIconW; + hr = CoCreateInstance(CLSID_FontExt, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IExtractIconW, &spExtractIconW)); + ok_hex(hr, S_OK); + } + else + { + CComPtr<IExtractIconA> spExtractIconA; + HRESULT hr = CoCreateInstance(CLSID_FontExt, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IExtractIconA, &spExtractIconA)); + ok_hex(hr, E_NOINTERFACE); + + CComPtr<IExtractIconW> spExtractIconW; + hr = CoCreateInstance(CLSID_FontExt, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IExtractIconW, &spExtractIconW)); + ok_hex(hr, E_NOINTERFACE); + } +} + + + +START_TEST(shellext) +{ + RTL_OSVERSIONINFOEXW rtlinfo = {0}; + + rtlinfo.dwOSVersionInfoSize = sizeof(rtlinfo); + RtlGetVersion((PRTL_OSVERSIONINFOW)&rtlinfo); + g_WinVersion = (rtlinfo.dwMajorVersion << 8) | rtlinfo.dwMinorVersion; + + trace("g_WinVersion=0x%x\n", g_WinVersion); + + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + CreateObjectsFromPersistFolder(); + CreateDropTarget(); + CreateExtractIcon(); + + CoUninitialize(); +} diff --git a/modules/rostests/apitests/fontext/testlist.c b/modules/rostests/apitests/fontext/testlist.c new file mode 100644 index 00000000000..08fc9631feb --- /dev/null +++ b/modules/rostests/apitests/fontext/testlist.c @@ -0,0 +1,12 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_shellext(void); + +const struct test winetest_testlist[] = +{ + { "shellext", func_shellext }, + { 0, 0 } +};

1 0

[reactos] 01/09: [SHELL32] Demote an ERR to WARN
by Mark Jansen 19 Oct '19

19 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d7ae44059399f633f956… commit 5d7ae44059399f633f956c8010c8944af9003746 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 4 02:42:31 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Oct 19 18:41:52 2019 +0200 [SHELL32] Demote an ERR to WARN --- dll/win32/shell32/CDefaultContextMenu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index a57b5324fce..55e0121a749 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -386,7 +386,7 @@ CDefaultContextMenu::LoadDynamicContextMenuHandler(HKEY hKey, const CLSID *pclsi hr = pExtInit->Initialize(m_pidlFolder, m_pDataObj, hKey); if (FAILED(hr)) { - ERR("IShellExtInit::Initialize failed.clsid %s hr 0x%x\n", wine_dbgstr_guid(pclsid), hr); + WARN("IShellExtInit::Initialize failed.clsid %s hr 0x%x\n", wine_dbgstr_guid(pclsid), hr); return hr; }

1 0

[reactos] 02/02: [MOUNTMGR] Don't kill Mm when a device has several symlinks
by Pierre Schweitzer 19 Oct '19

19 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a058e680b662ad4aca76e… commit a058e680b662ad4aca76e1fe4803fe033c124aa2 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 19 18:04:30 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 19 18:04:30 2019 +0200 [MOUNTMGR] Don't kill Mm when a device has several symlinks On preflight to compute output size, device name & unique ID were counted only once per device. Then, on copy, these two were copied on every MOUNTMGR_MOUNT_POINT structure. This is counter efficient (data duplication) but also, it was overruning the output buffer, since the preflight was not expecting these extra copies. --- drivers/filters/mountmgr/point.c | 55 ++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 14 deletions(-) diff --git a/drivers/filters/mountmgr/point.c b/drivers/filters/mountmgr/point.c index a2469b0de82..38260a57c2a 100644 --- a/drivers/filters/mountmgr/point.c +++ b/drivers/filters/mountmgr/point.c @@ -241,11 +241,12 @@ QueryPointsFromMemory(IN PDEVICE_EXTENSION DeviceExtension, NTSTATUS Status; PIO_STACK_LOCATION Stack; UNICODE_STRING DeviceName; - ULONG TotalSize, TotalSymLinks; PMOUNTMGR_MOUNT_POINTS MountPoints; PDEVICE_INFORMATION DeviceInformation; PLIST_ENTRY DeviceEntry, SymlinksEntry; PSYMLINK_INFORMATION SymlinkInformation; + USHORT UniqueIdLength, DeviceNameLength; + ULONG TotalSize, TotalSymLinks, UniqueIdOffset, DeviceNameOffset; /* If we got a symbolic link, query device */ if (SymbolicName) @@ -384,6 +385,26 @@ QueryPointsFromMemory(IN PDEVICE_EXTENSION DeviceExtension, } } + /* Save our information about shared data */ + UniqueIdOffset = TotalSize; + UniqueIdLength = DeviceInformation->UniqueId->UniqueIdLength; + DeviceNameOffset = TotalSize + UniqueIdLength; + DeviceNameLength = DeviceInformation->DeviceName.Length; + + /* Initialize first symlink */ + MountPoints->MountPoints[TotalSymLinks].UniqueIdOffset = UniqueIdOffset; + MountPoints->MountPoints[TotalSymLinks].UniqueIdLength = UniqueIdLength; + MountPoints->MountPoints[TotalSymLinks].DeviceNameOffset = DeviceNameOffset; + MountPoints->MountPoints[TotalSymLinks].DeviceNameLength = DeviceNameLength; + + /* And copy data */ + RtlCopyMemory((PWSTR)((ULONG_PTR)MountPoints + UniqueIdOffset), + DeviceInformation->UniqueId->UniqueId, UniqueIdLength); + RtlCopyMemory((PWSTR)((ULONG_PTR)MountPoints + DeviceNameOffset), + DeviceInformation->DeviceName.Buffer, DeviceNameLength); + + TotalSize += DeviceInformation->UniqueId->UniqueIdLength + DeviceInformation->DeviceName.Length; + /* Now we've got it, but all the data */ for (SymlinksEntry = DeviceInformation->SymbolicLinksListHead.Flink; SymlinksEntry != &(DeviceInformation->SymbolicLinksListHead); @@ -391,27 +412,33 @@ QueryPointsFromMemory(IN PDEVICE_EXTENSION DeviceExtension, { SymlinkInformation = CONTAINING_RECORD(SymlinksEntry, SYMLINK_INFORMATION, SymbolicLinksListEntry); + /* First, set shared data */ + + /* Only put UniqueID if online */ + if (SymlinkInformation->Online) + { + MountPoints->MountPoints[TotalSymLinks].UniqueIdOffset = UniqueIdOffset; + MountPoints->MountPoints[TotalSymLinks].UniqueIdLength = UniqueIdLength; + } + else + { + MountPoints->MountPoints[TotalSymLinks].UniqueIdOffset = 0; + MountPoints->MountPoints[TotalSymLinks].UniqueIdLength = 0; + } + + MountPoints->MountPoints[TotalSymLinks].DeviceNameOffset = DeviceNameOffset; + MountPoints->MountPoints[TotalSymLinks].DeviceNameLength = DeviceNameLength; + + /* And now, copy specific symlink info */ MountPoints->MountPoints[TotalSymLinks].SymbolicLinkNameOffset = TotalSize; MountPoints->MountPoints[TotalSymLinks].SymbolicLinkNameLength = SymlinkInformation->Name.Length; - MountPoints->MountPoints[TotalSymLinks].UniqueIdOffset = SymlinkInformation->Name.Length + - TotalSize; - MountPoints->MountPoints[TotalSymLinks].UniqueIdLength = DeviceInformation->UniqueId->UniqueIdLength; - MountPoints->MountPoints[TotalSymLinks].DeviceNameOffset = SymlinkInformation->Name.Length + - DeviceInformation->UniqueId->UniqueIdLength + - TotalSize; - MountPoints->MountPoints[TotalSymLinks].DeviceNameLength = DeviceInformation->DeviceName.Length; RtlCopyMemory((PWSTR)((ULONG_PTR)MountPoints + MountPoints->MountPoints[TotalSymLinks].SymbolicLinkNameOffset), SymlinkInformation->Name.Buffer, SymlinkInformation->Name.Length); - RtlCopyMemory((PWSTR)((ULONG_PTR)MountPoints + MountPoints->MountPoints[TotalSymLinks].UniqueIdOffset), - DeviceInformation->UniqueId->UniqueId, DeviceInformation->UniqueId->UniqueIdLength); - RtlCopyMemory((PWSTR)((ULONG_PTR)MountPoints + MountPoints->MountPoints[TotalSymLinks].DeviceNameOffset), - DeviceInformation->DeviceName.Buffer, DeviceInformation->DeviceName.Length); /* Update counters */ TotalSymLinks++; - TotalSize += SymlinkInformation->Name.Length + DeviceInformation->UniqueId->UniqueIdLength + - DeviceInformation->DeviceName.Length; + TotalSize += SymlinkInformation->Name.Length; } if (UniqueId || SymbolicName)

1 0

[reactos] 01/02: [MOUNTMGR_APITEST] Dump offsets
by Pierre Schweitzer 19 Oct '19

19 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=67d3fbdd97ef967573b74… commit 67d3fbdd97ef967573b7405e4310ae4bdfd8d7f0 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 19 18:00:36 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 19 18:00:36 2019 +0200 [MOUNTMGR_APITEST] Dump offsets That shows that some offset are shared (everything but the symlinks) --- modules/rostests/apitests/mountmgr/QueryPoints.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/rostests/apitests/mountmgr/QueryPoints.c b/modules/rostests/apitests/mountmgr/QueryPoints.c index e0341aec7d1..a56b1496606 100644 --- a/modules/rostests/apitests/mountmgr/QueryPoints.c +++ b/modules/rostests/apitests/mountmgr/QueryPoints.c @@ -12,7 +12,9 @@ TraceMountPoint(PMOUNTMGR_MOUNT_POINTS MountPoints, PMOUNTMGR_MOUNT_POINT MountPoint) { trace("MountPoint: %p\n", MountPoint); + trace("\tSymbolicOffset: %ld\n", MountPoint->SymbolicLinkNameOffset); trace("\tSymbolicLinkName: %.*S\n", MountPoint->SymbolicLinkNameLength / sizeof(WCHAR), (PWSTR)((ULONG_PTR)MountPoints + MountPoint->SymbolicLinkNameOffset)); + trace("\tDeviceOffset: %ld\n", MountPoint->DeviceNameOffset); trace("\tDeviceName: %.*S\n", MountPoint->DeviceNameLength / sizeof(WCHAR), (PWSTR)((ULONG_PTR)MountPoints + MountPoint->DeviceNameOffset)); }

1 0

[reactos] 05/05: [MOUNTMGR] Fix enumerating drive letter for creating new mountpoint
by Pierre Schweitzer 19 Oct '19

19 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a53992180dc4e378d7e9b… commit a53992180dc4e378d7e9b219bc6d854b75edfd6a Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 19 16:56:21 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 19 16:59:58 2019 +0200 [MOUNTMGR] Fix enumerating drive letter for creating new mountpoint This is purely a copypasta error fix, which was causing MountMgrNextDriveLetterWorker to fail as no drive letters were enumerated previously. With that set of patches, MountMgr now properly assigns drive letters to new devices! --- drivers/filters/mountmgr/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filters/mountmgr/device.c b/drivers/filters/mountmgr/device.c index ec9a04d063d..9b762890ea6 100644 --- a/drivers/filters/mountmgr/device.c +++ b/drivers/filters/mountmgr/device.c @@ -610,7 +610,7 @@ MountMgrNextDriveLetterWorker(IN PDEVICE_EXTENSION DeviceExtension, DriveLetterInfo->CurrentDriveLetter <= L'Z'; DriveLetterInfo->CurrentDriveLetter++) { - NameBuffer[LETTER_POSITION] = DeviceInformation->SuggestedDriveLetter; + NameBuffer[LETTER_POSITION] = DriveLetterInfo->CurrentDriveLetter; Status = MountMgrCreatePointWorker(DeviceExtension, &SymbolicName, &TargetDeviceName); if (NT_SUCCESS(Status))

1 0

[reactos] 04/05: [MOUNTMGR] Fix interpretation of QueryDeviceInformation GptDriveLetter
by Pierre Schweitzer 19 Oct '19

19 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e359a3c8881b1ebb1a960… commit e359a3c8881b1ebb1a96080ba456c94d7f17f95c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 19 16:53:45 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 19 16:59:58 2019 +0200 [MOUNTMGR] Fix interpretation of QueryDeviceInformation GptDriveLetter Being TRUE doesn't mean the device is GPT and has a drive letter. It just means that it's not a GPT device with GPT_BASIC_DATA_ATTRIBUTE_NO_DRIVE_LETTER attribute. In short, if TRUE, it means that the device can receive a drive letter mount point. This fixes MountMgrNextDriveLetterWorker bailing out for any attempt to assign a drive letter to a device. --- drivers/filters/mountmgr/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/filters/mountmgr/device.c b/drivers/filters/mountmgr/device.c index 4f3f9d2974e..ec9a04d063d 100644 --- a/drivers/filters/mountmgr/device.c +++ b/drivers/filters/mountmgr/device.c @@ -524,11 +524,12 @@ MountMgrNextDriveLetterWorker(IN PDEVICE_EXTENSION DeviceExtension, } /* If we didn't find a drive letter online - * ensure there's no GPT drive letter nor no drive entry + * ensure this is not a no drive entry + * by querying GPT attributes & database */ if (NextEntry == &(DeviceInformation->SymbolicLinksListHead)) { - if (GptDriveLetter || HasNoDriveLetterEntry(DeviceInformation->UniqueId)) + if (!GptDriveLetter || HasNoDriveLetterEntry(DeviceInformation->UniqueId)) { DriveLetterInfo->DriveLetterWasAssigned = FALSE; DriveLetterInfo->CurrentDriveLetter = 0;

1 0

[reactos] 03/05: [MOUNTMGR] Fix IsFtVolume so that it returns TRUE only for FT volumes
by Pierre Schweitzer 19 Oct '19

19 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=961693f0609a6998a8b88… commit 961693f0609a6998a8b8810d0e30001d36f7e0fd Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 19 16:52:29 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 19 16:59:58 2019 +0200 [MOUNTMGR] Fix IsFtVolume so that it returns TRUE only for FT volumes --- drivers/filters/mountmgr/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filters/mountmgr/device.c b/drivers/filters/mountmgr/device.c index 8ed81e327d0..4f3f9d2974e 100644 --- a/drivers/filters/mountmgr/device.c +++ b/drivers/filters/mountmgr/device.c @@ -393,7 +393,7 @@ IsFtVolume(IN PUNICODE_STRING SymbolicName) } /* Check if this is a FT volume */ - return IsRecognizedPartition(PartitionInfo.PartitionType); + return IsFTPartition(PartitionInfo.PartitionType); } /*

1 0

[reactos] 02/05: [MOUNTMGR] Query proper device when creating mount point
by Pierre Schweitzer 19 Oct '19

19 Oct '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=225a1e92bdc58314c831b… commit 225a1e92bdc58314c831b5d1c9f5a7d3358da8c9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Oct 19 16:34:38 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Oct 19 16:59:57 2019 +0200 [MOUNTMGR] Query proper device when creating mount point We must query the target device, and not the symbolic link we attempt to create. The later will always fail as it doesn't exist yet. This fixes MountMgrCreatePointWorker not working. --- drivers/filters/mountmgr/point.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filters/mountmgr/point.c b/drivers/filters/mountmgr/point.c index 35fe8bb2435..a2469b0de82 100644 --- a/drivers/filters/mountmgr/point.c +++ b/drivers/filters/mountmgr/point.c @@ -44,7 +44,7 @@ MountMgrCreatePointWorker(IN PDEVICE_EXTENSION DeviceExtension, PDEVICE_INFORMATION DeviceInformation = NULL, DeviceInfo; /* Get device name */ - Status = QueryDeviceInformation(SymbolicLinkName, + Status = QueryDeviceInformation(DeviceName, &TargetDeviceName, NULL, NULL, NULL, NULL, NULL, NULL);

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