Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
b9212e2a
Commit
b9212e2a
authored
Nov 28, 2005
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Nov 28, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
set_menu_item_text handles converting an empty menu item to a
separator on its own, give it a chance to do its work in the MIIM_FTYPE case.
parent
3592110a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
menu.c
dlls/user/menu.c
+7
-4
menu.c
dlls/user/tests/menu.c
+0
-2
No files found.
dlls/user/menu.c
View file @
b9212e2a
...
@@ -4230,10 +4230,10 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu,
...
@@ -4230,10 +4230,10 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu,
menu
->
fType
&=
~
MENU_ITEM_TYPE
(
menu
->
fType
);
menu
->
fType
&=
~
MENU_ITEM_TYPE
(
menu
->
fType
);
menu
->
fType
|=
MENU_ITEM_TYPE
(
lpmii
->
fType
);
menu
->
fType
|=
MENU_ITEM_TYPE
(
lpmii
->
fType
);
menu
->
text
=
lpmii
->
dwTypeData
;
if
(
IS_STRING_ITEM
(
menu
->
fType
))
if
(
IS_STRING_ITEM
(
menu
->
fType
))
set_menu_item_text
(
menu
,
lpmii
->
dwTypeData
,
unicode
);
set_menu_item_text
(
menu
,
lpmii
->
dwTypeData
,
unicode
);
else
menu
->
text
=
lpmii
->
dwTypeData
;
}
}
if
(
lpmii
->
fMask
&
MIIM_FTYPE
)
{
if
(
lpmii
->
fMask
&
MIIM_FTYPE
)
{
...
@@ -4244,8 +4244,11 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu,
...
@@ -4244,8 +4244,11 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu,
}
}
menu
->
fType
&=
~
MENU_ITEM_TYPE
(
menu
->
fType
);
menu
->
fType
&=
~
MENU_ITEM_TYPE
(
menu
->
fType
);
menu
->
fType
|=
MENU_ITEM_TYPE
(
lpmii
->
fType
);
menu
->
fType
|=
MENU_ITEM_TYPE
(
lpmii
->
fType
);
if
(
IS_STRING_ITEM
(
menu
->
fType
)
&&
!
menu
->
text
)
menu
->
fType
|=
MF_SEPARATOR
;
if
(
IS_STRING_ITEM
(
menu
->
fType
))
set_menu_item_text
(
menu
,
lpmii
->
dwTypeData
,
unicode
);
else
menu
->
text
=
lpmii
->
dwTypeData
;
}
}
if
(
lpmii
->
fMask
&
MIIM_STRING
)
{
if
(
lpmii
->
fMask
&
MIIM_STRING
)
{
...
...
dlls/user/tests/menu.c
View file @
b9212e2a
...
@@ -277,9 +277,7 @@ static void test_menu_add_string( void )
...
@@ -277,9 +277,7 @@ static void test_menu_add_string( void )
string
[
0
]
=
0
;
string
[
0
]
=
0
;
GetMenuItemInfo
(
hmenu
,
0
,
TRUE
,
&
info
);
GetMenuItemInfo
(
hmenu
,
0
,
TRUE
,
&
info
);
todo_wine
{
ok
(
!
strcmp
(
string
,
"blah"
),
"menu item name differed
\n
"
);
ok
(
!
strcmp
(
string
,
"blah"
),
"menu item name differed
\n
"
);
}
DestroyMenu
(
hmenu
);
DestroyMenu
(
hmenu
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment