February 2017 - Wine-commits

Henri Verbeet : d3d8/tests: Add a test for resource creation with D3DFMT_UNKNOWN.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 1b007ad38d2d01f7c8830f9f33d3cec69dc5cc4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b007ad38d2d01f7c8830f9f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 9 12:52:35 2017 +0100 d3d8/tests: Add a test for resource creation with D3DFMT_UNKNOWN. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 87d2433..da67fb3 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8149,6 +8149,107 @@ static void test_render_target_device_mismatch(void) DestroyWindow(window); } +static void test_format_unknown(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + UINT refcount; + HWND window; + void *iface; + HRESULT hr; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + if (SUCCEEDED(IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_P8))) + { + skip("P8 textures are supported, skipping some tests.\n"); + } + else + { + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice8_CreateRenderTarget(device, 64, 64, + D3DFMT_P8, D3DMULTISAMPLE_NONE, FALSE, (IDirect3DSurface8 **)&iface); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 64, 64, + D3DFMT_P8, D3DMULTISAMPLE_NONE, (IDirect3DSurface8 **)&iface); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice8_CreateTexture(device, 64, 64, 1, 0, + D3DFMT_P8, D3DPOOL_DEFAULT, (IDirect3DTexture8 **)&iface); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice8_CreateCubeTexture(device, 64, 1, 0, + D3DFMT_P8, D3DPOOL_DEFAULT, (IDirect3DCubeTexture8 **)&iface); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice8_CreateVolumeTexture(device, 64, 64, 1, 1, 0, + D3DFMT_P8, D3DPOOL_DEFAULT, (IDirect3DVolumeTexture8 **)&iface); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + } + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice8_CreateRenderTarget(device, 64, 64, + D3DFMT_UNKNOWN, D3DMULTISAMPLE_NONE, FALSE, (IDirect3DSurface8 **)&iface); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + todo_wine ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 64, 64, + D3DFMT_UNKNOWN, D3DMULTISAMPLE_NONE, (IDirect3DSurface8 **)&iface); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + todo_wine ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice8_CreateImageSurface(device, 64, 64, + D3DFMT_UNKNOWN, (IDirect3DSurface8 **)&iface); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice8_CreateTexture(device, 64, 64, 1, 0, + D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DTexture8 **)&iface); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + todo_wine ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice8_CreateCubeTexture(device, 64, 1, 0, + D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DCubeTexture8 **)&iface); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + todo_wine ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice8_CreateVolumeTexture(device, 64, 64, 1, 1, 0, + D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DVolumeTexture8 **)&iface); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + todo_wine ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -8254,6 +8355,7 @@ START_TEST(device) test_check_device_format(); test_miptree_layout(); test_render_target_device_mismatch(); + test_format_unknown(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Henri Verbeet : d3d9/tests: Add a test for resource creation with D3DFMT_UNKNOWN.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: b28631f62f2a20c61a656d0f810710407424b899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b28631f62f2a20c61a656d0f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 9 12:52:36 2017 +0100 d3d9/tests: Add a test for resource creation with D3DFMT_UNKNOWN. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/device.c | 64 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index f949f5c..6348ee7 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3701,6 +3701,81 @@ static void test_backbuffer_resize(void) DestroyWindow(window); } +static void test_format_unknown(void) +{ + IDirect3DDevice9Ex *device; + UINT refcount; + HWND window; + void *iface; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, NULL))) + { + skip("Failed to create a D3D device.\n"); + DestroyWindow(window); + return; + } + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice9Ex_CreateRenderTarget(device, 64, 64, + D3DFMT_UNKNOWN, D3DMULTISAMPLE_NONE, 0, FALSE, (IDirect3DSurface9 **)&iface, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice9Ex_CreateRenderTargetEx(device, 64, 64, + D3DFMT_UNKNOWN, D3DMULTISAMPLE_NONE, 0, FALSE, (IDirect3DSurface9 **)&iface, NULL, 0); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice9Ex_CreateDepthStencilSurface(device, 64, 64, + D3DFMT_UNKNOWN, D3DMULTISAMPLE_NONE, 0, TRUE, (IDirect3DSurface9 **)&iface, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice9Ex_CreateDepthStencilSurfaceEx(device, 64, 64, + D3DFMT_UNKNOWN, D3DMULTISAMPLE_NONE, 0, TRUE, (IDirect3DSurface9 **)&iface, NULL, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!iface, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, 64, 64, + D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DSurface9 **)&iface, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurfaceEx(device, 64, 64, + D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DSurface9 **)&iface, NULL, 9); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!iface, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice9Ex_CreateTexture(device, 64, 64, 1, 0, + D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DTexture9 **)&iface, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice9Ex_CreateCubeTexture(device, 64, 1, 0, + D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DCubeTexture9 **)&iface, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice9Ex_CreateVolumeTexture(device, 64, 64, 1, 1, 0, + D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DVolumeTexture9 **)&iface, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + refcount = IDirect3DDevice9Ex_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(d3d9ex) { DEVMODEW current_mode; @@ -3749,4 +3824,5 @@ START_TEST(d3d9ex) test_window_style(); test_swapchain_parameters(); test_backbuffer_resize(); + test_format_unknown(); } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index e776515..feb1efc 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11443,6 +11443,69 @@ static void test_render_target_device_mismatch(void) DestroyWindow(window); } +static void test_format_unknown(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + UINT refcount; + HWND window; + void *iface; + HRESULT hr; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice9_CreateRenderTarget(device, 64, 64, + D3DFMT_UNKNOWN, D3DMULTISAMPLE_NONE, 0, FALSE, (IDirect3DSurface9 **)&iface, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 64, 64, + D3DFMT_UNKNOWN, D3DMULTISAMPLE_NONE, 0, TRUE, (IDirect3DSurface9 **)&iface, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 64, 64, + D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DSurface9 **)&iface, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 1, 0, + D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DTexture9 **)&iface, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice9_CreateCubeTexture(device, 64, 1, 0, + D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DCubeTexture9 **)&iface, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + iface = (void *)0xdeadbeef; + hr = IDirect3DDevice9_CreateVolumeTexture(device, 64, 64, 1, 1, 0, + D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DVolumeTexture9 **)&iface, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!iface, "Got unexpected iface %p.\n", iface); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -11560,6 +11623,7 @@ START_TEST(device) test_miptree_layout(); test_get_render_target_data(); test_render_target_device_mismatch(); + test_format_unknown(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Henri Verbeet : d3d9: Clear the "surface" pointer on error in d3d9_device_CreateDepthStencilSurfaceEx().
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 6b8cc32a1f1b63b4ac7a0924a16cb38d20e06946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8cc32a1f1b63b4ac7a0924a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 9 12:52:37 2017 +0100 d3d9: Clear the "surface" pointer on error in d3d9_device_CreateDepthStencilSurfaceEx(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 1 + dlls/d3d9/tests/d3d9ex.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e646cb7..ec1b985 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3474,6 +3474,7 @@ static HRESULT WINAPI d3d9_device_CreateDepthStencilSurfaceEx(IDirect3DDevice9Ex if (discard) flags |= WINED3D_TEXTURE_CREATE_DISCARD; + *surface = NULL; return d3d9_device_create_surface(device, width, height, format, flags, surface, D3DUSAGE_DEPTHSTENCIL | usage, D3DPOOL_DEFAULT, multisample_type, multisample_quality, NULL); } diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 6348ee7..1dbab26 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3739,7 +3739,7 @@ static void test_format_unknown(void) hr = IDirect3DDevice9Ex_CreateDepthStencilSurfaceEx(device, 64, 64, D3DFMT_UNKNOWN, D3DMULTISAMPLE_NONE, 0, TRUE, (IDirect3DSurface9 **)&iface, NULL, 0); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!iface, "Got unexpected iface %p.\n", iface); + ok(!iface, "Got unexpected iface %p.\n", iface); iface = (void *)0xdeadbeef; hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, 64, 64,

1 0

Henri Verbeet : d3d8: Do not modify the "texture" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateTexture().
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 5ec48e76ad0a285b046b1af41b552ab697bc8344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec48e76ad0a285b046b1af41… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 9 12:52:38 2017 +0100 d3d8: Do not modify the "texture" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateTexture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 3 +++ dlls/d3d8/tests/device.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 805694b..989c1b0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -791,6 +791,9 @@ static HRESULT WINAPI d3d8_device_CreateTexture(IDirect3DDevice8 *iface, TRACE("iface %p, width %u, height %u, levels %u, usage %#x, format %#x, pool %#x, texture %p.\n", iface, width, height, levels, usage, format, pool, texture); + if (!format) + return D3DERR_INVALIDCALL; + *texture = NULL; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index da67fb3..c05c9f2 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8230,7 +8230,7 @@ static void test_format_unknown(void) hr = IDirect3DDevice8_CreateTexture(device, 64, 64, 1, 0, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DTexture8 **)&iface); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); + ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); iface = (void *)0xdeadbeef; hr = IDirect3DDevice8_CreateCubeTexture(device, 64, 1, 0,

1 0

Henri Verbeet : d3d8: Do not modify the "texture" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateCubeTexture().
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 9e16f478c1c1d18e35d0964ca93378626fede569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e16f478c1c1d18e35d0964ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 9 12:52:39 2017 +0100 d3d8: Do not modify the "texture" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateCubeTexture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 3 +++ dlls/d3d8/tests/device.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 989c1b0..ad5880c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -853,6 +853,9 @@ static HRESULT WINAPI d3d8_device_CreateCubeTexture(IDirect3DDevice8 *iface, UIN TRACE("iface %p, edge_length %u, levels %u, usage %#x, format %#x, pool %#x, texture %p.\n", iface, edge_length, levels, usage, format, pool, texture); + if (!format) + return D3DERR_INVALIDCALL; + *texture = NULL; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c05c9f2..ff3c9b4 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8236,7 +8236,7 @@ static void test_format_unknown(void) hr = IDirect3DDevice8_CreateCubeTexture(device, 64, 1, 0, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DCubeTexture8 **)&iface); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); + ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); iface = (void *)0xdeadbeef; hr = IDirect3DDevice8_CreateVolumeTexture(device, 64, 64, 1, 1, 0,

1 0

Henri Verbeet : d3d8: Do not modify the "texture" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateVolumeTexture().
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: bb8f4d7a888b791b0dc56e7c281b215d12bd022c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8f4d7a888b791b0dc56e7c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 9 12:52:40 2017 +0100 d3d8: Do not modify the "texture" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateVolumeTexture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 3 +++ dlls/d3d8/tests/device.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index ad5880c..2c8d6cb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -824,6 +824,9 @@ static HRESULT WINAPI d3d8_device_CreateVolumeTexture(IDirect3DDevice8 *iface, TRACE("iface %p, width %u, height %u, depth %u, levels %u, usage %#x, format %#x, pool %#x, texture %p.\n", iface, width, height, depth, levels, usage, format, pool, texture); + if (!format) + return D3DERR_INVALIDCALL; + *texture = NULL; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index ff3c9b4..9a9278b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8242,7 +8242,7 @@ static void test_format_unknown(void) hr = IDirect3DDevice8_CreateVolumeTexture(device, 64, 64, 1, 1, 0, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DVolumeTexture8 **)&iface); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); + ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Henri Verbeet : wined3d: Disallow upload conversion from compressed formats in surface_convert_format ().
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 5a6efe632918fd18758897c39910d52791d46053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a6efe632918fd18758897c39… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 8 16:46:36 2017 +0100 wined3d: Disallow upload conversion from compressed formats in surface_convert_format(). The underlying issue is that glCompressedTexSubImage2D() needs the upload format to match the texture's internal format. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 222159b..628c83a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1521,7 +1521,8 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr if (!(conv = find_converter(src_format->id, dst_format->id)) && (!device->d3d_initialized || !is_identity_fixup(src_format->color_fixup) || src_format->convert - || !is_identity_fixup(dst_format->color_fixup) || dst_format->convert)) + || !is_identity_fixup(dst_format->color_fixup) || dst_format->convert + || (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED))) { FIXME("Cannot find a conversion function from format %s to %s.\n", debug_d3dformat(src_format->id), debug_d3dformat(dst_format->id));

