January 2016 - Wine-commits

Nikolay Sivov : msxml3/tests: Fix BSTR leak warning (Valgrind).
by Alexandre Julliard 05 Jan '16

05 Jan '16

Module: wine Branch: master Commit: 529451e47f298b903a27c7eb2bbb9472c56a7af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=529451e47f298b903a27c7eb2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 4 01:04:39 2016 +0300 msxml3/tests: Fix BSTR leak warning (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/httpreq.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index ab72d3a..f228b41 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1752,6 +1752,7 @@ static void test_safe_httpreq(void) test_open(xhr, "GET", "http://www.test.winehq.org/tests/hello.html", E_ACCESSDENIED); IXMLHttpRequest_Release(xhr); + free_bstrs(); } START_TEST(httpreq)

1 0

Henri Verbeet : ddraw: Simplify the root surface test in ddraw_surface7_GetPriority().
by Alexandre Julliard 05 Jan '16

05 Jan '16

Module: wine Branch: master Commit: 8f91d3ccd8fa105d8d1537167996d6ac9863e64f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f91d3ccd8fa105d8d1537167… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 5 15:04:53 2016 +0100 ddraw: Simplify the root surface test in ddraw_surface7_GetPriority(). This fixes commit 97f0345f71679570d4eedb4ab750158d1a80001c. I assume it was applied by mistake, since it's also missing the correct sign-off. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 87f5bb0..0969650 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2377,12 +2377,9 @@ static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWO WARN("Called on offscreenplain surface, returning DDERR_INVALIDOBJECT.\n"); hr = DDERR_INVALIDOBJECT; } - else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) - || (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL) - || ((surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) - && !(surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP_POSITIVEX))) + else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->is_complex_root) { - WARN("Called on non-managed texture, mipmap sublevel or non +X toplevel surface, returning DDERR_INVALIDPARAMS.\n"); + WARN("Called on non-managed texture or non-root surface, returning DDERR_INVALIDPARAMS.\n"); hr = DDERR_INVALIDPARAMS; } else

1 0

Henri Verbeet : ddraw/tests: Don' t require a 3D device for test_resource_priority().
by Alexandre Julliard 05 Jan '16

05 Jan '16

Module: wine Branch: master Commit: 6862fc1dd7d15d4185f1d427487fce5e946ebdf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6862fc1dd7d15d4185f1d4274… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 5 15:04:54 2016 +0100 ddraw/tests: Don't require a 3D device for test_resource_priority(). This fixes commit b0d4502c29941c31108a53d6c23f9e23196fb7ec. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index f7a71b8..34e4c3d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -8436,10 +8436,7 @@ static void test_lost_device(void) static void test_resource_priority(void) { IDirectDrawSurface7 *surface, *mipmap; - D3DDEVICEDESC7 device_desc; DDSURFACEDESC2 surface_desc; - IDirect3D7 *d3d; - IDirect3DDevice7 *device; IDirectDraw7 *ddraw; ULONG refcount; HWND window; @@ -8472,19 +8469,10 @@ static void test_resource_priority(void) window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); - if (!(device = create_device(window, DDSCL_NORMAL))) - { - skip("Failed to create a 3D device, skipping test.\n"); - DestroyWindow(window); - return; - } - hr = IDirect3DDevice7_GetCaps(device, &device_desc); - ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); - hr = IDirect3DDevice7_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); - hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); - ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); - IDirect3D7_Release(d3d); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); memset(&hal_caps, 0, sizeof(hal_caps)); hal_caps.dwSize = sizeof(hal_caps); @@ -8505,12 +8493,6 @@ static void test_resource_priority(void) surface_desc.dwWidth = 32; surface_desc.dwHeight = 32; surface_desc.ddsCaps.dwCaps = test_data[i].caps; - if ((test_data[i].caps2 & DDSCAPS2_CUBEMAP) - && !(device_desc.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_CUBEMAP)) - { - skip("Device does not support cubemaps.\n"); - continue; - } surface_desc.ddsCaps.dwCaps2 = test_data[i].caps2; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); if (is_ddraw64 && (test_data[i].caps & DDSCAPS_TEXTURE)) @@ -8550,10 +8532,10 @@ static void test_resource_priority(void) if (test_data[i].caps2 & DDSCAPS2_CUBEMAP) { caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEZ; - priority = 0xdeadbeef; hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &mipmap); ok(SUCCEEDED(hr), "Failed to get attached surface, i %u, hr %#x.\n", i, hr); /* IDirectDrawSurface7_SetPriority crashes when called on non-positive X surfaces on Windows */ + priority = 0xdeadbeef; hr = IDirectDrawSurface7_GetPriority(mipmap, &priority); ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x, type %s.\n", hr, test_data[i].name); ok(priority == 0xdeadbeef, "Got unexpected priority %u, type %s.\n", priority, test_data[i].name); @@ -8595,8 +8577,7 @@ static void test_resource_priority(void) ok(!refcount, "Got unexpected refcount %u.\n", refcount); done: - IDirectDraw7_Release(ddraw); - refcount = IDirect3DDevice7_Release(device); + refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); DestroyWindow(window); }

