From b5e5555c7cefa8764b150476942c64fbca8fb888 Mon Sep 17 00:00:00 2001 From: Patrik Stridvall Date: Fri, 1 Dec 2000 23:54:51 +0000 Subject: [PATCH] Fixed Win16 documentation not fixed because of a bug in winapi_check. --- dlls/kernel/kernel_main.c | 15 ++++++++++++++- dlls/kernel/thunk.c | 2 +- dlls/msvideo/msvideo_main.c | 33 +++++++++++++++++++++++++++++++++ dlls/setupapi/setupx_main.c | 24 ++++++++++++++++++++---- loader/ne/module.c | 3 +++ 5 files changed, 71 insertions(+), 6 deletions(-) diff --git a/dlls/kernel/kernel_main.c b/dlls/kernel/kernel_main.c index ec2b0e9439e..b3467446aa8 100644 --- a/dlls/kernel/kernel_main.c +++ b/dlls/kernel/kernel_main.c @@ -118,16 +118,26 @@ LONG WINAPI KERNEL_nop(void) { return 0; } * * We rather want to implement them here instead of doing Callouts */ + +/*********************************************************************** + * KERNEL_AnsiNext16 + */ SEGPTR WINAPI KERNEL_AnsiNext16(SEGPTR current) { return (*(char *)PTR_SEG_TO_LIN(current)) ? current + 1 : current; } - + +/*********************************************************************** + * KERNEL_AnsiPrev16 + */ SEGPTR WINAPI KERNEL_AnsiPrev16( SEGPTR start, SEGPTR current ) { return (current==start)?start:current-1; } +/*********************************************************************** + * KERNEL_AnsiUpper16 + */ SEGPTR WINAPI KERNEL_AnsiUpper16( SEGPTR strOrChar ) { /* uppercase only one char if strOrChar < 0x10000 */ @@ -143,6 +153,9 @@ SEGPTR WINAPI KERNEL_AnsiUpper16( SEGPTR strOrChar ) else return toupper((char)strOrChar); } +/*********************************************************************** + * KERNEL_AnsiLower16 + */ SEGPTR WINAPI KERNEL_AnsiLower16( SEGPTR strOrChar ) { /* lowercase only one char if strOrChar < 0x10000 */ diff --git a/dlls/kernel/thunk.c b/dlls/kernel/thunk.c index cf6c3211b45..6fd71843d22 100644 --- a/dlls/kernel/thunk.c +++ b/dlls/kernel/thunk.c @@ -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 * RETURNS * TRUE, if it is. diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c index 1ff355f478e..0edd71b67f3 100644 --- a/dlls/msvideo/msvideo_main.c +++ b/dlls/msvideo/msvideo_main.c @@ -204,10 +204,16 @@ HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, FARPROC l return MSVIDEO_OpenFunc(fccType,fccHandler,wMode,lpfnHandler,TRUE); } +/*********************************************************************** + * ICOpen [MSVIDEO.203] + */ HIC16 VFWAPI ICOpen16(DWORD fccType, DWORD fccHandler, UINT16 wMode) { return (HIC16)ICOpen(fccType, fccHandler, wMode); } +/*********************************************************************** + * ICOpenFunction [MSVIDEO.206] + */ HIC16 VFWAPI ICOpenFunction16(DWORD fccType, DWORD fccHandler, UINT16 wMode, FARPROC16 lpfnHandler) { return MSVIDEO_OpenFunc(fccType, fccHandler, wMode, lpfnHandler,FALSE); } @@ -224,6 +230,9 @@ LRESULT VFWAPI ICGetInfo(HIC hic,ICINFO *picinfo,DWORD cb) { return ret; } +/*********************************************************************** + * ICGetInfo [MSVIDEO.212] + */ LRESULT VFWAPI ICGetInfo16(HIC16 hic, ICINFO16 *picinfo,DWORD cb) { LRESULT ret; @@ -313,6 +322,9 @@ HIC VFWAPI ICLocate( return 0; } +/*********************************************************************** + * ICLocate [MSVIDEO.213] + */ HIC16 VFWAPI ICLocate16(DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbiIn, LPBITMAPINFOHEADER lpbiOut, WORD wFlags) { return (HIC16)ICLocate(fccType, fccHandler, lpbiIn, lpbiOut, wFlags); @@ -402,6 +414,9 @@ ICCompress( return ICSendMessage(hic,ICM_COMPRESS,(DWORD)&iccmp,sizeof(iccmp)); } +/*********************************************************************** + * _ICCompress [MSVIDEO.224] + */ DWORD VFWAPIV ICCompress16(HIC16 hic, DWORD dwFlags, LPBITMAPINFOHEADER lpbiOutput, LPVOID lpData, LPBITMAPINFOHEADER lpbiInput, LPVOID lpBits, LPDWORD lpckid, LPDWORD lpdwFlags, LONG lFrameNum, DWORD dwFrameSize, DWORD dwQuality, @@ -460,6 +475,9 @@ DWORD VFWAPIV ICDecompress(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiFormat, return ret; } +/*********************************************************************** + * _ICDecompress [MSVIDEO.230] + */ DWORD VFWAPIV ICDecompress16(HIC16 hic, DWORD dwFlags, LPBITMAPINFOHEADER lpbiFormat, 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); } +/*********************************************************************** + * ICSendMessage [MSVIDEO.205] + */ LRESULT VFWAPI ICSendMessage16(HIC16 hic, UINT16 msg, DWORD lParam1, DWORD lParam2) { return MSVIDEO_SendMessage(hic,msg,lParam1,lParam2,FALSE); } +/*********************************************************************** + * _ICMessage [MSVIDEO.207] + */ LRESULT VFWAPIV ICMessage16(void) { HIC16 hic; UINT16 msg; @@ -948,6 +972,9 @@ DWORD VFWAPIV ICDrawBegin( return ICSendMessage(hic,ICM_DRAW_BEGIN,(DWORD)&icdb,sizeof(icdb)); } +/*********************************************************************** + * _ICDrawBegin [MSVIDEO.232] + */ DWORD VFWAPIV ICDrawBegin16( HIC16 hic, 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)); } +/*********************************************************************** + * _ICDraw [MSVIDEO.234] + */ DWORD VFWAPIV ICDraw16(HIC16 hic, DWORD dwFlags, LPVOID /*SEGPTR*/ lpFormat, LPVOID /*SEGPTR*/ lpData, DWORD cbData, LONG lTime) { @@ -1045,6 +1075,9 @@ LRESULT WINAPI ICClose(HIC hic) { return 0; } +/*********************************************************************** + * ICClose [MSVIDEO.204] + */ LRESULT WINAPI ICClose16(HIC16 hic) { return ICClose(hic); } diff --git a/dlls/setupapi/setupx_main.c b/dlls/setupapi/setupx_main.c index e0dadb28f2b..121bd3d0b3b 100644 --- a/dlls/setupapi/setupx_main.c +++ b/dlls/setupapi/setupx_main.c @@ -54,7 +54,9 @@ DWORD WINAPI SURegQueryValueEx( HKEY hkey, LPSTR lpszValueName, lpbData, lpcbData ); } -/* +/*********************************************************************** + * InstallHinfSection + * * hwnd = parent window * hinst = instance of SETUPX.DLL * 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; } -/* - * GenFormStrWithoutPlaceHolders +/*********************************************************************** + * GenFormStrWithoutPlaceHolders */ 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); } +/*********************************************************************** + * CtlGetLddPath + */ RETERR16 WINAPI CtlGetLddPath16(LOGDISKID16 ldid, LPSTR szPath) { FIXME("(%04x, %p), stub.\n", ldid, szPath); @@ -553,13 +558,18 @@ RETERR16 WINAPI CtlGetLddPath16(LOGDISKID16 ldid, LPSTR szPath) return OK; } +/*********************************************************************** + * CtlSetLddPath + */ RETERR16 WINAPI CtlSetLddPath16(LOGDISKID16 ldid, LPSTR szPath) { FIXME("(%04x, '%s'), stub.\n", ldid, szPath); return OK; } -/* +/*********************************************************************** + * vcpOpen + * * p2 is "\001" for Netmeeting. */ RETERR16 WINAPI vcpOpen16(LPWORD p1, LPWORD p2) @@ -568,12 +578,18 @@ RETERR16 WINAPI vcpOpen16(LPWORD p1, LPWORD p2) return OK; } +/*********************************************************************** + * vcpClose + */ RETERR16 WINAPI vcpClose16(WORD w1, WORD w2, WORD w3) { FIXME("(%04x, %04x %04x), stub.\n", w1, w2, w3); return OK; } +/*********************************************************************** + * GenInstall + */ 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); diff --git a/loader/ne/module.c b/loader/ne/module.c index ec4bce98946..81aa3edeab5 100644 --- a/loader/ne/module.c +++ b/loader/ne/module.c @@ -1427,6 +1427,9 @@ DWORD WINAPI WIN16_GetModuleHandle( SEGPTR name ) return MAKELONG(GetModuleHandle16( PTR_SEG_TO_LIN(name)), hFirstModule ); } +/*********************************************************************** + * GetModuleHandle16 (KERNEL but also exported from KERNEL32 in Wine) + */ HMODULE16 WINAPI GetModuleHandle16( LPCSTR name ) { HMODULE16 hModule = hFirstModule;