- Support PSH_WIZARDHASFINISH in wizards.

- Correct tab order of the wizard buttons.

dlls/comctl32/comctl_Cn.rc

@@ -37,9 +37,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Wizard"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  DEFPUSHBUTTON "结束",  IDC_FINISH_BUTTON,121,138,50,14
-  DEFPUSHBUTTON "下一步(&N) >", IDC_NEXT_BUTTON,121,138,50,14
   PUSHBUTTON    "< 上一步(&B)", IDC_BACK_BUTTON,71,138,50,14
+  DEFPUSHBUTTON "下一步(&N) >", IDC_NEXT_BUTTON,121,138,50,14
+  DEFPUSHBUTTON "结束",  IDC_FINISH_BUTTON,121,138,50,14
   PUSHBUTTON    "取消",  IDCANCEL,178,138,50,14
   PUSHBUTTON    "帮助",    IDHELP,235,138,50,14,WS_GROUP
   LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN

dlls/comctl32/comctl_Cs.rc

@@ -39,9 +39,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Prùvodce"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  DEFPUSHBUTTON "Dokonèit",  IDC_FINISH_BUTTON,121,138,50,14
-  DEFPUSHBUTTON "&Dal¹í >", IDC_NEXT_BUTTON,121,138,50,14
   PUSHBUTTON    "< &Zpìt", IDC_BACK_BUTTON,71,138,50,14
+  DEFPUSHBUTTON "&Dal¹í >", IDC_NEXT_BUTTON,121,138,50,14
+  DEFPUSHBUTTON "Dokonèit",  IDC_FINISH_BUTTON,121,138,50,14
   PUSHBUTTON    "Storno",  IDCANCEL,178,138,50,14
   PUSHBUTTON    "Nápovìda",    IDHELP,235,138,50,14,WS_GROUP
   LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN

dlls/comctl32/comctl_De.rc

@@ -57,9 +57,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Wizard"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  DEFPUSHBUTTON "&Beenden",   IDC_FINISH_BUTTON,121,138,50,14
-  DEFPUSHBUTTON "&Weiter >", IDC_NEXT_BUTTON,121,138,50,14
   PUSHBUTTON    "< &Zurück", IDC_BACK_BUTTON,71,138,50,14
+  DEFPUSHBUTTON "&Weiter >", IDC_NEXT_BUTTON,121,138,50,14
+  DEFPUSHBUTTON "&Beenden",   IDC_FINISH_BUTTON,121,138,50,14
   PUSHBUTTON    "Abbrechen", IDCANCEL,178,138,50,14
   PUSHBUTTON    "&Hilfe",     IDHELP,235,138,50,14,WS_GROUP
   LTEXT         "",          IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN

dlls/comctl32/comctl_En.rc

@@ -36,9 +36,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Wizard"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  DEFPUSHBUTTON "Finish",  IDC_FINISH_BUTTON,121,138,50,14
-  DEFPUSHBUTTON "&Next >", IDC_NEXT_BUTTON,121,138,50,14
   PUSHBUTTON    "< &Back", IDC_BACK_BUTTON,71,138,50,14
+  DEFPUSHBUTTON "&Next >", IDC_NEXT_BUTTON,121,138,50,14
+  DEFPUSHBUTTON "Finish",  IDC_FINISH_BUTTON,121,138,50,14
   PUSHBUTTON    "Cancel",  IDCANCEL,178,138,50,14
   PUSHBUTTON    "Help",    IDHELP,235,138,50,14,WS_GROUP
   LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN

dlls/comctl32/comctl_Es.rc

@@ -36,9 +36,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Ayudante"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  DEFPUSHBUTTON "Terminar",     IDC_FINISH_BUTTON,121,138,50,14
-  DEFPUSHBUTTON "&Siguiente >", IDC_NEXT_BUTTON,121,138,50,14
   PUSHBUTTON    "< &Anterior",  IDC_BACK_BUTTON,71,138,50,14
+  DEFPUSHBUTTON "&Siguiente >", IDC_NEXT_BUTTON,121,138,50,14
+  DEFPUSHBUTTON "Terminar",     IDC_FINISH_BUTTON,121,138,50,14
   PUSHBUTTON    "Cancelar",     IDCANCEL,178,138,50,14
   PUSHBUTTON    "Ayuda",        IDHELP,235,138,50,14,WS_GROUP
   LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN

