[greatlrd] 29154: Fix : RemoveFontResourceA : let it call to RemoveFontResourceExA Fix : RemoveFontResourceW : let it call to RemoveFontResourceExW Fix : a comment in SetWorldTransform Fix : Redirect STROBJ_bEnum@12 to win32k Fix : Redirect STROBJ_bEnumPositionsOnly@12 to win32k Fix : Redirect STROBJ_bGetAdvanceWidths@16 to win32k Fix : Redirect STROBJ_dwGetCodePage@4 to win32k Fix : Redirect STROBJ_vEnumStart@4 to win32k Fix : Redirect SetFontEnumeration to win32k Fix : Redirect SetMagicColors
Author: greatlrd Date: Sun Sep 23 15:33:47 2007 New Revision: 29154
URL: http://svn.reactos.org/svn/reactos?rev=29154&view=rev Log: Fix : RemoveFontResourceA : let it call to RemoveFontResourceExA Fix : RemoveFontResourceW : let it call to RemoveFontResourceExW Fix : a comment in SetWorldTransform Fix : Redirect STROBJ_bEnum@12 to win32k Fix : Redirect STROBJ_bEnumPositionsOnly@12 to win32k Fix : Redirect STROBJ_bGetAdvanceWidths@16 to win32k Fix : Redirect STROBJ_dwGetCodePage@4 to win32k Fix : Redirect STROBJ_vEnumStart@4 to win32k Fix : Redirect SetFontEnumeration to win32k Fix : Redirect SetMagicColors to win32k Fix : Redirect SetSystemPaletteUse to win32k Fix : Redirect SetVirtualResolution@20 to win32k Fix : PtInRegion : Make smaller code in gdi32 for sharememory/metadc Fix : RectInRegion : Make smaller code in gdi32 for sharememory/metadc Fix : SetBrushOrgEx : Make smaller code in gdi32 for sharememory/metadc Fix : SetDIBits : Make smaller code in gdi32 for sharememory/metadc Fix : SetGraphicsMode : Make smaller code in gdi32 for sharememory/metadc Implement RemoveFontResourceExA : it is partly implement it miss flags, and pdv and we also need fix win32k Implement RemoveFontResourceExW : it is partly implement it miss flags, and pdv and we also need fix win32k
and more stuff
Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/misc/stubsa.c trunk/reactos/dll/win32/gdi32/misc/stubsw.c trunk/reactos/dll/win32/gdi32/objects/coord.c trunk/reactos/dll/win32/gdi32/objects/font.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 15:33:47 2007 @@ -437,14 +437,96 @@ PolyPolygon@16 PolyPolyline@16
- - - - - - - - +PolyTextOutA@12 +PolyTextOutW@12 +Polygon@12 +Polyline@12 +PolylineTo@12 +PtInRegion@12 +PtVisible@12=NtGdiPtVisible@12 +QueryFontAssocStatus@0 +RealizePalette@4 +RectInRegion@8 +RectVisible@8=NtGdiRectVisible@8 +Rectangle@20 +RemoveFontMemResourceEx@4 +RemoveFontResourceA@4 +RemoveFontResourceExA@12 +RemoveFontResourceExW@12 +RemoveFontResourceTracking@8 +RemoveFontResourceW@4 +ResetDCA@8 +ResetDCW@8 +ResizePalette@8 +RestoreDC@8 +RoundRect@28 +STROBJ_bEnum@12=NtGdiSTROBJ_bEnum@12 +STROBJ_bEnumPositionsOnly@12=NtGdiSTROBJ_bEnumPositionsOnly@12 +STROBJ_bGetAdvanceWidths@16=NtGdiSTROBJ_bGetAdvanceWidths@16 +STROBJ_dwGetCodePage@4=NtGdiSTROBJ_dwGetCodePage@4 +STROBJ_vEnumStart@4=NtGdiSTROBJ_vEnumStart@4 +SaveDC@4 +ScaleViewportExtEx@24 +ScaleWindowExtEx@24 +SelectBrushLocal@8 +SelectClipPath@8 +SelectClipRgn@8 +SelectFontLocal@8 +SelectObject@8 +SelectPalette@12 +SetAbortProc@8 +SetArcDirection@8 +SetBitmapBits@12=NtGdiSetBitmapBits@12 +SetBitmapDimensionEx@16=NtGdiSetBitmapDimension@16 +SetBkColor@8 +SetBkMode@8 +SetBoundsRect@12 +SetBrushOrgEx@16 +SetColorAdjustment@8 +SetColorSpace@8 +SetDCBrushColor@8 +SetDCPenColor@8 +SetDIBColorTable@16 +SetDIBits@28 +SetDIBitsToDevice@48 +SetDeviceGammaRamp@8 +SetEnhMetaFileBits@8 +SetFontEnumeration@4=NtGdiSetFontEnumeration@4 +SetGraphicsMode@8 +SetICMMode@8 +SetICMProfileA@8 +SetICMProfileW@8 +SetLayout@8 +SetLayoutWidth@12 +SetMagicColors@12=NtGdiSetMagicColors@12 +SetMapMode@8 +SetMapperFlags@8 +SetMetaFileBitsEx@8 +SetMetaRgn@4 +SetMiterLimit@12 +SetPaletteEntries@16 +SetPixel@16 +SetPixelFormat@12 +SetPixelV@16 +SetPolyFillMode@8 +SetROP2@8 +SetRectRgn@20 +SetRelAbs@8 +SetStretchBltMode@8 +SetSystemPaletteUse@8=NtGdiSetSystemPaletteUse@8 +SetTextAlign@8 +SetTextCharacterExtra@8 +SetTextColor@8 +SetTextJustification@12 +SetViewportExtEx@16 +SetViewportOrgEx@16 +SetVirtualResolution@20=NtGdiSetVirtualResolution@20 +SetWinMetaFileBits@16 +SetWindowExtEx@16 +SetWindowOrgEx@16 +SetWorldTransform@8 +StartDocA@8 +StartDocW@8
@@ -512,102 +594,12 @@ GetGlyphIndicesA@20 GetTextExtentExPointWPri@28 GetTextExtentPoint32A@16 -PolyTextOutA@12 -PolyTextOutW@12 -Polygon@12 -Polyline@12 -PolylineTo@12 -PtInRegion@12=NtGdiPtInRegion@12 -PtVisible@12=NtGdiPtVisible@12 -QueryFontAssocStatus@0 -RealizePalette@4 -RectInRegion@8=NtGdiRectInRegion@8 -RectVisible@8=NtGdiRectVisible@8 -Rectangle@20 -RemoveFontMemResourceEx@4 -RemoveFontResourceA@4 -RemoveFontResourceExA@12 -RemoveFontResourceExW@12 -RemoveFontResourceW@4 -RemoveFontResourceTracking@8 -ResetDCA@8 -ResetDCW@8 -ResizePalette@8 -RestoreDC@8=NtGdiRestoreDC@8 -RoundRect@28 -SaveDC@4=NtGdiSaveDC@4 -ScaleViewportExtEx@24 -ScaleWindowExtEx@24 -SelectBrushLocal@8 -SelectClipPath@8 -SelectClipRgn@8 -SelectFontLocal@8 -SelectObject@8 -SelectPalette@12 -SetAbortProc@8 -SetArcDirection@8 SetBitmapAttributes@8 -SetBitmapBits@12=NtGdiSetBitmapBits@12 -SetBitmapDimensionEx@16=NtGdiSetBitmapDimension@16 -SetBkColor@8 -SetBkMode@8 -SetBoundsRect@12 SetBrushAttributes@8 -SetBrushOrgEx@16=NtGdiSetBrushOrg@16 -SetColorAdjustment@8 -SetColorSpace@8 -SetDCBrushColor@8 -SetDCPenColor@8 -SetDIBColorTable@16 -SetDIBits@28=NtGdiSetDIBits@28 -SetDIBitsToDevice@48 -SetDeviceGammaRamp@8 -SetEnhMetaFileBits@8 -SetFontEnumeration@4 -SetGraphicsMode@8=NtGdiSetGraphicsMode@8 -SetICMMode@8 -SetICMProfileA@8 -SetICMProfileW@8 -SetLayout@8 -SetLayoutWidth@12 -SetMagicColors@12 -SetMapMode@8 -SetMapperFlags@8 -SetMetaFileBitsEx@8 -SetMetaRgn@4 -SetMiterLimit@12 -SetPaletteEntries@16 -SetPixel@16 -SetPixelFormat@12 -SetPixelV@16 -SetPolyFillMode@8=NtGdiSetPolyFillMode@8 -SetROP2@8=NtGdiSetROP2@8 -SetRectRgn@20=NtGdiSetRectRgn@20 -SetRelAbs@8 -SetStretchBltMode@8=NtGdiSetStretchBltMode@8 -SetSystemPaletteUse@8 -SetTextAlign@8=NtGdiSetTextAlign@8 -SetTextCharacterExtra@8 -SetTextColor@8 -SetTextJustification@12 -SetViewportExtEx@16=NtGdiSetViewportExtEx@16 -SetViewportOrgEx@16=NtGdiSetViewportOrgEx@16 -SetVirtualResolution@20 -SetWinMetaFileBits@16 -SetWindowExtEx@16=NtGdiSetWindowExtEx@16 -SetWindowOrgEx@16=NtGdiSetWindowOrgEx@16 -SetWorldTransform@8 -StartDocA@8 -StartDocW@8 StartFormPage@4 StartPage@4 StretchBlt@44 StretchDIBits@52=NtGdiStretchDIBits@52 -STROBJ_bEnum@12 -STROBJ_bEnumPositionsOnly@12 -STROBJ_bGetAdvanceWidths@16 -STROBJ_dwGetCodePage@4 -STROBJ_vEnumStart@4 StrokeAndFillPath@4 StrokePath@4 SwapBuffers@4
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 15:33:47 2007 @@ -23,51 +23,257 @@ /* * @unimplemented */ -BOOL -STDCALL -CancelDC( - HDC a0 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/* - * @unimplemented - */ int STDCALL -DrawEscape( - HDC a0, - int a1, - int a2, - LPCSTR a3 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - +SetDIBits(HDC hdc, + HBITMAP hbmp, + UINT uStartScan, + UINT cScanLines, + CONST VOID *lpvBits, + CONST BITMAPINFO *lpbmi, + UINT fuColorUse) +{ + /* FIXME share memory */ + return NtGdiSetDIBits(hdc, hbmp, uStartScan, cScanLines, lpvBits, lpbmi, fuColorUse); +}
/* * @unimplemented */ int STDCALL -EnumObjects( - HDC a0, - int a1, - GOBJENUMPROC a2, - LPARAM a3 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +SetGraphicsMode(HDC hdc, + int iMode) +{ + /* FIXME share memory */ + return NtGdiSetGraphicsMode(hdc, iMode); +} + +/* + * @unimplemented + */ +int +STDCALL +SetPolyFillMode(HDC hdc, + int iPolyFillMode) +{ + /* FIXME share memory */ + return NtGdiSetPolyFillMode(hdc, iPolyFillMode); +} + +/* + * @unimplemented + */ +int +STDCALL +SetROP2(HDC hdc, + int fnDrawMode) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +int +STDCALL +SetStretchBltMode(HDC hdc, int iStretchMode) +{ + /* FIXME share memory */ + return NtGdiSetStretchBltMode(hdc, iStretchMode); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +SetRectRgn(HRGN hrgn, + int nLeftRect, + int nTopRect, + int nRightRect, + int nBottomRect) +{ + /* FIXME metadc stuff */ + return NtGdiSetRectRgn(hrgn, nLeftRect, nTopRect, nRightRect, nBottomRect); +} + +/* + * @unimplemented + */ +UINT +STDCALL +SetTextAlign(HDC hdc, + UINT fMode) +{ + /* FIXME share memory */ + return NtGdiSetTextAlign(hdc, fMode); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +SetViewportExtEx(HDC hdc, + int nXExtent, + int nYExtent, + LPSIZE lpSize) +{ + /* FIXME share memory */ + return NtGdiSetViewportExtEx(hdc, nXExtent, nYExtent, lpSize); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +SetWindowOrgEx(HDC hdc, + int X, + int Y, + LPPOINT lpPoint) +{ + /* FIXME share memory */ + return NtGdiSetWindowOrgEx(hdc,X,Y,lpPoint); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +SetWindowExtEx(HDC hdc, + int nXExtent, + int nYExtent, + LPSIZE lpSize) +{ + /* FIXME share memory */ + return NtGdiSetWindowExtEx(hdc, nXExtent, nYExtent, lpSize); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +SetViewportOrgEx(HDC hdc, + int X, + int Y, + LPPOINT lpPoint) +{ + /* FIXME share memory */ + return NtGdiSetViewportOrgEx(hdc,X,Y,lpPoint); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +SetBrushOrgEx(HDC hdc, + int nXOrg, + int nYOrg, + LPPOINT lppt) +{ + /* FIXME share memory */ + return NtGdiSetBrushOrg(hdc,nXOrg,nYOrg,lppt); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +PtInRegion(IN HRGN hrgn, + int x, + int y) +{ + /* FIXME some stuff at user mode need be fixed */ + return NtGdiPtInRegion(hrgn,x,y); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +RectInRegion(HRGN hrgn, + LPCRECT prcl) +{ + /* FIXME some stuff at user mode need be fixed */ + return NtGdiRectInRegion(hrgn, (LPRECT) prcl); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +RestoreDC(IN HDC hdc, + IN INT iLevel) +{ + /* FIXME Sharememory */ + return NtGdiRestoreDC(hdc, iLevel); +} + +/* + * @unimplemented + */ +INT +STDCALL +SaveDC(IN HDC hdc) +{ + /* FIXME Sharememory */ + return NtGdiSaveDC(hdc); +} + + + +/* + * @unimplemented + */ +BOOL +STDCALL +CancelDC(HDC hdc) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/* + * @unimplemented + */ +int +STDCALL +DrawEscape(HDC hdc, + int a1, + int a2, + LPCSTR a3) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + + +/* + * @unimplemented + */ +int +STDCALL +EnumObjects(HDC hdc, + int a1, + GOBJENUMPROC a2, + LPARAM a3) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -239,21 +445,6 @@ SetMetaFileBitsEx( UINT a0, CONST BYTE *a1 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -UINT -STDCALL -SetSystemPaletteUse( - HDC a0, - UINT a1 ) { UNIMPLEMENTED; @@ -740,13 +931,11 @@ */ HCOLORSPACE STDCALL -GetColorSpace( - HDC hDc - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GetColorSpace(HDC hDc) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
@@ -786,10 +975,6 @@ return retValue; }
- - - - /* * @implemented */ @@ -1061,13 +1246,6 @@ * === WHERE ARE THEY DEFINED? ============= */
- - - - - - - /* * @unimplemented */ @@ -1122,25 +1300,6 @@ return 0; }
- - - - -/* - * @unimplemented - */ -DWORD -STDCALL -SetFontEnumeration( - DWORD a0 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - /* * @unimplemented */ @@ -1383,9 +1542,9 @@ STDCALL GdiIsMetaPrintDC(HDC hdc) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -1395,9 +1554,9 @@ STDCALL GdiIsPlayMetafileDC(HDC hdc) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -1407,9 +1566,9 @@ STDCALL GdiValidateHandle(HGDIOBJ hobj) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -1419,9 +1578,9 @@ STDCALL GetBitmapAttributes(HBITMAP hbm) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -1431,9 +1590,9 @@ STDCALL GetBrushAttributes(HBRUSH hbr) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -1441,17 +1600,16 @@ */ BOOL STDCALL -GetCharABCWidthsI( - HDC hdc, - UINT giFirst, - UINT cgi, - LPWORD pgi, - LPABC lpabc +GetCharABCWidthsI(HDC hdc, + UINT giFirst, + UINT cgi, + LPWORD pgi, + LPABC lpabc ) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -1459,17 +1617,16 @@ */ BOOL STDCALL -GetCharWidthI( - HDC hdc, - UINT giFirst, - UINT cgi, - LPWORD pgi, - LPINT lpBuffer +GetCharWidthI(HDC hdc, + UINT giFirst, + UINT cgi, + LPWORD pgi, + LPINT lpBuffer ) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
@@ -1508,9 +1665,9 @@ STDCALL GetHFONT(HDC dc) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -1518,13 +1675,12 @@ */ DWORD STDCALL -GetLayout( - HDC hdc +GetLayout(HDC hdc ) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -1573,9 +1729,9 @@ STDCALL MirrorRgn(HWND hwnd,HRGN hrgn) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
@@ -1587,9 +1743,9 @@ STDCALL QueryFontAssocStatus(VOID) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -1653,14 +1809,12 @@ */ DWORD STDCALL -SetLayout( - HDC hdc, - DWORD dwLayout -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +SetLayout(HDC hdc, + DWORD dwLayout) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -1670,34 +1824,12 @@ STDCALL SetLayoutWidth(HDC hdc,LONG wox,DWORD dwLayout) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -SetMagicColors(HDC hdc,PALETTEENTRY peMagic,ULONG Index) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -SetVirtualResolution(HDC hdc, int cxVirtualDevicePixel,int cyVirtualDevicePixel,int cxVirtualDeviceMm, int cyVirtualDeviceMm) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +
/* * @unimplemented @@ -1706,9 +1838,9 @@ STDCALL StartFormPage(HDC hdc) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -1718,8 +1850,8 @@ STDCALL UnloadNetworkFonts(DWORD unknown) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); }
/* @@ -1760,11 +1892,12 @@ */ BOOL STDCALL -GdiRealizationInfo(HDC hdc, PREALIZATION_INFO pri) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GdiRealizationInfo(HDC hdc, + PREALIZATION_INFO pri) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
@@ -1774,23 +1907,27 @@ */ BOOL STDCALL -GetETM(HDC hdc,EXTTEXTMETRIC *petm) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiAddGlsRecord(HDC hdc,DWORD unknown1,LPCSTR unknown2,LPRECT unknown3) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GetETM(HDC hdc, + EXTTEXTMETRIC *petm) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiAddGlsRecord(HDC hdc, + DWORD unknown1, + LPCSTR unknown2, + LPRECT unknown3) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -1800,9 +1937,9 @@ STDCALL GdiConvertMetaFilePict(HGLOBAL hMem) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -1812,68 +1949,72 @@ STDCALL GdiConvertToDevmodeW(DEVMODEA *dm) { - LPDEVMODEW dmw; - - dmw = HEAP_alloc(sizeof(DEVMODEW)); -#define COPYS(f,len) MultiByteToWideChar ( CP_THREAD_ACP, 0, (LPSTR)dm->f, len, dmw->f, len ) -#define COPYN(f) dmw->f = dm->f - COPYS(dmDeviceName, CCHDEVICENAME ); - COPYN(dmSpecVersion); - COPYN(dmDriverVersion); - switch ( dm->dmSize ) + LPDEVMODEW dmw; + + dmw = HEAP_alloc(sizeof(DEVMODEW)); + #define COPYS(f,len) MultiByteToWideChar ( CP_THREAD_ACP, 0, (LPSTR)dm->f, len, dmw->f, len ) + #define COPYN(f) dmw->f = dm->f + COPYS(dmDeviceName, CCHDEVICENAME ); + COPYN(dmSpecVersion); + COPYN(dmDriverVersion); + switch ( dm->dmSize ) { - case SIZEOF_DEVMODEA_300: - dmw->dmSize = SIZEOF_DEVMODEW_300; - break; - case SIZEOF_DEVMODEA_400: - dmw->dmSize = SIZEOF_DEVMODEW_400; - break; - case SIZEOF_DEVMODEA_500: - default: /* FIXME what to do??? */ - dmw->dmSize = SIZEOF_DEVMODEW_500; - break; + case SIZEOF_DEVMODEA_300: + dmw->dmSize = SIZEOF_DEVMODEW_300; + break; + case SIZEOF_DEVMODEA_400: + dmw->dmSize = SIZEOF_DEVMODEW_400; + break; + case SIZEOF_DEVMODEA_500: + default: /* FIXME what to do??? */ + dmw->dmSize = SIZEOF_DEVMODEW_500; + break; } - COPYN(dmDriverExtra); - COPYN(dmFields); - COPYN(dmPosition.x); - COPYN(dmPosition.y); - COPYN(dmScale); - COPYN(dmCopies); - COPYN(dmDefaultSource); - COPYN(dmPrintQuality); - COPYN(dmColor); - COPYN(dmDuplex); - COPYN(dmYResolution); - COPYN(dmTTOption); - COPYN(dmCollate); - COPYS(dmFormName,CCHFORMNAME); - COPYN(dmLogPixels); - COPYN(dmBitsPerPel); - COPYN(dmPelsWidth); - COPYN(dmPelsHeight); - COPYN(dmDisplayFlags); // aka dmNup - COPYN(dmDisplayFrequency); - - if ( dm->dmSize <= SIZEOF_DEVMODEA_300 ) - return dmw; // we're done with 0x300 fields - - COPYN(dmICMMethod); - COPYN(dmICMIntent); - COPYN(dmMediaType); - COPYN(dmDitherType); - COPYN(dmReserved1); - COPYN(dmReserved2); - - if ( dm->dmSize <= SIZEOF_DEVMODEA_400 ) - return dmw; // we're done with 0x400 fields - - COPYN(dmPanningWidth); - COPYN(dmPanningHeight); - - return dmw; - -#undef COPYN -#undef COPYS + COPYN(dmDriverExtra); + COPYN(dmFields); + COPYN(dmPosition.x); + COPYN(dmPosition.y); + COPYN(dmScale); + COPYN(dmCopies); + COPYN(dmDefaultSource); + COPYN(dmPrintQuality); + COPYN(dmColor); + COPYN(dmDuplex); + COPYN(dmYResolution); + COPYN(dmTTOption); + COPYN(dmCollate); + COPYS(dmFormName,CCHFORMNAME); + COPYN(dmLogPixels); + COPYN(dmBitsPerPel); + COPYN(dmPelsWidth); + COPYN(dmPelsHeight); + COPYN(dmDisplayFlags); // aka dmNup + COPYN(dmDisplayFrequency); + + if ( dm->dmSize <= SIZEOF_DEVMODEA_300 ) + { + return dmw; // we're done with 0x300 fields + } + + COPYN(dmICMMethod); + COPYN(dmICMIntent); + COPYN(dmMediaType); + COPYN(dmDitherType); + COPYN(dmReserved1); + COPYN(dmReserved2); + + if ( dm->dmSize <= SIZEOF_DEVMODEA_400 ) + { + return dmw; // we're done with 0x400 fields + } + + COPYN(dmPanningWidth); + COPYN(dmPanningHeight); + + return dmw; + + #undef COPYN + #undef COPYS }
/* @@ -1883,9 +2024,9 @@ STDCALL GdiCreateLocalEnhMetaFile(HENHMETAFILE hmo) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -1895,9 +2036,9 @@ STDCALL GdiCreateLocalMetaFilePict(HENHMETAFILE hmo) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
@@ -1906,27 +2047,25 @@ */ HANDLE STDCALL -GdiGetSpoolFileHandle( - LPWSTR pwszPrinterName, - LPDEVMODEW pDevmode, - LPWSTR pwszDocName) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiDeleteSpoolFileHandle( - HANDLE SpoolFileHandle) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GdiGetSpoolFileHandle(LPWSTR pwszPrinterName, + LPDEVMODEW pDevmode, + LPWSTR pwszDocName) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiDeleteSpoolFileHandle(HANDLE SpoolFileHandle) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -1934,12 +2073,11 @@ */ DWORD STDCALL -GdiGetPageCount( - HANDLE SpoolFileHandle) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GdiGetPageCount(HANDLE SpoolFileHandle) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -1947,12 +2085,11 @@ */ HDC STDCALL -GdiGetDC( - HANDLE SpoolFileHandle) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GdiGetDC(HANDLE SpoolFileHandle) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -1960,127 +2097,119 @@ */ HANDLE STDCALL -GdiGetPageHandle( - HANDLE SpoolFileHandle, - DWORD Page, - LPDWORD pdwPageType) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiStartDocEMF( - HANDLE SpoolFileHandle, - DOCINFOW *pDocInfo) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiStartPageEMF( - HANDLE SpoolFileHandle) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiPlayPageEMF( - HANDLE SpoolFileHandle, - HANDLE hemf, - RECT *prectDocument, - RECT *prectBorder, - RECT *prectClip) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiEndPageEMF( - HANDLE SpoolFileHandle, - DWORD dwOptimization) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiEndDocEMF( - HANDLE SpoolFileHandle) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiGetDevmodeForPage( - HANDLE SpoolFileHandle, - DWORD dwPageNumber, - PDEVMODEW *pCurrDM, - PDEVMODEW *pLastDM) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiResetDCEMF( - HANDLE SpoolFileHandle, - PDEVMODEW pCurrDM) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GdiGetPageHandle(HANDLE SpoolFileHandle, + DWORD Page, + LPDWORD pdwPageType) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiStartDocEMF(HANDLE SpoolFileHandle, + DOCINFOW *pDocInfo) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiStartPageEMF(HANDLE SpoolFileHandle) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiPlayPageEMF(HANDLE SpoolFileHandle, + HANDLE hemf, + RECT *prectDocument, + RECT *prectBorder, + RECT *prectClip) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiEndPageEMF(HANDLE SpoolFileHandle, + DWORD dwOptimization) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiEndDocEMF(HANDLE SpoolFileHandle) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiGetDevmodeForPage(HANDLE SpoolFileHandle, + DWORD dwPageNumber, + PDEVMODEW *pCurrDM, + PDEVMODEW *pLastDM) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiResetDCEMF(HANDLE SpoolFileHandle, + PDEVMODEW pCurrDM) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
HBITMAP STDCALL -CreateDIBitmap(HDC - hDc, const BITMAPINFOHEADER *Header, - DWORD Init, LPCVOID Bits, const BITMAPINFO *Data, - UINT ColorUse) -{ - /* FIMXE we need do more thing in user mode */ - return NtGdiCreateDIBitmap(hDc, Header, Init, Bits, Data, ColorUse); +CreateDIBitmap(HDC hDc, + const BITMAPINFOHEADER *Header, + DWORD Init, LPCVOID Bits, const BITMAPINFO *Data, + UINT ColorUse) +{ + /* FIMXE we need do more thing in user mode */ + return NtGdiCreateDIBitmap(hDc, Header, Init, Bits, Data, ColorUse); }
/* @@ -2089,9 +2218,9 @@ INT STDCALL CombineRgn(HRGN hDest, - HRGN hSrc1, - HRGN hSrc2, - INT CombineMode) + HRGN hSrc1, + HRGN hSrc2, + INT CombineMode) { /* FIXME some part should be done in user mode */ return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); @@ -2101,12 +2230,11 @@ * @unimplemented */ HBITMAP STDCALL -CreateBitmap( - INT Width, - INT Height, - UINT Planes, - UINT BitsPixel, - PCVOID pUnsafeBits) +CreateBitmap(INT Width, + INT Height, + UINT Planes, + UINT BitsPixel, + PCVOID pUnsafeBits) { /* FIXME some part should be done in user mode */ return NtGdiCreateBitmap(Width, Height, Planes, BitsPixel, (LPBYTE) pUnsafeBits); @@ -2121,9 +2249,9 @@ LPWSTR STDCALL EngGetDriverName(HDEV hdev) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -2173,96 +2301,46 @@ NULL); }
- - /* * @unimplemented */ BOOL STDCALL -STROBJ_bEnum(STROBJ *pstro,ULONG *pc,PGLYPHPOS *ppgpos) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL STDCALL -STROBJ_bEnumPositionsOnly(STROBJ *pstro,ULONG *pc,PGLYPHPOS *ppgpos) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL STDCALL -STROBJ_bGetAdvanceWidths(STROBJ *pso,ULONG iFirst,ULONG c,POINTQF *pptqD) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -DWORD STDCALL -STROBJ_dwGetCodePage(STROBJ *pstro) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -VOID STDCALL -STROBJ_vEnumStart(STROBJ *pstro) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -} - -/* - * @unimplemented - */ -BOOL STDCALL -XFORMOBJ_bApplyXform(XFORMOBJ *pxo,ULONG iMode,ULONG cPoints,PVOID pvIn,PVOID pvOut) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +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 +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; + ULONG PalOutType, + ULONG cPal, + ULONG *OutPal) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -2271,9 +2349,9 @@ HANDLE STDCALL XLATEOBJ_hGetColorTransform(XLATEOBJ *pxlo) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -2281,20 +2359,21 @@ */ ULONG STDCALL XLATEOBJ_iXlate(XLATEOBJ *XlateObj, - ULONG Color) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -ULONG * STDCALL + ULONG Color) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +ULONG * +STDCALL XLATEOBJ_piVector(XLATEOBJ *XlateObj) { - return XlateObj->pulXlate; + return XlateObj->pulXlate; }
/* @@ -2302,37 +2381,32 @@ */ BOOL STDCALL -GdiPlayEMF -( - LPWSTR pwszPrinterName, - LPDEVMODEW pDevmode, - LPWSTR pwszDocName, - EMFPLAYPROC pfnEMFPlayFn, - HANDLE hPageQuery +GdiPlayEMF(LPWSTR pwszPrinterName, + LPDEVMODEW pDevmode, + LPWSTR pwszDocName, + EMFPLAYPROC pfnEMFPlayFn, + HANDLE hPageQuery ) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiPlayPrivatePageEMF -( - HANDLE SpoolFileHandle, - DWORD unknown, - RECT *prectDocument -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + + + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiPlayPrivatePageEMF(HANDLE SpoolFileHandle, + DWORD unknown, + RECT *prectDocument) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; }
/* @@ -2340,8 +2414,8 @@ */ VOID STDCALL GdiInitializeLanguagePack(DWORD InitParam) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); }
@@ -2352,8 +2426,8 @@ STDCALL ExcludeClipRect(IN HDC hdc, IN INT xLeft, IN INT yTop, IN INT xRight, IN INT yBottom) { - /* FIXME some part need be done on user mode size */ - return NtGdiExcludeClipRect(hdc, xLeft, yTop, xRight, yBottom); + /* FIXME some part need be done on user mode size */ + return NtGdiExcludeClipRect(hdc, xLeft, yTop, xRight, yBottom); }
/* @@ -2363,8 +2437,8 @@ STDCALL ExtSelectClipRgn( IN HDC hdc, IN HRGN hrgn, IN INT iMode) { - /* FIXME some part need be done on user mode size */ - return NtGdiExtSelectClipRgn(hdc,hrgn, iMode); + /* FIXME some part need be done on user mode size */ + return NtGdiExtSelectClipRgn(hdc,hrgn, iMode); }
/* @@ -2390,18 +2464,17 @@ */ BOOL STDCALL -GdiTransparentBlt( - IN HDC hdcDst, - IN INT xDst, - IN INT yDst, - IN INT cxDst, - IN INT cyDst, - IN HDC hdcSrc, - IN INT xSrc, - IN INT ySrc, - IN INT cxSrc, - IN INT cySrc, - IN COLORREF TransColor +GdiTransparentBlt(IN HDC hdcDst, + IN INT xDst, + IN INT yDst, + IN INT cxDst, + IN INT cyDst, + IN HDC hdcSrc, + IN INT xSrc, + IN INT ySrc, + IN INT cxSrc, + IN INT cySrc, + IN COLORREF TransColor ) { /* FIXME some part need be done in user mode */
Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubsa... ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsa.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsa.c Sun Sep 23 15:33:47 2007 @@ -233,23 +233,6 @@ UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; -} - - -/* - * @unimplemented - */ -BOOL -STDCALL -RemoveFontResourceExA( - LPCSTR lpFileName, - DWORD fl, - PVOID pdv -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; }
/*
Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubsw... ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsw.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsw.c Sun Sep 23 15:33:47 2007 @@ -271,21 +271,7 @@ return retValue; }
-/* - * @unimplemented - */ -BOOL -STDCALL -RemoveFontResourceExW( - LPCWSTR lpFileName, - DWORD fl, - PVOID pdv -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} +
/* * @unimplemented
Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/coo... ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/coord.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/coord.c Sun Sep 23 15:33:47 2007 @@ -158,7 +158,8 @@ STDCALL SetWorldTransform( HDC hDC, CONST XFORM *Xform ) { - return ModifyWorldTransform( hDC, Xform, MWT_MAX+1); // MWT_SETXFORM? + /* FIXME shall we add undoc #define MWT_SETXFORM 4 ?? */ + return ModifyWorldTransform( hDC, Xform, MWT_MAX+1); }
Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fon... ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Sun Sep 23 15:33:47 2007 @@ -1173,11 +1173,9 @@ */ BOOL STDCALL -RemoveFontResourceW( - LPCWSTR lpFileName - ) -{ - return NtGdiRemoveFontResource ( lpFileName ); +RemoveFontResourceW(LPCWSTR lpFileName) +{ + return RemoveFontResourceExW(lpFileName,0,0); }
@@ -1186,26 +1184,57 @@ */ BOOL STDCALL -RemoveFontResourceA( - LPCSTR lpFileName - ) -{ - NTSTATUS Status; - LPWSTR lpFileNameW; - BOOL rc = 0; - - Status = HEAP_strdupA2W ( &lpFileNameW, lpFileName ); - if (!NT_SUCCESS (Status)) +RemoveFontResourceA(LPCSTR lpFileName) +{ + return RemoveFontResourceExA(lpFileName,0,0); +} + +/* + * @implemented + */ +BOOL +STDCALL +RemoveFontResourceExA(LPCSTR lpFileName, + DWORD fl, + PVOID pdv +) +{ + NTSTATUS Status; + LPWSTR lpFileNameW; + BOOL rc = 0; + + /* FIXME the flags */ + /* FIXME the pdv */ + /* FIXME NtGdiRemoveFontResource handle flags and pdv */ + + Status = HEAP_strdupA2W ( &lpFileNameW, lpFileName ); + if (!NT_SUCCESS (Status)) SetLastError (RtlNtStatusToDosError(Status)); - else - { - rc = NtGdiRemoveFontResource ( lpFileNameW ); - - HEAP_free ( lpFileNameW ); + else + { + rc = NtGdiRemoveFontResource ( lpFileNameW ); + + HEAP_free ( lpFileNameW ); }
return rc; } + +/* + * @unimplemented + */ +BOOL +STDCALL +RemoveFontResourceExW(LPCWSTR lpFileName, + DWORD fl, + PVOID pdv) +{ + /* FIXME the flags */ + /* FIXME the pdv */ + /* FIXME NtGdiRemoveFontResource handle flags and pdv */ + return NtGdiRemoveFontResource ( lpFileName); +} +
/*********************************************************************** * GdiGetCharDimensions
-
greatlrd＠svn.reactos.org