August 2016 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : d3dx10: Implement D3DX10CreateDeviceAndSwapChain.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: deafe568d235c44c24ece57e48d5b463f399694b URL: http://source.winehq.org/git/wine.git/?a=commit;h=deafe568d235c44c24ece57e4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 5 20:56:33 2016 +0200 d3dx10: Implement D3DX10CreateDeviceAndSwapChain. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 17 +++++++++++++++++ include/d3dx10core.idl | 3 +++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 8c71cce..7795cc8 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -19,7 +19,7 @@ @ stub D3DX10CreateAsyncTextureInfoProcessor(ptr ptr) @ stub D3DX10CreateAsyncTextureProcessor(ptr ptr ptr) @ stdcall D3DX10CreateDevice(ptr long long long ptr) -@ stub D3DX10CreateDeviceAndSwapChain(ptr long long long ptr ptr ptr) +@ stdcall D3DX10CreateDeviceAndSwapChain(ptr long long long ptr ptr ptr) @ stdcall D3DX10CreateEffectFromFileA(str ptr ptr str long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DX10CreateEffectFromFileW(wstr ptr ptr str long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DX10CreateEffectFromMemory(ptr long str ptr ptr str long long ptr ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 3f81088..0edb3a9 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -187,6 +187,23 @@ HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive return hr; } +HRESULT WINAPI D3DX10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, + HMODULE swrast, unsigned int flags, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain, + ID3D10Device **device) +{ + HRESULT hr; + + TRACE("adapter %p, driver_type %d, swrast %p, flags %#x, desc %p, swapchain %p, device %p.\n", + adapter, driver_type, swrast, flags, desc, swapchain, device); + + if (SUCCEEDED(hr = D3D10CreateDeviceAndSwapChain1(adapter, driver_type, swrast, flags, D3D10_FEATURE_LEVEL_10_1, + D3D10_1_SDK_VERSION, desc, swapchain, (ID3D10Device1 **)device))) + return hr; + + return D3D10CreateDeviceAndSwapChain1(adapter, driver_type, swrast, flags, D3D10_FEATURE_LEVEL_10_0, + D3D10_1_SDK_VERSION, desc, swapchain, (ID3D10Device1 **)device); +} + HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *src_data, SIZE_T src_data_size, D3DX10_IMAGE_LOAD_INFO *loadinfo, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult) diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl index 524b9ee..40d132c 100644 --- a/include/d3dx10core.idl +++ b/include/d3dx10core.idl @@ -68,4 +68,7 @@ interface ID3DX10ThreadPump : IUnknown cpp_quote("HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device);") cpp_quote("HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,") cpp_quote(" HMODULE swrast, unsigned int flags, ID3D10Device **device);") +cpp_quote("HRESULT WINAPI D3DX10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,") +cpp_quote(" HMODULE swrast, unsigned int flags, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain,") +cpp_quote(" ID3D10Device **device);") cpp_quote("HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1);")

1 0

