wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Nikolay Sivov : dwrite/tests: Initial test for GetLineMetrics().
by Alexandre Julliard 18 Jun '15

18 Jun '15

Module: wine Branch: master Commit: 0b84556f8d8dd14b843901619be88be55ad69acb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b84556f8d8dd14b843901619… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 17:14:56 2015 +0300 dwrite/tests: Initial test for GetLineMetrics(). --- dlls/dwrite/tests/layout.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index ee7cfcb..3e654ae 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2662,6 +2662,99 @@ static void test_SetDrawingEffect(void) IDWriteFactory_Release(factory); } +static IDWriteFontFace *get_fontface_from_format(IDWriteTextFormat *format) +{ + IDWriteFontCollection *collection; + IDWriteFontFamily *family; + IDWriteFontFace *fontface; + IDWriteFont *font; + WCHAR nameW[255]; + UINT32 index; + BOOL exists; + HRESULT hr; + + hr = IDWriteTextFormat_GetFontCollection(format, &collection); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextFormat_GetFontFamilyName(format, nameW, sizeof(nameW)/sizeof(WCHAR)); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontCollection_FindFamilyName(collection, nameW, &index, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontCollection_Release(collection); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, + IDWriteTextFormat_GetFontWeight(format), + IDWriteTextFormat_GetFontStretch(format), + IDWriteTextFormat_GetFontStyle(format), + &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IDWriteFont_Release(font); + IDWriteFontFamily_Release(family); + + return fontface; +} + +static void test_GetLineMetrics(void) +{ + static const WCHAR strW[] = {'a','b','c','d',' ',0}; + DWRITE_FONT_METRICS fontmetrics; + DWRITE_LINE_METRICS metrics; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + IDWriteFontFace *fontface; + IDWriteFactory *factory; + UINT32 count; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 2048.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 5, format, 30000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + hr = IDWriteTextLayout_GetLineMetrics(layout, &metrics, 0, &count); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); + ok(count == 1, "got count %u\n", count); + + memset(&metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetLineMetrics(layout, &metrics, 1, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { + ok(metrics.length == 5, "got %u\n", metrics.length); + ok(metrics.trailingWhitespaceLength == 1, "got %u\n", metrics.trailingWhitespaceLength); +} + ok(metrics.newlineLength == 0, "got %u\n", metrics.newlineLength); + ok(metrics.isTrimmed == FALSE, "got %d\n", metrics.isTrimmed); + + /* Tahoma doesn't provide BASE table, so baseline is calculated from font metrics */ + fontface = get_fontface_from_format(format); + ok(fontface != NULL, "got %p\n", fontface); + IDWriteFontFace_GetMetrics(fontface, &fontmetrics); + +todo_wine { + ok(metrics.baseline == fontmetrics.ascent, "got %.2f, expected %d\n", metrics.baseline, + fontmetrics.ascent); + ok(metrics.height == fontmetrics.ascent + fontmetrics.descent, "got %.2f, expected %d\n", + metrics.height, fontmetrics.ascent + fontmetrics.descent); +} + IDWriteFontFace_Release(fontface); + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); +} + START_TEST(layout) { static const WCHAR ctrlstrW[] = {0x202a,0}; @@ -2701,6 +2794,7 @@ START_TEST(layout) test_GetMetrics(); test_SetFlowDirection(); test_SetDrawingEffect(); + test_GetLineMetrics(); IDWriteFactory_Release(factory); }

1 0

Bernhard Übelacker : comctl32/tests: Free memory used by property sheet page (Valgrind).
by Alexandre Julliard 18 Jun '15

18 Jun '15

Module: wine Branch: master Commit: ccf2ea61798979ae92e682e7396ecdd27fc80d61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccf2ea61798979ae92e682e73… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Thu Jun 18 00:43:25 2015 +0200 comctl32/tests: Free memory used by property sheet page (Valgrind). --- dlls/comctl32/tests/propsheet.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 815b8ad..9a422f1 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -874,6 +874,7 @@ if (0) r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); ok(r == 3, "got %d\n", r); + DestroyPropertySheetPage(hpsp[4]); DestroyWindow(hdlg); }

1 0

