December 2015 - Wine-commits

Dmitry Timoshkov : winhttp/tests: Add an authentication test using IWinHttpRequest.
by Alexandre Julliard 10 Dec '15

10 Dec '15

Module: wine Branch: master Commit: 97ac9d410fdd612db863fdccc538d8dd8d94d91a URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ac9d410fdd612db863fdccc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 10 21:54:30 2015 +0800 winhttp/tests: Add an authentication test using IWinHttpRequest. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 64 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 6153296..9442085 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -27,6 +27,7 @@ #include <winhttp.h> #include <wincrypt.h> #include <winreg.h> +#include <stdio.h> #include <initguid.h> #include <httprequest.h> #include <httprequestid.h> @@ -2095,6 +2096,7 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, noauthmsg, sizeof noauthmsg - 1, 0); send(c, unauthorized, sizeof unauthorized - 1, 0); } + continue; } if (strstr(buffer, "/big")) { @@ -2311,11 +2313,15 @@ static void test_basic_authentication(int port) size = 0; ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); - ok(ret, "failed to read data %u\n", GetLastError()); + error = GetLastError(); + ok(ret || broken(error == ERROR_WINHTTP_SHUTDOWN || error == ERROR_WINHTTP_TIMEOUT) /* XP */, "failed to read data %u\n", GetLastError()); + if (ret) + { todo_wine - ok(size == 12, "expected 12, got %u\n", size); + ok(size == 12, "expected 12, got %u\n", size); todo_wine - ok(!memcmp(buffer, unauthorized, 12), "got %s\n", buffer); + ok(!memcmp(buffer, unauthorized, 12), "got %s\n", buffer); + } supported = first = target = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -2380,9 +2386,13 @@ todo_wine size = 0; ret = WinHttpReadData(req, buffer, sizeof(buffer), &size); - ok(ret, "failed to read data %u\n", GetLastError()); - ok(size == 11, "expected 11, got %u\n", size); - ok(!memcmp(buffer, hello_world, 11), "got %s\n", buffer); + error = GetLastError(); + ok(ret || broken(error == ERROR_WINHTTP_SHUTDOWN || error == ERROR_WINHTTP_TIMEOUT) /* XP */, "failed to read data %u\n", GetLastError()); + if (ret) + { + ok(size == 11, "expected 11, got %u\n", size); + ok(!memcmp(buffer, hello_world, 11), "got %s\n", buffer); + } WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -3078,7 +3088,7 @@ static void test_credentials(void) WinHttpCloseHandle(ses); } -static void test_IWinHttpRequest(void) +static void test_IWinHttpRequest(int port) { static const WCHAR data_start[] = {'<','!','D','O','C','T','Y','P','E',' ','h','t','m','l',' ','P','U','B','L','I','C'}; static const WCHAR usernameW[] = {'u','s','e','r','n','a','m','e',0}; @@ -3096,6 +3106,7 @@ static void test_IWinHttpRequest(void) static const WCHAR dateW[] = {'D','a','t','e',0}; static const WCHAR test_dataW[] = {'t','e','s','t','d','a','t','a',128,0}; static const WCHAR utf8W[] = {'u','t','f','-','8',0}; + static const WCHAR unauthW[] = {'U','n','a','u','t','h','o','r','i','z','e','d',0}; HRESULT hr; IWinHttpRequest *req; BSTR method, url, username, password, response = NULL, status_text = NULL, headers = NULL; @@ -3108,6 +3119,7 @@ static void test_IWinHttpRequest(void) IStream *stream, *stream2; LARGE_INTEGER pos; char buf[128]; + WCHAR bufW[128]; DWORD count; GetSystemTime( &st ); @@ -3614,6 +3626,42 @@ static void test_IWinHttpRequest(void) IWinHttpRequest_Release( req ); + hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); + ok( hr == S_OK, "got %08x\n", hr ); + + sprintf( buf, "http://localhost:%d/auth", port ); + MultiByteToWideChar( CP_ACP, 0, buf, -1, bufW, sizeof(bufW)/sizeof(bufW[0]) ); + url = SysAllocString( bufW ); + method = SysAllocString( method3W ); + V_VT( &async ) = VT_BOOL; + V_BOOL( &async ) = VARIANT_FALSE; + hr = IWinHttpRequest_Open( req, method, url, async ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( method ); + SysFreeString( url ); + + hr = IWinHttpRequest_get_Status( req, &status ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND ), "got %08x\n", hr ); + + V_VT( &data ) = VT_BSTR; + V_BSTR( &data ) = SysAllocString( test_dataW ); + hr = IWinHttpRequest_Send( req, data ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( V_BSTR( &data ) ); + + hr = IWinHttpRequest_get_ResponseText( req, &response ); + ok( hr == S_OK, "got %08x\n", hr ); +todo_wine + ok( !memcmp( response, unauthW, sizeof(unauthW) ), "got %s\n", wine_dbgstr_w(response) ); + SysFreeString( response ); + + status = 0xdeadbeef; + hr = IWinHttpRequest_get_Status( req, &status ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( status == HTTP_STATUS_DENIED, "got %d\n", status ); + + IWinHttpRequest_Release( req ); + CoUninitialize(); } @@ -4152,7 +4200,6 @@ START_TEST (winhttp) test_Timeouts(); test_resolve_timeout(); test_credentials(); - test_IWinHttpRequest(); test_IWinHttpRequest_Invoke(); test_WinHttpDetectAutoProxyConfigUrl(); test_WinHttpGetIEProxyConfigForCurrentUser(); @@ -4170,6 +4217,7 @@ START_TEST (winhttp) if (ret != WAIT_OBJECT_0) return; + test_IWinHttpRequest(si.port); test_connection_info(si.port); test_basic_request(si.port, NULL, basicW); test_no_headers(si.port);

1 0

Alexandre Julliard : opengl32: Make it possible to use an alternative in wglGetProcAddress when an extension is missing.
by Alexandre Julliard 09 Dec '15

09 Dec '15

Module: wine Branch: master Commit: 5c9ddc55dcf6e64d747b1a8ab01e408d4b8d55e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9ddc55dcf6e64d747b1a8ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 15:44:51 2015 +0900 opengl32: Make it possible to use an alternative in wglGetProcAddress when an extension is missing. --- dlls/opengl32/wgl.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 42bf920..88aa564 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -878,6 +878,19 @@ PROC WINAPI wglGetProcAddress( LPCSTR name ) if (!is_extension_supported(ext_ret->extension)) { + unsigned int i; + static const struct { const char *name, *alt; } alternatives[] = + { + { "glCopyTexSubImage3DEXT", "glCopyTexSubImage3D" }, /* needed by RuneScape */ + }; + + for (i = 0; i < sizeof(alternatives)/sizeof(alternatives[0]); i++) + { + if (strcmp( name, alternatives[i].name )) continue; + WARN("Extension %s required for %s not supported, trying %s\n", + ext_ret->extension, name, alternatives[i].alt ); + return wglGetProcAddress( alternatives[i].alt ); + } WARN("Extension %s required for %s not supported\n", ext_ret->extension, name); return NULL; }

1 0

Alexandre Julliard : user32: SetLayeredWindowAttributes is no longer a stub.
by Alexandre Julliard 09 Dec '15

09 Dec '15

