Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-27 09:00:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sync to Wine-20050830:

Browse source 
Francois Gouget <fgouget@free.fr>
- Add missing WINAPI to MSXML_DllGetClassObject().
  Standardize the DllGetClassObject() prototypes so they match the MSDN
  definition.
Alexandre Julliard <julliard@winehq.org>
- Don't prefix the functions DllCanUnloadNow, DllGetClassObject and
  Dll(Un)RegisterServer with the dll name so that the compiler can check
  the prototypes.

svn path=/trunk/; revision=17717
This commit is contained in:
Gé van Geldorp 2005-09-07 15:57:31 +00:00
parent 5be54798fe
commit 179c1bfe6c
4 changed files with 88 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
reactos/lib/urlmon/Makefile.in
View file

@ -1,23 +0,0 @@
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = urlmon.dll
IMPORTLIB = liburlmon.$(IMPLIBEXT)
IMPORTS = cabinet ole32 shlwapi wininet user32 advapi32 kernel32 ntdll
EXTRALIBS = -luuid
C_SRCS = \
regsvr.c \
sec_mgr.c \
umon.c \
umstream.c \
urlmon_main.c
RC_SRCS = rsrc.rc
SUBDIRS = tests
@MAKE_DLL_RULES@
### Dependencies:

4
reactos/lib/urlmon/regsvr.c
View file

