Fixed Win16 documentation not fixed because of a bug in winapi_check.

This commit is contained in:
Patrik Stridvall 2000-12-01 23:54:51 +00:00 committed by Alexandre Julliard
parent 7a4e599780
commit b5e5555c7c
5 changed files with 71 additions and 6 deletions

View File

@ -118,16 +118,26 @@ LONG WINAPI KERNEL_nop(void) { return 0; }
* *
* We rather want to implement them here instead of doing Callouts * We rather want to implement them here instead of doing Callouts
*/ */
/***********************************************************************
* KERNEL_AnsiNext16
*/
SEGPTR WINAPI KERNEL_AnsiNext16(SEGPTR current) SEGPTR WINAPI KERNEL_AnsiNext16(SEGPTR current)
{ {
return (*(char *)PTR_SEG_TO_LIN(current)) ? current + 1 : current; return (*(char *)PTR_SEG_TO_LIN(current)) ? current + 1 : current;
} }
/***********************************************************************
* KERNEL_AnsiPrev16
*/
SEGPTR WINAPI KERNEL_AnsiPrev16( SEGPTR start, SEGPTR current ) SEGPTR WINAPI KERNEL_AnsiPrev16( SEGPTR start, SEGPTR current )
{ {
return (current==start)?start:current-1; return (current==start)?start:current-1;
} }
/***********************************************************************
* KERNEL_AnsiUpper16
*/
SEGPTR WINAPI KERNEL_AnsiUpper16( SEGPTR strOrChar ) SEGPTR WINAPI KERNEL_AnsiUpper16( SEGPTR strOrChar )
{ {
/* uppercase only one char if strOrChar < 0x10000 */ /* uppercase only one char if strOrChar < 0x10000 */
@ -143,6 +153,9 @@ SEGPTR WINAPI KERNEL_AnsiUpper16( SEGPTR strOrChar )
else return toupper((char)strOrChar); else return toupper((char)strOrChar);
} }
/***********************************************************************
* KERNEL_AnsiLower16
*/
SEGPTR WINAPI KERNEL_AnsiLower16( SEGPTR strOrChar ) SEGPTR WINAPI KERNEL_AnsiLower16( SEGPTR strOrChar )
{ {
/* lowercase only one char if strOrChar < 0x10000 */ /* lowercase only one char if strOrChar < 0x10000 */

View File

@ -1037,7 +1037,7 @@ void WINAPI GetTEBSelectorFS16(void)
} }
/********************************************************************** /**********************************************************************
* KERNEL_431 (KERNEL.431) * IsPeFormat (KERNEL.431)
* Checks the passed filename if it is a PE format executeable * Checks the passed filename if it is a PE format executeable
* RETURNS * RETURNS
* TRUE, if it is. * TRUE, if it is.

View File

@ -204,10 +204,16 @@ HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, FARPROC l
return MSVIDEO_OpenFunc(fccType,fccHandler,wMode,lpfnHandler,TRUE); return MSVIDEO_OpenFunc(fccType,fccHandler,wMode,lpfnHandler,TRUE);
} }
/***********************************************************************
* ICOpen [MSVIDEO.203]
*/
HIC16 VFWAPI ICOpen16(DWORD fccType, DWORD fccHandler, UINT16 wMode) { HIC16 VFWAPI ICOpen16(DWORD fccType, DWORD fccHandler, UINT16 wMode) {
return (HIC16)ICOpen(fccType, fccHandler, wMode); return (HIC16)ICOpen(fccType, fccHandler, wMode);
} }
/***********************************************************************
* ICOpenFunction [MSVIDEO.206]
*/
HIC16 VFWAPI ICOpenFunction16(DWORD fccType, DWORD fccHandler, UINT16 wMode, FARPROC16 lpfnHandler) { HIC16 VFWAPI ICOpenFunction16(DWORD fccType, DWORD fccHandler, UINT16 wMode, FARPROC16 lpfnHandler) {
return MSVIDEO_OpenFunc(fccType, fccHandler, wMode, lpfnHandler,FALSE); return MSVIDEO_OpenFunc(fccType, fccHandler, wMode, lpfnHandler,FALSE);
} }
@ -224,6 +230,9 @@ LRESULT VFWAPI ICGetInfo(HIC hic,ICINFO *picinfo,DWORD cb) {
return ret; return ret;
} }
/***********************************************************************
* ICGetInfo [MSVIDEO.212]
*/
LRESULT VFWAPI ICGetInfo16(HIC16 hic, ICINFO16 *picinfo,DWORD cb) { LRESULT VFWAPI ICGetInfo16(HIC16 hic, ICINFO16 *picinfo,DWORD cb) {
LRESULT ret; LRESULT ret;
@ -313,6 +322,9 @@ HIC VFWAPI ICLocate(
return 0; return 0;
} }
/***********************************************************************
* ICLocate [MSVIDEO.213]
*/
HIC16 VFWAPI ICLocate16(DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbiIn, HIC16 VFWAPI ICLocate16(DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbiIn,
LPBITMAPINFOHEADER lpbiOut, WORD wFlags) { LPBITMAPINFOHEADER lpbiOut, WORD wFlags) {
return (HIC16)ICLocate(fccType, fccHandler, lpbiIn, lpbiOut, wFlags); return (HIC16)ICLocate(fccType, fccHandler, lpbiIn, lpbiOut, wFlags);
@ -402,6 +414,9 @@ ICCompress(
return ICSendMessage(hic,ICM_COMPRESS,(DWORD)&iccmp,sizeof(iccmp)); return ICSendMessage(hic,ICM_COMPRESS,(DWORD)&iccmp,sizeof(iccmp));
} }
/***********************************************************************
* _ICCompress [MSVIDEO.224]
*/
DWORD VFWAPIV ICCompress16(HIC16 hic, DWORD dwFlags, LPBITMAPINFOHEADER lpbiOutput, LPVOID lpData, DWORD VFWAPIV ICCompress16(HIC16 hic, DWORD dwFlags, LPBITMAPINFOHEADER lpbiOutput, LPVOID lpData,
LPBITMAPINFOHEADER lpbiInput, LPVOID lpBits, LPDWORD lpckid, LPBITMAPINFOHEADER lpbiInput, LPVOID lpBits, LPDWORD lpckid,
LPDWORD lpdwFlags, LONG lFrameNum, DWORD dwFrameSize, DWORD dwQuality, LPDWORD lpdwFlags, LONG lFrameNum, DWORD dwFrameSize, DWORD dwQuality,
@ -460,6 +475,9 @@ DWORD VFWAPIV ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat,
return ret; return ret;
} }
/***********************************************************************
* _ICDecompress [MSVIDEO.230]
*/
DWORD VFWAPIV ICDecompress16(HIC16 hic, DWORD dwFlags, LPBITMAPINFOHEADER lpbiFormat, DWORD VFWAPIV ICDecompress16(HIC16 hic, DWORD dwFlags, LPBITMAPINFOHEADER lpbiFormat,
LPVOID lpData, LPBITMAPINFOHEADER lpbi, LPVOID lpBits) { LPVOID lpData, LPBITMAPINFOHEADER lpbi, LPVOID lpBits) {
@ -869,10 +887,16 @@ LRESULT VFWAPI ICSendMessage(HIC hic, UINT msg, DWORD lParam1, DWORD lParam2) {
return MSVIDEO_SendMessage(hic,msg,lParam1,lParam2,TRUE); return MSVIDEO_SendMessage(hic,msg,lParam1,lParam2,TRUE);
} }
/***********************************************************************
* ICSendMessage [MSVIDEO.205]
*/
LRESULT VFWAPI ICSendMessage16(HIC16 hic, UINT16 msg, DWORD lParam1, DWORD lParam2) { LRESULT VFWAPI ICSendMessage16(HIC16 hic, UINT16 msg, DWORD lParam1, DWORD lParam2) {
return MSVIDEO_SendMessage(hic,msg,lParam1,lParam2,FALSE); return MSVIDEO_SendMessage(hic,msg,lParam1,lParam2,FALSE);
} }
/***********************************************************************
* _ICMessage [MSVIDEO.207]
*/
LRESULT VFWAPIV ICMessage16(void) { LRESULT VFWAPIV ICMessage16(void) {
HIC16 hic; HIC16 hic;
UINT16 msg; UINT16 msg;
@ -948,6 +972,9 @@ DWORD VFWAPIV ICDrawBegin(
return ICSendMessage(hic,ICM_DRAW_BEGIN,(DWORD)&icdb,sizeof(icdb)); return ICSendMessage(hic,ICM_DRAW_BEGIN,(DWORD)&icdb,sizeof(icdb));
} }
/***********************************************************************
* _ICDrawBegin [MSVIDEO.232]
*/
DWORD VFWAPIV ICDrawBegin16( DWORD VFWAPIV ICDrawBegin16(
HIC16 hic, HIC16 hic,
DWORD dwFlags,/* flags */ DWORD dwFlags,/* flags */
@ -1011,6 +1038,9 @@ DWORD VFWAPIV ICDraw(HIC hic, DWORD dwFlags, LPVOID lpFormat, LPVOID lpData, DWO
return ICSendMessage(hic,ICM_DRAW,(DWORD)&icd,sizeof(icd)); return ICSendMessage(hic,ICM_DRAW,(DWORD)&icd,sizeof(icd));
} }
/***********************************************************************
* _ICDraw [MSVIDEO.234]
*/
DWORD VFWAPIV ICDraw16(HIC16 hic, DWORD dwFlags, LPVOID /*SEGPTR*/ lpFormat, DWORD VFWAPIV ICDraw16(HIC16 hic, DWORD dwFlags, LPVOID /*SEGPTR*/ lpFormat,
LPVOID /*SEGPTR*/ lpData, DWORD cbData, LONG lTime) { LPVOID /*SEGPTR*/ lpData, DWORD cbData, LONG lTime) {
@ -1045,6 +1075,9 @@ LRESULT WINAPI ICClose(HIC hic) {
return 0; return 0;
} }
/***********************************************************************
* ICClose [MSVIDEO.204]
*/
LRESULT WINAPI ICClose16(HIC16 hic) { LRESULT WINAPI ICClose16(HIC16 hic) {
return ICClose(hic); return ICClose(hic);
} }

View File

@ -54,7 +54,9 @@ DWORD WINAPI SURegQueryValueEx( HKEY hkey, LPSTR lpszValueName,
lpbData, lpcbData ); lpbData, lpcbData );
} }
/* /***********************************************************************
* InstallHinfSection
*
* hwnd = parent window * hwnd = parent window
* hinst = instance of SETUPX.DLL * hinst = instance of SETUPX.DLL
* lpszCmdLine = e.g. "DefaultInstall 132 C:\MYINSTALL\MYDEV.INF" * lpszCmdLine = e.g. "DefaultInstall 132 C:\MYINSTALL\MYDEV.INF"
@ -472,8 +474,8 @@ static BOOL SETUPX_TranslateLDID(int ldid, LPSTR buffer, WORD buflen, HINF16 hIn
return handled; return handled;
} }
/* /***********************************************************************
* GenFormStrWithoutPlaceHolders * GenFormStrWithoutPlaceHolders
*/ */
void WINAPI GenFormStrWithoutPlaceHolders16( LPSTR szDst, LPCSTR szSrc, HINF16 hInf) void WINAPI GenFormStrWithoutPlaceHolders16( LPSTR szDst, LPCSTR szSrc, HINF16 hInf)
{ {
@ -546,6 +548,9 @@ void WINAPI GenFormStrWithoutPlaceHolders16( LPSTR szDst, LPCSTR szSrc, HINF16 h
TRACE("ret '%s'\n", szDst); TRACE("ret '%s'\n", szDst);
} }
/***********************************************************************
* CtlGetLddPath
*/
RETERR16 WINAPI CtlGetLddPath16(LOGDISKID16 ldid, LPSTR szPath) RETERR16 WINAPI CtlGetLddPath16(LOGDISKID16 ldid, LPSTR szPath)
{ {
FIXME("(%04x, %p), stub.\n", ldid, szPath); FIXME("(%04x, %p), stub.\n", ldid, szPath);
@ -553,13 +558,18 @@ RETERR16 WINAPI CtlGetLddPath16(LOGDISKID16 ldid, LPSTR szPath)
return OK; return OK;
} }
/***********************************************************************
* CtlSetLddPath
*/
RETERR16 WINAPI CtlSetLddPath16(LOGDISKID16 ldid, LPSTR szPath) RETERR16 WINAPI CtlSetLddPath16(LOGDISKID16 ldid, LPSTR szPath)
{ {
FIXME("(%04x, '%s'), stub.\n", ldid, szPath); FIXME("(%04x, '%s'), stub.\n", ldid, szPath);
return OK; return OK;
} }
/* /***********************************************************************
* vcpOpen
*
* p2 is "\001" for Netmeeting. * p2 is "\001" for Netmeeting.
*/ */
RETERR16 WINAPI vcpOpen16(LPWORD p1, LPWORD p2) RETERR16 WINAPI vcpOpen16(LPWORD p1, LPWORD p2)
@ -568,12 +578,18 @@ RETERR16 WINAPI vcpOpen16(LPWORD p1, LPWORD p2)
return OK; return OK;
} }
/***********************************************************************
* vcpClose
*/
RETERR16 WINAPI vcpClose16(WORD w1, WORD w2, WORD w3) RETERR16 WINAPI vcpClose16(WORD w1, WORD w2, WORD w3)
{ {
FIXME("(%04x, %04x %04x), stub.\n", w1, w2, w3); FIXME("(%04x, %04x %04x), stub.\n", w1, w2, w3);
return OK; return OK;
} }
/***********************************************************************
* GenInstall
*/
RETERR16 WINAPI GenInstall16(HINF16 hInfFile, LPCSTR szInstallSection, WORD wFlags) RETERR16 WINAPI GenInstall16(HINF16 hInfFile, LPCSTR szInstallSection, WORD wFlags)
{ {
FIXME("(%04x, '%s', %04x), stub. This doesn't install anything yet ! Use native SETUPX.DLL instead !!\n", hInfFile, szInstallSection, wFlags); FIXME("(%04x, '%s', %04x), stub. This doesn't install anything yet ! Use native SETUPX.DLL instead !!\n", hInfFile, szInstallSection, wFlags);

View File

@ -1427,6 +1427,9 @@ DWORD WINAPI WIN16_GetModuleHandle( SEGPTR name )
return MAKELONG(GetModuleHandle16( PTR_SEG_TO_LIN(name)), hFirstModule ); return MAKELONG(GetModuleHandle16( PTR_SEG_TO_LIN(name)), hFirstModule );
} }
/***********************************************************************
* GetModuleHandle16 (KERNEL but also exported from KERNEL32 in Wine)
*/
HMODULE16 WINAPI GetModuleHandle16( LPCSTR name ) HMODULE16 WINAPI GetModuleHandle16( LPCSTR name )
{ {
HMODULE16 hModule = hFirstModule; HMODULE16 hModule = hFirstModule;