Author: akhaldi Date: Wed Nov 25 14:29:07 2015 New Revision: 70113
URL: http://svn.reactos.org/svn/reactos?rev=70113&view=rev Log: [OLEDLG_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
Modified: trunk/rostests/winetests/oledlg/main.c
Modified: trunk/rostests/winetests/oledlg/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oledlg/main.c?re... ============================================================================== --- trunk/rostests/winetests/oledlg/main.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oledlg/main.c [iso-8859-1] Wed Nov 25 14:29:07 2015 @@ -25,6 +25,18 @@
#include <initguid.h> #include <oledlg.h> + +static const WCHAR *strstrW( const WCHAR *str, const WCHAR *sub ) +{ + while (*str) + { + const WCHAR *p1 = str, *p2 = sub; + while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } + if (!*p2) return str; + str++; + } + return NULL; +}
static HRESULT WINAPI enumverbs_QueryInterface(IEnumOLEVERB *iface, REFIID riid, void **ppv) { @@ -396,8 +408,9 @@ info.cch = sizeof(buffW)/sizeof(WCHAR); ret = GetMenuItemInfoW(hMenu, 4, TRUE, &info); ok(ret, "got %d\n", ret); - /* item string has a form of '<verb> <usertype> <Object>', where Object is localized */ - ok(!memcmp(buffW, verbW, sizeof(verbW) - sizeof(WCHAR)), "str %s\n", wine_dbgstr_w(buffW)); + /* Item string contains verb, usertype and localized string for 'Object' word, + exact format depends on localization. */ + ok(strstrW(buffW, verbW) != NULL, "str %s\n", wine_dbgstr_w(buffW)); ok(info.fState == 0, "got state 0x%08x\n", info.fState); ok(info.hSubMenu == NULL, "got submenu %p\n", info.hSubMenu);