[PATCH 0/2] MR7050: scrrun/tests: Add drive_get_path test and implements drive_get_path

[Quinn Rafferty (＠ramleejo)]

Creates a test to verify functionality of drive_get_path. Implements scrrun:drive_get_path 

Wine-bug https://bugs.winehq.org/show_bug.cgi?id=57539

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7050

[PATCH 1/2] scrrun/tests: Add drive_get_path test

[Quinn Rafferty]

From: Quinn Rafferty <ramleejo(a)yahoo.com>

The part one of the test gets the letter and path of a fixed drive.
It then uses the path to get the drive. The test then verifies it
is the same drive from before by comparing drive letters.

Wine-bug https://bugs.winehq.org/show_bug.cgi?id=57539
---
 dlls/scrrun/tests/filesystem.c | 65 +++++++++++++++++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c
index e53bd092ce9..fc959fbdafd 100644
--- a/dlls/scrrun/tests/filesystem.c
+++ b/dlls/scrrun/tests/filesystem.c
@@ -2729,6 +2729,68 @@ static void test_DoOpenPipeStream(void)
         ITextStream_Release(stream_write);
 }
 
+static void test_DriveGetPath(void)
+{
+    HRESULT hr;
+    IDrive *drive;
+    BSTR path, drive_letter;
+
+    drive = get_fixed_drive();
+    if (!drive) {
+        skip("No fixed drive found, skipping test.\n");
+        return;
+    }
+    /*Gets the letter of the drive for comparison later*/
+    drive_letter = NULL;
+    hr = IDrive_get_DriveLetter(drive, &drive_letter);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+
+
+    hr = IDrive_get_Path(drive, NULL);
+    ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
+
+
+    /*Get the path*/
+    path = NULL;
+    hr = IDrive_get_Path(drive, &path);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(path != NULL, "got %p\n", path);
+
+
+    IDrive_Release(drive);
+
+    /*If the path can be used to get the drive, it works.*/
+    if(path != NULL && drive_letter != NULL){
+        IDrive *drive_result;
+        BSTR result;
+        
+        hr = IFileSystem3_GetDrive(fs3, path, &drive_result);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        
+        /*Get the letter of the returned drive*/
+        if(SUCCEEDED(hr)){ 
+          result = NULL;
+          hr = IDrive_get_DriveLetter(drive, &result);
+          ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+          ok(result != NULL, "got %p\n", result);
+        }
+
+        if (SUCCEEDED(hr) && result != NULL) {
+            /*The path was successfuly returned*/
+            ok(!lstrcmpW(drive_letter, result), "got %s, expected %s for drive spec %s\n",
+                    wine_dbgstr_w(result), 
+                    wine_dbgstr_w(drive_letter),
+                    wine_dbgstr_w(path));      
+                    
+            SysFreeString(result);  
+        }
+
+        IDrive_Release(drive_result);
+    }
+
+    SysFreeString(path);
+    SysFreeString(drive_letter);
+}
 START_TEST(filesystem)
 {
     HRESULT hr;
@@ -2773,7 +2835,8 @@ START_TEST(filesystem)
     test_GetSpecialFolder();
     test_MoveFile();
     test_DoOpenPipeStream();
-
+    test_DriveGetPath();
+    
     IFileSystem3_Release(fs3);
 
     CoUninitialize();
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/7050

[PATCH 2/2] scrrun: Implemented drive_get_path

[Quinn Rafferty]

From: Quinn Rafferty <ramleejo(a)yahoo.com>

The implementation calls GetVolumePathNameW with drive->root.
It then returns the result of that call in the path argument.

https://bugs.winehq.org/show_bug.cgi?id=57539
---
 dlls/scrrun/filesystem.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c
index e53355267db..90fd74caf14 100644
--- a/dlls/scrrun/filesystem.c
+++ b/dlls/scrrun/filesystem.c
@@ -1088,8 +1088,20 @@ static HRESULT WINAPI drive_Invoke(IDrive *iface, DISPID dispIdMember,
 static HRESULT WINAPI drive_get_Path(IDrive *iface, BSTR *path)
 {
     struct drive *This = impl_from_IDrive(iface);
-    FIXME("(%p)->(%p): stub\n", This, path);
-    return E_NOTIMPL;
+    WCHAR pathW[MAX_PATH];
+    BOOL ret;
+
+    TRACE("(%p)->(%p)\n", This, path);
+
+    if (!path){
+        return E_POINTER;
+    }
+
+    ret = GetVolumePathNameW(This->root, pathW, MAX_PATH);
+    if(ret)
+        *path = SysAllocString(pathW);
+    
+    return ret ? S_OK : E_FAIL;
 }
 
 static HRESULT WINAPI drive_get_DriveLetter(IDrive *iface, BSTR *letter)
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/7050

[Nikolay Sivov (＠nsivov)]

This will need some cleanup too, but more importantly the test should actually check the path as direct as possible. For example using same GetVolumePathNameW() and comparing results.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7050#note_90953