Sync to Wine-20050830:

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

diff --git a/reactos/lib/urlmon/Makefile.in b/reactos/lib/urlmon/Makefile.in
deleted file mode 100644 (file)
index c32d818..0000000
--- a/reactos/lib/urlmon/Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-TOPSRCDIR = @top_srcdir@\r
-TOPOBJDIR = ../..\r
-SRCDIR    = @srcdir@\r
-VPATH     = @srcdir@\r
-MODULE    = urlmon.dll\r
-IMPORTLIB = liburlmon.$(IMPLIBEXT)\r
-IMPORTS   = cabinet ole32 shlwapi wininet user32 advapi32 kernel32 ntdll\r
-EXTRALIBS = -luuid\r
-\r
-C_SRCS = \\r
-       regsvr.c \\r
-       sec_mgr.c \\r
-       umon.c \\r
-       umstream.c \\r
-       urlmon_main.c\r
-\r
-RC_SRCS = rsrc.rc\r
-\r
-SUBDIRS = tests\r
-\r
-@MAKE_DLL_RULES@\r
-\r
-### Dependencies:\r

diff --git a/reactos/lib/urlmon/regsvr.c b/reactos/lib/urlmon/regsvr.c
index af5333a..ed81989 100644 (file)
--- a/reactos/lib/urlmon/regsvr.c
+++ b/reactos/lib/urlmon/regsvr.c
@@ -624,7 +624,7 @@ static HRESULT register_inf(BOOL doregister)
 /***********************************************************************
  *             DllRegisterServer (URLMON.@)
  */
-HRESULT WINAPI URLMON_DllRegisterServer(void)
+HRESULT WINAPI DllRegisterServer(void)
 {
     HRESULT hr;
 
@@ -641,7 +641,7 @@ HRESULT WINAPI URLMON_DllRegisterServer(void)
 /***********************************************************************
  *             DllUnregisterServer (URLMON.@)
  */
-HRESULT WINAPI URLMON_DllUnregisterServer(void)
+HRESULT WINAPI DllUnregisterServer(void)
 {
     HRESULT hr;
 

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

diff --git a/reactos/lib/urlmon/urlmon_main.c b/reactos/lib/urlmon/urlmon_main.c
index b3dcc15..3dcda86 100644 (file)
--- a/reactos/lib/urlmon/urlmon_main.c
+++ b/reactos/lib/urlmon/urlmon_main.c
@@ -65,7 +65,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
 /***********************************************************************
  *             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",
        debugstr_w(cmdline));
@@ -76,7 +76,7 @@ HRESULT WINAPI URLMON_DllInstall(BOOL bInstall, LPCWSTR cmdline)
 /***********************************************************************
  *             DllCanUnloadNow (URLMON.@)
  */
-HRESULT WINAPI URLMON_DllCanUnloadNow(void)
+HRESULT WINAPI DllCanUnloadNow(void)
 {
     return URLMON_refCount != 0 ? S_FALSE : S_OK;
 }
@@ -199,7 +199,7 @@ static const IClassFactoryVtbl CF_Vtbl =
  *             E_UNEXPECTED
  */
 
-DWORD WINAPI URLMON_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
+HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 {
     int i;
     IClassFactoryImpl *factory;
@@ -240,7 +240,7 @@ DWORD WINAPI URLMON_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 /***********************************************************************
  *             DllRegisterServerEx (URLMON.@)
  */
-HRESULT WINAPI URLMON_DllRegisterServerEx(void)
+HRESULT WINAPI DllRegisterServerEx(void)
 {
     FIXME("(void): stub\n");