Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [RDBSS] Fix a bug in RxQueryNameInfo(): don't only return name length, but also the whole structure. Avoids corruption
by Pierre Schweitzer 02 Nov '17

02 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c679fc6b4abd351a443d… commit 3c679fc6b4abd351a443d0affacd01554a96a044 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Nov 2 23:03:08 2017 +0100 [RDBSS] Fix a bug in RxQueryNameInfo(): don't only return name length, but also the whole structure. Avoids corruption --- sdk/lib/drivers/rdbsslib/rdbss.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/lib/drivers/rdbsslib/rdbss.c b/sdk/lib/drivers/rdbsslib/rdbss.c index 46c006d0a7..15e4a2d28c 100644 --- a/sdk/lib/drivers/rdbsslib/rdbss.c +++ b/sdk/lib/drivers/rdbsslib/rdbss.c @@ -8155,6 +8155,8 @@ RxQueryNameInfo( return STATUS_BUFFER_OVERFLOW; } + RxContext->Info.LengthRemaining -= FIELD_OFFSET(FILE_NAME_INFORMATION, FileName); + Fcb = (PFCB)RxContext->pFcb; Fobx = (PFOBX)RxContext->pFobx; /* Get the UNC name */

1 0

[reactos] 01/01: [MSPAINT] Base dialog implementations on CDialogImpl
by Benedikt Freisen 02 Nov '17

02 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ef056230ed50c6cb227c… commit 0ef056230ed50c6cb227cd52ea4b55a3db5f60cb Author: Benedikt Freisen <b.freisen(a)gmx.net> AuthorDate: Wed Nov 1 14:59:01 2017 +0100 [MSPAINT] Base dialog implementations on CDialogImpl - Wrap implementation of Mirror/Rotate, Stretch/Skew and Attributes dialog in subclasses of CDialogImpl - Turn global variables from code that was moved into member functions into member variables - Add global instances of all three dialog classes - Use <global instance>.DoModal(...) instead of one-line wrappers - Replace some TCHAR arrays with CStrings --- base/applications/mspaint/dialogs.cpp | 448 +++++++++++++++++----------------- base/applications/mspaint/dialogs.h | 79 +++++- base/applications/mspaint/globalvar.h | 26 +- base/applications/mspaint/main.cpp | 5 - base/applications/mspaint/winproc.cpp | 12 +- 5 files changed, 315 insertions(+), 255 deletions(-) diff --git a/base/applications/mspaint/dialogs.cpp b/base/applications/mspaint/dialogs.cpp index dd1887be8d..144b5ed735 100644 --- a/base/applications/mspaint/dialogs.cpp +++ b/base/applications/mspaint/dialogs.cpp @@ -10,257 +10,251 @@ #include "precomp.h" +#include "dialogs.h" + #include <winnls.h> +/* GLOBALS **********************************************************/ + +CMirrorRotateDialog mirrorRotateDialog; +CAttributesDialog attributesDialog; +CStretchSkewDialog stretchSkewDialog; + /* FUNCTIONS ********************************************************/ -INT_PTR CALLBACK -MRDlgWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +LRESULT CMirrorRotateDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + CheckDlgButton(IDD_MIRRORROTATERB1, BST_CHECKED); + CheckDlgButton(IDD_MIRRORROTATERB4, BST_CHECKED); + return 0; +} + +LRESULT CMirrorRotateDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + EndDialog(0); + return 0; +} + +LRESULT CMirrorRotateDialog::OnOk(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + if (IsDlgButtonChecked(IDD_MIRRORROTATERB1)) + EndDialog(1); + else if (IsDlgButtonChecked(IDD_MIRRORROTATERB2)) + EndDialog(2); + else if (IsDlgButtonChecked(IDD_MIRRORROTATERB4)) + EndDialog(3); + else if (IsDlgButtonChecked(IDD_MIRRORROTATERB5)) + EndDialog(4); + else if (IsDlgButtonChecked(IDD_MIRRORROTATERB6)) + EndDialog(5); + return 0; +} + +LRESULT CMirrorRotateDialog::OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + EndDialog(0); + return 0; +} + +LRESULT CMirrorRotateDialog::OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB4), TRUE); + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB5), TRUE); + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB6), TRUE); + return 0; +} + +LRESULT CMirrorRotateDialog::OnRadioButton12(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { - switch (message) + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB4), FALSE); + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB5), FALSE); + ::EnableWindow(GetDlgItem(IDD_MIRRORROTATERB6), FALSE); + return 0; +} + + + +LRESULT CAttributesDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + newWidth = imageModel.GetWidth(); + newHeight = imageModel.GetHeight(); + + CheckDlgButton(IDD_ATTRIBUTESRB3, BST_CHECKED); + CheckDlgButton(IDD_ATTRIBUTESRB5, BST_CHECKED); + SetDlgItemInt(IDD_ATTRIBUTESEDIT1, newWidth, FALSE); + SetDlgItemInt(IDD_ATTRIBUTESEDIT2, newHeight, FALSE); + + if (isAFile) { - case WM_INITDIALOG: - CheckDlgButton(hwnd, IDD_MIRRORROTATERB1, BST_CHECKED); - CheckDlgButton(hwnd, IDD_MIRRORROTATERB4, BST_CHECKED); - return TRUE; - case WM_CLOSE: - EndDialog(hwnd, 0); - break; - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDOK: - if (IsDlgButtonChecked(hwnd, IDD_MIRRORROTATERB1)) - EndDialog(hwnd, 1); - else if (IsDlgButtonChecked(hwnd, IDD_MIRRORROTATERB2)) - EndDialog(hwnd, 2); - else if (IsDlgButtonChecked(hwnd, IDD_MIRRORROTATERB4)) - EndDialog(hwnd, 3); - else if (IsDlgButtonChecked(hwnd, IDD_MIRRORROTATERB5)) - EndDialog(hwnd, 4); - else if (IsDlgButtonChecked(hwnd, IDD_MIRRORROTATERB6)) - EndDialog(hwnd, 5); - break; - case IDCANCEL: - EndDialog(hwnd, 0); - break; - case IDD_MIRRORROTATERB3: - EnableWindow(GetDlgItem(hwnd, IDD_MIRRORROTATERB4), TRUE); - EnableWindow(GetDlgItem(hwnd, IDD_MIRRORROTATERB5), TRUE); - EnableWindow(GetDlgItem(hwnd, IDD_MIRRORROTATERB6), TRUE); - break; - case IDD_MIRRORROTATERB1: - case IDD_MIRRORROTATERB2: - EnableWindow(GetDlgItem(hwnd, IDD_MIRRORROTATERB4), FALSE); - EnableWindow(GetDlgItem(hwnd, IDD_MIRRORROTATERB5), FALSE); - EnableWindow(GetDlgItem(hwnd, IDD_MIRRORROTATERB6), FALSE); - break; - } - break; - default: - return FALSE; + TCHAR date[100]; + TCHAR temp[100]; + GetDateFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, date, SIZEOF(date)); + GetTimeFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, temp, SIZEOF(temp)); + _tcscat(date, _T(" ")); + _tcscat(date, temp); + CString strSize; + strSize.Format(IDS_FILESIZE, fileSize); + SetDlgItemText(IDD_ATTRIBUTESTEXT6, date); + SetDlgItemText(IDD_ATTRIBUTESTEXT7, strSize); } - return TRUE; + CString strRes; + strRes.Format(IDS_PRINTRES, fileHPPM, fileVPPM); + SetDlgItemText(IDD_ATTRIBUTESTEXT8, strRes); + return 0; +} + +LRESULT CAttributesDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + EndDialog(0); + return 0; +} + +LRESULT CAttributesDialog::OnOk(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + EndDialog(1); + return 0; +} + +LRESULT CAttributesDialog::OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + EndDialog(0); + return 0; } -int -mirrorRotateDlg() +LRESULT CAttributesDialog::OnDefault(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { - return DialogBox(hProgInstance, MAKEINTRESOURCE(IDD_MIRRORROTATE), mainWindow.m_hWnd, MRDlgWinProc); + newWidth = imageModel.GetWidth(); + newHeight = imageModel.GetHeight(); + CheckDlgButton(IDD_ATTRIBUTESRB3, BST_CHECKED); + CheckDlgButton(IDD_ATTRIBUTESRB5, BST_CHECKED); + SetDlgItemInt(IDD_ATTRIBUTESEDIT1, newWidth, FALSE); + SetDlgItemInt(IDD_ATTRIBUTESEDIT2, newHeight, FALSE); + return 0; } -INT_PTR CALLBACK -ATTDlgWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +LRESULT CAttributesDialog::OnRadioButton1(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { - switch (message) + CString strNum; + strNum.Format(_T("%.3lf"), newWidth / (0.0254 * fileHPPM)); + SetDlgItemText(IDD_ATTRIBUTESEDIT1, strNum); + strNum.Format(_T("%.3lf"), newHeight / (0.0254 * fileVPPM)); + SetDlgItemText(IDD_ATTRIBUTESEDIT2, strNum); + return 0; +} + +LRESULT CAttributesDialog::OnRadioButton2(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + CString strNum; + strNum.Format(_T("%.3lf"), newWidth * 100.0 / fileHPPM); + SetDlgItemText(IDD_ATTRIBUTESEDIT1, strNum); + strNum.Format(_T("%.3lf"), newHeight * 100.0 / fileVPPM); + SetDlgItemText(IDD_ATTRIBUTESEDIT2, strNum); + return 0; +} + +LRESULT CAttributesDialog::OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + SetDlgItemInt(IDD_ATTRIBUTESEDIT1, newWidth, FALSE); + SetDlgItemInt(IDD_ATTRIBUTESEDIT2, newHeight, FALSE); + return 0; +} + +LRESULT CAttributesDialog::OnEdit1(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + if (Edit_GetModify(hWndCtl)) + { + TCHAR tempS[100]; + if (IsDlgButtonChecked(IDD_ATTRIBUTESRB1)) + { + GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, SIZEOF(tempS)); + newWidth = max(1, (int) (_tcstod(tempS, NULL) * fileHPPM * 0.0254)); + } + else if (IsDlgButtonChecked(IDD_ATTRIBUTESRB2)) + { + GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, SIZEOF(tempS)); + newWidth = max(1, (int) (_tcstod(tempS, NULL) * fileHPPM / 100)); + } + else if (IsDlgButtonChecked(IDD_ATTRIBUTESRB3)) + { + GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, SIZEOF(tempS)); + newWidth = max(1, _tstoi(tempS)); + } + Edit_SetModify(hWndCtl, FALSE); + } + return 0; +} + +LRESULT CAttributesDialog::OnEdit2(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + if (Edit_GetModify(hWndCtl)) { - case WM_INITDIALOG: + TCHAR tempS[100]; + if (IsDlgButtonChecked(IDD_ATTRIBUTESRB1)) + { + GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, SIZEOF(tempS)); + newHeight = max(1, (int) (_tcstod(tempS, NULL) * fileVPPM * 0.0254)); + } + else if (IsDlgButtonChecked(IDD_ATTRIBUTESRB2)) { - widthSetInDlg = imageModel.GetWidth(); - heightSetInDlg = imageModel.GetHeight(); - - CheckDlgButton(hwnd, IDD_ATTRIBUTESRB3, BST_CHECKED); - CheckDlgButton(hwnd, IDD_ATTRIBUTESRB5, BST_CHECKED); - SetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT1, widthSetInDlg, FALSE); - SetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT2, heightSetInDlg, FALSE); - - if (isAFile) - { - TCHAR date[100]; - TCHAR temp[100]; - GetDateFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, date, SIZEOF(date)); - GetTimeFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, temp, SIZEOF(temp)); - _tcscat(date, _T(" ")); - _tcscat(date, temp); - CString strSize; - strSize.Format(IDS_FILESIZE, fileSize); - SetDlgItemText(hwnd, IDD_ATTRIBUTESTEXT6, date); - SetDlgItemText(hwnd, IDD_ATTRIBUTESTEXT7, strSize); - } - CString strRes; - strRes.Format(IDS_PRINTRES, fileHPPM, fileVPPM); - SetDlgItemText(hwnd, IDD_ATTRIBUTESTEXT8, strRes); - return TRUE; + GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, SIZEOF(tempS)); + newHeight = max(1, (int) (_tcstod(tempS, NULL) * fileVPPM / 100)); } - case WM_CLOSE: - EndDialog(hwnd, 0); - break; - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDOK: - EndDialog(hwnd, 1); - break; - case IDCANCEL: - EndDialog(hwnd, 0); - break; - case IDD_ATTRIBUTESSTANDARD: - widthSetInDlg = imageModel.GetWidth(); - heightSetInDlg = imageModel.GetHeight(); - CheckDlgButton(hwnd, IDD_ATTRIBUTESRB3, BST_CHECKED); - CheckDlgButton(hwnd, IDD_ATTRIBUTESRB5, BST_CHECKED); - SetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT1, widthSetInDlg, FALSE); - SetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT2, heightSetInDlg, FALSE); - break; - case IDD_ATTRIBUTESRB1: - { - CString strNum; - strNum.Format(_T("%.3lf"), widthSetInDlg / (0.0254 * fileHPPM)); - SetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT1, strNum); - strNum.Format(_T("%.3lf"), heightSetInDlg / (0.0254 * fileVPPM)); - SetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT2, strNum); - break; - } - case IDD_ATTRIBUTESRB2: - { - CString strNum; - strNum.Format(_T("%.3lf"), widthSetInDlg * 100.0 / fileHPPM); - SetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT1, strNum); - strNum.Format(_T("%.3lf"), heightSetInDlg * 100.0 / fileVPPM); - SetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT2, strNum); - break; - } - case IDD_ATTRIBUTESRB3: - SetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT1, widthSetInDlg, FALSE); - SetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT2, heightSetInDlg, FALSE); - break; - case IDD_ATTRIBUTESEDIT1: - if (Edit_GetModify((HWND)lParam)) - { - TCHAR tempS[100]; - if (IsDlgButtonChecked(hwnd, IDD_ATTRIBUTESRB1)) - { - GetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT1, tempS, SIZEOF(tempS)); - widthSetInDlg = max(1, (int) (_tcstod(tempS, NULL) * fileHPPM * 0.0254)); - } - else if (IsDlgButtonChecked(hwnd, IDD_ATTRIBUTESRB2)) - { - GetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT1, tempS, SIZEOF(tempS)); - widthSetInDlg = max(1, (int) (_tcstod(tempS, NULL) * fileHPPM / 100)); - } - else if (IsDlgButtonChecked(hwnd, IDD_ATTRIBUTESRB3)) - { - GetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT1, tempS, SIZEOF(tempS)); - widthSetInDlg = max(1, _tstoi(tempS)); - } - Edit_SetModify((HWND)lParam, FALSE); - } - break; - case IDD_ATTRIBUTESEDIT2: - if (Edit_GetModify((HWND)lParam)) - { - TCHAR tempS[100]; - if (IsDlgButtonChecked(hwnd, IDD_ATTRIBUTESRB1)) - { - GetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT2, tempS, SIZEOF(tempS)); - heightSetInDlg = max(1, (int) (_tcstod(tempS, NULL) * fileVPPM * 0.0254)); - } - else if (IsDlgButtonChecked(hwnd, IDD_ATTRIBUTESRB2)) - { - GetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT2, tempS, SIZEOF(tempS)); - heightSetInDlg = max(1, (int) (_tcstod(tempS, NULL) * fileVPPM / 100)); - } - else if (IsDlgButtonChecked(hwnd, IDD_ATTRIBUTESRB3)) - { - GetDlgItemText(hwnd, IDD_ATTRIBUTESEDIT2, tempS, SIZEOF(tempS)); - heightSetInDlg = max(1, _tstoi(tempS)); - } - Edit_SetModify((HWND)lParam, FALSE); - } - break; - } - break; - default: - return FALSE; + else if (IsDlgButtonChecked(IDD_ATTRIBUTESRB3)) + { + GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, SIZEOF(tempS)); + newHeight = max(1, _tstoi(tempS)); + } + Edit_SetModify(hWndCtl, FALSE); } - return TRUE; + return 0; } -int -attributesDlg() + + +LRESULT CStretchSkewDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - return DialogBox(hProgInstance, MAKEINTRESOURCE(IDD_ATTRIBUTES), mainWindow.m_hWnd, ATTDlgWinProc); + SetDlgItemInt(IDD_STRETCHSKEWEDITHSTRETCH, 100, FALSE); + SetDlgItemInt(IDD_STRETCHSKEWEDITVSTRETCH, 100, FALSE); + SetDlgItemInt(IDD_STRETCHSKEWEDITHSKEW, 0, FALSE); + SetDlgItemInt(IDD_STRETCHSKEWEDITVSKEW, 0, FALSE); + return 0; } -INT_PTR CALLBACK -CHSIZEDlgWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +LRESULT CStretchSkewDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - switch (message) - { - case WM_INITDIALOG: - SetDlgItemInt(hwnd, IDD_STRETCHSKEWEDITHSTRETCH, 100, FALSE); - SetDlgItemInt(hwnd, IDD_STRETCHSKEWEDITVSTRETCH, 100, FALSE); - SetDlgItemInt(hwnd, IDD_STRETCHSKEWEDITHSKEW, 0, FALSE); - SetDlgItemInt(hwnd, IDD_STRETCHSKEWEDITVSKEW, 0, FALSE); - return TRUE; - case WM_CLOSE: - EndDialog(hwnd, 0); - break; - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDOK: - { - TCHAR strrcIntNumbers[100]; - TCHAR strrcPercentage[100]; - TCHAR strrcAngle[100]; - BOOL tr1, tr2, tr3, tr4; - - LoadString(hProgInstance, IDS_INTNUMBERS, strrcIntNumbers, SIZEOF(strrcIntNumbers)); - LoadString(hProgInstance, IDS_PERCENTAGE, strrcPercentage, SIZEOF(strrcPercentage)); - LoadString(hProgInstance, IDS_ANGLE, strrcAngle, SIZEOF(strrcAngle)); - - stretchSkew.percentage.x = GetDlgItemInt(hwnd, IDD_STRETCHSKEWEDITHSTRETCH, &tr1, FALSE); - stretchSkew.percentage.y = GetDlgItemInt(hwnd, IDD_STRETCHSKEWEDITVSTRETCH, &tr2, FALSE); - stretchSkew.angle.x = GetDlgItemInt(hwnd, IDD_STRETCHSKEWEDITHSKEW, &tr3, TRUE); - stretchSkew.angle.y = GetDlgItemInt(hwnd, IDD_STRETCHSKEWEDITVSKEW, &tr4, TRUE); - - if (!(tr1 && tr2 && tr3 && tr4)) - MessageBox(hwnd, strrcIntNumbers, NULL, MB_ICONEXCLAMATION); - else if (stretchSkew.percentage.x < 1 || stretchSkew.percentage.x > 500 - || stretchSkew.percentage.y < 1 || stretchSkew.percentage.y > 500) - MessageBox(hwnd, strrcPercentage, NULL, MB_ICONEXCLAMATION); - else if (stretchSkew.angle.x < -89 || stretchSkew.angle.x > 89 - || stretchSkew.angle.y < -89 || stretchSkew.angle.y > 89) - MessageBox(hwnd, strrcAngle, NULL, MB_ICONEXCLAMATION); - else - EndDialog(hwnd, 1); - - break; - } - case IDCANCEL: - EndDialog(hwnd, 0); - break; - } - break; - default: - return FALSE; - } - return TRUE; + EndDialog(0); + return 0; +} + +LRESULT CStretchSkewDialog::OnOk(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) +{ + CString strrcIntNumbers; + CString strrcPercentage; + CString strrcAngle; + BOOL tr1, tr2, tr3, tr4; + + strrcIntNumbers.LoadString(hProgInstance, IDS_INTNUMBERS); + strrcPercentage.LoadString(hProgInstance, IDS_PERCENTAGE); + strrcAngle.LoadString(hProgInstance, IDS_ANGLE); + + percentage.x = GetDlgItemInt(IDD_STRETCHSKEWEDITHSTRETCH, &tr1, FALSE); + percentage.y = GetDlgItemInt(IDD_STRETCHSKEWEDITVSTRETCH, &tr2, FALSE); + angle.x = GetDlgItemInt(IDD_STRETCHSKEWEDITHSKEW, &tr3, TRUE); + angle.y = GetDlgItemInt(IDD_STRETCHSKEWEDITVSKEW, &tr4, TRUE); + + if (!(tr1 && tr2 && tr3 && tr4)) + MessageBox(strrcIntNumbers, NULL, MB_ICONEXCLAMATION); + else if (percentage.x < 1 || percentage.x > 500 || percentage.y < 1 || percentage.y > 500) + MessageBox(strrcPercentage, NULL, MB_ICONEXCLAMATION); + else if (angle.x < -89 || angle.x > 89 || angle.y < -89 || angle.y > 89) + MessageBox(strrcAngle, NULL, MB_ICONEXCLAMATION); + else + EndDialog(1); + return 0; } -int -changeSizeDlg() +LRESULT CStretchSkewDialog::OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { - return DialogBox(hProgInstance, MAKEINTRESOURCE(IDD_STRETCHSKEW), mainWindow.m_hWnd, CHSIZEDlgWinProc); + EndDialog(0); + return 0; } diff --git a/base/applications/mspaint/dialogs.h b/base/applications/mspaint/dialogs.h index 55a313d72d..7c85652601 100644 --- a/base/applications/mspaint/dialogs.h +++ b/base/applications/mspaint/dialogs.h @@ -6,8 +6,81 @@ * PROGRAMMERS: Benedikt Freisen */ -int mirrorRotateDlg(void); +class CMirrorRotateDialog : public CDialogImpl<CMirrorRotateDialog> +{ +public: + enum { IDD = IDD_MIRRORROTATE }; -int attributesDlg(void); + BEGIN_MSG_MAP(CMirrorRotateDialog) + MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog) + MESSAGE_HANDLER(WM_CLOSE, OnClose) + COMMAND_ID_HANDLER(IDOK, OnOk) + COMMAND_ID_HANDLER(IDCANCEL, OnCancel) + COMMAND_ID_HANDLER(IDD_MIRRORROTATERB3, OnRadioButton3) + COMMAND_ID_HANDLER(IDD_MIRRORROTATERB1, OnRadioButton12) + COMMAND_ID_HANDLER(IDD_MIRRORROTATERB2, OnRadioButton12) + END_MSG_MAP() -int changeSizeDlg(void); + LRESULT OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnOk(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnRadioButton12(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); +}; + +class CAttributesDialog : public CDialogImpl<CAttributesDialog> +{ +public: + enum { IDD = IDD_ATTRIBUTES }; + + BEGIN_MSG_MAP(CAttributesDialog) + MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog) + MESSAGE_HANDLER(WM_CLOSE, OnClose) + COMMAND_ID_HANDLER(IDOK, OnOk) + COMMAND_ID_HANDLER(IDCANCEL, OnCancel) + COMMAND_ID_HANDLER(IDD_ATTRIBUTESSTANDARD, OnDefault) + COMMAND_ID_HANDLER(IDD_ATTRIBUTESRB1, OnRadioButton1) + COMMAND_ID_HANDLER(IDD_ATTRIBUTESRB1, OnRadioButton2) + COMMAND_ID_HANDLER(IDD_ATTRIBUTESRB1, OnRadioButton3) + COMMAND_ID_HANDLER(IDD_ATTRIBUTESEDIT1, OnEdit1) + COMMAND_ID_HANDLER(IDD_ATTRIBUTESEDIT1, OnEdit2) + END_MSG_MAP() + + LRESULT OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnOk(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnDefault(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnRadioButton1(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnRadioButton2(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnRadioButton3(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnEdit1(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnEdit2(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + +public: + int newWidth; + int newHeight; +}; + +class CStretchSkewDialog : public CDialogImpl<CStretchSkewDialog> +{ +public: + enum { IDD = IDD_STRETCHSKEW }; + + BEGIN_MSG_MAP(CStretchSkewDialog) + MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog) + MESSAGE_HANDLER(WM_CLOSE, OnClose) + COMMAND_ID_HANDLER(IDOK, OnOk) + COMMAND_ID_HANDLER(IDCANCEL, OnCancel) + END_MSG_MAP() + + LRESULT OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnOk(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + LRESULT OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled); + +public: + POINT percentage; + POINT angle; +}; diff --git a/base/applications/mspaint/globalvar.h b/base/applications/mspaint/globalvar.h index 8bc6029558..d584eb6375 100644 --- a/base/applications/mspaint/globalvar.h +++ b/base/applications/mspaint/globalvar.h @@ -6,19 +6,7 @@ * PROGRAMMERS: Benedikt Freisen */ -/* TYPES ************************************************************/ - -typedef struct tagSTRETCHSKEW { - POINT percentage; - POINT angle; -} STRETCHSKEW; - -/* VARIABLES declared in main.c *************************************/ - -extern int widthSetInDlg; -extern int heightSetInDlg; - -extern STRETCHSKEW stretchSkew; +/* VARIABLES declared in main.cpp ***********************************/ class RegistrySettings; extern RegistrySettings registrySettings; @@ -103,7 +91,17 @@ extern CSizeboxWindow sizeboxCenterBottom; extern CSizeboxWindow sizeboxRightBottom; extern CTextEditWindow textEditWindow; -/* VARIABLES declared in mouse.c ************************************/ +/* VARIABLES declared in dialogs.cpp ********************************/ + +class CMirrorRotateDialog; +class CAttributesDialog; +class CStretchSkewDialog; + +extern CMirrorRotateDialog mirrorRotateDialog; +extern CAttributesDialog attributesDialog; +extern CStretchSkewDialog stretchSkewDialog; + +/* VARIABLES declared in mouse.cpp **********************************/ extern POINT pointStack[256]; extern short pointSP; diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 5d1248262b..510688ea98 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -12,11 +12,6 @@ /* FUNCTIONS ********************************************************/ -int widthSetInDlg; -int heightSetInDlg; - -STRETCHSKEW stretchSkew; - POINT start; POINT last; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index ace8c960fa..f0b64c69a3 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -605,7 +605,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH imageArea.Invalidate(FALSE); break; case IDM_IMAGEROTATEMIRROR: - switch (mirrorRotateDlg()) + switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) { case 1: /* flip horizontally */ if (selectionWindow.IsWindowVisible()) @@ -633,18 +633,18 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; case IDM_IMAGEATTRIBUTES: { - if (attributesDlg()) + if (attributesDialog.DoModal(mainWindow.m_hWnd)) { - imageModel.Crop(widthSetInDlg, heightSetInDlg, 0, 0); + imageModel.Crop(attributesDialog.newWidth, attributesDialog.newHeight, 0, 0); } break; } case IDM_IMAGESTRETCHSKEW: { - if (changeSizeDlg()) + if (stretchSkewDialog.DoModal(mainWindow.m_hWnd)) { - imageModel.StretchSkew(stretchSkew.percentage.x, stretchSkew.percentage.y, - stretchSkew.angle.x, stretchSkew.angle.y); + imageModel.StretchSkew(stretchSkewDialog.percentage.x, stretchSkewDialog.percentage.y, + stretchSkewDialog.angle.x, stretchSkewDialog.angle.y); } break; }

