winapi_check: fixed some issues

Patrik Stridvall ps at leissner.se
Fri Feb 27 12:01:27 CST 2004


* dlls/kernel/kernel32.spec,
  dlls/kernel/module.c,
  dlls/netapi32/wksta.c,
  dlls/oleaut32/safearray.c,
  dlls/oleaut32/varformat.c,
  dlls/oleaut32/variant.c,
  dlls/rasapi32/rasapi32.spec,
  dlls/wineps/wineps.spec,
  dlls/wininet/netconnection.c,
  dlls/x11drv/x11drv.spec,
  dlls/x11drv/xim.c:
Fixed some issues found by winapi_check.

---8<---

Index: wine/dlls/kernel/kernel32.spec
===================================================================
RCS file: /home/wine/wine/dlls/kernel/kernel32.spec,v
retrieving revision 1.125
diff -u -u -r1.125 kernel32.spec
--- wine/dlls/kernel/kernel32.spec	24 Feb 2004 01:15:13 -0000	1.125
+++ wine/dlls/kernel/kernel32.spec	27 Feb 2004 17:55:38 -0000
@@ -1079,7 +1079,7 @@
 @ stdcall FindActCtxSectionGuid(long ptr long ptr ptr)
 @ stdcall FindActCtxSectionStringA(long ptr long str ptr)
 @ stdcall FindActCtxSectionStringW(long ptr long wstr ptr)
-@ stdcall GetCurrentActCtx()
+@ stdcall GetCurrentActCtx(ptr)
 @ stdcall QueryActCtxW(long ptr ptr long ptr long ptr)
 @ stdcall ReleaseActCtx(ptr)
 @ stdcall ZombifyActCtx(ptr)
Index: wine/dlls/kernel/module.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/module.c,v
retrieving revision 1.3
diff -u -u -r1.3 module.c
--- wine/dlls/kernel/module.c	31 Dec 2003 00:12:31 -0000	1.3
+++ wine/dlls/kernel/module.c	27 Feb 2004 17:55:38 -0000
@@ -25,9 +25,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
Index: wine/dlls/netapi32/wksta.c
===================================================================
RCS file: /home/wine/wine/dlls/netapi32/wksta.c,v
retrieving revision 1.14
diff -u -u -r1.14 wksta.c
--- wine/dlls/netapi32/wksta.c	10 Feb 2004 20:09:43 -0000	1.14
+++ wine/dlls/netapi32/wksta.c	27 Feb 2004 17:55:39 -0000
@@ -136,6 +136,10 @@
         *ptr1 = *ptr2;
     *ptr1 = '\0';
 }
+
+/***********************************************************************
+ *                NetWkstaTransportEnum  (NETAPI32.@)
+ */
  
 struct WkstaTransportEnumData
 {
@@ -146,6 +150,8 @@
     NET_API_STATUS ret;
 };
 
+/**********************************************************************/
+
 static BOOL WkstaEnumAdaptersCallback(UCHAR totalLANAs, UCHAR lanaIndex,
  ULONG transport, const NetBIOSAdapterImpl *data, void *closure)
 {
@@ -236,6 +242,8 @@
         ret = FALSE;
     return ret;
 }
