Commit 7980a50c authored by Patrik Stridvall's avatar Patrik Stridvall Committed by Alexandre Julliard

Fixed issues found by winapi_check.

parent d18837b7
...@@ -495,7 +495,7 @@ HRESULT WINAPI OleRun(LPUNKNOWN pUnknown) ...@@ -495,7 +495,7 @@ HRESULT WINAPI OleRun(LPUNKNOWN pUnknown)
/****************************************************************************** /******************************************************************************
* MkParseDisplayName [OLE32.81] * MkParseDisplayName [OLE32.81]
*/ */
HRESULT MkParseDisplayName( LPBC pbc, LPCOLESTR szUserName, HRESULT WINAPI MkParseDisplayName(LPBC pbc, LPCOLESTR szUserName,
LPDWORD pchEaten, LPMONIKER *ppmk) LPDWORD pchEaten, LPMONIKER *ppmk)
{ {
FIXME("(%p, %s, %p, %p): stub.\n", pbc, debugstr_w(szUserName), pchEaten, *ppmk); FIXME("(%p, %s, %p, %p): stub.\n", pbc, debugstr_w(szUserName), pchEaten, *ppmk);
......
...@@ -291,7 +291,7 @@ LPWSTR WINAPI StrDupW (LPCWSTR lpSrc) ...@@ -291,7 +291,7 @@ LPWSTR WINAPI StrDupW (LPCWSTR lpSrc)
/************************************************************************* /*************************************************************************
* StrCSpnA [SHLWAPI] * StrCSpnA [SHLWAPI]
*/ */
int StrCSpnA (LPCSTR lpStr, LPCSTR lpSet) int WINAPI StrCSpnA (LPCSTR lpStr, LPCSTR lpSet)
{ {
int i,j, pos = strlen(lpStr); int i,j, pos = strlen(lpStr);
...@@ -315,7 +315,7 @@ int StrCSpnA (LPCSTR lpStr, LPCSTR lpSet) ...@@ -315,7 +315,7 @@ int StrCSpnA (LPCSTR lpStr, LPCSTR lpSet)
/************************************************************************* /*************************************************************************
* StrCSpnW [SHLWAPI] * StrCSpnW [SHLWAPI]
*/ */
int StrCSpnW (LPCWSTR lpStr, LPCWSTR lpSet) int WINAPI StrCSpnW (LPCWSTR lpStr, LPCWSTR lpSet)
{ {
int i,j, pos = lstrlenW(lpStr); int i,j, pos = lstrlenW(lpStr);
......
...@@ -26,7 +26,7 @@ DEFAULT_DEBUG_CHANNEL(win32); ...@@ -26,7 +26,7 @@ DEFAULT_DEBUG_CHANNEL(win32);
* MK_E_SYNTAX not a valid url * MK_E_SYNTAX not a valid url
* *
*/ */
HRESULT CreateURLMoniker(IMoniker *pmkContext, LPWSTR szURL, IMoniker **ppmk) HRESULT WINAPI CreateURLMoniker(IMoniker *pmkContext, LPWSTR szURL, IMoniker **ppmk)
{ {
TRACE("\n"); TRACE("\n");
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef __WINE_URLMON_H #ifndef __WINE_URLMON_H
#define __WINE_URLMON_H #define __WINE_URLMON_H
HRESULT CreateURLMoniker(IMoniker *pmkContext, LPWSTR szURL, IMoniker **ppmk); HRESULT WINAPI CreateURLMoniker(IMoniker *pmkContext, LPWSTR szURL, IMoniker **ppmk);
#endif /* __WINE_URLMON_H */ #endif /* __WINE_URLMON_H */
...@@ -184,6 +184,9 @@ void WINAPI UninitializeCriticalSection( CRITICAL_SECTION *crit ) ...@@ -184,6 +184,9 @@ void WINAPI UninitializeCriticalSection( CRITICAL_SECTION *crit )
#ifdef __i386__ #ifdef __i386__
/***********************************************************************
* InterlockCompareExchange (KERNEL32.@)
*/
PVOID WINAPI InterlockedCompareExchange( PVOID *dest, PVOID xchg, PVOID compare ); PVOID WINAPI InterlockedCompareExchange( PVOID *dest, PVOID xchg, PVOID compare );
__ASM_GLOBAL_FUNC(InterlockedCompareExchange, __ASM_GLOBAL_FUNC(InterlockedCompareExchange,
"movl 12(%esp),%eax\n\t" "movl 12(%esp),%eax\n\t"
...@@ -192,6 +195,9 @@ __ASM_GLOBAL_FUNC(InterlockedCompareExchange, ...@@ -192,6 +195,9 @@ __ASM_GLOBAL_FUNC(InterlockedCompareExchange,
"lock; cmpxchgl %ecx,(%edx)\n\t" "lock; cmpxchgl %ecx,(%edx)\n\t"
"ret $12"); "ret $12");
/***********************************************************************
* InterlockedExchange (KERNEL32.@)
*/
LONG WINAPI InterlockedExchange( PLONG dest, LONG val ); LONG WINAPI InterlockedExchange( PLONG dest, LONG val );
__ASM_GLOBAL_FUNC(InterlockedExchange, __ASM_GLOBAL_FUNC(InterlockedExchange,
"movl 8(%esp),%eax\n\t" "movl 8(%esp),%eax\n\t"
...@@ -199,6 +205,9 @@ __ASM_GLOBAL_FUNC(InterlockedExchange, ...@@ -199,6 +205,9 @@ __ASM_GLOBAL_FUNC(InterlockedExchange,
"lock; xchgl %eax,(%edx)\n\t" "lock; xchgl %eax,(%edx)\n\t"
"ret $8"); "ret $8");
/***********************************************************************
* InterlockedExchangeAdd (KERNEL32.@)
*/
LONG WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr ); LONG WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr );
__ASM_GLOBAL_FUNC(InterlockedExchangeAdd, __ASM_GLOBAL_FUNC(InterlockedExchangeAdd,
"movl 8(%esp),%eax\n\t" "movl 8(%esp),%eax\n\t"
...@@ -206,6 +215,9 @@ __ASM_GLOBAL_FUNC(InterlockedExchangeAdd, ...@@ -206,6 +215,9 @@ __ASM_GLOBAL_FUNC(InterlockedExchangeAdd,
"lock; xaddl %eax,(%edx)\n\t" "lock; xaddl %eax,(%edx)\n\t"
"ret $8"); "ret $8");
/***********************************************************************
* InterlockedIncrement (KERNEL32.@)
*/
LONG WINAPI InterlockedIncrement( PLONG dest ); LONG WINAPI InterlockedIncrement( PLONG dest );
__ASM_GLOBAL_FUNC(InterlockedIncrement, __ASM_GLOBAL_FUNC(InterlockedIncrement,
"movl 4(%esp),%edx\n\t" "movl 4(%esp),%edx\n\t"
...@@ -214,6 +226,9 @@ __ASM_GLOBAL_FUNC(InterlockedIncrement, ...@@ -214,6 +226,9 @@ __ASM_GLOBAL_FUNC(InterlockedIncrement,
"incl %eax\n\t" "incl %eax\n\t"
"ret $4"); "ret $4");
/***********************************************************************
* InterlockDecrement (KERNEL32.@)
*/
LONG WINAPI InterlockedDecrement( PLONG dest ); LONG WINAPI InterlockedDecrement( PLONG dest );
__ASM_GLOBAL_FUNC(InterlockedDecrement, __ASM_GLOBAL_FUNC(InterlockedDecrement,
"movl 4(%esp),%edx\n\t" "movl 4(%esp),%edx\n\t"
...@@ -237,6 +252,9 @@ __ASM_GLOBAL_FUNC(InterlockedDecrement, ...@@ -237,6 +252,9 @@ __ASM_GLOBAL_FUNC(InterlockedDecrement,
#include <synch.h> #include <synch.h>
static lwp_mutex_t interlocked_mutex = DEFAULTMUTEX; static lwp_mutex_t interlocked_mutex = DEFAULTMUTEX;
/***********************************************************************
* InterlockedCompareExchange (KERNEL32.@)
*/
PVOID WINAPI InterlockedCompareExchange( PVOID *dest, PVOID xchg, PVOID compare ) PVOID WINAPI InterlockedCompareExchange( PVOID *dest, PVOID xchg, PVOID compare )
{ {
_lwp_mutex_lock( &interlocked_mutex ); _lwp_mutex_lock( &interlocked_mutex );
...@@ -250,6 +268,9 @@ PVOID WINAPI InterlockedCompareExchange( PVOID *dest, PVOID xchg, PVOID compare ...@@ -250,6 +268,9 @@ PVOID WINAPI InterlockedCompareExchange( PVOID *dest, PVOID xchg, PVOID compare
return compare; return compare;
} }
/***********************************************************************
* InterlockedExchange (KERNEL32.@)
*/
LONG WINAPI InterlockedExchange( PLONG dest, LONG val ) LONG WINAPI InterlockedExchange( PLONG dest, LONG val )
{ {
LONG retv; LONG retv;
...@@ -262,6 +283,9 @@ LONG WINAPI InterlockedExchange( PLONG dest, LONG val ) ...@@ -262,6 +283,9 @@ LONG WINAPI InterlockedExchange( PLONG dest, LONG val )
return retv; return retv;
} }
/***********************************************************************
* InterlockedExchangeAdd (KERNEL32.@)
*/
LONG WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr ) LONG WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr )
{ {
LONG retv; LONG retv;
...@@ -274,6 +298,9 @@ LONG WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr ) ...@@ -274,6 +298,9 @@ LONG WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr )
return retv; return retv;
} }
/***********************************************************************
* InterlockedIncrement (KERNEL32.@)
*/
LONG WINAPI InterlockedIncrement( PLONG dest ) LONG WINAPI InterlockedIncrement( PLONG dest )
{ {
LONG retv; LONG retv;
...@@ -285,6 +312,9 @@ LONG WINAPI InterlockedIncrement( PLONG dest ) ...@@ -285,6 +312,9 @@ LONG WINAPI InterlockedIncrement( PLONG dest )
return retv; return retv;
} }
/***********************************************************************
* InterlockedDecrement (KERNEL32.@)
*/
LONG WINAPI InterlockedDecrement( PLONG dest ) LONG WINAPI InterlockedDecrement( PLONG dest )
{ {
LONG retv; LONG retv;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment