Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:02:56 +00:00
Code Issues Projects Releases Packages 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
Download patch file Download diff file Expand all files Collapse all files

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

@ -1091,13 +1091,17 @@ int
STDCALL STDCALL
AddFontResourceExW ( LPCWSTR lpszFilename, DWORD fl, PVOID pvReserved ) 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 ); SetLastError( ERROR_INVALID_PARAMETER );
return 0;
} }
return retVal;
return GdiAddFontResourceW(lpszFilename, fl,0);
} }
@ -1110,23 +1114,25 @@ AddFontResourceExA ( LPCSTR lpszFilename, DWORD fl, PVOID pvReserved )
{ {
NTSTATUS Status; NTSTATUS Status;
PWSTR FilenameW; 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 ); SetLastError( ERROR_INVALID_PARAMETER );
return 0;
} }
else
{
Status = HEAP_strdupA2W ( &FilenameW, lpszFilename ); Status = HEAP_strdupA2W ( &FilenameW, lpszFilename );
if ( !NT_SUCCESS (Status) ) if ( !NT_SUCCESS (Status) )
{ {
SetLastError (RtlNtStatusToDosError(Status)); SetLastError (RtlNtStatusToDosError(Status));
return 0;
} }
else
{
rc = GdiAddFontResourceW ( FilenameW, fl, 0 ); rc = GdiAddFontResourceW ( FilenameW, fl, 0 );
HEAP_free ( FilenameW ); HEAP_free ( FilenameW );
}
}
return rc; return rc;
} }