Fixed some issues found by winapi_check.

This commit is contained in:
Patrik Stridvall 2001-06-19 03:36:23 +00:00 committed by Alexandre Julliard
parent 20ca00113b
commit c01c1933bf
10 changed files with 39 additions and 26 deletions

View File

@ -21,6 +21,7 @@ DEFAULT_DEBUG_CHANNEL(avifile);
/*********************************************************************** /***********************************************************************
* AVIFileInit (AVIFILE.100)
* AVIFileInit (AVIFIL32.@) * AVIFileInit (AVIFIL32.@)
*/ */
void WINAPI AVIFileInit(void) void WINAPI AVIFileInit(void)
@ -37,6 +38,7 @@ void WINAPI AVIFileInit(void)
} }
/*********************************************************************** /***********************************************************************
* AVIFileExit (AVIFILE.101)
* AVIFileExit (AVIFIL32.@) * AVIFileExit (AVIFIL32.@)
*/ */
void WINAPI AVIFileExit(void) void WINAPI AVIFileExit(void)
@ -68,6 +70,7 @@ ULONG WINAPI AVIFileAddRef(PAVIFILE pfile)
} }
/*********************************************************************** /***********************************************************************
* AVIFileRelease (AVIFILE.141)
* AVIFileRelease (AVIFIL32.@) * AVIFileRelease (AVIFIL32.@)
*/ */
ULONG WINAPI AVIFileRelease(PAVIFILE pfile) ULONG WINAPI AVIFileRelease(PAVIFILE pfile)
@ -76,6 +79,7 @@ ULONG WINAPI AVIFileRelease(PAVIFILE pfile)
} }
/*********************************************************************** /***********************************************************************
* AVIFileOpenA (AVIFILE.102)
* AVIFileOpenA (AVIFIL32.@) * AVIFileOpenA (AVIFIL32.@)
*/ */
HRESULT WINAPI AVIFileOpenA( HRESULT WINAPI AVIFileOpenA(
@ -175,6 +179,7 @@ HRESULT WINAPI AVIFileInfoA(PAVIFILE pfile,AVIFILEINFOA* pfi,LONG lSize)
} }
/*********************************************************************** /***********************************************************************
* AVIFileGetStream (AVIFILE.143)
* AVIFileGetStream (AVIFIL32.@) * AVIFileGetStream (AVIFIL32.@)
*/ */
HRESULT WINAPI AVIFileGetStream(PAVIFILE pfile,PAVISTREAM* pas,DWORD fccType,LONG lParam) HRESULT WINAPI AVIFileGetStream(PAVIFILE pfile,PAVISTREAM* pas,DWORD fccType,LONG lParam)

View File

@ -13,11 +13,11 @@ debug_channels (avifile)
@ stub AVIBuildFilterA @ stub AVIBuildFilterA
@ stub AVIBuildFilterW @ stub AVIBuildFilterW
@ stub AVIClearClipboard @ stub AVIClearClipboard
@ stub AVIFileAddRef @ stdcall AVIFileAddRef(ptr) AVIFileAddRef
@ stub AVIFileCreateStream @ stub AVIFileCreateStream
@ stdcall AVIFileCreateStreamA(ptr ptr ptr) AVIFileCreateStreamA @ stdcall AVIFileCreateStreamA(ptr ptr ptr) AVIFileCreateStreamA
@ stdcall AVIFileCreateStreamW(ptr ptr ptr) AVIFileCreateStreamW @ stdcall AVIFileCreateStreamW(ptr ptr ptr) AVIFileCreateStreamW
@ stub AVIFileEndRecord @ stdcall AVIFileEndRecord(ptr) AVIFileEndRecord
@ stdcall AVIFileExit() AVIFileExit @ stdcall AVIFileExit() AVIFileExit
@ stdcall AVIFileGetStream(ptr ptr long long) AVIFileGetStream @ stdcall AVIFileGetStream(ptr ptr long long) AVIFileGetStream
@ stdcall AVIFileInfo (ptr ptr long) AVIFileInfoA # A in both Win95 and NT @ stdcall AVIFileInfo (ptr ptr long) AVIFileInfoA # A in both Win95 and NT
@ -26,10 +26,10 @@ debug_channels (avifile)
@ stdcall AVIFileInit() AVIFileInit @ stdcall AVIFileInit() AVIFileInit
@ stub AVIFileOpen @ stub AVIFileOpen
@ stdcall AVIFileOpenA(ptr str long ptr) AVIFileOpenA @ stdcall AVIFileOpenA(ptr str long ptr) AVIFileOpenA
@ stub AVIFileOpenW @ stdcall AVIFileOpenW(ptr wstr long ptr) AVIFileOpenW
@ stub AVIFileReadData @ stdcall AVIFileReadData(ptr long ptr ptr) AVIFileReadData
@ stdcall AVIFileRelease(ptr) AVIFileRelease @ stdcall AVIFileRelease(ptr) AVIFileRelease
@ stub AVIFileWriteData @ stdcall AVIFileWriteData(ptr long ptr long) AVIFileWriteData
@ stub AVIGetFromClipboard @ stub AVIGetFromClipboard
@ stdcall AVIMakeCompressedStream(ptr ptr ptr ptr) AVIMakeCompressedStream @ stdcall AVIMakeCompressedStream(ptr ptr ptr ptr) AVIMakeCompressedStream
@ stub AVIMakeFileFromStreams @ stub AVIMakeFileFromStreams
@ -43,11 +43,11 @@ debug_channels (avifile)
@ stub AVISaveVA @ stub AVISaveVA
@ stub AVISaveVW @ stub AVISaveVW
@ stub AVISaveW @ stub AVISaveW
@ stub AVIStreamAddRef @ stdcall AVIStreamAddRef(ptr) AVIStreamAddRef
@ stub AVIStreamBeginStreaming @ stdcall AVIStreamBeginStreaming(ptr long long long) AVIStreamBeginStreaming
@ stdcall AVIStreamCreate(ptr long long ptr) AVIStreamCreate @ stdcall AVIStreamCreate(ptr long long ptr) AVIStreamCreate
@ stub AVIStreamEndStreaming @ stdcall AVIStreamEndStreaming(ptr) AVIStreamEndStreaming
@ stub AVIStreamFindSample @ stdcall AVIStreamFindSample(ptr long long) AVIStreamFindSample
@ stdcall AVIStreamGetFrame(ptr long) AVIStreamGetFrame @ stdcall AVIStreamGetFrame(ptr long) AVIStreamGetFrame
@ stdcall AVIStreamGetFrameClose(ptr) AVIStreamGetFrameClose @ stdcall AVIStreamGetFrameClose(ptr) AVIStreamGetFrameClose
@ stdcall AVIStreamGetFrameOpen(ptr ptr) AVIStreamGetFrameOpen @ stdcall AVIStreamGetFrameOpen(ptr ptr) AVIStreamGetFrameOpen
@ -56,16 +56,16 @@ debug_channels (avifile)
@ stdcall AVIStreamInfoW(ptr ptr long) AVIStreamInfoW @ stdcall AVIStreamInfoW(ptr ptr long) AVIStreamInfoW
@ stdcall AVIStreamLength(ptr) AVIStreamLength @ stdcall AVIStreamLength(ptr) AVIStreamLength
@ stub AVIStreamOpenFromFile @ stub AVIStreamOpenFromFile
@ stub AVIStreamOpenFromFileA @ stdcall AVIStreamOpenFromFileA(ptr str long long long ptr) AVIStreamOpenFromFileA
@ stub AVIStreamOpenFromFileW @ stdcall AVIStreamOpenFromFileW(ptr wstr long long long ptr) AVIStreamOpenFromFileW
@ stdcall AVIStreamRead(ptr long long ptr long ptr ptr) AVIStreamRead @ stdcall AVIStreamRead(ptr long long ptr long ptr ptr) AVIStreamRead
@ stdcall AVIStreamReadData(ptr long ptr ptr) AVIStreamReadData @ stdcall AVIStreamReadData(ptr long ptr ptr) AVIStreamReadData
@ stdcall AVIStreamReadFormat(ptr long ptr long) AVIStreamReadFormat @ stdcall AVIStreamReadFormat(ptr long ptr long) AVIStreamReadFormat
@ stdcall AVIStreamRelease(ptr) AVIStreamRelease @ stdcall AVIStreamRelease(ptr) AVIStreamRelease
@ stub AVIStreamSampleToTime @ stdcall AVIStreamSampleToTime(ptr long) AVIStreamSampleToTime
@ stdcall AVIStreamSetFormat(ptr long ptr long) AVIStreamSetFormat @ stdcall AVIStreamSetFormat(ptr long ptr long) AVIStreamSetFormat
@ stdcall AVIStreamStart(ptr) AVIStreamStart @ stdcall AVIStreamStart(ptr) AVIStreamStart
@ stub AVIStreamTimeToSample @ stdcall AVIStreamTimeToSample(ptr long) AVIStreamTimeToSample
@ stdcall AVIStreamWrite(ptr long long ptr long long ptr ptr) AVIStreamWrite @ stdcall AVIStreamWrite(ptr long long ptr long long ptr ptr) AVIStreamWrite
@ stdcall AVIStreamWriteData(ptr long ptr long) AVIStreamWriteData @ stdcall AVIStreamWriteData(ptr long ptr long) AVIStreamWriteData
@ stub CLSID_AVISimpleUnMarshal @ stub CLSID_AVISimpleUnMarshal

View File

@ -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) * Output by a 16 bit application of an ascii string to a debugger (if attached)
* and program log. * and program log.

View File

@ -122,7 +122,7 @@ rsrc version16.res
112 pascal16 GlobalUnWire(word) GlobalUnWire16 112 pascal16 GlobalUnWire(word) GlobalUnWire16
113 equate __AHSHIFT 3 113 equate __AHSHIFT 3
114 equate __AHINCR 8 114 equate __AHINCR 8
115 pascal16 OutputDebugString(str) OutputDebugStringA 115 pascal16 OutputDebugString(str) OutputDebugString16
116 stub InitLib 116 stub InitLib
117 pascal16 OldYield() OldYield16 117 pascal16 OldYield() OldYield16
118 pascal16 GetTaskQueueDS() GetTaskQueueDS16 118 pascal16 GetTaskQueueDS() GetTaskQueueDS16

View File

@ -553,7 +553,7 @@ BOOL WINAPI GetProcessTimes(
} }
/********************************************************************* /*********************************************************************
* GetCalendarInfoA (KERNEL32) * GetCalendarInfoA (KERNEL32.@)
* *
*/ */
int WINAPI GetCalendarInfoA(LCID Locale, CALID Calendar, CALTYPE CalType, 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, 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) 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) int WINAPI SetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, LPCWSTR lpCalData)

View File

