[PATCH 0/2] MR7896: comctl32: Implement MSAA events for progress bars.

[PATCH 1/2] comctl32: Implement EVENT_OBJECT_STATECHANGE for progress control.

[Esme Povirk]

From: Esme Povirk

---
 dlls/comctl32/progress.c       |  4 +++
 dlls/comctl32/tests/progress.c | 46 ++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c
index fcecd7bb293..b22fe5b9c44 100644
--- a/dlls/comctl32/progress.c
+++ b/dlls/comctl32/progress.c
@@ -535,7 +535,11 @@ static UINT PROGRESS_SetState (HWND hwnd, PROGRESS_INFO *infoPtr, UINT state)
         return 0;

if (state != prev_state)
+    {
+        NotifyWinEvent(EVENT_OBJECT_STATECHANGE, hwnd, OBJID_CLIENT, 0);
+
         InvalidateRect(hwnd, NULL, TRUE);
+    }
     return prev_state;
 }

diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c
index 092137985fb..1ccd3295724 100644
--- a/dlls/comctl32/tests/progress.c
+++ b/dlls/comctl32/tests/progress.c
@@ -43,6 +43,47 @@ enum seq_index

static struct msg_sequence *sequences[NUM_MSG_SEQUENCES];

+static void CALLBACK msg_winevent_proc(HWINEVENTHOOK hevent,
+                                       DWORD event,
+                                       HWND hwnd,
+                                       LONG object_id,
+                                       LONG child_id,
+                                       DWORD thread_id,
+                                       DWORD event_time)
+{
+    struct message msg = {0};
+    char class_name[256];
+
+    /* ignore window and other system events */
+    if (object_id != OBJID_CLIENT) return;
+
+    /* ignore events not from a progress bar control */
+    if (!GetClassNameA(hwnd, class_name, ARRAY_SIZE(class_name)) ||
+        strcmp(class_name, PROGRESS_CLASSA) != 0)
+        return;
+
+    msg.message = event;
+    msg.flags = winevent_hook|wparam|lparam;
+    msg.wParam = object_id;
+    msg.lParam = child_id;
+    add_message(sequences, CHILD_SEQ_INDEX, &msg);
+}
+
+static void init_winevent_hook(void) {
+    hwineventhook = SetWinEventHook(EVENT_MIN, EVENT_MAX, GetModuleHandleA(0), msg_winevent_proc,
+                                    0, GetCurrentThreadId(), WINEVENT_INCONTEXT);
+    if (!hwineventhook)
+        win_skip( "no win event hook support\n" );
+}
+
+static void uninit_winevent_hook(void) {
+    if (!hwineventhook)
+        return;
+
+    UnhookWinEvent(hwineventhook);
+    hwineventhook = 0;
+}
+
 static HWND create_progress(DWORD style)
 {
     return CreateWindowExA(0, PROGRESS_CLASSA, "", WS_VISIBLE | style,
@@ -323,6 +364,7 @@ static WNDPROC old_proc;
 static const struct message paint_pbm_setstate_seq[] =
 {
     {PBM_SETSTATE, sent},
+    {EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0},
     {WM_PAINT, sent},
     {WM_ERASEBKGND, sent | defwinproc},
     {0}
@@ -432,10 +474,14 @@ START_TEST(progress)
         return;
     init_msg_sequences(sequences, NUM_MSG_SEQUENCES);

+    init_winevent_hook();
+
     test_setcolors();
     test_PBM_STEPIT();
     test_bar_states();

+    uninit_winevent_hook();
+
     unload_v6_module(ctx_cookie, hCtx);

cleanup();

[PATCH 2/2] comctl32: Implement EVENT_OBJECT_VALUECHANGE for progress bars.

[Esme Povirk]

From: Esme Povirk

---
 dlls/comctl32/progress.c       |  1 +
 dlls/comctl32/tests/progress.c | 57 ++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c
index b22fe5b9c44..aae2d8f8660 100644
--- a/dlls/comctl32/progress.c
+++ b/dlls/comctl32/progress.c
@@ -520,6 +520,7 @@ static UINT PROGRESS_SetPos (PROGRESS_INFO *infoPtr, INT pos)
        TRACE("PBM_SETPOS: current pos changed from %d to %d\n", oldVal, infoPtr->CurVal);
             PROGRESS_Invalidate( infoPtr, oldVal, infoPtr->CurVal );
             UpdateWindow( infoPtr->Self );
+            NotifyWinEvent( EVENT_OBJECT_VALUECHANGE, infoPtr->Self, OBJID_CLIENT, 0 );
         }
         return oldVal;
     }
diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c
index 1ccd3295724..f228ac84d2e 100644
--- a/dlls/comctl32/tests/progress.c
+++ b/dlls/comctl32/tests/progress.c
@@ -443,6 +443,62 @@ void test_bar_states(void)
     DestroyWindow(progress_bar);
 }

+static const struct message step_seq[] =
+{
+    {PBM_SETRANGE, sent},
+    {PBM_SETPOS, sent},
+    {EVENT_OBJECT_VALUECHANGE, winevent_hook, OBJID_CLIENT, 0},
+    {PBM_SETPOS, sent},
+    {PBM_SETSTEP, sent},
+    {0}
+};
+
+static LRESULT WINAPI test_pbm_step_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp)
+{
+    static int defwndproc_counter = 0;
+    struct message msg = {0};
+    LRESULT ret;
+
+    if (message == PBM_SETSTEP
+        || message == PBM_SETRANGE
+        || message == PBM_SETPOS)
+    {
+        msg.message = message;
+        msg.flags = sent | wparam | lparam;
+        if (defwndproc_counter)
+            msg.flags |= defwinproc;
+        msg.wParam = wp;
+        msg.lParam = lp;
+        add_message(sequences, CHILD_SEQ_INDEX, &msg);
+    }
+
+    ++defwndproc_counter;
+    ret = CallWindowProcA(old_proc, hwnd, message, wp, lp);
+    --defwndproc_counter;
+    return ret;
+}
+
+void test_step_messages(void)
+{
+    HWND progress_bar;
+
+    progress_bar = create_progress(0);
+
+    old_proc = (WNDPROC)SetWindowLongPtrA(progress_bar, GWLP_WNDPROC, (LONG_PTR)test_pbm_step_proc);
+
+    flush_events();
+    flush_sequences(sequences, NUM_MSG_SEQUENCES);
+
+    SendMessageA(progress_bar, PBM_SETRANGE, 0, MAKELPARAM(0, 100));
+    SendMessageA(progress_bar, PBM_SETPOS, 10, 0);
+    SendMessageA(progress_bar, PBM_SETPOS, 10, 0);
+    SendMessageA(progress_bar, PBM_SETSTEP, 20, 0);
+
+    ok_sequence(sequences, CHILD_SEQ_INDEX, step_seq, "step_seq", FALSE);
+
+    DestroyWindow(progress_bar);
+}
+
 static void init_functions(void)
 {
     HMODULE hComCtl32 = LoadLibraryA("comctl32.dll");
@@ -479,6 +535,7 @@ START_TEST(progress)
     test_setcolors();
     test_PBM_STEPIT();
     test_bar_states();
+    test_step_messages();

uninit_winevent_hook();

[PATCH 0/2] MR7896: comctl32: Implement MSAA events for progress bars. - approved

[Zhiyi Zhang (＠zhiyi)]

This merge request was approved by Zhiyi Zhang.