Fixed some issues reported by winapi_check.
diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index df5d271..c84993b 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec
@@ -78,7 +78,7 @@ @ 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 cccab1f..13b78aa 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c
@@ -19,13 +19,28 @@ 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 dbe440f..088c0e7 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec
@@ -182,10 +182,10 @@ 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 6748a00..313e7bd 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c
@@ -2216,13 +2216,13 @@ } /************************************************************************** - * 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 @@ } /************************************************************************** - * 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 @@ } /************************************************************************** - * 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 @@ } /************************************************************************** - * 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 b8622c5..eea464d 100644 --- a/dlls/gdi/gdi.spec +++ b/dlls/gdi/gdi.spec
@@ -141,7 +141,7 @@ 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 8133987..0407fee 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 @@ } /*********************************************************************** - * ACMMETRICS (MSACM.8) + * acmMetrics (MSACM.8) */ MMRESULT16 WINAPI acmMetrics16( @@ -34,7 +34,7 @@ } /*********************************************************************** - * ACMDRIVERENUM (MSACM.10) + * acmDriverEnum (MSACM.10) */ MMRESULT16 WINAPI acmDriverEnum16( ACMDRIVERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) @@ -47,7 +47,7 @@ } /*********************************************************************** - * ACMDRIVERDETAILS (MSACM.11) + * acmDriverDetails (MSACM.11) */ MMRESULT16 WINAPI acmDriverDetails16( @@ -59,7 +59,7 @@ } /*********************************************************************** - * ACMDRIVERADD (MSACM.12) + * acmDriverAdd (MSACM.12) */ MMRESULT16 WINAPI acmDriverAdd16( LPHACMDRIVERID16 phadid, HINSTANCE16 hinstModule, @@ -73,7 +73,7 @@ } /*********************************************************************** - * ACMDRIVERREMOVE (MSACM.13) + * acmDriverRemove (MSACM.13) */ MMRESULT16 WINAPI acmDriverRemove16( HACMDRIVERID16 hadid, DWORD fdwRemove) @@ -84,7 +84,7 @@ } /*********************************************************************** - * ACMDRIVEROPEN (MSACM.14) + * acmDriverOpen (MSACM.14) */ MMRESULT16 WINAPI acmDriverOpen16( LPHACMDRIVER16 phad, HACMDRIVERID16 hadid, DWORD fdwOpen) @@ -95,7 +95,7 @@ } /*********************************************************************** - * ACMDRIVERCLOSE (MSACM.15) + * acmDriverClose (MSACM.15) */ MMRESULT16 WINAPI acmDriverClose16( HACMDRIVER16 had, DWORD fdwClose) @@ -106,7 +106,7 @@ } /*********************************************************************** - * ACMDRIVERMESSAGE (MSACM.16) + * acmDriverMessage (MSACM.16) */ LRESULT WINAPI acmDriverMessage16( HACMDRIVER16 had, UINT16 uMsg, LPARAM lParam1, LPARAM lParam2) @@ -119,7 +119,7 @@ } /*********************************************************************** - * ACMDRIVERID (MSACM.17) + * acmDriverID (MSACM.17) */ MMRESULT16 WINAPI acmDriverID16( HACMOBJ16 hao, LPHACMDRIVERID16 phadid, DWORD fdwDriverID) @@ -130,7 +130,7 @@ } /*********************************************************************** - * ACMDRIVERPRIORITY (MSACM.18) + * acmDriverPriority (MSACM.18) */ MMRESULT16 WINAPI acmDriverPriority16( HACMDRIVERID16 hadid, DWORD dwPriority, DWORD fdwPriority) @@ -143,7 +143,7 @@ } /*********************************************************************** - * ACMFORMATTAGDETAILS (MSACM.30) + * acmFormatTagDetails (MSACM.30) */ MMRESULT16 WINAPI acmFormatTagDetails16( HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd, DWORD fdwDetails) @@ -154,7 +154,7 @@ } /*********************************************************************** - * ACMFORMATTAGENUM (MSACM.31) + * acmFormatTagEnum (MSACM.31) */ MMRESULT16 WINAPI acmFormatTagEnum16( HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd, @@ -168,7 +168,7 @@ } /*********************************************************************** - * ACMFORMATCHOOSE (MSACM.40) + * acmFormatChoose (MSACM.40) */ MMRESULT16 WINAPI acmFormatChoose16( LPACMFORMATCHOOSE16 pafmtc) @@ -179,7 +179,7 @@ } /*********************************************************************** - * ACMFORMATDETAILS (MSACM.41) + * acmFormatDetails (MSACM.41) */ MMRESULT16 WINAPI acmFormatDetails16( HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd, DWORD fdwDetails) @@ -190,7 +190,7 @@ } /*********************************************************************** - * ACMFORMATENUM (MSACM.42) + * acmFormatEnum (MSACM.42) */ MMRESULT16 WINAPI acmFormatEnum16( HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd, @@ -204,7 +204,7 @@ } /*********************************************************************** - * ACMFORMATSUGGEST (MSACM.45) + * acmFormatSuggest (MSACM.45) */ MMRESULT16 WINAPI acmFormatSuggest16( HACMDRIVER16 had, LPWAVEFORMATEX pwfxSrc, @@ -218,7 +218,7 @@ } /*********************************************************************** - * ACMFILTERTAGDETAILS (MSACM.50) + * acmFilterTagDetails (MSACM.50) */ MMRESULT16 WINAPI acmFilterTagDetails16( HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, DWORD fdwDetails) @@ -229,7 +229,7 @@ } /*********************************************************************** - * ACMFILTERTAGENUM (MSACM.51) + * acmFilterTagEnum (MSACM.51) */ MMRESULT16 WINAPI acmFilterTagEnum16( HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, @@ -243,7 +243,7 @@ } /*********************************************************************** - * ACMFILTERCHOOSE (MSACM.60) + * acmFilterChoose (MSACM.60) */ MMRESULT16 WINAPI acmFilterChoose16( LPACMFILTERCHOOSE16 pafltrc) @@ -254,7 +254,7 @@ } /*********************************************************************** - * ACMFILTERDETAILS (MSACM.61) + * acmFilterDetails (MSACM.61) */ MMRESULT16 WINAPI acmFilterDetails16( HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd, DWORD fdwDetails) @@ -265,7 +265,7 @@ } /*********************************************************************** - * ACMFILTERENUM (MSACM.62) + * acmFilterEnum (MSACM.62) */ MMRESULT16 WINAPI acmFilterEnum16( HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd, @@ -279,7 +279,7 @@ } /*********************************************************************** - * ACMSTREAMOPEN (MSACM.70) + * acmStreamOpen (MSACM.70) */ MMRESULT16 WINAPI acmStreamOpen16( LPHACMSTREAM16 phas, HACMDRIVER16 had, @@ -296,7 +296,7 @@ } /*********************************************************************** - * ACMSTREAMCLOSE (MSACM.71) + * acmStreamClose (MSACM.71) */ MMRESULT16 WINAPI acmStreamClose16( HACMSTREAM16 has, DWORD fdwClose) @@ -307,7 +307,7 @@ } /*********************************************************************** - * ACMSTREAMSIZE (MSACM.72) + * acmStreamSize (MSACM.72) */ MMRESULT16 WINAPI acmStreamSize16( HACMSTREAM16 has, DWORD cbInput, @@ -321,7 +321,7 @@ } /*********************************************************************** - * ACMSTREAMCONVERT (MSACM.75) + * acmStreamConvert (MSACM.75) */ MMRESULT16 WINAPI acmStreamConvert16( HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwConvert) @@ -332,7 +332,7 @@ } /*********************************************************************** - * ACMSTREAMRESET (MSACM.76) + * acmStreamReset (MSACM.76) */ MMRESULT16 WINAPI acmStreamReset16( HACMSTREAM16 has, DWORD fdwReset) @@ -343,7 +343,7 @@ } /*********************************************************************** - * ACMSTREAMPREPAREHEADER (MSACM.77) + * acmStreamPrepareHeader (MSACM.77) */ MMRESULT16 WINAPI acmStreamPrepareHeader16( HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwPrepare) @@ -354,7 +354,7 @@ } /*********************************************************************** - * ACMSTREAMUNPREPAREHEADER (MSACM.78) + * acmStreamUnprepareHeader (MSACM.78) */ MMRESULT16 WINAPI acmStreamUnprepareHeader16( HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwUnprepare) @@ -367,43 +367,43 @@ } /*********************************************************************** - * ACMAPPLICATIONEXIT (MSACM.150) + * ACMAPPLICATIONEXIT (MSACM.150) * FIXME * No documentation found. */ /*********************************************************************** - * ACMHUGEPAGELOCK (MSACM.175) + * ACMHUGEPAGELOCK (MSACM.175) + *FIXME + * No documentation found. + */ + +/*********************************************************************** + * ACMHUGEPAGEUNLOCK (MSACM.176) * FIXME * No documentation found. */ /*********************************************************************** - * ACMHUGEPAGEUNLOCK (MSACM.176) + * ACMOPENCONVERSION (MSACM.200) * FIXME * No documentation found. */ /*********************************************************************** - * ACMOPENCONVERSION (MSACM.200) + * ACMCLOSECONVERSION (MSACM.201) * FIXME * No documentation found. */ /*********************************************************************** - * ACMCLOSECONVERSION (MSACM.201) + * ACMCONVERT (MSACM.202) * FIXME * No documentation found. */ /*********************************************************************** - * 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 a0cbb37..08000a0 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c
@@ -5652,7 +5652,7 @@ return hRes; } -/******************************************************************************************* +/*********************************************************************** * ReadClassStg * * This method reads the CLSID previously written to a storage object with the WriteClassStg. @@ -5677,7 +5677,7 @@ return hRes; } -/************************************************************************************* +/*********************************************************************** * OleLoadFromStream * * This function loads an object from stream @@ -5703,10 +5703,11 @@ 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 6bb9035..04a7f6e 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 @@ return S_OK; } -/***************************************************** +/*********************************************************************** * OleCreatePropertyFrameIndirect */ HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams) @@ -30,7 +30,7 @@ return S_OK; } -/***************************************************** +/*********************************************************************** * OleCreatePropertyFrame */ HRESULT WINAPI OleCreatePropertyFrame( HWND hwndOwner, UINT x, UINT y, @@ -44,7 +44,7 @@ return S_OK; } -/***************************************************** +/*********************************************************************** * OleLoadPicture */ HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, @@ -56,7 +56,7 @@ return S_OK; } -/***************************************************** +/*********************************************************************** * OleCreatePictureIndirect */ HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid, @@ -67,3 +67,4 @@ ); return S_OK; } +
diff --git a/dlls/olepro32/olepro32.spec b/dlls/olepro32/olepro32.spec index b802144..d3ae369 100644 --- a/dlls/olepro32/olepro32.spec +++ b/dlls/olepro32/olepro32.spec
@@ -11,6 +11,6 @@ @ 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 572cde0..5a0379b 100644 --- a/dlls/shell32/shell.c +++ b/dlls/shell32/shell.c
@@ -1086,7 +1086,7 @@ } /************************************************************************* - * 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 @@ 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 3350646..21155c5 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec
@@ -63,7 +63,7 @@ 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 c931a88..ab96739 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c
@@ -856,14 +856,33 @@ PathUnquoteSpacesA(str); } +/************************************************************************* + * PathGetDriveNumberA [SHLWAPI.@] + * + */ +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 PathGetDriveNumber(LPSTR u) -{ FIXME("%s stub\n",debugstr_a(u)); - return 0; +HRESULT WINAPI PathGetDriveNumberAW(LPVOID str) +{ + if(VERSION_OsIsUnicode()) + return PathGetDriveNumberW(str); + return PathGetDriveNumberA(str); } /*************************************************************************
diff --git a/dlls/shell32/shlwapi.spec b/dlls/shell32/shlwapi.spec index 1829530..098c5a1 100644 --- a/dlls/shell32/shlwapi.spec +++ b/dlls/shell32/shlwapi.spec
@@ -205,8 +205,8 @@ @ 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 43b1b48..529bbf8 100644 --- a/dlls/win32s/w32sys.c +++ b/dlls/win32s/w32sys.c
@@ -48,6 +48,9 @@ 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 ec9c5b3..3fc4fc9 100644 --- a/dlls/win87em/emulate.c +++ b/dlls/win87em/emulate.c
@@ -39,7 +39,7 @@ 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 @@ 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 d100476..248868a 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c
@@ -1313,7 +1313,7 @@ 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 705393a..b619c32 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c
@@ -5028,7 +5028,7 @@ /* ### stop build ### */ /************************************************************************** - * mmThreadGetTask [internal] + * WINE_mmThreadEntryPoint [internal] */ void WINAPI WINE_mmThreadEntryPoint(DWORD _pmt) { @@ -5090,9 +5090,9 @@ } /************************************************************************** - * 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 @@ } /************************************************************************** - * 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 a9f493a..50f0d21 100644 --- a/dlls/winmm/mmsystem.spec +++ b/dlls/winmm/mmsystem.spec
@@ -9,8 +9,8 @@ 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