1 0

Henri Verbeet : wined3d: Set WINED3D_BUFFER_DOUBLEBUFFER for managed buffers as well.
by Alexandre Julliard 05 Jan '16

05 Jan '16

Module: wine Branch: master Commit: e6e0c2278359340594da7451654ef7c50d175e7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6e0c2278359340594da74516… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 5 15:04:55 2016 +0100 wined3d: Set WINED3D_BUFFER_DOUBLEBUFFER for managed buffers as well. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/device.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/buffer.c | 2 +- 3 files changed, 156 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index daf45b7..8b20d19 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -5577,6 +5577,82 @@ static void test_swvp_buffer(void) DestroyWindow(window); } +static void test_managed_buffer(void) +{ + static const unsigned int vertex_count = 1024; + IDirect3DVertexBuffer8 *buffer; + D3DVERTEXBUFFER_DESC desc; + IDirect3DDevice8 *device; + struct vec3 *ptr, *ptr2; + IDirect3D8 *d3d8; + unsigned int i; + UINT refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + d3d8 = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d8, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d8, window, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateVertexBuffer(device, vertex_count * sizeof(*ptr), 0, 0, D3DPOOL_MANAGED, &buffer); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_GetDesc(buffer, &desc); + ok(SUCCEEDED(hr), "Failed to get desc, hr %#x.\n", hr); + ok(desc.Pool == D3DPOOL_MANAGED, "Got unexpected pool %#x.\n", desc.Pool); + ok(!desc.Usage, "Got unexpected usage %#x.\n", desc.Usage); + + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, vertex_count * sizeof(*ptr), (BYTE **)&ptr, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + for (i = 0; i < vertex_count; ++i) + { + ptr[i].x = i * 1.0f; + ptr[i].y = i * 2.0f; + ptr[i].z = i * 3.0f; + } + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(*ptr)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, vertex_count * sizeof(*ptr2), (BYTE **)&ptr2, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + ok(ptr2 == ptr, "Got unexpected ptr2 %p, expected %p.\n", ptr2, ptr); + for (i = 0; i < vertex_count; ++i) + { + if (ptr2[i].x != i * 1.0f || ptr2[i].y != i * 2.0f || ptr2[i].z != i * 3.0f) + { + ok(FALSE, "Got unexpected vertex %u {%.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e}.\n", + i, ptr2[i].x, ptr2[i].y, ptr2[i].z, i * 1.0f, i * 2.0f, i * 3.0f); + break; + } + } + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + IDirect3DVertexBuffer8_Release(buffer); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + static void test_npot_textures(void) { IDirect3DDevice8 *device = NULL; @@ -7530,6 +7606,7 @@ START_TEST(device) test_surface_blocks(); test_set_palette(); test_swvp_buffer(); + test_managed_buffer(); test_npot_textures(); test_volume_locking(); test_update_volumetexture(); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 6cdb225..16723df 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -8102,6 +8102,83 @@ static void test_swvp_buffer(void) DestroyWindow(window); } +static void test_managed_buffer(void) +{ + static const unsigned int vertex_count = 1024; + IDirect3DVertexBuffer9 *buffer; + D3DVERTEXBUFFER_DESC desc; + IDirect3DDevice9 *device; + struct vec3 *ptr, *ptr2; + IDirect3D9 *d3d9; + unsigned int i; + UINT refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d9, window, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateVertexBuffer(device, vertex_count * sizeof(*ptr), + 0, 0, D3DPOOL_MANAGED, &buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer9_GetDesc(buffer, &desc); + ok(SUCCEEDED(hr), "Failed to get desc, hr %#x.\n", hr); + ok(desc.Pool == D3DPOOL_MANAGED, "Got unexpected pool %#x.\n", desc.Pool); + ok(!desc.Usage, "Got unexpected usage %#x.\n", desc.Usage); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, vertex_count * sizeof(*ptr), (void **)&ptr, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + for (i = 0; i < vertex_count; ++i) + { + ptr[i].x = i * 1.0f; + ptr[i].y = i * 2.0f; + ptr[i].z = i * 3.0f; + } + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(*ptr)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLELIST, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, vertex_count * sizeof(*ptr2), (void **)&ptr2, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); + ok(ptr2 == ptr, "Got unexpected ptr2 %p, expected %p.\n", ptr2, ptr); + for (i = 0; i < vertex_count; ++i) + { + if (ptr2[i].x != i * 1.0f || ptr2[i].y != i * 2.0f || ptr2[i].z != i * 3.0f) + { + ok(FALSE, "Got unexpected vertex %u {%.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e}.\n", + i, ptr2[i].x, ptr2[i].y, ptr2[i].z, i * 1.0f, i * 2.0f, i * 3.0f); + break; + } + } + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); + + IDirect3DVertexBuffer9_Release(buffer); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + static void test_npot_textures(void) { IDirect3DDevice9 *device = NULL; @@ -10446,6 +10523,7 @@ START_TEST(device) test_surface_blocks(); test_set_palette(); test_swvp_buffer(); + test_managed_buffer(); test_npot_textures(); test_vidmem_accounting(); test_volume_locking(); diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 444015f..1e66cae 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1230,7 +1230,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory, buffer); - if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING) + if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING || pool == WINED3D_POOL_MANAGED) { /* SWvp always returns the same pointer in buffer maps and retains data in DISCARD maps. * Keep a system memory copy of the buffer to provide the same behavior to the application.

1 0

Henri Verbeet : wined3d: Get rid of GL_APPLE_client_storage support.
by Alexandre Julliard 05 Jan '16

05 Jan '16

Module: wine Branch: master Commit: 4287054943b5b659400438fc26fa5a328a10fa68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4287054943b5b659400438fc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 5 15:04:56 2016 +0100 wined3d: Get rid of GL_APPLE_client_storage support. Once upon a time this extention helped reduce address space usage on MacOS, although at the cost of obscure driver bugs. These days it just seems to make things worse. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 -- dlls/wined3d/surface.c | 38 +++--------------------- dlls/wined3d/texture.c | 65 +++--------------------------------------- dlls/wined3d/volume.c | 3 -- dlls/wined3d/wined3d_gl.h | 1 - dlls/wined3d/wined3d_private.h | 5 +--- 6 files changed, 9 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4287054943b5b65940043…

1 0

Henri Verbeet : wined3d: Get rid of unused error codes.
by Alexandre Julliard 05 Jan '16

05 Jan '16

Module: wine Branch: master Commit: 9c96a525e7989974e165a0c044ee90fda5d97e05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c96a525e7989974e165a0c04… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 5 15:04:57 2016 +0100 wined3d: Get rid of unused error codes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 4 ++-- dlls/ddraw/surface.c | 2 -- include/wine/wined3d.h | 18 ------------------ 4 files changed, 3 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6c94243..653a158 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1288,7 +1288,7 @@ static HRESULT WINAPI d3d8_device_GetDepthStencilSurface(IDirect3DDevice8 *iface } else { - hr = WINED3DERR_NOTFOUND; + hr = D3DERR_NOTFOUND; *depth_stencil = NULL; } wined3d_mutex_unlock(); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 16b27e5..294e680 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1525,7 +1525,7 @@ static HRESULT WINAPI d3d9_device_GetRenderTarget(IDirect3DDevice9Ex *iface, DWO } else { - hr = WINED3DERR_NOTFOUND; + hr = D3DERR_NOTFOUND; *surface = NULL; } wined3d_mutex_unlock(); @@ -1571,7 +1571,7 @@ static HRESULT WINAPI d3d9_device_GetDepthStencilSurface(IDirect3DDevice9Ex *ifa } else { - hr = WINED3DERR_NOTFOUND; + hr = D3DERR_NOTFOUND; *depth_stencil = NULL; } wined3d_mutex_unlock(); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0969650..0976603 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1653,7 +1653,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 * switch(hr) { case WINED3DERR_NOTAVAILABLE: return DDERR_UNSUPPORTED; - case WINED3DERR_WRONGTEXTUREFORMAT: return DDERR_INVALIDPIXELFORMAT; default: return hr; } } @@ -4164,7 +4163,6 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltFast(IDirectDrawSurfac switch(hr) { case WINED3DERR_NOTAVAILABLE: return DDERR_UNSUPPORTED; - case WINED3DERR_WRONGTEXTUREFORMAT: return DDERR_INVALIDPIXELFORMAT; default: return hr; } } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e38bc7d..9f39a6d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -39,35 +39,17 @@ #define WINED3DOK_NOAUTOGEN MAKE_WINED3DSTATUS(2159) #define MAKE_WINED3DHRESULT(code) MAKE_HRESULT(1, _FACWINED3D, code) -#define WINED3DERR_WRONGTEXTUREFORMAT MAKE_WINED3DHRESULT(2072) -#define WINED3DERR_UNSUPPORTEDCOLOROPERATION MAKE_WINED3DHRESULT(2073) -#define WINED3DERR_UNSUPPORTEDCOLORARG MAKE_WINED3DHRESULT(2074) -#define WINED3DERR_UNSUPPORTEDALPHAOPERATION MAKE_WINED3DHRESULT(2075) -#define WINED3DERR_UNSUPPORTEDALPHAARG MAKE_WINED3DHRESULT(2076) -#define WINED3DERR_TOOMANYOPERATIONS MAKE_WINED3DHRESULT(2077) -#define WINED3DERR_CONFLICTINGTEXTUREFILTER MAKE_WINED3DHRESULT(2078) -#define WINED3DERR_UNSUPPORTEDFACTORVALUE MAKE_WINED3DHRESULT(2079) #define WINED3DERR_CONFLICTINGRENDERSTATE MAKE_WINED3DHRESULT(2081) #define WINED3DERR_UNSUPPORTEDTEXTUREFILTER MAKE_WINED3DHRESULT(2082) -#define WINED3DERR_CONFLICTINGTEXTUREPALETTE MAKE_WINED3DHRESULT(2086) -#define WINED3DERR_DRIVERINTERNALERROR MAKE_WINED3DHRESULT(2087) -#define WINED3DERR_NOTFOUND MAKE_WINED3DHRESULT(2150) -#define WINED3DERR_MOREDATA MAKE_WINED3DHRESULT(2151) -#define WINED3DERR_DEVICENOTRESET MAKE_WINED3DHRESULT(2153) #define WINED3DERR_NOTAVAILABLE MAKE_WINED3DHRESULT(2154) #define WINED3DERR_OUTOFVIDEOMEMORY MAKE_WINED3DHRESULT(380) -#define WINED3DERR_INVALIDDEVICE MAKE_WINED3DHRESULT(2155) #define WINED3DERR_INVALIDCALL MAKE_WINED3DHRESULT(2156) -#define WINED3DERR_DRIVERINVALIDCALL MAKE_WINED3DHRESULT(2157) -#define WINED3DERR_WASSTILLDRAWING MAKE_WINED3DHRESULT(540) #define WINEDDERR_NOTAOVERLAYSURFACE MAKE_WINED3DHRESULT(580) #define WINEDDERR_NOTLOCKED MAKE_WINED3DHRESULT(584) #define WINEDDERR_NODC MAKE_WINED3DHRESULT(586) #define WINEDDERR_DCALREADYCREATED MAKE_WINED3DHRESULT(620) -#define WINEDDERR_NOTFLIPPABLE MAKE_WINED3DHRESULT(582) #define WINEDDERR_SURFACEBUSY MAKE_WINED3DHRESULT(430) #define WINEDDERR_INVALIDRECT MAKE_WINED3DHRESULT(150) -#define WINEDDERR_NOCLIPLIST MAKE_WINED3DHRESULT(205) #define WINEDDERR_OVERLAYNOTVISIBLE MAKE_WINED3DHRESULT(577) enum wined3d_light_type

1 0

Jacek Caban : mshtml: Added IHTMLElement::lang property implementation.
by Alexandre Julliard 05 Jan '16

05 Jan '16

Module: wine Branch: master Commit: 467981c29b9346e7065299a4619c8d2941e279d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=467981c29b9346e7065299a46… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 5 15:58:48 2016 +0100 mshtml: Added IHTMLElement::lang property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 36 ++++++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 6c948d3..ce9d859 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1265,15 +1265,43 @@ static HRESULT WINAPI HTMLElement_get_recordNumber(IHTMLElement *iface, VARIANT static HRESULT WINAPI HTMLElement_put_lang(IHTMLElement *iface, BSTR v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!This->nselem) { + FIXME("NULL nselem\n"); + return E_NOTIMPL; + } + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLElement_SetLang(This->nselem, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetLang failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLElement_get_lang(IHTMLElement *iface, BSTR *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->nselem) { + FIXME("NULL nselem\n"); + return E_NOTIMPL; + } + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLElement_GetLang(This->nselem, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLElement_get_offsetLeft(IHTMLElement *iface, LONG *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 9d09acd..bcb016d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3586,6 +3586,36 @@ static void _set_elem_language(unsigned line, IHTMLElement *elem, const char *la _test_elem_language(line, elem, lang); } +#define test_elem_lang(e,i) _test_elem_lang(__LINE__,e,i) +static void _test_elem_lang(unsigned line, IHTMLElement *elem, const char *exlang) +{ + BSTR lang = (void*)0xdeadbeef; + HRESULT hres; + + hres = IHTMLElement_get_lang(elem, &lang); + ok_(__FILE__,line) (hres == S_OK, "get_lang failed: %08x\n", hres); + + if(exlang) + ok_(__FILE__,line) (!strcmp_wa(lang, exlang), "unexpected lang %s\n", wine_dbgstr_w(lang)); + else + ok_(__FILE__,line) (!lang, "lang=%s\n", wine_dbgstr_w(lang)); + + SysFreeString(lang); +} + +#define set_elem_lang(e,i) _set_elem_lang(__LINE__,e,i) +static void _set_elem_lang(unsigned line, IHTMLElement *elem, const char *lang) +{ + BSTR str = a2bstr(lang); + HRESULT hres; + + hres = IHTMLElement_put_lang(elem, str); + ok_(__FILE__,line) (hres == S_OK, "get_lang failed: %08x\n", hres); + SysFreeString(str); + + _test_elem_lang(line, elem, lang); +} + #define test_elem_put_id(u,i) _test_elem_put_id(__LINE__,u,i) static void _test_elem_put_id(unsigned line, IUnknown *unk, const char *new_id) { @@ -8034,6 +8064,9 @@ static void test_elems(IHTMLDocument2 *doc) test_input_readOnly(input, VARIANT_TRUE); test_input_readOnly(input, VARIANT_FALSE); + test_elem_lang(elem, NULL); + set_elem_lang(elem, "en-us"); + IHTMLInputElement_Release(input); IHTMLElement_Release(elem); }

1 0

Hugh McMaster : wineconsole: Send the largest console window size information to the server.
by Alexandre Julliard 05 Jan '16

05 Jan '16

Module: wine Branch: master Commit: 8ac323f61b1406cc1581df27d009e41dc46630a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ac323f61b1406cc1581df27d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jan 5 18:59:31 2016 +1100 wineconsole: Send the largest console window size information to the server. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 6 +++++- server/console.c | 7 ------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 7a89eeb..729416f 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -424,11 +424,15 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf if (strcmpiW(data->curcfg.face_name, cfg->face_name) || data->curcfg.cell_width != cfg->cell_width || data->curcfg.cell_height != cfg->cell_height || data->curcfg.font_weight != cfg->font_weight) { + RECT r; data->fnSetFont(data, cfg->face_name, cfg->cell_height, cfg->font_weight); + SystemParametersInfoW(SPI_GETWORKAREA, 0, &r, 0); SERVER_START_REQ(set_console_output_info) { req->handle = wine_server_obj_handle( data->hConOut ); - req->mask = SET_CONSOLE_OUTPUT_INFO_FONT; + req->mask = SET_CONSOLE_OUTPUT_INFO_MAX_SIZE | SET_CONSOLE_OUTPUT_INFO_FONT; + req->max_width = (r.right - r.left) / cfg->cell_width; + req->max_height = (r.bottom - r.top - GetSystemMetrics(SM_CYCAPTION)) / cfg->cell_height; req->font_width = cfg->cell_width; req->font_height = cfg->cell_height; wine_server_call( req ); diff --git a/server/console.c b/server/console.c index a57b2fe..9b01614 100644 --- a/server/console.c +++ b/server/console.c @@ -1018,13 +1018,6 @@ static int set_console_output_info( struct screen_buffer *screen_buffer, } if (req->mask & SET_CONSOLE_OUTPUT_INFO_MAX_SIZE) { - /* can only be done by renderer */ - if (current->process->console != screen_buffer->input) - { - set_error( STATUS_INVALID_PARAMETER ); - return 0; - } - screen_buffer->max_width = req->max_width; screen_buffer->max_height = req->max_height; }

