Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-09 20:30:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert 28748 that change are incorrect,

Browse source 
it shall only check if the bits are set or not, 
if no flag are set we shall fail, if one flag are set we shall doing the call. 

svn path=/trunk/; revision=28750
This commit is contained in:
Magnus Olsen 2007-09-01 20:25:50 +00:00
parent 94d3aeebb3
commit 290cc1ffd4
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1091,13 +1091,17 @@ int
STDCALL
AddFontResourceExW ( LPCWSTR lpszFilename, DWORD fl, PVOID pvReserved )
{
if (fl & ~(FR_PRIVATE | FR_NOT_ENUM))
int retVal = 0;
if (fl & (FR_PRIVATE | FR_NOT_ENUM))
{
retVal = GdiAddFontResourceW(lpszFilename, fl,0);
}
else
{
SetLastError( ERROR_INVALID_PARAMETER );
return 0;
}
return GdiAddFontResourceW(lpszFilename, fl,0);
return retVal;
}
@ -1110,24 +1114,26 @@ AddFontResourceExA ( LPCSTR lpszFilename, DWORD fl, PVOID pvReserved )
{
NTSTATUS Status;
PWSTR FilenameW;
int rc;
int rc = 0;
if (fl & ~(FR_PRIVATE | FR_NOT_ENUM))
if (!(fl & (FR_PRIVATE | FR_NOT_ENUM)))
{
SetLastError( ERROR_INVALID_PARAMETER );
return 0;
}
Status = HEAP_strdupA2W ( &FilenameW, lpszFilename );
if ( !NT_SUCCESS (Status) )
else
{
SetLastError (RtlNtStatusToDosError(Status));
return 0;
Status = HEAP_strdupA2W ( &FilenameW, lpszFilename );
if ( !NT_SUCCESS (Status) )
{
SetLastError (RtlNtStatusToDosError(Status));
}
else
{
rc = GdiAddFontResourceW ( FilenameW, fl, 0 );
HEAP_free ( FilenameW );
}
}
rc = GdiAddFontResourceW ( FilenameW, fl, 0 );
HEAP_free ( FilenameW );
return rc;
return rc;
}