Nikolay Sivov : scrrun: Return disk space as VT_I4 if it fits.
Alexandre Julliard
julliard at winehq.org
Mon May 19 15:09:59 CDT 2014
Module: wine
Branch: master
Commit: 9d95788f121d58c7cde90da8e5debb0bd8ad8b9b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d95788f121d58c7cde90da8e5debb0bd8ad8b9b
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Sat May 17 20:55:58 2014 +0400
scrrun: Return disk space as VT_I4 if it fits.
---
dlls/scrrun/filesystem.c | 27 +++++++++++++++++++++------
dlls/scrrun/tests/filesystem.c | 14 ++++++++++----
2 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c
index f5afb91..9412491 100644
--- a/dlls/scrrun/filesystem.c
+++ b/dlls/scrrun/filesystem.c
@@ -888,6 +888,24 @@ static HRESULT WINAPI drive_get_RootFolder(IDrive *iface, IFolder **folder)
return E_NOTIMPL;
}
+static HRESULT variant_from_largeint(const ULARGE_INTEGER *src, VARIANT *v)
+{
+ HRESULT hr = S_OK;
+
+ if (src->HighPart)
+ {
+ V_VT(v) = VT_R8;
+ hr = VarR8FromUI8(src->QuadPart, &V_R8(v));
+ }
+ else
+ {
+ V_VT(v) = VT_I4;
+ V_I4(v) = src->LowPart;
+ }
+
+ return hr;
+}
+
static HRESULT WINAPI drive_get_AvailableSpace(IDrive *iface, VARIANT *v)
{
struct drive *This = impl_from_IDrive(iface);
@@ -901,8 +919,7 @@ static HRESULT WINAPI drive_get_AvailableSpace(IDrive *iface, VARIANT *v)
if (!GetDiskFreeSpaceExW(This->root, &avail, NULL, NULL))
return E_FAIL;
- V_VT(v) = VT_R8;
- return VarR8FromUI8(avail.QuadPart, &V_R8(v));
+ return variant_from_largeint(&avail, v);
}
static HRESULT WINAPI drive_get_FreeSpace(IDrive *iface, VARIANT *v)
@@ -918,8 +935,7 @@ static HRESULT WINAPI drive_get_FreeSpace(IDrive *iface, VARIANT *v)
if (!GetDiskFreeSpaceExW(This->root, &freespace, NULL, NULL))
return E_FAIL;
- V_VT(v) = VT_R8;
- return VarR8FromUI8(freespace.QuadPart, &V_R8(v));
+ return variant_from_largeint(&freespace, v);
}
static HRESULT WINAPI drive_get_TotalSize(IDrive *iface, VARIANT *v)
@@ -935,8 +951,7 @@ static HRESULT WINAPI drive_get_TotalSize(IDrive *iface, VARIANT *v)
if (!GetDiskFreeSpaceExW(This->root, NULL, &total, NULL))
return E_FAIL;
- V_VT(v) = VT_R8;
- return VarR8FromUI8(total.QuadPart, &V_R8(v));
+ return variant_from_largeint(&total, v);
}
static HRESULT WINAPI drive_get_VolumeName(IDrive *iface, BSTR *name)
diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c
index 531b732..61cadb9 100644
--- a/dlls/scrrun/tests/filesystem.c
+++ b/dlls/scrrun/tests/filesystem.c
@@ -1294,14 +1294,20 @@ static void test_DriveCollection(void)
V_VT(&size) = VT_EMPTY;
hr = IDrive_get_AvailableSpace(drive, &size);
ok(hr == S_OK, "got 0x%08x\n", hr);
- ok(V_VT(&size) == VT_R8, "got %d\n", V_VT(&size));
- ok(V_R8(&size) > 0, "got %f\n", V_R8(&size));
+ ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size));
+ if (V_VT(&size) == VT_R8)
+ ok(V_R8(&size) > 0, "got %f\n", V_R8(&size));
+ else
+ ok(V_I4(&size) > 0, "got %d\n", V_I4(&size));
V_VT(&size) = VT_EMPTY;
hr = IDrive_get_FreeSpace(drive, &size);
ok(hr == S_OK, "got 0x%08x\n", hr);
- ok(V_VT(&size) == VT_R8, "got %d\n", V_VT(&size));
- ok(V_R8(&size) > 0, "got %f\n", V_R8(&size));
+ ok(V_VT(&size) == VT_R8 || V_VT(&size) == VT_I4, "got %d\n", V_VT(&size));
+ if (V_VT(&size) == VT_R8)
+ ok(V_R8(&size) > 0, "got %f\n", V_R8(&size));
+ else
+ ok(V_I4(&size) > 0, "got %d\n", V_I4(&size));
}
VariantClear(&var);
}
More information about the wine-cvs
mailing list