November 2013 - Wine-commits

Jacek Caban : urlmon: Fixed internet features tests on IE10.
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: 72edda27a15633ce73cbcfc80baec7d06a577435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72edda27a15633ce73cbcfc80… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 15 13:33:13 2013 +0100 urlmon: Fixed internet features tests on IE10. --- dlls/urlmon/tests/misc.c | 87 +++++++++++++++++++++++++++++++--------------- 1 files changed, 59 insertions(+), 28 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index f0455ee..78d3448 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -23,6 +23,7 @@ #include <wine/test.h> #include <stdarg.h> #include <stddef.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -1730,6 +1731,8 @@ static void test_internet_feature_defaults(void) { * call hasn't already been made for the specified Feature). Because of * this we skip these tests on IE 7 and earlier. */ +static const char* szFeatureControlKey = "Software\\Microsoft\\Internet Explorer\\Main\\FeatureControl"; + static void test_internet_features_registry(void) { HRESULT hres; DWORD res; @@ -1739,9 +1742,7 @@ static void test_internet_features_registry(void) { HKEY feature; DWORD value, skip_zone; BOOL delete_feature_key = TRUE; - BOOL delete_feature_control_key = FALSE; - static const char* szFeatureControlKey = "Software\\Microsoft\\Internet Explorer\\Main\\FeatureControl"; static const char* szFeatureBehaviorsKey = "FEATURE_BEHAVIORS"; static const char* szFeatureZoneElevationKey = "FEATURE_ZONE_ELEVATION"; @@ -1757,17 +1758,13 @@ static void test_internet_features_registry(void) { /* Some Windows machines don't have a FeatureControl key in HKCU. */ res = RegOpenKeyA(HKEY_CURRENT_USER, szFeatureControlKey, &feature_control); - if(res != ERROR_SUCCESS) { - res = RegCreateKeyA(HKEY_CURRENT_USER, szFeatureControlKey, &feature_control); - ok(res == ERROR_SUCCESS, "RegCreateKey failed: %d\n", res); - delete_feature_control_key = TRUE; - } + ok(res == ERROR_SUCCESS, "RegCreateKey failed: %d\n", res); res = RegOpenKeyA(feature_control, szFeatureBehaviorsKey, &feature); - if(res == ERROR_SUCCESS) + if(res == ERROR_SUCCESS) { /* FEATURE_BEHAVIORS already existed, so don't delete it when we're done. */ delete_feature_key = FALSE; - else { + }else { res = RegCreateKeyA(feature_control, szFeatureBehaviorsKey, &feature); ok(res == ERROR_SUCCESS, "RegCreateKey failed: %d\n", res); } @@ -1796,8 +1793,6 @@ static void test_internet_features_registry(void) { ok(hres == S_OK, "CoInternetSetFeatureEnabled failed: %08x\n", hres); RegCloseKey(feature_control); - if(delete_feature_control_key) - RegDeleteKeyA(HKEY_CURRENT_USER, szFeatureControlKey); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, szFeatureControlKey, &feature_control); ok(res == ERROR_SUCCESS, "RegOpenKey failed: %d\n", res); @@ -1891,11 +1886,40 @@ static void test_CoInternetSetFeatureEnabled(void) { } static void test_internet_features(void) { + HKEY key; + DWORD res; + if(!pCoInternetIsFeatureEnabled || !pCoInternetSetFeatureEnabled) { win_skip("Skipping internet feature tests, IE is too old\n"); return; } + /* IE10 takes FeatureControl key into account only if it's available upon process start. */ + res = RegOpenKeyA(HKEY_CURRENT_USER, szFeatureControlKey, &key); + if(res != ERROR_SUCCESS) { + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + char cmdline[MAX_PATH]; + char **argv; + BOOL ret; + + res = RegCreateKeyA(HKEY_CURRENT_USER, szFeatureControlKey, &key); + ok(res == ERROR_SUCCESS, "RegCreateKey failed: %d\n", res); + + trace("Running features tests in a separated process.\n"); + + winetest_get_mainargs( &argv ); + sprintf(cmdline, "\"%s\" %s internet_features", argv[0], argv[1]); + ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + winetest_wait_child_process( pi.hProcess ); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + RegDeleteKeyA(HKEY_CURRENT_USER, szFeatureControlKey); + return; + } + test_internet_features_registry(); test_CoInternetIsFeatureEnabled(); test_CoInternetSetFeatureEnabled(); @@ -1904,6 +1928,10 @@ static void test_internet_features(void) { START_TEST(misc) { HMODULE hurlmon; + int argc; + char **argv; + + argc = winetest_get_mainargs(&argv); hurlmon = GetModuleHandleA("urlmon.dll"); pCoInternetCompareUrl = (void *) GetProcAddress(hurlmon, "CoInternetCompareUrl"); @@ -1930,23 +1958,26 @@ START_TEST(misc) OleInitialize(NULL); - register_protocols(); - - test_CreateFormatEnum(); - test_RegisterFormatEnumerator(); - test_CoInternetParseUrl(); - test_CoInternetCompareUrl(); - test_CoInternetQueryInfo(); - test_FindMimeFromData(); - test_NameSpace(); - test_MimeFilter(); - test_ReleaseBindInfo(); - test_CopyStgMedium(); - test_CopyBindInfo(); - test_UrlMkGetSessionOption(); - test_user_agent(); - test_MkParseDisplayNameEx(); - test_IsValidURL(); + if(argc <= 2 || strcmp(argv[2], "internet_features")) { + register_protocols(); + + test_CreateFormatEnum(); + test_RegisterFormatEnumerator(); + test_CoInternetParseUrl(); + test_CoInternetCompareUrl(); + test_CoInternetQueryInfo(); + test_FindMimeFromData(); + test_NameSpace(); + test_MimeFilter(); + test_ReleaseBindInfo(); + test_CopyStgMedium(); + test_CopyBindInfo(); + test_UrlMkGetSessionOption(); + test_user_agent(); + test_MkParseDisplayNameEx(); + test_IsValidURL(); + } + test_internet_features(); OleUninitialize();

