September 2011 - Wine-Commits

Piotr Caban : propsys/tests: Added InitVariantFromGUIDAsString tests.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: 96427780894897c84646ba1a8060309b79ac4e25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96427780894897c84646ba1a8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 16 11:20:18 2011 +0200 propsys/tests: Added InitVariantFromGUIDAsString tests. --- dlls/propsys/tests/Makefile.in | 2 +- dlls/propsys/tests/propsys.c | 59 ++++++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 2 + 3 files changed, 62 insertions(+), 1 deletions(-) diff --git a/dlls/propsys/tests/Makefile.in b/dlls/propsys/tests/Makefile.in index 8db4008..312a3a9 100644 --- a/dlls/propsys/tests/Makefile.in +++ b/dlls/propsys/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = propsys.dll -IMPORTS = propsys ole32 +IMPORTS = propsys ole32 oleaut32 C_SRCS = \ propsys.c diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index e0895f3..1e63348 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -24,10 +24,13 @@ #include <stdarg.h> #include <stdio.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "objbase.h" #include "propsys.h" +#include "propvarutil.h" #include "initguid.h" #include "wine/test.h" @@ -46,6 +49,13 @@ static char *show_guid(const GUID *guid, char *buf) return buf; } +static int strcmp_wa(LPCWSTR strw, const char *stra) +{ + CHAR buf[512]; + WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); + return lstrcmpA(stra, buf); +} + static void test_PSStringFromPropertyKey(void) { static const WCHAR fillerW[] = {'X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X', @@ -450,9 +460,58 @@ static void test_PSRefreshPropertySchema(void) CoUninitialize(); } +static void test_InitPropVariantFromGUIDAsString(void) +{ + PROPVARIANT propvar; + VARIANT var; + HRESULT hres; + int i; + + const struct { + REFGUID guid; + const char *str; + } testcases[] = { + {&IID_NULL, "{00000000-0000-0000-0000-000000000000}" }, + {&dummy_guid, "{DEADBEEF-DEAD-BEEF-DEAD-BEEFCAFEBABE}" }, + }; + + hres = InitPropVariantFromGUIDAsString(NULL, &propvar); + ok(hres == E_FAIL, "InitPropVariantFromGUIDAsString returned %x\n", hres); + + if(0) { + /* Returns strange data on Win7, crashes on older systems */ + InitVariantFromGUIDAsString(NULL, &var); + + /* Crashes on windows */ + InitPropVariantFromGUIDAsString(&IID_NULL, NULL); + InitVariantFromGUIDAsString(&IID_NULL, NULL); + } + + for(i=0; i<sizeof(testcases)/sizeof(testcases[0]); i++) { + memset(&propvar, 0, sizeof(PROPVARIANT)); + hres = InitPropVariantFromGUIDAsString(testcases[i].guid, &propvar); + ok(hres == S_OK, "%d) InitPropVariantFromGUIDAsString returned %x\n", i, hres); + ok(propvar.vt == VT_LPWSTR, "%d) propvar.vt = %d\n", i, propvar.vt); + ok(!strcmp_wa(propvar.u.pwszVal, testcases[i].str), "%d) propvar.u.pwszVal = %s\n", + i, wine_dbgstr_w(propvar.u.pwszVal)); + CoTaskMemFree(propvar.u.pwszVal); + + memset(&var, 0, sizeof(VARIANT)); + hres = InitVariantFromGUIDAsString(testcases[i].guid, &var); + ok(hres == S_OK, "%d) InitVariantFromGUIDAsString returned %x\n", i, hres); + ok(V_VT(&var) == VT_BSTR, "%d) V_VT(&var) = %d\n", i, V_VT(&var)); + ok(SysStringLen(V_BSTR(&var)) == 38, "SysStringLen returned %d\n", + SysStringLen(V_BSTR(&var))); + ok(!strcmp_wa(V_BSTR(&var), testcases[i].str), "%d) V_BSTR(&var) = %s\n", + i, wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + } +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); test_PSPropertyKeyFromString(); test_PSRefreshPropertySchema(); + test_InitPropVariantFromGUIDAsString(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index e830885..4d2a9b4 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -37,6 +37,8 @@ typedef int PROPVAR_CHANGE_FLAGS; HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc, PROPVAR_CHANGE_FLAGS flags, VARTYPE vt); +HRESULT WINAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar); +HRESULT WINAPI InitVariantFromGUIDAsString(REFGUID guid, VARIANT *pvar); #ifdef __cplusplus

1 0

Francois Gouget : po: Remove English strings from the Turkish translation.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: bfbde4368ef04e8bce290863c0ef506aeac6a72f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfbde4368ef04e8bce290863c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 16 01:49:26 2011 +0200 po: Remove English strings from the Turkish translation. --- po/tr.po | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/po/tr.po b/po/tr.po index 995accd..b69b3c8 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6622,7 +6622,7 @@ msgstr "Silinme tarihi" #: shell32.rc:156 msgid "Control Panel" -msgstr "Control Panel" +msgstr "" #: shell32.rc:163 msgid "Select" @@ -6926,7 +6926,7 @@ msgstr "" #: shell32.rc:250 msgid "Wine Control Panel" -msgstr "Wine Control Panel" +msgstr "" #: shell32.rc:192 msgid "Unable to display Run File dialog box (internal error)" @@ -7960,13 +7960,10 @@ msgid "" "Not Yet Implemented\n" "\n" msgstr "" -"Not Yet Implemented\n" -"\n" #: attrib.rc:28 cmd.rc:301 -#, fuzzy msgid "%s: File Not Found\n" -msgstr "%s : File Not Found\n" +msgstr "" #: attrib.rc:47 msgid "" @@ -11148,6 +11145,7 @@ msgid "Error while selecting new font." msgstr "Yeni yazı tipi seçerken hata." #: winefile.rc:99 +#, fuzzy msgid "Wine File Manager" msgstr "Winefile"

1 0

Henri Verbeet : ddraw: Store the primary surface.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

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 Sept. 16, 2011

Sept. 16, 2011

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 Sept. 16, 2011

Sept. 16, 2011

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 process_vertices_strided() const.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

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 Sept. 16, 2011

Sept. 16, 2011

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 : ddraw/tests: Add some slop to the fog tests.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: eac78fd488bfe928d16e4d2573da1f3a43562bfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=eac78fd488bfe928d16e4d257… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 15 23:12:09 2011 +0200 ddraw/tests: Add some slop to the fog tests. --- dlls/ddraw/tests/visual.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 3cb698f..96c940f 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -586,15 +586,15 @@ static void fog_test(IDirect3DDevice7 *device) } color = getPixelColor(device, 160, 360); - ok(color == 0x00FF0000, "Untransformed vertex with no table or vertex fog has color %08x\n", color); + ok(color_match(color, 0x00FF0000, 1), "Untransformed vertex with no table or vertex fog has color %08x\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x0000FF00, "Untransformed vertex with linear vertex fog has color %08x\n", color); + ok(color_match(color, 0x0000FF00, 1), "Untransformed vertex with linear vertex fog has color %08x\n", color); color = getPixelColor(device, 480, 120); - ok(color == 0x00FFFF00, "Transformed vertex with linear vertex fog has color %08x\n", color); + ok(color_match(color, 0x00FFFF00, 1), "Transformed vertex with linear vertex fog has color %08x\n", color); if(caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_FOGTABLE) { color = getPixelColor(device, 480, 360); - ok(color == 0x0000FF00, "Transformed vertex with linear table fog has color %08x\n", color); + ok(color_match(color, 0x0000FF00, 1), "Transformed vertex with linear table fog has color %08x\n", color); } else { @@ -641,7 +641,7 @@ static void fog_test(IDirect3DDevice7 *device) color = getPixelColor(device, 160, 360); ok(color_match(color, 0x00ff0000, 4), "Unfogged quad has color %08x\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x0000ff00, "Fogged out quad has color %08x\n", color); + ok(color_match(color, 0x0000ff00, 1), "Fogged out quad has color %08x\n", color); /* Test fog behavior with an orthogonal (but not identity) projection matrix */ hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *)world_mat2); @@ -673,7 +673,7 @@ static void fog_test(IDirect3DDevice7 *device) color = getPixelColor(device, 160, 360); todo_wine ok(color_match(color, 0x00e51900, 4), "Partially fogged quad has color %08x\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x0000ff00, "Fogged out quad has color %08x\n", color); + ok(color_match(color, 0x0000ff00, 1), "Fogged out quad has color %08x\n", color); hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *)ident_mat); ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr);

1 0

Francois Gouget : pdh/tests: Some tests require that the user interface be in English.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: 25088379d9f3506fda32833945423407f581d29b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25088379d9f3506fda3283394… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 16 01:05:20 2011 +0200 pdh/tests: Some tests require that the user interface be in English. --- dlls/pdh/tests/pdh.c | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index f6fac16..9690020 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -37,6 +37,30 @@ static PDH_STATUS (WINAPI *pPdhValidatePathExW)(PDH_HLOG, LPCWSTR); #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( pdh, #func ); + +/* Returns true if the user interface is in English. Note that this does not + * presume of the formatting of dates, numbers, etc. + */ +static BOOL is_lang_english(void) +{ + static HMODULE hkernel32 = NULL; + static LANGID (WINAPI *pGetThreadUILanguage)(void) = NULL; + static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL; + + if (!hkernel32) + { + hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); + pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); + } + if (pGetThreadUILanguage) + return PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH; + if (pGetUserDefaultUILanguage) + return PRIMARYLANGID(pGetUserDefaultUILanguage()) == LANG_ENGLISH; + + return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; +} + static void init_function_ptrs( void ) { pdh = GetModuleHandle( "pdh" ); @@ -962,9 +986,9 @@ static void test_PdhGetDllVersion(void) START_TEST(pdh) { - if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + if (!is_lang_english()) { - skip("non-english locale\n"); + skip("An English UI is needed for the pdh tests\n"); return; } init_function_ptrs();

1 0

Stefan Dösinger : d3d8/tests: State getters don' t work with PUREDEVICEs.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: c7b509b16c4b869024b371647865255eb883c1db URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7b509b16c4b869024b371647… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 15 23:02:08 2011 +0200 d3d8/tests: State getters don't work with PUREDEVICEs. --- dlls/d3d8/tests/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index aeed57f..524ce2b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1726,7 +1726,7 @@ static void test_lights(void) d3dpp.AutoDepthStencilFormat = D3DFMT_D16; hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, - D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &d3dpp, &device ); + D3DCREATE_HARDWARE_VERTEXPROCESSING, &d3dpp, &device ); ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, "IDirect3D8_CreateDevice failed with %08x\n", hr); if(!device) @@ -2525,7 +2525,7 @@ static void test_ApplyStateBlock(void) d3dpp.AutoDepthStencilFormat = D3DFMT_D16; hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, - D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &d3dpp, &device ); + D3DCREATE_HARDWARE_VERTEXPROCESSING, &d3dpp, &device ); ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, "IDirect3D8_CreateDevice failed with %#x\n", hr); if(!device)

1 0