Matteo Bruni : d3dx9: Add stubs for D3DXFill*TextureTX().
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 2cd9db009ad5751bfc9e02d5120e9f88f0855a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd9db009ad5751bfc9e02d51… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Aug 5 20:56:34 2016 +0200 d3dx9: Add stubs for D3DXFill*TextureTX(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 6 +++--- dlls/d3dx9_25/d3dx9_25.spec | 6 +++--- dlls/d3dx9_26/d3dx9_26.spec | 6 +++--- dlls/d3dx9_27/d3dx9_27.spec | 6 +++--- dlls/d3dx9_28/d3dx9_28.spec | 6 +++--- dlls/d3dx9_29/d3dx9_29.spec | 6 +++--- dlls/d3dx9_30/d3dx9_30.spec | 6 +++--- dlls/d3dx9_31/d3dx9_31.spec | 6 +++--- dlls/d3dx9_32/d3dx9_32.spec | 6 +++--- dlls/d3dx9_33/d3dx9_33.spec | 6 +++--- dlls/d3dx9_34/d3dx9_34.spec | 6 +++--- dlls/d3dx9_35/d3dx9_35.spec | 6 +++--- dlls/d3dx9_36/d3dx9_36.spec | 6 +++--- dlls/d3dx9_36/texture.c | 18 ++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 6 +++--- dlls/d3dx9_38/d3dx9_38.spec | 6 +++--- dlls/d3dx9_39/d3dx9_39.spec | 6 +++--- dlls/d3dx9_40/d3dx9_40.spec | 6 +++--- dlls/d3dx9_41/d3dx9_41.spec | 6 +++--- dlls/d3dx9_42/d3dx9_42.spec | 6 +++--- dlls/d3dx9_43/d3dx9_43.spec | 6 +++--- 21 files changed, 78 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2cd9db009ad5751bfc9e0…

1 0

Matteo Bruni : d3dx9/tests: Add a test for texture shaders.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: a7a89b8b003ae7c642ca30b6ec6ed120494e2e17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7a89b8b003ae7c642ca30b6e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Aug 5 20:56:35 2016 +0200 d3dx9/tests: Add a test for texture shaders. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/texture.c | 242 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 242 insertions(+) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 87d13d2..011f756 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -116,6 +116,22 @@ static inline void expect_vec4_(unsigned int line, const D3DXVECTOR4 *expected, got->x, got->y, got->z, got->w); } +static BOOL compare_color(DWORD c1, DWORD c2, BYTE max_diff) +{ + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + return FALSE; + c1 >>= 8; c2 >>= 8; + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + return FALSE; + c1 >>= 8; c2 >>= 8; + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + return FALSE; + c1 >>= 8; c2 >>= 8; + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + return FALSE; + return TRUE; +} + static BOOL is_autogenmipmap_supported(IDirect3DDevice9 *device, D3DRESOURCETYPE resource_type) { HRESULT hr; @@ -1991,6 +2007,230 @@ static void test_D3DXSaveTextureToFileInMemory(IDirect3DDevice9 *device) IDirect3DVolumeTexture9_Release(volume_texture); } +void test_texture_shader(void) +{ + static const DWORD shader_zero[] = {0x0}; + static const DWORD shader_invalid[] = {0xeeee0100}; + static const DWORD shader_empty[] = {0xfffe0200, 0x0000ffff}; +#if 0 +float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR +{ + return float4(pos, 1.0); +} +#endif + static const DWORD shader_code[] = + { + 0x54580100, 0x0015fffe, 0x42415443, 0x0000001c, 0x0000001f, 0x54580100, 0x00000000, 0x00000000, + 0x00000100, 0x0000001c, 0x4d007874, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, + 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, 0x392e3932, 0x332e3235, 0x00313131, 0x000afffe, + 0x54494c43, 0x00000004, 0x00000000, 0x3ff00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x0014fffe, 0x434c5846, 0x00000002, 0x10000003, 0x00000001, 0x00000000, + 0x00000003, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x10000001, 0x00000001, 0x00000000, + 0x00000001, 0x00000000, 0x00000000, 0x00000004, 0x00000003, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, + }; + IDirect3DVolumeTexture9 *volume_texture; + IDirect3DCubeTexture9 *cube_texture; + D3DPRESENT_PARAMETERS d3dpp; + IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; + ID3DXTextureShader *tx; + unsigned int x, y, z; + ID3DXBuffer *buffer; + unsigned int *data; + D3DLOCKED_RECT lr; + D3DLOCKED_BOX lb; + IDirect3D9 *d3d; + D3DCAPS9 caps; + HRESULT hr; + HWND wnd; + + hr = D3DXCreateTextureShader(NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = D3DXCreateTextureShader(NULL, &tx); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = D3DXCreateTextureShader(shader_invalid, &tx); + todo_wine ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#x.\n", hr); + + hr = D3DXCreateTextureShader(shader_zero, &tx); + todo_wine ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#x.\n", hr); + + hr = D3DXCreateTextureShader(shader_empty, &tx); + todo_wine ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#x.\n", hr); + + hr = D3DXCreateTextureShader(shader_code, &tx); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + hr = tx->lpVtbl->GetFunction(tx, &buffer); + todo_wine ok(SUCCEEDED(hr), "Failed to get texture shader bytecode.\n"); + if (FAILED(hr)) + { + skip("Texture shaders not supported, skipping further tests.\n"); + IUnknown_Release(tx); + return; + } + ID3DXBuffer_Release(buffer); + + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) + { + skip("Couldn't create application window.\n"); + IUnknown_Release(tx); + return; + } + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d) + { + skip("Couldn't create IDirect3D9 object.\n"); + DestroyWindow(wnd); + IUnknown_Release(tx); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object, hr %#x.\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + IUnknown_Release(tx); + return; + } + + IDirect3DDevice9_GetDeviceCaps(device, &caps); + + hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, + &texture, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + hr = D3DXFillTextureTX(texture, tx); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DTexture9_LockRect(texture, 0, &lr, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Locking texture failed, hr %#x.\n", hr); + data = lr.pBits; + for (y = 0; y < 256; ++y) + { + for (x = 0; x < 256; ++x) + { + unsigned int expected = 0xff000000 | x << 16 | y << 8; + /* The third position coordinate is apparently undefined for 2D textures. */ + unsigned int color = data[y * lr.Pitch / sizeof(*data) + x] & 0xffffff00; + + ok(compare_color(color, expected, 1), "Unexpected color %08x at (%u, %u).\n", color, x, y); + } + } + hr = IDirect3DTexture9_UnlockRect(texture, 0); + ok(SUCCEEDED(hr), "Unlocking texture failed, hr %#x.\n", hr); + + IDirect3DTexture9_Release(texture); + + if (!(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP)) + { + skip("Cube textures not supported, skipping tests.\n"); + goto cleanup; + } + + hr = IDirect3DDevice9_CreateCubeTexture(device, 256, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, + &cube_texture, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + hr = D3DXFillCubeTextureTX(cube_texture, tx); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + for (z = 0; z < 6; ++z) + { + static const char * const mapping[6][3] = + { + {"-x", "-y", "1"}, + {"+x", "-y", "0"}, + {"+y", "1", "+x"}, + {"-y", "0", "+x"}, + {"1", "-y", "+x"}, + {"0", "-y", "-x"}, + }; + + hr = IDirect3DCubeTexture9_LockRect(cube_texture, z, 0, &lr, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Locking texture failed, hr %#x.\n", hr); + data = lr.pBits; + for (y = 0; y < 256; ++y) + { + for (x = 0; x < 256; ++x) + { + unsigned int color = data[y * lr.Pitch / sizeof(*data) + x]; + unsigned int expected = 0xff000000; + unsigned int i; + + for (i = 0; i < 3; ++i) + { + int component; + + if (mapping[z][i][0] == '0') + component = 0; + else if (mapping[z][i][0] == '1') + component = 255; + else + component = mapping[z][i][1] == 'x' ? x * 2 - 255 : y * 2 - 255; + if (mapping[z][i][0] == '-') + component = -component; + expected |= max(component, 0) << i * 8; + } + ok(compare_color(color, expected, 1), "Unexpected color %08x at (%u, %u, %u).\n", + color, x, y, z); + } + } + hr = IDirect3DCubeTexture9_UnlockRect(cube_texture, z, 0); + ok(SUCCEEDED(hr), "Unlocking texture failed, hr %#x.\n", hr); + } + + IDirect3DCubeTexture9_Release(cube_texture); + + if (!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP) || caps.MaxVolumeExtent < 64) + { + skip("Volume textures not supported, skipping test.\n"); + goto cleanup; + } + hr = IDirect3DDevice9_CreateVolumeTexture(device, 64, 64, 64, 1, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &volume_texture, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + hr = D3DXFillVolumeTextureTX(volume_texture, tx); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVolumeTexture9_LockBox(volume_texture, 0, &lb, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Locking texture failed, hr %#x.\n", hr); + data = lb.pBits; + for (z = 0; z < 64; ++z) + { + for (y = 0; y < 64; ++y) + { + for (x = 0; x < 64; ++x) + { + unsigned int expected = 0xff000000 | ((x * 4 + 2) << 16) | ((y * 4 + 2) << 8) | (z * 4 + 2); + unsigned int color = data[z * lb.SlicePitch / sizeof(*data) + y * lb.RowPitch / sizeof(*data) + x]; + + ok(compare_color(color, expected, 1), "Unexpected color %08x at (%u, %u, %u).\n", + color, x, y, z); + } + } + } + hr = IDirect3DVolumeTexture9_UnlockBox(volume_texture, 0); + ok(SUCCEEDED(hr), "Unlocking texture failed, hr %#x.\n", hr); + + IDirect3DVolumeTexture9_Release(volume_texture); + + cleanup: + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + IUnknown_Release(tx); +} + START_TEST(texture) { HWND wnd; @@ -2053,4 +2293,6 @@ START_TEST(texture) IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); DestroyWindow(wnd); + + test_texture_shader(); }

1 0

Józef Kucia : d3dx9/tests: Fix compilation when the INFINITY macro is not available.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 61de92735593eb79df8145c31ba84b6127ab1f49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61de92735593eb79df8145c31… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 4 17:52:14 2016 +0200 d3dx9/tests: Fix compilation when the INFINITY macro is not available. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 41db494..b3845c5 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -22,6 +22,15 @@ #include "wine/test.h" #include "d3dx9.h" +#ifndef INFINITY +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() +#endif /* INFINITY */ + #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(*arr)) /* helper functions */ @@ -4181,7 +4190,7 @@ static void test_preshader_op(IDirect3DDevice9 *device, const DWORD *sample_effe static void test_effect_preshader_ops(IDirect3DDevice9 *device) { - static const struct test_preshader_op_def op_tests[] = + const struct test_preshader_op_def op_tests[] = { {"exp", 0x10500001, 1, {0x3f800000, 0x3f800000, 0x3e5edc66, 0x7f800000}, {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}},

1 0

Nikolay Sivov : d3dx9: Remove dead assignment (Coverity).
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 29fee71f1d0e26680c858dc44ce42885f4e3cd45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29fee71f1d0e26680c858dc44… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 09:17:16 2016 +0300 d3dx9: Remove dead assignment (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 3204ea7..c26aa72 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -5662,7 +5662,6 @@ static HRESULT create_outline(struct glyphinfo *glyph, void *raw_outline, int da pt->corner = POINTTYPE_CURVE_END; } outline->count--; - lastpt = &outline->items[outline->count - 1]; } else { /* outline closed with a line from end to start point */ attempt_line_merge(outline, outline->count - 1, &pt->pos, FALSE, cos_table);

1 0

Nikolay Sivov : d3dx9/tests: Remove dead assignment.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 0054621b70cf2f1e123af5a1f61c1b572d5d35c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0054621b70cf2f1e123af5a1f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 5 22:26:24 2016 +0300 d3dx9/tests: Remove dead assignment. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index f2a0751..95dd06e 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -3734,7 +3734,6 @@ static HRESULT create_outline(struct glyphinfo *glyph, void *raw_outline, int da pt->corner = POINTTYPE_CURVE_END; } outline->count--; - lastpt = &outline->items[outline->count - 1]; } else { /* outline closed with a line from end to start point */ attempt_line_merge(outline, outline->count - 1, &pt->pos, FALSE);

1 0

Nikolay Sivov : gdiplus: Remove some casts.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 2de908f3ff09cddf4eccfd50eea18d38842960a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de908f3ff09cddf4eccfd50e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 5 09:32:46 2016 +0300 gdiplus: Remove some casts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 2 +- dlls/gdiplus/image.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index b8a6866..ed29990 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -178,7 +178,7 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) if (stat == Ok) { new_texture->transform = texture->transform; - *clone = (GpBrush*)new_texture; + *clone = &new_texture->brush; } else *clone = NULL; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 1681099..4d0496a 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1290,7 +1290,7 @@ GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, } if (stat != Ok) - GdipDisposeImage((GpImage*)*dstBitmap); + GdipDisposeImage(&(*dstBitmap)->image); } if (stat != Ok) @@ -1523,8 +1523,8 @@ GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, if (!bitmap || !hbmReturn) return InvalidParameter; - GdipGetImageWidth((GpImage*)bitmap, &width); - GdipGetImageHeight((GpImage*)bitmap, &height); + GdipGetImageWidth(&bitmap->image, &width); + GdipGetImageHeight(&bitmap->image, &height); bih.biSize = sizeof(bih); bih.biWidth = width; @@ -1648,7 +1648,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) if (stat != Ok) { DeleteObject(iinfo.hbmColor); DeleteObject(iinfo.hbmMask); - GdipDisposeImage((GpImage*)*bitmap); + GdipDisposeImage(&(*bitmap)->image); return stat; } @@ -3027,7 +3027,7 @@ static void add_property(GpBitmap *bitmap, PropertyItem *item) UINT i; char *item_value; - GdipGetPropertySize((GpImage *)bitmap, &prop_size, &prop_count); + GdipGetPropertySize(&bitmap->image, &prop_size, &prop_count); prop_item = heap_alloc_zero(prop_size + item->length + sizeof(PropertyItem)); if (!prop_item) return; @@ -3714,11 +3714,11 @@ static GpStatus decode_frame_wic(IWICBitmapDecoder *decoder, BOOL force_conversi } if (SUCCEEDED(hr) && status == Ok) - *image = (GpImage*)bitmap; + *image = &bitmap->image; else { *image = NULL; - GdipDisposeImage((GpImage*)bitmap); + GdipDisposeImage(&bitmap->image); } if (SUCCEEDED(hr) && status == Ok) @@ -5047,7 +5047,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi entry[i].peGreen << 8 | entry[i].peBlue; } - retval = GdipSetImagePalette((GpImage*)*bitmap, palette); + retval = GdipSetImagePalette(&(*bitmap)->image, palette); } heap_free(palette); @@ -5055,7 +5055,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi if (retval != Ok) { - GdipDisposeImage((GpImage*)*bitmap); + GdipDisposeImage(&(*bitmap)->image); *bitmap = NULL; } } @@ -5310,7 +5310,7 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) if (stat == Ok) move_bitmap(bitmap, new_bitmap, FALSE); else - GdipDisposeImage((GpImage*)new_bitmap); + GdipDisposeImage(&new_bitmap->image); return stat; }