1 0

Jacek Caban : urlmon: Simplify get_feature_from_process.
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: c356d450fbf05f76c320f9977cef8829ab5d1c24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c356d450fbf05f76c320f9977… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 15 13:34:08 2013 +0100 urlmon: Simplify get_feature_from_process. --- dlls/urlmon/internet.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index d4a49b5..e5d41b6 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -637,22 +637,17 @@ static HRESULT load_process_feature(INTERNETFEATURELIST feature) static HRESULT get_feature_from_process(INTERNETFEATURELIST feature) { - HRESULT hres; + HRESULT hres = S_OK; EnterCriticalSection(&process_features_cs); /* Try loading the feature from the registry, if it hasn't already * been done. */ - if(process_feature_controls[feature].check_registry) { + if(process_feature_controls[feature].check_registry) hres = load_process_feature(feature); - if(FAILED(hres)) { - LeaveCriticalSection(&process_features_cs); - return hres; - } - } - - hres = process_feature_controls[feature].enabled ? S_OK : S_FALSE; + if(SUCCEEDED(hres)) + hres = process_feature_controls[feature].enabled ? S_OK : S_FALSE; LeaveCriticalSection(&process_features_cs);

1 0

Jacek Caban : urlmon.idl: Added missing BINDSTATUS values.
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: afb59c23e75bb7cbec93803201986200ca8e4c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afb59c23e75bb7cbec9380320… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 15 14:24:58 2013 +0100 urlmon.idl: Added missing BINDSTATUS values. --- include/urlmon.idl | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 7407c18..94d444a 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -258,7 +258,23 @@ interface IBindStatusCallback : IUnknown BINDSTATUS_CONTENTDISPOSITIONFILENAME, BINDSTATUS_MIMETEXTPLAINMISMATCH, BINDSTATUS_PUBLISHERAVAILABLE, - BINDSTATUS_DISPLAYNAMEAVAILABLE + BINDSTATUS_DISPLAYNAMEAVAILABLE, + BINDSTATUS_SSLUX_NAVBLOCKED, + BINDSTATUS_SERVER_MIMETYPEAVAILABLE, + BINDSTATUS_SNIFFED_CLASSIDAVAILABLE, + BINDSTATUS_64BIT_PROGRESS, + BINDSTATUS_LAST = BINDSTATUS_64BIT_PROGRESS, + BINDSTATUS_RESERVED_0 = (BINDSTATUS_LAST+1), + BINDSTATUS_RESERVED_1 = (BINDSTATUS_RESERVED_0+1), + BINDSTATUS_RESERVED_2 = (BINDSTATUS_RESERVED_1+1), + BINDSTATUS_RESERVED_3 = (BINDSTATUS_RESERVED_2+1), + BINDSTATUS_RESERVED_4 = (BINDSTATUS_RESERVED_3+1), + BINDSTATUS_RESERVED_5 = (BINDSTATUS_RESERVED_4+1), + BINDSTATUS_RESERVED_6 = (BINDSTATUS_RESERVED_5+1), + BINDSTATUS_RESERVED_7 = (BINDSTATUS_RESERVED_6+1), + BINDSTATUS_RESERVED_8 = (BINDSTATUS_RESERVED_7+1), + BINDSTATUS_RESERVED_9 = (BINDSTATUS_RESERVED_8+1), + BINDSTATUS_LAST_PRIVATE = BINDSTATUS_RESERVED_9 } BINDSTATUS;

1 0

