Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
36595828
Commit
36595828
authored
Nov 06, 2002
by
Chris Morgan
Committed by
Alexandre Julliard
Nov 06, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove ERR() if menu entry isn't of type MF_STRING as some
applications set flags of MT_SEPARATOR and erroneous errors are produced. Add a couple of comments.
parent
39433b94
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
menu.c
controls/menu.c
+4
-4
No files found.
controls/menu.c
View file @
36595828
...
...
@@ -1891,6 +1891,8 @@ static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags )
*
* Parse a standard menu resource and add items to the menu.
* Return a pointer to the end of the resource.
*
* NOTE: flags is equivalent to the mtOption field
*/
static
LPCSTR
MENU_ParseResource
(
LPCSTR
res
,
HMENU
hMenu
,
BOOL
unicode
)
{
...
...
@@ -1906,8 +1908,6 @@ static LPCSTR MENU_ParseResource( LPCSTR res, HMENU hMenu, BOOL unicode )
id
=
GET_WORD
(
res
);
res
+=
sizeof
(
WORD
);
}
if
(
!
IS_STRING_ITEM
(
flags
))
ERR
(
"not a string item %04x
\n
"
,
flags
);
str
=
res
;
if
(
!
unicode
)
res
+=
strlen
(
str
)
+
1
;
else
res
+=
(
strlenW
((
LPCWSTR
)
str
)
+
1
)
*
sizeof
(
WCHAR
);
...
...
@@ -4192,7 +4192,7 @@ HMENU WINAPI LoadMenuIndirectA( LPCVOID template )
TRACE
(
"%p, ver %d
\n
"
,
template
,
version
);
switch
(
version
)
{
case
0
:
case
0
:
/* standard format is version of 0 */
offset
=
GET_WORD
(
p
);
p
+=
sizeof
(
WORD
)
+
offset
;
if
(
!
(
hMenu
=
CreateMenu
()))
return
0
;
...
...
@@ -4202,7 +4202,7 @@ HMENU WINAPI LoadMenuIndirectA( LPCVOID template )
return
0
;
}
return
hMenu
;
case
1
:
case
1
:
/* extended format is version of 1 */
offset
=
GET_WORD
(
p
);
p
+=
sizeof
(
WORD
)
+
offset
;
if
(
!
(
hMenu
=
CreateMenu
()))
return
0
;
...
...
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