[ros-diffs] [tkreuzer] 27865: - fix parameter count for NtGdiCreatePen in w32ksvc.db (4 params, not 3) - implement CreatePen, calling NtGdiCreatePen at 16 instead of forwarding to NtGdiCreatePen at 12, wich does not exist - implement CreatePenIndirect, calling NtGdiCreatePen, instead of forwarding to NtGdiCreatePenIndirect - remove NtGdiCreatePenIndirect from w32ksvc.db and win32k
tkreuzer at svn.reactos.org
tkreuzer at svn.reactos.org
Thu Jul 26 19:38:50 CEST 2007
Author: tkreuzer
Date: Thu Jul 26 21:38:49 2007
New Revision: 27865
URL: http://svn.reactos.org/svn/reactos?rev=27865&view=rev
Log:
- fix parameter count for NtGdiCreatePen in w32ksvc.db (4 params, not 3)
- implement CreatePen, calling NtGdiCreatePen at 16 instead of forwarding to NtGdiCreatePen at 12, wich does not exist
- implement CreatePenIndirect, calling NtGdiCreatePen, instead of forwarding to NtGdiCreatePenIndirect
- remove NtGdiCreatePenIndirect from w32ksvc.db and win32k
Modified:
trunk/reactos/dll/win32/gdi32/gdi32.def
trunk/reactos/dll/win32/gdi32/gdi32.rbuild
trunk/reactos/subsystems/win32/win32k/objects/pen.c
trunk/reactos/tools/nci/w32ksvc.db
Modified: trunk/reactos/dll/win32/gdi32/gdi32.def
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?rev=27865&r1=27864&r2=27865&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/gdi32.def (original)
+++ trunk/reactos/dll/win32/gdi32/gdi32.def Thu Jul 26 21:38:49 2007
@@ -79,8 +79,8 @@
CreateMetaFileW at 4
CreatePalette at 4=NtGdiCreatePalette at 4
CreatePatternBrush at 4
-CreatePen at 12=NtGdiCreatePen at 12
-CreatePenIndirect at 4=NtGdiCreatePenIndirect at 4
+CreatePen at 12
+CreatePenIndirect at 4
CreatePolyPolygonRgn at 16=NtGdiCreatePolyPolygonRgn at 16
CreatePolygonRgn at 12=NtGdiCreatePolygonRgn at 12
CreateRectRgn at 16=NtGdiCreateRectRgn at 16
Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbuild?rev=27865&r1=27864&r2=27865&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/gdi32.rbuild (original)
+++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Thu Jul 26 21:38:49 2007
@@ -46,6 +46,7 @@
<file>font.c</file>
<file>linedda.c</file>
<file>metafile.c</file>
+ <file>pen.c</file>
<file>region.c</file>
<file>text.c</file>
<file>utils.c</file>
Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/pen.c?rev=27865&r1=27864&r2=27865&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/pen.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/pen.c Thu Jul 26 21:38:49 2007
@@ -242,44 +242,6 @@
}
HPEN STDCALL
-NtGdiCreatePenIndirect(CONST PLOGPEN LogPen)
-{
- LOGPEN SafeLogPen = {0};
- NTSTATUS Status = STATUS_SUCCESS;
-
- _SEH_TRY
- {
- ProbeForRead(LogPen,
- sizeof(LOGPEN),
- 1);
- SafeLogPen = *LogPen;
- }
- _SEH_HANDLE
- {
- Status = _SEH_GetExceptionCode();
- }
- _SEH_END;
-
- if (!NT_SUCCESS(Status))
- {
- SetLastNtError(Status);
- return 0;
- }
-
- return IntGdiExtCreatePen(SafeLogPen.lopnStyle,
- SafeLogPen.lopnWidth.x,
- BS_SOLID,
- SafeLogPen.lopnColor,
- 0,
- 0,
- 0,
- NULL,
- 0,
- TRUE,
- 0);
-}
-
-HPEN STDCALL
NtGdiExtCreatePen(
DWORD dwPenStyle,
DWORD ulWidth,
Modified: trunk/reactos/tools/nci/w32ksvc.db
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=27865&r1=27864&r2=27865&view=diff
==============================================================================
--- trunk/reactos/tools/nci/w32ksvc.db (original)
+++ trunk/reactos/tools/nci/w32ksvc.db Thu Jul 26 21:38:49 2007
@@ -34,8 +34,7 @@
NtGdiCreateMetaFile 1
NtGdiCreatePalette 1
NtGdiCreatePatternBrushInternal 3
-NtGdiCreatePen 3
-NtGdiCreatePenIndirect 1
+NtGdiCreatePen 4
NtGdiCreatePolygonRgn 3
NtGdiCreatePolyPolygonRgn 4
NtGdiCreateRectRgn 4
More information about the Ros-diffs
mailing list