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

reactos/lib/urlmon/Makefile.in

@@ -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:

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;
 

reactos/lib/urlmon/urlmon.spec

@@ -26,12 +26,12 @@
 @ stdcall CreateAsyncBindCtxEx(ptr long ptr ptr ptr long)
 @ stub CreateFormatEnumerator
 @ 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 FaultInIEFeature(long ptr ptr long)
 @ stub FindMediaType

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");