August 2011 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Pass a gl_info pointer to select_blit_implementation().
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 4503f3d5afa7bc634cb6d2a31f32fbec232298e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4503f3d5afa7bc634cb6d2a31… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:50 2011 +0200 wined3d: Pass a gl_info pointer to select_blit_implementation(). --- dlls/wined3d/directx.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index efee8fb..a43dc9f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2162,9 +2162,8 @@ static const struct wined3d_shader_backend_ops *select_shader_backend(const stru return &none_shader_backend; } -static const struct blit_shader *select_blit_implementation(struct wined3d_adapter *adapter) +static const struct blit_shader *select_blit_implementation(const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = &adapter->gl_info; int vs_selected_mode, ps_selected_mode; select_shader_mode(gl_info, &ps_selected_mode, &vs_selected_mode); @@ -2600,7 +2599,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) adapter->fragment_pipe = select_fragment_implementation(gl_info); adapter->shader_backend = select_shader_backend(gl_info); - adapter->blitter = select_blit_implementation(adapter); + adapter->blitter = select_blit_implementation(gl_info); adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); gl_info->limits.texture_stages = fragment_caps.MaxTextureBlendStages;

1 0

Francois Gouget : msxml3/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 9ec291500b6d7e4c5f6e1d92a4d4698875319217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec291500b6d7e4c5f6e1d92a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 24 23:32:16 2011 +0200 msxml3/tests: Add a trailing '\n' to an ok() call. --- dlls/msxml3/tests/saxreader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index cc123ff..b205090 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1272,7 +1272,7 @@ static void test_mxwriter_flush(void) pos.QuadPart = 0; hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(pos2.QuadPart == 0, "expected stream beginning"); + ok(pos2.QuadPart == 0, "expected stream beginning\n"); hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); ok(hr == S_OK, "got %08x\n", hr);

1 0

Octavian Voicu : msxml3/tests: Prevent crash in saxreader tests.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: ace8b534185d4e88f751126188d9b2f83228ccf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ace8b534185d4e88f75112618… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Thu Aug 25 03:43:05 2011 +0300 msxml3/tests: Prevent crash in saxreader tests. --- dlls/msxml3/tests/saxreader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index b205090..e136e33 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1714,7 +1714,7 @@ static void test_mxwriter_encoding(void) hr = IMXWriter_get_output(writer, &dest); todo_wine ok(hr == S_OK, "get_output failed: %08x\n", hr); todo_wine ok(V_VT(&dest) == VT_BSTR, "Expected VT_BSTR, got %d\n", V_VT(&dest)); - todo_wine ok(!lstrcmpW(_bstr_("<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n"), V_BSTR(&dest)), + if (V_VT(&dest) == VT_BSTR) todo_wine ok(!lstrcmpW(_bstr_("<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n"), V_BSTR(&dest)), "got wrong content: %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest);

1 0

Marcus Meissner : oleaut32: Fixed buffer size to MBtoWC.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 9d7219dfb965036995bdb2cfdb01507f3dda0faf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7219dfb965036995bdb2cfd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Aug 25 10:03:50 2011 +0200 oleaut32: Fixed buffer size to MBtoWC. --- dlls/oleaut32/tests/vartest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index c52e3ce..7a6394a 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -348,7 +348,7 @@ static void test_var_call2( int line, HRESULT (WINAPI *func)(LPVARIANT,LPVARIANT static int strcmp_wa(const WCHAR *strw, const char *stra) { WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)); + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(buf[0])); return lstrcmpW(strw, buf); }

1 0

André Hentschel : mshtml: Initialize return value.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 7205f8888355441f63ec8da290061a74f57124fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7205f8888355441f63ec8da29… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 22 20:48:33 2011 +0200 mshtml: Initialize return value. --- dlls/mshtml/htmlanchor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index c369ed5..7422de7 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -45,7 +45,7 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This) { nsAString href_str, target_str; nsresult nsres; - HRESULT hres; + HRESULT hres = E_FAIL; nsAString_Init(&target_str, NULL); nsres = nsIDOMHTMLAnchorElement_GetTarget(This->nsanchor, &target_str);

1 0

Ričardas Barkauskas : wined3d: Avoid dereferencing null pointer in context_apply_clear_state when calling context_generate_rt_mask_from_surface .
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: e110c08cc8cfa1b2acd9c363d954a85ad61aa870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e110c08cc8cfa1b2acd9c363d… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Aug 22 15:46:31 2011 +0300 wined3d: Avoid dereferencing null pointer in context_apply_clear_state when calling context_generate_rt_mask_from_surface. --- dlls/wined3d/context.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 42d26bc..4abe18e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2066,7 +2066,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d } else { - rt_mask = context_generate_rt_mask_no_fbo(device, rts[0]); + rt_mask = context_generate_rt_mask_no_fbo(device, rt_count ? rts[0] : NULL); } } else if (wined3d_settings.offscreen_rendering_mode == ORM_FBO @@ -2079,7 +2079,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d } else { - rt_mask = context_generate_rt_mask_no_fbo(device, rts[0]); + rt_mask = context_generate_rt_mask_no_fbo(device, rt_count ? rts[0] : NULL); } old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask;

