Fixed some issues found by winapi_check.
diff --git a/dlls/capi2032/cap20wxx.c b/dlls/capi2032/cap20wxx.c
index 5972d9d..67e62c9 100644
--- a/dlls/capi2032/cap20wxx.c
+++ b/dlls/capi2032/cap20wxx.c
@@ -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;
}
diff --git a/dlls/capi2032/cap20wxx.h b/dlls/capi2032/cap20wxx.h
index e5717db..896d126 100644
--- a/dlls/capi2032/cap20wxx.h
+++ b/dlls/capi2032/cap20wxx.h
@@ -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);
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index eb1b655..0ac7c35 100644
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -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
diff --git a/dlls/glut32/glut.c b/dlls/glut32/glut.c
index c8e4bfe..b9efb10 100644
--- a/dlls/glut32/glut.c
+++ b/dlls/glut32/glut.c
@@ -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)
diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c
index 09d11f2..8e4d548 100644
--- a/dlls/iphlpapi/tests/iphlpapi.c
+++ b/dlls/iphlpapi/tests/iphlpapi.c
@@ -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"
diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c
index c4ac1ea..475a3ad 100644
--- a/dlls/kernel/process.c
+++ b/dlls/kernel/process.c
@@ -2581,6 +2581,7 @@
/***********************************************************************
+ * GetSystemMSecCount (SYSTEM.6)
* GetTickCount (KERNEL32.@)
*
* Returns the number of milliseconds, modulo 2^32, since the start
diff --git a/dlls/kernel/task.c b/dlls/kernel/task.c
index 9b002c3..eff6b97 100644
--- a/dlls/kernel/task.c
+++ b/dlls/kernel/task.c
@@ -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))
diff --git a/dlls/kernel/thunk.c b/dlls/kernel/thunk.c
index 8b3fcd0..7fc22f2 100644
--- a/dlls/kernel/thunk.c
+++ b/dlls/kernel/thunk.c
@@ -1026,7 +1026,7 @@
* RETURNS
* TRUE for success.
*/
-BOOL WINAPI SSInit16()
+BOOL WINAPI SSInit16(void)
{
return TRUE;
}
diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c
index 16d487f..4d5b832 100644
--- a/dlls/msvidc32/msvideo1.c
+++ b/dlls/msvidc32/msvideo1.c
@@ -454,6 +454,9 @@
return ICERR_OK;
}
+/***********************************************************************
+ * DriverProc (MSVIDC32.@)
+ */
LRESULT WINAPI CRAM_DriverProc( DWORD dwDriverId, HDRVR hdrvr, UINT msg,
LONG lParam1, LONG lParam2)
{
diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index fa8d4b2..9431d2a 100644
--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c
@@ -300,6 +300,8 @@
EXC_DefaultHandling( rec, context );
}
+/**********************************************************************/
+
#ifdef DEFINE_REGS_ENTRYPOINT
DEFINE_REGS_ENTRYPOINT( RtlRaiseException, EXC_RtlRaiseException, 4, 4 );
#else
@@ -385,6 +387,8 @@
}
}
+/**********************************************************************/
+
#ifdef DEFINE_REGS_ENTRYPOINT
DEFINE_REGS_ENTRYPOINT( RtlUnwind, EXC_RtlUnwind, 16, 16 );
#else
diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c
index d226a2c..f5cbcaf 100644
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -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)
{
diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c
index f0769cd..b7b5044 100644
--- a/dlls/quartz/main.c
+++ b/dlls/quartz/main.c
@@ -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 }
};
diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c
index 8dc5e7d..3b1490a 100644
--- a/dlls/setupapi/setupcab.c
+++ b/dlls/setupapi/setupcab.c
@@ -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"
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 83d6ce3..aafa3eb 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -1020,6 +1020,8 @@
#undef HKCU
#undef HKLM
+/**********************************************************************/
+
HRESULT WINAPI SHGetFolderPathW(
HWND hwndOwner,
int csidl,
diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
index 3ee8823..2195666 100644
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -248,6 +248,8 @@
return SHNotifyCreateDirectoryW(wPath, sec);
}
+/**********************************************************************/
+
static DWORD SHNotifyCreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec)
{
TRACE("(%s, %p)\n", debugstr_w(path), sec);
@@ -273,6 +275,8 @@
return GetLastError();
}
+/**********************************************************************/
+
BOOL WINAPI Win32CreateDirectoryAW(LPCVOID path, LPSECURITY_ATTRIBUTES sec)
{
if (SHELL_OsIsUnicode())
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index 394a423..250b58b 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -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);
diff --git a/dlls/win32s/win32s16.c b/dlls/win32s/win32s16.c
index 23f80d4..baf4f82 100644
--- a/dlls/win32s/win32s16.c
+++ b/dlls/win32s/win32s16.c
@@ -32,7 +32,7 @@
/***********************************************************************
* BootTask (WIN32S16.2)
*/
-void WINAPI BootTask16()
+void WINAPI BootTask16(void)
{
MESSAGE("BootTask(): should only be used by WIN32S.EXE.\n");
}
diff --git a/dlls/winaspi/winaspi16.c b/dlls/winaspi/winaspi16.c
index 4081000..df6289d 100644
--- a/dlls/winaspi/winaspi16.c
+++ b/dlls/winaspi/winaspi16.c
@@ -481,7 +481,7 @@
* GETASPIDLLVERSION (WINASPI.4)
*/
-DWORD WINAPI GetASPIDLLVersion16()
+DWORD WINAPI GetASPIDLLVersion16(void)
{
#ifdef linux
return 2;
diff --git a/dlls/winedos/dosvm.c b/dlls/winedos/dosvm.c
index 4da954b..c662265 100644
--- a/dlls/winedos/dosvm.c
+++ b/dlls/winedos/dosvm.c
@@ -711,7 +711,7 @@
/**********************************************************************
- * DllMain (DOSVM.Init)
+ * DllMain (DOSVM.0)
*/
BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
{
diff --git a/dlls/winmm/mciavi/mciavi.c b/dlls/winmm/mciavi/mciavi.c
index d35ad17..594fb27 100644
--- a/dlls/winmm/mciavi/mciavi.c
+++ b/dlls/winmm/mciavi/mciavi.c
@@ -118,6 +118,9 @@
HINSTANCE MCIAVI_hInstance = 0;
+/***********************************************************************
+ * DllMain (MCIAVI.0)
+ */
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad)
{
switch (fdwReason) {
diff --git a/dlls/winmm/winejack/audio.c b/dlls/winmm/winejack/audio.c
index 9988ac1..7b93595 100644
--- a/dlls/winmm/winejack/audio.c
+++ b/dlls/winmm/winejack/audio.c
@@ -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)
{
diff --git a/dlls/x11drv/wintab.c b/dlls/x11drv/wintab.c
index 837f2e7..d9ed846 100644
--- a/dlls/x11drv/wintab.c
+++ b/dlls/x11drv/wintab.c
@@ -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;
diff --git a/loader/glibc.c b/loader/glibc.c
index 625a688..9d98d74 100644
--- a/loader/glibc.c
+++ b/loader/glibc.c
@@ -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"
