Changeset 8611 for trunk/src

Timestamp:

Jun 9, 2002, 1:15:19 PM (23 years ago)

Author:

sandervl

Message:

GetFileDialog95W fix (check if template name is string or numeric id)

File:

• trunk/src/comdlg32/filedlg95.c (modified) (2 diffs)

trunk/src/comdlg32/filedlg95.c

@@ -480 +480 @@
   AllocInArgWtoA(ofn->lpstrTitle, lpstrTitle);
   AllocInArgWtoA(ofn->lpstrDefExt, lpstrDefExt);
-  AllocInArgWtoA(ofn->lpTemplateName, lpTemplateName);
+#ifdef __WIN32OS2__
+  if(HIWORD(ofn->lpTemplateName)) {
+#endif
+       AllocInArgWtoA(ofn->lpTemplateName, lpTemplateName);
+#ifdef __WIN32OS2__
+  }
+  else lpTemplateName = ofn->lpTemplateName;
+#endif
+
   dwFlags = ofn->Flags;
   hInstance = ofn->hInstance;
@@ -531 +539 @@
   FreeInArg(ofn->lpstrTitle, lpstrTitle);
   FreeInArg(ofn->lpstrDefExt, lpstrDefExt);
-  FreeInArg(ofn->lpTemplateName, lpTemplateName);
+#ifdef __WIN32OS2__
+  if(HIWORD(lpTemplateName))
+#endif
+      FreeInArg(ofn->lpTemplateName, lpTemplateName);
 
   MemFree((LPVOID)(fodInfos));