From 99ef31f67fb6f7a7e04737c4ab43c11faacf9e1f Mon Sep 17 00:00:00 2001
From: Steven Edwards <winehacker@gmail.com>
Date: Sat, 14 Aug 2004 20:43:40 +0000
Subject: [PATCH] Get it building. Linking is next

svn path=/trunk/; revision=10541
---
 reactos/lib/urlmon/Makefile.ros-template |  4 ++--
 reactos/lib/urlmon/umon.c                | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/reactos/lib/urlmon/Makefile.ros-template b/reactos/lib/urlmon/Makefile.ros-template
index 53563e6d05c..088baa231fd 100644
--- a/reactos/lib/urlmon/Makefile.ros-template
+++ b/reactos/lib/urlmon/Makefile.ros-template
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.1 2004/08/13 06:14:48 rcampbell Exp $
+# $Id: Makefile.ros-template,v 1.2 2004/08/14 20:43:40 sedwards Exp $
 
 TARGET_NAME = urlmon
 
@@ -6,7 +6,7 @@ TARGET_OBJECTS = @C_SRCS@
 
 TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
 
-TARGET_SDKLIBS = @IMPORTS@ libwine.a ntdll.a
+TARGET_SDKLIBS = @IMPORTS@ libwine.a wine_uuid.a ntdll.a wininet.a
 
 TARGET_BASE = $(TARGET_BASE_LIB_RICHEDIT)
 
diff --git a/reactos/lib/urlmon/umon.c b/reactos/lib/urlmon/umon.c
index c1a1943c565..2a0869d615a 100644
--- a/reactos/lib/urlmon/umon.c
+++ b/reactos/lib/urlmon/umon.c
@@ -19,6 +19,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #define COM_NO_WINDOWS_H
 #include <stdarg.h>
 #include <stdio.h>
@@ -49,8 +52,8 @@ static const WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e',
 /* filemoniker data structure */
 typedef struct URLMonikerImpl{
 
-    ICOM_VTABLE(IMoniker)*  lpvtbl1;  /* VTable relative to the IMoniker interface.*/
-    ICOM_VTABLE(IBinding)*  lpvtbl2;  /* VTable to IBinding interface */
+    IMonikerVtbl*  lpvtbl1;  /* VTable relative to the IMoniker interface.*/
+    IBindingVtbl*  lpvtbl2;  /* VTable to IBinding interface */
 
     ULONG ref; /* reference counter for this object */
 
@@ -113,7 +116,7 @@ static HRESULT URLMonikerImpl_Destroy(URLMonikerImpl* iface);
 /********************************************************************************/
 /* Virtual function table for the URLMonikerImpl class which  include IPersist,*/
 /* IPersistStream and IMoniker functions.                                       */
-static ICOM_VTABLE(IMoniker) VT_URLMonikerImpl =
+static IMonikerVtbl VT_URLMonikerImpl =
 {
     ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
     URLMonikerImpl_QueryInterface,
@@ -141,7 +144,7 @@ static ICOM_VTABLE(IMoniker) VT_URLMonikerImpl =
     URLMonikerImpl_IsSystemMoniker
 };
 
-static ICOM_VTABLE(IBinding) VTBinding_URLMonikerImpl =
+static IBindingVtbl VTBinding_URLMonikerImpl =
 {
     ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
     URLMonikerImpl_IBinding_QueryInterface,