*** empty log message ***

svn path=/trunk/; revision=5199

reactos/lib/gdi32/makefile

@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.28 2003/06/26 21:52:40 gvg Exp $
+# $Id: makefile,v 1.29 2003/07/21 02:36:00 royce Exp $
 
 PATH_TO_TOP = ../..
 
@@ -8,16 +8,17 @@ TARGET_NAME = gdi32
 
 TARGET_BASE = 0x77ed0000
 
+TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a rosrtl.a
+
 TARGET_CFLAGS = \
  -I./include \
+ -DUNICODE \
  -Wall \
  -Werror \
  -fno-builtin
 
 TARGET_LFLAGS = -nostartfiles -nostdlib
 
-TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a
-
 MAIN_OBJECTS = main/dllmain.o
 
 MISC_OBJECTS = misc/stubs.o misc/stubsa.o misc/stubsw.o misc/win32k.o

reactos/lib/gdi32/misc/stubsa.c

@@ -1,4 +1,4 @@
-/* $Id: stubsa.c,v 1.12 2003/07/21 01:59:51 royce Exp $
+/* $Id: stubsa.c,v 1.13 2003/07/21 02:36:00 royce Exp $
  *
  * reactos/lib/gdi32/misc/stubs.c
  *
@@ -17,6 +17,8 @@
 #include <ddk/ntddk.h>
 #include <win32k/text.h>
 #include <win32k/metafile.h>
+#include <win32k/dc.h>
+#include <rosrtl/devmode.h>
 
 /*
  * @implemented
@@ -86,7 +88,7 @@ CopyMetaFileA(
 
 
 /*
- * @unimplemented
+ * @implemented
  */
 HDC
 STDCALL
@@ -127,9 +129,18 @@ CreateICA(
     }
 
   if ( lpdvmInit )
-    RosRtlDevModeA2W ( &dvmInitW, lpdvmInit );
+    RosRtlDevModeA2W ( &dvmInitW, (const LPDEVMODEA)lpdvmInit );
 
-  return 0;
+  rc = W32kCreateIC ( Driver.Buffer,
+		      Device.Buffer,
+		      Output.Buffer,
+		      lpdvmInit ? &dvmInitW : NULL );
+
+  RtlFreeUnicodeString ( &Output );
+  RtlFreeUnicodeString ( &Device );
+  RtlFreeUnicodeString ( &Driver );
+
+  return rc;
 }
 
 

reactos/lib/gdi32/misc/stubsw.c

@@ -1,4 +1,4 @@
-/* $Id: stubsw.c,v 1.11 2003/07/21 01:59:51 royce Exp $
+/* $Id: stubsw.c,v 1.12 2003/07/21 02:36:00 royce Exp $
  *
  * reactos/lib/gdi32/misc/stubs.c
  *
@@ -8,7 +8,9 @@
  * remove its stub from this file.
  *
  */
+#ifndef UNICODE
 #define UNICODE
+#endif//UNICODE
 #include <windows.h>
 #include <win32k/kapi.h>
 

reactos/lib/rosrtl/makefile

@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.4 2003/07/21 01:59:51 royce Exp $
+# $Id: makefile,v 1.5 2003/07/21 02:36:00 royce Exp $
 
 PATH_TO_TOP = ../..
 
@@ -15,6 +15,10 @@ MISC_OBJECTS = \
  misc/devmode.o \
  misc/qsort.o
 
+TARGET_LFLAGS = -nostartfiles -nostdlib
+
+TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a
+
 TARGET_OBJECTS = $(THREAD_OBJECTS) $(MISC_OBJECTS)
  
 DEP_OBJECTS = $(TARGET_OBJECTS)

reactos/lib/rosrtl/misc/devmode.c

@@ -1,5 +1,5 @@
-#include <string.h>
 #include <windows.h>
+#include <string.h>
 
 void
 RosRtlDevModeA2W ( LPDEVMODEW pW, const LPDEVMODEA pA )