1 0

Hugh McMaster : kernel32: Implement GetLargestConsoleWindowSize.
by Alexandre Julliard 05 Jan '16

05 Jan '16

Module: wine Branch: master Commit: dd6477966b2628995e0a9384b04fee9658ef011b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd6477966b2628995e0a9384b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jan 5 18:59:32 2016 +1100 kernel32: Implement GetLargestConsoleWindowSize. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 51d6e60..f48bca7 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1360,6 +1360,22 @@ DWORD WINAPI GetConsoleTitleW(LPWSTR title, DWORD size) return ret; } +static COORD get_largest_console_window_size(HANDLE hConsole) +{ + COORD c = {0,0}; + + SERVER_START_REQ(get_console_output_info) + { + req->handle = console_handle_unmap(hConsole); + if (!wine_server_call_err(req)) + { + c.X = reply->max_width; + c.Y = reply->max_height; + } + } + SERVER_END_REQ; + return c; +} /*********************************************************************** * GetLargestConsoleWindowSize (KERNEL32.@) @@ -1378,8 +1394,7 @@ DWORD WINAPI GetLargestConsoleWindowSize(HANDLE hConsoleOutput) COORD c; DWORD w; } x; - x.c.X = 80; - x.c.Y = 24; + x.c = get_largest_console_window_size(hConsoleOutput); TRACE("(%p), returning %dx%d (%x)\n", hConsoleOutput, x.c.X, x.c.Y, x.w); return x.w; } @@ -1399,12 +1414,11 @@ DWORD WINAPI GetLargestConsoleWindowSize(HANDLE hConsoleOutput) COORD WINAPI GetLargestConsoleWindowSize(HANDLE hConsoleOutput) { COORD c; - c.X = 80; - c.Y = 24; + c = get_largest_console_window_size(hConsoleOutput); TRACE("(%p), returning %dx%d\n", hConsoleOutput, c.X, c.Y); return c; } -#endif /* defined(__i386__) */ +#endif /* !defined(__i386__) */ static WCHAR* S_EditString /* = NULL */; static unsigned S_EditStrPos /* = 0 */;

