[PATCH 0/1] MR6174: comctl32: Handle WM_GETOBJECT in tab control.

[PATCH 1/1] comctl32: Handle WM_GETOBJECT in tab control.

[Esme Povirk]

From: Esme Povirk

---
 dlls/comctl32/tab.c       |  5 +++++
 dlls/comctl32/tests/tab.c | 15 +++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c
index b0d645bddd4..887682196bc 100644
--- a/dlls/comctl32/tab.c
+++ b/dlls/comctl32/tab.c
@@ -3368,6 +3368,11 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
     case TCM_SETEXTENDEDSTYLE:
       return TAB_SetExtendedStyle (infoPtr, wParam, lParam);

+    case WM_GETOBJECT:
+      if ((LONG)lParam == OBJID_QUERYCLASSNAMEIDX)
+        return 0x1000f;
+      break;
+
     case WM_GETFONT:
       return TAB_GetFont (infoPtr);

diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c
index 6d38baae8a6..32b095f0e9b 100644
--- a/dlls/comctl32/tests/tab.c
+++ b/dlls/comctl32/tests/tab.c
@@ -1621,6 +1621,20 @@ static void test_TCM_GETROWCOUNT(void)
     DestroyWindow(hTab);
 }

+static void test_WM_GETOBJECT(void)
+{
+    HWND hTab;
+    DWORD objid;
+
+    hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, 2);
+    ok(hTab != NULL, "Failed to create tab control\n");
+
+    objid = SendMessageA(hTab, WM_GETOBJECT, 0, OBJID_QUERYCLASSNAMEIDX);
+    ok(objid == 0x1000f, "Unexpected objid %u.\n", objid);
+
+    DestroyWindow(hTab);
+}
+
 START_TEST(tab)
 {
     LOGFONTA logfont;
@@ -1660,6 +1674,7 @@ START_TEST(tab)
     test_create();
     test_TCN_SELCHANGING();
     test_TCM_GETROWCOUNT();
+    test_WM_GETOBJECT();

uninit_winevent_hook();

[PATCH 1/1] comctl32: Handle WM_GETOBJECT in tab control.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=147420

Your paranoid android.

=== w7u_adm (32 bit report) ===

comctl32:
tab.c:1117: Test failed: Getset tooltip test parent sequence: the msg sequence is not complete: expected 0000 - actual 0047

[PATCH 0/1] MR6174: comctl32: Handle WM_GETOBJECT in tab control. - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.

[Nikolay Sivov (＠nsivov)]

Nikolay Sivov (@nsivov) commented about dlls/comctl32/tests/tab.c:
>  DestroyWindow(hTab);
>
> }
>
> +static void test_WM_GETOBJECT(void)
> +{
> - HWND hTab;
> - DWORD objid;
> -
> - hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, 2);
> - ok(hTab != NULL, "Failed to create tab control\n");
> -
> - objid = SendMessageA(hTab, WM_GETOBJECT, 0, OBJID_QUERYCLASSNAMEIDX);
> - ok(objid == 0x1000f, "Unexpected objid %u.\n", objid);

That gives a format warning on 64-bit.