Very hacked implementation of url monikers.

dlls/urlmon/Makefile.in

@@ -3,7 +3,8 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = urlmon.dll
-IMPORTS   = ole32
+IMPORTS   = ole32 wininet user32 kernel32
+EXTRALIBS = $(LIBUUID)
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o

dlls/urlmon/urlmon.spec

+init URLMON_DllEntryPoint
+
 1 stub CDLGetLongPathNameA
 2 stub CDLGetLongPathNameW
 @ stub AsyncGetClassBits
@@ -19,14 +21,14 @@
 @ stub CreateAsyncBindCtx
 @ stdcall CreateAsyncBindCtxEx(ptr long ptr ptr ptr long) CreateAsyncBindCtxEx
 @ stub CreateFormatEnumerator
-@ stdcall CreateURLMoniker(ptr str ptr) CreateURLMoniker
+@ stdcall CreateURLMoniker(ptr wstr ptr) CreateURLMoniker
 @ 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
 @ stdcall DllUnregisterServer() URLMON_DllUnregisterServer
-@ stdcall Extract(long long) Extract
+@ stdcall Extract(long str) Extract
 @ stub FaultInIEFeature
 @ stub FindMediaType
 @ stub FindMediaTypeClass
@@ -46,7 +48,7 @@
 @ stub IsLoggingEnabledA
 @ stub IsLoggingEnabledW
 @ stub IsValidURL
-@ stub MkParseDisplayNameEx
+@ forward MkParseDisplayNameEx ole32.MkParseDisplayName
 @ stdcall ObtainUserAgentString(long str ptr) ObtainUserAgentString
 @ stub PrivateCoInstall
 @ stdcall RegisterBindStatusCallback(ptr ptr ptr long) RegisterBindStatusCallback

dlls/urlmon/urlmon_main.c

@@ -24,7 +24,32 @@
 
 #include "wine/debug.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(win32);
+#include "urlmon_main.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
+
+HINSTANCE URLMON_hInstance = 0;
+
+/***********************************************************************
+ *		DllEntryPoint (OLE32.@)
+ */
+
+BOOL WINAPI URLMON_DllEntryPoint(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
+{
+    TRACE("0x%x 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
+
+    switch(fdwReason) {
+    case DLL_PROCESS_ATTACH:
+        URLMON_hInstance = hinstDLL;
+	break;
+
+    case DLL_PROCESS_DETACH:
+        URLMON_hInstance = 0;
+	break;
+    }
+    return TRUE;
+}
+
 
 /***********************************************************************
  *		DllInstall (URLMON.@)
@@ -101,28 +126,6 @@ HRESULT WINAPI URLMON_DllUnregisterServer(void)
 }
 
 /**************************************************************************
- *                 CoInternetGetSession (URLMON.@)
- */
-HRESULT WINAPI CoInternetGetSession(DWORD dwSessionMode,
-                                    LPVOID /* IInternetSession ** */ ppIInternetSession,
-                                    DWORD dwReserved)
-{
-    FIXME("(%ld, %p, %ld): stub\n", dwSessionMode, ppIInternetSession,
-	  dwReserved);
-
-    if(dwSessionMode) {
-      ERR("dwSessionMode: %ld, must be zero\n", dwSessionMode);
-    }
-
-    if(dwReserved) {
-      ERR("dwReserved: %ld, must be zero\n", dwReserved);
-    }
-
-    return S_OK;
-}
-
-
-/**************************************************************************
  *                 ObtainUserAgentString (URLMON.@)
  */
 HRESULT WINAPI ObtainUserAgentString(DWORD dwOption, LPCSTR pcszUAOut, DWORD *cbSize)

dlls/urlmon/urlmon_main.h

+/*
+ * Copyright 2002 Huw D M Davies for Codeweavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __WINE_URLMON_MAIN_H
+#define __WINE_URLMON_MAIN_H
+
+#include "windef.h"
+
+extern HINSTANCE URLMON_hInstance;
+
+#endif /* __WINE_URLMON_MAIN_H */

ole/uuid.c

@@ -48,6 +48,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 #include "wine/obj_dragdrophelper.h"
 
 #include "comcat.h"
+#include "urlmon.h"
 
 /* FIXME: cguids declares GUIDs but does not define their values */