From c01c1933bf8b93f0f220f9dd9a69095945a916a7 Mon Sep 17 00:00:00 2001 From: Patrik Stridvall Date: Tue, 19 Jun 2001 03:36:23 +0000 Subject: [PATCH] Fixed some issues found by winapi_check. --- dlls/avifil32/api.c | 5 +++++ dlls/avifil32/avifil32.spec | 26 +++++++++++++------------- dlls/kernel/debugger.c | 2 +- dlls/kernel/kernel.spec | 2 +- dlls/kernel/time.c | 8 ++++---- dlls/user/user32.spec | 2 +- dlls/wininet/internet.c | 2 +- dlls/winmm/mmsystem.c | 8 ++++++++ dlls/winmm/mmsystem.spec | 2 +- if1632/relay.c | 8 ++++---- 10 files changed, 39 insertions(+), 26 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index f9ba622d45e..b205f606f7d 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -21,6 +21,7 @@ DEFAULT_DEBUG_CHANNEL(avifile); /*********************************************************************** + * AVIFileInit (AVIFILE.100) * AVIFileInit (AVIFIL32.@) */ void WINAPI AVIFileInit(void) @@ -37,6 +38,7 @@ void WINAPI AVIFileInit(void) } /*********************************************************************** + * AVIFileExit (AVIFILE.101) * AVIFileExit (AVIFIL32.@) */ void WINAPI AVIFileExit(void) @@ -68,6 +70,7 @@ ULONG WINAPI AVIFileAddRef(PAVIFILE pfile) } /*********************************************************************** + * AVIFileRelease (AVIFILE.141) * AVIFileRelease (AVIFIL32.@) */ ULONG WINAPI AVIFileRelease(PAVIFILE pfile) @@ -76,6 +79,7 @@ ULONG WINAPI AVIFileRelease(PAVIFILE pfile) } /*********************************************************************** + * AVIFileOpenA (AVIFILE.102) * AVIFileOpenA (AVIFIL32.@) */ HRESULT WINAPI AVIFileOpenA( @@ -175,6 +179,7 @@ HRESULT WINAPI AVIFileInfoA(PAVIFILE pfile,AVIFILEINFOA* pfi,LONG lSize) } /*********************************************************************** + * AVIFileGetStream (AVIFILE.143) * AVIFileGetStream (AVIFIL32.@) */ HRESULT WINAPI AVIFileGetStream(PAVIFILE pfile,PAVISTREAM* pas,DWORD fccType,LONG lParam) diff --git a/dlls/avifil32/avifil32.spec b/dlls/avifil32/avifil32.spec index 24bca8fc6cd..d04fc982219 100644 --- a/dlls/avifil32/avifil32.spec +++ b/dlls/avifil32/avifil32.spec @@ -13,11 +13,11 @@ debug_channels (avifile) @ stub AVIBuildFilterA @ stub AVIBuildFilterW @ stub AVIClearClipboard -@ stub AVIFileAddRef +@ stdcall AVIFileAddRef(ptr) AVIFileAddRef @ stub AVIFileCreateStream @ stdcall AVIFileCreateStreamA(ptr ptr ptr) AVIFileCreateStreamA @ stdcall AVIFileCreateStreamW(ptr ptr ptr) AVIFileCreateStreamW -@ stub AVIFileEndRecord +@ stdcall AVIFileEndRecord(ptr) AVIFileEndRecord @ stdcall AVIFileExit() AVIFileExit @ stdcall AVIFileGetStream(ptr ptr long long) AVIFileGetStream @ stdcall AVIFileInfo (ptr ptr long) AVIFileInfoA # A in both Win95 and NT @@ -26,10 +26,10 @@ debug_channels (avifile) @ stdcall AVIFileInit() AVIFileInit @ stub AVIFileOpen @ stdcall AVIFileOpenA(ptr str long ptr) AVIFileOpenA -@ stub AVIFileOpenW -@ stub AVIFileReadData +@ stdcall AVIFileOpenW(ptr wstr long ptr) AVIFileOpenW +@ stdcall AVIFileReadData(ptr long ptr ptr) AVIFileReadData @ stdcall AVIFileRelease(ptr) AVIFileRelease -@ stub AVIFileWriteData +@ stdcall AVIFileWriteData(ptr long ptr long) AVIFileWriteData @ stub AVIGetFromClipboard @ stdcall AVIMakeCompressedStream(ptr ptr ptr ptr) AVIMakeCompressedStream @ stub AVIMakeFileFromStreams @@ -43,11 +43,11 @@ debug_channels (avifile) @ stub AVISaveVA @ stub AVISaveVW @ stub AVISaveW -@ stub AVIStreamAddRef -@ stub AVIStreamBeginStreaming +@ stdcall AVIStreamAddRef(ptr) AVIStreamAddRef +@ stdcall AVIStreamBeginStreaming(ptr long long long) AVIStreamBeginStreaming @ stdcall AVIStreamCreate(ptr long long ptr) AVIStreamCreate -@ stub AVIStreamEndStreaming -@ stub AVIStreamFindSample +@ stdcall AVIStreamEndStreaming(ptr) AVIStreamEndStreaming +@ stdcall AVIStreamFindSample(ptr long long) AVIStreamFindSample @ stdcall AVIStreamGetFrame(ptr long) AVIStreamGetFrame @ stdcall AVIStreamGetFrameClose(ptr) AVIStreamGetFrameClose @ stdcall AVIStreamGetFrameOpen(ptr ptr) AVIStreamGetFrameOpen @@ -56,16 +56,16 @@ debug_channels (avifile) @ stdcall AVIStreamInfoW(ptr ptr long) AVIStreamInfoW @ stdcall AVIStreamLength(ptr) AVIStreamLength @ stub AVIStreamOpenFromFile -@ stub AVIStreamOpenFromFileA -@ stub AVIStreamOpenFromFileW +@ stdcall AVIStreamOpenFromFileA(ptr str long long long ptr) AVIStreamOpenFromFileA +@ stdcall AVIStreamOpenFromFileW(ptr wstr long long long ptr) AVIStreamOpenFromFileW @ stdcall AVIStreamRead(ptr long long ptr long ptr ptr) AVIStreamRead @ stdcall AVIStreamReadData(ptr long ptr ptr) AVIStreamReadData @ stdcall AVIStreamReadFormat(ptr long ptr long) AVIStreamReadFormat @ stdcall AVIStreamRelease(ptr) AVIStreamRelease -@ stub AVIStreamSampleToTime +@ stdcall AVIStreamSampleToTime(ptr long) AVIStreamSampleToTime @ stdcall AVIStreamSetFormat(ptr long ptr long) AVIStreamSetFormat @ stdcall AVIStreamStart(ptr) AVIStreamStart -@ stub AVIStreamTimeToSample +@ stdcall AVIStreamTimeToSample(ptr long) AVIStreamTimeToSample @ stdcall AVIStreamWrite(ptr long long ptr long long ptr ptr) AVIStreamWrite @ stdcall AVIStreamWriteData(ptr long ptr long) AVIStreamWriteData @ stub CLSID_AVISimpleUnMarshal diff --git a/dlls/kernel/debugger.c b/dlls/kernel/debugger.c index 86f55c8f27b..e8dea4a19c9 100644 --- a/dlls/kernel/debugger.c +++ b/dlls/kernel/debugger.c @@ -213,7 +213,7 @@ void WINAPI OutputDebugStringW( /*********************************************************************** - * OutputDebugString16 (KERNEL.115) + * OutputDebugString (KERNEL.115) * * Output by a 16 bit application of an ascii string to a debugger (if attached) * and program log. diff --git a/dlls/kernel/kernel.spec b/dlls/kernel/kernel.spec index 805a209ff27..6a3f8391535 100644 --- a/dlls/kernel/kernel.spec +++ b/dlls/kernel/kernel.spec @@ -122,7 +122,7 @@ rsrc version16.res 112 pascal16 GlobalUnWire(word) GlobalUnWire16 113 equate __AHSHIFT 3 114 equate __AHINCR 8 -115 pascal16 OutputDebugString(str) OutputDebugStringA +115 pascal16 OutputDebugString(str) OutputDebugString16 116 stub InitLib 117 pascal16 OldYield() OldYield16 118 pascal16 GetTaskQueueDS() GetTaskQueueDS16 diff --git a/dlls/kernel/time.c b/dlls/kernel/time.c index 50baa19c376..5b93032715a 100644 --- a/dlls/kernel/time.c +++ b/dlls/kernel/time.c @@ -553,7 +553,7 @@ BOOL WINAPI GetProcessTimes( } /********************************************************************* - * GetCalendarInfoA (KERNEL32) + * GetCalendarInfoA (KERNEL32.@) * */ int WINAPI GetCalendarInfoA(LCID Locale, CALID Calendar, CALTYPE CalType, @@ -565,7 +565,7 @@ int WINAPI GetCalendarInfoA(LCID Locale, CALID Calendar, CALTYPE CalType, } /********************************************************************* - * GetCalendarInfoW (KERNEL32) + * GetCalendarInfoW (KERNEL32.@) * */ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, @@ -577,7 +577,7 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, } /********************************************************************* - * SetCalendarInfoA (KERNEL32) + * SetCalendarInfoA (KERNEL32.@) * */ int WINAPI SetCalendarInfoA(LCID Locale, CALID Calendar, CALTYPE CalType, LPCSTR lpCalData) @@ -588,7 +588,7 @@ int WINAPI SetCalendarInfoA(LCID Locale, CALID Calendar, CALTYPE CalType, LPCSTR } /********************************************************************* - * SetCalendarInfoW (KERNEL32) + * SetCalendarInfoW (KERNEL32.@) * */ int WINAPI SetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, LPCWSTR lpCalData) diff --git a/dlls/user/user32.spec b/dlls/user/user32.spec index d0ec2097dcb..a76057cfecd 100644 --- a/dlls/user/user32.spec +++ b/dlls/user/user32.spec @@ -333,7 +333,7 @@ debug_channels (accel caret class clipboard combo cursor dc ddeml dialog driver @ stdcall HiliteMenuItem(long long long long) HiliteMenuItem @ stub ImpersonateDdeClientWindow @ stdcall InSendMessage() InSendMessage -@ stub InSendMessageEx +@ stdcall InSendMessageEx(ptr) InSendMessageEx @ stdcall InflateRect(ptr long long) InflateRect @ stdcall InsertMenuA(long long long long ptr) InsertMenuA @ stdcall InsertMenuItemA(long long long ptr) InsertMenuItemA diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 3416e1af0cd..988ae8239a1 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -927,7 +927,7 @@ BOOL WINAPI InternetQueryOptionA(HINTERNET hInternet, DWORD dwOption, * FALSE on failure * */ -BOOLAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, +BOOL WINAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, LPSTR lpCookieData, LPDWORD lpdwSize) { FIXME("Stub\n"); diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index f9c9b35926f..8e86ecab87e 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -4955,6 +4955,14 @@ LRESULT WINAPI mmTaskSignal16(HTASK16 ht) return PostAppMessage16(ht, WM_USER, 0, 0); } +/************************************************************************** + * mmGetCurrentTask [MMSYSTEM.904] + */ +HTASK16 WINAPI mmGetCurrentTask16(void) +{ + return GetCurrentTask(); +} + /************************************************************************** * mmTaskYield16 [MMSYSTEM.905] */ diff --git a/dlls/winmm/mmsystem.spec b/dlls/winmm/mmsystem.spec index 9685229dcfc..3add1f38efa 100644 --- a/dlls/winmm/mmsystem.spec +++ b/dlls/winmm/mmsystem.spec @@ -135,7 +135,7 @@ owner winmm 900 pascal mmTaskCreate(long ptr long) mmTaskCreate16 902 pascal mmTaskBlock(word) mmTaskBlock16 903 pascal mmTaskSignal(word) mmTaskSignal16 -904 pascal mmGetCurrentTask() GetCurrentTask #just the same +904 pascal16 mmGetCurrentTask() mmGetCurrentTask16 905 pascal mmTaskYield() mmTaskYield16 1100 pascal DrvOpen(str str long) DrvOpen16 1101 pascal DrvClose(word long long) DrvClose16 diff --git a/if1632/relay.c b/if1632/relay.c index 17f9b526bd3..441fb1e20ba 100644 --- a/if1632/relay.c +++ b/if1632/relay.c @@ -96,7 +96,7 @@ void WINAPI wine_call_to_16_regs_long ( CONTEXT86 *context, INT nArgs ) /*********************************************************************** * __wine_call_from_16_word (KERNEL32.@) */ -WORD __cdecl __wine_call_from_16_word(void) +WORD __wine_call_from_16_word() { assert( FALSE ); } @@ -104,7 +104,7 @@ WORD __cdecl __wine_call_from_16_word(void) /*********************************************************************** * __wine_call_from_16_long (KERNEL32.@) */ -LONG __cdecl __wine_call_from_16_long(void) +LONG __wine_call_from_16_long() { assert( FALSE ); } @@ -112,7 +112,7 @@ LONG __cdecl __wine_call_from_16_long(void) /*********************************************************************** * __wine_call_from_16_regs (KERNEL32.@) */ -void __cdecl __wine_call_from_16_regs(void) +void __wine_call_from_16_regs() { assert( FALSE ); } @@ -120,7 +120,7 @@ void __cdecl __wine_call_from_16_regs(void) /*********************************************************************** * __wine_call_from_16_thunk (KERNEL32.@) */ -void __cdecl __wine_call_from_16_thunk(void) +void __wine_call_from_16_thunk() { assert( FALSE ); }