Changeset 9519 for trunk/src

Timestamp:

Dec 17, 2002, 3:16:47 PM (23 years ago)

Author:

sandervl

Message:

Merged dialog directory functions with latest Rewind

File:

• trunk/src/user32/windlg.cpp (modified) (13 diffs)

trunk/src/user32/windlg.cpp

@@ -1 @@
-/* $Id: windlg.cpp,v 1.35 2002-09-26 16:04:35 sandervl Exp $ */
+/* $Id: windlg.cpp,v 1.36 2002-12-17 14:16:47 sandervl Exp $ */
 /*
  * Win32 dialog apis for OS/2
@@ -624 +624 @@
 //******************************************************************************
 //******************************************************************************
-INT WIN32API DlgDirListA(HWND hDlg, LPSTR spec, INT idLBox, INT idStatic, UINT attrib )
-{
-    return DIALOG_DlgDirList( hDlg, spec, idLBox, idStatic, attrib, FALSE );
-}
-//******************************************************************************
-//******************************************************************************
-int WIN32API DlgDirListW(HWND hDlg, LPWSTR spec, INT idLBox, INT idStatic, UINT attrib )
-{
-    return DIALOG_DlgDirListW( hDlg, spec, idLBox, idStatic, attrib, FALSE );
-}
-//******************************************************************************
-//******************************************************************************
-INT WIN32API DlgDirListComboBoxA(HWND hDlg, LPSTR spec, INT idCBox, INT idStatic, UINT attrib )
-{
-    return DIALOG_DlgDirList( hDlg, spec, idCBox, idStatic, attrib, TRUE );
-}
-//******************************************************************************
-//******************************************************************************
-INT WIN32API DlgDirListComboBoxW( HWND hDlg, LPWSTR spec, INT idCBox, INT idStatic, UINT attrib )
-{
-    return DIALOG_DlgDirListW( hDlg, spec, idCBox, idStatic, attrib, TRUE );
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API DlgDirSelectComboBoxExA(HWND hwnd, LPSTR str, INT len, INT id )
-{
-    return DIALOG_DlgDirSelect( hwnd, str, len, id, TRUE, FALSE, TRUE );
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API DlgDirSelectComboBoxExW(HWND hwnd, LPWSTR str, INT len, INT id)
-{
-    return DIALOG_DlgDirSelect( hwnd, (LPSTR)str, len, id, TRUE, TRUE, TRUE );
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API DlgDirSelectExA(HWND hwnd, LPSTR str, INT len, INT id)
-{
-    return DIALOG_DlgDirSelect( hwnd, str, len, id, TRUE, FALSE, FALSE );
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API DlgDirSelectExW(HWND hwnd, LPWSTR str, INT len, INT id)
-{
-    return DIALOG_DlgDirSelect( hwnd, (LPSTR)str, len, id, TRUE, TRUE, FALSE );
-}
 /**********************************************************************
  *           DIALOG_DlgDirSelect
@@ -676 +630 @@
  */
 static BOOL DIALOG_DlgDirSelect( HWND hwnd, LPSTR str, INT len,
-                                 INT id, BOOL win32, BOOL unicode,
-                                 BOOL combo )
+                                 INT id, BOOL unicode, BOOL combo )
 {
     char *buffer, *ptr;
@@ -684 +637 @@
     HWND listbox = GetDlgItem( hwnd, id );
 
+    dprintf(("%04x '%s' %d\n", hwnd, str, id ));
     if (!listbox) return FALSE;
 
-    item = SendMessageA(listbox, combo ? CB_GETCURSEL
-                                             : LB_GETCURSEL, 0, 0 );
+    item = SendMessageA(listbox, combo ? CB_GETCURSEL : LB_GETCURSEL, 0, 0 );
     if (item == LB_ERR) return FALSE;
-    size = SendMessageA(listbox, combo ? CB_GETLBTEXTLEN
-                                             : LB_GETTEXTLEN, 0, 0 );
+    size = SendMessageA(listbox, combo ? CB_GETLBTEXTLEN : LB_GETTEXTLEN, 0, 0 );
     if (size == LB_ERR) return FALSE;
 
-    if (!(buffer = (char *)malloc( size+1 ))) return FALSE;
-
-    SendMessageA( listbox, combo ? CB_GETLBTEXT : LB_GETTEXT,
-                  item, (LPARAM)buffer );
-
-    if ((ret = (buffer[0] == '[')) != 0)  /* drive or directory */
+    if (!(buffer = (char *)HeapAlloc( GetProcessHeap(), 0, size+1 ))) return FALSE;
+
+    SendMessageA( listbox, combo ? CB_GETLBTEXT : LB_GETTEXT, item, (LPARAM)buffer );
+
+    if ((ret = (buffer[0] == '[')))  /* drive or directory */
     {
         if (buffer[1] == '-')  /* drive */
@@ -714 +665 @@
     else ptr = buffer;
 
-    if (unicode) lstrcpynAtoW( (LPWSTR)str, ptr, len );
+    if (unicode)
+    {
+        if (len > 0 && !MultiByteToWideChar( CP_ACP, 0, ptr, -1, (LPWSTR)str, len ))
+            ((LPWSTR)str)[len-1] = 0;
+    }
     else lstrcpynA( str, ptr, len );
-
-    free( buffer );
+    HeapFree( GetProcessHeap(), 0, buffer );
+    dprintf(("Returning %d '%s'\n", ret, str ));
     return ret;
 }
@@ -723 +678 @@
 
 /**********************************************************************
- *      DIALOG_DlgDirList
+ *          DIALOG_DlgDirList
  *
  * Helper function for DlgDirList*
  */
 static INT DIALOG_DlgDirList( HWND hDlg, LPSTR spec, INT idLBox,
-                              INT idStatic, UINT attrib, BOOL combo )
-{
-    int drive;
+                                INT idStatic, UINT attrib, BOOL combo )
+{
     HWND hwnd;
     LPSTR orig_spec = spec;
@@ -738 +692 @@
                              : SendMessageA( hwnd, msg, wparam, lparam ))
 
-    if (spec && spec[0] && (spec[1] == ':'))
-    {
-        drive = _toupper( spec[0] ) - 'A';
-        spec += 2;
-        if (!DRIVE_SetCurrentDrive( drive )) return FALSE;
-    }
-    else drive = DRIVE_GetCurrentDrive();
+    dprintf(("%04x '%s' %d %d %04x\n",
+                    hDlg, spec ? spec : "NULL", idLBox, idStatic, attrib ));
 
     /* If the path exists and is a directory, chdir to it */
-    if (!spec || !spec[0] || DRIVE_Chdir( drive, spec )) spec = "*.*";
+    if (!spec || !spec[0] || SetCurrentDirectoryA( spec )) spec = "*.*";
     else
     {
         char *p, *p2;
         p = spec;
-        if ((p2 = strrchr( p, '\\' )) != 0) p = p2;
-        if ((p2 = strrchr( p, '/' )) != 0) p = p2;
+        if ((p2 = strrchr( p, '\\' ))) p = p2;
+        if ((p2 = strrchr( p, '/' ))) p = p2;
         if (p != spec)
         {
             char sep = *p;
             *p = 0;
-            if (!DRIVE_Chdir( drive, spec ))
+            if (!SetCurrentDirectoryA( spec ))
             {
                 *p = sep;  /* Restore the original spec */
@@ -766 +715 @@
         }
     }
+
+    dprintf(( "mask=%s\n", spec ));
 
     if (idLBox && ((hwnd = GetDlgItem( hDlg, idLBox )) != 0))
@@ -794 +745 @@
     if (idStatic && ((hwnd = GetDlgItem( hDlg, idStatic )) != 0))
     {
-        char temp[512], curpath[512];
-        int drive = DRIVE_GetCurrentDrive();
-        strcpy( temp, "A:\\" );
-        temp[0] += drive;
-        lstrcpynA( temp + 3, DRIVE_GetDosCwd(curpath, drive, sizeof(curpath)), sizeof(temp)-3 );
+        char temp[MAX_PATH];
+        GetCurrentDirectoryA( sizeof(temp), temp );
         CharLowerA( temp );
         /* Can't use PostMessage() here, because the string is on the stack */
@@ -808 +756 @@
         /* Update the original file spec */
         char *p = spec;
-        while ((*orig_spec++ = *p++) != 0);
+        while ((*orig_spec++ = *p++));
     }
 
@@ -817 +765 @@
 
 /**********************************************************************
- *      DIALOG_DlgDirListW
+ *          DIALOG_DlgDirListW
  *
- * Helper function for DlgDirList*32W
+ * Helper function for DlgDirList*W
  */
 static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox,
-                               INT idStatic, UINT attrib, BOOL combo )
+                                 INT idStatic, UINT attrib, BOOL combo )
 {
     if (spec)
@@ -829 +777 @@
         INT ret = DIALOG_DlgDirList( hDlg, specA, idLBox, idStatic,
                                        attrib, combo );
-        lstrcpyAtoW( spec, specA );
+        MultiByteToWideChar( CP_ACP, 0, specA, -1, spec, 0x7fffffff );
         HeapFree( GetProcessHeap(), 0, specA );
         return ret;
@@ -835 +783 @@
     return DIALOG_DlgDirList( hDlg, NULL, idLBox, idStatic, attrib, combo );
 }
