[gvg] 17717: Sync to Wine-20050830:

Sync to Wine-20050830:
Francois Gouget <fgouget(a)free.fr>
- Add missing WINAPI to MSXML_DllGetClassObject().
  Standardize the DllGetClassObject() prototypes so they match the MSDN
  definition.
Alexandre Julliard <julliard(a)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.
Deleted: trunk/reactos/lib/urlmon/Makefile.in
Modified: trunk/reactos/lib/urlmon/regsvr.c
Modified: trunk/reactos/lib/urlmon/urlmon.spec
Modified: trunk/reactos/lib/urlmon/urlmon_main.c
  _____  

Deleted: trunk/reactos/lib/urlmon/Makefile.in
--- trunk/reactos/lib/urlmon/Makefile.in	2005-09-07 15:52:47 UTC
(rev 17716)
+++ trunk/reactos/lib/urlmon/Makefile.in	2005-09-07 15:57:31 UTC
(rev 17717)
@@ -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:
  _____  

Modified: trunk/reactos/lib/urlmon/regsvr.c
--- trunk/reactos/lib/urlmon/regsvr.c	2005-09-07 15:52:47 UTC (rev
17716)
+++ trunk/reactos/lib/urlmon/regsvr.c	2005-09-07 15:57:31 UTC (rev
17717)
@@ -624,7 +624,7 @@

 
/***********************************************************************
  *		DllRegisterServer (URLMON.@)
  */
-HRESULT WINAPI URLMON_DllRegisterServer(void)
+HRESULT WINAPI DllRegisterServer(void)
 {
     HRESULT hr;
 
@@ -641,7 +641,7 @@
 
/***********************************************************************
  *		DllUnregisterServer (URLMON.@)
  */
-HRESULT WINAPI URLMON_DllUnregisterServer(void)
+HRESULT WINAPI DllUnregisterServer(void)
 {
     HRESULT hr;
 
  _____  

Modified: trunk/reactos/lib/urlmon/urlmon.spec
--- trunk/reactos/lib/urlmon/urlmon.spec	2005-09-07 15:52:47 UTC
(rev 17716)
+++ trunk/reactos/lib/urlmon/urlmon.spec	2005-09-07 15:57:31 UTC
(rev 17717)
@@ -1,82 +1,82 @@

-# 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() URLMON_DllCanUnloadNow
-@ stdcall -private DllGetClassObject(ptr ptr ptr)
URLMON_DllGetClassObject
-@ stdcall DllInstall(long ptr) URLMON_DllInstall
-@ stdcall -private DllRegisterServer() URLMON_DllRegisterServer
-@ stdcall -private DllRegisterServerEx() URLMON_DllRegisterServerEx
-@ stdcall -private DllUnregisterServer() URLMON_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
+# 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
Property changes on: trunk/reactos/lib/urlmon/urlmon.spec
___________________________________________________________________
Name: svn:eol-style
   + native
  _____  

Modified: trunk/reactos/lib/urlmon/urlmon_main.c
--- trunk/reactos/lib/urlmon/urlmon_main.c	2005-09-07 15:52:47 UTC
(rev 17716)
+++ trunk/reactos/lib/urlmon/urlmon_main.c	2005-09-07 15:57:31 UTC
(rev 17717)
@@ -65,7 +65,7 @@

 
/***********************************************************************
  *		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 @@
 
/***********************************************************************
  *		DllCanUnloadNow (URLMON.@)
  */
-HRESULT WINAPI URLMON_DllCanUnloadNow(void)
+HRESULT WINAPI DllCanUnloadNow(void)
 {
     return URLMON_refCount != 0 ? S_FALSE : S_OK;
 }
@@ -199,7 +199,7 @@
  *             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 @@
 
/***********************************************************************
  *		DllRegisterServerEx (URLMON.@)
  */
-HRESULT WINAPI URLMON_DllRegisterServerEx(void)
+HRESULT WINAPI DllRegisterServerEx(void)
 {
     FIXME("(void): stub\n");