system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

scrrun: Return disk space as VT_I4 if it fits.

Browse source
This commit is contained in:
Nikolay Sivov 2014-05-17 20:55:58 +04:00 committed by Alexandre Julliard
parent 108c27313b
commit 9d95788f12
2 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
dlls/scrrun/filesystem.c
View file

@ -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)

14
dlls/scrrun/tests/filesystem.c
View file

@ -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);
}