Module: wine Branch: master Commit: 2e56a912b458e63677738611e532db3b48efe918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e56a912b458e63677738611e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 20:09:52 2015 +0900 user32: SetLayeredWindowAttributes is no longer a stub. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 1a3cd49..887fd48 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3682,7 +3682,7 @@ BOOL WINAPI SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWO { BOOL ret; - TRACE("(%p,%08x,%d,%x): stub!\n", hwnd, key, alpha, flags); + TRACE("(%p,%08x,%d,%x)\n", hwnd, key, alpha, flags); SERVER_START_REQ( set_window_layered_info ) {

1 0

Alexandre Julliard : user32: Preserve the surface contents when changing the WS_EX_LAYERED bit.
by Alexandre Julliard 09 Dec '15

09 Dec '15

Module: wine Branch: master Commit: e5ef460d7dc9c9739da92349eb5d6bf827d7ce8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ef460d7dc9c9739da92349e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 20:10:24 2015 +0900 user32: Preserve the surface contents when changing the WS_EX_LAYERED bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 887fd48..e378ab9 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -438,11 +438,13 @@ static void send_parent_notify( HWND hwnd, UINT msg ) */ static void update_window_state( HWND hwnd ) { - RECT window_rect, client_rect; + RECT window_rect, client_rect, valid_rects[2]; WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); + valid_rects[0] = valid_rects[1] = client_rect; set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, &window_rect, &client_rect, NULL ); + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, + &window_rect, &client_rect, valid_rects ); }

1 0

Dmitry Timoshkov : user32: Call the EnumChildWindows callback using a wrapper.
by Alexandre Julliard 09 Dec '15

09 Dec '15

Module: wine Branch: master Commit: b08c400fe2924bf7137e350c3673b11d3a6378c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b08c400fe2924bf7137e350c3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 9 13:11:16 2015 +0800 user32: Call the EnumChildWindows callback using a wrapper. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index e378ab9..2ef49fa 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3356,6 +3356,31 @@ BOOL WINAPI EnumDesktopWindows( HDESK desktop, WNDENUMPROC func, LPARAM lparam ) } +#ifdef __i386__ +/* Some apps pass a non-stdcall proc to EnumChildWindows, + * so we need a small assembly wrapper to call the proc. + */ +extern LRESULT enum_callback_wrapper( WNDENUMPROC proc, HWND hwnd, LPARAM lparam ); +__ASM_GLOBAL_FUNC( enum_callback_wrapper, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) +#else +static inline LRESULT enum_callback_wrapper( WNDENUMPROC proc, HWND hwnd, LPARAM lparam ) +{ + return proc( hwnd, lparam ); +} +#endif /* __i386__ */ + /********************************************************************** * WIN_EnumChildWindows * @@ -3373,7 +3398,7 @@ static BOOL WIN_EnumChildWindows( HWND *list, WNDENUMPROC func, LPARAM lParam ) /* Build children list first */ childList = WIN_ListChildren( *list ); - ret = func( *list, lParam ); + ret = enum_callback_wrapper( func, *list, lParam ); if (childList) {

1 0

Nikolay Sivov : dwrite/tests: Some tests for fallback builder.
by Alexandre Julliard 09 Dec '15

09 Dec '15

