From 9a8e6e98c51a84837736cd244a38fc7438b7bfc3 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sat, 27 Apr 2002 00:16:25 +0000 Subject: [PATCH] Added some shdocvw ordinals and stubs. Fixed a few winapi_check issues. --- dlls/oleaut32/dispstd.c | 4 +- dlls/oleaut32/disptype.c | 4 +- dlls/shdocvw/api.c | 12 ++-- dlls/shdocvw/comimpl.c | 12 ++-- dlls/shdocvw/shdocvw.spec | 169 ++++++++++++++++++++++++++++++++++++---------- dlls/urlmon/comimpl.c | 12 ++-- dlls/urlmon/urlmon.spec | 6 +- 7 files changed, 160 insertions(+), 59 deletions(-) rewrite dlls/shdocvw/shdocvw.spec (81%) diff --git a/dlls/oleaut32/dispstd.c b/dlls/oleaut32/dispstd.c index 844c66433c1..22615425754 100644 --- a/dlls/oleaut32/dispstd.c +++ b/dlls/oleaut32/dispstd.c @@ -211,7 +211,9 @@ static ICOM_VTABLE(IDispatch) idisp = CStdDispImpl_fnInvoke, }; -/*****************************************************************************/ +/****************************************************************************** + * CreateStdDispatch (OLEAUT32.32) + */ HRESULT WINAPI CreateStdDispatch( IUnknown* punkOuter, diff --git a/dlls/oleaut32/disptype.c b/dlls/oleaut32/disptype.c index 29863d92c8f..c9e0349cec9 100644 --- a/dlls/oleaut32/disptype.c +++ b/dlls/oleaut32/disptype.c @@ -751,8 +751,10 @@ static ICOM_VTABLE(ITypeInfo2) itypeinfo2 = CTypeInfo2Impl_fnGetAllImplTypeCustData, }; -/*****************************************************************************/ +/****************************************************************************** + * CreateDispTypeInfo (OLEAUT32.31) + */ HRESULT WINAPI CreateDispTypeInfo( INTERFACEDATA* pifd, LCID lcid, diff --git a/dlls/shdocvw/api.c b/dlls/shdocvw/api.c index c0021ae0654..c40c60b30b4 100644 --- a/dlls/shdocvw/api.c +++ b/dlls/shdocvw/api.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); /*********************************************************************** - * DllGetVersion (SHDOCVW.113) + * DllGetVersion (SHDOCVW.@) */ HRESULT WINAPI SHDOCVW_DllGetVersion (DLLVERSIONINFO *pdvi) { @@ -39,7 +39,7 @@ HRESULT WINAPI SHDOCVW_DllGetVersion (DLLVERSIONINFO *pdvi) } /************************************************************************* - * DllInstall (SHDOCVW.114) + * DllInstall (SHDOCVW.@) */ HRESULT WINAPI SHDOCVW_DllInstall(BOOL bInstall, LPCWSTR cmdline) { @@ -49,18 +49,18 @@ HRESULT WINAPI SHDOCVW_DllInstall(BOOL bInstall, LPCWSTR cmdline) } /*********************************************************************** - * DllRegisterServer (SHDOCVW.124) + * DllRegisterServer (SHDOCVW.@) */ -HRESULT WINAPI SHDOCVW_DllRegisterServer() +HRESULT WINAPI SHDOCVW_DllRegisterServer(void) { FIXME("(), stub!\n"); return E_NOTIMPL; } /*********************************************************************** - * DllUnregisterServer (SHDOCVW.127) + * DllUnregisterServer (SHDOCVW.@) */ -HRESULT WINAPI SHDOCVW_DllUnregisterServer() +HRESULT WINAPI SHDOCVW_DllUnregisterServer(void) { FIXME("(), stub!\n"); return E_NOTIMPL; diff --git a/dlls/shdocvw/comimpl.c b/dlls/shdocvw/comimpl.c index ae5bedcfed9..908054ef165 100644 --- a/dlls/shdocvw/comimpl.c +++ b/dlls/shdocvw/comimpl.c @@ -356,9 +356,9 @@ static void COMIMPL_UninitProcess( HINSTANCE hInstDLL ) /*********************************************************************** - * COMIMPL_DllMain + * SHDOCVW_DllMain */ -BOOL WINAPI COMIMPL_DllMain( +BOOL WINAPI SHDOCVW_DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved ) { TRACE("(%08x,%08lx,%p)\n",hInstDLL,fdwReason,lpvReserved); @@ -382,9 +382,9 @@ BOOL WINAPI COMIMPL_DllMain( } /*********************************************************************** - * COMIMPL_DllGetClassObject + * DllGetClassObject (SHDOCVW.@) */ -HRESULT WINAPI COMIMPL_DllGetClassObject( +HRESULT WINAPI SHDOCVW_DllGetClassObject( const CLSID* pclsid,const IID* piid,void** ppv) { *ppv = NULL; @@ -398,13 +398,13 @@ HRESULT WINAPI COMIMPL_DllGetClassObject( } /*********************************************************************** - * COMIMPL_DllCanUnloadNow + * DllCanUnloadNow (SHDOCVW.@) * * RETURNS * Success: S_OK * Failure: S_FALSE */ -HRESULT WINAPI COMIMPL_DllCanUnloadNow(void) +HRESULT WINAPI SHDOCVW_DllCanUnloadNow(void) { HRESULT hr; diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec dissimilarity index 81% index 9538021dfc3..46f5847c469 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -1,36 +1,133 @@ -name shdocvw -type win32 -init COMIMPL_DllMain - -import ole32.dll -import kernel32.dll -import ntdll.dll - -debug_channels (shdocvw comimpl) - -108 stub AddUrlToFavorites -109 stdcall DllCanUnloadNow() COMIMPL_DllCanUnloadNow -312 stdcall DllGetClassObject(long long ptr) COMIMPL_DllGetClassObject -113 stdcall DllGetVersion(ptr) SHDOCVW_DllGetVersion -114 stdcall DllInstall(long wstr) SHDOCVW_DllInstall -124 stdcall DllRegisterServer() SHDOCVW_DllRegisterServer -126 stub DllRegisterWindowClasses -127 stdcall DllUnregisterServer() SHDOCVW_DllUnregisterServer -128 stub DoAddToFavDlg -129 stub DoAddToFavDlgW -132 stub DoFileDownload -133 stub DoFileDownloadEx -134 stub DoOrganizeFavDlg -144 stub DoOrganizeFavDlgW -106 stub HlinkFindFrame -154 stub HlinkFrameNavigate -155 stub HlinkFrameNavigateNHL -156 stub IEWriteErrorLog -157 stub OpenURL -163 stub SHAddSubscribeFavorite -166 stub SHGetIDispatchForFolder -168 stub SetQueryNetSessionCount -107 stub SetShellOfflineState -182 stub SoftwareUpdateMessageBox -184 stub URLQualifyA -186 stub URLQualifyW +name shdocvw +type win32 +init SHDOCVW_DllMain + +import ole32.dll +import kernel32.dll +import ntdll.dll + +debug_channels (comimpl shdocvw) + +# ordinal exports +101 stub @ +102 stub @ +103 stub @ +104 stub @ +105 stub @ +106 stub HlinkFindFrame +107 stub SetShellOfflineState +108 stub AddUrlToFavorites +110 stub @ +111 stub @ +115 stub @ +116 stub @ +117 stub IEAboutBox +118 stub @ +119 stub @ +120 stub @ +121 stub @ +122 stub @ +123 stub @ +125 stub @ +130 stub @ +131 stub @ +135 stub @ +136 stub @ +137 stub @ +138 stub @ +139 stub @ +140 stub @ +141 stub @ +142 stub @ +143 stub @ +145 stub @ +146 stub @ +147 stub @ +148 stub @ +149 stub @ +150 stub @ +151 stub @ +152 stub @ +153 stub @ +158 stub @ +159 stub @ +160 stub @ +161 stub @ +162 stub @ +163 stub SHAddSubscribeFavorite +164 stub @ +165 stub @ +167 stub @ +169 stub @ +170 stub @ +171 stub @ +172 stub @ +173 stub @ +174 stub @ +175 stub @ +176 stub @ +177 stub @ +178 stub @ +179 stub @ +180 stub @ +181 stub @ +183 stub @ +185 stub @ +187 stub @ +188 stub @ +189 stub @ +190 stub @ +191 stub @ +192 stub @ +194 stub @ +195 stub @ +196 stub @ +197 stub @ +198 stub @ +199 stub @ +200 stub @ +203 stub @ +204 stub @ +208 stub @ +209 stub @ +210 stub @ +211 stub @ +212 stub @ +213 stub @ +214 stub @ +215 stub @ +216 stub @ +217 stub @ +218 stub @ +219 stub @ +220 stub @ +221 stub @ +222 stub @ +223 stub @ +224 stub @ +225 stub @ +226 stub @ + +@ stdcall DllCanUnloadNow() SHDOCVW_DllCanUnloadNow +@ stdcall DllGetClassObject(long long ptr) SHDOCVW_DllGetClassObject +@ stdcall DllGetVersion(ptr) SHDOCVW_DllGetVersion +@ stdcall DllInstall(long wstr) SHDOCVW_DllInstall +@ stdcall DllRegisterServer() SHDOCVW_DllRegisterServer +@ stdcall DllUnregisterServer() SHDOCVW_DllUnregisterServer +@ stub DllRegisterWindowClasses +@ stub DoAddToFavDlg +@ stub DoAddToFavDlgW +@ stub DoFileDownload +@ stub DoFileDownloadEx +@ stub DoOrganizeFavDlg +@ stub DoOrganizeFavDlgW +@ stub HlinkFrameNavigate +@ stub HlinkFrameNavigateNHL +@ stub InstallReg_RunDLL +@ stub IEWriteErrorLog +@ stub OpenURL +@ stub SHGetIDispatchForFolder +@ stub SetQueryNetSessionCount +@ stub SoftwareUpdateMessageBox +@ stub URLQualifyA +@ stub URLQualifyW diff --git a/dlls/urlmon/comimpl.c b/dlls/urlmon/comimpl.c index 9067a57dde1..fef06b7ffa8 100644 --- a/dlls/urlmon/comimpl.c +++ b/dlls/urlmon/comimpl.c @@ -356,9 +356,9 @@ static void COMIMPL_UninitProcess( HINSTANCE hInstDLL ) /*********************************************************************** - * COMIMPL_DllMain + * URLMON_DllMain */ -BOOL WINAPI COMIMPL_DllMain( +BOOL WINAPI URLMON_DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved ) { TRACE("(%08x,%08lx,%p)\n",hInstDLL,fdwReason,lpvReserved); @@ -382,9 +382,9 @@ BOOL WINAPI COMIMPL_DllMain( } /*********************************************************************** - * COMIMPL_DllGetClassObject + * DllGetClassObject (URLMON.@) */ -HRESULT WINAPI COMIMPL_DllGetClassObject( +HRESULT WINAPI URLMON_DllGetClassObject( const CLSID* pclsid,const IID* piid,void** ppv) { *ppv = NULL; @@ -398,13 +398,13 @@ HRESULT WINAPI COMIMPL_DllGetClassObject( } /*********************************************************************** - * COMIMPL_DllCanUnloadNow + * DllCanUnloadNow (URLMON.@) * * RETURNS * Success: S_OK * Failure: S_FALSE */ -HRESULT WINAPI COMIMPL_DllCanUnloadNow(void) +HRESULT WINAPI URLMON_DllCanUnloadNow(void) { HRESULT hr; diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index f05d06b8210..fc8b4bd3ad1 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -1,6 +1,6 @@ name urlmon type win32 -init COMIMPL_DllMain +init URLMON_DllMain import ole32.dll import kernel32.dll @@ -30,8 +30,8 @@ debug_channels (comimpl urlmon) @ stdcall CreateAsyncBindCtxEx(ptr long ptr ptr ptr long) CreateAsyncBindCtxEx @ stdcall CreateFormatEnumerator(long ptr ptr) CreateFormatEnumerator @ stdcall CreateURLMoniker(ptr str ptr) CreateURLMoniker -@ stdcall DllCanUnloadNow() COMIMPL_DllCanUnloadNow -@ stdcall DllGetClassObject(ptr ptr ptr) COMIMPL_DllGetClassObject +@ stdcall DllCanUnloadNow() URLMON_DllCanUnloadNow +@ stdcall DllGetClassObject(ptr ptr ptr) URLMON_DllGetClassObject @ stdcall DllInstall(long ptr) URLMON_DllInstall @ stdcall DllRegisterServer() URLMON_DllRegisterServer @ stdcall DllRegisterServerEx() URLMON_DllRegisterServerEx -- 2.11.4.GIT