Implemented Win16 behaviour of DDL_DRIVES in DlgDirList.

controls/listbox.c

@@ -1661,6 +1661,9 @@ static LRESULT LISTBOX_Directory( WND *wnd, LB_DESCR *descr, UINT attrib,
     WIN32_FIND_DATAA entry;
     int pos;
 
+    /* don't scan directory if we just want drives exclusively */
+    if (attrib != (DDL_DRIVES | DDL_EXCLUSIVE)) {
+        /* scan directory */
         if ((handle = FindFirstFileA(filespec,&entry)) == INVALID_HANDLE_VALUE)
         {
             if (GetLastError() != ERROR_NO_MORE_FILES) return LB_ERR;
@@ -1696,7 +1699,9 @@ static LRESULT LISTBOX_Directory( WND *wnd, LB_DESCR *descr, UINT attrib,
             } while (FindNextFileA( handle, &entry ));
             FindClose( handle );
         }
+    }
 
+    /* scan drives */
     if ((ret >= 0) && (attrib & DDL_DRIVES))
     {
         char buffer[] = "[-a-]";
@@ -2689,6 +2694,9 @@ static inline LRESULT WINAPI ListBoxWndProc_locked( WND* wnd, UINT msg,
         return LB_OKAY;
 
     case LB_DIR16:
+        /* according to Win16 docs, DDL_DRIVES should make DDL_EXCLUSIVE
+         * be set automatically (this is different in Win32) */
+        if (wParam & DDL_DRIVES) wParam |= DDL_EXCLUSIVE;
         return LISTBOX_Directory( wnd, descr, wParam,
                                   (LPCSTR)PTR_SEG_TO_LIN(lParam), FALSE );
 

dlls/user/user.spec

@@ -102,7 +102,7 @@ owner	user32
 97  pascal16 CheckDlgButton(word word word) CheckDlgButton16
 98  pascal16 IsDlgButtonChecked(word word) IsDlgButtonChecked16
 99  pascal16 DlgDirSelect(word ptr word) DlgDirSelect16
-100 pascal16 DlgDirList(word ptr word word word) DlgDirList16
+100 pascal16 DlgDirList(word str word word word) DlgDirList16
 101 pascal   SendDlgItemMessage(word word word word long) SendDlgItemMessage16
 102 pascal16 AdjustWindowRect(ptr long word) AdjustWindowRect16
 103 pascal16 MapDialogRect(word ptr) MapDialogRect16

dlls/user/user32.spec

@@ -155,10 +155,10 @@ debug_channels (accel caret class clipboard combo cursor dc ddeml dialog driver
 @ stdcall DialogBoxParamW(long wstr long ptr long) DialogBoxParamW
 @ stdcall DispatchMessageA(ptr) DispatchMessageA
 @ stdcall DispatchMessageW(ptr) DispatchMessageW
-@ stdcall DlgDirListA(long ptr long long long) DlgDirListA
+@ stdcall DlgDirListA(long str long long long) DlgDirListA
 @ stdcall DlgDirListComboBoxA(long ptr long long long) DlgDirListComboBoxA
 @ stdcall DlgDirListComboBoxW(long ptr long long long) DlgDirListComboBoxW
-@ stdcall DlgDirListW(long ptr long long long) DlgDirListW
+@ stdcall DlgDirListW(long wstr long long long) DlgDirListW
 @ stdcall DlgDirSelectComboBoxExA(long ptr long long) DlgDirSelectComboBoxExA
 @ stdcall DlgDirSelectComboBoxExW(long ptr long long) DlgDirSelectComboBoxExW
 @ stdcall DlgDirSelectExA(long ptr long long) DlgDirSelectExA