September 2011 - Wine-commits

Piotr Caban : propsys: Added InitVariantFromBuffer implementation.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: f8dd85f246ee5f2a8a999b2b8287170c526cebc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8dd85f246ee5f2a8a999b2b8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 16 11:20:37 2011 +0200 propsys: Added InitVariantFromBuffer implementation. --- dlls/propsys/propsys.spec | 4 ++-- dlls/propsys/propvar.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index e738985..5bcb483 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -28,7 +28,7 @@ @ stub DllRegisterServer @ stub DllUnregisterServer @ stub InitPropVariantFromBooleanVector -@ stub InitPropVariantFromBuffer +@ stdcall InitPropVariantFromBuffer(ptr long ptr) @ stub InitPropVariantFromCLSID @ stub InitPropVariantFromDoubleVector @ stub InitPropVariantFromFileTime @@ -47,7 +47,7 @@ @ stub InitPropVariantFromUInt64Vector @ stub InitPropVariantVectorFromPropVariant @ stub InitVariantFromBooleanArray -@ stub InitVariantFromBuffer +@ stdcall InitVariantFromBuffer(ptr long ptr) @ stub InitVariantFromDoubleArray @ stub InitVariantFromFileTime @ stub InitVariantFromFileTimeArray diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index d59173c..01a1d5f 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -132,3 +132,48 @@ HRESULT WINAPI InitVariantFromGUIDAsString(REFGUID guid, VARIANT *pvar) PROPVAR_GUIDToWSTR(guid, V_BSTR(pvar)); return S_OK; } + +HRESULT WINAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *ppropvar) +{ + TRACE("(%p %u %p)\n", pv, cb, ppropvar); + + ppropvar->u.caub.pElems = CoTaskMemAlloc(cb); + if(!ppropvar->u.caub.pElems) + return E_OUTOFMEMORY; + + ppropvar->vt = VT_VECTOR|VT_UI1; + ppropvar->u.caub.cElems = cb; + memcpy(ppropvar->u.caub.pElems, pv, cb); + return S_OK; +} + +HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar) +{ + SAFEARRAY *arr; + void *data; + HRESULT hres; + + TRACE("(%p %u %p)\n", pv, cb, pvar); + + arr = SafeArrayCreateVector(VT_UI1, 0, cb); + if(!arr) + return E_OUTOFMEMORY; + + hres = SafeArrayAccessData(arr, &data); + if(FAILED(hres)) { + SafeArrayDestroy(arr); + return hres; + } + + memcpy(data, pv, cb); + + hres = SafeArrayUnaccessData(arr); + if(FAILED(hres)) { + SafeArrayDestroy(arr); + return hres; + } + + V_VT(pvar) = VT_ARRAY|VT_UI1; + V_ARRAY(pvar) = arr; + return S_OK; +}

1 0