1 0

Hugh McMaster : kernel32: Add a stub for SetConsoleFont.
by Alexandre Julliard 05 Jan '16

05 Jan '16

Module: wine Branch: master Commit: c9364659aa5fd6c02bb8e766fe413a8a1c5f056d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9364659aa5fd6c02bb8e766f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jan 5 18:59:33 2016 +1100 kernel32: Add a stub for SetConsoleFont. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 6 ++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index f48bca7..3c53b52 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3256,6 +3256,12 @@ DWORD WINAPI GetNumberOfConsoleFonts(void) return 1; } +BOOL WINAPI SetConsoleFont(HANDLE hConsole, DWORD index) +{ + FIXME("(%p, %u): stub!\n", hConsole, index); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} BOOL WINAPI SetConsoleKeyShortcuts(BOOL set, BYTE keys, VOID *a, DWORD b) { diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ff67e54..d10e6bb 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1345,7 +1345,7 @@ @ stub SetConsoleCursorMode @ stdcall SetConsoleCursorPosition(long long) @ stdcall SetConsoleDisplayMode(long long ptr) -@ stub SetConsoleFont +@ stdcall SetConsoleFont(long long) @ stub SetConsoleHardwareState @ stdcall SetConsoleIcon(ptr) @ stdcall SetConsoleInputExeNameA(ptr)

1 0