[ros-diffs] [reactos] 01/01: [COMCTL32][USER32] ComboBox: Do default processing on WM_SYSKEYDOWN (#6152)

[Katayama Hirofumi MZ]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04b1e8945b6fa1817f565…

commit 04b1e8945b6fa1817f565682fbf46ed3327e8032
Author:     Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Mon Dec 11 22:04:18 2023 +0900
Commit:     GitHub <noreply(a)github.com>
CommitDate: Mon Dec 11 22:04:18 2023 +0900

    [COMCTL32][USER32] ComboBox: Do default processing on WM_SYSKEYDOWN (#6152)
    
    Based on KRosUser's combo.patch. Enable Alt+F4 on ComboBox.
    Do default processing on WM_SYSKEYDOWN if necessary.
    CORE-18231
---
 dll/win32/comctl32/combo.c           | 7 +++++++
 win32ss/user/user32/controls/combo.c | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/dll/win32/comctl32/combo.c b/dll/win32/comctl32/combo.c
index 9b694dcbf7b..62c2d4138a2 100644
--- a/dll/win32/comctl32/combo.c
+++ b/dll/win32/comctl32/combo.c
@@ -1890,8 +1890,15 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message,
WPARAM wParam
     case WM_SYSKEYDOWN:
         if ( KEYDATA_ALT & HIWORD(lParam) )
             if( wParam == VK_UP || wParam == VK_DOWN )
+#ifdef __REACTOS__
+            {
+#endif
                 COMBO_FlipListbox( lphc, FALSE, FALSE );
         return  0;
+#ifdef __REACTOS__
+            }
+        break;
+#endif
 
     case WM_KEYDOWN:
         if ((wParam == VK_RETURN || wParam == VK_ESCAPE) &&
diff --git a/win32ss/user/user32/controls/combo.c b/win32ss/user/user32/controls/combo.c
index 8e3d07dc216..b29d5a36efb 100644
--- a/win32ss/user/user32/controls/combo.c
+++ b/win32ss/user/user32/controls/combo.c
@@ -1989,8 +1989,15 @@ LRESULT WINAPI ComboWndProc_common( HWND hwnd, UINT message, WPARAM
wParam, LPAR
         if ( KEYDATA_ALT & HIWORD(lParam) )
 #endif
             if( wParam == VK_UP || wParam == VK_DOWN )
+#ifdef __REACTOS__
+            {
+#endif
                 COMBO_FlipListbox( lphc, FALSE, FALSE );
         return  0;
+#ifdef __REACTOS__
+            }
+        break;
+#endif
 
     case WM_KEYDOWN:
         if ((wParam == VK_RETURN || wParam == VK_ESCAPE) &&