1 0

Nikolay Sivov : msvcp140: Added __crtInitializeCriticalSectionEx().
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: e3c5c7d03d732ddbd771362d7e5298bcdad74500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c5c7d03d732ddbd771362d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 5 12:31:28 2016 +0200 msvcp140: Added __crtInitializeCriticalSectionEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 1e8f85f..922aa9e 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3770,7 +3770,7 @@ @ stub __crtGetSystemTimePreciseAsFileTime @ stub __crtGetTickCount64 @ stub __crtInitOnceExecuteOnce -@ stub __crtInitializeCriticalSectionEx +@ cdecl __crtInitializeCriticalSectionEx(ptr long long) MSVCP__crtInitializeCriticalSectionEx @ stub __crtIsPackagedApp @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA @ stub __crtLCMapStringEx diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 81a5fbb..2037e69 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1066,6 +1066,16 @@ void __asm_dummy_vtables(void) { } #endif +/********************************************************************* + * __crtInitializeCriticalSectionEx (MSVCP140.@) + */ +BOOL CDECL MSVCP__crtInitializeCriticalSectionEx( + CRITICAL_SECTION *cs, DWORD spin_count, DWORD flags) +{ + TRACE("(%p %x %x)\n", cs, spin_count, flags); + return InitializeCriticalSectionEx(cs, spin_count, flags); +} + void init_misc(void *base) { #ifdef __x86_64__

