wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Nikolay Sivov : msxml3: Enable inline wrappers for tests.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 6ca60b59c937ca3e31696ef685c068d136c1cbc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ca60b59c937ca3e31696ef68… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 30 10:32:56 2012 +0400 msxml3: Enable inline wrappers for tests. --- dlls/msxml3/tests/Makefile.in | 1 + dlls/msxml3/tests/domdoc.c | 70 ++++++++++++++++++++-------------------- dlls/msxml3/tests/xmldoc.c | 4 +- 3 files changed, 38 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ca60b59c937ca3e31696…

1 0

Nikolay Sivov : kernel32: Added WerRegisterMemoryBlock stub.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 48ff6fa9277740823a4e46cbac47c7e0471332ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ff6fa9277740823a4e46cba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 29 12:51:47 2012 +0400 kernel32: Added WerRegisterMemoryBlock stub. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/wer.c | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a916309..b8c6a3c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1253,6 +1253,7 @@ @ stdcall WaitNamedPipeA (str long) @ stdcall WaitNamedPipeW (wstr long) @ stdcall WerRegisterFile(wstr long long) +@ stdcall WerRegisterMemoryBlock(ptr long) @ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) @ stdcall WerSetFlags(long) @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) diff --git a/dlls/kernel32/wer.c b/dlls/kernel32/wer.c index 22ca7f2..aa1d530 100644 --- a/dlls/kernel32/wer.c +++ b/dlls/kernel32/wer.c @@ -63,3 +63,9 @@ HRESULT WINAPI WerSetFlags(DWORD flags) FIXME("(%d) stub!\n", flags); return E_NOTIMPL; } + +HRESULT WINAPI WerRegisterMemoryBlock(void *block, DWORD size) +{ + FIXME("(%p %d) stub\n", block, size); + return E_NOTIMPL; +}

1 0

Nikolay Sivov : shell32: Use proper macros when calling COM methods.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: bf0c67c3220bbbf527316ff1384e25f00f79d843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf0c67c3220bbbf527316ff13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 29 12:51:05 2012 +0400 shell32: Use proper macros when calling COM methods. --- dlls/shell32/assoc.c | 2 +- dlls/shell32/cpanelfolder.c | 2 +- dlls/shell32/ebrowser.c | 12 ++++++------ dlls/shell32/recyclebin.c | 2 +- dlls/shell32/shellitem.c | 6 +++--- dlls/shell32/shfldr_desktop.c | 6 +++--- dlls/shell32/shfldr_fs.c | 8 ++++---- dlls/shell32/shfldr_mycomp.c | 14 +++++++------- dlls/shell32/shfldr_netplaces.c | 2 +- dlls/shell32/shfldr_unixfs.c | 12 ++++++------ dlls/shell32/shlfolder.c | 8 ++++---- 11 files changed, 37 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf0c67c3220bbbf527316…

1 0

Jacek Caban : jscript/tests: Use proper helpers for iface calls.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 142d0f302623e650a6854ebb2f1e368f4547c536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=142d0f302623e650a6854ebb2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 12:02:01 2012 +0200 jscript/tests: Use proper helpers for iface calls. --- dlls/jscript/tests/activex.c | 68 ++++++++++++++++++++++++++++------------- dlls/jscript/tests/caller.c | 30 ++++++++++++++---- dlls/jscript/tests/jscript.c | 34 +++++++++++++++----- dlls/jscript/tests/run.c | 46 +++++++++++++++++++--------- 4 files changed, 125 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=142d0f302623e650a6854…

1 0

Jacek Caban : mshtml/tests: Use proper helpers for iface calls.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: d0b8c6bca21fef9f92c47191d7875eef529c8cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0b8c6bca21fef9f92c47191d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 11:04:56 2012 +0200 mshtml/tests: Use proper helpers for iface calls. --- dlls/mshtml/tests/activex.c | 2 +- dlls/mshtml/tests/dom.c | 14 ++++---- dlls/mshtml/tests/htmldoc.c | 66 +++++++++++++++++++++--------------------- 3 files changed, 41 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0b8c6bca21fef9f92c47…

1 0

