[PATCH v2 1/1] comctl32: Implement WM_GETOBJECT for buttons.

[Esme Povirk]

From: Esme Povirk

---
 dlls/comctl32/button.c       |  5 +++++
 dlls/comctl32/tests/button.c | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c
index 9e7eaedc383..11a9760e3e2 100644
--- a/dlls/comctl32/button.c
+++ b/dlls/comctl32/button.c
@@ -885,6 +885,11 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L
         InvalidateRect( hWnd, NULL, FALSE );
         break;

+    case WM_GETOBJECT:
+        if ((LONG)lParam == OBJID_QUERYCLASSNAMEIDX)
+            return 0x10002;
+        break;
+
     case BM_SETSTYLE:
     {
         DWORD new_btn_type;
diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c
index c554ac4e50b..7c171af8af1 100644
--- a/dlls/comctl32/tests/button.c
+++ b/dlls/comctl32/tests/button.c
@@ -2445,6 +2445,23 @@ static void test_visual(void)
     DestroyWindow(parent);
 }

+static void test_getobject(void)
+{
+    HWND hwnd;
+    LONG idx;
+
+    hwnd = create_button(BS_PUSHBUTTON, NULL);
+
+    idx = SendMessageA(hwnd, WM_GETOBJECT, 0, OBJID_QUERYCLASSNAMEIDX);
+    ok(idx == 0x10002, "Expect idx 0x%08x, got 0x%08lx\n", 0x10002, idx);
+
+    /* Check with upper 32 bits truncated */
+    idx = SendMessageA(hwnd, WM_GETOBJECT, 0, (DWORD)OBJID_QUERYCLASSNAMEIDX);
+    ok(idx == 0x10002, "Expect idx 0x%08x, got 0x%08lx\n", 0x10002, idx);
+
+    DestroyWindow(hwnd);
+}
+
 START_TEST(button)
 {
     BOOL (WINAPI * pIsThemeActive)(VOID);
@@ -2482,6 +2499,7 @@ START_TEST(button)
     test_bcm_get_ideal_size();
     test_style();
     test_visual();
+    test_getobject();

uninit_winevent_hook();