1 0

[reactos] 01/01: [SHELL32] Fix multiple selection of desktop icons
by Manuel Bachmann 02 Nov '17

02 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9192d39f6e177683ad40d… commit 9192d39f6e177683ad40d85bdcb70c443e40a13a Author: Manuel Bachmann <tarnyko(a)tarnyko.net> AuthorDate: Thu Nov 2 19:55:03 2017 +0100 [SHELL32] Fix multiple selection of desktop icons This fixes the following issue : when selecting multiple icons on the desktop, and then right-clicking; the Properties sheet would immediately be displayed, conflicting with the context menu. --- dll/win32/shell32/folders/CDesktopFolder.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dll/win32/shell32/folders/CDesktopFolder.cpp b/dll/win32/shell32/folders/CDesktopFolder.cpp index 98e5c4fb6c..6d9b66eb72 100644 --- a/dll/win32/shell32/folders/CDesktopFolder.cpp +++ b/dll/win32/shell32/folders/CDesktopFolder.cpp @@ -858,6 +858,9 @@ HRESULT WINAPI CDesktopFolder::CallBack(IShellFolder *psf, HWND hwndOwner, IData return S_OK; } + if (uMsg != DFM_INVOKECOMMAND || wParam != DFM_CMD_PROPERTIES) + return S_OK; + PIDLIST_ABSOLUTE pidlFolder; PUITEMID_CHILD *apidl; UINT cidl;

1 0

[reactos] 01/01: [BROWSEUI] Add a todo comment block in CISFBand.cpp and CBandSite.cpp regarding some problems and missing features when using the quick launch toolbar. These two lists are not complete but cover most important problems of quick launch. There is no need to create bug reports for these.
by Giannis Adamopoulos 02 Nov '17

