From b9a38fb83dab7933b5be37728c49f200692457e1 Mon Sep 17 00:00:00 2001 From: Rex Jolliff Date: Fri, 23 Jul 1999 20:21:06 +0000 Subject: [PATCH] moved path functions into seperate file svn path=/trunk/; revision=603 --- reactos/include/win32k/paint.h | 33 ----------- reactos/include/win32k/path.h | 40 +++++++++++++ reactos/include/win32k/win32k.h | 1 + reactos/makefile_rex | 2 +- reactos/subsys/win32k/makefile | 6 +- reactos/subsys/win32k/objects/paint.c | 73 +----------------------- reactos/subsys/win32k/objects/path.c | 82 +++++++++++++++++++++++++++ 7 files changed, 128 insertions(+), 109 deletions(-) create mode 100644 reactos/include/win32k/path.h create mode 100644 reactos/subsys/win32k/objects/path.c diff --git a/reactos/include/win32k/paint.h b/reactos/include/win32k/paint.h index cb30e915ad9..bf249003e89 100644 --- a/reactos/include/win32k/paint.h +++ b/reactos/include/win32k/paint.h @@ -19,38 +19,5 @@ UINT W32kSetBoundsRect(HDC hDC, CONST PRECT Bounds, UINT Flags); -BOOL W32kAbortPath(HDC hDC); - -BOOL W32kBeginPath(HDC hDC); - -BOOL W32kCloseFigure(HDC hDC); - -BOOL W32kEndPath(HDC hDC); - -BOOL W32kFillPath(HDC hDC); - -BOOL W32kFlattenPath(HDC hDC); - -BOOL W32kGetMiterLimit(HDC hDC, PFLOAT Limit); - -INT W32kGetPath(HDC hDC, - PPOINT Points, - PBYTE Types, - INT Size); - -HRGN W32kPathToRegion(HDC hDC); - - -BOOL W32kSetMiterLimit(HDC hDC, - FLOAT NewLimit, - PFLOAT OldLimit); - - -BOOL W32kStrokeAndFillPath(HDC hDC); - -BOOL W32kStrokePath(HDC hDC); - -BOOL W32kWidenPath(HDC hDC); - #endif diff --git a/reactos/include/win32k/path.h b/reactos/include/win32k/path.h new file mode 100644 index 00000000000..9d9a498e7c9 --- /dev/null +++ b/reactos/include/win32k/path.h @@ -0,0 +1,40 @@ + +#ifndef __WIN32K_PATH_H +#define __WIN32K_PATH_H + +BOOL W32kAbortPath(HDC hDC); + +BOOL W32kBeginPath(HDC hDC); + +BOOL W32kCloseFigure(HDC hDC); + +BOOL W32kEndPath(HDC hDC); + +BOOL W32kFillPath(HDC hDC); + +BOOL W32kFlattenPath(HDC hDC); + +BOOL W32kGetMiterLimit(HDC hDC, + PFLOAT Limit); + +INT W32kGetPath(HDC hDC, + LPPOINT Points, + LPBYTE Types, + INT nSize); + +HRGN W32kPathToRegion(HDC hDC); + +BOOL W32kSetMiterLimit(HDC hDC, + FLOAT NewLimit, + PFLOAT OldLimit); + +BOOL W32kStrokeAndFillPath(HDC hDC); + +BOOL W32kStrokePath(HDC hDC); + +BOOL W32kWidenPath(HDC hDC); + + + +#endif + diff --git a/reactos/include/win32k/win32k.h b/reactos/include/win32k/win32k.h index 2b051677d6c..92189ac895e 100644 --- a/reactos/include/win32k/win32k.h +++ b/reactos/include/win32k/win32k.h @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/reactos/makefile_rex b/reactos/makefile_rex index 33fc52c32d3..f5ea49dde11 100644 --- a/reactos/makefile_rex +++ b/reactos/makefile_rex @@ -17,7 +17,7 @@ include rules.mak COMPONENTS = iface_native ntoskrnl DLLS = ntdll kernel32 crtdll fmifs gdi32 #DLLS = advapi32 mingw32 user32 -#SUBSYS = win32k +SUBSYS = win32k # # Select the server(s) you want to build diff --git a/reactos/subsys/win32k/makefile b/reactos/subsys/win32k/makefile index 6dfefc79cf0..ffd671808af 100644 --- a/reactos/subsys/win32k/makefile +++ b/reactos/subsys/win32k/makefile @@ -7,9 +7,9 @@ MISC_OBJECTS = misc/driver.o OBJECTS_OBJECTS = objects/bitmaps.o objects/brush.o objects/cliprgn.o \ objects/color.o objects/coord.o objects/dc.o \ objects/fillshap.o objects/icm.o objects/line.o \ - objects/metafile.o objects/pen.o \ - objects/print.o objects/region.o objects/text.o \ - objects/wingl.o + objects/metafile.o objects/paint.o objects/path.o \ + objects/pen.o objects/print.o objects/region.o \ + objects/text.o objects/wingl.o RESOURCE_OBJECT = win32k.coff STUBS_OBJECTS = stubs/stubs.o diff --git a/reactos/subsys/win32k/objects/paint.c b/reactos/subsys/win32k/objects/paint.c index d2454d075ed..03b5a4b92d6 100644 --- a/reactos/subsys/win32k/objects/paint.c +++ b/reactos/subsys/win32k/objects/paint.c @@ -12,7 +12,7 @@ BOOL W32kGdiFlush(VOID) UNIMPLEMENTED; } -DWORD GdiGetBatchLimit(VOID) +DWORD W32kGdiGetBatchLimit(VOID) { UNIMPLEMENTED; } @@ -42,74 +42,3 @@ UINT W32kSetBoundsRect(HDC hDC, UNIMPLEMENTED; } -BOOL W32kAbortPath(HDC hDC) -{ - UNIMPLEMENTED; -} - -BOOL W32kBeginPath(HDC hDC) -{ - UNIMPLEMENTED; -} - -BOOL W32kCloseFigure(HDC hDC) -{ - UNIMPLEMENTED; -} - -BOOL W32kEndPath(HDC hDC) -{ - UNIMPLEMENTED; -} - -BOOL W32kFillPath(HDC hDC) -{ - UNIMPLEMENTED; -} - -BOOL W32kFlattenPath(HDC hDC) -{ - UNIMPLEMENTED; -} - -BOOL W32kGetMiterLimit(HDC hDC, PFLOAT Limit) -{ - UNIMPLEMENTED; -} - -INT W32kGetPath(HDC hDC, - PPOINT Points, - PBYTE Types, - INT Size) -{ - UNIMPLEMENTED; -} - -HRGN W32kPathToRegion(HDC hDC) -{ - UNIMPLEMENTED; -} - -BOOL W32kSetMiterLimit(HDC hDC, - FLOAT NewLimit, - PFLOAT OldLimit) -{ - UNIMPLEMENTED; -} - -BOOL W32kStrokeAndFillPath(HDC hDC) -{ - UNIMPLEMENTED; -} - -BOOL W32kStrokePath(HDC hDC) -{ - UNIMPLEMENTED; -} - -BOOL W32kWidenPath(HDC hDC) -{ - UNIMPLEMENTED; -} - - diff --git a/reactos/subsys/win32k/objects/path.c b/reactos/subsys/win32k/objects/path.c new file mode 100644 index 00000000000..66d93baebe0 --- /dev/null +++ b/reactos/subsys/win32k/objects/path.c @@ -0,0 +1,82 @@ + + +#undef WIN32_LEAN_AND_MEAN +#include +#include + +// #define NDEBUG +#include + +BOOL W32kAbortPath(HDC hDC) +{ + UNIMPLEMENTED; +} + +BOOL W32kBeginPath(HDC hDC) +{ + UNIMPLEMENTED; +} + +BOOL W32kCloseFigure(HDC hDC) +{ + UNIMPLEMENTED; +} + +BOOL W32kEndPath(HDC hDC) +{ + UNIMPLEMENTED; +} + +BOOL W32kFillPath(HDC hDC) +{ + UNIMPLEMENTED; +} + +BOOL W32kFlattenPath(HDC hDC) +{ + UNIMPLEMENTED; +} + + +BOOL W32kGetMiterLimit(HDC hDC, + PFLOAT Limit) +{ + UNIMPLEMENTED; +} + +INT W32kGetPath(HDC hDC, + LPPOINT Points, + LPBYTE Types, + INT nSize) +{ + UNIMPLEMENTED; +} + +HRGN W32kPathToRegion(HDC hDC) +{ + UNIMPLEMENTED; +} + +BOOL W32kSetMiterLimit(HDC hDC, + FLOAT NewLimit, + PFLOAT OldLimit) +{ + UNIMPLEMENTED; +} + +BOOL W32kStrokeAndFillPath(HDC hDC) +{ + UNIMPLEMENTED; +} + +BOOL W32kStrokePath(HDC hDC) +{ + UNIMPLEMENTED; +} + +BOOL W32kWidenPath(HDC hDC) +{ + UNIMPLEMENTED; +} + +