Jacek Caban : urlmon/tests: Use proper helpers for iface calls.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: fcca6af646303b61041ca35adc0013b8d0469891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcca6af646303b61041ca35ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 10:56:13 2012 +0200 urlmon/tests: Use proper helpers for iface calls. --- dlls/urlmon/tests/url.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 69a2716..5be3f02 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2638,8 +2638,8 @@ static BOOL test_bscholder(IBindStatusCallback *holder) CHECK_CALLED_BROKEN(QueryInterface_IHttpNegotiate2); /* IE8 */ CHECK_CALLED(GetRootSecurityId); - IHttpNegotiate_Release(http_negotiate2_serv); - IHttpNegotiate_Release(http_negotiate2); + IHttpNegotiate2_Release(http_negotiate2_serv); + IHttpNegotiate2_Release(http_negotiate2); }else { skip("Could not get IHttpNegotiate2\n"); ret = FALSE;

1 0

Jacek Caban : ieframe/tests: Use proper helpers for iface calls.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 0947bc78a79eaac198b52791b1466a7c4d24fb15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0947bc78a79eaac198b52791b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 10:52:52 2012 +0200 ieframe/tests: Use proper helpers for iface calls. --- dlls/ieframe/tests/intshcut.c | 2 +- dlls/ieframe/tests/webbrowser.c | 37 +++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index 63c595f..c9c105c 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -143,7 +143,7 @@ static void _test_shortcut_url(unsigned line, IUnknown *unk, const char *exurl) ok_(__FILE__,line)(!strcmp(url_a, exurl), "unexpected URL, got %s, expected %s\n", url_a, exurl); CoTaskMemFree(url_a); - IUnknown_Release(locator_a); + IUnknown_Release((IUnknown*)locator_a); } #define check_string_transform(a,b,c,d,e) _check_string_transform(__LINE__,a,b,c,d,e) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index e073c91..57c2be9 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -288,7 +288,7 @@ static IDispatch *_get_document(unsigned line, IWebBrowser2 *wb) hres = IDispatch_QueryInterface(disp, &IID_IHTMLDocument2, (void**)&html_doc); ok_(__FILE__,line)(hres == S_OK, "Could not get IHTMLDocument iface: %08x\n", hres); ok(disp == (IDispatch*)html_doc, "disp != html_doc\n"); - IHTMLDocument_Release(html_doc); + IHTMLDocument2_Release(html_doc); return disp; } @@ -1750,7 +1750,7 @@ static void test_DoVerb(IWebBrowser2 *unk) RECT rect = {0,0,1000,1000}; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "QueryInterface(IID_OleObject) failed: %08x\n", hres); if(FAILED(hres)) return; @@ -1798,7 +1798,7 @@ static void call_DoVerb(IWebBrowser2 *unk, LONG verb) RECT rect = {60,60,600,600}; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "QueryInterface(IID_OleObject) failed: %08x\n", hres); if(FAILED(hres)) return; @@ -1816,7 +1816,7 @@ static HWND get_hwnd(IWebBrowser2 *unk) HWND hwnd; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceObject, (void**)&inplace); + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleInPlaceObject, (void**)&inplace); ok(hres == S_OK, "QueryInterface(IID_OleInPlaceObject) failed: %08x\n", hres); hres = IOleInPlaceObject_GetWindow(inplace, &hwnd); @@ -1859,7 +1859,7 @@ static void test_ClientSite(IWebBrowser2 *unk, IOleClientSite *client, BOOL stop HWND hwnd; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "QueryInterface(IID_OleObject) failed: %08x\n", hres); if(FAILED(hres)) return; @@ -1867,7 +1867,7 @@ static void test_ClientSite(IWebBrowser2 *unk, IOleClientSite *client, BOOL stop test_GetMiscStatus(oleobj); test_SetHostNames(oleobj); - hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceObject, (void**)&inplace); + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleInPlaceObject, (void**)&inplace); ok(hres == S_OK, "QueryInterface(IID_OleInPlaceObject) failed: %08x\n", hres); if(FAILED(hres)) { IOleObject_Release(oleobj); @@ -1929,7 +1929,7 @@ static void test_ClassInfo(IWebBrowser2 *unk) GUID guid; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IProvideClassInfo2, (void**)&class_info); + hres = IWebBrowser2_QueryInterface(unk, &IID_IProvideClassInfo2, (void**)&class_info); ok(hres == S_OK, "QueryInterface(IID_IProvideClassInfo) failed: %08x\n", hres); if(FAILED(hres)) return; @@ -2394,7 +2394,7 @@ static void test_wb_funcs(IWebBrowser2 *wb, BOOL is_clientsite) IOleControl *control; HRESULT hres; - hres = IUnknown_QueryInterface(wb, &IID_IOleControl, (void**)&control); + hres = IWebBrowser2_QueryInterface(wb, &IID_IOleControl, (void**)&control); ok(hres == S_OK, "Could not get IOleControl interface: %08x\n", hres); test_Silent(wb, control, is_clientsite); @@ -2410,7 +2410,7 @@ static void test_GetControlInfo(IWebBrowser2 *unk) CONTROLINFO info; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IOleControl, (void**)&control); + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleControl, (void**)&control); ok(hres == S_OK, "Could not get IOleControl: %08x\n", hres); if(FAILED(hres)) return; @@ -2440,7 +2440,7 @@ static void test_Extent(IWebBrowser2 *unk) if (dpi_x != 96 || dpi_y != 96) trace("dpi: %d / %d\n", dpi_y, dpi_y); - hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); ok(hres == S_OK, "Could not get IOleObkect: %08x\n", hres); if(FAILED(hres)) return; @@ -2510,7 +2510,7 @@ static void test_ConnectionPoint(IWebBrowser2 *unk, BOOL init) static DWORD dw = 100; - hres = IUnknown_QueryInterface(unk, &IID_IConnectionPointContainer, (void**)&container); + hres = IWebBrowser2_QueryInterface(unk, &IID_IConnectionPointContainer, (void**)&container); ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08x\n", hres); if(FAILED(hres)) return; @@ -2801,7 +2801,7 @@ static void test_olecmd(IWebBrowser2 *unk, BOOL loaded) OLECMD cmds[3]; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); ok(hres == S_OK, "Could not get IOleCommandTarget iface: %08x\n", hres); if(FAILED(hres)) return; @@ -2831,7 +2831,7 @@ static void test_IServiceProvider(IWebBrowser2 *unk) IUnknown *iface; HRESULT hres; - hres = IUnknown_QueryInterface(unk, &IID_IServiceProvider, (void**)&servprov); + hres = IWebBrowser2_QueryInterface(unk, &IID_IServiceProvider, (void**)&servprov); ok(hres == S_OK, "QueryInterface returned %08x, expected S_OK\n", hres); if(FAILED(hres)) return; @@ -2909,7 +2909,7 @@ static void test_go_back(IWebBrowser2 *wb, const char *back_url) todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE); } -static void test_QueryInterface(IWebBrowser2 *unk) +static void test_QueryInterface(IWebBrowser2 *wb) { IQuickActivate *qa = (IQuickActivate*)0xdeadbeef; IRunnableObject *runnable = (IRunnableObject*)0xdeadbeef; @@ -2921,6 +2921,7 @@ static void test_QueryInterface(IWebBrowser2 *unk) IOleLink *link = (void*)0xdeadbeef; IMarshal *marshal = (void*)0xdeadbeef; IStdMarshalInfo *marshalinfo = (void*)0xdeadbeef; + IUnknown *unk = (IUnknown*)wb; HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&qa); @@ -3054,7 +3055,7 @@ static void test_TranslateAccelerator(IWebBrowser2 *unk) test_Navigate2(unk, "about:blank"); - hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceActiveObject, (void**)&pao); + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleInPlaceActiveObject, (void**)&pao); ok(hres == S_OK, "Got 0x%08x\n", hres); if(SUCCEEDED(hres)) { /* One accelerator that should be handled by mshtml */ @@ -3075,7 +3076,7 @@ static void test_TranslateAccelerator(IWebBrowser2 *unk) test_UIActivate(unk, TRUE); /* Test again after UIActivate */ - hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceActiveObject, (void**)&pao); + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleInPlaceActiveObject, (void**)&pao); ok(hres == S_OK, "Got 0x%08x\n", hres); if(SUCCEEDED(hres)) { /* One accelerator that should be handled by mshtml */ @@ -3125,14 +3126,14 @@ static void test_TranslateAccelerator(IWebBrowser2 *unk) for(keycode = 0; keycode <= 0x100; keycode++) { msg_a.wParam = keycode; SET_EXPECT(DocHost_TranslateAccelerator); - hres = IDocHostUIHandler_TranslateAccelerator(dochost, &msg_a, &CGID_MSHTML, 1234); + hres = IDocHostUIHandler2_TranslateAccelerator(dochost, &msg_a, &CGID_MSHTML, 1234); ok(hres == 0xdeadbeef, "Got 0x%08x\n", hres); CHECK_CALLED(DocHost_TranslateAccelerator); } hr_dochost_TranslateAccelerator = E_NOTIMPL; SET_EXPECT(DocHost_TranslateAccelerator); - hres = IDocHostUIHandler_TranslateAccelerator(dochost, &msg_a, &CGID_MSHTML, 1234); + hres = IDocHostUIHandler2_TranslateAccelerator(dochost, &msg_a, &CGID_MSHTML, 1234); ok(hres == E_NOTIMPL, "Got 0x%08x\n", hres); CHECK_CALLED(DocHost_TranslateAccelerator);

