Changeset 1417

Timestamp:

Oct 23, 1999, 6:43:50 PM (26 years ago)

Author:

cbratschi

Message:

partial fix for NT's clock.exe: ChooseFont

File:

• trunk/src/comdlg32/comdlg32.cpp (modified) (8 diffs)

trunk/src/comdlg32/comdlg32.cpp ¶

@@ -1 @@
-/* $Id: comdlg32.cpp,v 1.13 1999-10-18 11:59:04 sandervl Exp $ */
+/* $Id: comdlg32.cpp,v 1.14 1999-10-23 16:43:50 cbratschi Exp $ */
 
 /*
@@ -37 +37 @@
     a->lpfnHook = (c)Win32WindowProc::GetOS2Callback();\
   } \
-  a->hwndOwner = Win32ToOS2Handle(a->hwndOwner); 
+  a->hwndOwner = Win32ToOS2Handle(a->hwndOwner);
 
 #define COMDLG32_CHECKHOOK2(a,b,c,d)        \
@@ -48 +48 @@
     a->d = (c)Win32WindowProc::GetOS2Callback();\
   } \
-  a->hwndOwner = Win32ToOS2Handle(a->hwndOwner); 
+  a->hwndOwner = Win32ToOS2Handle(a->hwndOwner);
 #else
 #define COMDLG32_CHECKHOOK(a,b,c)           \
@@ -55 +55 @@
     a->lpfnHook = 0; \
   } \
-  a->hwndOwner = Win32ToOS2Handle(a->hwndOwner); 
+  a->hwndOwner = Win32ToOS2Handle(a->hwndOwner);
 
 #define COMDLG32_CHECKHOOK2(a,b,c,d)        \
@@ -62 +62 @@
     a->d = 0; \
   } \
-  a->hwndOwner = Win32ToOS2Handle(a->hwndOwner); 
+  a->hwndOwner = Win32ToOS2Handle(a->hwndOwner);
 #endif
 /*****************************************************************************
@@ -247 +247 @@
   // NOTE: LOGFONTW/A is NOT converted !
   dprintf(("COMDLG32: ChooseFontW not correctly implemented.\n"));
+
+  if (!lpcf)
+  {
+    SetLastError(ERROR_INVALID_PARAMETER);
+
+    return FALSE;
+  }
 
   // convert to ASCII string
@@ -265 +272 @@
       asciicf.lpTemplateName = UnicodeToAsciiString((LPWSTR)lpcf->lpTemplateName);
 
-  UnicodeToAsciiN(lpcf->lpszStyle,
-                  szAsciiStyle,
-                  sizeof(szAsciiStyle) - 1);
-  asciicf.lpszStyle = szAsciiStyle;
+  if (lpcf->lpszStyle)
+  {
+    //CB: NT's clock.exe sets this pointer, don't know why
+    //    it's not a pointer to a string!
+    if ((UINT)lpcf->lpszStyle == 0xAAAAAAAA)
+      asciicf.lpszStyle = NULL;
+    else
+    {
+      UnicodeToAsciiN(lpcf->lpszStyle,
+                      szAsciiStyle,
+                      sizeof(szAsciiStyle));
+
+      asciicf.lpszStyle = szAsciiStyle;
+    }
+  };
 
   UnicodeToAsciiN(lpcf->lpLogFont->lfFaceName,
@@ -280 +298 @@
   bResult = O32_ChooseFont((LPCHOOSEFONTA)&asciicf);        // call ASCII version
 
-  // transfer BACK resulting strings !!!
-  AsciiToUnicodeN(asciicf.lpLogFont->lfFaceName,
-                  lpcf->lpLogFont->lfFaceName,
-                  LF_FACESIZE-1);
-
-  AsciiToUnicode(asciicf.lpszStyle,
-                 lpcf->lpszStyle);
+  if (bResult)
+  {
+    // transfer BACK resulting strings !!!
+    AsciiToUnicodeN(asciicf.lpLogFont->lfFaceName,
+                    lpcf->lpLogFont->lfFaceName,
+                    LF_FACESIZE-1);
+
+    if (lpcf->lpszStyle) AsciiToUnicode(asciicf.lpszStyle,lpcf->lpszStyle);
+  }
 
   if (lpcf->Flags & CF_ENABLETEMPLATE)