Alex Henrie : riched20: Fix link notification conditions and add tests.
by Alexandre Julliard 18 Jun '15

18 Jun '15

Module: wine Branch: master Commit: af19e6401770a0e9e5b81e5b03005fd702f9078a URL: http://source.winehq.org/git/wine.git/?a=commit;h=af19e6401770a0e9e5b81e5b0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 17 23:08:34 2015 -0600 riched20: Fix link notification conditions and add tests. --- dlls/riched20/editor.c | 13 +++- dlls/riched20/tests/editor.c | 178 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 172 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af19e6401770a0e9e5b81…

1 0

Hans Leidekker : winhttp: Fix handling of the headers length parameter in WinHttpAddRequestHeaders and WinHttpSendRequest.
by Alexandre Julliard 17 Jun '15

17 Jun '15

Module: wine Branch: master Commit: 9e96beefae97bb63845b1cac6f372de515465ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e96beefae97bb63845b1cac6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 17 15:11:50 2015 +0200 winhttp: Fix handling of the headers length parameter in WinHttpAddRequestHeaders and WinHttpSendRequest. --- dlls/winhttp/request.c | 7 +++++-- dlls/winhttp/tests/winhttp.c | 41 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 05d494f..bdcbb96 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -486,7 +486,8 @@ BOOL add_request_headers( request_t *request, LPCWSTR headers, DWORD len, DWORD if (len == ~0u) len = strlenW( headers ); if (!len) return TRUE; if (!(buffer = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return FALSE; - strcpyW( buffer, headers ); + memcpy( buffer, headers, len * sizeof(WCHAR) ); + buffer[len] = 0; p = buffer; do @@ -530,7 +531,7 @@ BOOL WINAPI WinHttpAddRequestHeaders( HINTERNET hrequest, LPCWSTR headers, DWORD TRACE("%p, %s, 0x%x, 0x%08x\n", hrequest, debugstr_w(headers), len, flags); - if (!headers) + if (!headers || !len) { set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; @@ -1251,6 +1252,8 @@ BOOL WINAPI WinHttpSendRequest( HINTERNET hrequest, LPCWSTR headers, DWORD heade return FALSE; } + if (headers && !headers_len) headers_len = strlenW( headers ); + if (request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) { send_request_t *s; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 8b72d08..d808ff6 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -410,7 +410,7 @@ static void test_WinHttpAddHeaders(void) BOOL ret, reverse; WCHAR buffer[MAX_PATH]; WCHAR check_buffer[MAX_PATH]; - DWORD index, len, oldlen; + DWORD err, index, len, oldlen; static const WCHAR test_file[] = {'/','p','o','s','t','t','e','s','t','.','p','h','p',0}; static const WCHAR test_verb[] = {'P','O','S','T',0}; @@ -420,6 +420,9 @@ static void test_WinHttpAddHeaders(void) {'P','O','S','T',' ','h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',':','8','0','/','p','o','s','t','.','p','h','p',' ','H','T','T','P','/','1'}; static const WCHAR test_header_end[] = {'\r','\n','\r','\n',0}; static const WCHAR test_header_name[] = {'W','a','r','n','i','n','g',0}; + static const WCHAR test_header_range[] = {'R','a','n','g','e',0}; + static const WCHAR test_header_range_bytes[] = {'R','a','n','g','e',':',' ','b','y','t','e','s','=','0','-','7','7','3','\r','\n',0}; + static const WCHAR test_header_bytes[] = {'b','y','t','e','s','=','0','-','7','7','3',0}; static const WCHAR test_flag_coalesce[] = {'t','e','s','t','2',',',' ','t','e','s','t','4',0}; static const WCHAR test_flag_coalesce_reverse[] = {'t','e','s','t','3',',',' ','t','e','s','t','4',0}; @@ -780,6 +783,26 @@ static void test_WinHttpAddHeaders(void) ok(ret, "WinHttpQueryHeaders failed: %u\n", GetLastError()); ok(!memcmp(buffer, value, sizeof(value)) || ! memcmp(buffer, value_nospace, sizeof(value_nospace)), "unexpected result\n"); + SetLastError(0xdeadbeef); + ret = WinHttpAddRequestHeaders(request, test_header_range_bytes, 0, + WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE); + err = GetLastError(); + ok(!ret, "unexpected success\n"); + ok(err == ERROR_INVALID_PARAMETER, "got %u\n", err); + + ret = WinHttpAddRequestHeaders(request, test_header_range_bytes, ~0u, + WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE); + ok(ret, "failed to add header: %u\n", GetLastError()); + + index = 0; + len = sizeof(buffer); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + test_header_range, buffer, &len, &index); + ok(ret, "failed to get range header %u\n", GetLastError()); + ok(!memcmp(buffer, test_header_bytes, sizeof(test_header_bytes)), "incorrect string returned\n"); + ok(len == lstrlenW(test_header_bytes) * sizeof(WCHAR), "wrong length %u\n", len); + ok(index == 1, "wrong index %u\n", index); + ret = WinHttpCloseHandle(request); ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); done: @@ -1923,7 +1946,8 @@ static DWORD CALLBACK server_thread(LPVOID param) } if (strstr(buffer, "GET /not_modified")) { - send(c, notmodified, sizeof notmodified - 1, 0); + if (strstr(buffer, "If-Modified-Since:")) send(c, notmodified, sizeof notmodified - 1, 0); + else send(c, notokmsg, sizeof(notokmsg) - 1, 0); continue; } if (strstr(buffer, "HEAD /head")) @@ -2395,11 +2419,12 @@ static void test_not_modified(int port) { static const WCHAR pathW[] = {'/','n','o','t','_','m','o','d','i','f','i','e','d',0}; static const WCHAR ifmodifiedW[] = {'I','f','-','M','o','d','i','f','i','e','d','-','S','i','n','c','e',':',' '}; + static const WCHAR ifmodified2W[] = {'I','f','-','M','o','d','i','f','i','e','d','-','S','i','n','c','e',0}; BOOL ret; HINTERNET session, request, connection; - DWORD status, size, start = GetTickCount(); + DWORD index, len, status, size, start = GetTickCount(); SYSTEMTIME st; - WCHAR today[(sizeof(ifmodifiedW) + WINHTTP_TIME_FORMAT_BUFSIZE)/sizeof(WCHAR) + 3]; + WCHAR today[(sizeof(ifmodifiedW) + WINHTTP_TIME_FORMAT_BUFSIZE)/sizeof(WCHAR) + 3], buffer[32]; memcpy(today, ifmodifiedW, sizeof(ifmodifiedW)); GetSystemTime(&st); @@ -2416,12 +2441,18 @@ static void test_not_modified(int port) WINHTTP_DEFAULT_ACCEPT_TYPES, WINHTTP_FLAG_BYPASS_PROXY_CACHE); ok(request != NULL, "WinHttpOpenrequest failed: %u\n", GetLastError()); - ret = WinHttpSendRequest(request, today, ~0u, NULL, 0, 0, 0); + ret = WinHttpSendRequest(request, today, 0, NULL, 0, 0, 0); ok(ret, "WinHttpSendRequest failed: %u\n", GetLastError()); ret = WinHttpReceiveResponse(request, NULL); ok(ret, "WinHttpReceiveResponse failed: %u\n", GetLastError()); + index = 0; + len = sizeof(buffer); + ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + ifmodified2W, buffer, &len, &index); + ok(ret, "failed to get header %u\n", GetLastError()); + status = 0xdeadbeef; size = sizeof(status); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER,

1 0

Hans Leidekker : winhttp/tests: Fix a test failure on win2k.
by Alexandre Julliard 17 Jun '15

17 Jun '15

Module: wine Branch: master Commit: d9d8e6f0312f6d6f4d79ef2486091cfa1c52b566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d8e6f0312f6d6f4d79ef248… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 17 15:11:22 2015 +0200 winhttp/tests: Fix a test failure on win2k. --- dlls/winhttp/tests/winhttp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 10a3f06..8b72d08 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -942,6 +942,11 @@ static void test_request_parameter_defaults(void) ok(ret, "failed to send request %u\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); + if (!ret && GetLastError() == ERROR_WINHTTP_INVALID_SERVER_RESPONSE) /* win2k */ + { + win_skip("invalid response\n"); + goto done; + } ok(ret, "failed to receive response %u\n", GetLastError()); status = 0xdeadbeef;

1 0

Hans Leidekker : advapi32/tests: Add tests to show that reading the SACL requires a special privilege.
by Alexandre Julliard 17 Jun '15

17 Jun '15

Module: wine Branch: master Commit: 1fb3f9cb1552d1968de77f3f00636467fa09d584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fb3f9cb1552d1968de77f3f0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 17 15:09:39 2015 +0200 advapi32/tests: Add tests to show that reading the SACL requires a special privilege. --- dlls/advapi32/tests/security.c | 87 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b43f212..f141b3e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5835,6 +5835,92 @@ static void test_AddAce(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %d\n", GetLastError()); } +static void test_system_security_access(void) +{ + static const WCHAR testkeyW[] = + {'S','O','F','T','W','A','R','E','\\','W','i','n','e','\\','S','A','C','L','t','e','s','t',0}; + LONG res; + HKEY hkey; + PSECURITY_DESCRIPTOR sd; + ACL *sacl; + DWORD err, len = 128; + TOKEN_PRIVILEGES priv, *priv_prev; + HANDLE token; + LUID luid; + BOOL ret; + + if (!OpenProcessToken( GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES|TOKEN_QUERY, &token )) return; + if (!LookupPrivilegeValueA( NULL, SE_SECURITY_NAME, &luid )) + { + CloseHandle( token ); + return; + } + + /* ACCESS_SYSTEM_SECURITY requires special privilege */ + res = RegCreateKeyExW( HKEY_LOCAL_MACHINE, testkeyW, 0, NULL, 0, KEY_READ|ACCESS_SYSTEM_SECURITY, NULL, &hkey, NULL ); + todo_wine ok( res == ERROR_PRIVILEGE_NOT_HELD, "got %d\n", res ); + + priv.PrivilegeCount = 1; + priv.Privileges[0].Luid = luid; + priv.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + + priv_prev = HeapAlloc( GetProcessHeap(), 0, len ); + ret = AdjustTokenPrivileges( token, FALSE, &priv, len, priv_prev, &len ); + ok( ret, "got %u\n", GetLastError()); + + res = RegCreateKeyExW( HKEY_LOCAL_MACHINE, testkeyW, 0, NULL, 0, KEY_READ|ACCESS_SYSTEM_SECURITY, NULL, &hkey, NULL ); + ok( !res, "got %d\n", res ); + + /* restore privileges */ + ret = AdjustTokenPrivileges( token, FALSE, priv_prev, 0, NULL, NULL ); + ok( ret, "got %u\n", GetLastError() ); + HeapFree( GetProcessHeap(), 0, priv_prev ); + + /* privilege is checked on access */ + err = GetSecurityInfo( hkey, SE_REGISTRY_KEY, SACL_SECURITY_INFORMATION, NULL, NULL, NULL, &sacl, &sd ); + todo_wine ok( err == ERROR_PRIVILEGE_NOT_HELD, "got %u\n", err ); + + priv.PrivilegeCount = 1; + priv.Privileges[0].Luid = luid; + priv.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + + priv_prev = HeapAlloc( GetProcessHeap(), 0, len ); + ret = AdjustTokenPrivileges( token, FALSE, &priv, len, priv_prev, &len ); + ok( ret, "got %u\n", GetLastError()); + + err = GetSecurityInfo( hkey, SE_REGISTRY_KEY, SACL_SECURITY_INFORMATION, NULL, NULL, NULL, &sacl, &sd ); + ok( err == ERROR_SUCCESS, "got %u\n", err ); + RegCloseKey( hkey ); + LocalFree( sd ); + + /* handle created without ACCESS_SYSTEM_SECURITY, privilege held */ + res = RegCreateKeyExW( HKEY_LOCAL_MACHINE, testkeyW, 0, NULL, 0, KEY_READ, NULL, &hkey, NULL ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + sd = NULL; + err = GetSecurityInfo( hkey, SE_REGISTRY_KEY, SACL_SECURITY_INFORMATION, NULL, NULL, NULL, &sacl, &sd ); + todo_wine ok( err == ERROR_SUCCESS, "got %u\n", err ); + RegCloseKey( hkey ); + LocalFree( sd ); + + /* restore privileges */ + ret = AdjustTokenPrivileges( token, FALSE, priv_prev, 0, NULL, NULL ); + ok( ret, "got %u\n", GetLastError() ); + HeapFree( GetProcessHeap(), 0, priv_prev ); + + /* handle created without ACCESS_SYSTEM_SECURITY, privilege not held */ + res = RegCreateKeyExW( HKEY_LOCAL_MACHINE, testkeyW, 0, NULL, 0, KEY_READ, NULL, &hkey, NULL ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + err = GetSecurityInfo( hkey, SE_REGISTRY_KEY, SACL_SECURITY_INFORMATION, NULL, NULL, NULL, &sacl, &sd ); + todo_wine ok( err == ERROR_PRIVILEGE_NOT_HELD, "got %u\n", err ); + RegCloseKey( hkey ); + + res = RegDeleteKeyW( HKEY_LOCAL_MACHINE, testkeyW ); + ok( !res, "got %d\n", res ); + CloseHandle( token ); +} + START_TEST(security) { init(); @@ -5877,4 +5963,5 @@ START_TEST(security) test_default_dacl_owner_sid(); test_AdjustTokenPrivileges(); test_AddAce(); + test_system_security_access(); }

1 0

Jacek Caban : secur32: Fixed compilation on with gnutls.
by Alexandre Julliard 17 Jun '15

17 Jun '15

Module: wine Branch: master Commit: 72747526b1242f436db9e68d319c37484ce02109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72747526b1242f436db9e68d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 17 13:01:14 2015 +0200 secur32: Fixed compilation on with gnutls. --- dlls/secur32/schannel_gnutls.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index bb463c1..c0b6f80 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -76,7 +76,10 @@ MAKE_FUNCPTR(gnutls_transport_set_pull_function); MAKE_FUNCPTR(gnutls_transport_set_push_function); #undef MAKE_FUNCPTR - +#if GNUTLS_VERSION_MAJOR < 3 +#define GNUTLS_CIPHER_AES_128_GCM 93 +#define GNUTLS_CIPHER_AES_256_GCM 94 +#endif static ssize_t schan_pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) @@ -258,7 +261,7 @@ static DWORD schannel_get_protocol(gnutls_protocol_t proto) } } -static ALG_ID schannel_get_cipher_algid(gnutls_cipher_algorithm_t cipher) +static ALG_ID schannel_get_cipher_algid(int cipher) { switch (cipher) {

1 0

Matteo Bruni : wined3d: Make use of the EXT_BLEND_SUBTRACT flag.
by Alexandre Julliard 17 Jun '15

17 Jun '15

Module: wine Branch: master Commit: 498e55a1824fccaca826c7edc84a55e729e4e342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=498e55a1824fccaca826c7edc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 16 22:45:41 2015 +0200 wined3d: Make use of the EXT_BLEND_SUBTRACT flag. MSDN mentions a fallback to D3DBLENDOP_ADD if the selected blendop is not supported. In theory it would be nice to write a test for that but I don't think this is particularly important and moreover hardware without that cap seems hard to come by (i.e. I have none)... --- dlls/wined3d/directx.c | 17 +++++++++++++++-- dlls/wined3d/state.c | 20 ++++++++++---------- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f238fc0..243f5ae 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3399,13 +3399,25 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->supported[NV_POINT_SPRITE] = TRUE; } + if ((!gl_info->supported[EXT_BLEND_MINMAX] || !gl_info->supported[EXT_BLEND_SUBTRACT]) + && gl_version >= MAKEDWORD_VERSION(1, 4)) + { + TRACE("GL CORE: GL_EXT_blend_minmax / GL_EXT_blend_subtract support.\n"); + gl_info->supported[EXT_BLEND_MINMAX] = TRUE; + gl_info->supported[EXT_BLEND_SUBTRACT] = TRUE; + } + if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] && gl_version >= MAKEDWORD_VERSION(2, 0)) { TRACE("GL CORE: GL_ARB_texture_non_power_of_two support.\n"); gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = TRUE; } - if (gl_version >= MAKEDWORD_VERSION(2, 0)) gl_info->supported[WINED3D_GL_VERSION_2_0] = TRUE; + if (gl_info->supported[EXT_BLEND_MINMAX] || gl_info->supported[EXT_BLEND_SUBTRACT]) + gl_info->supported[WINED3D_GL_BLEND_EQUATION] = TRUE; + + if (gl_version >= MAKEDWORD_VERSION(2, 0)) + gl_info->supported[WINED3D_GL_VERSION_2_0] = TRUE; if (gl_info->supported[APPLE_FENCE]) { @@ -4760,7 +4772,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPMISCCAPS_CLIPTLVERTS | WINED3DPMISCCAPS_CLIPPLANESCALEDPOINTS | WINED3DPMISCCAPS_MASKZ | - WINED3DPMISCCAPS_BLENDOP | WINED3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING; /* TODO: WINED3DPMISCCAPS_NULLREFERENCE @@ -4768,6 +4779,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINED3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS WINED3DPMISCCAPS_FOGVERTEXCLAMPED */ + if (gl_info->supported[WINED3D_GL_BLEND_EQUATION]) + caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_BLENDOP; if (gl_info->supported[EXT_BLEND_EQUATION_SEPARATE] && gl_info->supported[EXT_BLEND_FUNC_SEPARATE]) caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_SEPARATEALPHABLEND; if (gl_info->supported[EXT_DRAW_BUFFERS2]) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f5a9a24..c28798d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -273,23 +273,23 @@ static void state_blendop_w(struct wined3d_context *context, const struct wined3 WARN("Unsupported in local OpenGL implementation: glBlendEquation\n"); } -static GLenum gl_blend_op(enum wined3d_blend_op op) +static GLenum gl_blend_op(const struct wined3d_gl_info *gl_info, enum wined3d_blend_op op) { switch (op) { case WINED3D_BLEND_OP_ADD: - return GL_FUNC_ADD_EXT; + return GL_FUNC_ADD; case WINED3D_BLEND_OP_SUBTRACT: - return GL_FUNC_SUBTRACT_EXT; + return gl_info->supported[EXT_BLEND_SUBTRACT] ? GL_FUNC_SUBTRACT : GL_FUNC_ADD; case WINED3D_BLEND_OP_REVSUBTRACT: - return GL_FUNC_REVERSE_SUBTRACT_EXT; + return gl_info->supported[EXT_BLEND_SUBTRACT] ? GL_FUNC_REVERSE_SUBTRACT : GL_FUNC_ADD; case WINED3D_BLEND_OP_MIN: - return GL_MIN_EXT; + return gl_info->supported[EXT_BLEND_MINMAX] ? GL_MIN : GL_FUNC_ADD; case WINED3D_BLEND_OP_MAX: - return GL_MAX_EXT; + return gl_info->supported[EXT_BLEND_MINMAX] ? GL_MAX : GL_FUNC_ADD; default: FIXME("Unhandled blend op %#x.\n", op); - return GL_NONE; + return GL_FUNC_ADD; } } @@ -307,8 +307,8 @@ static void state_blendop(struct wined3d_context *context, const struct wined3d_ return; } - blend_equation = gl_blend_op(state->render_states[WINED3D_RS_BLENDOP]); - blend_equation_alpha = gl_blend_op(state->render_states[WINED3D_RS_BLENDOPALPHA]); + blend_equation = gl_blend_op(gl_info, state->render_states[WINED3D_RS_BLENDOP]); + blend_equation_alpha = gl_blend_op(gl_info, state->render_states[WINED3D_RS_BLENDOPALPHA]); TRACE("blend_equation %#x, blend_equation_alpha %#x.\n", blend_equation, blend_equation_alpha); if (state->render_states[WINED3D_RS_SEPARATEALPHABLENDENABLE]) @@ -4997,7 +4997,7 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), { STATE_RENDER(WINED3D_RS_DEBUGMONITORTOKEN), state_debug_monitor }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), state_colorwrite0 }, EXT_DRAW_BUFFERS2 }, { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), { STATE_RENDER(WINED3D_RS_COLORWRITEENABLE), state_colorwrite }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_BLENDOP), { STATE_RENDER(WINED3D_RS_BLENDOP), state_blendop }, EXT_BLEND_MINMAX }, + { STATE_RENDER(WINED3D_RS_BLENDOP), { STATE_RENDER(WINED3D_RS_BLENDOP), state_blendop }, WINED3D_GL_BLEND_EQUATION }, { STATE_RENDER(WINED3D_RS_BLENDOP), { STATE_RENDER(WINED3D_RS_BLENDOP), state_blendop_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE), { STATE_RENDER(WINED3D_RS_SCISSORTESTENABLE), state_scissor }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SLOPESCALEDEPTHBIAS), { STATE_RENDER(WINED3D_RS_DEPTHBIAS), NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 009dca6..4257cd2 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -160,6 +160,7 @@ enum wined3d_gl_extension WGL_EXT_SWAP_CONTROL, WGL_WINE_PIXEL_FORMAT_PASSTHROUGH, /* Internally used */ + WINED3D_GL_BLEND_EQUATION, WINED3D_GL_NORMALIZED_TEXRECT, WINED3D_GL_VERSION_2_0,

1 0

Matteo Bruni : wined3d: Drop WINED3D_RS_TEXTUREPERSPECTIVE handling.
by Alexandre Julliard 17 Jun '15

17 Jun '15

Module: wine Branch: master Commit: 35a2406900b88ead932cd998c85dabefb8a4b987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a2406900b88ead932cd998c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 16 22:45:40 2015 +0200 wined3d: Drop WINED3D_RS_TEXTUREPERSPECTIVE handling. The hint is not supported on core profiles. It's not guaranteed to do anything on compatibility profile either: "The interpretation of hints is implementation dependent. An implementation may ignore them entirely." This state was only available on D3D 7 and below (and not guaranteed to do anything there either, according to older DX SDK docs). If necessary we could implement it via the GLSL 1.50 "noperspective" interpolation qualifier, which is what we need to use for the equivalent D3D10 feature anyway. --- dlls/wined3d/state.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 67558fd..f5a9a24 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1698,22 +1698,6 @@ static void state_zvisible(struct wined3d_context *context, const struct wined3d FIXME("WINED3D_RS_ZVISIBLE not implemented.\n"); } -static void state_perspective(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - const struct wined3d_gl_info *gl_info = context->gl_info; - - if (state->render_states[WINED3D_RS_TEXTUREPERSPECTIVE]) - { - gl_info->gl_ops.gl.p_glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); - checkGLcall("glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST)"); - } - else - { - gl_info->gl_ops.gl.p_glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST); - checkGLcall("glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST)"); - } -} - static void state_stippledalpha(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (state->render_states[WINED3D_RS_STIPPLEDALPHA]) @@ -4939,7 +4923,7 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }, ARB_VERTEX_BUFFER_OBJECT }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ANTIALIAS), { STATE_RENDER(WINED3D_RS_ANTIALIAS), state_antialias }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), { STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), state_perspective }, WINED3D_GL_EXT_NONE }, + { STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), { STATE_RENDER(WINED3D_RS_TEXTUREPERSPECTIVE), state_nop }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_ZENABLE), { STATE_RENDER(WINED3D_RS_ZENABLE), state_zenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAPU), { STATE_RENDER(WINED3D_RS_WRAPU), state_wrapu }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAPV), { STATE_RENDER(WINED3D_RS_WRAPV), state_wrapv }, WINED3D_GL_EXT_NONE },

1 0

Matteo Bruni : wined3d: Cleanup and simplify texture sampling code generation.
by Alexandre Julliard 17 Jun '15

17 Jun '15

Module: wine Branch: master Commit: f6e7e01744602a55200019642dada5715fd51822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6e7e01744602a55200019642… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 16 22:45:39 2015 +0200 wined3d: Cleanup and simplify texture sampling code generation. Makes it easier to support the different names and syntax in GLSL 1.50 in the (hopefully) near future. --- dlls/wined3d/glsl_shader.c | 329 ++++++++++++++------------------------------- 1 file changed, 98 insertions(+), 231 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6e7e01744602a5520001…

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2015