April 2016 - Wine-Commits - list.winehq.org

Piotr Caban : ieframe: Test setting different client site in OleObject_SetClientSite.
by Alexandre Julliard April 13, 2016

April 13, 2016

Module: wine Branch: master Commit: 9b6881a57787ba5f4f9801c088301c25c3a28b46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b6881a57787ba5f4f9801c08… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 13 17:12:04 2016 +0200 ieframe: Test setting different client site in OleObject_SetClientSite. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 62 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 521e2ce..1ff7ca2 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -1123,6 +1123,7 @@ static const IOleClientSiteVtbl ClientSiteVtbl = { }; static IOleClientSite ClientSite = { &ClientSiteVtbl }; +static IOleClientSite ClientSite2 = { &ClientSiteVtbl }; static HRESULT WINAPI IOleControlSite_fnQueryInterface(IOleControlSite *iface, REFIID riid, void **ppv) { @@ -2030,6 +2031,61 @@ static void test_ClientSite(IWebBrowser2 *unk, IOleClientSite *client, BOOL stop IOleObject_Release(oleobj); } +static void test_change_ClientSite(IWebBrowser2 *unk) +{ + BOOL old_use_container_olecmd = use_container_olecmd; + IOleClientSite *doc_clientsite; + IOleInPlaceObject *inplace; + IOleCommandTarget *olecmd; + IOleObject *oleobj; + HRESULT hres; + HWND hwnd; + + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_OleObject) failed: %08x\n", hres); + if(FAILED(hres)) + return; + + use_container_olecmd = FALSE; + + SET_EXPECT(Site_GetWindow); + SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + SET_EXPECT(Invoke_AMBIENT_SILENT); + + hres = IOleObject_SetClientSite(oleobj, &ClientSite2); + ok(hres == S_OK, "SetClientSite failed: %08x\n", hres); + IOleObject_Release(oleobj); + + CHECK_CALLED(Site_GetWindow); + CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + CHECK_CALLED(Invoke_AMBIENT_SILENT); + + doc_clientsite = get_dochost(unk); + hres = IOleClientSite_QueryInterface(doc_clientsite, &IID_IOleCommandTarget, (void**)&olecmd); + ok(hres == S_OK, "QueryInterface(IOleCommandTarget) failed: %08x\n", hres); + IOleClientSite_Release(doc_clientsite); + + hres = IWebBrowser2_QueryInterface(unk, &IID_IOleInPlaceObject, (void**)&inplace); + ok(hres == S_OK, "QueryInterface(OleInPlaceObject) failed: %08x\n", hres); + hres = IOleInPlaceObject_GetWindow(inplace, &hwnd); + ok(hres == S_OK, "GetWindow failed: %08x\n", hres); + ok(hwnd == shell_embedding_hwnd, "unexpected hwnd %p\n", hwnd); + IOleInPlaceObject_Release(inplace); + + if(old_use_container_olecmd) { + SET_EXPECT(Exec_UPDATECOMMANDS); + + hres = IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_UPDATECOMMANDS, + OLECMDEXECOPT_DONTPROMPTUSER, NULL, NULL); + ok(hres == S_OK, "Exec(OLECMDID_UPDATECOMMAND) failed: %08x\n", hres); + + CHECK_CALLED(Exec_UPDATECOMMANDS); + use_container_olecmd = TRUE; + } + + IOleCommandTarget_Release(olecmd); +} + static void test_ClassInfo(IWebBrowser2 *unk) { IProvideClassInfo2 *class_info; @@ -3777,10 +3833,12 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_external(webbrowser); test_htmlwindow_close(webbrowser); - if(do_close) + if(do_close) { test_Close(webbrowser, do_download); - else + }else { + test_change_ClientSite(webbrowser); test_ClientSite(webbrowser, NULL, !do_download); + } test_ie_funcs(webbrowser); test_GetControlInfo(webbrowser); test_wb_funcs(webbrowser, FALSE);

1 0

Francois Gouget : ole32/tests: Fix spelling of a few variable names.
by Alexandre Julliard April 13, 2016

April 13, 2016

Module: wine Branch: master Commit: 842bb8cb58a7a3c9353f6744d2fdceb20f08febc URL: http://source.winehq.org/git/wine.git/?a=commit;h=842bb8cb58a7a3c9353f6744d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 13 11:29:23 2016 +0200 ole32/tests: Fix spelling of a few variable names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index dca85ac..7b67dfd 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1580,11 +1580,11 @@ static void test_item_moniker(void) IBindCtx *bindctx; IMoniker *inverse; IUnknown *unknown; - static const WCHAR wszDelimeter[] = {'!',0}; + static const WCHAR wszDelimiter[] = {'!',0}; static const WCHAR wszObjectName[] = {'T','e','s','t',0}; static const WCHAR expected_display_name[] = { '!','T','e','s','t',0 }; - hr = CreateItemMoniker(wszDelimeter, wszObjectName, &moniker); + hr = CreateItemMoniker(wszDelimiter, wszObjectName, &moniker); ok_ole_success(hr, CreateItemMoniker); test_moniker("item moniker", moniker, @@ -1709,15 +1709,15 @@ static void test_generic_composite_moniker(void) FILETIME filetime; IMoniker *inverse; IUnknown *unknown; - static const WCHAR wszDelimeter1[] = {'!',0}; + static const WCHAR wszDelimiter1[] = {'!',0}; static const WCHAR wszObjectName1[] = {'T','e','s','t',0}; - static const WCHAR wszDelimeter2[] = {'#',0}; + static const WCHAR wszDelimiter2[] = {'#',0}; static const WCHAR wszObjectName2[] = {'W','i','n','e',0}; static const WCHAR expected_display_name[] = { '!','T','e','s','t','#','W','i','n','e',0 }; - hr = CreateItemMoniker(wszDelimeter1, wszObjectName1, &moniker1); + hr = CreateItemMoniker(wszDelimiter1, wszObjectName1, &moniker1); ok_ole_success(hr, CreateItemMoniker); - hr = CreateItemMoniker(wszDelimeter2, wszObjectName2, &moniker2); + hr = CreateItemMoniker(wszDelimiter2, wszObjectName2, &moniker2); ok_ole_success(hr, CreateItemMoniker); hr = CreateGenericComposite(moniker1, moniker2, &moniker); ok_ole_success(hr, CreateGenericComposite);

1 0

Francois Gouget : hidclass.sys: Fix spelling of a private struct's name.
by Alexandre Julliard April 13, 2016

April 13, 2016

Module: wine Branch: master Commit: 742d8f4808a3cdbfceede814368d346e37eacbc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=742d8f4808a3cdbfceede8143… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 13 11:28:17 2016 +0200 hidclass.sys: Fix spelling of a private struct's name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/hid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 2820c9d..34c2a09 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -39,7 +39,7 @@ typedef NTSTATUS (WINAPI *pAddDevice)(DRIVER_OBJECT *DriverObject, DEVICE_OBJECT /* Ring buffer functions */ struct ReportRingBuffer; -typedef struct _BASE_DEVICE_EXTENSTION { +typedef struct _BASE_DEVICE_EXTENSION { HID_DEVICE_EXTENSION deviceExtension; HID_COLLECTION_INFORMATION information;

1 0

Hans Leidekker : webservices: Reject field mappings without a description.
by Alexandre Julliard April 13, 2016

April 13, 2016

Module: wine Branch: master Commit: 4bb2e5efea12560ca87500b53f10fd8e646df465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb2e5efea12560ca87500b53… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 13 13:49:41 2016 +0200 webservices: Reject field mappings without a description. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 34b62e7..f09781e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2731,18 +2731,19 @@ static WS_READ_OPTION map_field_options( WS_TYPE type, ULONG options ) static HRESULT read_type_struct_field( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_HEAP *heap, char *buf ) { - char *ptr = buf + desc->offset; + char *ptr; WS_READ_OPTION option; ULONG size; HRESULT hr; - if (!(option = map_field_options( desc->type, desc->options ))) return E_INVALIDARG; + if (!desc || !(option = map_field_options( desc->type, desc->options ))) return E_INVALIDARG; if (option == WS_READ_REQUIRED_VALUE) size = get_type_size( desc->type, desc->typeDescription ); else size = sizeof(void *); + ptr = buf + desc->offset; switch (desc->mapping) { case WS_ATTRIBUTE_FIELD_MAPPING:

1 0

Hans Leidekker : webservices: Fix reader movement for text field mappings.
by Alexandre Julliard April 13, 2016

April 13, 2016

Module: wine Branch: master Commit: a5a12491acf3c8a1a02c4e4b34ac014669395aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5a12491acf3c8a1a02c4e4b3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 13 13:49:39 2016 +0200 webservices: Fix reader movement for text field mappings. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 8191aa5..713e992 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2016,6 +2016,7 @@ static HRESULT read_get_text( struct reader *reader, WS_TYPE_MAPPING mapping, } case WS_ELEMENT_TYPE_MAPPING: case WS_ELEMENT_CONTENT_TYPE_MAPPING: + case WS_ANY_ELEMENT_TYPE_MAPPING: { HRESULT hr; *found = TRUE; @@ -2690,8 +2691,9 @@ static HRESULT read_type_text( struct reader *reader, const WS_FIELD_DESCRIPTION if ((hr = read_to_startelement( reader, &found )) != S_OK) return S_OK; if (!found) return WS_E_INVALID_FORMAT; if ((hr = read_node( reader )) != S_OK) return hr; + if (node_type( reader->current ) != WS_XML_NODE_TYPE_TEXT) return WS_E_INVALID_FORMAT; - return read_type( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, desc->type, NULL, NULL, + return read_type( reader, WS_ANY_ELEMENT_TYPE_MAPPING, desc->type, NULL, NULL, desc->typeDescription, option, heap, ret, size ); } @@ -2875,6 +2877,7 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP if ((hr = read_type_next_element_node( reader, localname, ns )) != S_OK) return hr; break; + case WS_ANY_ELEMENT_TYPE_MAPPING: case WS_ATTRIBUTE_TYPE_MAPPING: break;

1 0

Michael Stefaniuc : quartz: Use SetRect instead of open coding it.
by Alexandre Julliard April 13, 2016

April 13, 2016

Module: wine Branch: master Commit: f96aab3f2281b230e72c8346d40a1b35c3cb7873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f96aab3f2281b230e72c8346d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 13 13:45:54 2016 +0200 quartz: Use SetRect instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 14 +++----------- dlls/quartz/vmr9.c | 30 ++++++++++-------------------- 2 files changed, 13 insertions(+), 31 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 7bc2620..3026c07 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -430,9 +430,7 @@ static RECT WINAPI VideoRenderer_GetDefaultRect(BaseWindow *iface) VideoRendererImpl *This = impl_from_BaseWindow(iface); static RECT defRect; - defRect.left = defRect.top = 0; - defRect.right = This->VideoWidth; - defRect.bottom = This->VideoHeight; + SetRect(&defRect, 0, 0, This->VideoWidth, This->VideoHeight); return defRect; } @@ -596,10 +594,7 @@ static HRESULT WINAPI VideoRenderer_SetDefaultSourceRect(BaseControlVideo* iface { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); - This->SourceRect.left = 0; - This->SourceRect.top = 0; - This->SourceRect.right = This->VideoWidth; - This->SourceRect.bottom = This->VideoHeight; + SetRect(&This->SourceRect, 0, 0, This->VideoWidth, This->VideoHeight); return S_OK; } @@ -612,10 +607,7 @@ static HRESULT WINAPI VideoRenderer_SetDefaultTargetRect(BaseControlVideo* iface if (!GetClientRect(This->baseControlWindow.baseWindow.hWnd, &rect)) return E_FAIL; - This->DestRect.left = 0; - This->DestRect.top = 0; - This->DestRect.right = rect.right; - This->DestRect.bottom = rect.bottom; + SetRect(&This->DestRect, 0, 0, rect.right, rect.bottom); return S_OK; } diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 3538ddb..03b4115 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -353,9 +353,9 @@ static HRESULT WINAPI VMR9_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TY This->bmiheader = format->bmiHeader; TRACE("Resolution: %dx%d\n", format->bmiHeader.biWidth, format->bmiHeader.biHeight); - This->source_rect.right = This->VideoWidth = format->bmiHeader.biWidth; - This->source_rect.bottom = This->VideoHeight = format->bmiHeader.biHeight; - This->source_rect.top = This->source_rect.left = 0; + This->VideoWidth = format->bmiHeader.biWidth; + This->VideoHeight = format->bmiHeader.biHeight; + SetRect(&This->source_rect, 0, 0, This->VideoWidth, This->VideoHeight); } else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) { @@ -364,9 +364,9 @@ static HRESULT WINAPI VMR9_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TY This->bmiheader = format->bmiHeader; TRACE("Resolution: %dx%d\n", format->bmiHeader.biWidth, format->bmiHeader.biHeight); - This->source_rect.right = This->VideoWidth = format->bmiHeader.biWidth; - This->source_rect.bottom = This->VideoHeight = format->bmiHeader.biHeight; - This->source_rect.top = This->source_rect.left = 0; + This->VideoWidth = format->bmiHeader.biWidth; + This->VideoHeight = format->bmiHeader.biHeight; + SetRect(&This->source_rect, 0, 0, This->VideoWidth, This->VideoHeight); } else { @@ -426,9 +426,7 @@ static HRESULT VMR9_maybe_init(struct quartz_vmr *This, BOOL force) hr = IVMRSurfaceAllocatorEx9_InitializeDevice(This->allocator, This->cookie, &info, &buffers); if (SUCCEEDED(hr)) { - This->source_rect.left = This->source_rect.top = 0; - This->source_rect.right = This->bmiheader.biWidth; - This->source_rect.bottom = This->bmiheader.biHeight; + SetRect(&This->source_rect, 0, 0, This->bmiheader.biWidth, This->bmiheader.biHeight); This->num_surfaces = buffers; } @@ -544,9 +542,7 @@ static RECT WINAPI VMR9_GetDefaultRect(BaseWindow *This) struct quartz_vmr* pVMR9 = impl_from_BaseWindow(This); static RECT defRect; - defRect.left = defRect.top = 0; - defRect.right = pVMR9->VideoWidth; - defRect.bottom = pVMR9->VideoHeight; + SetRect(&defRect, 0, 0, pVMR9->VideoWidth, pVMR9->VideoHeight); return defRect; } @@ -688,10 +684,7 @@ static HRESULT WINAPI VMR9_SetDefaultSourceRect(BaseControlVideo* This) { struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This); - pVMR9->source_rect.left = 0; - pVMR9->source_rect.top = 0; - pVMR9->source_rect.right = pVMR9->VideoWidth; - pVMR9->source_rect.bottom = pVMR9->VideoHeight; + SetRect(&pVMR9->source_rect, 0, 0, pVMR9->VideoWidth, pVMR9->VideoHeight); return S_OK; } @@ -704,10 +697,7 @@ static HRESULT WINAPI VMR9_SetDefaultTargetRect(BaseControlVideo* This) if (!GetClientRect(pVMR9->baseControlWindow.baseWindow.hWnd, &rect)) return E_FAIL; - pVMR9->target_rect.left = 0; - pVMR9->target_rect.top = 0; - pVMR9->target_rect.right = rect.right; - pVMR9->target_rect.bottom = rect.bottom; + SetRect(&pVMR9->target_rect, 0, 0, rect.right, rect.bottom); return S_OK; }