02 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2875a70c0a41a149c0764… commit 2875a70c0a41a149c0764d1f3c45fa5cd211a6d6 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Thu Nov 2 19:50:03 2017 +0200 [BROWSEUI] Add a todo comment block in CISFBand.cpp and CBandSite.cpp regarding some problems and missing features when using the quick launch toolbar. These two lists are not complete but cover most important problems of quick launch. There is no need to create bug reports for these. --- dll/win32/browseui/shellbars/CBandSite.cpp | 9 +++++++++ dll/win32/browseui/shellbars/CISFBand.cpp | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/dll/win32/browseui/shellbars/CBandSite.cpp b/dll/win32/browseui/shellbars/CBandSite.cpp index 520f9eba58..5bf195ec89 100644 --- a/dll/win32/browseui/shellbars/CBandSite.cpp +++ b/dll/win32/browseui/shellbars/CBandSite.cpp @@ -27,6 +27,15 @@ ERR ("ASSERTION %s AT %s:%d FAILED!\n", #cond, __FILE__, __LINE__) #endif + +/* +TODO: + ** Fix tasks band gripper not appearing when quick launch is added + ** Fix hiding grippers in locked mode + ** The context menu should include the menu of both the site and the band + ** The chevron should be shown only when needed +*/ + CBandSiteBase::CBandSiteBase() { fBandsCount = 0; diff --git a/dll/win32/browseui/shellbars/CISFBand.cpp b/dll/win32/browseui/shellbars/CISFBand.cpp index 6e4bb36a7f..2ea32eb63a 100644 --- a/dll/win32/browseui/shellbars/CISFBand.cpp +++ b/dll/win32/browseui/shellbars/CISFBand.cpp @@ -13,6 +13,16 @@ #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) +/* +TODO: + ** drag and drop support + ** tooltips + ** handle change notifications + ** Fix position of the items context menu + ** Implement responding to theme change +*/ + + // ***Extras*** /*++ * @name _ILIsDesktop

1 0

[reactos] 01/01: [ATL] Initial implementation of CAtlExeModuleT. CORE-13908
by Mark Jansen 01 Nov '17

01 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be1155f294ea1c4d551a3… commit be1155f294ea1c4d551a34411d48389e510d4082 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Oct 22 22:25:03 2017 +0200 [ATL] Initial implementation of CAtlExeModuleT. CORE-13908 --- sdk/lib/atl/atlbase.h | 189 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 181 insertions(+), 8 deletions(-) diff --git a/sdk/lib/atl/atlbase.h b/sdk/lib/atl/atlbase.h index 21d6d252b5..5d6c874bb6 100644 --- a/sdk/lib/atl/atlbase.h +++ b/sdk/lib/atl/atlbase.h @@ -190,15 +190,18 @@ struct _ATL_REGMAP_ENTRY LPCOLESTR szData; }; -HRESULT __stdcall AtlWinModuleInit(_ATL_WIN_MODULE *pWinModule); -HRESULT __stdcall AtlWinModuleTerm(_ATL_WIN_MODULE *pWinModule, HINSTANCE hInst); -HRESULT __stdcall AtlInternalQueryInterface(void *pThis, const _ATL_INTMAP_ENTRY *pEntries, REFIID iid, void **ppvObject); -void __stdcall AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE *pWinModule, _AtlCreateWndData *pData, void *pObject); -void *__stdcall AtlWinModuleExtractCreateWndData(_ATL_WIN_MODULE *pWinModule); -HRESULT __stdcall AtlComModuleGetClassObject(_ATL_COM_MODULE *pComModule, REFCLSID rclsid, REFIID riid, LPVOID *ppv); +HRESULT WINAPI AtlWinModuleInit(_ATL_WIN_MODULE *pWinModule); +HRESULT WINAPI AtlWinModuleTerm(_ATL_WIN_MODULE *pWinModule, HINSTANCE hInst); +HRESULT WINAPI AtlInternalQueryInterface(void *pThis, const _ATL_INTMAP_ENTRY *pEntries, REFIID iid, void **ppvObject); +void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE *pWinModule, _AtlCreateWndData *pData, void *pObject); +void *WINAPI AtlWinModuleExtractCreateWndData(_ATL_WIN_MODULE *pWinModule); +HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE *pComModule, REFCLSID rclsid, REFIID riid, LPVOID *ppv); -HRESULT __stdcall AtlComModuleRegisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeLib, const CLSID *clsid); -HRESULT __stdcall AtlComModuleUnregisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeLib, const CLSID *clsid); +HRESULT WINAPI AtlComModuleRegisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeLib, const CLSID *clsid); +HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeLib, const CLSID *clsid); + +HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE *module, DWORD context, DWORD flags); +HRESULT WINAPI AtlComModuleRevokeClassObjects(_ATL_COM_MODULE *module); template<class TLock> @@ -662,6 +665,127 @@ public: } }; + +template <class T> +class CAtlExeModuleT : public CAtlModuleT<T> +{ +public: + DWORD m_dwMainThreadID; + //DWORD m_dwTimeOut; + //DWORD m_dwPause; + //bool m_bDelayShutdown; + + CAtlExeModuleT() + :m_dwMainThreadID(::GetCurrentThreadId()) + { + } + + ~CAtlExeModuleT() + { + } + + int WinMain(int nShowCmd) + { + HRESULT hr = T::InitializeCom(); + if (FAILED(hr)) + return hr; + + T* pThis = static_cast<T*>(this); + + LPCTSTR lpCommandLine = GetCommandLine(); + if (pThis->ParseCommandLine(lpCommandLine, &hr)) + { + hr = pThis->Run(nShowCmd); + } + + T::UninitializeCom(); + return hr; + } + + + HRESULT Run(int nShowCmd = SW_HIDE) + { + HRESULT hr = S_OK; + + T* pThis = static_cast<T*>(this); + hr = pThis->PreMessageLoop(nShowCmd); + + if (hr == S_OK) + { + pThis->RunMessageLoop(); + hr = pThis->PostMessageLoop(); + } + + return hr; + } + + LONG Lock() + { + return CoAddRefServerProcess(); + } + + LONG Unlock() + { + LONG lRet = CoReleaseServerProcess(); + if (lRet == 0) + { + ::PostThreadMessage(m_dwMainThreadID, WM_QUIT, 0, 0); + } + return lRet; + } + + bool ParseCommandLine(LPCTSTR lpCmdLine, HRESULT* pnRetCode) + { + // unimplemented! + return true; + } + + HRESULT PreMessageLoop(int nShowCmd) + { + T* pThis = static_cast<T*>(this); + return pThis->RegisterClassObjects(CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE); + } + + void RunMessageLoop() + { + MSG msg; + while (GetMessage(&msg, 0, 0, 0) > 0) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + + HRESULT PostMessageLoop() + { + T* pThis = static_cast<T*>(this); + return pThis->RevokeClassObjects(); + } + + HRESULT RegisterClassObjects(DWORD dwClsContext, DWORD dwFlags) + { + return AtlComModuleRegisterClassObjects(&_AtlComModule, dwClsContext, dwFlags); + } + + HRESULT RevokeClassObjects() + { + return AtlComModuleRevokeClassObjects(&_AtlComModule); + } + + static HRESULT InitializeCom() + { + return ::CoInitializeEx(NULL, COINIT_MULTITHREADED); + } + + static void UninitializeCom() + { + ::CoUninitialize(); + } + +}; + + + class CComModule : public CAtlModuleT<CComModule> { public: @@ -1685,6 +1809,55 @@ inline HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE *mod, BOOL bU } +// Adapted from dll/win32/atl/atl.c +inline HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE *module, DWORD context, DWORD flags) +{ + _ATL_OBJMAP_ENTRY **iter; + IUnknown* unk = NULL; + HRESULT hr; + + if (!module) + return E_INVALIDARG; + + for (iter = module->m_ppAutoObjMapFirst; iter < module->m_ppAutoObjMapLast; iter++) + { + if (!(*iter)->pfnGetClassObject) + continue; + + hr = (*iter)->pfnGetClassObject((void*)(*iter)->pfnCreateInstance, IID_IUnknown, (void**)&unk); + if (FAILED(hr)) + return hr; + + hr = CoRegisterClassObject(*(*iter)->pclsid, unk, context, flags, &(*iter)->dwRegister); + unk->Release(); + if (FAILED(hr)) + return hr; + } + + return S_OK; +} + + +// Adapted from dll/win32/atl/atl.c +inline HRESULT WINAPI AtlComModuleRevokeClassObjects(_ATL_COM_MODULE *module) +{ + _ATL_OBJMAP_ENTRY **iter; + HRESULT hr; + + if (!module) + return E_INVALIDARG; + + for (iter = module->m_ppAutoObjMapFirst; iter < module->m_ppAutoObjMapLast; iter++) + { + hr = CoRevokeClassObject((*iter)->dwRegister); + if (FAILED(hr)) + return hr; + } + + return S_OK; +} + + }; // namespace ATL #ifndef _ATL_NO_AUTOMATIC_NAMESPACE

1 0

[reactos] 01/01: [RDBSS] More capture
by Pierre Schweitzer 01 Nov '17

01 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b960479bfc12bb5f0ed5… commit 5b960479bfc12bb5f0ed56641e03b9ac45d5b0c6 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Nov 1 15:12:08 2017 +0100 [RDBSS] More capture --- sdk/lib/drivers/rdbsslib/rdbss.c | 70 +++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/sdk/lib/drivers/rdbsslib/rdbss.c b/sdk/lib/drivers/rdbsslib/rdbss.c index 01b1bd9a7a..46c006d0a7 100644 --- a/sdk/lib/drivers/rdbsslib/rdbss.c +++ b/sdk/lib/drivers/rdbsslib/rdbss.c @@ -772,6 +772,7 @@ RxAddToWorkque( ULONG Queued; KIRQL OldIrql; WORK_QUEUE_TYPE Queue; + RxCaptureParamBlock; RxContext->PostRequest = FALSE; @@ -1240,6 +1241,9 @@ RxCanonicalizeNameAndObtainNetRoot( NET_ROOT_TYPE NetRootType; UNICODE_STRING CanonicalName; + RxCaptureParamBlock; + RxCaptureFileObject; + PAGED_CODE(); NetRootType = NET_ROOT_WILD; @@ -1248,7 +1252,7 @@ RxCanonicalizeNameAndObtainNetRoot( RtlInitEmptyUnicodeString(&CanonicalName, NULL, 0); /* if not relative opening, just handle the passed name */ - if (RxContext->CurrentIrpSp->FileObject->RelatedFileObject == NULL) + if (capFileObject->RelatedFileObject == NULL) { Status = RxFirstCanonicalize(RxContext, FileName, &CanonicalName, &NetRootType); if (!NT_SUCCESS(Status)) @@ -1261,9 +1265,8 @@ RxCanonicalizeNameAndObtainNetRoot( PFCB Fcb; /* Make sure we have a valid FCB and a FOBX */ - Fcb = RxContext->CurrentIrpSp->FileObject->RelatedFileObject->FsContext; - if (Fcb == NULL || - RxContext->CurrentIrpSp->FileObject->RelatedFileObject->FsContext2 == NULL) + Fcb = capFileObject->RelatedFileObject->FsContext; + if (Fcb == NULL || capFileObject->RelatedFileObject->FsContext2 == NULL) { return STATUS_INVALID_PARAMETER; } @@ -1612,26 +1615,25 @@ NTSTATUS RxCollapseOrCreateSrvOpen( PRX_CONTEXT RxContext) { - PFCB Fcb; NTSTATUS Status; ULONG Disposition; PSRV_OPEN SrvOpen; USHORT ShareAccess; - PIO_STACK_LOCATION Stack; ACCESS_MASK DesiredAccess; RX_BLOCK_CONDITION FcbCondition; + RxCaptureFcb; + RxCaptureParamBlock; + PAGED_CODE(); DPRINT("RxCollapseOrCreateSrvOpen(%p)\n", RxContext); - Fcb = (PFCB)RxContext->pFcb; - ASSERT(RxIsFcbAcquiredExclusive(Fcb)); - ++Fcb->UncleanCount; + ASSERT(RxIsFcbAcquiredExclusive(capFcb)); + ++capFcb->UncleanCount; - Stack = RxContext->CurrentIrpSp; - DesiredAccess = Stack->Parameters.Create.SecurityContext->DesiredAccess & FILE_ALL_ACCESS; - ShareAccess = Stack->Parameters.Create.ShareAccess & FILE_SHARE_VALID_FLAGS; + DesiredAccess = capPARAMS->Parameters.Create.SecurityContext->DesiredAccess & FILE_ALL_ACCESS; + ShareAccess = capPARAMS->Parameters.Create.ShareAccess & FILE_SHARE_VALID_FLAGS; Disposition = RxContext->Create.NtCreateParameters.Disposition; @@ -1640,7 +1642,7 @@ RxCollapseOrCreateSrvOpen( if (Status == STATUS_NOT_FOUND) { /* If none found, create one */ - SrvOpen = RxCreateSrvOpen((PV_NET_ROOT)RxContext->Create.pVNetRoot, Fcb); + SrvOpen = RxCreateSrvOpen((PV_NET_ROOT)RxContext->Create.pVNetRoot, capFcb); if (SrvOpen == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -1665,7 +1667,7 @@ RxCollapseOrCreateSrvOpen( /* Cookie to check the mini-rdr doesn't mess with RX_CONTEXT */ RxContext->CurrentIrp->IoStatus.Information = 0xABCDEF; /* Inform the mini-rdr we're handling a create */ - MINIRDR_CALL(Status, RxContext, Fcb->MRxDispatch, MRxCreate, (RxContext)); + MINIRDR_CALL(Status, RxContext, capFcb->MRxDispatch, MRxCreate, (RxContext)); ASSERT(RxContext->CurrentIrp->IoStatus.Information == 0xABCDEF); DPRINT("MRxCreate returned: %x\n", Status); @@ -1674,23 +1676,23 @@ RxCollapseOrCreateSrvOpen( /* In case of overwrite, reset file size */ if (Disposition == FILE_OVERWRITE || Disposition == FILE_OVERWRITE_IF) { - RxAcquirePagingIoResource(RxContext, Fcb); - Fcb->Header.AllocationSize.QuadPart = 0LL; - Fcb->Header.FileSize.QuadPart = 0LL; - Fcb->Header.ValidDataLength.QuadPart = 0LL; - RxContext->CurrentIrpSp->FileObject->SectionObjectPointer = &Fcb->NonPaged->SectionObjectPointers; - CcSetFileSizes(RxContext->CurrentIrpSp->FileObject, (PCC_FILE_SIZES)&Fcb->Header.AllocationSize); - RxReleasePagingIoResource(RxContext, Fcb); + RxAcquirePagingIoResource(RxContext, capFcb); + capFcb->Header.AllocationSize.QuadPart = 0LL; + capFcb->Header.FileSize.QuadPart = 0LL; + capFcb->Header.ValidDataLength.QuadPart = 0LL; + RxContext->CurrentIrpSp->FileObject->SectionObjectPointer = &capFcb->NonPaged->SectionObjectPointers; + CcSetFileSizes(RxContext->CurrentIrpSp->FileObject, (PCC_FILE_SIZES)&capFcb->Header.AllocationSize); + RxReleasePagingIoResource(RxContext, capFcb); } else { /* Otherwise, adjust sizes */ - RxContext->CurrentIrpSp->FileObject->SectionObjectPointer = &Fcb->NonPaged->SectionObjectPointers; + RxContext->CurrentIrpSp->FileObject->SectionObjectPointer = &capFcb->NonPaged->SectionObjectPointers; if (CcIsFileCached(RxContext->CurrentIrpSp->FileObject)) { - RxAdjustAllocationSizeforCC(Fcb); + RxAdjustAllocationSizeforCC(capFcb); } - CcSetFileSizes(RxContext->CurrentIrpSp->FileObject, (PCC_FILE_SIZES)&Fcb->Header.AllocationSize); + CcSetFileSizes(RxContext->CurrentIrpSp->FileObject, (PCC_FILE_SIZES)&capFcb->Header.AllocationSize); } } @@ -1701,15 +1703,15 @@ RxCollapseOrCreateSrvOpen( /* Set SRV_OPEN state - good or bad - depending on whether create succeed */ RxTransitionSrvOpen(SrvOpen, (Status == STATUS_SUCCESS ? Condition_Good : Condition_Bad)); - ASSERT(RxIsFcbAcquiredExclusive(Fcb)); + ASSERT(RxIsFcbAcquiredExclusive(capFcb)); RxCompleteSrvOpenKeyAssociation(SrvOpen); if (Status == STATUS_SUCCESS) { - if (BooleanFlagOn(Stack->Parameters.Create.Options, FILE_DELETE_ON_CLOSE)) + if (BooleanFlagOn(capPARAMS->Parameters.Create.Options, FILE_DELETE_ON_CLOSE)) { - ClearFlag(Fcb->FcbState, FCB_STATE_COLLAPSING_ENABLED); + ClearFlag(capFcb->FcbState, FCB_STATE_COLLAPSING_ENABLED); } SrvOpen->CreateOptions = RxContext->Create.NtCreateParameters.CreateOptions; FcbCondition = Condition_Good; @@ -1729,8 +1731,8 @@ RxCollapseOrCreateSrvOpen( } /* Set FCB state - good or bad - depending on whether create succeed */ - DPRINT("Transitioning FCB %p to condition %lx\n", Fcb, Fcb->Condition); - RxTransitionNetFcb(Fcb, FcbCondition); + DPRINT("Transitioning FCB %p to condition %lx\n", capFcb, capFcb->Condition); + RxTransitionNetFcb(capFcb, FcbCondition); } else if (Status == STATUS_SUCCESS) { @@ -1750,12 +1752,12 @@ RxCollapseOrCreateSrvOpen( ++SrvOpen->OpenCount; ExtraOpen = TRUE; - RxReleaseFcb(RxContext, Fcb); + RxReleaseFcb(RxContext, capFcb); RxContext->Create.FcbAcquired = FALSE; RxWaitForStableSrvOpen(SrvOpen, RxContext); - if (NT_SUCCESS(RxAcquireExclusiveFcb(RxContext, Fcb))) + if (NT_SUCCESS(RxAcquireExclusiveFcb(RxContext, capFcb))) { RxContext->Create.FcbAcquired = TRUE; } @@ -1766,9 +1768,9 @@ RxCollapseOrCreateSrvOpen( /* Inform the mini-rdr we do an opening with a reused SRV_OPEN */ if (IsGood) { - MINIRDR_CALL(Status, RxContext, Fcb->MRxDispatch, MRxCollapseOpen, (RxContext)); + MINIRDR_CALL(Status, RxContext, capFcb->MRxDispatch, MRxCollapseOpen, (RxContext)); - ASSERT(RxIsFcbAcquiredExclusive(Fcb)); + ASSERT(RxIsFcbAcquiredExclusive(capFcb)); } else { @@ -1782,7 +1784,7 @@ RxCollapseOrCreateSrvOpen( } } - --Fcb->UncleanCount; + --capFcb->UncleanCount; DPRINT("Status: %x\n", Status); return Status;

1 0

[reactos] 03/03: [RDBSS] Start defining the RxCapture* macros and start using them (to be continued)
by Pierre Schweitzer 01 Nov '17

01 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2511ba8f8f4c26fc8043a… commit 2511ba8f8f4c26fc8043af37102a3a664ebffe7d Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Nov 1 11:45:43 2017 +0100 [RDBSS] Start defining the RxCapture* macros and start using them (to be continued) --- sdk/include/ddk/ntrxdef.h | 16 +++++++++ sdk/lib/drivers/rdbsslib/rdbss.c | 78 +++++++++++++++++++--------------------- 2 files changed, 53 insertions(+), 41 deletions(-) diff --git a/sdk/include/ddk/ntrxdef.h b/sdk/include/ddk/ntrxdef.h index da3a9ac75f..996e3ee29c 100644 --- a/sdk/include/ddk/ntrxdef.h +++ b/sdk/include/ddk/ntrxdef.h @@ -6,6 +6,22 @@ #define INVALID_HANDLE_VALUE ((HANDLE)-1) #endif +#ifndef MINIRDR__NAME +#define RxCaptureFcb PFCB __C_Fcb = (PFCB)(RxContext->pFcb) +#define RxCaptureFobx PFOBX __C_Fobx = (PFOBX)(RxContext->pFobx) +#else +#define RxCaptureFcb PMRX_FCB __C_Fcb = (RxContext->pFcb) +#define RxCaptureFobx PMRX_FOBX __C_Fobx = (RxContext->pFobx) +#endif + +#define RxCaptureParamBlock PIO_STACK_LOCATION __C_IrpSp = RxContext->CurrentIrpSp +#define RxCaptureFileObject PFILE_OBJECT __C_FileObject = __C_IrpSp-> FileObject + +#define capFcb __C_Fcb +#define capFobx __C_Fobx +#define capPARAMS __C_IrpSp +#define capFileObject __C_FileObject + #define RxAllocatePoolWithTag ExAllocatePoolWithTag #define RxFreePool ExFreePool diff --git a/sdk/lib/drivers/rdbsslib/rdbss.c b/sdk/lib/drivers/rdbsslib/rdbss.c index d25171ce64..01b1bd9a7a 100644 --- a/sdk/lib/drivers/rdbsslib/rdbss.c +++ b/sdk/lib/drivers/rdbsslib/rdbss.c @@ -643,6 +643,8 @@ VOID CheckForLoudOperations( PRX_CONTEXT RxContext) { + RxCaptureFcb; + PAGED_CODE(); #define ALLSCR_LENGTH (sizeof(L"all.scr") - sizeof(UNICODE_NULL)) @@ -650,11 +652,9 @@ CheckForLoudOperations( /* Are loud operations enabled? */ if (RxLoudLowIoOpsEnabled) { - PFCB Fcb; - /* If so, the operation will be loud only if filename ends with all.scr */ - Fcb = (PFCB)RxContext->pFcb; - if (RtlCompareMemory(Add2Ptr(Fcb->PrivateAlreadyPrefixedName.Buffer, (Fcb->PrivateAlreadyPrefixedName.Length - ALLSCR_LENGTH)), + if (RtlCompareMemory(Add2Ptr(capFcb->PrivateAlreadyPrefixedName.Buffer, + (capFcb->PrivateAlreadyPrefixedName.Length - ALLSCR_LENGTH)), L"all.scr", ALLSCR_LENGTH) == ALLSCR_LENGTH) { SetFlag(RxContext->LowIoContext.Flags, LOWIO_CONTEXT_FLAG_LOUDOPS); @@ -701,14 +701,12 @@ __RxWriteReleaseResources( PCSTR FileName, ULONG SerialNumber) { - PFCB Fcb; + RxCaptureFcb; PAGED_CODE(); ASSERT(RxContext != NULL); - - Fcb = (PFCB)RxContext->pFcb; - ASSERT(Fcb != NULL); + ASSERT(capFcb != NULL); /* If FCB resource was acquired, release it */ if (RxContext->FcbResourceAcquired) @@ -716,11 +714,11 @@ __RxWriteReleaseResources( /* Taking care of owner */ if (ResourceOwnerSet) { - RxReleaseFcbForThread(RxContext, Fcb, RxContext->LowIoContext.ResourceThreadId); + RxReleaseFcbForThread(RxContext, capFcb, RxContext->LowIoContext.ResourceThreadId); } else { - RxReleaseFcb(RxContext, Fcb); + RxReleaseFcb(RxContext, capFcb); } RxContext->FcbResourceAcquired = FALSE; @@ -732,11 +730,11 @@ __RxWriteReleaseResources( /* Taking care of owner */ if (ResourceOwnerSet) { - RxReleasePagingIoResourceForThread(RxContext, Fcb, RxContext->LowIoContext.ResourceThreadId); + RxReleasePagingIoResourceForThread(RxContext, capFcb, RxContext->LowIoContext.ResourceThreadId); } else { - RxReleasePagingIoResource(RxContext, Fcb); + RxReleasePagingIoResource(RxContext, capFcb); } /* No need to release boolean here, RxReleasePagingIoResource() takes care of it */ @@ -774,14 +772,13 @@ RxAddToWorkque( ULONG Queued; KIRQL OldIrql; WORK_QUEUE_TYPE Queue; - PIO_STACK_LOCATION Stack; + RxCaptureParamBlock; - Stack = RxContext->CurrentIrpSp; RxContext->PostRequest = FALSE; /* First of all, select the appropriate queue - delayed for prefix claim, critical for the rest */ if (RxContext->MajorFunction == IRP_MJ_DEVICE_CONTROL && - Stack->Parameters.DeviceIoControl.IoControlCode == IOCTL_REDIR_QUERY_PATH) + capPARAMS->Parameters.DeviceIoControl.IoControlCode == IOCTL_REDIR_QUERY_PATH) { Queue = DelayedWorkQueue; SetFlag(RxContext->Flags, RX_CONTEXT_FLAG_FSP_DELAYED_OVERFLOW_QUEUE); @@ -793,7 +790,7 @@ RxAddToWorkque( } /* Check for overflow */ - if (Stack->FileObject != NULL) + if (capPARAMS->FileObject != NULL) { KeAcquireSpinLock(&RxFileSystemDeviceObject->OverflowQueueSpinLock, &OldIrql); @@ -821,22 +818,23 @@ RxAddToWorkque( */ VOID RxAdjustFileTimesAndSize( - PRX_CONTEXT Context) + PRX_CONTEXT RxContext) { - PFCB Fcb; - PFOBX Fobx; NTSTATUS Status; - PFILE_OBJECT FileObject; LARGE_INTEGER CurrentTime; FILE_BASIC_INFORMATION FileBasicInfo; FILE_END_OF_FILE_INFORMATION FileEOFInfo; BOOLEAN FileModified, SetLastChange, SetLastAccess, SetLastWrite, NeedUpdate; + RxCaptureFcb; + RxCaptureFobx; + RxCaptureParamBlock; + RxCaptureFileObject; + PAGED_CODE(); - FileObject = Context->CurrentIrpSp->FileObject; /* If Cc isn't initialized, the file was not read nor written, nothing to do */ - if (FileObject->PrivateCacheMap == NULL) + if (capFileObject->PrivateCacheMap == NULL) { return; } @@ -844,17 +842,16 @@ RxAdjustFileTimesAndSize( /* Get now */ KeQuerySystemTime(&CurrentTime); - Fobx = (PFOBX)Context->pFobx; /* Was the file modified? */ - FileModified = BooleanFlagOn(FileObject->Flags, FO_FILE_MODIFIED); + FileModified = BooleanFlagOn(capFileObject->Flags, FO_FILE_MODIFIED); /* We'll set last write if it was modified and user didn't update yet */ - SetLastWrite = FileModified && !BooleanFlagOn(Fobx->Flags, FOBX_FLAG_USER_SET_LAST_WRITE); + SetLastWrite = FileModified && !BooleanFlagOn(capFobx->Flags, FOBX_FLAG_USER_SET_LAST_WRITE); /* File was accessed if: written or read (fastio), we'll update last access if user didn't */ SetLastAccess = SetLastWrite || - (BooleanFlagOn(FileObject->Flags, FO_FILE_FAST_IO_READ) && - !BooleanFlagOn(Fobx->Flags, FOBX_FLAG_USER_SET_LAST_ACCESS)); + (BooleanFlagOn(capFileObject->Flags, FO_FILE_FAST_IO_READ) && + !BooleanFlagOn(capFobx->Flags, FOBX_FLAG_USER_SET_LAST_ACCESS)); /* We'll set last change if it was modified and user didn't update yet */ - SetLastChange = FileModified && !BooleanFlagOn(Fobx->Flags, FOBX_FLAG_USER_SET_LAST_CHANGE); + SetLastChange = FileModified && !BooleanFlagOn(capFobx->Flags, FOBX_FLAG_USER_SET_LAST_CHANGE); /* Nothing to update? Job done */ if (!FileModified && !SetLastWrite && !SetLastAccess && !SetLastChange) @@ -862,7 +859,6 @@ RxAdjustFileTimesAndSize( return; } - Fcb = (PFCB)Context->pFcb; /* By default, we won't issue any MRxSetFileInfoAtCleanup call */ NeedUpdate = FALSE; RtlZeroMemory(&FileBasicInfo, sizeof(FileBasicInfo)); @@ -871,7 +867,7 @@ RxAdjustFileTimesAndSize( if (SetLastWrite) { NeedUpdate = TRUE; - Fcb->LastWriteTime.QuadPart = CurrentTime.QuadPart; + capFcb->LastWriteTime.QuadPart = CurrentTime.QuadPart; FileBasicInfo.LastWriteTime.QuadPart = CurrentTime.QuadPart; } @@ -879,7 +875,7 @@ RxAdjustFileTimesAndSize( if (SetLastAccess) { NeedUpdate = TRUE; - Fcb->LastAccessTime.QuadPart = CurrentTime.QuadPart; + capFcb->LastAccessTime.QuadPart = CurrentTime.QuadPart; FileBasicInfo.LastAccessTime.QuadPart = CurrentTime.QuadPart; } @@ -887,31 +883,31 @@ RxAdjustFileTimesAndSize( if (SetLastChange) { NeedUpdate = TRUE; - Fcb->LastChangeTime.QuadPart = CurrentTime.QuadPart; + capFcb->LastChangeTime.QuadPart = CurrentTime.QuadPart; FileBasicInfo.ChangeTime.QuadPart = CurrentTime.QuadPart; } /* If one of the date was modified, issue a call to mini-rdr */ if (NeedUpdate) { - Context->Info.FileInformationClass = FileBasicInformation; - Context->Info.Buffer = &FileBasicInfo; - Context->Info.Length = sizeof(FileBasicInfo); + RxContext->Info.FileInformationClass = FileBasicInformation; + RxContext->Info.Buffer = &FileBasicInfo; + RxContext->Info.Length = sizeof(FileBasicInfo); - MINIRDR_CALL(Status, Context, Fcb->MRxDispatch, MRxSetFileInfoAtCleanup, (Context)); + MINIRDR_CALL(Status, RxContext, capFcb->MRxDispatch, MRxSetFileInfoAtCleanup, (RxContext)); (void)Status; } /* If the file was modified, update its EOF */ if (FileModified) { - FileEOFInfo.EndOfFile.QuadPart = Fcb->Header.FileSize.QuadPart; + FileEOFInfo.EndOfFile.QuadPart = capFcb->Header.FileSize.QuadPart; - Context->Info.FileInformationClass = FileEndOfFileInformation; - Context->Info.Buffer = &FileEOFInfo; - Context->Info.Length = sizeof(FileEOFInfo); + RxContext->Info.FileInformationClass = FileEndOfFileInformation; + RxContext->Info.Buffer = &FileEOFInfo; + RxContext->Info.Length = sizeof(FileEOFInfo); - MINIRDR_CALL(Status, Context, Fcb->MRxDispatch, MRxSetFileInfoAtCleanup, (Context)); + MINIRDR_CALL(Status, RxContext, capFcb->MRxDispatch, MRxSetFileInfoAtCleanup, (RxContext)); (void)Status; } }

1 0

[reactos] 02/03: [RXCE] Implement RxInitializeDebugSupport()
by Pierre Schweitzer 01 Nov '17

01 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b840f6536247a172db987… commit b840f6536247a172db987a8b46a20168137fb4fe Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Nov 1 11:20:28 2017 +0100 [RXCE] Implement RxInitializeDebugSupport() --- sdk/lib/drivers/rdbsslib/rdbss.c | 8 -------- sdk/lib/drivers/rxce/rxce.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/sdk/lib/drivers/rdbsslib/rdbss.c b/sdk/lib/drivers/rdbsslib/rdbss.c index 44467fe69b..d25171ce64 100644 --- a/sdk/lib/drivers/rdbsslib/rdbss.c +++ b/sdk/lib/drivers/rdbsslib/rdbss.c @@ -6771,14 +6771,6 @@ RxIndicateChangeOfBufferingStateForSrvOpen( UNIMPLEMENTED; } -VOID -NTAPI -RxInitializeDebugSupport( - VOID) -{ - UNIMPLEMENTED; -} - /* * @implemented */ diff --git a/sdk/lib/drivers/rxce/rxce.c b/sdk/lib/drivers/rxce/rxce.c index 7473a2a4fa..6aad39ced3 100644 --- a/sdk/lib/drivers/rxce/rxce.c +++ b/sdk/lib/drivers/rxce/rxce.c @@ -4609,6 +4609,17 @@ RxInitializeContext( } } +/* + * @implemented + */ +VOID +NTAPI +RxInitializeDebugSupport( + VOID) +{ + /* Nothing to do */ +} + /* * @implemented */

1 0

[reactos] 01/03: [RDBSS] Implement RxCheckFcbStructuresForAlignment()
by Pierre Schweitzer 01 Nov '17

01 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac3e4a48958b1edeca399… commit ac3e4a48958b1edeca3998be977cee8d09d284b0 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Nov 1 11:05:32 2017 +0100 [RDBSS] Implement RxCheckFcbStructuresForAlignment() --- sdk/lib/drivers/rdbsslib/rdbss.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdk/lib/drivers/rdbsslib/rdbss.c b/sdk/lib/drivers/rdbsslib/rdbss.c index 154c63ad72..44467fe69b 100644 --- a/sdk/lib/drivers/rdbsslib/rdbss.c +++ b/sdk/lib/drivers/rdbsslib/rdbss.c @@ -1323,12 +1323,15 @@ RxCanonicalizeNameAndObtainNetRoot( return Status; } +/* + * @implemented + */ VOID NTAPI RxCheckFcbStructuresForAlignment( VOID) { - UNIMPLEMENTED; + PAGED_CODE(); } #if DBG

1 0

[reactos] 01/01: [EXPLORER] -Rewrite taskbar settings routines and dialog - Rewrite the taskbar settings and start menu settings property sheets. - All settings in the taskbar settings property sheet can be loaded and saved properly except for the quick launch one which will be implemented later. - Implement toggling lock, autohide and always on top. The rest will be implemented later.
by Giannis Adamopoulos 31 Oct '17

31 Oct '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ed535da8ab490b53bb49… commit 2ed535da8ab490b53bb496f3ac25fd1fd03f4965 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Oct 30 17:39:12 2017 +0200 [EXPLORER] -Rewrite taskbar settings routines and dialog - Rewrite the taskbar settings and start menu settings property sheets. - All settings in the taskbar settings property sheet can be loaded and saved properly except for the quick launch one which will be implemented later. - Implement toggling lock, autohide and always on top. The rest will be implemented later. --- base/shell/explorer/CMakeLists.txt | 2 +- base/shell/explorer/explorer.cpp | 3 +- base/shell/explorer/precomp.h | 55 ++-- base/shell/explorer/resource.h | 2 + base/shell/explorer/settings.cpp | 106 +++---- base/shell/explorer/taskswnd.cpp | 13 + base/shell/explorer/trayntfy.cpp | 64 ++-- base/shell/explorer/trayprop.cpp | 583 +++++++++++++------------------------ base/shell/explorer/traywnd.cpp | 173 +++++------ 9 files changed, 395 insertions(+), 606 deletions(-) diff --git a/base/shell/explorer/CMakeLists.txt b/base/shell/explorer/CMakeLists.txt index 8d1eaa42c6..f935f4dafd 100644 --- a/base/shell/explorer/CMakeLists.txt +++ b/base/shell/explorer/CMakeLists.txt @@ -1,7 +1,7 @@ PROJECT(SHELL) set_cpp(WITH_RUNTIME) - +add_definitions(-D_ATL_NO_EXCEPTIONS) include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) list(APPEND SOURCE diff --git a/base/shell/explorer/explorer.cpp b/base/shell/explorer/explorer.cpp index e803c4db42..f6e7402423 100644 --- a/base/shell/explorer/explorer.cpp +++ b/base/shell/explorer/explorer.cpp @@ -127,7 +127,8 @@ StartWithDesktop(IN HINSTANCE hInstance) hExplorerInstance = hInstance; hProcessHeap = GetProcessHeap(); - LoadTaskBarSettings(); + g_TaskbarSettings.Load(); + InitCommonControls(); OleInitialize(NULL); diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index f674a2c13c..df6fd7537f 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -27,6 +27,7 @@ #include <atlbase.h> #include <atlcom.h> #include <atlwin.h> +#include <atlstr.h> #include <shellapi.h> #include <shlobj.h> #include <shlwapi.h> @@ -40,6 +41,7 @@ #include <undocshell.h> #include <rosctrls.h> +#include <rosdlgs.h> #include <shellutils.h> #include "tmschema.h" @@ -125,6 +127,7 @@ HRESULT WINAPI _CBandSite_CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, void */ #define TWM_OPENSTARTMENU (WM_USER + 260) +#define TWM_SETTINGSCHANGED (WM_USER + 300) extern const GUID IID_IShellDesktopTray; @@ -181,35 +184,39 @@ TrayMessageLoop(IN OUT ITrayWindow *Tray); * settings.c */ -/* Structure to hold non-default options*/ -typedef struct _TASKBAR_SETTINGS +typedef struct _TW_STUCKRECTS2 +{ + DWORD cbSize; + LONG Unknown; + union + { + DWORD dwFlags; + struct + { + DWORD AutoHide : 1; + DWORD AlwaysOnTop : 1; + DWORD SmallIcons : 1; + DWORD HideClock : 1; + }; + }; + DWORD Position; + SIZE Size; + RECT Rect; +} TW_STRUCKRECTS2, *PTW_STUCKRECTS2; + +struct TaskbarSettings { BOOL bLock; - BOOL bAutoHide; - BOOL bAlwaysOnTop; BOOL bGroupButtons; - BOOL bShowQuickLaunch; - BOOL bShowClock; BOOL bShowSeconds; BOOL bHideInactiveIcons; -} TASKBAR_SETTINGS, *PTASKBAR_SETTINGS; - -extern TASKBAR_SETTINGS TaskBarSettings; - -VOID -LoadTaskBarSettings(VOID); + TW_STRUCKRECTS2 sr; -VOID -SaveTaskBarSettings(VOID); + BOOL Load(); + BOOL Save(); +}; -BOOL -LoadSettingDword(IN LPCWSTR pszKeyName, - IN LPCWSTR pszValueName, - OUT DWORD &dwValue); -BOOL -SaveSettingDword(IN LPCWSTR pszKeyName, - IN LPCWSTR pszValueName, - IN DWORD dwValue); +extern TaskbarSettings g_TaskbarSettings; /* * shellservice.cpp @@ -229,7 +236,7 @@ ProcessStartupItems(VOID); */ VOID -DisplayTrayProperties(IN HWND hwndOwner); +DisplayTrayProperties(IN HWND hwndOwner, IN HWND hwndTaskbar); /* * desktop.cpp @@ -344,7 +351,7 @@ VOID UnregisterTrayNotifyWndClass(VOID); HWND -CreateTrayNotifyWnd(IN OUT ITrayWindow *TrayWindow, IN BOOL bHideClock, CTrayNotifyWnd** ppTrayNotify); +CreateTrayNotifyWnd(IN OUT ITrayWindow *TrayWindow, CTrayNotifyWnd** ppTrayNotify); BOOL TrayNotify_NotifyIconCmd(CTrayNotifyWnd* pTrayNotify, IN WPARAM wParam, IN LPARAM lParam); diff --git a/base/shell/explorer/resource.h b/base/shell/explorer/resource.h index ae3c29181f..aed1e08a60 100644 --- a/base/shell/explorer/resource.h +++ b/base/shell/explorer/resource.h @@ -107,6 +107,7 @@ \*******************************************************************************/ /* Taskbar Page */ +#define IDC_TASKBARPROP_FIRST_CMD 1000 #define IDC_TASKBARPROP_HIDEICONS 1000 #define IDC_TASKBARPROP_ICONCUST 1007 #define IDC_TASKBARPROP_ONTOP 1101 @@ -116,6 +117,7 @@ #define IDC_TASKBARPROP_LOCK 1105 #define IDC_TASKBARPROP_SECONDS 1106 #define IDC_TASKBARPROP_SHOWQL 1107 +#define IDC_TASKBARPROP_LAST_CMD 1107 #define IDC_TASKBARPROP_TASKBARBITMAP 1111 #define IDC_TASKBARPROP_NOTIFICATIONBITMAP 1112 diff --git a/base/shell/explorer/settings.cpp b/base/shell/explorer/settings.cpp index 791a91c79c..f47e165d7d 100644 --- a/base/shell/explorer/settings.cpp +++ b/base/shell/explorer/settings.cpp @@ -20,85 +20,61 @@ #include "precomp.h" -TASKBAR_SETTINGS TaskBarSettings; -const WCHAR szSettingsKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer"; -const WCHAR szAdvancedSettingsKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced"; +TaskbarSettings g_TaskbarSettings; -VOID -LoadTaskBarSettings(VOID) +BOOL TaskbarSettings::Save() { - DWORD dwValue = NULL; - - LoadSettingDword(szAdvancedSettingsKey, L"TaskbarSizeMove", dwValue); - TaskBarSettings.bLock = (dwValue == 0); - - LoadSettingDword(szAdvancedSettingsKey, L"ShowSeconds", dwValue); - TaskBarSettings.bShowSeconds = (dwValue != 0); - - LoadSettingDword(szSettingsKey, L"EnableAutotray", dwValue); - TaskBarSettings.bHideInactiveIcons = (dwValue != 0); - - LoadSettingDword(szAdvancedSettingsKey, L"TaskbarGlomming", dwValue); - TaskBarSettings.bGroupButtons = (dwValue != 0); - - TaskBarSettings.bShowQuickLaunch = TRUE; //FIXME: Where is this stored, and how? - - /* FIXME: The following settings are stored in stuckrects2, do they have to be load here too? */ - TaskBarSettings.bShowClock = TRUE; - TaskBarSettings.bAutoHide = FALSE; - TaskBarSettings.bAlwaysOnTop = FALSE; + SHSetValueW(hkExplorer, NULL, L"EnableAutotray", REG_DWORD, &bHideInactiveIcons, sizeof(bHideInactiveIcons)); + SHSetValueW(hkExplorer, L"Advanced", L"ShowSeconds", REG_DWORD, &bShowSeconds, sizeof(bShowSeconds)); + SHSetValueW(hkExplorer, L"Advanced", L"TaskbarGlomming", REG_DWORD, &bGroupButtons, sizeof(bGroupButtons)); + BOOL bAllowSizeMove = !bLock; + SHSetValueW(hkExplorer, L"Advanced", L"TaskbarSizeMove", REG_DWORD, &bAllowSizeMove, sizeof(bAllowSizeMove)); + sr.cbSize = sizeof(sr); + SHSetValueW(hkExplorer, L"StuckRects2", L"Settings", REG_BINARY, &sr, sizeof(sr)); + /* TODO: AutoHide writes something to HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\Desktop\Components\0 figure out what and why */ + return TRUE; } -VOID -SaveTaskBarSettings(VOID) +BOOL TaskbarSettings::Load() { - SaveSettingDword(szAdvancedSettingsKey, L"TaskbarSizeMove", TaskBarSettings.bLock); - SaveSettingDword(szAdvancedSettingsKey, L"ShowSeconds", TaskBarSettings.bShowSeconds); - SaveSettingDword(szSettingsKey, L"EnableAutotray", TaskBarSettings.bHideInactiveIcons); - SaveSettingDword(szAdvancedSettingsKey, L"TaskbarGlomming", TaskBarSettings.bGroupButtons); - - /* FIXME: Show Clock, AutoHide and Always on top are stored in the stuckrects2 key but are not written to it with a click on apply. How is this done instead? - AutoHide writes something to HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\Desktop\Components\0 figure out what and why */ -} + DWORD dwRet, cbSize, dwValue = NULL; -BOOL -LoadSettingDword(IN LPCWSTR pszKeyName, - IN LPCWSTR pszValueName, - OUT DWORD &dwValue) -{ - BOOL ret = FALSE; - HKEY hKey; + cbSize = sizeof(dwValue); + dwRet = SHGetValueW(hkExplorer, L"Advanced", L"TaskbarSizeMove", NULL, &dwValue, &cbSize); + bLock = (dwRet == ERROR_SUCCESS) ? (dwValue == 0) : TRUE; - if (RegOpenKeyW(HKEY_CURRENT_USER, pszKeyName, &hKey) == ERROR_SUCCESS) - { - DWORD dwValueLength, dwType; + dwRet = SHGetValueW(hkExplorer, L"Advanced", L"ShowSeconds", NULL, &dwValue, &cbSize); + bShowSeconds = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : FALSE; - dwValueLength = sizeof(dwValue); - ret = RegQueryValueExW(hKey, pszValueName, NULL, &dwType, (PBYTE)&dwValue, &dwValueLength) == ERROR_SUCCESS && dwType == REG_DWORD; - - RegCloseKey(hKey); - } - - return ret; -} + dwRet = SHGetValueW(hkExplorer, L"Advanced", L"TaskbarGlomming", NULL, &dwValue, &cbSize); + bGroupButtons = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : FALSE; -BOOL -SaveSettingDword(IN LPCWSTR pszKeyName, - IN LPCWSTR pszValueName, - IN DWORD dwValue) -{ - BOOL ret = FALSE; - HKEY hKey; + dwRet = SHGetValueW(hkExplorer, NULL, L"EnableAutotray", NULL, &dwValue, &cbSize); + bHideInactiveIcons = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : FALSE; - if (RegCreateKeyW(HKEY_CURRENT_USER, pszKeyName, &hKey) == ERROR_SUCCESS) - { - ret = RegSetValueExW(hKey, pszValueName, 0, REG_DWORD, (PBYTE)&dwValue, sizeof(dwValue)) == ERROR_SUCCESS; + cbSize = sizeof(sr); + dwRet = SHGetValueW(hkExplorer, L"StuckRects2", L"Settings", NULL, &sr, &cbSize); - RegCloseKey(hKey); + /* Make sure we have correct values here */ + if (dwRet != ERROR_SUCCESS || sr.cbSize != sizeof(sr) || cbSize != sizeof(sr)) + { + sr.Position = ABE_BOTTOM; + sr.AutoHide = FALSE; + sr.AlwaysOnTop = TRUE; + sr.SmallIcons = TRUE; + sr.HideClock = FALSE; + sr.Rect.left = sr.Rect.top = 0; + sr.Rect.bottom = sr.Rect.right = 1; + sr.Size.cx = sr.Size.cy = 0; + } + else + { + if (sr.Position > ABE_BOTTOM) + sr.Position = ABE_BOTTOM; } - return ret; + return TRUE; } /* EOF */ diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index 94ee926038..44d0e3e215 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -1735,6 +1735,18 @@ public: return TRUE; } + LRESULT OnTaskbarSettingsChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + TaskbarSettings* newSettings = (TaskbarSettings*)lParam; + if (newSettings->bGroupButtons != g_TaskbarSettings.bGroupButtons) + { + /* TODO: Toggle grouping */ + g_TaskbarSettings.bGroupButtons = newSettings->bGroupButtons; + } + + return 0; + } + LRESULT OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { LRESULT Ret = 0; @@ -1828,6 +1840,7 @@ public: MESSAGE_HANDLER(WM_NOTIFY, OnNotify) MESSAGE_HANDLER(TSWM_ENABLEGROUPING, OnEnableGrouping) MESSAGE_HANDLER(TSWM_UPDATETASKBARPOS, OnUpdateTaskbarPos) + MESSAGE_HANDLER(TWM_SETTINGSCHANGED, OnTaskbarSettingsChanged) MESSAGE_HANDLER(WM_CONTEXTMENU, OnContextMenu) MESSAGE_HANDLER(WM_TIMER, OnTimer) MESSAGE_HANDLER(WM_SETFONT, OnSetFont) diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index b79d41b5a3..95c40aa723 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -916,7 +916,7 @@ public: if (ClockWndFormats[i].IsTime) { iRet = GetTimeFormat(LOCALE_USER_DEFAULT, - TaskBarSettings.bShowSeconds ? ClockWndFormats[i].dwFormatFlags : TIME_NOSECONDS, + g_TaskbarSettings.bShowSeconds ? ClockWndFormats[i].dwFormatFlags : TIME_NOSECONDS, &LocalTime, ClockWndFormats[i].lpFormat, szLines[i], @@ -988,7 +988,7 @@ public: /* Calculate the due time */ GetLocalTime(&LocalTime); uiDueTime = 1000 - (UINT) LocalTime.wMilliseconds; - if (TaskBarSettings.bShowSeconds) + if (g_TaskbarSettings.bShowSeconds) uiDueTime += (UINT) LocalTime.wSecond * 100; else uiDueTime += (59 - (UINT) LocalTime.wSecond) * 1000; @@ -1046,7 +1046,7 @@ public: uiDueTime = CalculateDueTime(); - if (TaskBarSettings.bShowSeconds) + if (g_TaskbarSettings.bShowSeconds) { uiWait1 = 1000 - 200; uiWait2 = 1000; @@ -1310,15 +1310,7 @@ class CTrayNotifyWnd : SIZE szTrayClockMin; SIZE szTrayNotify; MARGINS ContentMargin; - union - { - DWORD dwFlags; - struct - { - DWORD HideClock : 1; - DWORD IsHorizontal : 1; - }; - }; + BOOL IsHorizontal; public: CTrayNotifyWnd() : @@ -1326,7 +1318,7 @@ public: m_pager(NULL), m_clock(NULL), TrayTheme(NULL), - dwFlags(0) + IsHorizontal(FALSE) { ZeroMemory(&szTrayClockMin, sizeof(szTrayClockMin)); ZeroMemory(&szTrayNotify, sizeof(szTrayNotify)); @@ -1377,10 +1369,10 @@ public: LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { m_clock = new CTrayClockWnd(); - m_clock->_Init(m_hWnd, !HideClock); + m_clock->_Init(m_hWnd, !g_TaskbarSettings.sr.HideClock); m_pager = new CSysPagerWnd(); - m_pager->_Init(m_hWnd, !HideClock); + m_pager->_Init(m_hWnd, !g_TaskbarSettings.sr.HideClock); return TRUE; } @@ -1390,7 +1382,7 @@ public: SIZE szClock = { 0, 0 }; SIZE szTray = { 0, 0 }; - if (!HideClock) + if (!g_TaskbarSettings.sr.HideClock) { if (IsHorizontal) { @@ -1430,7 +1422,7 @@ public: { pSize->cx = 2 * TRAY_NOTIFY_WND_SPACING_X; - if (!HideClock) + if (!g_TaskbarSettings.sr.HideClock) pSize->cx += TRAY_NOTIFY_WND_SPACING_X + szTrayClockMin.cx; pSize->cx += szTray.cx; @@ -1439,7 +1431,7 @@ public: { pSize->cy = 2 * TRAY_NOTIFY_WND_SPACING_Y; - if (!HideClock) + if (!g_TaskbarSettings.sr.HideClock) pSize->cy += TRAY_NOTIFY_WND_SPACING_Y + szTrayClockMin.cy; pSize->cy += szTray.cy; @@ -1453,7 +1445,7 @@ public: VOID Size(IN const SIZE *pszClient) { - if (!HideClock) + if (!g_TaskbarSettings.sr.HideClock) { POINT ptClock; SIZE szClock; @@ -1600,17 +1592,35 @@ public: LRESULT OnShowClock(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - BOOL PrevHidden = HideClock; - HideClock = (wParam == 0); + BOOL PrevHidden = g_TaskbarSettings.sr.HideClock; + g_TaskbarSettings.sr.HideClock = (wParam == 0); - if (m_clock != NULL && PrevHidden != HideClock) + if (m_clock != NULL && PrevHidden != g_TaskbarSettings.sr.HideClock) { - m_clock->ShowWindow(HideClock ? SW_HIDE : SW_SHOW); + m_clock->ShowWindow(g_TaskbarSettings.sr.HideClock ? SW_HIDE : SW_SHOW); } return (LRESULT) (!PrevHidden); } + LRESULT OnTaskbarSettingsChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + TaskbarSettings* newSettings = (TaskbarSettings*)lParam; + if (newSettings->bShowSeconds != g_TaskbarSettings.bShowSeconds) + { + g_TaskbarSettings.bShowSeconds = newSettings->bShowSeconds; + /* TODO: Toggle showing seconds */ + } + + if (newSettings->sr.HideClock != g_TaskbarSettings.sr.HideClock) + { + g_TaskbarSettings.sr.HideClock = newSettings->sr.HideClock; + /* TODO: Toggle hiding the clock */ + } + + return 0; + } + LRESULT OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { const NMHDR *nmh = (const NMHDR *) lParam; @@ -1665,9 +1675,10 @@ public: MESSAGE_HANDLER(TNWM_GETMINIMUMSIZE, OnGetMinimumSize) MESSAGE_HANDLER(TNWM_UPDATETIME, OnUpdateTime) MESSAGE_HANDLER(TNWM_SHOWCLOCK, OnShowClock) + MESSAGE_HANDLER(TWM_SETTINGSCHANGED, OnTaskbarSettingsChanged) END_MSG_MAP() - HWND _Init(IN OUT ITrayWindow *TrayWindow, IN BOOL bHideClock) + HWND _Init(IN OUT ITrayWindow *TrayWindow) { HWND hWndTrayWindow; @@ -1676,7 +1687,6 @@ public: return NULL; this->TrayWindow = TrayWindow; - this->HideClock = bHideClock; this->hWndNotify = hWndTrayWindow; DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; @@ -1684,13 +1694,13 @@ public: } }; -HWND CreateTrayNotifyWnd(IN OUT ITrayWindow *Tray, BOOL bHideClock, CTrayNotifyWnd** ppinstance) +HWND CreateTrayNotifyWnd(IN OUT ITrayWindow *Tray, CTrayNotifyWnd** ppinstance) { CTrayNotifyWnd * pTrayNotify = new CTrayNotifyWnd(); // TODO: Destroy after the window is destroyed *ppinstance = pTrayNotify; - return pTrayNotify->_Init(Tray, bHideClock); + return pTrayNotify->_Init(Tray); } BOOL diff --git a/base/shell/explorer/trayprop.cpp b/base/shell/explorer/trayprop.cpp index 87cf7a2d8c..03823ccf97 100644 --- a/base/shell/explorer/trayprop.cpp +++ b/base/shell/explorer/trayprop.cpp @@ -21,441 +21,254 @@ #include "precomp.h" -typedef struct _PROPSHEET_INFO +static void SetBitmap(HWND hwnd, HBITMAP* hbmp, UINT uImageId) { - HWND hTaskbarWnd; - HWND hStartWnd; + if (*hbmp) + DeleteObject(*hbmp); - HBITMAP hTaskbarBitmap; - HBITMAP hTrayBitmap; - HBITMAP hStartBitmap; -} PROPSHEET_INFO, *PPROPSHEET_INFO; + *hbmp = (HBITMAP)LoadImageW(hExplorerInstance, + MAKEINTRESOURCEW(uImageId), + IMAGE_BITMAP, + 0, + 0, + LR_DEFAULTCOLOR); + + if (*hbmp && hwnd) + { + BITMAP bm; + GetObject(*hbmp, sizeof(bm), &bm); + ::SetWindowPos(hwnd, NULL, 0, 0, bm.bmWidth + 2, bm.bmHeight + 2, + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); + SendMessage(hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)*hbmp); + } +} -static BOOL -UpdateBitmaps(PPROPSHEET_INFO pPropInfo) +class CTaskBarSettingsPage : public CPropertyPageImpl<CTaskBarSettingsPage> { - HWND hwndLock, hwndHide, hwndGroup, hwndShowQL, hwndClock, hwndSeconds, hwndHideInactive, hwndModernStart, hwndClassicStart; - HWND hwndTaskbarBitmap, hwndTrayBitmap, hwndStartBitmap; - HWND hwndCustomizeNotifyButton, hwndCustomizeClassicStartButton, hwndCustomizeModernStartButton; - BOOL bLock, bHide, bGroup, bShowQL, bShowClock, bShowSeconds, bHideInactive; - LPTSTR lpTaskBarImageName = NULL, lpTrayImageName = NULL, lpStartImageName = NULL; - BOOL bRet = FALSE; - - hwndLock = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_LOCK); - hwndHide = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_HIDE); - hwndGroup = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_GROUP); - hwndShowQL = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_SHOWQL); - - hwndClock = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_CLOCK); - hwndSeconds = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_SECONDS); - hwndHideInactive = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_HIDEICONS); - - hwndCustomizeNotifyButton = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_ICONCUST); - - hwndModernStart = GetDlgItem(pPropInfo->hStartWnd, IDC_TASKBARPROP_STARTMENU); - hwndClassicStart = GetDlgItem(pPropInfo->hStartWnd, IDC_TASKBARPROP_STARTMENUCLASSIC); - - hwndCustomizeClassicStartButton = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_STARTMENUCLASSICCUST); - hwndCustomizeModernStartButton = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_STARTMENUCUST); - - +private: + HBITMAP m_hbmpTaskbar; + HBITMAP m_hbmpTray; + HWND m_hwndTaskbar; - if (hwndLock && hwndHide && hwndGroup && hwndShowQL && hwndClock && hwndSeconds && hwndHideInactive) + void UpdateDialog() { - bLock = (SendMessage(hwndLock, BM_GETCHECK, 0, 0) == BST_CHECKED); - bHide = (SendMessage(hwndHide, BM_GETCHECK, 0, 0) == BST_CHECKED); - bGroup = (SendMessage(hwndGroup, BM_GETCHECK, 0, 0) == BST_CHECKED); - bShowQL = (SendMessage(hwndShowQL, BM_GETCHECK, 0, 0) == BST_CHECKED); - - bShowClock = (SendMessage(hwndClock, BM_GETCHECK, 0, 0) == BST_CHECKED); - bShowSeconds = (SendMessage(hwndSeconds, BM_GETCHECK, 0, 0) == BST_CHECKED); - bHideInactive = (SendMessage(hwndHideInactive, BM_GETCHECK, 0, 0) == BST_CHECKED); + BOOL bLock = IsDlgButtonChecked(IDC_TASKBARPROP_LOCK); + BOOL bHide = IsDlgButtonChecked(IDC_TASKBARPROP_HIDE); + BOOL bGroup = IsDlgButtonChecked(IDC_TASKBARPROP_GROUP); + BOOL bShowQL = IsDlgButtonChecked(IDC_TASKBARPROP_SHOWQL); + BOOL bShowClock = IsDlgButtonChecked(IDC_TASKBARPROP_CLOCK); + BOOL bShowSeconds = IsDlgButtonChecked(IDC_TASKBARPROP_SECONDS); + BOOL bHideInactive = IsDlgButtonChecked(IDC_TASKBARPROP_HIDEICONS); + UINT uImageId; + + HWND hwndCustomizeNotifyButton = GetDlgItem(IDC_TASKBARPROP_ICONCUST); + HWND hwndSeconds = GetDlgItem(IDC_TASKBARPROP_SECONDS); + HWND hwndTaskbarBitmap = GetDlgItem(IDC_TASKBARPROP_TASKBARBITMAP); + HWND hwndTrayBitmap = GetDlgItem(IDC_TASKBARPROP_NOTIFICATIONBITMAP); if (bHide) - lpTaskBarImageName = MAKEINTRESOURCEW(IDB_TASKBARPROP_AUTOHIDE); + uImageId = IDB_TASKBARPROP_AUTOHIDE; else if (bLock && bGroup && bShowQL) - lpTaskBarImageName = MAKEINTRESOURCEW(IDB_TASKBARPROP_LOCK_GROUP_QL); + uImageId = IDB_TASKBARPROP_LOCK_GROUP_QL; else if (bLock && !bGroup && !bShowQL) - lpTaskBarImageName = MAKEINTRESOURCEW(IDB_TASKBARPROP_LOCK_NOGROUP_NOQL); + uImageId = IDB_TASKBARPROP_LOCK_NOGROUP_NOQL; else if (bLock && bGroup && !bShowQL) - lpTaskBarImageName = MAKEINTRESOURCEW(IDB_TASKBARPROP_LOCK_GROUP_NOQL); + uImageId = IDB_TASKBARPROP_LOCK_GROUP_NOQL; else if (bLock && !bGroup && bShowQL) - lpTaskBarImageName = MAKEINTRESOURCEW(IDB_TASKBARPROP_LOCK_NOGROUP_QL); + uImageId = IDB_TASKBARPROP_LOCK_NOGROUP_QL; else if (!bLock && !bGroup && !bShowQL) - lpTaskBarImageName = MAKEINTRESOURCEW(IDB_TASKBARPROP_NOLOCK_NOGROUP_NOQL); + uImageId = IDB_TASKBARPROP_NOLOCK_NOGROUP_NOQL; else if (!bLock && bGroup && !bShowQL) - lpTaskBarImageName = MAKEINTRESOURCEW(IDB_TASKBARPROP_NOLOCK_GROUP_NOQL); + uImageId = IDB_TASKBARPROP_NOLOCK_GROUP_NOQL; else if (!bLock && !bGroup && bShowQL) - lpTaskBarImageName = MAKEINTRESOURCEW(IDB_TASKBARPROP_NOLOCK_NOGROUP_QL); + uImageId = IDB_TASKBARPROP_NOLOCK_NOGROUP_QL; else if (!bLock && bGroup && bShowQL) - lpTaskBarImageName = MAKEINTRESOURCEW(IDB_TASKBARPROP_NOLOCK_GROUP_QL); - - - if (lpTaskBarImageName) - { - if (pPropInfo->hTaskbarBitmap) - { - DeleteObject(pPropInfo->hTaskbarBitmap); - } - - pPropInfo->hTaskbarBitmap = (HBITMAP)LoadImageW(hExplorerInstance, - lpTaskBarImageName, - IMAGE_BITMAP, - 0, - 0, - LR_DEFAULTCOLOR); - if (pPropInfo->hTaskbarBitmap) - { - hwndTaskbarBitmap = GetDlgItem(pPropInfo->hTaskbarWnd, - IDC_TASKBARPROP_TASKBARBITMAP); - if (hwndTaskbarBitmap) - { - BITMAP bm; - GetObject(pPropInfo->hTaskbarBitmap, sizeof(bm), &bm); - SetWindowPos(hwndTaskbarBitmap, NULL, 0, 0, bm.bmWidth + 2, bm.bmHeight + 2, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); - SendMessage(hwndTaskbarBitmap, - STM_SETIMAGE, - IMAGE_BITMAP, - (LPARAM)pPropInfo->hTaskbarBitmap); - } - } - } - - if (bHideInactive) - { - EnableWindow(hwndCustomizeNotifyButton, TRUE); - if (bShowClock) - { - EnableWindow(hwndSeconds, TRUE); - if (bShowSeconds) - lpTrayImageName = MAKEINTRESOURCEW(IDB_SYSTRAYPROP_HIDE_SECONDS); - else - lpTrayImageName = MAKEINTRESOURCEW(IDB_SYSTRAYPROP_HIDE_CLOCK); - } - else - { - SendMessage(hwndSeconds, BM_SETCHECK, BST_UNCHECKED, 0); - EnableWindow(hwndSeconds, FALSE); - lpTrayImageName = MAKEINTRESOURCEW(IDB_SYSTRAYPROP_HIDE_NOCLOCK); - } - } - else - { - EnableWindow(hwndCustomizeNotifyButton, FALSE); - if (bShowClock) - { - EnableWindow(hwndSeconds, TRUE); - if (bShowSeconds) - lpTrayImageName = MAKEINTRESOURCEW(IDB_SYSTRAYPROP_SHOW_SECONDS); - else - lpTrayImageName = MAKEINTRESOURCEW(IDB_SYSTRAYPROP_SHOW_CLOCK); - } - else - { - SendMessage(hwndSeconds, BM_SETCHECK, BST_UNCHECKED, 0); - EnableWindow(hwndSeconds, FALSE); - lpTrayImageName = MAKEINTRESOURCEW(IDB_SYSTRAYPROP_SHOW_NOCLOCK); - } - } - - if (lpTrayImageName) - { - if (pPropInfo->hTrayBitmap) - { - DeleteObject(pPropInfo->hTrayBitmap); - } - - pPropInfo->hTrayBitmap = (HBITMAP)LoadImageW(hExplorerInstance, - lpTrayImageName, - IMAGE_BITMAP, - 0, - 0, - LR_DEFAULTCOLOR); - if (pPropInfo->hTrayBitmap) - { - hwndTrayBitmap = GetDlgItem(pPropInfo->hTaskbarWnd, - IDC_TASKBARPROP_NOTIFICATIONBITMAP); - if (hwndTrayBitmap) - { - BITMAP bm; - GetObject(pPropInfo->hTrayBitmap, sizeof(bm), &bm); - SetWindowPos(hwndTrayBitmap, NULL, 0, 0, bm.bmWidth + 2, bm.bmHeight + 2, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); - SendMessage(hwndTrayBitmap, - STM_SETIMAGE, - IMAGE_BITMAP, - (LPARAM)pPropInfo->hTrayBitmap); - } - } - } + uImageId = IDB_TASKBARPROP_NOLOCK_GROUP_QL; + else + ASSERT(FALSE); + + SetBitmap(hwndTaskbarBitmap, &m_hbmpTaskbar, uImageId); + + ::EnableWindow(hwndCustomizeNotifyButton, bHideInactive); + ::EnableWindow(hwndSeconds, bShowClock); + if (!bShowSeconds) + CheckDlgButton(IDC_TASKBARPROP_SECONDS, BST_UNCHECKED); + + if (bHideInactive && bShowClock && bShowSeconds) + uImageId = IDB_SYSTRAYPROP_HIDE_SECONDS; + else if (bHideInactive && bShowClock && !bShowSeconds) + uImageId = IDB_SYSTRAYPROP_HIDE_CLOCK; + else if (bHideInactive && !bShowClock) + uImageId = IDB_SYSTRAYPROP_HIDE_NOCLOCK; + else if (!bHideInactive && bShowClock && bShowSeconds) + uImageId = IDB_SYSTRAYPROP_SHOW_SECONDS; + else if (!bHideInactive && bShowClock && !bShowSeconds) + uImageId = IDB_SYSTRAYPROP_SHOW_CLOCK; + else if (!bHideInactive && !bShowClock) + uImageId = IDB_SYSTRAYPROP_SHOW_NOCLOCK; + else + ASSERT(FALSE); + + SetBitmap(hwndTrayBitmap, &m_hbmpTray, uImageId); + } + +public: + enum { IDD = IDD_TASKBARPROP_TASKBAR }; + + BEGIN_MSG_MAP(CTaskBarSettingsPage) + MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog) + COMMAND_ID_HANDLER(IDC_TASKBARPROP_ICONCUST, OnCustomizeTrayIcons) + COMMAND_RANGE_HANDLER(IDC_TASKBARPROP_FIRST_CMD, IDC_TASKBARPROP_LAST_CMD, OnCtrlCommand) + CHAIN_MSG_MAP(CPropertyPageImpl<CTaskBarSettingsPage>) + END_MSG_MAP() + + CTaskBarSettingsPage(HWND hwnd): + m_hbmpTaskbar(NULL), + m_hbmpTray(NULL), + m_hwndTaskbar(hwnd) + { } - if(hwndClassicStart && hwndModernStart) + ~CTaskBarSettingsPage() { - if(SendMessage(hwndModernStart, BM_GETCHECK, 0, 0) == BST_CHECKED) - { - EnableWindow(hwndCustomizeModernStartButton, TRUE); - EnableWindow(hwndCustomizeClassicStartButton, FALSE); - lpStartImageName = MAKEINTRESOURCEW(IDB_STARTPREVIEW); - } - else - { - EnableWindow(hwndCustomizeModernStartButton, FALSE); - EnableWindow(hwndCustomizeClassicStartButton, TRUE); - lpStartImageName = MAKEINTRESOURCEW(IDB_STARTPREVIEW_CLASSIC); - } - - if (lpStartImageName) - { - if (pPropInfo->hStartBitmap) - { - DeleteObject(pPropInfo->hStartBitmap); - } - - pPropInfo->hStartBitmap = (HBITMAP)LoadImageW(hExplorerInstance, - lpStartImageName, - IMAGE_BITMAP, - 0, - 0, - LR_DEFAULTCOLOR); - if (pPropInfo->hStartBitmap) - { - hwndStartBitmap = GetDlgItem(pPropInfo->hStartWnd, - IDC_TASKBARPROP_STARTMENU_BITMAP); - if (hwndStartBitmap) - { - BITMAP bm; - GetObject(pPropInfo->hStartBitmap, sizeof(bm), &bm); - SetWindowPos(hwndStartBitmap, NULL, 0, 0, bm.bmWidth + 2, bm.bmHeight + 2, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER); - SendMessage(hwndStartBitmap, - STM_SETIMAGE, - IMAGE_BITMAP, - (LPARAM)pPropInfo->hStartBitmap); - } - } - } + if (m_hbmpTaskbar) + DeleteObject(m_hbmpTaskbar); + if (m_hbmpTray) + DeleteObject(m_hbmpTray); } - return bRet; -} + LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) + { + CheckDlgButton(IDC_TASKBARPROP_LOCK, g_TaskbarSettings.bLock ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_TASKBARPROP_HIDE, g_TaskbarSettings.sr.AutoHide ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_TASKBARPROP_ONTOP, g_TaskbarSettings.sr.AlwaysOnTop ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_TASKBARPROP_GROUP, g_TaskbarSettings.bGroupButtons ? BST_CHECKED : BST_UNCHECKED); + //CheckDlgButton(IDC_TASKBARPROP_SHOWQL, g_TaskbarSettings.bShowQuickLaunch ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_TASKBARPROP_CLOCK, (!g_TaskbarSettings.sr.HideClock) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_TASKBARPROP_SECONDS, g_TaskbarSettings.bShowSeconds ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(IDC_TASKBARPROP_HIDEICONS, g_TaskbarSettings.bHideInactiveIcons ? BST_CHECKED : BST_UNCHECKED); + + UpdateDialog(); + return TRUE; + } -static VOID -OnCreateTaskbarPage(HWND hwnd, - PPROPSHEET_INFO pPropInfo) -{ - SetWindowLongPtr(hwnd, - GWLP_USERDATA, - (LONG_PTR)pPropInfo); - - pPropInfo->hTaskbarWnd = hwnd; - - CheckDlgButton(hwnd, IDC_TASKBARPROP_LOCK, TaskBarSettings.bLock ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwnd, IDC_TASKBARPROP_HIDE, TaskBarSettings.bAutoHide ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwnd, IDC_TASKBARPROP_ONTOP, TaskBarSettings.bAlwaysOnTop ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwnd, IDC_TASKBARPROP_GROUP, TaskBarSettings.bGroupButtons ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwnd, IDC_TASKBARPROP_SHOWQL, TaskBarSettings.bShowQuickLaunch ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwnd, IDC_TASKBARPROP_CLOCK, TaskBarSettings.bShowClock ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwnd, IDC_TASKBARPROP_SECONDS, TaskBarSettings.bShowSeconds ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwnd, IDC_TASKBARPROP_HIDEICONS, TaskBarSettings.bHideInactiveIcons ? BST_CHECKED : BST_UNCHECKED); - - UpdateBitmaps(pPropInfo); -} + LRESULT OnCustomizeTrayIcons(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) + { + ShowCustomizeNotifyIcons(hExplorerInstance, m_hWnd); + return 0; + } -static VOID -OnCreateStartPage(HWND hwnd, - PPROPSHEET_INFO pPropInfo) -{ - pPropInfo->hStartWnd = hwnd; + LRESULT OnCtrlCommand(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) + { + UpdateDialog(); + SetModified(TRUE); + return 0; + } - CheckDlgButton(hwnd, IDC_TASKBARPROP_STARTMENUCLASSIC, 1); // HACK: This has to be read from registry! - - UpdateBitmaps(pPropInfo); -} + int OnApply() + { + TaskbarSettings newSettings; + memcpy(&newSettings, &g_TaskbarSettings, sizeof(TaskbarSettings)); + + newSettings.bLock = IsDlgButtonChecked(IDC_TASKBARPROP_LOCK); + newSettings.sr.AutoHide = IsDlgButtonChecked(IDC_TASKBARPROP_HIDE); + newSettings.sr.AlwaysOnTop = IsDlgButtonChecked(IDC_TASKBARPROP_ONTOP); + newSettings.bGroupButtons = IsDlgButtonChecked(IDC_TASKBARPROP_GROUP); + //newSettings.bShowQuickLaunch = IsDlgButtonChecked(IDC_TASKBARPROP_SHOWQL); + newSettings.sr.HideClock = !IsDlgButtonChecked(IDC_TASKBARPROP_CLOCK); + newSettings.bShowSeconds = IsDlgButtonChecked(IDC_TASKBARPROP_SECONDS); + newSettings.bHideInactiveIcons = IsDlgButtonChecked(IDC_TASKBARPROP_HIDEICONS); -INT_PTR CALLBACK -TaskbarPageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) + SendMessage(m_hwndTaskbar, TWM_SETTINGSCHANGED, 0, (LPARAM)&newSettings); + + return PSNRET_NOERROR; + } +}; + +class CStartMenuSettingsPage : public CPropertyPageImpl<CStartMenuSettingsPage> { - PPROPSHEET_INFO pPropInfo; +private: + HBITMAP m_hbmpStartBitmap; - /* Get the window context */ - pPropInfo = (PPROPSHEET_INFO)GetWindowLongPtrW(hwndDlg, - GWLP_USERDATA); - if (pPropInfo == NULL && uMsg != WM_INITDIALOG) + void UpdateDialog() { - goto HandleDefaultMessage; + HWND hwndCustomizeClassic = GetDlgItem(IDC_TASKBARPROP_STARTMENUCLASSICCUST); + HWND hwndCustomizeModern = GetDlgItem(IDC_TASKBARPROP_STARTMENUCUST); + HWND hwndStartBitmap = GetDlgItem(IDC_TASKBARPROP_STARTMENU_BITMAP); + + BOOL bModern = IsDlgButtonChecked(IDC_TASKBARPROP_STARTMENU); + ::EnableWindow(hwndCustomizeModern, bModern); + ::EnableWindow(hwndCustomizeClassic, !bModern); + + UINT uImageId = bModern ? IDB_STARTPREVIEW : IDB_STARTPREVIEW_CLASSIC; + SetBitmap(hwndStartBitmap, &m_hbmpStartBitmap, uImageId); } - switch (uMsg) +public: + enum { IDD = IDD_TASKBARPROP_STARTMENU }; + + BEGIN_MSG_MAP(CTaskBarSettingsPage) + MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog) + COMMAND_ID_HANDLER(IDC_TASKBARPROP_STARTMENUCLASSICCUST, OnStartMenuCustomize) + CHAIN_MSG_MAP(CPropertyPageImpl<CStartMenuSettingsPage>) + END_MSG_MAP() + + CStartMenuSettingsPage(): + m_hbmpStartBitmap(NULL) { - case WM_INITDIALOG: - OnCreateTaskbarPage(hwndDlg, (PPROPSHEET_INFO)((LPPROPSHEETPAGE)lParam)->lParam); - break; - - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDC_TASKBARPROP_LOCK: - case IDC_TASKBARPROP_HIDE: - case IDC_TASKBARPROP_GROUP: - case IDC_TASKBARPROP_SHOWQL: - case IDC_TASKBARPROP_HIDEICONS: - case IDC_TASKBARPROP_CLOCK: - case IDC_TASKBARPROP_SECONDS: - if (HIWORD(wParam) == BN_CLICKED) - { - UpdateBitmaps(pPropInfo); - - /* Enable the 'Apply' button */ - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - } - break; - case IDC_TASKBARPROP_ICONCUST: - ShowCustomizeNotifyIcons(hExplorerInstance, hwndDlg); - break; - } - break; - - case WM_NOTIFY: - { - LPNMHDR pnmh = (LPNMHDR)lParam; - - switch (pnmh->code) - { - case PSN_SETACTIVE: - break; - - case PSN_APPLY: - TaskBarSettings.bLock = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_LOCK); - TaskBarSettings.bAutoHide = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_HIDE); - TaskBarSettings.bAlwaysOnTop = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_ONTOP); - TaskBarSettings.bGroupButtons = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_GROUP); - TaskBarSettings.bShowQuickLaunch = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_SHOWQL); - TaskBarSettings.bShowClock = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_CLOCK); - TaskBarSettings.bShowSeconds = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_SECONDS); - TaskBarSettings.bHideInactiveIcons = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_HIDEICONS); - SaveTaskBarSettings(); - break; - } - - break; - } - - case WM_DESTROY: - if (pPropInfo->hTaskbarBitmap) - { - DeleteObject(pPropInfo->hTaskbarBitmap); - } - if (pPropInfo->hTrayBitmap) - { - DeleteObject(pPropInfo->hTrayBitmap); - } - break; - -HandleDefaultMessage: - default: - return FALSE; } - return FALSE; -} - -static INT_PTR CALLBACK -StartMenuPageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - switch (uMsg) + ~CStartMenuSettingsPage() { - case WM_INITDIALOG: - OnCreateStartPage(hwndDlg, (PPROPSHEET_INFO)((LPPROPSHEETPAGE)lParam)->lParam); - break; - - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDC_TASKBARPROP_STARTMENUCLASSICCUST: - ShowCustomizeClassic(hExplorerInstance, hwndDlg); - break; - } - break; - } - - case WM_DESTROY: - break; - - case WM_NOTIFY: - { - LPNMHDR pnmh = (LPNMHDR)lParam; - - switch (pnmh->code) - { - case PSN_SETACTIVE: - break; - - case PSN_APPLY: - break; - } - - break; - } + if (m_hbmpStartBitmap) + DeleteObject(m_hbmpStartBitmap); } - return FALSE; -} + LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) + { + CheckDlgButton(IDC_TASKBARPROP_STARTMENUCLASSIC, BST_CHECKED); // HACK: This has to be read from registry! + UpdateDialog(); + return TRUE; + } -static VOID -InitPropSheetPage(PROPSHEETPAGE *psp, - WORD idDlg, - DLGPROC DlgProc, - LPARAM lParam) -{ - ZeroMemory(psp, sizeof(*psp)); - psp->dwSize = sizeof(*psp); - psp->dwFlags = PSP_DEFAULT; - psp->hInstance = hExplorerInstance; - psp->pszTemplate = MAKEINTRESOURCEW(idDlg); - psp->lParam = lParam; - psp->pfnDlgProc = DlgProc; -} + LRESULT OnStartMenuCustomize(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) + { + ShowCustomizeClassic(hExplorerInstance, m_hWnd); + return 0; + } + int OnApply() + { + //TODO + return PSNRET_NOERROR; + } +}; VOID -DisplayTrayProperties(IN HWND hwndOwner) +DisplayTrayProperties(IN HWND hwndOwner, IN HWND hwndTaskbar) { - PROPSHEET_INFO propInfo = {0}; PROPSHEETHEADER psh; - PROPSHEETPAGE psp[2]; - WCHAR szCaption[256]; - - if (!LoadStringW(hExplorerInstance, - IDS_TASKBAR_STARTMENU_PROP_CAPTION, - szCaption, - _countof(szCaption))) - { - return; - } + HPROPSHEETPAGE hpsp[2]; + CTaskBarSettingsPage tbSettingsPage(hwndTaskbar); + CStartMenuSettingsPage smSettingsPage; + CStringW caption; + + caption.LoadStringW(IDS_TASKBAR_STARTMENU_PROP_CAPTION); + + hpsp[0] = tbSettingsPage.Create(); + hpsp[1] = smSettingsPage.Create(); ZeroMemory(&psh, sizeof(psh)); psh.dwSize = sizeof(psh); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE; + psh.dwFlags = PSH_PROPTITLE; psh.hwndParent = hwndOwner; psh.hInstance = hExplorerInstance; psh.hIcon = NULL; - psh.pszCaption = szCaption; - psh.nPages = _countof(psp); + psh.pszCaption = caption.GetString(); + psh.nPages = _countof(hpsp); psh.nStartPage = 0; - psh.ppsp = psp; - - InitPropSheetPage(&psp[0], IDD_TASKBARPROP_TASKBAR, TaskbarPageProc, (LPARAM)&propInfo); - InitPropSheetPage(&psp[1], IDD_TASKBARPROP_STARTMENU, StartMenuPageProc, (LPARAM)&propInfo); + psh.phpage = hpsp; PropertySheet(&psh); } diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index f703955a30..fefd0f0623 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -237,12 +237,6 @@ public: DWORD Flags; struct { - DWORD AutoHide : 1; - DWORD AlwaysOnTop : 1; - DWORD SmSmallIcons : 1; - DWORD HideClock : 1; - DWORD Locked : 1; - /* UI Status */ DWORD InSizeMove : 1; DWORD IsDragging : 1; @@ -411,7 +405,7 @@ public: m_TrayPropertiesOwner = hwnd; - DisplayTrayProperties(hwnd); + DisplayTrayProperties(hwnd, m_hWnd); m_TrayPropertiesOwner = NULL; ::DestroyWindow(hwnd); @@ -494,7 +488,7 @@ public: case ID_LOCKTASKBAR: if (SHRestricted(REST_CLASSICSHELL) == 0) { - Lock(!Locked); + Lock(!g_TaskbarSettings.bLock); } break; @@ -1192,7 +1186,7 @@ GetPrimaryScreenRect: without user interaction. */ rcTray = m_TrayRects[m_Position]; - if (AutoHide) + if (g_TaskbarSettings.sr.AutoHide) { rcTray.left += m_AutoHideOffset.cx; rcTray.right += m_AutoHideOffset.cx; @@ -1273,7 +1267,7 @@ ChangePos: /* If AutoHide is false then change the workarea to exclude the area that the taskbar covers. */ - if (!AutoHide) + if (!g_TaskbarSettings.sr.AutoHide) { switch (m_Position) { @@ -1324,23 +1318,11 @@ ChangePos: ApplyClipping(TRUE); } - typedef struct _TW_STUCKRECTS2 - { - DWORD cbSize; - LONG Unknown; - DWORD dwFlags; - DWORD Position; - SIZE Size; - RECT Rect; - } TW_STRUCKRECTS2, *PTW_STUCKRECTS2; - VOID RegLoadSettings() { DWORD Pos; - TW_STRUCKRECTS2 sr; RECT rcScreen; SIZE WndSize, EdgeSize, DlgFrameSize; - DWORD cbSize = sizeof(sr); SIZE StartBtnSize = m_StartButton.GetSize(); EdgeSize.cx = GetSystemMetrics(SM_CXEDGE); @@ -1348,44 +1330,12 @@ ChangePos: DlgFrameSize.cx = GetSystemMetrics(SM_CXDLGFRAME); DlgFrameSize.cy = GetSystemMetrics(SM_CYDLGFRAME); - if (SHGetValue(hkExplorer, - TEXT("StuckRects2"), - TEXT("Settings"), - NULL, - &sr, - &cbSize) == ERROR_SUCCESS && - sr.cbSize == sizeof(sr)) - { - AutoHide = (sr.dwFlags & ABS_AUTOHIDE) != 0; - AlwaysOnTop = (sr.dwFlags & ABS_ALWAYSONTOP) != 0; - SmSmallIcons = (sr.dwFlags & 0x4) != 0; - HideClock = (sr.dwFlags & 0x8) != 0; - - /* FIXME: Are there more flags? */ + m_Position = g_TaskbarSettings.sr.Position; + rcScreen = g_TaskbarSettings.sr.Rect; + GetScreenRectFromRect(&rcScreen, MONITOR_DEFAULTTONEAREST); -#if WIN7_DEBUG_MODE - m_Position = ABE_LEFT; -#else - if (sr.Position > ABE_BOTTOM) - m_Position = ABE_BOTTOM; - else - m_Position = sr.Position; -#endif - - /* Try to find out which monitor the tray window was located on last. - Here we're only interested in the monitor screen that we think - is the last one used. We're going to determine on which monitor - we really are after calculating the docked position. */ - rcScreen = sr.Rect; - GetScreenRectFromRect( - &rcScreen, - MONITOR_DEFAULTTONEAREST); - } - else + if (!g_TaskbarSettings.sr.Size.cx || !g_TaskbarSettings.sr.Size.cy) { - m_Position = ABE_BOTTOM; - AlwaysOnTop = TRUE; - /* Use the minimum size of the taskbar, we'll use the start button as a minimum for now. Make sure we calculate the entire window size, not just the client size. However, we @@ -1393,36 +1343,17 @@ ChangePos: the start button and bands are not stuck to the screen border. */ if(!m_Theme) { - sr.Size.cx = StartBtnSize.cx + (2 * (EdgeSize.cx + DlgFrameSize.cx)); - sr.Size.cy = StartBtnSize.cy + (2 * (EdgeSize.cy + DlgFrameSize.cy)); + g_TaskbarSettings.sr.Size.cx = StartBtnSize.cx + (2 * (EdgeSize.cx + DlgFrameSize.cx)); + g_TaskbarSettings.sr.Size.cy = StartBtnSize.cy + (2 * (EdgeSize.cy + DlgFrameSize.cy)); } else { - sr.Size.cx = StartBtnSize.cx - EdgeSize.cx; - sr.Size.cy = StartBtnSize.cy - EdgeSize.cy; - if(!Locked) - sr.Size.cy += GetSystemMetrics(SM_CYSIZEFRAME); + g_TaskbarSettings.sr.Size.cx = StartBtnSize.cx - EdgeSize.cx; + g_TaskbarSettings.sr.Size.cy = StartBtnSize.cy - EdgeSize.cy; + if(!g_TaskbarSettings.bLock) + g_TaskbarSettings.sr.Size.cy += GetSystemMetrics(SM_CYSIZEFRAME); } - - /* Use the primary screen by default */ - rcScreen.left = 0; - rcScreen.top = 0; - rcScreen.right = GetSystemMetrics(SM_CXSCREEN); - rcScreen.bottom = GetSystemMetrics(SM_CYSCREEN); - GetScreenRectFromRect( - &rcScreen, - MONITOR_DEFAULTTOPRIMARY); } - - if (m_hWnd != NULL) - SetWindowPos( - AlwaysOnTop ? HWND_TOPMOST : HWND_NOTOPMOST, - 0, - 0, - 0, - 0, - SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); - /* Determine a minimum tray window rectangle. The "client" height is zero here since we cannot determine an optimal minimum width when loaded as a vertical tray window. We just need to make sure the values @@ -1440,10 +1371,10 @@ ChangePos: WndSize.cy = StartBtnSize.cy - EdgeSize.cx; } - if (WndSize.cx < sr.Size.cx) - WndSize.cx = sr.Size.cx; - if (WndSize.cy < sr.Size.cy) - WndSize.cy = sr.Size.cy; + if (WndSize.cx < g_TaskbarSettings.sr.Size.cx) + WndSize.cx = g_TaskbarSettings.sr.Size.cx; + if (WndSize.cy < g_TaskbarSettings.sr.Size.cy) + WndSize.cy = g_TaskbarSettings.sr.Size.cy; /* Save the calculated size */ m_TraySize = WndSize; @@ -1940,7 +1871,7 @@ ChangePos: } DWORD dwExStyle = WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE; - if (AlwaysOnTop) + if (g_TaskbarSettings.sr.AlwaysOnTop) dwExStyle |= WS_EX_TOPMOST; DWORD dwStyle = WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; @@ -1996,18 +1927,18 @@ ChangePos: BOOL STDMETHODCALLTYPE Lock(IN BOOL bLock) { - BOOL bPrevLock = Locked; + BOOL bPrevLock = g_TaskbarSettings.bLock; - if (Locked != bLock) + if (g_TaskbarSettings.bLock != bLock) { - Locked = bLock; + g_TaskbarSettings.bLock = bLock; if (m_TrayBandSite != NULL) { if (!SUCCEEDED(m_TrayBandSite->Lock(bLock))) { /* Reset?? */ - Locked = bPrevLock; + g_TaskbarSettings.bLock = bPrevLock; return bPrevLock; } } @@ -2020,7 +1951,7 @@ ChangePos: RECT rcGripper = {0}; AdjustSizerRect(&rcGripper, Pos); - if(Locked) + if(g_TaskbarSettings.bLock) { m_TrayRects[Pos].top += rcGripper.top; m_TrayRects[Pos].left += rcGripper.left; @@ -2130,13 +2061,13 @@ ChangePos: SetWindowTheme(m_Rebar, L"TaskBar", NULL); /* Create the tray notification window */ - m_TrayNotify = CreateTrayNotifyWnd(this, HideClock, &m_TrayNotifyInstance); + m_TrayNotify = CreateTrayNotifyWnd(this, &m_TrayNotifyInstance); UpdateFonts(); InitShellServices(&m_ShellServices); - if (AutoHide) + if (g_TaskbarSettings.sr.AutoHide) { m_AutoHideState = AUTOHIDE_HIDING; SetTimer(TIMER_ID_AUTOHIDE, AUTOHIDE_DELAY_HIDE, NULL); @@ -2248,7 +2179,7 @@ ChangePos: RECT rcClient; POINT pt; - if (Locked) + if (g_TaskbarSettings.bLock) { /* The user may not be able to resize the tray window. Pretend like the window is not sizeable when the user @@ -2307,7 +2238,7 @@ ChangePos: need to be able to move the window in case the user wants to drag the tray window to another position or in case the user wants to resize the tray window. */ - if (!Locked && GetCursorPos(&ptCursor)) + if (!g_TaskbarSettings.bLock && GetCursorPos(&ptCursor)) { IsDragging = TRUE; m_DraggingPosition = GetDraggingRectFromPt(ptCursor, pRect, &m_DraggingMonitor); @@ -2323,7 +2254,7 @@ ChangePos: { PRECT pRect = (PRECT) lParam; - if (!Locked) + if (!g_TaskbarSettings.bLock) { FitToRebar(pRect); } @@ -2370,7 +2301,7 @@ ChangePos: { InSizeMove = TRUE; IsDragging = FALSE; - if (!Locked) + if (!g_TaskbarSettings.bLock) { /* Remove the clipping on multi monitor systems while dragging around */ ApplyClipping(FALSE); @@ -2381,7 +2312,7 @@ ChangePos: LRESULT OnExitSizeMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { InSizeMove = FALSE; - if (!Locked) + if (!g_TaskbarSettings.bLock) { FitToRebar(&m_TrayRects[m_Position]); @@ -2714,7 +2645,7 @@ HandleTrayContextMenu: LRESULT OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (AutoHide) + if (g_TaskbarSettings.sr.AutoHide) { SetTimer(TIMER_ID_MOUSETRACK, MOUSETRACK_INTERVAL, NULL); } @@ -2741,7 +2672,7 @@ HandleTrayContextMenu: { RECT *rc = NULL; /* Ignore WM_NCCALCSIZE if we are not themed or locked */ - if(!m_Theme || Locked) + if(!m_Theme || g_TaskbarSettings.bLock) { bHandled = FALSE; return 0; @@ -2817,6 +2748,41 @@ HandleTrayContextMenu: return 0; } + LRESULT OnTaskbarSettingsChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + TaskbarSettings* newSettings = (TaskbarSettings*)lParam; + + /* Propagate the new settings to the children */ + ::SendMessageW(m_TaskSwitch, uMsg, wParam, lParam); + ::SendMessageW(m_TrayNotify, uMsg, wParam, lParam); + + /* Toggle autohide */ + if (newSettings->sr.AutoHide != g_TaskbarSettings.sr.AutoHide) + { + g_TaskbarSettings.sr.AutoHide = newSettings->sr.AutoHide; + memset(&m_AutoHideOffset, 0, sizeof(m_AutoHideOffset)); + m_AutoHideState = AUTOHIDE_SHOWN; + if (!newSettings->sr.AutoHide) + SetWindowPos(NULL, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOZORDER); + else + SetTimer(TIMER_ID_MOUSETRACK, MOUSETRACK_INTERVAL, NULL); + } + + /* Toggle lock state */ + Lock(newSettings->bLock); + + /* Toggle OnTop state */ + if (newSettings->sr.AlwaysOnTop != g_TaskbarSettings.sr.AlwaysOnTop) + { + g_TaskbarSettings.sr.AlwaysOnTop = newSettings->sr.AlwaysOnTop; + HWND hWndInsertAfter = newSettings->sr.AlwaysOnTop ? HWND_TOPMOST : HWND_BOTTOM; + SetWindowPos(hWndInsertAfter, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); + } + + g_TaskbarSettings.Save(); + return 0; + } + DECLARE_WND_CLASS_EX(szTrayWndClass, CS_DBLCLKS, COLOR_3DFACE) BEGIN_MSG_MAP(CTrayWindow) @@ -2872,6 +2838,7 @@ HandleTrayContextMenu: MESSAGE_HANDLER(WM_CLOSE, OnDoExitWindows) MESSAGE_HANDLER(WM_HOTKEY, OnHotkey) MESSAGE_HANDLER(WM_NCCALCSIZE, OnNcCalcSize) + MESSAGE_HANDLER(TWM_SETTINGSCHANGED, OnTaskbarSettingsChanged) ALT_MSG_MAP(1) END_MSG_MAP() @@ -3032,7 +2999,7 @@ public: CheckMenuItem(hPopup, ID_LOCKTASKBAR, - MF_BYCOMMAND | (TrayWnd->Locked ? MF_CHECKED : MF_UNCHECKED)); + MF_BYCOMMAND | (g_TaskbarSettings.bLock ? MF_CHECKED : MF_UNCHECKED)); UINT idCmdNext; idCmdNext = Shell_MergeMenus(hPopup, menubase, indexMenu, idCmdFirst, idCmdLast, MM_SUBMENUSHAVEIDS | MM_ADDSEPARATOR);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs