October 2015 - Wine-Commits

Sebastian Lackner : user32/tests: Add a test for sending WM_SIZE message to edit control.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: e4a3cd60dfa9c67df2a5c4b62c487b2aa8275005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a3cd60dfa9c67df2a5c4b62… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 6 03:32:07 2015 +0200 user32/tests: Add a test for sending WM_SIZE message to edit control. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/user32/tests/edit.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index e8b41c2..bd7b6d5 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1476,10 +1476,23 @@ static void test_margins(void) SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&old_rect); SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(10, 10)); SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); - ok(new_rect.left == old_rect.left, "The left border of the rectangle has changed\n"); - ok(new_rect.right == old_rect.right, "The right border of the rectangle has changed\n"); - ok(new_rect.top == old_rect.top, "The top border of the rectangle has changed\n"); - ok(new_rect.bottom == old_rect.bottom, "The bottom border of the rectangle has changed\n"); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + + /* The lParam argument of the WM_SIZE message should be ignored. */ + + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&old_rect); + SendMessageA(hwEdit, WM_SIZE, SIZE_RESTORED, 0); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + todo_wine ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + SendMessageA(hwEdit, WM_SIZE, SIZE_MINIMIZED, 0); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + todo_wine ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + SendMessageA(hwEdit, WM_SIZE, SIZE_MAXIMIZED, 0); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + todo_wine ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + SendMessageA(hwEdit, WM_SIZE, SIZE_RESTORED, MAKELONG(10, 10)); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + todo_wine ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); DestroyWindow (hwEdit);

1 0

Alex Henrie : user32: Remove unused parameter mask from create_alpha_bitmap.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: 9c750bb956d1cf5ccd180048ccc1b45e2b369835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c750bb956d1cf5ccd180048c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 4 21:27:56 2015 -0600 user32: Remove unused parameter mask from create_alpha_bitmap. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/user32/cursoricon.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index b94a177..6a05822 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -725,8 +725,7 @@ static BOOL bmi_has_alpha( const BITMAPINFO *info, const void *bits ) * * Create the alpha bitmap for a 32-bpp icon that has an alpha channel. */ -static HBITMAP create_alpha_bitmap( HBITMAP color, HBITMAP mask, - const BITMAPINFO *src_info, const void *color_bits ) +static HBITMAP create_alpha_bitmap( HBITMAP color, const BITMAPINFO *src_info, const void *color_bits ) { HBITMAP alpha = 0; BITMAPINFO *info = NULL; @@ -904,7 +903,7 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE color_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); if (bmi_has_alpha( bmi_copy, color_bits )) - alpha = create_alpha_bitmap( color, mask, bmi_copy, color_bits ); + alpha = create_alpha_bitmap( color, bmi_copy, color_bits ); /* convert info to monochrome to copy the mask */ bmi_copy->bmiHeader.biBitCount = 1; @@ -2195,7 +2194,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) frame->height = height; frame->color = color; frame->mask = mask; - frame->alpha = create_alpha_bitmap( iconinfo->hbmColor, mask, NULL, NULL ); + frame->alpha = create_alpha_bitmap( iconinfo->hbmColor, NULL, NULL ); release_icon_frame( info, frame ); if (info->is_icon) {

1 0

Józef Kucia : d3d10core/tests: Check that private data is shared between d3d10 and d3d11 interfaces.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: 17ad42fcf531055cf2bfd81cad56cc66a846c084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17ad42fcf531055cf2bfd81ca… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 6 01:49:28 2015 +0200 d3d10core/tests: Check that private data is shared between d3d10 and d3d11 interfaces. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 5dc3049..2fb4cbb 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2945,6 +2945,8 @@ static void test_private_data(void) { D3D10_TEXTURE2D_DESC texture_desc; ULONG refcount, expected_refcount; + ID3D11Texture2D *d3d11_texture; + ID3D11Device *d3d11_device; ID3D10Device *test_object; ID3D10Texture2D *texture; IDXGIDevice *dxgi_device; @@ -3065,6 +3067,23 @@ static void test_private_data(void) IUnknown_Release(ptr); --expected_refcount; + hr = ID3D10Device_QueryInterface(device, &IID_ID3D11Device, (void **)&d3d11_device); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Device should implement ID3D11Device.\n"); + if (SUCCEEDED(hr)) + { + ptr = NULL; + size = sizeof(ptr); + hr = ID3D11Device_GetPrivateData(d3d11_device, &test_guid, &size, &ptr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)test_object, "Got unexpected ptr %p, expected %p.\n", ptr, test_object); + IUnknown_Release(ptr); + ID3D11Device_Release(d3d11_device); + refcount = get_refcount((IUnknown *)test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + refcount, expected_refcount); + } + ptr = (IUnknown *)0xdeadbeef; size = 1; hr = ID3D10Device_GetPrivateData(device, &test_guid, &size, NULL); @@ -3102,6 +3121,20 @@ static void test_private_data(void) ok(ptr == (IUnknown *)test_object, "Got unexpected ptr %p, expected %p.\n", ptr, test_object); IUnknown_Release(ptr); + hr = ID3D10Texture2D_QueryInterface(texture, &IID_ID3D11Texture2D, (void **)&d3d11_texture); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Texture should implement ID3D11Texture2D.\n"); + if (SUCCEEDED(hr)) + { + ptr = NULL; + size = sizeof(ptr); + hr = ID3D11Texture2D_GetPrivateData(d3d11_texture, &test_guid, &size, &ptr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)test_object, "Got unexpected ptr %p, expected %p.\n", ptr, test_object); + IUnknown_Release(ptr); + ID3D11Texture2D_Release(d3d11_texture); + } + IDXGISurface_Release(surface); ID3D10Texture2D_Release(texture); refcount = ID3D10Device_Release(device);

1 0

Alex Henrie : user32: Remove always-false condition.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: 64e63f455084d92c0da60cdafd0e1f303807e2ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e63f455084d92c0da60cdaf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 4 21:27:53 2015 -0600 user32: Remove always-false condition. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/user32/button.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 248df74..9a10b86 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -443,7 +443,6 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, break; case BM_SETSTYLE: - if ((wParam & BS_TYPEMASK) >= MAX_BTN_TYPE) break; btn_type = wParam & BS_TYPEMASK; style = (style & ~BS_TYPEMASK) | btn_type; WIN_SetStyle( hWnd, style, BS_TYPEMASK & ~style );

1 0

Józef Kucia : d3d11/tests: Check that private data is shared between d3d10 and d3d11 interfaces.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: d8a6972bd22c3481246d51d4cad250b6aa514d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a6972bd22c3481246d51d4c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 6 01:49:27 2015 +0200 d3d11/tests: Check that private data is shared between d3d10 and d3d11 interfaces. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5b48fe0..cecac07 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1637,6 +1637,7 @@ static void test_private_data(void) { ULONG refcount, expected_refcount; D3D11_TEXTURE2D_DESC texture_desc; + ID3D10Texture2D *d3d10_texture; ID3D11Device *test_object; ID3D11Texture2D *texture; IDXGIDevice *dxgi_device; @@ -1785,6 +1786,20 @@ static void test_private_data(void) ok(ptr == (IUnknown *)test_object, "Got unexpected ptr %p, expected %p.\n", ptr, test_object); IUnknown_Release(ptr); + hr = ID3D11Texture2D_QueryInterface(texture, &IID_ID3D10Texture2D, (void **)&d3d10_texture); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Texture should implement ID3D10Texture2D.\n"); + if (SUCCEEDED(hr)) + { + ptr = NULL; + size = sizeof(ptr); + hr = ID3D10Texture2D_GetPrivateData(d3d10_texture, &test_guid, &size, &ptr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)test_object, "Got unexpected ptr %p, expected %p.\n", ptr, test_object); + IUnknown_Release(ptr); + ID3D10Texture2D_Release(d3d10_texture); + } + IDXGISurface_Release(surface); ID3D11Texture2D_Release(texture); refcount = ID3D11Device_Release(device);

1 0

Józef Kucia : d3d11/tests: Port test_private_data() from d3d10core.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: dae7e7487a23bf15b0f38b91f928e90ee73276d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dae7e7487a23bf15b0f38b91f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 6 01:49:26 2015 +0200 d3d11/tests: Port test_private_data() from d3d10core. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 161 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a079acf..5b48fe0 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1633,6 +1633,166 @@ static void test_device_removed_reason(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_private_data(void) +{ + ULONG refcount, expected_refcount; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11Device *test_object; + ID3D11Texture2D *texture; + IDXGIDevice *dxgi_device; + IDXGISurface *surface; + ID3D11Device *device; + IUnknown *ptr; + HRESULT hr; + UINT size; + + static const GUID test_guid = + {0xfdb37466, 0x428f, 0x4edf, {0xa3, 0x7f, 0x9b, 0x1d, 0xf4, 0x88, 0xc5, 0xfc}}; + static const GUID test_guid2 = + {0x2e5afac2, 0x87b5, 0x4c10, {0x9b, 0x4b, 0x89, 0xd7, 0xd1, 0x12, 0xe7, 0x2b}}; + static const DWORD data[] = {1, 2, 3, 4}; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + test_object = create_device(NULL); + + texture_desc.Width = 512; + texture_desc.Height = 512; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get IDXGISurface, hr %#x.\n", hr); + + hr = ID3D11Device_SetPrivateData(device, &test_guid, 0, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_SetPrivateDataInterface(device, &test_guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_SetPrivateData(device, &test_guid, ~0u, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_SetPrivateData(device, &test_guid, ~0u, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + + hr = ID3D11Device_SetPrivateDataInterface(device, &test_guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + size = sizeof(ptr) * 2; + ptr = (IUnknown *)0xdeadbeef; + hr = ID3D11Device_GetPrivateData(device, &test_guid, &size, &ptr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!ptr, "Got unexpected pointer %p.\n", ptr); + ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); + + hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); + size = sizeof(ptr) * 2; + ptr = (IUnknown *)0xdeadbeef; + hr = IDXGIDevice_GetPrivateData(dxgi_device, &test_guid, &size, &ptr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!ptr, "Got unexpected pointer %p.\n", ptr); + ok(size == sizeof(IUnknown *), "Got unexpected size %u.\n", size); + IDXGIDevice_Release(dxgi_device); + + refcount = get_refcount((IUnknown *)test_object); + hr = ID3D11Device_SetPrivateDataInterface(device, &test_guid, (IUnknown *)test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + expected_refcount = refcount + 1; + refcount = get_refcount((IUnknown *)test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + hr = ID3D11Device_SetPrivateDataInterface(device, &test_guid, (IUnknown *)test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + + hr = ID3D11Device_SetPrivateDataInterface(device, &test_guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + --expected_refcount; + refcount = get_refcount((IUnknown *)test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + + hr = ID3D11Device_SetPrivateDataInterface(device, &test_guid, (IUnknown *)test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + size = sizeof(data); + hr = ID3D11Device_SetPrivateData(device, &test_guid, size, data); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + hr = ID3D11Device_SetPrivateData(device, &test_guid, 42, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_SetPrivateData(device, &test_guid, 42, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + + hr = ID3D11Device_SetPrivateDataInterface(device, &test_guid, (IUnknown *)test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ++expected_refcount; + size = 2 * sizeof(ptr); + ptr = NULL; + hr = ID3D11Device_GetPrivateData(device, &test_guid, &size, &ptr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(test_object), "Got unexpected size %u.\n", size); + ++expected_refcount; + refcount = get_refcount((IUnknown *)test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + IUnknown_Release(ptr); + --expected_refcount; + + ptr = (IUnknown *)0xdeadbeef; + size = 1; + hr = ID3D11Device_GetPrivateData(device, &test_guid, &size, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); + size = 2 * sizeof(ptr); + hr = ID3D11Device_GetPrivateData(device, &test_guid, &size, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); + refcount = get_refcount((IUnknown *)test_object); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + + size = 1; + hr = ID3D11Device_GetPrivateData(device, &test_guid, &size, &ptr); + ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(device), "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + hr = ID3D11Device_GetPrivateData(device, &test_guid2, NULL, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + size = 0xdeadbabe; + hr = ID3D11Device_GetPrivateData(device, &test_guid2, &size, &ptr); + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + ok(size == 0, "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + hr = ID3D11Device_GetPrivateData(device, &test_guid, NULL, &ptr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + + hr = ID3D11Texture2D_SetPrivateDataInterface(texture, &test_guid, (IUnknown *)test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ptr = NULL; + size = sizeof(ptr); + hr = IDXGISurface_GetPrivateData(surface, &test_guid, &size, &ptr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)test_object, "Got unexpected ptr %p, expected %p.\n", ptr, test_object); + IUnknown_Release(ptr); + + IDXGISurface_Release(surface); + ID3D11Texture2D_Release(texture); + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = ID3D11Device_Release(test_object); + ok(!refcount, "Test object has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -1650,4 +1810,5 @@ START_TEST(d3d11) test_create_depthstencil_state(); test_create_rasterizer_state(); test_device_removed_reason(); + test_private_data(); }

1 0

Matteo Bruni : wined3d: Initialize unwritten texcoord varyings in the FFP replacement vertex shader.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: 47bf62962a316ec99ec3e6f6cdb7a37c7eb7da19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47bf62962a316ec99ec3e6f6c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Oct 2 14:54:46 2015 +0200 wined3d: Initialize unwritten texcoord varyings in the FFP replacement vertex shader. Only when the GPU supports enough varyings. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/utils.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 10 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index af44989..9fd48c4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5802,6 +5802,8 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_string_buffe if (settings->texcoords & (1u << i)) shader_addline(buffer, "gl_TexCoord[%u] = ffp_texture_matrix[%u] * ffp_attrib_texcoord%u;\n", i, i, i); + else if (gl_info->limits.glsl_varyings >= wined3d_max_compat_varyings(gl_info)) + shader_addline(buffer, "gl_TexCoord[%u] = vec4(0.0);\n", i); break; case WINED3DTSS_TCI_CAMERASPACENORMAL: diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index aa6eb62..8265b9c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4343,6 +4343,13 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) { return size; } +unsigned int wined3d_max_compat_varyings(const struct wined3d_gl_info *gl_info) +{ + /* On core profile we have to also count diffuse and specular colors and the + * fog coordinate. */ + return gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? MAX_TEXTURES * 4 : (MAX_TEXTURES + 2) * 4 + 1; +} + void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d_state *state, struct ffp_frag_settings *settings, BOOL ignore_textype) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 758af54..d3c362b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1877,6 +1877,7 @@ extern const struct wine_rb_functions wined3d_ffp_frag_program_rb_functions DECL extern const struct wine_rb_functions wined3d_ffp_vertex_program_rb_functions DECLSPEC_HIDDEN; extern const struct wined3d_parent_ops wined3d_null_parent_ops DECLSPEC_HIDDEN; +unsigned int wined3d_max_compat_varyings(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d_state *state, struct ffp_frag_settings *settings, BOOL ignore_textype) DECLSPEC_HIDDEN; const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders,

1 0

Hans Leidekker : msiexec: Add support for /passive.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: c0b3f3f2e8ebc17b68ce31af7d02fb1a2ef9de6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0b3f3f2e8ebc17b68ce31af7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 6 00:29:13 2015 +0200 msiexec: Add support for /passive. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- programs/msiexec/msiexec.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index bb5c931..b7999d1 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -924,6 +924,14 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine wine_dbgstr_w(argvW[i]+2)); } } + else if(msi_option_equal(argvW[i], "passive")) + { + static const WCHAR rebootpromptW[] = + {'R','E','B','O','O','T','P','R','O','M','P','T','=','"','S','"',0}; + + InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY|INSTALLUILEVEL_HIDECANCEL; + StringListAppend(&property_list, rebootpromptW); + } else if(msi_option_equal(argvW[i], "y")) { FunctionDllRegisterServer = TRUE;

1 0

Józef Kucia : d3d11: Implement private data methods for ID3D11Device.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: 30fe161469e331289348b9ee2261b6abeaa9945b URL: http://source.winehq.org/git/wine.git/?a=commit;h=30fe161469e331289348b9ee2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 6 01:49:24 2015 +0200 d3d11: Implement private data methods for ID3D11Device. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/device.c | 74 ++++++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 79e3ea8..693c992 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -503,25 +503,49 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device * static HRESULT STDMETHODCALLTYPE d3d11_device_GetPrivateData(ID3D11Device *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + IDXGIDevice *dxgi_device; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + if (FAILED(hr = ID3D11Device_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) + return hr; + hr = IDXGIDevice_GetPrivateData(dxgi_device, guid, data_size, data); + IDXGIDevice_Release(dxgi_device); + + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateData(ID3D11Device *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + IDXGIDevice *dxgi_device; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + if (FAILED(hr = ID3D11Device_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) + return hr; + hr = IDXGIDevice_SetPrivateData(dxgi_device, guid, data_size, data); + IDXGIDevice_Release(dxgi_device); + + return hr; } static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateDataInterface(ID3D11Device *iface, REFGUID guid, - const IUnknown *data_iface) + const IUnknown *data) { - FIXME("iface %p, guid %s, data_iface %p stub!\n", iface, debugstr_guid(guid), data_iface); + IDXGIDevice *dxgi_device; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + if (FAILED(hr = ID3D11Device_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) + return hr; + hr = IDXGIDevice_SetPrivateDataInterface(dxgi_device, guid, data); + IDXGIDevice_Release(dxgi_device); + + return hr; } static D3D_FEATURE_LEVEL STDMETHODCALLTYPE d3d11_device_GetFeatureLevel(ID3D11Device *iface) @@ -2020,51 +2044,31 @@ static UINT STDMETHODCALLTYPE d3d10_device_GetExceptionMode(ID3D10Device1 *iface static HRESULT STDMETHODCALLTYPE d3d10_device_GetPrivateData(ID3D10Device1 *iface, REFGUID guid, UINT *data_size, void *data) { - IDXGIDevice *dxgi_device; - HRESULT hr; + struct d3d_device *device = impl_from_ID3D10Device(iface); - TRACE("iface %p, guid %s, data_size %p, data %p.\n", - iface, debugstr_guid(guid), data_size, data); + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - if (FAILED(hr = ID3D10Device1_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) - return hr; - hr = IDXGIDevice_GetPrivateData(dxgi_device, guid, data_size, data); - IDXGIDevice_Release(dxgi_device); - - return hr; + return d3d11_device_GetPrivateData(&device->ID3D11Device_iface, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateData(ID3D10Device1 *iface, REFGUID guid, UINT data_size, const void *data) { - IDXGIDevice *dxgi_device; - HRESULT hr; - - TRACE("iface %p, guid %s, data_size %u, data %p.\n", - iface, debugstr_guid(guid), data_size, data); + struct d3d_device *device = impl_from_ID3D10Device(iface); - if (FAILED(hr = ID3D10Device1_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) - return hr; - hr = IDXGIDevice_SetPrivateData(dxgi_device, guid, data_size, data); - IDXGIDevice_Release(dxgi_device); + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return hr; + return d3d11_device_SetPrivateData(&device->ID3D11Device_iface, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_device_SetPrivateDataInterface(ID3D10Device1 *iface, REFGUID guid, const IUnknown *data) { - IDXGIDevice *dxgi_device; - HRESULT hr; + struct d3d_device *device = impl_from_ID3D10Device(iface); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); - if (FAILED(hr = ID3D10Device1_QueryInterface(iface, &IID_IDXGIDevice, (void **)&dxgi_device))) - return hr; - hr = IDXGIDevice_SetPrivateDataInterface(dxgi_device, guid, data); - IDXGIDevice_Release(dxgi_device); - - return hr; + return d3d11_device_SetPrivateDataInterface(&device->ID3D11Device_iface, guid, data); } static void STDMETHODCALLTYPE d3d10_device_ClearState(ID3D10Device1 *iface)

1 0

Józef Kucia : d3d10core/tests: Check that shaders implement d3d11 interfaces.
by Alexandre Julliard Oct. 6, 2015

Oct. 6, 2015

Module: wine Branch: master Commit: 44293175a3678b1299ded61f5e10cccac8790581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44293175a3678b1299ded61f5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 6 01:49:29 2015 +0200 d3d10core/tests: Check that shaders implement d3d11 interfaces. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 2fb4cbb..99890a2 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1085,6 +1085,7 @@ float4 main(const float4 color : COLOR) : SV_TARGET ID3D10VertexShader *vs = NULL; ID3D10PixelShader *ps = NULL; ID3D10Device *device, *tmp; + IUnknown *iface; HRESULT hr; if (!(device = create_device())) @@ -1096,6 +1097,7 @@ float4 main(const float4 color : COLOR) : SV_TARGET expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateVertexShader(device, vs_4_0, sizeof(vs_4_0), &vs); ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x\n", hr); + refcount = get_refcount((IUnknown *)device); ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); tmp = NULL; @@ -1105,7 +1107,14 @@ float4 main(const float4 color : COLOR) : SV_TARGET refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D10Device_Release(tmp); - ID3D10VertexShader_Release(vs); + + hr = ID3D10VertexShader_QueryInterface(vs, &IID_ID3D11VertexShader, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Vertex shader should implement ID3D11VertexShader.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D10VertexShader_Release(vs); + ok(!refcount, "Vertex shader has %u references left.\n", refcount); hr = ID3D10Device_CreateVertexShader(device, vs_2_0, sizeof(vs_2_0), &vs); ok(hr == E_INVALIDARG, "Created a SM2 vertex shader, hr %#x\n", hr); @@ -1119,6 +1128,7 @@ float4 main(const float4 color : COLOR) : SV_TARGET expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreatePixelShader(device, ps_4_0, sizeof(ps_4_0), &ps); ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x\n", hr); + refcount = get_refcount((IUnknown *)device); ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); tmp = NULL; @@ -1128,7 +1138,14 @@ float4 main(const float4 color : COLOR) : SV_TARGET refcount = get_refcount((IUnknown *)device); ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D10Device_Release(tmp); - ID3D10PixelShader_Release(ps); + + hr = ID3D10PixelShader_QueryInterface(ps, &IID_ID3D11PixelShader, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Pixel shader should implement ID3D11PixelShader.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D10PixelShader_Release(ps); + ok(!refcount, "Pixel shader has %u references left.\n", refcount); refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0