+
+/**********************************************************************/
 
 NET_API_STATUS WINAPI 
 NetWkstaTransportEnum(LPWSTR ServerName, DWORD level, PBYTE* pbuf,
Index: wine/dlls/oleaut32/safearray.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/safearray.c,v
retrieving revision 1.33
diff -u -u -r1.33 safearray.c
--- wine/dlls/oleaut32/safearray.c	12 Jan 2004 21:06:30 -0000	1.33
+++ wine/dlls/oleaut32/safearray.c	27 Feb 2004 17:55:39 -0000
@@ -33,9 +33,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include "windef.h"
Index: wine/dlls/oleaut32/varformat.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/varformat.c,v
retrieving revision 1.2
diff -u -u -r1.2 varformat.c
--- wine/dlls/oleaut32/varformat.c	6 Jan 2004 22:08:34 -0000	1.2
+++ wine/dlls/oleaut32/varformat.c	27 Feb 2004 17:55:40 -0000
@@ -26,12 +26,8 @@
 
 #include "config.h"
 
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <string.h>
+#include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 
Index: wine/dlls/oleaut32/variant.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/variant.c,v
retrieving revision 1.89
diff -u -u -r1.89 variant.c
--- wine/dlls/oleaut32/variant.c	26 Feb 2004 05:27:11 -0000	1.89
+++ wine/dlls/oleaut32/variant.c	27 Feb 2004 17:55:41 -0000
@@ -24,12 +24,8 @@
 
 #include "config.h"
 
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <string.h>
+#include <stdlib.h>
 #include <stdarg.h>
 
 #define NONAMELESSUNION
Index: wine/dlls/rasapi32/rasapi32.spec
===================================================================
RCS file: /home/wine/wine/dlls/rasapi32/rasapi32.spec,v
retrieving revision 1.17
diff -u -u -r1.17 rasapi32.spec
--- wine/dlls/rasapi32/rasapi32.spec	13 Jun 2003 19:15:36 -0000	1.17
+++ wine/dlls/rasapi32/rasapi32.spec	27 Feb 2004 17:55:41 -0000
@@ -72,7 +72,7 @@
 @ stub RasSetSubEntryPropertiesA
 @ stub RasSetSubEntryPropertiesW
 @ stdcall RasValidateEntryNameA(str str)
-@ stub RasValidateEntryNameW
+@ stdcall RasValidateEntryNameW(wstr wstr)
 
 500 stub	RnaEngineRequest
 501 stub	DialEngineRequest
Index: wine/dlls/wineps/wineps.spec
===================================================================
RCS file: /home/wine/wine/dlls/wineps/wineps.spec,v
retrieving revision 1.23
diff -u -u -r1.23 wineps.spec
--- wine/dlls/wineps/wineps.spec	12 Jan 2004 21:08:31 -0000	1.23
+++ wine/dlls/wineps/wineps.spec	27 Feb 2004 17:55:42 -0000
@@ -32,7 +32,7 @@
 @ cdecl SelectFont(ptr long) PSDRV_SelectFont
 @ cdecl SelectPen(ptr long) PSDRV_SelectPen
 @ cdecl SetBkColor(ptr long) PSDRV_SetBkColor
-@ cdecl SetDeviceClipping(ptr long) PSDRV_SetDeviceClipping
+@ cdecl SetDeviceClipping(ptr long long) PSDRV_SetDeviceClipping
 @ cdecl SetPixel(ptr long long long) PSDRV_SetPixel
 @ cdecl SetTextColor(ptr long) PSDRV_SetTextColor
 @ cdecl StartDoc(ptr ptr) PSDRV_StartDoc
Index: wine/dlls/wininet/netconnection.c
===================================================================
RCS file: /home/wine/wine/dlls/wininet/netconnection.c,v
retrieving revision 1.5
diff -u -u -r1.5 netconnection.c
--- wine/dlls/wininet/netconnection.c	8 Oct 2003 19:09:44 -0000	1.5
+++ wine/dlls/wininet/netconnection.c	27 Feb 2004 17:55:42 -0000
@@ -26,9 +26,7 @@
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
Index: wine/dlls/x11drv/x11drv.spec
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/x11drv.spec,v
retrieving revision 1.53
diff -u -u -r1.53 x11drv.spec
--- wine/dlls/x11drv/x11drv.spec	21 Jan 2004 02:22:26 -0000	1.53
+++ wine/dlls/x11drv/x11drv.spec	27 Feb 2004 17:55:44 -0000
@@ -52,7 +52,7 @@
 @ cdecl SetDIBColorTable(ptr long long ptr) X11DRV_SetDIBColorTable
 @ cdecl SetDIBits(ptr long long long ptr ptr long) X11DRV_SetDIBits
 @ cdecl SetDIBitsToDevice(ptr long long long long long long long long ptr ptr long) X11DRV_SetDIBitsToDevice
-@ cdecl SetDeviceClipping(ptr long) X11DRV_SetDeviceClipping
+@ cdecl SetDeviceClipping(ptr long long) X11DRV_SetDeviceClipping
 @ cdecl SetDeviceGammaRamp(ptr ptr) X11DRV_SetDeviceGammaRamp
 @ cdecl SetPixel(ptr long long long) X11DRV_SetPixel
 @ cdecl SetPixelFormat(ptr long ptr) X11DRV_SetPixelFormat
Index: wine/dlls/x11drv/xim.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/xim.c,v
retrieving revision 1.2
diff -u -u -r1.2 xim.c
--- wine/dlls/x11drv/xim.c	9 Feb 2004 22:07:43 -0000	1.2
+++ wine/dlls/x11drv/xim.c	27 Feb 2004 17:55:44 -0000
@@ -314,7 +314,7 @@
     FIXME("PreeditCaretCalback %p\n",ic);
 }
 
-void WINAPI X11DRV_ForceXIMReset(HWND hwnd)
+void X11DRV_ForceXIMReset(HWND hwnd)
 {
     XIC ic = X11DRV_get_ic(hwnd);
     if (ic)




More information about the wine-patches mailing list