From aa3f68d3f90ace69f838766414bf2fb2a7e72253 Mon Sep 17 00:00:00 2001 From: Royce Mitchell III Date: Mon, 21 Jul 2003 02:36:00 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/; revision=5199 --- reactos/lib/gdi32/makefile | 7 ++++--- reactos/lib/gdi32/misc/stubsa.c | 19 +++++++++++++++---- reactos/lib/gdi32/misc/stubsw.c | 4 +++- reactos/lib/rosrtl/makefile | 6 +++++- reactos/lib/rosrtl/misc/devmode.c | 2 +- 5 files changed, 28 insertions(+), 10 deletions(-) diff --git a/reactos/lib/gdi32/makefile b/reactos/lib/gdi32/makefile index 0bde954baba..bed6d2beb36 100644 --- a/reactos/lib/gdi32/makefile +++ b/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 diff --git a/reactos/lib/gdi32/misc/stubsa.c b/reactos/lib/gdi32/misc/stubsa.c index 9eb90f6df90..ad87e68878f 100644 --- a/reactos/lib/gdi32/misc/stubsa.c +++ b/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 #include #include +#include +#include /* * @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; } diff --git a/reactos/lib/gdi32/misc/stubsw.c b/reactos/lib/gdi32/misc/stubsw.c index 40913d992c8..550912a4194 100644 --- a/reactos/lib/gdi32/misc/stubsw.c +++ b/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 #include diff --git a/reactos/lib/rosrtl/makefile b/reactos/lib/rosrtl/makefile index 315f2031237..712991c4a82 100644 --- a/reactos/lib/rosrtl/makefile +++ b/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) diff --git a/reactos/lib/rosrtl/misc/devmode.c b/reactos/lib/rosrtl/misc/devmode.c index d9e5fef83fb..2bd3011f12f 100644 --- a/reactos/lib/rosrtl/misc/devmode.c +++ b/reactos/lib/rosrtl/misc/devmode.c @@ -1,5 +1,5 @@ -#include #include +#include void RosRtlDevModeA2W ( LPDEVMODEW pW, const LPDEVMODEA pA )