From 2377fc099daf467e9b77e4e9d71d89f5b8d84554 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Sun, 30 Mar 2014 15:58:45 +0400 Subject: [PATCH] scrrun: Implement TotalSize property for a drive. --- dlls/scrrun/filesystem.c | 14 ++++++++++++-- dlls/scrrun/tests/filesystem.c | 10 ++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index d963719a759..04d649d5a6f 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -753,8 +753,18 @@ static HRESULT WINAPI drive_get_FreeSpace(IDrive *iface, VARIANT *v) static HRESULT WINAPI drive_get_TotalSize(IDrive *iface, VARIANT *v) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, v); - return E_NOTIMPL; + ULARGE_INTEGER total; + + TRACE("(%p)->(%p)\n", This, v); + + if (!v) + return E_POINTER; + + if (!GetDiskFreeSpaceExW(This->root, NULL, &total, NULL)) + return E_FAIL; + + V_VT(v) = VT_R8; + return VarR8FromUI8(total.QuadPart, &V_R8(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 4128bf575bf..215df428448 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1247,12 +1247,22 @@ static void test_DriveCollection(void) hr = IDrive_get_IsReady(drive, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); + hr = IDrive_get_TotalSize(drive, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + if (type == Fixed) { VARIANT_BOOL ready = VARIANT_FALSE; + VARIANT size; hr = IDrive_get_IsReady(drive, &ready); ok(hr == S_OK, "got 0x%08x\n", hr); ok(ready == VARIANT_TRUE, "got %x\n", ready); + + V_VT(&size) = VT_EMPTY; + hr = IDrive_get_TotalSize(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)); } VariantClear(&var); } -- 2.11.4.GIT