winapi_check: fixed some issues
Patrik Stridvall
ps at leissner.se
Fri Feb 20 09:55:40 CST 2004
*** winapi_checked
* dlls/capi2032/cap20wxx.c,
dlls/capi2032/cap20wxx.h,
dlls/ddraw/main.c,
dlls/glut32/glut.c,
dlls/ntdll/exception.c,
dlls/iphlpapi/tests/iphlpapi.c,
dlls/kernel/process.c,
dlls/kernel/task.c,
dlls/kernel/thunk.c,
dlls/msvidc32/msvideo1.c,
dlls/ole32/moniker.c,
dlls/quartz/main.c,
dlls/setupapi/setupcab.c,
dlls/shell32/shellpath.c,
dlls/shell32/shlfileop.c,
dlls/shlwapi/ordinal.c,
dlls/win32s/win32s16.c,
dlls/winaspi/winaspi16.c,
dlls/winedos/dosvm.c,
dlls/winmm/mciavi/mciavi.c,
dlls/winmm/winejack/audio.c,
dlls/x11drv/wintab.c,
loader/glibc.c:
Fixed some issues found by winapi_check.
---8<---
Index: wine/dlls/capi2032/cap20wxx.c
===================================================================
RCS file: /home/wine/wine/dlls/capi2032/cap20wxx.c,v
retrieving revision 1.2
diff -u -u -r1.2 cap20wxx.c
--- wine/dlls/capi2032/cap20wxx.c 13 Nov 2003 20:51:49 -0000 1.2
+++ wine/dlls/capi2032/cap20wxx.c 20 Feb 2004 14:46:15 -0000
@@ -25,7 +25,9 @@
#include <stdio.h>
#include <sys/types.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#ifdef HAVE_LINUX_CAPI_H
# include <linux/capi.h>
@@ -41,7 +43,7 @@
/*===========================================================================*\
\*===========================================================================*/
-DWORD APIENTRY wrapCAPI_REGISTER (DWORD MessageBufferSize, DWORD maxLogicalConnection, DWORD maxBDataBlocks, DWORD maxBDataLen, DWORD *pApplID) {
+DWORD WINAPI wrapCAPI_REGISTER (DWORD MessageBufferSize, DWORD maxLogicalConnection, DWORD maxBDataBlocks, DWORD maxBDataLen, DWORD *pApplID) {
#ifdef HAVE_CAPI4LINUX
unsigned aid = 0;
DWORD fret = capi20_register (maxLogicalConnection, maxBDataBlocks, maxBDataLen, &aid);
@@ -56,7 +58,7 @@
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
-DWORD APIENTRY wrapCAPI_RELEASE (DWORD ApplID) {
+DWORD WINAPI wrapCAPI_RELEASE (DWORD ApplID) {
#ifdef HAVE_CAPI4LINUX
DWORD fret = capi20_release (ApplID);
TRACE ("(%lx) -> %lx\n", ApplID, fret);
@@ -68,7 +70,7 @@
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
-DWORD APIENTRY wrapCAPI_PUT_MESSAGE (DWORD ApplID, PVOID pCAPIMessage) {
+DWORD WINAPI wrapCAPI_PUT_MESSAGE (DWORD ApplID, PVOID pCAPIMessage) {
#ifdef HAVE_CAPI4LINUX
DWORD fret = capi20_put_message (ApplID, pCAPIMessage);
TRACE ("(%lx) -> %lx\n", ApplID, fret);
@@ -80,7 +82,7 @@
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
-DWORD APIENTRY wrapCAPI_GET_MESSAGE (DWORD ApplID, PVOID *ppCAPIMessage) {
+DWORD WINAPI wrapCAPI_GET_MESSAGE (DWORD ApplID, PVOID *ppCAPIMessage) {
#ifdef HAVE_CAPI4LINUX
DWORD fret = capi20_get_message (ApplID, (unsigned char **)ppCAPIMessage);
TRACE ("(%lx) -> %lx\n", ApplID, fret);
@@ -92,7 +94,7 @@
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
-DWORD APIENTRY wrapCAPI_WAIT_FOR_SIGNAL (DWORD ApplID) {
+DWORD WINAPI wrapCAPI_WAIT_FOR_SIGNAL (DWORD ApplID) {
#ifdef HAVE_CAPI4LINUX
TRACE ("(%lx)\n", ApplID);
return capi20_waitformessage (ApplID, NULL);
@@ -103,7 +105,7 @@
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
-DWORD APIENTRY wrapCAPI_GET_MANUFACTURER (char *SzBuffer) {
+DWORD WINAPI wrapCAPI_GET_MANUFACTURER (char *SzBuffer) {
#ifdef HAVE_CAPI4LINUX
DWORD fret = (capi20_get_manufacturer (0, SzBuffer) != 0) ? 0 : 0x1108;
if (!strncmp (SzBuffer, "AVM", 3)) {
@@ -118,7 +120,7 @@
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
-DWORD APIENTRY wrapCAPI_GET_VERSION (DWORD *pCAPIMajor, DWORD *pCAPIMinor, DWORD *pManufacturerMajor, DWORD *pManufacturerMinor) {
+DWORD WINAPI wrapCAPI_GET_VERSION (DWORD *pCAPIMajor, DWORD *pCAPIMinor, DWORD *pManufacturerMajor, DWORD *pManufacturerMinor) {
#ifdef HAVE_CAPI4LINUX
unsigned char version[4 * sizeof (unsigned)];
DWORD fret = (capi20_get_version (0, version) != 0) ? 0 : 0x1108;
@@ -136,7 +138,7 @@
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
-DWORD APIENTRY wrapCAPI_GET_SERIAL_NUMBER (char *SzBuffer) {
+DWORD WINAPI wrapCAPI_GET_SERIAL_NUMBER (char *SzBuffer) {
#ifdef HAVE_CAPI4LINUX
DWORD fret = (capi20_get_serial_number (0, SzBuffer) != 0) ? 0 : 0x1108;
TRACE ("(%s) -> %lx\n", SzBuffer, fret);
@@ -148,7 +150,7 @@
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
-DWORD APIENTRY wrapCAPI_GET_PROFILE (PVOID SzBuffer, DWORD CtlrNr) {
+DWORD WINAPI wrapCAPI_GET_PROFILE (PVOID SzBuffer, DWORD CtlrNr) {
#ifdef HAVE_CAPI4LINUX
DWORD fret = capi20_get_profile (CtlrNr, SzBuffer);
TRACE ("(%lx,%x) -> %lx\n", CtlrNr, *(unsigned short *)SzBuffer, fret);
@@ -160,7 +162,7 @@
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
-DWORD APIENTRY wrapCAPI_INSTALLED (void) {
+DWORD WINAPI wrapCAPI_INSTALLED (void) {
#ifdef HAVE_CAPI4LINUX
DWORD fret = capi20_isinstalled();
TRACE ("() -> %lx\n", fret);
@@ -172,7 +174,7 @@
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
-DWORD APIENTRY wrapCAPI_MANUFACTURER (DWORD Class, DWORD Function, DWORD Ctlr, PVOID pParams, DWORD ParamsLen) {
+DWORD WINAPI wrapCAPI_MANUFACTURER (DWORD Class, DWORD Function, DWORD Ctlr, PVOID pParams, DWORD ParamsLen) {
FIXME ("(), not supported!\n");
return 0x1109;
}
Index: wine/dlls/capi2032/cap20wxx.h
===================================================================
RCS file: /home/wine/wine/dlls/capi2032/cap20wxx.h,v
retrieving revision 1.2
diff -u -u -r1.2 cap20wxx.h
--- wine/dlls/capi2032/cap20wxx.h 13 Nov 2003 20:51:49 -0000 1.2
+++ wine/dlls/capi2032/cap20wxx.h 20 Feb 2004 14:46:15 -0000
@@ -33,17 +33,17 @@
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
-DWORD APIENTRY wrapCAPI_REGISTER (DWORD MessageBufferSize, DWORD maxLogicalConnection, DWORD maxBDataBlocks, DWORD maxBDataLen, DWORD *pApplID);
-DWORD APIENTRY wrapCAPI_RELEASE (DWORD ApplID);
-DWORD APIENTRY wrapCAPI_PUT_MESSAGE (DWORD ApplID, PVOID pCAPIMessage);
-DWORD APIENTRY wrapCAPI_GET_MESSAGE (DWORD ApplID, PVOID *ppCAPIMessage);
-DWORD APIENTRY wrapCAPI_WAIT_FOR_SIGNAL (DWORD ApplID);
-DWORD APIENTRY wrapCAPI_GET_MANUFACTURER (char *SzBuffer);
-DWORD APIENTRY wrapCAPI_GET_VERSION (DWORD *pCAPIMajor, DWORD *pCAPIMinor, DWORD *pManufacturerMajor, DWORD *pManufacturerMinor);
-DWORD APIENTRY wrapCAPI_GET_SERIAL_NUMBER (char *SzBuffer);
-DWORD APIENTRY wrapCAPI_GET_PROFILE (PVOID SzBuffer, DWORD CtrlNr);
-DWORD APIENTRY wrapCAPI_INSTALLED (void);
-DWORD APIENTRY wrapCAPI_MANUFACTURER (DWORD Class, DWORD Function, DWORD Ctlr, PVOID pParams, DWORD ParamsLen);
+DWORD WINAPI wrapCAPI_REGISTER (DWORD MessageBufferSize, DWORD maxLogicalConnection, DWORD maxBDataBlocks, DWORD maxBDataLen, DWORD *pApplID);
+DWORD WINAPI wrapCAPI_RELEASE (DWORD ApplID);
+DWORD WINAPI wrapCAPI_PUT_MESSAGE (DWORD ApplID, PVOID pCAPIMessage);
+DWORD WINAPI wrapCAPI_GET_MESSAGE (DWORD ApplID, PVOID *ppCAPIMessage);
+DWORD WINAPI wrapCAPI_WAIT_FOR_SIGNAL (DWORD ApplID);
+DWORD WINAPI wrapCAPI_GET_MANUFACTURER (char *SzBuffer);
+DWORD WINAPI wrapCAPI_GET_VERSION (DWORD *pCAPIMajor, DWORD *pCAPIMinor, DWORD *pManufacturerMajor, DWORD *pManufacturerMinor);
+DWORD WINAPI wrapCAPI_GET_SERIAL_NUMBER (char *SzBuffer);
+DWORD WINAPI wrapCAPI_GET_PROFILE (PVOID SzBuffer, DWORD CtrlNr);
+DWORD WINAPI wrapCAPI_INSTALLED (void);
+DWORD WINAPI wrapCAPI_MANUFACTURER (DWORD Class, DWORD Function, DWORD Ctlr, PVOID pParams, DWORD ParamsLen);
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
Index: wine/dlls/ddraw/main.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/main.c,v
retrieving revision 1.38
diff -u -u -r1.38 main.c
--- wine/dlls/ddraw/main.c 6 Oct 2003 21:03:32 -0000 1.38
+++ wine/dlls/ddraw/main.c 20 Feb 2004 14:46:15 -0000
@@ -581,6 +581,9 @@
return best;
}
+/***********************************************************************
+ * DllMain (DDRAW.0)
+ */
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
{
/* If we were sufficiently cool, DDraw drivers would just be COM
Index: wine/dlls/glut32/glut.c
===================================================================
RCS file: /home/wine/wine/dlls/glut32/glut.c,v
retrieving revision 1.2
diff -u -u -r1.2 glut.c
--- wine/dlls/glut32/glut.c 26 Jan 2004 20:14:16 -0000 1.2
+++ wine/dlls/glut32/glut.c 20 Feb 2004 14:46:16 -0000
@@ -771,7 +771,7 @@
}
/*********************************************
- * glutSolidCone (glut.dll)
+ * glutSolidCone (glut32.@)
*/
extern void glutSolidCone(double arg1, double arg2, int arg3, int arg4);
void WINAPI wine_glutSolidCone(double arg1, double arg2, int arg3, int arg4)
Index: wine/dlls/iphlpapi/tests/iphlpapi.c
===================================================================
RCS file: /home/wine/wine/dlls/iphlpapi/tests/iphlpapi.c,v
retrieving revision 1.2
diff -u -u -r1.2 iphlpapi.c
--- wine/dlls/iphlpapi/tests/iphlpapi.c 8 Jan 2004 00:41:13 -0000 1.2
+++ wine/dlls/iphlpapi/tests/iphlpapi.c 20 Feb 2004 14:46:16 -0000
@@ -34,6 +34,8 @@
* The DomainName field of FIXED_INFO isn't NULL-terminated on Win98.
*/
+#include "config.h"
+
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
Index: wine/dlls/kernel/process.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/process.c,v
retrieving revision 1.45
diff -u -u -r1.45 process.c
--- wine/dlls/kernel/process.c 12 Feb 2004 00:00:55 -0000 1.45
+++ wine/dlls/kernel/process.c 20 Feb 2004 14:46:17 -0000
@@ -2581,6 +2581,7 @@
/***********************************************************************
+ * GetSystemMSecCount (SYSTEM.6)
* GetTickCount (KERNEL32.@)
*
* Returns the number of milliseconds, modulo 2^32, since the start
Index: wine/dlls/kernel/task.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/task.c,v
retrieving revision 1.11
diff -u -u -r1.11 task.c
--- wine/dlls/kernel/task.c 8 Dec 2003 21:58:55 -0000 1.11
+++ wine/dlls/kernel/task.c 20 Feb 2004 14:46:18 -0000
@@ -53,7 +53,7 @@
WINE_DECLARE_DEBUG_CHANNEL(relay);
WINE_DECLARE_DEBUG_CHANNEL(toolhelp);
-#include <pshpack1.h>
+#include "pshpack1.h"
/* Segment containing MakeProcInstance() thunks */
typedef struct
@@ -65,7 +65,7 @@
WORD thunks[4]; /* Each thunk is 4 words long */
} THUNKS;
-#include <poppack.h>
+#include "poppack.h"
#define THUNK_MAGIC ('P' | ('T' << 8))
Index: wine/dlls/kernel/thunk.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/thunk.c,v
retrieving revision 1.48
diff -u -u -r1.48 thunk.c
--- wine/dlls/kernel/thunk.c 12 Feb 2004 01:03:55 -0000 1.48
+++ wine/dlls/kernel/thunk.c 20 Feb 2004 14:46:18 -0000
@@ -1026,7 +1026,7 @@
* RETURNS
* TRUE for success.
*/
-BOOL WINAPI SSInit16()
+BOOL WINAPI SSInit16(void)
{
return TRUE;
}
Index: wine/dlls/msvidc32/msvideo1.c
===================================================================
RCS file: /home/wine/wine/dlls/msvidc32/msvideo1.c,v
retrieving revision 1.3
diff -u -u -r1.3 msvideo1.c
--- wine/dlls/msvidc32/msvideo1.c 16 Feb 2004 20:34:18 -0000 1.3
+++ wine/dlls/msvidc32/msvideo1.c 20 Feb 2004 14:46:19 -0000
@@ -454,6 +454,9 @@
return ICERR_OK;
}
+/***********************************************************************
+ * DriverProc (MSVIDC32.@)
+ */
LRESULT WINAPI CRAM_DriverProc( DWORD dwDriverId, HDRVR hdrvr, UINT msg,
LONG lParam1, LONG lParam2)
{
Index: wine/dlls/ntdll/exception.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/exception.c,v
retrieving revision 1.68
diff -u -u -r1.68 exception.c
--- wine/dlls/ntdll/exception.c 6 Feb 2004 05:28:23 -0000 1.68
+++ wine/dlls/ntdll/exception.c 20 Feb 2004 14:46:19 -0000
@@ -300,6 +300,8 @@
EXC_DefaultHandling( rec, context );
}
+/**********************************************************************/
+
#ifdef DEFINE_REGS_ENTRYPOINT
DEFINE_REGS_ENTRYPOINT( RtlRaiseException, EXC_RtlRaiseException, 4, 4 );
#else
@@ -384,6 +386,8 @@
frame = __wine_pop_frame( frame );
}
}
+
+/**********************************************************************/
#ifdef DEFINE_REGS_ENTRYPOINT
DEFINE_REGS_ENTRYPOINT( RtlUnwind, EXC_RtlUnwind, 16, 16 );
Index: wine/dlls/ole32/moniker.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/moniker.c,v
retrieving revision 1.27
diff -u -u -r1.27 moniker.c
--- wine/dlls/ole32/moniker.c 11 Sep 2003 03:06:25 -0000 1.27
+++ wine/dlls/ole32/moniker.c 20 Feb 2004 14:46:19 -0000
@@ -467,7 +467,7 @@
}
/******************************************************************************
- * GetRunningObjectTable [OLE2.@]
+ * GetRunningObjectTable (OLE2.30)
*/
HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot)
{
@@ -527,7 +527,7 @@
}
/******************************************************************************
- * CreateClassMoniker [OLE32.*]
+ * CreateClassMoniker [OLE32.@]
*/
HRESULT WINAPI CreateClassMoniker(REFCLSID rclsid, IMoniker ** ppmk)
{
Index: wine/dlls/quartz/main.c
===================================================================
RCS file: /home/wine/wine/dlls/quartz/main.c,v
retrieving revision 1.31
diff -u -u -r1.31 main.c
--- wine/dlls/quartz/main.c 18 Nov 2003 20:47:48 -0000 1.31
+++ wine/dlls/quartz/main.c 20 Feb 2004 14:46:19 -0000
@@ -208,7 +208,7 @@
{
#define OUR_GUID_ENTRY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
{ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } , #name },
- #include <uuids.h>
+ #include "uuids.h"
{ { 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0} }, NULL }
};
Index: wine/dlls/setupapi/setupcab.c
===================================================================
RCS file: /home/wine/wine/dlls/setupapi/setupcab.c,v
retrieving revision 1.5
diff -u -u -r1.5 setupcab.c
--- wine/dlls/setupapi/setupcab.c 27 Jan 2004 00:01:44 -0000 1.5
+++ wine/dlls/setupapi/setupcab.c 20 Feb 2004 14:46:20 -0000
@@ -24,8 +24,8 @@
*/
#include <stdarg.h>
-#include "string.h"
-#include "stdlib.h"
+#include <string.h>
+#include <stdlib.h>
#include "wine/debug.h"
#include "windef.h"
Index: wine/dlls/shell32/shellpath.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shellpath.c,v
retrieving revision 1.79
diff -u -u -r1.79 shellpath.c
--- wine/dlls/shell32/shellpath.c 26 Jan 2004 20:09:10 -0000 1.79
+++ wine/dlls/shell32/shellpath.c 20 Feb 2004 14:46:20 -0000
@@ -1020,6 +1020,8 @@
#undef HKCU
#undef HKLM
+/**********************************************************************/
+
HRESULT WINAPI SHGetFolderPathW(
HWND hwndOwner,
int csidl,
Index: wine/dlls/shell32/shlfileop.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shlfileop.c,v
retrieving revision 1.36
diff -u -u -r1.36 shlfileop.c
--- wine/dlls/shell32/shlfileop.c 27 Jan 2004 00:01:43 -0000 1.36
+++ wine/dlls/shell32/shlfileop.c 20 Feb 2004 14:46:20 -0000
@@ -248,6 +248,8 @@
return SHNotifyCreateDirectoryW(wPath, sec);
}
+/**********************************************************************/
+
static DWORD SHNotifyCreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec)
{
TRACE("(%s, %p)\n", debugstr_w(path), sec);
@@ -272,6 +274,8 @@
}
return GetLastError();
}
+
+/**********************************************************************/
BOOL WINAPI Win32CreateDirectoryAW(LPCVOID path, LPSECURITY_ATTRIBUTES sec)
{
Index: wine/dlls/shlwapi/ordinal.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/ordinal.c,v
retrieving revision 1.78
diff -u -u -r1.78 ordinal.c
--- wine/dlls/shlwapi/ordinal.c 17 Feb 2004 22:48:56 -0000 1.78
+++ wine/dlls/shlwapi/ordinal.c 20 Feb 2004 14:46:22 -0000
@@ -3829,18 +3829,27 @@
return bRet;
}
+/***********************************************************************
+ * SHGetShellKey (SHLWAPI.@)
+ */
DWORD WINAPI SHGetShellKey(DWORD a, DWORD b, DWORD c)
{
FIXME("(%lx, %lx, %lx): stub\n", a, b, c);
return 0x50;
}
+/***********************************************************************
+ * SHQueueUserWorkItem (SHLWAPI.@)
+ */
HRESULT WINAPI SHQueueUserWorkItem(DWORD a, DWORD b, DWORD c, DWORD d, DWORD e, DWORD f, DWORD g)
{
FIXME("(%lx, %lx, %lx, %lx, %lx, %lx, %lx): stub\n", a, b, c, d, e, f, g);
return E_FAIL;
}
+/***********************************************************************
+ * IUnknown_OnFocusChangeIS (SHLWAPI.@)
+ */
DWORD WINAPI IUnknown_OnFocusChangeIS(IUnknown * pUnk, IUnknown * pFocusObject, BOOL bChange)
{
FIXME("(%p, %p, %s)\n", pUnk, pFocusObject, bChange ? "TRUE" : "FALSE");
@@ -3854,6 +3863,9 @@
return 0;
}
+/***********************************************************************
+ * SHGetValueW (SHLWAPI.@)
+ */
HRESULT WINAPI SKGetValueW(DWORD a, LPWSTR b, LPWSTR c, DWORD d, DWORD e, DWORD f)
{
FIXME("(%lx, %s, %s, %lx, %lx, %lx): stub\n", a, debugstr_w(b), debugstr_w(c), d, e, f);
Index: wine/dlls/win32s/win32s16.c
===================================================================
RCS file: /home/wine/wine/dlls/win32s/win32s16.c,v
retrieving revision 1.11
diff -u -u -r1.11 win32s16.c
--- wine/dlls/win32s/win32s16.c 5 Sep 2003 23:08:29 -0000 1.11
+++ wine/dlls/win32s/win32s16.c 20 Feb 2004 14:46:23 -0000
@@ -32,7 +32,7 @@
/***********************************************************************
* BootTask (WIN32S16.2)
*/
-void WINAPI BootTask16()
+void WINAPI BootTask16(void)
{
MESSAGE("BootTask(): should only be used by WIN32S.EXE.\n");
}
Index: wine/dlls/winaspi/winaspi16.c
===================================================================
RCS file: /home/wine/wine/dlls/winaspi/winaspi16.c,v
retrieving revision 1.35
diff -u -u -r1.35 winaspi16.c
--- wine/dlls/winaspi/winaspi16.c 15 Nov 2003 00:13:21 -0000 1.35
+++ wine/dlls/winaspi/winaspi16.c 20 Feb 2004 14:46:23 -0000
@@ -481,7 +481,7 @@
* GETASPIDLLVERSION (WINASPI.4)
*/
-DWORD WINAPI GetASPIDLLVersion16()
+DWORD WINAPI GetASPIDLLVersion16(void)
{
#ifdef linux
return 2;
Index: wine/dlls/winedos/dosvm.c
===================================================================
RCS file: /home/wine/wine/dlls/winedos/dosvm.c,v
retrieving revision 1.57
diff -u -u -r1.57 dosvm.c
--- wine/dlls/winedos/dosvm.c 26 Nov 2003 22:29:30 -0000 1.57
+++ wine/dlls/winedos/dosvm.c 20 Feb 2004 14:46:23 -0000
@@ -711,7 +711,7 @@
/**********************************************************************
- * DllMain (DOSVM.Init)
+ * DllMain (DOSVM.0)
*/
BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
{
Index: wine/dlls/winmm/mciavi/mciavi.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/mciavi/mciavi.c,v
retrieving revision 1.21
diff -u -u -r1.21 mciavi.c
--- wine/dlls/winmm/mciavi/mciavi.c 20 Jan 2004 01:45:05 -0000 1.21
+++ wine/dlls/winmm/mciavi/mciavi.c 20 Feb 2004 14:46:24 -0000
@@ -118,6 +118,9 @@
HINSTANCE MCIAVI_hInstance = 0;
+/***********************************************************************
+ * DllMain (MCIAVI.0)
+ */
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad)
{
switch (fdwReason) {
Index: wine/dlls/winmm/winejack/audio.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/winejack/audio.c,v
retrieving revision 1.7
diff -u -u -r1.7 audio.c
--- wine/dlls/winmm/winejack/audio.c 9 Jan 2004 05:03:17 -0000 1.7
+++ wine/dlls/winmm/winejack/audio.c 20 Feb 2004 14:46:25 -0000
@@ -2433,6 +2433,9 @@
#else /* !HAVE_JACK_JACK_H */
+/**************************************************************************
+ * widMessage (WINEJACK.6)
+ */
DWORD WINAPI JACK_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
DWORD dwParam1, DWORD dwParam2)
{
Index: wine/dlls/x11drv/wintab.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/wintab.c,v
retrieving revision 1.3
diff -u -u -r1.3 wintab.c
--- wine/dlls/x11drv/wintab.c 30 Jan 2004 22:56:06 -0000 1.3
+++ wine/dlls/x11drv/wintab.c 20 Feb 2004 14:46:27 -0000
@@ -1153,20 +1153,32 @@
return 0;
}
+/***********************************************************************
+ * AttachEventQueueToTablet (X11DRV.@)
+ */
int X11DRV_AttachEventQueueToTablet(HWND hOwner)
{
return 0;
}
+/***********************************************************************
+ * GetCurrentPacket (X11DRV.@)
+ */
int X11DRV_GetCurrentPacket(LPWTPACKET *packet)
{
return 0;
}
+/***********************************************************************
+ * LoadTabletInfo (X11DRV.@)
+ */
void X11DRV_LoadTabletInfo(HWND hwnddefault)
{
}
+/***********************************************************************
+ * WTInfoA (X11DRV.@)
+ */
UINT X11DRV_WTInfoA(UINT wCategory, UINT nIndex, LPVOID lpOutput)
{
return 0;
Index: wine/loader/glibc.c
===================================================================
RCS file: /home/wine/wine/loader/glibc.c,v
retrieving revision 1.2
diff -u -u -r1.2 glibc.c
--- wine/loader/glibc.c 11 Feb 2004 04:19:43 -0000 1.2
+++ wine/loader/glibc.c 20 Feb 2004 14:46:29 -0000
@@ -23,8 +23,12 @@
#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
-#include <pthread.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#ifdef HAVE_PTHREAD_H
+# include <pthread.h>
+#endif
#include "wine/library.h"
More information about the wine-patches
mailing list