Jacek Caban : urlmon: Fixed protocol tests on IE10.
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: 1e83ca4dcdd0527c60f014fd0c9444c0a99cb9a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e83ca4dcdd0527c60f014fd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 15 14:25:12 2013 +0100 urlmon: Fixed protocol tests on IE10. --- dlls/urlmon/protocol.c | 1 + dlls/urlmon/tests/protocol.c | 25 ++++++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 2682465..42ee8ed 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -516,6 +516,7 @@ HRESULT protocol_abort(Protocol *protocol, HRESULT reason) if(!protocol->protocol_sink) return S_OK; + /* NOTE: IE10 returns S_OK here */ if(protocol->flags & FLAG_RESULT_REPORTED) return INET_E_RESULT_DISPATCHED; diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 4728f3c..d4e9663 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -415,6 +415,18 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG return IHttpSecurity_QueryInterface(&http_security, riid, ppv); } + if(IsEqualGUID(&IID_IGetBindHandle, guidService)) { + trace("QueryService(IID_IGetBindHandle)\n"); + *ppv = NULL; + return E_NOINTERFACE; + } + + if(IsEqualGUID(&IID_IWindowForBindingUI, guidService)) { + trace("QueryService(IID_IWindowForBindingUI)\n"); + *ppv = NULL; + return E_NOINTERFACE; + } + ok(0, "unexpected service %s\n", debugstr_guid(guidService)); return E_FAIL; } @@ -872,8 +884,11 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, CHECK_EXPECT(ReportProgress_DECODING); ok(!lstrcmpW(szStatusText, pjpegW), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); break; + case BINDSTATUS_RESERVED_7: + trace("BINDSTATUS_RESERVED_7\n"); + break; default: - ok(0, "Unexpected status %d\n", ulStatusCode); + ok(0, "Unexpected status %d (%d)\n", ulStatusCode, ulStatusCode-BINDSTATUS_LAST); }; return S_OK; @@ -1232,6 +1247,7 @@ static IInternetProtocolSink mime_protocol_sink = { &mime_protocol_sink_vtbl }; static HRESULT QueryInterface(REFIID riid, void **ppv) { static const IID IID_undocumented = {0x58DFC7D0,0x5381,0x43E5,{0x9D,0x72,0x4C,0xDD,0xE4,0xCB,0x0F,0x1A}}; + static const IID IID_undocumentedIE10 = {0xc28722e5,0xbc1a,0x4c55,{0xa6,0x8d,0x33,0x21,0x9f,0x69,0x89,0x10}}; *ppv = NULL; @@ -1245,6 +1261,9 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) /* NOTE: IE8 queries for undocumented {58DFC7D0-5381-43E5-9D72-4CDDE4CB0F1A} interface. */ if(IsEqualGUID(&IID_undocumented, riid)) return E_NOINTERFACE; + /* NOTE: IE10 queries for undocumented {c28722e5-bc1a-4c55-a68d-33219f698910} interface. */ + if(IsEqualGUID(&IID_undocumentedIE10, riid)) + return E_NOINTERFACE; if(*ppv) return S_OK; @@ -3070,7 +3089,7 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym CHECK_CALLED(ReportResult); hres = IInternetProtocol_Abort(async_protocol, E_ABORT, 0); - ok(hres == INET_E_RESULT_DISPATCHED, "Abort failed: %08x\n", hres); + ok(hres == INET_E_RESULT_DISPATCHED || hres == S_OK /* IE10 */, "Abort failed: %08x\n", hres); break; } }else { @@ -3093,7 +3112,7 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym CLEAR_CALLED(ReportProgress_COOKIE_SENT); hres = IInternetProtocol_Abort(async_protocol, E_ABORT, 0); - ok(hres == INET_E_RESULT_DISPATCHED, "Abort failed: %08x\n", hres); + ok(hres == INET_E_RESULT_DISPATCHED || hres == S_OK /* IE10 */, "Abort failed: %08x\n", hres); test_protocol_terminate(async_protocol);

1 0

Jacek Caban : urlmon: Fixed url tests on IE10.
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: 3a9666f19acd5a46be8ccd7366eda9f43fccca48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9666f19acd5a46be8ccd736… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 15 15:45:51 2013 +0100 urlmon: Fixed url tests on IE10. --- dlls/urlmon/tests/url.c | 77 +++++++++++++++++++++++++--------------------- 1 files changed, 42 insertions(+), 35 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 7bfa75f..8fae051 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -188,6 +188,7 @@ static BOOL invalid_cn_accepted = FALSE; static BOOL abort_start = FALSE; static BOOL abort_progress = FALSE; static BOOL async_switch = FALSE; +static BOOL strict_bsc_qi; static const char *test_file; static WCHAR file_url[INTERNET_MAX_URL_LENGTH], current_url[INTERNET_MAX_URL_LENGTH]; @@ -375,6 +376,8 @@ static IInternetPriority InternetPriority = { &InternetPriorityVtbl }; static HRESULT WINAPI Protocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) { + static const IID IID_undocumentedIE10 = {0x7daf9908,0x8415,0x4005,{0x95,0xae,0xbd,0x27,0xf6,0xe3,0xdc,0x00}}; + *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocol, riid)) { @@ -393,6 +396,11 @@ static HRESULT WINAPI Protocol_QueryInterface(IInternetProtocol *iface, REFIID r if(IsEqualGUID(&IID_IInternetProtocolEx, riid)) return E_NOINTERFACE; /* TODO */ + if(IsEqualGUID(&IID_undocumentedIE10, riid)) { + trace("QI(%s)\n", debugstr_guid(riid)); + return E_NOINTERFACE; /* TODO */ + } + ok(0, "unexpected call %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -628,7 +636,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, if(filedwl_api || !is_urlmon_protocol(test_protocol) || tymed != TYMED_ISTREAM || !(bindf&BINDF_ASYNCSTORAGE) || !(bindf&BINDF_PULLDATA)) ok(bind_info & BINDF_NEEDFILE, "BINDF_NEEDFILE is not set\n"); - else + else if(test_protocol != MK_TEST) /* IE10 sets BINDF_NEEDFILE for mk: protocol */ ok(!(bind_info & BINDF_NEEDFILE), "BINDF_NEEDFILE is set\n"); bind_info &= ~(BINDF_NEEDFILE|BINDF_FROMURLMON); @@ -1434,6 +1442,12 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, return S_OK; } + if(IsEqualGUID(&IID_IGetBindHandle, guidService)) { + trace("QueryService(IID_IGetBindHandle)\n"); + *ppv = NULL; + return E_NOINTERFACE; + } + ok(0, "unexpected service %s\n", debugstr_guid(guidService)); return E_NOINTERFACE; } @@ -1497,6 +1511,8 @@ static void test_WinInetHttpInfo(IWinInetHttpInfo *http_info, DWORD progress) static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallbackEx *iface, REFIID riid, void **ppv) { + static const IID IID_undocumentedIE10 = {0xf286fa56,0xc1fd,0x4270,{0x8e,0x67,0xb3,0xeb,0x79,0x0a,0x81,0xe8}}; + ok(GetCurrentThreadId() == thread_id, "wrong thread %d\n", GetCurrentThreadId()); if(IsEqualGUID(&IID_IInternetProtocol, riid)) { @@ -1507,66 +1523,53 @@ static HRESULT WINAPI statusclb_QueryInterface(IBindStatusCallbackEx *iface, REF }else { return E_NOINTERFACE; } - } - else if (IsEqualGUID(&IID_IServiceProvider, riid)) - { + }else if (IsEqualGUID(&IID_IServiceProvider, riid)) { CHECK_EXPECT2(QueryInterface_IServiceProvider); *ppv = &ServiceProvider; return S_OK; - } - else if (IsEqualGUID(&IID_IHttpNegotiate, riid)) - { + }else if (IsEqualGUID(&IID_IHttpNegotiate, riid)) { CHECK_EXPECT2(QueryInterface_IHttpNegotiate); *ppv = &HttpNegotiate; return S_OK; - } - else if (IsEqualGUID(&IID_IHttpNegotiate2, riid)) - { + }else if (IsEqualGUID(&IID_IHttpNegotiate2, riid)) { CHECK_EXPECT(QueryInterface_IHttpNegotiate2); *ppv = &HttpNegotiate; return S_OK; - } - else if (IsEqualGUID(&IID_IAuthenticate, riid)) - { + }else if (IsEqualGUID(&IID_IAuthenticate, riid)) { CHECK_EXPECT(QueryInterface_IAuthenticate); return E_NOINTERFACE; - } - else if(IsEqualGUID(&IID_IBindStatusCallback, riid)) - { - CHECK_EXPECT2(QueryInterface_IBindStatusCallback); + }else if(IsEqualGUID(&IID_IBindStatusCallback, riid)) { + if(strict_bsc_qi) + CHECK_EXPECT2(QueryInterface_IBindStatusCallback); *ppv = iface; return S_OK; - } - else if(IsEqualGUID(&IID_IBindStatusCallbackHolder, riid)) - { + }else if(IsEqualGUID(&IID_IBindStatusCallbackHolder, riid)) { CHECK_EXPECT2(QueryInterface_IBindStatusCallbackHolder); return E_NOINTERFACE; - } - else if(IsEqualGUID(&IID_IBindStatusCallbackEx, riid)) - { + }else if(IsEqualGUID(&IID_IBindStatusCallbackEx, riid)) { CHECK_EXPECT(QueryInterface_IBindStatusCallbackEx); if(!use_bscex) return E_NOINTERFACE; *ppv = iface; return S_OK; - } - else if(IsEqualGUID(&IID_IInternetBindInfo, riid)) - { + }else if(IsEqualGUID(&IID_IInternetBindInfo, riid)) { /* TODO */ CHECK_EXPECT2(QueryInterface_IInternetBindInfo); - } - else if(IsEqualGUID(&IID_IWindowForBindingUI, riid)) - { + }else if(IsEqualGUID(&IID_IWindowForBindingUI, riid)) { CHECK_EXPECT2(QueryInterface_IWindowForBindingUI); return E_NOINTERFACE; - } - else if(IsEqualGUID(&IID_IHttpSecurity, riid)) - { + }else if(IsEqualGUID(&IID_IHttpSecurity, riid)) { CHECK_EXPECT2(QueryInterface_IHttpSecurity); return E_NOINTERFACE; - } - else - { + }else if(IsEqualGUID(&IID_IGetBindHandle, riid)) { + trace("QI(IID_IGetBindHandle)\n"); + *ppv = NULL; + return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_undocumentedIE10, riid)) { + trace("QI(IID_undocumentedIE10)\n"); + *ppv = NULL; + return E_NOINTERFACE; + }else { ok(0, "unexpected interface %s\n", debugstr_guid(riid)); } @@ -2703,6 +2706,8 @@ static BOOL test_RegisterBindStatusCallback(void) IUnknown *unk; HRESULT hres; + strict_bsc_qi = TRUE; + hres = CreateBindCtx(0, &bindctx); ok(hres == S_OK, "BindCtx failed: %08x\n", hres); @@ -2789,6 +2794,8 @@ static BOOL test_RegisterBindStatusCallback(void) IBindStatusCallback_Release(prev_clb); IBindCtx_Release(bindctx); + + strict_bsc_qi = FALSE; return ret; }

1 0

Jacek Caban : mshtml: Fixed activex tests on IE10.
by Alexandre Julliard 15 Nov '13

15 Nov '13

Module: wine Branch: master Commit: c20167dbdc99976f54921286da345994e89a68a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c20167dbdc99976f54921286d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 15 17:14:33 2013 +0100 mshtml: Fixed activex tests on IE10. --- dlls/mshtml/tests/activex.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 16dfba5..147c9a7 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -1343,7 +1343,7 @@ static HRESULT WINAPI OleInPlaceObject_UIDeactivate(IOleInPlaceObjectWindowless static HRESULT WINAPI OleInPlaceObject_SetObjectRects(IOleInPlaceObjectWindowless *iface, LPCRECT lprcPosRect, LPCRECT lprcClipRect) { - CHECK_EXPECT(SetObjectRects); + CHECK_EXPECT2(SetObjectRects); return S_OK; } @@ -1675,7 +1675,7 @@ static void test_object_elem(IHTMLDocument2 *doc) hres = IHTMLObjectElement_put_width(objelem, v); ok(hres == S_OK, "put_width failed: %08x\n", hres); CHECK_CALLED(OnAmbientPropertyChange_UNKNOWN); - CHECK_CALLED(Invoke_ENABLED); + CLEAR_CALLED(Invoke_ENABLED); /* Not called on IE10 */ hres = IHTMLObjectElement_get_width(objelem, &v); ok(hres == S_OK, "get_width failed: %08x\n", hres); @@ -1690,7 +1690,7 @@ static void test_object_elem(IHTMLDocument2 *doc) hres = IHTMLObjectElement_put_height(objelem, v); ok(hres == S_OK, "put_height failed: %08x\n", hres); CHECK_CALLED(OnAmbientPropertyChange_UNKNOWN); - CHECK_CALLED(Invoke_ENABLED); + CLEAR_CALLED(Invoke_ENABLED); /* Not called on IE10 */ hres = IHTMLObjectElement_get_height(objelem, &v); ok(hres == S_OK, "get_height failed: %08x\n", hres); @@ -1757,7 +1757,7 @@ static void test_ui_activate(void) SET_EXPECT(Invoke_ENABLED); hres = IOleInPlaceSite_OnUIActivate(ip_site); ok(hres == S_OK, "OnUIActivate failed: %08x\n", hres); - CHECK_CALLED(Invoke_ENABLED); + CLEAR_CALLED(Invoke_ENABLED); /* Not called on IE10 */ IOleInPlaceSite_Release(ip_site); } @@ -2448,8 +2448,7 @@ static void test_flash_ax(void) SET_EXPECT(SetClientSite_NULL); release_doc(doc); CHECK_CALLED(UIDeactivate); - todo_wine - CHECK_CALLED(Invoke_ENABLED); + CLEAR_CALLED(Invoke_ENABLED); /* Not called on IE10 */ todo_wine CHECK_CALLED(Invoke_VALID); CHECK_CALLED(InPlaceDeactivate);

1 0

Dmitry Timoshkov : gdiplus/tests: Convert expect_float() to macro to make failure messages print correct line numbers.
by Alexandre Julliard 14 Nov '13

14 Nov '13

Module: wine Branch: master Commit: c11476aeb8c52dee20edbed9ff762360f80d122b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c11476aeb8c52dee20edbed9f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 14 13:08:37 2013 +0900 gdiplus/tests: Convert expect_float() to macro to make failure messages print correct line numbers. --- dlls/gdiplus/tests/region.c | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 2b4f148..2b8cf76 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -38,13 +38,8 @@ #define expectf(expected, got) expectf_((expected), (got), 0.0001) #define expect_magic(value) ok(*(value) == RGNDATA_MAGIC || *(value) == RGNDATA_MAGIC2, "Expected a known magic value, got %8x\n", *(value)) -#define expect_dword(value, expected) expect(expected, *(value)) - -static inline void expect_float(DWORD *value, FLOAT expected) -{ - FLOAT valuef = *(FLOAT*)value; - expectf(expected, valuef); -} +#define expect_dword(value, expected) expect((expected), *(value)) +#define expect_float(value, expected) expectf((expected), *(FLOAT *)(value)) /* We get shorts back, not INTs like a GpPoint */ typedef struct RegionDataPoint @@ -533,20 +528,20 @@ static void test_getregiondata(void) expect_dword(buf + 3, 2); expect_dword(buf + 4, CombineModeUnion); expect_dword(buf + 5, RGNDATA_RECT); - expect_float(buf + 6, 20); - expect_float(buf + 7, 25); - expect_float(buf + 8, 60); - expect_float(buf + 9, 120); + expect_float(buf + 6, 20.0); + expect_float(buf + 7, 25.0); + expect_float(buf + 8, 60.0); + expect_float(buf + 9, 120.0); expect_dword(buf + 10, RGNDATA_PATH); expect_dword(buf + 11, 68); expect_magic(buf + 12); expect_dword(buf + 13, 6); - expect_float(buf + 14, 0x0); + expect_float(buf + 14, 0.0); - expect_float(buf + 15, 50); + expect_float(buf + 15, 50.0); expect_float(buf + 16, 70.2); - expect_float(buf + 17, 60); + expect_float(buf + 17, 60.0); expect_float(buf + 18, 102.8); expect_float(buf + 19, 55.4); expect_float(buf + 20, 122.4); @@ -554,7 +549,7 @@ static void test_getregiondata(void) expect_float(buf + 22, 60.2); expect_float(buf + 23, 45.6); expect_float(buf + 24, 20.2); - expect_float(buf + 25, 50); + expect_float(buf + 25, 50.0); expect_float(buf + 26, 70.2); expect_dword(buf + 27, 0x01010100); ok(*(buf + 28) == 0x00000101 || *(buf + 28) == 0x43050101 /* Win 7 */,

1 0

Dmitry Timoshkov : gdiplus/tests: Reset the buffer contents before each GdipGetRegionData test and check the tail of the returned data .
by Alexandre Julliard 14 Nov '13

14 Nov '13

Module: wine Branch: master Commit: 4b256191a010d6b74b0d1c7ae90ecbfd0215b899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b256191a010d6b74b0d1c7ae… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 14 13:08:49 2013 +0900 gdiplus/tests: Reset the buffer contents before each GdipGetRegionData test and check the tail of the returned data. --- dlls/gdiplus/tests/region.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 2b8cf76..e690b6a 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -142,12 +142,15 @@ static void test_getregiondata(void) expect_magic(buf + 2); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_INFINITE_RECT); + expect_dword(buf + 6, 0xeeeeeeee); status = GdipSetEmpty(region); ok(status == Ok, "status %08x\n", status); status = GdipGetRegionDataSize(region, &needed); ok(status == Ok, "status %08x\n", status); expect(20, needed); + memset(buf, 0xee, sizeof(buf)); + needed = 0; status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); ok(status == Ok, "status %08x\n", status); expect(20, needed); @@ -156,12 +159,15 @@ static void test_getregiondata(void) expect_magic(buf + 2); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_EMPTY_RECT); + expect_dword(buf + 6, 0xeeeeeeee); status = GdipSetInfinite(region); ok(status == Ok, "status %08x\n", status); status = GdipGetRegionDataSize(region, &needed); ok(status == Ok, "status %08x\n", status); expect(20, needed); + memset(buf, 0xee, sizeof(buf)); + needed = 0; status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); ok(status == Ok, "status %08x\n", status); expect(20, needed); @@ -170,6 +176,7 @@ static void test_getregiondata(void) expect_magic(buf + 2); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_INFINITE_RECT); + expect_dword(buf + 6, 0xeeeeeeee); status = GdipDeleteRegion(region); ok(status == Ok, "status %08x\n", status); @@ -183,6 +190,8 @@ static void test_getregiondata(void) status = GdipGetRegionDataSize(region, &needed); ok(status == Ok, "status %08x\n", status); expect(36, needed); + memset(buf, 0xee, sizeof(buf)); + needed = 0; status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); ok(status == Ok, "status %08x\n", status); expect(36, needed); @@ -195,6 +204,7 @@ static void test_getregiondata(void) expect_float(buf + 6, 20.0); expect_float(buf + 7, 100.0); expect_float(buf + 8, 200.0); + expect_dword(buf + 10, 0xeeeeeeee); rect.X = 50; rect.Y = 30; @@ -235,6 +245,8 @@ static void test_getregiondata(void) status = GdipGetRegionDataSize(region, &needed); ok(status == Ok, "status %08x\n", status); expect(156, needed); + memset(buf, 0xee, sizeof(buf)); + needed = 0; status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); ok(status == Ok, "status %08x\n", status); expect(156, needed); @@ -277,6 +289,7 @@ static void test_getregiondata(void) expect_float(buf + 36, 500.0); expect_float(buf + 37, 22.0); expect_float(buf + 38, 55.0); + expect_dword(buf + 39, 0xeeeeeeee); status = GdipDeleteRegion(region2); ok(status == Ok, "status %08x\n", status); @@ -294,6 +307,8 @@ static void test_getregiondata(void) status = GdipGetRegionDataSize(region, &needed); ok(status == Ok, "status %08x\n", status); expect(72, needed); + memset(buf, 0xee, sizeof(buf)); + needed = 0; status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); ok(status == Ok, "status %08x\n", status); expect(72, needed); @@ -315,6 +330,7 @@ static void test_getregiondata(void) expect_float(buf + 15, 12.5); expect_float(buf + 16, 28.0); expect_dword(buf + 17, 0x81010100); + expect_dword(buf + 18, 0xeeeeeeee); rect.X = 50; rect.Y = 30; @@ -325,6 +341,8 @@ static void test_getregiondata(void) status = GdipGetRegionDataSize(region, &needed); ok(status == Ok, "status %08x\n", status); expect(96, needed); + memset(buf, 0xee, sizeof(buf)); + needed = 0; status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); ok(status == Ok, "status %08x\n", status); expect(96, needed); @@ -352,6 +370,7 @@ static void test_getregiondata(void) expect_float(buf + 21, 30.0); expect_float(buf + 22, 10.0); expect_float(buf + 23, 20.0); + expect_dword(buf + 24, 0xeeeeeeee); status = GdipDeleteRegion(region); ok(status == Ok, "status %08x\n", status); @@ -366,6 +385,8 @@ static void test_getregiondata(void) status = GdipGetRegionDataSize(region, &needed); expect(Ok, status); expect(36, needed); + memset(buf, 0xee, sizeof(buf)); + needed = 0; status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); expect(Ok, status); expect(36, needed); @@ -381,6 +402,7 @@ static void test_getregiondata(void) /* flags 0 means that a path is an array of FLOATs */ ok(*(buf + 8) == 0x4000 /* before win7 */ || *(buf + 8) == 0, "expected 0x4000 or 0, got %08x\n", *(buf + 8)); + expect_dword(buf + 10, 0xeeeeeeee); /* Transform an empty region */ status = GdipCreateMatrix(&matrix); @@ -404,6 +426,8 @@ static void test_getregiondata(void) status = GdipGetRegionDataSize(region, &needed); expect(Ok, status); expect(56, needed); + memset(buf, 0xee, sizeof(buf)); + needed = 0; status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); expect(Ok, status); expect(56, needed); @@ -428,10 +452,11 @@ static void test_getregiondata(void) expect(5, point[3].X); /* buf + 12 */ expect(6, point[3].Y); expect_dword(buf + 13, 0x81010100); /* 0x01010100 if we don't close the path */ + expect_dword(buf + 14, 0xeeeeeeee); status = GdipTranslateRegion(region, 0.6, 0.8); expect(Ok, status); - memset(buf, 0, sizeof(buf)); + memset(buf, 0xee, sizeof(buf)); needed = 0; status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); expect(Ok, status); @@ -454,6 +479,7 @@ static void test_getregiondata(void) expect_float(buf + 15, 5.6); expect_float(buf + 16, 6.8); expect_dword(buf + 17, 0x81010100); /* 0x01010100 if we don't close the path */ + expect_dword(buf + 18, 0xeeeeeeee); status = GdipDeletePath(path); expect(Ok, status); @@ -472,6 +498,8 @@ static void test_getregiondata(void) status = GdipGetRegionDataSize(region, &needed); expect(Ok, status); expect(72, needed); + memset(buf, 0xee, sizeof(buf)); + needed = 0; status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); expect(Ok, status); expect(72, needed); @@ -480,7 +508,6 @@ static void test_getregiondata(void) expect_magic(buf + 2); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_PATH); - expect_dword(buf + 5, 48); expect_magic(buf + 6); expect_dword(buf + 7, 4); @@ -493,6 +520,8 @@ static void test_getregiondata(void) expect_float(buf + 14, 1.6); expect_float(buf + 15, 5.6); expect_float(buf + 16, 6.2); + expect_dword(buf + 17, 0x01010100); + expect_dword(buf + 18, 0xeeeeeeee); status = GdipDeletePath(path); expect(Ok, status); @@ -519,6 +548,8 @@ static void test_getregiondata(void) status = GdipGetRegionDataSize(region, &needed); expect(Ok, status); expect(116, needed); + memset(buf, 0xee, sizeof(buf)); + needed = 0; status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); expect(Ok, status); expect(116, needed); @@ -533,12 +564,10 @@ static void test_getregiondata(void) expect_float(buf + 8, 60.0); expect_float(buf + 9, 120.0); expect_dword(buf + 10, RGNDATA_PATH); - expect_dword(buf + 11, 68); expect_magic(buf + 12); expect_dword(buf + 13, 6); expect_float(buf + 14, 0.0); - expect_float(buf + 15, 50.0); expect_float(buf + 16, 70.2); expect_float(buf + 17, 60.0); @@ -554,6 +583,7 @@ static void test_getregiondata(void) expect_dword(buf + 27, 0x01010100); ok(*(buf + 28) == 0x00000101 || *(buf + 28) == 0x43050101 /* Win 7 */, "expected 00000101 or 43050101 got %08x\n", *(buf + 28)); + expect_dword(buf + 29, 0xeeeeeeee); status = GdipDeletePath(path); expect(Ok, status); @@ -596,6 +626,7 @@ static void test_getregiondata(void) expect(-1969, point[3].X); /* buf + 12 */ expect(23, point[3].Y); expect_dword(buf + 13, 0x81010100); /* 0x01010100 if we don't close the path */ + expect_dword(buf + 14, 0xeeeeeeee); status = GdipDeletePath(path); expect(Ok, status); @@ -637,6 +668,7 @@ static void test_getregiondata(void) expect_float(buf + 15, -196900.0); expect_float(buf + 16, 2300.0); expect_dword(buf + 17, 0x81010100); /* 0x01010100 if we don't close the path */ + expect_dword(buf + 18, 0xeeeeeeee); status = GdipDeletePath(path); expect(Ok, status);

