Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-01 00:58:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix : make AddFontResourceA acts like AddFontResourceW

Browse source 
Fix : smaller typo in AddFontResourceW 

svn path=/trunk/; revision=28539
This commit is contained in:
Magnus Olsen 2007-08-25 11:34:16 +00:00
parent 2c540b735a
commit 2b7a66234a
1 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1112,14 +1112,16 @@ int
STDCALL STDCALL
AddFontResourceExA ( LPCSTR lpszFilename, DWORD fl, PVOID pvReserved ) AddFontResourceExA ( LPCSTR lpszFilename, DWORD fl, PVOID pvReserved )
{ {
NTSTATUS Status; NTSTATUS Status;
PWSTR FilenameW; PWSTR FilenameW;
int rc = 0; int rc = 0;
Status = HEAP_strdupA2W ( &FilenameW, lpszFilename ); Status = HEAP_strdupA2W ( &FilenameW, lpszFilename );
if ( !NT_SUCCESS (Status) ) if ( !NT_SUCCESS (Status) )
SetLastError (RtlNtStatusToDosError(Status)); {
else SetLastError (RtlNtStatusToDosError(Status));
}
else
{ {
rc = AddFontResourceExW ( FilenameW, fl, pvReserved ); rc = AddFontResourceExW ( FilenameW, fl, pvReserved );
@ -1136,7 +1138,22 @@ int
STDCALL STDCALL
AddFontResourceA ( LPCSTR lpszFilename ) AddFontResourceA ( LPCSTR lpszFilename )
{ {
return AddFontResourceExA ( lpszFilename, 0, 0 ); NTSTATUS Status;
PWSTR FilenameW;
int rc = 0;
Status = HEAP_strdupA2W ( &FilenameW, lpszFilename );
if ( !NT_SUCCESS (Status) )
{
SetLastError (RtlNtStatusToDosError(Status));
}
else
{
rc = GdiAddFontResourceW ( FilenameW, 0, 0);
HEAP_free ( FilenameW );
}
return rc;
} }
@ -1147,7 +1164,7 @@ int
STDCALL STDCALL
AddFontResourceW ( LPCWSTR lpszFilename ) AddFontResourceW ( LPCWSTR lpszFilename )
{ {
return AddFontResourceExW ( lpszFilename, 0, 0 ); return GdiAddFontResourceW ( lpszFilename, 0, 0 );
} }