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

Jacek Caban : mshtml: Use inner window directly in handle_load.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 6530e8a9633ea47828f9f7c4d44f53594c5b1395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6530e8a9633ea47828f9f7c4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 15:56:45 2012 +0200 mshtml: Use inner window directly in handle_load. --- dlls/mshtml/nsevents.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 488bdd8..3fd1962 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -241,7 +241,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event if(doc->basedoc.doc_obj && doc->basedoc.doc_obj->basedoc.doc_node == doc) doc_obj = doc->basedoc.doc_obj; - connect_scripts(doc->basedoc.window->base.inner_window); + connect_scripts(doc->window); if(doc_obj) handle_docobj_load(doc_obj);

1 0

Nikolay Sivov : widl: Protect from duplicated method names in C-style vtable struct.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 0bc5e7a62a23650f57b2eb2d601ae111cd6e454d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bc5e7a62a23650f57b2eb2d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 27 19:18:04 2012 +0400 widl: Protect from duplicated method names in C-style vtable struct. --- tools/widl/header.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index f19929a..9ecbab5 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -816,6 +816,28 @@ const var_t *is_callas(const attr_list_t *a) return get_attrp(a, ATTR_CALLAS); } +static int is_inherited_method(const type_t *iface, const var_t *func) +{ + while ((iface = type_iface_get_inherit(iface))) + { + const statement_t *stmt; + STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) + { + const var_t *funccmp = stmt->u.var; + + if (!is_callas(func->attrs)) + { + char inherit_name[256]; + /* compare full name including property prefix */ + strcpy(inherit_name, get_name(funccmp)); + if (!strcmp(inherit_name, get_name(func))) return 1; + } + } + } + + return 0; +} + static void write_method_macro(FILE *header, const type_t *iface, const char *name) { const statement_t *stmt; @@ -967,7 +989,10 @@ static void do_write_c_method_def(FILE *header, const type_t *iface, const char if (!callconv) callconv = "STDMETHODCALLTYPE"; indent(header, 0); write_type_decl_left(header, type_function_get_rettype(func->type)); - fprintf(header, " (%s *%s)(\n", callconv, get_name(func)); + if (is_inherited_method(iface, func)) + fprintf(header, " (%s *%s_%s)(\n", callconv, iface->name, func->name); + else + fprintf(header, " (%s *%s)(\n", callconv, get_name(func)); write_args(header, type_get_function_args(func->type), name, 1, TRUE); fprintf(header, ");\n"); fprintf(header, "\n");

1 0

Nikolay Sivov : widl: Don' t output method macro if name duplicates another method name.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 65f418493683d96d4fd625ab019ea400eec4c19a URL: http://source.winehq.org/git/wine.git/?a=commit;h=65f418493683d96d4fd625ab0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 27 20:00:18 2012 +0400 widl: Don't output method macro if name duplicates another method name. --- tools/widl/header.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 9ecbab5..02e3b60 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -856,7 +856,7 @@ static void write_method_macro(FILE *header, const type_t *iface, const char *na first_iface = 0; } - if (!is_callas(func->attrs)) { + if (!is_callas(func->attrs) && !is_inherited_method(iface, func)) { const var_t *arg; fprintf(header, "#define %s_%s(This", name, get_name(func)); @@ -949,7 +949,7 @@ static void write_inline_wrappers(FILE *header, const type_t *iface, const char first_iface = 0; } - if (!is_callas(func->attrs)) { + if (!is_callas(func->attrs) && !is_inherited_method(iface, func)) { const var_t *arg; fprintf(header, "static FORCEINLINE ");

1 0

Nikolay Sivov : include: Added dwrite.idl file.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 7ef5661d546df99a26b639daf42e81c20156cc62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ef5661d546df99a26b639daf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 29 12:50:34 2012 +0400 include: Added dwrite.idl file. --- .gitignore | 1 + dlls/dwrite/dwrite.spec | 2 +- dlls/dwrite/main.c | 12 + include/Makefile.in | 2 + include/dcommon.h | 29 + include/dwrite.idl | 1394 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 1439 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ef5661d546df99a26b63…

1 0

Alexandre Goujon : kernel32: Reimplement GetLogicalDrives using Nt{Open, Query}DirectoryObject.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 4d7f510bef0891004bf5f1570148eeaf9ef73ee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d7f510bef0891004bf5f1570… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Sat Jul 28 16:14:15 2012 +0200 kernel32: Reimplement GetLogicalDrives using Nt{Open, Query}DirectoryObject. --- dlls/kernel32/volume.c | 44 ++++++++++++++++++++++++++------------------ 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 8377e41..238dd9c 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1435,28 +1435,36 @@ DWORD WINAPI QueryDosDeviceA( LPCSTR devname, LPSTR target, DWORD bufsize ) */ DWORD WINAPI GetLogicalDrives(void) { - const char *config_dir = wine_get_config_dir(); - struct stat st; - char *buffer, *dev; - DWORD ret = 0; - int i; + static const WCHAR dosdevW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\',0}; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nt_name; + DWORD bitmask = 0; + NTSTATUS status; + HANDLE handle; - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, strlen(config_dir) + sizeof("/dosdevices/a:") ))) + RtlInitUnicodeString( &nt_name, dosdevW ); + nt_name.Length -= sizeof(WCHAR); /* without trailing slash */ + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nt_name; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + status = NtOpenDirectoryObject( &handle, FILE_LIST_DIRECTORY, &attr ); + if (!status) { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return 0; - } - strcpy( buffer, config_dir ); - strcat( buffer, "/dosdevices/a:" ); - dev = buffer + strlen(buffer) - 2; + char data[1024]; + DIRECTORY_BASIC_INFORMATION *info = (DIRECTORY_BASIC_INFORMATION *)data; + ULONG ctx = 0, len; - for (i = 0; i < 26; i++) - { - *dev = 'a' + i; - if (!stat( buffer, &st )) ret |= (1 << i); + while (!NtQueryDirectoryObject( handle, info, sizeof(data), 1, 0, &ctx, &len )) + if(info->ObjectName.Length == 2*sizeof(WCHAR) && info->ObjectName.Buffer[1] == ':') + bitmask |= 1 << (info->ObjectName.Buffer[0] - 'A'); + + NtClose( handle ); } - HeapFree( GetProcessHeap(), 0, buffer ); - return ret; + + return bitmask; }

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICPalette_InitializeFromPalette.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 0316a1b4c1def76d6c9bfdd006891c4ac895925c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0316a1b4c1def76d6c9bfdd00… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 30 13:12:28 2012 +0900 windowscodecs: Implement IWICPalette_InitializeFromPalette. --- dlls/windowscodecs/palette.c | 34 +++++++++++++++++-- dlls/windowscodecs/tests/palette.c | 63 +++++++++++++++++++++++++++++++++++- 2 files changed, 93 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index f989c97..7d50d83 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -455,10 +455,38 @@ static HRESULT WINAPI PaletteImpl_InitializeFromBitmap(IWICPalette *iface, } static HRESULT WINAPI PaletteImpl_InitializeFromPalette(IWICPalette *iface, - IWICPalette *pIPalette) + IWICPalette *source) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + PaletteImpl *This = impl_from_IWICPalette(iface); + UINT count; + WICColor *colors = NULL; + WICBitmapPaletteType type; + HRESULT hr; + + TRACE("(%p,%p)\n", iface, source); + + if (!source) return E_INVALIDARG; + + hr = IWICPalette_GetType(source, &type); + if (hr != S_OK) return hr; + hr = IWICPalette_GetColorCount(source, &count); + if (hr != S_OK) return hr; + if (count) + { + colors = HeapAlloc(GetProcessHeap(), 0, sizeof(WICColor) * count); + if (!colors) return E_OUTOFMEMORY; + hr = IWICPalette_GetColors(source, count, colors, &count); + if (hr != S_OK) return hr; + } + + EnterCriticalSection(&This->lock); + HeapFree(GetProcessHeap(), 0, This->colors); + This->colors = colors; + This->count = count; + This->type = type; + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI PaletteImpl_GetType(IWICPalette *iface, diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 499d59d..e3b9a31 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -30,7 +30,7 @@ static void test_custom_palette(void) { IWICImagingFactory *factory; - IWICPalette *palette; + IWICPalette *palette, *palette2; HRESULT hr; WICBitmapPaletteType type=0xffffffff; UINT count=1; @@ -106,6 +106,29 @@ static void test_custom_palette(void) ok(SUCCEEDED(hr), "IsGrayscale failed, hr=%x\n", hr); ok(!boolresult, "expected FALSE, got TRUE\n"); + hr = IWICImagingFactory_CreatePalette(factory, &palette2); + ok(SUCCEEDED(hr), "CreatePalette failed, hr=%x\n", hr); + + hr = IWICPalette_InitializeFromPalette(palette2, palette); + ok(SUCCEEDED(hr), "InitializeFromPalette failed, hr=%x\n", hr); + + type = 0xdeadbeef; + hr = IWICPalette_GetType(palette2, &type); + ok(SUCCEEDED(hr), "GetType failed, hr=%x\n", hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %x\n", type); + + count = 0xdeadbeef; + hr = IWICPalette_GetColorCount(palette2, &count); + ok(SUCCEEDED(hr), "GetColorCount failed, hr=%x\n", hr); + ok(count == 4, "expected 4, got %u\n", count); + + memset(colors, 0, sizeof(colors)); + count = 0xdeadbeef; + hr = IWICPalette_GetColors(palette2, 4, colors, &count); + ok(SUCCEEDED(hr), "GetColors failed, hr=%x\n", hr); + ok(count == 4, "expected 4, got %u\n", count); + ok(!memcmp(colors, initcolors, sizeof(colors)), "got unexpected palette data\n"); + /* try a palette with some alpha in it */ colors[2] = 0x80ffffff; hr = IWICPalette_InitializeCustom(palette, colors, 4); @@ -119,6 +142,40 @@ static void test_custom_palette(void) hr = IWICPalette_InitializeCustom(palette, NULL, 0); ok(SUCCEEDED(hr), "InitializeCustom failed, hr=%x\n", hr); + type = 0xdeadbeef; + hr = IWICPalette_GetType(palette, &type); + ok(SUCCEEDED(hr), "GetType failed, hr=%x\n", hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %x\n", type); + + count = 0xdeadbeef; + hr = IWICPalette_GetColorCount(palette, &count); + ok(SUCCEEDED(hr), "GetColorCount failed, hr=%x\n", hr); + ok(count == 0, "expected 0, got %u\n", count); + + count = 0xdeadbeef; + hr = IWICPalette_GetColors(palette, 4, colors, &count); + ok(SUCCEEDED(hr), "GetColors failed, hr=%x\n", hr); + ok(count == 0, "expected 0, got %u\n", count); + + hr = IWICPalette_InitializeFromPalette(palette2, palette); + ok(SUCCEEDED(hr), "InitializeFromPalette failed, hr=%x\n", hr); + + type = 0xdeadbeef; + hr = IWICPalette_GetType(palette2, &type); + ok(SUCCEEDED(hr), "GetType failed, hr=%x\n", hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %x\n", type); + + count = 0xdeadbeef; + hr = IWICPalette_GetColorCount(palette2, &count); + ok(SUCCEEDED(hr), "GetColorCount failed, hr=%x\n", hr); + ok(count == 0, "expected 0, got %u\n", count); + + memset(colors, 0, sizeof(colors)); + count = 0xdeadbeef; + hr = IWICPalette_GetColors(palette2, 4, colors, &count); + ok(SUCCEEDED(hr), "GetColors failed, hr=%x\n", hr); + ok(count == 0, "expected 0, got %u\n", count); + /* IWICPalette is paranoid about NULL pointers */ hr = IWICPalette_GetType(palette, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %x\n", hr); @@ -144,6 +201,10 @@ static void test_custom_palette(void) hr = IWICPalette_IsGrayscale(palette, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %x\n", hr); + hr = IWICPalette_InitializeFromPalette(palette, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %x\n", hr); + + IWICPalette_Release(palette2); IWICPalette_Release(palette); }

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

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/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 : 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