1 0

Dmitry Timoshkov : gdiplus/tests: Add a test for bezier data returned by GdipGetRegionData.
by Alexandre Julliard 14 Nov '13

14 Nov '13

Module: wine Branch: master Commit: c9f8f41d185502c0785995e317b63d317e85a6f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f8f41d185502c0785995e31… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 14 13:08:58 2013 +0900 gdiplus/tests: Add a test for bezier data returned by GdipGetRegionData. --- dlls/gdiplus/tests/region.c | 67 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index e690b6a..66d950a 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -35,7 +35,7 @@ #define expect(expected, got) ok((got) == (expected), "Expected %.8x, got %.8x\n", (expected), (got)) #define expectf_(expected, got, precision) ok(fabs((expected) - (got)) < (precision), "Expected %f, got %f\n", (expected), (got)) -#define expectf(expected, got) expectf_((expected), (got), 0.0001) +#define expectf(expected, got) expectf_((expected), (got), 0.001) #define expect_magic(value) ok(*(value) == RGNDATA_MAGIC || *(value) == RGNDATA_MAGIC2, "Expected a known magic value, got %8x\n", *(value)) #define expect_dword(value, expected) expect((expected), *(value)) @@ -108,7 +108,7 @@ static void test_getregiondata(void) GpRegion *region, *region2; RegionDataPoint *point; UINT needed; - DWORD buf[100]; + DWORD buf[256]; GpRect rect; GpPath *path; GpMatrix *matrix; @@ -674,6 +674,69 @@ static void test_getregiondata(void) expect(Ok, status); status = GdipDeleteRegion(region); expect(Ok, status); + + /* Test beziers */ + GdipCreatePath(FillModeAlternate, &path); + /* Exactly 90 degrees */ + status = GdipAddPathArc(path, 100.0, 100.0, 500.0, 700.0, 0.0, 90.0); + expect(Ok, status); + /* Over 90 degrees */ + status = GdipAddPathArc(path, 100.0, 100.0, 500.0, 700.0, 0.0, 100.0); + expect(Ok, status); + status = GdipCreateRegionPath(path, &region); + ok(status == Ok, "status %08x\n", status); + needed = 0; + status = GdipGetRegionDataSize(region, &needed); + ok(status == Ok, "status %08x\n", status); + expect(136, needed); + memset(buf, 0xee, sizeof(buf)); + needed = 0; + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + ok(status == Ok, "status %08x\n", status); + expect(136, needed); + expect_dword(buf, 128); + trace("buf[1] = %08x\n", buf[1]); + expect_magic(buf + 2); + expect_dword(buf + 3, 0); + expect_dword(buf + 4, RGNDATA_PATH); + expect_dword(buf + 5, 112); + expect_magic(buf + 6); + expect_dword(buf + 7, 11); + /* flags 0 means that a path is an array of FLOATs */ + expect_dword(buf + 8, 0); + expect_float(buf + 9, 600.0); + expect_float(buf + 10, 450.0); + expect_float(buf + 11, 600.0); + expect_float(buf + 12, 643.299561); + expect_float(buf + 13, 488.071198); + expect_float(buf + 14, 800.0); + expect_float(buf + 15, 350.0); + expect_float(buf + 16, 800.0); + expect_float(buf + 17, 600.0); + expect_float(buf + 18, 450.0); + expect_float(buf + 19, 600.0); + expect_float(buf + 20, 643.299622); + expect_float(buf + 21, 488.071167); + expect_float(buf + 22, 800.0); + expect_float(buf + 23, 350.0); + expect_float(buf + 24, 800.0); + expect_float(buf + 25, 329.807129); + expect_float(buf + 26, 800.0); + expect_float(buf + 27, 309.688568); + expect_float(buf + 28, 796.574890); + expect_float(buf + 29, 290.084167); + expect_float(buf + 30, 789.799561); + expect_dword(buf + 31, 0x03030300); + expect_dword(buf + 32, 0x03030301); + ok(*(buf + 33) == 0x00030303 /* before win7 */ || + *(buf + 33) == 0x43030303 /* 32-bit win7 */ || *(buf + 33) == 0x4c030303 /* 64-bit win7 */, + "expected 0x00030303 or 0x43030303 or 0x4c030303 got %08x\n", *(buf + 33)); + expect_dword(buf + 34, 0xeeeeeeee); + + status = GdipDeletePath(path); + expect(Ok, status); + status = GdipDeleteRegion(region); + expect(Ok, status); } static void test_isinfinite(void)