1 0

Bernhard Übelacker : dinput8/tests: Add valid wide string termination to actionName member.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 86cdf0b1cb7a15cb43dd0c600b66f6665aea87d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86cdf0b1cb7a15cb43dd0c600… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Fri Aug 5 00:50:51 2016 +0200 dinput8/tests: Add valid wide string termination to actionName member. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/device.c | 15 ++++++++++----- dlls/dinput8/tests/dinput.c | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index fc415b7..6753b73 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -49,16 +49,21 @@ enum { static DIACTIONA actionMapping[]= { /* axis */ - { 0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */ , 0, { "Steer" } }, + { 0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */, 0, { "Steer.\0" } }, /* button */ - { 1, 0x01000C01 /* DIBUTTON_DRIVINGR_SHIFTUP */ , 0, { "Upshift" } }, + { 1, 0x01000C01 /* DIBUTTON_DRIVINGR_SHIFTUP */, 0, { "Upshift.\0" } }, /* keyboard key */ - { 2, DIKEYBOARD_SPACE , 0, { "Missile" } }, + { 2, DIKEYBOARD_SPACE, 0, { "Missile.\0" } }, /* mouse button */ - { 3, DIMOUSE_BUTTON0, 0, { "Select" } }, + { 3, DIMOUSE_BUTTON0, 0, { "Select\0" } }, /* mouse axis */ - { 4, DIMOUSE_YAXIS, 0, { "Y Axis" } } + { 4, DIMOUSE_YAXIS, 0, { "Y Axis\0" } } }; +/* By placing the memory pointed to by lptszActionName right before memory with PAGE_NOACCESS + * one can find out that the regular ansi string termination is not respected by EnumDevicesBySemantics. + * Adding a double termination, making it a valid wide string termination, made the test succeed. + * Therefore it looks like ansi version of EnumDevicesBySemantics forwards the string to + * the wide variant without conversation. */ static void flush_events(void) { diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index 57f5505..c3f80c6 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -443,16 +443,21 @@ struct enum_semantics_test static DIACTIONA actionMapping[]= { /* axis */ - { 0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */, 0, { "Steer" } }, + { 0, 0x01008A01 /* DIAXIS_DRIVINGR_STEER */, 0, { "Steer.\0" } }, /* button */ - { 1, 0x01000C01 /* DIBUTTON_DRIVINGR_SHIFTUP */, 0, { "Upshift" } }, + { 1, 0x01000C01 /* DIBUTTON_DRIVINGR_SHIFTUP */, 0, { "Upshift.\0" } }, /* keyboard key */ - { 2, DIKEYBOARD_SPACE, 0, { "Missile" } }, + { 2, DIKEYBOARD_SPACE, 0, { "Missile.\0" } }, /* mouse button */ - { 3, DIMOUSE_BUTTON0, 0, { "Select" } }, + { 3, DIMOUSE_BUTTON0, 0, { "Select\0" } }, /* mouse axis */ - { 4, DIMOUSE_YAXIS, 0, { "Y Axis" } } + { 4, DIMOUSE_YAXIS, 0, { "Y Axis\0" } } }; +/* By placing the memory pointed to by lptszActionName right before memory with PAGE_NOACCESS + * one can find out that the regular ansi string termination is not respected by EnumDevicesBySemantics. + * Adding a double termination, making it a valid wide string termination, made the test succeed. + * Therefore it looks like ansi version of EnumDevicesBySemantics forwards the string to + * the wide variant without conversation. */ static BOOL CALLBACK enum_semantics_callback(const DIDEVICEINSTANCEA *lpddi, IDirectInputDevice8A *lpdid, DWORD dwFlags, DWORD dwRemaining, void *context) {

1 0

Józef Kucia : wined3d: Add R32G32B32A32_SINT vertex format.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: ecd305708a4e156ae6ddbec1e2d5ec29c6a70b47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd305708a4e156ae6ddbec1e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 4 17:23:40 2016 +0200 wined3d: Add R32G32B32A32_SINT vertex format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 93b610d..31d5014 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -369,6 +369,7 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R32G32_SINT, WINED3D_FFP_EMIT_INVALID, 2, GL_INT, GL_FALSE}, {WINED3DFMT_R32G32B32_UINT, WINED3D_FFP_EMIT_INVALID, 3, GL_UNSIGNED_INT, GL_FALSE}, {WINED3DFMT_R32G32B32A32_UINT, WINED3D_FFP_EMIT_INVALID, 4, GL_UNSIGNED_INT, GL_FALSE}, + {WINED3DFMT_R32G32B32A32_SINT, WINED3D_FFP_EMIT_INVALID, 4, GL_INT, GL_FALSE}, }; struct wined3d_format_texture_info

1 0