1 added + 2 removed + 22 modified, total 25 files
reactos/include
diff -u -r1.60 -r1.61
--- funcs.h 14 Aug 2004 00:35:09 -0000 1.60
+++ funcs.h 6 Sep 2004 21:15:44 -0000 1.61
@@ -4088,7 +4088,7 @@
STDCALL
GdiGetCharDimensions(HDC hdc,LPTEXTMETRICW lptm,BOOL unk);
-PSHAREDHANDLETABLE
+PVOID
STDCALL
GdiQueryTable(VOID);
reactos/include/win32k
diff -u -r1.137 -r1.138
--- ntuser.h 24 Jun 2004 09:44:05 -0000 1.137
+++ ntuser.h 6 Sep 2004 21:15:45 -0000 1.138
@@ -163,6 +163,7 @@
#define NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO 0xffff0005
#define NOPARAM_ROUTINE_ANYPOPUP 0xffff0006
#define NOPARAM_ROUTINE_CSRSS_INITIALIZED 0xffff0007
+#define NOPARAM_ROUTINE_GDI_QUERY_TABLE 0xffff0008
DWORD
STDCALL
NtUserCallNoParam(
@@ -1765,6 +1766,18 @@
} Value;
} KMDDELPARAM, *PKMDDELPARAM;
+#include <pshpack1.h>
+typedef struct _GDI_TABLE_ENTRY
+{
+ PVOID KernelData; /* Points to the kernel mode structure */
+ unsigned short ProcessId; /* process id that created the object, 0 for stock objects */
+ unsigned short Count; /* we don't use this field, only NT4 uses it */
+ unsigned short Upper; /* copy of the upper 16 bit of the handle, contains the object type */
+ unsigned short nType; /* object type */
+ PVOID UserData; /* Points to the user mode structure, usually NULL though */
+} GDI_TABLE_ENTRY, *PGDI_TABLE_ENTRY;
+#include <poppack.h>
+
#endif /* __WIN32K_NTUSER_H */
/* EOF */
reactos/lib/gdi32/include
diff -u -r1.1 -r1.2
--- precomp.h 15 Aug 2004 18:40:07 -0000 1.1
+++ precomp.h 6 Sep 2004 21:15:45 -0000 1.2
@@ -1,3 +1,55 @@
#include <windows.h>
+#include <ddentry.h>
+#include <string.h>
+#include <win32k/kapi.h>
+#include <ddk/prntfont.h>
+#include <rosrtl/logfont.h>
+#include <rosrtl/devmode.h>
+#include <wine/unicode.h>
#define NTOS_MODE_USER
#include <ntos.h>
+
+#define NtGdiQueryTable() \
+ (PGDI_TABLE_ENTRY)NtUserCallNoParam(NOPARAM_ROUTINE_GDI_QUERY_TABLE)
+
+#define NtUserGetDCBrushColor(hbr) \
+ (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_BRUSH, TWOPARAM_ROUTINE_GETDCCOLOR)
+
+#define NtUserGetDCPenColor(hbr) \
+ (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_PEN, TWOPARAM_ROUTINE_GETDCCOLOR)
+
+#define NtUserSetDCBrushColor(hbr, crColor) \
+ (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUTINE_SETDCBRUSHCOLOR)
+
+#define NtUserSetDCPenColor(hbr, crColor) \
+ (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUTINE_SETDCPENCOLOR)
+
+#ifdef __USE_W32API
+typedef int (CALLBACK* EMFPLAYPROC)( HDC, INT, HANDLE );
+typedef DWORD FULLSCREENCONTROL;
+typedef DWORD UNIVERSAL_FONT_ID;
+typedef UNIVERSAL_FONT_ID *PUNIVERSAL_FONT_ID;
+typedef DWORD REALIZATION_INFO;
+typedef REALIZATION_INFO *PREALIZATION_INFO;
+typedef DWORD CHWIDTHINFO;
+typedef CHWIDTHINFO *PCHWIDTHINFO;
+#endif
+
+/* == GLOBAL VARIABLES ====================================================== */
+
+extern PGDI_TABLE_ENTRY GdiHandleTable;
+extern HANDLE hProcessHeap;
+
+/* == HEAP ================================================================== */
+
+PVOID HEAP_alloc ( DWORD len );
+NTSTATUS HEAP_strdupA2W ( LPWSTR* ppszW, LPCSTR lpszA );
+VOID HEAP_free ( LPVOID memory );
+
+/* == FONT ================================================================== */
+
+BOOL FASTCALL TextMetricW2A(TEXTMETRICA *tma, TEXTMETRICW *tmw);
+BOOL FASTCALL NewTextMetricW2A(NEWTEXTMETRICA *tma, NEWTEXTMETRICW *tmw);
+BOOL FASTCALL NewTextMetricExW2A(NEWTEXTMETRICEXA *tma, NEWTEXTMETRICEXW *tmw);
+
+/* EOF */
reactos/lib/gdi32/main
diff -u -r1.10 -r1.11
--- dllmain.c 15 Aug 2004 18:40:07 -0000 1.10
+++ dllmain.c 6 Sep 2004 21:15:45 -0000 1.11
@@ -1,15 +1,13 @@
/*
* dllmain.c
*
- * $Revision: 1.10 $
- * $Author: chorns $
- * $Date: 2004/08/15 18:40:07 $
+ * $Revision: 1.11 $
+ * $Author: weiden $
+ * $Date: 2004/09/06 21:15:45 $
*
*/
#include "precomp.h"
-#include <win32k/win32k.h>
-#include <internal/heap.h>
/*
* GDI32.DLL doesn't have an entry point. The initialization is done by a call
@@ -32,6 +30,9 @@
GdiProcessSetup (VOID)
{
hProcessHeap = GetProcessHeap();
+
+ /* map the gdi handle table to user space */
+ GdiHandleTable = NtGdiQueryTable();
}
reactos/lib/gdi32
diff -u -r1.39 -r1.40
--- makefile 15 Aug 2004 18:40:07 -0000 1.39
+++ makefile 6 Sep 2004 21:15:45 -0000 1.40
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.39 2004/08/15 18:40:07 chorns Exp $
+# $Id: makefile,v 1.40 2004/09/06 21:15:45 weiden Exp $
PATH_TO_TOP = ../..
@@ -31,6 +31,7 @@
MISC_OBJECTS = \
misc/heap.o \
+ misc/misc.o \
misc/stubs.o \
misc/stubsa.o \
misc/stubsw.o \
reactos/lib/gdi32/misc
diff -N misc.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ misc.c 6 Sep 2004 21:15:45 -0000 1.1
@@ -0,0 +1,41 @@
+/*
+ * ReactOS GDI lib
+ * Copyright (C) 2003 ReactOS Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id: misc.c,v 1.1 2004/09/06 21:15:45 weiden Exp $
+ *
+ * PROJECT: ReactOS gdi32.dll
+ * FILE: lib/gdi32/misc/misc.c
+ * PURPOSE: Miscellaneous functions
+ * PROGRAMMER: Thomas Weidenmueller <w3seek@reactos.com>
+ * UPDATE HISTORY:
+ * 2004/09/04 Created
+ */
+
+#include "precomp.h"
+
+PGDI_TABLE_ENTRY GdiHandleTable = NULL;
+
+/*
+ * @implemented
+ */
+PVOID
+STDCALL
+GdiQueryTable(VOID)
+{
+ return (PVOID)GdiHandleTable;
+}
reactos/lib/gdi32/misc
diff -u -r1.3 -r1.4
--- heap.c 15 Aug 2004 18:40:07 -0000 1.3
+++ heap.c 6 Sep 2004 21:15:45 -0000 1.4
@@ -4,6 +4,7 @@
// global variables in a dll are process-global
HANDLE hProcessHeap = NULL;
+
PVOID
HEAP_alloc ( DWORD len )
{
reactos/lib/gdi32/misc
diff -u -r1.64 -r1.65
--- stubs.c 15 Aug 2004 18:40:07 -0000 1.64
+++ stubs.c 6 Sep 2004 21:15:45 -0000 1.65
@@ -1,4 +1,4 @@
-/* $Id: stubs.c,v 1.64 2004/08/15 18:40:07 chorns Exp $
+/* $Id: stubs.c,v 1.65 2004/09/06 21:15:45 weiden Exp $
*
* reactos/lib/gdi32/misc/stubs.c
*
@@ -9,26 +9,7 @@
*
*/
-/* Can't use precomp.h because of this */
-#ifdef UNICODE
-#undef UNICODE
-#endif
-#include <windows.h>
-#include <ddentry.h>
-#include <ddk/prntfont.h>
-
-#ifdef __USE_W32API
-typedef int (CALLBACK* EMFPLAYPROC)( HDC, INT, HANDLE );
-typedef DWORD FULLSCREENCONTROL;
-typedef DWORD SHAREDHANDLETABLE;
-typedef SHAREDHANDLETABLE *PSHAREDHANDLETABLE;
-typedef DWORD UNIVERSAL_FONT_ID;
-typedef UNIVERSAL_FONT_ID *PUNIVERSAL_FONT_ID;
-typedef DWORD REALIZATION_INFO;
-typedef REALIZATION_INFO *PREALIZATION_INFO;
-typedef DWORD CHWIDTHINFO;
-typedef CHWIDTHINFO *PCHWIDTHINFO;
-#endif
+#include "precomp.h"
#define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__);
@@ -1910,30 +1891,6 @@
/*
* @unimplemented
*/
-BOOL
-STDCALL
-EudcLoadLinkW(LPCWSTR pBaseFaceName,LPCWSTR pEudcFontPath,INT iPriority,INT iFontLinkType)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-EudcUnloadLinkW(LPCWSTR pBaseFaceName,LPCWSTR pEudcFontPath)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-/*
- * @unimplemented
- */
BOOL
STDCALL
FontIsLinked(HDC hdc)
@@ -1946,18 +1903,6 @@
/*
* @unimplemented
*/
-int
-STDCALL
-GdiAddFontResourceW(LPCWSTR filename,FLONG f,DESIGNVECTOR *pdv)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-/*
- * @unimplemented
- */
DWORD
STDCALL
GdiAddGlsBounds(HDC hdc,LPRECT prc)
@@ -2006,18 +1951,6 @@
/*
* @unimplemented
*/
-BOOL
-STDCALL
-GdiConsoleTextOut(HDC hdc, POLYTEXTW *lpto,UINT nStrings, RECTL *prclBounds)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-/*
- * @unimplemented
- */
HDC
STDCALL
GdiConvertAndCheckDC(HDC hdc)
@@ -2427,18 +2360,6 @@
/*
* @unimplemented
*/
-DWORD
-STDCALL
-GetEUDCTimeStampExW(LPCWSTR str)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-/*
- * @unimplemented
- */
ULONG
STDCALL
GetFontAssocStatus(HDC hdc)
@@ -2587,38 +2508,6 @@
/*
* @unimplemented
*/
-BOOL
-STDCALL
-RemoveFontResourceExA(
- LPCSTR lpFileName,
- DWORD fl,
- PVOID pdv
-)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-RemoveFontResourceExW(
- LPCWSTR lpFileName,
- DWORD fl,
- PVOID pdv
-)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-/*
- * @unimplemented
- */
int
STDCALL
RemoveFontResourceTracking(LPCSTR lpString,int unknown)
@@ -2731,72 +2620,6 @@
*/
BOOL
STDCALL
-bInitSystemAndFontsDirectoriesW(LPWSTR *SystemDir,LPWSTR *FontsDir)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-bMakePathNameW(LPWSTR lpBuffer,LPCWSTR lpFileName,LPWSTR *lpFilePart,DWORD unknown)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-/*
- * @unimplemented
- */
-HFONT
-STDCALL
-CreateFontIndirectExA(const ENUMLOGFONTEXDVA *elfexd)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-/*
- * @unimplemented
- */
-DWORD
-STDCALL
-GetGlyphIndicesA(
- HDC hdc,
- LPCSTR lpstr,
- int c,
- LPWORD pgi,
- DWORD fl
-)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-/*
- * @unimplemented
- */
-UINT
-STDCALL
-GetStringBitmapA(HDC hdc,LPSTR psz,BOOL unknown,UINT cj,BYTE *lpSB)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
GetTextExtentExPointI(
HDC hdc,
LPWORD pgiIn,
@@ -2815,48 +2638,6 @@
/*
* @unimplemented
*/
-HFONT
-STDCALL
-CreateFontIndirectExW(const ENUMLOGFONTEXDVW *elfexd)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-/*
- * @unimplemented
- */
-DWORD
-STDCALL
-GetGlyphIndicesW(
- HDC hdc,
- LPCWSTR lpstr,
- int c,
- LPWORD pgi,
- DWORD fl
-)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-/*
- * @unimplemented
- */
-UINT
-STDCALL
-GetStringBitmapW(HDC hdc,LPWSTR pwsz,BOOL unknown,UINT cj,BYTE *lpSB)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-/*
- * @unimplemented
- */
BOOL
STDCALL
GetTextExtentPointI(
@@ -3008,18 +2789,6 @@
/*
* @unimplemented
*/
-PSHAREDHANDLETABLE
-STDCALL
-GdiQueryTable(VOID)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-/*
- * @unimplemented
- */
HANDLE
STDCALL
GdiGetSpoolFileHandle(
reactos/lib/gdi32/misc
diff -u -r1.33 -r1.34
--- stubsa.c 15 Aug 2004 18:40:07 -0000 1.33
+++ stubsa.c 6 Sep 2004 21:15:45 -0000 1.34
@@ -1,4 +1,4 @@
-/* $Id: stubsa.c,v 1.33 2004/08/15 18:40:07 chorns Exp $
+/* $Id: stubsa.c,v 1.34 2004/09/06 21:15:45 weiden Exp $
*
* reactos/lib/gdi32/misc/stubs.c
*
@@ -9,21 +9,7 @@
*
*/
-/* Can't use precomp.h because of this */
-#ifdef UNICODE
-#undef UNICODE
-#endif
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#define NTOS_MODE_USER
-#include <ntos.h>
-#include <win32k/text.h>
-#include <win32k/dc.h>
-#include <rosrtl/devmode.h>
-#include <rosrtl/logfont.h>
-#include <internal/heap.h>
+#include "precomp.h"
#define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__);
@@ -619,4 +605,64 @@
}
+/*
+ * @unimplemented
+ */
+BOOL
+STDCALL
+RemoveFontResourceExA(
+ LPCSTR lpFileName,
+ DWORD fl,
+ PVOID pdv
+)
+{
+ UNIMPLEMENTED;
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return 0;
+}
+
+
+/*
+ * @unimplemented
+ */
+HFONT
+STDCALL
+CreateFontIndirectExA(const ENUMLOGFONTEXDVA *elfexd)
+{
+ UNIMPLEMENTED;
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return 0;
+}
+
+/*
+ * @unimplemented
+ */
+DWORD
+STDCALL
+GetGlyphIndicesA(
+ HDC hdc,
+ LPCSTR lpstr,
+ int c,
+ LPWORD pgi,
+ DWORD fl
+)
+{
+ UNIMPLEMENTED;
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return 0;
+}
+
+/*
+ * @unimplemented
+ */
+UINT
+STDCALL
+GetStringBitmapA(HDC hdc,LPSTR psz,BOOL unknown,UINT cj,BYTE *lpSB)
+{
+ UNIMPLEMENTED;
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return 0;
+}
+
+
/* EOF */
reactos/lib/gdi32/misc
diff -u -r1.31 -r1.32
--- stubsw.c 15 Aug 2004 18:40:07 -0000 1.31
+++ stubsw.c 6 Sep 2004 21:15:45 -0000 1.32
@@ -1,4 +1,4 @@
-/* $Id: stubsw.c,v 1.31 2004/08/15 18:40:07 chorns Exp $
+/* $Id: stubsw.c,v 1.32 2004/09/06 21:15:45 weiden Exp $
*
* reactos/lib/gdi32/misc/stubs.c
*
@@ -10,7 +10,6 @@
*/
#include "precomp.h"
-#include <win32k/kapi.h>
#define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__);
@@ -500,5 +499,147 @@
return 0;
}
+/*
+ * @unimplemented
+ */
+BOOL
+STDCALL
+EudcLoadLinkW(LPCWSTR pBaseFaceName,LPCWSTR pEudcFontPath,INT iPriority,INT iFontLinkType)
+{
+ UNIMPLEMENTED;
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return 0;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+STDCALL
+EudcUnloadLinkW(LPCWSTR pBaseFaceName,LPCWSTR pEudcFontPath)
+{
+ UNIMPLEMENTED;
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return 0;
+}
+
+/*
+ * @unimplemented
+ */
+int
+STDCALL
+GdiAddFontResourceW(LPCWSTR filename,FLONG f,DESIGNVECTOR *pdv)
+{
+ UNIMPLEMENTED;
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return 0;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+STDCALL
+GdiConsoleTextOut(HDC hdc, POLYTEXTW *lpto,UINT nStrings, RECTL *prclBounds)
+{
+ UNIMPLEMENTED;
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return 0;
+}
+
+/*
+ * @unimplemented
+ */
+DWORD
+STDCALL
+GetEUDCTimeStampExW(LPCWSTR str)
+{
+ UNIMPLEMENTED;
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return 0;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+STDCALL
+RemoveFontResourceExW(
+ LPCWSTR lpFileName,
+ DWORD fl,
+ PVOID pdv
+)
+{
+ UNIMPLEMENTED;
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return 0;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+STDCALL
+bInitSystemAndFontsDirectoriesW(LPWSTR *SystemDir,LPWSTR *FontsDir)
+{
+ UNIMPLEMENTED;
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return 0;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+STDCALL
+bMakePathNameW(LPWSTR lpBuffer,LPCWSTR lpFileName,LPWSTR *lpFilePart,DWORD unknown)
+{
+ UNIMPLEMENTED;
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return 0;
+}
+
+/*
+ * @unimplemented
+ */
+HFONT
+STDCALL
+CreateFontIndirectExW(const ENUMLOGFONTEXDVW *elfexd)
+{
+ UNIMPLEMENTED;
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return 0;
+}
+
+/*
+ * @unimplemented
+ */
+DWORD
+STDCALL
+GetGlyphIndicesW(
+ HDC hdc,
+ LPCWSTR lpstr,
+ int c,
+ LPWORD pgi,
+ DWORD fl
+)
+{
+ UNIMPLEMENTED;
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return 0;
+}
+
+/*
+ * @unimplemented
+ */
+UINT
+STDCALL
+GetStringBitmapW(HDC hdc,LPWSTR pwsz,BOOL unknown,UINT cj,BYTE *lpSB)
+{
+ UNIMPLEMENTED;
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return 0;
+}
+
/* EOF */
reactos/lib/gdi32/misc
diff -u -r1.5 -r1.6
--- wingl.c 15 Aug 2004 18:40:07 -0000 1.5
+++ wingl.c 6 Sep 2004 21:15:45 -0000 1.6
@@ -22,7 +22,7 @@
*/
#include "precomp.h"
-#include <string.h>
+
#define NDEBUG
#include <win32k/debug1.h>
reactos/lib/gdi32/objects
diff -u -r1.23 -r1.24
--- bitblt.c 15 Aug 2004 18:40:07 -0000 1.23
+++ bitblt.c 6 Sep 2004 21:15:45 -0000 1.24
@@ -1,4 +1,4 @@
-/* $Id: bitblt.c,v 1.23 2004/08/15 18:40:07 chorns Exp $
+/* $Id: bitblt.c,v 1.24 2004/09/06 21:15:45 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@@ -8,7 +8,7 @@
*/
#include "precomp.h"
-#include <win32k/kapi.h>
+
#include <debug.h>
/*
reactos/lib/gdi32/objects
diff -u -r1.6 -r1.7
--- brush.c 15 Aug 2004 18:40:07 -0000 1.6
+++ brush.c 6 Sep 2004 21:15:46 -0000 1.7
@@ -1,5 +1,4 @@
#include "precomp.h"
-#include <win32k/kapi.h>
/*
reactos/lib/gdi32/objects
diff -u -r1.8 -r1.9
--- clip.c 15 Aug 2004 18:40:07 -0000 1.8
+++ clip.c 6 Sep 2004 21:15:46 -0000 1.9
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: clip.c,v 1.8 2004/08/15 18:40:07 chorns Exp $
+/* $Id: clip.c,v 1.9 2004/09/06 21:15:46 weiden Exp $
*
* PROJECT: ReactOS gdi32.dll
* FILE: lib/gdi32/objects/clip.c
@@ -27,7 +27,6 @@
*/
#include "precomp.h"
-#include <win32k/kapi.h>
/*
* @implemented
reactos/lib/gdi32/objects
diff -u -r1.35 -r1.36
--- dc.c 15 Aug 2004 18:40:07 -0000 1.35
+++ dc.c 6 Sep 2004 21:15:46 -0000 1.36
@@ -1,22 +1,8 @@
#include "precomp.h"
-#include <win32k/kapi.h>
-#include <rosrtl/logfont.h>
#define NDEBUG
#include <debug.h>
-#define NtUserGetDCBrushColor(hbr) \
- (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_BRUSH, TWOPARAM_ROUTINE_GETDCCOLOR)
-
-#define NtUserGetDCPenColor(hbr) \
- (COLORREF)NtUserCallTwoParam((DWORD)(hbr), OBJ_PEN, TWOPARAM_ROUTINE_GETDCCOLOR)
-
-#define NtUserSetDCBrushColor(hbr, crColor) \
- (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUTINE_SETDCBRUSHCOLOR)
-
-#define NtUserSetDCPenColor(hbr, crColor) \
- (COLORREF)NtUserCallTwoParam((DWORD)(hbr), (DWORD)crColor, TWOPARAM_ROUTINE_SETDCPENCOLOR)
-
/*
* @implemented
*/
reactos/lib/gdi32/objects
diff -u -r1.12 -r1.13
--- fillshap.c 15 Aug 2004 18:40:07 -0000 1.12
+++ fillshap.c 6 Sep 2004 21:15:46 -0000 1.13
@@ -1,5 +1,4 @@
#include "precomp.h"
-#include <win32k/kapi.h>
/*
* @implemented
reactos/lib/gdi32/objects
diff -u -r1.8 -r1.9
--- font.c 15 Aug 2004 18:40:07 -0000 1.8
+++ font.c 6 Sep 2004 21:15:46 -0000 1.9
@@ -1,4 +1,4 @@
-/* $Id: font.c,v 1.8 2004/08/15 18:40:07 chorns Exp $
+/* $Id: font.c,v 1.9 2004/09/06 21:15:46 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@@ -9,11 +9,6 @@
*/
#include "precomp.h"
-#include <rosrtl/logfont.h>
-#include <win32k/font.h>
-#include <win32k/text.h>
-#include <internal/font.h>
-#include <wine/unicode.h>
#define NDEBUG
#include <debug.h>
reactos/lib/gdi32/objects
diff -u -r1.12 -r1.13
--- line.c 15 Aug 2004 18:40:07 -0000 1.12
+++ line.c 6 Sep 2004 21:15:46 -0000 1.13
@@ -1,5 +1,4 @@
#include "precomp.h"
-#include <win32k/kapi.h>
/*
reactos/lib/gdi32/objects
diff -u -r1.3 -r1.4
--- linedda.c 15 Aug 2004 18:40:07 -0000 1.3
+++ linedda.c 6 Sep 2004 21:15:46 -0000 1.4
@@ -28,7 +28,7 @@
*/
#include "precomp.h"
-#include <win32k/kapi.h>
+
#include <debug.h>
/**********************************************************************
reactos/lib/gdi32/objects
diff -u -r1.4 -r1.5
--- metafile.c 15 Aug 2004 18:40:07 -0000 1.4
+++ metafile.c 6 Sep 2004 21:15:46 -0000 1.5
@@ -1,8 +1,4 @@
#include "precomp.h"
-#include <string.h>
-#include <internal/heap.h>
-#include <win32k/kapi.h>
-#include <win32k/metafile.h>
/*
reactos/lib/gdi32/objects
diff -u -r1.7 -r1.8
--- pen.c 15 Aug 2004 18:40:07 -0000 1.7
+++ pen.c 6 Sep 2004 21:15:46 -0000 1.8
@@ -1,5 +1,4 @@
#include "precomp.h"
-#include <win32k/kapi.h>
/*
reactos/lib/gdi32/objects
diff -u -r1.16 -r1.17
--- region.c 15 Aug 2004 18:40:07 -0000 1.16
+++ region.c 6 Sep 2004 21:15:46 -0000 1.17
@@ -1,5 +1,4 @@
#include "precomp.h"
-#include <win32k/kapi.h>
/*
reactos/lib/gdi32/objects
diff -u -r1.20 -r1.21
--- text.c 15 Aug 2004 18:40:07 -0000 1.20
+++ text.c 6 Sep 2004 21:15:46 -0000 1.21
@@ -1,8 +1,4 @@
#include "precomp.h"
-#include <string.h>
-#include <win32k/kapi.h>
-#include <internal/font.h>
-#include <rosrtl/logfont.h>
/*
reactos/lib/gdi32/include/internal
diff -N font.h
--- font.h 15 Aug 2004 18:40:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-/* $Id: font.h,v 1.2 2004/08/15 18:40:07 chorns Exp $
- *
- * COPYRIGHT: See COPYING in the top level directory
- * PROJECT: ReactOS system libraries
- * FILE: lib/gdi32/include/internal/font.h
- * PURPOSE:
- * PROGRAMMER:
- *
- */
-
-#ifndef GDI32_FONT_H_INCLUDED
-#define GDI32_FONT_H_INCLUDED
-
-BOOL FASTCALL TextMetricW2A(TEXTMETRICA *tma, TEXTMETRICW *tmw);
-BOOL FASTCALL NewTextMetricW2A(NEWTEXTMETRICA *tma, NEWTEXTMETRICW *tmw);
-BOOL FASTCALL NewTextMetricExW2A(NEWTEXTMETRICEXA *tma, NEWTEXTMETRICEXW *tmw);
-
-#endif
-
reactos/lib/gdi32/include/internal
diff -N heap.h
--- heap.h 4 Aug 2003 00:28:44 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-// heap.h
-
-#ifndef GDI32_INTERNAL_HEAP_H
-#define GDI32_INTERNAL_HEAP_H
-
-extern HANDLE hProcessHeap;
-
-PVOID
-HEAP_alloc ( DWORD len );
-
-NTSTATUS
-HEAP_strdupA2W ( LPWSTR* ppszW, LPCSTR lpszA );
-
-VOID
-HEAP_free ( LPVOID memory );
-
-#endif//GDI32_INTERNAL_HEAP_H
CVSspam 0.2.8