wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

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

10 Jan '12

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

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

10 Jan '12

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

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

10 Jan '12

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

Henri Verbeet : wined3d: Simplify transform flag handling in find_ps_compile_args().
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 40e8d8542699f3c27ead7d7622914c50ca695df1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40e8d8542699f3c27ead7d762… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 9 22:16:50 2012 +0100 wined3d: Simplify transform flag handling in find_ps_compile_args(). --- dlls/wined3d/shader.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b3d2f7f..1553bf4 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1911,24 +1911,13 @@ void find_ps_compile_args(const struct wined3d_state *state, for (i = 0; i < 4; ++i) { DWORD flags = state->texture_states[i][WINED3DTSS_TEXTURETRANSFORMFLAGS]; - DWORD count, tex_transform = 0; - - /* Filter some invalid flags */ - count = flags & ~WINED3DTTFF_PROJECTED; - if (count > WINED3DTTFF_COUNT4 || (!(flags & WINED3DTTFF_PROJECTED) && count != 0)) - { - WARN("The application set an invalid %#x TEXTURETRANSFORMFLAGS value.\n", flags); - count = 0; - } if (flags & WINED3DTTFF_PROJECTED) { enum wined3d_sampler_texture_type sampler_type = shader->reg_maps.sampler_type[i]; + DWORD tex_transform = flags & ~WINED3DTTFF_PROJECTED; DWORD max_valid = WINED3DTTFF_COUNT4; - if (!count) - count = WINED3DTTFF_COUNT4; - if (!state->vertex_shader) { unsigned int j; @@ -1947,10 +1936,12 @@ void find_ps_compile_args(const struct wined3d_state *state, } } - tex_transform = min(count, max_valid); - if (tex_transform != (flags & ~WINED3DTTFF_PROJECTED)) - WARN("Fixing up %#x projected texture transform flag to %#x.\n", - flags & ~WINED3DTTFF_PROJECTED, tex_transform); + if (!tex_transform || tex_transform > max_valid) + { + WARN("Fixing up projected texture transform flags from %#x to %#x.\n", + tex_transform, max_valid); + tex_transform = max_valid; + } if ((sampler_type == WINED3DSTT_1D && tex_transform > WINED3DTTFF_COUNT1) || (sampler_type == WINED3DSTT_2D && tex_transform > WINED3DTTFF_COUNT2) @@ -1958,9 +1949,9 @@ void find_ps_compile_args(const struct wined3d_state *state, tex_transform |= WINED3D_PSARGS_PROJECTED; else WARN("Application requested projected texture with unsuitable texture coordinates.\n"); + + args->tex_transform |= tex_transform << i * WINED3D_PSARGS_TEXTRANSFORM_SHIFT; } - tex_transform &= WINED3D_PSARGS_TEXTRANSFORM_MASK; - args->tex_transform |= tex_transform << i * WINED3D_PSARGS_TEXTRANSFORM_SHIFT; } }

1 0

Henri Verbeet : ddraw: Properly clear the clip list if ddraw_clipper_SetClipList() is called with NULL region data.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 1ef86ad59649372449885cfb8d832b476740cc3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef86ad59649372449885cfb8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 9 22:16:49 2012 +0100 ddraw: Properly clear the clip list if ddraw_clipper_SetClipList() is called with NULL region data. --- dlls/ddraw/clipper.c | 6 ++++-- dlls/ddraw/tests/ddraw1.c | 6 ++++++ dlls/ddraw/tests/ddraw2.c | 6 ++++++ dlls/ddraw/tests/ddraw4.c | 6 ++++++ dlls/ddraw/tests/ddraw7.c | 6 ++++++ 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index 6e40bab..81e9e8b 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -238,10 +238,12 @@ static HRESULT WINAPI ddraw_clipper_SetClipList(IDirectDrawClipper *iface, RGNDA if (clipper->region) DeleteObject(clipper->region); - if (!(clipper->region = ExtCreateRegion(NULL, 0, region))) + if (!region) + clipper->region = NULL; + else if (!(clipper->region = ExtCreateRegion(NULL, 0, region))) { wined3d_mutex_unlock(); - ERR("Failed to create creation.\n"); + ERR("Failed to create region.\n"); return E_FAIL; } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 6612c4d..13464af 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -339,6 +339,12 @@ static void test_clipper_blt(void) 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); + hr = IDirectDrawClipper_SetClipList(clipper, NULL, 0); + ok(SUCCEEDED(hr), "Failed to set clip list, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(hr == DDERR_NOCLIPLIST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(hr == DDERR_NOCLIPLIST, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface_Release(dst_surface); IDirectDrawSurface_Release(src_surface); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 4d9bf98..8146ff6 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -346,6 +346,12 @@ static void test_clipper_blt(void) 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); + hr = IDirectDrawClipper_SetClipList(clipper, NULL, 0); + ok(SUCCEEDED(hr), "Failed to set clip list, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(hr == DDERR_NOCLIPLIST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(hr == DDERR_NOCLIPLIST, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface_Release(dst_surface); IDirectDrawSurface_Release(src_surface); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index c3e550d..65725b3 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -641,6 +641,12 @@ static void test_clipper_blt(void) 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); + hr = IDirectDrawClipper_SetClipList(clipper, NULL, 0); + ok(SUCCEEDED(hr), "Failed to set clip list, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(hr == DDERR_NOCLIPLIST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(hr == DDERR_NOCLIPLIST, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface4_Release(dst_surface); IDirectDrawSurface4_Release(src_surface); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 3cdfd2b..0826346 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -634,6 +634,12 @@ static void test_clipper_blt(void) 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); + hr = IDirectDrawClipper_SetClipList(clipper, NULL, 0); + ok(SUCCEEDED(hr), "Failed to set clip list, hr %#x.\n", hr); + hr = IDirectDrawClipper_GetClipList(clipper, NULL, NULL, &ret); + ok(hr == DDERR_NOCLIPLIST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(hr == DDERR_NOCLIPLIST, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface7_Release(dst_surface); IDirectDrawSurface7_Release(src_surface);

1 0

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

10 Jan '12

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

Jacek Caban : mshtml: Added more IHTMLWindow2::open tests.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: c7cc9a1a5d1b57b2fd9a4c09d4bec28e9763c759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7cc9a1a5d1b57b2fd9a4c09d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 9 17:57:07 2012 +0100 mshtml: Added more IHTMLWindow2::open tests. --- dlls/mshtml/tests/htmldoc.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 174b448..fb615fb 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -41,6 +41,7 @@ #include "shdeprecated.h" #include "perhist.h" #include "shobjidl.h" +#include "htiface.h" #include "mshtml_test.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -199,7 +200,7 @@ static BOOL inplace_deactivated, open_call; static BOOL complete, loading_js, loading_hash; static DWORD status_code = HTTP_STATUS_OK; static BOOL asynchronous_binding = FALSE; -static BOOL support_wbapp; +static BOOL support_wbapp, allow_new_window; static int stream_read, protocol_read; static enum load_state_t { LD_DOLOAD, @@ -828,10 +829,10 @@ static HRESULT WINAPI NewWindowManager_EvaluateNewWindow(INewWindowManager *ifac ok(!strcmp_wa(pszUrlContext, "about:replace"), "pszUrlContext = %s\n", wine_dbgstr_w(pszUrlContext)); ok(!pszFeatures, "pszFeatures = %s\n", wine_dbgstr_w(pszFeatures)); ok(!fReplace, "fReplace = %x\n", fReplace); - ok(dwFlags == NWMF_FIRST, "dwFlags = %x\n", dwFlags); + ok(dwFlags == (allow_new_window ? 0 : NWMF_FIRST), "dwFlags = %x\n", dwFlags); ok(!dwUserActionTime, "dwUserActionime = %d\n", dwUserActionTime); - return E_FAIL; + return allow_new_window ? S_OK : E_FAIL; } static const INewWindowManagerVtbl NewWindowManagerVtbl = { @@ -5162,12 +5163,14 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *hre nav_url = prev_nav_url; } -static void test_open_window(IHTMLDocument2 *doc) +static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) { IHTMLWindow2 *window, *new_window; BSTR name, url; HRESULT hres; + allow_new_window = !do_block; + hres = IHTMLDocument2_get_parentWindow(doc, &window); ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); @@ -5203,7 +5206,16 @@ static void test_open_window(IHTMLDocument2 *doc) CHECK_CALLED(EvaluateNewWindow); ok(hres == S_OK, "open failed: %08x\n", hres); - ok(new_window == NULL, "new_window != NULL\n"); + + if(do_block) { + ok(!new_window, "new_window != NULL\n"); + }else { + ok(new_window != NULL, "new_window == NULL\n"); + + trace("WINDOW %p\n", new_window); + hres = IHTMLWindow2_close(new_window); + ok(hres == S_OK, "close failed: %08x\n", hres); + } IHTMLWindow2_Release(window); } @@ -6535,7 +6547,9 @@ static void test_HTMLDocument_http(BOOL with_wbapp) test_put_href(doc, FALSE, NULL, "about:blank", FALSE, FALSE); test_put_href(doc, TRUE, NULL, "about:replace", FALSE, FALSE); - test_open_window(doc); + test_open_window(doc, TRUE); + if(!support_wbapp) /* FIXME */ + test_open_window(doc, FALSE); test_InPlaceDeactivate(doc, TRUE); test_Close(doc, FALSE);

1 0

Jacek Caban : mshtml: Added IHTMLWindow::open implementation.
by Alexandre Julliard 09 Jan '12

09 Jan '12

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 implementation of AggregatedNavigation2.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 5fb52f2db0875d3faf0c7b36757d575f48ba3a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb52f2db0875d3faf0c7b367… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 9 17:56:41 2012 +0100 ieframe: Added implementation of AggregatedNavigation2. --- dlls/ieframe/navigate.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 6a74d2e..8d2636b 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -1302,9 +1302,25 @@ static HRESULT WINAPI TargetFramePriv2_AggregatedNavigation2(ITargetFramePriv2 * IBindStatusCallback *pibsc, LPCWSTR pszTargetName, IUri *pUri, LPCWSTR pszLocation) { HlinkFrame *This = impl_from_ITargetFramePriv2(iface); - FIXME("(%p)->(%x %p %p %s %p %s)\n", This, grfHLNF, pbc, pibsc, debugstr_w(pszTargetName), + IMoniker *mon; + HRESULT hres; + + TRACE("(%p)->(%x %p %p %s %p %s)\n", This, grfHLNF, pbc, pibsc, debugstr_w(pszTargetName), pUri, debugstr_w(pszLocation)); - return E_NOTIMPL; + + /* + * NOTE: This is an undocumented function. It seems to be working the way it's implemented, + * but I couldn't get its tests working. It's used by mshtml to load content in a new + * instance of browser. + */ + + hres = CreateURLMonikerEx2(NULL, pUri, &mon, 0); + if(FAILED(hres)) + return hres; + + hres = navigate_hlink(This->doc_host, mon, pbc, pibsc); + IMoniker_Release(mon); + return hres; } static const ITargetFramePriv2Vtbl TargetFramePriv2Vtbl = {

1 0

Jacek Caban : ieframe: Added semi-stub IHTMLWindow2::close implementation.
by Alexandre Julliard 09 Jan '12

09 Jan '12

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

← Newer
1
...
72
73
74
75
76
77
78
...
98
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2012