Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-07 01:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed NtGdiSetWorldTransform. Made the code info updates. Need to report from wine Path.c in win32k. I guess around in the next two weeks will be ok.

Browse source 
svn path=/trunk/; revision=28374
This commit is contained in:
James Tabor 2007-08-16 22:08:02 +00:00
parent 047296bb00
commit f0415590e9
5 changed files with 3 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/gdi32/gdi32.def
View file

@ -469,7 +469,7 @@ LineDDA@24
LineTo@12=NtGdiLineTo@12 LineTo@12=NtGdiLineTo@12
MaskBlt@48 MaskBlt@48
MirrorRgn@8 MirrorRgn@8
ModifyWorldTransform@12=NtGdiModifyWorldTransform@12 ModifyWorldTransform@12
MoveToEx@16=NtGdiMoveToEx@16 MoveToEx@16=NtGdiMoveToEx@16
NamedEscape@32 NamedEscape@32
OffsetClipRgn@12=NtGdiOffsetClipRgn@12 OffsetClipRgn@12=NtGdiOffsetClipRgn@12
@ -580,7 +580,7 @@ SetVirtualResolution@20
SetWinMetaFileBits@16 SetWinMetaFileBits@16
SetWindowExtEx@16=NtGdiSetWindowExtEx@16 SetWindowExtEx@16=NtGdiSetWindowExtEx@16
SetWindowOrgEx@16=NtGdiSetWindowOrgEx@16 SetWindowOrgEx@16=NtGdiSetWindowOrgEx@16
SetWorldTransform@8=NtGdiSetWorldTransform@8 SetWorldTransform@8
StartDocA@8 StartDocA@8
StartDocW@8 StartDocW@8
StartFormPage@4 StartFormPage@4

8
reactos/include/reactos/win32k/ntgdibad.h
View file

@ -775,14 +775,6 @@ NtGdiSetWindowOrgEx (
LPPOINT Point LPPOINT Point
); );
/* Use NtGdiModifyWorldTransform with MWT_MAX + 1; */
BOOL
STDCALL
NtGdiSetWorldTransform (
HDC hDC,
CONST LPXFORM Xform
);
/* Use NtGdiStretchDIBitsInternal. */ /* Use NtGdiStretchDIBitsInternal. */
INT INT
STDCALL STDCALL

52
reactos/subsystems/win32/win32k/objects/coord.c
View file

@ -924,57 +924,5 @@ NtGdiSetWindowOrgEx(HDC hDC,
return TRUE; return TRUE;
} }
BOOL
STDCALL
NtGdiSetWorldTransform(HDC hDC,
CONST LPXFORM XForm)
{
PDC dc;
NTSTATUS Status = STATUS_SUCCESS;
dc = DC_LockDc (hDC);
if ( !dc )
{
SetLastWin32Error(ERROR_INVALID_HANDLE);
return FALSE;
}
if (!XForm)
{
DC_UnlockDc(dc);
/* Win doesn't set LastError */
return FALSE;
}
/* Check that graphics mode is GM_ADVANCED */
if ( dc->Dc_Attr.iGraphicsMode != GM_ADVANCED )
{
DC_UnlockDc(dc);
return FALSE;
}
_SEH_TRY
{
ProbeForRead(XForm,
sizeof(XFORM),
1);
dc->w.xformWorld2Wnd = *XForm;
}
_SEH_HANDLE
{
Status = _SEH_GetExceptionCode();
}
_SEH_END;
if(!NT_SUCCESS(Status))
{
DC_UnlockDc(dc);
return FALSE;
}
DC_UpdateXforms(dc);
DC_UnlockDc(dc);
return TRUE;
}
/* EOF */ /* EOF */

2
reactos/subsystems/win32/win32k/objects/path.c
View file

@ -448,7 +448,7 @@ PATH_FillPath( PDC dc, GdiPath *pPath )
/* Go to GM_ADVANCED temporarily to restore the world transform */ /* Go to GM_ADVANCED temporarily to restore the world transform */
graphicsMode = NtGdiGetGraphicsMode( dc->hSelf ); graphicsMode = NtGdiGetGraphicsMode( dc->hSelf );
NtGdiSetGraphicsMode( dc->hSelf, GM_ADVANCED ); NtGdiSetGraphicsMode( dc->hSelf, GM_ADVANCED );
NtGdiSetWorldTransform( dc->hSelf, &xform ); NtGdiModifyWorldTransform( dc->hSelf, &xform, MWT_MAX+1 );
NtGdiSetGraphicsMode( dc->hSelf, graphicsMode ); NtGdiSetGraphicsMode( dc->hSelf, graphicsMode );
return TRUE; return TRUE;
} }

1
reactos/subsystems/win32/win32k/w32ksvc.db
View file

@ -715,7 +715,6 @@ NtGdiSetViewportExtEx 4
NtGdiSetViewportOrgEx 4 NtGdiSetViewportOrgEx 4
NtGdiSetWindowExtEx 4 NtGdiSetWindowExtEx 4
NtGdiSetWindowOrgEx 4 NtGdiSetWindowOrgEx 4
NtGdiSetWorldTransform 2
NtGdiStretchDIBits 13 NtGdiStretchDIBits 13
NtGdiTranslateCharsetInfo 3 NtGdiTranslateCharsetInfo 3
NtGdiUpdateICMRegKey 4 NtGdiUpdateICMRegKey 4