1 0

Ričardas Barkauskas : ddraw: Do not create implicit depth buffer.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: bf7df8516991cf4d544cbc22e66692e25be24b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf7df8516991cf4d544cbc22e… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Aug 22 15:46:41 2011 +0300 ddraw: Do not create implicit depth buffer. --- dlls/ddraw/ddraw.c | 50 +++-------------------------------------------- dlls/ddraw/tests/d3d.c | 12 +++++++++++ 2 files changed, 16 insertions(+), 46 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index fc0dd93..d1754ec 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2939,8 +2939,8 @@ static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfac localParameters.SwapEffect = WINED3DSWAPEFFECT_COPY; localParameters.hDeviceWindow = window; localParameters.Windowed = !(ddraw->cooperative_level & DDSCL_FULLSCREEN); - localParameters.EnableAutoDepthStencil = TRUE; - localParameters.AutoDepthStencilFormat = WINED3DFMT_D16_UNORM; + localParameters.EnableAutoDepthStencil = FALSE; + localParameters.AutoDepthStencilFormat = WINED3DFMT_UNKNOWN; localParameters.Flags = 0; localParameters.FullScreen_RefreshRateInHz = WINED3DPRESENT_RATE_DEFAULT; localParameters.PresentationInterval = WINED3DPRESENT_INTERVAL_DEFAULT; @@ -5923,50 +5923,8 @@ static HRESULT CDECL device_parent_create_depth_stencil(struct wined3d_device_pa UINT width, UINT height, enum wined3d_format_id format, WINED3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL discard, struct wined3d_surface **surface) { - struct IDirectDrawImpl *ddraw = ddraw_from_device_parent(device_parent); - IDirectDrawSurface7 *ddraw7; - IDirectDrawSurfaceImpl *ddraw_surface; - DDSURFACEDESC2 ddsd; - HRESULT hr; - - TRACE("device_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, discard %u, surface %p.\n", - device_parent, width, height, format, multisample_type, multisample_quality, discard, surface); - - *surface = NULL; - - /* Create a DirectDraw surface */ - memset(&ddsd, 0, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - ddsd.u4.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; - ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - ddsd.dwHeight = height; - ddsd.dwWidth = width; - if (format) - { - PixelFormat_WineD3DtoDD(&ddsd.u4.ddpfPixelFormat, format); - } - else - { - ddsd.dwFlags ^= DDSD_PIXELFORMAT; - } - - ddraw->depthstencil = TRUE; - hr = IDirectDraw7_CreateSurface(&ddraw->IDirectDraw7_iface, &ddsd, &ddraw7, NULL); - ddraw->depthstencil = FALSE; - if (FAILED(hr)) - { - WARN("Failed to create depth/stencil surface, hr %#x.\n", hr); - return hr; - } - - ddraw_surface = impl_from_IDirectDrawSurface7(ddraw7); - *surface = ddraw_surface->wined3d_surface; - wined3d_surface_incref(*surface); - IDirectDrawSurface7_Release(&ddraw_surface->IDirectDrawSurface7_iface); - - return D3D_OK; + ERR("DirectDraw doesn't have and shoudn't try creating implicit depth buffers.\n"); + return E_NOTIMPL; } static HRESULT CDECL device_parent_create_volume(struct wined3d_device_parent *device_parent, diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 685ed45..8946d48 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -100,11 +100,19 @@ static ULONG getRefcount(IUnknown *iface) return IUnknown_Release(iface); } +static HRESULT WINAPI SurfaceCounter(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) +{ + UINT *num = context; + (*num)++; + IDirectDrawSurface_Release(surface); + return DDENUMRET_OK; +} static BOOL CreateDirect3D(void) { HRESULT rc; DDSURFACEDESC2 ddsd; + UINT num; rc = pDirectDrawCreateEx(NULL, (void**)&lpDD, &IID_IDirectDraw7, NULL); @@ -131,6 +139,10 @@ static BOOL CreateDirect3D(void) if (FAILED(rc)) return FALSE; + num = 0; + IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST, NULL, &num, SurfaceCounter); + ok(num == 1, "Has %d surfaces, expected 1\n", num); + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT;

1 0

Michael Stefaniuc : ole32: COM cleanup in itemmoniker.c.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: d3c934adcd9f2e84732102f6be226ddab6f69199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c934adcd9f2e84732102f6b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 24 12:14:29 2011 +0200 ole32: COM cleanup in itemmoniker.c. --- dlls/ole32/itemmoniker.c | 95 +++++++++++++++++++++------------------------- 1 files changed, 43 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3c934adcd9f2e8473210…

1 0

Michael Stefaniuc : ole32: Cleanup ItemMonikerImpl_QueryInterface().
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 82b3d35b737ae06962cf7cd73fc37bcdfd536aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b3d35b737ae06962cf7cd73… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 24 12:18:49 2011 +0200 ole32: Cleanup ItemMonikerImpl_QueryInterface(). --- dlls/ole32/itemmoniker.c | 37 +++++++++++++++---------------------- 1 files changed, 15 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 644633c..32f7043 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -67,23 +67,17 @@ static HRESULT WINAPI ItemMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid { ItemMonikerImpl *This = impl_from_IMoniker(iface); - TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); + TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); - /* Perform a sanity check on the parameters.*/ - if ( (This==0) || (ppvObject==0) ) - return E_INVALIDARG; - - /* Initialize the return parameter */ - *ppvObject = 0; - - /* Compare the riid with the interface IDs implemented by this object.*/ - if (IsEqualIID(&IID_IUnknown, riid) || - IsEqualIID(&IID_IPersist, riid) || - IsEqualIID(&IID_IPersistStream, riid) || - IsEqualIID(&IID_IMoniker, riid) - ) - *ppvObject = iface; + if (!ppvObject) + return E_INVALIDARG; + /* Compare the riid with the interface IDs implemented by this object.*/ + if (IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IPersist, riid) || + IsEqualIID(&IID_IPersistStream, riid) || + IsEqualIID(&IID_IMoniker, riid)) + *ppvObject = iface; else if (IsEqualIID(&IID_IROTData, riid)) *ppvObject = &This->IROTData_iface; else if (IsEqualIID(&IID_IMarshal, riid)) @@ -95,15 +89,14 @@ static HRESULT WINAPI ItemMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid return hr; return IUnknown_QueryInterface(This->pMarshal, riid, ppvObject); } - - /* Check that we obtained an interface.*/ - if ((*ppvObject)==0) + else + { + *ppvObject = NULL; return E_NOINTERFACE; + } - /* Query Interface always increases the reference count by one when it is successful */ - IMoniker_AddRef(iface); - - return S_OK; + IMoniker_AddRef(iface); + return S_OK; } /******************************************************************************

1 0

Henri Verbeet : wined3d: Use draw_binding in IWineD3DSurfaceImpl_BltOverride().
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 1ae498dc59bd78fcc0fcfa510af81dcffb75eefa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae498dc59bd78fcc0fcfa510… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:41 2011 +0200 wined3d: Use draw_binding in IWineD3DSurfaceImpl_BltOverride(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dea13f8..95f5052 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5565,7 +5565,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa src_surface->CKeyFlags = oldCKeyFlags; src_surface->SrcBltCKey = oldBltCKey; - surface_modify_location(dst_surface, SFLAG_INDRAWABLE, TRUE); + surface_modify_location(dst_surface, dst_surface->draw_binding, TRUE); return WINED3D_OK; }

1 0