From 2d6457c11a3b39577738b23e9f6b359760dced2f Mon Sep 17 00:00:00 2001 From: Patrik Stridvall Date: Tue, 28 Mar 2000 20:22:59 +0000 Subject: [PATCH] Added/fixed some documentation reported by winapi_check. --- controls/desktop.c | 2 +- controls/menu.c | 84 +++++------ controls/scroll.c | 20 +-- controls/uitools.c | 4 +- dlls/advapi32/advapi.c | 4 +- dlls/advapi32/eventlog.c | 38 ++--- dlls/advapi32/security.c | 20 +-- dlls/comctl32/commctrl.c | 8 +- dlls/comctl32/imagelist.c | 4 +- dlls/comctl32/propsheet.c | 2 +- dlls/commdlg/finddlg32.c | 12 +- dlls/commdlg/fontdlg.c | 8 +- dlls/commdlg/printdlg.c | 2 +- dlls/imagehlp/access.c | 30 ++-- dlls/imagehlp/debug.c | 15 +- dlls/imagehlp/imagehlp_main.c | 14 +- dlls/imagehlp/integrity.c | 14 +- dlls/imagehlp/internal.c | 22 ++- dlls/imagehlp/modify.c | 26 ++-- dlls/imagehlp/symbol.c | 40 ++--- dlls/imm32/imm.c | 119 ++++++++------- dlls/lzexpand/lzexpand_main.c | 22 +-- dlls/msacm32/msacm32_main.c | 4 +- dlls/ole32/clipboard.c | 4 +- dlls/ole32/ole2.c | 10 +- dlls/ole32/storage.c | 2 +- dlls/ole32/storage32.c | 6 +- dlls/oleaut32/ole2disp.c | 12 +- dlls/oleaut32/oleaut.c | 7 + dlls/oleaut32/variant.c | 272 +++++++++++++++++----------------- dlls/olecli/olecli_main.c | 20 +-- dlls/oledlg/oledlg_main.c | 46 +++--- dlls/olesvr/olesvr_main.c | 12 +- dlls/psapi/psapi_main.c | 30 ++-- dlls/rasapi32/rasapi.c | 2 +- dlls/setupx/setupx_main.c | 8 +- dlls/shell32/shell.c | 12 +- dlls/shell32/shell32_main.c | 4 +- dlls/shell32/shellpath.c | 2 +- dlls/sound/sound_main.c | 92 +++++++++++- dlls/stress/stress_main.c | 39 ++++- dlls/version/info.c | 12 +- dlls/win32s/win32s16.c | 5 +- dlls/win87em/emulate.c | 10 +- dlls/winaspi/winaspi32.c | 6 +- dlls/winsock/async.c | 2 +- dlls/winsock/socket.c | 14 +- dlls/winspool/info.c | 72 ++++----- files/change.c | 2 +- files/directory.c | 32 ++-- files/dos_fs.c | 22 +-- files/drive.c | 28 ++-- files/file.c | 54 +++---- files/profile.c | 50 +++---- graphics/bitblt.c | 8 +- graphics/fontengine.c | 41 +++-- graphics/mapping.c | 22 +-- graphics/win16drv/prtdrv.c | 6 + if1632/dummy.c | 33 ++++- loader/module.c | 13 +- loader/resource.c | 19 ++- loader/task.c | 2 +- memory/atom.c | 20 +-- memory/environ.c | 24 +-- memory/global.c | 26 ++-- memory/local.c | 20 +-- memory/string.c | 30 ++-- memory/virtual.c | 28 ++-- misc/bidi16.c | 85 ++++++++++- misc/lstr.c | 24 +-- misc/main.c | 2 +- misc/registry.c | 16 +- misc/toolhelp.c | 23 ++- misc/version.c | 6 +- objects/bitmap.c | 20 +-- objects/brush.c | 12 +- objects/clipping.c | 16 +- objects/dc.c | 34 ++--- objects/dib.c | 18 +-- objects/enhmetafile.c | 8 +- objects/font.c | 10 +- objects/gdiobj.c | 16 +- objects/linedda.c | 2 +- objects/pen.c | 8 +- objects/region.c | 36 ++--- objects/text.c | 26 ++-- ole/ole2nls.c | 62 ++++---- scheduler/event.c | 8 +- scheduler/mutex.c | 8 +- scheduler/semaphore.c | 8 +- scheduler/syslevel.c | 4 +- win32/code_page.c | 6 +- win32/console.c | 20 +-- win32/device.c | 3 + win32/file.c | 4 +- win32/kernel32.c | 96 +++++++++--- win32/newfns.c | 28 ++-- win32/ordinals.c | 9 +- win32/time.c | 2 +- windows/caret.c | 16 +- windows/class.c | 36 ++--- windows/clipboard.c | 34 ++--- windows/cursoricon.c | 32 ++-- windows/dce.c | 12 +- windows/defdlg.c | 4 +- windows/defwnd.c | 4 +- windows/dialog.c | 74 ++++----- windows/focus.c | 4 +- windows/hook.c | 22 +-- windows/mdi.c | 20 +-- windows/message.c | 24 +-- windows/msgbox.c | 12 +- windows/multimon.c | 20 ++- windows/nonclient.c | 52 +++---- windows/painting.c | 20 +-- windows/property.c | 20 +-- windows/queue.c | 6 +- windows/rect.c | 22 +-- windows/scroll.c | 6 +- windows/syscolor.c | 8 +- windows/sysmetrics.c | 2 +- windows/sysparams.c | 4 +- windows/timer.c | 8 +- windows/user.c | 23 ++- windows/win.c | 78 +++++----- windows/winhelp.c | 4 +- windows/winpos.c | 2 +- windows/winproc.c | 4 +- 128 files changed, 1641 insertions(+), 1247 deletions(-) diff --git a/controls/desktop.c b/controls/desktop.c index 1341ff33a7f..809e78d236d 100644 --- a/controls/desktop.c +++ b/controls/desktop.c @@ -228,7 +228,7 @@ BOOL16 WINAPI SetDeskWallPaper16( LPCSTR filename ) /*********************************************************************** - * SetDeskWallPaper32 (USER32.475) + * SetDeskWallPaper (USER32.475) * * FIXME: is there a unicode version? */ diff --git a/controls/menu.c b/controls/menu.c index 5afe241741a..bbd3cbdebba 100644 --- a/controls/menu.c +++ b/controls/menu.c @@ -490,8 +490,8 @@ static void MENU_InitSysMenuPopup( HMENU hmenu, DWORD style, DWORD clsStyle ) /****************************************************************************** * - * UINT32 MENU_GetStartOfNextColumn( - * HMENU32 hMenu ) + * UINT MENU_GetStartOfNextColumn( + * HMENU hMenu ) * *****************************************************************************/ @@ -518,8 +518,8 @@ static UINT MENU_GetStartOfNextColumn( /****************************************************************************** * - * UINT32 MENU_GetStartOfPrevColumn( - * HMENU32 hMenu ) + * UINT MENU_GetStartOfPrevColumn( + * HMENU hMenu ) * *****************************************************************************/ @@ -3205,7 +3205,7 @@ BOOL16 WINAPI ChangeMenu16( HMENU16 hMenu, UINT16 pos, SEGPTR data, /******************************************************************* - * ChangeMenu32A (USER32.23) + * ChangeMenuA (USER32.23) */ BOOL WINAPI ChangeMenuA( HMENU hMenu, UINT pos, LPCSTR data, UINT id, UINT flags ) @@ -3226,7 +3226,7 @@ BOOL WINAPI ChangeMenuA( HMENU hMenu, UINT pos, LPCSTR data, /******************************************************************* - * ChangeMenu32W (USER32.24) + * ChangeMenuW (USER32.24) */ BOOL WINAPI ChangeMenuW( HMENU hMenu, UINT pos, LPCWSTR data, UINT id, UINT flags ) @@ -3282,7 +3282,7 @@ UINT16 WINAPI EnableMenuItem16( HMENU16 hMenu, UINT16 wItemID, UINT16 wFlags ) /********************************************************************** - * EnableMenuItem32 (USER32.170) + * EnableMenuItem (USER32.170) */ UINT WINAPI EnableMenuItem( HMENU hMenu, UINT wItemID, UINT wFlags ) { @@ -3336,7 +3336,7 @@ INT16 WINAPI GetMenuString16( HMENU16 hMenu, UINT16 wItemID, /******************************************************************* - * GetMenuString32A (USER32.268) + * GetMenuStringA (USER32.268) */ INT WINAPI GetMenuStringA( HMENU hMenu, /* [in] menuhandle */ @@ -3360,7 +3360,7 @@ INT WINAPI GetMenuStringA( /******************************************************************* - * GetMenuString32W (USER32.269) + * GetMenuStringW (USER32.269) */ INT WINAPI GetMenuStringW( HMENU hMenu, UINT wItemID, LPWSTR str, INT nMaxSiz, UINT wFlags ) @@ -3389,7 +3389,7 @@ BOOL16 WINAPI HiliteMenuItem16( HWND16 hWnd, HMENU16 hMenu, UINT16 wItemID, /********************************************************************** - * HiliteMenuItem32 (USER32.318) + * HiliteMenuItem (USER32.318) */ BOOL WINAPI HiliteMenuItem( HWND hWnd, HMENU hMenu, UINT wItemID, UINT wHilite ) @@ -3455,7 +3455,7 @@ INT16 WINAPI GetMenuItemCount16( HMENU16 hMenu ) /********************************************************************** - * GetMenuItemCount32 (USER32.262) + * GetMenuItemCount (USER32.262) */ INT WINAPI GetMenuItemCount( HMENU hMenu ) { @@ -3475,7 +3475,7 @@ UINT16 WINAPI GetMenuItemID16( HMENU16 hMenu, INT16 nPos ) } /********************************************************************** - * GetMenuItemID32 (USER32.263) + * GetMenuItemID (USER32.263) */ UINT WINAPI GetMenuItemID( HMENU hMenu, INT nPos ) { @@ -3503,7 +3503,7 @@ BOOL16 WINAPI InsertMenu16( HMENU16 hMenu, UINT16 pos, UINT16 flags, /******************************************************************* - * InsertMenu32A (USER32.322) + * InsertMenuA (USER32.322) */ BOOL WINAPI InsertMenuA( HMENU hMenu, UINT pos, UINT flags, UINT id, LPCSTR str ) @@ -3535,7 +3535,7 @@ BOOL WINAPI InsertMenuA( HMENU hMenu, UINT pos, UINT flags, /******************************************************************* - * InsertMenu32W (USER32.325) + * InsertMenuW (USER32.325) */ BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags, UINT id, LPCWSTR str ) @@ -3563,7 +3563,7 @@ BOOL16 WINAPI AppendMenu16(HMENU16 hMenu, UINT16 flags, UINT16 id, SEGPTR data) /******************************************************************* - * AppendMenu32A (USER32.5) + * AppendMenuA (USER32.5) */ BOOL WINAPI AppendMenuA( HMENU hMenu, UINT flags, UINT id, LPCSTR data ) @@ -3573,7 +3573,7 @@ BOOL WINAPI AppendMenuA( HMENU hMenu, UINT flags, /******************************************************************* - * AppendMenu32W (USER32.6) + * AppendMenuW (USER32.6) */ BOOL WINAPI AppendMenuW( HMENU hMenu, UINT flags, UINT id, LPCWSTR data ) @@ -3637,7 +3637,7 @@ BOOL16 WINAPI DeleteMenu16( HMENU16 hMenu, UINT16 nPos, UINT16 wFlags ) /********************************************************************** - * DeleteMenu32 (USER32.129) + * DeleteMenu (USER32.129) */ BOOL WINAPI DeleteMenu( HMENU hMenu, UINT nPos, UINT wFlags ) { @@ -3664,7 +3664,7 @@ BOOL16 WINAPI ModifyMenu16( HMENU16 hMenu, UINT16 pos, UINT16 flags, /******************************************************************* - * ModifyMenu32A (USER32.397) + * ModifyMenuA (USER32.397) */ BOOL WINAPI ModifyMenuA( HMENU hMenu, UINT pos, UINT flags, UINT id, LPCSTR str ) @@ -3689,7 +3689,7 @@ BOOL WINAPI ModifyMenuA( HMENU hMenu, UINT pos, UINT flags, /******************************************************************* - * ModifyMenu32W (USER32.398) + * ModifyMenuW (USER32.398) */ BOOL WINAPI ModifyMenuW( HMENU hMenu, UINT pos, UINT flags, UINT id, LPCWSTR str ) @@ -3717,7 +3717,7 @@ HMENU16 WINAPI CreatePopupMenu16(void) /********************************************************************** - * CreatePopupMenu32 (USER32.82) + * CreatePopupMenu (USER32.82) */ HMENU WINAPI CreatePopupMenu(void) { @@ -3752,7 +3752,7 @@ BOOL16 WINAPI SetMenuItemBitmaps16( HMENU16 hMenu, UINT16 nPos, UINT16 wFlags, /********************************************************************** - * SetMenuItemBitmaps32 (USER32.490) + * SetMenuItemBitmaps (USER32.490) */ BOOL WINAPI SetMenuItemBitmaps( HMENU hMenu, UINT nPos, UINT wFlags, HBITMAP hNewUnCheck, HBITMAP hNewCheck) @@ -3816,7 +3816,7 @@ BOOL16 WINAPI DestroyMenu16( HMENU16 hMenu ) /********************************************************************** - * DestroyMenu32 (USER32.134) + * DestroyMenu (USER32.134) */ BOOL WINAPI DestroyMenu( HMENU hMenu ) { @@ -3875,7 +3875,7 @@ HMENU16 WINAPI GetSystemMenu16( HWND16 hWnd, BOOL16 bRevert ) /********************************************************************** - * GetSystemMenu32 (USER32.291) + * GetSystemMenu (USER32.291) */ HMENU WINAPI GetSystemMenu( HWND hWnd, BOOL bRevert ) { @@ -3938,7 +3938,7 @@ BOOL16 WINAPI SetSystemMenu16( HWND16 hwnd, HMENU16 hMenu ) /******************************************************************* - * SetSystemMenu32 (USER32.508) + * SetSystemMenu (USER32.508) */ BOOL WINAPI SetSystemMenu( HWND hwnd, HMENU hMenu ) { @@ -3965,7 +3965,7 @@ HMENU16 WINAPI GetMenu16( HWND16 hWnd ) /********************************************************************** - * GetMenu32 (USER32.257) + * GetMenu (USER32.257) */ HMENU WINAPI GetMenu( HWND hWnd ) { @@ -3993,7 +3993,7 @@ BOOL16 WINAPI SetMenu16( HWND16 hWnd, HMENU16 hMenu ) /********************************************************************** - * SetMenu32 (USER32.487) + * SetMenu (USER32.487) */ BOOL WINAPI SetMenu( HWND hWnd, HMENU hMenu ) { @@ -4048,7 +4048,7 @@ HMENU16 WINAPI GetSubMenu16( HMENU16 hMenu, INT16 nPos ) /********************************************************************** - * GetSubMenu32 (USER32.288) + * GetSubMenu (USER32.288) */ HMENU WINAPI GetSubMenu( HMENU hMenu, INT nPos ) { @@ -4156,7 +4156,7 @@ HMENU16 WINAPI LoadMenu16( HINSTANCE16 instance, SEGPTR name ) /***************************************************************** - * LoadMenu32A (USER32.370) + * LoadMenuA (USER32.370) */ HMENU WINAPI LoadMenuA( HINSTANCE instance, LPCSTR name ) { @@ -4167,7 +4167,7 @@ HMENU WINAPI LoadMenuA( HINSTANCE instance, LPCSTR name ) /***************************************************************** - * LoadMenu32W (USER32.373) + * LoadMenuW (USER32.373) */ HMENU WINAPI LoadMenuW( HINSTANCE instance, LPCWSTR name ) { @@ -4207,7 +4207,7 @@ HMENU16 WINAPI LoadMenuIndirect16( LPCVOID template ) /********************************************************************** - * LoadMenuIndirect32A (USER32.371) + * LoadMenuIndirectA (USER32.371) */ HMENU WINAPI LoadMenuIndirectA( LPCVOID template ) { @@ -4248,7 +4248,7 @@ HMENU WINAPI LoadMenuIndirectA( LPCVOID template ) /********************************************************************** - * LoadMenuIndirect32W (USER32.372) + * LoadMenuIndirectW (USER32.372) */ HMENU WINAPI LoadMenuIndirectW( LPCVOID template ) { @@ -4268,7 +4268,7 @@ BOOL16 WINAPI IsMenu16( HMENU16 hmenu ) /********************************************************************** - * IsMenu32 (USER32.346) + * IsMenu (USER32.346) */ BOOL WINAPI IsMenu(HMENU hmenu) { @@ -4277,7 +4277,7 @@ BOOL WINAPI IsMenu(HMENU hmenu) } /********************************************************************** - * GetMenuItemInfo32_common + * GetMenuItemInfo_common */ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, @@ -4285,7 +4285,7 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, { MENUITEM *menu = MENU_FindItem (&hmenu, &item, bypos? MF_BYPOSITION : 0); - debug_print_menuitem("GetMenuItemInfo32_common: ", menu, ""); + debug_print_menuitem("GetMenuItemInfo_common: ", menu, ""); if (!menu) return FALSE; @@ -4374,7 +4374,7 @@ BOOL WINAPI GetMenuItemInfoW( HMENU hmenu, UINT item, BOOL bypos, } /********************************************************************** - * SetMenuItemInfo32_common + * SetMenuItemInfo_common */ static BOOL SetMenuItemInfo_common(MENUITEM * menu, @@ -4458,12 +4458,12 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu, if (lpmii->fMask & MIIM_DATA) menu->dwItemData = lpmii->dwItemData; - debug_print_menuitem("SetMenuItemInfo32_common: ", menu, ""); + debug_print_menuitem("SetMenuItemInfo_common: ", menu, ""); return TRUE; } /********************************************************************** - * SetMenuItemInfo32A (USER32.491) + * SetMenuItemInfoA (USER32.491) */ BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos, const MENUITEMINFOA *lpmii) @@ -4473,7 +4473,7 @@ BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos, } /********************************************************************** - * SetMenuItemInfo32W (USER32.492) + * SetMenuItemInfoW (USER32.492) */ BOOL WINAPI SetMenuItemInfoW(HMENU hmenu, UINT item, BOOL bypos, const MENUITEMINFOW *lpmii) @@ -4600,7 +4600,7 @@ BOOL16 WINAPI InsertMenuItem16( HMENU16 hmenu, UINT16 pos, BOOL16 byposition, /********************************************************************** - * InsertMenuItem32A (USER32.323) + * InsertMenuItemA (USER32.323) */ BOOL WINAPI InsertMenuItemA(HMENU hMenu, UINT uItem, BOOL bypos, const MENUITEMINFOA *lpmii) @@ -4611,7 +4611,7 @@ BOOL WINAPI InsertMenuItemA(HMENU hMenu, UINT uItem, BOOL bypos, /********************************************************************** - * InsertMenuItem32W (USER32.324) + * InsertMenuItemW (USER32.324) */ BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos, const MENUITEMINFOW *lpmii) @@ -4621,7 +4621,7 @@ BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos, } /********************************************************************** - * CheckMenuRadioItem32 (USER32.47) + * CheckMenuRadioItem (USER32.47) */ BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, @@ -4671,7 +4671,7 @@ BOOL16 WINAPI CheckMenuRadioItem16(HMENU16 hMenu, } /********************************************************************** - * GetMenuItemRect32 (USER32.266) + * GetMenuItemRect (USER32.266) * * ATTENTION: Here, the returned values in rect are the screen * coordinates of the item just like if the menu was diff --git a/controls/scroll.c b/controls/scroll.c index 1bd872137ac..13ee854fe1b 100644 --- a/controls/scroll.c +++ b/controls/scroll.c @@ -1232,8 +1232,8 @@ INT16 WINAPI SetScrollInfo16( HWND16 hwnd, INT16 nBar, const SCROLLINFO *info, /************************************************************************* - * SetScrollInfo32 (USER32.501) - * SetScrollInfo32 can be used to set the position, upper bound, + * SetScrollInfo (USER32.501) + * SetScrollInfo can be used to set the position, upper bound, * lower bound, and page size of a scrollbar control. * * RETURNS @@ -1412,8 +1412,8 @@ BOOL16 WINAPI GetScrollInfo16( HWND16 hwnd, INT16 nBar, LPSCROLLINFO info ) /************************************************************************* - * GetScrollInfo32 (USER32.284) - * GetScrollInfo32 can be used to retrieve the position, upper bound, + * GetScrollInfo (USER32.284) + * GetScrollInfo can be used to retrieve the position, upper bound, * lower bound, and page size of a scrollbar control. * * RETURNS STD @@ -1454,7 +1454,7 @@ INT16 WINAPI SetScrollPos16( HWND16 hwnd, INT16 nBar, INT16 nPos, /************************************************************************* - * SetScrollPos32 (USER32.502) + * SetScrollPos (USER32.502) * * RETURNS * Success: Scrollbar position @@ -1494,7 +1494,7 @@ INT16 WINAPI GetScrollPos16( HWND16 hwnd, INT16 nBar ) /************************************************************************* - * GetScrollPos32 (USER32.285) + * GetScrollPos (USER32.285) * * RETURNS * Success: Current position @@ -1528,7 +1528,7 @@ void WINAPI SetScrollRange16( HWND16 hwnd, INT16 nBar, /************************************************************************* - * SetScrollRange32 (USER32.503) + * SetScrollRange (USER32.503) * * RETURNS STD */ @@ -1599,7 +1599,7 @@ BOOL16 WINAPI GetScrollRange16( HWND16 hwnd, INT16 nBar, /************************************************************************* - * GetScrollRange32 (USER32.286) + * GetScrollRange (USER32.286) * * RETURNS STD */ @@ -1710,7 +1710,7 @@ void WINAPI ShowScrollBar16( HWND16 hwnd, INT16 nBar, BOOL16 fShow ) /************************************************************************* - * ShowScrollBar32 (USER32.532) + * ShowScrollBar (USER32.532) * * RETURNS STD */ @@ -1735,7 +1735,7 @@ BOOL16 WINAPI EnableScrollBar16( HWND16 hwnd, INT16 nBar, UINT16 flags ) /************************************************************************* - * EnableScrollBar32 (USER32.171) + * EnableScrollBar (USER32.171) */ BOOL WINAPI EnableScrollBar( HWND hwnd, INT nBar, UINT flags ) { diff --git a/controls/uitools.c b/controls/uitools.c index 82ca1d375c6..4f514dfadb0 100644 --- a/controls/uitools.c +++ b/controls/uitools.c @@ -576,7 +576,7 @@ BOOL16 WINAPI DrawEdge16( HDC16 hdc, LPRECT16 rc, UINT16 edge, UINT16 flags ) } /********************************************************************** - * DrawEdge32 (USER32.155) + * DrawEdge (USER32.155) */ BOOL WINAPI DrawEdge( HDC hdc, LPRECT rc, UINT edge, UINT flags ) { @@ -1359,7 +1359,7 @@ BOOL16 WINAPI DrawFrameControl16( HDC16 hdc, LPRECT16 rc, UINT16 uType, /********************************************************************** - * DrawFrameControl32 (USER32.158) + * DrawFrameControl (USER32.158) */ BOOL WINAPI DrawFrameControl( HDC hdc, LPRECT rc, UINT uType, UINT uState ) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 646f0f86250..966adf574c9 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -17,7 +17,7 @@ /****************************************************************************** - * GetUserName32A [ADVAPI32.67] + * GetUserNameA [ADVAPI32.67] */ BOOL WINAPI GetUserNameA( LPSTR lpszName, LPDWORD lpSize ) @@ -41,7 +41,7 @@ GetUserNameA( LPSTR lpszName, LPDWORD lpSize ) } /****************************************************************************** - * GetUserName32W [ADVAPI32.68] + * GetUserNameW [ADVAPI32.68] * * PARAMS * lpszName [] diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index b3bf7a60816..830d07298d2 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -14,7 +14,7 @@ DEFAULT_DEBUG_CHANNEL(advapi) /****************************************************************************** - * BackupEventLog32A [ADVAPI32.15] + * BackupEventLogA [ADVAPI32.15] */ BOOL WINAPI BackupEventLogA( HANDLE hEventLog, LPCSTR lpBackupFileName ) { @@ -23,7 +23,7 @@ BOOL WINAPI BackupEventLogA( HANDLE hEventLog, LPCSTR lpBackupFileName ) } /****************************************************************************** - * BackupEventLog32W [ADVAPI32.16] + * BackupEventLogW [ADVAPI32.16] * * PARAMS * hEventLog [] @@ -37,7 +37,7 @@ BackupEventLogW( HANDLE hEventLog, LPCWSTR lpBackupFileName ) } /****************************************************************************** - * ClearEventLog32A [ADVAPI32.19] + * ClearEventLogA [ADVAPI32.19] */ BOOL WINAPI ClearEventLogA ( HANDLE hEventLog, LPCSTR lpBackupFileName ) { @@ -46,7 +46,7 @@ BOOL WINAPI ClearEventLogA ( HANDLE hEventLog, LPCSTR lpBackupFileName ) } /****************************************************************************** - * ClearEventLog32W [ADVAPI32.20] + * ClearEventLogW [ADVAPI32.20] */ BOOL WINAPI ClearEventLogW ( HANDLE hEventLog, LPCWSTR lpBackupFileName ) { @@ -55,7 +55,7 @@ BOOL WINAPI ClearEventLogW ( HANDLE hEventLog, LPCWSTR lpBackupFileName ) } /****************************************************************************** - * CloseEventLog32 [ADVAPI32.21] + * CloseEventLog [ADVAPI32.21] */ BOOL WINAPI CloseEventLog ( HANDLE hEventLog ) { @@ -64,7 +64,7 @@ BOOL WINAPI CloseEventLog ( HANDLE hEventLog ) } /****************************************************************************** - * DeregisterEventSource32 [ADVAPI32.32] + * DeregisterEventSource [ADVAPI32.32] * Closes a handle to the specified event log * * PARAMS @@ -79,7 +79,7 @@ BOOL WINAPI DeregisterEventSource( HANDLE hEventLog ) } /****************************************************************************** - * GetNumberOfEventLogRecords32 [ADVAPI32.49] + * GetNumberOfEventLogRecords [ADVAPI32.49] * * PARAMS * hEventLog [] @@ -93,7 +93,7 @@ GetNumberOfEventLogRecords( HANDLE hEventLog, PDWORD NumberOfRecords ) } /****************************************************************************** - * GetOldestEventLogRecord32 [ADVAPI32.50] + * GetOldestEventLogRecord [ADVAPI32.50] * * PARAMS * hEventLog [] @@ -107,7 +107,7 @@ GetOldestEventLogRecord( HANDLE hEventLog, PDWORD OldestRecord ) } /****************************************************************************** - * NotifyChangeEventLog32 [ADVAPI32.98] + * NotifyChangeEventLog [ADVAPI32.98] * * PARAMS * hEventLog [] @@ -120,7 +120,7 @@ BOOL WINAPI NotifyChangeEventLog( HANDLE hEventLog, HANDLE hEvent ) } /****************************************************************************** - * OpenBackupEventLog32A [ADVAPI32.105] + * OpenBackupEventLogA [ADVAPI32.105] */ HANDLE WINAPI OpenBackupEventLogA( LPCSTR lpUNCServerName, LPCSTR lpFileName ) @@ -130,7 +130,7 @@ OpenBackupEventLogA( LPCSTR lpUNCServerName, LPCSTR lpFileName ) } /****************************************************************************** - * OpenBackupEventLog32W [ADVAPI32.106] + * OpenBackupEventLogW [ADVAPI32.106] * * PARAMS * lpUNCServerName [] @@ -144,7 +144,7 @@ OpenBackupEventLogW( LPCWSTR lpUNCServerName, LPCWSTR lpFileName ) } /****************************************************************************** - * OpenEventLog32A [ADVAPI32.107] + * OpenEventLogA [ADVAPI32.107] */ HANDLE WINAPI OpenEventLogA(LPCSTR uncname,LPCSTR source) { @@ -153,7 +153,7 @@ HANDLE WINAPI OpenEventLogA(LPCSTR uncname,LPCSTR source) } /****************************************************************************** - * OpenEventLog32W [ADVAPI32.108] + * OpenEventLogW [ADVAPI32.108] * * PARAMS * uncname [] @@ -167,7 +167,7 @@ OpenEventLogW( LPCWSTR uncname, LPCWSTR source ) } /****************************************************************************** - * ReadEventLog32A [ADVAPI32.124] + * ReadEventLogA [ADVAPI32.124] */ BOOL WINAPI ReadEventLogA( HANDLE hEventLog, DWORD dwReadFlags, DWORD dwRecordOffset, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, DWORD *pnBytesRead, DWORD *pnMinNumberOfBytesNeeded ) @@ -177,7 +177,7 @@ BOOL WINAPI ReadEventLogA( HANDLE hEventLog, DWORD dwReadFlags, DWORD dwRecordOf } /****************************************************************************** - * ReadEventLog32W [ADVAPI32.125] + * ReadEventLogW [ADVAPI32.125] * * PARAMS * hEventLog [] @@ -198,7 +198,7 @@ ReadEventLogW( HANDLE hEventLog, DWORD dwReadFlags, DWORD dwRecordOffset, } /****************************************************************************** - * RegisterEventSource32A [ADVAPI32.174] + * RegisterEventSourceA [ADVAPI32.174] */ HANDLE WINAPI RegisterEventSourceA( LPCSTR lpUNCServerName, LPCSTR lpSourceName ) { @@ -211,7 +211,7 @@ HANDLE WINAPI RegisterEventSourceA( LPCSTR lpUNCServerName, LPCSTR lpSourceName } /****************************************************************************** - * RegisterEventSource32W [ADVAPI32.175] + * RegisterEventSourceW [ADVAPI32.175] * Returns a registered handle to an event log * * PARAMS @@ -231,7 +231,7 @@ RegisterEventSourceW( LPCWSTR lpUNCServerName, LPCWSTR lpSourceName ) } /****************************************************************************** - * ReportEvent32A [ADVAPI32.178] + * ReportEventA [ADVAPI32.178] */ BOOL WINAPI ReportEventA ( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dwEventID, PSID lpUserSid, WORD wNumStrings, DWORD dwDataSize, LPCSTR *lpStrings, LPVOID lpRawData) @@ -241,7 +241,7 @@ BOOL WINAPI ReportEventA ( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD d } /****************************************************************************** - * ReportEvent32W [ADVAPI32.179] + * ReportEventW [ADVAPI32.179] * * PARAMS * hEventLog [] diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 97f3a4faec8..3f9bae95305 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -449,7 +449,7 @@ MakeSelfRelativeSD( } /****************************************************************************** - * GetSecurityDescriptorControl32 [ADVAPI32] + * GetSecurityDescriptorControl [ADVAPI32] */ BOOL WINAPI GetSecurityDescriptorControl ( PSECURITY_DESCRIPTOR pSecurityDescriptor, @@ -477,7 +477,7 @@ DWORD WINAPI InitializeAcl(PACL acl, DWORD size, DWORD rev) */ /****************************************************************************** - * LookupPrivilegeValue32W [ADVAPI32.93] + * LookupPrivilegeValueW [ADVAPI32.93] * Retrieves LUID used on a system to represent the privilege name. * * NOTES @@ -499,7 +499,7 @@ LookupPrivilegeValueW( LPCWSTR lpSystemName, LPCWSTR lpName, LPVOID lpLuid ) } /****************************************************************************** - * LookupPrivilegeValue32A [ADVAPI32.92] + * LookupPrivilegeValueA [ADVAPI32.92] */ BOOL WINAPI LookupPrivilegeValueA( LPCSTR lpSystemName, LPCSTR lpName, LPVOID lpLuid ) @@ -515,7 +515,7 @@ LookupPrivilegeValueA( LPCSTR lpSystemName, LPCSTR lpName, LPVOID lpLuid ) } /****************************************************************************** - * GetFileSecurity32A [ADVAPI32.45] + * GetFileSecurityA [ADVAPI32.45] * * Obtains Specified information about the security of a file or directory * The information obtained is constrained by the callers access rights and @@ -532,7 +532,7 @@ GetFileSecurityA( LPCSTR lpFileName, } /****************************************************************************** - * GetFileSecurity32W [ADVAPI32.46] + * GetFileSecurityW [ADVAPI32.46] * * Obtains Specified information about the security of a file or directory * The information obtained is constrained by the callers access rights and @@ -557,7 +557,7 @@ GetFileSecurityW( LPCWSTR lpFileName, /****************************************************************************** - * LookupAccountSid32A [ADVAPI32.86] + * LookupAccountSidA [ADVAPI32.86] */ BOOL WINAPI LookupAccountSidA( @@ -590,7 +590,7 @@ LookupAccountSidA( } /****************************************************************************** - * LookupAccountSid32W [ADVAPI32.87] + * LookupAccountSidW [ADVAPI32.87] * * PARAMS * system [] @@ -632,7 +632,7 @@ LookupAccountSidW( } /****************************************************************************** - * SetFileSecurity32A [ADVAPI32.182] + * SetFileSecurityA [ADVAPI32.182] * Sets the security of a file or directory */ BOOL WINAPI SetFileSecurityA( LPCSTR lpFileName, @@ -644,7 +644,7 @@ BOOL WINAPI SetFileSecurityA( LPCSTR lpFileName, } /****************************************************************************** - * SetFileSecurity32W [ADVAPI32.183] + * SetFileSecurityW [ADVAPI32.183] * Sets the security of a file or directory * * PARAMS @@ -862,7 +862,7 @@ ImpersonateSelf(SECURITY_IMPERSONATION_LEVEL ImpersonationLevel) } /****************************************************************************** - * AccessCheck32 [ADVAPI32.71] + * AccessCheck [ADVAPI32.71] * * FIXME check cast LPBOOL to PBOOLEAN */ diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 3168ce3de20..95344ba6897 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -343,7 +343,7 @@ GetEffectiveClientRect (HWND hwnd, LPRECT lpRect, LPINT lpInfo) /*********************************************************************** - * DrawStatusText32A [COMCTL32.5][COMCTL32.27] + * DrawStatusTextA [COMCTL32.5][COMCTL32.27] * * Draws text with borders, like in a status bar. * @@ -387,7 +387,7 @@ DrawStatusTextA (HDC hdc, LPRECT lprc, LPCSTR text, UINT style) /*********************************************************************** - * DrawStatusText32W [COMCTL32.28] + * DrawStatusTextW [COMCTL32.28] * * Draws text with borders, like in a status bar. * @@ -411,7 +411,7 @@ DrawStatusTextW (HDC hdc, LPRECT lprc, LPCWSTR text, UINT style) /*********************************************************************** - * CreateStatusWindow32A [COMCTL32.6][COMCTL32.21] + * CreateStatusWindowA [COMCTL32.6][COMCTL32.21] * * Creates a status bar * @@ -437,7 +437,7 @@ CreateStatusWindowA (INT style, LPCSTR text, HWND parent, UINT wid) /*********************************************************************** - * CreateStatusWindow32W [COMCTL32.22] Creates a status bar control + * CreateStatusWindowW [COMCTL32.22] Creates a status bar control * * PARAMS * style [I] window style diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 5177bee7c49..0a923615d5b 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1630,7 +1630,7 @@ ImageList_GetImageRect (HIMAGELIST himl, INT i, LPRECT lpRect) /************************************************************************* - * ImageList_LoadImage32A [COMCTL32.63][COMCTL32.62] + * ImageList_LoadImageA [COMCTL32.63][COMCTL32.62] * * Creates an image list from a bitmap, icon or cursor. * @@ -1707,7 +1707,7 @@ ImageList_LoadImageA (HINSTANCE hi, LPCSTR lpbmp, INT cx, INT cGrow, /************************************************************************* - * ImageList_LoadImage32W [COMCTL32.64] + * ImageList_LoadImageW [COMCTL32.64] * * Creates an image list from a bitmap, icon or cursor. * diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 6416bfd07dc..6dd225019c8 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1939,7 +1939,7 @@ INT WINAPI PropertySheetA(LPCPROPSHEETHEADERA lppsh) } /****************************************************************************** - * PropertySheet32W (COMCTL32.85) + * PropertySheetW (COMCTL32.85) */ INT WINAPI PropertySheetW(LPCPROPSHEETHEADERW propertySheetHeader) { diff --git a/dlls/commdlg/finddlg32.c b/dlls/commdlg/finddlg32.c index 35941451b0c..52bb4c8dd00 100644 --- a/dlls/commdlg/finddlg32.c +++ b/dlls/commdlg/finddlg32.c @@ -33,13 +33,13 @@ static UINT HelpMessage; * but _not_ at those places that are protected with the mutex (there are * globals that seem to hold info for the wndproc). * - * FindText32x/ReplaceText32x + * FindText[AW]/ReplaceText[AW] * The find/replace calls are passed a structure that is _not_ used * internally. There is a local copy that holds the running info to - * be able to combine xxx32A and xxx32W calls. The passed pointer is + * be able to combine xxxA and xxxW calls. The passed pointer is * returned upon sendmessage. Apps wont break this way when they rely * on the original pointer. This will work as long as the sizes of - * FINDREPLACE32A == FINDREPLACE32W. The local copy will also prevent + * FINDREPLACEA == FINDREPLACEW. The local copy will also prevent * the app to see the wine-specific extra flags to distinguish between * A/W and Find/Replace. */ @@ -415,7 +415,7 @@ cleanup: } /*********************************************************************** - * FindText32A [COMDLG32.6] + * FindTextA [COMDLG32.6] * RETURNS * Window handle to created dialog: Succes * NULL: Failure @@ -439,7 +439,7 @@ HWND WINAPI FindTextA( } /*********************************************************************** - * ReplaceText32A [COMDLG32.19] + * ReplaceTextA [COMDLG32.19] * RETURNS * Window handle to created dialog: Succes * NULL: Failure @@ -464,7 +464,7 @@ HWND WINAPI ReplaceTextA( } /*********************************************************************** - * FindText32W [COMDLG32.7] + * FindTextW [COMDLG32.7] * RETURNS * Window handle to created dialog: Succes * NULL: Failure diff --git a/dlls/commdlg/fontdlg.c b/dlls/commdlg/fontdlg.c index 9635568a411..d09d2280617 100644 --- a/dlls/commdlg/fontdlg.c +++ b/dlls/commdlg/fontdlg.c @@ -136,7 +136,7 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont) /*********************************************************************** - * ChooseFont32A (COMDLG32.3) + * ChooseFontA (COMDLG32.3) */ BOOL WINAPI ChooseFontA(LPCHOOSEFONTA lpChFont) { @@ -167,7 +167,7 @@ BOOL WINAPI ChooseFontA(LPCHOOSEFONTA lpChFont) } /*********************************************************************** - * ChooseFont32W (COMDLG32.4) + * ChooseFontW (COMDLG32.4) */ BOOL WINAPI ChooseFontW(LPCHOOSEFONTW lpChFont) { @@ -922,7 +922,7 @@ LRESULT WINAPI FormatCharDlgProc16(HWND16 hDlg, UINT16 message, WPARAM16 wParam, } /*********************************************************************** - * FormatCharDlgProc32A [internal] + * FormatCharDlgProcA [internal] */ LRESULT WINAPI FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -972,7 +972,7 @@ LRESULT WINAPI FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, } /*********************************************************************** - * FormatCharDlgProc32W [internal] + * FormatCharDlgProcW [internal] */ LRESULT WINAPI FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) diff --git a/dlls/commdlg/printdlg.c b/dlls/commdlg/printdlg.c index ce3b1664a3d..383a4a23038 100644 --- a/dlls/commdlg/printdlg.c +++ b/dlls/commdlg/printdlg.c @@ -306,7 +306,7 @@ BOOL WINAPI PrintDlgA( /*********************************************************************** - * PrintDlg32W (COMDLG32.18) + * PrintDlgW (COMDLG32.18) */ BOOL WINAPI PrintDlgW( LPPRINTDLGW printdlg ) { diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index bcf52e3d7ca..a64c9c84a57 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -12,7 +12,7 @@ #include "debugtools.h" #include "imagehlp.h" -DEFAULT_DEBUG_CHANNEL(imagehlp) +DEFAULT_DEBUG_CHANNEL(imagehlp); /*********************************************************************** * Data @@ -37,7 +37,7 @@ static LOADED_IMAGE IMAGEHLP_EmptyLoadedImage = { }; /*********************************************************************** - * EnumerateLoadedModules32 (IMAGEHLP.4) + * EnumerateLoadedModules (IMAGEHLP.@) */ BOOL WINAPI EnumerateLoadedModules( HANDLE hProcess, @@ -52,7 +52,7 @@ BOOL WINAPI EnumerateLoadedModules( } /*********************************************************************** - * GetTimestampForLoadedLibrary32 (IMAGEHLP.9) + * GetTimestampForLoadedLibrary (IMAGEHLP.@) */ DWORD WINAPI GetTimestampForLoadedLibrary(HMODULE Module) { @@ -62,7 +62,7 @@ DWORD WINAPI GetTimestampForLoadedLibrary(HMODULE Module) } /*********************************************************************** - * GetImageConfigInformation32 (IMAGEHLP.7) + * GetImageConfigInformation (IMAGEHLP.@) */ BOOL WINAPI GetImageConfigInformation( PLOADED_IMAGE LoadedImage, @@ -76,7 +76,7 @@ BOOL WINAPI GetImageConfigInformation( } /*********************************************************************** - * GetImageUnusedHeaderBytes32 (IMAGEHLP.8) + * GetImageUnusedHeaderBytes (IMAGEHLP.@) */ DWORD WINAPI GetImageUnusedHeaderBytes( PLOADED_IMAGE LoadedImage, @@ -90,7 +90,7 @@ DWORD WINAPI GetImageUnusedHeaderBytes( } /*********************************************************************** - * ImageDirectoryEntryToData32 (IMAGEHLP.11) + * ImageDirectoryEntryToData (IMAGEHLP.@) */ PVOID WINAPI ImageDirectoryEntryToData( PVOID Base, BOOLEAN MappedAsImage, USHORT DirectoryEntry, PULONG Size) @@ -103,7 +103,7 @@ PVOID WINAPI ImageDirectoryEntryToData( } /*********************************************************************** - * ImageLoad32 (IMAGEHLP.16) + * ImageLoad (IMAGEHLP.@) */ PLOADED_IMAGE WINAPI ImageLoad(LPSTR DllName, LPSTR DllPath) { @@ -113,7 +113,7 @@ PLOADED_IMAGE WINAPI ImageLoad(LPSTR DllName, LPSTR DllPath) } /*********************************************************************** - * ImageNtHeader32 (IMAGEHLP.17) + * ImageNtHeader (IMAGEHLP.@) */ PIMAGE_NT_HEADERS WINAPI ImageNtHeader(PVOID Base) { @@ -122,7 +122,7 @@ PIMAGE_NT_HEADERS WINAPI ImageNtHeader(PVOID Base) } /*********************************************************************** - * ImageRvaToSection32 (IMAGEHLP.19) + * ImageRvaToSection (IMAGEHLP.@) */ PIMAGE_SECTION_HEADER WINAPI ImageRvaToSection( PIMAGE_NT_HEADERS NtHeaders, PVOID Base, ULONG Rva) @@ -133,7 +133,7 @@ PIMAGE_SECTION_HEADER WINAPI ImageRvaToSection( } /*********************************************************************** - * ImageRvaToVa32 (IMAGEHLP.20) + * ImageRvaToVa (IMAGEHLP.@) */ PVOID WINAPI ImageRvaToVa( PIMAGE_NT_HEADERS NtHeaders, PVOID Base, ULONG Rva, @@ -147,7 +147,7 @@ PVOID WINAPI ImageRvaToVa( } /*********************************************************************** - * ImageUnload32 (IMAGEHLP.21) + * ImageUnload (IMAGEHLP.@) */ BOOL WINAPI ImageUnload(PLOADED_IMAGE pLoadedImage) { @@ -187,7 +187,7 @@ BOOL WINAPI ImageUnload(PLOADED_IMAGE pLoadedImage) } /*********************************************************************** - * MapAndLoad32 (IMAGEHLP.25) + * MapAndLoad (IMAGEHLP.@) */ BOOL WINAPI MapAndLoad( LPSTR pszImageName, LPSTR pszDllPath, PLOADED_IMAGE pLoadedImage, @@ -202,7 +202,7 @@ BOOL WINAPI MapAndLoad( /* PathCombine(&szFileName, pszDllPath, pszImageName); */ /* PathRenameExtension(&szFileName, bDotDll?:"dll":"exe"); */ - /* FIXME: Check if the file already loaded (use IMAGEHLP_pFirstLoadedImage32) */ + /* FIXME: Check if the file already loaded (use IMAGEHLP_pFirstLoadedImage) */ if(!(hFile = CreateFileA( szFileName, GENERIC_READ, 1, /* FIXME: FILE_SHARE_READ not defined */ NULL, OPEN_EXISTING, 0, (HANDLE) NULL))) @@ -281,7 +281,7 @@ Error: } /*********************************************************************** - * SetImageConfigInformation32 (IMAGEHLP.34) + * SetImageConfigInformation (IMAGEHLP.@) */ BOOL WINAPI SetImageConfigInformation( PLOADED_IMAGE LoadedImage, @@ -295,7 +295,7 @@ BOOL WINAPI SetImageConfigInformation( } /*********************************************************************** - * UnMapAndLoad32 (IMAGEHLP.58) + * UnMapAndLoad (IMAGEHLP.@) */ BOOL WINAPI UnMapAndLoad(PLOADED_IMAGE LoadedImage) { diff --git a/dlls/imagehlp/debug.c b/dlls/imagehlp/debug.c index fec37f15b37..9d191ff5d2e 100644 --- a/dlls/imagehlp/debug.c +++ b/dlls/imagehlp/debug.c @@ -10,10 +10,10 @@ #include "debugtools.h" #include "imagehlp.h" -DEFAULT_DEBUG_CHANNEL(imagehlp) +DEFAULT_DEBUG_CHANNEL(imagehlp); /*********************************************************************** - * FindDebugInfoFile32 (IMAGEHLP.5) + * FindDebugInfoFile (IMAGEHLP.@) */ HANDLE WINAPI FindDebugInfoFile( LPSTR FileName, LPSTR SymbolPath, LPSTR DebugFilePath) @@ -27,7 +27,7 @@ HANDLE WINAPI FindDebugInfoFile( } /*********************************************************************** - * FindExecutableImage32 (IMAGEHLP.6) + * FindExecutableImage (IMAGEHLP.@) */ HANDLE WINAPI FindExecutableImage( LPSTR FileName, LPSTR SymbolPath, LPSTR ImageFilePath) @@ -41,7 +41,7 @@ HANDLE WINAPI FindExecutableImage( } /*********************************************************************** - * MapDebugInformation32 (IMAGEHLP.26) + * MapDebugInformation (IMAGEHLP.@) */ PIMAGE_DEBUG_INFORMATION WINAPI MapDebugInformation( HANDLE FileHandle, LPSTR FileName, @@ -55,7 +55,7 @@ PIMAGE_DEBUG_INFORMATION WINAPI MapDebugInformation( } /*********************************************************************** - * StackWalk32 (IMAGEHLP.36) + * StackWalk (IMAGEHLP.@) */ BOOL WINAPI StackWalk( DWORD MachineType, HANDLE hProcess, HANDLE hThread, @@ -76,7 +76,7 @@ BOOL WINAPI StackWalk( } /*********************************************************************** - * UnDecorateSymbolName32 (IMAGEHLP.57) + * UnDecorateSymbolName (IMAGEHLP.@) */ DWORD WINAPI UnDecorateSymbolName( LPCSTR DecoratedName, LPSTR UnDecoratedName, @@ -91,9 +91,8 @@ DWORD WINAPI UnDecorateSymbolName( } /*********************************************************************** - * UnmapDebugInformation32 (IMAGEHLP.59) + * UnmapDebugInformation (IMAGEHLP.@) */ - BOOL WINAPI UnmapDebugInformation( PIMAGE_DEBUG_INFORMATION DebugInfo) { diff --git a/dlls/imagehlp/imagehlp_main.c b/dlls/imagehlp/imagehlp_main.c index 8d86a7a0f03..ee64d22c95d 100644 --- a/dlls/imagehlp/imagehlp_main.c +++ b/dlls/imagehlp/imagehlp_main.c @@ -10,7 +10,7 @@ #include "windef.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(imagehlp) +DEFAULT_DEBUG_CHANNEL(imagehlp); /**********************************************************************/ @@ -44,7 +44,7 @@ BOOL WINAPI IMAGEHLP_LibMain( } /*********************************************************************** - * ImagehlpApiVersion32 (IMAGEHLP.22) + * ImagehlpApiVersion (IMAGEHLP.@) */ PAPI_VERSION WINAPI ImagehlpApiVersion() { @@ -52,7 +52,7 @@ PAPI_VERSION WINAPI ImagehlpApiVersion() } /*********************************************************************** - * ImagehlpApiVersionEx32 (IMAGEHLP.23) + * ImagehlpApiVersionEx (IMAGEHLP.@) */ PAPI_VERSION WINAPI ImagehlpApiVersionEx(PAPI_VERSION AppVersion) { @@ -68,7 +68,7 @@ PAPI_VERSION WINAPI ImagehlpApiVersionEx(PAPI_VERSION AppVersion) } /*********************************************************************** - * MakeSureDirectoryPathExists32 (IMAGEHLP.24) + * MakeSureDirectoryPathExists (IMAGEHLP.@) */ BOOL WINAPI MakeSureDirectoryPathExists(LPCSTR DirPath) { @@ -78,13 +78,13 @@ BOOL WINAPI MakeSureDirectoryPathExists(LPCSTR DirPath) } /*********************************************************************** - * MarkImageAsRunFromSwap (IMAGEHLP.29) + * MarkImageAsRunFromSwap (IMAGEHLP.@) * FIXME * No documentation available. */ /*********************************************************************** - * SearchTreeForFile32 (IMAGEHLP.33) + * SearchTreeForFile (IMAGEHLP.@) */ BOOL WINAPI SearchTreeForFile( LPSTR RootPath, LPSTR InputPathName, LPSTR OutputPathBuffer) @@ -98,7 +98,7 @@ BOOL WINAPI SearchTreeForFile( } /*********************************************************************** - * TouchFileTimes32 (IMAGEHLP.56) + * TouchFileTimes (IMAGEHLP.@) */ BOOL WINAPI TouchFileTimes( HANDLE FileHandle, LPSYSTEMTIME lpSystemTime) diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c index 34abf0af1e2..cc203f25b85 100644 --- a/dlls/imagehlp/integrity.c +++ b/dlls/imagehlp/integrity.c @@ -10,10 +10,10 @@ #include "imagehlp.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(imagehlp) +DEFAULT_DEBUG_CHANNEL(imagehlp); /*********************************************************************** - * ImageAddCertificate32 (IMAGEHLP.10) + * ImageAddCertificate (IMAGEHLP.@) */ BOOL WINAPI ImageAddCertificate( @@ -27,7 +27,7 @@ BOOL WINAPI ImageAddCertificate( } /*********************************************************************** - * ImageEnumerateCertificates32 (IMAGEHLP.12) + * ImageEnumerateCertificates (IMAGEHLP.@) */ BOOL WINAPI ImageEnumerateCertificates( HANDLE FileHandle, WORD TypeFilter, PDWORD CertificateCount, @@ -41,7 +41,7 @@ BOOL WINAPI ImageEnumerateCertificates( } /*********************************************************************** - * ImageGetCertificateData32 (IMAGEHLP.13) + * ImageGetCertificateData (IMAGEHLP.@) */ BOOL WINAPI ImageGetCertificateData( HANDLE FileHandle, DWORD CertificateIndex, @@ -55,7 +55,7 @@ BOOL WINAPI ImageGetCertificateData( } /*********************************************************************** - * ImageGetCertificateHeader32 (IMAGEHLP.14) + * ImageGetCertificateHeader (IMAGEHLP.@) */ BOOL WINAPI ImageGetCertificateHeader( HANDLE FileHandle, DWORD CertificateIndex, @@ -69,7 +69,7 @@ BOOL WINAPI ImageGetCertificateHeader( } /*********************************************************************** - * ImageGetDigestStream32 (IMAGEHLP.15) + * ImageGetDigestStream (IMAGEHLP.@) */ BOOL WINAPI ImageGetDigestStream( HANDLE FileHandle, DWORD DigestLevel, @@ -83,7 +83,7 @@ BOOL WINAPI ImageGetDigestStream( } /*********************************************************************** - * ImageRemoveCertificate32 (IMAGEHLP.18) + * ImageRemoveCertificate (IMAGEHLP.@) */ BOOL WINAPI ImageRemoveCertificate(HANDLE FileHandle, DWORD Index) { diff --git a/dlls/imagehlp/internal.c b/dlls/imagehlp/internal.c index 318920d9e62..60049a7e6a6 100644 --- a/dlls/imagehlp/internal.c +++ b/dlls/imagehlp/internal.c @@ -11,7 +11,7 @@ #include "imagehlp.h" /*********************************************************************** - * InitializeListHead32 + * InitializeListHead */ VOID InitializeListHead(PLIST_ENTRY pListHead) { @@ -20,7 +20,7 @@ VOID InitializeListHead(PLIST_ENTRY pListHead) } /*********************************************************************** - * InsertHeadList32 + * InsertHeadList */ VOID InsertHeadList(PLIST_ENTRY pListHead, PLIST_ENTRY pEntry) { @@ -30,7 +30,7 @@ VOID InsertHeadList(PLIST_ENTRY pListHead, PLIST_ENTRY pEntry) } /*********************************************************************** - * InsertTailList32 + * InsertTailList */ VOID InsertTailList(PLIST_ENTRY pListHead, PLIST_ENTRY pEntry) { @@ -40,7 +40,7 @@ VOID InsertTailList(PLIST_ENTRY pListHead, PLIST_ENTRY pEntry) } /*********************************************************************** - * IsListEmpty32 + * IsListEmpty */ BOOLEAN IsListEmpty(PLIST_ENTRY pListHead) { @@ -48,7 +48,7 @@ BOOLEAN IsListEmpty(PLIST_ENTRY pListHead) } /*********************************************************************** - * PopEntryList32 + * PopEntryList */ PSINGLE_LIST_ENTRY PopEntryList(PSINGLE_LIST_ENTRY pListHead) { @@ -57,7 +57,7 @@ PSINGLE_LIST_ENTRY PopEntryList(PSINGLE_LIST_ENTRY pListHead) } /*********************************************************************** - * PushEntryList32 + * PushEntryList */ VOID PushEntryList( PSINGLE_LIST_ENTRY pListHead, PSINGLE_LIST_ENTRY pEntry) @@ -66,7 +66,7 @@ VOID PushEntryList( } /*********************************************************************** - * RemoveEntryList32 + * RemoveEntryList */ VOID RemoveEntryList(PLIST_ENTRY pEntry) { @@ -77,7 +77,7 @@ VOID RemoveEntryList(PLIST_ENTRY pEntry) } /*********************************************************************** - * RemoveHeadList32 + * RemoveHeadList */ PLIST_ENTRY RemoveHeadList(PLIST_ENTRY pListHead) { @@ -97,7 +97,7 @@ PLIST_ENTRY RemoveHeadList(PLIST_ENTRY pListHead) } /*********************************************************************** - * RemoveTailList32 + * RemoveTailList */ PLIST_ENTRY RemoveTailList(PLIST_ENTRY pListHead) { @@ -107,7 +107,3 @@ PLIST_ENTRY RemoveTailList(PLIST_ENTRY pListHead) else return NULL; } - - - - diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c index fc977615949..c9505044fc4 100644 --- a/dlls/imagehlp/modify.c +++ b/dlls/imagehlp/modify.c @@ -10,10 +10,10 @@ #include "debugtools.h" #include "imagehlp.h" -DEFAULT_DEBUG_CHANNEL(imagehlp) +DEFAULT_DEBUG_CHANNEL(imagehlp); /*********************************************************************** - * BindImage32 (IMAGEHLP.1) + * BindImage (IMAGEHLP.@) */ BOOL WINAPI BindImage( LPSTR ImageName, LPSTR DllPath, LPSTR SymbolPath) @@ -22,7 +22,7 @@ BOOL WINAPI BindImage( } /*********************************************************************** - * BindImageEx32 (IMAGEHLP.2) + * BindImageEx (IMAGEHLP.@) */ BOOL WINAPI BindImageEx( DWORD Flags, LPSTR ImageName, LPSTR DllPath, LPSTR SymbolPath, @@ -37,7 +37,7 @@ BOOL WINAPI BindImageEx( } /*********************************************************************** - * CheckSumMappedFile32 (IMAGEHLP.3) + * CheckSumMappedFile (IMAGEHLP.@) */ PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile( LPVOID BaseAddress, DWORD FileLength, @@ -51,7 +51,7 @@ PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile( } /*********************************************************************** - * MapFileAndCheckSum32A (IMAGEHLP.27) + * MapFileAndCheckSumA (IMAGEHLP.@) */ DWORD WINAPI MapFileAndCheckSumA( LPSTR Filename, LPDWORD HeaderSum, LPDWORD CheckSum) @@ -64,7 +64,7 @@ DWORD WINAPI MapFileAndCheckSumA( } /*********************************************************************** - * MapFileAndCheckSum32W (IMAGEHLP.28) + * MapFileAndCheckSumW (IMAGEHLP.@) */ DWORD WINAPI MapFileAndCheckSumW( LPWSTR Filename, LPDWORD HeaderSum, LPDWORD CheckSum) @@ -77,7 +77,7 @@ DWORD WINAPI MapFileAndCheckSumW( } /*********************************************************************** - * ReBaseImage32 (IMAGEHLP.30) + * ReBaseImage (IMAGEHLP.@) */ BOOL WINAPI ReBaseImage( LPSTR CurrentImageName, LPSTR SymbolPath, BOOL fReBase, @@ -96,7 +96,7 @@ BOOL WINAPI ReBaseImage( } /*********************************************************************** - * RemovePrivateCvSymbolic32 (IMAGEHLP.31) + * RemovePrivateCvSymbolic (IMAGEHLP.@) */ BOOL WINAPI RemovePrivateCvSymbolic( PCHAR DebugData, PCHAR *NewDebugData, ULONG *NewDebugSize) @@ -109,7 +109,7 @@ BOOL WINAPI RemovePrivateCvSymbolic( } /*********************************************************************** - * RemoveRelocations32 (IMAGEHLP.32) + * RemoveRelocations (IMAGEHLP.@) */ VOID WINAPI RemoveRelocations(PCHAR ImageName) { @@ -118,7 +118,7 @@ VOID WINAPI RemoveRelocations(PCHAR ImageName) } /*********************************************************************** - * SplitSymbols32 (IMAGEHLP.35) + * SplitSymbols (IMAGEHLP.@) */ BOOL WINAPI SplitSymbols( LPSTR ImageName, LPSTR SymbolsPath, @@ -133,7 +133,7 @@ BOOL WINAPI SplitSymbols( } /*********************************************************************** - * UpdateDebugInfoFile32 (IMAGEHLP.60) + * UpdateDebugInfoFile (IMAGEHLP.@) */ BOOL WINAPI UpdateDebugInfoFile( LPSTR ImageFileName, LPSTR SymbolPath, @@ -148,9 +148,7 @@ BOOL WINAPI UpdateDebugInfoFile( } /*********************************************************************** - * UpdateDebugInfoFileEx32 (IMAGEHLP.?) - * FIXME - * Function has no ordinal. + * UpdateDebugInfoFileEx (IMAGEHLP.@) */ BOOL WINAPI UpdateDebugInfoFileEx( LPSTR ImageFileName, LPSTR SymbolPath, LPSTR DebugFilePath, diff --git a/dlls/imagehlp/symbol.c b/dlls/imagehlp/symbol.c index b271aee72b0..71e50b2d56d 100644 --- a/dlls/imagehlp/symbol.c +++ b/dlls/imagehlp/symbol.c @@ -10,10 +10,10 @@ #include "debugtools.h" #include "imagehlp.h" -DEFAULT_DEBUG_CHANNEL(imagehlp) +DEFAULT_DEBUG_CHANNEL(imagehlp); /*********************************************************************** - * SymCleanup32 (IMAGEHLP.37) + * SymCleanup (IMAGEHLP.@) */ BOOL WINAPI SymCleanup(HANDLE hProcess) { @@ -23,7 +23,7 @@ BOOL WINAPI SymCleanup(HANDLE hProcess) } /*********************************************************************** - * SymEnumerateModules32 (IMAGEHLP.38) + * SymEnumerateModules (IMAGEHLP.@) */ BOOL WINAPI SymEnumerateModules( @@ -38,7 +38,7 @@ BOOL WINAPI SymEnumerateModules( } /*********************************************************************** - * SymEnumerateSymbols32 (IMAGEHLP.39) + * SymEnumerateSymbols (IMAGEHLP.@) */ BOOL WINAPI SymEnumerateSymbols( HANDLE hProcess, DWORD BaseOfDll, @@ -52,7 +52,7 @@ BOOL WINAPI SymEnumerateSymbols( } /*********************************************************************** - * SymFunctionTableAccess32 (IMAGEHLP.40) + * SymFunctionTableAccess (IMAGEHLP.@) */ PVOID WINAPI SymFunctionTableAccess(HANDLE hProcess, DWORD AddrBase) { @@ -62,7 +62,7 @@ PVOID WINAPI SymFunctionTableAccess(HANDLE hProcess, DWORD AddrBase) } /*********************************************************************** - * SymGetModuleBase32 (IMAGEHLP.41) + * SymGetModuleBase (IMAGEHLP.@) */ DWORD WINAPI SymGetModuleBase(HANDLE hProcess, DWORD dwAddr) { @@ -72,7 +72,7 @@ DWORD WINAPI SymGetModuleBase(HANDLE hProcess, DWORD dwAddr) } /*********************************************************************** - * SymGetModuleInfo32 (IMAGEHLP.42) + * SymGetModuleInfo (IMAGEHLP.@) */ BOOL WINAPI SymGetModuleInfo( HANDLE hProcess, DWORD dwAddr, @@ -86,7 +86,7 @@ BOOL WINAPI SymGetModuleInfo( } /*********************************************************************** - * SymGetOptions32 (IMAGEHLP.43) + * SymGetOptions (IMAGEHLP.@) */ DWORD WINAPI SymGetOptions() { @@ -96,7 +96,7 @@ DWORD WINAPI SymGetOptions() } /*********************************************************************** - * SymGetSearchPath32 (IMAGEHLP.44) + * SymGetSearchPath (IMAGEHLP.@) */ BOOL WINAPI SymGetSearchPath( HANDLE hProcess, LPSTR szSearchPath, DWORD SearchPathLength) @@ -109,7 +109,7 @@ BOOL WINAPI SymGetSearchPath( } /*********************************************************************** - * SymGetSymFromAddr32 (IMAGEHLP.45) + * SymGetSymFromAddr (IMAGEHLP.@) */ BOOL WINAPI SymGetSymFromAddr( HANDLE hProcess, DWORD dwAddr, @@ -123,7 +123,7 @@ BOOL WINAPI SymGetSymFromAddr( } /*********************************************************************** - * SymGetSymFromName32 (IMAGEHLP.46) + * SymGetSymFromName (IMAGEHLP.@) */ BOOL WINAPI SymGetSymFromName( HANDLE hProcess, LPSTR Name, PIMAGEHLP_SYMBOL Symbol) @@ -134,7 +134,7 @@ BOOL WINAPI SymGetSymFromName( } /*********************************************************************** - * SymGetSymNext32 (IMAGEHLP.47) + * SymGetSymNext (IMAGEHLP.@) */ BOOL WINAPI SymGetSymNext( HANDLE hProcess, PIMAGEHLP_SYMBOL Symbol) @@ -145,7 +145,7 @@ BOOL WINAPI SymGetSymNext( } /*********************************************************************** - * SymGetSymPrev32 (IMAGEHLP.48) + * SymGetSymPrev (IMAGEHLP.@) */ BOOL WINAPI SymGetSymPrev( @@ -157,7 +157,7 @@ BOOL WINAPI SymGetSymPrev( } /*********************************************************************** - * SymInitialize32 (IMAGEHLP.49) + * SymInitialize (IMAGEHLP.@) */ BOOL WINAPI SymInitialize( HANDLE hProcess, LPSTR UserSearchPath, BOOL fInvadeProcess) @@ -170,7 +170,7 @@ BOOL WINAPI SymInitialize( } /*********************************************************************** - * SymLoadModule32 (IMAGEHLP.50) + * SymLoadModule (IMAGEHLP.@) */ BOOL WINAPI SymLoadModule( @@ -186,7 +186,7 @@ BOOL WINAPI SymLoadModule( } /*********************************************************************** - * SymRegisterCallback32 (IMAGEHLP.51) + * SymRegisterCallback (IMAGEHLP.@) */ BOOL WINAPI SymRegisterCallback( HANDLE hProcess, PSYMBOL_REGISTERED_CALLBACK CallbackFunction, @@ -200,7 +200,7 @@ BOOL WINAPI SymRegisterCallback( } /*********************************************************************** - * SymSetOptions32 (IMAGEHLP.52) + * SymSetOptions (IMAGEHLP.@) */ DWORD WINAPI SymSetOptions(DWORD SymOptions) { @@ -210,7 +210,7 @@ DWORD WINAPI SymSetOptions(DWORD SymOptions) } /*********************************************************************** - * SymSetSearchPath32 (IMAGEHLP.53) + * SymSetSearchPath (IMAGEHLP.@) */ BOOL WINAPI SymSetSearchPath(HANDLE hProcess, LPSTR szSearchPath) { @@ -222,7 +222,7 @@ BOOL WINAPI SymSetSearchPath(HANDLE hProcess, LPSTR szSearchPath) } /*********************************************************************** - * SymUnDName32 (IMAGEHLP.54) + * SymUnDName (IMAGEHLP.@) */ BOOL WINAPI SymUnDName( PIMAGEHLP_SYMBOL sym, LPSTR UnDecName, DWORD UnDecNameLength) @@ -235,7 +235,7 @@ BOOL WINAPI SymUnDName( } /*********************************************************************** - * SymUnloadModule32 (IMAGEHLP.55) + * SymUnloadModule (IMAGEHLP.@) */ BOOL WINAPI SymUnloadModule( HANDLE hProcess, DWORD BaseOfDll) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 74fa525ed03..b52c480b273 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -13,10 +13,10 @@ #include "winversion.h" #include "imm.h" -DEFAULT_DEBUG_CHANNEL(imm) +DEFAULT_DEBUG_CHANNEL(imm); /*********************************************************************** - * ImmAssociateContext32 (IMM32.1) + * ImmAssociateContext (IMM32.@) */ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) { @@ -26,7 +26,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) } /*********************************************************************** - * ImmConfigureIME32A (IMM32.2) + * ImmConfigureIMEA (IMM32.@) */ BOOL WINAPI ImmConfigureIMEA( HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) @@ -39,7 +39,7 @@ BOOL WINAPI ImmConfigureIMEA( } /*********************************************************************** - * ImmConfigureIME32W (IMM32.3) + * ImmConfigureIMEW (IMM32.@) */ BOOL WINAPI ImmConfigureIMEW( HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) @@ -52,7 +52,7 @@ BOOL WINAPI ImmConfigureIMEW( } /*********************************************************************** - * ImmCreateContext32 (IMM32.4) + * ImmCreateContext (IMM32.@) */ HIMC WINAPI ImmCreateContext() { @@ -62,7 +62,7 @@ HIMC WINAPI ImmCreateContext() } /*********************************************************************** - * ImmDestroyContext32 (IMM32.7) + * ImmDestroyContext (IMM32.@) */ BOOL WINAPI ImmDestroyContext(HIMC hIMC) { @@ -72,7 +72,7 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC) } /*********************************************************************** - * ImmEnumRegisterWord32A (IMM32.10) + * ImmEnumRegisterWordA (IMM32.@) */ UINT WINAPI ImmEnumRegisterWordA( HKL hKL, REGISTERWORDENUMPROCA lpfnEnumProc, @@ -89,7 +89,7 @@ UINT WINAPI ImmEnumRegisterWordA( } /*********************************************************************** - * ImmEnumRegisterWord32W (IMM32.11) + * ImmEnumRegisterWordW (IMM32.@) */ UINT WINAPI ImmEnumRegisterWordW( HKL hKL, REGISTERWORDENUMPROCW lpfnEnumProc, @@ -106,7 +106,7 @@ UINT WINAPI ImmEnumRegisterWordW( } /*********************************************************************** - * ImmEscape32A (IMM32.12) + * ImmEscapeA (IMM32.@) */ LRESULT WINAPI ImmEscapeA( HKL hKL, HIMC hIMC, @@ -120,7 +120,7 @@ LRESULT WINAPI ImmEscapeA( } /*********************************************************************** - * ImmEscape32W (IMM32.13) + * ImmEscapeW (IMM32.@) */ LRESULT WINAPI ImmEscapeW( HKL hKL, HIMC hIMC, @@ -134,7 +134,7 @@ LRESULT WINAPI ImmEscapeW( } /*********************************************************************** - * ImmGetCandidateList32A (IMM32.15) + * ImmGetCandidateListA (IMM32.@) */ DWORD WINAPI ImmGetCandidateListA( HIMC hIMC, DWORD deIndex, @@ -149,7 +149,7 @@ DWORD WINAPI ImmGetCandidateListA( } /*********************************************************************** - * ImmGetCandidateListCount32A (IMM32.16) + * ImmGetCandidateListCountA (IMM32.@) */ DWORD WINAPI ImmGetCandidateListCountA( HIMC hIMC, LPDWORD lpdwListCount) @@ -160,7 +160,7 @@ DWORD WINAPI ImmGetCandidateListCountA( } /*********************************************************************** - * ImmGetCandidateListCount32W (IMM32.17) + * ImmGetCandidateListCountW (IMM32.@) */ DWORD WINAPI ImmGetCandidateListCountW( HIMC hIMC, LPDWORD lpdwListCount) @@ -171,7 +171,7 @@ DWORD WINAPI ImmGetCandidateListCountW( } /*********************************************************************** - * ImmGetCandidateList32W (IMM32.18) + * ImmGetCandidateListW (IMM32.@) */ DWORD WINAPI ImmGetCandidateListW( HIMC hIMC, DWORD deIndex, @@ -186,7 +186,7 @@ DWORD WINAPI ImmGetCandidateListW( } /*********************************************************************** - * ImmGetCandidateWindow32 (IMM32.19) + * ImmGetCandidateWindow (IMM32.@) */ BOOL WINAPI ImmGetCandidateWindow( HIMC hIMC, DWORD dwBufLen, LPCANDIDATEFORM lpCandidate) @@ -197,7 +197,7 @@ BOOL WINAPI ImmGetCandidateWindow( } /*********************************************************************** - * ImmGetCompositionFont32A (IMM32.20) + * ImmGetCompositionFontA (IMM32.@) */ BOOL WINAPI ImmGetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) { @@ -207,7 +207,7 @@ BOOL WINAPI ImmGetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) } /*********************************************************************** - * ImmGetCompositionFont32W (IMM32.21) + * ImmGetCompositionFontW (IMM32.@) */ BOOL WINAPI ImmGetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) { @@ -217,7 +217,7 @@ BOOL WINAPI ImmGetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) } /*********************************************************************** - * ImmGetCompositionString32A (IMM32.22) + * ImmGetCompositionStringA (IMM32.@) */ LONG WINAPI ImmGetCompositionStringA( HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen) @@ -238,7 +238,7 @@ LONG WINAPI ImmGetCompositionStringA( } /*********************************************************************** - * ImmGetCompositionString32W (IMM32.23) + * ImmGetCompositionStringW (IMM32.@) */ LONG WINAPI ImmGetCompositionStringW( HIMC hIMC, DWORD dwIndex, @@ -260,7 +260,7 @@ LONG WINAPI ImmGetCompositionStringW( } /*********************************************************************** - * ImmGetCompositionWindow32 (IMM32.24) + * ImmGetCompositionWindow (IMM32.@) */ BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) { @@ -270,7 +270,7 @@ BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) } /*********************************************************************** - * ImmGetContext32 (IMM32.25) + * ImmGetContext (IMM32.@) */ HIMC WINAPI ImmGetContext(HWND hWnd) { @@ -280,7 +280,7 @@ HIMC WINAPI ImmGetContext(HWND hWnd) } /*********************************************************************** - * ImmGetConversionList32A (IMM32.26) + * ImmGetConversionListA (IMM32.@) */ DWORD WINAPI ImmGetConversionListA( HKL hKL, HIMC hIMC, @@ -295,7 +295,7 @@ DWORD WINAPI ImmGetConversionListA( } /*********************************************************************** - * ImmGetConversionList32W (IMM32.27) + * ImmGetConversionListW (IMM32.@) */ DWORD WINAPI ImmGetConversionListW( HKL hKL, HIMC hIMC, @@ -310,7 +310,7 @@ DWORD WINAPI ImmGetConversionListW( } /*********************************************************************** - * ImmGetConversionStatus32 (IMM32.28) + * ImmGetConversionStatus (IMM32.@) */ BOOL WINAPI ImmGetConversionStatus( HIMC hIMC, LPDWORD lpfdwConversion, LPDWORD lpfdwSentence) @@ -323,7 +323,7 @@ BOOL WINAPI ImmGetConversionStatus( } /*********************************************************************** - * ImmGetDefaultIMEWnd32 (IMM32.29) + * ImmGetDefaultIMEWnd (IMM32.@) */ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { @@ -333,7 +333,7 @@ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) } /*********************************************************************** - * ImmGetDescription32A (IMM32.30) + * ImmGetDescriptionA (IMM32.@) */ UINT WINAPI ImmGetDescriptionA( HKL hKL, LPSTR lpszDescription, UINT uBufLen) @@ -346,7 +346,7 @@ UINT WINAPI ImmGetDescriptionA( } /*********************************************************************** - * ImmGetDescription32W (IMM32.31) + * ImmGetDescriptionW (IMM32.@) */ UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen) { @@ -358,7 +358,7 @@ UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen) } /*********************************************************************** - * ImmGetGuideLine32A (IMM32.32) + * ImmGetGuideLineA (IMM32.@) */ DWORD WINAPI ImmGetGuideLineA( HIMC hIMC, DWORD dwIndex, LPSTR lpBuf, DWORD dwBufLen) @@ -371,7 +371,7 @@ DWORD WINAPI ImmGetGuideLineA( } /*********************************************************************** - * ImmGetGuideLine32W (IMM32.33) + * ImmGetGuideLineW (IMM32.@) */ DWORD WINAPI ImmGetGuideLineW(HIMC hIMC, DWORD dwIndex, LPWSTR lpBuf, DWORD dwBufLen) { @@ -383,7 +383,7 @@ DWORD WINAPI ImmGetGuideLineW(HIMC hIMC, DWORD dwIndex, LPWSTR lpBuf, DWORD dwBu } /*********************************************************************** - * ImmGetIMEFileName32A (IMM32.38) + * ImmGetIMEFileNameA (IMM32.@) */ UINT WINAPI ImmGetIMEFileNameA( HKL hKL, LPSTR lpszFileName, UINT uBufLen) @@ -396,7 +396,7 @@ UINT WINAPI ImmGetIMEFileNameA( } /*********************************************************************** - * ImmGetIMEFileName32W (IMM32.39) + * ImmGetIMEFileNameW (IMM32.@) */ UINT WINAPI ImmGetIMEFileNameW( HKL hKL, LPWSTR lpszFileName, UINT uBufLen) @@ -409,7 +409,7 @@ UINT WINAPI ImmGetIMEFileNameW( } /*********************************************************************** - * ImmGetOpenStatus32 (IMM32.40) + * ImmGetOpenStatus (IMM32.@) */ BOOL WINAPI ImmGetOpenStatus(HIMC hIMC) { @@ -419,7 +419,7 @@ BOOL WINAPI ImmGetOpenStatus(HIMC hIMC) } /*********************************************************************** - * ImmGetProperty32 (IMM32.41) + * ImmGetProperty (IMM32.@) */ DWORD WINAPI ImmGetProperty(HKL hKL, DWORD fdwIndex) { @@ -429,7 +429,7 @@ DWORD WINAPI ImmGetProperty(HKL hKL, DWORD fdwIndex) } /*********************************************************************** - * ImmGetRegisterWordStyle32A (IMM32.42) + * ImmGetRegisterWordStyleA (IMM32.@) */ UINT WINAPI ImmGetRegisterWordStyleA( HKL hKL, UINT nItem, LPSTYLEBUFA lpStyleBuf) @@ -440,7 +440,7 @@ UINT WINAPI ImmGetRegisterWordStyleA( } /*********************************************************************** - * ImmGetRegisterWordStyle32W (IMM32.43) + * ImmGetRegisterWordStyleW (IMM32.@) */ UINT WINAPI ImmGetRegisterWordStyleW( HKL hKL, UINT nItem, LPSTYLEBUFW lpStyleBuf) @@ -451,7 +451,7 @@ UINT WINAPI ImmGetRegisterWordStyleW( } /*********************************************************************** - * ImmGetStatusWindowPos32 (IMM32.44) + * ImmGetStatusWindowPos (IMM32.@) */ BOOL WINAPI ImmGetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) { @@ -461,7 +461,7 @@ BOOL WINAPI ImmGetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) } /*********************************************************************** - * ImmGetVirtualKey32 (IMM32.45) + * ImmGetVirtualKey (IMM32.@) */ UINT WINAPI ImmGetVirtualKey(HWND hWnd) { @@ -479,7 +479,7 @@ UINT WINAPI ImmGetVirtualKey(HWND hWnd) } /*********************************************************************** - * ImmInstallIME32A (IMM32.46) + * ImmInstallIMEA (IMM32.@) */ HKL WINAPI ImmInstallIMEA( LPCSTR lpszIMEFileName, LPCSTR lpszLayoutText) @@ -492,7 +492,7 @@ HKL WINAPI ImmInstallIMEA( } /*********************************************************************** - * ImmInstallIME32W (IMM32.47) + * ImmInstallIMEW (IMM32.@) */ HKL WINAPI ImmInstallIMEW( LPCWSTR lpszIMEFileName, LPCWSTR lpszLayoutText) @@ -505,7 +505,7 @@ HKL WINAPI ImmInstallIMEW( } /*********************************************************************** - * ImmIsIME32 (IMM32.48) + * ImmIsIME (IMM32.@) */ BOOL WINAPI ImmIsIME(HKL hKL) { @@ -515,7 +515,7 @@ BOOL WINAPI ImmIsIME(HKL hKL) } /*********************************************************************** - * ImmIsUIMessage32A (IMM32.49) + * ImmIsUIMessageA (IMM32.@) */ BOOL WINAPI ImmIsUIMessageA( HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam) @@ -528,7 +528,7 @@ BOOL WINAPI ImmIsUIMessageA( } /*********************************************************************** - * ImmIsUIMessage32W (IMM32.50) + * ImmIsUIMessageW (IMM32.@) */ BOOL WINAPI ImmIsUIMessageW( HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam) @@ -541,7 +541,7 @@ BOOL WINAPI ImmIsUIMessageW( } /*********************************************************************** - * ImmNotifyIME32 (IMM32.53) + * ImmNotifyIME (IMM32.@) */ BOOL WINAPI ImmNotifyIME( HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) @@ -554,7 +554,7 @@ BOOL WINAPI ImmNotifyIME( } /*********************************************************************** - * ImmRegisterWord32A (IMM32.55) + * ImmRegisterWordA (IMM32.@) */ BOOL WINAPI ImmRegisterWordA( HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister) @@ -567,7 +567,7 @@ BOOL WINAPI ImmRegisterWordA( } /*********************************************************************** - * ImmRegisterWord32W (IMM32.56) + * ImmRegisterWordW (IMM32.@) */ BOOL WINAPI ImmRegisterWordW( HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister) @@ -580,7 +580,7 @@ BOOL WINAPI ImmRegisterWordW( } /*********************************************************************** - * ImmReleaseContext32 (IMM32.57) + * ImmReleaseContext (IMM32.@) */ BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC) { @@ -590,7 +590,7 @@ BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC) } /*********************************************************************** - * ImmSetCandidateWindow32 (IMM32.58) + * ImmSetCandidateWindow (IMM32.@) */ BOOL WINAPI ImmSetCandidateWindow( HIMC hIMC, LPCANDIDATEFORM lpCandidate) @@ -601,7 +601,7 @@ BOOL WINAPI ImmSetCandidateWindow( } /*********************************************************************** - * ImmSetCompositionFont32A (IMM32.59) + * ImmSetCompositionFontA (IMM32.@) */ BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) { @@ -611,7 +611,7 @@ BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) } /*********************************************************************** - * ImmSetCompositionFont32W (IMM32.60) + * ImmSetCompositionFontW (IMM32.@) */ BOOL WINAPI ImmSetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) { @@ -621,7 +621,7 @@ BOOL WINAPI ImmSetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) } /*********************************************************************** - * ImmSetCompositionString32A (IMM32.61) + * ImmSetCompositionStringA (IMM32.@) */ BOOL WINAPI ImmSetCompositionStringA( HIMC hIMC, DWORD dwIndex, @@ -636,7 +636,7 @@ BOOL WINAPI ImmSetCompositionStringA( } /*********************************************************************** - * ImmSetCompositionString32W (IMM32.62) + * ImmSetCompositionStringW (IMM32.@) */ BOOL WINAPI ImmSetCompositionStringW( HIMC hIMC, DWORD dwIndex, @@ -651,7 +651,7 @@ BOOL WINAPI ImmSetCompositionStringW( } /*********************************************************************** - * ImmSetCompositionWindow32 (IMM32.63) + * ImmSetCompositionWindow (IMM32.@) */ BOOL WINAPI ImmSetCompositionWindow( HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) @@ -662,7 +662,7 @@ BOOL WINAPI ImmSetCompositionWindow( } /*********************************************************************** - * ImmSetConversionStatus32 (IMM32.64) + * ImmSetConversionStatus (IMM32.@) */ BOOL WINAPI ImmSetConversionStatus( HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence) @@ -675,7 +675,7 @@ BOOL WINAPI ImmSetConversionStatus( } /*********************************************************************** - * ImmSetOpenStatus32 (IMM32.66) + * ImmSetOpenStatus (IMM32.@) */ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) { @@ -685,7 +685,7 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) } /*********************************************************************** - * ImmSetStatusWindowPos32 (IMM32.67) + * ImmSetStatusWindowPos (IMM32.@) */ BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) { @@ -695,7 +695,7 @@ BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) } /*********************************************************************** - * ImmSimulateHotKey32 (IMM32.69) + * ImmSimulateHotKey (IMM32.@) */ BOOL WINAPI ImmSimulateHotKey(HWND hWnd, DWORD dwHotKeyID) { @@ -705,7 +705,7 @@ BOOL WINAPI ImmSimulateHotKey(HWND hWnd, DWORD dwHotKeyID) } /*********************************************************************** - * ImmUnregisterWord32A (IMM32.72) + * ImmUnregisterWordA (IMM32.@) */ BOOL WINAPI ImmUnregisterWordA( HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszUnregister) @@ -718,10 +718,7 @@ BOOL WINAPI ImmUnregisterWordA( } /*********************************************************************** - * ImmUnregisterWord32W (IMM32.?) - * FIXME - * I haven't been able to find the ordinal for this function, - * This means it can't be called from outside the DLL. + * ImmUnregisterWordW (IMM32.@) */ BOOL WINAPI ImmUnregisterWordW( HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnregister) diff --git a/dlls/lzexpand/lzexpand_main.c b/dlls/lzexpand/lzexpand_main.c index 06fb1eacda0..adedcfe5bee 100644 --- a/dlls/lzexpand/lzexpand_main.c +++ b/dlls/lzexpand/lzexpand_main.c @@ -129,7 +129,7 @@ INT16 WINAPI LZStart16(void) /*********************************************************************** - * LZStart32 (LZ32.6) + * LZStart (LZ32.6) */ INT WINAPI LZStart(void) { @@ -151,7 +151,7 @@ HFILE16 WINAPI LZInit16( HFILE16 hfSrc ) /*********************************************************************** - * LZInit32 (LZ32.2) + * LZInit (LZ32.2) * * initializes internal decompression buffers, returns lzfiledescriptor. * (return value the same as hfSrc, if hfSrc is not compressed) @@ -215,7 +215,7 @@ INT16 WINAPI GetExpandedName16( LPCSTR in, LPSTR out ) /*********************************************************************** - * GetExpandedName32A (LZ32.9) + * GetExpandedNameA (LZ32.9) * * gets the full filename of the compressed file 'in' by opening it * and reading the header @@ -293,7 +293,7 @@ INT WINAPI GetExpandedNameA( LPCSTR in, LPSTR out ) /*********************************************************************** - * GetExpandedName32W (LZ32.11) + * GetExpandedNameW (LZ32.11) */ INT WINAPI GetExpandedNameW( LPCWSTR in, LPWSTR out ) { @@ -321,7 +321,7 @@ INT16 WINAPI LZRead16( HFILE16 fd, LPVOID buf, UINT16 toread ) /*********************************************************************** - * LZRead32 (LZ32.4) + * LZRead (LZ32.4) */ INT WINAPI LZRead( HFILE fd, LPVOID vbuf, UINT toread ) { @@ -422,7 +422,7 @@ LONG WINAPI LZSeek16( HFILE16 fd, LONG off, INT16 type ) /*********************************************************************** - * LZSeek32 (LZ32.3) + * LZSeek (LZ32.3) */ LONG WINAPI LZSeek( HFILE fd, LONG off, INT type ) { @@ -477,7 +477,7 @@ LONG WINAPI LZCopy16( HFILE16 src, HFILE16 dest ) /*********************************************************************** - * LZCopy32 (LZ32.0) + * LZCopy (LZ32.0) * * Copies everything from src to dest * if src is a LZ compressed file, it will be uncompressed. @@ -564,7 +564,7 @@ HFILE16 WINAPI LZOpenFile16( LPCSTR fn, LPOFSTRUCT ofs, UINT16 mode ) /*********************************************************************** - * LZOpenFile32A (LZ32.1) + * LZOpenFileA (LZ32.1) * * Opens a file. If not compressed, open it as a normal file. */ @@ -592,7 +592,7 @@ HFILE WINAPI LZOpenFileA( LPCSTR fn, LPOFSTRUCT ofs, UINT mode ) /*********************************************************************** - * LZOpenFile32W (LZ32.10) + * LZOpenFileW (LZ32.10) */ HFILE WINAPI LZOpenFileW( LPCWSTR fn, LPOFSTRUCT ofs, UINT mode ) { @@ -624,7 +624,7 @@ void WINAPI LZClose16( HFILE16 fd ) /*********************************************************************** - * LZClose32 (LZ32.5) + * LZClose (LZ32.5) */ void WINAPI LZClose( HFILE fd ) { @@ -652,7 +652,7 @@ LONG WINAPI CopyLZFile16( HFILE16 src, HFILE16 dest ) /*********************************************************************** - * CopyLZFile32 (LZ32.7) + * CopyLZFile (LZ32.7) * * Copy src to dest (including uncompressing src). * NOTE: Yes. This is exactly the same function as LZCopy. diff --git a/dlls/msacm32/msacm32_main.c b/dlls/msacm32/msacm32_main.c index 86437b33cb1..94bcfcb76bd 100644 --- a/dlls/msacm32/msacm32_main.c +++ b/dlls/msacm32/msacm32_main.c @@ -23,7 +23,7 @@ DEFAULT_DEBUG_CHANNEL(msacm) static DWORD MSACM_dwProcessesAttached = 0; /*********************************************************************** - * MSACM_LibMain32 (MSACM32.init) + * MSACM_LibMain (MSACM32.init) */ BOOL WINAPI MSACM32_LibMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -62,7 +62,7 @@ BOOL WINAPI MSACM32_LibMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReser */ /*********************************************************************** - * acmGetVersion32 (MSACM32.34) + * acmGetVersion (MSACM32.34) */ DWORD WINAPI acmGetVersion(void) { diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 99d50e314ec..ef433027dab 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -435,7 +435,7 @@ CLEANUP: /*********************************************************************** - * OleGetClipboard32 [OLE32.105] + * OleGetClipboard [OLE32.105] * Returns a pointer to our internal IDataObject which represents the conceptual * state of the Windows clipboard. If the current clipboard already contains * an IDataObject, our internal IDataObject will delegate to this object. @@ -566,7 +566,7 @@ CLEANUP: /*********************************************************************** - * OleIsCurrentClipboard32 [OLE32.110] + * OleIsCurrentClipboard [OLE32.110] */ HRESULT WINAPI OleIsCurrentClipboard ( IDataObject *pDataObject) { diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 9c232478965..359de359ea0 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -263,7 +263,7 @@ void WINAPI OleUninitialize(void) } /****************************************************************************** - * CoRegisterMessageFilter32 [OLE32.38] + * CoRegisterMessageFilter [OLE32.38] */ HRESULT WINAPI CoRegisterMessageFilter( LPMESSAGEFILTER lpMessageFilter, /* Pointer to interface */ @@ -296,7 +296,7 @@ HRESULT WINAPI RegisterDragDrop16( } /*********************************************************************** - * RegisterDragDrop32 (OLE32.139) + * RegisterDragDrop (OLE32.139) */ HRESULT WINAPI RegisterDragDrop( HWND hwnd, @@ -349,7 +349,7 @@ HRESULT WINAPI RevokeDragDrop16( } /*********************************************************************** - * RevokeDragDrop32 (OLE32.141) + * RevokeDragDrop (OLE32.141) */ HRESULT WINAPI RevokeDragDrop( HWND hwnd) @@ -475,7 +475,7 @@ HRESULT WINAPI OleRegGetUserType( } /*********************************************************************** - * DoDragDrop32 [OLE32.65] + * DoDragDrop [OLE32.65] */ HRESULT WINAPI DoDragDrop ( IDataObject *pDataObject, /* ptr to the data obj */ @@ -566,7 +566,7 @@ HRESULT WINAPI DoDragDrop ( } /*********************************************************************** - * OleQueryLinkFromData32 [OLE32.118] + * OleQueryLinkFromData [OLE32.118] */ HRESULT WINAPI OleQueryLinkFromData( IDataObject* pSrcDataObject) diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c index 001a8f9ecc0..c7c40b36da8 100644 --- a/dlls/ole32/storage.c +++ b/dlls/ole32/storage.c @@ -1642,7 +1642,7 @@ HRESULT WINAPI StgIsStorageFile16(LPCOLESTR16 fn) { } /****************************************************************************** - * StgIsStorageFile32 [OLE32.146] + * StgIsStorageFile [OLE32.146] */ HRESULT WINAPI StgIsStorageFile(LPCOLESTR fn) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 5a38e7179aa..a0cbb3749e9 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5252,7 +5252,7 @@ ULARGE_INTEGER SmallBlockChainStream_GetSize(SmallBlockChainStream* This) } /****************************************************************************** - * StgCreateDocfile32 [OLE32.144] + * StgCreateDocfile [OLE32.144] */ HRESULT WINAPI StgCreateDocfile( LPCOLESTR pwcsName, @@ -5372,7 +5372,7 @@ HRESULT WINAPI StgCreateDocfile( } /****************************************************************************** - * StgOpenStorage32 [OLE32.148] + * StgOpenStorage [OLE32.148] */ HRESULT WINAPI StgOpenStorage( const OLECHAR *pwcsName, @@ -5637,7 +5637,7 @@ HRESULT WINAPI StgIsStorageILockBytes(ILockBytes *plkbyt) } /****************************************************************************** - * WriteClassStg32 [OLE32.158] + * WriteClassStg [OLE32.158] * * This method will store the specified CLSID in the specified storage object */ diff --git a/dlls/oleaut32/ole2disp.c b/dlls/oleaut32/ole2disp.c index 54353f4762d..c0a9f8b3a64 100644 --- a/dlls/oleaut32/ole2disp.c +++ b/dlls/oleaut32/ole2disp.c @@ -57,7 +57,7 @@ BSTR16 WINAPI SysAllocString16(LPCOLESTR16 in) } /****************************************************************************** - * SysAllocString32 [OLEAUT32.2] + * SysAllocString [OLEAUT32.2] */ BSTR WINAPI SysAllocString(LPCOLESTR in) { @@ -77,7 +77,7 @@ INT16 WINAPI SysReAllocString16(LPBSTR16 old,LPCOLESTR16 in) } /****************************************************************************** - * SysReAllocString32 [OLEAUT32.3] + * SysReAllocString [OLEAUT32.3] */ INT WINAPI SysReAllocString(LPBSTR old,LPCOLESTR in) { @@ -125,7 +125,7 @@ BSTR16 WINAPI SysAllocStringLen16(const char *in, int len) } /****************************************************************************** - * SysAllocStringLen32 [OLEAUT32.4] + * SysAllocStringLen [OLEAUT32.4] * * In "Inside OLE, second edition" by Kraig Brockshmidt. In the Automation * section, he describes the DWORD value placed before the BSTR data type. @@ -204,7 +204,7 @@ int WINAPI SysReAllocStringLen16(BSTR16 *old,const char *in,int len) /****************************************************************************** - * SysReAllocStringLen32 [OLEAUT32.5] + * SysReAllocStringLen [OLEAUT32.5] */ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* in, unsigned int len) { @@ -237,7 +237,7 @@ void WINAPI SysFreeString16(BSTR16 in) } /****************************************************************************** - * SysFreeString32 [OLEAUT32.6] + * SysFreeString [OLEAUT32.6] */ void WINAPI SysFreeString(BSTR in) { @@ -270,7 +270,7 @@ int WINAPI SysStringLen16(BSTR16 str) } /****************************************************************************** - * SysStringLen32 [OLEAUT32.7] + * SysStringLen [OLEAUT32.7] * * The Windows documentation states that the length returned by this function * is not necessarely the same as the length returned by the _lstrlenW method. diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 014339352d7..79b91211526 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -121,10 +121,17 @@ UINT WINAPI OaBuildVersion() } } +/*********************************************************************** + * DllRegisterServer + */ HRESULT WINAPI OLEAUT32_DllRegisterServer() { FIXME("stub!\n"); return S_OK; } + +/*********************************************************************** + * DllUnregisterServer + */ HRESULT WINAPI OLEAUT32_DllUnregisterServer() { FIXME("stub!\n"); return S_OK; diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index c19903069e7..0895c547d18 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1657,7 +1657,7 @@ static HRESULT WINAPI ValidateVt( VARTYPE vt ) /****************************************************************************** - * VariantInit32 [OLEAUT32.8] + * VariantInit [OLEAUT32.8] * * Initializes the Variant. Unlike VariantClear it does not interpret the current * contents of the Variant. @@ -1673,7 +1673,7 @@ void WINAPI VariantInit(VARIANTARG* pvarg) } /****************************************************************************** - * VariantClear32 [OLEAUT32.9] + * VariantClear [OLEAUT32.9] * * This function clears the VARIANT by setting the vt field to VT_EMPTY. It also * sets the wReservedX field to 0. The current contents of the VARIANT are @@ -1735,7 +1735,7 @@ HRESULT WINAPI VariantClear(VARIANTARG* pvarg) } /****************************************************************************** - * VariantCopy32 [OLEAUT32.10] + * VariantCopy [OLEAUT32.10] * * Frees up the designation variant and makes a copy of the source. */ @@ -1818,7 +1818,7 @@ HRESULT WINAPI VariantCopy(VARIANTARG* pvargDest, VARIANTARG* pvargSrc) /****************************************************************************** - * VariantCopyInd32 [OLEAUT32.11] + * VariantCopyInd [OLEAUT32.11] * * Frees up the destination variant and makes a copy of the source. If * the source is of type VT_BYREF it performs the necessary indirections. @@ -1947,7 +1947,7 @@ HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, VARIANTARG* pvargSrc) } /****************************************************************************** - * VariantChangeType32 [OLEAUT32.12] + * VariantChangeType [OLEAUT32.12] */ HRESULT WINAPI VariantChangeType(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, USHORT wFlags, VARTYPE vt) @@ -1956,7 +1956,7 @@ HRESULT WINAPI VariantChangeType(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, } /****************************************************************************** - * VariantChangeTypeEx32 [OLEAUT32.147] + * VariantChangeTypeEx [OLEAUT32.147] */ HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, LCID lcid, USHORT wFlags, VARTYPE vt) @@ -2034,7 +2034,7 @@ HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, /****************************************************************************** - * VarUI1FromI232 [OLEAUT32.130] + * VarUI1FromI2 [OLEAUT32.130] */ HRESULT WINAPI VarUI1FromI2(short sIn, BYTE* pbOut) { @@ -2053,7 +2053,7 @@ HRESULT WINAPI VarUI1FromI2(short sIn, BYTE* pbOut) } /****************************************************************************** - * VarUI1FromI432 [OLEAUT32.131] + * VarUI1FromI4 [OLEAUT32.131] */ HRESULT WINAPI VarUI1FromI4(LONG lIn, BYTE* pbOut) { @@ -2073,7 +2073,7 @@ HRESULT WINAPI VarUI1FromI4(LONG lIn, BYTE* pbOut) /****************************************************************************** - * VarUI1FromR432 [OLEAUT32.132] + * VarUI1FromR4 [OLEAUT32.132] */ HRESULT WINAPI VarUI1FromR4(FLOAT fltIn, BYTE* pbOut) { @@ -2093,7 +2093,7 @@ HRESULT WINAPI VarUI1FromR4(FLOAT fltIn, BYTE* pbOut) } /****************************************************************************** - * VarUI1FromR832 [OLEAUT32.133] + * VarUI1FromR8 [OLEAUT32.133] */ HRESULT WINAPI VarUI1FromR8(double dblIn, BYTE* pbOut) { @@ -2113,7 +2113,7 @@ HRESULT WINAPI VarUI1FromR8(double dblIn, BYTE* pbOut) } /****************************************************************************** - * VarUI1FromDate32 [OLEAUT32.135] + * VarUI1FromDate [OLEAUT32.135] */ HRESULT WINAPI VarUI1FromDate(DATE dateIn, BYTE* pbOut) { @@ -2133,7 +2133,7 @@ HRESULT WINAPI VarUI1FromDate(DATE dateIn, BYTE* pbOut) } /****************************************************************************** - * VarUI1FromBool32 [OLEAUT32.138] + * VarUI1FromBool [OLEAUT32.138] */ HRESULT WINAPI VarUI1FromBool(VARIANT_BOOL boolIn, BYTE* pbOut) { @@ -2145,7 +2145,7 @@ HRESULT WINAPI VarUI1FromBool(VARIANT_BOOL boolIn, BYTE* pbOut) } /****************************************************************************** - * VarUI1FromI132 [OLEAUT32.237] + * VarUI1FromI1 [OLEAUT32.237] */ HRESULT WINAPI VarUI1FromI1(CHAR cIn, BYTE* pbOut) { @@ -2157,7 +2157,7 @@ HRESULT WINAPI VarUI1FromI1(CHAR cIn, BYTE* pbOut) } /****************************************************************************** - * VarUI1FromUI232 [OLEAUT32.238] + * VarUI1FromUI2 [OLEAUT32.238] */ HRESULT WINAPI VarUI1FromUI2(USHORT uiIn, BYTE* pbOut) { @@ -2176,7 +2176,7 @@ HRESULT WINAPI VarUI1FromUI2(USHORT uiIn, BYTE* pbOut) } /****************************************************************************** - * VarUI1FromUI432 [OLEAUT32.239] + * VarUI1FromUI4 [OLEAUT32.239] */ HRESULT WINAPI VarUI1FromUI4(ULONG ulIn, BYTE* pbOut) { @@ -2196,7 +2196,7 @@ HRESULT WINAPI VarUI1FromUI4(ULONG ulIn, BYTE* pbOut) /****************************************************************************** - * VarUI1FromStr32 [OLEAUT32.54] + * VarUI1FromStr [OLEAUT32.54] */ HRESULT WINAPI VarUI1FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, BYTE* pbOut) { @@ -2236,7 +2236,7 @@ HRESULT WINAPI VarUI1FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, BYTE* pbO } /********************************************************************** - * VarUI1FromCy32 [OLEAUT32.134] + * VarUI1FromCy [OLEAUT32.134] * Convert currency to unsigned char */ HRESULT WINAPI VarUI1FromCy(CY cyIn, BYTE* pbOut) { @@ -2249,7 +2249,7 @@ HRESULT WINAPI VarUI1FromCy(CY cyIn, BYTE* pbOut) { } /****************************************************************************** - * VarI2FromUI132 [OLEAUT32.48] + * VarI2FromUI1 [OLEAUT32.48] */ HRESULT WINAPI VarI2FromUI1(BYTE bIn, short* psOut) { @@ -2261,7 +2261,7 @@ HRESULT WINAPI VarI2FromUI1(BYTE bIn, short* psOut) } /****************************************************************************** - * VarI2FromI432 [OLEAUT32.49] + * VarI2FromI4 [OLEAUT32.49] */ HRESULT WINAPI VarI2FromI4(LONG lIn, short* psOut) { @@ -2280,7 +2280,7 @@ HRESULT WINAPI VarI2FromI4(LONG lIn, short* psOut) } /****************************************************************************** - * VarI2FromR432 [OLEAUT32.50] + * VarI2FromR4 [OLEAUT32.50] */ HRESULT WINAPI VarI2FromR4(FLOAT fltIn, short* psOut) { @@ -2300,7 +2300,7 @@ HRESULT WINAPI VarI2FromR4(FLOAT fltIn, short* psOut) } /****************************************************************************** - * VarI2FromR832 [OLEAUT32.51] + * VarI2FromR8 [OLEAUT32.51] */ HRESULT WINAPI VarI2FromR8(double dblIn, short* psOut) { @@ -2320,7 +2320,7 @@ HRESULT WINAPI VarI2FromR8(double dblIn, short* psOut) } /****************************************************************************** - * VarI2FromDate32 [OLEAUT32.53] + * VarI2FromDate [OLEAUT32.53] */ HRESULT WINAPI VarI2FromDate(DATE dateIn, short* psOut) { @@ -2340,7 +2340,7 @@ HRESULT WINAPI VarI2FromDate(DATE dateIn, short* psOut) } /****************************************************************************** - * VarI2FromBool32 [OLEAUT32.56] + * VarI2FromBool [OLEAUT32.56] */ HRESULT WINAPI VarI2FromBool(VARIANT_BOOL boolIn, short* psOut) { @@ -2352,7 +2352,7 @@ HRESULT WINAPI VarI2FromBool(VARIANT_BOOL boolIn, short* psOut) } /****************************************************************************** - * VarI2FromI132 [OLEAUT32.48] + * VarI2FromI1 [OLEAUT32.48] */ HRESULT WINAPI VarI2FromI1(CHAR cIn, short* psOut) { @@ -2364,7 +2364,7 @@ HRESULT WINAPI VarI2FromI1(CHAR cIn, short* psOut) } /****************************************************************************** - * VarI2FromUI232 [OLEAUT32.206] + * VarI2FromUI2 [OLEAUT32.206] */ HRESULT WINAPI VarI2FromUI2(USHORT uiIn, short* psOut) { @@ -2383,7 +2383,7 @@ HRESULT WINAPI VarI2FromUI2(USHORT uiIn, short* psOut) } /****************************************************************************** - * VarI2FromUI432 [OLEAUT32.49] + * VarI2FromUI4 [OLEAUT32.49] */ HRESULT WINAPI VarI2FromUI4(ULONG ulIn, short* psOut) { @@ -2402,7 +2402,7 @@ HRESULT WINAPI VarI2FromUI4(ULONG ulIn, short* psOut) } /****************************************************************************** - * VarI2FromStr32 [OLEAUT32.54] + * VarI2FromStr [OLEAUT32.54] */ HRESULT WINAPI VarI2FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, short* psOut) { @@ -2442,7 +2442,7 @@ HRESULT WINAPI VarI2FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, short* psO } /********************************************************************** - * VarI2FromCy32 [OLEAUT32.52] + * VarI2FromCy [OLEAUT32.52] * Convert currency to signed short */ HRESULT WINAPI VarI2FromCy(CY cyIn, short* psOut) { @@ -2455,7 +2455,7 @@ HRESULT WINAPI VarI2FromCy(CY cyIn, short* psOut) { } /****************************************************************************** - * VarI4FromUI132 [OLEAUT32.58] + * VarI4FromUI1 [OLEAUT32.58] */ HRESULT WINAPI VarI4FromUI1(BYTE bIn, LONG* plOut) { @@ -2468,7 +2468,7 @@ HRESULT WINAPI VarI4FromUI1(BYTE bIn, LONG* plOut) /****************************************************************************** - * VarI4FromR432 [OLEAUT32.60] + * VarI4FromR4 [OLEAUT32.60] */ HRESULT WINAPI VarI4FromR4(FLOAT fltIn, LONG* plOut) { @@ -2488,7 +2488,7 @@ HRESULT WINAPI VarI4FromR4(FLOAT fltIn, LONG* plOut) } /****************************************************************************** - * VarI4FromR832 [OLEAUT32.61] + * VarI4FromR8 [OLEAUT32.61] */ HRESULT WINAPI VarI4FromR8(double dblIn, LONG* plOut) { @@ -2508,7 +2508,7 @@ HRESULT WINAPI VarI4FromR8(double dblIn, LONG* plOut) } /****************************************************************************** - * VarI4FromDate32 [OLEAUT32.63] + * VarI4FromDate [OLEAUT32.63] */ HRESULT WINAPI VarI4FromDate(DATE dateIn, LONG* plOut) { @@ -2528,7 +2528,7 @@ HRESULT WINAPI VarI4FromDate(DATE dateIn, LONG* plOut) } /****************************************************************************** - * VarI4FromBool32 [OLEAUT32.66] + * VarI4FromBool [OLEAUT32.66] */ HRESULT WINAPI VarI4FromBool(VARIANT_BOOL boolIn, LONG* plOut) { @@ -2540,7 +2540,7 @@ HRESULT WINAPI VarI4FromBool(VARIANT_BOOL boolIn, LONG* plOut) } /****************************************************************************** - * VarI4FromI132 [OLEAUT32.209] + * VarI4FromI1 [OLEAUT32.209] */ HRESULT WINAPI VarI4FromI1(CHAR cIn, LONG* plOut) { @@ -2552,7 +2552,7 @@ HRESULT WINAPI VarI4FromI1(CHAR cIn, LONG* plOut) } /****************************************************************************** - * VarI4FromUI232 [OLEAUT32.210] + * VarI4FromUI2 [OLEAUT32.210] */ HRESULT WINAPI VarI4FromUI2(USHORT uiIn, LONG* plOut) { @@ -2564,7 +2564,7 @@ HRESULT WINAPI VarI4FromUI2(USHORT uiIn, LONG* plOut) } /****************************************************************************** - * VarI4FromUI432 [OLEAUT32.211] + * VarI4FromUI4 [OLEAUT32.211] */ HRESULT WINAPI VarI4FromUI4(ULONG ulIn, LONG* plOut) { @@ -2583,7 +2583,7 @@ HRESULT WINAPI VarI4FromUI4(ULONG ulIn, LONG* plOut) } /****************************************************************************** - * VarI4FromI232 [OLEAUT32.59] + * VarI4FromI2 [OLEAUT32.59] */ HRESULT WINAPI VarI4FromI2(short sIn, LONG* plOut) { @@ -2595,7 +2595,7 @@ HRESULT WINAPI VarI4FromI2(short sIn, LONG* plOut) } /****************************************************************************** - * VarI4FromStr32 [OLEAUT32.64] + * VarI4FromStr [OLEAUT32.64] */ HRESULT WINAPI VarI4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, LONG* plOut) { @@ -2635,7 +2635,7 @@ HRESULT WINAPI VarI4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, LONG* plOu } /********************************************************************** - * VarI4FromCy32 [OLEAUT32.62] + * VarI4FromCy [OLEAUT32.62] * Convert currency to signed long */ HRESULT WINAPI VarI4FromCy(CY cyIn, LONG* plOut) { @@ -2648,7 +2648,7 @@ HRESULT WINAPI VarI4FromCy(CY cyIn, LONG* plOut) { } /****************************************************************************** - * VarR4FromUI132 [OLEAUT32.68] + * VarR4FromUI1 [OLEAUT32.68] */ HRESULT WINAPI VarR4FromUI1(BYTE bIn, FLOAT* pfltOut) { @@ -2660,7 +2660,7 @@ HRESULT WINAPI VarR4FromUI1(BYTE bIn, FLOAT* pfltOut) } /****************************************************************************** - * VarR4FromI232 [OLEAUT32.69] + * VarR4FromI2 [OLEAUT32.69] */ HRESULT WINAPI VarR4FromI2(short sIn, FLOAT* pfltOut) { @@ -2672,7 +2672,7 @@ HRESULT WINAPI VarR4FromI2(short sIn, FLOAT* pfltOut) } /****************************************************************************** - * VarR4FromI432 [OLEAUT32.70] + * VarR4FromI4 [OLEAUT32.70] */ HRESULT WINAPI VarR4FromI4(LONG lIn, FLOAT* pfltOut) { @@ -2684,7 +2684,7 @@ HRESULT WINAPI VarR4FromI4(LONG lIn, FLOAT* pfltOut) } /****************************************************************************** - * VarR4FromR832 [OLEAUT32.71] + * VarR4FromR8 [OLEAUT32.71] */ HRESULT WINAPI VarR4FromR8(double dblIn, FLOAT* pfltOut) { @@ -2703,7 +2703,7 @@ HRESULT WINAPI VarR4FromR8(double dblIn, FLOAT* pfltOut) } /****************************************************************************** - * VarR4FromDate32 [OLEAUT32.73] + * VarR4FromDate [OLEAUT32.73] */ HRESULT WINAPI VarR4FromDate(DATE dateIn, FLOAT* pfltOut) { @@ -2722,7 +2722,7 @@ HRESULT WINAPI VarR4FromDate(DATE dateIn, FLOAT* pfltOut) } /****************************************************************************** - * VarR4FromBool32 [OLEAUT32.76] + * VarR4FromBool [OLEAUT32.76] */ HRESULT WINAPI VarR4FromBool(VARIANT_BOOL boolIn, FLOAT* pfltOut) { @@ -2734,7 +2734,7 @@ HRESULT WINAPI VarR4FromBool(VARIANT_BOOL boolIn, FLOAT* pfltOut) } /****************************************************************************** - * VarR4FromI132 [OLEAUT32.213] + * VarR4FromI1 [OLEAUT32.213] */ HRESULT WINAPI VarR4FromI1(CHAR cIn, FLOAT* pfltOut) { @@ -2746,7 +2746,7 @@ HRESULT WINAPI VarR4FromI1(CHAR cIn, FLOAT* pfltOut) } /****************************************************************************** - * VarR4FromUI232 [OLEAUT32.214] + * VarR4FromUI2 [OLEAUT32.214] */ HRESULT WINAPI VarR4FromUI2(USHORT uiIn, FLOAT* pfltOut) { @@ -2758,7 +2758,7 @@ HRESULT WINAPI VarR4FromUI2(USHORT uiIn, FLOAT* pfltOut) } /****************************************************************************** - * VarR4FromUI432 [OLEAUT32.215] + * VarR4FromUI4 [OLEAUT32.215] */ HRESULT WINAPI VarR4FromUI4(ULONG ulIn, FLOAT* pfltOut) { @@ -2770,7 +2770,7 @@ HRESULT WINAPI VarR4FromUI4(ULONG ulIn, FLOAT* pfltOut) } /****************************************************************************** - * VarR4FromStr32 [OLEAUT32.74] + * VarR4FromStr [OLEAUT32.74] */ HRESULT WINAPI VarR4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, FLOAT* pfltOut) { @@ -2809,7 +2809,7 @@ HRESULT WINAPI VarR4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, FLOAT* pfl } /********************************************************************** - * VarR4FromCy32 [OLEAUT32.72] + * VarR4FromCy [OLEAUT32.72] * Convert currency to float */ HRESULT WINAPI VarR4FromCy(CY cyIn, FLOAT* pfltOut) { @@ -2819,7 +2819,7 @@ HRESULT WINAPI VarR4FromCy(CY cyIn, FLOAT* pfltOut) { } /****************************************************************************** - * VarR8FromUI132 [OLEAUT32.68] + * VarR8FromUI1 [OLEAUT32.68] */ HRESULT WINAPI VarR8FromUI1(BYTE bIn, double* pdblOut) { @@ -2831,7 +2831,7 @@ HRESULT WINAPI VarR8FromUI1(BYTE bIn, double* pdblOut) } /****************************************************************************** - * VarR8FromI232 [OLEAUT32.69] + * VarR8FromI2 [OLEAUT32.69] */ HRESULT WINAPI VarR8FromI2(short sIn, double* pdblOut) { @@ -2843,7 +2843,7 @@ HRESULT WINAPI VarR8FromI2(short sIn, double* pdblOut) } /****************************************************************************** - * VarR8FromI432 [OLEAUT32.70] + * VarR8FromI4 [OLEAUT32.70] */ HRESULT WINAPI VarR8FromI4(LONG lIn, double* pdblOut) { @@ -2855,7 +2855,7 @@ HRESULT WINAPI VarR8FromI4(LONG lIn, double* pdblOut) } /****************************************************************************** - * VarR8FromR432 [OLEAUT32.81] + * VarR8FromR4 [OLEAUT32.81] */ HRESULT WINAPI VarR8FromR4(FLOAT fltIn, double* pdblOut) { @@ -2867,7 +2867,7 @@ HRESULT WINAPI VarR8FromR4(FLOAT fltIn, double* pdblOut) } /****************************************************************************** - * VarR8FromDate32 [OLEAUT32.83] + * VarR8FromDate [OLEAUT32.83] */ HRESULT WINAPI VarR8FromDate(DATE dateIn, double* pdblOut) { @@ -2879,7 +2879,7 @@ HRESULT WINAPI VarR8FromDate(DATE dateIn, double* pdblOut) } /****************************************************************************** - * VarR8FromBool32 [OLEAUT32.86] + * VarR8FromBool [OLEAUT32.86] */ HRESULT WINAPI VarR8FromBool(VARIANT_BOOL boolIn, double* pdblOut) { @@ -2891,7 +2891,7 @@ HRESULT WINAPI VarR8FromBool(VARIANT_BOOL boolIn, double* pdblOut) } /****************************************************************************** - * VarR8FromI132 [OLEAUT32.217] + * VarR8FromI1 [OLEAUT32.217] */ HRESULT WINAPI VarR8FromI1(CHAR cIn, double* pdblOut) { @@ -2903,7 +2903,7 @@ HRESULT WINAPI VarR8FromI1(CHAR cIn, double* pdblOut) } /****************************************************************************** - * VarR8FromUI232 [OLEAUT32.218] + * VarR8FromUI2 [OLEAUT32.218] */ HRESULT WINAPI VarR8FromUI2(USHORT uiIn, double* pdblOut) { @@ -2915,7 +2915,7 @@ HRESULT WINAPI VarR8FromUI2(USHORT uiIn, double* pdblOut) } /****************************************************************************** - * VarR8FromUI432 [OLEAUT32.219] + * VarR8FromUI4 [OLEAUT32.219] */ HRESULT WINAPI VarR8FromUI4(ULONG ulIn, double* pdblOut) { @@ -2927,7 +2927,7 @@ HRESULT WINAPI VarR8FromUI4(ULONG ulIn, double* pdblOut) } /****************************************************************************** - * VarR8FromStr32 [OLEAUT32.84] + * VarR8FromStr [OLEAUT32.84] */ HRESULT WINAPI VarR8FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, double* pdblOut) { @@ -2959,7 +2959,7 @@ HRESULT WINAPI VarR8FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, double* pd } /********************************************************************** - * VarR8FromCy32 [OLEAUT32.82] + * VarR8FromCy [OLEAUT32.82] * Convert currency to double */ HRESULT WINAPI VarR8FromCy(CY cyIn, double* pdblOut) { @@ -2969,7 +2969,7 @@ HRESULT WINAPI VarR8FromCy(CY cyIn, double* pdblOut) { } /****************************************************************************** - * VarDateFromUI132 [OLEAUT32.] + * VarDateFromUI1 [OLEAUT32.] */ HRESULT WINAPI VarDateFromUI1(BYTE bIn, DATE* pdateOut) { @@ -2981,7 +2981,7 @@ HRESULT WINAPI VarDateFromUI1(BYTE bIn, DATE* pdateOut) } /****************************************************************************** - * VarDateFromI232 [OLEAUT32.222] + * VarDateFromI2 [OLEAUT32.222] */ HRESULT WINAPI VarDateFromI2(short sIn, DATE* pdateOut) { @@ -2993,7 +2993,7 @@ HRESULT WINAPI VarDateFromI2(short sIn, DATE* pdateOut) } /****************************************************************************** - * VarDateFromI432 [OLEAUT32.90] + * VarDateFromI4 [OLEAUT32.90] */ HRESULT WINAPI VarDateFromI4(LONG lIn, DATE* pdateOut) { @@ -3010,7 +3010,7 @@ HRESULT WINAPI VarDateFromI4(LONG lIn, DATE* pdateOut) } /****************************************************************************** - * VarDateFromR432 [OLEAUT32.91] + * VarDateFromR4 [OLEAUT32.91] */ HRESULT WINAPI VarDateFromR4(FLOAT fltIn, DATE* pdateOut) { @@ -3027,7 +3027,7 @@ HRESULT WINAPI VarDateFromR4(FLOAT fltIn, DATE* pdateOut) } /****************************************************************************** - * VarDateFromR832 [OLEAUT32.92] + * VarDateFromR8 [OLEAUT32.92] */ HRESULT WINAPI VarDateFromR8(double dblIn, DATE* pdateOut) { @@ -3044,7 +3044,7 @@ HRESULT WINAPI VarDateFromR8(double dblIn, DATE* pdateOut) } /****************************************************************************** - * VarDateFromStr32 [OLEAUT32.94] + * VarDateFromStr [OLEAUT32.94] * The string representing the date is composed of two parts, a date and time. * * The format of the time is has follows: @@ -3092,7 +3092,7 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd } /****************************************************************************** - * VarDateFromI132 [OLEAUT32.221] + * VarDateFromI1 [OLEAUT32.221] */ HRESULT WINAPI VarDateFromI1(CHAR cIn, DATE* pdateOut) { @@ -3104,7 +3104,7 @@ HRESULT WINAPI VarDateFromI1(CHAR cIn, DATE* pdateOut) } /****************************************************************************** - * VarDateFromUI232 [OLEAUT32.222] + * VarDateFromUI2 [OLEAUT32.222] */ HRESULT WINAPI VarDateFromUI2(USHORT uiIn, DATE* pdateOut) { @@ -3121,7 +3121,7 @@ HRESULT WINAPI VarDateFromUI2(USHORT uiIn, DATE* pdateOut) } /****************************************************************************** - * VarDateFromUI432 [OLEAUT32.223] + * VarDateFromUI4 [OLEAUT32.223] */ HRESULT WINAPI VarDateFromUI4(ULONG ulIn, DATE* pdateOut) { @@ -3138,7 +3138,7 @@ HRESULT WINAPI VarDateFromUI4(ULONG ulIn, DATE* pdateOut) } /****************************************************************************** - * VarDateFromBool32 [OLEAUT32.96] + * VarDateFromBool [OLEAUT32.96] */ HRESULT WINAPI VarDateFromBool(VARIANT_BOOL boolIn, DATE* pdateOut) { @@ -3150,7 +3150,7 @@ HRESULT WINAPI VarDateFromBool(VARIANT_BOOL boolIn, DATE* pdateOut) } /********************************************************************** - * VarDateFromCy32 [OLEAUT32.93] + * VarDateFromCy [OLEAUT32.93] * Convert currency to date */ HRESULT WINAPI VarDateFromCy(CY cyIn, DATE* pdateOut) { @@ -3161,7 +3161,7 @@ HRESULT WINAPI VarDateFromCy(CY cyIn, DATE* pdateOut) { } /****************************************************************************** - * VarBstrFromUI132 [OLEAUT32.108] + * VarBstrFromUI1 [OLEAUT32.108] */ HRESULT WINAPI VarBstrFromUI1(BYTE bVal, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { @@ -3174,7 +3174,7 @@ HRESULT WINAPI VarBstrFromUI1(BYTE bVal, LCID lcid, ULONG dwFlags, BSTR* pbstrOu } /****************************************************************************** - * VarBstrFromI232 [OLEAUT32.109] + * VarBstrFromI2 [OLEAUT32.109] */ HRESULT WINAPI VarBstrFromI2(short iVal, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { @@ -3186,7 +3186,7 @@ HRESULT WINAPI VarBstrFromI2(short iVal, LCID lcid, ULONG dwFlags, BSTR* pbstrOu } /****************************************************************************** - * VarBstrFromI432 [OLEAUT32.110] + * VarBstrFromI4 [OLEAUT32.110] */ HRESULT WINAPI VarBstrFromI4(LONG lIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { @@ -3199,7 +3199,7 @@ HRESULT WINAPI VarBstrFromI4(LONG lIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) } /****************************************************************************** - * VarBstrFromR432 [OLEAUT32.111] + * VarBstrFromR4 [OLEAUT32.111] */ HRESULT WINAPI VarBstrFromR4(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { @@ -3212,7 +3212,7 @@ HRESULT WINAPI VarBstrFromR4(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR* pbstrO } /****************************************************************************** - * VarBstrFromR832 [OLEAUT32.112] + * VarBstrFromR8 [OLEAUT32.112] */ HRESULT WINAPI VarBstrFromR8(double dblIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { @@ -3234,7 +3234,7 @@ HRESULT WINAPI VarBstrFromCy(CY cyIn, LCID lcid, ULONG dwFlags, BSTR *pbstrOut) /****************************************************************************** - * VarBstrFromDate32 [OLEAUT32.114] + * VarBstrFromDate [OLEAUT32.114] * * The date is implemented using an 8 byte floating-point number. * Days are represented by whole numbers increments starting with 0.00 has @@ -3286,7 +3286,7 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst } /****************************************************************************** - * VarBstrFromBool32 [OLEAUT32.116] + * VarBstrFromBool [OLEAUT32.116] */ HRESULT WINAPI VarBstrFromBool(VARIANT_BOOL boolIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { @@ -3307,7 +3307,7 @@ HRESULT WINAPI VarBstrFromBool(VARIANT_BOOL boolIn, LCID lcid, ULONG dwFlags, BS } /****************************************************************************** - * VarBstrFromI132 [OLEAUT32.229] + * VarBstrFromI1 [OLEAUT32.229] */ HRESULT WINAPI VarBstrFromI1(CHAR cIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { @@ -3319,7 +3319,7 @@ HRESULT WINAPI VarBstrFromI1(CHAR cIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) } /****************************************************************************** - * VarBstrFromUI232 [OLEAUT32.230] + * VarBstrFromUI2 [OLEAUT32.230] */ HRESULT WINAPI VarBstrFromUI2(USHORT uiIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { @@ -3331,7 +3331,7 @@ HRESULT WINAPI VarBstrFromUI2(USHORT uiIn, LCID lcid, ULONG dwFlags, BSTR* pbstr } /****************************************************************************** - * VarBstrFromUI432 [OLEAUT32.231] + * VarBstrFromUI4 [OLEAUT32.231] */ HRESULT WINAPI VarBstrFromUI4(ULONG ulIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { @@ -3343,7 +3343,7 @@ HRESULT WINAPI VarBstrFromUI4(ULONG ulIn, LCID lcid, ULONG dwFlags, BSTR* pbstrO } /****************************************************************************** - * VarBoolFromUI132 [OLEAUT32.118] + * VarBoolFromUI1 [OLEAUT32.118] */ HRESULT WINAPI VarBoolFromUI1(BYTE bIn, VARIANT_BOOL* pboolOut) { @@ -3362,7 +3362,7 @@ HRESULT WINAPI VarBoolFromUI1(BYTE bIn, VARIANT_BOOL* pboolOut) } /****************************************************************************** - * VarBoolFromI232 [OLEAUT32.119] + * VarBoolFromI2 [OLEAUT32.119] */ HRESULT WINAPI VarBoolFromI2(short sIn, VARIANT_BOOL* pboolOut) { @@ -3381,7 +3381,7 @@ HRESULT WINAPI VarBoolFromI2(short sIn, VARIANT_BOOL* pboolOut) } /****************************************************************************** - * VarBoolFromI432 [OLEAUT32.120] + * VarBoolFromI4 [OLEAUT32.120] */ HRESULT WINAPI VarBoolFromI4(LONG lIn, VARIANT_BOOL* pboolOut) { @@ -3400,7 +3400,7 @@ HRESULT WINAPI VarBoolFromI4(LONG lIn, VARIANT_BOOL* pboolOut) } /****************************************************************************** - * VarBoolFromR432 [OLEAUT32.121] + * VarBoolFromR4 [OLEAUT32.121] */ HRESULT WINAPI VarBoolFromR4(FLOAT fltIn, VARIANT_BOOL* pboolOut) { @@ -3419,7 +3419,7 @@ HRESULT WINAPI VarBoolFromR4(FLOAT fltIn, VARIANT_BOOL* pboolOut) } /****************************************************************************** - * VarBoolFromR832 [OLEAUT32.122] + * VarBoolFromR8 [OLEAUT32.122] */ HRESULT WINAPI VarBoolFromR8(double dblIn, VARIANT_BOOL* pboolOut) { @@ -3438,7 +3438,7 @@ HRESULT WINAPI VarBoolFromR8(double dblIn, VARIANT_BOOL* pboolOut) } /****************************************************************************** - * VarBoolFromDate32 [OLEAUT32.123] + * VarBoolFromDate [OLEAUT32.123] */ HRESULT WINAPI VarBoolFromDate(DATE dateIn, VARIANT_BOOL* pboolOut) { @@ -3457,7 +3457,7 @@ HRESULT WINAPI VarBoolFromDate(DATE dateIn, VARIANT_BOOL* pboolOut) } /****************************************************************************** - * VarBoolFromStr32 [OLEAUT32.125] + * VarBoolFromStr [OLEAUT32.125] */ HRESULT WINAPI VarBoolFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, VARIANT_BOOL* pboolOut) { @@ -3510,7 +3510,7 @@ HRESULT WINAPI VarBoolFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, VARIANT_ } /****************************************************************************** - * VarBoolFromI132 [OLEAUT32.233] + * VarBoolFromI1 [OLEAUT32.233] */ HRESULT WINAPI VarBoolFromI1(CHAR cIn, VARIANT_BOOL* pboolOut) { @@ -3529,7 +3529,7 @@ HRESULT WINAPI VarBoolFromI1(CHAR cIn, VARIANT_BOOL* pboolOut) } /****************************************************************************** - * VarBoolFromUI232 [OLEAUT32.234] + * VarBoolFromUI2 [OLEAUT32.234] */ HRESULT WINAPI VarBoolFromUI2(USHORT uiIn, VARIANT_BOOL* pboolOut) { @@ -3548,7 +3548,7 @@ HRESULT WINAPI VarBoolFromUI2(USHORT uiIn, VARIANT_BOOL* pboolOut) } /****************************************************************************** - * VarBoolFromUI432 [OLEAUT32.235] + * VarBoolFromUI4 [OLEAUT32.235] */ HRESULT WINAPI VarBoolFromUI4(ULONG ulIn, VARIANT_BOOL* pboolOut) { @@ -3567,7 +3567,7 @@ HRESULT WINAPI VarBoolFromUI4(ULONG ulIn, VARIANT_BOOL* pboolOut) } /********************************************************************** - * VarBoolFromCy32 [OLEAUT32.124] + * VarBoolFromCy [OLEAUT32.124] * Convert currency to boolean */ HRESULT WINAPI VarBoolFromCy(CY cyIn, VARIANT_BOOL* pboolOut) { @@ -3578,7 +3578,7 @@ HRESULT WINAPI VarBoolFromCy(CY cyIn, VARIANT_BOOL* pboolOut) { } /****************************************************************************** - * VarI1FromUI132 [OLEAUT32.244] + * VarI1FromUI1 [OLEAUT32.244] */ HRESULT WINAPI VarI1FromUI1(BYTE bIn, CHAR* pcOut) { @@ -3597,7 +3597,7 @@ HRESULT WINAPI VarI1FromUI1(BYTE bIn, CHAR* pcOut) } /****************************************************************************** - * VarI1FromI232 [OLEAUT32.245] + * VarI1FromI2 [OLEAUT32.245] */ HRESULT WINAPI VarI1FromI2(short uiIn, CHAR* pcOut) { @@ -3614,7 +3614,7 @@ HRESULT WINAPI VarI1FromI2(short uiIn, CHAR* pcOut) } /****************************************************************************** - * VarI1FromI432 [OLEAUT32.246] + * VarI1FromI4 [OLEAUT32.246] */ HRESULT WINAPI VarI1FromI4(LONG lIn, CHAR* pcOut) { @@ -3631,7 +3631,7 @@ HRESULT WINAPI VarI1FromI4(LONG lIn, CHAR* pcOut) } /****************************************************************************** - * VarI1FromR432 [OLEAUT32.247] + * VarI1FromR4 [OLEAUT32.247] */ HRESULT WINAPI VarI1FromR4(FLOAT fltIn, CHAR* pcOut) { @@ -3649,7 +3649,7 @@ HRESULT WINAPI VarI1FromR4(FLOAT fltIn, CHAR* pcOut) } /****************************************************************************** - * VarI1FromR832 [OLEAUT32.248] + * VarI1FromR8 [OLEAUT32.248] */ HRESULT WINAPI VarI1FromR8(double dblIn, CHAR* pcOut) { @@ -3667,7 +3667,7 @@ HRESULT WINAPI VarI1FromR8(double dblIn, CHAR* pcOut) } /****************************************************************************** - * VarI1FromDate32 [OLEAUT32.249] + * VarI1FromDate [OLEAUT32.249] */ HRESULT WINAPI VarI1FromDate(DATE dateIn, CHAR* pcOut) { @@ -3685,7 +3685,7 @@ HRESULT WINAPI VarI1FromDate(DATE dateIn, CHAR* pcOut) } /****************************************************************************** - * VarI1FromStr32 [OLEAUT32.251] + * VarI1FromStr [OLEAUT32.251] */ HRESULT WINAPI VarI1FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, CHAR* pcOut) { @@ -3725,7 +3725,7 @@ HRESULT WINAPI VarI1FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, CHAR* pcOu } /****************************************************************************** - * VarI1FromBool32 [OLEAUT32.253] + * VarI1FromBool [OLEAUT32.253] */ HRESULT WINAPI VarI1FromBool(VARIANT_BOOL boolIn, CHAR* pcOut) { @@ -3737,7 +3737,7 @@ HRESULT WINAPI VarI1FromBool(VARIANT_BOOL boolIn, CHAR* pcOut) } /****************************************************************************** - * VarI1FromUI232 [OLEAUT32.254] + * VarI1FromUI2 [OLEAUT32.254] */ HRESULT WINAPI VarI1FromUI2(USHORT uiIn, CHAR* pcOut) { @@ -3754,7 +3754,7 @@ HRESULT WINAPI VarI1FromUI2(USHORT uiIn, CHAR* pcOut) } /****************************************************************************** - * VarI1FromUI432 [OLEAUT32.255] + * VarI1FromUI4 [OLEAUT32.255] */ HRESULT WINAPI VarI1FromUI4(ULONG ulIn, CHAR* pcOut) { @@ -3771,7 +3771,7 @@ HRESULT WINAPI VarI1FromUI4(ULONG ulIn, CHAR* pcOut) } /********************************************************************** - * VarI1FromCy32 [OLEAUT32.250] + * VarI1FromCy [OLEAUT32.250] * Convert currency to signed char */ HRESULT WINAPI VarI1FromCy(CY cyIn, CHAR* pcOut) { @@ -3784,7 +3784,7 @@ HRESULT WINAPI VarI1FromCy(CY cyIn, CHAR* pcOut) { } /****************************************************************************** - * VarUI2FromUI132 [OLEAUT32.257] + * VarUI2FromUI1 [OLEAUT32.257] */ HRESULT WINAPI VarUI2FromUI1(BYTE bIn, USHORT* puiOut) { @@ -3796,7 +3796,7 @@ HRESULT WINAPI VarUI2FromUI1(BYTE bIn, USHORT* puiOut) } /****************************************************************************** - * VarUI2FromI232 [OLEAUT32.258] + * VarUI2FromI2 [OLEAUT32.258] */ HRESULT WINAPI VarUI2FromI2(short uiIn, USHORT* puiOut) { @@ -3813,7 +3813,7 @@ HRESULT WINAPI VarUI2FromI2(short uiIn, USHORT* puiOut) } /****************************************************************************** - * VarUI2FromI432 [OLEAUT32.259] + * VarUI2FromI4 [OLEAUT32.259] */ HRESULT WINAPI VarUI2FromI4(LONG lIn, USHORT* puiOut) { @@ -3830,7 +3830,7 @@ HRESULT WINAPI VarUI2FromI4(LONG lIn, USHORT* puiOut) } /****************************************************************************** - * VarUI2FromR432 [OLEAUT32.260] + * VarUI2FromR4 [OLEAUT32.260] */ HRESULT WINAPI VarUI2FromR4(FLOAT fltIn, USHORT* puiOut) { @@ -3848,7 +3848,7 @@ HRESULT WINAPI VarUI2FromR4(FLOAT fltIn, USHORT* puiOut) } /****************************************************************************** - * VarUI2FromR832 [OLEAUT32.261] + * VarUI2FromR8 [OLEAUT32.261] */ HRESULT WINAPI VarUI2FromR8(double dblIn, USHORT* puiOut) { @@ -3866,7 +3866,7 @@ HRESULT WINAPI VarUI2FromR8(double dblIn, USHORT* puiOut) } /****************************************************************************** - * VarUI2FromDate32 [OLEAUT32.262] + * VarUI2FromDate [OLEAUT32.262] */ HRESULT WINAPI VarUI2FromDate(DATE dateIn, USHORT* puiOut) { @@ -3884,7 +3884,7 @@ HRESULT WINAPI VarUI2FromDate(DATE dateIn, USHORT* puiOut) } /****************************************************************************** - * VarUI2FromStr32 [OLEAUT32.264] + * VarUI2FromStr [OLEAUT32.264] */ HRESULT WINAPI VarUI2FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, USHORT* puiOut) { @@ -3924,7 +3924,7 @@ HRESULT WINAPI VarUI2FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, USHORT* p } /****************************************************************************** - * VarUI2FromBool32 [OLEAUT32.266] + * VarUI2FromBool [OLEAUT32.266] */ HRESULT WINAPI VarUI2FromBool(VARIANT_BOOL boolIn, USHORT* puiOut) { @@ -3936,7 +3936,7 @@ HRESULT WINAPI VarUI2FromBool(VARIANT_BOOL boolIn, USHORT* puiOut) } /****************************************************************************** - * VarUI2FromI132 [OLEAUT32.267] + * VarUI2FromI1 [OLEAUT32.267] */ HRESULT WINAPI VarUI2FromI1(CHAR cIn, USHORT* puiOut) { @@ -3948,7 +3948,7 @@ HRESULT WINAPI VarUI2FromI1(CHAR cIn, USHORT* puiOut) } /****************************************************************************** - * VarUI2FromUI432 [OLEAUT32.268] + * VarUI2FromUI4 [OLEAUT32.268] */ HRESULT WINAPI VarUI2FromUI4(ULONG ulIn, USHORT* puiOut) { @@ -3965,7 +3965,7 @@ HRESULT WINAPI VarUI2FromUI4(ULONG ulIn, USHORT* puiOut) } /****************************************************************************** - * VarUI4FromStr32 [OLEAUT32.277] + * VarUI4FromStr [OLEAUT32.277] */ HRESULT WINAPI VarUI4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, ULONG* pulOut) { @@ -4005,7 +4005,7 @@ HRESULT WINAPI VarUI4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, ULONG* pu } /********************************************************************** - * VarUI2FromCy32 [OLEAUT32.263] + * VarUI2FromCy [OLEAUT32.263] * Convert currency to unsigned short */ HRESULT WINAPI VarUI2FromCy(CY cyIn, USHORT* pusOut) { @@ -4019,7 +4019,7 @@ HRESULT WINAPI VarUI2FromCy(CY cyIn, USHORT* pusOut) { } /****************************************************************************** - * VarUI4FromUI132 [OLEAUT32.270] + * VarUI4FromUI1 [OLEAUT32.270] */ HRESULT WINAPI VarUI4FromUI1(BYTE bIn, ULONG* pulOut) { @@ -4031,7 +4031,7 @@ HRESULT WINAPI VarUI4FromUI1(BYTE bIn, ULONG* pulOut) } /****************************************************************************** - * VarUI4FromI232 [OLEAUT32.271] + * VarUI4FromI2 [OLEAUT32.271] */ HRESULT WINAPI VarUI4FromI2(short uiIn, ULONG* pulOut) { @@ -4048,7 +4048,7 @@ HRESULT WINAPI VarUI4FromI2(short uiIn, ULONG* pulOut) } /****************************************************************************** - * VarUI4FromI432 [OLEAUT32.272] + * VarUI4FromI4 [OLEAUT32.272] */ HRESULT WINAPI VarUI4FromI4(LONG lIn, ULONG* pulOut) { @@ -4065,7 +4065,7 @@ HRESULT WINAPI VarUI4FromI4(LONG lIn, ULONG* pulOut) } /****************************************************************************** - * VarUI4FromR432 [OLEAUT32.273] + * VarUI4FromR4 [OLEAUT32.273] */ HRESULT WINAPI VarUI4FromR4(FLOAT fltIn, ULONG* pulOut) { @@ -4081,7 +4081,7 @@ HRESULT WINAPI VarUI4FromR4(FLOAT fltIn, ULONG* pulOut) } /****************************************************************************** - * VarUI4FromR832 [OLEAUT32.274] + * VarUI4FromR8 [OLEAUT32.274] */ HRESULT WINAPI VarUI4FromR8(double dblIn, ULONG* pulOut) { @@ -4099,7 +4099,7 @@ HRESULT WINAPI VarUI4FromR8(double dblIn, ULONG* pulOut) } /****************************************************************************** - * VarUI4FromDate32 [OLEAUT32.275] + * VarUI4FromDate [OLEAUT32.275] */ HRESULT WINAPI VarUI4FromDate(DATE dateIn, ULONG* pulOut) { @@ -4117,7 +4117,7 @@ HRESULT WINAPI VarUI4FromDate(DATE dateIn, ULONG* pulOut) } /****************************************************************************** - * VarUI4FromBool32 [OLEAUT32.279] + * VarUI4FromBool [OLEAUT32.279] */ HRESULT WINAPI VarUI4FromBool(VARIANT_BOOL boolIn, ULONG* pulOut) { @@ -4129,7 +4129,7 @@ HRESULT WINAPI VarUI4FromBool(VARIANT_BOOL boolIn, ULONG* pulOut) } /****************************************************************************** - * VarUI4FromI132 [OLEAUT32.280] + * VarUI4FromI1 [OLEAUT32.280] */ HRESULT WINAPI VarUI4FromI1(CHAR cIn, ULONG* pulOut) { @@ -4141,7 +4141,7 @@ HRESULT WINAPI VarUI4FromI1(CHAR cIn, ULONG* pulOut) } /****************************************************************************** - * VarUI4FromUI232 [OLEAUT32.281] + * VarUI4FromUI2 [OLEAUT32.281] */ HRESULT WINAPI VarUI4FromUI2(USHORT uiIn, ULONG* pulOut) { @@ -4153,7 +4153,7 @@ HRESULT WINAPI VarUI4FromUI2(USHORT uiIn, ULONG* pulOut) } /********************************************************************** - * VarUI4FromCy32 [OLEAUT32.276] + * VarUI4FromCy [OLEAUT32.276] * Convert currency to unsigned long */ HRESULT WINAPI VarUI4FromCy(CY cyIn, ULONG* pulOut) { @@ -4167,7 +4167,7 @@ HRESULT WINAPI VarUI4FromCy(CY cyIn, ULONG* pulOut) { } /********************************************************************** - * VarCyFromUI132 [OLEAUT32.98] + * VarCyFromUI1 [OLEAUT32.98] * Convert unsigned char to currency */ HRESULT WINAPI VarCyFromUI1(BYTE bIn, CY* pcyOut) { @@ -4178,7 +4178,7 @@ HRESULT WINAPI VarCyFromUI1(BYTE bIn, CY* pcyOut) { } /********************************************************************** - * VarCyFromI232 [OLEAUT32.99] + * VarCyFromI2 [OLEAUT32.99] * Convert signed short to currency */ HRESULT WINAPI VarCyFromI2(short sIn, CY* pcyOut) { @@ -4190,7 +4190,7 @@ HRESULT WINAPI VarCyFromI2(short sIn, CY* pcyOut) { } /********************************************************************** - * VarCyFromI432 [OLEAUT32.100] + * VarCyFromI4 [OLEAUT32.100] * Convert signed long to currency */ HRESULT WINAPI VarCyFromI4(LONG lIn, CY* pcyOut) { @@ -4203,7 +4203,7 @@ HRESULT WINAPI VarCyFromI4(LONG lIn, CY* pcyOut) { } /********************************************************************** - * VarCyFromR432 [OLEAUT32.101] + * VarCyFromR4 [OLEAUT32.101] * Convert float to currency */ HRESULT WINAPI VarCyFromR4(FLOAT fltIn, CY* pcyOut) { @@ -4216,7 +4216,7 @@ HRESULT WINAPI VarCyFromR4(FLOAT fltIn, CY* pcyOut) { } /********************************************************************** - * VarCyFromR832 [OLEAUT32.102] + * VarCyFromR8 [OLEAUT32.102] * Convert double to currency */ HRESULT WINAPI VarCyFromR8(double dblIn, CY* pcyOut) { @@ -4229,7 +4229,7 @@ HRESULT WINAPI VarCyFromR8(double dblIn, CY* pcyOut) { } /********************************************************************** - * VarCyFromDate32 [OLEAUT32.103] + * VarCyFromDate [OLEAUT32.103] * Convert date to currency */ HRESULT WINAPI VarCyFromDate(DATE dateIn, CY* pcyOut) { @@ -4251,7 +4251,7 @@ HRESULT WINAPI VarCyFromStr(OLECHAR *strIn, LCID lcid, ULONG dwFlags, CY *pcyOut /********************************************************************** - * VarCyFromBool32 [OLEAUT32.106] + * VarCyFromBool [OLEAUT32.106] * Convert boolean to currency */ HRESULT WINAPI VarCyFromBool(VARIANT_BOOL boolIn, CY* pcyOut) { @@ -4263,7 +4263,7 @@ HRESULT WINAPI VarCyFromBool(VARIANT_BOOL boolIn, CY* pcyOut) { } /********************************************************************** - * VarCyFromI132 [OLEAUT32.225] + * VarCyFromI1 [OLEAUT32.225] * Convert signed char to currency */ HRESULT WINAPI VarCyFromI1(CHAR cIn, CY* pcyOut) { @@ -4275,7 +4275,7 @@ HRESULT WINAPI VarCyFromI1(CHAR cIn, CY* pcyOut) { } /********************************************************************** - * VarCyFromUI232 [OLEAUT32.226] + * VarCyFromUI2 [OLEAUT32.226] * Convert unsigned short to currency */ HRESULT WINAPI VarCyFromUI2(USHORT usIn, CY* pcyOut) { @@ -4286,7 +4286,7 @@ HRESULT WINAPI VarCyFromUI2(USHORT usIn, CY* pcyOut) { } /********************************************************************** - * VarCyFromUI432 [OLEAUT32.227] + * VarCyFromUI4 [OLEAUT32.227] * Convert unsigned long to currency */ HRESULT WINAPI VarCyFromUI4(ULONG ulIn, CY* pcyOut) { diff --git a/dlls/olecli/olecli_main.c b/dlls/olecli/olecli_main.c index 6009a1cbedd..a21f887f20a 100644 --- a/dlls/olecli/olecli_main.c +++ b/dlls/olecli/olecli_main.c @@ -30,7 +30,7 @@ OLESTATUS WINAPI OleRegisterClientDoc16(LPCSTR classname, LPCSTR docname, } /****************************************************************************** - * OleRegisterClientDoc32 [OLECLI32.41] + * OleRegisterClientDoc [OLECLI32.41] */ OLESTATUS WINAPI OleRegisterClientDoc(LPCSTR classname, LPCSTR docname, LONG reserved, LHCLIENTDOC *hRet ) @@ -50,7 +50,7 @@ OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC hDoc, LPCSTR newName) } /****************************************************************************** - * OleRenameClientDoc32 [OLECLI32.43] + * OleRenameClientDoc [OLECLI32.43] */ OLESTATUS WINAPI OleRenameClientDoc(LHCLIENTDOC hDoc, LPCSTR newName) { @@ -68,7 +68,7 @@ OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC hServerDoc) } /****************************************************************************** - * OleRevokeClientDoc32 [OLECLI32.42] + * OleRevokeClientDoc [OLECLI32.42] */ OLESTATUS WINAPI OleRevokeClientDoc(LHCLIENTDOC hServerDoc) { @@ -110,7 +110,7 @@ OLESTATUS WINAPI OleCreateLinkFromClip16( } /****************************************************************************** - * OleCreateLinkFromClip32 [OLECLI32.11] + * OleCreateLinkFromClip [OLECLI32.11] */ OLESTATUS WINAPI OleCreateLinkFromClip( LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname, @@ -131,7 +131,7 @@ OLESTATUS WINAPI OleQueryLinkFromClip16(LPCSTR name, UINT16 render, UINT16 clipf } /****************************************************************************** - * OleQueryLinkFromClip32 [OLECLI32.9] + * OleQueryLinkFromClip [OLECLI32.9] */ OLESTATUS WINAPI OleQueryLinkFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) { FIXME("(%s,%d,%ld): stub!\n",name,render,clipformat); @@ -148,7 +148,7 @@ OLESTATUS WINAPI OleQueryCreateFromClip16(LPCSTR name, UINT16 render, UINT16 cli } /****************************************************************************** - * OleQueryCreateFromClip32 [OLECLI32.10] + * OleQueryCreateFromClip [OLECLI32.10] */ OLESTATUS WINAPI OleQueryCreateFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) { FIXME("(%s,%d,%ld): stub!\n",name,render,clipformat); @@ -170,7 +170,7 @@ BOOL16 WINAPI OleIsDcMeta16(HDC16 hdc) /****************************************************************************** - * OleIsDcMeta32 [OLECLI32.60] + * OleIsDcMeta [OLECLI32.60] */ BOOL WINAPI OleIsDcMeta(HDC hdc) { @@ -184,7 +184,7 @@ BOOL WINAPI OleIsDcMeta(HDC hdc) /****************************************************************************** - * OleSetHostNames32 [OLECLI32.15] + * OleSetHostNames [OLECLI32.15] */ OLESTATUS WINAPI OleSetHostNames(LPOLEOBJECT oleob,LPCSTR name1,LPCSTR name2) { FIXME("(%p,%s,%s): stub\n",oleob,name1,name2); @@ -201,7 +201,7 @@ OLESTATUS WINAPI OleQueryType16(LPOLEOBJECT oleob, SEGPTR xlong) { } /****************************************************************************** - * OleQueryType32 [OLECLI32.14] + * OleQueryType [OLECLI32.14] */ OLESTATUS WINAPI OleQueryType(LPOLEOBJECT oleob,LONG*xlong) { FIXME("(%p,%p): stub!\n",oleob,xlong); @@ -227,7 +227,7 @@ OLESTATUS WINAPI OleCreateFromClip16( } /****************************************************************************** - * OleCreateFromClip32 [OLECLI32.12] + * OleCreateFromClip [OLECLI32.12] */ OLESTATUS WINAPI OleCreateFromClip( LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname, diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index fee1b0a9cb3..e9e4e21a942 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -13,7 +13,7 @@ DEFAULT_DEBUG_CHANNEL(ole) /*********************************************************************** - * OleUIAddVerbMenu32A (OLEDLG.1) + * OleUIAddVerbMenuA (OLEDLG.1) */ BOOL WINAPI OleUIAddVerbMenuA( LPOLEOBJECT lpOleObj, LPCSTR lpszShortType, @@ -30,7 +30,7 @@ BOOL WINAPI OleUIAddVerbMenuA( } /*********************************************************************** - * OleUIAddVerbMenu32W (OLEDLG.14) + * OleUIAddVerbMenuW (OLEDLG.14) */ BOOL WINAPI OleUIAddVerbMenuW( LPOLEOBJECT lpOleObj, LPCWSTR lpszShortType, @@ -47,7 +47,7 @@ BOOL WINAPI OleUIAddVerbMenuW( } /*********************************************************************** - * OleUICanConvertOrActivateAs32 (OLEDLG.2) + * OleUICanConvertOrActivateAs (OLEDLG.2) */ BOOL WINAPI OleUICanConvertOrActivateAs( REFCLSID rClsid, BOOL fIsLinkedObject, WORD wFormat) @@ -60,7 +60,7 @@ BOOL WINAPI OleUICanConvertOrActivateAs( } /*********************************************************************** - * OleUIInsertObject32A (OLEDLG.3) + * OleUIInsertObjectA (OLEDLG.3) */ UINT WINAPI OleUIInsertObjectA(LPOLEUIINSERTOBJECTA lpOleUIInsertObject) { @@ -70,7 +70,7 @@ UINT WINAPI OleUIInsertObjectA(LPOLEUIINSERTOBJECTA lpOleUIInsertObject) } /*********************************************************************** - * OleUIInsertObject32W (OLEDLG.20) + * OleUIInsertObjectW (OLEDLG.20) */ UINT WINAPI OleUIInsertObjectW(LPOLEUIINSERTOBJECTW lpOleUIInsertObject) { @@ -80,7 +80,7 @@ UINT WINAPI OleUIInsertObjectW(LPOLEUIINSERTOBJECTW lpOleUIInsertObject) } /*********************************************************************** - * OleUIPasteSpecial32A (OLEDLG.4) + * OleUIPasteSpecialA (OLEDLG.4) */ UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA lpOleUIPasteSpecial) { @@ -90,7 +90,7 @@ UINT WINAPI OleUIPasteSpecialA(LPOLEUIPASTESPECIALA lpOleUIPasteSpecial) } /*********************************************************************** - * OleUIPasteSpecial32W (OLEDLG.22) + * OleUIPasteSpecialW (OLEDLG.22) */ UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW lpOleUIPasteSpecial) { @@ -100,7 +100,7 @@ UINT WINAPI OleUIPasteSpecialW(LPOLEUIPASTESPECIALW lpOleUIPasteSpecial) } /*********************************************************************** - * OleUIEditLinks32A (OLEDLG.5) + * OleUIEditLinksA (OLEDLG.5) */ UINT WINAPI OleUIEditLinksA(LPOLEUIEDITLINKSA lpOleUIEditLinks) { @@ -110,7 +110,7 @@ UINT WINAPI OleUIEditLinksA(LPOLEUIEDITLINKSA lpOleUIEditLinks) } /*********************************************************************** - * OleUIEditLinks32W (OLEDLG.19) + * OleUIEditLinksW (OLEDLG.19) */ UINT WINAPI OleUIEditLinksW(LPOLEUIEDITLINKSW lpOleUIEditLinks) { @@ -120,7 +120,7 @@ UINT WINAPI OleUIEditLinksW(LPOLEUIEDITLINKSW lpOleUIEditLinks) } /*********************************************************************** - * OleUIChangeIcon32A (OLEDLG.6) + * OleUIChangeIconA (OLEDLG.6) */ UINT WINAPI OleUIChangeIconA( LPOLEUICHANGEICONA lpOleUIChangeIcon) @@ -131,7 +131,7 @@ UINT WINAPI OleUIChangeIconA( } /*********************************************************************** - * OleUIChangeIcon32W (OLEDLG.16) + * OleUIChangeIconW (OLEDLG.16) */ UINT WINAPI OleUIChangeIconW( LPOLEUICHANGEICONW lpOleUIChangeIcon) @@ -142,7 +142,7 @@ UINT WINAPI OleUIChangeIconW( } /*********************************************************************** - * OleUIConvert32A (OLEDLG.7) + * OleUIConvertA (OLEDLG.7) */ UINT WINAPI OleUIConvertA(LPOLEUICONVERTA lpOleUIConvert) { @@ -152,7 +152,7 @@ UINT WINAPI OleUIConvertA(LPOLEUICONVERTA lpOleUIConvert) } /*********************************************************************** - * OleUIConvert32W (OLEDLG.18) + * OleUIConvertW (OLEDLG.18) */ UINT WINAPI OleUIConvertW(LPOLEUICONVERTW lpOleUIConvert) { @@ -162,7 +162,7 @@ UINT WINAPI OleUIConvertW(LPOLEUICONVERTW lpOleUIConvert) } /*********************************************************************** - * OleUIBusy32A (OLEDLG.8) + * OleUIBusyA (OLEDLG.8) */ UINT WINAPI OleUIBusyA(LPOLEUIBUSYA lpOleUIBusy) { @@ -172,7 +172,7 @@ UINT WINAPI OleUIBusyA(LPOLEUIBUSYA lpOleUIBusy) } /*********************************************************************** - * OleUIBusy32W (OLEDLG.15) + * OleUIBusyW (OLEDLG.15) */ UINT WINAPI OleUIBusyW(LPOLEUIBUSYW lpOleUIBusy) { @@ -182,7 +182,7 @@ UINT WINAPI OleUIBusyW(LPOLEUIBUSYW lpOleUIBusy) } /*********************************************************************** - * OleUIUpdateLinks32A (OLEDLG.9) + * OleUIUpdateLinksA (OLEDLG.9) */ BOOL WINAPI OleUIUpdateLinksA( LPOLEUILINKCONTAINERA lpOleUILinkCntr, @@ -196,7 +196,7 @@ BOOL WINAPI OleUIUpdateLinksA( } /*********************************************************************** - * OleUIUpdateLinks32W (OLEDLG.?) + * OleUIUpdateLinksW (OLEDLG.?) * FIXME * I haven't been able to find the ordinal for this function, * This means it can't be called from outside the DLL. @@ -213,7 +213,7 @@ BOOL WINAPI OleUIUpdateLinksW( } /*********************************************************************** - * OleUIPromptUser32A (OLEDLG.10) + * OleUIPromptUserA (OLEDLG.10) */ INT __cdecl OleUIPromptUserA( INT nTemplate, HWND hwndParent, ...) @@ -224,7 +224,7 @@ INT __cdecl OleUIPromptUserA( } /*********************************************************************** - * OleUIPromptUser32W (OLEDLG.13) + * OleUIPromptUserW (OLEDLG.13) */ INT __cdecl OleUIPromptUserW( INT nTemplate, HWND hwndParent, ...) @@ -235,7 +235,7 @@ INT __cdecl OleUIPromptUserW( } /*********************************************************************** - * OleUIObjectProperties32A (OLEDLG.11) + * OleUIObjectPropertiesA (OLEDLG.11) */ UINT WINAPI OleUIObjectPropertiesA( LPOLEUIOBJECTPROPSA lpOleUIObjectProps) @@ -246,7 +246,7 @@ UINT WINAPI OleUIObjectPropertiesA( } /*********************************************************************** - * OleUIObjectProperties32W (OLEDLG.21) + * OleUIObjectPropertiesW (OLEDLG.21) */ UINT WINAPI OleUIObjectPropertiesW( LPOLEUIOBJECTPROPSW lpOleUIObjectProps) @@ -257,7 +257,7 @@ UINT WINAPI OleUIObjectPropertiesW( } /*********************************************************************** - * OleUIChangeSource32A (OLEDLG.12) + * OleUIChangeSourceA (OLEDLG.12) */ UINT WINAPI OleUIChangeSourceA( LPOLEUICHANGESOURCEA lpOleUIChangeSource) @@ -268,7 +268,7 @@ UINT WINAPI OleUIChangeSourceA( } /*********************************************************************** - * OleUIChangeSource32W (OLEDLG.17) + * OleUIChangeSourceW (OLEDLG.17) */ UINT WINAPI OleUIChangeSourceW( LPOLEUICHANGESOURCEW lpOleUIChangeSource) diff --git a/dlls/olesvr/olesvr_main.c b/dlls/olesvr/olesvr_main.c index 6fa30a7aacb..77fc096cac4 100644 --- a/dlls/olesvr/olesvr_main.c +++ b/dlls/olesvr/olesvr_main.c @@ -40,7 +40,7 @@ OLESTATUS WINAPI OleBlockServer16(LHSERVER hServer) } /****************************************************************************** - * OleBlockServer32 [OLESVR32.4] + * OleBlockServer [OLESVR32.4] */ OLESTATUS WINAPI OleBlockServer(LHSERVER hServer) { @@ -60,7 +60,7 @@ OLESTATUS WINAPI OleUnblockServer16(LHSERVER hServer, BOOL16 *block) } /****************************************************************************** - * OleUnblockServer32 [OLESVR32.5] + * OleUnblockServer [OLESVR32.5] */ OLESTATUS WINAPI OleUnblockServer(LHSERVER hServer, BOOL *block) { @@ -92,7 +92,7 @@ OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC hServerDoc) } /****************************************************************************** - * OleRevokeServerDoc32 [OLESVR32.7] + * OleRevokeServerDoc [OLESVR32.7] */ OLESTATUS WINAPI OleRevokeServerDoc(LHSERVERDOC hServerDoc) { @@ -110,7 +110,7 @@ OLESTATUS WINAPI OleRevokeServer16(LHSERVER hServer) } /****************************************************************************** - * OleRegisterServer32 [OLESVR32.2] + * OleRegisterServer [OLESVR32.2] */ OLESTATUS WINAPI OleRegisterServer(LPCSTR svrname,LPOLESERVER olesvr,LHSERVER* hRet,HINSTANCE hinst,OLE_SERVER_USE osu) { FIXME("(%s,%p,%p,%08x,%d): stub!\n",svrname,olesvr,hRet,hinst,osu); @@ -119,7 +119,7 @@ OLESTATUS WINAPI OleRegisterServer(LPCSTR svrname,LPOLESERVER olesvr,LHSERVER* h } /****************************************************************************** - * OleRegisterServerDoc32 [OLESVR32.6] + * OleRegisterServerDoc [OLESVR32.6] */ OLESTATUS WINAPI OleRegisterServerDoc( LHSERVER hServer, LPCSTR docname, LPOLESERVERDOC document, @@ -131,7 +131,7 @@ OLESTATUS WINAPI OleRegisterServerDoc( LHSERVER hServer, LPCSTR docname, } /****************************************************************************** - * OleRenameServerDoc32 [OLESVR32.8] + * OleRenameServerDoc [OLESVR32.8] * */ OLESTATUS WINAPI OleRenameServerDoc(LHSERVERDOC hDoc, LPCSTR newName) diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index 75a980c3463..d0f67f803f0 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -67,7 +67,7 @@ BOOL WINAPI EnumProcessModules( } /*********************************************************************** - * GetDeviceDriverBaseName32A (PSAPI.5) + * GetDeviceDriverBaseNameA (PSAPI.5) */ DWORD WINAPI GetDeviceDriverBaseNameA( LPVOID ImageBase, LPSTR lpBaseName, DWORD nSize) @@ -83,7 +83,7 @@ DWORD WINAPI GetDeviceDriverBaseNameA( } /*********************************************************************** - * GetDeviceDriverBaseName32W (PSAPI.6) + * GetDeviceDriverBaseNameW (PSAPI.6) */ DWORD WINAPI GetDeviceDriverBaseNameW( LPVOID ImageBase, LPWSTR lpBaseName, DWORD nSize) @@ -99,7 +99,7 @@ DWORD WINAPI GetDeviceDriverBaseNameW( } /*********************************************************************** - * GetDeviceDriverFileName32A (PSAPI.7) + * GetDeviceDriverFileNameA (PSAPI.7) */ DWORD WINAPI GetDeviceDriverFileNameA( LPVOID ImageBase, LPSTR lpFilename, DWORD nSize) @@ -115,7 +115,7 @@ DWORD WINAPI GetDeviceDriverFileNameA( } /*********************************************************************** - * GetDeviceDriverFileName32W (PSAPI.8) + * GetDeviceDriverFileNameW (PSAPI.8) */ DWORD WINAPI GetDeviceDriverFileNameW( LPVOID ImageBase, LPWSTR lpFilename, DWORD nSize) @@ -131,7 +131,7 @@ DWORD WINAPI GetDeviceDriverFileNameW( } /*********************************************************************** - * GetMappedFileName32A (PSAPI.9) + * GetMappedFileNameA (PSAPI.9) */ DWORD WINAPI GetMappedFileNameA( HANDLE hProcess, LPVOID lpv, LPSTR lpFilename, DWORD nSize) @@ -147,7 +147,7 @@ DWORD WINAPI GetMappedFileNameA( } /*********************************************************************** - * GetMappedFileName32W (PSAPI.10) + * GetMappedFileNameW (PSAPI.10) */ DWORD WINAPI GetMappedFileNameW( HANDLE hProcess, LPVOID lpv, LPWSTR lpFilename, DWORD nSize) @@ -163,7 +163,7 @@ DWORD WINAPI GetMappedFileNameW( } /*********************************************************************** - * GetModuleBaseName32A (PSAPI.11) + * GetModuleBaseNameA (PSAPI.11) */ DWORD WINAPI GetModuleBaseNameA( HANDLE hProcess, HMODULE hModule, LPSTR lpBaseName, DWORD nSize) @@ -179,7 +179,7 @@ DWORD WINAPI GetModuleBaseNameA( } /*********************************************************************** - * GetModuleBaseName32W (PSAPI.12) + * GetModuleBaseNameW (PSAPI.12) */ DWORD WINAPI GetModuleBaseNameW( HANDLE hProcess, HMODULE hModule, LPWSTR lpBaseName, DWORD nSize) @@ -194,7 +194,7 @@ DWORD WINAPI GetModuleBaseNameW( } /*********************************************************************** - * GetModuleFileNameEx32A (PSAPI.13) + * GetModuleFileNameExA (PSAPI.13) */ DWORD WINAPI GetModuleFileNameExA( HANDLE hProcess, HMODULE hModule, LPSTR lpFilename, DWORD nSize) @@ -210,7 +210,7 @@ DWORD WINAPI GetModuleFileNameExA( } /*********************************************************************** - * GetModuleFileNameEx32W (PSAPI.14) + * GetModuleFileNameExW (PSAPI.14) */ DWORD WINAPI GetModuleFileNameExW( HANDLE hProcess, HMODULE hModule, LPWSTR lpFilename, DWORD nSize) @@ -226,7 +226,7 @@ DWORD WINAPI GetModuleFileNameExW( } /*********************************************************************** - * GetModuleInformation32 (PSAPI.15) + * GetModuleInformation (PSAPI.15) */ BOOL WINAPI GetModuleInformation( HANDLE hProcess, HMODULE hModule, LPMODULEINFO lpmodinfo, DWORD cb) @@ -241,7 +241,7 @@ BOOL WINAPI GetModuleInformation( } /*********************************************************************** - * GetProcessMemoryInfo32 (PSAPI.16) + * GetProcessMemoryInfo (PSAPI.16) */ BOOL WINAPI GetProcessMemoryInfo( HANDLE Process, PPROCESS_MEMORY_COUNTERS ppsmemCounters, DWORD cb) @@ -256,7 +256,7 @@ BOOL WINAPI GetProcessMemoryInfo( } /*********************************************************************** - * GetWsChanges32 (PSAPI.17) + * GetWsChanges (PSAPI.17) */ BOOL WINAPI GetWsChanges( HANDLE hProcess, PPSAPI_WS_WATCH_INFORMATION lpWatchInfo, DWORD cb) @@ -271,7 +271,7 @@ BOOL WINAPI GetWsChanges( } /*********************************************************************** - * InitializeProcessForWsWatch32 (PSAPI.18) + * InitializeProcessForWsWatch (PSAPI.18) */ BOOL WINAPI InitializeProcessForWsWatch(HANDLE hProcess) { @@ -281,7 +281,7 @@ BOOL WINAPI InitializeProcessForWsWatch(HANDLE hProcess) } /*********************************************************************** - * QueryWorkingSet32 (PSAPI.?) + * QueryWorkingSet (PSAPI.?) * FIXME * I haven't been able to find the ordinal for this function, * This means it can't be called from outside the DLL. diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index 101479d60c2..7a8a5bc05a6 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -11,7 +11,7 @@ DEFAULT_DEBUG_CHANNEL(ras) /************************************************************************** - * RasEnumConnections32A [RASAPI32.544] + * RasEnumConnectionsA [RASAPI32.544] */ DWORD WINAPI RasEnumConnectionsA( LPRASCONNA rca, LPDWORD x, LPDWORD y) { /* Remote Access Service stuff is done by underlying OS anyway */ diff --git a/dlls/setupx/setupx_main.c b/dlls/setupx/setupx_main.c index 25e9f425d53..09ac298a9fc 100644 --- a/dlls/setupx/setupx_main.c +++ b/dlls/setupx/setupx_main.c @@ -9,14 +9,20 @@ #include "windows.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(setupx) +DEFAULT_DEBUG_CHANNEL(setupx); +/*********************************************************************** + * SURegOpenKey + */ DWORD WINAPI SURegOpenKey( HKEY hkey, LPCSTR lpszSubKey, LPHKEY retkey ) { FIXME("(%x,%s,%p), semi-stub.\n",hkey,debugstr_a(lpszSubKey),retkey); return RegOpenKeyA( hkey, lpszSubKey, retkey ); } +/*********************************************************************** + * SURegQueryValueEx + */ DWORD WINAPI SURegQueryValueEx( HKEY hkey, LPSTR lpszValueName, LPDWORD lpdwReserved, LPDWORD lpdwType, LPBYTE lpbData, LPDWORD lpcbData ) diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c index 82b2bde8286..572cde0afa3 100644 --- a/dlls/shell32/shell.c +++ b/dlls/shell32/shell.c @@ -124,7 +124,7 @@ BOOL WINAPI SHELL_DllEntryPoint(DWORD Reason, HINSTANCE16 hInst, } /************************************************************************* - * DragAcceptFiles32 [SHELL32.54] + * DragAcceptFiles [SHELL32.54] */ void WINAPI DragAcceptFiles(HWND hWnd, BOOL b) { @@ -190,7 +190,7 @@ static UINT SHELL_DragQueryFile(LPSTR lpDrop, LPWSTR lpwDrop, UINT lFile, } /************************************************************************* - * DragQueryFile32A [SHELL32.81] [shell32.82] + * DragQueryFileA [SHELL32.81] [shell32.82] */ UINT WINAPI DragQueryFileA(HDROP hDrop, UINT lFile, LPSTR lpszFile, UINT lLength) @@ -215,7 +215,7 @@ UINT WINAPI DragQueryFileA(HDROP hDrop, UINT lFile, LPSTR lpszFile, } /************************************************************************* - * DragQueryFile32W [shell32.133] + * DragQueryFileW [shell32.133] */ UINT WINAPI DragQueryFileW(HDROP hDrop, UINT lFile, LPWSTR lpszwFile, UINT lLength) @@ -265,7 +265,7 @@ UINT16 WINAPI DragQueryFile16(HDROP16 hDrop, WORD wFile, LPSTR lpszFile, /************************************************************************* - * DragFinish32 [SHELL32.80] + * DragFinish [SHELL32.80] */ void WINAPI DragFinish(HDROP h) { @@ -284,7 +284,7 @@ void WINAPI DragFinish16(HDROP16 h) /************************************************************************* - * DragQueryPoint32 [SHELL32.135] + * DragQueryPoint [SHELL32.135] */ BOOL WINAPI DragQueryPoint(HDROP hDrop, POINT *p) { @@ -349,7 +349,7 @@ HINSTANCE SHELL_FindExecutable( LPCSTR lpFile, } if (SearchPathA( NULL, lpFile,".exe",sizeof(xlpFile),xlpFile,NULL)) - { TRACE("SearchPath32A returned non-zero\n"); + { TRACE("SearchPathA returned non-zero\n"); lpFile = xlpFile; } diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 1e11e25d88a..e3423affd57 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -387,7 +387,7 @@ static BOOL __get_dropline( HWND hWnd, LPRECT lprect ) } /************************************************************************* - * SHAppBarMessage32 [SHELL32.207] + * SHAppBarMessage [SHELL32.207] */ UINT WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data) { @@ -496,7 +496,7 @@ ShellExecuteW( } /************************************************************************* - * AboutDlgProc32 (internal) + * AboutDlgProc (internal) */ BOOL WINAPI AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 3b8066c5d19..c931a88829a 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -858,7 +858,7 @@ VOID WINAPI PathUnquoteSpacesAW(LPVOID str) /************************************************************************* - * PathGetDriveNumber32 [SHELL32.57] + * PathGetDriveNumber [SHELL32.57] * */ HRESULT WINAPI PathGetDriveNumber(LPSTR u) diff --git a/dlls/sound/sound_main.c b/dlls/sound/sound_main.c index 8ceeca64dfc..6212412421b 100644 --- a/dlls/sound/sound_main.c +++ b/dlls/sound/sound_main.c @@ -7,36 +7,54 @@ #include "wine/winesound.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(sound) +DEFAULT_DEBUG_CHANNEL(sound); +/*********************************************************************** + * OpenSound16 + */ INT16 WINAPI OpenSound16(void) { FIXME("(void): stub\n"); return -1; } +/*********************************************************************** + * OpenSound + */ void WINAPI OpenSound(void) { FIXME("(void): stub\n"); } +/*********************************************************************** + * CloseSound16 + */ void WINAPI CloseSound16(void) { FIXME("(void): stub\n"); } +/*********************************************************************** + * SetVoiceQueueSize16 + */ INT16 WINAPI SetVoiceQueueSize16(INT16 nVoice, INT16 nBytes) { FIXME("(%d,%d): stub\n",nVoice,nBytes); return 0; } +/*********************************************************************** + * SetVoiceQueueSize + */ DWORD WINAPI SetVoiceQueueSize(DWORD nVoice, DWORD nBytes) { FIXME("(%ld,%ld): stub\n",nVoice,nBytes); return 0; } +/*********************************************************************** + * SetVoiceNote16 + */ INT16 WINAPI SetVoiceNote16(INT16 nVoice, INT16 nValue, INT16 nLength, INT16 nCdots) { @@ -44,6 +62,9 @@ INT16 WINAPI SetVoiceNote16(INT16 nVoice, INT16 nValue, INT16 nLength, return 0; } +/*********************************************************************** + * SetVoiceNote + */ DWORD WINAPI SetVoiceNote(DWORD nVoice, DWORD nValue, DWORD nLength, DWORD nCdots) { @@ -51,6 +72,9 @@ DWORD WINAPI SetVoiceNote(DWORD nVoice, DWORD nValue, DWORD nLength, return 0; } +/*********************************************************************** + * SetVoiceAccent16 + */ INT16 WINAPI SetVoiceAccent16(INT16 nVoice, INT16 nTempo, INT16 nVolume, INT16 nMode, INT16 nPitch) { @@ -59,6 +83,9 @@ INT16 WINAPI SetVoiceAccent16(INT16 nVoice, INT16 nTempo, INT16 nVolume, return 0; } +/*********************************************************************** + * SetVoiceAccent + */ DWORD WINAPI SetVoiceAccent(DWORD nVoice, DWORD nTempo, DWORD nVolume, DWORD nMode, DWORD nPitch) { @@ -67,124 +94,187 @@ DWORD WINAPI SetVoiceAccent(DWORD nVoice, DWORD nTempo, DWORD nVolume, return 0; } +/*********************************************************************** + * SetVoiceEnvelope16 + */ INT16 WINAPI SetVoiceEnvelope16(INT16 nVoice, INT16 nShape, INT16 nRepeat) { FIXME("(%d,%d,%d): stub\n",nVoice,nShape,nRepeat); return 0; } +/*********************************************************************** + * SetVoiceEnvelope + */ DWORD WINAPI SetVoiceEnvelope(DWORD nVoice, DWORD nShape, DWORD nRepeat) { FIXME("(%ld,%ld,%ld): stub\n",nVoice,nShape,nRepeat); return 0; } +/*********************************************************************** + * SetSoundNoise16 + */ INT16 WINAPI SetSoundNoise16(INT16 nSource, INT16 nDuration) { FIXME("(%d,%d): stub\n",nSource,nDuration); return 0; } +/*********************************************************************** + * SetSoundNoise + */ DWORD WINAPI SetSoundNoise(DWORD nSource, DWORD nDuration) { FIXME("(%ld,%ld): stub\n",nSource,nDuration); return 0; } +/*********************************************************************** + * SetVoiceSound16 + */ INT16 WINAPI SetVoiceSound16(INT16 nVoice, DWORD lFrequency, INT16 nDuration) { FIXME("(%d, %ld, %d): stub\n",nVoice,lFrequency, nDuration); return 0; } +/*********************************************************************** + * SetVoiceSound + */ DWORD WINAPI SetVoiceSound(DWORD nVoice, DWORD lFrequency, DWORD nDuration) { FIXME("(%ld, %ld, %ld): stub\n",nVoice,lFrequency, nDuration); return 0; } +/*********************************************************************** + * StartSound16 + */ INT16 WINAPI StartSound16(void) { return 0; } +/*********************************************************************** + * StopSound16 + */ INT16 WINAPI StopSound16(void) { return 0; } +/*********************************************************************** + * WaitSoundState16 + */ INT16 WINAPI WaitSoundState16(INT16 x) { FIXME("(%d): stub\n", x); return 0; } +/*********************************************************************** + * WaitSoundState + */ DWORD WINAPI WaitSoundState(DWORD x) { FIXME("(%ld): stub\n", x); return 0; } +/*********************************************************************** + * SyncAllVoices16 + */ INT16 WINAPI SyncAllVoices16(void) { FIXME("(void): stub\n"); return 0; } +/*********************************************************************** + * SyncAllVoices + */ DWORD WINAPI SyncAllVoices(void) { FIXME("(void): stub\n"); return 0; } +/*********************************************************************** + * CountVoiceNotes16 + */ INT16 WINAPI CountVoiceNotes16(INT16 x) { FIXME("(%d): stub\n", x); return 0; } +/*********************************************************************** + * CountVoiceNotes + */ DWORD WINAPI CountVoiceNotes(DWORD x) { FIXME("(%ld): stub\n", x); return 0; } +/*********************************************************************** + * GetThresholdEvent16 + */ LPINT16 WINAPI GetThresholdEvent16(void) { FIXME("(void): stub\n"); return NULL; } +/*********************************************************************** + * GetThresholdEvent + */ LPDWORD WINAPI GetThresholdEvent(void) { FIXME("(void): stub\n"); return NULL; } +/*********************************************************************** + * GetThresholdStatus16 + */ INT16 WINAPI GetThresholdStatus16(void) { FIXME("(void): stub\n"); return 0; } +/*********************************************************************** + * GetThresholdStatus + */ DWORD WINAPI GetThresholdStatus(void) { FIXME("(void): stub\n"); return 0; } +/*********************************************************************** + * SetVoiceThreshold16 + */ INT16 WINAPI SetVoiceThreshold16(INT16 a, INT16 b) { FIXME("(%d,%d): stub\n", a, b); return 0; } +/*********************************************************************** + * SetVoiceThreshold + */ DWORD WINAPI SetVoiceThreshold(DWORD a, DWORD b) { FIXME("(%ld,%ld): stub\n", a, b); return 0; } +/*********************************************************************** + * DoBeep16 + */ void WINAPI DoBeep16(void) { FIXME("(void): stub!\n"); diff --git a/dlls/stress/stress_main.c b/dlls/stress/stress_main.c index 3786fdbb0ff..6430956d9d6 100644 --- a/dlls/stress/stress_main.c +++ b/dlls/stress/stress_main.c @@ -2,9 +2,11 @@ #include "stress.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(stress) - +DEFAULT_DEBUG_CHANNEL(stress); +/*********************************************************************** + * AllocDiskSpace + */ INT16 WINAPI AllocDiskSpace(LONG lLeft, UINT16 uDrive) { FIXME("(%d, %ld) - stub\n", @@ -13,6 +15,9 @@ INT16 WINAPI AllocDiskSpace(LONG lLeft, UINT16 uDrive) return 1; } +/*********************************************************************** + * AllocFileHandles + */ INT16 WINAPI AllocFileHandles(INT16 Left) { TRACE("(%d) - stub\n", Left); @@ -23,6 +28,9 @@ INT16 WINAPI AllocFileHandles(INT16 Left) return 1; } +/*********************************************************************** + * AllocGDIMem + */ BOOL16 WINAPI AllocGDIMem(UINT16 uLeft) { TRACE("(%d) - stub\n", uLeft); @@ -30,6 +38,9 @@ BOOL16 WINAPI AllocGDIMem(UINT16 uLeft) return 1; } +/*********************************************************************** + * AllocMem + */ BOOL16 WINAPI AllocMem(DWORD dwLeft) { FIXME("(%ld) - stub\n", dwLeft); @@ -37,6 +48,9 @@ BOOL16 WINAPI AllocMem(DWORD dwLeft) return 1; } +/*********************************************************************** + * AllocUserMem + */ BOOL16 WINAPI AllocUserMem(UINT16 uContig) { TRACE("AllocUserMem %d\n", uContig); @@ -44,26 +58,41 @@ BOOL16 WINAPI AllocUserMem(UINT16 uContig) return 1; } +/*********************************************************************** + * FreeAllMem + */ void WINAPI FreeAllMem(void) { TRACE("FreeAllMem\n"); } +/*********************************************************************** + * FreeAllGDIMem + */ void WINAPI FreeAllGDIMem(void) { TRACE("FreeAllGDIMem\n"); } +/*********************************************************************** + * FreeAllUserMem + */ void WINAPI FreeAllUserMem(void) { TRACE("FreeAllUserMem\n"); } +/*********************************************************************** + * + */ void WINAPI GetFreeAllUserMem(void) { TRACE("GetFreeAllUserMem\n"); } +/*********************************************************************** + * GetFreeFileHandles + */ INT16 WINAPI GetFreeFileHandles(void) { TRACE("GetFreeFileHandles\n"); @@ -75,11 +104,17 @@ INT16 WINAPI GetFreeFileHandles(void) #endif } +/*********************************************************************** + * UnAllocDiskSpace + */ void WINAPI UnAllocDiskSpace(UINT16 drive) { TRACE("UnAllocDiskSpace %d\n", drive); } +/*********************************************************************** + * UnAllocFileHandles + */ void WINAPI UnAllocFileHandles(void) { TRACE("GetFreeAllUserMem\n"); diff --git a/dlls/version/info.c b/dlls/version/info.c index 320847d18fd..6f68156646a 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -262,7 +262,7 @@ void ConvertVersionInfo32To16( VS_VERSION_INFO_STRUCT32 *info32, /*********************************************************************** - * GetFileVersionInfoSize32A [VERSION.2] + * GetFileVersionInfoSizeA [VERSION.2] */ DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle ) { @@ -308,7 +308,7 @@ DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle ) } /*********************************************************************** - * GetFileVersionInfoSize32W [VERSION.3] + * GetFileVersionInfoSizeW [VERSION.3] */ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) { @@ -319,7 +319,7 @@ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) } /*********************************************************************** - * GetFileVersionInfo32A [VERSION.1] + * GetFileVersionInfoA [VERSION.1] */ DWORD WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle, DWORD datasize, LPVOID data ) @@ -345,7 +345,7 @@ DWORD WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle, } /*********************************************************************** - * GetFileVersionInfo32W [VERSION.4] + * GetFileVersionInfoW [VERSION.4] */ DWORD WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, DWORD datasize, LPVOID data ) @@ -414,7 +414,7 @@ static VS_VERSION_INFO_STRUCT32 *VersionInfo32_FindChild( VS_VERSION_INFO_STRUCT } /*********************************************************************** - * VerQueryValue32A [VERSION.12] + * VerQueryValueA [VERSION.12] */ DWORD WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock, LPVOID *lplpBuffer, UINT *puLen ) @@ -460,7 +460,7 @@ DWORD WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock, } /*********************************************************************** - * VerQueryValue32W [VERSION.13] + * VerQueryValueW [VERSION.13] */ DWORD WINAPI VerQueryValueW( LPVOID pBlock, LPCWSTR lpSubBlock, LPVOID *lplpBuffer, UINT *puLen ) diff --git a/dlls/win32s/win32s16.c b/dlls/win32s/win32s16.c index 506bdaa263e..bf7243c5abe 100644 --- a/dlls/win32s/win32s16.c +++ b/dlls/win32s/win32s16.c @@ -10,8 +10,11 @@ #include "windef.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(dll) +DEFAULT_DEBUG_CHANNEL(dll); +/*********************************************************************** + * BootTask16 + */ void WINAPI BootTask16() { MESSAGE("BootTask(): should only be used by WIN32S.EXE.\n"); diff --git a/dlls/win87em/emulate.c b/dlls/win87em/emulate.c index 2ceba0916fe..ec9c5b327bf 100644 --- a/dlls/win87em/emulate.c +++ b/dlls/win87em/emulate.c @@ -195,13 +195,18 @@ void WINAPI WIN87_fpmath( CONTEXT86 *context ) } } - +/*********************************************************************** + * WIN87_WinEm87Info + */ void WINAPI WIN87_WinEm87Info(struct Win87EmInfoStruct *pWIS, int cbWin87EmInfoStruct) { FIXME("(%p,%d), stub !\n",pWIS,cbWin87EmInfoStruct); } +/*********************************************************************** + * WIN87_WinEm87Restore + */ void WINAPI WIN87_WinEm87Restore(void *pWin87EmSaveArea, int cbWin87EmSaveArea) { @@ -209,6 +214,9 @@ void WINAPI WIN87_WinEm87Restore(void *pWin87EmSaveArea, pWin87EmSaveArea,cbWin87EmSaveArea); } +/*********************************************************************** + * WIN87_WinEm87Save + */ void WINAPI WIN87_WinEm87Save(void *pWin87EmSaveArea, int cbWin87EmSaveArea) { FIXME("(%p,%d), stub !\n", diff --git a/dlls/winaspi/winaspi32.c b/dlls/winaspi/winaspi32.c index 12133b943e6..b63a70e6952 100644 --- a/dlls/winaspi/winaspi32.c +++ b/dlls/winaspi/winaspi32.c @@ -442,7 +442,7 @@ error_exit: /******************************************************************* - * GetASPI32SupportInfo32 [WNASPI32.0] + * GetASPI32SupportInfo [WNASPI32.0] * * Checks if the ASPI subsystem is initialized correctly. * @@ -458,7 +458,7 @@ DWORD WINAPI GetASPI32SupportInfo() /*********************************************************************** - * SendASPI32Command32 (WNASPI32.1) + * SendASPI32Command (WNASPI32.1) */ DWORD __cdecl SendASPI32Command(LPSRB lpSRB) { @@ -534,7 +534,7 @@ DWORD __cdecl SendASPI32Command(LPSRB lpSRB) /*********************************************************************** - * GetASPI32DLLVersion32 (WNASPI32.3) + * GetASPI32DLLVersion (WNASPI32.3) */ DWORD WINAPI GetASPI32DLLVersion() diff --git a/dlls/winsock/async.c b/dlls/winsock/async.c index 431d7aae3e0..fa17d33c1f0 100644 --- a/dlls/winsock/async.c +++ b/dlls/winsock/async.c @@ -419,7 +419,7 @@ HANDLE16 WINAPI WSAAsyncGetHostByName16(HWND16 hWnd, UINT16 uMsg, LPCSTR name, } /*********************************************************************** - * WSAAsyncGetHostByName32() (WSOCK32.103) + * WSAAsyncGetHostByName() (WSOCK32.103) */ HANDLE WINAPI WSAAsyncGetHostByName(HWND hWnd, UINT uMsg, LPCSTR name, LPSTR sbuf, INT buflen) diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c index 4ff89fdb5be..5fd70de683d 100644 --- a/dlls/winsock/socket.c +++ b/dlls/winsock/socket.c @@ -322,6 +322,9 @@ static void WINSOCK_DeleteIData(void) } } +/*********************************************************************** + * WSOCK32_LibMain (WSOCK32.init) + */ BOOL WINAPI WSOCK32_LibMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) { TRACE("0x%x 0x%lx %p\n", hInstDLL, fdwReason, fImpLoad); @@ -333,6 +336,9 @@ BOOL WINAPI WSOCK32_LibMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad return TRUE; } +/*********************************************************************** + * WINSOCK_LibMain (WINSOCK.init) + */ BOOL WINAPI WINSOCK_LibMain(DWORD fdwReason, HINSTANCE hInstDLL, WORD ds, WORD wHeapSize, DWORD dwReserved1, WORD wReserved2) { @@ -598,7 +604,7 @@ INT16 WINAPI WSAStartup16(UINT16 wVersionRequested, LPWSADATA lpWSAData) } /*********************************************************************** - * WSAStartup32() (WSOCK32.115) + * WSAStartup() (WSOCK32.115) */ INT WINAPI WSAStartup(UINT wVersionRequested, LPWSADATA lpWSAData) { @@ -631,7 +637,7 @@ INT WINAPI WSAGetLastError(void) } /*********************************************************************** - * WSASetLastError32() (WSOCK32.112) + * WSASetLastError() (WSOCK32.112) */ void WINAPI WSASetLastError(INT iError) { SetLastError(iError); @@ -2394,7 +2400,7 @@ FARPROC16 WINAPI WSASetBlockingHook16(FARPROC16 lpBlockFunc) /*********************************************************************** - * WSASetBlockingHook32() + * WSASetBlockingHook() */ FARPROC WINAPI WSASetBlockingHook(FARPROC lpBlockFunc) { @@ -2427,7 +2433,7 @@ INT16 WINAPI WSAUnhookBlockingHook16(void) /*********************************************************************** - * WSAUnhookBlockingHook32() + * WSAUnhookBlockingHook() */ INT WINAPI WSAUnhookBlockingHook(void) { diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index fac76bccf70..ce0120a45d6 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -114,7 +114,7 @@ static LPOPENEDPRINTERA WINSPOOL_GetOpenedPrinterA(int printerHandle) } /****************************************************************** - * DeviceCapabilities32A [WINSPOOL.151] + * DeviceCapabilitiesA [WINSPOOL.151] * */ INT WINAPI DeviceCapabilitiesA(LPCSTR pDeivce,LPCSTR pPort, WORD cap, @@ -137,7 +137,7 @@ INT WINAPI DeviceCapabilitiesA(LPCSTR pDeivce,LPCSTR pPort, WORD cap, /***************************************************************************** - * DeviceCapabilities32W + * DeviceCapabilitiesW */ INT WINAPI DeviceCapabilitiesW(LPCWSTR pDevice, LPCWSTR pPort, WORD fwCapability, LPWSTR pOutput, @@ -149,7 +149,7 @@ INT WINAPI DeviceCapabilitiesW(LPCWSTR pDevice, LPCWSTR pPort, } /****************************************************************** - * DocumentProperties32A [WINSPOOL.155] + * DocumentPropertiesA [WINSPOOL.155] * */ LONG WINAPI DocumentPropertiesA(HWND hWnd,HANDLE hPrinter, @@ -179,7 +179,7 @@ LONG WINAPI DocumentPropertiesA(HWND hWnd,HANDLE hPrinter, /***************************************************************************** - * DocumentProperties32W + * DocumentPropertiesW */ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, LPWSTR pDeviceName, @@ -194,7 +194,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, /****************************************************************** - * OpenPrinter32A [WINSPOOL.196] + * OpenPrinterA [WINSPOOL.196] * */ BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter, @@ -268,7 +268,7 @@ BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter, } /****************************************************************** - * OpenPrinter32W [WINSPOOL.197] + * OpenPrinterW [WINSPOOL.197] * */ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, @@ -281,7 +281,7 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, } /****************************************************************** - * AddMonitor32A [WINSPOOL.107] + * AddMonitorA [WINSPOOL.107] * */ BOOL WINAPI AddMonitorA(LPSTR pName, DWORD Level, LPBYTE pMonitors) @@ -292,7 +292,7 @@ BOOL WINAPI AddMonitorA(LPSTR pName, DWORD Level, LPBYTE pMonitors) } /****************************************************************** - * DeletePrinterDriver32A [WINSPOOL.146] + * DeletePrinterDriverA [WINSPOOL.146] * */ BOOL WINAPI @@ -306,7 +306,7 @@ DeletePrinterDriverA (LPSTR pName, LPSTR pEnvironment, LPSTR pDriverName) /****************************************************************** - * DeleteMonitor32A [WINSPOOL.135] + * DeleteMonitorA [WINSPOOL.135] * */ BOOL WINAPI @@ -320,7 +320,7 @@ DeleteMonitorA (LPSTR pName, LPSTR pEnvironment, LPSTR pMonitorName) /****************************************************************** - * DeletePort32A [WINSPOOL.137] + * DeletePortA [WINSPOOL.137] * */ BOOL WINAPI @@ -333,7 +333,7 @@ DeletePortA (LPSTR pName, HWND hWnd, LPSTR pPortName) } /****************************************************************************** - * SetPrinter32W [WINSPOOL.214] + * SetPrinterW [WINSPOOL.214] */ BOOL WINAPI SetPrinterW( @@ -348,7 +348,7 @@ SetPrinterW( } /****************************************************************************** - * WritePrinter32 [WINSPOOL.223] + * WritePrinter [WINSPOOL.223] */ BOOL WINAPI WritePrinter( @@ -363,7 +363,7 @@ WritePrinter( } /***************************************************************************** - * AddForm32A [WINSPOOL.103] + * AddFormA [WINSPOOL.103] */ BOOL WINAPI AddFormA(HANDLE hPrinter, DWORD Level, LPBYTE pForm) { @@ -372,7 +372,7 @@ BOOL WINAPI AddFormA(HANDLE hPrinter, DWORD Level, LPBYTE pForm) } /***************************************************************************** - * AddForm32W [WINSPOOL.104] + * AddFormW [WINSPOOL.104] */ BOOL WINAPI AddFormW(HANDLE hPrinter, DWORD Level, LPBYTE pForm) { @@ -381,7 +381,7 @@ BOOL WINAPI AddFormW(HANDLE hPrinter, DWORD Level, LPBYTE pForm) } /***************************************************************************** - * AddJob32A [WINSPOOL.105] + * AddJobA [WINSPOOL.105] */ BOOL WINAPI AddJobA(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPDWORD pcbNeeded) @@ -392,7 +392,7 @@ BOOL WINAPI AddJobA(HANDLE hPrinter, DWORD Level, LPBYTE pData, } /***************************************************************************** - * AddJob32W [WINSPOOL.106] + * AddJobW [WINSPOOL.106] */ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPDWORD pcbNeeded) @@ -403,7 +403,7 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, } /***************************************************************************** - * AddPrinter32A [WINSPOOL.117] + * AddPrinterA [WINSPOOL.117] */ HANDLE WINAPI AddPrinterA(LPSTR pName, DWORD Level, LPBYTE pPrinter) { @@ -504,7 +504,7 @@ HANDLE WINAPI AddPrinterA(LPSTR pName, DWORD Level, LPBYTE pPrinter) } /***************************************************************************** - * AddPrinter32W [WINSPOOL.122] + * AddPrinterW [WINSPOOL.122] */ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) { @@ -514,7 +514,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) /***************************************************************************** - * ClosePrinter32 [WINSPOOL.126] + * ClosePrinter [WINSPOOL.126] */ BOOL WINAPI ClosePrinter(HANDLE hPrinter) { @@ -551,7 +551,7 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter) } /***************************************************************************** - * DeleteForm32A [WINSPOOL.133] + * DeleteFormA [WINSPOOL.133] */ BOOL WINAPI DeleteFormA(HANDLE hPrinter, LPSTR pFormName) { @@ -560,7 +560,7 @@ BOOL WINAPI DeleteFormA(HANDLE hPrinter, LPSTR pFormName) } /***************************************************************************** - * DeleteForm32W [WINSPOOL.134] + * DeleteFormW [WINSPOOL.134] */ BOOL WINAPI DeleteFormW(HANDLE hPrinter, LPWSTR pFormName) { @@ -569,7 +569,7 @@ BOOL WINAPI DeleteFormW(HANDLE hPrinter, LPWSTR pFormName) } /***************************************************************************** - * DeletePrinter32 [WINSPOOL.143] + * DeletePrinter [WINSPOOL.143] */ BOOL WINAPI DeletePrinter(HANDLE hPrinter) { @@ -578,7 +578,7 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) } /***************************************************************************** - * SetPrinter32A [WINSPOOL.211] + * SetPrinterA [WINSPOOL.211] */ BOOL WINAPI SetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD Command) @@ -588,7 +588,7 @@ BOOL WINAPI SetPrinterA(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, } /***************************************************************************** - * SetJob32A [WINSPOOL.209] + * SetJobA [WINSPOOL.209] */ BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pJob, DWORD Command) @@ -599,7 +599,7 @@ BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level, } /***************************************************************************** - * SetJob32W [WINSPOOL.210] + * SetJobW [WINSPOOL.210] */ BOOL WINAPI SetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pJob, DWORD Command) @@ -610,7 +610,7 @@ BOOL WINAPI SetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, } /***************************************************************************** - * GetForm32A [WINSPOOL.181] + * GetFormA [WINSPOOL.181] */ BOOL WINAPI GetFormA(HANDLE hPrinter, LPSTR pFormName, DWORD Level, LPBYTE pForm, DWORD cbBuf, LPDWORD pcbNeeded) @@ -621,7 +621,7 @@ BOOL WINAPI GetFormA(HANDLE hPrinter, LPSTR pFormName, DWORD Level, } /***************************************************************************** - * GetForm32W [WINSPOOL.182] + * GetFormW [WINSPOOL.182] */ BOOL WINAPI GetFormW(HANDLE hPrinter, LPWSTR pFormName, DWORD Level, LPBYTE pForm, DWORD cbBuf, LPDWORD pcbNeeded) @@ -632,7 +632,7 @@ BOOL WINAPI GetFormW(HANDLE hPrinter, LPWSTR pFormName, DWORD Level, } /***************************************************************************** - * SetForm32A [WINSPOOL.207] + * SetFormA [WINSPOOL.207] */ BOOL WINAPI SetFormA(HANDLE hPrinter, LPSTR pFormName, DWORD Level, LPBYTE pForm) @@ -642,7 +642,7 @@ BOOL WINAPI SetFormA(HANDLE hPrinter, LPSTR pFormName, DWORD Level, } /***************************************************************************** - * SetForm32W [WINSPOOL.208] + * SetFormW [WINSPOOL.208] */ BOOL WINAPI SetFormW(HANDLE hPrinter, LPWSTR pFormName, DWORD Level, LPBYTE pForm) @@ -652,7 +652,7 @@ BOOL WINAPI SetFormW(HANDLE hPrinter, LPWSTR pFormName, DWORD Level, } /***************************************************************************** - * ReadPrinter32 [WINSPOOL.202] + * ReadPrinter [WINSPOOL.202] */ BOOL WINAPI ReadPrinter(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf, LPDWORD pNoBytesRead) @@ -662,7 +662,7 @@ BOOL WINAPI ReadPrinter(HANDLE hPrinter, LPVOID pBuf, DWORD cbBuf, } /***************************************************************************** - * ResetPrinter32A [WINSPOOL.203] + * ResetPrinterA [WINSPOOL.203] */ BOOL WINAPI ResetPrinterA(HANDLE hPrinter, LPPRINTER_DEFAULTSA pDefault) { @@ -671,7 +671,7 @@ BOOL WINAPI ResetPrinterA(HANDLE hPrinter, LPPRINTER_DEFAULTSA pDefault) } /***************************************************************************** - * ResetPrinter32W [WINSPOOL.204] + * ResetPrinterW [WINSPOOL.204] */ BOOL WINAPI ResetPrinterW(HANDLE hPrinter, LPPRINTER_DEFAULTSW pDefault) { @@ -1154,7 +1154,7 @@ BOOL WINAPI EnumPrintersW(DWORD dwType, LPWSTR lpszName, /***************************************************************************** - * GetPrinterDriver32A [WINSPOOL.190] + * GetPrinterDriverA [WINSPOOL.190] */ BOOL WINAPI GetPrinterDriverA(HANDLE hPrinter, LPSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, @@ -1348,7 +1348,7 @@ BOOL WINAPI GetPrinterDriverA(HANDLE hPrinter, LPSTR pEnvironment, } /***************************************************************************** - * GetPrinterDriver32W [WINSPOOL.193] + * GetPrinterDriverW [WINSPOOL.193] */ BOOL WINAPI GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, DWORD Level, LPBYTE pDriverInfo, @@ -1421,7 +1421,7 @@ BOOL WINAPI GetPrinterDriverDirectoryW(LPWSTR pName, LPWSTR pEnvironment, } /***************************************************************************** - * AddPrinterDriver32A [WINSPOOL.120] + * AddPrinterDriverA [WINSPOOL.120] */ BOOL WINAPI AddPrinterDriverA(LPSTR pName, DWORD level, LPBYTE pDriverInfo) { @@ -1504,7 +1504,7 @@ BOOL WINAPI AddPrinterDriverA(LPSTR pName, DWORD level, LPBYTE pDriverInfo) return TRUE; } /***************************************************************************** - * AddPrinterDriver32W [WINSPOOL.121] + * AddPrinterDriverW [WINSPOOL.121] */ BOOL WINAPI AddPrinterDriverW(LPWSTR printerName,DWORD level, LPBYTE pDriverInfo) diff --git a/files/change.c b/files/change.c index 3aba77feb7d..a9c01297b8e 100644 --- a/files/change.c +++ b/files/change.c @@ -33,7 +33,7 @@ HANDLE WINAPI FindFirstChangeNotificationA( LPCSTR lpPathName, BOOL bWatchSubtre } /**************************************************************************** - * FindFirstChangeNotification32W (KERNEL32.249) + * FindFirstChangeNotificationW (KERNEL32.249) */ HANDLE WINAPI FindFirstChangeNotificationW( LPCWSTR lpPathName, BOOL bWatchSubtree, diff --git a/files/directory.c b/files/directory.c index 8ef48c71592..f20adcf7cf4 100644 --- a/files/directory.c +++ b/files/directory.c @@ -158,7 +158,7 @@ int DIR_Init(void) /*********************************************************************** - * GetTempPath32A (KERNEL32.292) + * GetTempPathA (KERNEL32.292) */ UINT WINAPI GetTempPathA( UINT count, LPSTR path ) { @@ -177,7 +177,7 @@ UINT WINAPI GetTempPathA( UINT count, LPSTR path ) /*********************************************************************** - * GetTempPath32W (KERNEL32.293) + * GetTempPathW (KERNEL32.293) */ UINT WINAPI GetTempPathW( UINT count, LPWSTR path ) { @@ -261,7 +261,7 @@ UINT16 WINAPI GetWindowsDirectory16( LPSTR path, UINT16 count ) /*********************************************************************** - * GetWindowsDirectory32A (KERNEL32.311) + * GetWindowsDirectoryA (KERNEL32.311) */ UINT WINAPI GetWindowsDirectoryA( LPSTR path, UINT count ) { @@ -271,7 +271,7 @@ UINT WINAPI GetWindowsDirectoryA( LPSTR path, UINT count ) /*********************************************************************** - * GetWindowsDirectory32W (KERNEL32.312) + * GetWindowsDirectoryW (KERNEL32.312) */ UINT WINAPI GetWindowsDirectoryW( LPWSTR path, UINT count ) { @@ -290,7 +290,7 @@ UINT16 WINAPI GetSystemDirectory16( LPSTR path, UINT16 count ) /*********************************************************************** - * GetSystemDirectory32A (KERNEL32.282) + * GetSystemDirectoryA (KERNEL32.282) */ UINT WINAPI GetSystemDirectoryA( LPSTR path, UINT count ) { @@ -300,7 +300,7 @@ UINT WINAPI GetSystemDirectoryA( LPSTR path, UINT count ) /*********************************************************************** - * GetSystemDirectory32W (KERNEL32.283) + * GetSystemDirectoryW (KERNEL32.283) */ UINT WINAPI GetSystemDirectoryW( LPWSTR path, UINT count ) { @@ -320,7 +320,7 @@ BOOL16 WINAPI CreateDirectory16( LPCSTR path, LPVOID dummy ) /*********************************************************************** - * CreateDirectory32A (KERNEL32.39) + * CreateDirectoryA (KERNEL32.39) * RETURNS: * TRUE : success * FALSE : failure @@ -358,7 +358,7 @@ BOOL WINAPI CreateDirectoryA( LPCSTR path, /*********************************************************************** - * CreateDirectory32W (KERNEL32.42) + * CreateDirectoryW (KERNEL32.42) */ BOOL WINAPI CreateDirectoryW( LPCWSTR path, LPSECURITY_ATTRIBUTES lpsecattribs ) @@ -371,7 +371,7 @@ BOOL WINAPI CreateDirectoryW( LPCWSTR path, /*********************************************************************** - * CreateDirectoryEx32A (KERNEL32.40) + * CreateDirectoryExA (KERNEL32.40) */ BOOL WINAPI CreateDirectoryExA( LPCSTR template, LPCSTR path, LPSECURITY_ATTRIBUTES lpsecattribs) @@ -381,7 +381,7 @@ BOOL WINAPI CreateDirectoryExA( LPCSTR template, LPCSTR path, /*********************************************************************** - * CreateDirectoryEx32W (KERNEL32.41) + * CreateDirectoryExW (KERNEL32.41) */ BOOL WINAPI CreateDirectoryExW( LPCWSTR template, LPCWSTR path, LPSECURITY_ATTRIBUTES lpsecattribs) @@ -400,7 +400,7 @@ BOOL16 WINAPI RemoveDirectory16( LPCSTR path ) /*********************************************************************** - * RemoveDirectory32A (KERNEL32.437) + * RemoveDirectoryA (KERNEL32.437) */ BOOL WINAPI RemoveDirectoryA( LPCSTR path ) { @@ -425,7 +425,7 @@ BOOL WINAPI RemoveDirectoryA( LPCSTR path ) /*********************************************************************** - * RemoveDirectory32W (KERNEL32.438) + * RemoveDirectoryW (KERNEL32.438) */ BOOL WINAPI RemoveDirectoryW( LPCWSTR path ) { @@ -512,7 +512,7 @@ static BOOL DIR_TryModulePath( LPCSTR name, DOS_FULL_NAME *full_name ) { PDB *pdb = PROCESS_Current(); - /* FIXME: for now, GetModuleFileName32A can't return more */ + /* FIXME: for now, GetModuleFileNameA can't return more */ /* than OFS_MAXPATHNAME. This may change with Win32. */ char buffer[OFS_MAXPATHNAME]; @@ -536,7 +536,7 @@ static BOOL DIR_TryModulePath( LPCSTR name, DOS_FULL_NAME *full_name ) /*********************************************************************** * DIR_SearchPath * - * Implementation of SearchPath32A. 'win32' specifies whether the search + * Implementation of SearchPathA. 'win32' specifies whether the search * order is Win16 (module path last) or Win32 (module path first). * * FIXME: should return long path names. @@ -625,7 +625,7 @@ done: /*********************************************************************** - * SearchPath32A [KERNEL32.447] + * SearchPathA [KERNEL32.447] * * Searches for a specified file in the search path. * @@ -674,7 +674,7 @@ DWORD WINAPI SearchPathA( LPCSTR path, LPCSTR name, LPCSTR ext, DWORD buflen, /*********************************************************************** - * SearchPath32W (KERNEL32.448) + * SearchPathW (KERNEL32.448) */ DWORD WINAPI SearchPathW( LPCWSTR path, LPCWSTR name, LPCWSTR ext, DWORD buflen, LPWSTR buffer, LPWSTR *lastpart ) diff --git a/files/dos_fs.c b/files/dos_fs.c index fe470a7c6ce..81025f1baee 100644 --- a/files/dos_fs.c +++ b/files/dos_fs.c @@ -978,7 +978,7 @@ DWORD WINAPI GetShortPathNameA( LPCSTR longpath, LPSTR shortpath, /*********************************************************************** - * GetShortPathName32W (KERNEL32.272) + * GetShortPathNameW (KERNEL32.272) */ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortlen ) @@ -1000,7 +1000,7 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, /*********************************************************************** - * GetLongPathName32A (KERNEL32.xxx) + * GetLongPathNameA (KERNEL32.xxx) */ DWORD WINAPI GetLongPathNameA( LPCSTR shortpath, LPSTR longpath, DWORD longlen ) @@ -1056,7 +1056,7 @@ DWORD WINAPI GetLongPathNameA( LPCSTR shortpath, LPSTR longpath, /*********************************************************************** - * GetLongPathName32W (KERNEL32.269) + * GetLongPathNameW (KERNEL32.269) */ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen ) @@ -1079,7 +1079,7 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, /*********************************************************************** * DOSFS_DoGetFullPathName * - * Implementation of GetFullPathName32A/W. + * Implementation of GetFullPathNameA/W. * * Known discrepancies to Win95 OSR2 bon 000118 * "g:..\test should return G:\test @@ -1197,7 +1197,7 @@ static DWORD DOSFS_DoGetFullPathName( LPCSTR name, DWORD len, LPSTR result, /*********************************************************************** - * GetFullPathName32A (KERNEL32.272) + * GetFullPathNameA (KERNEL32.272) * NOTES * if the path closed with '\', *lastpart is 0 */ @@ -1221,7 +1221,7 @@ DWORD WINAPI GetFullPathNameA( LPCSTR name, DWORD len, LPSTR buffer, /*********************************************************************** - * GetFullPathName32W (KERNEL32.273) + * GetFullPathNameW (KERNEL32.273) */ DWORD WINAPI GetFullPathNameW( LPCWSTR name, DWORD len, LPWSTR buffer, LPWSTR *lastpart ) @@ -1450,7 +1450,7 @@ HANDLE16 WINAPI FindFirstFile16( LPCSTR path, WIN32_FIND_DATAA *data ) /************************************************************************* - * FindFirstFile32A (KERNEL32.123) + * FindFirstFileA (KERNEL32.123) */ HANDLE WINAPI FindFirstFileA( LPCSTR path, WIN32_FIND_DATAA *data ) { @@ -1461,7 +1461,7 @@ HANDLE WINAPI FindFirstFileA( LPCSTR path, WIN32_FIND_DATAA *data ) /************************************************************************* - * FindFirstFile32W (KERNEL32.124) + * FindFirstFileW (KERNEL32.124) */ HANDLE WINAPI FindFirstFileW( LPCWSTR path, WIN32_FIND_DATAW *data ) { @@ -1515,7 +1515,7 @@ BOOL16 WINAPI FindNextFile16( HANDLE16 handle, WIN32_FIND_DATAA *data ) /************************************************************************* - * FindNextFile32A (KERNEL32.126) + * FindNextFileA (KERNEL32.126) */ BOOL WINAPI FindNextFileA( HANDLE handle, WIN32_FIND_DATAA *data ) { @@ -1524,7 +1524,7 @@ BOOL WINAPI FindNextFileA( HANDLE handle, WIN32_FIND_DATAA *data ) /************************************************************************* - * FindNextFile32W (KERNEL32.127) + * FindNextFileW (KERNEL32.127) */ BOOL WINAPI FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *data ) { @@ -1564,7 +1564,7 @@ BOOL16 WINAPI FindClose16( HANDLE16 handle ) /************************************************************************* - * FindClose32 (KERNEL32.119) + * FindClose (KERNEL32.119) */ BOOL WINAPI FindClose( HANDLE handle ) { diff --git a/files/drive.c b/files/drive.c index 24dc0b11d53..14d12d02e72 100644 --- a/files/drive.c +++ b/files/drive.c @@ -942,7 +942,7 @@ BOOL16 WINAPI GetDiskFreeSpace16( LPCSTR root, LPDWORD cluster_sectors, /*********************************************************************** - * GetDiskFreeSpace32A (KERNEL32.206) + * GetDiskFreeSpaceA (KERNEL32.206) * * Fails if expression resulting from current drive's dir and "root" * is not a root dir of the target drive. @@ -1034,7 +1034,7 @@ BOOL WINAPI GetDiskFreeSpaceA( LPCSTR root, LPDWORD cluster_sectors, /*********************************************************************** - * GetDiskFreeSpace32W (KERNEL32.207) + * GetDiskFreeSpaceW (KERNEL32.207) */ BOOL WINAPI GetDiskFreeSpaceW( LPCWSTR root, LPDWORD cluster_sectors, LPDWORD sector_bytes, LPDWORD free_clusters, @@ -1052,7 +1052,7 @@ BOOL WINAPI GetDiskFreeSpaceW( LPCWSTR root, LPDWORD cluster_sectors, /*********************************************************************** - * GetDiskFreeSpaceEx32A (KERNEL32.871) + * GetDiskFreeSpaceExA (KERNEL32.871) * * This function is used to aquire the size of the available and * total space on a logical volume. @@ -1128,7 +1128,7 @@ BOOL WINAPI GetDiskFreeSpaceExA( LPCSTR root, } /*********************************************************************** - * GetDiskFreeSpaceEx32W (KERNEL32.873) + * GetDiskFreeSpaceExW (KERNEL32.873) */ BOOL WINAPI GetDiskFreeSpaceExW( LPCWSTR root, PULARGE_INTEGER avail, PULARGE_INTEGER total, @@ -1171,7 +1171,7 @@ UINT16 WINAPI GetDriveType16( /*********************************************************************** - * GetDriveType32A (KERNEL32.208) + * GetDriveTypeA (KERNEL32.208) * * Returns the type of the disk drive specified. If root is NULL the * root of the current directory is used. @@ -1227,7 +1227,7 @@ UINT WINAPI GetDriveTypeA(LPCSTR root /* String describing drive */) /*********************************************************************** - * GetDriveType32W (KERNEL32.209) + * GetDriveTypeW (KERNEL32.209) */ UINT WINAPI GetDriveTypeW( LPCWSTR root ) { @@ -1248,7 +1248,7 @@ UINT16 WINAPI GetCurrentDirectory16( UINT16 buflen, LPSTR buf ) /*********************************************************************** - * GetCurrentDirectory32A (KERNEL32.196) + * GetCurrentDirectoryA (KERNEL32.196) */ UINT WINAPI GetCurrentDirectoryA( UINT buflen, LPSTR buf ) { @@ -1268,7 +1268,7 @@ UINT WINAPI GetCurrentDirectoryA( UINT buflen, LPSTR buf ) } /*********************************************************************** - * GetCurrentDirectory32W (KERNEL32.197) + * GetCurrentDirectoryW (KERNEL32.197) */ UINT WINAPI GetCurrentDirectoryW( UINT buflen, LPWSTR buf ) { @@ -1290,7 +1290,7 @@ BOOL16 WINAPI SetCurrentDirectory16( LPCSTR dir ) /*********************************************************************** - * SetCurrentDirectory32A (KERNEL32.479) + * SetCurrentDirectoryA (KERNEL32.479) */ BOOL WINAPI SetCurrentDirectoryA( LPCSTR dir ) { @@ -1321,7 +1321,7 @@ BOOL WINAPI SetCurrentDirectoryA( LPCSTR dir ) /*********************************************************************** - * SetCurrentDirectory32W (KERNEL32.480) + * SetCurrentDirectoryW (KERNEL32.480) */ BOOL WINAPI SetCurrentDirectoryW( LPCWSTR dirW ) { @@ -1333,7 +1333,7 @@ BOOL WINAPI SetCurrentDirectoryW( LPCWSTR dirW ) /*********************************************************************** - * GetLogicalDriveStrings32A (KERNEL32.231) + * GetLogicalDriveStringsA (KERNEL32.231) */ UINT WINAPI GetLogicalDriveStringsA( UINT len, LPSTR buffer ) { @@ -1362,7 +1362,7 @@ UINT WINAPI GetLogicalDriveStringsA( UINT len, LPSTR buffer ) /*********************************************************************** - * GetLogicalDriveStrings32W (KERNEL32.232) + * GetLogicalDriveStringsW (KERNEL32.232) */ UINT WINAPI GetLogicalDriveStringsW( UINT len, LPWSTR buffer ) { @@ -1406,7 +1406,7 @@ DWORD WINAPI GetLogicalDrives(void) /*********************************************************************** - * GetVolumeInformation32A (KERNEL32.309) + * GetVolumeInformationA (KERNEL32.309) */ BOOL WINAPI GetVolumeInformationA( LPCSTR root, LPSTR label, DWORD label_len, DWORD *serial, @@ -1467,7 +1467,7 @@ BOOL WINAPI GetVolumeInformationA( LPCSTR root, LPSTR label, /*********************************************************************** - * GetVolumeInformation32W (KERNEL32.310) + * GetVolumeInformationW (KERNEL32.310) */ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, DWORD *serial, diff --git a/files/file.c b/files/file.c index 76c2c6521a5..85bdb417409 100644 --- a/files/file.c +++ b/files/file.c @@ -386,7 +386,7 @@ HFILE FILE_CreateDevice( int client_id, DWORD access, LPSECURITY_ATTRIBUTES sa ) /************************************************************************* - * CreateFile32A [KERNEL32.45] Creates or opens a file or other object + * CreateFileA [KERNEL32.45] Creates or opens a file or other object * * Creates or opens an object, and returns a handle that can be used to * access that object. @@ -504,7 +504,7 @@ HANDLE WINAPI CreateFileA( LPCSTR filename, DWORD access, DWORD sharing, /************************************************************************* - * CreateFile32W (KERNEL32.48) + * CreateFileW (KERNEL32.48) */ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, LPSECURITY_ATTRIBUTES sa, DWORD creation, @@ -600,7 +600,7 @@ DWORD WINAPI GetFileAttributes16( LPCSTR name ) /************************************************************************** - * GetFileAttributes32A (KERNEL32.217) + * GetFileAttributesA (KERNEL32.217) */ DWORD WINAPI GetFileAttributesA( LPCSTR name ) { @@ -616,7 +616,7 @@ DWORD WINAPI GetFileAttributesA( LPCSTR name ) /************************************************************************** - * GetFileAttributes32W (KERNEL32.218) + * GetFileAttributesW (KERNEL32.218) */ DWORD WINAPI GetFileAttributesW( LPCWSTR name ) { @@ -738,7 +738,7 @@ static UINT FILE_GetTempFileName( LPCSTR path, LPCSTR prefix, UINT unique, /*********************************************************************** - * GetTempFileName32A (KERNEL32.290) + * GetTempFileNameA (KERNEL32.290) */ UINT WINAPI GetTempFileNameA( LPCSTR path, LPCSTR prefix, UINT unique, LPSTR buffer) @@ -747,7 +747,7 @@ UINT WINAPI GetTempFileNameA( LPCSTR path, LPCSTR prefix, UINT unique, } /*********************************************************************** - * GetTempFileName32W (KERNEL32.291) + * GetTempFileNameW (KERNEL32.291) */ UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique, LPWSTR buffer ) @@ -981,7 +981,7 @@ HFILE16 WINAPI OpenFile16( LPCSTR name, OFSTRUCT *ofs, UINT16 mode ) /*********************************************************************** - * OpenFile32 (KERNEL32.396) + * OpenFile (KERNEL32.396) */ HFILE WINAPI OpenFile( LPCSTR name, OFSTRUCT *ofs, UINT mode ) { @@ -1045,7 +1045,7 @@ error: /*********************************************************************** - * FILE_GetHandle32 + * FILE_GetHandle * * Return the Win32 handle for a DOS handle. */ @@ -1119,7 +1119,7 @@ HFILE16 WINAPI _lclose16( HFILE16 hFile ) /*********************************************************************** - * _lclose32 (KERNEL32.592) + * _lclose (KERNEL32.592) */ HFILE WINAPI _lclose( HFILE hFile ) { @@ -1243,7 +1243,7 @@ UINT16 WINAPI WIN16_lread( HFILE16 hFile, SEGPTR buffer, UINT16 count ) /*********************************************************************** - * _lread32 (KERNEL32.596) + * _lread (KERNEL32.596) */ UINT WINAPI _lread( HFILE handle, LPVOID buffer, UINT count ) { @@ -1329,7 +1329,7 @@ LONG WINAPI _llseek16( HFILE16 hFile, LONG lOffset, INT16 nOrigin ) /*********************************************************************** - * _llseek32 (KERNEL32.594) + * _llseek (KERNEL32.594) */ LONG WINAPI _llseek( HFILE hFile, LONG lOffset, INT nOrigin ) { @@ -1347,7 +1347,7 @@ HFILE16 WINAPI _lopen16( LPCSTR path, INT16 mode ) /*********************************************************************** - * _lopen32 (KERNEL32.595) + * _lopen (KERNEL32.595) */ HFILE WINAPI _lopen( LPCSTR path, INT mode ) { @@ -1368,7 +1368,7 @@ UINT16 WINAPI _lwrite16( HFILE16 hFile, LPCSTR buffer, UINT16 count ) } /*********************************************************************** - * _lwrite32 (KERNEL32.761) + * _lwrite (KERNEL32.761) */ UINT WINAPI _lwrite( HFILE hFile, LPCSTR buffer, UINT count ) { @@ -1386,7 +1386,7 @@ LONG WINAPI _hread16( HFILE16 hFile, LPVOID buffer, LONG count) /*********************************************************************** - * _hread32 (KERNEL32.590) + * _hread (KERNEL32.590) */ LONG WINAPI _hread( HFILE hFile, LPVOID buffer, LONG count) { @@ -1404,7 +1404,7 @@ LONG WINAPI _hwrite16( HFILE16 hFile, LPCSTR buffer, LONG count ) /*********************************************************************** - * _hwrite32 (KERNEL32.591) + * _hwrite (KERNEL32.591) * * experimentation yields that _lwrite: * o truncates the file at the current position with @@ -1484,7 +1484,7 @@ UINT16 WINAPI SetHandleCount16( UINT16 count ) /************************************************************************* - * SetHandleCount32 (KERNEL32.494) + * SetHandleCount (KERNEL32.494) */ UINT WINAPI SetHandleCount( UINT count ) { @@ -1524,7 +1524,7 @@ BOOL16 WINAPI DeleteFile16( LPCSTR path ) /*********************************************************************** - * DeleteFile32A (KERNEL32.71) + * DeleteFileA (KERNEL32.71) */ BOOL WINAPI DeleteFileA( LPCSTR path ) { @@ -1555,7 +1555,7 @@ BOOL WINAPI DeleteFileA( LPCSTR path ) /*********************************************************************** - * DeleteFile32W (KERNEL32.72) + * DeleteFileW (KERNEL32.72) */ BOOL WINAPI DeleteFileW( LPCWSTR path ) { @@ -1753,7 +1753,7 @@ BOOL WINAPI MoveFileExA( LPCSTR fn1, LPCSTR fn2, DWORD flag ) } /************************************************************************** - * MoveFileEx32W (KERNEL32.???) + * MoveFileExW (KERNEL32.???) */ BOOL WINAPI MoveFileExW( LPCWSTR fn1, LPCWSTR fn2, DWORD flag ) { @@ -1767,7 +1767,7 @@ BOOL WINAPI MoveFileExW( LPCWSTR fn1, LPCWSTR fn2, DWORD flag ) /************************************************************************** - * MoveFile32A (KERNEL32.387) + * MoveFileA (KERNEL32.387) * * Move file or directory */ @@ -1812,7 +1812,7 @@ BOOL WINAPI MoveFileA( LPCSTR fn1, LPCSTR fn2 ) /************************************************************************** - * MoveFile32W (KERNEL32.390) + * MoveFileW (KERNEL32.390) */ BOOL WINAPI MoveFileW( LPCWSTR fn1, LPCWSTR fn2 ) { @@ -1826,7 +1826,7 @@ BOOL WINAPI MoveFileW( LPCWSTR fn1, LPCWSTR fn2 ) /************************************************************************** - * CopyFile32A (KERNEL32.36) + * CopyFileA (KERNEL32.36) */ BOOL WINAPI CopyFileA( LPCSTR source, LPCSTR dest, BOOL fail_if_exists ) { @@ -1871,7 +1871,7 @@ done: /************************************************************************** - * CopyFile32W (KERNEL32.37) + * CopyFileW (KERNEL32.37) */ BOOL WINAPI CopyFileW( LPCWSTR source, LPCWSTR dest, BOOL fail_if_exists) { @@ -1885,7 +1885,7 @@ BOOL WINAPI CopyFileW( LPCWSTR source, LPCWSTR dest, BOOL fail_if_exists) /************************************************************************** - * CopyFileEx32A (KERNEL32.858) + * CopyFileExA (KERNEL32.858) * * This implementation ignores most of the extra parameters passed-in into * the "ex" version of the method and calls the CopyFile method. @@ -1912,7 +1912,7 @@ BOOL WINAPI CopyFileExA(LPCSTR sourceFilename, } /************************************************************************** - * CopyFileEx32W (KERNEL32.859) + * CopyFileExW (KERNEL32.859) */ BOOL WINAPI CopyFileExW(LPCWSTR sourceFilename, LPCWSTR destFilename, @@ -2245,7 +2245,7 @@ BOOL WINAPI UnlockFile( #endif /************************************************************************** - * GetFileAttributesEx32A [KERNEL32.874] + * GetFileAttributesExA [KERNEL32.874] */ BOOL WINAPI GetFileAttributesExA( LPCSTR lpFileName, GET_FILEEX_INFO_LEVELS fInfoLevelId, @@ -2280,7 +2280,7 @@ BOOL WINAPI GetFileAttributesExA( /************************************************************************** - * GetFileAttributesEx32W [KERNEL32.875] + * GetFileAttributesExW [KERNEL32.875] */ BOOL WINAPI GetFileAttributesExW( LPCWSTR lpFileName, GET_FILEEX_INFO_LEVELS fInfoLevelId, diff --git a/files/profile.c b/files/profile.c index bcac7883b83..12eaf7460a3 100644 --- a/files/profile.c +++ b/files/profile.c @@ -1081,7 +1081,7 @@ UINT16 WINAPI GetProfileInt16( LPCSTR section, LPCSTR entry, INT16 def_val ) /*********************************************************************** - * GetProfileInt32A (KERNEL32.264) + * GetProfileIntA (KERNEL32.264) */ UINT WINAPI GetProfileIntA( LPCSTR section, LPCSTR entry, INT def_val ) { @@ -1089,7 +1089,7 @@ UINT WINAPI GetProfileIntA( LPCSTR section, LPCSTR entry, INT def_val ) } /*********************************************************************** - * GetProfileInt32W (KERNEL32.264) + * GetProfileIntW (KERNEL32.264) */ UINT WINAPI GetProfileIntW( LPCWSTR section, LPCWSTR entry, INT def_val ) { @@ -1107,7 +1107,7 @@ INT16 WINAPI GetProfileString16( LPCSTR section, LPCSTR entry, LPCSTR def_val, } /*********************************************************************** - * GetProfileString32A (KERNEL32.268) + * GetProfileStringA (KERNEL32.268) */ INT WINAPI GetProfileStringA( LPCSTR section, LPCSTR entry, LPCSTR def_val, LPSTR buffer, UINT len ) @@ -1117,7 +1117,7 @@ INT WINAPI GetProfileStringA( LPCSTR section, LPCSTR entry, LPCSTR def_val, } /*********************************************************************** - * GetProfileString32W (KERNEL32.269) + * GetProfileStringW (KERNEL32.269) */ INT WINAPI GetProfileStringW( LPCWSTR section, LPCWSTR entry, LPCWSTR def_val, LPWSTR buffer, UINT len ) @@ -1136,7 +1136,7 @@ BOOL16 WINAPI WriteProfileString16( LPCSTR section, LPCSTR entry, } /*********************************************************************** - * WriteProfileString32A (KERNEL32.587) + * WriteProfileStringA (KERNEL32.587) */ BOOL WINAPI WriteProfileStringA( LPCSTR section, LPCSTR entry, LPCSTR string ) @@ -1145,7 +1145,7 @@ BOOL WINAPI WriteProfileStringA( LPCSTR section, LPCSTR entry, } /*********************************************************************** - * WriteProfileString32W (KERNEL32.588) + * WriteProfileStringW (KERNEL32.588) */ BOOL WINAPI WriteProfileStringW( LPCWSTR section, LPCWSTR entry, LPCWSTR string ) @@ -1169,7 +1169,7 @@ UINT16 WINAPI GetPrivateProfileInt16( LPCSTR section, LPCSTR entry, } /*********************************************************************** - * GetPrivateProfileInt32A (KERNEL32.251) + * GetPrivateProfileIntA (KERNEL32.251) */ UINT WINAPI GetPrivateProfileIntA( LPCSTR section, LPCSTR entry, INT def_val, LPCSTR filename ) @@ -1187,7 +1187,7 @@ UINT WINAPI GetPrivateProfileIntA( LPCSTR section, LPCSTR entry, } /*********************************************************************** - * GetPrivateProfileInt32W (KERNEL32.252) + * GetPrivateProfileIntW (KERNEL32.252) */ UINT WINAPI GetPrivateProfileIntW( LPCWSTR section, LPCWSTR entry, INT def_val, LPCWSTR filename ) @@ -1213,7 +1213,7 @@ INT16 WINAPI GetPrivateProfileString16( LPCSTR section, LPCSTR entry, } /*********************************************************************** - * GetPrivateProfileString32A (KERNEL32.255) + * GetPrivateProfileStringA (KERNEL32.255) */ INT WINAPI GetPrivateProfileStringA( LPCSTR section, LPCSTR entry, LPCSTR def_val, LPSTR buffer, @@ -1239,7 +1239,7 @@ INT WINAPI GetPrivateProfileStringA( LPCSTR section, LPCSTR entry, } /*********************************************************************** - * GetPrivateProfileString32W (KERNEL32.256) + * GetPrivateProfileStringW (KERNEL32.256) */ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, LPCWSTR def_val, LPWSTR buffer, @@ -1271,7 +1271,7 @@ INT16 WINAPI GetPrivateProfileSection16( LPCSTR section, LPSTR buffer, } /*********************************************************************** - * GetPrivateProfileSection32A (KERNEL32.255) + * GetPrivateProfileSectionA (KERNEL32.255) */ INT WINAPI GetPrivateProfileSectionA( LPCSTR section, LPSTR buffer, DWORD len, LPCSTR filename ) @@ -1290,7 +1290,7 @@ INT WINAPI GetPrivateProfileSectionA( LPCSTR section, LPSTR buffer, } /*********************************************************************** - * GetPrivateProfileSection32W (KERNEL32.256) + * GetPrivateProfileSectionW (KERNEL32.256) */ INT WINAPI GetPrivateProfileSectionW (LPCWSTR section, LPWSTR buffer, @@ -1318,7 +1318,7 @@ INT16 WINAPI GetProfileSection16( LPCSTR section, LPSTR buffer, UINT16 len ) } /*********************************************************************** - * GetProfileSection32A (KERNEL32.268) + * GetProfileSectionA (KERNEL32.268) */ INT WINAPI GetProfileSectionA( LPCSTR section, LPSTR buffer, DWORD len ) { @@ -1326,7 +1326,7 @@ INT WINAPI GetProfileSectionA( LPCSTR section, LPSTR buffer, DWORD len ) } /*********************************************************************** - * GetProfileSection32W (KERNEL32) + * GetProfileSectionW (KERNEL32) */ INT WINAPI GetProfileSectionW( LPCWSTR section, LPWSTR buffer, DWORD len ) { @@ -1344,7 +1344,7 @@ BOOL16 WINAPI WritePrivateProfileString16( LPCSTR section, LPCSTR entry, } /*********************************************************************** - * WritePrivateProfileString32A (KERNEL32.582) + * WritePrivateProfileStringA (KERNEL32.582) */ BOOL WINAPI WritePrivateProfileStringA( LPCSTR section, LPCSTR entry, LPCSTR string, LPCSTR filename ) @@ -1366,7 +1366,7 @@ BOOL WINAPI WritePrivateProfileStringA( LPCSTR section, LPCSTR entry, } /*********************************************************************** - * WritePrivateProfileString32W (KERNEL32.583) + * WritePrivateProfileStringW (KERNEL32.583) */ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, LPCWSTR string, LPCWSTR filename ) @@ -1427,7 +1427,7 @@ BOOL WINAPI WritePrivateProfileSectionA( LPCSTR section, } /*********************************************************************** - * WritePrivateProfileSection32W (KERNEL32) + * WritePrivateProfileSectionW (KERNEL32) */ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, LPCWSTR string, LPCWSTR filename) @@ -1452,7 +1452,7 @@ BOOL16 WINAPI WriteProfileSection16( LPCSTR section, LPCSTR keys_n_values) } /*********************************************************************** - * WriteProfileSection32A (KERNEL32.747) + * WriteProfileSectionA (KERNEL32.747) */ BOOL WINAPI WriteProfileSectionA( LPCSTR section, LPCSTR keys_n_values) @@ -1461,7 +1461,7 @@ BOOL WINAPI WriteProfileSectionA( LPCSTR section, LPCSTR keys_n_values) } /*********************************************************************** - * WriteProfileSection32W (KERNEL32.748) + * WriteProfileSectionW (KERNEL32.748) */ BOOL WINAPI WriteProfileSectionW( LPCWSTR section, LPCWSTR keys_n_values) { @@ -1498,7 +1498,7 @@ WORD WINAPI GetProfileSectionNames16( LPSTR buffer, WORD size) /*********************************************************************** - * GetPrivateProfileSectionNames32A (KERNEL32.365) + * GetPrivateProfileSectionNamesA (KERNEL32.365) */ DWORD WINAPI GetPrivateProfileSectionNamesA( LPSTR buffer, DWORD size, LPCSTR filename) @@ -1509,7 +1509,7 @@ DWORD WINAPI GetPrivateProfileSectionNamesA( LPSTR buffer, DWORD size, /*********************************************************************** - * GetPrivateProfileSectionNames32W (KERNEL32.366) + * GetPrivateProfileSectionNamesW (KERNEL32.366) */ DWORD WINAPI GetPrivateProfileSectionNamesW( LPWSTR buffer, DWORD size, LPCWSTR filename) @@ -1536,7 +1536,7 @@ BOOL16 WINAPI GetPrivateProfileStruct16(LPCSTR section, LPCSTR key, } /*********************************************************************** - * GetPrivateProfileStruct32A (KERNEL32.370) + * GetPrivateProfileStructA (KERNEL32.370) * * Should match Win95's behaviour pretty much */ @@ -1611,7 +1611,7 @@ BOOL WINAPI GetPrivateProfileStructA (LPCSTR section, LPCSTR key, } /*********************************************************************** - * GetPrivateProfileStruct32W (KERNEL32.543) + * GetPrivateProfileStructW (KERNEL32.543) */ BOOL WINAPI GetPrivateProfileStructW (LPCWSTR section, LPCWSTR key, LPVOID buffer, UINT len, LPCWSTR filename) @@ -1644,7 +1644,7 @@ BOOL16 WINAPI WritePrivateProfileStruct16 (LPCSTR section, LPCSTR key, } /*********************************************************************** - * WritePrivateProfileStruct32A (KERNEL32.744) + * WritePrivateProfileStructA (KERNEL32.744) */ BOOL WINAPI WritePrivateProfileStructA (LPCSTR section, LPCSTR key, LPVOID buf, UINT bufsize, LPCSTR filename) @@ -1683,7 +1683,7 @@ BOOL WINAPI WritePrivateProfileStructA (LPCSTR section, LPCSTR key, } /*********************************************************************** - * WritePrivateProfileStruct32W (KERNEL32.544) + * WritePrivateProfileStructW (KERNEL32.544) */ BOOL WINAPI WritePrivateProfileStructW (LPCWSTR section, LPCWSTR key, LPVOID buf, UINT bufsize, LPCWSTR filename) diff --git a/graphics/bitblt.c b/graphics/bitblt.c index 9e2572505c4..b739aec66f4 100644 --- a/graphics/bitblt.c +++ b/graphics/bitblt.c @@ -27,7 +27,7 @@ BOOL16 WINAPI PatBlt16( HDC16 hdc, INT16 left, INT16 top, /*********************************************************************** - * PatBlt32 (GDI32.260) + * PatBlt (GDI32.260) */ BOOL WINAPI PatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop) @@ -62,7 +62,7 @@ BOOL16 WINAPI BitBlt16( HDC16 hdcDst, INT16 xDst, INT16 yDst, INT16 width, /*********************************************************************** - * BitBlt32 (GDI32.10) + * BitBlt (GDI32.10) */ BOOL WINAPI BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width, INT height, HDC hdcSrc, INT xSrc, INT ySrc, @@ -107,7 +107,7 @@ BOOL16 WINAPI StretchBlt16( HDC16 hdcDst, INT16 xDst, INT16 yDst, /*********************************************************************** - * StretchBlt32 (GDI32.350) + * StretchBlt (GDI32.350) */ BOOL WINAPI StretchBlt( HDC hdcDst, INT xDst, INT yDst, INT widthDst, INT heightDst, @@ -149,7 +149,7 @@ BOOL16 WINAPI FastWindowFrame16( HDC16 hdc, const RECT16 *rect, return TRUE; } /*********************************************************************** - * MaskBlt32 [GDI32.252] + * MaskBlt [GDI32.252] */ BOOL WINAPI MaskBlt(HDC hdcDest, INT nXDest, INT nYDest, INT nWidth, INT nHeight, HDC hdcSource, diff --git a/graphics/fontengine.c b/graphics/fontengine.c index eba7070317e..abf3346fa54 100644 --- a/graphics/fontengine.c +++ b/graphics/fontengine.c @@ -12,12 +12,10 @@ #include "font.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(font) +DEFAULT_DEBUG_CHANNEL(font); - - -/* **************************************************************** - * EngineEnumerateFont [GDI.300] +/*********************************************************************** + * EngineEnumerateFont16 (GDI.300) */ WORD WINAPI EngineEnumerateFont16(LPSTR fontname, FARPROC16 proc, DWORD data ) @@ -26,8 +24,8 @@ EngineEnumerateFont16(LPSTR fontname, FARPROC16 proc, DWORD data ) return 0; } -/* **************************************************************** - * EngineDeleteFont [GDI.301] +/*********************************************************************** + * EngineDeleteFont16 (GDI.301) */ WORD WINAPI EngineDeleteFont16(LPFONTINFO16 lpFontInfo) { @@ -52,8 +50,8 @@ WORD WINAPI EngineDeleteFont16(LPFONTINFO16 lpFontInfo) return 1; } -/* **************************************************************** - * EngineRealizeFont [GDI.302] +/*********************************************************************** + * EngineRealizeFont16 (GDI.302) */ WORD WINAPI EngineRealizeFont16(LPLOGFONT16 lplogFont, LPTEXTXFORM16 lptextxform, LPFONTINFO16 lpfontInfo) { @@ -62,8 +60,8 @@ WORD WINAPI EngineRealizeFont16(LPLOGFONT16 lplogFont, LPTEXTXFORM16 lptextxform return 0; } -/* **************************************************************** - * EngineRealizeFontExt [GDI.315] +/*********************************************************************** + * EngineRealizeFontExt16 (GDI.315) */ WORD WINAPI EngineRealizeFontExt16(LONG l1, LONG l2, LONG l3, LONG l4) { @@ -72,8 +70,8 @@ WORD WINAPI EngineRealizeFontExt16(LONG l1, LONG l2, LONG l3, LONG l4) return 0; } -/* **************************************************************** - * EngineGetCharWidth [GDI.303] +/*********************************************************************** + * EngineGetCharWidth16 (GDI.303) */ WORD WINAPI EngineGetCharWidth16(LPFONTINFO16 lpFontInfo, BYTE firstChar, BYTE lastChar, LPINT16 buffer) { @@ -85,8 +83,8 @@ WORD WINAPI EngineGetCharWidth16(LPFONTINFO16 lpFontInfo, BYTE firstChar, BYTE l return 1; } -/* **************************************************************** - * EngineSetFontContext [GDI.304] +/*********************************************************************** + * EngineSetFontContext (GDI.304) */ WORD WINAPI EngineSetFontContext(LPFONTINFO16 lpFontInfo, WORD data) { @@ -94,8 +92,8 @@ WORD WINAPI EngineSetFontContext(LPFONTINFO16 lpFontInfo, WORD data) return 0; } -/* **************************************************************** - * EngineGetGlyphBMP [GDI.305] +/*********************************************************************** + * EngineGetGlyphBMP (GDI.305) */ WORD WINAPI EngineGetGlyphBMP(WORD word, LPFONTINFO16 lpFontInfo, WORD w1, WORD w2, LPSTR string, DWORD dword, /*LPBITMAPMETRICS16*/ LPVOID metrics) { @@ -103,8 +101,8 @@ WORD WINAPI EngineGetGlyphBMP(WORD word, LPFONTINFO16 lpFontInfo, WORD w1, WORD return 0; } -/* **************************************************************** - * EngineMakeFontDir [GDI.306] +/*********************************************************************** + * EngineMakeFontDir (GDI.306) */ DWORD WINAPI EngineMakeFontDir(HDC16 hdc, LPFONTDIR16 fontdir, LPCSTR string) { @@ -113,10 +111,9 @@ DWORD WINAPI EngineMakeFontDir(HDC16 hdc, LPFONTDIR16 fontdir, LPCSTR string) } -/* **************************************************************** - * EngineExtTextOut [GDI.314] +/*********************************************************************** + * EngineExtTextOut (GDI.314) */ - WORD WINAPI EngineExtTextOut() { FIXME("stub!\n"); diff --git a/graphics/mapping.c b/graphics/mapping.c index 429dbf10457..4cab2048f30 100644 --- a/graphics/mapping.c +++ b/graphics/mapping.c @@ -53,7 +53,7 @@ BOOL16 WINAPI DPtoLP16( HDC16 hdc, LPPOINT16 points, INT16 count ) /*********************************************************************** - * DPtoLP32 (GDI32.65) + * DPtoLP (GDI32.65) */ BOOL WINAPI DPtoLP( HDC hdc, LPPOINT points, INT count ) { @@ -89,7 +89,7 @@ BOOL16 WINAPI LPtoDP16( HDC16 hdc, LPPOINT16 points, INT16 count ) /*********************************************************************** - * LPtoDP32 (GDI32.247) + * LPtoDP (GDI32.247) */ BOOL WINAPI LPtoDP( HDC hdc, LPPOINT points, INT count ) { @@ -115,7 +115,7 @@ INT16 WINAPI SetMapMode16( HDC16 hdc, INT16 mode ) /*********************************************************************** - * SetMapMode32 (GDI32.321) + * SetMapMode (GDI32.321) */ INT WINAPI SetMapMode( HDC hdc, INT mode ) { @@ -208,7 +208,7 @@ BOOL16 WINAPI SetViewportExtEx16( HDC16 hdc, INT16 x, INT16 y, LPSIZE16 size ) /*********************************************************************** - * SetViewportExtEx32 (GDI32.340) + * SetViewportExtEx (GDI32.340) */ BOOL WINAPI SetViewportExtEx( HDC hdc, INT x, INT y, LPSIZE size ) { @@ -256,7 +256,7 @@ BOOL16 WINAPI SetViewportOrgEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt ) /*********************************************************************** - * SetViewportOrgEx32 (GDI32.341) + * SetViewportOrgEx (GDI32.341) */ BOOL WINAPI SetViewportOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) { @@ -300,7 +300,7 @@ BOOL16 WINAPI SetWindowExtEx16( HDC16 hdc, INT16 x, INT16 y, LPSIZE16 size ) /*********************************************************************** - * SetWindowExtEx32 (GDI32.344) + * SetWindowExtEx (GDI32.344) */ BOOL WINAPI SetWindowExtEx( HDC hdc, INT x, INT y, LPSIZE size ) { @@ -347,7 +347,7 @@ BOOL16 WINAPI SetWindowOrgEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt ) /*********************************************************************** - * SetWindowOrgEx32 (GDI32.345) + * SetWindowOrgEx (GDI32.345) */ BOOL WINAPI SetWindowOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) { @@ -390,7 +390,7 @@ BOOL16 WINAPI OffsetViewportOrgEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt) /*********************************************************************** - * OffsetViewportOrgEx32 (GDI32.257) + * OffsetViewportOrgEx (GDI32.257) */ BOOL WINAPI OffsetViewportOrgEx( HDC hdc, INT x, INT y, LPPOINT pt) { @@ -434,7 +434,7 @@ BOOL16 WINAPI OffsetWindowOrgEx16( HDC16 hdc, INT16 x, INT16 y, LPPOINT16 pt ) /*********************************************************************** - * OffsetWindowOrgEx32 (GDI32.258) + * OffsetWindowOrgEx (GDI32.258) */ BOOL WINAPI OffsetWindowOrgEx( HDC hdc, INT x, INT y, LPPOINT pt ) { @@ -482,7 +482,7 @@ BOOL16 WINAPI ScaleViewportExtEx16( HDC16 hdc, INT16 xNum, INT16 xDenom, /*********************************************************************** - * ScaleViewportExtEx32 (GDI32.293) + * ScaleViewportExtEx (GDI32.293) */ BOOL WINAPI ScaleViewportExtEx( HDC hdc, INT xNum, INT xDenom, INT yNum, INT yDenom, LPSIZE size ) @@ -537,7 +537,7 @@ BOOL16 WINAPI ScaleWindowExtEx16( HDC16 hdc, INT16 xNum, INT16 xDenom, /*********************************************************************** - * ScaleWindowExtEx32 (GDI32.294) + * ScaleWindowExtEx (GDI32.294) */ BOOL WINAPI ScaleWindowExtEx( HDC hdc, INT xNum, INT xDenom, INT yNum, INT yDenom, LPSIZE size ) diff --git a/graphics/win16drv/prtdrv.c b/graphics/win16drv/prtdrv.c index ac97af5b71a..03a35534c72 100644 --- a/graphics/win16drv/prtdrv.c +++ b/graphics/win16drv/prtdrv.c @@ -695,12 +695,18 @@ DWORD PRTDRV_ExtTextOut(LPPDEVICE lpDestDev, WORD wDestXOrg, WORD wDestYOrg, return dwRet; } +/*********************************************************************** + * dmEnumDFonts16 + */ int WINAPI dmEnumDFonts16(LPPDEVICE lpDestDev, LPSTR lpFaceName, FARPROC16 lpCallbackFunc, LPVOID lpClientData) { /* Windows 3.1 just returns 1 */ return 1; } +/*********************************************************************** + * dmRealizeObject16 + */ int WINAPI dmRealizeObject16(LPPDEVICE lpDestDev, INT16 wStyle, LPSTR lpInObj, LPSTR lpOutObj, SEGPTR lpTextXForm) { FIXME("(lpDestDev=%08x,wStyle=%04x,lpInObj=%08x,lpOutObj=%08x,lpTextXForm=%08x): stub\n", diff --git a/if1632/dummy.c b/if1632/dummy.c index 36427005ee6..c9b621c65f4 100644 --- a/if1632/dummy.c +++ b/if1632/dummy.c @@ -5,13 +5,44 @@ #include "windef.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(relay) +DEFAULT_DEBUG_CHANNEL(relay); +/*********************************************************************** + * stub_GDI_379 + */ LONG WINAPI stub_GDI_379(HDC16 hdc) { FIXME("STARTPAGE: stub\n"); return 1; } + +/*********************************************************************** + * stub_GDI_381 + */ LONG WINAPI stub_GDI_381(HDC16 hdc, SEGPTR proc) { FIXME("SETABORTPROC: stub\n"); return 1; } + +/*********************************************************************** + * stub_GDI_382 + */ LONG WINAPI stub_GDI_382(void) { FIXME("ABORTPROC: stub\n"); return 1; } + +/*********************************************************************** + * stub_USER_489 + */ LONG WINAPI stub_USER_489(void) { FIXME("stub\n"); return 0; } + +/*********************************************************************** + * stub_USER_490 + */ LONG WINAPI stub_USER_490(void) { FIXME("stub\n"); return 0; } + +/*********************************************************************** + * stub_USER_492 + */ LONG WINAPI stub_USER_492(void) { FIXME("stub\n"); return 0; } + +/*********************************************************************** + * stub_USER_496 + */ LONG WINAPI stub_USER_496(void) { FIXME("stub\n"); return 0; } + +/*********************************************************************** + * KERNEL_nop + */ LONG WINAPI KERNEL_nop(void) { return 0; } diff --git a/loader/module.c b/loader/module.c index d463297315a..f779f78b269 100644 --- a/loader/module.c +++ b/loader/module.c @@ -1250,7 +1250,7 @@ BOOL WINAPI CreateProcessW( LPCWSTR lpApplicationName, LPWSTR lpCommandLine, } /*********************************************************************** - * GetModuleHandle (KERNEL32.237) + * GetModuleHandleA (KERNEL32.237) */ HMODULE WINAPI GetModuleHandleA(LPCSTR module) { @@ -1264,6 +1264,9 @@ HMODULE WINAPI GetModuleHandleA(LPCSTR module) return wm? wm->module : 0; } +/*********************************************************************** + * GetModuleHandleW + */ HMODULE WINAPI GetModuleHandleW(LPCWSTR module) { HMODULE hModule; @@ -1300,7 +1303,7 @@ DWORD WINAPI GetModuleFileNameA( /*********************************************************************** - * GetModuleFileName32W (KERNEL32.236) + * GetModuleFileNameW (KERNEL32.236) */ DWORD WINAPI GetModuleFileNameW( HMODULE hModule, LPWSTR lpFileName, DWORD size ) @@ -1699,7 +1702,7 @@ FARPROC16 WINAPI GetProcAddress16( HMODULE16 hModule, SEGPTR name ) /*********************************************************************** - * GetProcAddress32 (KERNEL32.257) + * GetProcAddress (KERNEL32.257) */ FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function ) { @@ -1715,7 +1718,7 @@ FARPROC WINAPI GetProcAddress32_16( HMODULE hModule, LPCSTR function ) } /*********************************************************************** - * MODULE_GetProcAddress32 (internal) + * MODULE_GetProcAddress (internal) */ FARPROC MODULE_GetProcAddress( HMODULE hModule, /* [in] current module handle */ @@ -1752,7 +1755,7 @@ FARPROC MODULE_GetProcAddress( /*********************************************************************** - * RtlImageNtHeaders (NTDLL) + * RtlImageNtHeader (NTDLL) */ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule) { diff --git a/loader/resource.c b/loader/resource.c index 472be198284..6df863631af 100644 --- a/loader/resource.c +++ b/loader/resource.c @@ -572,7 +572,7 @@ HACCEL16 WINAPI LoadAccelerators16(HINSTANCE16 instance, SEGPTR lpTableName) } /********************************************************************** - * LoadAccelerators32W [USER.177] + * LoadAcceleratorsW [USER.177] * The image layout seems to look like this (not 100% sure): * 00: BYTE type type of accelerator * 01: BYTE pad (to WORD boundary) @@ -619,6 +619,9 @@ HACCEL WINAPI LoadAcceleratorsW(HINSTANCE instance,LPCWSTR lpTableName) return hRetval; } +/*********************************************************************** + * LoadAcceleratorsA + */ HACCEL WINAPI LoadAcceleratorsA(HINSTANCE instance,LPCSTR lpTableName) { LPWSTR uni; @@ -633,7 +636,7 @@ HACCEL WINAPI LoadAcceleratorsA(HINSTANCE instance,LPCSTR lpTableName) } /********************************************************************** - * CopyAcceleratorTable32A (USER32.58) + * CopyAcceleratorTableA (USER32.58) */ INT WINAPI CopyAcceleratorTableA(HACCEL src, LPACCEL dst, INT entries) { @@ -641,7 +644,7 @@ INT WINAPI CopyAcceleratorTableA(HACCEL src, LPACCEL dst, INT entries) } /********************************************************************** - * CopyAcceleratorTable32W (USER32.59) + * CopyAcceleratorTableW (USER32.59) * * By mortene@pvv.org 980321 */ @@ -695,7 +698,7 @@ INT WINAPI CopyAcceleratorTableW(HACCEL src, LPACCEL dst, } /********************************************************************* - * CreateAcceleratorTable (USER32.64) + * CreateAcceleratorTableA (USER32.64) * * By mortene@pvv.org 980321 */ @@ -857,7 +860,7 @@ INT16 WINAPI LoadString16( HINSTANCE16 instance, UINT16 resource_id, } /********************************************************************** - * LoadString32W (USER32.376) + * LoadStringW (USER32.376) */ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id, LPWSTR buffer, INT buflen ) @@ -908,7 +911,7 @@ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id, } /********************************************************************** - * LoadString32A (USER32.375) + * LoadStringA (USER32.375) */ INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id, LPSTR buffer, INT buflen ) @@ -980,7 +983,7 @@ INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id, */ /********************************************************************** - * LoadMessage32A (internal) + * LoadMessageA (internal) */ INT WINAPI LoadMessageA( HMODULE instance, UINT id, WORD lang, LPSTR buffer, INT buflen ) @@ -1038,7 +1041,7 @@ INT WINAPI LoadMessageA( HMODULE instance, UINT id, WORD lang, } /********************************************************************** - * LoadMessage32W (internal) + * LoadMessageW (internal) */ INT WINAPI LoadMessageW( HMODULE instance, UINT id, WORD lang, LPWSTR buffer, INT buflen ) diff --git a/loader/task.c b/loader/task.c index 4a6fad72765..fab5082d9f5 100644 --- a/loader/task.c +++ b/loader/task.c @@ -1671,7 +1671,7 @@ DWORD WINAPI GetAppCompatFlags16( HTASK16 hTask ) /*********************************************************************** - * GetAppCompatFlags32 (USER32.206) + * GetAppCompatFlags (USER32.206) */ DWORD WINAPI GetAppCompatFlags( HTASK hTask ) { diff --git a/memory/atom.c b/memory/atom.c index 637ff64028c..36db711c52f 100644 --- a/memory/atom.c +++ b/memory/atom.c @@ -402,7 +402,7 @@ UINT16 WINAPI GetAtomName16( ATOM atom, LPSTR buffer, INT16 count ) /*********************************************************************** - * AddAtom32A (KERNEL32.0) + * AddAtomA (KERNEL32.0) * Adds a string to the atom table and returns the atom identifying the * string. * @@ -418,8 +418,8 @@ ATOM WINAPI AddAtomA( /*********************************************************************** - * AddAtom32W (KERNEL32.1) - * See AddAtom32A + * AddAtomW (KERNEL32.1) + * See AddAtomA */ ATOM WINAPI AddAtomW( LPCWSTR str ) { @@ -428,7 +428,7 @@ ATOM WINAPI AddAtomW( LPCWSTR str ) /*********************************************************************** - * DeleteAtom32 (KERNEL32.69) + * DeleteAtom (KERNEL32.69) * Decrements the reference count of a string atom. If count becomes * zero, the string associated with the atom is removed from the table. * @@ -444,7 +444,7 @@ ATOM WINAPI DeleteAtom( /*********************************************************************** - * FindAtom32A (KERNEL32.117) + * FindAtomA (KERNEL32.117) * Searches the local atom table for the string and returns the atom * associated with that string. * @@ -460,8 +460,8 @@ ATOM WINAPI FindAtomA( /*********************************************************************** - * FindAtom32W (KERNEL32.118) - * See FindAtom32A + * FindAtomW (KERNEL32.118) + * See FindAtomA */ ATOM WINAPI FindAtomW( LPCWSTR str ) { @@ -470,7 +470,7 @@ ATOM WINAPI FindAtomW( LPCWSTR str ) /*********************************************************************** - * GetAtomName32A (KERNEL32.149) + * GetAtomNameA (KERNEL32.149) * Retrieves a copy of the string associated with the atom. * * RETURNS @@ -487,8 +487,8 @@ UINT WINAPI GetAtomNameA( /*********************************************************************** - * GetAtomName32W (KERNEL32.150) - * See GetAtomName32A + * GetAtomNameW (KERNEL32.150) + * See GetAtomNameA */ UINT WINAPI GetAtomNameW( ATOM atom, LPWSTR buffer, INT count ) { diff --git a/memory/environ.c b/memory/environ.c index c6033d58e98..a41f0e51150 100644 --- a/memory/environ.c +++ b/memory/environ.c @@ -170,7 +170,7 @@ void ENV_FreeEnvironment( PDB *pdb ) /*********************************************************************** - * GetCommandLine32A (KERNEL32.289) + * GetCommandLineA (KERNEL32.289) */ LPCSTR WINAPI GetCommandLineA(void) { @@ -178,7 +178,7 @@ LPCSTR WINAPI GetCommandLineA(void) } /*********************************************************************** - * GetCommandLine32W (KERNEL32.290) + * GetCommandLineW (KERNEL32.290) */ LPCWSTR WINAPI GetCommandLineW(void) { @@ -193,7 +193,7 @@ LPCWSTR WINAPI GetCommandLineW(void) /*********************************************************************** - * GetEnvironmentStrings32A (KERNEL32.319) (KERNEL32.320) + * GetEnvironmentStringsA (KERNEL32.319) (KERNEL32.320) */ LPSTR WINAPI GetEnvironmentStringsA(void) { @@ -203,7 +203,7 @@ LPSTR WINAPI GetEnvironmentStringsA(void) /*********************************************************************** - * GetEnvironmentStrings32W (KERNEL32.321) + * GetEnvironmentStringsW (KERNEL32.321) */ LPWSTR WINAPI GetEnvironmentStringsW(void) { @@ -225,7 +225,7 @@ LPWSTR WINAPI GetEnvironmentStringsW(void) /*********************************************************************** - * FreeEnvironmentStrings32A (KERNEL32.268) + * FreeEnvironmentStringsA (KERNEL32.268) */ BOOL WINAPI FreeEnvironmentStringsA( LPSTR ptr ) { @@ -240,7 +240,7 @@ BOOL WINAPI FreeEnvironmentStringsA( LPSTR ptr ) /*********************************************************************** - * FreeEnvironmentStrings32W (KERNEL32.269) + * FreeEnvironmentStringsW (KERNEL32.269) */ BOOL WINAPI FreeEnvironmentStringsW( LPWSTR ptr ) { @@ -249,7 +249,7 @@ BOOL WINAPI FreeEnvironmentStringsW( LPWSTR ptr ) /*********************************************************************** - * GetEnvironmentVariable32A (KERNEL32.322) + * GetEnvironmentVariableA (KERNEL32.322) */ DWORD WINAPI GetEnvironmentVariableA( LPCSTR name, LPSTR value, DWORD size ) { @@ -281,7 +281,7 @@ DWORD WINAPI GetEnvironmentVariableA( LPCSTR name, LPSTR value, DWORD size ) /*********************************************************************** - * GetEnvironmentVariable32W (KERNEL32.323) + * GetEnvironmentVariableW (KERNEL32.323) */ DWORD WINAPI GetEnvironmentVariableW( LPCWSTR nameW, LPWSTR valW, DWORD size) { @@ -299,7 +299,7 @@ DWORD WINAPI GetEnvironmentVariableW( LPCWSTR nameW, LPWSTR valW, DWORD size) /*********************************************************************** - * SetEnvironmentVariable32A (KERNEL32.641) + * SetEnvironmentVariableA (KERNEL32.641) */ BOOL WINAPI SetEnvironmentVariableA( LPCSTR name, LPCSTR value ) { @@ -357,7 +357,7 @@ done: /*********************************************************************** - * SetEnvironmentVariable32W (KERNEL32.642) + * SetEnvironmentVariableW (KERNEL32.642) */ BOOL WINAPI SetEnvironmentVariableW( LPCWSTR name, LPCWSTR value ) { @@ -371,7 +371,7 @@ BOOL WINAPI SetEnvironmentVariableW( LPCWSTR name, LPCWSTR value ) /*********************************************************************** - * ExpandEnvironmentStrings32A (KERNEL32.216) + * ExpandEnvironmentStringsA (KERNEL32.216) * * Note: overlapping buffers are not supported; this is how it should be. */ @@ -440,7 +440,7 @@ DWORD WINAPI ExpandEnvironmentStringsA( LPCSTR src, LPSTR dst, DWORD count ) /*********************************************************************** - * ExpandEnvironmentStrings32W (KERNEL32.217) + * ExpandEnvironmentStringsW (KERNEL32.217) */ DWORD WINAPI ExpandEnvironmentStringsW( LPCWSTR src, LPWSTR dst, DWORD len ) { diff --git a/memory/global.c b/memory/global.c index 1e4ad1fc90d..e40b431919c 100644 --- a/memory/global.c +++ b/memory/global.c @@ -1004,7 +1004,7 @@ static HANDLE GLOBAL_GetHeap( HGLOBAL hmem ) } /*********************************************************************** - * GlobalAlloc32 (KERNEL32.315) + * GlobalAlloc (KERNEL32.315) * RETURNS * Handle: Success * NULL: Failure @@ -1059,7 +1059,7 @@ HGLOBAL WINAPI GlobalAlloc( /*********************************************************************** - * GlobalLock32 (KERNEL32.326) + * GlobalLock (KERNEL32.326) * RETURNS * Pointer to first byte of block * NULL: Failure @@ -1093,7 +1093,7 @@ LPVOID WINAPI GlobalLock( /*********************************************************************** - * GlobalUnlock32 (KERNEL32.332) + * GlobalUnlock (KERNEL32.332) * RETURNS * TRUE: Object is still locked * FALSE: Object is unlocked @@ -1128,7 +1128,7 @@ BOOL WINAPI GlobalUnlock( /*********************************************************************** - * GlobalHandle32 (KERNEL32.325) + * GlobalHandle (KERNEL32.325) * Returns the handle associated with the specified pointer. * * NOTES @@ -1181,7 +1181,7 @@ HGLOBAL WINAPI GlobalHandle( /*********************************************************************** - * GlobalReAlloc32 (KERNEL32.328) + * GlobalReAlloc (KERNEL32.328) * RETURNS * Handle: Success * NULL: Failure @@ -1279,7 +1279,7 @@ HGLOBAL WINAPI GlobalReAlloc( /*********************************************************************** - * GlobalFree32 (KERNEL32.322) + * GlobalFree (KERNEL32.322) * RETURNS * NULL: Success * Handle: Failure @@ -1322,7 +1322,7 @@ HGLOBAL WINAPI GlobalFree( /*********************************************************************** - * GlobalSize32 (KERNEL32.329) + * GlobalSize (KERNEL32.329) * RETURNS * Size in bytes of the global memory object * 0: Failure @@ -1365,7 +1365,7 @@ DWORD WINAPI GlobalSize( /*********************************************************************** - * GlobalWire32 (KERNEL32.333) + * GlobalWire (KERNEL32.333) */ LPVOID WINAPI GlobalWire(HGLOBAL hmem) { @@ -1374,7 +1374,7 @@ LPVOID WINAPI GlobalWire(HGLOBAL hmem) /*********************************************************************** - * GlobalUnWire32 (KERNEL32.330) + * GlobalUnWire (KERNEL32.330) */ BOOL WINAPI GlobalUnWire(HGLOBAL hmem) { @@ -1383,7 +1383,7 @@ BOOL WINAPI GlobalUnWire(HGLOBAL hmem) /*********************************************************************** - * GlobalFix32 (KERNEL32.320) + * GlobalFix (KERNEL32.320) */ VOID WINAPI GlobalFix(HGLOBAL hmem) { @@ -1392,7 +1392,7 @@ VOID WINAPI GlobalFix(HGLOBAL hmem) /*********************************************************************** - * GlobalUnfix32 (KERNEL32.331) + * GlobalUnfix (KERNEL32.331) */ VOID WINAPI GlobalUnfix(HGLOBAL hmem) { @@ -1401,7 +1401,7 @@ VOID WINAPI GlobalUnfix(HGLOBAL hmem) /*********************************************************************** - * GlobalFlags32 (KERNEL32.321) + * GlobalFlags (KERNEL32.321) * Returns information about the specified global memory object * * NOTES @@ -1443,7 +1443,7 @@ UINT WINAPI GlobalFlags( /*********************************************************************** - * GlobalCompact32 (KERNEL32.316) + * GlobalCompact (KERNEL32.316) */ DWORD WINAPI GlobalCompact( DWORD minfree ) { diff --git a/memory/local.c b/memory/local.c index 283305778bc..fd08b422272 100644 --- a/memory/local.c +++ b/memory/local.c @@ -1789,7 +1789,7 @@ BOOL16 WINAPI LocalNext16( LOCALENTRY *pLocalEntry ) /*********************************************************************** - * LocalAlloc32 (KERNEL32.371) + * LocalAlloc (KERNEL32.371) * RETURNS * Handle: Success * NULL: Failure @@ -1803,7 +1803,7 @@ HLOCAL WINAPI LocalAlloc( /*********************************************************************** - * LocalCompact32 (KERNEL32.372) + * LocalCompact (KERNEL32.372) */ UINT WINAPI LocalCompact( UINT minfree ) { @@ -1812,7 +1812,7 @@ UINT WINAPI LocalCompact( UINT minfree ) /*********************************************************************** - * LocalFlags32 (KERNEL32.374) + * LocalFlags (KERNEL32.374) * RETURNS * Value specifying allocation flags and lock count. * LMEM_INVALID_HANDLE: Failure @@ -1825,7 +1825,7 @@ UINT WINAPI LocalFlags( /*********************************************************************** - * LocalFree32 (KERNEL32.375) + * LocalFree (KERNEL32.375) * RETURNS * NULL: Success * Handle: Failure @@ -1838,7 +1838,7 @@ HLOCAL WINAPI LocalFree( /*********************************************************************** - * LocalHandle32 (KERNEL32.376) + * LocalHandle (KERNEL32.376) * RETURNS * Handle: Success * NULL: Failure @@ -1851,7 +1851,7 @@ HLOCAL WINAPI LocalHandle( /*********************************************************************** - * LocalLock32 (KERNEL32.377) + * LocalLock (KERNEL32.377) * Locks a local memory object and returns pointer to the first byte * of the memory block. * @@ -1867,7 +1867,7 @@ LPVOID WINAPI LocalLock( /*********************************************************************** - * LocalReAlloc32 (KERNEL32.378) + * LocalReAlloc (KERNEL32.378) * RETURNS * Handle: Success * NULL: Failure @@ -1882,7 +1882,7 @@ HLOCAL WINAPI LocalReAlloc( /*********************************************************************** - * LocalShrink32 (KERNEL32.379) + * LocalShrink (KERNEL32.379) */ UINT WINAPI LocalShrink( HGLOBAL handle, UINT newsize ) { @@ -1891,7 +1891,7 @@ UINT WINAPI LocalShrink( HGLOBAL handle, UINT newsize ) /*********************************************************************** - * LocalSize32 (KERNEL32.380) + * LocalSize (KERNEL32.380) * RETURNS * Size: Success * 0: Failure @@ -1904,7 +1904,7 @@ UINT WINAPI LocalSize( /*********************************************************************** - * LocalUnlock32 (KERNEL32.381) + * LocalUnlock (KERNEL32.381) * RETURNS * TRUE: Object is still locked * FALSE: Object is unlocked diff --git a/memory/string.c b/memory/string.c index cf99b839b1c..34a5303bd85 100644 --- a/memory/string.c +++ b/memory/string.c @@ -158,7 +158,7 @@ INT16 WINAPI lstrcmp16( LPCSTR str1, LPCSTR str2 ) /*********************************************************************** - * lstrcmp32A (KERNEL.602) + * lstrcmpA (KERNEL.602) */ INT WINAPI lstrcmpA( LPCSTR str1, LPCSTR str2 ) { @@ -167,8 +167,8 @@ INT WINAPI lstrcmpA( LPCSTR str1, LPCSTR str2 ) /*********************************************************************** - * lstrcmp32W (KERNEL.603) - * FIXME : should call CompareString32W, when it is implemented. + * lstrcmpW (KERNEL.603) + * FIXME : should call CompareStringW, when it is implemented. * This implementation is not "word sort", as it should. */ INT WINAPI lstrcmpW( LPCWSTR str1, LPCWSTR str2 ) @@ -194,7 +194,7 @@ INT16 WINAPI lstrcmpi16( LPCSTR str1, LPCSTR str2 ) /*********************************************************************** - * lstrcmpi32A (KERNEL32.605) + * lstrcmpiA (KERNEL32.605) */ INT WINAPI lstrcmpiA( LPCSTR str1, LPCSTR str2 ) { TRACE("strcmpi %s and %s\n", @@ -204,7 +204,7 @@ INT WINAPI lstrcmpiA( LPCSTR str1, LPCSTR str2 ) /*********************************************************************** - * lstrcmpi32W (KERNEL32.606) + * lstrcmpiW (KERNEL32.606) */ INT WINAPI lstrcmpiW( LPCWSTR str1, LPCWSTR str2 ) { @@ -294,7 +294,7 @@ SEGPTR WINAPI lstrcpyn16( SEGPTR dst, LPCSTR src, INT16 n ) /*********************************************************************** - * lstrcpyn32A (KERNEL32.611) + * lstrcpynA (KERNEL32.611) * Note: this function differs from the UNIX strncpy, it _always_ writes * a terminating \0 */ @@ -317,7 +317,7 @@ LPSTR WINAPI lstrcpynA( LPSTR dst, LPCSTR src, INT n ) /*********************************************************************** - * lstrcpyn32W (KERNEL32.612) + * lstrcpynW (KERNEL32.612) * Note: this function differs from the UNIX strncpy, it _always_ writes * a terminating \0 */ @@ -516,7 +516,7 @@ void WINAPI OemToAnsiBuff16( LPCSTR s, LPSTR d, UINT16 len ) /*********************************************************************** - * CharToOem32A (USER32.37) + * CharToOemA (USER32.37) */ BOOL WINAPI CharToOemA( LPCSTR s, LPSTR d ) { @@ -530,7 +530,7 @@ BOOL WINAPI CharToOemA( LPCSTR s, LPSTR d ) /*********************************************************************** - * CharToOemBuff32A (USER32.38) + * CharToOemBuffA (USER32.38) */ BOOL WINAPI CharToOemBuffA( LPCSTR s, LPSTR d, DWORD len ) { @@ -540,7 +540,7 @@ BOOL WINAPI CharToOemBuffA( LPCSTR s, LPSTR d, DWORD len ) /*********************************************************************** - * CharToOemBuff32W (USER32.39) + * CharToOemBuffW (USER32.39) */ BOOL WINAPI CharToOemBuffW( LPCWSTR s, LPSTR d, DWORD len ) { @@ -550,7 +550,7 @@ BOOL WINAPI CharToOemBuffW( LPCWSTR s, LPSTR d, DWORD len ) /*********************************************************************** - * CharToOem32W (USER32.40) + * CharToOemW (USER32.40) */ BOOL WINAPI CharToOemW( LPCWSTR s, LPSTR d ) { @@ -564,7 +564,7 @@ BOOL WINAPI CharToOemW( LPCWSTR s, LPSTR d ) /*********************************************************************** - * OemToChar32A (USER32.402) + * OemToCharA (USER32.402) */ BOOL WINAPI OemToCharA( LPCSTR s, LPSTR d ) { @@ -577,7 +577,7 @@ BOOL WINAPI OemToCharA( LPCSTR s, LPSTR d ) /*********************************************************************** - * OemToCharBuff32A (USER32.403) + * OemToCharBuffA (USER32.403) */ BOOL WINAPI OemToCharBuffA( LPCSTR s, LPSTR d, DWORD len ) { @@ -588,7 +588,7 @@ BOOL WINAPI OemToCharBuffA( LPCSTR s, LPSTR d, DWORD len ) /*********************************************************************** - * OemToCharBuff32W (USER32.404) + * OemToCharBuffW (USER32.404) */ BOOL WINAPI OemToCharBuffW( LPCSTR s, LPWSTR d, DWORD len ) { @@ -599,7 +599,7 @@ BOOL WINAPI OemToCharBuffW( LPCSTR s, LPWSTR d, DWORD len ) /*********************************************************************** - * OemToChar32W (USER32.405) + * OemToCharW (USER32.405) */ BOOL WINAPI OemToCharW( LPCSTR s, LPWSTR d ) { diff --git a/memory/virtual.c b/memory/virtual.c index 79f0d6288d5..21dd40faee3 100644 --- a/memory/virtual.c +++ b/memory/virtual.c @@ -909,7 +909,7 @@ DWORD WINAPI VirtualQueryEx( /*********************************************************************** - * IsBadReadPtr32 (KERNEL32.354) + * IsBadReadPtr (KERNEL32.354) * * RETURNS * FALSE: Process has read access to entire block @@ -925,7 +925,7 @@ BOOL WINAPI IsBadReadPtr( /*********************************************************************** - * IsBadWritePtr32 (KERNEL32.357) + * IsBadWritePtr (KERNEL32.357) * * RETURNS * FALSE: Process has write access to entire block @@ -941,7 +941,7 @@ BOOL WINAPI IsBadWritePtr( /*********************************************************************** - * IsBadHugeReadPtr32 (KERNEL32.352) + * IsBadHugeReadPtr (KERNEL32.352) * RETURNS * FALSE: Process has read access to entire block * TRUE: Otherwise @@ -955,7 +955,7 @@ BOOL WINAPI IsBadHugeReadPtr( /*********************************************************************** - * IsBadHugeWritePtr32 (KERNEL32.353) + * IsBadHugeWritePtr (KERNEL32.353) * RETURNS * FALSE: Process has write access to entire block * TRUE: Otherwise @@ -969,7 +969,7 @@ BOOL WINAPI IsBadHugeWritePtr( /*********************************************************************** - * IsBadCodePtr32 (KERNEL32.351) + * IsBadCodePtr (KERNEL32.351) * * RETURNS * FALSE: Process has read access to specified memory @@ -983,7 +983,7 @@ BOOL WINAPI IsBadCodePtr( /*********************************************************************** - * IsBadStringPtr32A (KERNEL32.355) + * IsBadStringPtrA (KERNEL32.355) * * RETURNS * FALSE: Read access to all bytes in string @@ -1017,8 +1017,8 @@ BOOL WINAPI IsBadStringPtrA( /*********************************************************************** - * IsBadStringPtr32W (KERNEL32.356) - * See IsBadStringPtr32A + * IsBadStringPtrW (KERNEL32.356) + * See IsBadStringPtrA */ BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT max ) { @@ -1046,7 +1046,7 @@ BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT max ) /*********************************************************************** - * CreateFileMapping32A (KERNEL32.46) + * CreateFileMappingA (KERNEL32.46) * Creates a named or unnamed file-mapping object for the specified file * * RETURNS @@ -1098,8 +1098,8 @@ HANDLE WINAPI CreateFileMappingA( /*********************************************************************** - * CreateFileMapping32W (KERNEL32.47) - * See CreateFileMapping32A + * CreateFileMappingW (KERNEL32.47) + * See CreateFileMappingA */ HANDLE WINAPI CreateFileMappingW( HFILE hFile, LPSECURITY_ATTRIBUTES sa, DWORD protect, DWORD size_high, @@ -1141,7 +1141,7 @@ HANDLE WINAPI CreateFileMappingW( HFILE hFile, LPSECURITY_ATTRIBUTES sa, /*********************************************************************** - * OpenFileMapping32A (KERNEL32.397) + * OpenFileMappingA (KERNEL32.397) * Opens a named file-mapping object. * * RETURNS @@ -1165,8 +1165,8 @@ HANDLE WINAPI OpenFileMappingA( /*********************************************************************** - * OpenFileMapping32W (KERNEL32.398) - * See OpenFileMapping32A + * OpenFileMappingW (KERNEL32.398) + * See OpenFileMappingA */ HANDLE WINAPI OpenFileMappingW( DWORD access, BOOL inherit, LPCWSTR name) { diff --git a/misc/bidi16.c b/misc/bidi16.c index ee211ca94a7..2fd1c713863 100644 --- a/misc/bidi16.c +++ b/misc/bidi16.c @@ -9,31 +9,114 @@ DEFAULT_DEBUG_CHANNEL(relay) +/*********************************************************************** + * RawTextOut16 + */ LONG WINAPI RawTextOut16(void) { FIXME("stub (no prototype)\n"); return 0; } + +/*********************************************************************** + * RawExtTextOut16 + */ LONG WINAPI RawExtTextOut16(void) { FIXME("stub (no prototype)\n"); return 0; } + +/*********************************************************************** + * RawGetTextExtent16 + */ LONG WINAPI RawGetTextExtent16(HDC16 hdc, LPCSTR lpszString, INT16 cbString ) { FIXME("(%04hx, %p, %hd): stub\n", hdc, lpszString, cbString); return 0; } + +/*********************************************************************** + * BiDiLayout16 + */ LONG WINAPI BiDiLayout16(void) { FIXME("stub (no prototype)\n"); return 0; } + +/*********************************************************************** + * BiDiCreateTabString16 + */ LONG WINAPI BiDiCreateTabString16(void) { FIXME("stub (no prototype)\n"); return 0; } + +/*********************************************************************** + * BiDiGlyphOut16 + */ LONG WINAPI BiDiGlyphOut16(void) { FIXME("stub (no prototype)\n"); return 0; } + +/*********************************************************************** + * BiDiGetStringExtent16 + */ LONG WINAPI BiDiGetStringExtent16(void) { FIXME("stub (no prototype)\n"); return 0; } + +/*********************************************************************** + * BiDiDeleteString16 + */ LONG WINAPI BiDiDeleteString16(void) { FIXME("stub (no prototype)\n"); return 0; } + +/*********************************************************************** + * BiDiSetDefaults16 + */ LONG WINAPI BiDiSetDefaults16(void) { FIXME("stub (no prototype)\n"); return 0; } + +/*********************************************************************** + * BiDiGetDefaults16 + */ LONG WINAPI BiDiGetDefaults16(void) { FIXME("stub (no prototype)\n"); return 0; } + +/*********************************************************************** + * BiDiShape16 + */ LONG WINAPI BiDiShape16(void) { FIXME("stub (no prototype)\n"); return 0; } + +/*********************************************************************** + * BiDiFontComplement16 + */ LONG WINAPI BiDiFontComplement16(void) { FIXME("stub (no prototype)\n"); return 0; } + +/*********************************************************************** + * BiDiSetKashida16 + */ LONG WINAPI BiDiSetKashida16(void) { FIXME("stub (no prototype)\n"); return 0; } + +/*********************************************************************** + * BiDiKExtTextOut16 + */ LONG WINAPI BiDiKExtTextOut16(void) { FIXME("stub (no prototype)\n"); return 0; } + +/*********************************************************************** + * BiDiShapeEx16 + */ LONG WINAPI BiDiShapeEx16(void) { FIXME("stub (no prototype)\n"); return 0; } + +/*********************************************************************** + * BiDiCreateStringEx16 + */ LONG WINAPI BiDiCreateStringEx16(void) { FIXME("stub (no prototype)\n"); return 0; } + +/*********************************************************************** + * GetTextExtentRtoL16 + */ LONG WINAPI GetTextExtentRtoL16(void) { FIXME("stub (no prototype)\n"); return 0; } + +/*********************************************************************** + * GetHDCCharSet16 + */ LONG WINAPI GetHDCCharSet16(void) { FIXME("stub (no prototype)\n"); return 0; } + +/*********************************************************************** + * BiDiLayoutEx16 + */ LONG WINAPI BiDiLayoutEx16(void) { FIXME("stub (no prototype)\n"); return 0; } -/* the prototypes of these functions have not been found yet */ +/*********************************************************************** + * ChangeDialogTemplate16 + * FIXME: The prototypes of this function have not been found yet. + */ LONG WINAPI ChangeDialogTemplate16(void) { FIXME("stub (no prototype)\n"); return 0; } + +/*********************************************************************** + * BiDiMessageBoxEx16 + * FIXME: The prototypes of this function have not been found yet. + */ LONG WINAPI BiDiMessageBoxEx16(void) { FIXME("stub (no prototype)\n"); return 0; } diff --git a/misc/lstr.c b/misc/lstr.c index 51f9e464688..10e9aaab416 100644 --- a/misc/lstr.c +++ b/misc/lstr.c @@ -53,12 +53,18 @@ extern const WORD OLE2NLS_CT_CType3_LUT[]; /* FIXME: does not belong here */ /* FIXME: should probably get rid of wctype.h altogether */ #include "casemap.h" +/*********************************************************************** + * towupper + */ WCHAR towupper(WCHAR code) { const WCHAR * ptr = uprtable[HIBYTE(code)]; return ptr ? ptr[LOBYTE(code)] : code; } +/*********************************************************************** + * towlower + */ WCHAR towlower(WCHAR code) { const WCHAR * ptr = lwrtable[HIBYTE(code)]; @@ -176,7 +182,7 @@ SEGPTR WINAPI AnsiPrev16( SEGPTR start, SEGPTR current ) /*********************************************************************** - * CharNext32A (USER32.29) + * CharNextA (USER32.29) */ LPSTR WINAPI CharNextA( LPCSTR ptr ) { @@ -187,7 +193,7 @@ LPSTR WINAPI CharNextA( LPCSTR ptr ) /*********************************************************************** - * CharNextEx32A (USER32.30) + * CharNextExA (USER32.30) */ LPSTR WINAPI CharNextExA( WORD codepage, LPCSTR ptr, DWORD flags ) { @@ -217,7 +223,7 @@ LPWSTR WINAPI CharNextW(LPCWSTR x) } /*********************************************************************** - * CharPrev32A (USER32.33) + * CharPrevA (USER32.33) */ LPSTR WINAPI CharPrevA( LPCSTR start, LPCSTR ptr ) { @@ -232,7 +238,7 @@ LPSTR WINAPI CharPrevA( LPCSTR start, LPCSTR ptr ) /*********************************************************************** - * CharPrevEx32A (USER32.34) + * CharPrevExA (USER32.34) */ LPSTR WINAPI CharPrevExA( WORD codepage, LPCSTR start, LPCSTR ptr, DWORD flags ) { @@ -342,7 +348,7 @@ LPWSTR WINAPI CharLowerW(LPWSTR x) } /*********************************************************************** - * CharUpper32A (USER32.41) + * CharUpperA (USER32.41) * FIXME: handle current locale */ LPSTR WINAPI CharUpperA(LPSTR x) @@ -452,7 +458,7 @@ BOOL WINAPI IsCharAlphaW(WCHAR x) } /*********************************************************************** - * IsCharLower32A (USER32.335) + * IsCharLowerA (USER32.335) * FIXME: handle current locale */ BOOL WINAPI IsCharLowerA(CHAR x) @@ -461,7 +467,7 @@ BOOL WINAPI IsCharLowerA(CHAR x) } /*********************************************************************** - * IsCharLower32W (USER32.336) + * IsCharLowerW (USER32.336) * FIXME: handle current locale */ BOOL WINAPI IsCharLowerW(WCHAR x) @@ -470,7 +476,7 @@ BOOL WINAPI IsCharLowerW(WCHAR x) } /*********************************************************************** - * IsCharUpper32A (USER32.337) + * IsCharUpperA (USER32.337) * FIXME: handle current locale */ BOOL WINAPI IsCharUpperA(CHAR x) @@ -479,7 +485,7 @@ BOOL WINAPI IsCharUpperA(CHAR x) } /*********************************************************************** - * IsCharUpper32W (USER32.338) + * IsCharUpperW (USER32.338) * FIXME: handle current locale */ BOOL WINAPI IsCharUpperW(WCHAR x) diff --git a/misc/main.c b/misc/main.c index 05c237e42ab..6e87b259309 100644 --- a/misc/main.c +++ b/misc/main.c @@ -683,7 +683,7 @@ void WINAPI MessageBeep16( UINT16 i ) /*********************************************************************** - * MessageBeep32 (USER32.390) + * MessageBeep (USER32.390) */ BOOL WINAPI MessageBeep( UINT i ) { diff --git a/misc/registry.c b/misc/registry.c index 9b0556ab29a..c3cb7312571 100644 --- a/misc/registry.c +++ b/misc/registry.c @@ -1843,7 +1843,7 @@ DWORD WINAPI RegFlushKey( HKEY hkey ) } /****************************************************************************** - * RegConnectRegistry32W [ADVAPI32.128] + * RegConnectRegistryW [ADVAPI32.128] * * PARAMS * lpMachineName [I] Address of name of remote computer @@ -1866,7 +1866,7 @@ LONG WINAPI RegConnectRegistryW( LPCWSTR lpMachineName, HKEY hKey, /****************************************************************************** - * RegConnectRegistry32A [ADVAPI32.127] + * RegConnectRegistryA [ADVAPI32.127] */ LONG WINAPI RegConnectRegistryA( LPCSTR machine, HKEY hkey, LPHKEY reskey ) { @@ -1933,7 +1933,7 @@ LONG WINAPI RegNotifyChangeKeyValue( HKEY hkey, BOOL fWatchSubTree, /****************************************************************************** - * RegUnLoadKey32W [ADVAPI32.173] + * RegUnLoadKeyW [ADVAPI32.173] * * PARAMS * hkey [I] Handle of open key @@ -1947,7 +1947,7 @@ LONG WINAPI RegUnLoadKeyW( HKEY hkey, LPCWSTR lpSubKey ) /****************************************************************************** - * RegUnLoadKey32A [ADVAPI32.172] + * RegUnLoadKeyA [ADVAPI32.172] */ LONG WINAPI RegUnLoadKeyA( HKEY hkey, LPCSTR lpSubKey ) { @@ -1991,7 +1991,7 @@ LONG WINAPI RegSetKeySecurity( HKEY hkey, SECURITY_INFORMATION SecurityInfo, /****************************************************************************** - * RegRestoreKey32W [ADVAPI32.164] + * RegRestoreKeyW [ADVAPI32.164] * * PARAMS * hkey [I] Handle of key where restore begins @@ -2015,7 +2015,7 @@ LONG WINAPI RegRestoreKeyW( HKEY hkey, LPCWSTR lpFile, DWORD dwFlags ) /****************************************************************************** - * RegRestoreKey32A [ADVAPI32.163] + * RegRestoreKeyA [ADVAPI32.163] */ LONG WINAPI RegRestoreKeyA( HKEY hkey, LPCSTR lpFile, DWORD dwFlags ) { @@ -2028,7 +2028,7 @@ LONG WINAPI RegRestoreKeyA( HKEY hkey, LPCSTR lpFile, DWORD dwFlags ) /****************************************************************************** - * RegReplaceKey32W [ADVAPI32.162] + * RegReplaceKeyW [ADVAPI32.162] * * PARAMS * hkey [I] Handle of open key @@ -2046,7 +2046,7 @@ LONG WINAPI RegReplaceKeyW( HKEY hkey, LPCWSTR lpSubKey, LPCWSTR lpNewFile, /****************************************************************************** - * RegReplaceKey32A [ADVAPI32.161] + * RegReplaceKeyA [ADVAPI32.161] */ LONG WINAPI RegReplaceKeyA( HKEY hkey, LPCSTR lpSubKey, LPCSTR lpNewFile, LPCSTR lpOldFile ) diff --git a/misc/toolhelp.c b/misc/toolhelp.c index 6a664f0a667..36097af0389 100644 --- a/misc/toolhelp.c +++ b/misc/toolhelp.c @@ -37,6 +37,9 @@ static int nrofnotifys = 0; static FARPROC16 HookNotify = NULL; +/*********************************************************************** + * NotifyRegister16 + */ BOOL16 WINAPI NotifyRegister16( HTASK16 htask, FARPROC16 lpfnCallback, WORD wFlags ) { @@ -64,6 +67,9 @@ BOOL16 WINAPI NotifyRegister16( HTASK16 htask, FARPROC16 lpfnCallback, return TRUE; } +/*********************************************************************** + * NotifyUnregister16 + */ BOOL16 WINAPI NotifyUnregister16( HTASK16 htask ) { int i; @@ -82,26 +88,41 @@ BOOL16 WINAPI NotifyUnregister16( HTASK16 htask ) return TRUE; } +/*********************************************************************** + * StackTraceCSIPFirst16 + */ BOOL16 WINAPI StackTraceCSIPFirst16(STACKTRACEENTRY *ste, WORD wSS, WORD wCS, WORD wIP, WORD wBP) { return TRUE; } +/*********************************************************************** + * StackTraceFirst16 + */ BOOL16 WINAPI StackTraceFirst16(STACKTRACEENTRY *ste, HTASK16 Task) { return TRUE; } +/*********************************************************************** + * StackTraceNext16 + */ BOOL16 WINAPI StackTraceNext16(STACKTRACEENTRY *ste) { return TRUE; } +/*********************************************************************** + * InterruptRegister16 + */ BOOL16 WINAPI InterruptRegister16( HTASK16 task, FARPROC callback ) { return TRUE; } +/*********************************************************************** + * InterruptUnRegister16 + */ BOOL16 WINAPI InterruptUnRegister16( HTASK16 task ) { return TRUE; @@ -122,7 +143,7 @@ FARPROC16 tmp; /*********************************************************************** - * CreateToolHelp32Snapshot (KERNEL32.179) + * CreateToolhelp32Snapshot (KERNEL32.179) */ HANDLE WINAPI CreateToolhelp32Snapshot( DWORD flags, DWORD process ) { diff --git a/misc/version.c b/misc/version.c index 8b98d72f601..05cc1c88436 100644 --- a/misc/version.c +++ b/misc/version.c @@ -386,7 +386,7 @@ LONG WINAPI GetVersion16(void) /*********************************************************************** - * GetVersion32 (KERNEL32.427) + * GetVersion (KERNEL32.427) */ LONG WINAPI GetVersion(void) { @@ -417,7 +417,7 @@ BOOL16 WINAPI GetVersionEx16(OSVERSIONINFO16 *v) /*********************************************************************** - * GetVersionEx32A (KERNEL32.428) + * GetVersionExA (KERNEL32.428) */ BOOL WINAPI GetVersionExA(OSVERSIONINFOA *v) { @@ -439,7 +439,7 @@ BOOL WINAPI GetVersionExA(OSVERSIONINFOA *v) /*********************************************************************** - * GetVersionEx32W (KERNEL32.429) + * GetVersionExW (KERNEL32.429) */ BOOL WINAPI GetVersionExW(OSVERSIONINFOW *v) { diff --git a/objects/bitmap.c b/objects/bitmap.c index 62a47f024d3..a637ddc8bd6 100644 --- a/objects/bitmap.c +++ b/objects/bitmap.c @@ -89,7 +89,7 @@ HBITMAP16 WINAPI CreateBitmap16( INT16 width, INT16 height, UINT16 planes, /****************************************************************************** - * CreateBitmap32 [GDI32.25] Creates a bitmap with the specified info + * CreateBitmap [GDI32.25] Creates a bitmap with the specified info * * PARAMS * width [I] bitmap width @@ -162,7 +162,7 @@ HBITMAP16 WINAPI CreateCompatibleBitmap16(HDC16 hdc, INT16 width, INT16 height) /****************************************************************************** - * CreateCompatibleBitmap32 [GDI32.30] Creates a bitmap compatible with the DC + * CreateCompatibleBitmap [GDI32.30] Creates a bitmap compatible with the DC * * PARAMS * hdc [I] Handle to device context @@ -209,7 +209,7 @@ HBITMAP16 WINAPI CreateBitmapIndirect16( const BITMAP16 * bmp ) /****************************************************************************** - * CreateBitmapIndirect32 [GDI32.26] Creates a bitmap with the specifies info + * CreateBitmapIndirect [GDI32.26] Creates a bitmap with the specifies info * * RETURNS * Success: Handle to bitmap @@ -233,7 +233,7 @@ LONG WINAPI GetBitmapBits16( HBITMAP16 hbitmap, LONG count, LPVOID buffer ) /*********************************************************************** - * GetBitmapBits32 [GDI32.143] Copies bitmap bits of bitmap to buffer + * GetBitmapBits [GDI32.143] Copies bitmap bits of bitmap to buffer * * RETURNS * Success: Number of bytes copied @@ -311,7 +311,7 @@ LONG WINAPI SetBitmapBits16( HBITMAP16 hbitmap, LONG count, LPCVOID buffer ) /****************************************************************************** - * SetBitmapBits32 [GDI32.303] Sets bits of color data for a bitmap + * SetBitmapBits [GDI32.303] Sets bits of color data for a bitmap * * RETURNS * Success: Number of bytes used in setting the bitmap bits @@ -459,7 +459,7 @@ INT16 BITMAP_GetObject16( BITMAPOBJ * bmp, INT16 count, LPVOID buffer ) /*********************************************************************** - * BITMAP_GetObject32 + * BITMAP_GetObject */ INT BITMAP_GetObject( BITMAPOBJ * bmp, INT count, LPVOID buffer ) { @@ -497,7 +497,7 @@ HBITMAP16 WINAPI CreateDiscardableBitmap16( HDC16 hdc, INT16 width, /****************************************************************************** - * CreateDiscardableBitmap32 [GDI32.38] Creates a discardable bitmap + * CreateDiscardableBitmap [GDI32.38] Creates a discardable bitmap * * RETURNS * Success: Handle to bitmap @@ -516,7 +516,7 @@ HBITMAP WINAPI CreateDiscardableBitmap( * GetBitmapDimensionEx16 (GDI.468) * * NOTES - * Can this call GetBitmapDimensionEx32? + * Can this call GetBitmapDimensionEx? */ BOOL16 WINAPI GetBitmapDimensionEx16( HBITMAP16 hbitmap, LPSIZE16 size ) { @@ -529,7 +529,7 @@ BOOL16 WINAPI GetBitmapDimensionEx16( HBITMAP16 hbitmap, LPSIZE16 size ) /****************************************************************************** - * GetBitmapDimensionEx32 [GDI32.144] Retrieves dimensions of a bitmap + * GetBitmapDimensionEx [GDI32.144] Retrieves dimensions of a bitmap * * RETURNS * Success: TRUE @@ -575,7 +575,7 @@ BOOL16 WINAPI SetBitmapDimensionEx16( HBITMAP16 hbitmap, INT16 x, INT16 y, /****************************************************************************** - * SetBitmapDimensionEx32 [GDI32.304] Assignes dimensions to a bitmap + * SetBitmapDimensionEx [GDI32.304] Assignes dimensions to a bitmap * * RETURNS * Success: TRUE diff --git a/objects/brush.c b/objects/brush.c index 0ea8dec44a6..068f4e5ffed 100644 --- a/objects/brush.c +++ b/objects/brush.c @@ -124,7 +124,7 @@ HBRUSH16 WINAPI CreateBrushIndirect16( const LOGBRUSH16 * brush ) /*********************************************************************** - * CreateBrushIndirect32 (GDI32.27) + * CreateBrushIndirect (GDI32.27) * * BUGS * As for Windows 95 and Windows 98: @@ -164,7 +164,7 @@ HBRUSH16 WINAPI CreateHatchBrush16( INT16 style, COLORREF color ) /*********************************************************************** - * CreateHatchBrush32 (GDI32.48) + * CreateHatchBrush (GDI32.48) */ HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color ) { @@ -190,7 +190,7 @@ HBRUSH16 WINAPI CreatePatternBrush16( HBITMAP16 hbitmap ) /*********************************************************************** - * CreatePatternBrush32 (GDI32.54) + * CreatePatternBrush (GDI32.54) */ HBRUSH WINAPI CreatePatternBrush( HBITMAP hbitmap ) { @@ -220,7 +220,7 @@ HBRUSH16 WINAPI CreateDIBPatternBrush16( HGLOBAL16 hbitmap, UINT16 coloruse ) /*********************************************************************** - * CreateDIBPatternBrush32 (GDI32.34) + * CreateDIBPatternBrush (GDI32.34) * * Create a logical brush which has the pattern specified by the DIB * @@ -292,7 +292,7 @@ HBRUSH16 WINAPI CreateSolidBrush16( COLORREF color ) /*********************************************************************** - * CreateSolidBrush32 (GDI32.64) + * CreateSolidBrush (GDI32.64) */ HBRUSH WINAPI CreateSolidBrush( COLORREF color ) { @@ -386,7 +386,7 @@ INT16 BRUSH_GetObject16( BRUSHOBJ * brush, INT16 count, LPSTR buffer ) /*********************************************************************** - * BRUSH_GetObject32 + * BRUSH_GetObject */ INT BRUSH_GetObject( BRUSHOBJ * brush, INT count, LPSTR buffer ) { diff --git a/objects/clipping.c b/objects/clipping.c index 90bb8e270e6..3f83d3284d2 100644 --- a/objects/clipping.c +++ b/objects/clipping.c @@ -62,7 +62,7 @@ INT16 WINAPI SelectClipRgn16( HDC16 hdc, HRGN16 hrgn ) /*********************************************************************** - * SelectClipRgn32 (GDI32.297) + * SelectClipRgn (GDI32.297) */ INT WINAPI SelectClipRgn( HDC hdc, HRGN hrgn ) { @@ -155,7 +155,7 @@ INT16 WINAPI OffsetClipRgn16( HDC16 hdc, INT16 x, INT16 y ) /*********************************************************************** - * OffsetClipRgn32 (GDI32.255) + * OffsetClipRgn (GDI32.255) */ INT WINAPI OffsetClipRgn( HDC hdc, INT x, INT y ) { @@ -251,7 +251,7 @@ INT16 WINAPI ExcludeClipRect16( HDC16 hdc, INT16 left, INT16 top, /*********************************************************************** - * ExcludeClipRect32 (GDI32.92) + * ExcludeClipRect (GDI32.92) */ INT WINAPI ExcludeClipRect( HDC hdc, INT left, INT top, INT right, INT bottom ) @@ -288,7 +288,7 @@ INT16 WINAPI IntersectClipRect16( HDC16 hdc, INT16 left, INT16 top, /*********************************************************************** - * IntersectClipRect32 (GDI32.245) + * IntersectClipRect (GDI32.245) */ INT WINAPI IntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bottom ) @@ -408,7 +408,7 @@ BOOL16 WINAPI PtVisible16( HDC16 hdc, INT16 x, INT16 y ) /*********************************************************************** - * PtVisible32 (GDI32.279) + * PtVisible (GDI32.279) */ BOOL WINAPI PtVisible( HDC hdc, INT x, INT y ) { @@ -449,7 +449,7 @@ BOOL16 WINAPI RectVisible16( HDC16 hdc, const RECT16* rect ) /*********************************************************************** - * RectVisible32 (GDI32.282) + * RectVisible (GDI32.282) */ BOOL WINAPI RectVisible( HDC hdc, const RECT* rect ) { @@ -479,7 +479,7 @@ INT16 WINAPI GetClipBox16( HDC16 hdc, LPRECT16 rect ) /*********************************************************************** - * GetClipBox32 (GDI32.162) + * GetClipBox (GDI32.162) */ INT WINAPI GetClipBox( HDC hdc, LPRECT rect ) { @@ -497,7 +497,7 @@ INT WINAPI GetClipBox( HDC hdc, LPRECT rect ) /*********************************************************************** - * GetClipRgn32 (GDI32.163) + * GetClipRgn (GDI32.163) */ INT WINAPI GetClipRgn( HDC hdc, HRGN hRgn ) { diff --git a/objects/dc.c b/objects/dc.c index 6ab2149c269..163ecd7e4fe 100644 --- a/objects/dc.c +++ b/objects/dc.c @@ -399,7 +399,7 @@ INT16 WINAPI SaveDC16( HDC16 hdc ) /*********************************************************************** - * SaveDC32 (GDI32.292) + * SaveDC (GDI32.292) */ INT WINAPI SaveDC( HDC hdc ) { @@ -454,7 +454,7 @@ BOOL16 WINAPI RestoreDC16( HDC16 hdc, INT16 level ) /*********************************************************************** - * RestoreDC32 (GDI32.290) + * RestoreDC (GDI32.290) */ BOOL WINAPI RestoreDC( HDC hdc, INT level ) { @@ -536,7 +536,7 @@ HDC16 WINAPI CreateDC16( LPCSTR driver, LPCSTR device, LPCSTR output, /*********************************************************************** - * CreateDC32A (GDI32.) + * CreateDCA (GDI32.) */ HDC WINAPI CreateDCA( LPCSTR driver, LPCSTR device, LPCSTR output, const DEVMODEA *initData ) @@ -546,7 +546,7 @@ HDC WINAPI CreateDCA( LPCSTR driver, LPCSTR device, LPCSTR output, /*********************************************************************** - * CreateDC32W (GDI32.) + * CreateDCW (GDI32.) */ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, const DEVMODEW *initData ) @@ -575,7 +575,7 @@ HDC16 WINAPI CreateIC16( LPCSTR driver, LPCSTR device, LPCSTR output, /*********************************************************************** - * CreateIC32A (GDI32.49) + * CreateICA (GDI32.49) */ HDC WINAPI CreateICA( LPCSTR driver, LPCSTR device, LPCSTR output, const DEVMODEA* initData ) @@ -586,7 +586,7 @@ HDC WINAPI CreateICA( LPCSTR driver, LPCSTR device, LPCSTR output, /*********************************************************************** - * CreateIC32W (GDI32.50) + * CreateICW (GDI32.50) */ HDC WINAPI CreateICW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, const DEVMODEW* initData ) @@ -606,7 +606,7 @@ HDC16 WINAPI CreateCompatibleDC16( HDC16 hdc ) /*********************************************************************** - * CreateCompatibleDC32 (GDI32.31) + * CreateCompatibleDC (GDI32.31) */ HDC WINAPI CreateCompatibleDC( HDC hdc ) { @@ -656,7 +656,7 @@ BOOL16 WINAPI DeleteDC16( HDC16 hdc ) /*********************************************************************** - * DeleteDC32 (GDI32.67) + * DeleteDC (GDI32.67) */ BOOL WINAPI DeleteDC( HDC hdc ) { @@ -713,7 +713,7 @@ HDC16 WINAPI ResetDC16( HDC16 hdc, const DEVMODEA *devmode ) /*********************************************************************** - * ResetDC32A (GDI32.287) + * ResetDCA (GDI32.287) */ HDC WINAPI ResetDCA( HDC hdc, const DEVMODEA *devmode ) { @@ -723,7 +723,7 @@ HDC WINAPI ResetDCA( HDC hdc, const DEVMODEA *devmode ) /*********************************************************************** - * ResetDC32W (GDI32.288) + * ResetDCW (GDI32.288) */ HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode ) { @@ -742,7 +742,7 @@ INT16 WINAPI GetDeviceCaps16( HDC16 hdc, INT16 cap ) /*********************************************************************** - * GetDeviceCaps32 (GDI32.171) + * GetDeviceCaps (GDI32.171) */ INT WINAPI GetDeviceCaps( HDC hdc, INT cap ) { @@ -803,7 +803,7 @@ COLORREF WINAPI SetBkColor16( HDC16 hdc, COLORREF color ) /*********************************************************************** - * SetBkColor32 (GDI32.305) + * SetBkColor (GDI32.305) */ COLORREF WINAPI SetBkColor( HDC hdc, COLORREF color ) { @@ -832,7 +832,7 @@ COLORREF WINAPI SetTextColor16( HDC16 hdc, COLORREF color ) /*********************************************************************** - * SetTextColor32 (GDI32.338) + * SetTextColor (GDI32.338) */ COLORREF WINAPI SetTextColor( HDC hdc, COLORREF color ) { @@ -967,7 +967,7 @@ INT16 WINAPI GetArcDirection16( HDC16 hdc ) /*********************************************************************** - * GetArcDirection32 (GDI32.141) + * GetArcDirection (GDI32.141) */ INT WINAPI GetArcDirection( HDC hdc ) { @@ -990,7 +990,7 @@ INT16 WINAPI SetArcDirection16( HDC16 hdc, INT16 nDirection ) /*********************************************************************** - * SetArcDirection32 (GDI32.302) + * SetArcDirection (GDI32.302) */ INT WINAPI SetArcDirection( HDC hdc, INT nDirection ) { @@ -1319,7 +1319,7 @@ UINT16 WINAPI GetBoundsRect16(HDC16 hdc, LPRECT16 rect, UINT16 flags) } /*********************************************************************** - * GetBoundsRect32 (GDI32.147) + * GetBoundsRect (GDI32.147) */ UINT WINAPI GetBoundsRect(HDC hdc, LPRECT rect, UINT flags) { @@ -1339,7 +1339,7 @@ UINT16 WINAPI SetBoundsRect16(HDC16 hdc, const RECT16* rect, UINT16 flags) } /*********************************************************************** - * SetBoundsRect32 (GDI32.307) + * SetBoundsRect (GDI32.307) */ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) { diff --git a/objects/dib.c b/objects/dib.c index 9afe1fd687f..b346629d6bc 100644 --- a/objects/dib.c +++ b/objects/dib.c @@ -127,7 +127,7 @@ INT16 WINAPI StretchDIBits16(HDC16 hdc, INT16 xDst, INT16 yDst, INT16 widthDst, /*********************************************************************** - * StretchDIBits32 (GDI32.351) + * StretchDIBits (GDI32.351) */ INT WINAPI StretchDIBits(HDC hdc, INT xDst, INT yDst, INT widthDst, INT heightDst, INT xSrc, INT ySrc, INT widthSrc, @@ -142,7 +142,7 @@ INT WINAPI StretchDIBits(HDC hdc, INT xDst, INT yDst, INT widthDst, heightDst, xSrc, ySrc, widthSrc, heightSrc, bits, info, wUsage, dwRop); - else { /* use StretchBlt32 */ + else { /* use StretchBlt */ HBITMAP hBitmap, hOldBitmap; HDC hdcMem; @@ -175,7 +175,7 @@ INT16 WINAPI SetDIBits16( HDC16 hdc, HBITMAP16 hbitmap, UINT16 startscan, /****************************************************************************** - * SetDIBits32 [GDI32.312] Sets pixels in a bitmap using colors from DIB + * SetDIBits [GDI32.312] Sets pixels in a bitmap using colors from DIB * * PARAMS * hdc [I] Handle to device context @@ -237,7 +237,7 @@ INT16 WINAPI SetDIBitsToDevice16(HDC16 hdc, INT16 xDest, INT16 yDest, INT16 cx, /*********************************************************************** - * SetDIBitsToDevice32 (GDI32.313) + * SetDIBitsToDevice (GDI32.313) */ INT WINAPI SetDIBitsToDevice(HDC hdc, INT xDest, INT yDest, DWORD cx, DWORD cy, INT xSrc, INT ySrc, UINT startscan, @@ -272,7 +272,7 @@ UINT16 WINAPI SetDIBColorTable16( HDC16 hdc, UINT16 startpos, UINT16 entries, } /*********************************************************************** - * SetDIBColorTable32 (GDI32.311) + * SetDIBColorTable (GDI32.311) */ UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries, RGBQUAD *colors ) @@ -327,7 +327,7 @@ UINT16 WINAPI GetDIBColorTable16( HDC16 hdc, UINT16 startpos, UINT16 entries, } /*********************************************************************** - * GetDIBColorTable32 (GDI32.169) + * GetDIBColorTable (GDI32.169) */ UINT WINAPI GetDIBColorTable( HDC hdc, UINT startpos, UINT entries, RGBQUAD *colors ) @@ -433,7 +433,7 @@ INT16 WINAPI GetDIBits16( HDC16 hdc, HBITMAP16 hbitmap, UINT16 startscan, /****************************************************************************** - * GetDIBits32 [GDI32.170] Retrieves bits of bitmap and copies to buffer + * GetDIBits [GDI32.170] Retrieves bits of bitmap and copies to buffer * * RETURNS * Success: Number of scan lines copied from bitmap @@ -783,7 +783,7 @@ HBITMAP16 WINAPI CreateDIBitmap16( HDC16 hdc, const BITMAPINFOHEADER * header, /*********************************************************************** - * CreateDIBitmap32 (GDI32.37) + * CreateDIBitmap (GDI32.37) */ HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header, DWORD init, LPCVOID bits, const BITMAPINFO *data, @@ -878,7 +878,7 @@ HBITMAP16 WINAPI CreateDIBSection16 (HDC16 hdc, BITMAPINFO *bmi, UINT16 usage, } /*********************************************************************** - * CreateDIBSection32 (GDI32.36) + * CreateDIBSection (GDI32.36) */ HBITMAP WINAPI CreateDIBSection(HDC hdc, BITMAPINFO *bmi, UINT usage, LPVOID *bits, HANDLE section, diff --git a/objects/enhmetafile.c b/objects/enhmetafile.c index a2e4965884b..d83a2bb17f8 100644 --- a/objects/enhmetafile.c +++ b/objects/enhmetafile.c @@ -139,7 +139,7 @@ HENHMETAFILE WINAPI GetEnhMetaFileA( } /***************************************************************************** - * GetEnhMetaFile32W (GDI32.180) + * GetEnhMetaFileW (GDI32.180) */ HENHMETAFILE WINAPI GetEnhMetaFileW( LPCWSTR lpszMetaFile) /* filename of enhanced metafile */ @@ -184,7 +184,7 @@ UINT WINAPI GetEnhMetaFileHeader( /***************************************************************************** - * GetEnhMetaFileDescription32A (GDI32.176) + * GetEnhMetaFileDescriptionA (GDI32.176) */ UINT WINAPI GetEnhMetaFileDescriptionA( HENHMETAFILE hmf, /* enhanced metafile */ @@ -219,7 +219,7 @@ UINT WINAPI GetEnhMetaFileDescriptionA( } /***************************************************************************** - * GetEnhMetaFileDescription32W (GDI32.177) + * GetEnhMetaFileDescriptionW (GDI32.177) * * Copies the description string of an enhanced metafile into a buffer * _buf_. @@ -1210,7 +1210,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( /***************************************************************************** * - * EnumEnhMetaFile32 (GDI32.79) + * EnumEnhMetaFile (GDI32.79) * * Walk an enhanced metafile, calling a user-specified function _EnhMetaFunc_ * for each diff --git a/objects/font.c b/objects/font.c index d4bbce7dff1..98de1241eeb 100644 --- a/objects/font.c +++ b/objects/font.c @@ -498,7 +498,7 @@ static INT FONT_EnumInstance16( LPENUMLOGFONTEX16 plf, static INT FONT_EnumInstance( LPENUMLOGFONTEX16 plf, LPNEWTEXTMETRIC16 ptm, UINT16 fType, LPARAM lp ) { - /* lfCharSet is at the same offset in both LOGFONT32A and LOGFONT32W */ + /* lfCharSet is at the same offset in both LOGFONTA and LOGFONTW */ #define pfe ((fontEnum32*)lp) if( pfe->lpLogFontParam->lfCharSet == DEFAULT_CHARSET || @@ -1710,7 +1710,7 @@ INT16 WINAPI AddFontResource16( LPCSTR filename ) /*********************************************************************** - * AddFontResource32A (GDI32.2) + * AddFontResourceA (GDI32.2) */ INT WINAPI AddFontResourceA( LPCSTR str ) { @@ -1721,7 +1721,7 @@ INT WINAPI AddFontResourceA( LPCSTR str ) /*********************************************************************** - * AddFontResource32W (GDI32.4) + * AddFontResourceW (GDI32.4) */ INT WINAPI AddFontResourceW( LPCWSTR str ) { @@ -1741,7 +1741,7 @@ BOOL16 WINAPI RemoveFontResource16( SEGPTR str ) /*********************************************************************** - * RemoveFontResource32A (GDI32.284) + * RemoveFontResourceA (GDI32.284) */ BOOL WINAPI RemoveFontResourceA( LPCSTR str ) { @@ -1773,7 +1773,7 @@ BOOL WINAPI RemoveFontResourceA( LPCSTR str ) /*********************************************************************** - * RemoveFontResource32W (GDI32.286) + * RemoveFontResourceW (GDI32.286) */ BOOL WINAPI RemoveFontResourceW( LPCWSTR str ) { diff --git a/objects/gdiobj.c b/objects/gdiobj.c index b586ba8157e..40a0b4e2145 100644 --- a/objects/gdiobj.c +++ b/objects/gdiobj.c @@ -434,7 +434,7 @@ BOOL16 WINAPI DeleteObject16( HGDIOBJ16 obj ) /*********************************************************************** - * DeleteObject32 (GDI32.70) + * DeleteObject (GDI32.70) */ BOOL WINAPI DeleteObject( HGDIOBJ obj ) { @@ -479,7 +479,7 @@ HGDIOBJ16 WINAPI GetStockObject16( INT16 obj ) /*********************************************************************** - * GetStockObject32 (GDI32.220) + * GetStockObject (GDI32.220) */ HGDIOBJ WINAPI GetStockObject( INT obj ) { @@ -534,7 +534,7 @@ INT16 WINAPI GetObject16( HANDLE16 handle, INT16 count, LPVOID buffer ) /*********************************************************************** - * GetObject32A (GDI32.204) + * GetObjectA (GDI32.204) */ INT WINAPI GetObjectA( HANDLE handle, INT count, LPVOID buffer ) { @@ -591,7 +591,7 @@ INT WINAPI GetObjectA( HANDLE handle, INT count, LPVOID buffer ) } /*********************************************************************** - * GetObject32W (GDI32.206) + * GetObjectW (GDI32.206) */ INT WINAPI GetObjectW( HANDLE handle, INT count, LPVOID buffer ) { @@ -726,7 +726,7 @@ HGDIOBJ16 WINAPI SelectObject16( HDC16 hdc, HGDIOBJ16 handle ) /*********************************************************************** - * SelectObject32 (GDI32.299) + * SelectObject (GDI32.299) */ HGDIOBJ WINAPI SelectObject( HDC hdc, HGDIOBJ handle ) { @@ -856,7 +856,7 @@ INT16 WINAPI EnumObjects16( HDC16 hdc, INT16 nObjType, /*********************************************************************** - * EnumObjects32 (GDI32.89) + * EnumObjects (GDI32.89) */ INT WINAPI EnumObjects( HDC hdc, INT nObjType, GOBJENUMPROC lpEnumFunc, LPARAM lParam ) @@ -1001,7 +1001,7 @@ void WINAPI SetObjectOwner16( HGDIOBJ16 handle, HANDLE16 owner ) /*********************************************************************** - * SetObjectOwner32 (GDI32.386) + * SetObjectOwner (GDI32.386) */ void WINAPI SetObjectOwner( HGDIOBJ handle, HANDLE owner ) { @@ -1120,7 +1120,7 @@ INT16 WINAPI MulDiv16( /*********************************************************************** - * MulDiv32 (KERNEL32.391) + * MulDiv (KERNEL32.391) * RETURNS * Result of multiplication and division * -1: Overflow occurred or Divisor was 0 diff --git a/objects/linedda.c b/objects/linedda.c index 360604cda10..44615c59fd8 100644 --- a/objects/linedda.c +++ b/objects/linedda.c @@ -11,7 +11,7 @@ /********************************************************************** - * LineDDA32 (GDI32.248) + * LineDDA (GDI32.248) */ BOOL WINAPI LineDDA(INT nXStart, INT nYStart, INT nXEnd, INT nYEnd, LINEDDAPROC callback, LPARAM lParam ) diff --git a/objects/pen.c b/objects/pen.c index 9f23ea4c3d2..5fb6f0851b1 100644 --- a/objects/pen.c +++ b/objects/pen.c @@ -31,7 +31,7 @@ HPEN16 WINAPI CreatePen16( INT16 style, INT16 width, COLORREF color ) /*********************************************************************** - * CreatePen32 (GDI32.55) + * CreatePen (GDI32.55) */ HPEN WINAPI CreatePen( INT style, INT width, COLORREF color ) { @@ -69,7 +69,7 @@ HPEN16 WINAPI CreatePenIndirect16( const LOGPEN16 * pen ) /*********************************************************************** - * CreatePenIndirect32 (GDI32.56) + * CreatePenIndirect (GDI32.56) */ HPEN WINAPI CreatePenIndirect( const LOGPEN * pen ) { @@ -88,7 +88,7 @@ HPEN WINAPI CreatePenIndirect( const LOGPEN * pen ) } /*********************************************************************** - * ExtCreatePen32 (GDI32.93) + * ExtCreatePen (GDI32.93) * * FIXME: PS_USERSTYLE not handled */ @@ -140,7 +140,7 @@ INT16 PEN_GetObject16( PENOBJ * pen, INT16 count, LPSTR buffer ) /*********************************************************************** - * PEN_GetObject32 + * PEN_GetObject */ INT PEN_GetObject( PENOBJ * pen, INT count, LPSTR buffer ) { diff --git a/objects/region.c b/objects/region.c index bc1f95fb392..20430184256 100644 --- a/objects/region.c +++ b/objects/region.c @@ -500,7 +500,7 @@ INT16 WINAPI OffsetRgn16( HRGN16 hrgn, INT16 x, INT16 y ) } /*********************************************************************** - * OffsetRgn32 (GDI32.256) + * OffsetRgn (GDI32.256) */ INT WINAPI OffsetRgn( HRGN hrgn, INT x, INT y ) { @@ -546,7 +546,7 @@ INT16 WINAPI GetRgnBox16( HRGN16 hrgn, LPRECT16 rect ) } /*********************************************************************** - * GetRgnBox32 (GDI32.219) + * GetRgnBox (GDI32.219) */ INT WINAPI GetRgnBox( HRGN hrgn, LPRECT rect ) { @@ -570,7 +570,7 @@ INT WINAPI GetRgnBox( HRGN hrgn, LPRECT rect ) /*********************************************************************** * CreateRectRgn16 (GDI.64) * - * NOTE: Doesn't call CreateRectRgn32 because of differences in SetRectRgn16/32 + * NOTE: Doesn't call CreateRectRgn because of differences in SetRectRgn16/32 */ HRGN16 WINAPI CreateRectRgn16(INT16 left, INT16 top, INT16 right, INT16 bottom) { @@ -585,7 +585,7 @@ HRGN16 WINAPI CreateRectRgn16(INT16 left, INT16 top, INT16 right, INT16 bottom) /*********************************************************************** - * CreateRectRgn32 (GDI32.59) + * CreateRectRgn (GDI32.59) */ HRGN WINAPI CreateRectRgn(INT left, INT top, INT right, INT bottom) { @@ -610,7 +610,7 @@ HRGN16 WINAPI CreateRectRgnIndirect16( const RECT16* rect ) /*********************************************************************** - * CreateRectRgnIndirect32 (GDI32.60) + * CreateRectRgnIndirect (GDI32.60) */ HRGN WINAPI CreateRectRgnIndirect( const RECT* rect ) { @@ -634,7 +634,7 @@ VOID WINAPI SetRectRgn16( HRGN16 hrgn, INT16 left, INT16 top, /*********************************************************************** - * SetRectRgn32 (GDI32.332) + * SetRectRgn (GDI32.332) * * Allows either or both left and top to be greater than right or bottom. */ @@ -673,7 +673,7 @@ BOOL WINAPI SetRectRgn( HRGN hrgn, INT left, INT top, * * If either ellipse dimension is zero we call CreateRectRgn16 for its * `special' behaviour. -ve ellipse dimensions can result in GPFs under win3.1 - * we just let CreateRoundRectRgn32 convert them to +ve values. + * we just let CreateRoundRectRgn convert them to +ve values. */ HRGN16 WINAPI CreateRoundRectRgn16( INT16 left, INT16 top, @@ -688,7 +688,7 @@ HRGN16 WINAPI CreateRoundRectRgn16( INT16 left, INT16 top, } /*********************************************************************** - * CreateRoundRectRgn32 (GDI32.61) + * CreateRoundRectRgn (GDI32.61) */ HRGN WINAPI CreateRoundRectRgn( INT left, INT top, INT right, INT bottom, @@ -808,7 +808,7 @@ HRGN16 WINAPI CreateEllipticRgn16( INT16 left, INT16 top, /*********************************************************************** - * CreateEllipticRgn32 (GDI32.39) + * CreateEllipticRgn (GDI32.39) */ HRGN WINAPI CreateEllipticRgn( INT left, INT top, INT right, INT bottom ) @@ -830,7 +830,7 @@ HRGN16 WINAPI CreateEllipticRgnIndirect16( const RECT16 *rect ) /*********************************************************************** - * CreateEllipticRgnIndirect32 (GDI32.40) + * CreateEllipticRgnIndirect (GDI32.40) */ HRGN WINAPI CreateEllipticRgnIndirect( const RECT *rect ) { @@ -840,7 +840,7 @@ HRGN WINAPI CreateEllipticRgnIndirect( const RECT *rect ) } /*********************************************************************** - * GetRegionData32 (GDI32.217) + * GetRegionData (GDI32.217) * */ DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata) @@ -934,7 +934,7 @@ BOOL16 WINAPI PtInRegion16( HRGN16 hrgn, INT16 x, INT16 y ) /*********************************************************************** - * PtInRegion32 (GDI32.278) + * PtInRegion (GDI32.278) */ BOOL WINAPI PtInRegion( HRGN hrgn, INT x, INT y ) { @@ -969,7 +969,7 @@ BOOL16 WINAPI RectInRegion16( HRGN16 hrgn, const RECT16 *rect ) /*********************************************************************** - * RectInRegion32 (GDI32.281) + * RectInRegion (GDI32.281) * * Returns TRUE if rect is at least partly inside hrgn */ @@ -1024,7 +1024,7 @@ BOOL16 WINAPI EqualRgn16( HRGN16 rgn1, HRGN16 rgn2 ) /*********************************************************************** - * EqualRgn32 (GDI32.90) + * EqualRgn (GDI32.90) */ BOOL WINAPI EqualRgn( HRGN hrgn1, HRGN hrgn2 ) { @@ -1083,7 +1083,7 @@ static void REGION_UnionRectWithRegion(const RECT *rect, WINEREGION *rgn) /*********************************************************************** * REGION_UnionRectWithRgn - * Adds a rectangle to a HRGN32 + * Adds a rectangle to a HRGN * A helper used by scroll.c */ BOOL REGION_UnionRectWithRgn( HRGN hrgn, const RECT *lpRect ) @@ -1192,7 +1192,7 @@ INT16 WINAPI CombineRgn16(HRGN16 hDest, HRGN16 hSrc1, HRGN16 hSrc2, INT16 mode) /*********************************************************************** - * CombineRgn32 (GDI32.19) + * CombineRgn (GDI32.19) * * Note: The behavior is correct even if src and dest regions are the same. */ @@ -2668,7 +2668,7 @@ static int REGION_PtsToRegion(int numFullPtBlocks, int iCurPtBlock, } /*********************************************************************** - * CreatePolyPolygonRgn32 (GDI32.57) + * CreatePolyPolygonRgn (GDI32.57) */ HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, INT nbpolygons, INT mode) @@ -2885,7 +2885,7 @@ HRGN16 WINAPI CreatePolyPolygonRgn16( const POINT16 *points, } /*********************************************************************** - * CreatePolygonRgn32 (GDI32.58) + * CreatePolygonRgn (GDI32.58) */ HRGN WINAPI CreatePolygonRgn( const POINT *points, INT count, INT mode ) diff --git a/objects/text.c b/objects/text.c index fed275200cc..e8c01946573 100644 --- a/objects/text.c +++ b/objects/text.c @@ -296,7 +296,7 @@ INT16 WINAPI DrawText16( HDC16 hdc, LPCSTR str, INT16 i_count, /*********************************************************************** - * DrawText32A (USER32.164) + * DrawTextA (USER32.164) */ INT WINAPI DrawTextA( HDC hdc, LPCSTR str, INT count, LPRECT rect, UINT flags ) @@ -314,7 +314,7 @@ INT WINAPI DrawTextA( HDC hdc, LPCSTR str, INT count, /*********************************************************************** - * DrawText32W (USER32.167) + * DrawTextW (USER32.167) */ INT WINAPI DrawTextW( HDC hdc, LPCWSTR str, INT count, LPRECT rect, UINT flags ) @@ -326,7 +326,7 @@ INT WINAPI DrawTextW( HDC hdc, LPCWSTR str, INT count, } /*********************************************************************** - * DrawTextEx32A (USER32.165) + * DrawTextExA (USER32.165) */ INT WINAPI DrawTextExA( HDC hdc, LPCSTR str, INT count, LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp ) @@ -341,7 +341,7 @@ INT WINAPI DrawTextExA( HDC hdc, LPCSTR str, INT count, } /*********************************************************************** - * DrawTextEx32W (USER32.166) + * DrawTextExW (USER32.166) */ INT WINAPI DrawTextExW( HDC hdc, LPCWSTR str, INT count, LPRECT rect, UINT flags, LPDRAWTEXTPARAMS dtp ) @@ -420,7 +420,7 @@ BOOL16 WINAPI TextOut16( HDC16 hdc, INT16 x, INT16 y, LPCSTR str, INT16 count ) /*********************************************************************** - * TextOut32A (GDI32.355) + * TextOutA (GDI32.355) */ BOOL WINAPI TextOutA( HDC hdc, INT x, INT y, LPCSTR str, INT count ) { @@ -429,7 +429,7 @@ BOOL WINAPI TextOutA( HDC hdc, INT x, INT y, LPCSTR str, INT count ) /*********************************************************************** - * TextOut32W (GDI32.356) + * TextOutW (GDI32.356) */ BOOL WINAPI TextOutW(HDC hdc, INT x, INT y, LPCWSTR str, INT count) { @@ -550,7 +550,7 @@ BOOL16 WINAPI GrayString16( HDC16 hdc, HBRUSH16 hbr, GRAYSTRINGPROC16 gsprc, /*********************************************************************** - * GrayString32A (USER32.315) + * GrayStringA (USER32.315) */ BOOL WINAPI GrayStringA( HDC hdc, HBRUSH hbr, GRAYSTRINGPROC gsprc, LPARAM lParam, INT cch, INT x, INT y, @@ -561,7 +561,7 @@ BOOL WINAPI GrayStringA( HDC hdc, HBRUSH hbr, GRAYSTRINGPROC gsprc, /*********************************************************************** - * GrayString32W (USER32.316) + * GrayStringW (USER32.316) */ BOOL WINAPI GrayStringW( HDC hdc, HBRUSH hbr, GRAYSTRINGPROC gsprc, LPARAM lParam, INT cch, INT x, INT y, @@ -663,7 +663,7 @@ LONG WINAPI TabbedTextOut16( HDC16 hdc, INT16 x, INT16 y, LPCSTR lpstr, /*********************************************************************** - * TabbedTextOut32A (USER32.542) + * TabbedTextOutA (USER32.542) */ LONG WINAPI TabbedTextOutA( HDC hdc, INT x, INT y, LPCSTR lpstr, INT count, INT cTabStops, @@ -677,7 +677,7 @@ LONG WINAPI TabbedTextOutA( HDC hdc, INT x, INT y, LPCSTR lpstr, /*********************************************************************** - * TabbedTextOut32W (USER32.543) + * TabbedTextOutW (USER32.543) */ LONG WINAPI TabbedTextOutW( HDC hdc, INT x, INT y, LPCWSTR str, INT count, INT cTabStops, @@ -712,7 +712,7 @@ DWORD WINAPI GetTabbedTextExtent16( HDC16 hdc, LPCSTR lpstr, INT16 count, /*********************************************************************** - * GetTabbedTextExtent32A (USER32.293) + * GetTabbedTextExtentA (USER32.293) */ DWORD WINAPI GetTabbedTextExtentA( HDC hdc, LPCSTR lpstr, INT count, INT cTabStops, const INT *lpTabPos ) @@ -725,7 +725,7 @@ DWORD WINAPI GetTabbedTextExtentA( HDC hdc, LPCSTR lpstr, INT count, /*********************************************************************** - * GetTabbedTextExtent32W (USER32.294) + * GetTabbedTextExtentW (USER32.294) */ DWORD WINAPI GetTabbedTextExtentW( HDC hdc, LPCWSTR lpstr, INT count, INT cTabStops, const INT *lpTabPos ) @@ -744,7 +744,7 @@ DWORD WINAPI GetTabbedTextExtentW( HDC hdc, LPCWSTR lpstr, INT count, } /*********************************************************************** - * GetTextCharset32 [GDI32.226] Gets character set for font in DC + * GetTextCharset [GDI32.226] Gets character set for font in DC * * NOTES * Should it return a UINT32 instead of an INT32? diff --git a/ole/ole2nls.c b/ole/ole2nls.c index 783431add7a..c8729207a71 100644 --- a/ole/ole2nls.c +++ b/ole/ole2nls.c @@ -711,7 +711,7 @@ LCID WINAPI ConvertDefaultLocale32 (LCID lcid) return MAKELANGID( PRIMARYLANGID(lcid), SUBLANG_NEUTRAL); } /****************************************************************************** - * GetLocaleInfo32A [KERNEL32.342] + * GetLocaleInfoA [KERNEL32.342] * * NOTES * LANG_NEUTRAL is equal to LOCALE_SYSTEM_DEFAULT @@ -805,12 +805,12 @@ INT WINAPI GetLocaleInfoA(LCID lcid,LCTYPE LCType,LPSTR buf,INT len) } /****************************************************************************** - * GetLocaleInfo32W [KERNEL32.343] + * GetLocaleInfoW [KERNEL32.343] * * NOTES * MS documentation states that len "specifies the size, in bytes (ANSI version) * or characters (Unicode version), of" wbuf. Thus the number returned is - * the same between GetLocaleInfo32W and GetLocaleInfo32A. + * the same between GetLocaleInfoW and GetLocaleInfoA. */ INT WINAPI GetLocaleInfoW(LCID lcid,LCTYPE LCType,LPWSTR wbuf,INT len) { WORD wlen; @@ -850,7 +850,7 @@ BOOL WINAPI IsValidLocale(LCID lcid,DWORD flags) } /****************************************************************************** - * EnumSystemLocales32W [KERNEL32.209] + * EnumSystemLocalesW [KERNEL32.209] */ BOOL WINAPI EnumSystemLocalesW( LOCALE_ENUMPROCW lpfnLocaleEnum, DWORD flags ) @@ -893,7 +893,7 @@ BOOL WINAPI EnumSystemLocalesW( LOCALE_ENUMPROCW lpfnLocaleEnum, } /****************************************************************************** - * EnumSystemLocales32A [KERNEL32.208] + * EnumSystemLocalesA [KERNEL32.208] */ BOOL WINAPI EnumSystemLocalesA(LOCALE_ENUMPROCA lpfnLocaleEnum, DWORD flags) @@ -1459,7 +1459,7 @@ BOOL16 WINAPI GetStringType16(LCID locale,DWORD dwInfoType,LPCSTR src, return GetStringTypeExA(locale,dwInfoType,src,cchSrc,chartype); } /****************************************************************************** - * GetStringType32A [KERNEL32.396] + * GetStringTypeA [KERNEL32.396] */ BOOL WINAPI GetStringTypeA(LCID locale,DWORD dwInfoType,LPCSTR src, INT cchSrc,LPWORD chartype) @@ -1468,7 +1468,7 @@ BOOL WINAPI GetStringTypeA(LCID locale,DWORD dwInfoType,LPCSTR src, } /****************************************************************************** - * GetStringTypeEx32A [KERNEL32.397] + * GetStringTypeExA [KERNEL32.397] * * FIXME: Ignores the locale. */ @@ -1526,7 +1526,7 @@ BOOL WINAPI GetStringTypeExA(LCID locale,DWORD dwInfoType,LPCSTR src, } /****************************************************************************** - * GetStringType32W [KERNEL32.399] + * GetStringTypeW [KERNEL32.399] * * NOTES * Yes, this is missing LCID locale. MS fault. @@ -1538,7 +1538,7 @@ BOOL WINAPI GetStringTypeW(DWORD dwInfoType,LPCWSTR src,INT cchSrc, } /****************************************************************************** - * GetStringTypeEx32W [KERNEL32.398] + * GetStringTypeExW [KERNEL32.398] * * FIXME: unicode chars are assumed chars */ @@ -2064,7 +2064,7 @@ static int OLE2NLS_isPunctuation(unsigned char c) */ static int OLE2NLS_isNonSpacing(unsigned char c) { - /* This function is used by LCMapString32A. Characters + /* This function is used by LCMapStringA. Characters for which it returns true are ignored when mapping a string with NORM_IGNORENONSPACE */ return ((c==136) || (c==170) || (c==186)); @@ -2075,7 +2075,7 @@ static int OLE2NLS_isNonSpacing(unsigned char c) */ static int OLE2NLS_isSymbol(unsigned char c) { - /* This function is used by LCMapString32A. Characters + /* This function is used by LCMapStringA. Characters for which it returns true are ignored when mapping a string with NORM_IGNORESYMBOLS */ return ( (c!=0) && !IsCharAlphaNumericA(c) ); @@ -2090,7 +2090,7 @@ static int identity(int c) } /************************************************************************* - * LCMapString32A [KERNEL32.492] + * LCMapStringA [KERNEL32.492] * * Convert a string, or generate a sort key from it. * @@ -2112,7 +2112,7 @@ static int identity(int c) * NORM_IGNOREWIDTH means to compare ASCII and wide characters * as if they are equal. * In the only code page implemented so far, there may not be - * wide characters in strings passed to LCMapString32A, + * wide characters in strings passed to LCMapStringA, * so there is nothing to be done for this flag. */ INT WINAPI LCMapStringA( @@ -2352,13 +2352,13 @@ INT WINAPI LCMapStringA( } /************************************************************************* - * LCMapString32W [KERNEL32.493] + * LCMapStringW [KERNEL32.493] * * Convert a string, or generate a sort key from it. * * NOTE * - * See LCMapString32A for documentation + * See LCMapStringA for documentation */ INT WINAPI LCMapStringW( LCID lcid,DWORD mapflags,LPCWSTR srcstr,INT srclen,LPWSTR dststr, @@ -2679,7 +2679,7 @@ static inline int OLE2NLS_EstimateMappingLength(LCID lcid, DWORD dwMapFlags, } /****************************************************************************** - * CompareString32A [KERNEL32.143] + * CompareStringA [KERNEL32.143] * Compares two strings using locale * * RETURNS @@ -2741,7 +2741,7 @@ UINT WINAPI CompareStringA( if ( (!LCMapStringA(lcid,mapstring_flags,s1,l1,sk1,len1)) || (!LCMapStringA(lcid,mapstring_flags,s2,l2,sk2,len2)) ) { - ERR("Bug in LCmapString32A.\n"); + ERR("Bug in LCmapStringA.\n"); result = 0; } else @@ -2761,10 +2761,10 @@ UINT WINAPI CompareStringA( } /****************************************************************************** - * CompareString32W [KERNEL32.144] + * CompareStringW [KERNEL32.144] * This implementation ignores the locale * FIXME : Does only string sort. Should - * be reimplemented the same way as CompareString32A. + * be reimplemented the same way as CompareStringA. */ UINT WINAPI CompareStringW(DWORD lcid, DWORD fdwStyle, LPCWSTR s1, DWORD l1, LPCWSTR s2,DWORD l2) @@ -3265,7 +3265,7 @@ static INT OLE_GetFormatW(LCID locale, DWORD flags, DWORD tflags, /****************************************************************************** - * GetDateFormat32A [KERNEL32.310] + * GetDateFormatA [KERNEL32.310] * Makes an ASCII string of the date * * This function uses format to format the date, or, if format @@ -3336,16 +3336,16 @@ INT WINAPI GetDateFormatA(LCID locale,DWORD flags, TRACE( - "GetDateFormat32A() returning %d, with data=%s\n", + "GetDateFormatA() returning %d, with data=%s\n", ret, date); return ret; } /****************************************************************************** - * GetDateFormat32W [KERNEL32.311] + * GetDateFormatW [KERNEL32.311] * Makes a Unicode string of the date * - * Acts the same as GetDateFormat32A(), except that it's Unicode. + * Acts the same as GetDateFormatA(), except that it's Unicode. * Accepts & returns sizes as counts of Unicode characters. * */ @@ -3364,7 +3364,7 @@ INT WINAPI GetDateFormatW(LCID locale,DWORD flags, } /************************************************************************** - * EnumDateFormats32A (KERNEL32.198) + * EnumDateFormatsA (KERNEL32.198) */ BOOL WINAPI EnumDateFormatsA( DATEFMT_ENUMPROCA lpDateFmtEnumProc, LCID Locale, DWORD dwFlags) @@ -3401,7 +3401,7 @@ BOOL WINAPI EnumDateFormatsA( } /************************************************************************** - * EnumDateFormats32W (KERNEL32.199) + * EnumDateFormatsW (KERNEL32.199) */ BOOL WINAPI EnumDateFormatsW( DATEFMT_ENUMPROCW lpDateFmtEnumProc, LCID Locale, DWORD dwFlags) @@ -3412,7 +3412,7 @@ BOOL WINAPI EnumDateFormatsW( } /************************************************************************** - * EnumTimeFormats32A (KERNEL32.210) + * EnumTimeFormatsA (KERNEL32.210) */ BOOL WINAPI EnumTimeFormatsA( TIMEFMT_ENUMPROCA lpTimeFmtEnumProc, LCID Locale, DWORD dwFlags) @@ -3439,7 +3439,7 @@ BOOL WINAPI EnumTimeFormatsA( } /************************************************************************** - * EnumTimeFormats32W (KERNEL32.211) + * EnumTimeFormatsW (KERNEL32.211) */ BOOL WINAPI EnumTimeFormatsW( TIMEFMT_ENUMPROCW lpTimeFmtEnumProc, LCID Locale, DWORD dwFlags) @@ -3451,7 +3451,7 @@ BOOL WINAPI EnumTimeFormatsW( /************************************************************************** - * GetNumberFormat32A (KERNEL32.355) + * GetNumberFormatA (KERNEL32.355) */ INT WINAPI GetNumberFormatA(LCID locale, DWORD dwflags, LPCSTR lpValue, const NUMBERFMTA * lpFormat, @@ -3715,7 +3715,7 @@ INT WINAPI GetNumberFormatA(LCID locale, DWORD dwflags, } /************************************************************************** - * GetNumberFormat32W (KERNEL32.xxx) + * GetNumberFormatW (KERNEL32.xxx) */ INT WINAPI GetNumberFormatW(LCID locale, DWORD dwflags, LPCWSTR lpvalue, const NUMBERFMTW * lpFormat, @@ -3746,7 +3746,7 @@ static LCID OLE2NLS_CheckLocale (LCID locale) } } /****************************************************************************** - * GetTimeFormat32A [KERNEL32.422] + * GetTimeFormatA [KERNEL32.422] * Makes an ASCII string of the time * * Formats date according to format, or locale default if format is @@ -3814,7 +3814,7 @@ GetTimeFormatA(LCID locale, /* in */ /****************************************************************************** - * GetTimeFormat32W [KERNEL32.423] + * GetTimeFormatW [KERNEL32.423] * Makes a Unicode string of the time */ INT WINAPI diff --git a/scheduler/event.c b/scheduler/event.c index 1004ead09a7..c26112478d1 100644 --- a/scheduler/event.c +++ b/scheduler/event.c @@ -12,7 +12,7 @@ /*********************************************************************** - * CreateEvent32A (KERNEL32.156) + * CreateEventA (KERNEL32.156) */ HANDLE WINAPI CreateEventA( SECURITY_ATTRIBUTES *sa, BOOL manual_reset, BOOL initial_state, LPCSTR name ) @@ -31,7 +31,7 @@ HANDLE WINAPI CreateEventA( SECURITY_ATTRIBUTES *sa, BOOL manual_reset, /*********************************************************************** - * CreateEvent32W (KERNEL32.157) + * CreateEventW (KERNEL32.157) */ HANDLE WINAPI CreateEventW( SECURITY_ATTRIBUTES *sa, BOOL manual_reset, BOOL initial_state, LPCWSTR name ) @@ -58,7 +58,7 @@ HANDLE WINAPI WIN16_CreateEvent( BOOL manual_reset, BOOL initial_state ) /*********************************************************************** - * OpenEvent32A (KERNEL32.536) + * OpenEventA (KERNEL32.536) */ HANDLE WINAPI OpenEventA( DWORD access, BOOL inherit, LPCSTR name ) { @@ -74,7 +74,7 @@ HANDLE WINAPI OpenEventA( DWORD access, BOOL inherit, LPCSTR name ) /*********************************************************************** - * OpenEvent32W (KERNEL32.537) + * OpenEventW (KERNEL32.537) */ HANDLE WINAPI OpenEventW( DWORD access, BOOL inherit, LPCWSTR name ) { diff --git a/scheduler/mutex.c b/scheduler/mutex.c index 24bbe199a15..f656ed384d4 100644 --- a/scheduler/mutex.c +++ b/scheduler/mutex.c @@ -11,7 +11,7 @@ /*********************************************************************** - * CreateMutex32A (KERNEL32.166) + * CreateMutexA (KERNEL32.166) */ HANDLE WINAPI CreateMutexA( SECURITY_ATTRIBUTES *sa, BOOL owner, LPCSTR name ) { @@ -28,7 +28,7 @@ HANDLE WINAPI CreateMutexA( SECURITY_ATTRIBUTES *sa, BOOL owner, LPCSTR name ) /*********************************************************************** - * CreateMutex32W (KERNEL32.167) + * CreateMutexW (KERNEL32.167) */ HANDLE WINAPI CreateMutexW( SECURITY_ATTRIBUTES *sa, BOOL owner, LPCWSTR name ) { @@ -45,7 +45,7 @@ HANDLE WINAPI CreateMutexW( SECURITY_ATTRIBUTES *sa, BOOL owner, LPCWSTR name ) /*********************************************************************** - * OpenMutex32A (KERNEL32.541) + * OpenMutexA (KERNEL32.541) */ HANDLE WINAPI OpenMutexA( DWORD access, BOOL inherit, LPCSTR name ) { @@ -61,7 +61,7 @@ HANDLE WINAPI OpenMutexA( DWORD access, BOOL inherit, LPCSTR name ) /*********************************************************************** - * OpenMutex32W (KERNEL32.542) + * OpenMutexW (KERNEL32.542) */ HANDLE WINAPI OpenMutexW( DWORD access, BOOL inherit, LPCWSTR name ) { diff --git a/scheduler/semaphore.c b/scheduler/semaphore.c index a9b130fb23d..e5880a6e502 100644 --- a/scheduler/semaphore.c +++ b/scheduler/semaphore.c @@ -11,7 +11,7 @@ /*********************************************************************** - * CreateSemaphore32A (KERNEL32.174) + * CreateSemaphoreA (KERNEL32.174) */ HANDLE WINAPI CreateSemaphoreA( SECURITY_ATTRIBUTES *sa, LONG initial, LONG max, LPCSTR name ) { @@ -37,7 +37,7 @@ HANDLE WINAPI CreateSemaphoreA( SECURITY_ATTRIBUTES *sa, LONG initial, LONG max, /*********************************************************************** - * CreateSemaphore32W (KERNEL32.175) + * CreateSemaphoreW (KERNEL32.175) */ HANDLE WINAPI CreateSemaphoreW( SECURITY_ATTRIBUTES *sa, LONG initial, LONG max, LPCWSTR name ) @@ -64,7 +64,7 @@ HANDLE WINAPI CreateSemaphoreW( SECURITY_ATTRIBUTES *sa, LONG initial, /*********************************************************************** - * OpenSemaphore32A (KERNEL32.545) + * OpenSemaphoreA (KERNEL32.545) */ HANDLE WINAPI OpenSemaphoreA( DWORD access, BOOL inherit, LPCSTR name ) { @@ -80,7 +80,7 @@ HANDLE WINAPI OpenSemaphoreA( DWORD access, BOOL inherit, LPCSTR name ) /*********************************************************************** - * OpenSemaphore32W (KERNEL32.546) + * OpenSemaphoreW (KERNEL32.546) */ HANDLE WINAPI OpenSemaphoreW( DWORD access, BOOL inherit, LPCWSTR name ) { diff --git a/scheduler/syslevel.c b/scheduler/syslevel.c index ea677bc0c59..0a94bdfd11b 100644 --- a/scheduler/syslevel.c +++ b/scheduler/syslevel.c @@ -38,7 +38,7 @@ void SYSLEVEL_Init(void) } /************************************************************************ - * GetpWin16Lock32 (KERNEL32.93) + * GetpWin16Lock (KERNEL32.93) */ VOID WINAPI GetpWin16Lock(SYSLEVEL **lock) { @@ -129,7 +129,7 @@ VOID WINAPI _LeaveSysLevel(SYSLEVEL *lock) } /************************************************************************ - * (KERNEL32.86) + * _KERNEL32_86 (KERNEL32.86) */ VOID WINAPI _KERNEL32_86(SYSLEVEL *lock) { diff --git a/win32/code_page.c b/win32/code_page.c index 3decc820837..ebf36f71b05 100644 --- a/win32/code_page.c +++ b/win32/code_page.c @@ -267,7 +267,7 @@ BOOL16 WINAPI IsDBCSLeadByte16( BYTE testchar ) /*********************************************************************** - * IsDBCSLeadByte32 (KERNEL32.358) + * IsDBCSLeadByte (KERNEL32.358) */ BOOL WINAPI IsDBCSLeadByte( BYTE testchar ) { @@ -276,7 +276,7 @@ BOOL WINAPI IsDBCSLeadByte( BYTE testchar ) /*********************************************************************** - * EnumSystemCodePages32A (KERNEL32.92) + * EnumSystemCodePagesA (KERNEL32.92) */ BOOL WINAPI EnumSystemCodePagesA(CODEPAGE_ENUMPROCA lpfnCodePageEnum,DWORD flags) { @@ -286,7 +286,7 @@ BOOL WINAPI EnumSystemCodePagesA(CODEPAGE_ENUMPROCA lpfnCodePageEnum,DWORD flags } /*********************************************************************** - * EnumSystemCodePages32W (KERNEL32.93) + * EnumSystemCodePagesW (KERNEL32.93) */ BOOL WINAPI EnumSystemCodePagesW( CODEPAGE_ENUMPROCW lpfnCodePageEnum, DWORD flags) diff --git a/win32/console.c b/win32/console.c index ac0d66fffe8..837a573f868 100644 --- a/win32/console.c +++ b/win32/console.c @@ -679,7 +679,7 @@ DWORD WINAPI GetConsoleTitleA(LPSTR title,DWORD size) /****************************************************************************** - * GetConsoleTitle32W [KERNEL32.192] Retrieves title string for console + * GetConsoleTitleW [KERNEL32.192] Retrieves title string for console * * PARAMS * title [O] Address of buffer for title @@ -934,7 +934,7 @@ BOOL WINAPI ReadConsoleW( HANDLE hConsoleInput, /****************************************************************************** - * ReadConsoleInput32A [KERNEL32.569] Reads data from a console + * ReadConsoleInputA [KERNEL32.569] Reads data from a console * * PARAMS * hConsoleInput [I] Handle to console input buffer @@ -971,7 +971,7 @@ BOOL WINAPI ReadConsoleInputA(HANDLE hConsoleInput, LPINPUT_RECORD lpBuffer, /*********************************************************************** - * ReadConsoleInput32W (KERNEL32.570) + * ReadConsoleInputW (KERNEL32.570) */ BOOL WINAPI ReadConsoleInputW( HANDLE handle, LPINPUT_RECORD buffer, DWORD count, LPDWORD read ) @@ -1032,7 +1032,7 @@ BOOL WINAPI PeekConsoleInputW(HANDLE hConsoleInput, /****************************************************************************** - * WriteConsoleInput32A [KERNEL32.730] Write data to a console input buffer + * WriteConsoleInputA [KERNEL32.730] Write data to a console input buffer * */ BOOL WINAPI WriteConsoleInputA( HANDLE handle, INPUT_RECORD *buffer, @@ -1058,7 +1058,7 @@ BOOL WINAPI WriteConsoleInputA( HANDLE handle, INPUT_RECORD *buffer, /*********************************************************************** - * SetConsoleTitle32A (KERNEL32.476) + * SetConsoleTitleA (KERNEL32.476) * * Sets the console title. * @@ -1095,7 +1095,7 @@ BOOL WINAPI SetConsoleTitleA(LPCSTR title) /****************************************************************************** - * SetConsoleTitle32W [KERNEL32.477] Sets title bar string for console + * SetConsoleTitleW [KERNEL32.477] Sets title bar string for console * * PARAMS * title [I] Address of new title @@ -1177,7 +1177,7 @@ BOOL WINAPI GetNumberOfConsoleMouseButtons(LPDWORD nrofbuttons) } /****************************************************************************** - * GetConsoleCursorInfo32 [KERNEL32.296] Gets size and visibility of console + * GetConsoleCursorInfo [KERNEL32.296] Gets size and visibility of console * * PARAMS * hcon [I] Handle to console screen buffer @@ -1202,7 +1202,7 @@ BOOL WINAPI GetConsoleCursorInfo( HANDLE hcon, LPCONSOLE_CURSOR_INFO cinfo ) /****************************************************************************** - * SetConsoleCursorInfo32 [KERNEL32.626] Sets size and visibility of cursor + * SetConsoleCursorInfo [KERNEL32.626] Sets size and visibility of cursor * * RETURNS * Success: TRUE @@ -1246,7 +1246,7 @@ BOOL WINAPI SetConsoleWindowInfo( /****************************************************************************** - * SetConsoleTextAttribute32 [KERNEL32.631] Sets colors for text + * SetConsoleTextAttribute [KERNEL32.631] Sets colors for text * * Sets the foreground and background color attributes of characters * written to the screen buffer. @@ -1386,7 +1386,7 @@ BOOL WINAPI FillConsoleOutputAttribute( HANDLE hConsoleOutput, } /****************************************************************************** - * ReadConsoleOutputCharacter32A [KERNEL32.573] + * ReadConsoleOutputCharacterA [KERNEL32.573] * * BUGS * Unimplemented diff --git a/win32/device.c b/win32/device.c index 7e2cd850203..3b8ee350ea0 100644 --- a/win32/device.c +++ b/win32/device.c @@ -1234,6 +1234,9 @@ static BOOL DeviceIo_PCCARD (DWORD dwIoControlCode, return FALSE; } +/*********************************************************************** + * OpenVxDHandle + */ DWORD WINAPI OpenVxDHandle(DWORD pmt) { FIXME( "(0x%08lx) stub!\n", pmt); diff --git a/win32/file.c b/win32/file.c index ac55d014f56..17cc9594e74 100644 --- a/win32/file.c +++ b/win32/file.c @@ -64,7 +64,7 @@ BOOL16 WINAPI SetFileAttributes16( LPCSTR lpFileName, DWORD attributes ) /************************************************************************** - * SetFileAttributes32A (KERNEL32.490) + * SetFileAttributesA (KERNEL32.490) */ BOOL WINAPI SetFileAttributesA(LPCSTR lpFileName, DWORD attributes) { @@ -118,7 +118,7 @@ BOOL WINAPI SetFileAttributesA(LPCSTR lpFileName, DWORD attributes) /************************************************************************** - * SetFileAttributes32W (KERNEL32.491) + * SetFileAttributesW (KERNEL32.491) */ BOOL WINAPI SetFileAttributesW(LPCWSTR lpFileName, DWORD attributes) { diff --git a/win32/kernel32.c b/win32/kernel32.c index c8e8fbe277f..8b391e7aa74 100644 --- a/win32/kernel32.c +++ b/win32/kernel32.c @@ -469,22 +469,80 @@ static void FT_Exit(CONTEXT86 *context, int nPopArgs) ESP_reg(context) += nPopArgs; } +/*********************************************************************** + * FT_Exit0 (KERNEL32.218) + */ void WINAPI FT_Exit0 (CONTEXT86 *context) { FT_Exit(context, 0); } -void WINAPI FT_Exit4 (CONTEXT86 *context) { FT_Exit(context, 4); } -void WINAPI FT_Exit8 (CONTEXT86 *context) { FT_Exit(context, 8); } -void WINAPI FT_Exit12(CONTEXT86 *context) { FT_Exit(context, 12); } -void WINAPI FT_Exit16(CONTEXT86 *context) { FT_Exit(context, 16); } -void WINAPI FT_Exit20(CONTEXT86 *context) { FT_Exit(context, 20); } -void WINAPI FT_Exit24(CONTEXT86 *context) { FT_Exit(context, 24); } -void WINAPI FT_Exit28(CONTEXT86 *context) { FT_Exit(context, 28); } -void WINAPI FT_Exit32(CONTEXT86 *context) { FT_Exit(context, 32); } -void WINAPI FT_Exit36(CONTEXT86 *context) { FT_Exit(context, 36); } -void WINAPI FT_Exit40(CONTEXT86 *context) { FT_Exit(context, 40); } -void WINAPI FT_Exit44(CONTEXT86 *context) { FT_Exit(context, 44); } -void WINAPI FT_Exit48(CONTEXT86 *context) { FT_Exit(context, 48); } -void WINAPI FT_Exit52(CONTEXT86 *context) { FT_Exit(context, 52); } -void WINAPI FT_Exit56(CONTEXT86 *context) { FT_Exit(context, 56); } +/*********************************************************************** + * FT_Exit4 (KERNEL32.219) + */ +void WINAPI FT_Exit4 (CONTEXT86 *context) { FT_Exit(context, 4); } + +/*********************************************************************** + * FT_Exit8 (KERNEL32.220) + */ +void WINAPI FT_Exit8 (CONTEXT86 *context) { FT_Exit(context, 8); } + +/*********************************************************************** + * FT_Exit12 (KERNEL32.221) + */ +void WINAPI FT_Exit12(CONTEXT86 *context) { FT_Exit(context, 12); } + +/*********************************************************************** + * FT_Exit16 (KERNEL32.222) + */ +void WINAPI FT_Exit16(CONTEXT86 *context) { FT_Exit(context, 16); } + +/*********************************************************************** + * FT_Exit20 (KERNEL32.223) + */ +void WINAPI FT_Exit20(CONTEXT86 *context) { FT_Exit(context, 20); } + +/*********************************************************************** + * FT_Exit24 (KERNEL32.224) + */ +void WINAPI FT_Exit24(CONTEXT86 *context) { FT_Exit(context, 24); } + +/*********************************************************************** + * FT_Exit28 (KERNEL32.225) + */ +void WINAPI FT_Exit28(CONTEXT86 *context) { FT_Exit(context, 28); } + +/*********************************************************************** + * FT_Exit32 (KERNEL32.226) + */ +void WINAPI FT_Exit32(CONTEXT86 *context) { FT_Exit(context, 32); } + +/*********************************************************************** + * FT_Exit36 (KERNEL32.227) + */ +void WINAPI FT_Exit36(CONTEXT86 *context) { FT_Exit(context, 36); } + +/*********************************************************************** + * FT_Exit40 (KERNEL32.228) + */ +void WINAPI FT_Exit40(CONTEXT86 *context) { FT_Exit(context, 40); } + +/*********************************************************************** + * FT_Exit44 (KERNEL32.229) + */ +void WINAPI FT_Exit44(CONTEXT86 *context) { FT_Exit(context, 44); } + +/*********************************************************************** + * FT_Exit48 (KERNEL32.230) + */ +void WINAPI FT_Exit48(CONTEXT86 *context) { FT_Exit(context, 48); } + +/*********************************************************************** + * FT_Exit52 (KERNEL32.231) + */ +void WINAPI FT_Exit52(CONTEXT86 *context) { FT_Exit(context, 52); } + +/*********************************************************************** + * FT_Exit56 (KERNEL32.232) + */ +void WINAPI FT_Exit56(CONTEXT86 *context) { FT_Exit(context, 56); } /*********************************************************************** * ThunkInitLS (KERNEL32.43) @@ -765,7 +823,7 @@ void WINAPI QT_ThunkPrime( CONTEXT86 *context ) } /*********************************************************************** - * (KERNEL32.46) + * ThunkInitSL (KERNEL32.46) * Another thunkbuf link routine. * The start of the thunkbuf looks like this: * 00: DWORD length @@ -1107,7 +1165,7 @@ void WINAPI K32Thk1632Epilog( CONTEXT86 *context ) } /*********************************************************************** - * UpdateResource32A (KERNEL32.707) + * UpdateResourceA (KERNEL32.707) */ BOOL WINAPI UpdateResourceA( HANDLE hUpdate, @@ -1123,7 +1181,7 @@ BOOL WINAPI UpdateResourceA( } /*********************************************************************** - * UpdateResource32W (KERNEL32.708) + * UpdateResourceW (KERNEL32.708) */ BOOL WINAPI UpdateResourceW( HANDLE hUpdate, @@ -1140,7 +1198,7 @@ BOOL WINAPI UpdateResourceW( /*********************************************************************** - * WaitNamedPipe32A [KERNEL32.725] + * WaitNamedPipeA [KERNEL32.725] */ BOOL WINAPI WaitNamedPipeA (LPCSTR lpNamedPipeName, DWORD nTimeOut) { FIXME_(win32)("%s 0x%08lx\n",lpNamedPipeName,nTimeOut); @@ -1148,7 +1206,7 @@ BOOL WINAPI WaitNamedPipeA (LPCSTR lpNamedPipeName, DWORD nTimeOut) return FALSE; } /*********************************************************************** - * WaitNamedPipe32W [KERNEL32.726] + * WaitNamedPipeW [KERNEL32.726] */ BOOL WINAPI WaitNamedPipeW (LPCWSTR lpNamedPipeName, DWORD nTimeOut) { FIXME_(win32)("%s 0x%08lx\n",debugstr_w(lpNamedPipeName),nTimeOut); diff --git a/win32/newfns.c b/win32/newfns.c index f8b75d53a8e..9dd357989d5 100644 --- a/win32/newfns.c +++ b/win32/newfns.c @@ -120,7 +120,7 @@ BOOL WINAPI SetSystemPowerState(BOOL suspend_or_hibernate, /****************************************************************************** - * CreateMailslot32A [KERNEL32.164] + * CreateMailslotA [KERNEL32.164] */ HANDLE WINAPI CreateMailslotA( LPCSTR lpName, DWORD nMaxMessageSize, DWORD lReadTimeout, LPSECURITY_ATTRIBUTES sa) @@ -132,7 +132,7 @@ HANDLE WINAPI CreateMailslotA( LPCSTR lpName, DWORD nMaxMessageSize, /****************************************************************************** - * CreateMailslot32W [KERNEL32.165] Creates a mailslot with specified name + * CreateMailslotW [KERNEL32.165] Creates a mailslot with specified name * * PARAMS * lpName [I] Pointer to string for mailslot name @@ -181,7 +181,7 @@ BOOL WINAPI GetMailslotInfo( HANDLE hMailslot, LPDWORD lpMaxMessageSize, /****************************************************************************** - * GetCompressedFileSize32A [KERNEL32.291] + * GetCompressedFileSizeA [KERNEL32.291] * * NOTES * This should call the W function below @@ -196,7 +196,7 @@ DWORD WINAPI GetCompressedFileSizeA( /****************************************************************************** - * GetCompressedFileSize32W [KERNEL32.292] + * GetCompressedFileSizeW [KERNEL32.292] * * RETURNS * Success: Low-order doubleword of number of bytes @@ -262,7 +262,7 @@ VOID WINAPI SetDebugErrorLevel( DWORD dwLevel ) /****************************************************************************** - * SetComputerName32A [KERNEL32.621] + * SetComputerNameA [KERNEL32.621] */ BOOL WINAPI SetComputerNameA( LPCSTR lpComputerName ) { @@ -274,7 +274,7 @@ BOOL WINAPI SetComputerNameA( LPCSTR lpComputerName ) /****************************************************************************** - * SetComputerName32W [KERNEL32.622] + * SetComputerNameW [KERNEL32.622] * * PARAMS * lpComputerName [I] Address of new computer name @@ -287,14 +287,16 @@ BOOL WINAPI SetComputerNameW( LPCWSTR lpComputerName ) return TRUE; } - +/****************************************************************************** + * EnumPortsA + */ BOOL WINAPI EnumPortsA(LPSTR name,DWORD level,LPBYTE ports,DWORD bufsize,LPDWORD bufneeded,LPDWORD bufreturned) { FIXME("(%s,%ld,%p,%ld,%p,%p), stub!\n",name,level,ports,bufsize,bufneeded,bufreturned); return FALSE; } /****************************************************************************** - * OpenDesktop32A [USER32.408] + * OpenDesktopA [USER32.408] * * NOTES * Return type should be HDESK @@ -312,6 +314,9 @@ HANDLE WINAPI OpenDesktopA( LPCSTR lpszDesktop, DWORD dwFlags, } +/****************************************************************************** + * SetUserObjectInformationA + */ BOOL WINAPI SetUserObjectInformationA( HANDLE hObj, INT nIndex, LPVOID pvInfo, DWORD nLength ) { @@ -319,13 +324,18 @@ BOOL WINAPI SetUserObjectInformationA( HANDLE hObj, INT nIndex, return TRUE; } - +/****************************************************************************** + * SetThreadDesktop + */ BOOL WINAPI SetThreadDesktop( HANDLE hDesktop ) { FIXME("(%x): stub\n",hDesktop); return TRUE; } +/****************************************************************************** + * CreateIoCompletionPort + */ HANDLE WINAPI CreateIoCompletionPort(HANDLE hFileHandle, HANDLE hExistingCompletionPort, DWORD dwCompletionKey, DWORD dwNumberOfConcurrentThreads) diff --git a/win32/ordinals.c b/win32/ordinals.c index 1433dabf1e2..0dc84b2ccb7 100644 --- a/win32/ordinals.c +++ b/win32/ordinals.c @@ -73,12 +73,17 @@ void WINAPI HouseCleanLogicallyDeadHandles(void) don't need it :-) */ } - +/********************************************************************** + * _KERNEL32_100 + */ BOOL WINAPI _KERNEL32_100(HANDLE threadid,DWORD exitcode,DWORD x) { FIXME_(thread)("(%d,%ld,0x%08lx): stub\n",threadid,exitcode,x); return TRUE; } +/********************************************************************** + * _KERNEL32_99 + */ DWORD WINAPI _KERNEL32_99(DWORD x) { FIXME_(win32)("(0x%08lx): stub\n",x); return 1; @@ -124,7 +129,7 @@ HRESULT WINAPI DeregisterShellHookWindow ( DWORD u ) } /*********************************************************************** - * RegisterTaskList32 [USER23.436] + * RegisterTaskList [USER23.436] */ DWORD WINAPI RegisterTaskList (DWORD x) { FIXME_(win)("0x%08lx\n",x); diff --git a/win32/time.c b/win32/time.c index be54af300de..2bdf91f1d5e 100644 --- a/win32/time.c +++ b/win32/time.c @@ -175,7 +175,7 @@ VOID WINAPI GetSystemTimeAsFileTime(LPFILETIME systemtimeAsfiletime) } /*********************************************************************** - * SystemTimeToTzSpecificLocalTime32 (KERNEL32.683) + * SystemTimeToTzSpecificLocalTime (KERNEL32.683) */ BOOL WINAPI SystemTimeToTzSpecificLocalTime( LPTIME_ZONE_INFORMATION lpTimeZoneInformation, diff --git a/windows/caret.c b/windows/caret.c index 353430637a3..7b9cc75b403 100644 --- a/windows/caret.c +++ b/windows/caret.c @@ -138,7 +138,7 @@ void WINAPI CreateCaret16( HWND16 hwnd, HBITMAP16 bitmap, } /***************************************************************** - * CreateCaret32 (USER32.66) + * CreateCaret (USER32.66) */ BOOL WINAPI CreateCaret( HWND hwnd, HBITMAP bitmap, INT width, INT height ) @@ -189,7 +189,7 @@ void WINAPI DestroyCaret16(void) /***************************************************************** - * DestroyCaret32 (USER32.131) + * DestroyCaret (USER32.131) */ BOOL WINAPI DestroyCaret(void) { @@ -216,7 +216,7 @@ void WINAPI SetCaretPos16( INT16 x, INT16 y ) /***************************************************************** - * SetCaretPos32 (USER32.466) + * SetCaretPos (USER32.466) */ BOOL WINAPI SetCaretPos( INT x, INT y) { @@ -248,7 +248,7 @@ void WINAPI HideCaret16( HWND16 hwnd ) /***************************************************************** - * HideCaret32 (USER32.317) + * HideCaret (USER32.317) */ BOOL WINAPI HideCaret( HWND hwnd ) { @@ -275,7 +275,7 @@ void WINAPI ShowCaret16( HWND16 hwnd ) /***************************************************************** - * ShowCaret32 (USER32.529) + * ShowCaret (USER32.529) */ BOOL WINAPI ShowCaret( HWND hwnd ) { @@ -307,7 +307,7 @@ void WINAPI SetCaretBlinkTime16( UINT16 msecs ) } /***************************************************************** - * SetCaretBlinkTime32 (USER32.465) + * SetCaretBlinkTime (USER32.465) */ BOOL WINAPI SetCaretBlinkTime( UINT msecs ) { @@ -332,7 +332,7 @@ UINT16 WINAPI GetCaretBlinkTime16(void) /***************************************************************** - * GetCaretBlinkTime32 (USER32.209) + * GetCaretBlinkTime (USER32.209) */ UINT WINAPI GetCaretBlinkTime(void) { @@ -355,7 +355,7 @@ VOID WINAPI GetCaretPos16( LPPOINT16 pt ) /***************************************************************** - * GetCaretPos32 (USER32.210) + * GetCaretPos (USER32.210) */ BOOL WINAPI GetCaretPos( LPPOINT pt ) { diff --git a/windows/class.c b/windows/class.c index fd6a0f7be31..c8b39d1528d 100644 --- a/windows/class.c +++ b/windows/class.c @@ -454,7 +454,7 @@ ATOM WINAPI RegisterClass16( const WNDCLASS16 *wc ) /*********************************************************************** - * RegisterClass32A (USER32.427) + * RegisterClassA (USER32.427) * RETURNS * >0: Unique identifier * 0: Failure @@ -503,7 +503,7 @@ ATOM WINAPI RegisterClassA( /*********************************************************************** - * RegisterClass32W (USER32.430) + * RegisterClassW (USER32.430) */ ATOM WINAPI RegisterClassW( const WNDCLASSW* wc ) { @@ -584,7 +584,7 @@ ATOM WINAPI RegisterClassEx16( const WNDCLASSEX16 *wc ) /*********************************************************************** - * RegisterClassEx32A (USER32.428) + * RegisterClassExA (USER32.428) */ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { @@ -622,7 +622,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) /*********************************************************************** - * RegisterClassEx32W (USER32.429) + * RegisterClassExW (USER32.429) */ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) { @@ -669,7 +669,7 @@ BOOL16 WINAPI UnregisterClass16( LPCSTR className, HINSTANCE16 hInstance ) /*********************************************************************** - * UnregisterClass32A (USER32.563) + * UnregisterClassA (USER32.563) * */ BOOL WINAPI UnregisterClassA( LPCSTR className, HINSTANCE hInstance ) @@ -696,7 +696,7 @@ BOOL WINAPI UnregisterClassA( LPCSTR className, HINSTANCE hInstance ) } /*********************************************************************** - * UnregisterClass32W (USER32.564) + * UnregisterClassW (USER32.564) */ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) { CLASS *classPtr; @@ -731,7 +731,7 @@ WORD WINAPI GetClassWord16( HWND16 hwnd, INT16 offset ) /*********************************************************************** - * GetClassWord32 (USER32.219) + * GetClassWord (USER32.219) */ WORD WINAPI GetClassWord( HWND hwnd, INT offset ) { @@ -803,7 +803,7 @@ LONG WINAPI GetClassLong16( HWND16 hwnd, INT16 offset ) /*********************************************************************** - * GetClassLong32A (USER32.215) + * GetClassLongA (USER32.215) */ LONG WINAPI GetClassLongA( HWND hwnd, INT offset ) { @@ -855,7 +855,7 @@ END: /*********************************************************************** - * GetClassLong32W (USER32.216) + * GetClassLongW (USER32.216) */ LONG WINAPI GetClassLongW( HWND hwnd, INT offset ) { @@ -892,7 +892,7 @@ WORD WINAPI SetClassWord16( HWND16 hwnd, INT16 offset, WORD newval ) /*********************************************************************** - * SetClassWord32 (USER32.469) + * SetClassWord (USER32.469) */ WORD WINAPI SetClassWord( HWND hwnd, INT offset, WORD newval ) { @@ -977,7 +977,7 @@ LONG WINAPI SetClassLong16( HWND16 hwnd, INT16 offset, LONG newval ) /*********************************************************************** - * SetClassLong32A (USER32.467) + * SetClassLongA (USER32.467) */ LONG WINAPI SetClassLongA( HWND hwnd, INT offset, LONG newval ) { @@ -1035,7 +1035,7 @@ END: /*********************************************************************** - * SetClassLong32W (USER32.468) + * SetClassLongW (USER32.468) */ LONG WINAPI SetClassLongW( HWND hwnd, INT offset, LONG newval ) { @@ -1074,7 +1074,7 @@ INT16 WINAPI GetClassName16( HWND16 hwnd, LPSTR buffer, INT16 count ) /*********************************************************************** - * GetClassName32A (USER32.217) + * GetClassNameA (USER32.217) */ INT WINAPI GetClassNameA( HWND hwnd, LPSTR buffer, INT count ) { INT ret; @@ -1090,7 +1090,7 @@ INT WINAPI GetClassNameA( HWND hwnd, LPSTR buffer, INT count ) /*********************************************************************** - * GetClassName32W (USER32.218) + * GetClassNameW (USER32.218) */ INT WINAPI GetClassNameW( HWND hwnd, LPWSTR buffer, INT count ) { INT ret; @@ -1141,7 +1141,7 @@ BOOL16 WINAPI GetClassInfo16( HINSTANCE16 hInstance, LPCSTR name, WNDCLASS16 *wc /*********************************************************************** - * GetClassInfo32A (USER32.211) + * GetClassInfoA (USER32.211) */ BOOL WINAPI GetClassInfoA( HINSTANCE hInstance, LPCSTR name, WNDCLASSA *wc ) @@ -1182,7 +1182,7 @@ BOOL WINAPI GetClassInfoA( HINSTANCE hInstance, LPCSTR name, /*********************************************************************** - * GetClassInfo32W (USER32.214) + * GetClassInfoW (USER32.214) */ BOOL WINAPI GetClassInfoW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSW *wc ) @@ -1256,7 +1256,7 @@ BOOL16 WINAPI GetClassInfoEx16( HINSTANCE16 hInstance, LPCSTR name, WNDCLASSEX16 /*********************************************************************** - * GetClassInfoEx32A (USER32.212) + * GetClassInfoExA (USER32.212) */ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name, WNDCLASSEXA *wc ) @@ -1286,7 +1286,7 @@ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name, /*********************************************************************** - * GetClassInfoEx32W (USER32.213) + * GetClassInfoExW (USER32.213) */ BOOL WINAPI GetClassInfoExW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSEXW *wc ) diff --git a/windows/clipboard.c b/windows/clipboard.c index c1a77add619..32569b65a5e 100644 --- a/windows/clipboard.c +++ b/windows/clipboard.c @@ -529,7 +529,7 @@ BOOL16 WINAPI OpenClipboard16( HWND16 hWnd ) /************************************************************************** - * OpenClipboard32 (USER32.407) + * OpenClipboard (USER32.407) * * Note: Netscape uses NULL hWnd to open the clipboard. */ @@ -565,7 +565,7 @@ BOOL16 WINAPI CloseClipboard16(void) /************************************************************************** - * CloseClipboard32 (USER32.54) + * CloseClipboard (USER32.54) */ BOOL WINAPI CloseClipboard(void) { @@ -593,7 +593,7 @@ BOOL16 WINAPI EmptyClipboard16(void) /************************************************************************** - * EmptyClipboard32 (USER32.169) + * EmptyClipboard (USER32.169) * Empties and acquires ownership of the clipboard */ BOOL WINAPI EmptyClipboard(void) @@ -639,7 +639,7 @@ HWND16 WINAPI GetClipboardOwner16(void) /************************************************************************** - * GetClipboardOwner32 (USER32.225) + * GetClipboardOwner (USER32.225) * FIXME: Can't return the owner if the clipbard is owned by an external app */ HWND WINAPI GetClipboardOwner(void) @@ -834,7 +834,7 @@ HANDLE16 WINAPI GetClipboardData16( UINT16 wFormat ) /************************************************************************** - * GetClipboardData32 (USER32.222) + * GetClipboardData (USER32.222) */ HANDLE WINAPI GetClipboardData( UINT wFormat ) { @@ -905,7 +905,7 @@ INT16 WINAPI CountClipboardFormats16(void) /************************************************************************** - * CountClipboardFormats32 (USER32.63) + * CountClipboardFormats (USER32.63) */ INT WINAPI CountClipboardFormats(void) { @@ -959,7 +959,7 @@ UINT16 WINAPI EnumClipboardFormats16( UINT16 wFormat ) /************************************************************************** - * EnumClipboardFormats32 (USER32.179) + * EnumClipboardFormats (USER32.179) */ UINT WINAPI EnumClipboardFormats( UINT wFormat ) { @@ -1073,7 +1073,7 @@ UINT16 WINAPI RegisterClipboardFormat16( LPCSTR FormatName ) /************************************************************************** - * RegisterClipboardFormat32A (USER32.431) + * RegisterClipboardFormatA (USER32.431) */ UINT WINAPI RegisterClipboardFormatA( LPCSTR formatName ) { @@ -1082,7 +1082,7 @@ UINT WINAPI RegisterClipboardFormatA( LPCSTR formatName ) /************************************************************************** - * RegisterClipboardFormat32W (USER32.432) + * RegisterClipboardFormatW (USER32.432) */ UINT WINAPI RegisterClipboardFormatW( LPCWSTR formatName ) { @@ -1103,7 +1103,7 @@ INT16 WINAPI GetClipboardFormatName16( UINT16 wFormat, LPSTR retStr, INT16 maxle /************************************************************************** - * GetClipboardFormatName32A (USER32.223) + * GetClipboardFormatNameA (USER32.223) */ INT WINAPI GetClipboardFormatNameA( UINT wFormat, LPSTR retStr, INT maxlen ) { @@ -1122,7 +1122,7 @@ INT WINAPI GetClipboardFormatNameA( UINT wFormat, LPSTR retStr, INT maxlen ) /************************************************************************** - * GetClipboardFormatName32W (USER32.224) + * GetClipboardFormatNameW (USER32.224) */ INT WINAPI GetClipboardFormatNameW( UINT wFormat, LPWSTR retStr, INT maxlen ) { @@ -1145,7 +1145,7 @@ HWND16 WINAPI SetClipboardViewer16( HWND16 hWnd ) /************************************************************************** - * SetClipboardViewer32 (USER32.471) + * SetClipboardViewer (USER32.471) */ HWND WINAPI SetClipboardViewer( HWND hWnd ) { @@ -1169,7 +1169,7 @@ HWND16 WINAPI GetClipboardViewer16(void) /************************************************************************** - * GetClipboardViewer32 (USER32.226) + * GetClipboardViewer (USER32.226) */ HWND WINAPI GetClipboardViewer(void) { @@ -1188,7 +1188,7 @@ BOOL16 WINAPI ChangeClipboardChain16(HWND16 hWnd, HWND16 hWndNext) /************************************************************************** - * ChangeClipboardChain32 (USER32.22) + * ChangeClipboardChain (USER32.22) */ BOOL WINAPI ChangeClipboardChain(HWND hWnd, HWND hWndNext) { @@ -1218,7 +1218,7 @@ BOOL16 WINAPI IsClipboardFormatAvailable16( UINT16 wFormat ) /************************************************************************** - * IsClipboardFormatAvailable32 (USER32.340) + * IsClipboardFormatAvailable (USER32.340) */ BOOL WINAPI IsClipboardFormatAvailable( UINT wFormat ) { @@ -1252,7 +1252,7 @@ HWND16 WINAPI GetOpenClipboardWindow16(void) /************************************************************************** - * GetOpenClipboardWindow32 (USER32.277) + * GetOpenClipboardWindow (USER32.277) * FIXME: This wont work if an external app owns the selection */ HWND WINAPI GetOpenClipboardWindow(void) @@ -1273,7 +1273,7 @@ INT16 WINAPI GetPriorityClipboardFormat16( UINT16 *lpPriorityList, INT16 nCount) /************************************************************************** - * GetPriorityClipboardFormat32 (USER32.279) + * GetPriorityClipboardFormat (USER32.279) */ INT WINAPI GetPriorityClipboardFormat( UINT *lpPriorityList, INT nCount ) { diff --git a/windows/cursoricon.c b/windows/cursoricon.c index 08b3b8aa021..d69771502e5 100644 --- a/windows/cursoricon.c +++ b/windows/cursoricon.c @@ -655,7 +655,7 @@ HICON WINAPI CreateIconFromResource( LPBYTE bits, UINT cbSize, /********************************************************************** - * CreateIconFromResourceEx32 (USER32.77) + * CreateIconFromResourceEx (USER32.77) */ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, BOOL bIcon, DWORD dwVersion, @@ -1102,7 +1102,7 @@ HCURSOR16 WINAPI CreateCursor16( HINSTANCE16 hInstance, /*********************************************************************** - * CreateCursor32 (USER32.67) + * CreateCursor (USER32.67) */ HCURSOR WINAPI CreateCursor( HINSTANCE hInstance, INT xHotSpot, INT yHotSpot, @@ -1151,7 +1151,7 @@ HICON16 WINAPI CreateIcon16( HINSTANCE16 hInstance, INT16 nWidth, /*********************************************************************** - * CreateIcon32 (USER32.75) + * CreateIcon (USER32.75) */ HICON WINAPI CreateIcon( HINSTANCE hInstance, INT nWidth, INT nHeight, BYTE bPlanes, BYTE bBitsPixel, @@ -1215,7 +1215,7 @@ HICON16 WINAPI CopyIcon16( HINSTANCE16 hInstance, HICON16 hIcon ) /*********************************************************************** - * CopyIcon32 (USER32.60) + * CopyIcon (USER32.60) */ HICON WINAPI CopyIcon( HICON hIcon ) { @@ -1318,7 +1318,7 @@ BOOL16 WINAPI DrawIcon16( HDC16 hdc, INT16 x, INT16 y, HICON16 hIcon ) /*********************************************************************** - * DrawIcon32 (USER32.159) + * DrawIcon (USER32.159) */ BOOL WINAPI DrawIcon( HDC hdc, INT x, INT y, HICON hIcon ) { @@ -1384,7 +1384,7 @@ HCURSOR16 WINAPI SetCursor16( HCURSOR16 hCursor ) /*********************************************************************** - * SetCursor32 (USER32.472) + * SetCursor (USER32.472) * RETURNS: * A handle to the previous cursor shape. */ @@ -1417,7 +1417,7 @@ void WINAPI SetCursorPos16( INT16 x, INT16 y ) /*********************************************************************** - * SetCursorPos32 (USER32.474) + * SetCursorPos (USER32.474) */ BOOL WINAPI SetCursorPos( INT x, INT y ) { @@ -1436,7 +1436,7 @@ INT16 WINAPI ShowCursor16( BOOL16 bShow ) /*********************************************************************** - * ShowCursor32 (USER32.530) + * ShowCursor (USER32.530) */ INT WINAPI ShowCursor( BOOL bShow ) { @@ -1470,7 +1470,7 @@ HCURSOR16 WINAPI GetCursor16(void) /*********************************************************************** - * GetCursor32 (USER32.227) + * GetCursor (USER32.227) */ HCURSOR WINAPI GetCursor(void) { @@ -1490,7 +1490,7 @@ BOOL16 WINAPI ClipCursor16( const RECT16 *rect ) /*********************************************************************** - * ClipCursor32 (USER32.53) + * ClipCursor (USER32.53) */ BOOL WINAPI ClipCursor( const RECT *rect ) { @@ -1516,7 +1516,7 @@ BOOL16 WINAPI GetCursorPos16( POINT16 *pt ) /*********************************************************************** - * GetCursorPos32 (USER32.229) + * GetCursorPos (USER32.229) */ BOOL WINAPI GetCursorPos( POINT *pt ) { @@ -1539,7 +1539,7 @@ void WINAPI GetClipCursor16( RECT16 *rect ) /*********************************************************************** - * GetClipCursor32 (USER32.221) + * GetClipCursor (USER32.221) */ BOOL WINAPI GetClipCursor( RECT *rect ) { @@ -1587,7 +1587,7 @@ INT16 WINAPI LookupIconIdFromDirectoryEx16( LPBYTE xdir, BOOL16 bIcon, } /********************************************************************** - * LookupIconIdFromDirectoryEx32 (USER32.380) + * LookupIconIdFromDirectoryEx (USER32.380) */ INT WINAPI LookupIconIdFromDirectoryEx( LPBYTE dir, BOOL bIcon, INT width, INT height, UINT cFlag ) @@ -1778,7 +1778,7 @@ BOOL16 WINAPI GetIconInfo16(HICON16 hIcon,LPICONINFO16 iconinfo) } /********************************************************************** - * GetIconInfo32 (USER32.242) + * GetIconInfo (USER32.242) */ BOOL WINAPI GetIconInfo(HICON hIcon,LPICONINFO iconinfo) { CURSORICONINFO *ciconinfo; @@ -1878,7 +1878,7 @@ BOOL16 WINAPI DrawIconEx16 (HDC16 hdc, INT16 xLeft, INT16 yTop, HICON16 hIcon, /****************************************************************************** - * DrawIconEx32 [USER32.160] Draws an icon or cursor on device context + * DrawIconEx [USER32.160] Draws an icon or cursor on device context * * NOTES * Why is this using SM_CXICON instead of SM_CXCURSOR? @@ -2195,7 +2195,7 @@ HICON16 WINAPI CopyImage16( HANDLE16 hnd, UINT16 type, INT16 desiredx, } /****************************************************************************** - * CopyImage32 [USER32.61] Creates new image and copies attributes to it + * CopyImage [USER32.61] Creates new image and copies attributes to it * * PARAMS * hnd [I] Handle to image to copy diff --git a/windows/dce.c b/windows/dce.c index 5b14309d46c..9fef360a44d 100644 --- a/windows/dce.c +++ b/windows/dce.c @@ -646,7 +646,7 @@ HDC16 WINAPI GetDCEx16( HWND16 hwnd, HRGN16 hrgnClip, DWORD flags ) /*********************************************************************** - * GetDCEx32 (USER32.231) + * GetDCEx (USER32.231) * * Unimplemented flags: DCX_LOCKWINDOWUPDATE * @@ -892,7 +892,7 @@ HDC16 WINAPI GetDC16( HWND16 hwnd ) /*********************************************************************** - * GetDC32 (USER32.230) + * GetDC (USER32.230) * RETURNS * :Handle to DC * NULL: Failure @@ -917,7 +917,7 @@ HDC16 WINAPI GetWindowDC16( HWND16 hwnd ) /*********************************************************************** - * GetWindowDC32 (USER32.304) + * GetWindowDC (USER32.304) */ HDC WINAPI GetWindowDC( HWND hwnd ) { @@ -936,7 +936,7 @@ INT16 WINAPI ReleaseDC16( HWND16 hwnd, HDC16 hdc ) /*********************************************************************** - * ReleaseDC32 (USER32.440) + * ReleaseDC (USER32.440) * * RETURNS * 1: Success @@ -1064,7 +1064,7 @@ HWND16 WINAPI WindowFromDC16( HDC16 hDC ) /********************************************************************** - * WindowFromDC32 (USER32.581) + * WindowFromDC (USER32.581) */ HWND WINAPI WindowFromDC( HDC hDC ) { @@ -1093,7 +1093,7 @@ BOOL16 WINAPI LockWindowUpdate16( HWND16 hwnd ) /*********************************************************************** - * LockWindowUpdate32 (USER32.378) + * LockWindowUpdate (USER32.378) */ BOOL WINAPI LockWindowUpdate( HWND hwnd ) { diff --git a/windows/defdlg.c b/windows/defdlg.c index 15d28cd3aee..e00dec68a81 100644 --- a/windows/defdlg.c +++ b/windows/defdlg.c @@ -318,7 +318,7 @@ LRESULT WINAPI DefDlgProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, /*********************************************************************** - * DefDlgProc32A (USER32.120) + * DefDlgProcA (USER32.120) */ LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) @@ -378,7 +378,7 @@ LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, /*********************************************************************** - * DefDlgProc32W (USER32.121) + * DefDlgProcW (USER32.121) */ LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) diff --git a/windows/defwnd.c b/windows/defwnd.c index 045aae94f5c..e07f0a19bd2 100644 --- a/windows/defwnd.c +++ b/windows/defwnd.c @@ -561,7 +561,7 @@ LRESULT WINAPI DefWindowProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, /*********************************************************************** - * DefWindowProc32A [USER32.126] + * DefWindowProcA [USER32.126] * */ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, @@ -624,7 +624,7 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, /*********************************************************************** - * DefWindowProc32W [USER32.127] Calls default window message handler + * DefWindowProcW [USER32.127] Calls default window message handler * * Calls default window procedure for messages not processed * by application. diff --git a/windows/dialog.c b/windows/dialog.c index 92d4da1730f..569bdab7ab0 100644 --- a/windows/dialog.c +++ b/windows/dialog.c @@ -841,7 +841,7 @@ HWND16 WINAPI CreateDialogParam16( HINSTANCE16 hInst, SEGPTR dlgTemplate, } /*********************************************************************** - * CreateDialogParam32A (USER32.73) + * CreateDialogParamA (USER32.73) */ HWND WINAPI CreateDialogParamA( HINSTANCE hInst, LPCSTR name, HWND owner, DLGPROC dlgProc, @@ -856,7 +856,7 @@ HWND WINAPI CreateDialogParamA( HINSTANCE hInst, LPCSTR name, /*********************************************************************** - * CreateDialogParam32W (USER32.74) + * CreateDialogParamW (USER32.74) */ HWND WINAPI CreateDialogParamW( HINSTANCE hInst, LPCWSTR name, HWND owner, DLGPROC dlgProc, @@ -894,7 +894,7 @@ HWND16 WINAPI CreateDialogIndirectParam16( HINSTANCE16 hInst, /*********************************************************************** - * CreateDialogIndirectParam32A (USER32.69) + * CreateDialogIndirectParamA (USER32.69) */ HWND WINAPI CreateDialogIndirectParamA( HINSTANCE hInst, LPCVOID dlgTemplate, @@ -906,7 +906,7 @@ HWND WINAPI CreateDialogIndirectParamA( HINSTANCE hInst, } /*********************************************************************** - * CreateDialogIndirectParam32AorW (USER32.71) + * CreateDialogIndirectParamAorW (USER32.71) */ HWND WINAPI CreateDialogIndirectParamAorW( HINSTANCE hInst, LPCVOID dlgTemplate, @@ -918,7 +918,7 @@ HWND WINAPI CreateDialogIndirectParamAorW( HINSTANCE hInst, } /*********************************************************************** - * CreateDialogIndirectParam32W (USER32.72) + * CreateDialogIndirectParamW (USER32.72) */ HWND WINAPI CreateDialogIndirectParamW( HINSTANCE hInst, LPCVOID dlgTemplate, @@ -991,7 +991,7 @@ INT16 WINAPI DialogBoxParam16( HINSTANCE16 hInst, SEGPTR template, /*********************************************************************** - * DialogBoxParam32A (USER32.139) + * DialogBoxParamA (USER32.139) */ INT WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name, HWND owner, DLGPROC dlgProc, LPARAM param ) @@ -1003,7 +1003,7 @@ INT WINAPI DialogBoxParamA( HINSTANCE hInst, LPCSTR name, /*********************************************************************** - * DialogBoxParam32W (USER32.140) + * DialogBoxParamW (USER32.140) */ INT WINAPI DialogBoxParamW( HINSTANCE hInst, LPCWSTR name, HWND owner, DLGPROC dlgProc, LPARAM param ) @@ -1043,7 +1043,7 @@ INT16 WINAPI DialogBoxIndirectParam16( HINSTANCE16 hInst, HANDLE16 dlgTemplate, /*********************************************************************** - * DialogBoxIndirectParam32A (USER32.136) + * DialogBoxIndirectParamA (USER32.136) */ INT WINAPI DialogBoxIndirectParamA(HINSTANCE hInstance, LPCVOID template, HWND owner, DLGPROC dlgProc, @@ -1057,7 +1057,7 @@ INT WINAPI DialogBoxIndirectParamA(HINSTANCE hInstance, LPCVOID template, /*********************************************************************** - * DialogBoxIndirectParam32W (USER32.138) + * DialogBoxIndirectParamW (USER32.138) */ INT WINAPI DialogBoxIndirectParamW(HINSTANCE hInstance, LPCVOID template, HWND owner, DLGPROC dlgProc, @@ -1095,7 +1095,7 @@ BOOL16 WINAPI EndDialog16( HWND16 hwnd, INT16 retval ) /*********************************************************************** - * EndDialog32 (USER32.173) + * EndDialog (USER32.173) */ BOOL WINAPI EndDialog( HWND hwnd, INT retval ) { @@ -1406,7 +1406,7 @@ BOOL16 WINAPI IsDialogMessage16( HWND16 hwndDlg, LPMSG16 msg ) } /*********************************************************************** - * IsDialogMessage32A (USER32.342) + * IsDialogMessageA (USER32.342) */ BOOL WINAPI IsDialogMessageA( HWND hwndDlg, LPMSG msg ) { @@ -1432,7 +1432,7 @@ BOOL WINAPI IsDialogMessageA( HWND hwndDlg, LPMSG msg ) /*********************************************************************** - * IsDialogMessage32W (USER32.343) + * IsDialogMessageW (USER32.343) */ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) { @@ -1474,7 +1474,7 @@ INT16 WINAPI GetDlgCtrlID16( HWND16 hwnd ) /**************************************************************** - * GetDlgCtrlID32 (USER32.234) + * GetDlgCtrlID (USER32.234) */ INT WINAPI GetDlgCtrlID( HWND hwnd ) { @@ -1507,7 +1507,7 @@ HWND16 WINAPI GetDlgItem16( HWND16 hwndDlg, INT16 id ) /*********************************************************************** - * GetDlgItem32 (USER32.235) + * GetDlgItem (USER32.235) */ HWND WINAPI GetDlgItem( HWND hwndDlg, INT id ) { @@ -1538,7 +1538,7 @@ LRESULT WINAPI SendDlgItemMessage16( HWND16 hwnd, INT16 id, UINT16 msg, /******************************************************************* - * SendDlgItemMessage32A (USER32.452) + * SendDlgItemMessageA (USER32.452) */ LRESULT WINAPI SendDlgItemMessageA( HWND hwnd, INT id, UINT msg, WPARAM wParam, LPARAM lParam ) @@ -1550,7 +1550,7 @@ LRESULT WINAPI SendDlgItemMessageA( HWND hwnd, INT id, UINT msg, /******************************************************************* - * SendDlgItemMessage32W (USER32.453) + * SendDlgItemMessageW (USER32.453) */ LRESULT WINAPI SendDlgItemMessageW( HWND hwnd, INT id, UINT msg, WPARAM wParam, LPARAM lParam ) @@ -1571,7 +1571,7 @@ void WINAPI SetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR lpString ) /******************************************************************* - * SetDlgItemText32A (USER32.478) + * SetDlgItemTextA (USER32.478) */ BOOL WINAPI SetDlgItemTextA( HWND hwnd, INT id, LPCSTR lpString ) { @@ -1580,7 +1580,7 @@ BOOL WINAPI SetDlgItemTextA( HWND hwnd, INT id, LPCSTR lpString ) /******************************************************************* - * SetDlgItemText32W (USER32.479) + * SetDlgItemTextW (USER32.479) */ BOOL WINAPI SetDlgItemTextW( HWND hwnd, INT id, LPCWSTR lpString ) { @@ -1599,7 +1599,7 @@ INT16 WINAPI GetDlgItemText16( HWND16 hwnd, INT16 id, SEGPTR str, UINT16 len ) /*********************************************************************** - * GetDlgItemText32A (USER32.237) + * GetDlgItemTextA (USER32.237) */ INT WINAPI GetDlgItemTextA( HWND hwnd, INT id, LPSTR str, UINT len ) { @@ -1609,7 +1609,7 @@ INT WINAPI GetDlgItemTextA( HWND hwnd, INT id, LPSTR str, UINT len ) /*********************************************************************** - * GetDlgItemText32W (USER32.238) + * GetDlgItemTextW (USER32.238) */ INT WINAPI GetDlgItemTextW( HWND hwnd, INT id, LPWSTR str, UINT len ) { @@ -1628,7 +1628,7 @@ void WINAPI SetDlgItemInt16( HWND16 hwnd, INT16 id, UINT16 value, BOOL16 fSigned /******************************************************************* - * SetDlgItemInt32 (USER32.477) + * SetDlgItemInt (USER32.477) */ BOOL WINAPI SetDlgItemInt( HWND hwnd, INT id, UINT value, BOOL fSigned ) @@ -1668,7 +1668,7 @@ UINT16 WINAPI GetDlgItemInt16( HWND16 hwnd, INT16 id, BOOL16 *translated, /*********************************************************************** - * GetDlgItemInt32 (USER32.236) + * GetDlgItemInt (USER32.236) */ UINT WINAPI GetDlgItemInt( HWND hwnd, INT id, BOOL *translated, BOOL fSigned ) @@ -1711,7 +1711,7 @@ BOOL16 WINAPI CheckDlgButton16( HWND16 hwnd, INT16 id, UINT16 check ) /*********************************************************************** - * CheckDlgButton32 (USER32.45) + * CheckDlgButton (USER32.45) */ BOOL WINAPI CheckDlgButton( HWND hwnd, INT id, UINT check ) { @@ -1730,7 +1730,7 @@ UINT16 WINAPI IsDlgButtonChecked16( HWND16 hwnd, UINT16 id ) /*********************************************************************** - * IsDlgButtonChecked32 (USER32.344) + * IsDlgButtonChecked (USER32.344) */ UINT WINAPI IsDlgButtonChecked( HWND hwnd, UINT id ) { @@ -1777,7 +1777,7 @@ static BOOL CALLBACK CheckRB(HWND hwndChild, LPARAM lParam) /*********************************************************************** - * CheckRadioButton32 (USER32.48) + * CheckRadioButton (USER32.48) */ BOOL WINAPI CheckRadioButton( HWND hwndDlg, UINT firstID, UINT lastID, UINT checkID ) @@ -1821,7 +1821,7 @@ void WINAPI MapDialogRect16( HWND16 hwnd, LPRECT16 rect ) /*********************************************************************** - * MapDialogRect32 (USER32.382) + * MapDialogRect (USER32.382) */ BOOL WINAPI MapDialogRect( HWND hwnd, LPRECT rect ) { @@ -1849,7 +1849,7 @@ HWND16 WINAPI GetNextDlgGroupItem16( HWND16 hwndDlg, HWND16 hwndCtrl, /*********************************************************************** - * GetNextDlgGroupItem32 (USER32.275) + * GetNextDlgGroupItem (USER32.275) */ HWND WINAPI GetNextDlgGroupItem( HWND hwndDlg, HWND hwndCtrl, BOOL fPrevious ) @@ -2036,7 +2036,7 @@ static HWND DIALOG_GetNextTabItem( HWND hwndMain, HWND hwndDlg, HWND hwndCtrl, B } /*********************************************************************** - * GetNextDlgTabItem32 (USER32.276) + * GetNextDlgTabItem (USER32.276) */ HWND WINAPI GetNextDlgTabItem( HWND hwndDlg, HWND hwndCtrl, BOOL fPrevious ) @@ -2215,7 +2215,7 @@ static INT DIALOG_DlgDirList( HWND hDlg, LPSTR spec, INT idLBox, /********************************************************************** * DIALOG_DlgDirListW * - * Helper function for DlgDirList*32W + * Helper function for DlgDirList*W */ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox, INT idStatic, UINT attrib, BOOL combo ) @@ -2261,7 +2261,7 @@ BOOL16 WINAPI DlgDirSelectEx16( HWND16 hwnd, LPSTR str, INT16 len, INT16 id ) /********************************************************************** - * DlgDirSelectEx32A (USER32.149) + * DlgDirSelectExA (USER32.149) */ BOOL WINAPI DlgDirSelectExA( HWND hwnd, LPSTR str, INT len, INT id ) { @@ -2270,7 +2270,7 @@ BOOL WINAPI DlgDirSelectExA( HWND hwnd, LPSTR str, INT len, INT id ) /********************************************************************** - * DlgDirSelectEx32W (USER32.150) + * DlgDirSelectExW (USER32.150) */ BOOL WINAPI DlgDirSelectExW( HWND hwnd, LPWSTR str, INT len, INT id ) { @@ -2289,7 +2289,7 @@ BOOL16 WINAPI DlgDirSelectComboBoxEx16( HWND16 hwnd, LPSTR str, INT16 len, /********************************************************************** - * DlgDirSelectComboBoxEx32A (USER32.147) + * DlgDirSelectComboBoxExA (USER32.147) */ BOOL WINAPI DlgDirSelectComboBoxExA( HWND hwnd, LPSTR str, INT len, INT id ) @@ -2299,7 +2299,7 @@ BOOL WINAPI DlgDirSelectComboBoxExA( HWND hwnd, LPSTR str, INT len, /********************************************************************** - * DlgDirSelectComboBoxEx32W (USER32.148) + * DlgDirSelectComboBoxExW (USER32.148) */ BOOL WINAPI DlgDirSelectComboBoxExW( HWND hwnd, LPWSTR str, INT len, INT id) @@ -2319,7 +2319,7 @@ INT16 WINAPI DlgDirList16( HWND16 hDlg, LPSTR spec, INT16 idLBox, /********************************************************************** - * DlgDirList32A (USER32.143) + * DlgDirListA (USER32.143) */ INT WINAPI DlgDirListA( HWND hDlg, LPSTR spec, INT idLBox, INT idStatic, UINT attrib ) @@ -2329,7 +2329,7 @@ INT WINAPI DlgDirListA( HWND hDlg, LPSTR spec, INT idLBox, /********************************************************************** - * DlgDirList32W (USER32.146) + * DlgDirListW (USER32.146) */ INT WINAPI DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox, INT idStatic, UINT attrib ) @@ -2349,7 +2349,7 @@ INT16 WINAPI DlgDirListComboBox16( HWND16 hDlg, LPSTR spec, INT16 idCBox, /********************************************************************** - * DlgDirListComboBox32A (USER32.144) + * DlgDirListComboBoxA (USER32.144) */ INT WINAPI DlgDirListComboBoxA( HWND hDlg, LPSTR spec, INT idCBox, INT idStatic, UINT attrib ) @@ -2359,7 +2359,7 @@ INT WINAPI DlgDirListComboBoxA( HWND hDlg, LPSTR spec, INT idCBox, /********************************************************************** - * DlgDirListComboBox32W (USER32.145) + * DlgDirListComboBoxW (USER32.145) */ INT WINAPI DlgDirListComboBoxW( HWND hDlg, LPWSTR spec, INT idCBox, INT idStatic, UINT attrib ) diff --git a/windows/focus.c b/windows/focus.c index d99496fa173..ab4ea08619d 100644 --- a/windows/focus.c +++ b/windows/focus.c @@ -69,7 +69,7 @@ HWND16 WINAPI SetFocus16( HWND16 hwnd ) /***************************************************************** - * SetFocus32 (USER32.481) + * SetFocus (USER32.481) */ HWND WINAPI SetFocus( HWND hwnd ) { @@ -183,7 +183,7 @@ HWND16 WINAPI GetFocus16(void) /***************************************************************** - * GetFocus32 (USER32.240) + * GetFocus (USER32.240) */ HWND WINAPI GetFocus(void) { diff --git a/windows/hook.c b/windows/hook.c index 3349792f6d1..1804b82d19d 100644 --- a/windows/hook.c +++ b/windows/hook.c @@ -1091,7 +1091,7 @@ LRESULT HOOK_CallHooks16( INT16 id, INT16 code, WPARAM16 wParam, } /*********************************************************************** - * HOOK_CallHooks32A + * HOOK_CallHooksA * * Call a hook chain. */ @@ -1106,7 +1106,7 @@ LRESULT HOOK_CallHooksA( INT id, INT code, WPARAM wParam, } /*********************************************************************** - * HOOK_CallHooks32W + * HOOK_CallHooksW * * Call a hook chain. */ @@ -1224,7 +1224,7 @@ FARPROC16 WINAPI SetWindowsHook16( INT16 id, HOOKPROC16 proc ) } /*********************************************************************** - * SetWindowsHook32A (USER32.525) + * SetWindowsHookA (USER32.525) */ HHOOK WINAPI SetWindowsHookA( INT id, HOOKPROC proc ) { @@ -1232,7 +1232,7 @@ HHOOK WINAPI SetWindowsHookA( INT id, HOOKPROC proc ) } /*********************************************************************** - * SetWindowsHook32W (USER32.528) + * SetWindowsHookW (USER32.528) */ HHOOK WINAPI SetWindowsHookW( INT id, HOOKPROC proc ) { @@ -1255,7 +1255,7 @@ HHOOK WINAPI SetWindowsHookEx16( INT16 id, HOOKPROC16 proc, HINSTANCE16 hInst, } /*********************************************************************** - * SetWindowsHookEx32A (USER32.526) + * SetWindowsHookExA (USER32.526) */ HHOOK WINAPI SetWindowsHookExA( INT id, HOOKPROC proc, HINSTANCE hInst, DWORD dwThreadId ) @@ -1264,7 +1264,7 @@ HHOOK WINAPI SetWindowsHookExA( INT id, HOOKPROC proc, HINSTANCE hInst, } /*********************************************************************** - * SetWindowsHookEx32W (USER32.527) + * SetWindowsHookExW (USER32.527) */ HHOOK WINAPI SetWindowsHookExW( INT id, HOOKPROC proc, HINSTANCE hInst, DWORD dwThreadId ) @@ -1282,7 +1282,7 @@ BOOL16 WINAPI UnhookWindowsHook16( INT16 id, HOOKPROC16 proc ) } /*********************************************************************** - * UnhookWindowsHook32 (USER32.557) + * UnhookWindowsHook (USER32.557) */ BOOL WINAPI UnhookWindowsHook( INT id, HOOKPROC proc ) { @@ -1310,7 +1310,7 @@ BOOL16 WINAPI UnhookWindowsHookEx16( HHOOK hhook ) } /*********************************************************************** - * UnhookWindowHookEx32 (USER32.558) + * UnhookWindowsHookEx (USER32.558) */ BOOL WINAPI UnhookWindowsHookEx( HHOOK hhook ) { @@ -1338,7 +1338,7 @@ LRESULT WINAPI CallNextHookEx16( HHOOK hhook, INT16 code, WPARAM16 wParam, /*********************************************************************** - * CallNextHookEx32 (USER32.17) + * CallNextHookEx (USER32.17) * * There aren't ANSI and UNICODE versions of this. */ @@ -1435,7 +1435,7 @@ BOOL16 WINAPI CallMsgFilter32_16( SEGPTR msg16_32, INT16 code, BOOL16 wHaveParam /*********************************************************************** - * CallMsgFilter32A (USER32.15) + * CallMsgFilterA (USER32.15) */ /* * FIXME: There are ANSI and UNICODE versions of this, plus an unspecified @@ -1451,7 +1451,7 @@ BOOL WINAPI CallMsgFilterA( LPMSG msg, INT code ) /*********************************************************************** - * CallMsgFilter32W (USER32.16) + * CallMsgFilterW (USER32.16) */ BOOL WINAPI CallMsgFilterW( LPMSG msg, INT code ) { diff --git a/windows/mdi.c b/windows/mdi.c index 3fd68fb1059..9c170c3c017 100644 --- a/windows/mdi.c +++ b/windows/mdi.c @@ -1411,7 +1411,7 @@ LRESULT WINAPI DefFrameProc16( HWND16 hwnd, HWND16 hwndMDIClient, /*********************************************************************** - * DefFrameProc32A (USER32.122) + * DefFrameProcA (USER32.122) */ LRESULT WINAPI DefFrameProcA( HWND hwnd, HWND hwndMDIClient, UINT message, WPARAM wParam, LPARAM lParam) @@ -1452,7 +1452,7 @@ LRESULT WINAPI DefFrameProcA( HWND hwnd, HWND hwndMDIClient, /*********************************************************************** - * DefFrameProc32W (USER32.123) + * DefFrameProcW (USER32.123) */ LRESULT WINAPI DefFrameProcW( HWND hwnd, HWND hwndMDIClient, UINT message, WPARAM wParam, LPARAM lParam) @@ -1676,7 +1676,7 @@ END: /*********************************************************************** - * DefMDIChildProc32A (USER32.124) + * DefMDIChildProcA (USER32.124) */ LRESULT WINAPI DefMDIChildProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) @@ -1746,7 +1746,7 @@ END: /*********************************************************************** - * DefMDIChildProc32W (USER32.125) + * DefMDIChildProcW (USER32.125) */ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) @@ -1830,7 +1830,7 @@ HWND WINAPI CreateMDIWindowA( /********************************************************************** * MDI_CreateMDIWindowA * single threaded version of CreateMDIWindowA - * called by CreateWindowEx32A + * called by CreateWindowExA */ HWND MDI_CreateMDIWindowA( LPCSTR lpClassName, @@ -1875,7 +1875,7 @@ HWND MDI_CreateMDIWindowA( } /*************************************** - * CreateMDIWindow32W [USER32.80] Creates a MDI child in new thread + * CreateMDIWindowW [USER32.80] Creates a MDI child in new thread * * RETURNS * Success: Handle to created window @@ -1901,9 +1901,9 @@ HWND WINAPI CreateMDIWindowW( /****************************************************************************** - * CreateMDIWindow32W [USER32.80] Creates a MDI child window + * CreateMDIWindowW [USER32.80] Creates a MDI child window * single threaded version of CreateMDIWindow - * called by CreateWindowEx32W(). + * called by CreateWindowExW(). */ HWND MDI_CreateMDIWindowW( LPCWSTR lpClassName, /* [in] Pointer to registered child class name */ @@ -1925,7 +1925,7 @@ HWND MDI_CreateMDIWindowW( /********************************************************************** - * TranslateMDISysAccel32 (USER32.555) + * TranslateMDISysAccel (USER32.555) */ BOOL WINAPI TranslateMDISysAccel( HWND hwndClient, LPMSG msg ) { @@ -2050,7 +2050,7 @@ void WINAPI ScrollChildren16(HWND16 hWnd, UINT16 uMsg, WPARAM16 wParam, LPARAM l /*********************************************************************** - * ScrollChildren32 (USER32.448) + * ScrollChildren (USER32.448) */ void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) diff --git a/windows/message.c b/windows/message.c index 523a196c9c8..29f8d4421fe 100644 --- a/windows/message.c +++ b/windows/message.c @@ -759,7 +759,7 @@ void WINAPI SetDoubleClickTime16( UINT16 interval ) /********************************************************************** - * SetDoubleClickTime32 (USER32.480) + * SetDoubleClickTime (USER32.480) */ BOOL WINAPI SetDoubleClickTime( UINT interval ) { @@ -778,7 +778,7 @@ UINT16 WINAPI GetDoubleClickTime16(void) /********************************************************************** - * GetDoubleClickTime32 (USER32.239) + * GetDoubleClickTime (USER32.239) */ UINT WINAPI GetDoubleClickTime(void) { @@ -1506,7 +1506,7 @@ BOOL WINAPI GetMessageA( MSG *lpmsg, HWND hwnd, UINT min, UINT max ) } /*********************************************************************** - * GetMessage32W (USER32.274) Retrieve next message + * GetMessageW (USER32.274) Retrieve next message * * GetMessage retrieves the next event from the calling thread's * queue and deposits it in *lpmsg. @@ -1814,7 +1814,7 @@ LRESULT WINAPI SendMessage16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, /*********************************************************************** - * SendMessage32A (USER32.454) + * SendMessageA (USER32.454) */ LRESULT WINAPI SendMessageA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) @@ -1829,7 +1829,7 @@ LRESULT WINAPI SendMessageA( HWND hwnd, UINT msg, WPARAM wParam, /*********************************************************************** - * SendMessage32W (USER32.459) Send Window Message + * SendMessageW (USER32.459) Send Window Message * * Sends a message to the window procedure of the specified window. * SendMessage() will not return until the called window procedure @@ -2258,7 +2258,7 @@ BOOL16 WINAPI TranslateMessage32_16( const MSG32_16 *msg, BOOL16 wHaveParamHigh } /*********************************************************************** - * TranslateMessage32 (USER32.556) + * TranslateMessage (USER32.556) */ BOOL WINAPI TranslateMessage( const MSG *msg ) { @@ -2343,7 +2343,7 @@ LONG WINAPI DispatchMessage32_16( const MSG32_16* lpmsg16_32, BOOL16 wHaveParamH } /*********************************************************************** - * DispatchMessage32A (USER32.141) + * DispatchMessageA (USER32.141) */ LONG WINAPI DispatchMessageA( const MSG* msg ) { @@ -2399,7 +2399,7 @@ END: /*********************************************************************** - * DispatchMessage32W (USER32.142) Process Message + * DispatchMessageW (USER32.142) Process Message * * Process the message specified in the structure *_msg_. * @@ -2483,7 +2483,7 @@ WORD WINAPI RegisterWindowMessageA( LPCSTR str ) /*********************************************************************** - * RegisterWindowMessage32W (USER32.438) + * RegisterWindowMessageW (USER32.438) */ WORD WINAPI RegisterWindowMessageW( LPCWSTR str ) { @@ -2513,7 +2513,7 @@ BOOL16 WINAPI InSendMessage16(void) /*********************************************************************** - * InSendMessage32 (USER32.320) + * InSendMessage (USER32.320) */ BOOL WINAPI InSendMessage(void) { @@ -2584,7 +2584,7 @@ BOOL WINAPI SendNotifyMessageW(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam) } /*********************************************************************** - * SendMessageCallback32A + * SendMessageCallbackA * FIXME: It's like PostMessage. The callback gets called when the message * is processed. We have to modify the message processing for a exact * implementation... @@ -2604,7 +2604,7 @@ BOOL WINAPI SendMessageCallbackA( return TRUE; } /*********************************************************************** - * SendMessageCallback32W + * SendMessageCallbackW * FIXME: It's like PostMessage. The callback gets called when the message * is processed. We have to modify the message processing for a exact * implementation... diff --git a/windows/msgbox.c b/windows/msgbox.c index 9fa8a0ac631..f43f0b12976 100644 --- a/windows/msgbox.c +++ b/windows/msgbox.c @@ -260,7 +260,7 @@ INT16 WINAPI MessageBox16( HWND16 hwnd, LPCSTR text, LPCSTR title, UINT16 type) /************************************************************************** - * MessageBox32A (USER32.391) + * MessageBoxA (USER32.391) * * NOTES * The WARN is here to help debug erroneous MessageBoxes @@ -291,7 +291,7 @@ INT WINAPI MessageBoxA(HWND hWnd, LPCSTR text, LPCSTR title, UINT type) /************************************************************************** - * MessageBox32W (USER32.396) + * MessageBoxW (USER32.396) */ INT WINAPI MessageBoxW( HWND hwnd, LPCWSTR text, LPCWSTR title, UINT type ) @@ -310,7 +310,7 @@ INT WINAPI MessageBoxW( HWND hwnd, LPCWSTR text, LPCWSTR title, /************************************************************************** - * MessageBoxEx32A (USER32.392) + * MessageBoxExA (USER32.392) */ INT WINAPI MessageBoxExA( HWND hWnd, LPCSTR text, LPCSTR title, UINT type, WORD langid ) @@ -321,7 +321,7 @@ INT WINAPI MessageBoxExA( HWND hWnd, LPCSTR text, LPCSTR title, } /************************************************************************** - * MessageBoxEx32W (USER32.393) + * MessageBoxExW (USER32.393) */ INT WINAPI MessageBoxExW( HWND hWnd, LPCWSTR text, LPCWSTR title, UINT type, WORD langid ) @@ -364,7 +364,7 @@ INT16 WINAPI MessageBoxIndirect16( LPMSGBOXPARAMS16 msgbox ) } /************************************************************************** - * MessageBoxIndirect32A (USER32.394) + * MessageBoxIndirectA (USER32.394) */ INT WINAPI MessageBoxIndirectA( LPMSGBOXPARAMSA msgbox ) { @@ -384,7 +384,7 @@ INT WINAPI MessageBoxIndirectA( LPMSGBOXPARAMSA msgbox ) } /************************************************************************** - * MessageBoxIndirect32W (USER32.395) + * MessageBoxIndirectW (USER32.395) */ INT WINAPI MessageBoxIndirectW( LPMSGBOXPARAMSW msgbox ) { diff --git a/windows/multimon.c b/windows/multimon.c index 987b6abf94b..1a4cfe4daf0 100644 --- a/windows/multimon.c +++ b/windows/multimon.c @@ -16,8 +16,9 @@ MONITOR MONITOR_PrimaryMonitor; -/**********************************************************************/ - +/*********************************************************************** + * MonitorFromPoint + */ HMONITOR WINAPI MonitorFromPoint(POINT ptScreenCoords, DWORD dwFlags) { if ((dwFlags & (MONITOR_DEFAULTTOPRIMARY | MONITOR_DEFAULTTONEAREST)) || @@ -31,6 +32,9 @@ HMONITOR WINAPI MonitorFromPoint(POINT ptScreenCoords, DWORD dwFlags) return NULL; } +/*********************************************************************** + * MonitorFromRect + */ HMONITOR WINAPI MonitorFromRect(LPRECT lprcScreenCoords, DWORD dwFlags) { if ((dwFlags & (MONITOR_DEFAULTTOPRIMARY | MONITOR_DEFAULTTONEAREST)) || @@ -44,6 +48,9 @@ HMONITOR WINAPI MonitorFromRect(LPRECT lprcScreenCoords, DWORD dwFlags) return NULL; } +/*********************************************************************** + * MonitorFromWindow + */ HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags) { WINDOWPLACEMENT wp; @@ -61,6 +68,9 @@ HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags) return NULL; } +/*********************************************************************** + * GetMonitorInfoA + */ BOOL WINAPI GetMonitorInfoA(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo) { RECT rcWork; @@ -83,6 +93,9 @@ BOOL WINAPI GetMonitorInfoA(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo) return FALSE; } +/*********************************************************************** + * GetMonitorInfoW + */ BOOL WINAPI GetMonitorInfoW(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo) { RECT rcWork; @@ -105,6 +118,9 @@ BOOL WINAPI GetMonitorInfoW(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo) return FALSE; } +/*********************************************************************** + * EnumDisplayMonitors + */ BOOL WINAPI EnumDisplayMonitors( HDC hdcOptionalForPainting, LPRECT lprcEnumMonitorsThatIntersect, diff --git a/windows/nonclient.c b/windows/nonclient.c index 8b0edd81034..f35caef3ed1 100644 --- a/windows/nonclient.c +++ b/windows/nonclient.c @@ -162,7 +162,7 @@ static void NC_AdjustRect( LPRECT16 rect, DWORD style, BOOL menu, + PARAMS * LPRECT16 rect * DWORD style - * BOOL32 menu + * BOOL menu * DWORD exStyle * * NOTES @@ -284,7 +284,7 @@ DrawCaption16 (HWND16 hwnd, HDC16 hdc, const RECT16 *rect, UINT16 uFlags) /*********************************************************************** - * DrawCaption32 [USER32.154] Draws a caption bar + * DrawCaption [USER32.154] Draws a caption bar * * PARAMS * hwnd [I] @@ -329,7 +329,7 @@ DrawCaptionTemp16 (HWND16 hwnd, HDC16 hdc, const RECT16 *rect, HFONT16 hFont, /*********************************************************************** - * DrawCaptionTemp32A [USER32.599] + * DrawCaptionTempA [USER32.599] * * PARAMS * @@ -437,7 +437,7 @@ DrawCaptionTempA (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, /*********************************************************************** - * DrawCaptionTemp32W [USER32.602] + * DrawCaptionTempW [USER32.602] * * PARAMS * @@ -467,7 +467,7 @@ BOOL16 WINAPI AdjustWindowRect16( LPRECT16 rect, DWORD style, BOOL16 menu ) /*********************************************************************** - * AdjustWindowRect32 (USER32.2) + * AdjustWindowRect (USER32.2) */ BOOL WINAPI AdjustWindowRect( LPRECT rect, DWORD style, BOOL menu ) { @@ -506,7 +506,7 @@ BOOL16 WINAPI AdjustWindowRectEx16( LPRECT16 rect, DWORD style, /*********************************************************************** - * AdjustWindowRectEx32 (USER32.3) + * AdjustWindowRectEx (USER32.3) */ BOOL WINAPI AdjustWindowRectEx( LPRECT rect, DWORD style, BOOL menu, DWORD exStyle ) @@ -1047,9 +1047,9 @@ static void NC_DrawMinButton( HWND hwnd, HDC16 hdc, BOOL down ) /****************************************************************************** * * void NC_DrawSysButton95( - * HWND32 hwnd, - * HDC32 hdc, - * BOOL32 down ) + * HWND hwnd, + * HDC hdc, + * BOOL down ) * * Draws the Win95 system icon. * @@ -1099,9 +1099,9 @@ NC_DrawSysButton95 (HWND hwnd, HDC hdc, BOOL down) /****************************************************************************** * * void NC_DrawCloseButton95( - * HWND32 hwnd, - * HDC32 hdc, - * BOOL32 down, + * HWND hwnd, + * HDC hdc, + * BOOL down, * BOOL bGrayed ) * * Draws the Win95 close button. @@ -1149,9 +1149,9 @@ static void NC_DrawCloseButton95 (HWND hwnd, HDC hdc, BOOL down, BOOL bGrayed) /****************************************************************************** * * NC_DrawMaxButton95( - * HWND32 hwnd, + * HWND hwnd, * HDC16 hdc, - * BOOL32 down + * BOOL down * BOOL bGrayed ) * * Draws the maximize button for Win95 style windows. @@ -1209,9 +1209,9 @@ static void NC_DrawMaxButton95(HWND hwnd,HDC16 hdc,BOOL down, BOOL bGrayed) /****************************************************************************** * * NC_DrawMinButton95( - * HWND32 hwnd, + * HWND hwnd, * HDC16 hdc, - * BOOL32 down, + * BOOL down, * BOOL bGrayed ) * * Draws the minimize button for Win95 style windows. @@ -1351,10 +1351,10 @@ static void NC_DrawFrame( HDC hdc, RECT *rect, BOOL dlgFrame, /****************************************************************************** * * void NC_DrawFrame95( - * HDC32 hdc, - * RECT32 *rect, - * BOOL32 dlgFrame, - * BOOL32 active ) + * HDC hdc, + * RECT *rect, + * BOOL dlgFrame, + * BOOL active ) * * Draw a window frame inside the given rectangle, and update the rectangle. * The correct pen for the frame must be selected in the DC. @@ -1519,11 +1519,11 @@ static void NC_DrawCaption( HDC hdc, RECT *rect, HWND hwnd, /****************************************************************************** * * NC_DrawCaption95( - * HDC32 hdc, - * RECT32 *rect, - * HWND32 hwnd, + * HDC hdc, + * RECT *rect, + * HWND hwnd, * DWORD style, - * BOOL32 active ) + * BOOL active ) * * Draw the window caption for Win95 style windows. * The correct pen for the window frame must be selected in the DC. @@ -1732,8 +1732,8 @@ static void NC_DoNCPaint( WND* wndPtr, HRGN clip, BOOL suppress_menupaint ) * * void NC_DoNCPaint95( * WND *wndPtr, - * HRGN32 clip, - * BOOL32 suppress_menupaint ) + * HRGN clip, + * BOOL suppress_menupaint ) * * Paint the non-client area for Win95 windows. The clip region is * currently ignored. diff --git a/windows/painting.c b/windows/painting.c index 063d3719a0c..86bf4c25502 100644 --- a/windows/painting.c +++ b/windows/painting.c @@ -359,7 +359,7 @@ HDC16 WINAPI BeginPaint16( HWND16 hwnd, LPPAINTSTRUCT16 lps ) /*********************************************************************** - * BeginPaint32 (USER32.10) + * BeginPaint (USER32.10) */ HDC WINAPI BeginPaint( HWND hwnd, PAINTSTRUCT *lps ) { @@ -390,7 +390,7 @@ BOOL16 WINAPI EndPaint16( HWND16 hwnd, const PAINTSTRUCT16* lps ) /*********************************************************************** - * EndPaint32 (USER32.176) + * EndPaint (USER32.176) */ BOOL WINAPI EndPaint( HWND hwnd, const PAINTSTRUCT *lps ) { @@ -964,7 +964,7 @@ END: /*********************************************************************** - * RedrawWindow32 (USER32.426) + * RedrawWindow (USER32.426) */ BOOL WINAPI RedrawWindow( HWND hwnd, const RECT *rectUpdate, HRGN hrgnUpdate, UINT flags ) @@ -999,7 +999,7 @@ void WINAPI UpdateWindow16( HWND16 hwnd ) } /*********************************************************************** - * UpdateWindow32 (USER32.567) + * UpdateWindow (USER32.567) */ void WINAPI UpdateWindow( HWND hwnd ) { @@ -1017,7 +1017,7 @@ void WINAPI InvalidateRgn16( HWND16 hwnd, HRGN16 hrgn, BOOL16 erase ) /*********************************************************************** - * InvalidateRgn32 (USER32.329) + * InvalidateRgn (USER32.329) */ BOOL WINAPI InvalidateRgn( HWND hwnd, HRGN hrgn, BOOL erase ) { @@ -1035,7 +1035,7 @@ void WINAPI InvalidateRect16( HWND16 hwnd, const RECT16 *rect, BOOL16 erase ) /*********************************************************************** - * InvalidateRect32 (USER32.328) + * InvalidateRect (USER32.328) */ BOOL WINAPI InvalidateRect( HWND hwnd, const RECT *rect, BOOL erase ) { @@ -1055,7 +1055,7 @@ void WINAPI ValidateRgn16( HWND16 hwnd, HRGN16 hrgn ) /*********************************************************************** - * ValidateRgn32 (USER32.572) + * ValidateRgn (USER32.572) */ void WINAPI ValidateRgn( HWND hwnd, HRGN hrgn ) { @@ -1073,7 +1073,7 @@ void WINAPI ValidateRect16( HWND16 hwnd, const RECT16 *rect ) /*********************************************************************** - * ValidateRect32 (USER32.571) + * ValidateRect (USER32.571) */ void WINAPI ValidateRect( HWND hwnd, const RECT *rect ) { @@ -1097,7 +1097,7 @@ BOOL16 WINAPI GetUpdateRect16( HWND16 hwnd, LPRECT16 rect, BOOL16 erase ) /*********************************************************************** - * GetUpdateRect32 (USER32.297) + * GetUpdateRect (USER32.297) */ BOOL WINAPI GetUpdateRect( HWND hwnd, LPRECT rect, BOOL erase ) { @@ -1195,7 +1195,7 @@ INT16 WINAPI ExcludeUpdateRgn16( HDC16 hdc, HWND16 hwnd ) /*********************************************************************** - * ExcludeUpdateRgn32 (USER32.195) + * ExcludeUpdateRgn (USER32.195) */ INT WINAPI ExcludeUpdateRgn( HDC hdc, HWND hwnd ) { diff --git a/windows/property.c b/windows/property.c index bc9ba410ab3..2ed6527de51 100644 --- a/windows/property.c +++ b/windows/property.c @@ -75,7 +75,7 @@ HANDLE16 WINAPI GetProp16( HWND16 hwnd, LPCSTR str ) /*********************************************************************** - * GetProp32A (USER32.281) + * GetPropA (USER32.281) */ HANDLE WINAPI GetPropA( HWND hwnd, LPCSTR str ) { @@ -93,7 +93,7 @@ HANDLE WINAPI GetPropA( HWND hwnd, LPCSTR str ) /*********************************************************************** - * GetProp32W (USER32.282) + * GetPropW (USER32.282) */ HANDLE WINAPI GetPropW( HWND hwnd, LPCWSTR str ) { @@ -118,7 +118,7 @@ BOOL16 WINAPI SetProp16( HWND16 hwnd, LPCSTR str, HANDLE16 handle ) /*********************************************************************** - * SetProp32A (USER32.497) + * SetPropA (USER32.497) */ BOOL WINAPI SetPropA( HWND hwnd, LPCSTR str, HANDLE handle ) { @@ -157,7 +157,7 @@ BOOL WINAPI SetPropA( HWND hwnd, LPCSTR str, HANDLE handle ) /*********************************************************************** - * SetProp32W (USER32.498) + * SetPropW (USER32.498) */ BOOL WINAPI SetPropW( HWND hwnd, LPCWSTR str, HANDLE handle ) { @@ -183,7 +183,7 @@ HANDLE16 WINAPI RemoveProp16( HWND16 hwnd, LPCSTR str ) /*********************************************************************** - * RemoveProp32A (USER32.442) + * RemovePropA (USER32.442) */ HANDLE WINAPI RemovePropA( HWND hwnd, LPCSTR str ) { @@ -235,7 +235,7 @@ HANDLE WINAPI RemovePropA( HWND hwnd, LPCSTR str ) /*********************************************************************** - * RemoveProp32W (USER32.443) + * RemovePropW (USER32.443) */ HANDLE WINAPI RemovePropW( HWND hwnd, LPCWSTR str ) { @@ -298,7 +298,7 @@ INT16 WINAPI EnumProps16( HWND16 hwnd, PROPENUMPROC16 func ) /*********************************************************************** - * EnumProps32A (USER32.186) + * EnumPropsA (USER32.186) */ INT WINAPI EnumPropsA( HWND hwnd, PROPENUMPROCA func ) { @@ -307,7 +307,7 @@ INT WINAPI EnumPropsA( HWND hwnd, PROPENUMPROCA func ) /*********************************************************************** - * EnumProps32W (USER32.189) + * EnumPropsW (USER32.189) */ INT WINAPI EnumPropsW( HWND hwnd, PROPENUMPROCW func ) { @@ -316,7 +316,7 @@ INT WINAPI EnumPropsW( HWND hwnd, PROPENUMPROCW func ) /*********************************************************************** - * EnumPropsEx32A (USER32.187) + * EnumPropsExA (USER32.187) */ INT WINAPI EnumPropsExA(HWND hwnd, PROPENUMPROCEXA func, LPARAM lParam) { @@ -344,7 +344,7 @@ INT WINAPI EnumPropsExA(HWND hwnd, PROPENUMPROCEXA func, LPARAM lParam) /*********************************************************************** - * EnumPropsEx32W (USER32.188) + * EnumPropsExW (USER32.188) */ INT WINAPI EnumPropsExW(HWND hwnd, PROPENUMPROCEXW func, LPARAM lParam) { diff --git a/windows/queue.c b/windows/queue.c index cacdeb1e002..9d3036dd779 100644 --- a/windows/queue.c +++ b/windows/queue.c @@ -1349,7 +1349,7 @@ void WINAPI PostQuitMessage16( INT16 exitCode ) /*********************************************************************** - * PostQuitMessage32 (USER32.421) + * PostQuitMessage (USER32.421) * * PostQuitMessage() posts a message to the system requesting an * application to terminate execution. As a result of this function, @@ -1493,7 +1493,7 @@ DWORD WINAPI GetQueueStatus16( UINT16 flags ) } /*********************************************************************** - * GetQueueStatus32 (USER32.283) + * GetQueueStatus (USER32.283) */ DWORD WINAPI GetQueueStatus( UINT flags ) { @@ -1571,7 +1571,7 @@ DWORD WINAPI WaitForInputIdle (HANDLE hProcess, DWORD dwTimeOut) } /*********************************************************************** - * GetInputState32 (USER32.244) + * GetInputState (USER32.244) */ BOOL WINAPI GetInputState(void) { diff --git a/windows/rect.c b/windows/rect.c index 1f48e7775cf..c98c87fa489 100644 --- a/windows/rect.c +++ b/windows/rect.c @@ -24,7 +24,7 @@ void WINAPI SetRect16( LPRECT16 rect, INT16 left, INT16 top, /*********************************************************************** - * SetRect32 (USER32.499) + * SetRect (USER32.499) */ BOOL WINAPI SetRect( LPRECT rect, INT left, INT top, INT right, INT bottom ) @@ -47,7 +47,7 @@ void WINAPI SetRectEmpty16( LPRECT16 rect ) /*********************************************************************** - * SetRectEmpty32 (USER32.500) + * SetRectEmpty (USER32.500) */ BOOL WINAPI SetRectEmpty( LPRECT rect ) { @@ -67,7 +67,7 @@ BOOL16 WINAPI CopyRect16( RECT16 *dest, const RECT16 *src ) /*********************************************************************** - * CopyRect32 (USER32.62) + * CopyRect (USER32.62) */ BOOL WINAPI CopyRect( RECT *dest, const RECT *src ) { @@ -90,7 +90,7 @@ BOOL16 WINAPI IsRectEmpty16( const RECT16 *rect ) /*********************************************************************** - * IsRectEmpty32 (USER32.347) + * IsRectEmpty (USER32.347) * * Bug compat: Windows checks for 0 or negative width/height. */ @@ -111,7 +111,7 @@ BOOL16 WINAPI PtInRect16( const RECT16 *rect, POINT16 pt ) /*********************************************************************** - * PtInRect32 (USER32.424) + * PtInRect (USER32.424) */ BOOL WINAPI PtInRect( const RECT *rect, POINT pt ) { @@ -133,7 +133,7 @@ void WINAPI OffsetRect16( LPRECT16 rect, INT16 x, INT16 y ) /*********************************************************************** - * OffsetRect32 (USER32.406) + * OffsetRect (USER32.406) */ BOOL WINAPI OffsetRect( LPRECT rect, INT x, INT y ) { @@ -158,7 +158,7 @@ void WINAPI InflateRect16( LPRECT16 rect, INT16 x, INT16 y ) /*********************************************************************** - * InflateRect32 (USER32.321) + * InflateRect (USER32.321) */ BOOL WINAPI InflateRect( LPRECT rect, INT x, INT y ) { @@ -192,7 +192,7 @@ BOOL16 WINAPI IntersectRect16( LPRECT16 dest, const RECT16 *src1, /*********************************************************************** - * IntersectRect32 (USER32.327) + * IntersectRect (USER32.327) */ BOOL WINAPI IntersectRect( LPRECT dest, const RECT *src1, const RECT *src2 ) @@ -243,7 +243,7 @@ BOOL16 WINAPI UnionRect16( LPRECT16 dest, const RECT16 *src1, /*********************************************************************** - * UnionRect32 (USER32.559) + * UnionRect (USER32.559) */ BOOL WINAPI UnionRect( LPRECT dest, const RECT *src1, const RECT *src2 ) @@ -283,7 +283,7 @@ BOOL16 WINAPI EqualRect16( const RECT16* rect1, const RECT16* rect2 ) /*********************************************************************** - * EqualRect32 (USER32.194) + * EqualRect (USER32.194) */ BOOL WINAPI EqualRect( const RECT* rect1, const RECT* rect2 ) { @@ -329,7 +329,7 @@ BOOL16 WINAPI SubtractRect16( LPRECT16 dest, const RECT16 *src1, /*********************************************************************** - * SubtractRect32 (USER32.536) + * SubtractRect (USER32.536) */ BOOL WINAPI SubtractRect( LPRECT dest, const RECT *src1, const RECT *src2 ) diff --git a/windows/scroll.c b/windows/scroll.c index a0952901714..cbb08268b73 100644 --- a/windows/scroll.c +++ b/windows/scroll.c @@ -37,7 +37,7 @@ void WINAPI ScrollWindow16(HWND16 hwnd, INT16 dx, INT16 dy, const RECT16 *rect, } /************************************************************************* - * ScrollWindow32 (USER32.450) + * ScrollWindow (USER32.450) * */ BOOL WINAPI ScrollWindow( HWND hwnd, INT dx, INT dy, @@ -69,7 +69,7 @@ BOOL16 WINAPI ScrollDC16( HDC16 hdc, INT16 dx, INT16 dy, const RECT16 *rect, /************************************************************************* - * ScrollDC32 (USER32.449) + * ScrollDC (USER32.449) * * Only the hrgnUpdate is return in device coordinate. * rcUpdate must be returned in logical coordinate to comply with win API. @@ -226,7 +226,7 @@ static BOOL SCROLL_FixCaret(HWND hWnd, LPRECT lprc, UINT flags) } /************************************************************************* - * ScrollWindowEx32 (USER32.451) + * ScrollWindowEx (USER32.451) * * NOTE: Use this function instead of ScrollWindow32 */ diff --git a/windows/syscolor.c b/windows/syscolor.c index 6448e29bab3..a491ac86bcf 100644 --- a/windows/syscolor.c +++ b/windows/syscolor.c @@ -171,7 +171,7 @@ COLORREF WINAPI GetSysColor16( INT16 nIndex ) /************************************************************************* - * GetSysColor32 (USER32.289) + * GetSysColor (USER32.289) */ COLORREF WINAPI GetSysColor( INT nIndex ) { @@ -207,7 +207,7 @@ VOID WINAPI SetSysColors16( INT16 nChanges, const INT16 *lpSysColor, /************************************************************************* - * SetSysColors32 (USER32.505) + * SetSysColors (USER32.505) */ BOOL WINAPI SetSysColors( INT nChanges, const INT *lpSysColor, const COLORREF *lpColorValues ) @@ -241,7 +241,7 @@ HBRUSH16 WINAPI GetSysColorBrush16( INT16 index ) /*********************************************************************** - * GetSysColorBrush32 (USER32.290) + * GetSysColorBrush (USER32.290) */ HBRUSH WINAPI GetSysColorBrush( INT index ) { @@ -262,7 +262,7 @@ HPEN16 WINAPI GetSysColorPen16( INT16 index ) /*********************************************************************** - * GetSysColorPen32 (Not a Windows API) + * GetSysColorPen (Not a Windows API) * * This function is new to the Wine lib -- it does not exist in * Windows. However, it is a natural complement for GetSysColorBrush diff --git a/windows/sysmetrics.c b/windows/sysmetrics.c index 0f4a0fd4e86..8180718e442 100644 --- a/windows/sysmetrics.c +++ b/windows/sysmetrics.c @@ -181,7 +181,7 @@ INT16 WINAPI GetSystemMetrics16( INT16 index ) /*********************************************************************** - * GetSystemMetrics32 (USER32.292) + * GetSystemMetrics (USER32.292) */ INT WINAPI GetSystemMetrics( INT index ) { diff --git a/windows/sysparams.c b/windows/sysparams.c index 3ebe1257c23..6fec2f379af 100644 --- a/windows/sysparams.c +++ b/windows/sysparams.c @@ -29,7 +29,7 @@ LONG WINAPI GetTimerResolution16(void) } /*********************************************************************** - * SystemParametersInfo32A (USER32.540) + * SystemParametersInfoA (USER32.540) */ BOOL WINAPI SystemParametersInfoA( UINT uAction, UINT uParam, LPVOID lpvParam, UINT fuWinIni ) @@ -449,7 +449,7 @@ BOOL16 WINAPI SystemParametersInfo16( UINT16 uAction, UINT16 uParam, } /*********************************************************************** - * SystemParametersInfo32W (USER32.541) + * SystemParametersInfoW (USER32.541) */ BOOL WINAPI SystemParametersInfoW( UINT uAction, UINT uParam, LPVOID lpvParam, UINT fuWinIni ) diff --git a/windows/timer.c b/windows/timer.c index 8a33d4ade63..a8aeece6519 100644 --- a/windows/timer.c +++ b/windows/timer.c @@ -318,7 +318,7 @@ UINT16 WINAPI SetTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout, /*********************************************************************** - * SetTimer32 (USER32.511) + * SetTimer (USER32.511) */ UINT WINAPI SetTimer( HWND hwnd, UINT id, UINT timeout, TIMERPROC proc ) @@ -344,7 +344,7 @@ UINT16 WINAPI SetSystemTimer16( HWND16 hwnd, UINT16 id, UINT16 timeout, /*********************************************************************** - * SetSystemTimer32 (USER32.509) + * SetSystemTimer (USER32.509) */ UINT WINAPI SetSystemTimer( HWND hwnd, UINT id, UINT timeout, TIMERPROC proc ) @@ -367,7 +367,7 @@ BOOL16 WINAPI KillTimer16( HWND16 hwnd, UINT16 id ) /*********************************************************************** - * KillTimer32 (USER32.354) + * KillTimer (USER32.354) */ BOOL WINAPI KillTimer( HWND hwnd, UINT id ) { @@ -387,7 +387,7 @@ BOOL16 WINAPI KillSystemTimer16( HWND16 hwnd, UINT16 id ) /*********************************************************************** - * KillSystemTimer32 (USER32.353) + * KillSystemTimer (USER32.353) */ BOOL WINAPI KillSystemTimer( HWND hwnd, UINT id ) { diff --git a/windows/user.c b/windows/user.c index 7d4a735686e..697ee080172 100644 --- a/windows/user.c +++ b/windows/user.c @@ -386,7 +386,7 @@ static void _dump_CDS_flags(DWORD flags) { } /*********************************************************************** - * ChangeDisplaySettingA (USER32.589) + * ChangeDisplaySettingsA (USER32.589) */ LONG WINAPI ChangeDisplaySettingsA( LPDEVMODEA devmode, DWORD flags ) { @@ -414,7 +414,7 @@ LONG WINAPI ChangeDisplaySettingsA( LPDEVMODEA devmode, DWORD flags ) } /*********************************************************************** - * ChangeDisplaySettingExA (USER32.604) + * ChangeDisplaySettingsExA (USER32.604) */ LONG WINAPI ChangeDisplaySettingsExA( LPCSTR devname, LPDEVMODEA devmode, HWND hwnd, DWORD flags, @@ -448,7 +448,7 @@ LONG WINAPI ChangeDisplaySettingsExA( * FIXME: Currently uses static list of modes. * * RETURNS - * TRUE if nth setting exists found (described in the LPDEVMODE32A struct) + * TRUE if nth setting exists found (described in the LPDEVMODEA struct) * FALSE if we do not have the nth setting */ BOOL WINAPI EnumDisplaySettingsA( @@ -585,7 +585,7 @@ DWORD WINAPI RegisterLogonProcess(HANDLE hprocess,BOOL x) { } /*********************************************************************** - * CreateWindowStation32W (USER32.86) + * CreateWindowStationW (USER32.86) */ HWINSTA WINAPI CreateWindowStationW( LPWSTR winstation,DWORD res1,DWORD desiredaccess, @@ -618,7 +618,7 @@ BOOL WINAPI SetUserObjectSecurity( } /*********************************************************************** - * CreateDesktop32W (USER32.69) + * CreateDesktopW (USER32.69) */ HDESK WINAPI CreateDesktopW( LPWSTR lpszDesktop,LPWSTR lpszDevice,LPDEVMODEW pDevmode, @@ -631,11 +631,18 @@ HDESK WINAPI CreateDesktopW( return 0xcafedead; } +/*********************************************************************** + * CloseWindowStation + */ BOOL WINAPI CloseWindowStation(HWINSTA hWinSta) { FIXME_(win32)("(0x%08x)\n", hWinSta); return TRUE; } + +/*********************************************************************** + * CloseDesktop + */ BOOL WINAPI CloseDesktop(HDESK hDesk) { FIXME_(win32)("(0x%08x)\n", hDesk); @@ -666,21 +673,21 @@ VOID WINAPI LoadLocalFonts(VOID) { return; } /*********************************************************************** - * GetUserObjectInformation32A (USER32.299) + * GetUserObjectInformationA (USER32.299) */ BOOL WINAPI GetUserObjectInformationA( HANDLE hObj, INT nIndex, LPVOID pvInfo, DWORD nLength, LPDWORD lpnLen ) { FIXME_(win32)("(0x%x %i %p %ld %p),stub!\n", hObj, nIndex, pvInfo, nLength, lpnLen ); return TRUE; } /*********************************************************************** - * GetUserObjectInformation32W (USER32.300) + * GetUserObjectInformationW (USER32.300) */ BOOL WINAPI GetUserObjectInformationW( HANDLE hObj, INT nIndex, LPVOID pvInfo, DWORD nLength, LPDWORD lpnLen ) { FIXME_(win32)("(0x%x %i %p %ld %p),stub!\n", hObj, nIndex, pvInfo, nLength, lpnLen ); return TRUE; } /*********************************************************************** - * GetUserObjectSecurity32 (USER32.300) + * GetUserObjectSecurity (USER32.300) */ BOOL WINAPI GetUserObjectSecurity(HANDLE hObj, SECURITY_INFORMATION * pSIRequested, PSECURITY_DESCRIPTOR pSID, DWORD nLength, LPDWORD lpnLengthNeeded) diff --git a/windows/win.c b/windows/win.c index 762052eb984..a2fa889e511 100644 --- a/windows/win.c +++ b/windows/win.c @@ -1075,7 +1075,7 @@ HWND16 WINAPI CreateWindowEx16( DWORD exStyle, LPCSTR className, /*********************************************************************** - * CreateWindowEx32A (USER32.83) + * CreateWindowExA (USER32.83) */ HWND WINAPI CreateWindowExA( DWORD exStyle, LPCSTR className, LPCSTR windowName, DWORD style, INT x, @@ -1134,7 +1134,7 @@ HWND WINAPI CreateWindowExA( DWORD exStyle, LPCSTR className, /*********************************************************************** - * CreateWindowEx32W (USER32.84) + * CreateWindowExW (USER32.84) */ HWND WINAPI CreateWindowExW( DWORD exStyle, LPCWSTR className, LPCWSTR windowName, DWORD style, INT x, @@ -1188,8 +1188,8 @@ HWND WINAPI CreateWindowExW( DWORD exStyle, LPCWSTR className, cs.lpszClass = className; cs.dwExStyle = exStyle; - /* Note: we rely on the fact that CREATESTRUCT32A and */ - /* CREATESTRUCT32W have the same layout. */ + /* Note: we rely on the fact that CREATESTRUCTA and */ + /* CREATESTRUCTW have the same layout. */ return WIN_CreateWindowEx( (CREATESTRUCTA *)&cs, classAtom, TRUE, TRUE ); } @@ -1307,7 +1307,7 @@ BOOL16 WINAPI DestroyWindow16( HWND16 hwnd ) /*********************************************************************** - * DestroyWindow32 (USER32.135) + * DestroyWindow (USER32.135) */ BOOL WINAPI DestroyWindow( HWND hwnd ) { @@ -1438,7 +1438,7 @@ BOOL16 WINAPI CloseWindow16( HWND16 hwnd ) /*********************************************************************** - * CloseWindow32 (USER32.56) + * CloseWindow (USER32.56) */ BOOL WINAPI CloseWindow( HWND hwnd ) { @@ -1469,7 +1469,7 @@ BOOL16 WINAPI OpenIcon16( HWND16 hwnd ) /*********************************************************************** - * OpenIcon32 (USER32.410) + * OpenIcon (USER32.410) */ BOOL WINAPI OpenIcon( HWND hwnd ) { @@ -1568,7 +1568,7 @@ HWND16 WINAPI FindWindowEx16( HWND16 parent, HWND16 child, LPCSTR className, LPC /*********************************************************************** - * FindWindow32A (USER32.198) + * FindWindowA (USER32.198) */ HWND WINAPI FindWindowA( LPCSTR className, LPCSTR title ) { @@ -1579,7 +1579,7 @@ HWND WINAPI FindWindowA( LPCSTR className, LPCSTR title ) /*********************************************************************** - * FindWindowEx32A (USER32.199) + * FindWindowExA (USER32.199) */ HWND WINAPI FindWindowExA( HWND parent, HWND child, LPCSTR className, LPCSTR title ) @@ -1601,7 +1601,7 @@ HWND WINAPI FindWindowExA( HWND parent, HWND child, /*********************************************************************** - * FindWindowEx32W (USER32.200) + * FindWindowExW (USER32.200) */ HWND WINAPI FindWindowExW( HWND parent, HWND child, LPCWSTR className, LPCWSTR title ) @@ -1628,7 +1628,7 @@ HWND WINAPI FindWindowExW( HWND parent, HWND child, /*********************************************************************** - * FindWindow32W (USER32.201) + * FindWindowW (USER32.201) */ HWND WINAPI FindWindowW( LPCWSTR className, LPCWSTR title ) { @@ -1664,7 +1664,7 @@ HWND16 WINAPI GetDesktopWindow16(void) /********************************************************************** - * GetDesktopWindow32 (USER32.232) + * GetDesktopWindow (USER32.232) */ HWND WINAPI GetDesktopWindow(void) { @@ -1697,7 +1697,7 @@ BOOL16 WINAPI EnableWindow16( HWND16 hwnd, BOOL16 enable ) /******************************************************************* - * EnableWindow32 (USER32.172) + * EnableWindow (USER32.172) */ BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable ) { @@ -1758,7 +1758,7 @@ BOOL16 WINAPI IsWindowEnabled16(HWND16 hWnd) /*********************************************************************** - * IsWindowEnabled32 (USER32.349) + * IsWindowEnabled (USER32.349) */ BOOL WINAPI IsWindowEnabled(HWND hWnd) { @@ -1798,7 +1798,7 @@ WORD WINAPI GetWindowWord16( HWND16 hwnd, INT16 offset ) /********************************************************************** - * GetWindowWord32 (USER32.314) + * GetWindowWord (USER32.314) */ WORD WINAPI GetWindowWord( HWND hwnd, INT offset ) { @@ -1853,7 +1853,7 @@ WORD WINAPI SetWindowWord16( HWND16 hwnd, INT16 offset, WORD newval ) /********************************************************************** - * SetWindowWord32 (USER32.524) + * SetWindowWord (USER32.524) */ WORD WINAPI SetWindowWord( HWND hwnd, INT offset, WORD newval ) { @@ -2059,7 +2059,7 @@ LONG WINAPI GetWindowLong16( HWND16 hwnd, INT16 offset ) /********************************************************************** - * GetWindowLong32A (USER32.305) + * GetWindowLongA (USER32.305) */ LONG WINAPI GetWindowLongA( HWND hwnd, INT offset ) { @@ -2068,7 +2068,7 @@ LONG WINAPI GetWindowLongA( HWND hwnd, INT offset ) /********************************************************************** - * GetWindowLong32W (USER32.306) + * GetWindowLongW (USER32.306) */ LONG WINAPI GetWindowLongW( HWND hwnd, INT offset ) { @@ -2086,7 +2086,7 @@ LONG WINAPI SetWindowLong16( HWND16 hwnd, INT16 offset, LONG newval ) /********************************************************************** - * SetWindowLong32A (USER32.517) + * SetWindowLongA (USER32.517) */ LONG WINAPI SetWindowLongA( HWND hwnd, INT offset, LONG newval ) { @@ -2095,7 +2095,7 @@ LONG WINAPI SetWindowLongA( HWND hwnd, INT offset, LONG newval ) /********************************************************************** - * SetWindowLong32W (USER32.518) Set window attribute + * SetWindowLongW (USER32.518) Set window attribute * * SetWindowLong() alters one of a window's attributes or sets a 32-bit (long) * value in a window's extra memory. @@ -2188,7 +2188,7 @@ INT16 WINAPI GetWindowText16( HWND16 hwnd, SEGPTR lpString, INT16 nMaxCount ) /******************************************************************* - * GetWindowText32A (USER32.309) + * GetWindowTextA (USER32.309) */ INT WINAPI GetWindowTextA( HWND hwnd, LPSTR lpString, INT nMaxCount ) { @@ -2207,7 +2207,7 @@ INT WINAPI InternalGetWindowText(HWND hwnd,LPWSTR lpString,INT nMaxCount ) /******************************************************************* - * GetWindowText32W (USER32.312) + * GetWindowTextW (USER32.312) */ INT WINAPI GetWindowTextW( HWND hwnd, LPWSTR lpString, INT nMaxCount ) { @@ -2226,7 +2226,7 @@ BOOL16 WINAPI SetWindowText16( HWND16 hwnd, SEGPTR lpString ) /******************************************************************* - * SetWindowText32A (USER32.521) + * SetWindowTextA (USER32.521) */ BOOL WINAPI SetWindowTextA( HWND hwnd, LPCSTR lpString ) { @@ -2235,7 +2235,7 @@ BOOL WINAPI SetWindowTextA( HWND hwnd, LPCSTR lpString ) /******************************************************************* - * SetWindowText32W (USER32.523) + * SetWindowTextW (USER32.523) */ BOOL WINAPI SetWindowTextW( HWND hwnd, LPCWSTR lpString ) { @@ -2253,7 +2253,7 @@ INT16 WINAPI GetWindowTextLength16( HWND16 hwnd ) /******************************************************************* - * GetWindowTextLength32A (USER32.310) + * GetWindowTextLengthA (USER32.310) */ INT WINAPI GetWindowTextLengthA( HWND hwnd ) { @@ -2261,7 +2261,7 @@ INT WINAPI GetWindowTextLengthA( HWND hwnd ) } /******************************************************************* - * GetWindowTextLength32W (USER32.311) + * GetWindowTextLengthW (USER32.311) */ INT WINAPI GetWindowTextLengthW( HWND hwnd ) { @@ -2280,7 +2280,7 @@ BOOL16 WINAPI IsWindow16( HWND16 hwnd ) /******************************************************************* - * IsWindow32 (USER32.348) + * IsWindow (USER32.348) */ BOOL WINAPI IsWindow( HWND hwnd ) { @@ -2305,7 +2305,7 @@ HWND16 WINAPI GetParent16( HWND16 hwnd ) /***************************************************************** - * GetParent32 (USER32.278) + * GetParent (USER32.278) */ HWND WINAPI GetParent( HWND hwnd ) { @@ -2371,7 +2371,7 @@ HWND16 WINAPI SetParent16( HWND16 hwndChild, HWND16 hwndNewParent ) /***************************************************************** - * SetParent32 (USER32.495) + * SetParent (USER32.495) */ HWND WINAPI SetParent( HWND hwndChild, HWND hwndNewParent ) { @@ -2396,7 +2396,7 @@ HWND WINAPI SetParent( HWND hwndChild, HWND hwndNewParent ) pWndOldParent = WIN_LockWndPtr((*wndPtr->pDriver->pSetParent)(wndPtr, pWndNewParent)); - /* SetParent32 additionally needs to make hwndChild the topmost window + /* SetParent additionally needs to make hwndChild the topmost window in the x-order and send the expected WM_WINDOWPOSCHANGING and WM_WINDOWPOSCHANGED notification messages. */ @@ -2425,7 +2425,7 @@ BOOL16 WINAPI IsChild16( HWND16 parent, HWND16 child ) /******************************************************************* - * IsChild32 (USER32.339) + * IsChild (USER32.339) */ BOOL WINAPI IsChild( HWND parent, HWND child ) { @@ -2454,7 +2454,7 @@ BOOL16 WINAPI IsWindowVisible16( HWND16 hwnd ) /*********************************************************************** - * IsWindowVisible32 (USER32.351) + * IsWindowVisible (USER32.351) */ BOOL WINAPI IsWindowVisible( HWND hwnd ) { @@ -2505,7 +2505,7 @@ HWND16 WINAPI GetTopWindow16( HWND16 hwnd ) /******************************************************************* - * GetTopWindow32 (USER.229) + * GetTopWindow (USER.229) */ HWND WINAPI GetTopWindow( HWND hwnd ) { @@ -2531,7 +2531,7 @@ HWND16 WINAPI GetWindow16( HWND16 hwnd, WORD rel ) /******************************************************************* - * GetWindow32 (USER32.302) + * GetWindow (USER32.302) */ HWND WINAPI GetWindow( HWND hwnd, WORD rel ) { @@ -2620,7 +2620,7 @@ void WINAPI ShowOwnedPopups16( HWND16 owner, BOOL16 fShow ) /******************************************************************* - * ShowOwnedPopups32 (USER32.531) + * ShowOwnedPopups (USER32.531) */ BOOL WINAPI ShowOwnedPopups( HWND owner, BOOL fShow ) { @@ -2668,7 +2668,7 @@ HWND16 WINAPI GetLastActivePopup16( HWND16 hwnd ) } /******************************************************************* - * GetLastActivePopup32 (USER32.256) + * GetLastActivePopup (USER32.256) */ HWND WINAPI GetLastActivePopup( HWND hwnd ) { @@ -2912,7 +2912,7 @@ BOOL16 WINAPI AnyPopup16(void) /******************************************************************* - * AnyPopup32 (USER32.4) + * AnyPopup (USER32.4) */ BOOL WINAPI AnyPopup(void) { @@ -2945,7 +2945,7 @@ BOOL16 WINAPI FlashWindow16( HWND16 hWnd, BOOL16 bInvert ) /******************************************************************* - * FlashWindow32 (USER32.202) + * FlashWindow (USER32.202) */ BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert ) { @@ -3128,7 +3128,7 @@ BOOL16 WINAPI DragDetect16( HWND16 hWnd, POINT16 pt ) } /******************************************************************* - * DragDetect32 (USER32.151) + * DragDetect (USER32.151) */ BOOL WINAPI DragDetect( HWND hWnd, POINT pt ) { diff --git a/windows/winhelp.c b/windows/winhelp.c index 8f897cb6cf4..431f796c869 100644 --- a/windows/winhelp.c +++ b/windows/winhelp.c @@ -35,7 +35,7 @@ BOOL16 WINAPI WinHelp16( HWND16 hWnd, LPCSTR lpHelpFile, UINT16 wCommand, /********************************************************************** - * WinHelp32A (USER32.579) + * WinHelpA (USER32.579) */ BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand, DWORD dwData ) @@ -125,7 +125,7 @@ BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand, /********************************************************************** - * WinHelp32W (USER32.580) + * WinHelpW (USER32.580) */ BOOL WINAPI WinHelpW( HWND hWnd, LPCWSTR helpFile, UINT command, DWORD dwData ) diff --git a/windows/winpos.c b/windows/winpos.c index 86cfa83dccb..20edd216d6f 100644 --- a/windows/winpos.c +++ b/windows/winpos.c @@ -592,7 +592,7 @@ HWND16 WINAPI ChildWindowFromPointEx16( HWND16 hwndParent, POINT16 pt, UINT16 uF /******************************************************************* - * ChildWindowFromPointEx32 (USER32.50) + * ChildWindowFromPointEx (USER32.50) */ HWND WINAPI ChildWindowFromPointEx( HWND hwndParent, POINT pt, UINT uFlags) diff --git a/windows/winproc.c b/windows/winproc.c index 7b6893e8236..13a0fdb1d6e 100644 --- a/windows/winproc.c +++ b/windows/winproc.c @@ -2390,7 +2390,7 @@ LRESULT WINAPI CallWindowProc16( WNDPROC16 func, HWND16 hwnd, UINT16 msg, /********************************************************************** - * CallWindowProc32A (USER32.18) + * CallWindowProcA (USER32.18) * * The CallWindowProc() function invokes the windows procedure _func_, * with _hwnd_ as the target window, the message specified by _msg_, and @@ -2451,7 +2451,7 @@ LRESULT WINAPI CallWindowProcA( /********************************************************************** - * CallWindowProc32W (USER32.19) + * CallWindowProcW (USER32.19) */ LRESULT WINAPI CallWindowProcW( WNDPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam )