[prev in list] [next in list] [prev in thread] [next in thread]
List: wine-patches
Subject: Winapi check + misc related fixes
From: Patrik Stridvall <ps () leissner ! se>
Date: 1999-10-29 23:15:22
[Download RAW message or body]
The rejected-config.diff contains some of patches
that was rejected. The ones that
I don't understand or don't agree that
they should have been rejected.
Please apply or explain.
--- ChangeLog ---
*** solaris
* dlls/winmm/mciwave/Makefile.in:
Solaris make doesn't like unnessary \.
*** winapi-check
* tools/winapi_check/nativeapi.pm,
tools/winapi_check/winapi.pm,
tools/winapi_check/winapi_check,
tools/winapi_check/winapi_function.pm,
tools/winapi_check/winapi_global.pm,
tools/winapi_check/winapi_local.pm,
tools/winapi_check/winapi_options.pm,
tools/winapi_check/winapi_parser.pm:
- Minor fixes and reorganizations.
- Added checks for documentation inconsistancies.
*** documentation
* dlls/advapi32/crypt.c,
dlls/crtdll/crtdll_main.c,
files/dos_fs.c,
objects/dcvalues.c:
Fixed documentation.
*** implemented
* dlls/shell32/shell32.spec:
Added spec file declarations for already implemented functions.
*** rejected-config
* dlls/winmm/joystick.c,
dlls/winmm/wineoss/audio.c,
dlls/winmm/wineoss/midi.c,
dlls/winmm/wineoss/mixer.c,
dlls/winmm/wineoss/mmaux.c,
misc/port.c,
misc/winsock.c,
misc/winsock_async.c,
scheduler/sysdeps.c:
Added missing configuration #if:s and #includes:s.
["documentation.diff" (application/octet-stream)]
Index: wine/dlls/advapi32/crypt.c
===================================================================
RCS file: /home/wine/wine/dlls/advapi32/crypt.c,v
retrieving revision 1.9
diff -u -u -r1.9 crypt.c
--- wine/dlls/advapi32/crypt.c 1999/09/11 16:27:20 1.9
+++ wine/dlls/advapi32/crypt.c 1999/10/29 22:59:18
@@ -31,6 +31,9 @@
return FALSE;
}
+/******************************************************************************
+ * CryptSetKeyParam
+ */
BOOL WINAPI
CryptSetKeyParam( HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData, DWORD dwFlags)
{
Index: wine/dlls/crtdll/crtdll_main.c
===================================================================
RCS file: /home/wine/wine/dlls/crtdll/crtdll_main.c,v
retrieving revision 1.4
diff -u -u -r1.4 crtdll_main.c
--- wine/dlls/crtdll/crtdll_main.c 1999/10/24 22:13:48 1.4
+++ wine/dlls/crtdll/crtdll_main.c 1999/10/29 22:59:18
@@ -249,10 +249,14 @@
return 0;
}
+/*********************************************************************
+ * _fsopen (CRTDLL.110)
+ */
CRTDLL_FILE * __cdecl CRTDLL__fsopen(LPCSTR x, LPCSTR y, INT z) {
FIXME("(%s,%s,%d),stub!\n",x,y,z);
return NULL;
}
+
/*********************************************************************
* _fdopen (CRTDLL.91)
*/
@@ -581,7 +585,7 @@
}
/*********************************************************************
- * (CRTDLL.350)
+ * clock (CRTDLL.350)
*/
clock_t __cdecl CRTDLL_clock(void)
{
@@ -1812,7 +1816,7 @@
return ret;
}
/*********************************************************************
- * strdate (CRTDLL.283)
+ * _strdate (CRTDLL.283)
*/
LPSTR __cdecl CRTDLL__strdate (LPSTR date)
{ FIXME("%p stub\n", date);
@@ -1820,7 +1824,7 @@
}
/*********************************************************************
- * strtime (CRTDLL.299)
+ * _strtime (CRTDLL.299)
*/
LPSTR __cdecl CRTDLL__strtime (LPSTR date)
{ FIXME("%p stub\n", date);
Index: wine/files/dos_fs.c
===================================================================
RCS file: /home/wine/wine/files/dos_fs.c,v
retrieving revision 1.31
diff -u -u -r1.31 dos_fs.c
--- wine/files/dos_fs.c 1999/10/24 22:13:50 1.31
+++ wine/files/dos_fs.c 1999/10/29 22:59:33
@@ -1937,6 +1937,9 @@
return TRUE;
}
+/***********************************************************************
+ * DefineDosDeviceA (KERNEL32.182)
+ */
BOOL WINAPI DefineDosDeviceA(DWORD flags,LPCSTR devname,LPCSTR targetpath) {
FIXME_(dosfs)("(0x%08lx,%s,%s),stub!\n",flags,devname,targetpath);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
Index: wine/objects/dcvalues.c
===================================================================
RCS file: /home/wine/wine/objects/dcvalues.c,v
retrieving revision 1.6
diff -u -u -r1.6 dcvalues.c
--- wine/objects/dcvalues.c 1999/04/25 09:24:24 1.6
+++ wine/objects/dcvalues.c 1999/10/29 22:59:36
@@ -77,54 +77,193 @@
return prevMode; \
}
-
-
-/* GDI.2 GDI32.306 */
+/***********************************************************************
+ * SetBkMode (GDI.2) (GDI32.306)
+ *
+ */
DC_SET_MODE( SetBkMode, w.backgroundMode, TRANSPARENT, OPAQUE )
-/* GDI.4 GDI32.331 */
+/***********************************************************************
+ * SetROP2 (GDI.4) (GDI32.331)
+ */
DC_SET_MODE( SetROP2, w.ROPmode, R2_BLACK, R2_WHITE )
-/* GDI.5 GDI32.333 */
+/***********************************************************************
+ * SetRelAbs (GDI.5) (GDI32.333)
+ */
DC_SET_MODE( SetRelAbs, w.relAbsMode, ABSOLUTE, RELATIVE )
-/* GDI.6 GDI32.330 */
+/***********************************************************************
+ * SetPolyFillMode (GDI.6) (GDI32.330)
+ */
DC_SET_MODE( SetPolyFillMode, w.polyFillMode, ALTERNATE, WINDING )
-/* GDI.7 GDI32.334 */
+/***********************************************************************
+ * SetStretchBltMode (GDI.7) (GDI32.334)
+ */
DC_SET_MODE( SetStretchBltMode, w.stretchBltMode, BLACKONWHITE, HALFTONE )
-DC_GET_VAL_16( COLORREF, GetBkColor16, w.backgroundColor ) /* GDI.75 */
-DC_GET_VAL_32( COLORREF, GetBkColor, w.backgroundColor ) /* GDI32.145 */
-DC_GET_VAL_16( INT16, GetBkMode16, w.backgroundMode ) /* GDI.76 */
-DC_GET_VAL_32( INT, GetBkMode, w.backgroundMode ) /* GDI32.146 */
-DC_GET_X_Y( DWORD, GetCurrentPosition16, w.CursPosX, w.CursPosY ) /* GDI.78 */
-DC_GET_VAL_16( INT16, GetMapMode16, w.MapMode ) /* GDI.81 */
-DC_GET_VAL_32( INT, GetMapMode, w.MapMode ) /* GDI32.196 */
-DC_GET_VAL_16( INT16, GetPolyFillMode16, w.polyFillMode ) /* GDI.84 */
-DC_GET_VAL_32( INT, GetPolyFillMode, w.polyFillMode ) /* GDI32.213 */
-DC_GET_VAL_16( INT16, GetROP216, w.ROPmode ) /* GDI.85 */
-DC_GET_VAL_32( INT, GetROP2, w.ROPmode ) /* GDI32.214 */
-DC_GET_VAL_16( INT16, GetRelAbs16, w.relAbsMode ) /* GDI.86 */
-DC_GET_VAL_32( INT, GetRelAbs, w.relAbsMode ) /* GDI32.218 */
-DC_GET_VAL_16( INT16, GetStretchBltMode16, w.stretchBltMode ) /* GDI.88 */
-DC_GET_VAL_32( INT, GetStretchBltMode, w.stretchBltMode ) /* GDI32.221 */
-DC_GET_VAL_16( COLORREF, GetTextColor16, w.textColor ) /* GDI.90 */
-DC_GET_VAL_32( COLORREF, GetTextColor, w.textColor ) /* GDI32.227 */
-DC_GET_X_Y( DWORD, GetViewportExt16, vportExtX, vportExtY ) /* GDI.94 */
-DC_GET_X_Y( DWORD, GetViewportOrg16, vportOrgX, vportOrgY ) /* GDI.95 */
-DC_GET_X_Y( DWORD, GetWindowExt16, wndExtX, wndExtY ) /* GDI.96 */
-DC_GET_X_Y( DWORD, GetWindowOrg16, wndOrgX, wndOrgY ) /* GDI.97 */
-DC_GET_VAL_16( HRGN16, InquireVisRgn16, w.hVisRgn ) /* GDI.131 */
-DC_GET_VAL_16( HRGN16, GetClipRgn16, w.hClipRgn ) /* GDI.173 */
-DC_GET_X_Y( DWORD, GetBrushOrg16, w.brushOrgX, w.brushOrgY ) /* GDI.149 */
-DC_GET_VAL_16( UINT16, GetTextAlign16, w.textAlign ) /* GDI.345 */
-DC_GET_VAL_32( UINT, GetTextAlign, w.textAlign ) /* GDI32.224 */
-DC_GET_VAL_16( HFONT16, GetCurLogFont16, w.hFont ) /* GDI.411 */
-DC_GET_VAL_EX( GetBrushOrgEx, w.brushOrgX, w.brushOrgY, POINT ) /* GDI.469 GDI32.148 */
-DC_GET_VAL_EX( GetCurrentPositionEx, w.CursPosX, w.CursPosY, /* GDI.470 GDI32.167 */
- POINT )
-DC_GET_VAL_EX( GetViewportExtEx, vportExtX, vportExtY, SIZE ) /* GDI.472 GDI32.239 */
-DC_GET_VAL_EX( GetViewportOrgEx, vportOrgX, vportOrgY, POINT ) /* GDI.473 GDI32.240 */
-DC_GET_VAL_EX( GetWindowExtEx, wndExtX, wndExtY, SIZE ) /* GDI.474 GDI32.242 */
-DC_GET_VAL_EX( GetWindowOrgEx, wndOrgX, wndOrgY, POINT ) /* GDI.475 GDI32.243 */
+/***********************************************************************
+ * GetBkColor16 (GDI.75)
+ */
+DC_GET_VAL_16( COLORREF, GetBkColor16, w.backgroundColor )
+
+/***********************************************************************
+ * GetBkColor (GDI32.145)
+ */
+DC_GET_VAL_32( COLORREF, GetBkColor, w.backgroundColor )
+
+/***********************************************************************
+ * GetBkMode16 (GDI.76)
+ */
+DC_GET_VAL_16( INT16, GetBkMode16, w.backgroundMode )
+
+/***********************************************************************
+ * GetBkMode (GDI32.146)
+ */
+DC_GET_VAL_32( INT, GetBkMode, w.backgroundMode )
+
+/***********************************************************************
+ * GetCurrentPosition16 (GDI.78)
+ */
+DC_GET_X_Y( DWORD, GetCurrentPosition16, w.CursPosX, w.CursPosY )
+
+/***********************************************************************
+ * GetMapMode16 (GDI.81)
+ */
+DC_GET_VAL_16( INT16, GetMapMode16, w.MapMode )
+
+/***********************************************************************
+ * GetMapMode (GDI32.196)
+ */
+DC_GET_VAL_32( INT, GetMapMode, w.MapMode )
+
+/***********************************************************************
+ * GetPolyFillMode16 (GDI.84)
+ */
+DC_GET_VAL_16( INT16, GetPolyFillMode16, w.polyFillMode )
+
+/***********************************************************************
+ * GetPolyFillMode (GDI32.213)
+ */
+DC_GET_VAL_32( INT, GetPolyFillMode, w.polyFillMode )
+
+/***********************************************************************
+ * GetROP216 (GDI.85)
+ */
+DC_GET_VAL_16( INT16, GetROP216, w.ROPmode )
+
+/***********************************************************************
+ * GetROP2 (GDI32.214)
+ */
+DC_GET_VAL_32( INT, GetROP2, w.ROPmode )
+
+/***********************************************************************
+ * GetRelAbs16 (GDI.86)
+ */
+DC_GET_VAL_16( INT16, GetRelAbs16, w.relAbsMode )
+
+/***********************************************************************
+ * GetRelAbs (GDI32.218)
+ */
+DC_GET_VAL_32( INT, GetRelAbs, w.relAbsMode )
+
+/***********************************************************************
+ * GetStretchBltMode16 (GDI.88)
+ */
+DC_GET_VAL_16( INT16, GetStretchBltMode16, w.stretchBltMode )
+
+/***********************************************************************
+ * GetStretchBltMode (GDI32.221)
+ */
+DC_GET_VAL_32( INT, GetStretchBltMode, w.stretchBltMode )
+
+/***********************************************************************
+ * GetTextColor16 (GDI.90)
+ */
+DC_GET_VAL_16( COLORREF, GetTextColor16, w.textColor )
+
+/***********************************************************************
+ * GetTextColor (GDI32.227)
+ */
+DC_GET_VAL_32( COLORREF, GetTextColor, w.textColor )
+
+/***********************************************************************
+ * GetViewportExt16 (GDI.94)
+ */
+DC_GET_X_Y( DWORD, GetViewportExt16, vportExtX, vportExtY )
+
+/***********************************************************************
+ * GetViewportOrg16 (GDI.95)
+ */
+DC_GET_X_Y( DWORD, GetViewportOrg16, vportOrgX, vportOrgY )
+
+/***********************************************************************
+ * GetWindowExt16 (GDI.96)
+ */
+DC_GET_X_Y( DWORD, GetWindowExt16, wndExtX, wndExtY )
+
+/***********************************************************************
+ * GetWindowOrg16 (GDI.97)
+ */
+DC_GET_X_Y( DWORD, GetWindowOrg16, wndOrgX, wndOrgY )
+
+/***********************************************************************
+ * InquireVisRgn16 (GDI.131)
+ */
+DC_GET_VAL_16( HRGN16, InquireVisRgn16, w.hVisRgn )
+
+/***********************************************************************
+ * GetClipRgn16 (GDI.173)
+ */
+DC_GET_VAL_16( HRGN16, GetClipRgn16, w.hClipRgn )
+
+/***********************************************************************
+ * GetBrushOrg16 (GDI.149)
+ */
+DC_GET_X_Y( DWORD, GetBrushOrg16, w.brushOrgX, w.brushOrgY )
+
+/***********************************************************************
+ * GetTextAlign16 (GDI.345)
+ */
+DC_GET_VAL_16( UINT16, GetTextAlign16, w.textAlign )
+
+/***********************************************************************
+ * GetTextAlign (GDI32.224)
+ */
+DC_GET_VAL_32( UINT, GetTextAlign, w.textAlign )
+
+/***********************************************************************
+ * GetCurLogFont16 (GDI.411)
+ */
+DC_GET_VAL_16( HFONT16, GetCurLogFont16, w.hFont )
+
+/***********************************************************************
+ * GetBrushOrgEx (GDI.469) (GDI32.148)
+ */
+DC_GET_VAL_EX( GetBrushOrgEx, w.brushOrgX, w.brushOrgY, POINT ) /* */
+
+/***********************************************************************
+ * GetCurrentPositionEx (GDI.470) (GDI32.167)
+ */
+DC_GET_VAL_EX( GetCurrentPositionEx, w.CursPosX, w.CursPosY, POINT )
+
+/***********************************************************************
+ * GetViewportExtEx (GDI.472 GDI32.239)
+ */
+DC_GET_VAL_EX( GetViewportExtEx, vportExtX, vportExtY, SIZE )
+
+/***********************************************************************
+ * GetViewportOrgEx (GDI.473) (GDI32.240)
+ */
+DC_GET_VAL_EX( GetViewportOrgEx, vportOrgX, vportOrgY, POINT )
+
+/***********************************************************************
+ * GetWindowExtEx (GDI.474) (GDI32.242)
+ */
+DC_GET_VAL_EX( GetWindowExtEx, wndExtX, wndExtY, SIZE )
+
+/***********************************************************************
+ * GetWindowOrgEx (GDI.475) (GDI32.243)
+ */
+DC_GET_VAL_EX( GetWindowOrgEx, wndOrgX, wndOrgY, POINT )
["implemented.diff" (application/octet-stream)]
Index: wine/dlls/shell32/shell32.spec
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shell32.spec,v
retrieving revision 1.7
diff -u -u -r1.7 shell32.spec
--- wine/dlls/shell32/shell32.spec 1999/10/25 15:36:39 1.7
+++ wine/dlls/shell32/shell32.spec 1999/10/29 22:59:19
@@ -323,7 +323,7 @@
314 stub StrNCmpW # proper ordinal unknown
315 stub StrNCpyA # proper ordinal unknown
316 stub StrNCpyW # proper ordinal unknown
- 317 stub StrRChrA # proper ordinal unknown
+ 317 stdcall StrRChrA (str str long) StrRChrA # proper ordinal unknown
318 stub StrRChrIA # proper ordinal unknown
319 stub StrRChrIW # proper ordinal unknown
320 stdcall StrRChrW (wstr wstr long) StrRChrW # proper ordinal unknown
["rejected-config.diff" (application/octet-stream)]
Index: wine/dlls/winmm/joystick.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/joystick.c,v
retrieving revision 1.1
diff -u -u -r1.1 joystick.c
--- wine/dlls/winmm/joystick.c 1999/10/24 18:42:42 1.1
+++ wine/dlls/winmm/joystick.c 1999/10/29 22:59:22
@@ -13,6 +13,8 @@
* routines for backward compatibility.
*/
+#include "config.h"
+
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
Index: wine/dlls/winmm/wineoss/audio.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/wineoss/audio.c,v
retrieving revision 1.1
diff -u -u -r1.1 audio.c
--- wine/dlls/winmm/wineoss/audio.c 1999/10/24 18:42:43 1.1
+++ wine/dlls/winmm/wineoss/audio.c 1999/10/29 22:59:24
@@ -13,6 +13,8 @@
/*#define EMULATE_SB16*/
+#include "config.h"
+
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
Index: wine/dlls/winmm/wineoss/midi.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/wineoss/midi.c,v
retrieving revision 1.1
diff -u -u -r1.1 midi.c
--- wine/dlls/winmm/wineoss/midi.c 1999/10/24 18:42:43 1.1
+++ wine/dlls/winmm/wineoss/midi.c 1999/10/29 22:59:32
@@ -12,6 +12,8 @@
* 98/11 splitted in midi.c and mcimidi.c
*/
+#include "config.h"
+
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
Index: wine/dlls/winmm/wineoss/mixer.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/wineoss/mixer.c,v
retrieving revision 1.1
diff -u -u -r1.1 mixer.c
--- wine/dlls/winmm/wineoss/mixer.c 1999/10/24 18:42:44 1.1
+++ wine/dlls/winmm/wineoss/mixer.c 1999/10/29 22:59:32
@@ -7,6 +7,8 @@
* 1999 Eric Pouech
*/
+#include "config.h"
+
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
Index: wine/dlls/winmm/wineoss/mmaux.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/wineoss/mmaux.c,v
retrieving revision 1.1
diff -u -u -r1.1 mmaux.c
--- wine/dlls/winmm/wineoss/mmaux.c 1999/10/24 18:42:44 1.1
+++ wine/dlls/winmm/wineoss/mmaux.c 1999/10/29 22:59:32
@@ -7,6 +7,8 @@
#define EMULATE_SB16
+#include "config.h"
+
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
Index: wine/misc/port.c
===================================================================
RCS file: /home/wine/wine/misc/port.c,v
retrieving revision 1.8
diff -u -u -r1.8 port.c
--- wine/misc/port.c 1999/09/04 14:36:03 1.8
+++ wine/misc/port.c 1999/10/29 22:59:35
@@ -74,7 +74,9 @@
#if !defined(HAVE_CLONE) && defined(__linux__)
#include <assert.h>
#include <errno.h>
-#include <syscall.h>
+#ifdef HAVE_SYSCALL_H
+# include <syscall.h>
+#endif
int clone( int (*fn)(void *), void *stack, int flags, void *arg )
{
#ifdef __i386__
Index: wine/misc/winsock.c
===================================================================
RCS file: /home/wine/wine/misc/winsock.c,v
retrieving revision 1.30
diff -u -u -r1.30 winsock.c
--- wine/misc/winsock.c 1999/10/23 16:53:35 1.30
+++ wine/misc/winsock.c 1999/10/29 22:59:35
@@ -14,14 +14,18 @@
#include <string.h>
#include <sys/types.h>
-#include <sys/ipc.h>
+#ifdef HAVE_SYS_IPC_H
+# include <sys/ipc.h>
+#endif
#include <sys/ioctl.h>
#ifdef HAVE_SYS_FILIO_H
# include <sys/filio.h>
#endif
#if defined(__svr4__) || defined(__sun)
#include <sys/ioccom.h>
-#include <sys/sockio.h>
+#ifdef HAVE_SYS_SOCKIO_H
+# include <sys/sockio.h>
+#endif
#endif
#if defined(__EMX__)
@@ -32,12 +36,24 @@
# include <sys/param.h>
#endif
-#include <sys/msg.h>
-#include <sys/wait.h>
+#ifdef HAVE_SYS_MSG_H
+# include <sys/msg.h>
+#endif
+#ifdef HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#ifdef HAVE_NETINET_TCP_H
+# include <netinet/tcp.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#endif
#include <ctype.h>
#include <fcntl.h>
#include <errno.h>
Index: wine/misc/winsock_async.c
===================================================================
RCS file: /home/wine/wine/misc/winsock_async.c,v
retrieving revision 1.5
diff -u -u -r1.5 winsock_async.c
--- wine/misc/winsock_async.c 1999/06/26 19:09:10 1.5
+++ wine/misc/winsock_async.c 1999/10/29 22:59:36
@@ -23,14 +23,18 @@
#include <string.h>
#include <sys/types.h>
-#include <sys/ipc.h>
+#ifdef HAVE_SYS_IPC_H
+# include <sys/ipc.h>
+#endif
#include <sys/ioctl.h>
#ifdef HAVE_SYS_FILIO_H
# include <sys/filio.h>
#endif
#if defined(__svr4__)
#include <sys/ioccom.h>
-#include <sys/sockio.h>
+#ifdef HAVE_SYS_SOCKIO_H
+# include <sys/sockio.h>
+#endif
#endif
#if defined(__EMX__)
@@ -41,15 +45,27 @@
# include <sys/param.h>
#endif
-#include <sys/msg.h>
+#ifdef HAVE_SYS_MSG_H
+# include <sys/msg.h>
+#endif
+#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#endif
#include <ctype.h>
#include <fcntl.h>
#include <errno.h>
+#ifdef HAVE_SYS_ERRNO_H
#include <sys/errno.h>
+#endif
#include <netdb.h>
#include <unistd.h>
#include <stdlib.h>
Index: wine/scheduler/sysdeps.c
===================================================================
RCS file: /home/wine/wine/scheduler/sysdeps.c,v
retrieving revision 1.17
diff -u -u -r1.17 sysdeps.c
--- wine/scheduler/sysdeps.c 1999/09/27 10:58:46 1.17
+++ wine/scheduler/sysdeps.c 1999/10/29 22:59:36
@@ -33,14 +33,10 @@
DEFAULT_DEBUG_CHANNEL(thread)
-#ifdef linux
-#define HAVE_CLONE_SYSCALL
-#endif
-
/* Xlib critical section (FIXME: does not belong here) */
CRITICAL_SECTION X11DRV_CritSection = { 0, };
-#ifdef HAVE_CLONE_SYSCALL
+#ifdef HAVE_CLONE
# ifdef HAVE_SCHED_H
# include <sched.h>
# endif
@@ -53,7 +49,7 @@
/* If we didn't get the flags, we probably didn't get the prototype either */
extern int clone( int (*fn)(void *arg), void *stack, int flags, void *arg );
# endif /* CLONE_VM */
-#endif /* HAVE_CLONE_SYSCALL */
+#endif /* HAVE_CLONE */
static int init_done;
@@ -155,7 +151,7 @@
{
#ifndef NO_REENTRANT_LIBC
-#ifdef HAVE_CLONE_SYSCALL
+#ifdef HAVE_CLONE
if (clone( (int (*)(void *))SYSDEPS_StartThread, teb->stack_top,
CLONE_VM | CLONE_FS | CLONE_FILES | SIGCHLD, teb ) < 0)
return -1;
["solaris.diff" (application/octet-stream)]
Index: wine/dlls/winmm/mciwave/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/winmm/mciwave/Makefile.in,v
retrieving revision 1.1
diff -u -u -r1.1 Makefile.in
--- wine/dlls/winmm/mciwave/Makefile.in 1999/10/24 18:42:43 1.1
+++ wine/dlls/winmm/mciwave/Makefile.in 1999/10/29 22:59:22
@@ -9,7 +9,7 @@
mciwave.spec
C_SRCS = \
- mciwave.c \
+ mciwave.c
all: $(MODULE).o
["winapi-check.diff" (application/octet-stream)]
Index: wine/tools/winapi_check/nativeapi.pm
===================================================================
RCS file: /home/wine/wine/tools/winapi_check/nativeapi.pm,v
retrieving revision 1.2
diff -u -u -r1.2 nativeapi.pm
--- wine/tools/winapi_check/nativeapi.pm 1999/10/24 21:45:39 1.2
+++ wine/tools/winapi_check/nativeapi.pm 1999/10/29 22:59:36
@@ -8,14 +8,19 @@
my $self = {};
bless ($self, $class);
+ my $output = \${$self->{OUTPUT}};
my $functions = \%{$self->{FUNCTIONS}};
my $conditionals = \%{$self->{CONDITIONALS}};
my $conditional_headers = \%{$self->{CONDITIONAL_HEADERS}};
+ my $conditional_functions = \%{$self->{CONDITIONAL_FUNCTIONS}};
+ $$output = shift;
my $api_file = shift;
my $configure_in_file = shift;
my $config_h_in_file = shift;
+ $$output->progress("$api_file");
+
open(IN, "< $api_file");
$/ = "\n";
while(<IN>) {
@@ -27,8 +32,10 @@
}
close(IN);
+ $$output->progress("$configure_in_file");
+
my $again = 0;
- open(IN, "< $configure_in_file");
+ open(IN, "< $configure_in_file");
local $/ = "\n";
while($again || (defined($_ = <IN>))) {
$again = 0;
@@ -45,9 +52,14 @@
s/^\s*(.*?)\s*$/$1/;
if(/^AC_CHECK_HEADERS\(\s*(.*?)\)\s*$/) {
+ my @arguments = split(/,/,$1);
+ foreach my $name (split(/\s+/, $arguments[0])) {
+ $$conditional_headers{$name}++;
+ }
+ } elsif(/^AC_CHECK_FUNCS\(\s*(.*?)\)\s*$/) {
my @arguments = split(/,/,$1);
- foreach my $header (split(/\s+/, $arguments[0])) {
- $$conditional_headers{$header}++;
+ foreach my $name (split(/\s+/, $arguments[0])) {
+ $$conditional_functions{$name}++;
}
} elsif(/^AC_FUNC_ALLOCA/) {
$$conditional_headers{"alloca.h"}++;
@@ -56,10 +68,12 @@
}
close(IN);
+ $$output->progress("$config_h_in_file");
+
open(IN, "< $config_h_in_file");
local $/ = "\n";
while(<IN>) {
- if(/^\#undef (\S+)$/) {
+ if(/^\#undef\s+(\S+)$/) {
$$conditionals{$1}++;
}
}
@@ -93,6 +107,15 @@
my $name = shift;
return $$conditional_headers{$name};
+}
+
+sub is_conditional_function {
+ my $self = shift;
+ my $conditional_functions = \%{$self->{CONDITIONAL_FUNCTIONS}};
+
+ my $name = shift;
+
+ return $$conditional_functions{$name};
}
1;
Index: wine/tools/winapi_check/winapi.pm
===================================================================
RCS file: /home/wine/wine/tools/winapi_check/winapi.pm,v
retrieving revision 1.3
diff -u -u -r1.3 winapi.pm
--- wine/tools/winapi_check/winapi.pm 1999/10/24 21:45:39 1.3
+++ wine/tools/winapi_check/winapi.pm 1999/10/29 22:59:36
@@ -70,12 +70,12 @@
if(!$forbidden) {
if(defined($module)) {
if($$allowed_modules_unlimited{$type}) {
- print "$file: type ($type) already specificed as an unlimited type\n";
+ $$output->write("$file: type ($type) already specificed as an unlimited type\n");
} elsif(!$$allowed_modules{$type}{$module}) {
$$allowed_modules{$type}{$module} = 1;
$$allowed_modules_limited{$type} = 1;
} else {
- print "$file: type ($type) already specificed\n";
+ $$output->write("$file: type ($type) already specificed\n");
}
} else {
$$allowed_modules_unlimited{$type} = 1;
@@ -84,12 +84,12 @@
$$allowed_modules_limited{$type} = 1;
}
if(defined($$translate_argument{$type}) && $$translate_argument{$type} ne \
$kind) {
- print "$file: type ($type) respecified as different kind ($kind != \
$$translate_argument{$type})\n"; + $$output->write("$file: type ($type) respecified \
as different kind ($kind != $$translate_argument{$type})\n"); } else {
$$translate_argument{$type} = $kind;
}
} else {
- print "$file: file must begin with %<type> statement\n";
+ $$output->write("$file: file must begin with %<type> statement\n");
exit 1;
}
}
@@ -208,7 +208,7 @@
if(defined($ordinal)) {
if($ordinals{$ordinal}) {
- print "$file: ordinal redefined: $_\n";
+ $$output->write("$file: ordinal redefined: $_\n");
}
$ordinals{$ordinal}++;
}
Index: wine/tools/winapi_check/winapi_check
===================================================================
RCS file: /home/wine/wine/tools/winapi_check/winapi_check,v
retrieving revision 1.3
diff -u -u -r1.3 winapi_check
--- wine/tools/winapi_check/winapi_check 1999/10/24 21:45:39 1.3
+++ wine/tools/winapi_check/winapi_check 1999/10/29 22:59:36
@@ -6,6 +6,7 @@
my $wine_dir;
my $winapi_check_dir;
+
BEGIN {
if($0 =~ /^((.*?)\/?tools\/winapi_check)\/winapi_check$/)
@@ -24,6 +25,7 @@
require "output.pm";
require "preprocessor.pm";
require "winapi.pm";
+ require "winapi_function.pm";
require "winapi_local.pm";
require "winapi_global.pm";
require "winapi_options.pm";
@@ -33,6 +35,7 @@
import output;
import preprocessor;
import winapi;
+ import winapi_function;
import winapi_local;
import winapi_global;
import winapi_options;
@@ -51,7 +54,7 @@
my $win32api = 'winapi'->new($output, "win32", "$winapi_check_dir/win32api.dat", \
"$winapi_check_dir/win32"); 'winapi'->read_spec_files($wine_dir, $win16api, \
$win32api);
-my $nativeapi = 'nativeapi'->new("$winapi_check_dir/nativeapi.dat", \
"$wine_dir/configure.in", "$wine_dir/include/config.h.in"); +my $nativeapi = \
'nativeapi'->new($output, "$winapi_check_dir/nativeapi.dat", \
"$wine_dir/configure.in", "$wine_dir/include/config.h.in");
for my $name ($win32api->all_functions) {
my $module16 = $win16api->function_module($name);
@@ -62,7 +65,7 @@
$win32api->found_shared_function($name);
if($options->shared) {
- print "*.spec: $name: is shared between $module16 (Win16) and $module32 \
(Win32)\n"; + $output->write("*.spec: $name: is shared between $module16 (Win16) \
and $module32 (Win32)\n"); }
}
}
@@ -86,19 +89,21 @@
}
}
-my %functions;
-
my $progress_output;
my $progress_current=0;
my $progress_max=scalar($options->files);
foreach my $file ($options->files) {
+ my %functions;
+
$progress_current++;
if($options->progress) {
$output->progress("$file: file $progress_current of $progress_max");
}
my $file_dir = $file;
- $file_dir =~ s/(.*?)\/[^\/]*$/$1/;
+ if(!($file_dir =~ s/(.*?)\/[^\/]*$/$1/)) {
+ $file_dir = ".";
+ }
my $file_type;
if($file_dir =~ /^(libtest|program|rc)/) {
@@ -112,6 +117,7 @@
}
my $found_function = sub {
+ my $documentation = shift;
my $return_type = shift;
my $calling_convention = shift;
my $name = shift;
@@ -135,16 +141,19 @@
my $module16 = $win16api->function_module($name);
my $module32 = $win32api->function_module($name);
- my $module;
- if(defined($module16) && defined($module32)) {
- $module = "$module16 & $module32";
- } elsif(defined($module16)) {
- $module = $module16;
- } elsif(defined($module32)) {
- $module = $module32;
- } else {
- $module = "";
- }
+ my $function = 'winapi_function'->new;
+ $functions{$name} = $function;
+
+ $function->documentation($documentation);
+ $function->file($file);
+ $function->return_type($return_type);
+ $function->calling_convention($calling_convention);
+ $function->name($name);
+ $function->arguments([@arguments]);
+ $function->statements($statements);
+ $function->module16($module16);
+ $function->module32($module32);
+
my $output_module = sub {
my $module = shift;
return sub {
@@ -157,22 +166,13 @@
my $output16 = &$output_module($module16);
my $output32 = &$output_module($module32);
- my $function = $functions{$name};
- $$function{file} = $file;
- $$function{return_type} = $return_type;
- $$function{calling_convention} = $calling_convention;
- $$function{arguments} = [@arguments];
- $$function{module} = $module;
- $$function{module16} = $module16;
- $$function{module32} = $module32;
-
if($options->argument) {
if($options->win16 && $options->report_module($module16)) {
- winapi_local::check_arguments $options, $output16,
+ winapi_local::check_function $options, $output16,
$return_type, $calling_convention, $name, [@arguments], $win16api;
}
if($options->win32 && $options->report_module($module32)) {
- winapi_local::check_arguments $options, $output32,
+ winapi_local::check_function $options, $output32,
$return_type, $calling_convention, $name, [@arguments], $win32api;
}
}
@@ -202,14 +202,42 @@
$_ = $';
my $called_name = $1;
if($called_name !~ /^if|for|while|switch|sizeof$/) {
- $functions{$name}{called_function_names}{$called_name}++;
- $functions{$called_name}{called_by_function_names}{$name}++;
+ $functions{$name}->function_called($called_name);
+ if(!defined($functions{$called_name})) {
+ $functions{$called_name} = 'function'->new;
+ }
+ $functions{$called_name}->function_called_by($name);
}
} else {
undef $_
}
}
}
+
+ if($options->documentation && (defined($module16) || defined($module32))) {
+ my $name2 = $name;
+ my $name3 = $name;
+ my $name4 = $name;
+ my $name5 = $name;
+
+ if(defined($module16) && !defined($module32)) {
+ $name2 =~ s/([AW])$/16$1/;
+ $name3 =~ s/16(([AW])?)$/$1/;
+ $name4 =~ s/^\U$module16\E\_//;
+ $name5 =~ s/^WIN16_//;
+ } elsif(!defined($module16) && defined($module32)) {
+ $name2 =~ s/([AW])$/32$1/;
+ $name3 =~ s/32(([AW])?)$/$1/;
+ $name4 =~ s/^\U$module32\E\_//;
+ $name5 =~ s/^WIN16_//;
+ }
+
+ if($name !~ /^SMapLS|SUnMapLS/ && $documentation !~ \
/($name|$name2|$name3|$name4|$name5)/) { + $output->write("$file: $name: \\\n");
+ $output->write("$documentation\n");
+ }
+ }
+
}
};
@@ -278,7 +306,7 @@
foreach my $name (keys(%{$includes{"$file_dir/$header"}{includes}})) {
$includes{$name}{used}++;
}
- } elsif(-e "include/$header") {
+ } elsif(-e "$wine_dir/include/$header") {
$includes{"include/$header"}{used}++;
foreach my $name (keys(%{$includes{"include/$header"}{includes}})) {
$includes{$name}{used}++;
@@ -291,7 +319,7 @@
}
};
- winapi_parser::parse_c_file $options, $file, $found_function, \
$found_preprocessor; + winapi_parser::parse_c_file $options, $output, $file, \
$found_function, $found_preprocessor;
if($options->config_unnessary) {
if($config && $conditional == 0) {
@@ -299,26 +327,7 @@
}
}
- if($options->cross_call) {
- my @names = sort(keys(%functions));
- for my $name (@names) {
- my @called_names = sort(keys(%{$functions{$name}{called_function_names}}));
- my @called_by_names = \
sort(keys(%{$functions{$name}{called_by_function_names}}));
- my $module = $functions{$name}{module};
- my $module16 = $functions{$name}{module16};
- my $module32 = $functions{$name}{module32};
-
- if($#called_names >= 0 && (defined($module16) || defined($module32)) ) {
- $output->write("$file: $module: $name: \\\n");
- for my $called_name (@called_names) {
- my $function;
- if($function = $functions{$called_name}) {
- $output->write(" $called_name\n");
- }
- }
- }
- }
- }
+ winapi_local::check_file $options, $output, $file, \%functions;
}
$output->hide_progress;
@@ -327,12 +336,12 @@
foreach my $name (sort(keys(%includes))) {
if(!$includes{$name}{used}) {
if($options->include) {
- print "$name: include file is never used\n";
+ $output->write("$name: include file is never used\n");
}
}
}
- winapi_global::check $options, $win16api, $nativeapi if $options->win16;
- winapi_global::check $options, $win32api, $nativeapi if $options->win32;
+ winapi_global::check $options, $output, $win16api, $nativeapi if \
$options->win16; + winapi_global::check $options, $output, $win32api, $nativeapi \
if $options->win32; }
Index: wine/tools/winapi_check/winapi_global.pm
===================================================================
RCS file: /home/wine/wine/tools/winapi_check/winapi_global.pm,v
retrieving revision 1.2
diff -u -u -r1.2 winapi_global.pm
--- wine/tools/winapi_check/winapi_global.pm 1999/10/24 21:45:39 1.2
+++ wine/tools/winapi_check/winapi_global.pm 1999/10/29 22:59:36
@@ -4,6 +4,7 @@
sub check {
my $options = shift;
+ my $output = shift;
my $winapi = shift;
my $nativeapi = shift;
@@ -11,9 +12,9 @@
if($options->argument) {
foreach my $type ($winapi->all_declared_types) {
- if(!$winapi->type_found($type) && !$winapi->is_type_limited($type) && $type ne \
"CONTEXT86 *") {
- print "*.c: $winver: ";
- print "type ($type) not used\n";
+ if(!$winapi->type_found($type) && !$winapi->is_limited_type($type) && $type ne \
"CONTEXT86 *") { + $output->write("*.c: $winver: ");
+ $output->write("type ($type) not used\n");
}
}
}
@@ -22,8 +23,8 @@
foreach my $name ($winapi->all_functions) {
if(!$winapi->function_found($name) && !$nativeapi->is_function($name)) {
my $module = $winapi->function_module($name);
- print "*.c: $module: $name: ";
- print "function declared but not implemented: " . \
$winapi->function_arguments($name) . "\n"; + $output->write("*.c: $module: $name: \
"); + $output->write("function declared but not implemented: " . \
$winapi->function_arguments($name) . "\n"); }
}
}
@@ -33,10 +34,9 @@
foreach my $module (sort(keys(%$not_used))) {
foreach my $type (sort(keys(%{$$not_used{$module}}))) {
- print "*.c: $module: type $type not used\n";
+ $output->write("*.c: $module: type $type not used\n");
}
- }
-
+ }
}
}
Index: wine/tools/winapi_check/winapi_local.pm
===================================================================
RCS file: /home/wine/wine/tools/winapi_check/winapi_local.pm,v
retrieving revision 1.2
diff -u -u -r1.2 winapi_local.pm
--- wine/tools/winapi_check/winapi_local.pm 1999/10/24 21:45:39 1.2
+++ wine/tools/winapi_check/winapi_local.pm 1999/10/29 22:59:36
@@ -2,7 +2,7 @@
use strict;
-sub check_arguments {
+sub check_function {
my $options = shift;
my $output = shift;
my $return_type = shift;
@@ -160,6 +160,37 @@
if($segmented && $options->shared_segmented && \
$winapi->is_shared_function($name)) { &$output("function using segmented pointers \
shared between Win16 och Win32"); + }
+}
+
+sub check_file {
+ my $options = shift;
+ my $output = shift;
+ my $file = shift;
+ my $functions = shift;
+
+ if($options->cross_call) {
+ my @names = sort(keys(%$functions));
+ for my $name (@names) {
+ my @called_names = $$functions{$name}->called_function_names;
+ my @called_by_names = $$functions{$name}->called_by_function_names;
+ my $module = $$functions{$name}->module;
+ my $module16 = $$functions{$name}->module16;
+ my $module32 = $$functions{$name}->module32;
+
+ if($#called_names >= 0 && (defined($module16) || defined($module32)) ) {
+ for my $called_name (@called_names) {
+ my $called_module16 = $$functions{$called_name}->module16;
+ my $called_module32 = $$functions{$called_name}->module32;
+ if(defined($module32) &&
+ defined($called_module16) && !defined($called_module32) &&
+ $name ne $called_name)
+ {
+ $output->write("$file: $module: $name: illegal call to $called_name (Win16)\n");
+ }
+ }
+ }
+ }
}
}
Index: wine/tools/winapi_check/winapi_options.pm
===================================================================
RCS file: /home/wine/wine/tools/winapi_check/winapi_options.pm,v
retrieving revision 1.3
diff -u -u -r1.3 winapi_options.pm
--- wine/tools/winapi_check/winapi_options.pm 1999/10/24 21:45:39 1.3
+++ wine/tools/winapi_check/winapi_options.pm 1999/10/29 22:59:36
@@ -59,6 +59,7 @@
"calling-convention" => { default => 0, parent => "local", description => \
"calling convention checking" },
"misplaced" => { default => 0, parent => "local", description => "check for \
misplaced functions" },
"cross-call" => { default => 0, parent => "local", description => "check for \
cross calling functions" }, + "documentation" => { default => 0, parent => \
"local", description => "check for documentation inconsistances\n" },
"global" => { default => 1, description => "global checking" },
"declared" => { default => 1, parent => "global", description => "declared \
checking" },
Index: wine/tools/winapi_check/winapi_parser.pm
===================================================================
RCS file: /home/wine/wine/tools/winapi_check/winapi_parser.pm,v
retrieving revision 1.3
diff -u -u -r1.3 winapi_parser.pm
--- wine/tools/winapi_check/winapi_parser.pm 1999/10/24 21:45:39 1.3
+++ wine/tools/winapi_check/winapi_parser.pm 1999/10/29 22:59:36
@@ -4,10 +4,12 @@
sub parse_c_file {
my $options = shift;
+ my $output = shift;
my $file = shift;
my $function_found_callback = shift;
my $preprocessor_found_callback = shift;
+ my $documentation;
my $return_type;
my $calling_convention;
my $function = "";
@@ -15,6 +17,7 @@
my $statements;
my $function_begin = sub {
+ $documentation = shift;
$return_type= shift;
$calling_convention = shift;
$function = shift;
@@ -23,11 +26,12 @@
$statements = "";
};
my $function_end = sub {
- &$function_found_callback($return_type,$calling_convention,$function,$arguments,$statements);
+ &$function_found_callback($documentation,$return_type,$calling_convention,$function,$arguments,$statements);
$function = "";
};
+ my @comments = ();
my $level = 0;
my $again = 0;
my $lookahead = 0;
@@ -53,9 +57,15 @@
$lookahead_count = 0;
$again = 0;
}
-
+
+ # Merge conflicts in file?
+ if(/^(<<<<<<<|=======|>>>>>>>)/) {
+ $output->write("$file: merge conflicts in file\n");
+ last;
+ }
+
# remove comments
- if(s/^(.*?)\/\*.*?\*\/(.*)$/$1 $2/s) { $again = 1; next };
+ if(s/^(.*?)(\/\*.*?\*\/)(.*)$/$1 $3/s) { push @comments, $2; $again = 1; next };
if(/^(.*?)\/\*/s) {
$lookahead = 1;
next;
@@ -80,6 +90,17 @@
}
}
+ my $documentation;
+ {
+ my $n = $#comments;
+ while($n >= 0 && $comments[$n] !~ /\/\*\*/) { $n-- }
+ if(defined($comments[$n]) && $n >= 0) {
+ $documentation = $comments[$n];
+ } else {
+ $documentation = "";
+ }
+ }
+
if($level > 0)
{
my $line;
@@ -110,8 +131,8 @@
next;
} elsif($10 eq "{") {
$level++;
- }
-
+ }
+
my $return_type = $1;
my $calling_convention = $6;
my $name = $7;
@@ -156,65 +177,65 @@
if($options->debug) {
print "$file: $return_type $calling_convention $name(" . join(",", @arguments) . \
")\n"; }
- &$function_begin($return_type,$calling_convention,$name,\@arguments);
+ &$function_begin($documentation,$return_type,$calling_convention,$name,\@arguments);
} elsif(/DC_(GET_X_Y|GET_VAL_16)\s*\(\s*(.*?)\s*,\s*(.*?)\s*,\s*(.*?)\s*\)/s) {
$_ = $'; $again = 1;
my @arguments = ("HDC16");
- &$function_begin($2, "WINAPI", $3, \@arguments);
+ &$function_begin($documentation,$2, "WINAPI", $3, \@arguments);
&$function_end;
} elsif(/DC_(GET_VAL_32)\s*\(\s*(.*?)\s*,\s*(.*?)\s*,.*?\)/s) {
$_ = $'; $again = 1;
my @arguments = ("HDC");
- &$function_begin($2, "WINAPI", $3, \@arguments);
+ &$function_begin($documentation,$2, "WINAPI", $3, \@arguments);
&$function_end;
} elsif(/DC_(GET_VAL_EX)\s*\(\s*(.*?)\s*,\s*(.*?)\s*,\s*(.*?)\s*,\s*(.*?)\s*\)/s) {
$_ = $'; $again = 1;
my @arguments16 = ("HDC16", "LP" . $5 . "16");
my @arguments32 = ("HDC", "LP" . $5);
- &$function_begin("BOOL16", "WINAPI", $2 . "16", \@arguments16);
+ &$function_begin($documentation,"BOOL16", "WINAPI", $2 . "16", \@arguments16);
&$function_end;
- &$function_begin("BOOL", "WINAPI", $2, \@arguments32);
+ &$function_begin($documentation,"BOOL", "WINAPI", $2, \@arguments32);
&$function_end;
} elsif(/DC_(SET_MODE)\s*\(\s*(.*?)\s*,\s*(.*?)\s*,\s*(.*?)\s*,\s*(.*?)\s*\)/s) {
$_ = $'; $again = 1;
my @arguments16 = ("HDC16", "INT16");
my @arguments32 = ("HDC", "INT");
- &$function_begin("INT16", "WINAPI", $2 . "16", \@arguments16);
+ &$function_begin($documentation,"INT16", "WINAPI", $2 . "16", \@arguments16);
&$function_end;
- &$function_begin("INT", "WINAPI", $2, \@arguments32);
+ &$function_begin($documentation,"INT", "WINAPI", $2, \@arguments32);
&$function_end;
} elsif(/WAVEIN_SHORTCUT_0\s*\(\s*(.*?)\s*,\s*(.*?)\s*\)/s) {
$_ = $'; $again = 1;
my @arguments16 = ("HWAVEIN16");
my @arguments32 = ("HWAVEIN");
- &$function_begin("UINT16", "WINAPI", "waveIn" . $1 . "16", \@arguments16);
+ &$function_begin($documentation,"UINT16", "WINAPI", "waveIn" . $1 . "16", \
\@arguments16); &$function_end;
- &$function_begin("UINT", "WINAPI", "waveIn" . $1, \@arguments32);
+ &$function_begin($documentation,"UINT", "WINAPI", "waveIn" . $1, \
\@arguments32); &$function_end;
} elsif(/WAVEOUT_SHORTCUT_0\s*\(\s*(.*?)\s*,\s*(.*?)\s*\)/s) {
$_ = $'; $again = 1;
my @arguments16 = ("HWAVEOUT16");
my @arguments32 = ("HWAVEOUT");
- &$function_begin("UINT16", "WINAPI", "waveOut" . $1 . "16", \@arguments16);
+ &$function_begin($documentation,"UINT16", "WINAPI", "waveOut" . $1 . "16", \
\@arguments16); &$function_end;
- &$function_begin("UINT", "WINAPI", "waveOut" . $1, \@arguments32);
+ &$function_begin($documentation,"UINT", "WINAPI", "waveOut" . $1, \
\@arguments32); &$function_end;
} elsif(/WAVEOUT_SHORTCUT_(1|2)\s*\(\s*(.*?)\s*,\s*(.*?)\s*,\s*(.*?)\s*\)/s) {
$_ = $'; $again = 1;
if($1 eq "1") {
my @arguments16 = ("HWAVEOUT16", $4);
my @arguments32 = ("HWAVEOUT", $4);
- &$function_begin("UINT16", "WINAPI", "waveOut" . $2 . "16", \@arguments16);
+ &$function_begin($documentation,"UINT16", "WINAPI", "waveOut" . $2 . "16", \
\@arguments16); &$function_end;
- &$function_begin("UINT", "WINAPI", "waveOut" . $2, \@arguments32);
+ &$function_begin($documentation,"UINT", "WINAPI", "waveOut" . $2, \@arguments32);
&$function_end;
} elsif($1 eq 2) {
my @arguments16 = ("UINT16", $4);
my @arguments32 = ("UINT", $4);
- &$function_begin("UINT16", "WINAPI", "waveOut". $2 . "16", \@arguments16);
+ &$function_begin($documentation,"UINT16", "WINAPI", "waveOut". $2 . "16", \
\@arguments16); &$function_end;
- &$function_begin("UINT", "WINAPI", "waveOut" . $2, \@arguments32);
+ &$function_begin($documentation,"UINT", "WINAPI", "waveOut" . $2, \@arguments32);
&$function_end;
}
} elsif(/;/s) {
@@ -229,7 +250,7 @@
}
close(IN);
print STDERR "done\n" if $options->verbose;
- print "$file: <>: not at toplevel at end of file\n" unless $level == 0;
+ $output->write("$file: not at toplevel at end of file\n") unless $level == 0;
}
1;
["winapi-check.tar" (application/octet-stream)]
=========================================================================
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic