Commit 811725ac authored by Vincent Béron's avatar Vincent Béron Committed by Alexandre Julliard

Correct and complete some api documentation.

parent 085f95ec
...@@ -190,6 +190,7 @@ void WINAPI AVIFileExit(void) { ...@@ -190,6 +190,7 @@ void WINAPI AVIFileExit(void) {
} }
/*********************************************************************** /***********************************************************************
* AVIFileOpen (AVIFIL32.@)
* AVIFileOpenA (AVIFIL32.@) * AVIFileOpenA (AVIFIL32.@)
* AVIFileOpen (AVIFILE.102) * AVIFileOpen (AVIFILE.102)
*/ */
...@@ -363,6 +364,7 @@ HRESULT WINAPI AVIFileGetStream(PAVIFILE pfile, PAVISTREAM *avis, ...@@ -363,6 +364,7 @@ HRESULT WINAPI AVIFileGetStream(PAVIFILE pfile, PAVISTREAM *avis,
} }
/*********************************************************************** /***********************************************************************
* AVIFileCreateStream (AVIFIL32.@)
* AVIFileCreateStreamA (AVIFIL32.@) * AVIFileCreateStreamA (AVIFIL32.@)
* AVIFileCreateStream (AVIFILE.144) * AVIFileCreateStream (AVIFILE.144)
*/ */
...@@ -782,8 +784,9 @@ HRESULT WINAPI AVIMakeFileFromStreams(PAVIFILE *ppfile, int nStreams, ...@@ -782,8 +784,9 @@ HRESULT WINAPI AVIMakeFileFromStreams(PAVIFILE *ppfile, int nStreams,
} }
/*********************************************************************** /***********************************************************************
* AVIStreamOpenFromFile (AVIFILE.103) * AVIStreamOpenFromFile (AVIFIL32.@)
* AVIStreamOpenFromFileA (AVIFIL32.@) * AVIStreamOpenFromFileA (AVIFIL32.@)
* AVIStreamOpenFromFile (AVIFILE.103)
*/ */
HRESULT WINAPI AVIStreamOpenFromFileA(PAVISTREAM *ppavi, LPCSTR szFile, HRESULT WINAPI AVIStreamOpenFromFileA(PAVISTREAM *ppavi, LPCSTR szFile,
DWORD fccType, LONG lParam, DWORD fccType, LONG lParam,
...@@ -987,6 +990,7 @@ LONG WINAPI AVIStreamTimeToSample(PAVISTREAM pstream, LONG lTime) ...@@ -987,6 +990,7 @@ LONG WINAPI AVIStreamTimeToSample(PAVISTREAM pstream, LONG lTime)
} }
/*********************************************************************** /***********************************************************************
* AVIBuildFilter (AVIFIL32.@)
* AVIBuildFilterA (AVIFIL32.@) * AVIBuildFilterA (AVIFIL32.@)
* AVIBuildFilter (AVIFILE.123) * AVIBuildFilter (AVIFILE.123)
*/ */
......
...@@ -168,6 +168,9 @@ static IClassFactoryVtbl ITSSCF_Vtbl = ...@@ -168,6 +168,9 @@ static IClassFactoryVtbl ITSSCF_Vtbl =
}; };
/***********************************************************************
* DllGetClassObject (ITSS.@)
*/
HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
{ {
DWORD i; DWORD i;
......
...@@ -1036,10 +1036,21 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID) ...@@ -1036,10 +1036,21 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID)
return ret; return ret;
} }
HRESULT WINAPI CLSIDFromProgID16( /******************************************************************************
LPCOLESTR16 progid, /* [in] program id as found in registry */ * CLSIDFromProgID [COMPOBJ.61]
LPCLSID riid /* [out] associated CLSID */ *
) { * Converts a program ID into the respective GUID.
*
* PARAMS
* progid [I] program id as found in registry
* riid [O] associated CLSID
*
* RETURNS
* Success: S_OK
* Failure: CO_E_CLASSSTRING - the given ProgID cannot be found.
*/
HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid)
{
char *buf,buf2[80]; char *buf,buf2[80];
DWORD buf2len; DWORD buf2len;
HRESULT err; HRESULT err;
...@@ -1063,7 +1074,6 @@ HRESULT WINAPI CLSIDFromProgID16( ...@@ -1063,7 +1074,6 @@ HRESULT WINAPI CLSIDFromProgID16(
/****************************************************************************** /******************************************************************************
* CLSIDFromProgID [OLE32.@] * CLSIDFromProgID [OLE32.@]
* CLSIDFromProgID [COMPOBJ.61]
* *
* Converts a program id into the respective GUID. * Converts a program id into the respective GUID.
* *
......
...@@ -30,7 +30,11 @@ ...@@ -30,7 +30,11 @@
WINE_DEFAULT_DEBUG_CHANNEL(twain); WINE_DEFAULT_DEBUG_CHANNEL(twain);
/* Main entry point for the TWAIN library */ /***********************************************************************
* DSM_Entry (TWAIN.1)
*
* Main entry point for the TWAIN library
*/
TW_UINT16 WINAPI TW_UINT16 WINAPI
DSM_Entry16 (pTW_IDENTITY pOrigin, DSM_Entry16 (pTW_IDENTITY pOrigin,
pTW_IDENTITY pDest, pTW_IDENTITY pDest,
......
...@@ -731,7 +731,7 @@ UINT16 WINAPI midiOutGetDevCaps16(UINT16 uDeviceID, LPMIDIOUTCAPS16 lpCaps, ...@@ -731,7 +731,7 @@ UINT16 WINAPI midiOutGetDevCaps16(UINT16 uDeviceID, LPMIDIOUTCAPS16 lpCaps,
/************************************************************************** /**************************************************************************
* midiOutGetErrorText [MMSYSTEM.203] * midiOutGetErrorText [MMSYSTEM.203]
* midiInGetErrorText [MMSYSTEM.203] * midiInGetErrorText [MMSYSTEM.303]
*/ */
UINT16 WINAPI midiOutGetErrorText16(UINT16 uError, LPSTR lpText, UINT16 uSize) UINT16 WINAPI midiOutGetErrorText16(UINT16 uError, LPSTR lpText, UINT16 uSize)
{ {
...@@ -1231,7 +1231,7 @@ UINT16 WINAPI waveOutGetDevCaps16(UINT16 uDeviceID, ...@@ -1231,7 +1231,7 @@ UINT16 WINAPI waveOutGetDevCaps16(UINT16 uDeviceID,
/************************************************************************** /**************************************************************************
* waveOutGetErrorText [MMSYSTEM.403] * waveOutGetErrorText [MMSYSTEM.403]
* waveInGetErrorText [MMSYSTEM.403] * waveInGetErrorText [MMSYSTEM.503]
*/ */
UINT16 WINAPI waveOutGetErrorText16(UINT16 uError, LPSTR lpText, UINT16 uSize) UINT16 WINAPI waveOutGetErrorText16(UINT16 uError, LPSTR lpText, UINT16 uSize)
{ {
......
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