March 2014 - Wine-commits - list.winehq.org

Henri Verbeet : ddraw/tests: Properly create offscreen plain surfaces.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 9677805ec456f61e750923c621f777fcb5efafe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9677805ec456f61e750923c62… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 28 11:26:52 2014 +0100 ddraw/tests: Properly create offscreen plain surfaces. It's not entirely clear what kind of surface is actually created when just DDSCAPS_SYSTEMMEMORY is specified, but at the very least its format appears to be validated against the current display mode, which is not what we want. --- dlls/ddraw/tests/ddraw2.c | 12 +++++++----- dlls/ddraw/tests/ddraw4.c | 12 +++++++----- dlls/ddraw/tests/ddraw7.c | 12 +++++++----- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index e016852..6b34912 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4753,7 +4753,7 @@ static void test_set_surface_desc(void) U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; - ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -4798,7 +4798,8 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps == (DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN), + "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); /* Setting the caps is an error. This also means the original description cannot be reapplied. */ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); @@ -4813,7 +4814,7 @@ static void test_set_surface_desc(void) ddsd.lpSurface = data; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); ok(hr == DDERR_INVALIDCAPS, "Setting DDSD_CAPS returned %#x.\n", hr); - ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); ok(hr == DDERR_INVALIDCAPS, "Setting DDSD_CAPS returned %#x.\n", hr); ddsd.ddsCaps.dwCaps = 0; @@ -4822,7 +4823,8 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps == (DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN), + "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); /* Setting the height is allowed, but it cannot be set to 0, and only if LPSURFACE is set too. */ reset_ddsd(&ddsd); @@ -5050,7 +5052,7 @@ static void test_user_memory_getdc(void) U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; - ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 0786e8b..ad1e724 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5359,7 +5359,7 @@ static void test_set_surface_desc(void) U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00ff0000; U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000ff00; U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000ff; - ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -5400,7 +5400,8 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &ddsd); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps == (DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN), + "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); ok(ddsd.ddsCaps.dwCaps2 == 0, "Got unexpected caps2 %#x.\n", 0); /* Setting the caps is an error. This also means the original description cannot be reapplied. */ @@ -5416,7 +5417,7 @@ static void test_set_surface_desc(void) ddsd.lpSurface = data; hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDCAPS, "Setting DDSD_CAPS returned %#x.\n", hr); - ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDCAPS, "Setting DDSD_CAPS returned %#x.\n", hr); ddsd.ddsCaps.dwCaps = 0; @@ -5426,7 +5427,8 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &ddsd); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps == (DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN), + "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); ok(ddsd.ddsCaps.dwCaps2 == 0, "Got unexpected caps2 %#x.\n", 0); /* Setting the height is allowed, but it cannot be set to 0, and only if LPSURFACE is set too. */ @@ -5652,7 +5654,7 @@ static void test_user_memory_getdc(void) U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00ff0000; U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000ff00; U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000ff; - ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 287c5c3..24c38bc 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5237,7 +5237,7 @@ static void test_set_surface_desc(void) U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00ff0000; U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000ff00; U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000ff; - ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -5279,7 +5279,8 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &ddsd); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps == (DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN), + "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); ok(ddsd.ddsCaps.dwCaps2 == 0, "Got unexpected caps2 %#x.\n", 0); /* Setting the caps is an error. This also means the original description cannot be reapplied. */ @@ -5295,7 +5296,7 @@ static void test_set_surface_desc(void) ddsd.lpSurface = data; hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDCAPS, "Setting DDSD_CAPS returned %#x.\n", hr); - ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDCAPS, "Setting DDSD_CAPS returned %#x.\n", hr); ddsd.ddsCaps.dwCaps = 0; @@ -5305,7 +5306,8 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &ddsd); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps == (DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN), + "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); ok(ddsd.ddsCaps.dwCaps2 == 0, "Got unexpected caps2 %#x.\n", 0); /* Setting the height is allowed, but it cannot be set to 0, and only if LPSURFACE is set too. */ @@ -5531,7 +5533,7 @@ static void test_user_memory_getdc(void) U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00ff0000; U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000ff00; U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000ff; - ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);

1 0

Henri Verbeet : ddraw/tests: Don't trust what EnumDevices() tells us about the supported Z buffer formats.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 66aa4dcc6c76f2046b07bbd8ba4a5baa6fefca0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=66aa4dcc6c76f2046b07bbd8b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 28 11:26:53 2014 +0100 ddraw/tests: Don't trust what EnumDevices() tells us about the supported Z buffer formats. --- dlls/ddraw/tests/ddraw1.c | 63 +++++++++++++++++---------------------------- dlls/ddraw/tests/ddraw2.c | 59 +++++++++++++++++------------------------- 2 files changed, 47 insertions(+), 75 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 2cc6518..9f45f40 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -238,11 +238,11 @@ static IDirectDraw *create_ddraw(void) static IDirect3DDevice *create_device(IDirectDraw *ddraw, HWND window, DWORD coop_level) { + static const DWORD z_depths[] = {32, 24, 16}; IDirectDrawSurface *surface, *ds; IDirect3DDevice *device = NULL; DDSURFACEDESC surface_desc; - DWORD z_depth = 0; - IDirect3D *d3d; + unsigned int i; HRESULT hr; hr = IDirectDraw_SetCooperativeLevel(ddraw, window, coop_level); @@ -271,51 +271,34 @@ static IDirect3DDevice *create_device(IDirectDraw *ddraw, HWND window, DWORD coo IDirectDrawClipper_Release(clipper); } - hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirect3D, (void **)&d3d); - if (FAILED(hr)) + /* We used to use EnumDevices() for this, but it seems + * D3DDEVICEDESC.dwDeviceZBufferBitDepth only has a very casual + * relationship with reality. */ + for (i = 0; i < sizeof(z_depths) / sizeof(*z_depths); ++i) { - IDirectDrawSurface_Release(surface); - return NULL; - } + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_ZBUFFERBITDEPTH | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + U2(surface_desc).dwZBufferBitDepth = z_depths[i]; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + if (FAILED(hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &ds, NULL))) + continue; - hr = IDirect3D_EnumDevices(d3d, enum_z_fmt, &z_depth); - ok(SUCCEEDED(hr), "Failed to enumerate z-formats, hr %#x.\n", hr); - IDirect3D_Release(d3d); - if (FAILED(hr) || !z_depth) - { - IDirectDrawSurface_Release(surface); - return NULL; - } + hr = IDirectDrawSurface_AddAttachedSurface(surface, ds); + ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); + IDirectDrawSurface_Release(ds); + if (FAILED(hr)) + continue; - memset(&surface_desc, 0, sizeof(surface_desc)); - surface_desc.dwSize = sizeof(surface_desc); - surface_desc.dwFlags = DDSD_CAPS | DDSD_ZBUFFERBITDEPTH | DDSD_WIDTH | DDSD_HEIGHT; - surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; - U2(surface_desc).dwZBufferBitDepth = z_depth; - surface_desc.dwWidth = 640; - surface_desc.dwHeight = 480; - hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &ds, NULL); - ok(SUCCEEDED(hr), "Failed to create depth buffer, hr %#x.\n", hr); - if (FAILED(hr)) - { - IDirectDrawSurface_Release(surface); - return NULL; - } + if (SUCCEEDED(hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirect3DHALDevice, (void **)&device))) + break; - hr = IDirectDrawSurface_AddAttachedSurface(surface, ds); - ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); - IDirectDrawSurface_Release(ds); - if (FAILED(hr)) - { - IDirectDrawSurface_Release(surface); - return NULL; + IDirectDrawSurface_DeleteAttachedSurface(surface, 0, ds); } - hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirect3DHALDevice, (void **)&device); IDirectDrawSurface_Release(surface); - if (FAILED(hr)) - return NULL; - return device; } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 6b34912..ab6c967 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -177,11 +177,12 @@ static IDirectDraw2 *create_ddraw(void) static IDirect3DDevice2 *create_device(IDirectDraw2 *ddraw, HWND window, DWORD coop_level) { + static const DWORD z_depths[] = {32, 24, 16}; IDirectDrawSurface *surface, *ds; IDirect3DDevice2 *device = NULL; DDSURFACEDESC surface_desc; - DWORD z_depth = 0; IDirect3D2 *d3d; + unsigned int i; HRESULT hr; hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, coop_level); @@ -217,47 +218,35 @@ static IDirect3DDevice2 *create_device(IDirectDraw2 *ddraw, HWND window, DWORD c return NULL; } - hr = IDirect3D2_EnumDevices(d3d, enum_z_fmt, &z_depth); - ok(SUCCEEDED(hr), "Failed to enumerate z-formats, hr %#x.\n", hr); - if (FAILED(hr) || !z_depth) + /* We used to use EnumDevices() for this, but it seems + * D3DDEVICEDESC.dwDeviceZBufferBitDepth only has a very casual + * relationship with reality. */ + for (i = 0; i < sizeof(z_depths) / sizeof(*z_depths); ++i) { - IDirect3D2_Release(d3d); - IDirectDrawSurface_Release(surface); - return NULL; - } + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_ZBUFFERBITDEPTH | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + U2(surface_desc).dwZBufferBitDepth = z_depths[i]; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + if (FAILED(hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &ds, NULL))) + continue; - memset(&surface_desc, 0, sizeof(surface_desc)); - surface_desc.dwSize = sizeof(surface_desc); - surface_desc.dwFlags = DDSD_CAPS | DDSD_ZBUFFERBITDEPTH | DDSD_WIDTH | DDSD_HEIGHT; - surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; - U2(surface_desc).dwZBufferBitDepth = z_depth; - surface_desc.dwWidth = 640; - surface_desc.dwHeight = 480; - hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &ds, NULL); - ok(SUCCEEDED(hr), "Failed to create depth buffer, hr %#x.\n", hr); - if (FAILED(hr)) - { - IDirect3D2_Release(d3d); - IDirectDrawSurface_Release(surface); - return NULL; - } + hr = IDirectDrawSurface_AddAttachedSurface(surface, ds); + ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); + IDirectDrawSurface_Release(ds); + if (FAILED(hr)) + continue; - hr = IDirectDrawSurface_AddAttachedSurface(surface, ds); - ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); - IDirectDrawSurface_Release(ds); - if (FAILED(hr)) - { - IDirect3D2_Release(d3d); - IDirectDrawSurface_Release(surface); - return NULL; + if (SUCCEEDED(hr = IDirect3D2_CreateDevice(d3d, &IID_IDirect3DHALDevice, surface, &device))) + break; + + IDirectDrawSurface_DeleteAttachedSurface(surface, 0, ds); } - hr = IDirect3D2_CreateDevice(d3d, &IID_IDirect3DHALDevice, surface, &device); IDirect3D2_Release(d3d); IDirectDrawSurface_Release(surface); - if (FAILED(hr)) - return NULL; - return device; }

