From 304292d17ed37fd6b6f99ce1e2ea83f01d28d529 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Wed, 23 Jul 2014 18:50:09 +0000 Subject: [PATCH] [WBEMPROX] - Don't omit lpBytesReturned in DeviceIoControl call ROSTESTS-120 #resolve svn path=/trunk/; revision=63733 --- reactos/dll/win32/wbemprox/builtin.c | 3 ++- rostests/winetests/wbemprox/query.c | 9 +-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/reactos/dll/win32/wbemprox/builtin.c b/reactos/dll/win32/wbemprox/builtin.c index c053be79646..b2369e710ac 100644 --- a/reactos/dll/win32/wbemprox/builtin.c +++ b/reactos/dll/win32/wbemprox/builtin.c @@ -1477,6 +1477,7 @@ static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) ULARGE_INTEGER free; DISK_GEOMETRY_EX info; HANDLE handle; + DWORD bytes_returned; free.QuadPart = 512 * 1024 * 1024; GetDiskFreeSpaceExW( dir, NULL, NULL, &free ); @@ -1485,7 +1486,7 @@ static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) handle = CreateFileW( root, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); if (handle != INVALID_HANDLE_VALUE) { - if (DeviceIoControl( handle, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0, &info, sizeof(info), NULL, NULL )) + if (DeviceIoControl( handle, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0, &info, sizeof(info), &bytes_returned, NULL )) *disksize = info.DiskSize.QuadPart; CloseHandle( handle ); } diff --git a/rostests/winetests/wbemprox/query.c b/rostests/winetests/wbemprox/query.c index e1ed5beb49e..d244dad3109 100644 --- a/rostests/winetests/wbemprox/query.c +++ b/rostests/winetests/wbemprox/query.c @@ -675,14 +675,7 @@ START_TEST(query) RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); - if (!winetest_interactive) - { - skip("test_select( services ), ROSTESTS-120\n"); - } - else - { - test_select( services ); - } + test_select( services ); test_Win32_Process( services ); test_Win32_Service( services ); test_StdRegProv( services ); -- 2.17.1