@ -624,7 +624,7 @@ static HRESULT register_inf(BOOL doregister)
/*********************************************************************** /***********************************************************************
* DllRegisterServer (URLMON.@) * DllRegisterServer (URLMON.@)
*/ */
HRESULT WINAPI URLMON_DllRegisterServer(void) HRESULT WINAPI DllRegisterServer(void)
{ {
HRESULT hr; HRESULT hr;
@ -641,7 +641,7 @@ HRESULT WINAPI URLMON_DllRegisterServer(void)
/*********************************************************************** /***********************************************************************
* DllUnregisterServer (URLMON.@) * DllUnregisterServer (URLMON.@)
*/ */
HRESULT WINAPI URLMON_DllUnregisterServer(void) HRESULT WINAPI DllUnregisterServer(void)
{ {
HRESULT hr; HRESULT hr;

164
reactos/lib/urlmon/urlmon.spec
View file

@ -1,82 +1,82 @@
# Up until Windows 2000 these APIs have hardcoded ordinals. # Up until Windows 2000 these APIs have hardcoded ordinals.
# Keep it that way for compatibility. # Keep it that way for compatibility.
1 stub CDLGetLongPathNameA 1 stub CDLGetLongPathNameA
2 stub CDLGetLongPathNameW 2 stub CDLGetLongPathNameW
# IsJITInProgress has a hardcoded ordinal on WinME and Windows 2000 # IsJITInProgress has a hardcoded ordinal on WinME and Windows 2000
#3 stub IsJITInProgress #3 stub IsJITInProgress
@ stub AsyncGetClassBits @ stub AsyncGetClassBits
@ stub AsyncInstallDistributionUnit @ stub AsyncInstallDistributionUnit
@ stub BindAsyncMoniker @ stub BindAsyncMoniker
@ stdcall CoGetClassObjectFromURL(ptr wstr long long wstr ptr long ptr ptr ptr) @ stdcall CoGetClassObjectFromURL(ptr wstr long long wstr ptr long ptr ptr ptr)
@ stub CoInstall @ stub CoInstall
@ stdcall CoInternetCombineUrl(wstr wstr long wstr long ptr long) @ stdcall CoInternetCombineUrl(wstr wstr long wstr long ptr long)
@ stdcall CoInternetCompareUrl(wstr wstr long) @ stdcall CoInternetCompareUrl(wstr wstr long)
@ stdcall CoInternetCreateSecurityManager(ptr ptr long) @ stdcall CoInternetCreateSecurityManager(ptr ptr long)
@ stdcall CoInternetCreateZoneManager(ptr ptr long) @ stdcall CoInternetCreateZoneManager(ptr ptr long)
@ stub CoInternetGetProtocolFlags @ stub CoInternetGetProtocolFlags
@ stub CoInternetGetSecurityUrl @ stub CoInternetGetSecurityUrl
@ stdcall CoInternetGetSession(long ptr long) @ stdcall CoInternetGetSession(long ptr long)
@ stub CoInternetParseUrl @ stub CoInternetParseUrl
@ stdcall CoInternetQueryInfo(ptr long long ptr long ptr long) @ stdcall CoInternetQueryInfo(ptr long long ptr long ptr long)
@ stub CompareSecurityIds @ stub CompareSecurityIds
@ stub CopyBindInfo @ stub CopyBindInfo
@ stub CopyStgMedium @ stub CopyStgMedium
@ stdcall CreateAsyncBindCtx(long ptr ptr ptr) @ stdcall CreateAsyncBindCtx(long ptr ptr ptr)
@ stdcall CreateAsyncBindCtxEx(ptr long ptr ptr ptr long) @ stdcall CreateAsyncBindCtxEx(ptr long ptr ptr ptr long)
@ stub CreateFormatEnumerator @ stub CreateFormatEnumerator
@ stdcall CreateURLMoniker(ptr wstr ptr) @ stdcall CreateURLMoniker(ptr wstr ptr)
@ stdcall -private DllCanUnloadNow() URLMON_DllCanUnloadNow @ stdcall -private DllCanUnloadNow()
@ stdcall -private DllGetClassObject(ptr ptr ptr) URLMON_DllGetClassObject @ stdcall -private DllGetClassObject(ptr ptr ptr)
@ stdcall DllInstall(long ptr) URLMON_DllInstall @ stdcall -private DllInstall(long wstr)
@ stdcall -private DllRegisterServer() URLMON_DllRegisterServer @ stdcall -private DllRegisterServer()
@ stdcall -private DllRegisterServerEx() URLMON_DllRegisterServerEx @ stdcall -private DllRegisterServerEx()
@ stdcall -private DllUnregisterServer() URLMON_DllUnregisterServer @ stdcall -private DllUnregisterServer()
@ stdcall Extract(long ptr) cabinet.Extract @ stdcall Extract(long ptr) cabinet.Extract
@ stdcall FaultInIEFeature(long ptr ptr long) @ stdcall FaultInIEFeature(long ptr ptr long)
@ stub FindMediaType @ stub FindMediaType
@ stub FindMediaTypeClass @ stub FindMediaTypeClass
@ stdcall FindMimeFromData(long ptr ptr long ptr long ptr long) @ stdcall FindMimeFromData(long ptr ptr long ptr long ptr long)
@ stub GetClassFileOrMime @ stub GetClassFileOrMime
@ stub GetClassURL @ stub GetClassURL
@ stub GetComponentIDFromCLSSPEC @ stub GetComponentIDFromCLSSPEC
@ stub GetMarkOfTheWeb @ stub GetMarkOfTheWeb
@ stdcall GetSoftwareUpdateInfo(ptr ptr) @ stdcall GetSoftwareUpdateInfo(ptr ptr)
@ stub HlinkGoBack @ stub HlinkGoBack
@ stub HlinkGoForward @ stub HlinkGoForward
@ stub HlinkNavigateMoniker @ stub HlinkNavigateMoniker
@ stdcall HlinkNavigateString(ptr wstr) @ stdcall HlinkNavigateString(ptr wstr)
@ stub HlinkSimpleNavigateToMoniker @ stub HlinkSimpleNavigateToMoniker
@ stdcall HlinkSimpleNavigateToString(wstr wstr wstr ptr ptr ptr long long) @ stdcall HlinkSimpleNavigateToString(wstr wstr wstr ptr ptr ptr long long)
@ stdcall IsAsyncMoniker(ptr) @ stdcall IsAsyncMoniker(ptr)
@ stub IsLoggingEnabledA @ stub IsLoggingEnabledA
@ stub IsLoggingEnabledW @ stub IsLoggingEnabledW
@ stdcall IsValidURL(ptr wstr long) @ stdcall IsValidURL(ptr wstr long)
@ stdcall MkParseDisplayNameEx(ptr ptr ptr ptr) ole32.MkParseDisplayName @ stdcall MkParseDisplayNameEx(ptr ptr ptr ptr) ole32.MkParseDisplayName
@ stdcall ObtainUserAgentString(long str ptr) @ stdcall ObtainUserAgentString(long str ptr)
@ stub PrivateCoInstall @ stub PrivateCoInstall
@ stdcall RegisterBindStatusCallback(ptr ptr ptr long) @ stdcall RegisterBindStatusCallback(ptr ptr ptr long)
@ stub RegisterFormatEnumerator @ stub RegisterFormatEnumerator
@ stub RegisterMediaTypeClass @ stub RegisterMediaTypeClass
@ stub RegisterMediaTypes @ stub RegisterMediaTypes
@ stdcall ReleaseBindInfo(ptr) @ stdcall ReleaseBindInfo(ptr)
@ stdcall RevokeBindStatusCallback(ptr ptr) @ stdcall RevokeBindStatusCallback(ptr ptr)
@ stub RevokeFormatEnumerator @ stub RevokeFormatEnumerator
@ stub SetSoftwareUpdateAdvertisementState @ stub SetSoftwareUpdateAdvertisementState
@ stub URLDownloadA @ stub URLDownloadA
@ stub URLDownloadToCacheFileA @ stub URLDownloadToCacheFileA
@ stub URLDownloadToCacheFileW @ stub URLDownloadToCacheFileW
@ stdcall URLDownloadToFileA(ptr str str long ptr) @ stdcall URLDownloadToFileA(ptr str str long ptr)
@ stdcall URLDownloadToFileW(ptr wstr wstr long ptr) @ stdcall URLDownloadToFileW(ptr wstr wstr long ptr)
@ stub URLDownloadW @ stub URLDownloadW
@ stub URLOpenBlockingStreamA @ stub URLOpenBlockingStreamA
@ stub URLOpenBlockingStreamW @ stub URLOpenBlockingStreamW
@ stub URLOpenPullStreamA @ stub URLOpenPullStreamA
@ stub URLOpenPullStreamW @ stub URLOpenPullStreamW
@ stub URLOpenStreamA @ stub URLOpenStreamA
@ stub URLOpenStreamW @ stub URLOpenStreamW
@ stub UrlMkBuildVersion @ stub UrlMkBuildVersion
@ stdcall UrlMkGetSessionOption(long ptr long ptr long) @ stdcall UrlMkGetSessionOption(long ptr long ptr long)
@ stdcall UrlMkSetSessionOption(long ptr long long) @ stdcall UrlMkSetSessionOption(long ptr long long)
@ stub WriteHitLogging @ stub WriteHitLogging
@ stub ZonesReInit @ stub ZonesReInit

8
reactos/lib/urlmon/urlmon_main.c
View file

@ -65,7 +65,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
/*********************************************************************** /***********************************************************************
* DllInstall (URLMON.@) * DllInstall (URLMON.@)
*/ */
HRESULT WINAPI URLMON_DllInstall(BOOL bInstall, LPCWSTR cmdline) HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline)
{ {
FIXME("(%s, %s): stub\n", bInstall?"TRUE":"FALSE", FIXME("(%s, %s): stub\n", bInstall?"TRUE":"FALSE",
debugstr_w(cmdline)); debugstr_w(cmdline));
@ -76,7 +76,7 @@ HRESULT WINAPI URLMON_DllInstall(BOOL bInstall, LPCWSTR cmdline)
/*********************************************************************** /***********************************************************************
* DllCanUnloadNow (URLMON.@) * DllCanUnloadNow (URLMON.@)
*/ */
HRESULT WINAPI URLMON_DllCanUnloadNow(void) HRESULT WINAPI DllCanUnloadNow(void)
{ {
return URLMON_refCount != 0 ? S_FALSE : S_OK; return URLMON_refCount != 0 ? S_FALSE : S_OK;
} }
@ -199,7 +199,7 @@ static const IClassFactoryVtbl CF_Vtbl =
* E_UNEXPECTED * E_UNEXPECTED
*/ */
DWORD WINAPI URLMON_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
{ {
int i; int i;
IClassFactoryImpl *factory; IClassFactoryImpl *factory;
@ -240,7 +240,7 @@ DWORD WINAPI URLMON_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
/*********************************************************************** /***********************************************************************
* DllRegisterServerEx (URLMON.@) * DllRegisterServerEx (URLMON.@)
*/ */
HRESULT WINAPI URLMON_DllRegisterServerEx(void) HRESULT WINAPI DllRegisterServerEx(void)
{ {
FIXME("(void): stub\n"); FIXME("(void): stub\n");