From 54fe8380a1f47e88d6f212a5dbe82a39f9a1c6c8 Mon Sep 17 00:00:00 2001 From: Patrik Stridvall Date: Thu, 6 Apr 2000 20:21:16 +0000 Subject: [PATCH] Fixed some issues reported by winapi_check. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/service.c | 23 ++++++++++--- dlls/comctl32/comctl32.spec | 8 ++--- dlls/comctl32/comctl32undoc.c | 16 ++++----- dlls/gdi/gdi.spec | 2 +- dlls/msacm/msacm_main.c | 74 ++++++++++++++++++++-------------------- dlls/ole32/storage32.c | 9 ++--- dlls/oleaut32/stubs.c | 11 +++--- dlls/olepro32/olepro32.spec | 2 +- dlls/shell32/shell.c | 8 ++++- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shellpath.c | 25 ++++++++++++-- dlls/shell32/shlwapi.spec | 4 +-- dlls/win32s/w32sys.c | 3 ++ dlls/win87em/emulate.c | 4 +-- dlls/winmm/mmio.c | 2 +- dlls/winmm/mmsystem.c | 19 ++++++++--- dlls/winmm/mmsystem.spec | 4 +-- graphics/painting.c | 4 +-- graphics/psdrv/driver.c | 6 ++-- graphics/win16drv/font.c | 12 +++---- loader/module.c | 2 +- loader/ne/module.c | 2 +- memory/selector.c | 78 +++++++++++++++++++++++++++++++++++++++++++ misc/lstr.c | 2 +- misc/network.c | 4 +-- msdos/int21.c | 3 ++ objects/font.c | 6 ++-- win32/console.c | 4 +-- win32/except.c | 2 +- windows/dialog.c | 4 +-- windows/hook.c | 4 +-- windows/mdi.c | 2 +- windows/message.c | 4 +-- windows/winpos.c | 2 +- 35 files changed, 247 insertions(+), 112 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index df5d271dd63..c84993bbadf 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -78,7 +78,7 @@ type win32 @ stub EnumDependentServicesA @ stub EnumDependentServicesW @ stdcall EnumServicesStatusA (long long long ptr long ptr ptr ptr) EnumServicesStatusA -@ stdcall EnumServicesStatusW (long long long ptr long ptr ptr ptr) EnumServicesStatusA +@ stdcall EnumServicesStatusW (long long long ptr long ptr ptr ptr) EnumServicesStatusW @ stdcall EqualPrefixSid(ptr ptr) EqualPrefixSid @ stdcall EqualSid(ptr ptr) EqualSid @ stub FindFirstFreeAce diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index cccab1f9b9f..13b78aa2b54 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -19,13 +19,28 @@ static DWORD start_dwNumServiceArgs; static LPWSTR *start_lpServiceArgVectors; /****************************************************************************** - * EnumServicesStatusA [ADVAPI32.38] + * EnumServicesStatusA [ADVAPI32.@] */ BOOL WINAPI EnumServicesStatusA( SC_HANDLE hSCManager, DWORD dwServiceType, - DWORD dwServiceState, LPENUM_SERVICE_STATUSA lpServices, - DWORD cbBufSize, LPDWORD pcbBytesNeeded, - LPDWORD lpServicesReturned, LPDWORD lpResumeHandle ) + DWORD dwServiceState, LPENUM_SERVICE_STATUSA lpServices, + DWORD cbBufSize, LPDWORD pcbBytesNeeded, + LPDWORD lpServicesReturned, LPDWORD lpResumeHandle ) +{ FIXME("%x type=%lx state=%lx %p %lx %p %p %p\n", hSCManager, + dwServiceType, dwServiceState, lpServices, cbBufSize, + pcbBytesNeeded, lpServicesReturned, lpResumeHandle); + SetLastError (ERROR_ACCESS_DENIED); + return 0; +} + +/****************************************************************************** + * EnumServicesStatusW [ADVAPI32.@] + */ +BOOL WINAPI +EnumServicesStatusW( SC_HANDLE hSCManager, DWORD dwServiceType, + DWORD dwServiceState, LPENUM_SERVICE_STATUSW lpServices, + DWORD cbBufSize, LPDWORD pcbBytesNeeded, + LPDWORD lpServicesReturned, LPDWORD lpResumeHandle ) { FIXME("%x type=%lx state=%lx %p %lx %p %p %p\n", hSCManager, dwServiceType, dwServiceState, lpServices, cbBufSize, pcbBytesNeeded, lpServicesReturned, lpResumeHandle); diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index dbe440f12ac..088c0e76df3 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -182,10 +182,10 @@ rsrc comctl32 403 stub EnumMRUListW@16 404 stub CreateMRUListLazyW@16 -410 stdcall COMCTL32_410(long long long long) comctl32_410 -411 stdcall COMCTL32_411(long long long) comctl32_411 -412 stdcall COMCTL32_412(long long long) comctl32_412 -413 stdcall COMCTL32_413(long long long long) comctl32_413 +410 stdcall COMCTL32_410(long long long long) COMCTL32_410 +411 stdcall COMCTL32_411(long long long) COMCTL32_411 +412 stdcall COMCTL32_412(long long long) COMCTL32_412 +413 stdcall COMCTL32_413(long long long long) COMCTL32_413 # this is actually ordinal 70 in COMCTL32 v5.0 414 stdcall InitMUILanguage(long) InitMUILanguage diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index 6748a0093a3..313e7bd5cdd 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -2216,13 +2216,13 @@ INT WINAPI COMCTL32_StrSpnW( LPWSTR lpStr, LPWSTR lpSet) { } /************************************************************************** - * comctl32_410 [COMCTL32.410] + * COMCTL32_410 [COMCTL32.410] * * FIXME: What's this supposed to do? * Parameter 1 is an HWND, you're on your own for the rest. */ -BOOL WINAPI comctl32_410( HWND hw, DWORD b, DWORD c, DWORD d) { +BOOL WINAPI COMCTL32_410( HWND hw, DWORD b, DWORD c, DWORD d) { FIXME("(%x, %lx, %lx, %lx): stub!\n", hw, b, c, d); @@ -2230,13 +2230,13 @@ BOOL WINAPI comctl32_410( HWND hw, DWORD b, DWORD c, DWORD d) { } /************************************************************************** - * comctl32_411 [COMCTL32.411] + * COMCTL32_411 [COMCTL32.411] * * FIXME: What's this supposed to do? * Parameter 1 is an HWND, you're on your own for the rest. */ -BOOL WINAPI comctl32_411( HWND hw, DWORD b, DWORD c) { +BOOL WINAPI COMCTL32_411( HWND hw, DWORD b, DWORD c) { FIXME("(%x, %lx, %lx): stub!\n", hw, b, c); @@ -2244,13 +2244,13 @@ BOOL WINAPI comctl32_411( HWND hw, DWORD b, DWORD c) { } /************************************************************************** - * comctl32_412 [COMCTL32.412] + * COMCTL32_412 [COMCTL32.412] * * FIXME: What's this supposed to do? * Parameter 1 is an HWND, you're on your own for the rest. */ -BOOL WINAPI comctl32_412( HWND hwnd, DWORD b, DWORD c) +BOOL WINAPI COMCTL32_412( HWND hwnd, DWORD b, DWORD c) { FIXME("(%x, %lx, %lx): stub!\n", hwnd, b, c); @@ -2265,13 +2265,13 @@ BOOL WINAPI comctl32_412( HWND hwnd, DWORD b, DWORD c) } /************************************************************************** - * comctl32_413 [COMCTL32.413] + * COMCTL32_413 [COMCTL32.413] * * FIXME: What's this supposed to do? * Parameter 1 is an HWND, you're on your own for the rest. */ -BOOL WINAPI comctl32_413( HWND hw, DWORD b, DWORD c, DWORD d) { +BOOL WINAPI COMCTL32_413( HWND hw, DWORD b, DWORD c, DWORD d) { FIXME("(%x, %lx, %lx, %lx): stub!\n", hw, b, c, d); diff --git a/dlls/gdi/gdi.spec b/dlls/gdi/gdi.spec index b8622c5f3f6..eea464d0f2a 100644 --- a/dlls/gdi/gdi.spec +++ b/dlls/gdi/gdi.spec @@ -141,7 +141,7 @@ file gdi.exe 154 pascal GetNearestColor(word long) GetNearestColor16 155 pascal16 QueryAbort(word word) QueryAbort16 156 pascal16 CreateDiscardableBitmap(word word word) CreateDiscardableBitmap16 -158 pascal16 EnumCallback(ptr ptr word long) WineEnumDFontCallback +158 pascal16 EnumCallback(ptr ptr word long) EnumCallback16 159 pascal16 GetMetaFileBits(word) GetMetaFileBits16 160 pascal16 SetMetaFileBits(word) SetMetaFileBits16 161 pascal16 PtInRegion(word s_word s_word) PtInRegion16 diff --git a/dlls/msacm/msacm_main.c b/dlls/msacm/msacm_main.c index 813398782d1..0407fee1c55 100644 --- a/dlls/msacm/msacm_main.c +++ b/dlls/msacm/msacm_main.c @@ -12,7 +12,7 @@ DEFAULT_DEBUG_CHANNEL(msacm) /*********************************************************************** - * ACMGETVERSION (MSACM.7) + * acmGetVersion (MSACM.7) */ DWORD WINAPI acmGetVersion16() { @@ -22,7 +22,7 @@ DWORD WINAPI acmGetVersion16() } /*********************************************************************** - * ACMMETRICS (MSACM.8) + * acmMetrics (MSACM.8) */ MMRESULT16 WINAPI acmMetrics16( @@ -34,7 +34,7 @@ MMRESULT16 WINAPI acmMetrics16( } /*********************************************************************** - * ACMDRIVERENUM (MSACM.10) + * acmDriverEnum (MSACM.10) */ MMRESULT16 WINAPI acmDriverEnum16( ACMDRIVERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) @@ -47,7 +47,7 @@ MMRESULT16 WINAPI acmDriverEnum16( } /*********************************************************************** - * ACMDRIVERDETAILS (MSACM.11) + * acmDriverDetails (MSACM.11) */ MMRESULT16 WINAPI acmDriverDetails16( @@ -59,7 +59,7 @@ MMRESULT16 WINAPI acmDriverDetails16( } /*********************************************************************** - * ACMDRIVERADD (MSACM.12) + * acmDriverAdd (MSACM.12) */ MMRESULT16 WINAPI acmDriverAdd16( LPHACMDRIVERID16 phadid, HINSTANCE16 hinstModule, @@ -73,7 +73,7 @@ MMRESULT16 WINAPI acmDriverAdd16( } /*********************************************************************** - * ACMDRIVERREMOVE (MSACM.13) + * acmDriverRemove (MSACM.13) */ MMRESULT16 WINAPI acmDriverRemove16( HACMDRIVERID16 hadid, DWORD fdwRemove) @@ -84,7 +84,7 @@ MMRESULT16 WINAPI acmDriverRemove16( } /*********************************************************************** - * ACMDRIVEROPEN (MSACM.14) + * acmDriverOpen (MSACM.14) */ MMRESULT16 WINAPI acmDriverOpen16( LPHACMDRIVER16 phad, HACMDRIVERID16 hadid, DWORD fdwOpen) @@ -95,7 +95,7 @@ MMRESULT16 WINAPI acmDriverOpen16( } /*********************************************************************** - * ACMDRIVERCLOSE (MSACM.15) + * acmDriverClose (MSACM.15) */ MMRESULT16 WINAPI acmDriverClose16( HACMDRIVER16 had, DWORD fdwClose) @@ -106,7 +106,7 @@ MMRESULT16 WINAPI acmDriverClose16( } /*********************************************************************** - * ACMDRIVERMESSAGE (MSACM.16) + * acmDriverMessage (MSACM.16) */ LRESULT WINAPI acmDriverMessage16( HACMDRIVER16 had, UINT16 uMsg, LPARAM lParam1, LPARAM lParam2) @@ -119,7 +119,7 @@ LRESULT WINAPI acmDriverMessage16( } /*********************************************************************** - * ACMDRIVERID (MSACM.17) + * acmDriverID (MSACM.17) */ MMRESULT16 WINAPI acmDriverID16( HACMOBJ16 hao, LPHACMDRIVERID16 phadid, DWORD fdwDriverID) @@ -130,7 +130,7 @@ MMRESULT16 WINAPI acmDriverID16( } /*********************************************************************** - * ACMDRIVERPRIORITY (MSACM.18) + * acmDriverPriority (MSACM.18) */ MMRESULT16 WINAPI acmDriverPriority16( HACMDRIVERID16 hadid, DWORD dwPriority, DWORD fdwPriority) @@ -143,7 +143,7 @@ MMRESULT16 WINAPI acmDriverPriority16( } /*********************************************************************** - * ACMFORMATTAGDETAILS (MSACM.30) + * acmFormatTagDetails (MSACM.30) */ MMRESULT16 WINAPI acmFormatTagDetails16( HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd, DWORD fdwDetails) @@ -154,7 +154,7 @@ MMRESULT16 WINAPI acmFormatTagDetails16( } /*********************************************************************** - * ACMFORMATTAGENUM (MSACM.31) + * acmFormatTagEnum (MSACM.31) */ MMRESULT16 WINAPI acmFormatTagEnum16( HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd, @@ -168,7 +168,7 @@ MMRESULT16 WINAPI acmFormatTagEnum16( } /*********************************************************************** - * ACMFORMATCHOOSE (MSACM.40) + * acmFormatChoose (MSACM.40) */ MMRESULT16 WINAPI acmFormatChoose16( LPACMFORMATCHOOSE16 pafmtc) @@ -179,7 +179,7 @@ MMRESULT16 WINAPI acmFormatChoose16( } /*********************************************************************** - * ACMFORMATDETAILS (MSACM.41) + * acmFormatDetails (MSACM.41) */ MMRESULT16 WINAPI acmFormatDetails16( HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd, DWORD fdwDetails) @@ -190,7 +190,7 @@ MMRESULT16 WINAPI acmFormatDetails16( } /*********************************************************************** - * ACMFORMATENUM (MSACM.42) + * acmFormatEnum (MSACM.42) */ MMRESULT16 WINAPI acmFormatEnum16( HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd, @@ -204,7 +204,7 @@ MMRESULT16 WINAPI acmFormatEnum16( } /*********************************************************************** - * ACMFORMATSUGGEST (MSACM.45) + * acmFormatSuggest (MSACM.45) */ MMRESULT16 WINAPI acmFormatSuggest16( HACMDRIVER16 had, LPWAVEFORMATEX pwfxSrc, @@ -218,7 +218,7 @@ MMRESULT16 WINAPI acmFormatSuggest16( } /*********************************************************************** - * ACMFILTERTAGDETAILS (MSACM.50) + * acmFilterTagDetails (MSACM.50) */ MMRESULT16 WINAPI acmFilterTagDetails16( HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, DWORD fdwDetails) @@ -229,7 +229,7 @@ MMRESULT16 WINAPI acmFilterTagDetails16( } /*********************************************************************** - * ACMFILTERTAGENUM (MSACM.51) + * acmFilterTagEnum (MSACM.51) */ MMRESULT16 WINAPI acmFilterTagEnum16( HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, @@ -243,7 +243,7 @@ MMRESULT16 WINAPI acmFilterTagEnum16( } /*********************************************************************** - * ACMFILTERCHOOSE (MSACM.60) + * acmFilterChoose (MSACM.60) */ MMRESULT16 WINAPI acmFilterChoose16( LPACMFILTERCHOOSE16 pafltrc) @@ -254,7 +254,7 @@ MMRESULT16 WINAPI acmFilterChoose16( } /*********************************************************************** - * ACMFILTERDETAILS (MSACM.61) + * acmFilterDetails (MSACM.61) */ MMRESULT16 WINAPI acmFilterDetails16( HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd, DWORD fdwDetails) @@ -265,7 +265,7 @@ MMRESULT16 WINAPI acmFilterDetails16( } /*********************************************************************** - * ACMFILTERENUM (MSACM.62) + * acmFilterEnum (MSACM.62) */ MMRESULT16 WINAPI acmFilterEnum16( HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd, @@ -279,7 +279,7 @@ MMRESULT16 WINAPI acmFilterEnum16( } /*********************************************************************** - * ACMSTREAMOPEN (MSACM.70) + * acmStreamOpen (MSACM.70) */ MMRESULT16 WINAPI acmStreamOpen16( LPHACMSTREAM16 phas, HACMDRIVER16 had, @@ -296,7 +296,7 @@ MMRESULT16 WINAPI acmStreamOpen16( } /*********************************************************************** - * ACMSTREAMCLOSE (MSACM.71) + * acmStreamClose (MSACM.71) */ MMRESULT16 WINAPI acmStreamClose16( HACMSTREAM16 has, DWORD fdwClose) @@ -307,7 +307,7 @@ MMRESULT16 WINAPI acmStreamClose16( } /*********************************************************************** - * ACMSTREAMSIZE (MSACM.72) + * acmStreamSize (MSACM.72) */ MMRESULT16 WINAPI acmStreamSize16( HACMSTREAM16 has, DWORD cbInput, @@ -321,7 +321,7 @@ MMRESULT16 WINAPI acmStreamSize16( } /*********************************************************************** - * ACMSTREAMCONVERT (MSACM.75) + * acmStreamConvert (MSACM.75) */ MMRESULT16 WINAPI acmStreamConvert16( HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwConvert) @@ -332,7 +332,7 @@ MMRESULT16 WINAPI acmStreamConvert16( } /*********************************************************************** - * ACMSTREAMRESET (MSACM.76) + * acmStreamReset (MSACM.76) */ MMRESULT16 WINAPI acmStreamReset16( HACMSTREAM16 has, DWORD fdwReset) @@ -343,7 +343,7 @@ MMRESULT16 WINAPI acmStreamReset16( } /*********************************************************************** - * ACMSTREAMPREPAREHEADER (MSACM.77) + * acmStreamPrepareHeader (MSACM.77) */ MMRESULT16 WINAPI acmStreamPrepareHeader16( HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwPrepare) @@ -354,7 +354,7 @@ MMRESULT16 WINAPI acmStreamPrepareHeader16( } /*********************************************************************** - * ACMSTREAMUNPREPAREHEADER (MSACM.78) + * acmStreamUnprepareHeader (MSACM.78) */ MMRESULT16 WINAPI acmStreamUnprepareHeader16( HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwUnprepare) @@ -367,43 +367,43 @@ MMRESULT16 WINAPI acmStreamUnprepareHeader16( } /*********************************************************************** - * ACMAPPLICATIONEXIT (MSACM.150) + * ACMAPPLICATIONEXIT (MSACM.150) * FIXME * No documentation found. */ /*********************************************************************** - * ACMHUGEPAGELOCK (MSACM.175) - * FIXME + * ACMHUGEPAGELOCK (MSACM.175) + *FIXME * No documentation found. */ /*********************************************************************** - * ACMHUGEPAGEUNLOCK (MSACM.176) + * ACMHUGEPAGEUNLOCK (MSACM.176) * FIXME * No documentation found. */ /*********************************************************************** - * ACMOPENCONVERSION (MSACM.200) + * ACMOPENCONVERSION (MSACM.200) * FIXME * No documentation found. */ /*********************************************************************** - * ACMCLOSECONVERSION (MSACM.201) + * ACMCLOSECONVERSION (MSACM.201) * FIXME * No documentation found. */ /*********************************************************************** - * ACMCONVERT (MSACM.202) + * ACMCONVERT (MSACM.202) * FIXME * No documentation found. */ /*********************************************************************** - * ACMCHOOSEFORMAT (MSACM.203) + * ACMCHOOSEFORMAT (MSACM.203) * FIXME * No documentation found. */ diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index a0cbb3749e9..08000a0c241 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5652,7 +5652,7 @@ HRESULT WINAPI WriteClassStg(IStorage* pStg, REFCLSID rclsid) return hRes; } -/******************************************************************************************* +/*********************************************************************** * ReadClassStg * * This method reads the CLSID previously written to a storage object with the WriteClassStg. @@ -5677,7 +5677,7 @@ HRESULT WINAPI ReadClassStg(IStorage *pstg,CLSID *pclsid){ return hRes; } -/************************************************************************************* +/*********************************************************************** * OleLoadFromStream * * This function loads an object from stream @@ -5703,10 +5703,11 @@ HRESULT WINAPI OleLoadFromStream(IStream *pStm,REFIID iidInterface,void** ppvOb return res; } -/************************************************************************************************ +/*********************************************************************** * OleSaveToStream * - * This function saves an object with the IPersistStream interface on it to the specified stream + * This function saves an object with the IPersistStream interface on it + * to the specified stream. */ HRESULT WINAPI OleSaveToStream(IPersistStream *pPStm,IStream *pStm) { diff --git a/dlls/oleaut32/stubs.c b/dlls/oleaut32/stubs.c index 6bb9035a828..04a7f6ed20a 100644 --- a/dlls/oleaut32/stubs.c +++ b/dlls/oleaut32/stubs.c @@ -12,7 +12,7 @@ DEFAULT_DEBUG_CHANNEL(ole); -/***************************************************** +/*********************************************************************** * OleIconToCursor */ HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hicon) @@ -21,7 +21,7 @@ HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hicon) return S_OK; } -/***************************************************** +/*********************************************************************** * OleCreatePropertyFrameIndirect */ HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams) @@ -30,7 +30,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams) return S_OK; } -/***************************************************** +/*********************************************************************** * OleCreatePropertyFrame */ HRESULT WINAPI OleCreatePropertyFrame( HWND hwndOwner, UINT x, UINT y, @@ -44,7 +44,7 @@ HRESULT WINAPI OleCreatePropertyFrame( HWND hwndOwner, UINT x, UINT y, return S_OK; } -/***************************************************** +/*********************************************************************** * OleLoadPicture */ HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, @@ -56,7 +56,7 @@ HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, return S_OK; } -/***************************************************** +/*********************************************************************** * OleCreatePictureIndirect */ HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid, @@ -67,3 +67,4 @@ HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid, ); return S_OK; } + diff --git a/dlls/olepro32/olepro32.spec b/dlls/olepro32/olepro32.spec index b802144be39..d3ae3699fc9 100644 --- a/dlls/olepro32/olepro32.spec +++ b/dlls/olepro32/olepro32.spec @@ -11,6 +11,6 @@ import oleaut32.dll @ forward OleCreateFontIndirect OLEAUT32.OleCreateFontIndirect @ forward OleTranslateColor OLEAUT32.OleTranslateColor @ stdcall DllCanUnloadNow() OLEPRO32_DllCanUnloadNow -@ stdcall DllGetClassObjecti( ptr ptr ptr ) OLEPRO32_DllGetClassObject +@ stdcall DllGetClassObject( ptr ptr ptr ) OLEPRO32_DllGetClassObject @ stdcall DllRegisterServer() OLEPRO32_DllRegisterServer @ stdcall DllUnregisterServer() OLEPRO32_DllUnregisterServer diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c index 572cde0afa3..5a0379b0294 100644 --- a/dlls/shell32/shell.c +++ b/dlls/shell32/shell.c @@ -1086,7 +1086,7 @@ HICON16 WINAPI ExtractIconEx16( } /************************************************************************* - * ExtractAssociatedIconA [SHELL.36] + * ExtractAssociatedIconA * * Return icon for given file (either from file itself or from associated * executable) and patch parameters if needed. @@ -1096,6 +1096,12 @@ HICON WINAPI ExtractAssociatedIconA(HINSTANCE hInst, LPSTR lpIconPath, LPWORD lp return ExtractAssociatedIcon16(hInst,lpIconPath,lpiIcon); } +/************************************************************************* + * ExtractAssociatedIcon [SHELL.36] + * + * Return icon for given file (either from file itself or from associated + * executable) and patch parameters if needed. + */ HICON16 WINAPI ExtractAssociatedIcon16(HINSTANCE16 hInst, LPSTR lpIconPath, LPWORD lpiIcon) { HICON16 hIcon; diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 3350646a457..21155c56024 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -63,7 +63,7 @@ rsrc shell32 54 stdcall DragAcceptFiles(long long) DragAcceptFiles 55 stdcall PathQuoteSpaces (ptr) PathQuoteSpacesAW 56 stdcall PathUnquoteSpaces(str) PathUnquoteSpacesAW - 57 stdcall PathGetDriveNumber (str) PathGetDriveNumber + 57 stdcall PathGetDriveNumber(str) PathGetDriveNumberAW 58 stdcall ParseField(str long ptr long) ParseFieldA 59 stub RestartDialog@12 60 stdcall ExitWindowsDialog(long) ExitWindowsDialog diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index c931a88829a..ab96739faa0 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -856,17 +856,36 @@ VOID WINAPI PathUnquoteSpacesAW(LPVOID str) PathUnquoteSpacesA(str); } - /************************************************************************* - * PathGetDriveNumber [SHELL32.57] + * PathGetDriveNumberA [SHLWAPI.@] * */ -HRESULT WINAPI PathGetDriveNumber(LPSTR u) +HRESULT WINAPI PathGetDriveNumberA(LPSTR u) { FIXME("%s stub\n",debugstr_a(u)); return 0; } /************************************************************************* + * PathGetDriveNumberW [SHLWAPI.@] + * + */ +HRESULT WINAPI PathGetDriveNumberW(LPWSTR u) +{ FIXME("%s stub\n",debugstr_w(u)); + return 0; +} + +/************************************************************************* + * PathGetDriveNumber [SHELL32.57] + * + */ +HRESULT WINAPI PathGetDriveNumberAW(LPVOID str) +{ + if(VERSION_OsIsUnicode()) + return PathGetDriveNumberW(str); + return PathGetDriveNumberA(str); +} + +/************************************************************************* * PathYetAnotherMakeUniqueNameA [SHELL32.75] * * NOTES diff --git a/dlls/shell32/shlwapi.spec b/dlls/shell32/shlwapi.spec index 1829530000a..098c5a15713 100644 --- a/dlls/shell32/shlwapi.spec +++ b/dlls/shell32/shlwapi.spec @@ -205,8 +205,8 @@ type win32 @ stdcall PathGetArgsW (str) PathGetArgsW @ stub PathGetCharTypeA @ stub PathGetCharTypeW -@ stdcall PathGetDriveNumberA (str) PathGetDriveNumber -@ stub PathGetDriveNumberW #(str) PathGetDriveNumber +@ stdcall PathGetDriveNumberA(str) PathGetDriveNumberA +@ stdcall PathGetDriveNumberW(str) PathGetDriveNumberW @ stub PathIsContentTypeA @ stub PathIsContentTypeW @ stdcall PathIsDirectoryA(str) PathIsDirectoryA diff --git a/dlls/win32s/w32sys.c b/dlls/win32s/w32sys.c index 43b1b485b2c..529bbf82a86 100644 --- a/dlls/win32s/w32sys.c +++ b/dlls/win32s/w32sys.c @@ -48,6 +48,9 @@ WORD WINAPI GetPEResourceTable16( return 0; } +/*********************************************************************** + * LoadPeResource + */ DWORD WINAPI LoadPeResource16(WORD x,SEGPTR y) { FIXME("(0x%04x,0x%08lx),stub!\n",x,y); return 0; diff --git a/dlls/win87em/emulate.c b/dlls/win87em/emulate.c index ec9c5b327bf..3fc4fc949ab 100644 --- a/dlls/win87em/emulate.c +++ b/dlls/win87em/emulate.c @@ -39,7 +39,7 @@ static WORD StackTop = 175; static WORD StackBottom = 0; static WORD Inthandler02hVar = 1; -void WIN87_ClearCtrlWord( CONTEXT86 *context ) +static void WIN87_ClearCtrlWord( CONTEXT86 *context ) { AX_reg(context) = 0; if (Installed) @@ -51,7 +51,7 @@ void WIN87_ClearCtrlWord( CONTEXT86 *context ) StatusWord_3 = StatusWord_2 = 0; } -void WIN87_SetCtrlWord( CONTEXT86 *context ) +static void WIN87_SetCtrlWord( CONTEXT86 *context ) { CtrlWord_1 = AX_reg(context); AX_reg(context) &= 0xff3c; diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index d1004765fb5..248868ab2ca 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -1313,7 +1313,7 @@ UINT WINAPI mmioAdvance(HMMIO hmmio, MMIOINFO* lpmmioinfo, UINT uFlags) return 0; } -/**********************************************************m**************** +/*********************************************************************** * mmioAdvance [MMSYSTEM.1219] */ UINT16 WINAPI mmioAdvance16(HMMIO16 hmmio, MMIOINFO16* lpmmioinfo, UINT16 uFlags) diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index 705393ab6ee..b619c32c234 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -5028,7 +5028,7 @@ extern LONG CALLBACK MMSYSTEM_CallTo16_long_l (FARPROC16,LONG); /* ### stop build ### */ /************************************************************************** - * mmThreadGetTask [internal] + * WINE_mmThreadEntryPoint [internal] */ void WINAPI WINE_mmThreadEntryPoint(DWORD _pmt) { @@ -5090,9 +5090,9 @@ BOOL16 WINAPI mmShowMMCPLPropertySheet16(HWND hWnd, LPCSTR lpStrDevice, } /************************************************************************** - * StackEnter & StackLeave [MMSYSTEM.32][MMSYSTEM.33] + * StackEnter [MMSYSTEM.32] */ -void WINAPI StackEnterLeave16(void) +void WINAPI StackEnter16(void) { #ifdef __i386__ /* mmsystem.dll from Win 95 does only this: so does Wine */ @@ -5101,7 +5101,18 @@ void WINAPI StackEnterLeave16(void) } /************************************************************************** - * WMMMIDIRUNONCE [MMSYSTEM.8] + * StackLeave [MMSYSTEM.33] + */ +void WINAPI StackLeave16(void) +{ +#ifdef __i386__ + /* mmsystem.dll from Win 95 does only this: so does Wine */ + __asm__("stc"); +#endif +} + +/************************************************************************** + * WMMMidiRunOnce [MMSYSTEM.8] */ void WINAPI WMMMidiRunOnce16(void) { diff --git a/dlls/winmm/mmsystem.spec b/dlls/winmm/mmsystem.spec index a9f493a02b9..50f0d2110e6 100644 --- a/dlls/winmm/mmsystem.spec +++ b/dlls/winmm/mmsystem.spec @@ -9,8 +9,8 @@ type win16 8 pascal WMMMIDIRUNONCE() WMMMidiRunOnce16 30 pascal16 OutputDebugStr(str) OutputDebugString16 31 pascal DriverCallback(long word word word long long long) DriverCallback16 -32 pascal StackEnter() StackEnterLeave16 -33 pascal StackLeave() StackEnterLeave16 +32 pascal StackEnter() StackEnter16 +33 pascal StackLeave() StackLeave16 34 stub MMDRVINSTALL 101 pascal joyGetNumDevs() joyGetNumDevs16 102 pascal joyGetDevCaps(word ptr word) joyGetDevCaps16 diff --git a/graphics/painting.c b/graphics/painting.c index 7f3d3710ceb..61404ad796b 100644 --- a/graphics/painting.c +++ b/graphics/painting.c @@ -906,7 +906,7 @@ BOOL WINAPI PolyBezierTo( HDC hdc, const POINT* lppt, DWORD cPoints ) return ret; } -/*************************************************************** +/*********************************************************************** * AngleArc (GDI32.5) * */ @@ -917,7 +917,7 @@ BOOL WINAPI AngleArc(HDC hdc, INT x, INT y, DWORD dwRadius, return 0; } -/*************************************************************** +/*********************************************************************** * PolyDraw (GDI32.270) * */ diff --git a/graphics/psdrv/driver.c b/graphics/psdrv/driver.c index a733988cd38..aa2193d208d 100644 --- a/graphics/psdrv/driver.c +++ b/graphics/psdrv/driver.c @@ -216,7 +216,7 @@ LRESULT WINAPI PSDRV_AdvancedSetupDlgProc(HWND hWnd, UINT wMsg, } #endif /* 0 */ -/************************************************************** +/*********************************************************************** * * PSDRV_AdvancedSetupDialog16 [WINEPS.93] * @@ -239,7 +239,7 @@ WORD WINAPI PSDRV_AdvancedSetupDialog16(HWND16 hwnd, HANDLE16 hDriver, } -/*************************************************************** +/*********************************************************************** * * PSDRV_ExtDeviceMode16 [WINEPS.90] * @@ -288,7 +288,7 @@ INT PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput, lpdmInput, lpszProfile, dwMode); } -/*************************************************************** +/*********************************************************************** * * PSDRV_DeviceCapabilities16 [WINEPS.91] * diff --git a/graphics/win16drv/font.c b/graphics/win16drv/font.c index ca1a4bf1757..c525e8f3540 100644 --- a/graphics/win16drv/font.c +++ b/graphics/win16drv/font.c @@ -196,7 +196,7 @@ BOOL WIN16DRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf, return wRet; } -/* +/*********************************************************************** * EnumCallback (GDI.158) * * This is the callback function used when EnumDFonts is called. @@ -206,13 +206,11 @@ BOOL WIN16DRV_EnumDeviceFonts( DC* dc, LPLOGFONT16 plf, * structure (WEPFC = WINE_ENUM_PRINTER_FONT_CALLBACK). * */ - - -WORD WINAPI WineEnumDFontCallback(LPENUMLOGFONT16 lpLogFont, - LPNEWTEXTMETRIC16 lpTextMetrics, - WORD wFontType, LONG lpClientData) +WORD WINAPI EnumCallback16(LPENUMLOGFONT16 lpLogFont, + LPNEWTEXTMETRIC16 lpTextMetrics, + WORD wFontType, LONG lpClientData) { - TRACE("In WineEnumDFontCallback plf=%p\n", lpLogFont); + TRACE("In EnumCallback16 plf=%p\n", lpLogFont); return (*(((WEPFC *)lpClientData)->proc))( lpLogFont, lpTextMetrics, wFontType, ((WEPFC *)lpClientData)->lp ); } diff --git a/loader/module.c b/loader/module.c index f779f78b269..a2e0581e55a 100644 --- a/loader/module.c +++ b/loader/module.c @@ -1710,7 +1710,7 @@ FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function ) } /*********************************************************************** - * WIN16_GetProcAddress32 (KERNEL.453) + * GetProcAddress32 (KERNEL.453) */ FARPROC WINAPI GetProcAddress32_16( HMODULE hModule, LPCSTR function ) { diff --git a/loader/ne/module.c b/loader/ne/module.c index f22c267cb80..9c4ad77c07b 100644 --- a/loader/ne/module.c +++ b/loader/ne/module.c @@ -1421,7 +1421,7 @@ INT16 WINAPI GetModuleFileName16( HINSTANCE16 hModule, LPSTR lpFileName, /********************************************************************** - * GetModuleHandle16 (KERNEL.47) + * GetModuleHandle (KERNEL.47) * * Find a module from a module name. * diff --git a/memory/selector.c b/memory/selector.c index 0a1251a5ed8..0f0b99f6742 100644 --- a/memory/selector.c +++ b/memory/selector.c @@ -691,16 +691,54 @@ x_SMapLS_IP_EBP_x(CONTEXT86 *context,int argoff) { EAX_reg(context) = ptr; } +/*********************************************************************** + * SMapLS_IP_EBP_8 (KERNEL32.601) + */ void WINAPI SMapLS_IP_EBP_8 (CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context, 8);} + +/*********************************************************************** + * SMapLS_IP_EBP_12 (KERNEL32.593) + */ void WINAPI SMapLS_IP_EBP_12(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,12);} + +/*********************************************************************** + * SMapLS_IP_EBP_16 (KERNEL32.594) + */ void WINAPI SMapLS_IP_EBP_16(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,16);} + +/*********************************************************************** + * SMapLS_IP_EBP_20 (KERNEL32.595) + */ void WINAPI SMapLS_IP_EBP_20(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,20);} + +/*********************************************************************** + * SMapLS_IP_EBP_24 (KERNEL32.596) + */ void WINAPI SMapLS_IP_EBP_24(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,24);} + +/*********************************************************************** + * SMapLS_IP_EBP_28 (KERNEL32.597) + */ void WINAPI SMapLS_IP_EBP_28(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,28);} + +/*********************************************************************** + * SMapLS_IP_EBP_32 (KERNEL32.598) + */ void WINAPI SMapLS_IP_EBP_32(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,32);} + +/*********************************************************************** + * SMapLS_IP_EBP_36 (KERNEL32.599) + */ void WINAPI SMapLS_IP_EBP_36(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,36);} + +/*********************************************************************** + * SMapLS_IP_EBP_40 (KERNEL32.600) + */ void WINAPI SMapLS_IP_EBP_40(CONTEXT86 *context) {x_SMapLS_IP_EBP_x(context,40);} +/*********************************************************************** + * SMapLS (KERNEL32.592) + */ void WINAPI SMapLS( CONTEXT86 *context ) { if (EAX_reg(context)>=0x10000) { @@ -711,6 +749,10 @@ void WINAPI SMapLS( CONTEXT86 *context ) } } +/*********************************************************************** + * SUnMapLS (KERNEL32.602) + */ + void WINAPI SUnMapLS( CONTEXT86 *context ) { if (EAX_reg(context)>=0x10000) @@ -723,14 +765,50 @@ x_SUnMapLS_IP_EBP_x(CONTEXT86 *context,int argoff) { UnMapLS(*(DWORD*)(EBP_reg(context)+argoff)); *(DWORD*)(EBP_reg(context)+argoff)=0; } + +/*********************************************************************** + * SUnMapLS_IP_EBP_8 (KERNEL32.611) + */ void WINAPI SUnMapLS_IP_EBP_8 (CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context, 8); } + +/*********************************************************************** + * SUnMapLS_IP_EBP_12 (KERNEL32.603) + */ void WINAPI SUnMapLS_IP_EBP_12(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,12); } + +/*********************************************************************** + * SUnMapLS_IP_EBP_16 (KERNEL32.604) + */ void WINAPI SUnMapLS_IP_EBP_16(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,16); } + +/*********************************************************************** + * SUnMapLS_IP_EBP_20 (KERNEL32.605) + */ void WINAPI SUnMapLS_IP_EBP_20(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,20); } + +/*********************************************************************** + * SUnMapLS_IP_EBP_24 (KERNEL32.606) + */ void WINAPI SUnMapLS_IP_EBP_24(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,24); } + +/*********************************************************************** + * SUnMapLS_IP_EBP_28 (KERNEL32.607) + */ void WINAPI SUnMapLS_IP_EBP_28(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,28); } + +/*********************************************************************** + * SUnMapLS_IP_EBP_32 (KERNEL32.608) + */ void WINAPI SUnMapLS_IP_EBP_32(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,32); } + +/*********************************************************************** + * SUnMapLS_IP_EBP_36 (KERNEL32.609) + */ void WINAPI SUnMapLS_IP_EBP_36(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,36); } + +/*********************************************************************** + * SUnMapLS_IP_EBP_40 (KERNEL32.610) + */ void WINAPI SUnMapLS_IP_EBP_40(CONTEXT86 *context) { x_SUnMapLS_IP_EBP_x(context,40); } /********************************************************************** diff --git a/misc/lstr.c b/misc/lstr.c index 10e9aaab416..f3ecd7bc04a 100644 --- a/misc/lstr.c +++ b/misc/lstr.c @@ -81,7 +81,7 @@ BOOL16 WINAPI IsCharAlpha16(CHAR ch) } /*********************************************************************** - * IsCharAlphanumeric (USER.434) + * IsCharAlphaNumeric (USER.434) */ BOOL16 WINAPI IsCharAlphaNumeric16(CHAR ch) { diff --git a/misc/network.c b/misc/network.c index 17411d2ec28..18f115079dc 100644 --- a/misc/network.c +++ b/misc/network.c @@ -325,7 +325,7 @@ WORD WINAPI WNetBrowseDialog16( HWND16 hParent, WORD nType, LPSTR szPath ) } /******************************************************************** - * WNetConnectDialog16 [USER.525] + * WNetConnectDialog [USER.525] */ WORD WINAPI WNetConnectDialog( HWND16 hWndParent, WORD iType ) { @@ -343,7 +343,7 @@ WORD WINAPI WNetDisconnectDialog16( HWND16 hwndOwner, WORD iType ) } /************************************************************************** - * WnetConnectionDialog16 [USER.527] + * WNetConnectionDialog16 [USER.527] */ WORD WINAPI WNetConnectionDialog16( HWND16 hWndParent, WORD iType ) { diff --git a/msdos/int21.c b/msdos/int21.c index 9d8998e0bd8..0910fa55dbe 100644 --- a/msdos/int21.c +++ b/msdos/int21.c @@ -2414,6 +2414,9 @@ void WINAPI DOS3Call( CONTEXT86 *context ) EFL_reg(context)); } +/*********************************************************************** + * GetSetKernelDOSProc + */ FARPROC16 WINAPI GetSetKernelDOSProc16(FARPROC16 DosProc) { FIXME("(DosProc=0x%08x): stub\n", (UINT)DosProc); diff --git a/objects/font.c b/objects/font.c index 98de1241eeb..03f182758c4 100644 --- a/objects/font.c +++ b/objects/font.c @@ -1252,10 +1252,10 @@ BOOL WINAPI GetCharWidth32W( HDC hdc, UINT firstChar, UINT lastChar, } +/* FIXME: all following APIs ******************************************/ + -/* FIXME: all following APIs ******************************************* - * - * +/*********************************************************************** * SetMapperFlags16 (GDI.349) */ DWORD WINAPI SetMapperFlags16( HDC16 hDC, DWORD dwFlag ) diff --git a/win32/console.c b/win32/console.c index 837a573f868..768a2fe91d2 100644 --- a/win32/console.c +++ b/win32/console.c @@ -1402,12 +1402,12 @@ BOOL WINAPI ReadConsoleOutputCharacterA(HANDLE hConsoleOutput, /****************************************************************************** - * ScrollConsoleScreenBuffer [KERNEL32.612] + * ScrollConsoleScreenBufferA [KERNEL32.612] * * BUGS * Unimplemented */ -BOOL WINAPI ScrollConsoleScreenBuffer( HANDLE hConsoleOutput, +BOOL WINAPI ScrollConsoleScreenBufferA( HANDLE hConsoleOutput, LPSMALL_RECT lpScrollRect, LPSMALL_RECT lpClipRect, COORD dwDestOrigin, LPCHAR_INFO lpFill) { diff --git a/win32/except.c b/win32/except.c index c76d43880dc..5dea00d1fd6 100644 --- a/win32/except.c +++ b/win32/except.c @@ -98,7 +98,7 @@ DWORD WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS epointers) } -/************************************************************* +/*********************************************************************** * SetUnhandledExceptionFilter (KERNEL32.516) */ LPTOP_LEVEL_EXCEPTION_FILTER WINAPI SetUnhandledExceptionFilter( diff --git a/windows/dialog.c b/windows/dialog.c index 569bdab7ab0..568a574e874 100644 --- a/windows/dialog.c +++ b/windows/dialog.c @@ -1457,7 +1457,7 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) } -/**************************************************************** +/*********************************************************************** * GetDlgCtrlID16 (USER.277) */ INT16 WINAPI GetDlgCtrlID16( HWND16 hwnd ) @@ -1473,7 +1473,7 @@ INT16 WINAPI GetDlgCtrlID16( HWND16 hwnd ) } -/**************************************************************** +/*********************************************************************** * GetDlgCtrlID (USER32.234) */ INT WINAPI GetDlgCtrlID( HWND hwnd ) diff --git a/windows/hook.c b/windows/hook.c index 1804b82d19d..5c591d3d16d 100644 --- a/windows/hook.c +++ b/windows/hook.c @@ -1302,7 +1302,7 @@ BOOL WINAPI UnhookWindowsHook( INT id, HOOKPROC proc ) /*********************************************************************** - * UnhookWindowHookEx16 (USER.292) + * UnhookWindowsHookEx16 (USER.292) */ BOOL16 WINAPI UnhookWindowsHookEx16( HHOOK hhook ) { @@ -1392,7 +1392,7 @@ BOOL16 WINAPI CallMsgFilter16( SEGPTR msg, INT16 code ) /*********************************************************************** - * WIN16_CallMsgFilter32 (USER.823) + * CallMsgFilter32 (USER.823) */ BOOL16 WINAPI CallMsgFilter32_16( SEGPTR msg16_32, INT16 code, BOOL16 wHaveParamHigh ) { diff --git a/windows/mdi.c b/windows/mdi.c index 9c170c3c017..39b696c604b 100644 --- a/windows/mdi.c +++ b/windows/mdi.c @@ -1874,7 +1874,7 @@ HWND MDI_CreateMDIWindowA( return retvalue; } -/*************************************** +/*********************************************************************** * CreateMDIWindowW [USER32.80] Creates a MDI child in new thread * * RETURNS diff --git a/windows/message.c b/windows/message.c index 29f8d4421fe..9e0c1a081aa 100644 --- a/windows/message.c +++ b/windows/message.c @@ -2242,7 +2242,7 @@ BOOL16 WINAPI TranslateMessage16( const MSG16 *msg ) /*********************************************************************** - * WIN16_TranslateMessage32 (USER.821) + * TranslateMessage32 (USER.821) */ BOOL16 WINAPI TranslateMessage32_16( const MSG32_16 *msg, BOOL16 wHaveParamHigh ) { @@ -2321,7 +2321,7 @@ END: /*********************************************************************** - * WIN16_DispatchMessage32 (USER.822) + * DispatchMessage32 (USER.822) */ LONG WINAPI DispatchMessage32_16( const MSG32_16* lpmsg16_32, BOOL16 wHaveParamHigh ) { diff --git a/windows/winpos.c b/windows/winpos.c index 20edd216d6f..d4656825705 100644 --- a/windows/winpos.c +++ b/windows/winpos.c @@ -3086,7 +3086,7 @@ void WINAPI TileChildWindows16( HWND16 parent, WORD action ) } /*********************************************************************** - * CascageChildWindows (USER.198) + * CascadeChildWindows (USER.198) */ void WINAPI CascadeChildWindows16( HWND16 parent, WORD action ) { -- 2.11.4.GIT