Rein Klazes : user32: Separate menu bitmaps and strings.

paul pgr at arcelectronicsinc.com
Fri Jan 6 21:41:00 CST 2006


Alexandre Julliard wrote:
> Module: wine
> Branch: refs/heads/master
> Commit: b34868dffa0df144ea9d6e1586a67cff70ae9c4e
> URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=b34868dffa0df144ea9d6e1586a67cff70ae9c4e
> 
> Author: Rein Klazes <wijn at wanadoo.nl>
> Date:   Tue Jan  3 13:23:28 2006 +0100
> 
> user32: Separate menu bitmaps and strings.
> Store bitmaps and bitmaps always in separate fields in the internal
> menu structure.  Get rid of a lot of assumptions in the code that the
> menu can have strings only when it is not some other type and that
> bitmaps come in two flavors.
> Add a lot of conformance tests, including some submitted by Jason
> Edmeades.
> 
> ---
> 
>  dlls/user/menu.c       |  317 ++++++++++++++++----------
>  dlls/user/tests/menu.c |  593 ++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 785 insertions(+), 125 deletions(-)
> 
> 
> 
> 
Regression see http://bugs.winehq.org/show_bug.cgi?id=4250

The set last error function added to GetMenuStringA and GetMenuStringW 
removed this check which seems to be still needed.
if (!IS_STRING_ITEM(item->fType)) return 0;

I have tried several times to make a patch of the changes required but I 
get a lot of white space changes.

Paul R.



More information about the wine-devel mailing list