Author: greatlrd Date: Sun Sep 23 18:35:40 2007 New Revision: 29163
URL: http://svn.reactos.org/svn/reactos?rev=29163&view=rev Log: Fix : UnrealizeObject behoivr as windows 2000/XP see msdn http://msdn2.microsoft.com/en-us/library/ms532602.aspx Redirect : XFORMOBJ_bApplyXform@20 to NtGdiXFORMOBJ_bApplyXform@20 Redirect : XFORMOBJ_iGetXform@8 to NtGdiXFORMOBJ_iGetXform@8 Redirect : XLATEOBJ_cGetPalette@16 to NtGdiXLATEOBJ_cGetPalette@16 Redirect : XLATEOBJ_hGetColorTransform@4 to NtGdiXLATEOBJ_hGetColorTransform@4
Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c
Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?r... ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Sun Sep 23 18:35:40 2007 @@ -536,7 +536,16 @@ TextOutA@20 TextOutW@20 TranslateCharsetInfo@12 - +UnloadNetworkFonts@4 +UnrealizeObject@4 +UpdateColors@4 +UpdateICMRegKeyA@16 +UpdateICMRegKeyW@16 +WidenPath@4 +XFORMOBJ_bApplyXform@20=NtGdiXFORMOBJ_bApplyXform@20 +XFORMOBJ_iGetXform@8=NtGdiXFORMOBJ_iGetXform@8 +XLATEOBJ_cGetPalette@16=NtGdiXLATEOBJ_cGetPalette@16 +XLATEOBJ_hGetColorTransform@4=NtGdiXLATEOBJ_hGetColorTransform@4
ClearBitmapAttributes@8 @@ -605,17 +614,6 @@ GetTextExtentPoint32A@16 SetBitmapAttributes@8 SetBrushAttributes@8 -UnrealizeObject@4 -UnloadNetworkFonts@4 -UpdateColors@4 -UpdateICMRegKeyA@16 -UpdateICMRegKeyA@16 -UpdateICMRegKeyW@16 -WidenPath@4 -XFORMOBJ_bApplyXform@20 -XFORMOBJ_iGetXform@8 -XLATEOBJ_cGetPalette@16 -XLATEOBJ_hGetColorTransform@4 XLATEOBJ_iXlate@8 XLATEOBJ_piVector@4 bInitSystemAndFontsDirectoriesW@8
Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs.... ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sun Sep 23 18:35:40 2007 @@ -911,11 +911,16 @@ */ BOOL STDCALL -UnrealizeObject( - HGDIOBJ a0 - ) -{ - return NtGdiUnrealizeObject(a0); +UnrealizeObject(HGDIOBJ hgdiobj) +{ + BOOL retValue = TRUE; + + if (GDI_HANDLE_GET_TYPE(hgdiobj) != GDI_OBJECT_TYPE_BRUSH) + { + retValue = NtGdiUnrealizeObject(hgdiobj); + } + + return retValue; }
@@ -2338,58 +2343,6 @@ NULL); }
-/* - * @unimplemented - */ -BOOL STDCALL -XFORMOBJ_bApplyXform(XFORMOBJ *pxo, - ULONG iMode, - ULONG cPoints, - PVOID pvIn, - PVOID pvOut) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -ULONG STDCALL -XFORMOBJ_iGetXform(XFORMOBJ *pxo, - XFORML *pxform) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -ULONG -STDCALL -XLATEOBJ_cGetPalette(XLATEOBJ *XlateObj, - ULONG PalOutType, - ULONG cPal, - ULONG *OutPal) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -HANDLE STDCALL -XLATEOBJ_hGetColorTransform(XLATEOBJ *pxlo) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -}
/* * @unimplemented