Changeset 243 for trunk/src/comdlg32/comdlg32.cpp

Timestamp:

Jun 29, 1999, 5:54:10 PM (26 years ago)

Author:

cbratschi

Message:

UnicodeToAsciiN-fixes + TemplateID-Fix

File:

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

trunk/src/comdlg32/comdlg32.cpp

@@ -1 @@
-/* $Id: comdlg32.cpp,v 1.6 1999-06-24 16:54:24 achimha Exp $ */
+/* $Id: comdlg32.cpp,v 1.7 1999-06-29 15:54:10 cbratschi Exp $ */
 
 /*
@@ -222 +222 @@
  *
  * Author    : Patrick Haller [Tue, 1998/02/10 01:55]
+ *             Edgar Buerkle  [Mon, 1999/06/28 19:35]
  *****************************************************************************/
 
@@ -247 +248 @@
   asciicf.lpLogFont = &asciilf; // update pointer
 
-
-  // now translate the strings
+  // lpTemplatenName bug in open32 ?  This doesn't work.
+  // TODO: CF_ENABLETEMPLATEHANDLE
   if (lpcf->Flags & CF_ENABLETEMPLATE)
-    asciicf.lpTemplateName = UnicodeToAsciiString((LPWSTR)lpcf->lpTemplateName);
-  else
-    asciicf.lpTemplateName = NULL;
+    if((int)asciicf.lpTemplateName >> 16 != 0)
+      asciicf.lpTemplateName = UnicodeToAsciiString((LPWSTR)lpcf->lpTemplateName);
 
   UnicodeToAsciiN(lpcf->lpszStyle,
                   szAsciiStyle,
-                  sizeof(szAsciiStyle));
+                  sizeof(szAsciiStyle) - 1);
   asciicf.lpszStyle = szAsciiStyle;
 
   UnicodeToAsciiN(lpcf->lpLogFont->lfFaceName,
                   asciilf.lfFaceName,
-                  LF_FACESIZE);
+                  LF_FACESIZE-1);
 
   // LPCFHOOKPROC != WNDPROC ?
@@ -272 +272 @@
   AsciiToUnicodeN(asciicf.lpLogFont->lfFaceName,
                   lpcf->lpLogFont->lfFaceName,
-                  LF_FACESIZE);
+                  LF_FACESIZE-1);
 
   AsciiToUnicode(asciicf.lpszStyle,
                  lpcf->lpszStyle);
 
-  if(asciicf.lpTemplateName != NULL)
-    FreeAsciiString((char*)asciicf.lpTemplateName);
+  if (lpcf->Flags & CF_ENABLETEMPLATE)
+    if((int)asciicf.lpTemplateName >> 16 != 0)
+      FreeAsciiString((char*)asciicf.lpTemplateName);
 
   // copy back fields