Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-23 07:10:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bugfix : AddFontResourceExW, SetLastError to invaild param when the fl are not set.

Browse source 
Redirect : AnyLinkedFonts@0 to NtGdiAnyLinkedFonts@0 (stubed in win32k)
Redirect : BRUSHOBJ_hGetColorTransform@4 to NtGdiBRUSHOBJ_hGetColorTransform@4 (stubed in win32k)
Redirect : BRUSHOBJ_pvAllocRbrush@8 to  NtGdiBRUSHOBJ_pvAllocRbrush@8  (stubed in win32k)
partly working : GdiAddFontResourceW is parttly working but it does not works as windows version, instead for being stub, it is not finish implementions of it. This is nassry to clean up some mess. 


svn path=/trunk/; revision=28465
This commit is contained in:
Magnus Olsen 2007-08-23 09:52:31 +00:00
parent 851f4ff721
commit 94e74e9b8b
5 changed files with 35 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,28 +14,29 @@ AddFontMemResourceEx@16
AddFontResourceA@4
AddFontResourceExA@12
AddFontResourceExW@12
AddFontResourceW@4
AddFontResourceTracking@8
AddFontResourceW@4
AngleArc@24
AnimatePalette@16
AnyLinkedFonts@0
AnyLinkedFonts@0=NtGdiAnyLinkedFonts@0
Arc@36
ArcTo@36
BeginPath@4
BRUSHOBJ_hGetColorTransform@4
BRUSHOBJ_pvAllocRbrush@8
BRUSHOBJ_hGetColorTransform@4=NtGdiBRUSHOBJ_hGetColorTransform@4
BRUSHOBJ_pvAllocRbrush@8=NtGdiBRUSHOBJ_pvAllocRbrush@8
BRUSHOBJ_pvGetRbrush@4
BRUSHOBJ_ulGetBrushColor@4
BeginPath@4
BitBlt@36
CLIPOBJ_bEnum@12
CLIPOBJ_cEnumStart@20
CLIPOBJ_ppoGetPath@4
CancelDC@4
CheckColorsInGamut@16
ChoosePixelFormat@8
Chord@36
ClearBitmapAttributes@8
ClearBrushAttributes@8
CLIPOBJ_bEnum@12
CLIPOBJ_cEnumStart@20
CLIPOBJ_ppoGetPath@4
CloseEnhMetaFile@4
CloseFigure@4
CloseMetaFile@4

4
reactos/dll/win32/gdi32/include/gdi32p.h
View file

@ -184,5 +184,9 @@ UINT
WINAPI
UserRealizePalette(HDC hDC);
int
STDCALL
GdiAddFontResourceW(LPCWSTR lpszFilename,FLONG fl,DESIGNVECTOR *pdv);
/* EOF */

35
reactos/dll/win32/gdi32/misc/stubs.c
View file

@ -1314,17 +1314,7 @@ AddFontResourceTracking(
return 0;
}
/*
* @unimplemented
*/
BOOL
STDCALL
AnyLinkedFonts(VOID)
{
UNIMPLEMENTED;
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
}
/*
* @unimplemented
@ -2442,28 +2432,9 @@ GdiResetDCEMF(
return 0;
}
/*
* @unimplemented
*/
HANDLE STDCALL
BRUSHOBJ_hGetColorTransform(BRUSHOBJ *pbo)
{
UNIMPLEMENTED;
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
}
/*
* @unimplemented
*/
PVOID STDCALL
BRUSHOBJ_pvAllocRbrush(IN BRUSHOBJ *BrushObj,
IN ULONG ObjSize)
{
UNIMPLEMENTED;
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
}
/*
* @unimplemented

13
reactos/dll/win32/gdi32/misc/stubsw.c
View file

@ -258,11 +258,16 @@ EudcUnloadLinkW(LPCWSTR pBaseFaceName,LPCWSTR pEudcFontPath)
*/
int
STDCALL
GdiAddFontResourceW(LPCWSTR filename,FLONG f,DESIGNVECTOR *pdv)
GdiAddFontResourceW(LPCWSTR lpszFilename,FLONG fl,DESIGNVECTOR *pdv)
{
UNIMPLEMENTED;
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
UNICODE_STRING Filename;
//UNIMPLEMENTED;
//SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
//return 0;
/* FIXME handle fl parameter */
RtlInitUnicodeString(&Filename, lpszFilename);
return NtGdiAddFontResource ( &Filename, fl );
}
/*

14
reactos/dll/win32/gdi32/objects/font.c
View file

@ -1091,11 +1091,17 @@ int
STDCALL
AddFontResourceExW ( LPCWSTR lpszFilename, DWORD fl, PVOID pvReserved )
{
UNICODE_STRING Filename;
int retVal = 0;
/* FIXME handle fl parameter */
RtlInitUnicodeString(&Filename, lpszFilename);
return NtGdiAddFontResource ( &Filename, fl );
if (fl & (FR_PRIVATE | FR_NOT_ENUM))
{
retVal = GdiAddFontResourceW(lpszFilename, fl,0);
}
else
{
SetLastError( ERROR_INVALID_PARAMETER );
}
return retVal;
}