1 0

Ken Thomases : winemac: Pass correct buffer length to RegQueryValueExW().
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 02c6e4530246f510f5683b44d9d50bea445dfdba URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c6e4530246f510f5683b44d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 8 09:30:13 2017 -0600 winemac: Pass correct buffer length to RegQueryValueExW(). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/mouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index f25b06d..67e0dce 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -206,7 +206,7 @@ CFStringRef copy_system_cursor_name(ICONINFOEXW *info) DWORD size, ret; value[0] = 0; - size = sizeof(value) / sizeof(WCHAR); + size = sizeof(value); ret = RegQueryValueExW(key, name, NULL, NULL, (BYTE *)value, &size); RegCloseKey(key); if (!ret)

1 0

Bruno Jesus : wlanapi: Semi-stub WlanEnumInterfaces.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 6bb8ca1e25a9cfc66f396b2ae6bc423a8057929c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb8ca1e25a9cfc66f396b2ae… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Feb 7 16:05:40 2017 -0200 wlanapi: Semi-stub WlanEnumInterfaces. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 24 ++++++++++++++++++++++-- dlls/wlanapi/tests/wlanapi.c | 5 ----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 3fae765..6955245 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -63,8 +63,28 @@ static HANDLE handle_new(struct wine_wlan **entry) DWORD WINAPI WlanEnumInterfaces(HANDLE handle, void *reserved, WLAN_INTERFACE_INFO_LIST **interface_list) { - FIXME("(%p, %p, %p) stub\n", handle, reserved, interface_list); - return ERROR_CALL_NOT_IMPLEMENTED; + struct wine_wlan *wlan; + WLAN_INTERFACE_INFO_LIST *ret_list; + + FIXME("(%p, %p, %p) semi-stub\n", handle, reserved, interface_list); + + if (!handle || reserved || !interface_list) + return ERROR_INVALID_PARAMETER; + + wlan = handle_index(handle); + if (!wlan) + return ERROR_INVALID_HANDLE; + + ret_list = WlanAllocateMemory(sizeof(WLAN_INTERFACE_INFO_LIST)); + if (!ret_list) + return ERROR_NOT_ENOUGH_MEMORY; + + memset(&ret_list->InterfaceInfo[0], 0, sizeof(WLAN_INTERFACE_INFO)); + ret_list->dwNumberOfItems = 0; + ret_list->dwIndex = 0; /* unused in this function */ + *interface_list = ret_list; + + return ERROR_SUCCESS; } DWORD WINAPI WlanCloseHandle(HANDLE handle, void *reserved) diff --git a/dlls/wlanapi/tests/wlanapi.c b/dlls/wlanapi/tests/wlanapi.c index e0c55f6..882aa82 100644 --- a/dlls/wlanapi/tests/wlanapi.c +++ b/dlls/wlanapi/tests/wlanapi.c @@ -134,24 +134,19 @@ static void test_WlanEnumInterfaces(void) /* invalid parameters */ ret = WlanEnumInterfaces(NULL, NULL, &list); -todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); ok(list == bad_list, "list changed\n"); ret = WlanEnumInterfaces(handle, &reserved, &list); -todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); ok(list == bad_list, "list changed\n"); ret = WlanEnumInterfaces(handle, NULL, NULL); -todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); ok(list == bad_list, "list changed\n"); /* good tests */ list = NULL; ret = WlanEnumInterfaces(handle, NULL, &list); -todo_wine ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); -todo_wine ok(list != NULL, "bad interface list\n"); if (!list || !list->dwNumberOfItems) {

1 0

Francois Gouget : inetcomm/tests: A spelling fix in an ok() message.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 6b2dbe6cf6e30d9833f32d2c933be9175cc3eba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b2dbe6cf6e30d9833f32d2c9… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 12:09:51 2017 +0100 inetcomm/tests: A spelling fix in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 5701af6..c2026bc 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -1579,7 +1579,7 @@ static void test_mhtml_protocol(void) hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "CreateInstance returned: %08x\n", hres); hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocol, (void**)&unk2); - ok(hres == S_OK, "Coult not get IInternetProtocol iface: %08x\n", hres); + ok(hres == S_OK, "Could not get IInternetProtocol iface: %08x\n", hres); IUnknown_Release(unk2); IUnknown_Release(unk);

1 0