Module: wine Branch: master Commit: 2bdf470177c1729bd15c369283fff39b67e4d530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bdf470177c1729bd15c36928… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 9 13:32:21 2015 +0300 dwrite/tests: Some tests for fallback builder. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 157 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index d98ffea..6ea2734 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -3903,6 +3903,162 @@ if (hr == S_OK) { IDWriteFactory2_Release(factory2); } +static void test_FontFallbackBuilder(void) +{ + static const WCHAR localeW[] = {'l','o','c','a','l','e',0}; + static const WCHAR strW[] = {'A',0}; + IDWriteFontFallbackBuilder *builder; + IDWriteFontFallback *fallback; + DWRITE_UNICODE_RANGE range; + IDWriteFactory2 *factory2; + IDWriteFactory *factory; + const WCHAR *familyW; + UINT32 mappedlength; + IDWriteFont *font; + FLOAT scale; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory2, (void**)&factory2); + IDWriteFactory_Release(factory); + + if (factory2) + hr = IDWriteFactory2_CreateFontFallbackBuilder(factory2, &builder); + + if (hr != S_OK) { + skip("IDWriteFontFallbackBuilder is not supported\n"); + return; + } + + hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFallbackBuilder_AddMapping(builder, NULL, 0, NULL, 0, NULL, NULL, NULL, 0.0f); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + range.first = 'A'; + range.last = 'B'; + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 0, NULL, 0, NULL, NULL, NULL, 0.0f); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 0, NULL, 0, NULL, NULL, NULL, 1.0f); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* negative scaling factor */ + range.first = range.last = 0; + familyW = g_blahfontW; + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, NULL, NULL, NULL, -1.0f); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* empty range */ + range.first = range.last = 0; + familyW = g_blahfontW; + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, NULL, NULL, NULL, 1.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + + range.first = range.last = 0; + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, NULL, NULL, NULL, 2.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + + range.first = range.last = 'A'; + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, NULL, NULL, NULL, 3.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + + range.first = 'B'; + range.last = 'A'; + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, NULL, NULL, NULL, 4.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (0) /* crashes on native */ + hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, NULL); + + hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* fallback font missing from system collection */ + g_source = strW; + mappedlength = 0; + scale = 0.0f; + font = (void*)0xdeadbeef; + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mappedlength == 1, "got %u\n", mappedlength); + ok(scale == 1.0f, "got %f\n", scale); + ok(font == NULL, "got %p\n", font); + + IDWriteFontFallback_Release(fallback); + + /* remap with custom collection */ + range.first = range.last = 'A'; + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, &fallbackcollection, NULL, NULL, 5.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + + g_source = strW; + mappedlength = 0; + scale = 0.0f; + font = NULL; + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mappedlength == 1, "got %u\n", mappedlength); + ok(scale == 5.0f, "got %f\n", scale); + ok(font != NULL, "got %p\n", font); + IDWriteFont_Release(font); + + IDWriteFontFallback_Release(fallback); + + range.first = 'B'; + range.last = 'A'; + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, &fallbackcollection, NULL, NULL, 6.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + + g_source = strW; + mappedlength = 0; + scale = 0.0f; + font = NULL; + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mappedlength == 1, "got %u\n", mappedlength); + ok(scale == 5.0f, "got %f\n", scale); + ok(font != NULL, "got %p\n", font); + IDWriteFont_Release(font); + + IDWriteFontFallback_Release(fallback); + + /* explicit locale */ + range.first = 'A'; + range.last = 'B'; + hr = IDWriteFontFallbackBuilder_AddMapping(builder, &range, 1, &familyW, 1, &fallbackcollection, localeW, NULL, 6.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + + g_source = strW; + mappedlength = 0; + scale = 0.0f; + font = NULL; + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(mappedlength == 1, "got %u\n", mappedlength); + ok(scale == 5.0f, "got %f\n", scale); + ok(font != NULL, "got %p\n", font); + IDWriteFont_Release(font); + + IDWriteFontFallbackBuilder_Release(builder); + IDWriteFactory2_Release(factory2); +} + START_TEST(layout) { static const WCHAR ctrlstrW[] = {0x202a,0}; @@ -3949,6 +4105,7 @@ START_TEST(layout) test_pixelsnapping(); test_SetWordWrapping(); test_MapCharacters(); + test_FontFallbackBuilder(); IDWriteFactory_Release(factory); }

1 0

Józef Kucia : wined3d: Use correct initial color for FFP texture blending in GLSL backend.
by Alexandre Julliard 09 Dec '15

09 Dec '15

