[ros-diffs] [greatlrd] 28697: Fix typo in : AddFontResourceExW Redirect : GetColorAdjustment, GetCharWidthInfo to win32k.sys implement : GetEUDCTimeStamp add smaller code in user mode : GetDeviceCaps, GetCurrentPositionEx, GetCurrentObject, GetClipBox, GetCharWidthFloatW, GetCharWidth32W, GetCharABCWidths
greatlrd at svn.reactos.org
greatlrd at svn.reactos.org
Fri Aug 31 13:28:46 CEST 2007
Author: greatlrd
Date: Fri Aug 31 15:28:45 2007
New Revision: 28697
URL: http://svn.reactos.org/svn/reactos?rev=28697&view=rev
Log:
Fix typo in : AddFontResourceExW
Redirect : GetColorAdjustment, GetCharWidthInfo to win32k.sys
implement : GetEUDCTimeStamp
add smaller code in user mode : GetDeviceCaps, GetCurrentPositionEx, GetCurrentObject, GetClipBox, GetCharWidthFloatW, GetCharWidth32W, GetCharABCWidths
Modified:
trunk/reactos/dll/win32/gdi32/gdi32.def
trunk/reactos/dll/win32/gdi32/misc/stubs.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?rev=28697&r1=28696&r2=28697&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/gdi32.def (original)
+++ trunk/reactos/dll/win32/gdi32/gdi32.def Fri Aug 31 15:28:45 2007
@@ -286,7 +286,36 @@
GetCharABCWidthsFloatA at 16
GetCharABCWidthsFloatW at 16
GetCharABCWidthsI at 20
-
+GetCharABCWidthsW at 16
+GetCharWidth32A at 16
+GetCharWidth32W at 16
+GetCharWidthA at 16
+GetCharWidthFloatA at 16
+GetCharWidthFloatW at 16
+GetCharWidthI at 20
+GetCharWidthInfo at 8=NtGdiGetCharWidthInfo at 8
+GetCharWidthW at 16
+GetCharacterPlacementA at 24
+GetCharacterPlacementW at 24
+GetClipBox at 8
+GetClipRgn at 8
+GetColorAdjustment at 8=NtGdiGetColorAdjustment at 8
+GetColorSpace at 4
+GetCurrentObject at 8
+GetCurrentPositionEx at 8
+GetDCBrushColor at 4
+GetDCOrgEx at 8
+GetDCPenColor at 4
+GetDIBColorTable at 16
+GetDIBits at 28
+GetDeviceCaps at 8
+GetDeviceGammaRamp at 8
+GetETM at 8
+GetEUDCTimeStamp at 0
+GetEUDCTimeStampExW at 4
+GetEnhMetaFileA at 4
+GetEnhMetaFileBits at 12
+GetEnhMetaFileDescriptionA at 12
ClearBitmapAttributes at 8
@@ -350,41 +379,11 @@
GdiDrawStream at 12
GetBitmapAttributes at 4
GetBrushAttributes at 4
-GetCharABCWidthsW at 16=NtGdiGetCharABCWidths at 16
-GetCharWidth32A at 16
-GetCharWidth32W at 16=NtGdiGetCharWidth32 at 16
-GetCharWidthA at 16
-GetCharWidthFloatA at 16
-GetCharWidthFloatW at 16=NtGdiGetCharWidthFloat at 16
-GetCharWidthI at 20
-GetCharWidthInfo at 8
-GetCharWidthW at 16
-GetCharacterPlacementA at 24
-GetCharacterPlacementW at 24
-GetClipBox at 8=NtGdiGetClipBox at 8
-GetClipRgn at 8
-GetColorAdjustment at 8
-GetColorSpace at 4
-GetCurrentObject at 8=NtGdiGetCurrentObject at 8
-GetCurrentPositionEx at 8=NtGdiGetCurrentPositionEx at 8
-GetDCBrushColor at 4
-GetDCOrgEx at 8
-GetDCPenColor at 4
-GetDIBColorTable at 16
-GetDIBits at 28
-GetDeviceCaps at 8=NtGdiGetDeviceCaps at 8
-GetDeviceGammaRamp at 8
-GetEnhMetaFileA at 4
-GetEnhMetaFileBits at 12
-GetEnhMetaFileDescriptionA at 12
GetEnhMetaFileDescriptionW at 12
GetEnhMetaFileHeader at 12
GetEnhMetaFilePaletteEntries at 12
GetEnhMetaFilePixelFormat at 12
GetEnhMetaFileW at 4
-GetETM at 8
-GetEUDCTimeStamp at 0
-GetEUDCTimeStampExW at 4
GetFontAssocStatus at 4
GetFontData at 20=NtGdiGetFontData at 20
GetFontLanguageInfo at 4
Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs.c?rev=28697&r1=28696&r2=28697&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Fri Aug 31 15:28:45 2007
@@ -609,20 +609,7 @@
}
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-GetColorAdjustment(
- HDC hdc,
- LPCOLORADJUSTMENT a1
- )
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return FALSE;
-}
+
/*
@@ -1435,7 +1422,7 @@
STDCALL
GdiConvertFont(HFONT hfont)
{
- return hfont;
+ return hfont;
}
/*
@@ -1445,7 +1432,7 @@
STDCALL
GdiConvertPalette(HPALETTE hpal)
{
- return hpal;
+ return hpal;
}
/*
@@ -1455,7 +1442,7 @@
STDCALL
GdiConvertRegion(HRGN hregion)
{
- return hregion;
+ return hregion;
}
/*
@@ -1692,15 +1679,13 @@
}
/*
- * @unimplemented
+ * @implemented
*/
ULONG
STDCALL
GetEUDCTimeStamp(VOID)
{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
+ return NtGdiGetEudcTimeStampEx(NULL,0,TRUE);
}
/*
@@ -2002,17 +1987,7 @@
return 0;
}
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-GetCharWidthInfo(HDC hdc,PCHWIDTHINFO pChWidthInfo)
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
+
/*
* @unimplemented
@@ -2840,3 +2815,100 @@
return NtGdiGetCharABCWidthsFloat(hdc, FirstChar, LastChar, abcF);
}
+/*
+ * @implemented
+ *
+ */
+int
+STDCALL
+GetDeviceCaps(HDC hdc,
+ int i)
+{
+ /* FIXME some part need be done in user mode */
+ return NtGdiGetDeviceCaps(hdc,i);
+}
+
+
+/*
+ * @implemented
+ *
+ */
+BOOL
+STDCALL
+GetCurrentPositionEx(HDC hdc,
+ LPPOINT lpPoint)
+{
+ /* FIXME some part need be done in user mode */
+ return NtGdiGetCurrentPositionEx(hdc, lpPoint);
+}
+
+/*
+ * @implemented
+ *
+ */
+HGDIOBJ
+STDCALL
+GetCurrentObject(HDC hdc,
+ UINT uObjectType)
+{
+ /* FIXME some part need be done in user mode */
+ return NtGdiGetCurrentObject(hdc, uObjectType);
+}
+
+/*
+ * @implemented
+ *
+ */
+int
+STDCALL
+GetClipBox(HDC hdc,
+ LPRECT lprc)
+{
+ /* FIXME some part need be done in user mode */
+ return NtGdiGetClipBox(hdc, lprc);
+}
+
+/*
+ * @implemented
+ *
+ */
+BOOL
+STDCALL
+GetCharWidthFloatW(HDC hdc,
+ UINT iFirstChar,
+ UINT iLastChar,
+ PFLOAT pxBuffer)
+{
+ /* FIXME some part need be done in user mode */
+ return NtGdiGetCharWidthFloat(hdc, iFirstChar, iLastChar, pxBuffer);
+}
+
+/*
+ * @implemented
+ *
+ */
+BOOL
+STDCALL
+GetCharWidth32W(HDC hdc,
+ UINT iFirstChar,
+ UINT iLastChar,
+ LPINT lpBuffer)
+{
+ /* FIXME some part need be done in user mode */
+ return NtGdiGetCharWidth32(hdc, iFirstChar, iLastChar, lpBuffer);
+}
+
+/*
+ * @implemented
+ *
+ */
+BOOL
+STDCALL
+GetCharABCWidths(HDC hdc,
+ UINT uFirstChar,
+ UINT uLastChar,
+ LPABC lpabc)
+{
+ /* FIXME some part need be done in user mode */
+ return NtGdiGetCharABCWidths(hdc, uFirstChar, uLastChar, lpabc);
+}
Modified: trunk/reactos/dll/win32/gdi32/objects/font.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/font.c?rev=28697&r1=28696&r2=28697&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/font.c (original)
+++ trunk/reactos/dll/win32/gdi32/objects/font.c Fri Aug 31 15:28:45 2007
@@ -1093,7 +1093,7 @@
{
int retVal = 0;
- if (fl & (FR_PRIVATE | FR_NOT_ENUM))
+ if (!(fl & (FR_PRIVATE | FR_NOT_ENUM)))
{
retVal = GdiAddFontResourceW(lpszFilename, fl,0);
}
@@ -1170,7 +1170,7 @@
STDCALL
AddFontResourceW ( LPCWSTR lpszFilename )
{
- return GdiAddFontResourceW ( lpszFilename, 0, 0 );
+ return GdiAddFontResourceW ( lpszFilename, 0, 0 );
}
More information about the Ros-diffs
mailing list