July 2014 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Fixed tests on IE11.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: 1e191e031c812f23901f4f08a2b14fc5a14b28ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e191e031c812f23901f4f08a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 22 12:57:56 2014 +0200 mshtml: Fixed tests on IE11. --- dlls/mshtml/tests/htmldoc.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 11015e7..84b8806 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -978,6 +978,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D case 3000029: case 3000030: case 3000031: + case 3000032: /* TODO */ return S_OK; } @@ -2855,6 +2856,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID test_readyState(NULL); return S_OK; case OLECMDID_UPDATETRAVELENTRY_DATARECOVERY: + case OLECMDID_PAGEAVAILABLE: case 6058: return E_FAIL; /* FIXME */ default: @@ -2864,7 +2866,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID } if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { - if(nCmdID != 63 && (!is_refresh || nCmdID != 37)) + if(nCmdID != 63 && nCmdID != 178 && (!is_refresh || nCmdID != 37)) test_readyState(NULL); ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); @@ -2976,9 +2978,11 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 83: case 102: + case 133: case 134: /* TODO */ case 135: case 136: /* TODO */ + case 137: case 139: /* TODO */ case 143: /* TODO */ case 144: /* TODO */ @@ -3293,13 +3297,15 @@ static HRESULT WINAPI TravelLog_QueryInterface(ITravelLog *iface, REFIID riid, v { static const IID IID_IIETravelLog2 = {0xb67cefd2,0xe3f1,0x478a,{0x9b,0xfa,0xd8,0x93,0x70,0x37,0x5e,0x94}}; static const IID IID_unk_travellog = {0x6afc8b7f,0xbc17,0x4a95,{0x90,0x2f,0x6f,0x5c,0xb5,0x54,0xc3,0xd8}}; + static const IID IID_unk_travellog2 = {0xf6d02767,0x9c80,0x428d,{0xb9,0x74,0x3f,0x17,0x29,0x45,0x3f,0xdb}}; if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITravelLog, riid)) { *ppv = iface; return S_OK; } - if(!IsEqualGUID(&IID_IIETravelLog2, riid) && !IsEqualGUID(&IID_unk_travellog, riid)) + if(!IsEqualGUID(&IID_IIETravelLog2, riid) && !IsEqualGUID(&IID_unk_travellog, riid) + && !IsEqualGUID(&IID_unk_travellog2, riid)) ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; @@ -3433,7 +3439,7 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2(IDocObjectService *i ok(!pDispatch, "pDispatch = %p\n", pDispatch); ok(!strcmp_wa(lpszUrl, nav_url), "lpszUrl = %s, expected %s\n", wine_dbgstr_w(lpszUrl), nav_url); - ok(dwFlags == 0x40 || !dwFlags || dwFlags == 0x50, "dwFlags = %x\n", dwFlags); + ok(dwFlags == 0x140 /* IE11*/ || dwFlags == 0x40 || !dwFlags || dwFlags == 0x50, "dwFlags = %x\n", dwFlags); ok(!lpszFrameName, "lpszFrameName = %s\n", wine_dbgstr_w(lpszFrameName)); if(!testing_submit) { ok(!pPostData, "pPostData = %p\n", pPostData); @@ -5294,7 +5300,7 @@ static void test_doscroll(IUnknown *unk) switch(load_state) { case LD_DOLOAD: case LD_NO: - if(!nav_url) + if(!nav_url && !editmode) ok(!elem, "elem != NULL\n"); default: break; @@ -5746,6 +5752,8 @@ static void test_download(DWORD flags) SET_EXPECT(NavigateWithBindCtx); SET_EXPECT(Exec_Explorer_38); /* todo_wine */ } + if(editmode || is_refresh) + SET_EXPECT(Exec_ShellDocView_138); expect_status_text = (LPWSTR)0xdeadbeef; /* TODO */ while(!*b && GetMessageW(&msg, NULL, 0, 0)) { @@ -5868,6 +5876,8 @@ static void test_download(DWORD flags) CHECK_CALLED(NavigateWithBindCtx); todo_wine CHECK_NOT_CALLED(Exec_Explorer_38); } + if(editmode || is_refresh) + CLEAR_CALLED(Exec_ShellDocView_138); /* IE11 */ if(!is_extern) load_state = LD_COMPLETE; @@ -5973,7 +5983,7 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *hre CHECK_CALLED(TranslateUrl); if(support_wbapp) { CHECK_CALLED(FireBeforeNavigate2); - CHECK_CALLED(Exec_ShellDocView_67); + CLEAR_CALLED(Exec_ShellDocView_67); /* Not called by IE11 */ if(!is_hash) { CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); @@ -6039,7 +6049,7 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *hre ok(hres == S_OK, "SuperNavigate failed: %08x\n", hres); CHECK_CALLED(TranslateUrl); - CHECK_CALLED(Exec_ShellDocView_67); + CLEAR_CALLED(Exec_ShellDocView_67); /* Not called by IE11 */ CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(Exec_ShellDocView_63); @@ -6110,8 +6120,8 @@ static void test_load_history(IHTMLDocument2 *doc) hres = IPersistHistory_LoadHistory(per_hist, history_stream, NULL); ok(hres == S_OK, "LoadHistory failed: %08x\n", hres); - CHECK_CALLED_BROKEN(Exec_ShellDocView_138); - CHECK_CALLED(Exec_ShellDocView_67); + CLEAR_CALLED(Exec_ShellDocView_138); /* Not called by IE11 */ + CLEAR_CALLED(Exec_ShellDocView_67); /* Not called by IE11 */ CHECK_CALLED(FireBeforeNavigate2); CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); @@ -7834,11 +7844,11 @@ static void test_submit(void) CHECK_CALLED(TranslateUrl); CHECK_CALLED(FireBeforeNavigate2); - CHECK_CALLED(Exec_ShellDocView_67); + CLEAR_CALLED(Exec_ShellDocView_67); /* Not called by IE11 */ CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(Exec_ShellDocView_63); - todo_wine CHECK_CALLED(Exec_ShellDocView_84); + CLEAR_CALLED(Exec_ShellDocView_84); /* Not called by IE11 */ CHECK_CALLED(CreateInstance); CHECK_CALLED(Start); CHECK_CALLED(Protocol_Read);

1 0

Jacek Caban : atl: Added AtlAxCreateControlLic(Ex) stubs.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: 062f92a99cd3ca3aa2c5cd73de018757fdb0e2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=062f92a99cd3ca3aa2c5cd73d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 22 13:23:00 2014 +0200 atl: Added AtlAxCreateControlLic(Ex) stubs. --- dlls/atl/atl_ax.c | 26 ++++++++++++++++++++++++++ dlls/atl100/atl100.spec | 4 ++-- dlls/atl110/atl110.spec | 4 ++-- dlls/atl80/atl80.spec | 4 ++-- dlls/atl90/atl90.spec | 4 ++-- 5 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index c77071d..5bafbf1 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1382,3 +1382,29 @@ INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_a(lpTemplateName), hWndParent, lpDialogProc, dwInitParam); return 0; } + +#if _ATL_VER >= _ATL_VER_80 + +/*********************************************************************** + * AtlAxCreateControlLic [atl100.59] + * + */ +HRESULT WINAPI AtlAxCreateControlLic(const WCHAR *lpTricsData, HWND hwnd, IStream *stream, IUnknown **container, BSTR lic) +{ + FIXME("(%s %p %p %p %s)\n", debugstr_w(lpTricsData), hwnd, stream, container, debugstr_w(lic)); + return E_NOTIMPL; +} + +/*********************************************************************** + * AtlAxCreateControlLicEx [atl100.60] + * + */ +HRESULT WINAPI AtlAxCreateControlLicEx(const WCHAR *lpTricsData, HWND hwnd, IStream *stream, + IUnknown **container, IUnknown **control, REFIID iidSink, IUnknown *punkSink, BSTR lic) +{ + FIXME("(%s %p %p %p %p %s %p %s)\n", debugstr_w(lpTricsData), hwnd, stream, container, control, + debugstr_guid(iidSink), punkSink, debugstr_w(lic)); + return E_NOTIMPL; +} + +#endif diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 0d41c1e..25fad3d 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -40,8 +40,8 @@ 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) -59 stub AtlAxCreateControlLic -60 stub AtlAxCreateControlLicEx +59 stdcall AtlAxCreateControlLic(wstr long ptr ptr wstr) +60 stdcall AtlAxCreateControlLicEx(wstr long ptr ptr ptr ptr ptr wstr) 61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA diff --git a/dlls/atl110/atl110.spec b/dlls/atl110/atl110.spec index 0d41c1e..25fad3d 100644 --- a/dlls/atl110/atl110.spec +++ b/dlls/atl110/atl110.spec @@ -40,8 +40,8 @@ 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) -59 stub AtlAxCreateControlLic -60 stub AtlAxCreateControlLicEx +59 stdcall AtlAxCreateControlLic(wstr long ptr ptr wstr) +60 stdcall AtlAxCreateControlLicEx(wstr long ptr ptr ptr ptr ptr wstr) 61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index fb5fae8..f313944 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -43,8 +43,8 @@ 55 stub AtlUnRegisterTypeLib 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) -59 stub AtlAxCreateControlLic -60 stub AtlAxCreateControlLicEx +59 stdcall AtlAxCreateControlLic(wstr long ptr ptr wstr) +60 stdcall AtlAxCreateControlLicEx(wstr long ptr ptr ptr ptr ptr wstr) 61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec index 0d41c1e..25fad3d 100644 --- a/dlls/atl90/atl90.spec +++ b/dlls/atl90/atl90.spec @@ -40,8 +40,8 @@ 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) -59 stub AtlAxCreateControlLic -60 stub AtlAxCreateControlLicEx +59 stdcall AtlAxCreateControlLic(wstr long ptr ptr wstr) +60 stdcall AtlAxCreateControlLicEx(wstr long ptr ptr ptr ptr ptr wstr) 61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA

1 0

David Hedberg : comdlg32: Populate psia_results before making any callbacks.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: 7311a9fc6e866116056c020281cdcd6dd98aaf98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7311a9fc6e866116056c02028… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Mon Jul 21 23:56:46 2014 +0200 comdlg32: Populate psia_results before making any callbacks. --- dlls/comdlg32/itemdlg.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 2313b0a..21cdf89 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -536,9 +536,6 @@ static HRESULT on_default_action(FileDialogImpl *This) break; case ONOPEN_OPEN: - if(events_OnFileOk(This) != S_OK) - break; - hr = SHGetDesktopFolder(&psf_desktop); if(SUCCEEDED(hr)) { @@ -547,10 +544,11 @@ static HRESULT on_default_action(FileDialogImpl *This) hr = SHCreateShellItemArray(NULL, psf_desktop, file_count, (PCUITEMID_CHILD_ARRAY)pidla, &This->psia_results); - if(SUCCEEDED(hr)) - ret = S_OK; IShellFolder_Release(psf_desktop); + + if(SUCCEEDED(hr) && events_OnFileOk(This) == S_OK) + ret = S_OK; } break;

1 0

Nikolay Sivov : wshom.ocx: Implement get_Item() for IWshEnvironment.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: ac65c3fb18d9c9be4aa43f373b4096bba991a0c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac65c3fb18d9c9be4aa43f373… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 22 18:26:10 2014 +0400 wshom.ocx: Implement get_Item() for IWshEnvironment. --- dlls/wshom.ocx/shell.c | 18 ++++++++++++++++-- dlls/wshom.ocx/tests/wshom.c | 42 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 09b3fa0..b7b819a 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -197,8 +197,22 @@ static HRESULT WINAPI WshEnvironment_Invoke(IWshEnvironment *iface, DISPID dispI static HRESULT WINAPI WshEnvironment_get_Item(IWshEnvironment *iface, BSTR name, BSTR *value) { WshEnvironment *This = impl_from_IWshEnvironment(iface); - FIXME("(%p)->(%s %p): stub\n", This, debugstr_w(name), value); - return E_NOTIMPL; + DWORD len; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), value); + + if (!value) + return E_POINTER; + + len = GetEnvironmentVariableW(name, NULL, 0); + *value = SysAllocStringLen(NULL, len); + if (!*value) + return E_OUTOFMEMORY; + + if (len) + GetEnvironmentVariableW(name, *value, len+1); + + return S_OK; } static HRESULT WINAPI WshEnvironment_put_Item(IWshEnvironment *iface, BSTR name, BSTR value) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 5f6e79d..4c3581e 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -36,6 +36,9 @@ static void test_wshshell(void) static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; static const WCHAR lnk1W[] = {'f','i','l','e','.','l','n','k',0}; static const WCHAR pathW[] = {'%','P','A','T','H','%',0}; + static const WCHAR sysW[] = {'S','Y','S','T','E','M',0}; + static const WCHAR path2W[] = {'P','A','T','H',0}; + IWshEnvironment *env; IWshShell3 *sh3; IDispatchEx *dispex; IWshCollection *coll; @@ -49,7 +52,7 @@ static void test_wshshell(void) DISPPARAMS dp; EXCEPINFO ei; VARIANT arg, res; - BSTR str; + BSTR str, ret; UINT err; hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -131,6 +134,43 @@ static void test_wshshell(void) ok(hr == E_POINTER, "got 0x%08x\n", hr); SysFreeString(str); + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = SysAllocString(sysW); + hr = IWshShell3_get_Environment(sh3, &arg, &env); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&arg); + + hr = IWshEnvironment_get_Item(env, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + ret = (BSTR)0x1; + hr = IWshEnvironment_get_Item(env, NULL, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ret && !*ret, "got %p\n", ret); + SysFreeString(ret); + + /* invalid var name */ + str = SysAllocString(lnk1W); + hr = IWshEnvironment_get_Item(env, str, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + ret = NULL; + hr = IWshEnvironment_get_Item(env, str, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ret && *ret == 0, "got %s\n", wine_dbgstr_w(ret)); + SysFreeString(ret); + SysFreeString(str); + + /* valid name */ + str = SysAllocString(path2W); + hr = IWshEnvironment_get_Item(env, str, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ret && *ret != 0, "got %s\n", wine_dbgstr_w(ret)); + SysFreeString(ret); + SysFreeString(str); + + IWshEnvironment_Release(env); + IWshCollection_Release(coll); IDispatch_Release(disp); IWshShell3_Release(sh3);

1 0

Alexandre Julliard : riched20/tests: Fix test on 64-bit.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: 35dd553038f69a46b553c16e193ea00e7529ed11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35dd553038f69a46b553c16e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 22 20:38:33 2014 +0200 riched20/tests: Fix test on 64-bit. --- dlls/riched20/tests/richole.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 98ac50d..571e5cd 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -418,10 +418,7 @@ static void test_ITextSelection_GetText(void) static const WCHAR bufW4[] = {'T', 'e', 's', 't', 'S', 'o', 'm', 'e', 'T', 'e', 'x', 't', '\r', 0}; static const WCHAR bufW5[] = {'\r', 0}; - SYSTEM_INFO sysinfo; - int is64bit; - GetSystemInfo(&sysinfo); - is64bit = (sysinfo.wProcessorArchitecture & PROCESSOR_ARCHITECTURE_AMD64); + BOOL is64bit = sizeof(void *) > sizeof(int); create_interfaces(&w, &reOle, &txtDoc, &txtSel); SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); @@ -446,9 +443,7 @@ static void test_ITextSelection_GetText(void) ok(hres == S_OK, "ITextSelection_GetText\n"); ok(!bstr, "got wrong text: %s\n", wine_dbgstr_w(bstr)); - if(is64bit) - win_skip("native 64bit riched20 can't support a NULL parameter\n"); - else + if (!is64bit) { hres = ITextSelection_GetText(txtSel, NULL); ok(hres == E_INVALIDARG, "ITextSelection_GetText\n");

1 0

Zhenbo Li : mshtml: Fixed get_target_window when no parent frame is found.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: fbc4d3f1602e6ae28ae92e497f2e01ccbb9cb224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc4d3f1602e6ae28ae92e497… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Jul 21 22:20:39 2014 +0800 mshtml: Fixed get_target_window when no parent frame is found. --- dlls/mshtml/htmlanchor.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index a9187a4..0de0585 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -98,8 +98,9 @@ HTMLOuterWindow *get_target_window(HTMLOuterWindow *window, nsAString *target_st if(!strcmpiW(target, _parentW)) { if(!window->parent) { - WARN("Window has no parent\n"); - return NULL; + WARN("Window has no parent, treat as self\n"); + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); + return window; } IHTMLWindow2_AddRef(&window->parent->base.IHTMLWindow2_iface);

1 0

Zhenbo Li : mshtml: Added IHTMLFormElement:: target property implementation.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: f8f8964afeb8058b4ccf52a243bddb625fa501af URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8f8964afeb8058b4ccf52a24… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Jul 21 22:51:11 2014 +0800 mshtml: Added IHTMLFormElement::target property implementation. --- dlls/mshtml/htmlform.c | 29 +++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 22 ++++++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 86af350..10b2df4 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -286,15 +286,36 @@ static HRESULT WINAPI HTMLFormElement_get_elements(IHTMLFormElement *iface, IDis static HRESULT WINAPI HTMLFormElement_put_target(IHTMLFormElement *iface, BSTR v) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - FIXME("(%p)->(%s)\n", This, wine_dbgstr_w(v)); - return E_NOTIMPL; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(v)); + + nsAString_InitDepend(&str, v); + + nsres = nsIDOMHTMLFormElement_SetTarget(This->nsform, &str); + + nsAString_Finish(&str); + if (NS_FAILED(nsres)) { + ERR("Set Target(%s) failed: %08x\n", wine_dbgstr_w(v), nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLFormElement_get_target(IHTMLFormElement *iface, BSTR *p) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&str, NULL); + nsres = nsIDOMHTMLFormElement_GetTarget(This->nsform, &str); + + return return_nsstr(nsres, &str, p); } static HRESULT WINAPI HTMLFormElement_put_name(IHTMLFormElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 487c25c..533d7b7 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3775,6 +3775,27 @@ static void _test_form_reset(unsigned line, IUnknown *unk) IHTMLFormElement_Release(form); } + +static void test_form_target(IUnknown *unk) +{ + IHTMLFormElement *form = get_form_iface(unk); + HRESULT hres; + BSTR str; + static const char target[] = "_blank"; + + str = a2bstr(target); + hres = IHTMLFormElement_put_target(form, str); + ok(hres == S_OK, "put_target(%s) failed: %08x\n", target, hres); + SysFreeString(str); + + hres = IHTMLFormElement_get_target(form, &str); + ok(hres == S_OK, "get_target failed: %08x\n", hres); + ok(!strcmp_wa(str, target), "Expected %s, got %s\n", target, wine_dbgstr_w(str)); + SysFreeString(str); + + IHTMLFormElement_Release(form); +} + #define test_meta_name(a,b) _test_meta_name(__LINE__,a,b) static void _test_meta_name(unsigned line, IUnknown *unk, const char *exname) { @@ -7342,6 +7363,7 @@ static void test_elems2(IHTMLDocument2 *doc) test_form_encoding((IUnknown*)elem, "multipart/form-data"); test_form_elements((IUnknown*)elem); test_form_reset((IUnknown*)elem); + test_form_target((IUnknown*)elem); IHTMLElement_Release(elem); }

1 0

Shuai Meng : vbscript: Implemented IsNumeric.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: 13fe9147b340472b3af57344ea6098e456a6578a URL: http://source.winehq.org/git/wine.git/?a=commit;h=13fe9147b340472b3af57344e… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Jul 21 23:41:22 2014 +0800 vbscript: Implemented IsNumeric. --- dlls/vbscript/global.c | 21 +++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 26 +++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 610de43..68fa388 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -91,6 +91,15 @@ static HRESULT return_bstr(VARIANT *res, BSTR str) return S_OK; } +static HRESULT return_bool(VARIANT *res, BOOL val) +{ + if(res) { + V_VT(res) = VT_BOOL; + V_BOOL(res) = val ? VARIANT_TRUE : VARIANT_FALSE; + } + return S_OK; +} + static HRESULT return_short(VARIANT *res, short val) { if(res) { @@ -600,8 +609,16 @@ static HRESULT Global_IsNull(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA static HRESULT Global_IsNumeric(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + double d; + + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + hres = to_double(arg, &d); + + return return_bool(res, SUCCEEDED(hres)); } static HRESULT Global_IsArray(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 38e5e76..fbf252a 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1,4 +1,3 @@ -' ' Copyright 2011 Jacek Caban for CodeWeavers ' ' This library is free software; you can redistribute it and/or @@ -195,6 +194,31 @@ Call ok(not isNull(4), "isNull(4) is true?") Call ok(not isNull("x"), "isNull(""x"") is true?") Call ok(isNull(Null), "isNull(Null) is not true?") +Call ok(isNumeric(Empty), "isNumeric(empty) is not true?") +Call ok(not isNumeric(Null), "isNumeric(Null) is not true?") +Call ok(isNumeric(32767), "isNumeric(32767) is true?") +Call ok(isNumeric(32768), "isNumeric(32768) is true?") +Call ok(isNumeric(CSng(3242.4)), "isNumeric(CSng(3242.4)) is true?") +Call ok(isNumeric(32768.4), "isNumeric(32768.4) is true?") +Call ok(isNumeric(CCur(32768.4)), "isNumeric(CCur(32768.4)) is true?") +Call ok(isNumeric("44"), "isNumeric(""44"") is true?") +Call ok(not isNumeric("rwrf"), "isNumeric(""rwrf"") is not true?") +Call ok(not isNumeric(Nothing), "isNumeric(Nothing) is not true?") +Call ok(not isNumeric(New EmptyClass), "isNumeric(New EmptyClass) is not true?") +Call ok(isNumeric(true), "isNumeric(true) is true?") +Call ok(isNumeric(CByte(32)), "isNumeric(CByte(32)) is true?") +Dim arr(2) +arr(0) = 2 +arr(1) = 3 +Call ok(not isNumeric(arr), "isNumeric(arr) is not true?") + +Dim newObject +Set newObject = New ValClass +newObject.myval = 1 +Call ok(isNumeric(newObject), "isNumeric(newObject) is true?") +newObject.myval = "test" +Call ok(not isNumeric(newObject), "isNumeric(newObject) is not true?") + Call ok(getVT(err) = "VT_DISPATCH", "getVT(err) = " & getVT(err)) Sub TestHex(x, ex)

1 0

Thomas Faber : qcap: Destroy BaseFilter after VfwCapture child class.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: 5cbc081a1fef1e89a755bc44dc509bed29feaf42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cbc081a1fef1e89a755bc44d… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 19 10:38:26 2014 +0200 qcap: Destroy BaseFilter after VfwCapture child class. --- dlls/qcap/vfwcapture.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 41a05a5..6d416b7 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -203,7 +203,7 @@ static HRESULT WINAPI VfwCapture_QueryInterface(IBaseFilter * iface, REFIID riid static ULONG WINAPI VfwCapture_Release(IBaseFilter * iface) { VfwCapture *This = (VfwCapture *)iface; - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("%p->() New refcount: %d\n", This, refCount); @@ -225,6 +225,7 @@ static ULONG WINAPI VfwCapture_Release(IBaseFilter * iface) IPin_Disconnect(This->pOutputPin); } IPin_Release(This->pOutputPin); + BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); ObjectRefCount(FALSE); }

1 0

Thomas Faber : winegstreamer: Destroy BaseFilter after GST child class.
by Alexandre Julliard 22 Jul '14

22 Jul '14

Module: wine Branch: master Commit: 04240e6ae3b8bca126e11cb344d9155b521a9696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04240e6ae3b8bca126e11cb34… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 19 10:40:28 2014 +0200 winegstreamer: Destroy BaseFilter after GST child class. --- dlls/winegstreamer/gstdemux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3694b54..4e5f04d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1099,6 +1099,7 @@ static void GST_Destroy(GSTImpl *This) { gst_bus_set_sync_handler(This->bus, NULL, NULL); gst_object_unref(This->bus); } + BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); } @@ -1131,7 +1132,7 @@ static HRESULT WINAPI GST_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID static ULONG WINAPI GST_Release(IBaseFilter *iface) { GSTImpl *This = (GSTImpl *)iface; - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1);

1 0