@ -333,7 +333,7 @@ debug_channels (accel caret class clipboard combo cursor dc ddeml dialog driver
@ stdcall HiliteMenuItem(long long long long) HiliteMenuItem @ stdcall HiliteMenuItem(long long long long) HiliteMenuItem
@ stub ImpersonateDdeClientWindow @ stub ImpersonateDdeClientWindow
@ stdcall InSendMessage() InSendMessage @ stdcall InSendMessage() InSendMessage
@ stub InSendMessageEx @ stdcall InSendMessageEx(ptr) InSendMessageEx
@ stdcall InflateRect(ptr long long) InflateRect @ stdcall InflateRect(ptr long long) InflateRect
@ stdcall InsertMenuA(long long long long ptr) InsertMenuA @ stdcall InsertMenuA(long long long long ptr) InsertMenuA
@ stdcall InsertMenuItemA(long long long ptr) InsertMenuItemA @ stdcall InsertMenuItemA(long long long ptr) InsertMenuItemA

View File

@ -927,7 +927,7 @@ BOOL WINAPI InternetQueryOptionA(HINTERNET hInternet, DWORD dwOption,
* FALSE on failure * FALSE on failure
* *
*/ */
BOOLAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, BOOL WINAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName,
LPSTR lpCookieData, LPDWORD lpdwSize) LPSTR lpCookieData, LPDWORD lpdwSize)
{ {
FIXME("Stub\n"); FIXME("Stub\n");

View File

@ -4955,6 +4955,14 @@ LRESULT WINAPI mmTaskSignal16(HTASK16 ht)
return PostAppMessage16(ht, WM_USER, 0, 0); return PostAppMessage16(ht, WM_USER, 0, 0);
} }
/**************************************************************************
* mmGetCurrentTask [MMSYSTEM.904]
*/
HTASK16 WINAPI mmGetCurrentTask16(void)
{
return GetCurrentTask();
}
/************************************************************************** /**************************************************************************
* mmTaskYield16 [MMSYSTEM.905] * mmTaskYield16 [MMSYSTEM.905]
*/ */

View File

@ -135,7 +135,7 @@ owner winmm
900 pascal mmTaskCreate(long ptr long) mmTaskCreate16 900 pascal mmTaskCreate(long ptr long) mmTaskCreate16
902 pascal mmTaskBlock(word) mmTaskBlock16 902 pascal mmTaskBlock(word) mmTaskBlock16
903 pascal mmTaskSignal(word) mmTaskSignal16 903 pascal mmTaskSignal(word) mmTaskSignal16
904 pascal mmGetCurrentTask() GetCurrentTask #just the same 904 pascal16 mmGetCurrentTask() mmGetCurrentTask16
905 pascal mmTaskYield() mmTaskYield16 905 pascal mmTaskYield() mmTaskYield16
1100 pascal DrvOpen(str str long) DrvOpen16 1100 pascal DrvOpen(str str long) DrvOpen16
1101 pascal DrvClose(word long long) DrvClose16 1101 pascal DrvClose(word long long) DrvClose16

View File

@ -96,7 +96,7 @@ void WINAPI wine_call_to_16_regs_long ( CONTEXT86 *context, INT nArgs )
/*********************************************************************** /***********************************************************************
* __wine_call_from_16_word (KERNEL32.@) * __wine_call_from_16_word (KERNEL32.@)
*/ */
WORD __cdecl __wine_call_from_16_word(void) WORD __wine_call_from_16_word()
{ {
assert( FALSE ); assert( FALSE );
} }
@ -104,7 +104,7 @@ WORD __cdecl __wine_call_from_16_word(void)
/*********************************************************************** /***********************************************************************
* __wine_call_from_16_long (KERNEL32.@) * __wine_call_from_16_long (KERNEL32.@)
*/ */
LONG __cdecl __wine_call_from_16_long(void) LONG __wine_call_from_16_long()
{ {
assert( FALSE ); assert( FALSE );
} }
@ -112,7 +112,7 @@ LONG __cdecl __wine_call_from_16_long(void)
/*********************************************************************** /***********************************************************************
* __wine_call_from_16_regs (KERNEL32.@) * __wine_call_from_16_regs (KERNEL32.@)
*/ */
void __cdecl __wine_call_from_16_regs(void) void __wine_call_from_16_regs()
{ {
assert( FALSE ); assert( FALSE );
} }
@ -120,7 +120,7 @@ void __cdecl __wine_call_from_16_regs(void)
/*********************************************************************** /***********************************************************************
* __wine_call_from_16_thunk (KERNEL32.@) * __wine_call_from_16_thunk (KERNEL32.@)
*/ */
void __cdecl __wine_call_from_16_thunk(void) void __wine_call_from_16_thunk()
{ {
assert( FALSE ); assert( FALSE );
} }