Skip to content

W
wine-winehq
Commit 75912855 authored by Andrew Talbot's avatar Andrew Talbot Committed by Alexandre Julliard
Browse files
Options

user/tests: Write-strings warnings fix.

parent 24dcc8d3
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 7 deletions
dlls/user/tests/menu.c
View file @ 75912855
......@@ -530,15 +530,15 @@ static void test_menu_add_string( void )
char strback[0x80];
WCHAR strbackW[0x80];
static const WCHAR expectedString[] = {'D', 'u', 'm', 'm', 'y', ' ',
's', 't', 'r', 'i', 'n', 'g', 0};
static CHAR blah[] = "blah";
static const WCHAR expectedString[] = {'D','u','m','m','y',' ','s','t','r','i','n','g', 0};
hmenu = CreateMenu();
memset( &info, 0, sizeof info );
info.cbSize = sizeof info;
info.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE | MIIM_ID;
info.dwTypeData = "blah";
info.dwTypeData = blah;
info.cch = 6;
info.dwItemData = 0;
info.wID = 1;
......@@ -1179,6 +1179,8 @@ void test_menu_search_bycommand( void )
UINT id;
char strback[0x80];
char strIn[0x80];
static CHAR menuitem[] = "MenuItem",
menuitem2[] = "MenuItem 2";
/* Case 1: Menu containing a menu item */
hmenu = CreateMenu();
......@@ -1330,7 +1332,7 @@ void test_menu_search_bycommand( void )
info.cbSize = sizeof info;
info.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_ID;
info.fType = MFT_STRING;
info.dwTypeData = "MenuItem";
info.dwTypeData = menuitem;
info.wID = (UINT_PTR) hmenuSub; /* Enforce id collisions with the hmenu of the popup submenu*/
rc = InsertMenu(hmenu, 0, MF_BYPOSITION | MF_POPUP | MF_STRING, (UINT_PTR)hmenuSub, "Submenu");
......@@ -1343,7 +1345,7 @@ void test_menu_search_bycommand( void )
info.cbSize = sizeof info;
info.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_ID;
info.fType = MFT_STRING;
info.dwTypeData = "MenuItem 2";
info.dwTypeData = menuitem2;
info.wID = (UINT_PTR) hmenuSub; /* Enforce id collisions with the hmenu of the popup submenu*/
rc = InsertMenuItem(hmenuSub, 1, TRUE, &info );
......@@ -1386,7 +1388,7 @@ void test_menu_search_bycommand( void )
info.cbSize = sizeof info;
info.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_ID;
info.fType = MFT_STRING;
info.dwTypeData = "MenuItem";
info.dwTypeData = menuitem;
info.wID = (UINT_PTR) hmenuSub; /* Enforce id collisions with the hmenu of the popup submenu*/
rc = InsertMenuItem(hmenuSub2, 0, TRUE, &info );
......@@ -1396,7 +1398,7 @@ void test_menu_search_bycommand( void )
info.cbSize = sizeof info;
info.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_ID;
info.fType = MFT_STRING;
info.dwTypeData = "MenuItem 2";
info.dwTypeData = menuitem2;
info.wID = (UINT_PTR) hmenuSub; /* Enforce id collisions with the hmenu of the popup submenu*/
rc = InsertMenuItem(hmenuSub2, 1, TRUE, &info );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment