diff --git a/reactos/dll/win32/gdi32/misc/stubsa.c b/reactos/dll/win32/gdi32/misc/stubsa.c index 6c2b57cacff..aba6ee909d3 100644 --- a/reactos/dll/win32/gdi32/misc/stubsa.c +++ b/reactos/dll/win32/gdi32/misc/stubsa.c @@ -269,30 +269,6 @@ RemoveFontResourceExA( return 0; } - -/* - * @unimplemented - */ -HFONT -STDCALL -CreateFontIndirectExA(const ENUMLOGFONTEXDVA *elfexd) -{ - if (elfexd) - { - ENUMLOGFONTEXDVW Logfont; - - EnumLogFontExW2A( (LPENUMLOGFONTEXA) elfexd, - &Logfont.elfEnumLogfontEx ); - - RtlCopyMemory( &Logfont.elfDesignVector, - (PVOID) &elfexd->elfDesignVector, - sizeof(DESIGNVECTOR)); - - return NtGdiHfontCreate( &Logfont, 0, 0, 0, NULL); - } - else return NULL; -} - /* * @unimplemented */ diff --git a/reactos/dll/win32/gdi32/misc/stubsw.c b/reactos/dll/win32/gdi32/misc/stubsw.c index e0b4fb96b38..187cde85f31 100644 --- a/reactos/dll/win32/gdi32/misc/stubsw.c +++ b/reactos/dll/win32/gdi32/misc/stubsw.c @@ -346,20 +346,6 @@ bMakePathNameW(LPWSTR lpBuffer,LPCWSTR lpFileName,LPWSTR *lpFilePart,DWORD unkno return 0; } -/* - * @unimplemented - */ -HFONT -STDCALL -CreateFontIndirectExW(const ENUMLOGFONTEXDVW *elfexd) -{ - if ( elfexd ) - { - return NtGdiHfontCreate((PENUMLOGFONTEXDVW) elfexd, 0, 0, 0, NULL ); - } - else return NULL; -} - /* * @unimplemented */ diff --git a/reactos/dll/win32/gdi32/objects/font.c b/reactos/dll/win32/gdi32/objects/font.c index 8fef0547933..3d836f3bfa4 100644 --- a/reactos/dll/win32/gdi32/objects/font.c +++ b/reactos/dll/win32/gdi32/objects/font.c @@ -820,6 +820,48 @@ GetOutlineTextMetricsW( } +/* + * @implemented + */ +HFONT +STDCALL +CreateFontIndirectExA(const ENUMLOGFONTEXDVA *elfexd) +{ + if (elfexd) + { + ENUMLOGFONTEXDVW Logfont; + + EnumLogFontExW2A( (LPENUMLOGFONTEXA) elfexd, + &Logfont.elfEnumLogfontEx ); + + RtlCopyMemory( &Logfont.elfDesignVector, + (PVOID) &elfexd->elfDesignVector, + sizeof(DESIGNVECTOR)); + + return NtGdiHfontCreate( &Logfont, 0, 0, 0, NULL); + } + else return NULL; +} + + +/* + * @implemented + */ +HFONT +STDCALL +CreateFontIndirectExW(const ENUMLOGFONTEXDVW *elfexd) +{ + /* Msdn: Note, this function ignores the elfDesignVector member in + ENUMLOGFONTEXDV. + */ + if ( elfexd ) + { + return NtGdiHfontCreate((PENUMLOGFONTEXDVW) elfexd, 0, 0, 0, NULL ); + } + else return NULL; +} + + /* * @implemented */