January 2012 - Wine-Commits

Henri Verbeet : wined3d: Get rid of the WINED3DTEXTURESTAGESTATETYPE typedef.
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

Module: wine Branch: master Commit: 43fcbcb36ee6fa128a68945861b5172ec6f7246d URL: http://source.winehq.org/git/wine.git/?a=commit;h=43fcbcb36ee6fa128a6894586… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 9 22:16:51 2012 +0100 wined3d: Get rid of the WINED3DTEXTURESTAGESTATETYPE typedef. --- dlls/d3d8/device.c | 60 +++--- dlls/d3d9/device.c | 70 ++++---- dlls/ddraw/device.c | 124 ++++++------ dlls/wined3d/arb_program_shader.c | 282 +++++++++++++------------- dlls/wined3d/ati_fragment_shader.c | 232 +++++++++++----------- dlls/wined3d/context.c | 4 +- dlls/wined3d/device.c | 42 ++-- dlls/wined3d/drawprim.c | 4 +- dlls/wined3d/glsl_shader.c | 6 +- dlls/wined3d/nvidia_texture_shader.c | 266 +++++++++++++------------ dlls/wined3d/shader.c | 4 +- dlls/wined3d/state.c | 361 +++++++++++++++++----------------- dlls/wined3d/stateblock.c | 74 ++++---- dlls/wined3d/utils.c | 62 +++--- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 50 +++--- 16 files changed, 827 insertions(+), 816 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43fcbcb36ee6fa128a689…

1 0

Matteo Bruni : d3d9/tests: Fix NP2 check.
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

