[ros-diffs] [reactos] 01/01: [ACCESS] Improve IDC_RESET_COMBO selection (#5893)

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=416d63026eaba0aa8e2fe…

commit 416d63026eaba0aa8e2fe05c028fc0b1b4e2b0ab
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Sun Nov 19 10:33:18 2023 +0900
Commit:     GitHub <noreply(a)github.com>
CommitDate: Sun Nov 19 10:33:18 2023 +0900

    [ACCESS] Improve IDC_RESET_COMBO selection (#5893)
    
    Based on KRosUser's access.patch. CORE-19303
---
 dll/cpl/access/general.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dll/cpl/access/general.c b/dll/cpl/access/general.c
index 414b93016a5..8069fd0e965 100644
--- a/dll/cpl/access/general.c
+++ b/dll/cpl/access/general.c
@@ -12,6 +12,7 @@
 #define BAUDTICKS 6
 static UINT nBaudArray[BAUDTICKS] = {300, 1200, 2400, 4800, 9600, 19200};
 
+#define FIVE_MINS_IN_MS (5 * 60 * 1000)
 
 INT_PTR CALLBACK
 SerialKeysDlgProc(HWND hwndDlg,
@@ -177,6 +178,7 @@ GeneralPageProc(HWND hwndDlg,
 {
     PGLOBAL_DATA pGlobalData;
     LPPSHNOTIFY lppsn;
+    INT iCurSel;
 
     pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER);
 
@@ -194,8 +196,9 @@ GeneralPageProc(HWND hwndDlg,
                            IDC_RESET_BOX,
                            pGlobalData->accessTimeout.dwFlags & ATF_TIMEOUTON ?
BST_CHECKED : BST_UNCHECKED);
             FillResetComboBox(GetDlgItem(hwndDlg, IDC_RESET_COMBO));
-            SendDlgItemMessage(hwndDlg, IDC_RESET_COMBO, CB_SETCURSEL,
-                               (pGlobalData->accessTimeout.iTimeOutMSec / 300000) - 1,
0);
+            pGlobalData->accessTimeout.iTimeOutMSec = max(FIVE_MINS_IN_MS,
pGlobalData->accessTimeout.iTimeOutMSec);
+            iCurSel = (pGlobalData->accessTimeout.iTimeOutMSec / FIVE_MINS_IN_MS) -
1;
+            SendDlgItemMessage(hwndDlg, IDC_RESET_COMBO, CB_SETCURSEL, iCurSel, 0);
             EnableWindow(GetDlgItem(hwndDlg, IDC_RESET_COMBO),
                          pGlobalData->accessTimeout.dwFlags & ATF_TIMEOUTON ? TRUE
: FALSE);
 
@@ -233,7 +236,7 @@ GeneralPageProc(HWND hwndDlg,
                     {
                         INT nSel;
                         nSel = SendDlgItemMessage(hwndDlg, IDC_RESET_COMBO, CB_GETCURSEL,
0, 0);
-                        pGlobalData->accessTimeout.iTimeOutMSec = (ULONG)((nSel + 1) *
300000);
+                        pGlobalData->accessTimeout.iTimeOutMSec = (DWORD)((nSel + 1) *
FIVE_MINS_IN_MS);
                         PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                     }
                     break;