dlls/comctl32/comctl_Fr.rc

@@ -40,9 +40,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Assistant"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  DEFPUSHBUTTON "Terminer", IDC_FINISH_BUTTON,121,138,50,14
-  DEFPUSHBUTTON "&Suivant >", IDC_NEXT_BUTTON,121,138,50,14
   PUSHBUTTON    "< &Précédent", IDC_BACK_BUTTON,71,138,50,14
+  DEFPUSHBUTTON "&Suivant >", IDC_NEXT_BUTTON,121,138,50,14
+  DEFPUSHBUTTON "Terminer", IDC_FINISH_BUTTON,121,138,50,14
   PUSHBUTTON    "Annuler", IDCANCEL,178,138,50,14
   PUSHBUTTON    "Aide",    IDHELP,235,138,50,14,WS_GROUP
   LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN

dlls/comctl32/comctl_It.rc

@@ -37,9 +37,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Wizard"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  DEFPUSHBUTTON "Fine",  IDC_FINISH_BUTTON,121,138,50,14
-  DEFPUSHBUTTON "&Avanti >", IDC_NEXT_BUTTON,121,138,50,14
   PUSHBUTTON    "< &Indietro", IDC_BACK_BUTTON,71,138,50,14
+  DEFPUSHBUTTON "&Avanti >", IDC_NEXT_BUTTON,121,138,50,14
+  DEFPUSHBUTTON "Fine",  IDC_FINISH_BUTTON,121,138,50,14
   PUSHBUTTON    "Anulla",  IDCANCEL,178,138,50,14
   PUSHBUTTON    "Aiuto",    IDHELP,235,138,50,14,WS_GROUP
   LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN

dlls/comctl32/comctl_Ja.rc

@@ -36,9 +36,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Wizard"
 FONT 9, "MS UI Gothic"
 BEGIN
-  DEFPUSHBUTTON "Š®—¹",  IDC_FINISH_BUTTON,121,138,50,14
-  DEFPUSHBUTTON "<22>i‚Þ(&N) >", IDC_NEXT_BUTTON,121,138,50,14
   PUSHBUTTON    "< 戻る(&B)", IDC_BACK_BUTTON,71,138,50,14
+  DEFPUSHBUTTON "<22>i‚Þ(&N) >", IDC_NEXT_BUTTON,121,138,50,14
+  DEFPUSHBUTTON "Š®—¹",  IDC_FINISH_BUTTON,121,138,50,14
   PUSHBUTTON    "キャンセル",  IDCANCEL,178,138,50,14
   PUSHBUTTON    "ヘルプ",    IDHELP,235,138,50,14,WS_GROUP
   LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN

dlls/comctl32/comctl_Ko.rc

@@ -36,9 +36,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Wizard"
 FONT 9, "MS Shell Dlg"
 BEGIN
-  DEFPUSHBUTTON "종료",  IDC_FINISH_BUTTON,121,138,50,14
-  DEFPUSHBUTTON "다음(&N) >", IDC_NEXT_BUTTON,121,138,50,14
   PUSHBUTTON    "< 이전(&B)", IDC_BACK_BUTTON,71,138,50,14
+  DEFPUSHBUTTON "다음(&N) >", IDC_NEXT_BUTTON,121,138,50,14
+  DEFPUSHBUTTON "종료",  IDC_FINISH_BUTTON,121,138,50,14
   PUSHBUTTON    "취소",  IDCANCEL,178,138,50,14
   PUSHBUTTON    "도움말",    IDHELP,235,138,50,14,WS_GROUP
   LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN

dlls/comctl32/comctl_Nl.rc

@@ -38,9 +38,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Assistent"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  DEFPUSHBUTTON "Beëindigen",  IDC_FINISH_BUTTON,121,138,50,14
-  DEFPUSHBUTTON "&Volgende >", IDC_NEXT_BUTTON,121,138,50,14
   PUSHBUTTON    "< V&orige",   IDC_BACK_BUTTON,71,138,50,14
+  DEFPUSHBUTTON "&Volgende >", IDC_NEXT_BUTTON,121,138,50,14
+  DEFPUSHBUTTON "Beëindigen",  IDC_FINISH_BUTTON,121,138,50,14
   PUSHBUTTON    "Annuleren",   IDCANCEL,178,138,50,14
   PUSHBUTTON    "Help",        IDHELP,235,138,50,14,WS_GROUP
   LTEXT         "",            IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN

dlls/comctl32/comctl_Pl.rc

@@ -37,9 +37,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Kreator"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  DEFPUSHBUTTON "Zakoñcz",  IDC_FINISH_BUTTON,121,138,50,14
-  DEFPUSHBUTTON "&Dalej >", IDC_NEXT_BUTTON,121,138,50,14
   PUSHBUTTON    "< &Wstecz", IDC_BACK_BUTTON,71,138,50,14
+  DEFPUSHBUTTON "&Dalej >", IDC_NEXT_BUTTON,121,138,50,14
+  DEFPUSHBUTTON "Zakoñcz",  IDC_FINISH_BUTTON,121,138,50,14
   PUSHBUTTON    "Anuluj",  IDCANCEL,178,138,50,14
   PUSHBUTTON    "Pomoc",    IDHELP,235,138,50,14,WS_GROUP
   LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN

dlls/comctl32/comctl_Pt.rc

@@ -36,9 +36,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Assistente"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  DEFPUSHBUTTON "Finalizar",  IDC_FINISH_BUTTON,121,138,50,14
-  DEFPUSHBUTTON "&Avançar >", IDC_NEXT_BUTTON,121,138,50,14
   PUSHBUTTON    "< &Voltar", IDC_BACK_BUTTON,71,138,50,14
+  DEFPUSHBUTTON "&Avançar >", IDC_NEXT_BUTTON,121,138,50,14
+  DEFPUSHBUTTON "Finalizar",  IDC_FINISH_BUTTON,121,138,50,14
   PUSHBUTTON    "Cancelar",  IDCANCEL,178,138,50,14
   PUSHBUTTON    "Ajuda",    IDHELP,235,138,50,14,WS_GROUP
   LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN

dlls/comctl32/comctl_Ru.rc

@@ -38,9 +38,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Ìàñòåð"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  DEFPUSHBUTTON "Çàâåðøèòü",  IDC_FINISH_BUTTON,121,138,50,14
-  DEFPUSHBUTTON "&Äàëåå >", IDC_NEXT_BUTTON,121,138,50,14
   PUSHBUTTON    "< &Íàçàä", IDC_BACK_BUTTON,71,138,50,14
+  DEFPUSHBUTTON "&Äàëåå >", IDC_NEXT_BUTTON,121,138,50,14
+  DEFPUSHBUTTON "Çàâåðøèòü",  IDC_FINISH_BUTTON,121,138,50,14
   PUSHBUTTON    "Îòìåíà",  IDCANCEL,178,138,50,14
   PUSHBUTTON    "&Ñïðàâêà",    IDHELP,235,138,50,14,WS_GROUP
   LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN

dlls/comctl32/comctl_Si.rc

@@ -36,9 +36,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Èarovnik"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  DEFPUSHBUTTON "Dokonèaj",  IDC_FINISH_BUTTON,121,138,50,14
-  DEFPUSHBUTTON "Naprej >", IDC_NEXT_BUTTON,121,138,50,14
   PUSHBUTTON    "< Na&zaj", IDC_BACK_BUTTON,71,138,50,14
+  DEFPUSHBUTTON "Naprej >", IDC_NEXT_BUTTON,121,138,50,14
+  DEFPUSHBUTTON "Dokonèaj",  IDC_FINISH_BUTTON,121,138,50,14
   PUSHBUTTON    "Preklièi",  IDCANCEL,178,138,50,14
   PUSHBUTTON    "Pomoè",    IDHELP,235,138,50,14,WS_GROUP
   LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN

dlls/comctl32/comctl_Sv.rc