Module: wine Branch: master Commit: 175a6d8d59a8a68e85aed876299ec18f514c2fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=175a6d8d59a8a68e85aed8762… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jan 9 15:52:46 2012 +0100 d3d9/tests: Fix NP2 check. --- dlls/d3d9/tests/visual.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e92ee0d..ccbbbeb 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7884,16 +7884,22 @@ static void conditional_np2_repeat_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(hr == D3D_OK, "IDirect3DDevice9_GetDeviceCaps failed hr=%08x\n", hr); - if(!(caps.TextureCaps & D3DPTEXTURECAPS_POW2)) { + if (caps.TextureCaps & D3DPTEXTURECAPS_NONPOW2CONDITIONAL) + { /* NP2 conditional requires the POW2 flag. Check that while we're at it */ - ok((caps.TextureCaps & D3DPTEXTURECAPS_NONPOW2CONDITIONAL) == 0, - "Card has conditional NP2 support without power of two restriction set\n"); - skip("Card has unconditional pow2 support, skipping conditional NP2 tests\n"); - return; - } else if(!(caps.TextureCaps & D3DPTEXTURECAPS_POW2)) { + ok(caps.TextureCaps & D3DPTEXTURECAPS_POW2, + "Card has conditional NP2 support without power of two restriction set\n"); + } + else if (caps.TextureCaps & D3DPTEXTURECAPS_POW2) + { skip("No conditional NP2 support, skipping conditional NP2 tests\n"); return; } + else + { + skip("Card has unconditional NP2 support, skipping conditional NP2 tests\n"); + return; + } hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%08x\n", hr);

1 0

Henri Verbeet : ddraw/tests: Add tests for clippers with a destroyed window .
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

Module: wine Branch: master Commit: e2765579bcafe0a21d671e5bc9605d68145429fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2765579bcafe0a21d671e5bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 9 22:16:48 2012 +0100 ddraw/tests: Add tests for clippers with a destroyed window. --- dlls/ddraw/clipper.c | 5 +++-- dlls/ddraw/tests/ddraw1.c | 12 ++++++++++++ dlls/ddraw/tests/ddraw2.c | 12 ++++++++++++ dlls/ddraw/tests/ddraw4.c | 12 ++++++++++++ dlls/ddraw/tests/ddraw7.c | 12 ++++++++++++ 5 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index fb5c022..6e40bab 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -104,7 +104,8 @@ static HRGN get_window_region(HWND window) if (!GetClientRect(window, &client_rect)) { - ERR("Failed to get client rect.\n"); + /* This can happen if the window is destroyed, for example. */ + WARN("Failed to get client rect.\n"); return NULL; } @@ -157,7 +158,7 @@ static HRESULT WINAPI ddraw_clipper_GetClipList(IDirectDrawClipper *iface, RECT if (!(region = get_window_region(clipper->window))) { wined3d_mutex_unlock(); - ERR("Failed to get window region.\n"); + WARN("Failed to get window region.\n"); return E_FAIL; } } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 09d632a..6612c4d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -328,6 +328,18 @@ static void test_clipper_blt(void) hr = IDirectDrawSurface_BltFast(dst_surface, 0, 0, src_surface, NULL, DDBLTFAST_WAIT); ok(hr == DDERR_BLTFASTCANTCLIP || broken(hr == E_NOTIMPL /* NT4 */), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawClipper_SetHWnd(clipper, 0, window); + ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(SUCCEEDED(hr), "Failed to get clip list size, hr %#x.\n", hr); + DestroyWindow(window); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawClipper_SetHWnd(clipper, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(SUCCEEDED(hr), "Failed to get clip list size, hr %#x.\n", hr); + IDirectDrawSurface_Release(dst_surface); IDirectDrawSurface_Release(src_surface); IDirectDrawClipper_Release(clipper); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 7ffa977..4d9bf98 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -335,6 +335,18 @@ static void test_clipper_blt(void) hr = IDirectDrawSurface_BltFast(dst_surface, 0, 0, src_surface, NULL, DDBLTFAST_WAIT); ok(hr == DDERR_BLTFASTCANTCLIP || broken(hr == E_NOTIMPL /* NT4 */), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawClipper_SetHWnd(clipper, 0, window); + ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(SUCCEEDED(hr), "Failed to get clip list size, hr %#x.\n", hr); + DestroyWindow(window); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawClipper_SetHWnd(clipper, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(SUCCEEDED(hr), "Failed to get clip list size, hr %#x.\n", hr); + IDirectDrawSurface_Release(dst_surface); IDirectDrawSurface_Release(src_surface); IDirectDrawClipper_Release(clipper); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 3f195b7..c3e550d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -630,6 +630,18 @@ static void test_clipper_blt(void) hr = IDirectDrawSurface4_BltFast(dst_surface, 0, 0, src_surface, NULL, DDBLTFAST_WAIT); ok(hr == DDERR_BLTFASTCANTCLIP, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawClipper_SetHWnd(clipper, 0, window); + ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(SUCCEEDED(hr), "Failed to get clip list size, hr %#x.\n", hr); + DestroyWindow(window); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawClipper_SetHWnd(clipper, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(SUCCEEDED(hr), "Failed to get clip list size, hr %#x.\n", hr); + IDirectDrawSurface4_Release(dst_surface); IDirectDrawSurface4_Release(src_surface); IDirectDrawClipper_Release(clipper); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 6075009..3cdfd2b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -623,6 +623,18 @@ static void test_clipper_blt(void) hr = IDirectDrawSurface7_BltFast(dst_surface, 0, 0, src_surface, NULL, DDBLTFAST_WAIT); ok(hr == DDERR_BLTFASTCANTCLIP, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawClipper_SetHWnd(clipper, 0, window); + ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(SUCCEEDED(hr), "Failed to get clip list size, hr %#x.\n", hr); + DestroyWindow(window); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawClipper_SetHWnd(clipper, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(SUCCEEDED(hr), "Failed to get clip list size, hr %#x.\n", hr); + IDirectDrawSurface7_Release(dst_surface); IDirectDrawSurface7_Release(src_surface); IDirectDrawClipper_Release(clipper);

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DTEXTURETRANSFORMFLAGS typedef.
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

Module: wine Branch: master Commit: 7f7bc520b6610528b5db351502299b4c9589d6b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f7bc520b6610528b5db35150… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 9 22:16:52 2012 +0100 wined3d: Get rid of the WINED3DTEXTURETRANSFORMFLAGS typedef. --- dlls/wined3d/glsl_shader.c | 53 ++++++++++++++++++++++++++------------ dlls/wined3d/shader.c | 12 ++++---- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/utils.c | 60 +++++++++++++++++++++++++++----------------- include/wine/wined3d.h | 17 ++++++------ 5 files changed, 88 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f7bc520b6610528b5db3…

1 0

Jörg Höhle : winealsa: Fix AudioRenderClient Get/ ReleaseBuffer protocol.
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

Module: wine Branch: master Commit: 2b51d38d3cf5e2f4e14d905c9263b1222dad3ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b51d38d3cf5e2f4e14d905c9… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 5 18:24:20 2012 +0100 winealsa: Fix AudioRenderClient Get/ReleaseBuffer protocol. --- dlls/winealsa.drv/mmdevdrv.c | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index a2a2a7d..29933e8 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -116,6 +116,7 @@ struct ACImpl { HANDLE timer; BYTE *local_buffer, *tmp_buffer; int buf_state; + long getbuf_last; /* <0 when using tmp_buffer */ CRITICAL_SECTION lock; @@ -1763,7 +1764,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) return AUDCLNT_E_NOT_STOPPED; } - if(This->buf_state != NOT_LOCKED){ + if(This->buf_state != NOT_LOCKED || This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_BUFFER_OPERATION_PENDING; } @@ -1964,16 +1965,16 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, if(!data) return E_POINTER; + *data = NULL; EnterCriticalSection(&This->lock); - if(This->buf_state != NOT_LOCKED){ + if(This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } if(!frames){ - This->buf_state = LOCKED_NORMAL; LeaveCriticalSection(&This->lock); return S_OK; } @@ -2003,10 +2004,10 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, This->tmp_buffer_frames = frames; } *data = This->tmp_buffer; - This->buf_state = LOCKED_WRAPPED; + This->getbuf_last = -frames; }else{ *data = This->local_buffer + write_pos * This->fmt->nBlockAlign; - This->buf_state = LOCKED_NORMAL; + This->getbuf_last = frames; } LeaveCriticalSection(&This->lock); @@ -2042,13 +2043,23 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( EnterCriticalSection(&This->lock); - if(This->buf_state == NOT_LOCKED || !written_frames){ - This->buf_state = NOT_LOCKED; + if(!written_frames){ + This->getbuf_last = 0; LeaveCriticalSection(&This->lock); - return written_frames ? AUDCLNT_E_OUT_OF_ORDER : S_OK; + return S_OK; } - if(This->buf_state == LOCKED_NORMAL) + if(!This->getbuf_last){ + LeaveCriticalSection(&This->lock); + return AUDCLNT_E_OUT_OF_ORDER; + } + + if(written_frames > (This->getbuf_last >= 0 ? This->getbuf_last : -This->getbuf_last)){ + LeaveCriticalSection(&This->lock); + return AUDCLNT_E_INVALID_SIZE; + } + + if(This->getbuf_last >= 0) buffer = This->local_buffer + This->fmt->nBlockAlign * ((This->lcl_offs_frames + This->held_frames) % This->bufsize_frames); else @@ -2061,12 +2072,12 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( memset(buffer, 0, written_frames * This->fmt->nBlockAlign); } - if(This->buf_state == LOCKED_WRAPPED) + if(This->getbuf_last < 0) alsa_wrap_buffer(This, buffer, written_frames); This->held_frames += written_frames; This->written_frames += written_frames; - This->buf_state = NOT_LOCKED; + This->getbuf_last = 0; LeaveCriticalSection(&This->lock);

1 0

Matteo Bruni : d3d9/tests: Multisampled depth buffer tests.
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

Module: wine Branch: master Commit: 9fb3e0fb62d5769e1f09b5d82f1192723bf1d39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb3e0fb62d5769e1f09b5d82… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jan 9 15:52:47 2012 +0100 d3d9/tests: Multisampled depth buffer tests. --- dlls/d3d9/tests/visual.c | 253 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 241 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9fb3e0fb62d5769e1f09b…

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: 4777a1c1c97e90765610e6eb7840c68f11ff7482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4777a1c1c97e90765610e6eb7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 8 16:11:22 2012 +0100 po: Update German translation. --- po/de.po | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index e962a22..47813e9 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-01-05 19:30+0100\n" +"PO-Revision-Date: 2012-01-08 16:10+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -1301,7 +1301,7 @@ msgstr "CPS" #: crypt32.rc:54 cryptdlg.rc:32 msgid "User Notice" -msgstr "Benutzerbenachrichtung" +msgstr "Benutzerbenachrichtigung" #: crypt32.rc:55 msgid "On-line Certificate Status Protocol" @@ -8771,7 +8771,7 @@ msgid "" "Cannot carry out the specified command on an auto-opened device. Wait until " "the device is closed, and then try again." msgstr "" -"Der Befehl kann nicht auf ein selbst öffnedes Gerät angewandt werden. Warten " +"Der Befehl kann nicht auf ein selbst öffnendes Gerät angewandt werden. Warten " "Sie, bis das Gerät geschlossen wurde und versuchen Sie es erneut." #: winmm.rc:99 @@ -13126,9 +13126,8 @@ msgid "&Color" msgstr "F&arbe" #: wineconsole.rc:97 -#, fuzzy msgid "Configuration" -msgstr " Konfiguration " +msgstr "Konfiguration" #: wineconsole.rc:100 msgid "Buffer zone"

1 0

Jacek Caban : ieframe: Store embedder iface as IWebBrowser2 in DocHost.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: a8816f51d8c5e67f88cbcf98400e1859ed1dac6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8816f51d8c5e67f88cbcf984… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 9 17:56:05 2012 +0100 ieframe: Store embedder iface as IWebBrowser2 in DocHost. --- dlls/ieframe/client.c | 6 +++--- dlls/ieframe/dochost.c | 8 ++++---- dlls/ieframe/ieframe.h | 4 ++-- dlls/ieframe/iexplore.c | 2 +- dlls/ieframe/navigate.c | 4 ++-- dlls/ieframe/shellbrowser.c | 6 +++--- dlls/ieframe/webbrowser.c | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ieframe/client.c b/dlls/ieframe/client.c index 6a567ae..dd1d9db 100644 --- a/dlls/ieframe/client.c +++ b/dlls/ieframe/client.c @@ -471,7 +471,7 @@ static HRESULT WINAPI ControlSite_TranslateAccelerator(IOleControlSite *iface, M TRACE("(%p)->(%p, %08x)\n", This, pMsg, grfModifiers); - hr = IDispatch_QueryInterface(This->disp, &IID_IOleObject, (void**)&wb_obj); + hr = IWebBrowser2_QueryInterface(This->wb, &IID_IOleObject, (void**)&wb_obj); if(SUCCEEDED(hr)) { hr = IOleObject_GetClientSite(wb_obj, &clientsite); if(SUCCEEDED(hr)) { @@ -663,12 +663,12 @@ static HRESULT WINAPI ClServiceProvider_QueryService(IServiceProvider *iface, RE if(IsEqualGUID(&IID_IHlinkFrame, guidService)) { TRACE("(%p)->(IID_IHlinkFrame %s %p)\n", This, debugstr_guid(riid), ppv); - return IDispatch_QueryInterface(This->disp, riid, ppv); + return IWebBrowser2_QueryInterface(This->wb, riid, ppv); } if(IsEqualGUID(&IID_IWebBrowserApp, guidService)) { TRACE("IWebBrowserApp service\n"); - return IDispatch_QueryInterface(This->disp, riid, ppv); + return IWebBrowser2_QueryInterface(This->wb, riid, ppv); } if(IsEqualGUID(&IID_IShellBrowser, guidService)) { diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index ebc5978..d59c335 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -91,7 +91,7 @@ static void notif_complete(DocHost *This, DISPID dispid) V_BYREF(params) = &url; V_VT(params+1) = VT_DISPATCH; - V_DISPATCH(params+1) = This->disp; + V_DISPATCH(params+1) = (IDispatch*)This->wb; V_VT(&url) = VT_BSTR; V_BSTR(&url) = SysAllocString(This->url); @@ -871,13 +871,13 @@ static const IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { PropertyNotifySink_OnRequestEdit }; -void DocHost_Init(DocHost *This, IDispatch *disp, const IDocHostContainerVtbl* container) +void DocHost_Init(DocHost *This, IWebBrowser2 *wb, const IDocHostContainerVtbl* container) { This->IDocHostUIHandler2_iface.lpVtbl = &DocHostUIHandler2Vtbl; This->IOleCommandTarget_iface.lpVtbl = &OleCommandTargetVtbl; This->IPropertyNotifySink_iface.lpVtbl = &PropertyNotifySinkVtbl; - This->disp = disp; + This->wb = wb; This->container_vtbl = container; This->ready_state = READYSTATE_UNINITIALIZED; @@ -886,7 +886,7 @@ void DocHost_Init(DocHost *This, IDispatch *disp, const IDocHostContainerVtbl* c DocHost_ClientSite_Init(This); DocHost_Frame_Init(This); - ConnectionPointContainer_Init(&This->cps, (IUnknown*)disp); + ConnectionPointContainer_Init(&This->cps, (IUnknown*)wb); IEHTMLWindow_Init(This); NewWindowManager_Init(This); } diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index b7a7b02..60a65fb 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -118,7 +118,7 @@ struct DocHost { /* Interfaces of InPlaceFrame object */ IOleInPlaceFrame IOleInPlaceFrame_iface; - IDispatch *disp; + IWebBrowser2 *wb; IDispatch *client_disp; IDocHostUIHandler *hostui; @@ -231,7 +231,7 @@ void WebBrowser_ClassInfo_Init(WebBrowser*) DECLSPEC_HIDDEN; void WebBrowser_OleObject_Destroy(WebBrowser*) DECLSPEC_HIDDEN; -void DocHost_Init(DocHost*,IDispatch*,const IDocHostContainerVtbl*) DECLSPEC_HIDDEN; +void DocHost_Init(DocHost*,IWebBrowser2*,const IDocHostContainerVtbl*) DECLSPEC_HIDDEN; void DocHost_Release(DocHost*) DECLSPEC_HIDDEN; void DocHost_ClientSite_Init(DocHost*) DECLSPEC_HIDDEN; void DocHost_ClientSite_Release(DocHost*) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index cbab8f5..2d9bca3 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -789,7 +789,7 @@ static HRESULT create_ie(InternetExplorer **ret_obj) ret->doc_host->ref = 1; ret->doc_host->ie = ret; - DocHost_Init(&ret->doc_host->doc_host, (IDispatch*)&ret->IWebBrowser2_iface, &DocHostContainerVtbl); + DocHost_Init(&ret->doc_host->doc_host, &ret->IWebBrowser2_iface, &DocHostContainerVtbl); InternetExplorer_WebBrowser_Init(ret); diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index a12b195..6a74d2e 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -329,7 +329,7 @@ void handle_navigation_error(DocHost* doc_host, HRESULT hres, BSTR url, IHTMLWin V_BSTR(&var_url) = url; V_VT(params+4) = VT_DISPATCH; - V_DISPATCH(params+4) = doc_host->disp; + V_DISPATCH(params+4) = (IDispatch*)doc_host->wb; call_sink(doc_host->cps.wbe2, DISPID_NAVIGATEERROR, &dispparams); SysFreeString(V_BSTR(&var_frame_name)); @@ -551,7 +551,7 @@ static void on_before_navigate2(DocHost *This, LPCWSTR url, SAFEARRAY *post_data V_BSTR(&var_url) = SysAllocString(url); V_VT(params+6) = (VT_DISPATCH); - V_DISPATCH(params+6) = This->disp; + V_DISPATCH(params+6) = (IDispatch*)This->wb; call_sink(This->cps.wbe2, DISPID_BEFORENAVIGATE2, &dispparams); diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index b97f3f9..86bba68 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -706,7 +706,7 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( V_BSTR(&var_url) = SysAllocString(lpszUrl); V_VT(params+6) = (VT_DISPATCH); - V_DISPATCH(params+6) = This->doc_host->disp; + V_DISPATCH(params+6) = (IDispatch*)This->doc_host->wb; TRACE(">>>\n"); call_sink(This->doc_host->cps.wbe2, DISPID_BEFORENAVIGATE2, &dp); @@ -751,7 +751,7 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( V_BYREF(params) = &url; V_VT(params+1) = VT_DISPATCH; - V_DISPATCH(params+1) = This->doc_host->disp; + V_DISPATCH(params+1) = (IDispatch*)This->doc_host->wb; V_VT(&url_var) = VT_BSTR; V_BSTR(&url_var) = url; @@ -812,7 +812,7 @@ static HRESULT WINAPI DocObjectService_FireDocumentComplete( V_BYREF(params) = &url; V_VT(params+1) = VT_DISPATCH; - V_DISPATCH(params+1) = This->doc_host->disp; + V_DISPATCH(params+1) = (IDispatch*)This->doc_host->wb; V_VT(&url_var) = VT_BSTR; V_BSTR(&url_var) = url; diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index ff026db..2d4d818 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -1252,7 +1252,7 @@ static HRESULT create_webbrowser(int version, IUnknown *outer, REFIID riid, void ret->ref = 1; ret->version = version; - DocHost_Init(&ret->doc_host, (IDispatch*)&ret->IWebBrowser2_iface, &DocHostContainerVtbl); + DocHost_Init(&ret->doc_host, &ret->IWebBrowser2_iface, &DocHostContainerVtbl); ret->visible = VARIANT_TRUE; ret->menu_bar = VARIANT_TRUE;

1 0

Jacek Caban : mshtml: Added IHTMLWindow::open implementation.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: d870b8c3e37f91e885dabc99eca4b0e05539e486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d870b8c3e37f91e885dabc99e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 9 17:56:54 2012 +0100 mshtml: Added IHTMLWindow::open implementation. --- dlls/mshtml/binding.h | 1 + dlls/mshtml/htmlwindow.c | 43 ++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 57 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/htmldoc.c | 4 --- 5 files changed, 100 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 0d7a3a7..dfb14cf 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -108,6 +108,7 @@ HRESULT load_nsuri(HTMLWindow*,nsWineURI*,nsChannelBSC*,DWORD) DECLSPEC_HIDDEN; HRESULT set_moniker(HTMLDocument*,IMoniker*,IBindCtx*,nsChannelBSC*,BOOL) DECLSPEC_HIDDEN; void prepare_for_binding(HTMLDocument*,IMoniker*,BOOL) DECLSPEC_HIDDEN; HRESULT super_navigate(HTMLWindow*,IUri*,const WCHAR*,BYTE*,DWORD) DECLSPEC_HIDDEN; +HRESULT navigate_new_window(HTMLWindow*,IUri*,const WCHAR*,IHTMLWindow2**) DECLSPEC_HIDDEN; HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,nsChannelBSC**) DECLSPEC_HIDDEN; HRESULT channelbsc_load_stream(nsChannelBSC*,IStream*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index f907776..654f2e0 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -26,6 +26,7 @@ #include "ole2.h" #include "mshtmdid.h" #include "shlguid.h" +#include "shobjidl.h" #define NO_SHLWAPI_REG #include "shlwapi.h" @@ -776,9 +777,47 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, BSTR features, VARIANT_BOOL replace, IHTMLWindow2 **pomWindowResult) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s %s %s %x %p)\n", This, debugstr_w(url), debugstr_w(name), + INewWindowManager *new_window_mgr; + IUri *uri; + HRESULT hres; + + TRACE("(%p)->(%s %s %s %x %p)\n", This, debugstr_w(url), debugstr_w(name), debugstr_w(features), replace, pomWindowResult); - return E_NOTIMPL; + + if(!This->doc_obj) + return E_UNEXPECTED; + + if(name && *name == '_') { + FIXME("Unsupported name %s\n", debugstr_w(name)); + return E_NOTIMPL; + } + + hres = do_query_service((IUnknown*)This->doc_obj->client, &SID_SNewWindowManager, &IID_INewWindowManager, + (void**)&new_window_mgr); + if(FAILED(hres)) { + FIXME("No INewWindowManager\n"); + return E_NOTIMPL; + } + + hres = INewWindowManager_EvaluateNewWindow(new_window_mgr, url, name, This->url, + features, !!replace, This->doc_obj->has_popup ? 0 : NWMF_FIRST, 0); + INewWindowManager_Release(new_window_mgr); + This->doc_obj->has_popup = TRUE; + if(FAILED(hres)) { + *pomWindowResult = NULL; + return S_OK; + } + + if(This->uri) + hres = CoInternetCombineUrlEx(This->uri, url, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, &uri, 0); + else + hres = CreateUri(url, 0, 0, &uri); + if(FAILED(hres)) + return hres; + + hres = navigate_new_window(This, uri, name, pomWindowResult); + IUri_Release(uri); + return hres; } static HRESULT WINAPI HTMLWindow2_get_self(IHTMLWindow2 *iface, IHTMLWindow2 **p) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 0c6d73f..5480435 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -466,6 +466,7 @@ struct HTMLDocumentObj { BOOL is_webbrowser; BOOL container_locked; BOOL focus; + BOOL has_popup; INT download_state; USERMODE usermode; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index bfee591..f5375e4 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -33,6 +33,8 @@ #include "shlguid.h" #include "wininet.h" #include "shlwapi.h" +#include "htiface.h" +#include "shdeprecated.h" #include "wine/debug.h" @@ -44,6 +46,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define CONTENT_LENGTH "Content-Length" #define UTF16_STR "utf-16" +static const WCHAR emptyW[] = {0}; + struct nsProtocolStream { nsIInputStream nsIInputStream_iface; @@ -1977,6 +1981,59 @@ HRESULT super_navigate(HTMLWindow *window, IUri *uri, const WCHAR *headers, BYTE return S_OK; } +HRESULT navigate_new_window(HTMLWindow *window, IUri *uri, const WCHAR *name, IHTMLWindow2 **ret) +{ + IWebBrowser2 *web_browser; + IHTMLWindow2 *new_window; + IBindCtx *bind_ctx; + nsChannelBSC *bsc; + HRESULT hres; + + hres = create_channelbsc(NULL, NULL, NULL, 0, &bsc); + if(FAILED(hres)) + return hres; + + hres = CreateAsyncBindCtx(0, &bsc->bsc.IBindStatusCallback_iface, NULL, &bind_ctx); + if(FAILED(hres)) { + IBindStatusCallback_Release(&bsc->bsc.IBindStatusCallback_iface); + return hres; + } + + hres = CoCreateInstance(&CLSID_InternetExplorer, NULL, CLSCTX_LOCAL_SERVER, + &IID_IWebBrowser2, (void**)&web_browser); + if(SUCCEEDED(hres)) { + ITargetFramePriv2 *target_frame_priv; + + hres = IWebBrowser_QueryInterface(web_browser, &IID_ITargetFramePriv2, (void**)&target_frame_priv); + if(SUCCEEDED(hres)) { + hres = ITargetFramePriv2_AggregatedNavigation2(target_frame_priv, + HLNF_DISABLEWINDOWRESTRICTIONS|HLNF_OPENINNEWWINDOW, bind_ctx, &bsc->bsc.IBindStatusCallback_iface, + name, uri, emptyW); + ITargetFramePriv2_Release(target_frame_priv); + + if(SUCCEEDED(hres)) + hres = do_query_service((IUnknown*)web_browser, &SID_SHTMLWindow, &IID_IHTMLWindow2, (void**)&new_window); + } + if(FAILED(hres)) { + IWebBrowser2_Quit(web_browser); + IWebBrowser2_Release(web_browser); + } + }else { + WARN("Could not create InternetExplorer instance: %08x\n", hres); + } + + IBindStatusCallback_Release(&bsc->bsc.IBindStatusCallback_iface); + IBindCtx_Release(bind_ctx); + if(FAILED(hres)) + return hres; + + IWebBrowser2_put_Visible(web_browser, VARIANT_TRUE); + IWebBrowser2_Release(web_browser); + + *ret = new_window; + return S_OK; +} + HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, nsChannel *nschannel, DWORD hlnf, BOOL *cancel) { IHlinkFrame *hlink_frame; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index d72eb1b..174b448 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -5194,19 +5194,15 @@ static void test_open_window(IHTMLDocument2 *doc) CHECK_CALLED(TranslateUrl); if(!called_EvaluateNewWindow) { - todo_wine win_skip("INewWindowManager not supported\n"); if(SUCCEEDED(hres) && new_window) IHTMLWindow2_Release(new_window); IHTMLWindow2_Release(window); return; } - todo_wine CHECK_CALLED(EvaluateNewWindow); - todo_wine ok(hres == S_OK, "open failed: %08x\n", hres); - todo_wine ok(new_window == NULL, "new_window != NULL\n"); IHTMLWindow2_Release(window);

1 0

Jacek Caban : ieframe: Added semi-stub IHTMLWindow2::close implementation.
by Alexandre Julliard Jan. 9, 2012

Jan. 9, 2012

Module: wine Branch: master Commit: c3f681788b7dad81ce6948969d704e51251e38dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3f681788b7dad81ce6948969… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 9 17:56:26 2012 +0100 ieframe: Added semi-stub IHTMLWindow2::close implementation. --- dlls/ieframe/iehtmlwnd.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/iehtmlwnd.c b/dlls/ieframe/iehtmlwnd.c index 1d1f214..04f6dfa 100644 --- a/dlls/ieframe/iehtmlwnd.c +++ b/dlls/ieframe/iehtmlwnd.c @@ -215,8 +215,13 @@ static HRESULT WINAPI IEHTMLWindow2_get_history(IHTMLWindow2 *iface, IOmHistory static HRESULT WINAPI IEHTMLWindow2_close(IHTMLWindow2 *iface) { IEHTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + FIXME("(%p) semi-stub\n", This); + + if(!This->doc_host->wb) + return E_UNEXPECTED; + + return IWebBrowser2_put_Visible(This->doc_host->wb, VARIANT_FALSE); } static HRESULT WINAPI IEHTMLWindow2_put_opener(IHTMLWindow2 *iface, VARIANT v)

1 0