1 0

Henri Verbeet : wined3d: Also trace "mem" and "pitch" in wined3d_surface_update_desc().
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: b40eda767bfc945823df62a0b52d7d5f20edb162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b40eda767bfc945823df62a0b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 28 11:26:54 2014 +0100 wined3d: Also trace "mem" and "pitch" in wined3d_surface_update_desc(). --- dlls/wined3d/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 371f3bc..6af6158 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2605,8 +2605,9 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, HRESULT hr; DWORD valid_location = 0; - TRACE("surface %p, width %u, height %u, format %s, multisample_type %#x, multisample_quality %u.\n", - surface, width, height, debug_d3dformat(format_id), multisample_type, multisample_type); + TRACE("surface %p, width %u, height %u, format %s, multisample_type %#x, multisample_quality %u, " + "mem %p, pitch %u.\n", + surface, width, height, debug_d3dformat(format_id), multisample_type, multisample_type, mem, pitch); if (!resource_size) return WINED3DERR_INVALIDCALL;

1 0

Nikolay Sivov : oleaut32: Implement DISPID_PICT_RENDER dispid.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: bc50be98c9c983545966d6c490c129651e0c56d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc50be98c9c983545966d6c49… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 16:57:19 2014 +0400 oleaut32: Implement DISPID_PICT_RENDER dispid. --- dlls/oleaut32/olepicture.c | 37 +++++++++++- dlls/oleaut32/tests/olepicture.c | 123 ++++++++++++++++++++++++++++++++------ 2 files changed, 142 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 2139fde..6e4a737 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1995,6 +1995,7 @@ static HRESULT WINAPI OLEPictureImpl_Invoke( UINT* puArgErr) { OLEPictureImpl *This = impl_from_IDispatch(iface); + HRESULT hr; /* validate parameters */ @@ -2052,7 +2053,7 @@ static HRESULT WINAPI OLEPictureImpl_Invoke( else if (wFlags & DISPATCH_PROPERTYPUT) { VARIANTARG vararg; - HRESULT hr; + TRACE("DISPID_PICT_HPAL\n"); VariantInit(&vararg); @@ -2090,6 +2091,40 @@ static HRESULT WINAPI OLEPictureImpl_Invoke( return IPicture_get_Height(&This->IPicture_iface, &V_I4(pVarResult)); } break; + case DISPID_PICT_RENDER: + if (wFlags & DISPATCH_METHOD) + { + VARIANTARG *args = pDispParams->rgvarg; + int i; + + TRACE("DISPID_PICT_RENDER\n"); + + if (pDispParams->cArgs != 10) + return DISP_E_BADPARAMCOUNT; + + /* All parameters are supposed to be VT_I4 (on 64 bits too). */ + for (i = 0; i < pDispParams->cArgs; i++) + if (V_VT(&args[i]) != VT_I4) + { + ERR("DISPID_PICT_RENDER: wrong argument type %d:%d\n", i, V_VT(&args[i])); + return DISP_E_TYPEMISMATCH; + } + + /* FIXME: rectangle pointer argument handling seems broken on 64 bits, + currently Render() doesn't use it at all so for now NULL is passed. */ + return IPicture_Render(&This->IPicture_iface, + LongToHandle(V_I4(&args[9])), + V_I4(&args[8]), + V_I4(&args[7]), + V_I4(&args[6]), + V_I4(&args[5]), + V_I4(&args[4]), + V_I4(&args[3]), + V_I4(&args[2]), + V_I4(&args[1]), + NULL); + } + break; } ERR("invalid dispid 0x%x or wFlags 0x%x\n", dispIdMember, wFlags); diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index de37322..26395b9 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -412,12 +412,14 @@ static void test_Invoke(void) { IPictureDisp *picdisp; HRESULT hr; - VARIANTARG vararg; + VARIANTARG vararg, args[10]; DISPPARAMS dispparams; VARIANT varresult; IStream *stream; HGLOBAL hglob; void *data; + HDC hdc; + int i; hglob = GlobalAlloc (0, sizeof(gifimage)); data = GlobalLock(hglob); @@ -477,6 +479,44 @@ static void test_Invoke(void) hr = IPictureDisp_Invoke(picdisp, DISPID_PICT_HPAL, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dispparams, &varresult, NULL, NULL); ok(hr == DISP_E_BADPARAMCOUNT, "IPictureDisp_Invoke should have returned DISP_E_BADPARAMCOUNT instead of 0x%08x\n", hr); + /* DISPID_PICT_RENDER */ + hdc = GetDC(0); + + for (i = 0; i < sizeof(args)/sizeof(args[0]); i++) + V_VT(&args[i]) = VT_I4; + + V_I4(&args[0]) = 0; + V_I4(&args[1]) = 10; + V_I4(&args[2]) = 10; + V_I4(&args[3]) = 0; + V_I4(&args[4]) = 0; + V_I4(&args[5]) = 10; + V_I4(&args[6]) = 10; + V_I4(&args[7]) = 0; + V_I4(&args[8]) = 0; + V_I4(&args[9]) = HandleToLong(hdc); + + dispparams.rgvarg = args; + dispparams.rgdispidNamedArgs = NULL; + dispparams.cArgs = 10; + dispparams.cNamedArgs = 0; + + V_VT(&varresult) = VT_EMPTY; + hr = IPictureDisp_Invoke(picdisp, DISPID_PICT_RENDER, &GUID_NULL, 0, DISPATCH_METHOD, &dispparams, &varresult, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* Try with one argument set to VT_I2, it'd still work if coerced. */ + V_VT(&args[3]) = VT_I2; + hr = IPictureDisp_Invoke(picdisp, DISPID_PICT_RENDER, &GUID_NULL, 0, DISPATCH_METHOD, &dispparams, &varresult, NULL, NULL); + ok(hr == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hr); + V_VT(&args[3]) = VT_I4; + + /* Wrong argument count */ + dispparams.cArgs = 9; + hr = IPictureDisp_Invoke(picdisp, DISPID_PICT_RENDER, &GUID_NULL, 0, DISPATCH_METHOD, &dispparams, &varresult, NULL, NULL); + ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); + + ReleaseDC(NULL, hdc); IPictureDisp_Release(picdisp); } @@ -602,6 +642,55 @@ static void test_enhmetafile(void) IStream_Release(stream); } +static HRESULT picture_render(IPicture *iface, HDC hdc, LONG x, LONG y, LONG cx, LONG cy, + OLE_XPOS_HIMETRIC xSrc, + OLE_YPOS_HIMETRIC ySrc, + OLE_XSIZE_HIMETRIC cxSrc, + OLE_YSIZE_HIMETRIC cySrc, + const RECT *bounds) +{ + VARIANT ret, args[10]; + HRESULT hr, hr_disp; + DISPPARAMS params; + IDispatch *disp; + int i; + + hr = IPicture_Render(iface, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, bounds); + + IPicture_QueryInterface(iface, &IID_IDispatch, (void**)&disp); + + /* This is broken on 64 bits - accepted pointer argument type is still VT_I4 */ + for (i = 0; i < sizeof(args)/sizeof(args[0]); i++) + V_VT(&args[i]) = VT_I4; + + /* pack arguments and call */ + V_INT_PTR(&args[0]) = (INT_PTR)bounds; + V_I4(&args[1]) = cySrc; + V_I4(&args[2]) = cxSrc; + V_I4(&args[3]) = ySrc; + V_I4(&args[4]) = xSrc; + V_I4(&args[5]) = cy; + V_I4(&args[6]) = cx; + V_I4(&args[7]) = y; + V_I4(&args[8]) = x; + V_I4(&args[9]) = HandleToLong(hdc); + + params.rgvarg = args; + params.rgdispidNamedArgs = NULL; + params.cArgs = 10; + params.cNamedArgs = 0; + + V_VT(&ret) = VT_EMPTY; + hr_disp = IDispatch_Invoke(disp, DISPID_PICT_RENDER, &GUID_NULL, 0, DISPATCH_METHOD, + &params, &ret, NULL, NULL); + ok(hr == hr_disp, "DISPID_PICT_RENDER returned wrong code, 0x%08x, expected 0x%08x\n", + hr_disp, hr); + + IDispatch_Release(disp); + + return hr; +} + static void test_Render(void) { IPicture *pic; @@ -619,22 +708,22 @@ static void test_Render(void) ok(hres == S_OK, "IPicture_get_Type does not return S_OK, but 0x%08x\n", hres); ok(type == PICTYPE_UNINITIALIZED, "Expected type = PICTYPE_UNINITIALIZED, got = %d\n", type); /* zero dimensions */ - hres = IPicture_Render(pic, hdc, 0, 0, 0, 0, 0, 0, 0, 0, NULL); + hres = picture_render(pic, hdc, 0, 0, 0, 0, 0, 0, 0, 0, NULL); ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); - hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 10, 0, NULL); + hres = picture_render(pic, hdc, 0, 0, 10, 10, 0, 0, 10, 0, NULL); ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); - hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 0, 10, NULL); + hres = picture_render(pic, hdc, 0, 0, 10, 10, 0, 0, 0, 10, NULL); ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); - hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 0, 0, NULL); + hres = picture_render(pic, hdc, 0, 0, 10, 10, 0, 0, 0, 0, NULL); ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); - hres = IPicture_Render(pic, hdc, 0, 0, 0, 10, 0, 0, 10, 10, NULL); + hres = picture_render(pic, hdc, 0, 0, 0, 10, 0, 0, 10, 10, NULL); ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); - hres = IPicture_Render(pic, hdc, 0, 0, 10, 0, 0, 0, 10, 10, NULL); + hres = picture_render(pic, hdc, 0, 0, 10, 0, 0, 0, 10, 10, NULL); ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); - hres = IPicture_Render(pic, hdc, 0, 0, 0, 0, 0, 0, 10, 10, NULL); + hres = picture_render(pic, hdc, 0, 0, 0, 0, 0, 0, 10, 10, NULL); ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); /* nonzero dimensions, PICTYPE_UNINITIALIZED */ - hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 10, 10, NULL); + hres = picture_render(pic, hdc, 0, 0, 10, 10, 0, 0, 10, 10, NULL); ole_expect(hres, S_OK); IPicture_Release(pic); @@ -649,19 +738,19 @@ static void test_Render(void) OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, (VOID**)&pic); /* zero dimensions, PICTYPE_ICON */ - hres = IPicture_Render(pic, hdc, 0, 0, 0, 0, 0, 0, 0, 0, NULL); + hres = picture_render(pic, hdc, 0, 0, 0, 0, 0, 0, 0, 0, NULL); ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); - hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 10, 0, NULL); + hres = picture_render(pic, hdc, 0, 0, 10, 10, 0, 0, 10, 0, NULL); ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); - hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 0, 10, NULL); + hres = picture_render(pic, hdc, 0, 0, 10, 10, 0, 0, 0, 10, NULL); ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); - hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 0, 0, NULL); + hres = picture_render(pic, hdc, 0, 0, 10, 10, 0, 0, 0, 0, NULL); ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); - hres = IPicture_Render(pic, hdc, 0, 0, 0, 10, 0, 0, 10, 10, NULL); + hres = picture_render(pic, hdc, 0, 0, 0, 10, 0, 0, 10, 10, NULL); ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); - hres = IPicture_Render(pic, hdc, 0, 0, 10, 0, 0, 0, 10, 10, NULL); + hres = picture_render(pic, hdc, 0, 0, 10, 0, 0, 0, 10, 10, NULL); ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); - hres = IPicture_Render(pic, hdc, 0, 0, 0, 0, 0, 0, 10, 10, NULL); + hres = picture_render(pic, hdc, 0, 0, 0, 0, 0, 0, 10, 10, NULL); ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); /* Check if target size and position is respected */ @@ -673,7 +762,7 @@ static void test_Render(void) SetPixelV(hdc, 10, 10, 0x00223344); expected = GetPixel(hdc, 0, 0); - hres = IPicture_Render(pic, hdc, 1, 1, 9, 9, 0, 0, pWidth, -pHeight, NULL); + hres = picture_render(pic, hdc, 1, 1, 9, 9, 0, 0, pWidth, -pHeight, NULL); ole_expect(hres, S_OK); if(hres != S_OK) {

1 0

Frédéric Delanoy : winemenubuilder: Use BOOL type where appropriate.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: e5a26f6fdf57f9c9a48cfdbf3610d6b9c8e612db URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a26f6fdf57f9c9a48cfdbf3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 28 18:56:54 2014 +0100 winemenubuilder: Use BOOL type where appropriate. --- programs/winemenubuilder/winemenubuilder.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index afd3d96..592487f 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1862,11 +1862,10 @@ static HRESULT get_cmdline( IShellLinkW *sl, LPWSTR szPath, DWORD pathSize, if (hr == ERROR_SUCCESS) { WCHAR *s, *d; - int bcount, in_quotes; + int bcount = 0; + BOOL in_quotes = FALSE; /* Extract the application path */ - bcount=0; - in_quotes=0; s=szCmdline; d=szPath; while (*s)

1 0

Francois Gouget : xcopy/tests: Fix the test in case stdin has been redirected.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 8d51235dbeca036f91d6b6022944894f6abe962b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d51235dbeca036f91d6b6022… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 28 19:50:32 2014 +0100 xcopy/tests: Fix the test in case stdin has been redirected. --- programs/xcopy/tests/xcopy.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/xcopy/tests/xcopy.c b/programs/xcopy/tests/xcopy.c index 4cd6b1a..ec7683a 100644 --- a/programs/xcopy/tests/xcopy.c +++ b/programs/xcopy/tests/xcopy.c @@ -31,7 +31,11 @@ static DWORD runcmd(const char* cmd) /* Create a writable copy for CreateProcessA() */ wcmd = HeapAlloc(GetProcessHeap(), 0, strlen(cmd) + 1); strcpy(wcmd, cmd); - rc = CreateProcessA(NULL, wcmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + + /* On Windows 2003 and older, xcopy.exe fails if stdin is not a console + * handle, even with '/I /Y' options. + */ + rc = CreateProcessA(NULL, wcmd, NULL, NULL, FALSE, CREATE_NEW_CONSOLE, NULL, NULL, &si, &pi); HeapFree(GetProcessHeap(), 0, wcmd); if (!rc) return 260;

1 0

Piotr Caban : ole32: Change DoDragDrop return value on IDropTarget:: Drop call.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: bc2c6d39a69201ab64a03822ddd44f904853e8c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc2c6d39a69201ab64a03822d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 1 14:46:20 2014 +0100 ole32: Change DoDragDrop return value on IDropTarget::Drop call. --- dlls/ole32/ole2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index baaf02e..766b1e7 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2430,11 +2430,11 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) */ case DRAGDROP_S_DROP: if (*trackerInfo->pdwEffect != DROPEFFECT_NONE) - IDropTarget_Drop(trackerInfo->curDragTarget, - trackerInfo->dataObject, - trackerInfo->dwKeyState, - trackerInfo->curMousePos, - trackerInfo->pdwEffect); + trackerInfo->returnValue = IDropTarget_Drop(trackerInfo->curDragTarget, + trackerInfo->dataObject, + trackerInfo->dwKeyState, + trackerInfo->curMousePos, + trackerInfo->pdwEffect); else IDropTarget_DragLeave(trackerInfo->curDragTarget); break;

1 0

Piotr Caban : ole32: Merge OLEDD_TrackMouseMove and OLEDD_TrackStateChange functions.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 68d3a136f6ab6c174cf974fb5999e39eb1c5e714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d3a136f6ab6c174cf974fb5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 1 14:46:32 2014 +0100 ole32: Merge OLEDD_TrackMouseMove and OLEDD_TrackStateChange functions. --- dlls/ole32/ole2.c | 39 ++++++--------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 766b1e7..aa6ad7c 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -157,7 +157,6 @@ extern void OLEClipbrd_Initialize(void); */ static void OLEDD_Initialize(void); static LRESULT WINAPI OLEDD_DragTrackerWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -static void OLEDD_TrackMouseMove(TrackerWindowInfo* trackerInfo); static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo); static DWORD OLEDD_GetButtonState(void); @@ -2199,10 +2198,6 @@ static LRESULT WINAPI OLEDD_DragTrackerWindowProc( } case WM_TIMER: case WM_MOUSEMOVE: - { - OLEDD_TrackMouseMove((TrackerWindowInfo*)GetWindowLongPtrA(hwnd, 0)); - break; - } case WM_LBUTTONUP: case WM_MBUTTONUP: case WM_RBUTTONUP: @@ -2227,19 +2222,16 @@ static LRESULT WINAPI OLEDD_DragTrackerWindowProc( } /*** - * OLEDD_TrackMouseMove() + * OLEDD_TrackStateChange() * * This method is invoked while a drag and drop operation is in effect. - * it will generate the appropriate callbacks in the drop source - * and drop target. It will also provide the expected feedback to - * the user. * * params: * trackerInfo - Pointer to the structure identifying the * drag & drop operation that is currently * active. */ -static void OLEDD_TrackMouseMove(TrackerWindowInfo* trackerInfo) +static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) { HWND hwndNewTarget = 0; HRESULT hr = S_OK; @@ -2252,6 +2244,10 @@ static void OLEDD_TrackMouseMove(TrackerWindowInfo* trackerInfo) pt.y = trackerInfo->curMousePos.y; hwndNewTarget = WindowFromPoint(pt); + trackerInfo->returnValue = IDropSource_QueryContinueDrag(trackerInfo->dropSource, + trackerInfo->escPressed, + trackerInfo->dwKeyState); + /* * Every time, we re-initialize the effects passed to the * IDropTarget to the effects allowed by the source. @@ -2375,29 +2371,6 @@ static void OLEDD_TrackMouseMove(TrackerWindowInfo* trackerInfo) SetCursor(hCur); } -} - -/*** - * OLEDD_TrackStateChange() - * - * This method is invoked while a drag and drop operation is in effect. - * It is used to notify the drop target/drop source callbacks when - * the state of the keyboard or mouse button change. - * - * params: - * trackerInfo - Pointer to the structure identifying the - * drag & drop operation that is currently - * active. - */ -static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) -{ - /* - * Ask the drop source what to do with the operation. - */ - trackerInfo->returnValue = IDropSource_QueryContinueDrag( - trackerInfo->dropSource, - trackerInfo->escPressed, - trackerInfo->dwKeyState); /* * All the return valued will stop the operation except the S_OK

1 0

André Hentschel : Fix WWN 364
by Jeremy Newman 03 Mar '14

03 Mar '14

Module: website Branch: master Commit: 5db1bc5c78614b128de572ba3c0d33d512564ec5 URL: http://source.winehq.org/git/website.git/?a=commit;h=5db1bc5c78614b128de572… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 3 18:51:28 2014 +0100 Fix WWN 364 --- wwn/en/wn20140303_364.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/wwn/en/wn20140303_364.xml b/wwn/en/wn20140303_364.xml index 2148c6a..3134161 100644 --- a/wwn/en/wn20140303_364.xml +++ b/wwn/en/wn20140303_364.xml @@ -87,11 +87,9 @@ Shortly after the last WWN, Marcus wrote: <p> Wine is an accepted organization for GSoC 2014, would-be students should now discuss project ideas with us as in one week the Student application period opens. </p> -<quote> <p> -For each article you buy, we donate part of our benefit to Wine HQ. This way we all win :) +See <a href="http://wiki.winehq.org/SummerOfCode">our Wiki</a> for more informations and project ideas. </p> -</quote> </section> <section @@ -101,11 +99,16 @@ For each article you buy, we donate part of our benefit to Wine HQ. This way we posts="0" > <p> -Ismael Barros once wrote: As the design seems to be liked, we just made the garments available for sale. As always, you can find them at <a href="http://www.freewear.org/?org=Wine">freewear.org</a>. +Ismael Barros once wrote: +</p> +<quote> +<p> +As the design seems to be liked, we just made the garments available for sale. As always, you can find them at <a href="http://www.freewear.org/?org=Wine">freewear.org</a> </p> <p> -Ismael Barros once wrote: As the design seems to be liked, we just made the garments available for sale. As always, you can find them at <a href="http://www.freewear.org/?org=Wine">freewear.org</a>. +For each article you buy, we donate part of our benefit to Wine HQ. This way we all win :) </p> +</quote> </section> <section

1 0

André Hentschel : Add WWN 364
by Jeremy Newman 03 Mar '14

03 Mar '14

Module: website Branch: master Commit: 9f7757ac780763c972910c426ed72d158d910761 URL: http://source.winehq.org/git/website.git/?a=commit;h=9f7757ac780763c972910c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 3 17:52:05 2014 +0100 Add WWN 364 --- news/de/2014030301.xml | 16 + news/en/2014030301.xml | 16 + wwn/en/wn20140303_364.xml | 1577 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1609 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=9f7757ac780763c972…

1 0