Piotr Caban : propsys/tests: Added InitVariantFromBuffer tests.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 4a740c8a802bbd396a581ce3870e08fb0683c8b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a740c8a802bbd396a581ce38… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 16 11:20:49 2011 +0200 propsys/tests: Added InitVariantFromBuffer tests. --- dlls/propsys/tests/propsys.c | 55 ++++++++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 2 + 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 1e63348..caff25e 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -508,10 +508,65 @@ static void test_InitPropVariantFromGUIDAsString(void) } } +static void test_InitPropVariantFromBuffer(void) +{ + static const char data_in[] = "test"; + PROPVARIANT propvar; + VARIANT var; + HRESULT hres; + void *data_out; + LONG size; + + hres = InitPropVariantFromBuffer(NULL, 0, &propvar); + ok(hres == S_OK, "InitPropVariantFromBuffer returned %x\n", hres); + ok(propvar.vt == (VT_VECTOR|VT_UI1), "propvar.vt = %d\n", propvar.vt); + ok(propvar.u.caub.cElems == 0, "cElems = %d\n", propvar.u.caub.cElems == 0); + PropVariantClear(&propvar); + + hres = InitPropVariantFromBuffer(data_in, 4, &propvar); + ok(hres == S_OK, "InitPropVariantFromBuffer returned %x\n", hres); + ok(propvar.vt == (VT_VECTOR|VT_UI1), "propvar.vt = %d\n", propvar.vt); + ok(propvar.u.caub.cElems == 4, "cElems = %d\n", propvar.u.caub.cElems == 0); + ok(!memcmp(propvar.u.caub.pElems, data_in, 4), "Data inside array is incorrect\n"); + PropVariantClear(&propvar); + + hres = InitVariantFromBuffer(NULL, 0, &var); + ok(hres == S_OK, "InitVariantFromBuffer returned %x\n", hres); + ok(V_VT(&var) == (VT_ARRAY|VT_UI1), "V_VT(&var) = %d\n", V_VT(&var)); + size = SafeArrayGetDim(V_ARRAY(&var)); + ok(size == 1, "SafeArrayGetDim returned %d\n", size); + hres = SafeArrayGetLBound(V_ARRAY(&var), 1, &size); + ok(hres == S_OK, "SafeArrayGetLBound returned %x\n", hres); + ok(size == 0, "LBound = %d\n", size); + hres = SafeArrayGetUBound(V_ARRAY(&var), 1, &size); + ok(hres == S_OK, "SafeArrayGetUBound returned %x\n", hres); + ok(size == -1, "UBound = %d\n", size); + VariantClear(&var); + + hres = InitVariantFromBuffer(data_in, 4, &var); + ok(hres == S_OK, "InitVariantFromBuffer returned %x\n", hres); + ok(V_VT(&var) == (VT_ARRAY|VT_UI1), "V_VT(&var) = %d\n", V_VT(&var)); + size = SafeArrayGetDim(V_ARRAY(&var)); + ok(size == 1, "SafeArrayGetDim returned %d\n", size); + hres = SafeArrayGetLBound(V_ARRAY(&var), 1, &size); + ok(hres == S_OK, "SafeArrayGetLBound returned %x\n", hres); + ok(size == 0, "LBound = %d\n", size); + hres = SafeArrayGetUBound(V_ARRAY(&var), 1, &size); + ok(hres == S_OK, "SafeArrayGetUBound returned %x\n", hres); + ok(size == 3, "UBound = %d\n", size); + hres = SafeArrayAccessData(V_ARRAY(&var), &data_out); + ok(hres == S_OK, "SafeArrayAccessData failed %x\n", hres); + ok(!memcmp(data_in, data_out, 4), "Data inside safe array is incorrect\n"); + hres = SafeArrayUnaccessData(V_ARRAY(&var)); + ok(hres == S_OK, "SafeArrayUnaccessData failed %x\n", hres); + VariantClear(&var); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); test_PSPropertyKeyFromString(); test_PSRefreshPropertySchema(); test_InitPropVariantFromGUIDAsString(); + test_InitPropVariantFromBuffer(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index 4d2a9b4..f7d2e82 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -39,6 +39,8 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p PROPVAR_CHANGE_FLAGS flags, VARTYPE vt); HRESULT WINAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar); HRESULT WINAPI InitVariantFromGUIDAsString(REFGUID guid, VARIANT *pvar); +HRESULT WINAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *ppropvar); +HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar); #ifdef __cplusplus

1 0