Module: wine Branch: master Commit: 2e00982a6144bf9701f0ac7aff85133a6b4ba080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e00982a6144bf9701f0ac7af… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 9 14:48:01 2015 +0100 wined3d: Use correct initial color for FFP texture blending in GLSL backend. 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/glsl_shader.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6fe0ff6..6fa9521 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6023,10 +6023,7 @@ static const char *shader_glsl_get_ffp_fragment_op_arg(struct wined3d_string_buf break; case WINED3DTA_CURRENT: - if (!stage) - ret = "ffp_varying_diffuse"; - else - ret = "ret"; + ret = "ret"; break; case WINED3DTA_TEXTURE: @@ -6128,8 +6125,6 @@ static void shader_glsl_ffp_fragment_op(struct wined3d_string_buffer *buffer, un switch (op) { case WINED3D_TOP_DISABLE: - if (!stage) - shader_addline(buffer, "%s%s = ffp_varying_diffuse%s;\n", dstreg, dstmask, dstmask); break; case WINED3D_TOP_SELECT_ARG1: @@ -6262,7 +6257,6 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * struct wined3d_string_buffer *buffer = &priv->shader_buffer; BYTE lum_map = 0, bump_map = 0, tex_map = 0, tss_const_map = 0; BOOL tempreg_used = FALSE, tfactor_used = FALSE; - const char *final_combiner_src = "ret"; UINT lowest_disabled_stage; GLuint shader_id; DWORD arg0, arg1, arg2; @@ -6453,7 +6447,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (lowest_disabled_stage < 7 && settings->emul_clipplanes) shader_addline(buffer, "if (any(lessThan(ffp_texcoord[7], vec4(0.0)))) discard;\n"); - /* Generate texture sampling instructions) */ + /* Generate texture sampling instructions */ for (stage = 0; stage < MAX_TEXTURES && settings->op[stage].cop != WINED3D_TOP_DISABLE; ++stage) { const char *texture_function, *coord_mask; @@ -6602,17 +6596,15 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * shader_addline(buffer, " discard;\n"); } + shader_addline(buffer, "ret = ffp_varying_diffuse;\n"); + /* Generate the main shader */ for (stage = 0; stage < MAX_TEXTURES; ++stage) { BOOL op_equal; if (settings->op[stage].cop == WINED3D_TOP_DISABLE) - { - if (!stage) - final_combiner_src = "ffp_varying_diffuse"; break; - } if (settings->op[stage].cop == WINED3D_TOP_SELECT_ARG1 && settings->op[stage].aop == WINED3D_TOP_SELECT_ARG1) @@ -6637,8 +6629,6 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * shader_glsl_ffp_fragment_op(buffer, stage, TRUE, FALSE, settings->op[stage].dst, settings->op[stage].cop, settings->op[stage].carg0, settings->op[stage].carg1, settings->op[stage].carg2); - if (!stage) - shader_addline(buffer, "ret.w = ffp_varying_diffuse.w;\n"); } else if (op_equal) { @@ -6657,7 +6647,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * } } - shader_addline(buffer, "gl_FragData[0] = ffp_varying_specular * specular_enable + %s;\n", final_combiner_src); + shader_addline(buffer, "gl_FragData[0] = ffp_varying_specular * specular_enable + ret;\n"); if (settings->sRGB_write) shader_glsl_generate_srgb_write_correction(buffer);

1 0

Józef Kucia : wined3d: Use correct initial color for FFP texture blending in ARB program shader backend.
by Alexandre Julliard 09 Dec '15

09 Dec '15

Module: wine Branch: master Commit: c251d0217102b6c8c987f87795d1c1ef7bbb8b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c251d0217102b6c8c987f8779… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 9 14:48:02 2015 +0100 wined3d: Use correct initial color for FFP texture blending in ARB program shader backend. 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/arb_program_shader.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2af9845..be3d727 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6082,8 +6082,7 @@ static const char *get_argreg(struct wined3d_string_buffer *buffer, DWORD argnum ret = "fragment.color.primary"; break; case WINED3DTA_CURRENT: - if (!stage) ret = "fragment.color.primary"; - else ret = "ret"; + ret = "ret"; break; case WINED3DTA_TEXTURE: @@ -6163,8 +6162,6 @@ static void gen_ffp_instr(struct wined3d_string_buffer *buffer, unsigned int sta switch (op) { case WINED3D_TOP_DISABLE: - if (!stage) - shader_addline(buffer, "MOV %s%s, fragment.color.primary;\n", dstreg, dstmask); break; case WINED3D_TOP_SELECT_ARG2: @@ -6309,7 +6306,6 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con DWORD arg0, arg1, arg2; BOOL tempreg_used = FALSE, tfactor_used = FALSE; BOOL op_equal; - const char *final_combiner_src = "ret"; BOOL custom_linear_fog = FALSE; struct color_fixup_masks masks; @@ -6440,7 +6436,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con if (tempreg_used || settings->sRGB_write) shader_addline(&buffer, "MOV tempreg, 0.0;\n"); - /* Generate texture sampling instructions) */ + /* Generate texture sampling instructions */ for (stage = 0; stage < MAX_TEXTURES && settings->op[stage].cop != WINED3D_TOP_DISABLE; ++stage) { if (!tex_read[stage]) @@ -6516,15 +6512,13 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con shader_addline(&buffer, "KIL -TMP;\n"); /* discard if true */ } + shader_addline(&buffer, "MOV ret, fragment.color.primary;\n"); + /* Generate the main shader */ for (stage = 0; stage < MAX_TEXTURES; ++stage) { if (settings->op[stage].cop == WINED3D_TOP_DISABLE) - { - if (!stage) - final_combiner_src = "fragment.color.primary"; break; - } if (settings->op[stage].cop == WINED3D_TOP_SELECT_ARG1 && settings->op[stage].aop == WINED3D_TOP_SELECT_ARG1) @@ -6549,8 +6543,6 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con gen_ffp_instr(&buffer, stage, TRUE, FALSE, settings->op[stage].dst, settings->op[stage].cop, settings->op[stage].carg0, settings->op[stage].carg1, settings->op[stage].carg2); - if (!stage) - shader_addline(&buffer, "MOV ret.w, fragment.color.primary.w;\n"); } else if (op_equal) { @@ -6569,7 +6561,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con if (settings->sRGB_write || custom_linear_fog) { - shader_addline(&buffer, "MAD ret, fragment.color.secondary, specular_enable, %s;\n", final_combiner_src); + shader_addline(&buffer, "MAD ret, fragment.color.secondary, specular_enable, ret;\n"); if (settings->sRGB_write) arbfp_add_sRGB_correction(&buffer, "ret", "arg0", "arg1", "arg2", "tempreg", FALSE); if (custom_linear_fog) @@ -6578,8 +6570,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con } else { - shader_addline(&buffer, "MAD result.color, fragment.color.secondary, specular_enable, %s;\n", - final_combiner_src); + shader_addline(&buffer, "MAD result.color, fragment.color.secondary, specular_enable, ret;\n"); } /* Footer */

1 0

Józef Kucia : d3d9/tests: Add tests for FFP texture blending.
by Alexandre Julliard 09 Dec '15

09 Dec '15

Module: wine Branch: master Commit: c3be8d748f44b53e99e9022c77ee70e413c3abdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3be8d748f44b53e99e9022c7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 9 14:48:03 2015 +0100 d3d9/tests: Add tests for FFP texture blending. 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/d3d9/tests/visual.c | 851 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 851 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3be8d748f44b53e99e90…

1 0

Józef Kucia : d3d8/tests: Port test_texture_blending( ) from d3d9.
by Alexandre Julliard 09 Dec '15

09 Dec '15

Module: wine Branch: master Commit: d29dcec6efa935abc2db2cbb726c48086a8e1a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d29dcec6efa935abc2db2cbb7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 9 14:48:04 2015 +0100 d3d8/tests: Port test_texture_blending() from d3d9. 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/d3d8/tests/visual.c | 585 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 585 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d29dcec6efa935abc2db2…

1 0