ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed some issues found by winapi_check.

This commit is contained in:
Patrik Stridvall 2004-02-20 20:19:23 +00:00 committed by Alexandre Julliard
parent f310fdf3a0
commit ede82e3055
23 changed files with 92 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/capi2032/cap20wxx.c
View File

@ -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 @@ WINE_DEFAULT_DEBUG_CHANNEL(capi);
/*===========================================================================*\
\*===========================================================================*/
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_REGISTER (DWORD MessageBufferSize, DWORD maxLogicalConne
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
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_RELEASE (DWORD ApplID) {
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
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_PUT_MESSAGE (DWORD ApplID, PVOID pCAPIMessage) {
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
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_GET_MESSAGE (DWORD ApplID, PVOID *ppCAPIMessage) {
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
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_WAIT_FOR_SIGNAL (DWORD ApplID) {
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
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_MANUFACTURER (char *SzBuffer) {
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
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_VERSION (DWORD *pCAPIMajor, DWORD *pCAPIMinor, DWORD
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
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_SERIAL_NUMBER (char *SzBuffer) {
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
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_GET_PROFILE (PVOID SzBuffer, DWORD CtlrNr) {
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
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_INSTALLED (void) {
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
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;
}

22
dlls/capi2032/cap20wxx.h
View File

@ -33,17 +33,17 @@ extern "C" {
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/
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);
/*---------------------------------------------------------------------------*\
\*---------------------------------------------------------------------------*/

3
dlls/ddraw/main.c
View File

@ -581,6 +581,9 @@ static int DDRAW_ChooseDefaultDriver(void)
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

2
dlls/glut32/glut.c
View File

@ -771,7 +771,7 @@ void WINAPI wine_glutShowWindow(void)
}
/*********************************************
* 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)

2
dlls/iphlpapi/tests/iphlpapi.c
View File

@ -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"

1
dlls/kernel/process.c
View File

@ -2581,6 +2581,7 @@ BOOL WINAPI AreFileApisANSI(void)
/***********************************************************************
* GetSystemMSecCount (SYSTEM.6)
* GetTickCount (KERNEL32.@)
*
* Returns the number of milliseconds, modulo 2^32, since the start

4
dlls/kernel/task.c
View File

@ -53,7 +53,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(task);
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 @@ typedef struct
WORD thunks[4]; /* Each thunk is 4 words long */
} THUNKS;
#include <poppack.h>
#include "poppack.h"
#define THUNK_MAGIC ('P' | ('T' << 8))

2
dlls/kernel/thunk.c
View File

@ -1026,7 +1026,7 @@ VOID WINAPI ThunkInitSL(
* RETURNS
* TRUE for success.
*/
BOOL WINAPI SSInit16()
BOOL WINAPI SSInit16(void)
{
return TRUE;
}

3
dlls/msvidc32/msvideo1.c
View File

@ -454,6 +454,9 @@ LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DWORD siz
return ICERR_OK;
}
/***********************************************************************
* DriverProc (MSVIDC32.@)
*/
LRESULT WINAPI CRAM_DriverProc( DWORD dwDriverId, HDRVR hdrvr, UINT msg,
LONG lParam1, LONG lParam2)
{

4
dlls/ntdll/exception.c
View File

@ -300,6 +300,8 @@ void WINAPI EXC_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context )
EXC_DefaultHandling( rec, context );
}
/**********************************************************************/
#ifdef DEFINE_REGS_ENTRYPOINT
DEFINE_REGS_ENTRYPOINT( RtlRaiseException, EXC_RtlRaiseException, 4, 4 );
#else
@ -385,6 +387,8 @@ void WINAPI EXC_RtlUnwind( PEXCEPTION_REGISTRATION_RECORD pEndFrame, PVOID unuse
}
}
/**********************************************************************/
#ifdef DEFINE_REGS_ENTRYPOINT
DEFINE_REGS_ENTRYPOINT( RtlUnwind, EXC_RtlUnwind, 16, 16 );
#else

4
dlls/ole32/moniker.c
View File

@ -467,7 +467,7 @@ HRESULT WINAPI RunningObjectTableImpl_GetObjectIndex(RunningObjectTableImpl* Thi
}
/******************************************************************************
* GetRunningObjectTable [OLE2.@]
* GetRunningObjectTable (OLE2.30)
*/
HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot)
{
@ -527,7 +527,7 @@ HRESULT WINAPI MkParseDisplayName(LPBC pbc, LPCOLESTR szUserName,
}
/******************************************************************************
* CreateClassMoniker [OLE32.*]
* CreateClassMoniker [OLE32.@]
*/
HRESULT WINAPI CreateClassMoniker(REFCLSID rclsid, IMoniker ** ppmk)
{

2
dlls/quartz/main.c
View File

@ -208,7 +208,7 @@ static struct {
{
#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 }
};

4
dlls/setupapi/setupcab.c
View File

@ -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"

2
dlls/shell32/shellpath.c
View File

@ -1020,6 +1020,8 @@ static const CSIDL_DATA CSIDL_Data[] =
#undef HKCU
#undef HKLM
/**********************************************************************/
HRESULT WINAPI SHGetFolderPathW(
HWND hwndOwner,
int csidl,

4
dlls/shell32/shlfileop.c
View File

@ -248,6 +248,8 @@ static DWORD SHNotifyCreateDirectoryA(LPCSTR path, LPSECURITY_ATTRIBUTES sec)
return SHNotifyCreateDirectoryW(wPath, sec);
}
/**********************************************************************/
static DWORD SHNotifyCreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec)
{
TRACE("(%s, %p)\n", debugstr_w(path), sec);
@ -273,6 +275,8 @@ static DWORD SHNotifyCreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec)
return GetLastError();
}
/**********************************************************************/
BOOL WINAPI Win32CreateDirectoryAW(LPCVOID path, LPSECURITY_ATTRIBUTES sec)
{
if (SHELL_OsIsUnicode())

12
dlls/shlwapi/ordinal.c
View File

@ -3829,18 +3829,27 @@ BOOL WINAPI SHSkipJunction(IBindCtx *pbc, const CLSID *pclsid)
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 @@ DWORD WINAPI IUnknown_OnFocusChangeIS(IUnknown * pUnk, IUnknown * pFocusObject,
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);

2
dlls/win32s/win32s16.c
View File

@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dll);
/***********************************************************************
* BootTask (WIN32S16.2)
*/
void WINAPI BootTask16()
void WINAPI BootTask16(void)
{
MESSAGE("BootTask(): should only be used by WIN32S.EXE.\n");
}

2
dlls/winaspi/winaspi16.c
View File

@ -481,7 +481,7 @@ WORD WINAPI InsertInASPIChain16(BOOL16 remove, FARPROC16 pASPIChainFunc)
* GETASPIDLLVERSION (WINASPI.4)
*/
DWORD WINAPI GetASPIDLLVersion16()
DWORD WINAPI GetASPIDLLVersion16(void)
{
#ifdef linux
return 2;

2
dlls/winedos/dosvm.c
View File

@ -711,7 +711,7 @@ BIOSDATA *DOSVM_BiosData( void )
/**********************************************************************
* DllMain (DOSVM.Init)
* DllMain (DOSVM.0)
*/
BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
{

3
dlls/winmm/mciavi/mciavi.c
View File

@ -118,6 +118,9 @@ static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD dwParam1,
HINSTANCE MCIAVI_hInstance = 0;
/***********************************************************************
* DllMain (MCIAVI.0)
*/
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad)
{
switch (fdwReason) {

3
dlls/winmm/winejack/audio.c
View File

@ -2433,6 +2433,9 @@ DWORD WINAPI JACK_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
#else /* !HAVE_JACK_JACK_H */
/**************************************************************************
* widMessage (WINEJACK.6)
*/
DWORD WINAPI JACK_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
DWORD dwParam1, DWORD dwParam2)
{

12
dlls/x11drv/wintab.c
View File

@ -1153,20 +1153,32 @@ int X11DRV_ProcessTabletEvent(HWND hwnd, XEvent *event)
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;

8
loader/glibc.c
View File

@ -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"