Uniform SYS/VXD Handling 2/6: Cleanup arguments for existing VXDs
Uwe Bonnes
bon at elektron.ikp.physik.tu-darmstadt.de
Sun Jul 10 09:20:41 CDT 2005
Changelog:
DeviceIoControl are now called with hDevice, adapt existing code
--
Uwe Bonnes bon at elektron.ikp.physik.tu-darmstadt.de
Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt
--------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------
Index: wine/dlls/ifsmgr.vxd/ifsmgr.vxd.spec
===================================================================
RCS file: /home/wine/wine/dlls/ifsmgr.vxd/ifsmgr.vxd.spec,v
retrieving revision 1.1
diff -u -r1.1 ifsmgr.vxd.spec
--- wine/dlls/ifsmgr.vxd/ifsmgr.vxd.spec 20 Feb 2004 01:18:44 -0000 1.1
+++ wine/dlls/ifsmgr.vxd/ifsmgr.vxd.spec 10 Jul 2005 14:03:45 -0000
@@ -1 +1 @@
-@ stdcall DeviceIoControl(long ptr long ptr long ptr ptr) IFSMGR_DeviceIoControl
+@ stdcall DeviceIoControl(ptr long ptr long ptr long ptr ptr) IFSMGR_DeviceIoControl
Index: wine/dlls/ifsmgr.vxd/ifsmgr.c
===================================================================
RCS file: /home/wine/wine/dlls/ifsmgr.vxd/ifsmgr.c,v
retrieving revision 1.1
diff -u -r1.1 ifsmgr.c
--- wine/dlls/ifsmgr.vxd/ifsmgr.c 20 Feb 2004 01:18:44 -0000 1.1
+++ wine/dlls/ifsmgr.vxd/ifsmgr.c 10 Jul 2005 14:03:45 -0000
@@ -102,13 +102,13 @@
/***********************************************************************
* DeviceIoControl (IFSMGR.VXD.@)
*/
-BOOL WINAPI IFSMGR_DeviceIoControl(DWORD dwIoControlCode, LPVOID lpvInBuffer, DWORD cbInBuffer,
+BOOL WINAPI IFSMGR_DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpvInBuffer, DWORD cbInBuffer,
LPVOID lpvOutBuffer, DWORD cbOutBuffer,
LPDWORD lpcbBytesReturned,
LPOVERLAPPED lpOverlapped)
{
- TRACE("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n",
- dwIoControlCode, lpvInBuffer,cbInBuffer, lpvOutBuffer,cbOutBuffer,
+ TRACE("(%p %ld,%p,%ld,%p,%ld,%p,%p): stub\n",
+ hDevice, dwIoControlCode, lpvInBuffer,cbInBuffer, lpvOutBuffer,cbOutBuffer,
lpcbBytesReturned, lpOverlapped);
switch (dwIoControlCode)
Index: wine/dlls/vnbt.vxd/vnbt.vxd.spec
===================================================================
RCS file: /home/wine/wine/dlls/vnbt.vxd/vnbt.vxd.spec,v
retrieving revision 1.1
diff -u -r1.1 vnbt.vxd.spec
--- wine/dlls/vnbt.vxd/vnbt.vxd.spec 1 Mar 2004 23:35:25 -0000 1.1
+++ wine/dlls/vnbt.vxd/vnbt.vxd.spec 10 Jul 2005 14:04:37 -0000
@@ -1 +1 @@
-@ stdcall DeviceIoControl(long ptr long ptr long ptr ptr) VNBT_DeviceIoControl
+@ stdcall DeviceIoControl(ptr long ptr long ptr long ptr ptr) VNBT_DeviceIoControl
Index: wine/dlls/vnbt.vxd/vnbt.c
===================================================================
RCS file: /home/wine/wine/dlls/vnbt.vxd/vnbt.c,v
retrieving revision 1.3
diff -u -r1.3 vnbt.c
--- wine/dlls/vnbt.vxd/vnbt.c 24 Mar 2005 21:01:36 -0000 1.3
+++ wine/dlls/vnbt.vxd/vnbt.c 10 Jul 2005 14:04:37 -0000
@@ -59,7 +59,7 @@
/***********************************************************************
* DeviceIoControl (VNB.VXD.@)
*/
-BOOL WINAPI VNBT_DeviceIoControl(DWORD dwIoControlCode,
+BOOL WINAPI VNBT_DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode,
LPVOID lpvInBuffer, DWORD cbInBuffer,
LPVOID lpvOutBuffer, DWORD cbOutBuffer,
LPDWORD lpcbBytesReturned,
Index: wine/dlls/vdhcp.vxd/vdhcp.vxd.spec
===================================================================
RCS file: /home/wine/wine/dlls/vdhcp.vxd/vdhcp.vxd.spec,v
retrieving revision 1.1
diff -u -r1.1 vdhcp.vxd.spec
--- wine/dlls/vdhcp.vxd/vdhcp.vxd.spec 20 Feb 2004 01:18:43 -0000 1.1
+++ wine/dlls/vdhcp.vxd/vdhcp.vxd.spec 10 Jul 2005 14:05:06 -0000
@@ -1 +1 @@
-@ stdcall DeviceIoControl(long ptr long ptr long ptr ptr) VDHCP_DeviceIoControl
+@ stdcall DeviceIoControl(ptr long ptr long ptr long ptr ptr) VDHCP_DeviceIoControl
Index: wine/dlls/vdhcp.vxd/vdhcp.c
===================================================================
RCS file: /home/wine/wine/dlls/vdhcp.vxd/vdhcp.c,v
retrieving revision 1.1
diff -u -r1.1 vdhcp.c
--- wine/dlls/vdhcp.vxd/vdhcp.c 20 Feb 2004 01:18:43 -0000 1.1
+++ wine/dlls/vdhcp.vxd/vdhcp.c 10 Jul 2005 14:05:06 -0000
@@ -29,7 +29,7 @@
/***********************************************************************
* DeviceIoControl (VDHCP.VXD.@)
*/
-BOOL WINAPI VDHCP_DeviceIoControl(DWORD dwIoControlCode, LPVOID lpvInBuffer,
+BOOL WINAPI VDHCP_DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpvInBuffer,
DWORD cbInBuffer,
LPVOID lpvOutBuffer, DWORD cbOutBuffer,
LPDWORD lpcbBytesReturned,
@@ -62,7 +62,8 @@
break;
default:
- FIXME("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n",
+ FIXME("(%p %ld,%p,%ld,%p,%ld,%p,%p): stub\n",
+ hDevice,
dwIoControlCode,
lpvInBuffer,cbInBuffer,
lpvOutBuffer,cbOutBuffer,
Index: wine/dlls/vwin32.vxd/vwin32.vxd.spec
===================================================================
RCS file: /home/wine/wine/dlls/vwin32.vxd/vwin32.vxd.spec,v
retrieving revision 1.2
diff -u -r1.2 vwin32.vxd.spec
--- wine/dlls/vwin32.vxd/vwin32.vxd.spec 21 Feb 2004 04:13:56 -0000 1.2
+++ wine/dlls/vwin32.vxd/vwin32.vxd.spec 10 Jul 2005 14:05:47 -0000
@@ -1,2 +1,2 @@
-@ stdcall DeviceIoControl(long ptr long ptr long ptr ptr) VWIN32_DeviceIoControl
+@ stdcall DeviceIoControl(ptr long ptr long ptr long ptr ptr) VWIN32_DeviceIoControl
@ stdcall VxDCall(long ptr) VWIN32_VxDCall
Index: wine/dlls/vwin32.vxd/vwin32.c
===================================================================
RCS file: /home/wine/wine/dlls/vwin32.vxd/vwin32.c,v
retrieving revision 1.2
diff -u -r1.2 vwin32.c
--- wine/dlls/vwin32.vxd/vwin32.c 21 Feb 2004 04:13:56 -0000 1.2
+++ wine/dlls/vwin32.vxd/vwin32.c 10 Jul 2005 14:05:47 -0000
@@ -90,7 +90,7 @@
/***********************************************************************
* DeviceIoControl (VWIN32.VXD.@)
*/
-BOOL WINAPI VWIN32_DeviceIoControl(DWORD dwIoControlCode,
+BOOL WINAPI VWIN32_DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode,
LPVOID lpvInBuffer, DWORD cbInBuffer,
LPVOID lpvOutBuffer, DWORD cbOutBuffer,
LPDWORD lpcbBytesReturned, LPOVERLAPPED lpOverlapped)
Index: wine/dlls/vnetbios.vxd/vnetbios.vxd.spec
===================================================================
RCS file: /home/wine/wine/dlls/vnetbios.vxd/vnetbios.vxd.spec,v
retrieving revision 1.1
diff -u -r1.1 vnetbios.vxd.spec
--- wine/dlls/vnetbios.vxd/vnetbios.vxd.spec 20 Feb 2004 01:18:43 -0000 1.1
+++ wine/dlls/vnetbios.vxd/vnetbios.vxd.spec 10 Jul 2005 14:06:13 -0000
@@ -1 +1 @@
-@ stdcall DeviceIoControl(long ptr long ptr long ptr ptr) VNETBIOS_DeviceIoControl
+@ stdcall DeviceIoControl(ptr long ptr long ptr long ptr ptr) VNETBIOS_DeviceIoControl
Index: wine/dlls/vnetbios.vxd/vnetbios.c
===================================================================
RCS file: /home/wine/wine/dlls/vnetbios.vxd/vnetbios.c,v
retrieving revision 1.1
diff -u -r1.1 vnetbios.c
--- wine/dlls/vnetbios.vxd/vnetbios.c 20 Feb 2004 01:18:43 -0000 1.1
+++ wine/dlls/vnetbios.vxd/vnetbios.c 10 Jul 2005 14:06:13 -0000
@@ -29,7 +29,7 @@
/***********************************************************************
* DeviceIoControl (VNETBIOS.VXD.@)
*/
-BOOL WINAPI VNETBIOS_DeviceIoControl( DWORD code, LPVOID lpvInBuffer, DWORD cbInBuffer,
+BOOL WINAPI VNETBIOS_DeviceIoControl( HANDLE hDevice, DWORD code, LPVOID lpvInBuffer, DWORD cbInBuffer,
LPVOID lpvOutBuffer, DWORD cbOutBuffer,
LPDWORD lpcbBytesReturned, LPOVERLAPPED lpOverlapped )
{
@@ -39,8 +39,8 @@
Netbios(lpvInBuffer);
return TRUE;
default:
- FIXME("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n",
- code, lpvInBuffer,cbInBuffer, lpvOutBuffer,cbOutBuffer,
+ FIXME("(%p %ld,%p,%ld,%p,%ld,%p,%p): stub\n",
+ hDevice, code, lpvInBuffer,cbInBuffer, lpvOutBuffer,cbOutBuffer,
lpcbBytesReturned, lpOverlapped);
return FALSE;
}
Index: wine/dlls/monodebg.vxd/monodebg.vxd.spec
===================================================================
RCS file: /home/wine/wine/dlls/monodebg.vxd/monodebg.vxd.spec,v
retrieving revision 1.1
diff -u -r1.1 monodebg.vxd.spec
--- wine/dlls/monodebg.vxd/monodebg.vxd.spec 20 Feb 2004 01:18:43 -0000 1.1
+++ wine/dlls/monodebg.vxd/monodebg.vxd.spec 10 Jul 2005 14:07:04 -0000
@@ -1 +1 @@
-@ stdcall DeviceIoControl(long ptr long ptr long ptr ptr) MONODEBG_DeviceIoControl
+@ stdcall DeviceIoControl(ptr long ptr long ptr long ptr ptr) MONODEBG_DeviceIoControl
Index: wine/dlls/monodebg.vxd/monodebg.c
===================================================================
RCS file: /home/wine/wine/dlls/monodebg.vxd/monodebg.c,v
retrieving revision 1.1
diff -u -r1.1 monodebg.c
--- wine/dlls/monodebg.vxd/monodebg.c 20 Feb 2004 01:18:43 -0000 1.1
+++ wine/dlls/monodebg.vxd/monodebg.c 10 Jul 2005 14:07:04 -0000
@@ -31,7 +31,7 @@
/***********************************************************************
* DeviceIoControl (MONODEBG.VXD.@)
*/
-BOOL WINAPI MONODEBG_DeviceIoControl(DWORD dwIoControlCode,
+BOOL WINAPI MONODEBG_DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode,
LPVOID lpvInBuffer, DWORD cbInBuffer,
LPVOID lpvOutBuffer, DWORD cbOutBuffer,
LPDWORD lpcbBytesReturned,
@@ -46,8 +46,9 @@
ERR("%s\n",debugstr_a(lpvInBuffer));
break;
default:
- FIXME("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n",
- dwIoControlCode,
+ FIXME("(%p %ld,%p,%ld,%p,%ld,%p,%p): stub\n",
+ hDevice,
+ dwIoControlCode,
lpvInBuffer,cbInBuffer,
lpvOutBuffer,cbOutBuffer,
lpcbBytesReturned,
Index: wine/dlls/vtdapi.vxd/vtdapi.vxd.spec
===================================================================
RCS file: /home/wine/wine/dlls/vtdapi.vxd/vtdapi.vxd.spec,v
retrieving revision 1.1
diff -u -r1.1 vtdapi.vxd.spec
--- wine/dlls/vtdapi.vxd/vtdapi.vxd.spec 20 Feb 2004 01:18:43 -0000 1.1
+++ wine/dlls/vtdapi.vxd/vtdapi.vxd.spec 10 Jul 2005 14:07:35 -0000
@@ -1 +1 @@
-@ stdcall DeviceIoControl(long ptr long ptr long ptr ptr) VTDAPI_DeviceIoControl
+@ stdcall DeviceIoControl(ptr long ptr long ptr long ptr ptr) VTDAPI_DeviceIoControl
Index: wine/dlls/vtdapi.vxd/vtdapi.c
===================================================================
RCS file: /home/wine/wine/dlls/vtdapi.vxd/vtdapi.c,v
retrieving revision 1.1
diff -u -r1.1 vtdapi.c
--- wine/dlls/vtdapi.vxd/vtdapi.c 20 Feb 2004 01:18:43 -0000 1.1
+++ wine/dlls/vtdapi.vxd/vtdapi.c 10 Jul 2005 14:07:35 -0000
@@ -28,7 +28,7 @@
/***********************************************************************
* DeviceIoControl (VTDAPI.VXD.@)
*/
-BOOL WINAPI VTDAPI_DeviceIoControl( DWORD code, LPVOID lpvInBuffer, DWORD cbInBuffer,
+BOOL WINAPI VTDAPI_DeviceIoControl( HANDLE hDevice, DWORD code, LPVOID lpvInBuffer, DWORD cbInBuffer,
LPVOID lpvOutBuffer, DWORD cbOutBuffer,
LPDWORD lpcbBytesReturned, LPOVERLAPPED lpOverlapped )
{
More information about the wine-patches
mailing list