[ros-diffs] [tfaber] 63733: [WBEMPROX] - Don't omit lpBytesReturned in DeviceIoControl call ROSTESTS-120 #resolve

Author: tfaber
Date: Wed Jul 23 18:50:09 2014
New Revision: 63733

URL: http://svn.reactos.org/svn/reactos?rev=63733&view=rev
Log:
[WBEMPROX]
- Don't omit lpBytesReturned in DeviceIoControl call
ROSTESTS-120 #resolve

Modified:
    trunk/reactos/dll/win32/wbemprox/builtin.c
    trunk/rostests/winetests/wbemprox/query.c

Modified: trunk/reactos/dll/win32/wbemprox/builtin.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/builtin…
==============================================================================
--- trunk/reactos/dll/win32/wbemprox/builtin.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wbemprox/builtin.c	[iso-8859-1] Wed Jul 23 18:50:09 2014
@@ -1477,6 +1477,7 @@
     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 @@
     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 );
     }

Modified: trunk/rostests/winetests/wbemprox/query.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wbemprox/query.…
==============================================================================
--- trunk/rostests/winetests/wbemprox/query.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/wbemprox/query.c	[iso-8859-1] Wed Jul 23 18:50:09 2014
@@ -675,14 +675,7 @@
                             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 );