1 0

Jacek Caban : urlmon: SecManagerImpl_QueryInterface clean up.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 4ffcf3359da132a4699e1f1e829e271c3ae18f7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ffcf3359da132a4699e1f1e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 10:36:44 2012 +0200 urlmon: SecManagerImpl_QueryInterface clean up. --- dlls/urlmon/sec_mgr.c | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index df90ce1..477f89e 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -854,31 +854,23 @@ static HRESULT WINAPI SecManagerImpl_QueryInterface(IInternetSecurityManagerEx2* { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvObject); + TRACE("(%p)->(%s %p)\n",This,debugstr_guid(riid),ppvObject); - /* Perform a sanity check on the parameters.*/ - if ( (This==0) || (ppvObject==0) ) + if(!ppvObject) return E_INVALIDARG; - /* Initialize the return parameter */ - *ppvObject = 0; - - /* Compare the riid with the interface IDs implemented by this object.*/ - if (IsEqualIID(&IID_IUnknown, riid) || - IsEqualIID(&IID_IInternetSecurityManager, riid) || - IsEqualIID(&IID_IInternetSecurityManagerEx, riid) || - IsEqualIID(&IID_IInternetSecurityManagerEx2, riid)) + if(IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IInternetSecurityManager, riid) || + IsEqualIID(&IID_IInternetSecurityManagerEx, riid) || + IsEqualIID(&IID_IInternetSecurityManagerEx2, riid)) { *ppvObject = iface; - - /* Check that we obtained an interface.*/ - if (!*ppvObject) { + } else { WARN("not supported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } - /* Query Interface always increases the reference count by one when it is successful */ IInternetSecurityManagerEx2_AddRef(iface); - return S_OK; }

1 0

Hans Leidekker : winhttp: Use platform-specific versions of IActiveScriptParse methods.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: 8f108a0f4d5c966fe7606919294c834e2f67872e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f108a0f4d5c966fe76069192… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 27 14:46:13 2012 +0200 winhttp: Use platform-specific versions of IActiveScriptParse methods. --- dlls/winhttp/Makefile.in | 1 + dlls/winhttp/session.c | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 53b5b97..130971e 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -3,6 +3,7 @@ IMPORTLIB = winhttp IMPORTS = uuid user32 advapi32 DELAYIMPORTS = oleaut32 ole32 crypt32 EXTRALIBS = @SOCKETLIBS@ +EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ cookie.c \ diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index e3e5e2b..0349ba7 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1828,6 +1828,16 @@ static BSTR include_pac_utils( BSTR script ) return ret; } +#ifdef _WIN64 +#define IActiveScriptParse_Release IActiveScriptParse64_Release +#define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew +#define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText +#else +#define IActiveScriptParse_Release IActiveScriptParse32_Release +#define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew +#define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText +#endif + static BOOL run_script( const BSTR script, const WCHAR *url, WINHTTP_PROXY_INFO *info ) { static const WCHAR jscriptW[] = {'J','S','c','r','i','p','t',0}; @@ -1862,7 +1872,7 @@ static BOOL run_script( const BSTR script, const WCHAR *url, WINHTTP_PROXY_INFO hr = IActiveScript_QueryInterface( engine, &IID_IActiveScriptParse, (void **)&parser ); if (hr != S_OK) goto done; - hr = IActiveScriptParse64_InitNew( parser ); + hr = IActiveScriptParse_InitNew( parser ); if (hr != S_OK) goto done; hr = IActiveScript_SetScriptSite( engine, &script_site ); @@ -1873,7 +1883,7 @@ static BOOL run_script( const BSTR script, const WCHAR *url, WINHTTP_PROXY_INFO if (!(full_script = include_pac_utils( script ))) goto done; - hr = IActiveScriptParse64_ParseScriptText( parser, full_script, NULL, NULL, NULL, 0, 0, 0, NULL, NULL ); + hr = IActiveScriptParse_ParseScriptText( parser, full_script, NULL, NULL, NULL, 0, 0, 0, NULL, NULL ); if (hr != S_OK) goto done; hr = IActiveScript_SetScriptState( engine, SCRIPTSTATE_STARTED ); @@ -1910,7 +1920,7 @@ done: SysFreeString( hostname ); SysFreeString( func ); if (dispatch) IDispatch_Release( dispatch ); - if (parser) IUnknown_Release( parser ); + if (parser) IActiveScriptParse_Release( parser ); if (engine) IActiveScript_Release( engine ); if (SUCCEEDED( init )) CoUninitialize(); if (!ret) set_last_error( ERROR_WINHTTP_BAD_AUTO_PROXY_SCRIPT );

1 0

Hans Leidekker : wbemprox: Parse the object path passed to IWbemServices:: GetObject.
by Alexandre Julliard 27 Jul '12

27 Jul '12

Module: wine Branch: master Commit: f3b93f26159873f35e32f71f523b943b7ba37b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3b93f26159873f35e32f71f5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 27 14:04:28 2012 +0200 wbemprox: Parse the object path passed to IWbemServices::GetObject. --- dlls/wbemprox/services.c | 112 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 99 insertions(+), 13 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index e8c5461..8c9c2f4 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -235,35 +235,108 @@ static HRESULT WINAPI wbem_services_QueryObjectSink( return WBEM_E_FAILED; } -static HRESULT create_instance_enum( const WCHAR *class, IEnumWbemClassObject **iter ) +struct path { - static const WCHAR selectW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; - WCHAR *query; - HRESULT hr; + WCHAR *class; + UINT class_len; + WCHAR *filter; + UINT filter_len; +}; + +static HRESULT parse_path( const WCHAR *str, struct path **ret ) +{ + struct path *path; + const WCHAR *p = str, *q; + UINT len; - query = heap_alloc( strlenW( class ) * sizeof(WCHAR) + sizeof(selectW) ); - if (!query) return E_OUTOFMEMORY; + if (!(path = heap_alloc_zero( sizeof(*path) ))) return E_OUTOFMEMORY; - strcpyW( query, selectW ); - strcatW( query, class ); + while (*p && *p != '.') p++; + len = p - str; + if (!(path->class = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + heap_free( path ); + return E_OUTOFMEMORY; + } + memcpy( path->class, str, len * sizeof(WCHAR) ); + path->class[len] = 0; + path->class_len = len; + + if (p[0] == '.' && p[1]) + { + q = ++p; + while (*q) q++; + + len = q - p; + if (!(path->filter = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + { + heap_free( path->class ); + heap_free( path ); + return E_OUTOFMEMORY; + } + memcpy( path->filter, p, len * sizeof(WCHAR) ); + path->filter[len] = 0; + path->filter_len = len; + } + *ret = path; + return S_OK; +} + +static void free_path( struct path *path ) +{ + heap_free( path->class ); + heap_free( path->filter ); + heap_free( path ); +} + +static HRESULT create_instance_enum( const struct path *path, IEnumWbemClassObject **iter ) +{ + static const WCHAR selectW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','%','s',' ', + 'W','H','E','R','E',' ','%','s',0}; + static const WCHAR select_allW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; + WCHAR *query; + HRESULT hr; + UINT len; + + if (path->filter) + { + len = path->class_len + path->filter_len + SIZEOF(selectW); + if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + sprintfW( query, selectW, path->class, path->filter ); + } + else + { + len = path->class_len + SIZEOF(select_allW); + if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + strcpyW( query, select_allW ); + strcatW( query, path->class ); + } hr = exec_query( query, iter ); heap_free( query ); return hr; } -HRESULT get_object( const WCHAR *path, IWbemClassObject **obj ) +HRESULT get_object( const WCHAR *object_path, IWbemClassObject **obj ) { IEnumWbemClassObject *iter; + struct path *path; HRESULT hr; - /* FIXME: parse path */ - - hr = create_instance_enum( path, &iter ); + hr = parse_path( object_path, &path ); if (hr != S_OK) return hr; + hr = create_instance_enum( path, &iter ); + if (hr != S_OK) + { + free_path( path ); + return hr; + } hr = WbemClassObject_create( NULL, iter, 0, (void **)obj ); IEnumWbemClassObject_Release( iter ); + free_path( path ); return hr; } @@ -280,6 +353,11 @@ static HRESULT WINAPI wbem_services_GetObject( if (lFlags) FIXME("unsupported flags 0x%08x\n", lFlags); + if (!strObjectPath) + { + FIXME("no support for creating new classes\n"); + return WBEM_E_FAILED; + } return get_object( strObjectPath, ppObject ); } @@ -411,11 +489,19 @@ static HRESULT WINAPI wbem_services_CreateInstanceEnum( IWbemContext *pCtx, IEnumWbemClassObject **ppEnum ) { + struct path *path; + HRESULT hr; + TRACE("%p, %s, 0%08x, %p, %p\n", iface, debugstr_w(strClass), lFlags, pCtx, ppEnum); if (lFlags) FIXME("unsupported flags 0x%08x\n", lFlags); - return create_instance_enum( strClass, ppEnum ); + hr = parse_path( strClass, &path ); + if (hr != S_OK) return hr; + + hr = create_instance_enum( path, ppEnum ); + free_path( path ); + return hr; } static HRESULT WINAPI wbem_services_CreateInstanceEnumAsync(

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2012