1 0

Piotr Caban : ieframe: Improve setting different client site in OleObject_SetClientSite.
by Alexandre Julliard April 13, 2016

April 13, 2016

Module: wine Branch: master Commit: 3fbd56b08ec1812f87a194670d5428ff4e566291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fbd56b08ec1812f87a194670… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 13 17:11:53 2016 +0200 ieframe: Improve setting different client site in OleObject_SetClientSite. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/oleobject.c | 69 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 23 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 4dcc536..1ff9a92 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -283,7 +283,7 @@ static HRESULT on_silent_change(WebBrowser *This) return S_OK; } -static void release_client_site(WebBrowser *This) +static void release_client_site(WebBrowser *This, BOOL destroy_win) { release_dochost_client(&This->doc_host); @@ -297,7 +297,7 @@ static void release_client_site(WebBrowser *This) This->client_closed = NULL; } - if(This->shell_embedding_hwnd) { + if(destroy_win && This->shell_embedding_hwnd) { DestroyWindow(This->shell_embedding_hwnd); This->shell_embedding_hwnd = NULL; } @@ -459,6 +459,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE WebBrowser *This = impl_from_IOleObject(iface); IDocHostUIHandler *hostui; IOleCommandTarget *olecmd; + BOOL get_olecmd = TRUE; IOleContainer *container; IDispatch *disp; HRESULT hres; @@ -473,7 +474,14 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE if(This->client == pClientSite) return S_OK; - release_client_site(This); + if(This->client && pClientSite) { + get_olecmd = FALSE; + olecmd = This->doc_host.olecmd; + if(olecmd) + IOleCommandTarget_AddRef(olecmd); + } + + release_client_site(This, !pClientSite); if(!pClientSite) { on_commandstate_change(&This->doc_host, CSC_NAVIGATEBACK, FALSE); @@ -497,31 +505,46 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE if(SUCCEEDED(hres)) This->doc_host.hostui = hostui; - hres = IOleClientSite_GetContainer(This->client, &container); - if(SUCCEEDED(hres)) { - ITargetContainer *target_container; - - hres = IOleContainer_QueryInterface(container, &IID_ITargetContainer, - (void**)&target_container); + if(get_olecmd) { + hres = IOleClientSite_GetContainer(This->client, &container); if(SUCCEEDED(hres)) { - FIXME("Unsupported ITargetContainer\n"); - ITargetContainer_Release(target_container); + ITargetContainer *target_container; + + hres = IOleContainer_QueryInterface(container, &IID_ITargetContainer, + (void**)&target_container); + if(SUCCEEDED(hres)) { + FIXME("Unsupported ITargetContainer\n"); + ITargetContainer_Release(target_container); + } + + hres = IOleContainer_QueryInterface(container, &IID_IOleCommandTarget, (void**)&olecmd); + if(FAILED(hres)) + olecmd = NULL; + + IOleContainer_Release(container); + }else { + hres = IOleClientSite_QueryInterface(This->client, &IID_IOleCommandTarget, (void**)&olecmd); + if(FAILED(hres)) + olecmd = NULL; } - - hres = IOleContainer_QueryInterface(container, &IID_IOleCommandTarget, (void**)&olecmd); - if(FAILED(hres)) - olecmd = NULL; - - IOleContainer_Release(container); - }else { - hres = IOleClientSite_QueryInterface(This->client, &IID_IOleCommandTarget, (void**)&olecmd); - if(FAILED(hres)) - olecmd = NULL; } This->doc_host.olecmd = olecmd; - create_shell_embedding_hwnd(This); + if(This->shell_embedding_hwnd) { + IOleInPlaceSite *inplace; + HWND parent; + + hres = IOleClientSite_QueryInterface(This->client, &IID_IOleInPlaceSite, (void**)&inplace); + if(SUCCEEDED(hres)) { + hres = IOleInPlaceSite_GetWindow(inplace, &parent); + IOleInPlaceSite_Release(inplace); + if(SUCCEEDED(hres)) + SHSetParentHwnd(This->shell_embedding_hwnd, parent); + } + }else { + create_shell_embedding_hwnd(This); + } on_offlineconnected_change(This); on_silent_change(This); @@ -1198,5 +1221,5 @@ void WebBrowser_OleObject_Init(WebBrowser *This) void WebBrowser_OleObject_Destroy(WebBrowser *This) { - release_client_site(This); + release_client_site(This, TRUE); }

1 0

Daniel Lehman : ucrtbase: Add __std_exception_destroy/copy.
by Alexandre Julliard April 13, 2016

April 13, 2016

Module: wine Branch: master Commit: 4f6f0f09fd7a67e20376772faf1e1c02c9112422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f6f0f09fd7a67e20376772fa… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Apr 11 14:19:00 2016 -0700 ucrtbase: Add __std_exception_destroy/copy. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 4 +- dlls/msvcrt/except.c | 35 +++++++ dlls/ucrtbase/tests/Makefile.in | 1 + dlls/ucrtbase/tests/cpp.c | 103 +++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 +- dlls/vcruntime140/vcruntime140.spec | 4 +- 6 files changed, 145 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index b7b0eec..c85a998 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -42,8 +42,8 @@ @ stub __intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure -@ stub __std_exception_copy -@ stub __std_exception_destroy +@ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy +@ cdecl __std_exception_destroy(ptr) ucrtbase.__std_exception_destroy @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare @ stub __std_type_info_destroy_list @ stub __std_type_info_hash diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index fc0e36e..18c2f15 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -462,3 +462,38 @@ void CDECL __CxxUnregisterExceptionObject(cxx_frame_info *frame_info, BOOL in_us __DestructExceptionObject(data->exc_record); data->exc_record = frame_info->rec; } + +struct __std_exception_data { + char *what; + MSVCRT_bool dofree; +}; + +/********************************************************************* + * __std_exception_copy (MSVCRT.@) + */ +void CDECL MSVCRT___std_exception_copy(const struct __std_exception_data *src, + struct __std_exception_data *dst) +{ + TRACE("(%p %p)\n", src, dst); + + if(src->dofree && src->what) { + dst->what = MSVCRT__strdup(src->what); + dst->dofree = 1; + } else { + dst->what = src->what; + dst->dofree = 0; + } +} + +/********************************************************************* + * __std_exception_destroy (MSVCRT.@) + */ +void CDECL MSVCRT___std_exception_destroy(struct __std_exception_data *data) +{ + TRACE("(%p)\n", data); + + if(data->dofree) + MSVCRT_free(data->what); + data->what = NULL; + data->dofree = 0; +} diff --git a/dlls/ucrtbase/tests/Makefile.in b/dlls/ucrtbase/tests/Makefile.in index c4fa7c8..10e4f0d 100644 --- a/dlls/ucrtbase/tests/Makefile.in +++ b/dlls/ucrtbase/tests/Makefile.in @@ -2,5 +2,6 @@ TESTDLL = ucrtbase.dll APPMODE = -mno-cygwin C_SRCS = \ + cpp.c \ printf.c \ string.c diff --git a/dlls/ucrtbase/tests/cpp.c b/dlls/ucrtbase/tests/cpp.c new file mode 100644 index 0000000..12b0422 --- /dev/null +++ b/dlls/ucrtbase/tests/cpp.c @@ -0,0 +1,103 @@ +/* + * Copyright 2016 Daniel Lehman (Esri) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <errno.h> +#include <stdarg.h> +#include <stdlib.h> +#include <wchar.h> +#include <stdio.h> + +#include <windef.h> +#include <winbase.h> +#include "wine/test.h" + +typedef unsigned char MSVCRT_bool; + +typedef struct { + const char *what; + MSVCRT_bool dofree; +} __std_exception_data; + +static void (CDECL *p___std_exception_copy)(const __std_exception_data*, __std_exception_data*); +static void (CDECL *p___std_exception_destroy)(__std_exception_data*); + +static BOOL init(void) +{ + HMODULE module; + + module = LoadLibraryA("ucrtbase.dll"); + if (!module) + { + win_skip("ucrtbase.dll not installed\n"); + return FALSE; + } + + p___std_exception_copy = (void*)GetProcAddress(module, "__std_exception_copy"); + p___std_exception_destroy = (void*)GetProcAddress(module, "__std_exception_destroy"); + return TRUE; +} + +static void test___std_exception(void) +{ + __std_exception_data src; + __std_exception_data dst; + + if (0) /* crash on Windows */ + { + p___std_exception_copy(NULL, &src); + p___std_exception_copy(&dst, NULL); + + src.what = "invalid free"; + src.dofree = 1; + p___std_exception_destroy(&src); + p___std_exception_destroy(NULL); + } + + src.what = "what"; + src.dofree = 0; + p___std_exception_copy(&src, &dst); + ok(dst.what == src.what, "expected what to be same, got src %p dst %p\n", src.what, dst.what); + ok(!dst.dofree, "expected 0, got %d\n", dst.dofree); + + src.dofree = 0x42; + p___std_exception_copy(&src, &dst); + ok(dst.what != src.what, "expected what to be different, got src %p dst %p\n", src.what, dst.what); + ok(dst.dofree == 1, "expected 1, got %d\n", dst.dofree); + + p___std_exception_destroy(&dst); + ok(!dst.what, "expected NULL, got %p\n", dst.what); + ok(!dst.dofree, "expected 0, got %d\n", dst.dofree); + + src.what = NULL; + src.dofree = 0; + p___std_exception_copy(&src, &dst); + ok(!dst.what, "dst.what != NULL\n"); + ok(!dst.dofree, "dst.dofree != FALSE\n"); + + src.what = NULL; + src.dofree = 1; + p___std_exception_copy(&src, &dst); + ok(!dst.what, "dst.what != NULL\n"); + ok(!dst.dofree, "dst.dofree != FALSE\n"); +} + +START_TEST(cpp) +{ + if (!init()) return; + test___std_exception(); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 20e8de1..a54a71a 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -140,8 +140,8 @@ @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs @ stub __report_gsfailure @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __std_exception_copy -@ stub __std_exception_destroy +@ cdecl __std_exception_copy(ptr ptr) MSVCRT___std_exception_copy +@ cdecl __std_exception_destroy(ptr) MSVCRT___std_exception_destroy @ cdecl __std_type_info_compare(ptr ptr) MSVCRT_type_info_compare @ stub __std_type_info_destroy_list @ stub __std_type_info_hash diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index d8c33c4..ea8c93b 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -36,8 +36,8 @@ @ stub __intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure -@ stub __std_exception_copy -@ stub __std_exception_destroy +@ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy +@ cdecl __std_exception_destroy(ptr) ucrtbase.__std_exception_destroy @ stub __std_terminate @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare @ stub __std_type_info_destroy_list

1 0

Francois Gouget : wintrust: Fix spelling of a variable name.
by Alexandre Julliard April 13, 2016

April 13, 2016

Module: wine Branch: master Commit: 17d1126d03b69f4acb2e8734df3bd3da4cdc3b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17d1126d03b69f4acb2e8734d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 13 11:28:32 2016 +0200 wintrust: Fix spelling of a variable name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/register.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 303426c..b9a7559 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintrust); static CRYPT_TRUST_REG_ENTRY SoftpubInitialization; static CRYPT_TRUST_REG_ENTRY SoftpubMessage; static CRYPT_TRUST_REG_ENTRY SoftpubSignature; -static CRYPT_TRUST_REG_ENTRY SoftpubCertficate; +static CRYPT_TRUST_REG_ENTRY SoftpubCertificate; static CRYPT_TRUST_REG_ENTRY SoftpubCertCheck; static CRYPT_TRUST_REG_ENTRY SoftpubFinalPolicy; static CRYPT_TRUST_REG_ENTRY SoftpubCleanup; @@ -100,7 +100,7 @@ static void WINTRUST_InitRegStructs(void) WINTRUST_INITREGENTRY(SoftpubInitialization, SP_POLICY_PROVIDER_DLL_NAME, SP_INIT_FUNCTION) WINTRUST_INITREGENTRY(SoftpubMessage, SP_POLICY_PROVIDER_DLL_NAME, SP_OBJTRUST_FUNCTION) WINTRUST_INITREGENTRY(SoftpubSignature, SP_POLICY_PROVIDER_DLL_NAME, SP_SIGTRUST_FUNCTION) - WINTRUST_INITREGENTRY(SoftpubCertficate, SP_POLICY_PROVIDER_DLL_NAME, WT_PROVIDER_CERTTRUST_FUNCTION) + WINTRUST_INITREGENTRY(SoftpubCertificate, SP_POLICY_PROVIDER_DLL_NAME, WT_PROVIDER_CERTTRUST_FUNCTION) WINTRUST_INITREGENTRY(SoftpubCertCheck, SP_POLICY_PROVIDER_DLL_NAME, SP_CHKCERT_FUNCTION) WINTRUST_INITREGENTRY(SoftpubFinalPolicy, SP_POLICY_PROVIDER_DLL_NAME, SP_FINALPOLICY_FUNCTION) WINTRUST_INITREGENTRY(SoftpubCleanup, SP_POLICY_PROVIDER_DLL_NAME, SP_CLEANUPPOLICY_FUNCTION) @@ -134,7 +134,7 @@ static void WINTRUST_FreeRegStructs(void) WINTRUST_FREEREGENTRY(SoftpubInitialization); WINTRUST_FREEREGENTRY(SoftpubMessage); WINTRUST_FREEREGENTRY(SoftpubSignature); - WINTRUST_FREEREGENTRY(SoftpubCertficate); + WINTRUST_FREEREGENTRY(SoftpubCertificate); WINTRUST_FREEREGENTRY(SoftpubCertCheck); WINTRUST_FREEREGENTRY(SoftpubFinalPolicy); WINTRUST_FREEREGENTRY(SoftpubCleanup); @@ -432,7 +432,7 @@ static BOOL WINTRUST_RegisterGenVerifyV2(void) ProvInfo.sInitProvider = SoftpubInitialization; ProvInfo.sObjectProvider = SoftpubMessage; ProvInfo.sSignatureProvider = SoftpubSignature; - ProvInfo.sCertificateProvider = SoftpubCertficate; + ProvInfo.sCertificateProvider = SoftpubCertificate; ProvInfo.sCertificatePolicyProvider = SoftpubCertCheck; ProvInfo.sFinalPolicyProvider = SoftpubFinalPolicy; ProvInfo.sTestPolicyProvider = NullCTRE; /* No diagnostic policy */ @@ -465,7 +465,7 @@ static BOOL WINTRUST_RegisterPublishedSoftware(void) ProvInfo.sInitProvider = SoftpubInitialization; ProvInfo.sObjectProvider = SoftpubMessage; ProvInfo.sSignatureProvider = SoftpubSignature; - ProvInfo.sCertificateProvider = SoftpubCertficate; + ProvInfo.sCertificateProvider = SoftpubCertificate; ProvInfo.sCertificatePolicyProvider = SoftpubCertCheck; ProvInfo.sFinalPolicyProvider = SoftpubFinalPolicy; ProvInfo.sTestPolicyProvider = NullCTRE; /* No diagnostic policy */ @@ -497,7 +497,7 @@ static BOOL WINTRUST_RegisterPublishedSoftwareNoBadUi(void) ProvInfo.sInitProvider = SoftpubInitialization; ProvInfo.sObjectProvider = SoftpubMessage; ProvInfo.sSignatureProvider = SoftpubSignature; - ProvInfo.sCertificateProvider = SoftpubCertficate; + ProvInfo.sCertificateProvider = SoftpubCertificate; ProvInfo.sCertificatePolicyProvider = SoftpubCertCheck; ProvInfo.sFinalPolicyProvider = SoftpubFinalPolicy; ProvInfo.sTestPolicyProvider = NullCTRE; /* No diagnostic policy */ @@ -527,7 +527,7 @@ static BOOL WINTRUST_RegisterGenCertVerify(void) ProvInfo.sInitProvider = SoftpubDefCertInit; ProvInfo.sObjectProvider = SoftpubMessage; ProvInfo.sSignatureProvider = SoftpubSignature; - ProvInfo.sCertificateProvider = SoftpubCertficate; + ProvInfo.sCertificateProvider = SoftpubCertificate; ProvInfo.sCertificatePolicyProvider = SoftpubCertCheck; ProvInfo.sFinalPolicyProvider = SoftpubFinalPolicy; ProvInfo.sTestPolicyProvider = NullCTRE; /* No diagnostic policy */ @@ -557,7 +557,7 @@ static BOOL WINTRUST_RegisterTrustProviderTest(void) ProvInfo.sInitProvider = SoftpubInitialization; ProvInfo.sObjectProvider = SoftpubMessage; ProvInfo.sSignatureProvider = SoftpubSignature; - ProvInfo.sCertificateProvider = SoftpubCertficate; + ProvInfo.sCertificateProvider = SoftpubCertificate; ProvInfo.sCertificatePolicyProvider = SoftpubCertCheck; ProvInfo.sFinalPolicyProvider = SoftpubFinalPolicy; ProvInfo.sTestPolicyProvider = SoftpubDumpStructure; @@ -639,7 +639,7 @@ static BOOL WINTRUST_RegisterOfficeSignVerify(void) ProvInfo.sInitProvider = OfficeInitializePolicy; ProvInfo.sObjectProvider = SoftpubMessage; ProvInfo.sSignatureProvider = SoftpubSignature; - ProvInfo.sCertificateProvider = SoftpubCertficate; + ProvInfo.sCertificateProvider = SoftpubCertificate; ProvInfo.sCertificatePolicyProvider = SoftpubCertCheck; ProvInfo.sFinalPolicyProvider = SoftpubFinalPolicy; ProvInfo.sTestPolicyProvider = NullCTRE; /* No diagnostic policy */ @@ -670,7 +670,7 @@ static BOOL WINTRUST_RegisterDriverVerify(void) ProvInfo.sInitProvider = DriverInitializePolicy; ProvInfo.sObjectProvider = SoftpubMessage; ProvInfo.sSignatureProvider = SoftpubSignature; - ProvInfo.sCertificateProvider = SoftpubCertficate; + ProvInfo.sCertificateProvider = SoftpubCertificate; ProvInfo.sCertificatePolicyProvider = SoftpubCertCheck; ProvInfo.sFinalPolicyProvider = DriverFinalPolicy; ProvInfo.sTestPolicyProvider = NullCTRE; /* No diagnostic policy */

1 0

Hans Leidekker : webservices/tests: Add channel tests.
by Alexandre Julliard April 13, 2016

April 13, 2016

Module: wine Branch: master Commit: 1f79f36373a098e937d718b7dfe7c9f823979b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f79f36373a098e937d718b7d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 13 13:49:46 2016 +0200 webservices/tests: Add channel tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/Makefile.in | 1 + dlls/webservices/tests/channel.c | 63 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/dlls/webservices/tests/Makefile.in b/dlls/webservices/tests/Makefile.in index 1456b44..5f79fcb 100644 --- a/dlls/webservices/tests/Makefile.in +++ b/dlls/webservices/tests/Makefile.in @@ -2,5 +2,6 @@ TESTDLL = webservices.dll IMPORTS = webservices C_SRCS = \ + channel.c \ reader.c \ writer.c diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c new file mode 100644 index 0000000..82a7a69 --- /dev/null +++ b/dlls/webservices/tests/channel.c @@ -0,0 +1,63 @@ +/* + * Copyright 2016 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> +#include "windows.h" +#include "webservices.h" +#include "wine/test.h" + +static void test_WsCreateChannel(void) +{ + HRESULT hr; + WS_CHANNEL *channel; + WS_CHANNEL_STATE state; + ULONG size, value; + + hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, NULL, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + channel = NULL; + hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + ok( channel != NULL, "channel not set\n" ); + + value = 0xdeadbeef; + size = sizeof(value); + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE, &value, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( value == 65536, "got %u\n", value ); + + /* read-only property */ + state = 0xdeadbeef; + size = sizeof(state); + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_CHANNEL_STATE_CREATED, "got %u\n", state ); + + state = WS_CHANNEL_STATE_CREATED; + size = sizeof(state); + hr = WsSetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, size, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + WsFreeChannel( channel ); +} + +START_TEST(channel) +{ + test_WsCreateChannel(); +}

1 0