From b34cf0f3ac60d0009d3ee7024028820b14206374 Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Sun, 23 Sep 2007 13:46:20 +0000 Subject: [PATCH] implement StartFormPage it call on StartPage(hdc); and StartPage is unimplment Fix : do not redirect TranslateCharsetInfo and StretchDIBits some stuff need be done in user mode. svn path=/trunk/; revision=29162 --- reactos/dll/win32/gdi32/gdi32.def | 21 +++++++------ reactos/dll/win32/gdi32/misc/stubs.c | 45 +++++++++++++++++++++++++--- 2 files changed, 51 insertions(+), 15 deletions(-) diff --git a/reactos/dll/win32/gdi32/gdi32.def b/reactos/dll/win32/gdi32/gdi32.def index e1d691f4c42..c54af953afa 100644 --- a/reactos/dll/win32/gdi32/gdi32.def +++ b/reactos/dll/win32/gdi32/gdi32.def @@ -436,7 +436,6 @@ PolyDraw@16 PolyPatBlt@20 PolyPolygon@16 PolyPolyline@16 - PolyTextOutA@12 PolyTextOutW@12 Polygon@12 @@ -527,6 +526,16 @@ SetWindowOrgEx@16 SetWorldTransform@8 StartDocA@8 StartDocW@8 +StartFormPage@4 +StartPage@4 +StretchBlt@44 +StretchDIBits@52 +StrokeAndFillPath@4 +StrokePath@4 +SwapBuffers@4 +TextOutA@20 +TextOutW@20 +TranslateCharsetInfo@12 @@ -596,16 +605,6 @@ GetTextExtentExPointWPri@28 GetTextExtentPoint32A@16 SetBitmapAttributes@8 SetBrushAttributes@8 -StartFormPage@4 -StartPage@4 -StretchBlt@44 -StretchDIBits@52=NtGdiStretchDIBits@52 -StrokeAndFillPath@4 -StrokePath@4 -SwapBuffers@4 -TextOutA@20 -TextOutW@20 -TranslateCharsetInfo@12=NtGdiTranslateCharsetInfo@12 UnrealizeObject@4 UnloadNetworkFonts@4 UpdateColors@4 diff --git a/reactos/dll/win32/gdi32/misc/stubs.c b/reactos/dll/win32/gdi32/misc/stubs.c index c52043950e2..a7cd81490d6 100644 --- a/reactos/dll/win32/gdi32/misc/stubs.c +++ b/reactos/dll/win32/gdi32/misc/stubs.c @@ -20,6 +20,45 @@ #define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again later.\n", __FUNCTION__); + +/* + * @unimplemented + */ +BOOL +STDCALL +TranslateCharsetInfo(DWORD * lpSrc, + LPCHARSETINFO lpCs, + DWORD dwFlags) +{ + /* FIXME share memory */ + return NtGdiTranslateCharsetInfo(lpSrc, lpCs, dwFlags ); +} + +/* + * @unimplemented + */ +int +STDCALL +StretchDIBits(HDC hdc, + int XDest, + int YDest, + int nDestWidth, + int nDestHeight, + int XSrc, + int YSrc, + int nSrcWidth, + int nSrcHeight, + CONST VOID *lpBits, + CONST BITMAPINFO *lpBitsInfo, + UINT iUsage, + DWORD dwRop) + +{ + /* FIXME share memory */ + return NtGdiStretchDIBits(hdc, XDest, YDest, nDestWidth, nDestHeight, XSrc, YSrc, + nSrcWidth, nSrcHeight, lpBits, lpBitsInfo, iUsage, dwRop); +} + /* * @unimplemented */ @@ -1832,15 +1871,13 @@ SetLayoutWidth(HDC hdc,LONG wox,DWORD dwLayout) /* - * @unimplemented + * @implemented */ int STDCALL StartFormPage(HDC hdc) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return StartPage(hdc); } /*