msi: Build a proper tab chain by walking through the controls list.

Simply changing Z-order as we encounter windows is not sufficient to ensure correct ordering, we have to rebuild the list from scratch.

msi: Build a proper tab chain by walking through the controls list.
2c5bd492 · Alexandre Julliard · bd7a2e70 · 2c5bd492
Commit 2c5bd492 authored Jul 15, 2009 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 27 deletions

dialog.c dlls/msi/dialog.c +23 -27

No files found.
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -417,7 +417,7 @@ static msi_control *msi_dialog_create_window( msi_dialog *dialog,
        return NULL;
    strcpyW( control->name, name );
-    list_add_head( &dialog->controls, &control->entry );
+    list_add_tail( &dialog->controls, &control->entry );
    control->handler = NULL;
    control->update = NULL;
    control->property = NULL;
@@ -3002,37 +3002,34 @@ static void msi_dialog_adjust_dialog_pos( msi_dialog *dialog, MSIRECORD *rec, LP
    AdjustWindowRect( pos, style, FALSE );
 }
-static BOOL msi_control_set_next( msi_control *control, msi_control *next )
+static void msi_dialog_set_tab_order( msi_dialog *dialog, LPCWSTR first )
 {
-    return SetWindowPos( next->hwnd, control->hwnd, 0, 0, 0, 0,
+    struct list tab_chain;
-                         SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOREDRAW |
+    msi_control *control;
-                         SWP_NOREPOSITION | SWP_NOSENDCHANGING | SWP_NOSIZE );
+    HWND prev = HWND_TOP;
-}
-static UINT msi_dialog_set_tab_order( msi_dialog *dialog )
+    list_init( &tab_chain );
-{
+    if (!(control = msi_dialog_find_control( dialog, first ))) return;
-    msi_control *control, *tab_next;
-    LIST_FOR_EACH_ENTRY( control, &dialog->controls, msi_control, entry )
+    dialog->hWndFocus = control->hwnd;
+    while (control)
    {
-        tab_next = msi_dialog_find_control( dialog, control->tabnext );
+        list_remove( &control->entry );
-        if( !tab_next )
+        list_add_tail( &tab_chain, &control->entry );
-            continue;
+        if (!control->tabnext) break;
-        msi_control_set_next( control, tab_next );
+        control = msi_dialog_find_control( dialog, control->tabnext );
    }
-    return ERROR_SUCCESS;
+    LIST_FOR_EACH_ENTRY( control, &tab_chain, msi_control, entry )
-}
+    {
+        SetWindowPos( control->hwnd, prev, 0, 0, 0, 0,
-static void msi_dialog_set_first_control( msi_dialog* dialog, LPCWSTR name )
+                      SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOREDRAW |
-{
+                      SWP_NOREPOSITION | SWP_NOSENDCHANGING | SWP_NOSIZE );
-    msi_control *control;
+        prev = control->hwnd;
+    }
-    control = msi_dialog_find_control( dialog, name );
+    /* put them back on the main list */
-    if( control )
+    list_move_head( &dialog->controls, &tab_chain );
-        dialog->hWndFocus = control->hwnd;
-    else
-        dialog->hWndFocus = NULL;
 }
 static LRESULT msi_dialog_oncreate( HWND hwnd, LPCREATESTRUCTW cs )
@@ -3082,8 +3079,7 @@ static LRESULT msi_dialog_oncreate( HWND hwnd, LPCREATESTRUCTW cs )
    msi_dialog_build_font_list( dialog );
    msi_dialog_fill_controls( dialog );
    msi_dialog_evaluate_control_conditions( dialog );
-    msi_dialog_set_tab_order( dialog );
+    msi_dialog_set_tab_order( dialog, MSI_RecordGetString( rec, 8 ) );
-    msi_dialog_set_first_control( dialog, MSI_RecordGetString( rec, 8 ) );
    msiobj_release( &rec->hdr );
    return 0;