@@ -36,9 +36,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Guide"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  DEFPUSHBUTTON "Slutför",  IDC_FINISH_BUTTON,121,138,50,14
-  DEFPUSHBUTTON "&Nästa >", IDC_NEXT_BUTTON,121,138,50,14
   PUSHBUTTON    "< &Föregående", IDC_BACK_BUTTON,71,138,50,14
+  DEFPUSHBUTTON "&Nästa >", IDC_NEXT_BUTTON,121,138,50,14
+  DEFPUSHBUTTON "Slutför",  IDC_FINISH_BUTTON,121,138,50,14
   PUSHBUTTON    "Avbryt",  IDCANCEL,178,138,50,14
   PUSHBUTTON    "Hjälp",    IDHELP,235,138,50,14,WS_GROUP
   LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN

dlls/comctl32/comctl_Th.rc

@@ -36,9 +36,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Wizard"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  DEFPUSHBUTTON "·íÒãËéàÊÃç¨",  IDC_FINISH_BUTTON,121,138,50,14
-  DEFPUSHBUTTON "µèÍä» >", IDC_NEXT_BUTTON,121,138,50,14
   PUSHBUTTON    "< Âé͹¡ÅѺ", IDC_BACK_BUTTON,71,138,50,14
+  DEFPUSHBUTTON "µèÍä» >", IDC_NEXT_BUTTON,121,138,50,14
+  DEFPUSHBUTTON "·íÒãËéàÊÃç¨",  IDC_FINISH_BUTTON,121,138,50,14
   PUSHBUTTON    "¡àÅÔ¡",  IDCANCEL,178,138,50,14
   PUSHBUTTON    "ªèÇÂàËÅÕÍ",    IDHELP,235,138,50,14,WS_GROUP
   LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN

dlls/comctl32/comctl_Uk.rc

@@ -38,9 +38,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 CAPTION "Ìàñòåð"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  DEFPUSHBUTTON "&Çàâåðøèòè",  IDC_FINISH_BUTTON,121,138,50,14
-  DEFPUSHBUTTON "&Äàë³ >", IDC_NEXT_BUTTON,121,138,50,14
   PUSHBUTTON    "< &Íàçàä", IDC_BACK_BUTTON,71,138,50,14
+  DEFPUSHBUTTON "&Äàë³ >", IDC_NEXT_BUTTON,121,138,50,14
+  DEFPUSHBUTTON "&Çàâåðøèòè",  IDC_FINISH_BUTTON,121,138,50,14
   PUSHBUTTON    "&³äì³íà",  IDCANCEL,178,138,50,14
   PUSHBUTTON    "&Äîâ³äêà",    IDHELP,235,138,50,14,WS_GROUP
   LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN

dlls/comctl32/propsheet.c

@@ -45,7 +45,6 @@
  *     o PSN_QUERYINITIALFOCUS
  *     o PSN_TRANSLATEACCELERATOR
  *   - Styles:
- *     o PSH_WIZARDHASFINISH
  *     o PSH_RTLREADING
  *     o PSH_STRETCHWATERMARK
  *     o PSH_USEPAGELANG
@@ -121,6 +120,7 @@ typedef struct tagPropSheetInfo
   BOOL isModeless;
   BOOL hasHelp;
   BOOL hasApply;
+  BOOL hasFinish;
   BOOL useCallback;
   BOOL restartWindows;
   BOOL rebootSystem;
@@ -233,13 +233,11 @@ static VOID PROPSHEET_UnImplementedFlags(DWORD dwFlags)
 
   /*
    * unhandled header flags:
-   *  PSH_WIZARDHASFINISH    0x00000010
    *  PSH_RTLREADING         0x00000800
    *  PSH_STRETCHWATERMARK   0x00040000
    *  PSH_USEPAGELANG        0x00200000
    */
 
-    add_flag(PSH_WIZARDHASFINISH);
     add_flag(PSH_RTLREADING);
     add_flag(PSH_STRETCHWATERMARK);
     add_flag(PSH_USEPAGELANG);
@@ -341,6 +339,7 @@ static BOOL PROPSHEET_CollectSheetInfoA(LPCPROPSHEETHEADERA lppsh,
 
   psInfo->hasHelp = dwFlags & PSH_HASHELP;
   psInfo->hasApply = !(dwFlags & PSH_NOAPPLYNOW);
+  psInfo->hasFinish = dwFlags & PSH_WIZARDHASFINISH;
   psInfo->useCallback = (dwFlags & PSH_USECALLBACK )&& (lppsh->pfnCallback);
   psInfo->isModeless = dwFlags & PSH_MODELESS;
 
@@ -396,6 +395,7 @@ static BOOL PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh,
 
   psInfo->hasHelp = dwFlags & PSH_HASHELP;
   psInfo->hasApply = !(dwFlags & PSH_NOAPPLYNOW);
+  psInfo->hasFinish = dwFlags & PSH_WIZARDHASFINISH;
   psInfo->useCallback = (dwFlags & PSH_USECALLBACK) && (lppsh->pfnCallback);
   psInfo->isModeless = dwFlags & PSH_MODELESS;
 
@@ -1004,6 +1004,8 @@ static BOOL PROPSHEET_AdjustButtonsWizard(HWND hwndParent,
 
   if (psInfo->hasHelp)
     num_buttons++;
+  if (psInfo->hasFinish)
+    num_buttons++;
 
   /*
    * Obtain the size of the buttons.
@@ -1024,40 +1026,47 @@ static BOOL PROPSHEET_AdjustButtonsWizard(HWND hwndParent,
    * All buttons will be at this y coordinate.
    */
   y = rcSheet.bottom - (padding.y + buttonHeight);
-
+  
-  /*
-   * Position the Next and the Finish buttons.
-   */
-  hwndButton = GetDlgItem(hwndParent, IDC_NEXT_BUTTON);
-
-  x = rcSheet.right - ((padding.x + buttonWidth) * (num_buttons - 1));
-
-  SetWindowPos(hwndButton, 0, x, y, 0, 0,
-               SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
-
-  hwndButton = GetDlgItem(hwndParent, IDC_FINISH_BUTTON);
-
-  SetWindowPos(hwndButton, 0, x, y, 0, 0,
-               SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
-
-  ShowWindow(hwndButton, SW_HIDE);
-
   /*
    * Position the Back button.
    */
   hwndButton = GetDlgItem(hwndParent, IDC_BACK_BUTTON);
 
-  x -= buttonWidth;
+  x = rcSheet.right - ((padding.x + buttonWidth) * (num_buttons - 1)) - buttonWidth;
 
   SetWindowPos(hwndButton, 0, x, y, 0, 0,
                SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
 
+  /*
+   * Position the Next button.
+   */
+  hwndButton = GetDlgItem(hwndParent, IDC_NEXT_BUTTON);
+  
+  x += buttonWidth;
+  
+  SetWindowPos(hwndButton, 0, x, y, 0, 0,
+               SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
+
+  /*
+   * Position the Finish button.
+   */
+  hwndButton = GetDlgItem(hwndParent, IDC_FINISH_BUTTON);
+  
+  if (psInfo->hasFinish)
+    x += padding.x + buttonWidth;
+
+  SetWindowPos(hwndButton, 0, x, y, 0, 0,
+               SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
+
+  if (!psInfo->hasFinish)
+    ShowWindow(hwndButton, SW_HIDE);
+
   /*
    * Position the Cancel button.
    */
   hwndButton = GetDlgItem(hwndParent, IDCANCEL);
 
-  x = rcSheet.right - ((padding.x + buttonWidth) * (num_buttons - 2));
+  x += padding.x + buttonWidth;
 
   SetWindowPos(hwndButton, 0, x, y, 0, 0,
                SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
@@ -1069,7 +1078,7 @@ static BOOL PROPSHEET_AdjustButtonsWizard(HWND hwndParent,
 
   if (psInfo->hasHelp)
   {
-    x = rcSheet.right - (padding.x + buttonWidth);
+    x += padding.x + buttonWidth;
 
     SetWindowPos(hwndButton, 0, x, y, 0, 0,
                  SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE);
@@ -2193,6 +2202,7 @@ static void PROPSHEET_SetTitleW(HWND hwndDlg, DWORD dwStyle, LPCWSTR lpszText)
  */
 static void PROPSHEET_SetFinishTextA(HWND hwndDlg, LPCSTR lpszText)
 {
+  PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwndDlg, PropSheetInfoStr);
   HWND hwndButton = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON);
 
   TRACE("'%s'\n", lpszText);
@@ -2208,9 +2218,12 @@ static void PROPSHEET_SetFinishTextA(HWND hwndDlg, LPCSTR lpszText)
   hwndButton = GetDlgItem(hwndDlg, IDC_BACK_BUTTON);
   ShowWindow(hwndButton, SW_HIDE);
 
-  /* Hide Next button */
+  if (!psInfo->hasFinish)
-  hwndButton = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON);
+  {
-  ShowWindow(hwndButton, SW_HIDE);
+    /* Hide Next button */
+    hwndButton = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON);
+    ShowWindow(hwndButton, SW_HIDE);
+  }
 }
 
 /******************************************************************************
@@ -2218,6 +2231,7 @@ static void PROPSHEET_SetFinishTextA(HWND hwndDlg, LPCSTR lpszText)
  */
 static void PROPSHEET_SetFinishTextW(HWND hwndDlg, LPCWSTR lpszText)
 {
+  PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwndDlg, PropSheetInfoStr);
   HWND hwndButton = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON);
 
   TRACE("'%s'\n", debugstr_w(lpszText));
@@ -2233,9 +2247,12 @@ static void PROPSHEET_SetFinishTextW(HWND hwndDlg, LPCWSTR lpszText)
   hwndButton = GetDlgItem(hwndDlg, IDC_BACK_BUTTON);
   ShowWindow(hwndButton, SW_HIDE);
 
-  /* Hide Next button */
+  if (!psInfo->hasFinish)
-  hwndButton = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON);
+  {
-  ShowWindow(hwndButton, SW_HIDE);
+    /* Hide Next button */
+    hwndButton = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON);
+    ShowWindow(hwndButton, SW_HIDE);
+  }
 }
 
 /******************************************************************************
@@ -2436,6 +2453,8 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg,
  */
 static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags)
 {
+  PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwndDlg,
+                                                    PropSheetInfoStr);
   HWND hwndBack   = GetDlgItem(hwndDlg, IDC_BACK_BUTTON);
   HWND hwndNext   = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON);
   HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON);
