Added/modified documentation for function arguments.

This commit is contained in:
Patrik Stridvall 2000-12-01 23:58:28 +00:00 committed by Alexandre Julliard
parent b5e5555c7c
commit 2b3aa616e8
51 changed files with 310 additions and 274 deletions

View File

@ -1316,10 +1316,10 @@ INT16 WINAPI SetScrollInfo16( HWND16 hwnd, INT16 nBar, const SCROLLINFO *info,
* the text), and info->nPage=25.
*/
INT WINAPI SetScrollInfo(
HWND hwnd /* [I] Handle of window whose scrollbar will be affected */,
INT nBar /* [I] One of SB_HORZ, SB_VERT, or SB_CTL */,
const SCROLLINFO *info /* [I] Specifies what to change and new values */,
BOOL bRedraw /* [I] Should scrollbar be redrawn afterwards ? */)
HWND hwnd /* [in] Handle of window whose scrollbar will be affected */,
INT nBar /* [in] One of SB_HORZ, SB_VERT, or SB_CTL */,
const SCROLLINFO *info /* [in] Specifies what to change and new values */,
BOOL bRedraw /* [in] Should scrollbar be redrawn afterwards ? */)
{
INT action;
INT retVal = SCROLL_SetScrollInfo( hwnd, nBar, info, &action );
@ -1493,9 +1493,9 @@ BOOL16 WINAPI GetScrollInfo16( HWND16 hwnd, INT16 nBar, LPSCROLLINFO info )
* RETURNS STD
*/
BOOL WINAPI GetScrollInfo(
HWND hwnd /* [I] Handle of window */ ,
INT nBar /* [I] One of SB_HORZ, SB_VERT, or SB_CTL */,
LPSCROLLINFO info /* [IO] (info.fMask [I] specifies which values are to retrieve) */)
HWND hwnd /* [in] Handle of window */ ,
INT nBar /* [in] One of SB_HORZ, SB_VERT, or SB_CTL */,
LPSCROLLINFO info /* [in/out] (info.fMask [in] specifies which values are to retrieve) */)
{
SCROLLBAR_INFO *infoPtr;
@ -1539,10 +1539,10 @@ INT16 WINAPI SetScrollPos16( HWND16 hwnd, INT16 nBar, INT16 nPos,
* to make sure there was an error (and to know which one).
*/
INT WINAPI SetScrollPos(
HWND hwnd /* [I] Handle of window whose scrollbar will be affected */,
INT nBar /* [I] One of SB_HORZ, SB_VERT, or SB_CTL */,
INT nPos /* [I] New value */,
BOOL bRedraw /* [I] Should scrollbar be redrawn afterwards ? */ )
HWND hwnd /* [in] Handle of window whose scrollbar will be affected */,
INT nBar /* [in] One of SB_HORZ, SB_VERT, or SB_CTL */,
INT nPos /* [in] New value */,
BOOL bRedraw /* [in] Should scrollbar be redrawn afterwards ? */ )
{
SCROLLINFO info;
SCROLLBAR_INFO *infoPtr;
@ -1579,8 +1579,8 @@ INT16 WINAPI GetScrollPos16( HWND16 hwnd, INT16 nBar )
* to make sure there was an error (and to know which one).
*/
INT WINAPI GetScrollPos(
HWND hwnd, /* [I] Handle of window */
INT nBar /* [I] One of SB_HORZ, SB_VERT, or SB_CTL */)
HWND hwnd, /* [in] Handle of window */
INT nBar /* [in] One of SB_HORZ, SB_VERT, or SB_CTL */)
{
SCROLLBAR_INFO *infoPtr;
@ -1607,11 +1607,11 @@ void WINAPI SetScrollRange16( HWND16 hwnd, INT16 nBar,
* RETURNS STD
*/
BOOL WINAPI SetScrollRange(
HWND hwnd, /* [I] Handle of window whose scrollbar will be affected */
INT nBar, /* [I] One of SB_HORZ, SB_VERT, or SB_CTL */
INT MinVal, /* [I] New minimum value */
INT MaxVal, /* [I] New maximum value */
BOOL bRedraw /* [I] Should scrollbar be redrawn afterwards ? */)
HWND hwnd, /* [in] Handle of window whose scrollbar will be affected */
INT nBar, /* [in] One of SB_HORZ, SB_VERT, or SB_CTL */
INT MinVal, /* [in] New minimum value */
INT MaxVal, /* [in] New maximum value */
BOOL bRedraw /* [in] Should scrollbar be redrawn afterwards ? */)
{
SCROLLINFO info;
@ -1678,10 +1678,10 @@ BOOL16 WINAPI GetScrollRange16( HWND16 hwnd, INT16 nBar,
* RETURNS STD
*/
BOOL WINAPI GetScrollRange(
HWND hwnd, /* [I] Handle of window */
INT nBar, /* [I] One of SB_HORZ, SB_VERT, or SB_CTL */
LPINT lpMin, /* [O] Where to store minimum value */
LPINT lpMax /* [O] Where to store maximum value */)
HWND hwnd, /* [in] Handle of window */
INT nBar, /* [in] One of SB_HORZ, SB_VERT, or SB_CTL */
LPINT lpMin, /* [out] Where to store minimum value */
LPINT lpMax /* [out] Where to store maximum value */)
{
SCROLLBAR_INFO *infoPtr;
@ -1788,9 +1788,9 @@ void WINAPI ShowScrollBar16( HWND16 hwnd, INT16 nBar, BOOL16 fShow )
* RETURNS STD
*/
BOOL WINAPI ShowScrollBar(
HWND hwnd, /* [I] Handle of window whose scrollbar(s) will be affected */
INT nBar, /* [I] One of SB_HORZ, SB_VERT, SB_BOTH or SB_CTL */
BOOL fShow /* [I] TRUE = show, FALSE = hide */)
HWND hwnd, /* [in] Handle of window whose scrollbar(s) will be affected */
INT nBar, /* [in] One of SB_HORZ, SB_VERT, SB_BOTH or SB_CTL */
BOOL fShow /* [in] TRUE = show, FALSE = hide */)
{
SCROLL_ShowScrollBar( hwnd, nBar, (nBar == SB_VERT) ? 0 : fShow,
(nBar == SB_HORZ) ? 0 : fShow );

View File

@ -1480,7 +1480,7 @@ static LRESULT WINAPI FileOpenDlgProc(HWND hWnd, UINT wMsg,
* unknown, there are some FIXME's left.
*/
BOOL16 WINAPI GetOpenFileName16(
SEGPTR ofn /* addess of structure with data*/
SEGPTR ofn /* [in/out] address of structure with data*/
)
{
HINSTANCE hInst;
@ -1519,7 +1519,7 @@ BOOL16 WINAPI GetOpenFileName16(
* unknown. There are some FIXME's left.
*/
BOOL16 WINAPI GetSaveFileName16(
SEGPTR ofn /* addess of structure with data*/
SEGPTR ofn /* [in/out] addess of structure with data*/
)
{
HINSTANCE hInst;
@ -1556,7 +1556,7 @@ BOOL16 WINAPI GetSaveFileName16(
*
*/
BOOL WINAPI GetOpenFileNameA(
LPOPENFILENAMEA ofn) /* address of init structure */
LPOPENFILENAMEA ofn) /* [in/out] address of init structure */
{
BOOL newlook = TRUE; /* FIXME: TWEAK_WineLook */
@ -1587,7 +1587,7 @@ BOOL WINAPI GetOpenFileNameA(
*
*/
BOOL WINAPI GetOpenFileNameW(
LPOPENFILENAMEW ofn) /* address of init structure */
LPOPENFILENAMEW ofn) /* [in/out] address of init structure */
{
BOOL newlook = TRUE; /* FIXME: TWEAK_WineLook */
@ -1618,7 +1618,7 @@ BOOL WINAPI GetOpenFileNameW(
*
*/
BOOL WINAPI GetSaveFileNameA(
LPOPENFILENAMEA ofn) /* address of init structure */
LPOPENFILENAMEA ofn) /* [in/out] address of init structure */
{
BOOL newlook = TRUE; /* FIXME: TWEAK_WineLook */
@ -1649,7 +1649,7 @@ BOOL WINAPI GetSaveFileNameA(
*
*/
BOOL WINAPI GetSaveFileNameW(
LPOPENFILENAMEW ofn) /* address of init structure */
LPOPENFILENAMEW ofn) /* [in/out] address of init structure */
{
BOOL newlook = TRUE; /* FIXME: TWEAK_WineLook */

View File

@ -879,7 +879,7 @@ static BOOL PRINTDLG_CreateDC(LPPRINTDLGA lppd)
* default printer settings.
*/
BOOL WINAPI PrintDlgA(
LPPRINTDLGA lppd /* ptr to PRINTDLG32 struct */
LPPRINTDLGA lppd /* [in/out] ptr to PRINTDLG32 struct */
)
{
BOOL bRet = FALSE;
@ -1197,7 +1197,7 @@ BOOL16 WINAPI PrintDlg16( LPPRINTDLG16 lpPrint )
/***********************************************************************
* PrintDlgExA
*/
HRESULT WINAPI PrintDlgExA(/*LPPRINTDLGEXA*/ LPVOID lpPrintDlgExA)
HRESULT WINAPI PrintDlgExA(LPVOID lpPrintDlgExA) /* [???] FIXME: LPPRINTDLGEXA */
{
FIXME("stub\n");
return E_NOTIMPL;
@ -1205,7 +1205,7 @@ HRESULT WINAPI PrintDlgExA(/*LPPRINTDLGEXA*/ LPVOID lpPrintDlgExA)
/***********************************************************************
* PrintDlgExW
*/
HRESULT WINAPI PrintDlgExW(/*LPPRINTDLGEXW*/ LPVOID lpPrintDlgExW)
HRESULT WINAPI PrintDlgExW(LPVOID lpPrintDlgExW) /* [???] FIXME: LPPRINTDLGEXW */
{
FIXME("stub\n");
return E_NOTIMPL;

View File

@ -2501,8 +2501,8 @@ BOOL WINAPI GetCommTimeouts(HANDLE hComm,LPCOMMTIMEOUTS lptimeouts)
* - used in WriteFile to calculate GetOverlappedResult's timeout
*/
BOOL WINAPI SetCommTimeouts(
HANDLE hComm, /* [I] handle of COMM device */
LPCOMMTIMEOUTS lptimeouts /* [I] pointer to COMMTIMEOUTS structure */
HANDLE hComm, /* [in] handle of COMM device */
LPCOMMTIMEOUTS lptimeouts /* [in] pointer to COMMTIMEOUTS structure */
) {
BOOL ret;
int fd;
@ -2630,9 +2630,9 @@ VOID COMM_WaitCommEventService(void **args)
* Only supports EV_RXCHAR and EV_TXEMPTY
*/
BOOL WINAPI WaitCommEvent(
HANDLE hFile, /* [I] handle of comm port to wait for */
LPDWORD lpdwEvents, /* [O] event(s) that were detected */
LPOVERLAPPED lpOverlapped /* [I/O] for Asynchronous waiting */
HANDLE hFile, /* [in] handle of comm port to wait for */
LPDWORD lpdwEvents, /* [out] event(s) that were detected */
LPOVERLAPPED lpOverlapped /* [in/out] for Asynchronous waiting */
) {
OVERLAPPED ov;
LPOVERLAPPED lpov;
@ -2718,8 +2718,8 @@ BOOL WINAPI WaitCommEvent(
* properties of the comm port.
*/
BOOL WINAPI GetCommProperties(
HANDLE hFile, /* handle of the comm port */
LPCOMMPROP lpCommProp /* pointer to struct to be filled */
HANDLE hFile, /* [in] handle of the comm port */
LPCOMMPROP lpCommProp /* [out] pointer to struct to be filled */
) {
FIXME("(%d %p )\n",hFile,lpCommProp);
if(!lpCommProp)
@ -2788,9 +2788,9 @@ static CHAR lpszSerialUI[] = "serialui.dll";
* Perhaps this should be done when the comm port is closed?
*/
BOOL WINAPI CommConfigDialogA(
LPCSTR lpszDevice, /* name of communications device */
HANDLE hWnd, /* parent window for the dialog */
LPCOMMCONFIG lpCommConfig /* pointer to struct to fill */
LPCSTR lpszDevice, /* [in] name of communications device */
HANDLE hWnd, /* [in] parent window for the dialog */
LPCOMMCONFIG lpCommConfig /* [out] pointer to struct to fill */
) {
FARPROC lpfnCommDialog;
HMODULE hConfigModule;
@ -2820,9 +2820,9 @@ BOOL WINAPI CommConfigDialogA(
* see CommConfigDialogA for more info
*/
BOOL WINAPI CommConfigDialogW(
LPCWSTR lpszDevice, /* name of communications device */
HANDLE hWnd, /* parent window for the dialog */
LPCOMMCONFIG lpCommConfig /* pointer to struct to fill */
LPCWSTR lpszDevice, /* [in] name of communications device */
HANDLE hWnd, /* [in] parent window for the dialog */
LPCOMMCONFIG lpCommConfig /* [out] pointer to struct to fill */
) {
BOOL r;
LPSTR lpDeviceA;

View File

@ -382,7 +382,7 @@ static BOOL CALLBACK MSACM_FormatEnumCallbackWtoA(HACMDRIVERID hadid,
/***********************************************************************
* acmFormatEnumA (MSACM32.27)
s */
*/
MMRESULT WINAPI acmFormatEnumA(HACMDRIVER had, PACMFORMATDETAILSA pafda,
ACMFORMATENUMCBA fnCallback, DWORD dwInstance,
DWORD fdwEnum)
@ -460,6 +460,8 @@ static BOOL MSACM_FormatEnumHelper(PWINE_ACMDRIVERID padid, HACMDRIVER had,
return TRUE;
}
/**********************************************************************/
MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd,
ACMFORMATENUMCBW fnCallback, DWORD dwInstance,
DWORD fdwEnum)

View File

@ -704,8 +704,8 @@ NTSTATUS WINAPI RtlFormatCurrentUserKeyPath(
*
*/
DWORD WINAPI RtlOpenCurrentUser(
IN ACCESS_MASK DesiredAccess,
OUT PHANDLE KeyHandle) /* handle of HKEY_CURRENT_USER */
IN ACCESS_MASK DesiredAccess, /* [in] */
OUT PHANDLE KeyHandle) /* [out] handle of HKEY_CURRENT_USER */
{
OBJECT_ATTRIBUTES ObjectAttributes;
UNICODE_STRING ObjectName;

View File

@ -926,7 +926,7 @@ HRESULT WINAPI CoRegisterClassObject16(
* CoRevokeClassObject16 [COMPOBJ.6]
*
*/
HRESULT WINAPI CoRevokeClassObject16(DWORD dwRegister /* token on class obj */)
HRESULT WINAPI CoRevokeClassObject16(DWORD dwRegister) /* [in] token on class obj */
{
FIXME("(0x%08lx),stub!\n", dwRegister);
return 0;

View File

@ -269,8 +269,8 @@ void WINAPI OleUninitialize(void)
* CoRegisterMessageFilter [OLE32.38]
*/
HRESULT WINAPI CoRegisterMessageFilter(
LPMESSAGEFILTER lpMessageFilter, /* Pointer to interface */
LPMESSAGEFILTER *lplpMessageFilter /* Indirect pointer to prior instance if non-NULL */
LPMESSAGEFILTER lpMessageFilter, /* [in] Pointer to interface */
LPMESSAGEFILTER *lplpMessageFilter /* [out] Indirect pointer to prior instance if non-NULL */
) {
FIXME("stub\n");
if (lplpMessageFilter) {
@ -497,10 +497,10 @@ HRESULT WINAPI OleRegGetUserType(
* DoDragDrop [OLE32.65]
*/
HRESULT WINAPI DoDragDrop (
IDataObject *pDataObject, /* ptr to the data obj */
IDropSource* pDropSource, /* ptr to the source obj */
DWORD dwOKEffect, /* effects allowed by the source */
DWORD *pdwEffect) /* ptr to effects of the source */
IDataObject *pDataObject, /* [in] ptr to the data obj */
IDropSource* pDropSource, /* [in] ptr to the source obj */
DWORD dwOKEffect, /* [in] effects allowed by the source */
DWORD *pdwEffect) /* [out] ptr to effects of the source */
{
TrackerWindowInfo trackerInfo;
HWND hwndTrackWindow;

View File

@ -55,7 +55,7 @@ UINT16 WINAPI CompareString16(DWORD lcid,DWORD fdwStyle,
/******************************************************************************
* RegisterNLSInfoChanged [OLE2NLS.10]
*/
BOOL16 WINAPI RegisterNLSInfoChanged16(LPVOID/*FIXME*/ lpNewNLSInfo)
BOOL16 WINAPI RegisterNLSInfoChanged16(LPVOID lpNewNLSInfo) /* [???] FIXME */
{
FIXME("Fully implemented, but doesn't effect anything.\n");

View File

@ -237,7 +237,7 @@ HRESULT WINAPI OleRegEnumFormatEtc (
/***********************************************************************
* PropVariantClear [OLE32.166]
*/
HRESULT WINAPI PropVariantClear(/*PROPVARIANT* */void* pvar)
HRESULT WINAPI PropVariantClear(void *pvar) /* [in/out] FIXME: PROPVARIANT * */
{
FIXME("(%p): stub:\n", pvar);
@ -249,8 +249,8 @@ HRESULT WINAPI PropVariantClear(/*PROPVARIANT* */void* pvar)
/***********************************************************************
* PropVariantCopy [OLE32.246]
*/
HRESULT WINAPI PropVariantCopy(/*PROPVARIANT* */void* pvarDest,
/*const PROPVARIANT* */ void* pvarSrc)
HRESULT WINAPI PropVariantCopy(void *pvarDest, /* [out] FIXME: PROPVARIANT * */
const void *pvarSrc) /* [in] FIXME: const PROPVARIANT * */
{
FIXME("(%p, %p): stub:\n", pvarDest, pvarSrc);
@ -260,7 +260,8 @@ HRESULT WINAPI PropVariantCopy(/*PROPVARIANT* */void* pvarDest,
/***********************************************************************
* FreePropVariantArray [OLE32.195]
*/
HRESULT WINAPI FreePropVariantArray(ULONG cVariants, /*PROPVARIANT* */void* rgvars)
HRESULT WINAPI FreePropVariantArray(ULONG cVariants, /* [in] */
void *rgvars) /* [in/out] FIXME: PROPVARIANT * */
{
FIXME("(%lu, %p): stub:\n", cVariants, rgvars);

View File

@ -254,7 +254,7 @@ HRESULT WINAPI LoadTypeLib(
*/
HRESULT WINAPI LoadTypeLibEx(
LPCOLESTR szFile, /* [in] Name of file to load from */
REGKIND regkind, /* specify kind of registration */
REGKIND regkind, /* [in] Specify kind of registration */
ITypeLib **pptLib) /* [out] Pointer to pointer to loaded type library */
{
LPSTR p;
@ -311,9 +311,9 @@ HRESULT WINAPI LoadRegTypeLib(
* Failure: Status
*/
HRESULT WINAPI RegisterTypeLib(
ITypeLib * ptlib, /*[in] Pointer to the library*/
OLECHAR * szFullPath, /*[in] full Path of the library*/
OLECHAR * szHelpDir) /*[in] dir to the helpfile for the library,
ITypeLib * ptlib, /* [in] Pointer to the library*/
OLECHAR * szFullPath, /* [in] full Path of the library*/
OLECHAR * szHelpDir) /* [in] dir to the helpfile for the library,
may be NULL*/
{ FIXME("(%p,%s,%s): stub\n",ptlib, debugstr_w(szFullPath),debugstr_w(szHelpDir));
return S_OK; /* FIXME: pretend everything is OK */

View File

@ -319,9 +319,9 @@ RPC_STATUS WINAPI UuidToStringA(UUID *Uuid, unsigned char** StringUuid)
* NdrDllRegisterProxy (RPCRT4.@)
*/
WINAPI HRESULT WINAPI NdrDllRegisterProxy(
HMODULE hDll,
/*const ProxyFileInfo */ void **pProxyFileList,
const CLSID * pclsid
HMODULE hDll, /* [in] */
void **pProxyFileList, /* [???] FIXME: const ProxyFileInfo ** */
const CLSID *pclsid /* [in] */
) {
FIXME("(%x,%p,%s), stub!\n",hDll,pProxyFileList,debugstr_guid(pclsid));
return S_OK;

View File

@ -679,6 +679,8 @@ LPSTR SHELL_FindString(LPSTR lpEnv, LPCSTR entry)
return NULL;
}
/**********************************************************************/
SEGPTR WINAPI FindEnvironmentString16(LPSTR str)
{ SEGPTR spEnv;
LPSTR lpEnv,lpString;

View File

@ -420,7 +420,8 @@ HICON WINAPI ExtractIconW( HINSTANCE hInstance, LPCWSTR lpszExeFileName,
*/
HINSTANCE WINAPI FindExecutableA( LPCSTR lpFile, LPCSTR lpDirectory,
LPSTR lpResult )
{ HINSTANCE retval=31; /* default - 'No association was found' */
{
HINSTANCE retval=31; /* default - 'No association was found' */
char old_dir[1024];
TRACE("File %s, Dir %s\n",

View File

@ -487,9 +487,9 @@ static ICOM_VTABLE(IClassFactory) dclfvt =
HRESULT WINAPI SHCreateDefClassObject(
REFIID riid,
LPVOID* ppv,
LPFNCREATEINSTANCE lpfnCI, /* create instance callback entry */
PLONG pcRefDll, /* ref count of the dll */
REFIID riidInst) /* optional interface to the instance */
LPFNCREATEINSTANCE lpfnCI, /* [in] create instance callback entry */
PLONG pcRefDll, /* [in/out] ref count of the dll */
REFIID riidInst) /* [in] optional interface to the instance */
{
TRACE("\n\tIID:\t%s %p %p %p \n\tIIDIns:\t%s\n",
debugstr_guid(riid), ppv, lpfnCI, pcRefDll, debugstr_guid(riidInst));

View File

@ -459,8 +459,8 @@ DWORD WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv)
* see IShellFolder::CreateViewObject
*/
HRESULT WINAPI SHCreateShellFolderViewEx(
LPCSHELLFOLDERVIEWINFO psvcbi, /*[in ] shelltemplate struct*/
LPSHELLVIEW* ppv) /*[out] IShellView pointer*/
LPCSHELLFOLDERVIEWINFO psvcbi, /* [in] shelltemplate struct */
LPSHELLVIEW* ppv) /* [out] IShellView pointer */
{
IShellView * psf;
HRESULT hRes;

View File

@ -877,8 +877,8 @@ BOOL WINAPI SHGetSpecialFolderPathAW (
HRESULT WINAPI SHGetFolderPathA(
HWND hwndOwner,
int nFolder,
HANDLE hToken, /* FIXME: get paths for specific user */
DWORD dwFlags, /* FIXME: SHGFP_TYPE_CURRENT|SHGFP_TYPE_DEFAULT */
HANDLE hToken, /* [in] FIXME: get paths for specific user */
DWORD dwFlags, /* [in] FIXME: SHGFP_TYPE_CURRENT|SHGFP_TYPE_DEFAULT */
LPSTR pszPath)
{
return (SHGetSpecialFolderPathA(

View File

@ -354,6 +354,9 @@ BOOL WINAPI FileMenu_AppendItemA(
return TRUE;
}
/**********************************************************************/
BOOL WINAPI FileMenu_AppendItemAW(
HMENU hMenu,
LPCVOID lpText,
@ -822,6 +825,8 @@ BOOL _SHIsMenuSeparator(HMENU hm, int i)
return(FALSE);
}
/**********************************************************************/
HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags)
{ int nItem;
HMENU hmSubMenu;

View File

@ -151,8 +151,8 @@ DWORD WINAPI SHLWAPI_153(DWORD dw1, DWORD dw2, DWORD dw3)
* FIXME: function guessed
*/
DWORD WINAPI SHLWAPI_156 (
LPWSTR str1, /* "shell32.dll" */
LPWSTR str2) /* "shell32.dll" */
LPWSTR str1, /* [???] NOTE: "shell32.dll" */
LPWSTR str2) /* [???] NOTE: "shell32.dll" */
{
FIXME("(%s %s)stub\n",debugstr_w(str1),debugstr_w(str2));
return lstrcmpW(str1,str2);
@ -209,10 +209,10 @@ LPWSTR WINAPI SHLWAPI_215 (
* error codes: E_POINTER, E_NOINTERFACE
*/
HRESULT WINAPI SHLWAPI_219 (
LPVOID w, /* returned by LocalAlloc, 0x450 bytes, iface */
LPVOID w, /* [???] NOTE: returned by LocalAlloc, 0x450 bytes, iface */
LPVOID x,
LPVOID y,
LPWSTR z) /* OUT: path */
LPWSTR z) /* [???] NOTE: OUT: path */
{
FIXME("(%p %p %p %p)stub\n",w,x,y,z);
return 0xabba1252;
@ -299,8 +299,8 @@ DWORD WINAPI SHLWAPI_266 (
* SHLWAPI_267 [SHLWAPI.267]
*/
HRESULT WINAPI SHLWAPI_267 (
LPVOID w, /* same as 1th parameter of SHLWAPI_219 */
LPVOID x, /* same as 2nd parameter of SHLWAPI_219 */
LPVOID w, /* [???] NOTE: same as 1th parameter of SHLWAPI_219 */
LPVOID x, /* [???] NOTE: same as 2nd parameter of SHLWAPI_219 */
LPVOID y,
LPVOID z)
{
@ -421,8 +421,8 @@ DWORD WINAPI SHLWAPI_377 (LPVOID x, LPVOID y, LPVOID z)
*/
DWORD WINAPI SHLWAPI_378 (
LPSTR x,
LPVOID y, /* 0x50000000 */
LPVOID z) /* 4 */
LPVOID y, /* [???] 0x50000000 */
LPVOID z) /* [???] 4 */
{
FIXME("(%s %p %p)stub\n", x,y,z);
return LoadLibraryA(x);

View File

@ -78,7 +78,7 @@ BOOL WINAPI SHRegGetBoolUSValueW(
* SHRegQueryUSValueA [SHLWAPI]
*/
LONG WINAPI SHRegQueryUSValueA(
HKEY/*HUSKEY*/ hUSKey,
HKEY hUSKey, /* [in] FIXME: HUSKEY */
LPCSTR pszValue,
LPDWORD pdwType,
void *pvData,

View File

@ -534,10 +534,10 @@ HRESULT WINAPI PrivateExtractIconsW (
int nIndex,
DWORD sizeX,
DWORD sizeY,
HICON * phicon, /* HICON* */
DWORD w, /* 0 */
HICON * phicon, /* [???] NOTE: HICON* */
DWORD w, /* [in] NOTE: 0 */
UINT nIcons,
DWORD y ) /* 0x80 maybe LR_* constant */
DWORD y ) /* [in] NOTE: 0x80 maybe LR_* constant */
{
DWORD ret;
TRACE("%s 0x%08x 0x%08lx 0x%08lx %p 0x%08lx 0x%08x 0x%08lx\n",
@ -563,9 +563,9 @@ HRESULT WINAPI PrivateExtractIconsA (
DWORD sizeX,
DWORD sizeY,
HICON * phicon,
DWORD w, /* 0 */
DWORD w, /* [in] NOTE: 0 */
UINT nIcons,
DWORD y ) /* 0x80 */
DWORD y ) /* [in] NOTE: 0x80 */
{
DWORD ret;
LPWSTR lpwstrFile = HEAP_strdupAtoW(GetProcessHeap(), 0, lpstrFile);

View File

@ -502,12 +502,12 @@ BOOL WINAPI IsCharAlphaW(WCHAR x)
*/
DWORD WINAPI FormatMessage16(
DWORD dwFlags,
SEGPTR lpSource, /*not always a valid pointer*/
SEGPTR lpSource, /* [in] NOTE: not always a valid pointer */
WORD dwMessageId,
WORD dwLanguageId,
LPSTR lpBuffer, /* *((HLOCAL16*)) for FORMAT_MESSAGE_ALLOCATE_BUFFER*/
LPSTR lpBuffer, /* [out] NOTE: *((HLOCAL16*)) for FORMAT_MESSAGE_ALLOCATE_BUFFER*/
WORD nSize,
LPDWORD args /* va_list *args */
LPDWORD args /* [in] NOTE: va_list *args */
) {
#ifdef __i386__
/* This implementation is completely dependant on the format of the va_list on x86 CPUs */

View File

@ -550,7 +550,7 @@ DWORD __cdecl GetASPI32DLLVersion(void)
/***********************************************************************
* GetASPI32Buffer (WNASPI32.@)
*/
BOOL __cdecl GetASPI32Buffer(/*PASPI32BUFF*/LPVOID pab)
BOOL __cdecl GetASPI32Buffer(LPVOID pab) /* [???] FIXME: PASPI32BUFF */
{
FIXME("(%p), stub !\n", pab);
return TRUE;
@ -559,7 +559,7 @@ BOOL __cdecl GetASPI32Buffer(/*PASPI32BUFF*/LPVOID pab)
/***********************************************************************
* FreeASPI32Buffer (WNASPI32.@)
*/
BOOL __cdecl FreeASPI32Buffer(/*PASPI32BUFF*/LPVOID pab)
BOOL __cdecl FreeASPI32Buffer(LPVOID pab) /* [???] FIXME: PASPI32BUFF */
{
FIXME("(%p), stub !\n", pab);
return TRUE;

View File

@ -2208,9 +2208,9 @@ UINT WINAPI midiOutPrepareHeader(HMIDIOUT hMidiOut,
/**************************************************************************
* midiOutPrepareHeader [MMSYSTEM.206]
*/
UINT16 WINAPI midiOutPrepareHeader16(HMIDIOUT16 hMidiOut,
LPMIDIHDR16 /*SEGPTR*/ lpsegMidiOutHdr,
UINT16 uSize)
UINT16 WINAPI midiOutPrepareHeader16(HMIDIOUT16 hMidiOut, /* [in] */
LPMIDIHDR16 lpsegMidiOutHdr, /* [???] NOTE: SEGPTR */
UINT16 uSize) /* [in] */
{
LPWINE_MLD wmld;
@ -2245,9 +2245,9 @@ UINT WINAPI midiOutUnprepareHeader(HMIDIOUT hMidiOut,
/**************************************************************************
* midiOutUnprepareHeader [MMSYSTEM.207]
*/
UINT16 WINAPI midiOutUnprepareHeader16(HMIDIOUT16 hMidiOut,
LPMIDIHDR16 /*SEGPTR*/ lpsegMidiOutHdr,
UINT16 uSize)
UINT16 WINAPI midiOutUnprepareHeader16(HMIDIOUT16 hMidiOut, /* [in] */
LPMIDIHDR16 lpsegMidiOutHdr, /* [???] NOTE: SEGPTR */
UINT16 uSize) /* [in] */
{
LPWINE_MLD wmld;
LPMIDIHDR16 lpMidiOutHdr = PTR_SEG_TO_LIN(lpsegMidiOutHdr);
@ -2306,9 +2306,9 @@ UINT WINAPI midiOutLongMsg(HMIDIOUT hMidiOut,
/**************************************************************************
* midiOutLongMsg [MMSYSTEM.209]
*/
UINT16 WINAPI midiOutLongMsg16(HMIDIOUT16 hMidiOut,
LPMIDIHDR16 /* SEGPTR */ lpsegMidiOutHdr,
UINT16 uSize)
UINT16 WINAPI midiOutLongMsg16(HMIDIOUT16 hMidiOut, /* [in] */
LPMIDIHDR16 lpsegMidiOutHdr, /* [???] NOTE: SEGPTR */
UINT16 uSize) /* [in] */
{
LPWINE_MLD wmld;
@ -2721,9 +2721,9 @@ UINT WINAPI midiInPrepareHeader(HMIDIIN hMidiIn,
/**************************************************************************
* midiInPrepareHeader [MMSYSTEM.306]
*/
UINT16 WINAPI midiInPrepareHeader16(HMIDIIN16 hMidiIn,
MIDIHDR16* /*SEGPTR*/ lpsegMidiInHdr,
UINT16 uSize)
UINT16 WINAPI midiInPrepareHeader16(HMIDIIN16 hMidiIn, /* [in] */
MIDIHDR16* lpsegMidiInHdr, /* [???] NOTE: SEGPTR */
UINT16 uSize) /* [in] */
{
LPWINE_MLD wmld;
@ -2758,9 +2758,9 @@ UINT WINAPI midiInUnprepareHeader(HMIDIIN hMidiIn,
/**************************************************************************
* midiInUnprepareHeader [MMSYSTEM.307]
*/
UINT16 WINAPI midiInUnprepareHeader16(HMIDIIN16 hMidiIn,
MIDIHDR16* /* SEGPTR */ lpsegMidiInHdr,
UINT16 uSize)
UINT16 WINAPI midiInUnprepareHeader16(HMIDIIN16 hMidiIn, /* [in] */
MIDIHDR16* lpsegMidiInHdr, /* [???] NOTE: SEGPTR */
UINT16 uSize) /* [in] */
{
LPWINE_MLD wmld;
LPMIDIHDR16 lpMidiInHdr = PTR_SEG_TO_LIN(lpsegMidiInHdr);
@ -2796,9 +2796,9 @@ UINT WINAPI midiInAddBuffer(HMIDIIN hMidiIn,
/**************************************************************************
* midiInAddBuffer [MMSYSTEM.308]
*/
UINT16 WINAPI midiInAddBuffer16(HMIDIIN16 hMidiIn,
MIDIHDR16* /* SEGPTR */ lpsegMidiInHdr,
UINT16 uSize)
UINT16 WINAPI midiInAddBuffer16(HMIDIIN16 hMidiIn, /* [in] */
MIDIHDR16* lpsegMidiInHdr, /* [???] NOTE: SEGPTR */
UINT16 uSize) /* [in] */
{
LPWINE_MLD wmld;
@ -3922,9 +3922,9 @@ UINT WINAPI waveOutPrepareHeader(HWAVEOUT hWaveOut,
/**************************************************************************
* waveOutPrepareHeader [MMSYSTEM.406]
*/
UINT16 WINAPI waveOutPrepareHeader16(HWAVEOUT16 hWaveOut,
WAVEHDR* /*SEGPTR*/ lpsegWaveOutHdr,
UINT16 uSize)
UINT16 WINAPI waveOutPrepareHeader16(HWAVEOUT16 hWaveOut, /* [in] */
WAVEHDR* lpsegWaveOutHdr, /* [???] NOTE: SEGPTR */
UINT16 uSize) /* [in] */
{
LPWINE_MLD wmld;
LPWAVEHDR lpWaveOutHdr = (LPWAVEHDR)PTR_SEG_TO_LIN(lpsegWaveOutHdr);
@ -3962,9 +3962,9 @@ UINT WINAPI waveOutUnprepareHeader(HWAVEOUT hWaveOut,
/**************************************************************************
* waveOutUnprepareHeader [MMSYSTEM.407]
*/
UINT16 WINAPI waveOutUnprepareHeader16(HWAVEOUT16 hWaveOut,
LPWAVEHDR /*SEGPTR*/ lpsegWaveOutHdr,
UINT16 uSize)
UINT16 WINAPI waveOutUnprepareHeader16(HWAVEOUT16 hWaveOut, /* [in] */
LPWAVEHDR lpsegWaveOutHdr, /* [???] NOTE: SEGPTR */
UINT16 uSize) /* [in] */
{
LPWINE_MLD wmld;
LPWAVEHDR lpWaveOutHdr = (LPWAVEHDR)PTR_SEG_TO_LIN(lpsegWaveOutHdr);
@ -4000,9 +4000,9 @@ UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, LPWAVEHDR lpWaveOutHdr,
/**************************************************************************
* waveOutWrite [MMSYSTEM.408]
*/
UINT16 WINAPI waveOutWrite16(HWAVEOUT16 hWaveOut,
LPWAVEHDR /*SEGPTR*/ lpsegWaveOutHdr,
UINT16 uSize)
UINT16 WINAPI waveOutWrite16(HWAVEOUT16 hWaveOut, /* [in] */
LPWAVEHDR lpsegWaveOutHdr, /* [???] NOTE: SEGPTR */
UINT16 uSize) /* [in] */
{
LPWINE_MLD wmld;
@ -4563,9 +4563,9 @@ UINT WINAPI waveInPrepareHeader(HWAVEIN hWaveIn, WAVEHDR* lpWaveInHdr,
/**************************************************************************
* waveInPrepareHeader [MMSYSTEM.506]
*/
UINT16 WINAPI waveInPrepareHeader16(HWAVEIN16 hWaveIn,
WAVEHDR* /* SEGPTR */ lpsegWaveInHdr,
UINT16 uSize)
UINT16 WINAPI waveInPrepareHeader16(HWAVEIN16 hWaveIn, /* [in] */
WAVEHDR* lpsegWaveInHdr, /* [???] NOTE: SEGPTR */
UINT16 uSize) /* [in] */
{
LPWINE_MLD wmld;
LPWAVEHDR lpWaveInHdr = (LPWAVEHDR)PTR_SEG_TO_LIN(lpsegWaveInHdr);
@ -4607,9 +4607,9 @@ UINT WINAPI waveInUnprepareHeader(HWAVEIN hWaveIn, WAVEHDR* lpWaveInHdr,
/**************************************************************************
* waveInUnprepareHeader [MMSYSTEM.507]
*/
UINT16 WINAPI waveInUnprepareHeader16(HWAVEIN16 hWaveIn,
WAVEHDR* /* SEGPTR */ lpsegWaveInHdr,
UINT16 uSize)
UINT16 WINAPI waveInUnprepareHeader16(HWAVEIN16 hWaveIn, /* [in] */
WAVEHDR* lpsegWaveInHdr, /* [???] NOTE: SEGPTR */
UINT16 uSize) /* [in] */
{
LPWINE_MLD wmld;
LPWAVEHDR lpWaveInHdr = (LPWAVEHDR)PTR_SEG_TO_LIN(lpsegWaveInHdr);
@ -4648,9 +4648,9 @@ UINT WINAPI waveInAddBuffer(HWAVEIN hWaveIn,
/**************************************************************************
* waveInAddBuffer [MMSYSTEM.508]
*/
UINT16 WINAPI waveInAddBuffer16(HWAVEIN16 hWaveIn,
WAVEHDR* /* SEGPTR */ lpsegWaveInHdr,
UINT16 uSize)
UINT16 WINAPI waveInAddBuffer16(HWAVEIN16 hWaveIn, /* [in] */
WAVEHDR* lpsegWaveInHdr, /* [???] NOTE: SEGPTR */
UINT16 uSize) /* [in] */
{
LPWINE_MLD wmld;

View File

@ -784,6 +784,8 @@ static void WSOCK32_async_accept(LPWSINFO pwsi, SOCKET s, SOCKET as)
_enable_event(s, WS_FD_SERVEVENT, 0, 0);
}
/**********************************************************************/
SOCKET WINAPI WSOCK32_accept(SOCKET s, struct sockaddr *addr,
INT *addrlen32)
{
@ -1277,6 +1279,8 @@ char* WINAPI WSOCK32_inet_ntoa(struct in_addr in)
return NULL;
}
/**********************************************************************/
SEGPTR WINAPI WINSOCK_inet_ntoa16(struct in_addr in)
{
char* retVal = WSOCK32_inet_ntoa(in);
@ -2722,6 +2726,8 @@ VOID CALLBACK WINSOCK_DoAsyncEvent( ULONG_PTR ptr )
}
}
/**********************************************************************/
INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, LONG lEvent)
{
LPWSINFO pwsi = WINSOCK_GetIData();
@ -2768,6 +2774,8 @@ INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, LONG lEvent)
return SOCKET_ERROR;
}
/**********************************************************************/
INT16 WINAPI WSAAsyncSelect16(SOCKET16 s, HWND16 hWnd, UINT16 wMsg, LONG lEvent)
{
return (INT16)WSAAsyncSelect( s, hWnd, wMsg, lEvent );

View File

@ -1686,13 +1686,13 @@ static BOOL WINSPOOL_EnumPrinters(DWORD dwType, LPWSTR lpszName,
* exist, which makes this function return an empty list.
*/
BOOL WINAPI EnumPrintersW(
DWORD dwType, /* Types of print objects to enumerate */
LPWSTR lpszName, /* name of objects to enumerate */
DWORD dwLevel, /* type of printer info structure */
LPBYTE lpbPrinters, /* buffer which receives info */
DWORD cbBuf, /* max size of buffer in bytes */
LPDWORD lpdwNeeded, /* pointer to var: # bytes used/needed */
LPDWORD lpdwReturned /* number of entries returned */
DWORD dwType, /* [in] Types of print objects to enumerate */
LPWSTR lpszName, /* [in] name of objects to enumerate */
DWORD dwLevel, /* [in] type of printer info structure */
LPBYTE lpbPrinters, /* [out] buffer which receives info */
DWORD cbBuf, /* [in] max size of buffer in bytes */
LPDWORD lpdwNeeded, /* [out] pointer to var: # bytes used/needed */
LPDWORD lpdwReturned /* [out] number of entries returned */
)
{
return WINSPOOL_EnumPrinters(dwType, lpszName, dwLevel, lpbPrinters, cbBuf,
@ -2167,8 +2167,8 @@ BOOL WINAPI AddPrinterDriverW(LPWSTR printerName,DWORD level,
* BUGS
* implemented as stub only
*/
BOOL WINAPI PrinterProperties(HWND hWnd, /* handle to parent window */
HANDLE hPrinter /* handle to printer object */
BOOL WINAPI PrinterProperties(HWND hWnd, /* [in] handle to parent window */
HANDLE hPrinter /* [in] handle to printer object */
){
FIXME("(%d,%d): stub\n", hWnd, hPrinter);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

View File

@ -1210,7 +1210,7 @@ UINT16 WINAPI GetDriveType16(
*
* DRIVE_RAMDISK is unsupported.
*/
UINT WINAPI GetDriveTypeA(LPCSTR root /* String describing drive */)
UINT WINAPI GetDriveTypeA(LPCSTR root) /* [in] String describing drive */
{
int drive;
TRACE("(%s)\n", debugstr_a(root));

View File

@ -109,9 +109,9 @@ static void DISPDIB_Show(LPBITMAPINFOHEADER lpbi,LPSTR lpBits,WORD uFlags)
* Waiting for keypresses is not implemented.
*/
WORD WINAPI DisplayDib(
LPBITMAPINFO lpbi, /* DIB header with resolution and palette */
LPSTR lpBits, /* Bitmap bits to show */
WORD wFlags
LPBITMAPINFO lpbi, /* [in] DIB header with resolution and palette */
LPSTR lpBits, /* [in] Bitmap bits to show */
WORD wFlags /* [in] */
)
{
WORD ret;

View File

@ -199,12 +199,12 @@ int EMFDRV_AddHandleDC( DC *dc )
/**********************************************************************
* CreateEnhMetaFileA (GDI32.41)
*/
*/
HDC WINAPI CreateEnhMetaFileA(
HDC hdc, /* optional reference DC */
LPCSTR filename, /* optional filename for disk metafiles */
const RECT *rect, /* optional bounding rectangle */
LPCSTR description /* optional description */
HDC hdc, /* [in] optional reference DC */
LPCSTR filename, /* [in] optional filename for disk metafiles */
const RECT *rect, /* [in] optional bounding rectangle */
LPCSTR description /* [in] optional description */
)
{
LPWSTR filenameW = NULL;
@ -237,10 +237,10 @@ HDC WINAPI CreateEnhMetaFileA(
* CreateEnhMetaFileW (GDI32.42)
*/
HDC WINAPI CreateEnhMetaFileW(
HDC hdc, /* optional reference DC */
LPCWSTR filename, /* optional filename for disk metafiles */
const RECT* rect, /* optional bounding rectangle */
LPCWSTR description /* optional description */
HDC hdc, /* [in] optional reference DC */
LPCWSTR filename, /* [in] optional filename for disk metafiles */
const RECT* rect, /* [in] optional bounding rectangle */
LPCWSTR description /* [in] optional description */
)
{
HDC ret;
@ -344,7 +344,7 @@ HDC WINAPI CreateEnhMetaFileW(
/******************************************************************
* CloseEnhMetaFile
*/
HENHMETAFILE WINAPI CloseEnhMetaFile( HDC hdc /* metafile DC */ )
HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */
{
HENHMETAFILE hmf;
EMFDRV_PDEVICE *physDev;

View File

@ -183,7 +183,7 @@ static BOOL MFDRV_DeleteDC( DC *dc )
* A handle to the metafile DC if successful, NULL on failure.
*/
HDC16 WINAPI CreateMetaFile16(
LPCSTR filename /* Filename of disk metafile */
LPCSTR filename /* [in] Filename of disk metafile */
)
{
HDC ret;
@ -227,7 +227,7 @@ HDC16 WINAPI CreateMetaFile16(
* CreateMetaFileA (GDI32.51)
*/
HDC WINAPI CreateMetaFileA(
LPCSTR filename /* Filename of disk metafile */
LPCSTR filename /* [in] Filename of disk metafile */
)
{
return CreateMetaFile16( filename );
@ -298,7 +298,7 @@ static DC *MFDRV_CloseMetaFile( HDC hdc )
* CloseMetaFile16 (GDI.126)
*/
HMETAFILE16 WINAPI CloseMetaFile16(
HDC16 hdc /* Metafile DC to close */
HDC16 hdc /* [in] Metafile DC to close */
)
{
HMETAFILE16 hmf;
@ -326,7 +326,7 @@ HMETAFILE16 WINAPI CloseMetaFile16(
* Handle of newly created metafile on success, NULL on failure.
*/
HMETAFILE WINAPI CloseMetaFile(
HDC hdc /* Metafile DC to close */
HDC hdc /* [in] Metafile DC to close */
)
{
HMETAFILE hmf;

View File

@ -1510,6 +1510,8 @@ static inline HMODULE16 GetExePtrHelper( HANDLE16 handle, HTASK16 *hTask )
return 0;
}
/**********************************************************************/
HMODULE16 WINAPI WIN16_GetExePtr( HANDLE16 handle )
{
HTASK16 hTask = 0;
@ -1520,6 +1522,8 @@ HMODULE16 WINAPI WIN16_GetExePtr( HANDLE16 handle )
return hModule;
}
/**********************************************************************/
HMODULE16 WINAPI GetExePtr( HANDLE16 handle )
{
HTASK16 hTask = 0;

View File

@ -1130,8 +1130,8 @@ DWORD WINAPI VirtualQueryEx(
* TRUE: Otherwise
*/
BOOL WINAPI IsBadReadPtr(
LPCVOID ptr, /* Address of memory block */
UINT size ) /* Size of block */
LPCVOID ptr, /* [in] Address of memory block */
UINT size ) /* [in] Size of block */
{
if (!size) return FALSE; /* handle 0 size case w/o reference */
__TRY

View File

@ -124,6 +124,8 @@ WORD WINAPI CreateSystemTimer( WORD rate, SYSTEMTIMERPROC callback )
return 0;
}
/**********************************************************************/
static void SYSTEM_CallSystemTimerProc( FARPROC16 proc, WORD timer )
{
CONTEXT86 context;
@ -139,6 +141,8 @@ static void SYSTEM_CallSystemTimerProc( FARPROC16 proc, WORD timer )
wine_call_to_16_regs_short( &context, 0 );
}
/**********************************************************************/
WORD WINAPI WIN16_CreateSystemTimer( WORD rate, FARPROC16 proc )
{
FARPROC thunk = THUNK_Alloc( proc, (RELAY)SYSTEM_CallSystemTimerProc );

View File

@ -57,8 +57,8 @@ static void BIOS_SetCursorPos(BIOSDATA*data,unsigned page,unsigned X,unsigned Y)
* ask me, I don't work for them.
*
* Joseph Pranevich - 9/98
*/
/* Jess Haas 2/99
*
* Jess Haas 2/99
* Added support for Vesa. It is not complete but is a start.
* NOTE: Im not sure if i did all this right or if eny of it works.
* Currently i dont have a program that uses Vesa that actually gets far

View File

@ -233,8 +233,8 @@ HBRUSH16 WINAPI CreateDIBPatternBrush16( HGLOBAL16 hbitmap, UINT16 coloruse )
*
*/
HBRUSH WINAPI CreateDIBPatternBrush(
HGLOBAL hbitmap, /* Global object containg BITMAPINFO structure */
UINT coloruse /* Specifies color format, if provided */
HGLOBAL hbitmap, /* [in] Global object containg BITMAPINFO structure */
UINT coloruse /* [in] Specifies color format, if provided */
)
{
LOGBRUSH logbrush;
@ -263,8 +263,8 @@ HBRUSH WINAPI CreateDIBPatternBrush(
*
*/
HBRUSH WINAPI CreateDIBPatternBrushPt(
const void* data, /* Pointer to a BITMAPINFO structure followed by more data */
UINT coloruse /* Specifies color format, if provided */
const void* data, /* [in] Pointer to a BITMAPINFO structure followed by more data */
UINT coloruse /* [in] Specifies color format, if provided */
)
{
BITMAPINFO *info=(BITMAPINFO*)data;

View File

@ -1193,9 +1193,13 @@ BOOL WINAPI CombineTransform( LPXFORM xformResult, const XFORM *xform1,
/***********************************************************************
* SetDCHook (GDI.190)
*/
/* ### start build ### */
extern WORD CALLBACK GDI_CallTo16_word_wwll(FARPROC16,WORD,WORD,LONG,LONG);
/* ### stop build ### */
/**********************************************************************/
BOOL16 WINAPI SetDCHook( HDC16 hdc, FARPROC16 hookProc, DWORD dwHookData )
{
DC *dc = DC_GetDCPtr( hdc );

View File

@ -118,7 +118,7 @@ static HENHMETAFILE EMF_GetEnhMetaFile( HFILE hFile )
*
*/
HENHMETAFILE WINAPI GetEnhMetaFileA(
LPCSTR lpszMetaFile /* filename of enhanced metafile */
LPCSTR lpszMetaFile /* [in] filename of enhanced metafile */
)
{
HENHMETAFILE hmf;
@ -140,7 +140,7 @@ HENHMETAFILE WINAPI GetEnhMetaFileA(
* GetEnhMetaFileW (GDI32.180)
*/
HENHMETAFILE WINAPI GetEnhMetaFileW(
LPCWSTR lpszMetaFile) /* filename of enhanced metafile */
LPCWSTR lpszMetaFile) /* [in] filename of enhanced metafile */
{
HENHMETAFILE hmf;
HFILE hFile;
@ -165,9 +165,9 @@ HENHMETAFILE WINAPI GetEnhMetaFileW(
* buf.
*/
UINT WINAPI GetEnhMetaFileHeader(
HENHMETAFILE hmf, /* enhanced metafile */
UINT bufsize, /* size of buffer */
LPENHMETAHEADER buf /* buffer */
HENHMETAFILE hmf, /* [in] enhanced metafile */
UINT bufsize, /* [in] size of buffer */
LPENHMETAHEADER buf /* [out] buffer */
)
{
LPENHMETAHEADER emh;
@ -191,9 +191,9 @@ UINT WINAPI GetEnhMetaFileHeader(
* GetEnhMetaFileDescriptionA (GDI32.176)
*/
UINT WINAPI GetEnhMetaFileDescriptionA(
HENHMETAFILE hmf, /* enhanced metafile */
UINT size, /* size of buf */
LPSTR buf /* buffer to receive description */
HENHMETAFILE hmf, /* [in] enhanced metafile */
UINT size, /* [in] size of buf */
LPSTR buf /* [out] buffer to receive description */
)
{
LPENHMETAHEADER emh = EMF_GetEnhMetaHeader(hmf);
@ -229,9 +229,9 @@ UINT WINAPI GetEnhMetaFileDescriptionA(
* number of characters copied.
*/
UINT WINAPI GetEnhMetaFileDescriptionW(
HENHMETAFILE hmf, /* enhanced metafile */
UINT size, /* size of buf */
LPWSTR buf /* buffer to receive description */
HENHMETAFILE hmf, /* [in] enhanced metafile */
UINT size, /* [in] size of buf */
LPWSTR buf /* [out] buffer to receive description */
)
{
LPENHMETAHEADER emh = EMF_GetEnhMetaHeader(hmf);
@ -304,10 +304,10 @@ UINT WINAPI GetEnhMetaFileBits(
* No error handling on record play failures (ie checking return codes)
*/
BOOL WINAPI PlayEnhMetaFileRecord(
HDC hdc, /* device context in which to render EMF record */
LPHANDLETABLE handletable, /* array of handles to be used in rendering record */
const ENHMETARECORD *mr, /* EMF record to render */
UINT handles /* size of handle array */
HDC hdc, /* [in] device context in which to render EMF record */
LPHANDLETABLE handletable, /* [in] array of handles to be used in rendering record */
const ENHMETARECORD *mr, /* [in] EMF record to render */
UINT handles /* [in] size of handle array */
)
{
int type;
@ -1197,11 +1197,11 @@ BOOL WINAPI PlayEnhMetaFileRecord(
* Ignores rect.
*/
BOOL WINAPI EnumEnhMetaFile(
HDC hdc, /* device context to pass to _EnhMetaFunc_ */
HENHMETAFILE hmf, /* EMF to walk */
ENHMFENUMPROC callback, /* callback function */
LPVOID data, /* optional data for callback function */
const RECT *lpRect /* bounding rectangle for rendered metafile */
HDC hdc, /* [in] device context to pass to _EnhMetaFunc_ */
HENHMETAFILE hmf, /* [in] EMF to walk */
ENHMFENUMPROC callback, /* [in] callback function */
LPVOID data, /* [in] optional data for callback function */
const RECT *lpRect /* [in] bounding rectangle for rendered metafile */
)
{
BOOL ret;
@ -1324,9 +1324,9 @@ static INT CALLBACK EMF_PlayEnhMetaFileCallback(HDC hdc, HANDLETABLE *ht,
*
*/
BOOL WINAPI PlayEnhMetaFile(
HDC hdc, /* DC to render into */
HENHMETAFILE hmf, /* metafile to render */
const RECT *lpRect /* rectangle to place metafile inside */
HDC hdc, /* [in] DC to render into */
HENHMETAFILE hmf, /* [in] metafile to render */
const RECT *lpRect /* [in] rectangle to place metafile inside */
)
{
return EnumEnhMetaFile(hdc, hmf, EMF_PlayEnhMetaFileCallback, NULL,

View File

@ -1542,13 +1542,13 @@ DWORD WINAPI GetKerningPairsW( HDC hDC, DWORD cPairs,
*
*/
BOOL WINAPI TranslateCharsetInfo(
LPDWORD lpSrc, /*
LPDWORD lpSrc, /* [in]
if flags == TCI_SRCFONTSIG: pointer to fsCsb of a FONTSIGNATURE
if flags == TCI_SRCCHARSET: a character set value
if flags == TCI_SRCCODEPAGE: a code page value
*/
LPCHARSETINFO lpCs, /* structure to receive charset information */
DWORD flags /* determines interpretation of lpSrc */
LPCHARSETINFO lpCs, /* [out] structure to receive charset information */
DWORD flags /* [in] determines interpretation of lpSrc */
) {
int index = 0;
switch (flags) {

View File

@ -382,8 +382,8 @@ HMETAFILE16 WINAPI CopyMetaFile16( HMETAFILE16 hSrcMetaFile, LPCSTR lpFilename)
* Copying to disk returns NULL even if successful.
*/
HMETAFILE WINAPI CopyMetaFileA(
HMETAFILE hSrcMetaFile, /* handle of metafile to copy */
LPCSTR lpFilename /* filename if copying to a file */
HMETAFILE hSrcMetaFile, /* [in] handle of metafile to copy */
LPCSTR lpFilename /* [in] filename if copying to a file */
) {
METAHEADER *mh = MF_GetMetaHeader( hSrcMetaFile );
METAHEADER *mh2 = NULL;
@ -546,8 +546,8 @@ BOOL16 WINAPI PlayMetaFile16( HDC16 hdc, HMETAFILE16 hmf )
* hdc. Returns FALSE on failure, TRUE on success.
*/
BOOL WINAPI PlayMetaFile(
HDC hdc, /* handle of DC to render in */
HMETAFILE hmf /* handle of metafile to render */
HDC hdc, /* [in] handle of DC to render in */
HMETAFILE hmf /* [in] handle of metafile to render */
)
{
BOOL ret;
@ -756,10 +756,10 @@ static BOOL MF_Play_MetaExtTextOut(HDC16 hdc, METARECORD *mr);
*
*/
void WINAPI PlayMetaFileRecord16(
HDC16 hdc, /* DC to render metafile into */
HANDLETABLE16 *ht, /* pointer to handle table for metafile objects */
METARECORD *mr, /* pointer to metafile record to render */
UINT16 nHandles /* size of handle table */
HDC16 hdc, /* [in] DC to render metafile into */
HANDLETABLE16 *ht, /* [in] pointer to handle table for metafile objects */
METARECORD *mr, /* [in] pointer to metafile record to render */
UINT16 nHandles /* [in] size of handle table */
) {
short s1;
HANDLE16 hndl;
@ -1236,7 +1236,7 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, HANDLETABLE *handletable,
*/
HGLOBAL16 WINAPI GetMetaFileBits16(
HMETAFILE16 hmf /* metafile handle */
HMETAFILE16 hmf /* [in] metafile handle */
)
{
TRACE("hMem out: %04x\n", hmf);
@ -1253,7 +1253,7 @@ HGLOBAL16 WINAPI GetMetaFileBits16(
*/
HMETAFILE16 WINAPI SetMetaFileBits16(
HGLOBAL16 hMem
/* handle to a memory region holding a metafile */
/* [in] handle to a memory region holding a metafile */
)
{
TRACE("hmf out: %04x\n", hMem);
@ -1286,8 +1286,8 @@ HMETAFILE16 WINAPI SetMetaFileBitsBetter16( HMETAFILE16 hMeta )
* Use _GetMetaFileBitsEx_ to get raw data from a metafile.
*/
HMETAFILE WINAPI SetMetaFileBitsEx(
UINT size, /* size of metafile, in bytes */
const BYTE *lpData /* pointer to metafile data */
UINT size, /* [in] size of metafile, in bytes */
const BYTE *lpData /* [in] pointer to metafile data */
)
{
METAHEADER *mh = HeapAlloc( GetProcessHeap(), 0, size );
@ -1304,9 +1304,9 @@ HMETAFILE WINAPI SetMetaFileBitsEx(
* returns number of bytes copied.
*/
UINT WINAPI GetMetaFileBitsEx(
HMETAFILE hmf, /* metafile */
UINT nSize, /* size of buf */
LPVOID buf /* buffer to receive raw metafile data */
HMETAFILE hmf, /* [in] metafile */
UINT nSize, /* [in] size of buf */
LPVOID buf /* [out] buffer to receive raw metafile data */
) {
METAHEADER *mh = MF_GetMetaHeader(hmf);
UINT mfSize;

View File

@ -847,6 +847,8 @@ VOID WINAPI SetMagicColors16(HDC16 hDC, COLORREF color, UINT16 index)
#define WINEICM "winefake.icm" /* easy-to-identify fake filename */
/*********************************************************************/
BOOL WINAPI GetICMProfileA(HDC hDC, LPDWORD lpcbName, LPSTR lpszFilename)
{
DWORD callerLen;

View File

@ -179,7 +179,7 @@ UINT16 WINAPI GetTextCharset16(HDC16 hdc)
* Failure: DEFAULT_CHARSET
*/
UINT WINAPI GetTextCharsetInfo(
HDC hdc, /* [in] Handle to device context */
HDC hdc, /* [in] Handle to device context */
LPFONTSIGNATURE fs, /* [out] Pointer to struct to receive data */
DWORD flags) /* [in] Reserved - must be 0 */
{
@ -206,9 +206,9 @@ UINT WINAPI GetTextCharsetInfo(
* PolyTextOutA [GDI.402] Draw several Strings
*/
BOOL WINAPI PolyTextOutA (
HDC hdc, /* Handle to device context */
PPOLYTEXTA pptxt, /* array of strings */
INT cStrings /* Number of strings in array */
HDC hdc, /* [in] Handle to device context */
PPOLYTEXTA pptxt, /* [in] Array of strings */
INT cStrings /* [in] Number of strings in array */
)
{
FIXME("stub!\n");
@ -222,9 +222,9 @@ BOOL WINAPI PolyTextOutA (
* PolyTextOutW [GDI.403] Draw several Strings
*/
BOOL WINAPI PolyTextOutW (
HDC hdc, /* Handle to device context */
PPOLYTEXTW pptxt, /* array of strings */
INT cStrings /* Number of strings in array */
HDC hdc, /* [in] Handle to device context */
PPOLYTEXTW pptxt, /* [in] Array of strings */
INT cStrings /* [in] Number of strings in array */
)
{
FIXME("stub!\n");

View File

@ -1874,14 +1874,14 @@ static int identity(int c)
* so there is nothing to be done for this flag.
*/
INT WINAPI LCMapStringA(
LCID lcid /* locale identifier created with MAKELCID;
LOCALE_SYSTEM_DEFAULT and LOCALE_USER_DEFAULT are
predefined values. */,
DWORD mapflags /* flags */,
LPCSTR srcstr /* source buffer */,
INT srclen /* source length */,
LPSTR dststr /* destination buffer */,
INT dstlen /* destination buffer length */)
LCID lcid, /* [in] locale identifier created with MAKELCID;
LOCALE_SYSTEM_DEFAULT and LOCALE_USER_DEFAULT are
predefined values. */
DWORD mapflags, /* [in] flags */
LPCSTR srcstr, /* [in] source buffer */
INT srclen, /* [in] source length */
LPSTR dststr, /* [out] destination buffer */
INT dstlen) /* [in] destination buffer length */
{
int i;
@ -2452,12 +2452,12 @@ static inline int OLE2NLS_EstimateMappingLength(LCID lcid, DWORD dwMapFlags,
* Quite inefficient.
*/
UINT WINAPI CompareStringA(
DWORD lcid, /* locale ID */
DWORD fdwStyle, /* comparison-style options */
LPCSTR s1, /* first string */
DWORD l1, /* length of first string */
LPCSTR s2, /* second string */
DWORD l2) /* length of second string */
DWORD lcid, /* [in] locale ID */
DWORD fdwStyle, /* [in] comparison-style options */
LPCSTR s1, /* [in] first string */
DWORD l1, /* [in] length of first string */
LPCSTR s2, /* [in] second string */
DWORD l2) /* [in] length of second string */
{
int mapstring_flags;
int len1,len2;
@ -4150,12 +4150,12 @@ static LCID OLE2NLS_CheckLocale (LCID locale)
*
*/
INT WINAPI
GetTimeFormatA(LCID locale, /* in */
DWORD flags, /* in */
LPSYSTEMTIME xtime, /* in */
LPCSTR format, /* in */
LPSTR timestr, /* out */
INT timelen /* in */)
GetTimeFormatA(LCID locale, /* [in] */
DWORD flags, /* [in] */
LPSYSTEMTIME xtime, /* [in] */
LPCSTR format, /* [in] */
LPSTR timestr, /* [out] */
INT timelen /* [in] */)
{ char format_buf[40];
LPCSTR thisformat;
SYSTEMTIME t;
@ -4204,12 +4204,12 @@ GetTimeFormatA(LCID locale, /* in */
* Makes a Unicode string of the time
*/
INT WINAPI
GetTimeFormatW(LCID locale, /* in */
DWORD flags, /* in */
LPSYSTEMTIME xtime, /* in */
LPCWSTR format, /* in */
LPWSTR timestr, /* out */
INT timelen /* in */)
GetTimeFormatW(LCID locale, /* [in] */
DWORD flags, /* [in] */
LPSYSTEMTIME xtime, /* [in] */
LPCWSTR format, /* [in] */
LPWSTR timestr, /* [out] */
INT timelen /* [in] */)
{ WCHAR format_buf[40];
LPCWSTR thisformat;
SYSTEMTIME t;

View File

@ -1328,8 +1328,8 @@ DWORD WINAPI RegisterServiceProcess(DWORD dwProcessId, DWORD dwType)
* Failure: FALSE
*/
BOOL WINAPI GetExitCodeProcess(
HANDLE hProcess, /* [I] handle to the process */
LPDWORD lpExitCode) /* [O] address to receive termination status */
HANDLE hProcess, /* [in] handle to the process */
LPDWORD lpExitCode) /* [out] address to receive termination status */
{
BOOL ret;
SERVER_START_REQ

View File

@ -461,7 +461,7 @@ ATOM WINAPI RegisterClass16( const WNDCLASS16 *wc )
* >0: Unique identifier
* 0: Failure
*/
ATOM WINAPI RegisterClassA( const WNDCLASSA* wc ) /* Address of structure with class data */
ATOM WINAPI RegisterClassA( const WNDCLASSA* wc ) /* [in] Address of structure with class data */
{
ATOM atom;
int iSmIconWidth, iSmIconHeight;

View File

@ -1379,7 +1379,7 @@ HCURSOR16 WINAPI SetCursor16( HCURSOR16 hCursor )
* A handle to the previous cursor shape.
*/
HCURSOR WINAPI SetCursor(
HCURSOR hCursor /* Handle of cursor to show */
HCURSOR hCursor /* [in] Handle of cursor to show */
) {
HCURSOR hOldCursor;

View File

@ -905,7 +905,7 @@ HDC16 WINAPI GetDC16( HWND16 hwnd )
* NULL: Failure
*/
HDC WINAPI GetDC(
HWND hwnd /* handle of window */
HWND hwnd /* [in] handle of window */
) {
if (!hwnd)
return GetDCEx( GetDesktopWindow(), 0, DCX_CACHE | DCX_WINDOW );
@ -950,8 +950,8 @@ INT16 WINAPI ReleaseDC16( HWND16 hwnd, HDC16 hdc )
* 0: Failure
*/
INT WINAPI ReleaseDC(
HWND hwnd /* Handle of window - ignored */,
HDC hdc /* Handle of device context */
HWND hwnd /* [in] Handle of window - ignored */,
HDC hdc /* [in] Handle of device context */
) {
DCE * dce;
INT nRet = 0;

View File

@ -1436,8 +1436,7 @@ BOOL16 WINAPI CallMsgFilter32_16( SEGPTR msg16_32, INT16 code, BOOL16 wHaveParam
/***********************************************************************
* CallMsgFilterA (USER32.15)
*/
/*
*
* FIXME: There are ANSI and UNICODE versions of this, plus an unspecified
* version, plus USER (the 16bit one) has a CallMsgFilter32 function.
*/

View File

@ -69,6 +69,8 @@ VOID WINAPI KEYBOARD_Enable( LPKEYBD_EVENT_PROC lpKeybEventProc,
initDone = TRUE;
}
/**********************************************************************/
static VOID WINAPI KEYBOARD_CallKeybdEventProc( FARPROC16 proc,
BYTE bVk, BYTE bScan,
DWORD dwFlags, DWORD dwExtraInfo )
@ -86,6 +88,8 @@ static VOID WINAPI KEYBOARD_CallKeybdEventProc( FARPROC16 proc,
wine_call_to_16_regs_short( &context, 0 );
}
/**********************************************************************/
VOID WINAPI WIN16_KEYBOARD_Enable( FARPROC16 proc, LPBYTE lpKeyState )
{
LPKEYBD_EVENT_PROC thunk =
@ -159,8 +163,8 @@ DWORD WINAPI OemKeyScan(WORD wOemChar)
/**********************************************************************
* VkKeyScan [KEYBOARD.129]
*/
/* VkKeyScan translates an ANSI character to a virtual-key and shift code
*
* VkKeyScan translates an ANSI character to a virtual-key and shift code
* for the current keyboard.
* high-order byte yields :
* 0 Unshifted

View File

@ -1461,11 +1461,11 @@ BOOL WINAPI PeekMessageA( LPMSG lpmsg, HWND hwnd,
*
*/
BOOL WINAPI PeekMessageW(
LPMSG lpmsg, /* buffer to receive message */
HWND hwnd, /* restrict to messages for hwnd */
UINT min, /* minimum message to receive */
UINT max, /* maximum message to receive */
UINT wRemoveMsg /* removal flags */
LPMSG lpmsg, /* [out] buffer to receive message */
HWND hwnd, /* [in] restrict to messages for hwnd */
UINT min, /* [in] minimum message to receive */
UINT max, /* [in] maximum message to receive */
UINT wRemoveMsg /* [in] removal flags */
)
{
BOOL ret = MSG_PeekMessage( QMSG_WIN32W, lpmsg, hwnd, min, max, wRemoveMsg, TRUE );
@ -1554,10 +1554,10 @@ BOOL WINAPI GetMessageA( MSG *lpmsg, HWND hwnd, UINT min, UINT max )
*
*/
BOOL WINAPI GetMessageW(
MSG* lpmsg, /* buffer to receive message */
HWND hwnd, /* restrict to messages for hwnd */
UINT min, /* minimum message to receive */
UINT max /* maximum message to receive */
MSG* lpmsg, /* [out] buffer to receive message */
HWND hwnd, /* [in] restrict to messages for hwnd */
UINT min, /* [in] minimum message to receive */
UINT max /* [in] maximum message to receive */
)
{
MSG_PeekMessage( QMSG_WIN32W, lpmsg, hwnd, min, max, PM_REMOVE, FALSE );
@ -1871,12 +1871,12 @@ LRESULT WINAPI SendMessageA( HWND hwnd, UINT msg, WPARAM wParam,
* ECMA-234, Win32
*/
LRESULT WINAPI SendMessageW(
HWND hwnd, /* Window to send message to. If HWND_BROADCAST,
the message will be sent to all top-level windows. */
HWND hwnd, /* [in] Window to send message to. If HWND_BROADCAST,
the message will be sent to all top-level windows. */
UINT msg, /* message */
WPARAM wParam, /* message parameter */
LPARAM lParam /* additional message parameter */
UINT msg, /* [in] message */
WPARAM wParam, /* [in] message parameter */
LPARAM lParam /* [in] additional message parameter */
) {
LRESULT res;

View File

@ -2187,9 +2187,9 @@ LONG WINAPI SetWindowLongA( HWND hwnd, INT offset, LONG newval )
*
*/
LONG WINAPI SetWindowLongW(
HWND hwnd, /* window to alter */
INT offset, /* offset, in bytes, of location to alter */
LONG newval /* new value of location */
HWND hwnd, /* [in] window to alter */
INT offset, /* [in] offset, in bytes, of location to alter */
LONG newval /* [in] new value of location */
) {
return WIN_SetWindowLong( hwnd, offset, newval, WIN_PROC_32W );
}

View File

@ -2527,11 +2527,11 @@ LRESULT WINAPI CallWindowProc16( WNDPROC16 func, HWND16 hwnd, UINT16 msg,
* ECMA-234, Win32
*/
LRESULT WINAPI CallWindowProcA(
WNDPROC func, /* window procedure */
HWND hwnd, /* target window */
UINT msg, /* message */
WPARAM wParam, /* message dependent parameter */
LPARAM lParam /* message dependent parameter */
WNDPROC func, /* [in] window procedure */
HWND hwnd, /* [in] target window */
UINT msg, /* [in] message */
WPARAM wParam, /* [in] message dependent parameter */
LPARAM lParam /* [in] message dependent parameter */
) {
WINDOWPROC *proc = WINPROC_GetPtr( (WNDPROC16)func );