Alexandre Julliard : winex11: Use the original unclipped coordinates for XRender blits to avoid rounding errors .
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 9ea45ac6023a68d19a9ff62e724486120cde6f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea45ac6023a68d19a9ff62e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 16 17:10:41 2011 +0200 winex11: Use the original unclipped coordinates for XRender blits to avoid rounding errors. --- dlls/winex11.drv/xrender.c | 44 ++++++++++++++++++++++++++++---------------- 1 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index ce3bc03..f85c5c1 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2336,10 +2336,10 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr Drawable drawable, const struct bitblt_coords *src, const struct bitblt_coords *dst ) { - int width = dst->visrect.right - dst->visrect.left; - int height = dst->visrect.bottom - dst->visrect.top; - int x_src = physdev_src->x11dev->dc_rect.left + src->visrect.left; - int y_src = physdev_src->x11dev->dc_rect.top + src->visrect.top; + int width = abs( dst->width ); + int height = abs( dst->height ); + int x_src = physdev_src->x11dev->dc_rect.left + src->x; + int y_src = physdev_src->x11dev->dc_rect.top + src->y; int x_dst, y_dst; Picture src_pict = 0, dst_pict, mask_pict = 0; BOOL use_repeat; @@ -2357,7 +2357,8 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr { XRenderPictureAttributes pa; - x_dst = y_dst = 0; + x_dst = dst->x; + y_dst = dst->y; pa.repeat = RepeatNone; wine_tsx11_lock(); dst_pict = pXRenderCreatePicture( gdi_display, drawable, physdev_dst->pict_format, CPRepeat, &pa ); @@ -2365,11 +2366,16 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr } else { - x_dst = physdev_dst->x11dev->dc_rect.left + dst->visrect.left; - y_dst = physdev_dst->x11dev->dc_rect.top + dst->visrect.top; + x_dst = physdev_dst->x11dev->dc_rect.left + dst->x; + y_dst = physdev_dst->x11dev->dc_rect.top + dst->y; dst_pict = get_xrender_picture( physdev_dst ); } + if (src->width < 0) x_src += src->width + 1; + if (src->height < 0) y_src += src->height + 1; + if (dst->width < 0) x_dst += dst->width + 1; + if (dst->height < 0) y_dst += dst->height + 1; + /* mono -> color */ if (physdev_src->format == WXR_FORMAT_MONO && physdev_dst->format != WXR_FORMAT_MONO) { @@ -2463,16 +2469,23 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, { GC tmpGC; Pixmap tmp_pixmap; + struct bitblt_coords tmp; + + /* make coordinates relative to tmp pixmap */ + tmp = *dst; + tmp.x -= tmp.visrect.left; + tmp.y -= tmp.visrect.top; + OffsetRect( &tmp.visrect, -tmp.visrect.left, -tmp.visrect.top ); wine_tsx11_lock(); tmpGC = XCreateGC( gdi_display, physdev_dst->x11dev->drawable, 0, NULL ); XSetSubwindowMode( gdi_display, tmpGC, IncludeInferiors ); XSetGraphicsExposures( gdi_display, tmpGC, False ); - tmp_pixmap = XCreatePixmap( gdi_display, root_window, dst->visrect.right - dst->visrect.left, - dst->visrect.bottom - dst->visrect.top, physdev_dst->x11dev->depth ); + tmp_pixmap = XCreatePixmap( gdi_display, root_window, tmp.visrect.right - tmp.visrect.left, + tmp.visrect.bottom - tmp.visrect.top, physdev_dst->x11dev->depth ); wine_tsx11_unlock(); - xrender_stretch_blit( physdev_src, physdev_dst, tmp_pixmap, src, dst ); + xrender_stretch_blit( physdev_src, physdev_dst, tmp_pixmap, src, &tmp ); execute_rop( physdev_dst->x11dev, tmp_pixmap, tmpGC, &dst->visrect, rop ); wine_tsx11_lock(); @@ -2547,12 +2560,11 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, wine_tsx11_lock(); xrender_blit( PictOpOver, src_pict, mask_pict, dst_pict, - physdev_src->x11dev->dc_rect.left + src->visrect.left, - physdev_src->x11dev->dc_rect.top + src->visrect.top, - physdev_dst->x11dev->dc_rect.left + dst->visrect.left, - physdev_dst->x11dev->dc_rect.top + dst->visrect.top, - xscale, yscale, - dst->visrect.right - dst->visrect.left, dst->visrect.bottom - dst->visrect.top ); + physdev_src->x11dev->dc_rect.left + src->x, + physdev_src->x11dev->dc_rect.top + src->y, + physdev_dst->x11dev->dc_rect.left + dst->x, + physdev_dst->x11dev->dc_rect.top + dst->y, + xscale, yscale, dst->width, dst->height ); if (tmp_pict) pXRenderFreePicture( gdi_display, tmp_pict ); wine_tsx11_unlock();

1 0

Henri Verbeet : ddraw: Store the primary surface.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 51868820984ef9b34b2a9a050fc12e6f90bf856d URL: http://source.winehq.org/git/wine.git/?a=commit;h=51868820984ef9b34b2a9a050… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 15 20:01:49 2011 +0200 ddraw: Store the primary surface. --- dlls/ddraw/ddraw.c | 47 ++++++++++--------------------------------- dlls/ddraw/ddraw_private.h | 2 + dlls/ddraw/surface.c | 3 ++ 3 files changed, 16 insertions(+), 36 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 53230cb..7e6d372 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1974,41 +1974,21 @@ static HRESULT WINAPI ddraw4_TestCooperativeLevel(IDirectDraw4 *iface) static HRESULT WINAPI ddraw7_GetGDISurface(IDirectDraw7 *iface, IDirectDrawSurface7 **GDISurface) { IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); - struct wined3d_surface *wined3d_surface; - IDirectDrawSurface7 *ddsurf; - HRESULT hr; - DDSCAPS2 ddsCaps; TRACE("iface %p, surface %p.\n", iface, GDISurface); - /* Get the back buffer from the wineD3DDevice and search its - * attached surfaces for the front buffer. */ EnterCriticalSection(&ddraw_cs); - hr = wined3d_device_get_back_buffer(This->wined3d_device, - 0, 0, WINED3DBACKBUFFER_TYPE_MONO, &wined3d_surface); - if (FAILED(hr) || !wined3d_surface) + + if (!(*GDISurface = &This->primary->IDirectDrawSurface7_iface)) { - ERR("IWineD3DDevice::GetBackBuffer failed\n"); + WARN("Primary not created yet.\n"); LeaveCriticalSection(&ddraw_cs); return DDERR_NOTFOUND; } + IDirectDrawSurface7_AddRef(*GDISurface); - ddsurf = wined3d_surface_get_parent(wined3d_surface); - wined3d_surface_decref(wined3d_surface); - - /* Find the front buffer */ - ddsCaps.dwCaps = DDSCAPS_FRONTBUFFER; - hr = IDirectDrawSurface7_GetAttachedSurface(ddsurf, - &ddsCaps, - GDISurface); - if(hr != DD_OK) - { - ERR("IDirectDrawSurface7::GetAttachedSurface failed, hr = %x\n", hr); - } - - /* The AddRef is OK this time */ LeaveCriticalSection(&ddraw_cs); - return hr; + return DD_OK; } static HRESULT WINAPI ddraw4_GetGDISurface(IDirectDraw4 *iface, IDirectDrawSurface4 **surface) @@ -2803,19 +2783,11 @@ static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurface WINED3DPRESENT_PARAMETERS presentation_parameters; IDirectDrawSurfaceImpl *target = surface; HRESULT hr = WINED3D_OK; - struct list *entry; - /* Search for the primary to use as render target. */ - LIST_FOR_EACH(entry, &ddraw->surface_list) + if (ddraw->primary) { - IDirectDrawSurfaceImpl *primary = LIST_ENTRY(entry, IDirectDrawSurfaceImpl, surface_list_entry); - if ((primary->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) - == (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) - { - TRACE("Using primary %p as render target.\n", target); - target = primary; - break; - } + TRACE("Using primary %p.\n", ddraw->primary); + target = ddraw->primary; } memset(&presentation_parameters, 0, sizeof(presentation_parameters)); @@ -3251,6 +3223,9 @@ static HRESULT CreateSurface(IDirectDrawImpl *ddraw, DDSURFACEDESC2 *DDSD, } } + if (desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + ddraw->primary = object; + /* Create a WineD3DTexture if a texture was requested */ if (desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE) { diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 9721915..b5d85d1 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -88,6 +88,8 @@ struct IDirectDrawImpl struct wined3d_device *wined3d_device; BOOL d3d_initialized; + IDirectDrawSurfaceImpl *primary; + /* DirectDraw things, which are not handled by WineD3D */ DWORD cooperative_level; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 1b6d6ff..7357742 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5100,6 +5100,9 @@ static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *paren /* Reduce the ddraw surface count. */ list_remove(&surface->surface_list_entry); + if (surface == surface->ddraw->primary) + surface->ddraw->primary = NULL; + HeapFree(GetProcessHeap(), 0, surface); }

1 0

Henri Verbeet : ddraw: Use offscreen backbuffers.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 1aeee59bd8b6172c848c8029e1a55ddac1f93c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aeee59bd8b6172c848c8029e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 15 20:01:50 2011 +0200 ddraw: Use offscreen backbuffers. In principle this allows us to use more than one backbuffer in ddraw. It's also a requirement for the next patch. --- dlls/ddraw/ddraw.c | 46 +++++++--------------------------------------- 1 files changed, 7 insertions(+), 39 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7e6d372..a8b8985 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2794,8 +2794,6 @@ static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurface presentation_parameters.BackBufferWidth = target->surface_desc.dwWidth; presentation_parameters.BackBufferHeight = target->surface_desc.dwHeight; presentation_parameters.BackBufferFormat = PixelFormat_DD2WineD3D(&target->surface_desc.u4.ddpfPixelFormat); - presentation_parameters.BackBufferCount = (target->surface_desc.dwFlags & DDSD_BACKBUFFERCOUNT) - ? target->surface_desc.dwBackBufferCount : 0; presentation_parameters.SwapEffect = WINED3DSWAPEFFECT_COPY; presentation_parameters.hDeviceWindow = ddraw->dest_window; presentation_parameters.Windowed = !(ddraw->cooperative_level & DDSCL_FULLSCREEN); @@ -5644,27 +5642,6 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent * return D3D_OK; } -static HRESULT WINAPI findRenderTarget(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *surface_desc, void *ctx) -{ - IDirectDrawSurfaceImpl *s = impl_from_IDirectDrawSurface7(surface); - IDirectDrawSurfaceImpl **target = ctx; - - if (!s->isRenderTarget) - { - *target = s; - IDirectDrawSurface7_Release(surface); - return DDENUMRET_CANCEL; - } - - /* Recurse into the surface tree */ - IDirectDrawSurface7_EnumAttachedSurfaces(surface, ctx, findRenderTarget); - - IDirectDrawSurface7_Release(surface); - if (*target) return DDENUMRET_CANCEL; - - return DDENUMRET_OK; -} - static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, WINED3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL lockable, @@ -5672,33 +5649,24 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par { struct IDirectDrawImpl *ddraw = ddraw_from_device_parent(device_parent); IDirectDrawSurfaceImpl *d3d_surface = ddraw->d3d_target; - IDirectDrawSurfaceImpl *target = NULL; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" "\tmultisample_quality %u, lockable %u, surface %p.\n", device_parent, container_parent, width, height, format, multisample_type, multisample_quality, lockable, surface); - if (d3d_surface->isRenderTarget) - { - IDirectDrawSurface7_EnumAttachedSurfaces(&d3d_surface->IDirectDrawSurface7_iface, &target, findRenderTarget); - } - else - { - target = d3d_surface; - } + /* TODO: Return failure if the dimensions do not match, but this shouldn't + * happen. */ - if (!target) + if (d3d_surface->isRenderTarget) { - target = ddraw->d3d_target; - ERR(" (%p) : No DirectDrawSurface found to create the back buffer. Using the front buffer as back buffer. Uncertain consequences\n", ddraw); + ERR("Frontbuffer already created.\n"); + return E_FAIL; } + d3d_surface->isRenderTarget = TRUE; - /* TODO: Return failure if the dimensions do not match, but this shouldn't happen */ - - *surface = target->wined3d_surface; + *surface = d3d_surface->wined3d_surface; wined3d_surface_incref(*surface); - target->isRenderTarget = TRUE; TRACE("Returning wineD3DSurface %p, it belongs to surface %p\n", *surface, d3d_surface);

1 0

Henri Verbeet : ddraw: Use real flips.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: b9fcf71c714e8587def75742f94759d7eca84ad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9fcf71c714e8587def75742f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 15 20:01:51 2011 +0200 ddraw: Use real flips. --- dlls/ddraw/ddraw.c | 30 +++++++++++++++++++----------- dlls/ddraw/ddraw_private.h | 4 +--- dlls/ddraw/surface.c | 25 +++++++++++++++++++++++++ dlls/wined3d/surface.c | 21 +++++++-------------- 4 files changed, 52 insertions(+), 28 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index a8b8985..1a63938 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5642,35 +5642,43 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent * return D3D_OK; } +static void STDMETHODCALLTYPE ddraw_frontbuffer_destroyed(void *parent) +{ + struct IDirectDrawImpl *ddraw = parent; + ddraw->wined3d_frontbuffer = NULL; +} + +static const struct wined3d_parent_ops ddraw_frontbuffer_parent_ops = +{ + ddraw_frontbuffer_destroyed, +}; + static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, WINED3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL lockable, struct wined3d_surface **surface) { struct IDirectDrawImpl *ddraw = ddraw_from_device_parent(device_parent); - IDirectDrawSurfaceImpl *d3d_surface = ddraw->d3d_target; + HRESULT hr; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" "\tmultisample_quality %u, lockable %u, surface %p.\n", device_parent, container_parent, width, height, format, multisample_type, multisample_quality, lockable, surface); - /* TODO: Return failure if the dimensions do not match, but this shouldn't - * happen. */ - - if (d3d_surface->isRenderTarget) + if (ddraw->wined3d_frontbuffer) { ERR("Frontbuffer already created.\n"); return E_FAIL; } - d3d_surface->isRenderTarget = TRUE; - - *surface = d3d_surface->wined3d_surface; - wined3d_surface_incref(*surface); - TRACE("Returning wineD3DSurface %p, it belongs to surface %p\n", *surface, d3d_surface); + hr = wined3d_surface_create(ddraw->wined3d_device, width, height, format, lockable, FALSE, 0, + WINED3DUSAGE_RENDERTARGET, WINED3DPOOL_DEFAULT, multisample_type, multisample_quality, + DefaultSurfaceType, ddraw, &ddraw_frontbuffer_parent_ops, surface); + if (SUCCEEDED(hr)) + ddraw->wined3d_frontbuffer = *surface; - return D3D_OK; + return hr; } static HRESULT CDECL device_parent_create_depth_stencil(struct wined3d_device_parent *device_parent, diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b5d85d1..c1c52ca 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -89,6 +89,7 @@ struct IDirectDrawImpl BOOL d3d_initialized; IDirectDrawSurfaceImpl *primary; + struct wined3d_surface *wined3d_frontbuffer; /* DirectDraw things, which are not handled by WineD3D */ DWORD cooperative_level; @@ -184,9 +185,6 @@ struct IDirectDrawSurfaceImpl DWORD uniqueness_value; UINT mipmap_level; - /* For D3DDevice creation */ - BOOL isRenderTarget; - /* Clipper objects */ IDirectDrawClipperImpl *clipper; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 7357742..96caa3f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -39,6 +39,12 @@ static inline IDirectDrawSurfaceImpl *impl_from_IDirectDrawGammaControl(IDirectD return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawGammaControl_iface); } +static HRESULT ddraw_surface_update_frontbuffer(IDirectDrawSurfaceImpl *surface) +{ + return wined3d_surface_blt(surface->ddraw->wined3d_frontbuffer, NULL, + surface->wined3d_surface, NULL, 0, NULL, WINED3DTEXF_POINT); +} + /***************************************************************************** * IUnknown parts follow *****************************************************************************/ @@ -1072,6 +1078,8 @@ static HRESULT WINAPI ddraw_surface7_Unlock(IDirectDrawSurface7 *iface, RECT *pR hr = wined3d_surface_unmap(This->wined3d_surface); if (SUCCEEDED(hr)) { + if (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + hr = ddraw_surface_update_frontbuffer(This); This->surface_desc.lpSurface = NULL; } LeaveCriticalSection(&ddraw_cs); @@ -1170,6 +1178,9 @@ static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDra } hr = wined3d_surface_flip(This->wined3d_surface, Override->wined3d_surface, Flags); + if (SUCCEEDED(hr) && This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + hr = ddraw_surface_update_frontbuffer(This); + LeaveCriticalSection(&ddraw_cs); return hr; } @@ -1268,6 +1279,8 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR * struct are supported anyway. */ hr = wined3d_surface_blt(This->wined3d_surface, DestRect, Src ? Src->wined3d_surface : NULL, SrcRect, Flags, (WINEDDBLTFX *)DDBltFx, WINED3DTEXF_LINEAR); + if (SUCCEEDED(hr) && (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER)) + hr = ddraw_surface_update_frontbuffer(This); LeaveCriticalSection(&ddraw_cs); switch(hr) @@ -1828,6 +1841,8 @@ static HRESULT WINAPI ddraw_surface7_ReleaseDC(IDirectDrawSurface7 *iface, HDC h EnterCriticalSection(&ddraw_cs); hr = wined3d_surface_releasedc(This->wined3d_surface, hdc); + if (SUCCEEDED(hr) && (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER)) + hr = ddraw_surface_update_frontbuffer(This); LeaveCriticalSection(&ddraw_cs); return hr; } @@ -3673,6 +3688,8 @@ static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD d EnterCriticalSection(&ddraw_cs); hr = wined3d_surface_bltfast(This->wined3d_surface, dstx, dsty, src->wined3d_surface, rsrc, trans); + if (SUCCEEDED(hr) && (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER)) + hr = ddraw_surface_update_frontbuffer(This); LeaveCriticalSection(&ddraw_cs); switch(hr) { @@ -4298,6 +4315,14 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir /* Release the old palette */ if(oldPal) IDirectDrawPalette_Release(oldPal); + /* Update the wined3d frontbuffer if this is the frontbuffer. */ + if ((This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) && This->ddraw->wined3d_frontbuffer) + { + hr = wined3d_surface_set_palette(This->ddraw->wined3d_frontbuffer, PalImpl ? PalImpl->wineD3DPalette : NULL); + if (FAILED(hr)) + ERR("Failed to set frontbuffer palette, hr %#x.\n", hr); + } + /* If this is a front buffer, also update the back buffers * TODO: How do things work for palettized cube textures? */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 22f194a..f64e0ca 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3793,11 +3793,9 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined WARN("Ignoring flags %#x.\n", flags); } - /* FIXME: This will also prevent overlay flips, since overlays aren't on - * a swapchain either. */ - if (surface->container.type != WINED3D_CONTAINER_SWAPCHAIN) + if (surface->container.type == WINED3D_CONTAINER_SWAPCHAIN) { - ERR("Flipped surface is not on a swapchain.\n"); + ERR("Not supported on swapchain surfaces.\n"); return WINEDDERR_NOTFLIPPABLE; } @@ -3808,18 +3806,13 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined return WINEDDERR_NOTFLIPPABLE; } - if (surface->resource.usage & WINED3DUSAGE_OVERLAY) - { - flip_surface(surface, override); + flip_surface(surface, override); - /* Update the overlay if it is visible */ - if (surface->overlay_dest) - return surface->surface_ops->surface_draw_overlay(surface); - else - return WINED3D_OK; - } + /* Update overlays if they're visible. */ + if ((surface->resource.usage & WINED3DUSAGE_OVERLAY) && surface->overlay_dest) + return surface->surface_ops->surface_draw_overlay(surface); - return wined3d_surface_blt(surface, NULL, override, NULL, 0, NULL, WINED3DTEXF_POINT); + return WINED3D_OK; } /* Do not call while under the GL lock. */

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_ps_consts_f() const.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: a61fe27fb838cef82abcbe0a917056ddd8278648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a61fe27fb838cef82abcbe0a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 15 20:01:52 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_ps_consts_f() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ed43810..2916b2d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3213,7 +3213,7 @@ HRESULT CDECL wined3d_device_set_ps_consts_f(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_ps_consts_f(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_ps_consts_f(const struct wined3d_device *device, UINT start_register, float *constants, UINT vector4f_count) { int count = min(vector4f_count, device->d3d_pshader_constantF - start_register); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6c31e14..85f47b4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2233,7 +2233,7 @@ struct wined3d_shader * __cdecl wined3d_device_get_pixel_shader(const struct win void __cdecl wined3d_device_get_primitive_type(struct wined3d_device *device, WINED3DPRIMITIVETYPE *primitive_topology); HRESULT __cdecl wined3d_device_get_ps_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count); -HRESULT __cdecl wined3d_device_get_ps_consts_f(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *device, UINT start_register, float *constants, UINT vector4f_count); HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count);

1 0

Henri Verbeet : wined3d: Make the device parameter to process_vertices_strided() const.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 0ad7e98d24dc5f424bb9f49743d9cf6f3a37e3ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ad7e98d24dc5f424bb9f4974… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 15 20:01:53 2011 +0200 wined3d: Make the device parameter to process_vertices_strided() const. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2916b2d..7fd6eee 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3232,7 +3232,7 @@ HRESULT CDECL wined3d_device_get_ps_consts_f(const struct wined3d_device *device /* Context activation is done by the caller. */ /* Do not call while under the GL lock. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) -static HRESULT process_vertices_strided(struct wined3d_device *device, DWORD dwDestIndex, DWORD dwCount, +static HRESULT process_vertices_strided(const struct wined3d_device *device, DWORD dwDestIndex, DWORD dwCount, const struct wined3d_stream_info *stream_info, struct wined3d_buffer *dest, DWORD flags, DWORD DestFVF) {

1 0

Andrew Talbot : mmsystem.dll16: Remove an unused variable.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: de0a0efca9571f8f248cafed21255d8496ab76f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de0a0efca9571f8f248cafed2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Sep 15 20:59:51 2011 +0100 mmsystem.dll16: Remove an unused variable. --- dlls/mmsystem.dll16/driver.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/mmsystem.dll16/driver.c b/dlls/mmsystem.dll16/driver.c index d3d9882..b18cdcb 100644 --- a/dlls/mmsystem.dll16/driver.c +++ b/dlls/mmsystem.dll16/driver.c @@ -209,17 +209,12 @@ static LPWINE_DRIVER DRIVER_TryOpenDriver16(LPCSTR lpFileName, LPARAM lParam2) LPWINE_DRIVER lpDrv = NULL; HMODULE16 hModule; DRIVERPROC16 lpProc; - LPCSTR lpSFN; LPSTR ptr; TRACE("('%s', %08lX);\n", lpFileName, lParam2); if (strlen(lpFileName) < 1) return lpDrv; - if ((lpSFN = strrchr(lpFileName, '\\')) == NULL) - lpSFN = lpFileName; - else - lpSFN++; if ((ptr = strchr(lpFileName, ' ')) != NULL) { *ptr++ = '\0'; while (*ptr == ' ') ptr++;

1 0

Stefan Dösinger : d3d9/tests: Fix the depth stencil size tests on AMD.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: f3644a513f21ec589acc7b442fa1b364e15a9d28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3644a513f21ec589acc7b442… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 15 22:10:36 2011 +0200 d3d9/tests: Fix the depth stencil size tests on AMD. --- dlls/d3d9/tests/visual.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f583a89..fd7f387 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12179,7 +12179,6 @@ static void ds_size_test(IDirect3DDevice9 *device) { IDirect3DSurface9 *ds, *rt, *old_rt, *old_ds, *readback; HRESULT hr; - DWORD color; DWORD num_passes; struct { @@ -12228,29 +12227,20 @@ static void ds_size_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff0000, 0.5f, 0); ok(SUCCEEDED(hr), "Target and Z Buffer clear failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_GetRenderTargetData(device, rt, readback); - ok(SUCCEEDED(hr), "IDirect3DDevice9_GetRenderTargetData failed, hr %#x.\n", hr); - color = getPixelColorFromSurface(readback, 2, 2); - ok(color == 0x000000FF, "DS size test: Pixel (2, 2) after clear is %#x, expected 0x000000FF\n", color); - color = getPixelColorFromSurface(readback, 31, 31); - ok(color == 0x000000FF, "DS size test: Pixel (31, 31) after clear is %#x, expected 0x000000FF\n", color); - color = getPixelColorFromSurface(readback, 32, 32); - ok(color == 0x000000FF, "DS size test: Pixel (32, 32) after clear is %#x, expected 0x000000FF\n", color); - color = getPixelColorFromSurface(readback, 63, 63); - ok(color == 0x000000FF, "DS size test: Pixel (63, 63) after clear is %#x, expected 0x000000FF\n", color); + /* Nvidia does not clear the surface(The color is still 0x000000ff), AMD does(the color is 0x00ff0000) */ /* Turning on any depth-related state results in a ValidateDevice failure */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); hr = IDirect3DDevice9_ValidateDevice(device, &num_passes); - ok(hr == D3DERR_CONFLICTINGRENDERSTATE, "IDirect3DDevice9_ValidateDevice returned %#x, expected " + ok(hr == D3DERR_CONFLICTINGRENDERSTATE || hr == D3D_OK, "IDirect3DDevice9_ValidateDevice returned %#x, expected " "D3DERR_CONFLICTINGRENDERSTATE.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); hr = IDirect3DDevice9_ValidateDevice(device, &num_passes); - ok(hr == D3DERR_CONFLICTINGRENDERSTATE, "IDirect3DDevice9_ValidateDevice returned %#x, expected " + ok(hr == D3DERR_CONFLICTINGRENDERSTATE || hr == D3D_OK, "IDirect3DDevice9_ValidateDevice returned %#x, expected " "D3DERR_CONFLICTINGRENDERSTATE.\n", hr); /* Try to draw with the device in an invalid state */ @@ -12264,6 +12254,10 @@ static void ds_size_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "IDirect3DDevice9_DrawPrimitiveUP failed, hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "IDirect3DDevice9_EndScene failed, hr %#x.\n", hr); + + /* Don't check the resulting draw unless we find an app that needs it. On nvidia ValidateDevice + * returns CONFLICTINGRENDERSTATE, so the result is undefined. On AMD d3d seems to assume the + * stored Z buffer value is 0.0 for all pixels, even those that are covered by the depth buffer */ } hr = IDirect3DDevice9_SetRenderTarget(device, 0, old_rt);

1 0