- Fixed access to the lpTemplateName of ChooseFont in cases where the

flags don't specify to use it. - Do not try to convert the resource name from ANSI to Wide if it is a result of MAKEINTRESOURCE (and therefore not a string).

- Fixed access to the lpTemplateName of ChooseFont in cases where the
d386fa75 · Shachar Shemesh · Alexandre Julliard · c345f7b9 · d386fa75
Commit d386fa75 authored Jul 10, 2002 by Shachar Shemesh Committed by Alexandre Julliard Jul 10, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

fontdlg.c dlls/commdlg/fontdlg.c +2 -4

No files found.
--- a/dlls/commdlg/fontdlg.c
+++ b/dlls/commdlg/fontdlg.c
@@ -323,7 +323,7 @@ static BOOL ChooseFontWtoA(const CHOOSEFONTW *cfw, CHOOSEFONTA *cfa)

    LogFontWtoA(cfw->lpLogFont, lpLogFont);

-    if (cfw->lpTemplateName != NULL)
+    if ((cfw->Flags&CF_ENABLETEMPLATE)!=0 && HIWORD(cfw->lpTemplateName)!=0)
    {
    	cfa->lpTemplateName = HEAP_strdupWtoA(GetProcessHeap(), 0,
    	    	cfw->lpTemplateName);
@@ -354,7 +354,7 @@ static VOID ChooseFontAtoW(const CHOOSEFONTA *cfa, CHOOSEFONTW *cfw)

    LogFontAtoW(cfa->lpLogFont, lpLogFont);

-    if (cfa->lpTemplateName != NULL)
+    if ((cfa->Flags&CF_ENABLETEMPLATE)!=0 && HIWORD(cfa->lpTemplateName) != 0)
    	HeapFree(GetProcessHeap(), 0, (LPSTR)(cfa->lpTemplateName));

    if ((cfa->Flags & CF_USESTYLE) != 0 && cfa->lpszStyle != NULL)
@@ -1300,5 +1300,3 @@ LRESULT WINAPI FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam,
    }
  return res;
 }
-
-