Zebediah Figura : kernel32: Call kernelbase DeviceIoControl() in kernel32 DeviceIoControl().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c4ff18f765b5d932f5e25aaf705522f13c6c0a36
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=c4ff18f765b5d932f5e25aaf705522f13c6c0a36

Author: Zebediah Figura <zfigura at codeweavers.com>
Date:   Thu Aug 26 20:54:11 2021 -0500

kernel32: Call kernelbase DeviceIoControl() in kernel32 DeviceIoControl().

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/kernel32/file.c        | 57 +++++++--------------------------------------
 dlls/kernel32/kernel32.spec |  2 +-
 2 files changed, 10 insertions(+), 49 deletions(-)

diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c
index 92022063ecc..4d6f893c92d 100644
--- a/dlls/kernel32/file.c
+++ b/dlls/kernel32/file.c
@@ -389,21 +389,16 @@ HANDLE WINAPI OpenVxDHandle(HANDLE hHandleRing3)
 /****************************************************************************
  *		DeviceIoControl (KERNEL32.@)
  */
-BOOL WINAPI DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode,
-                            LPVOID lpvInBuffer, DWORD cbInBuffer,
-                            LPVOID lpvOutBuffer, DWORD cbOutBuffer,
-                            LPDWORD lpcbBytesReturned,
-                            LPOVERLAPPED lpOverlapped)
+BOOL WINAPI KERNEL32_DeviceIoControl( HANDLE handle, DWORD code, void *in_buff, DWORD in_count,
+                                      void *out_buff, DWORD out_count, DWORD *returned,
+                                      OVERLAPPED *overlapped )
 {
-    NTSTATUS status;
-
-    TRACE( "(%p,%x,%p,%d,%p,%d,%p,%p)\n",
-           hDevice,dwIoControlCode,lpvInBuffer,cbInBuffer,
-           lpvOutBuffer,cbOutBuffer,lpcbBytesReturned,lpOverlapped );
+    TRACE( "(%p,%#x,%p,%d,%p,%d,%p,%p)\n",
+           handle, code, in_buff, in_count, out_buff, out_count, returned, overlapped );
 
     /* Check if this is a user defined control code for a VxD */
 
-    if (HIWORD( dwIoControlCode ) == 0 && (GetVersion() & 0x80000000))
+    if (HIWORD( code ) == 0 && (GetVersion() & 0x80000000))
     {
         typedef BOOL (WINAPI *DeviceIoProc)(DWORD, LPVOID, DWORD, LPVOID, DWORD, LPDWORD, LPOVERLAPPED);
         static DeviceIoProc (*vxd_get_proc)(HANDLE);
@@ -411,45 +406,11 @@ BOOL WINAPI DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode,
 
         if (!vxd_get_proc) vxd_get_proc = (void *)GetProcAddress( GetModuleHandleW(L"krnl386.exe16"),
                                                                   "__wine_vxd_get_proc" );
-        if (vxd_get_proc) proc = vxd_get_proc( hDevice );
-        if (proc) return proc( dwIoControlCode, lpvInBuffer, cbInBuffer,
-                               lpvOutBuffer, cbOutBuffer, lpcbBytesReturned, lpOverlapped );
+        if (vxd_get_proc) proc = vxd_get_proc( handle );
+        if (proc) return proc( code, in_buff, in_count, out_buff, out_count, returned, overlapped );
     }
 
-    /* Not a VxD, let ntdll handle it */
-
-    if (lpOverlapped)
-    {
-        LPVOID cvalue = ((ULONG_PTR)lpOverlapped->hEvent & 1) ? NULL : lpOverlapped;
-        lpOverlapped->Internal = STATUS_PENDING;
-        lpOverlapped->InternalHigh = 0;
-        if (HIWORD(dwIoControlCode) == FILE_DEVICE_FILE_SYSTEM)
-            status = NtFsControlFile(hDevice, lpOverlapped->hEvent,
-                                     NULL, cvalue, (PIO_STATUS_BLOCK)lpOverlapped,
-                                     dwIoControlCode, lpvInBuffer, cbInBuffer,
-                                     lpvOutBuffer, cbOutBuffer);
-        else
-            status = NtDeviceIoControlFile(hDevice, lpOverlapped->hEvent,
-                                           NULL, cvalue, (PIO_STATUS_BLOCK)lpOverlapped,
-                                           dwIoControlCode, lpvInBuffer, cbInBuffer,
-                                           lpvOutBuffer, cbOutBuffer);
-        if (lpcbBytesReturned) *lpcbBytesReturned = lpOverlapped->InternalHigh;
-    }
-    else
-    {
-        IO_STATUS_BLOCK iosb;
-
-        if (HIWORD(dwIoControlCode) == FILE_DEVICE_FILE_SYSTEM)
-            status = NtFsControlFile(hDevice, NULL, NULL, NULL, &iosb,
-                                     dwIoControlCode, lpvInBuffer, cbInBuffer,
-                                     lpvOutBuffer, cbOutBuffer);
-        else
-            status = NtDeviceIoControlFile(hDevice, NULL, NULL, NULL, &iosb,
-                                           dwIoControlCode, lpvInBuffer, cbInBuffer,
-                                           lpvOutBuffer, cbOutBuffer);
-        if (lpcbBytesReturned) *lpcbBytesReturned = iosb.Information;
-    }
-    return set_ntstatus( status );
+    return DeviceIoControl( handle, code, in_buff, in_count, out_buff, out_count, returned, overlapped );
 }
 
 
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index 6c02b17c7cf..90b503af19f 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -377,7 +377,7 @@
 @ stdcall DeleteVolumeMountPointA(str)
 @ stdcall -import DeleteVolumeMountPointW(wstr)
 @ stdcall -arch=x86_64 DequeueUmsCompletionListItems(ptr long ptr)
-@ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr)
+@ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) KERNEL32_DeviceIoControl
 @ stdcall -import DisableThreadLibraryCalls(long)
 @ stdcall -import DisconnectNamedPipe(long)
 @ stdcall DnsHostnameToComputerNameA (str ptr ptr)