Jacek Caban : win32u/tests: Add NtUserThunkedMenuItemInfo tests.
Alexandre Julliard
julliard at winehq.org
Mon May 2 16:02:10 CDT 2022
Module: wine
Branch: master
Commit: d366ef515d0970aea352fe160c7ee08ed61bc3a0
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d366ef515d0970aea352fe160c7ee08ed61bc3a0
Author: Jacek Caban <jacek at codeweavers.com>
Date: Sun May 1 01:10:44 2022 +0200
win32u/tests: Add NtUserThunkedMenuItemInfo tests.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/win32u/tests/win32u.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 75 insertions(+)
diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c
index 401913f0aee..03c143cc143 100644
--- a/dlls/win32u/tests/win32u.c
+++ b/dlls/win32u/tests/win32u.c
@@ -505,6 +505,80 @@ static void test_window_text(void)
DestroyWindow( hwnd );
}
+#define test_menu_item_id(a, b, c) test_menu_item_id_(a, b, c, __LINE__)
+static void test_menu_item_id_( HMENU menu, int pos, int expect, int line )
+{
+ MENUITEMINFOW item;
+ BOOL ret;
+
+ item.cbSize = sizeof(item);
+ item.fMask = MIIM_ID;
+ ret = GetMenuItemInfoW( menu, pos, TRUE, &item );
+ ok_(__FILE__,line)( ret, "GetMenuItemInfoW failed: %lu\n", GetLastError() );
+ ok_(__FILE__,line)( item.wID == expect, "got if %d, expected %d\n", item.wID, expect );
+}
+
+static void test_menu(void)
+{
+ MENUITEMINFOW item;
+ HMENU menu;
+ int count;
+ BOOL ret;
+
+ menu = CreateMenu();
+
+ memset( &item, 0, sizeof(item) );
+ item.cbSize = sizeof(item);
+ item.fMask = MIIM_ID;
+ item.wID = 10;
+ ret = NtUserThunkedMenuItemInfo( menu, 0, MF_BYPOSITION, NtUserInsertMenuItem, &item, NULL );
+ ok( ret, "InsertMenuItemW failed: %lu\n", GetLastError() );
+
+ count = GetMenuItemCount( menu );
+ ok( count == 1, "count = %d\n", count );
+
+ item.wID = 20;
+ ret = NtUserThunkedMenuItemInfo( menu, 1, MF_BYPOSITION, NtUserInsertMenuItem, &item, NULL );
+ ok( ret, "InsertMenuItemW failed: %lu\n", GetLastError() );
+
+ count = GetMenuItemCount( menu );
+ ok( count == 2, "count = %d\n", count );
+ test_menu_item_id( menu, 0, 10 );
+ test_menu_item_id( menu, 1, 20 );
+
+ item.wID = 30;
+ ret = NtUserThunkedMenuItemInfo( menu, 1, MF_BYPOSITION, NtUserInsertMenuItem, &item, NULL );
+ ok( ret, "InsertMenuItemW failed: %lu\n", GetLastError() );
+
+ count = GetMenuItemCount( menu );
+ ok( count == 3, "count = %d\n", count );
+ test_menu_item_id( menu, 0, 10 );
+ test_menu_item_id( menu, 1, 30 );
+ test_menu_item_id( menu, 2, 20 );
+
+ item.wID = 50;
+ ret = NtUserThunkedMenuItemInfo( menu, 10, 0, NtUserInsertMenuItem, &item, NULL );
+ ok( ret, "InsertMenuItemW failed: %lu\n", GetLastError() );
+
+ count = GetMenuItemCount( menu );
+ ok( count == 4, "count = %d\n", count );
+ test_menu_item_id( menu, 0, 50 );
+ test_menu_item_id( menu, 1, 10 );
+ test_menu_item_id( menu, 2, 30 );
+ test_menu_item_id( menu, 3, 20 );
+
+ item.wID = 60;
+ ret = NtUserThunkedMenuItemInfo( menu, 1, MF_BYPOSITION, NtUserSetMenuItemInfo, &item, NULL );
+ ok( ret, "InsertMenuItemW failed: %lu\n", GetLastError() );
+
+ count = GetMenuItemCount( menu );
+ ok( count == 4, "count = %d\n", count );
+ test_menu_item_id( menu, 1, 60 );
+
+ ret = NtUserDestroyMenu( menu );
+ ok( ret, "NtUserDestroyMenu failed: %lu\n", GetLastError() );
+}
+
START_TEST(win32u)
{
/* native win32u.dll fails if user32 is not loaded, so make sure it's fully initialized */
@@ -517,6 +591,7 @@ START_TEST(win32u)
test_cursoricon();
test_message_call();
test_window_text();
+ test_menu();
test_NtUserCloseWindowStation();
}
More information about the wine-cvs
mailing list