-//******************************************************************************
-//******************************************************************************
-
+
+
+/**********************************************************************
+ *              DlgDirSelectExA (USER32.@)
+ */
+BOOL WINAPI DlgDirSelectExA( HWND hwnd, LPSTR str, INT len, INT id )
+{
+    return DIALOG_DlgDirSelect( hwnd, str, len, id, FALSE, FALSE );
+}
+
+
+/**********************************************************************
+ *              DlgDirSelectExW (USER32.@)
+ */
+BOOL WINAPI DlgDirSelectExW( HWND hwnd, LPWSTR str, INT len, INT id )
+{
+    return DIALOG_DlgDirSelect( hwnd, (LPSTR)str, len, id, TRUE, FALSE );
+}
+
+
+/**********************************************************************
+ *              DlgDirSelectComboBoxExA (USER32.@)
+ */
+BOOL WINAPI DlgDirSelectComboBoxExA( HWND hwnd, LPSTR str, INT len,
+                                         INT id )
+{
+    return DIALOG_DlgDirSelect( hwnd, str, len, id, FALSE, TRUE );
+}
+
+
+/**********************************************************************
+ *              DlgDirSelectComboBoxExW (USER32.@)
+ */
+BOOL WINAPI DlgDirSelectComboBoxExW( HWND hwnd, LPWSTR str, INT len,
+                                         INT id)
+{
+    return DIALOG_DlgDirSelect( hwnd, (LPSTR)str, len, id, TRUE, TRUE );
+}
+
+
+/**********************************************************************
+ *              DlgDirListA (USER32.@)
+ */
+INT WINAPI DlgDirListA( HWND hDlg, LPSTR spec, INT idLBox,
+                            INT idStatic, UINT attrib )
+{
+    return DIALOG_DlgDirList( hDlg, spec, idLBox, idStatic, attrib, FALSE );
+}
+
+
+/**********************************************************************
+ *              DlgDirListW (USER32.@)
+ */
+INT WINAPI DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox,
+                            INT idStatic, UINT attrib )
+{
+    return DIALOG_DlgDirListW( hDlg, spec, idLBox, idStatic, attrib, FALSE );
+}
+
+
+/**********************************************************************
+ *              DlgDirListComboBoxA (USER32.@)
+ */
+INT WINAPI DlgDirListComboBoxA( HWND hDlg, LPSTR spec, INT idCBox,
+                                    INT idStatic, UINT attrib )
+{
+    return DIALOG_DlgDirList( hDlg, spec, idCBox, idStatic, attrib, TRUE );
+}
+
+
+/**********************************************************************
+ *              DlgDirListComboBoxW (USER32.@)
+ */
+INT WINAPI DlgDirListComboBoxW( HWND hDlg, LPWSTR spec, INT idCBox,
+                                    INT idStatic, UINT attrib )
+{
+    return DIALOG_DlgDirListW( hDlg, spec, idCBox, idStatic, attrib, TRUE );
+}