1 0

Daniel Lehman : msvcp90: Return last index in string:: find_last_not_of_cstr_substr if input is empty.
by Alexandre Julliard 14 Nov '13

14 Nov '13

Module: wine Branch: master Commit: 90cb553e5eaec08187e325a5eb7ec8f3c393ac5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=90cb553e5eaec08187e325a5e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Sep 12 16:13:47 2012 -0700 msvcp90: Return last index in string::find_last_not_of_cstr_substr if input is empty. --- dlls/msvcp90/string.c | 4 +- dlls/msvcp90/tests/string.c | 59 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 23322fe..f412ddb 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1837,7 +1837,7 @@ MSVCP_size_t __thiscall MSVCP_basic_string_char_find_last_not_of_cstr_substr( TRACE("%p %p %lu %lu\n", this, find, off, len); - if(len>0 && this->size>0) { + if(this->size>0) { if(off >= this->size) off = this->size-1; @@ -3861,7 +3861,7 @@ MSVCP_size_t __thiscall MSVCP_basic_string_wchar_find_last_not_of_cstr_substr( TRACE("%p %p %lu %lu\n", this, find, off, len); - if(len>0 && this->size>0) { + if(this->size>0) { if(off >= this->size) off = this->size-1; diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 511d846..6cc06ce 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -78,6 +78,7 @@ static int (__thiscall *p_basic_string_char_compare_substr_cstr_len)(basic_strin static size_t (__thiscall *p_basic_string_char_find_cstr_substr)(basic_string_char*, const char*, size_t, size_t); static size_t (__thiscall *p_basic_string_char_rfind_cstr_substr)(basic_string_char*, const char*, size_t, size_t); static basic_string_char* (__thiscall *p_basic_string_char_replace_cstr)(basic_string_char*, size_t, size_t, const char*); +static size_t (__thiscall *p_basic_string_char_find_last_not_of_cstr_substr)(const basic_string_char*, const char*, size_t, size_t); static size_t *p_basic_string_char_npos; @@ -229,6 +230,8 @@ static BOOL init(void) "?rfind@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K1(a)Z"); SET(p_basic_string_char_replace_cstr, "?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0PEBD@Z"); + SET(p_basic_string_char_find_last_not_of_cstr_substr, + "?find_last_not_of@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K1(a)Z"); SET(p_basic_string_char_npos, "?npos@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@2_KB"); @@ -295,6 +298,8 @@ static BOOL init(void) "?rfind@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)Z"); SET(p_basic_string_char_replace_cstr, "?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)IIPBD@Z"); + SET(p_basic_string_char_find_last_not_of_cstr_substr, + "?find_last_not_of@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)Z"); SET(p_basic_string_char_npos, "?npos@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@2IB"); @@ -708,6 +713,59 @@ static void test_basic_string_wchar_swap(void) { call_func1(p_basic_string_wchar_dtor, &str2); } +static void test_basic_string_char_find_last_not_of(void) { + struct find_last_not_of_test { + const char *str; + const char *find; + size_t off; + size_t len; + size_t ret; + }; + + int i; + size_t ret; + basic_string_char str; + struct find_last_not_of_test tests[] = { + /* simple cases where find is not in string */ + { "AAAAA", "B", 0, 1, 0 }, + { "AAAAA", "B", 5, 1, 4 }, + { "AAAAA", "BCDE", 0, 4, 0 }, + { "AAAAA", "BCDE", 5, 4, 4 }, + + /* simple cases where find is in string */ + { "AAAAA", "A", 5, 1, -1 }, + { "AAAAB", "A", 5, 1, 4 }, + { "AAAAB", "A", 4, 1, 4 }, + { "AAAAB", "A", 3, 1, -1 }, + { "ABCDE", "ABCDE", 0, 5, -1 }, + { "ABCDE", "ABCDE", 5, 5, -1 }, + { "ABCDE", "AB DE", 5, 5, 2 }, + + /* cases where find appears in multiple spots */ + { "ABABA", "A", 0, 1, -1 }, + { "ABABA", "A", 1, 1, 1 }, + { "ABABA", "A", 2, 1, 1 }, + { "ABABA", "A", 3, 1, 3 }, + + /* using empty strings */ + { "", "", 0, 0, -1 }, + { "", "A", 0, 1, -1 }, + { "ABCDE", "", 0, 0, 0 }, + { "ABCDE", "", 3, 0, 3 }, + { "ABCDE", "", 5, 0, 4 }, + }; + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); + + ret = (size_t)call_func4(p_basic_string_char_find_last_not_of_cstr_substr, + &str, tests[i].find, tests[i].off, tests[i].len); + ok(ret == tests[i].ret, "ret = %li tests[%i].ret = %li\n", (long)ret, i, (long)tests[i].ret); + + call_func1(p_basic_string_char_dtor, &str); + } +} + START_TEST(string) { if(!init()) @@ -723,6 +781,7 @@ START_TEST(string) test_basic_string_char_replace(); test_basic_string_wchar(); test_basic_string_wchar_swap(); + test_basic_string_char_find_last_not_of(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); }

1 0