Changeset 71 for trunk/src/helpers/winh.c

Timestamp:

May 22, 2001, 7:18:41 PM (24 years ago)

Author:

umoeller

Message:

misc updates

File:

• trunk/src/helpers/winh.c (modified) (4 diffs)

trunk/src/helpers/winh.c

@@ -1492 +1492 @@
 
 /*
+ *@@ winhLboxFindItemFromHandle:
+ *      finds the list box item with the specified
+ *      handle.
+ *
+ *      Of course this only makes sense if each item
+ *      has a unique handle indeed.
+ *
+ *      Returns the index of the item found or -1.
+ *
+ *@@added V0.9.12 (2001-05-18) [umoeller]
+ */
+
+ULONG winhLboxFindItemFromHandle(HWND hwndListBox,
+                                 ULONG ulHandle)
+{
+    LONG cItems = WinQueryLboxCount(hwndListBox);
+    if (cItems)
+    {
+        ULONG ul;
+        for (ul = 0;
+             ul < cItems;
+             ul++)
+        {
+            if (ulHandle == winhQueryLboxItemHandle(hwndListBox,
+                                                    ul))
+                return (ul);
+        }
+    }
+
+    return (-1);
+}
+
+/*
  *@@category: Helpers\PM helpers\Scroll bar helpers
  */
@@ -3566 +3599 @@
  *
  *@@added V0.9.3 (2000-04-29) [umoeller]
+ *@@changed V0.9.12 (2001-05-21) [umoeller]: this failed if INI data had root dir, fixed
  */
 
@@ -3580 +3614 @@
 {
     FILEDLG fd;
+    FILESTATUS3 fs3;
+
     memset(&fd, 0, sizeof(FILEDLG));
     fd.cbSize = sizeof(FILEDLG);
@@ -3589 +3625 @@
         fd.fl |= FDS_OPEN_DIALOG;
 
-    // default: copy pszFile
-    strcpy(fd.szFullFile, pszFile);
-
-    if ( (hini) && (flFlags & WINH_FOD_INILOADDIR) )
-    {
-        // overwrite with initial directory for FOD from OS2.INI
-        if (PrfQueryProfileString(hini,
-                                  (PSZ)pcszApplication,
-                                  (PSZ)pcszKey,
-                                  "",      // default string V0.9.9 (2001-02-10) [umoeller]
-                                  fd.szFullFile,
-                                  sizeof(fd.szFullFile)-10)
-                    >= 2)
-        {
-            // found: append "\*"
-            strcat(fd.szFullFile, "\\");
-            strcat(fd.szFullFile, pszFile);
-        }
-    }
+    if (    (hini)
+         && (flFlags & WINH_FOD_INILOADDIR)
+         && (PrfQueryProfileString(hini,
+                                   (PSZ)pcszApplication,
+                                   (PSZ)pcszKey,
+                                   "",      // default string V0.9.9 (2001-02-10) [umoeller]
+                                   fd.szFullFile,
+                                   sizeof(fd.szFullFile)-10)
+                     > 2)
+         // added these checks V0.9.12 (2001-05-21) [umoeller]
+         && (!DosQueryPathInfo(fd.szFullFile,
+                               FIL_STANDARD,
+                               &fs3,
+                               sizeof(fs3)))
+         && (fs3.attrFile & FILE_DIRECTORY)
+       )
+    {
+        // found: append "\*"
+        strcat(fd.szFullFile, "\\");
+        strcat(fd.szFullFile, pszFile);
+    }
+    else
+        // default: copy pszFile
+        strcpy(fd.szFullFile, pszFile);
+        // fixed V0.9.12 (2001-05-21) [umoeller]
 
     if (    WinFileDlg(HWND_DESKTOP,    // parent