@@ -2451,8 +2470,11 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags)
 
   if (dwFlags & PSWIZB_NEXT)
   {
-    /* Hide the Finish button */
+    if (!psInfo->hasFinish)
-    ShowWindow(hwndFinish, SW_HIDE);
+    {
+      /* Hide the Finish button */
+      ShowWindow(hwndFinish, SW_HIDE);
+    }
 
     /* Show and enable the Next button */
     ShowWindow(hwndNext, SW_SHOW);
@@ -2462,20 +2484,27 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags)
     SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0);
   }
 
-  if ((dwFlags & PSWIZB_FINISH) || (dwFlags & PSWIZB_DISABLEDFINISH))
+  if (!psInfo->hasFinish)
   {
-    /* Hide the Next button */
+    if ((dwFlags & PSWIZB_FINISH) || (dwFlags & PSWIZB_DISABLEDFINISH))
-    ShowWindow(hwndNext, SW_HIDE);
+    {
+      /* Hide the Next button */
+      ShowWindow(hwndNext, SW_HIDE);
+      
+      /* Show the Finish button */
+      ShowWindow(hwndFinish, SW_SHOW);
 
-    /* Show the Finish button */
+      if (!(dwFlags & PSWIZB_DISABLEDFINISH))
-    ShowWindow(hwndFinish, SW_SHOW);
+      {
+        EnableWindow(hwndFinish, TRUE);
 
-    if (dwFlags & PSWIZB_FINISH)
+        /* Set the Finish button as the default pushbutton  */
-      EnableWindow(hwndFinish, TRUE);
+        SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0);
-
+      }
-    /* Set the Finish button as the default pushbutton  */
+    }
-    SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0);
   }
+  else if (!(dwFlags & PSWIZB_DISABLEDFINISH))
+    EnableWindow(hwndFinish, TRUE);
 }
 
 /******************************************************************************