Greg Geldorp : user32/tests: Fix menu test failures on East-Asian machines.

Alexandre Julliard julliard at winehq.org
Thu Jan 13 11:48:57 CST 2011


Module: wine
Branch: master
Commit: 2b0d8ed7c3f185db392ae6392bb65894ae919583
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2b0d8ed7c3f185db392ae6392bb65894ae919583

Author: Greg Geldorp <ggeldorp at vmware.com>
Date:   Thu Jan 13 11:25:02 2011 +0100

user32/tests: Fix menu test failures on East-Asian machines.

---

 dlls/user32/tests/menu.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c
index deecbe8..aa7ebde 100644
--- a/dlls/user32/tests/menu.c
+++ b/dlls/user32/tests/menu.c
@@ -954,7 +954,9 @@ static void check_menu_item_info( int line, HMENU hmenu, BOOL ansi, UINT mask, U
                              "wrong bmpitem %p/%p\n", info.hbmpItem, item );
     ok_(__FILE__, line)( info.dwTypeData == type_data || (ULONG_PTR)info.dwTypeData == LOWORD(type_data),
                          "wrong type data %p/%p\n", info.dwTypeData, type_data );
-    ok_(__FILE__, line)( info.cch == out_len, "wrong len %x/%x\n", info.cch, out_len );
+    ok_(__FILE__, line)( info.cch == out_len ||
+                         broken(! ansi && info.cch == 2 * out_len) /* East-Asian */,
+                         "wrong len %x/%x\n", info.cch, out_len );
     if (expname)
     {
         if(ansi)




More information about the wine-cvs mailing list