February 2017 - Wine-Commits

Sebastian Lackner : wined3d: Avoid unnecessary memory allocations in nested command stream calls.
by Alexandre Julliard Feb. 17, 2017

Feb. 17, 2017

Module: wine Branch: master Commit: 82965692a0d16fc4f94c6a548a9ab4b1199472af URL: http://source.winehq.org/git/wine.git/?a=commit;h=82965692a0d16fc4f94c6a548… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 17 16:54:45 2017 +0100 wined3d: Avoid unnecessary memory allocations in nested command stream calls. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 10905c0..bbae5ad 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1608,15 +1608,14 @@ static void wined3d_cs_st_submit(struct wined3d_cs *cs) data = cs->data; start = cs->start; cs->start = cs->end; + opcode = *(const enum wined3d_cs_op *)&data[start]; wined3d_cs_op_handlers[opcode](cs, &data[start]); - if (!start) - { - if (cs->data != data) - HeapFree(GetProcessHeap(), 0, data); - else - cs->start = cs->end = 0; - } + + if (cs->data == data) + cs->start = cs->end = start; + else if (!start) + HeapFree(GetProcessHeap(), 0, data); } static void wined3d_cs_st_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p,

1 0

Tag wine-2.2 : Alexandre Julliard : Release 2.2
by Alexandre Julliard Feb. 17, 2017

Feb. 17, 2017

Module: wine Branch: refs/tags/wine-2.2 Tag: 4f746cca7ab06849298ab203545760e5c0109897 URL: http://source.winehq.org/git/wine.git/?a=tag;h=4f746cca7ab06849298ab2035457… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 21:35:09 2017 +0100 Release 2.2

1 0

Jacek Caban : mshtml: Removed no longer used attr_name from event_info_t.
by Alexandre Julliard Feb. 17, 2017

Feb. 17, 2017

Module: wine Branch: master Commit: 794e424c2a8cb5f9930b7ed7ab635e4a9519a148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=794e424c2a8cb5f9930b7ed7a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 17 13:17:16 2017 +0100 mshtml: Removed no longer used attr_name from event_info_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 142 ++++++++++++------------------------------------ 1 file changed, 36 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=794e424c2a8cb5f9930b7…

1 0

Alistair Leslie-Hughes : dplayx: Don' t print an error when no Lobby Providers are found.
by Alexandre Julliard Feb. 17, 2017

Feb. 17, 2017

Module: wine Branch: master Commit: 7603e859c3d23026820c04e05955467894455ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7603e859c3d23026820c04e05… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 17 06:42:49 2017 +0000 dplayx: Don't print an error when no Lobby Providers are found. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplay.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 92062d3..cf6bd4a 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -4379,8 +4379,7 @@ static HRESULT WINAPI IDirectPlay4AImpl_EnumConnections( IDirectPlay4A *iface, if( RegOpenKeyExA( HKEY_LOCAL_MACHINE, searchSubKey, 0, KEY_READ, &hkResult ) != ERROR_SUCCESS ) { - /* Hmmm. Does this mean that there are no service providers? */ - ERR(": no service providers?\n"); + TRACE("No Lobby Providers have been registered.\n"); return DP_OK; }

1 0

Alistair Leslie-Hughes : dplayx/tests: DirectPlay IPX support was removed in Vista.
by Alexandre Julliard Feb. 17, 2017

Feb. 17, 2017

Module: wine Branch: master Commit: 52d5e868f3b2f809b3c72692780a9179147a6c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=52d5e868f3b2f809b3c726927… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 17 06:42:37 2017 +0000 dplayx/tests: DirectPlay IPX support was removed in Vista. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/tests/dplayx.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index f394768..de392aa 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -893,7 +893,11 @@ static BOOL CALLBACK EnumAddress_cb2( REFGUID guidDataType, } else if ( IsEqualGUID( types[1], guidDataType ) ) { - todo_wine checkGuid( sps[ callbackData->dwCounter1 ], lpData ); + BOOL found = FALSE; + int i; + for( i=0; i < sizeof(sps) / sizeof(sps[0]) && !found; i++ ) + found = IsEqualGUID( sps[i], lpData ); + ok( found, "Unknown Address type found %s\n", wine_dbgstr_guid(lpData) ); } callbackData->dwCounter2++; @@ -957,14 +961,14 @@ static void test_EnumConnections(void) hr = IDirectPlayX_EnumConnections( pDP, &appGuid, EnumConnections_cb, &callbackData, callbackData.dwFlags ); checkHR( DP_OK, hr ); - check( 4, callbackData.dwCounter1 ); + ok( callbackData.dwCounter1 == 4 || callbackData.dwCounter1 == 3, "got=%d\n", callbackData.dwCounter1 ); callbackData.dwCounter1 = 0; callbackData.dwFlags = 0; hr = IDirectPlayX_EnumConnections( pDP, NULL, EnumConnections_cb, &callbackData, callbackData.dwFlags ); checkHR( DP_OK, hr ); - check( 4, callbackData.dwCounter1 ); + ok( callbackData.dwCounter1 == 4 || callbackData.dwCounter1 == 3, "got=%d\n", callbackData.dwCounter1 ); callbackData.dwCounter1 = 0; callbackData.dwFlags = 0; @@ -980,7 +984,7 @@ static void test_EnumConnections(void) hr = IDirectPlayX_EnumConnections( pDP, &appGuid, EnumConnections_cb, &callbackData, callbackData.dwFlags ); checkHR( DP_OK, hr ); - check( 4, callbackData.dwCounter1 ); + ok( callbackData.dwCounter1 == 4 || callbackData.dwCounter1 == 3, "got=%d\n", callbackData.dwCounter1 ); callbackData.dwCounter1 = 0; callbackData.dwFlags = DPCONNECTION_DIRECTPLAYLOBBY; @@ -995,7 +999,7 @@ static void test_EnumConnections(void) hr = IDirectPlayX_EnumConnections( pDP, &appGuid, EnumConnections_cb, &callbackData, callbackData.dwFlags ); checkHR( DP_OK, hr ); - check( 4, callbackData.dwCounter1 ); + ok( callbackData.dwCounter1 == 4 || callbackData.dwCounter1 == 3, "got=%d\n", callbackData.dwCounter1 ); callbackData.dwCounter1 = 0; callbackData.dwFlags = ~( DPCONNECTION_DIRECTPLAY | @@ -1094,7 +1098,7 @@ static void test_GetCaps(void) { hr = IDirectPlayX_GetCaps( pDP, &dpcaps, dwFlags ); - checkHR( DP_OK, hr ); + todo_wine checkHR( DP_OK, hr ); if ( hr == DP_OK ) @@ -6890,20 +6894,19 @@ START_TEST(dplayx) test_COM(); test_COM_dplobby(); test_EnumerateProviders(); + test_DirectPlayCreate(); + test_EnumConnections(); + test_InitializeConnection(); + test_GetCaps(); if (!winetest_interactive) { - skip("Run in interactive mode to run dplayx tests.\n"); + skip("Run in interactive mode to run all dplayx tests.\n"); return; } trace("Running in interactive mode, tests will take a while\n"); - test_DirectPlayCreate(); - test_EnumConnections(); - test_InitializeConnection(); - - test_GetCaps(); /* test_Open() takes almost a minute, */ test_Open(); /* test_EnumSession takes three minutes */

1 0

Jacek Caban : mshtml: Reimplemented check_event_attr to iterate though declared attributes instead of all known events.
by Alexandre Julliard Feb. 17, 2017

Feb. 17, 2017

Module: wine Branch: master Commit: 9f0be726180a9655fe2ae21092b5c1440bb55b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f0be726180a9655fe2ae2109… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 17 13:16:56 2017 +0100 mshtml: Reimplemented check_event_attr to iterate though declared attributes instead of all known events. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 84 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 66 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 77c998f..13fda24 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1596,34 +1596,82 @@ void update_doc_cp_events(HTMLDocumentNode *doc, cp_static_data_t *cp) void check_event_attr(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem) { - const PRUnichar *attr_value; - nsAString attr_value_str; + nsIDOMMozNamedAttrMap *attr_map; + const PRUnichar *name, *value; + nsAString name_str, value_str; + HTMLDOMNode *node = NULL; + cpp_bool has_attrs; + nsIDOMAttr *attr; IDispatch *disp; - HTMLDOMNode *node; - int i; + UINT32 length, i; + eventid_t eid; nsresult nsres; HRESULT hres; - for(i=0; i < EVENTID_LAST; i++) { - nsres = get_elem_attr_value(nselem, event_info[i].attr_name, &attr_value_str, &attr_value); - if(NS_SUCCEEDED(nsres)) { - if(!*attr_value) - continue; + nsres = nsIDOMHTMLElement_HasAttributes(nselem, &has_attrs); + if(NS_FAILED(nsres) || !has_attrs) + return; - TRACE("%p.%s = %s\n", nselem, debugstr_w(event_info[i].attr_name), debugstr_w(attr_value)); + nsres = nsIDOMHTMLElement_GetAttributes(nselem, &attr_map); + if(NS_FAILED(nsres)) + return; - disp = script_parse_event(doc->window, attr_value); - if(disp) { - hres = get_node(doc, (nsIDOMNode*)nselem, TRUE, &node); - if(SUCCEEDED(hres)) { - set_event_handler_disp(&node->event_target, i, disp); - node_release(node); - } + nsres = nsIDOMMozNamedAttrMap_GetLength(attr_map, &length); + assert(nsres == NS_OK); + + nsAString_Init(&name_str, NULL); + nsAString_Init(&value_str, NULL); + + for(i = 0; i < length; i++) { + nsres = nsIDOMMozNamedAttrMap_Item(attr_map, i, &attr); + if(NS_FAILED(nsres)) + continue; + + nsres = nsIDOMAttr_GetName(attr, &name_str); + if(NS_FAILED(nsres)) { + nsIDOMAttr_Release(attr); + continue; + } + + nsAString_GetData(&name_str, &name); + eid = attr_to_eid(name); + if(eid == EVENTID_LAST) { + nsIDOMAttr_Release(attr); + continue; + } + + nsres = nsIDOMAttr_GetValue(attr, &value_str); + nsIDOMAttr_Release(attr); + if(NS_FAILED(nsres)) + continue; + + nsAString_GetData(&value_str, &value); + if(!*value) + continue; + + TRACE("%p.%s = %s\n", nselem, debugstr_w(name), debugstr_w(value)); + + disp = script_parse_event(doc->window, value); + if(!disp) + continue; + + if(!node) { + hres = get_node(doc, (nsIDOMNode*)nselem, TRUE, &node); + if(FAILED(hres)) { IDispatch_Release(disp); + break; } - nsAString_Finish(&attr_value_str); } + + set_event_handler_disp(&node->event_target, eid, disp); + IDispatch_Release(disp); } + + if(node) + node_release(node); + nsAString_Finish(&name_str); + nsAString_Finish(&value_str); + nsIDOMMozNamedAttrMap_Release(attr_map); } HRESULT doc_init_events(HTMLDocumentNode *doc)

1 0

Lauri Kenttä : crypt32: Fix wrong Base64 trailer WCHAR constants.
by Alexandre Julliard Feb. 17, 2017

Feb. 17, 2017

Module: wine Branch: master Commit: 254eb21c6f659088b1f9e0d95b86ee33ded11474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=254eb21c6f659088b1f9e0d95… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Feb 17 16:45:54 2017 +0200 crypt32: Fix wrong Base64 trailer WCHAR constants. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/base64.c | 4 ++-- dlls/crypt32/tests/base64.c | 22 +++++++++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 6c2e252..40ce9dc 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -47,10 +47,10 @@ static const WCHAR CERT_HEADER_START_W[] = { static const WCHAR CERT_DELIMITER_W[] = { '-','-','-','-','-',0 }; static const WCHAR CERT_TRAILER_W[] = { -'-','-','-','-','-','E','N','D',' ',0 }; -static const WCHAR CERT_TRAILER_START_W[] = { '-','-','-','-','-','E','N','D',' ','C','E','R','T','I','F','I','C','A','T', 'E','-','-','-','-','-',0 }; +static const WCHAR CERT_TRAILER_START_W[] = { +'-','-','-','-','-','E','N','D',' ',0 }; static const WCHAR CERT_REQUEST_HEADER_W[] = { '-','-','-','-','-','B','E','G','I','N',' ','N','E','W',' ','C','E','R','T', 'I','F','I','C','A','T','E','R','E','Q','U','E','S','T','-','-','-','-','-',0 }; diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index fb70ca0..2e7e488 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -47,6 +47,9 @@ static BOOL (WINAPI *pCryptBinaryToStringA)(const BYTE *pbBinary, static BOOL (WINAPI *pCryptStringToBinaryA)(LPCSTR pszString, DWORD cchString, DWORD dwFlags, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags); +static BOOL (WINAPI *pCryptStringToBinaryW)(LPCWSTR pszString, + DWORD cchString, DWORD dwFlags, BYTE *pbBinary, DWORD *pcbBinary, + DWORD *pdwSkip, DWORD *pdwFlags); struct BinTests { @@ -299,10 +302,24 @@ static void decodeAndCompareBase64_A(LPCSTR toDecode, LPCSTR header, } } +static void decodeBase64WithLenFmtW(LPCSTR strA, int len, DWORD fmt, BOOL retA, + const BYTE *bufA, DWORD bufLenA, DWORD fmtUsedA) +{ + BYTE buf[8] = {0}; + DWORD bufLen = sizeof(buf)-1, fmtUsed = 0xdeadbeef; + BOOL ret; + WCHAR strW[64]; + int i; + for (i = 0; (strW[i] = strA[i]) != 0; ++i); + ret = pCryptStringToBinaryW(strW, len, fmt, buf, &bufLen, NULL, &fmtUsed); + ok(ret == retA && bufLen == bufLenA && memcmp(bufA, buf, bufLen) == 0 + && fmtUsed == fmtUsedA, "base64 \"%s\" len %d: W and A differ\n", strA, len); +} + static void decodeBase64WithLenFmt(LPCSTR str, int len, DWORD fmt, LPCSTR expected, int le, BOOL isBroken) { BYTE buf[8] = {0}; - DWORD bufLen = sizeof(buf)-1, fmtUsed; + DWORD bufLen = sizeof(buf)-1, fmtUsed = 0xdeadbeef; BOOL ret; SetLastError(0xdeadbeef); ret = pCryptStringToBinaryA(str, len, fmt, buf, &bufLen, NULL, &fmtUsed); @@ -320,6 +337,8 @@ static void decodeBase64WithLenFmt(LPCSTR str, int len, DWORD fmt, LPCSTR expect "base64 \"%s\" len %d: expected failure, got \"%s\" (ret %d, le %d)\n", str, len, (char*)buf, ret, GetLastError()); } + if (pCryptStringToBinaryW) + decodeBase64WithLenFmtW(str, len, fmt, ret, buf, bufLen, fmtUsed); } static void decodeBase64WithLenBroken(LPCSTR str, int len, LPCSTR expected, int le) @@ -539,6 +558,7 @@ START_TEST(base64) pCryptBinaryToStringA = (void *)GetProcAddress(lib, "CryptBinaryToStringA"); pCryptStringToBinaryA = (void *)GetProcAddress(lib, "CryptStringToBinaryA"); + pCryptStringToBinaryW = (void *)GetProcAddress(lib, "CryptStringToBinaryW"); if (pCryptBinaryToStringA) testBinaryToStringA();

1 0

Lauri Kenttä : crypt32: Remove unused parameter and dead code.
by Alexandre Julliard Feb. 17, 2017

Feb. 17, 2017

Module: wine Branch: master Commit: e37612329fe4a1a6ac0a0a4a32ba5143f464dab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e37612329fe4a1a6ac0a0a4a3… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Feb 17 16:46:51 2017 +0200 crypt32: Remove unused parameter and dead code. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/base64.c | 90 +++++++++++++-------------------------------------- 1 file changed, 22 insertions(+), 68 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 40ce9dc..4a904d4 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -604,7 +604,7 @@ static LONG Base64ToBinaryA(LPCSTR pszString, DWORD cchString, static LONG Base64WithHeaderAndTrailerToBinaryA(LPCSTR pszString, DWORD cchString, BYTE *pbBinary, - DWORD *pcbBinary, DWORD *pdwSkip, BOOL exactHeaderAndTrailerMatch) + DWORD *pcbBinary, DWORD *pdwSkip) { LONG ret; LPCSTR header = CERT_HEADER_START; @@ -627,43 +627,20 @@ static LONG Base64WithHeaderAndTrailerToBinaryA(LPCSTR pszString, } dataBegins = headerBegins + strlen(header); - if (!exactHeaderAndTrailerMatch) + if (!(dataBegins = strstr(dataBegins, CERT_DELIMITER))) { - if ((dataBegins = strstr(dataBegins, CERT_DELIMITER))) - { - dataBegins += strlen(CERT_DELIMITER); - } - else - { - return ERROR_INVALID_DATA; - } + return ERROR_INVALID_DATA; } + dataBegins += strlen(CERT_DELIMITER); if (*dataBegins == '\r') dataBegins++; if (*dataBegins == '\n') dataBegins++; - if (exactHeaderAndTrailerMatch) - { - trailerBegins = pszString + cchString - strlen(trailer); - if (pszString[cchString - 1] == '\n') trailerBegins--; - if (pszString[cchString - 2] == '\r') trailerBegins--; - - if (*(trailerBegins-1) == '\n') trailerBegins--; - if (*(trailerBegins-1) == '\r') trailerBegins--; - - if (!strncmp(trailerBegins, trailer, strlen(trailer))) - { - return ERROR_INVALID_DATA; - } - } - else + if (!(trailerBegins = strstr(dataBegins, trailer))) { - if (!(trailerBegins = strstr(dataBegins, trailer))) - { - return ERROR_INVALID_DATA; - } - if (*(trailerBegins-1) == '\n') trailerBegins--; - if (*(trailerBegins-1) == '\r') trailerBegins--; + return ERROR_INVALID_DATA; } + if (*(trailerBegins-1) == '\n') trailerBegins--; + if (*(trailerBegins-1) == '\r') trailerBegins--; if (pdwSkip) *pdwSkip = headerBegins - pszString; @@ -680,7 +657,7 @@ static LONG Base64HeaderToBinaryA(LPCSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryA(pszString, cchString, - pbBinary, pcbBinary, pdwSkip, FALSE); + pbBinary, pcbBinary, pdwSkip); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64HEADER; @@ -691,7 +668,7 @@ static LONG Base64RequestHeaderToBinaryA(LPCSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryA(pszString, cchString, - pbBinary, pcbBinary, pdwSkip, FALSE); + pbBinary, pcbBinary, pdwSkip); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64REQUESTHEADER; @@ -702,7 +679,7 @@ static LONG Base64X509HeaderToBinaryA(LPCSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryA(pszString, cchString, - pbBinary, pcbBinary, pdwSkip, FALSE); + pbBinary, pcbBinary, pdwSkip); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64X509CRLHEADER; @@ -838,7 +815,7 @@ static LONG Base64ToBinaryW(LPCWSTR pszString, DWORD cchString, static LONG Base64WithHeaderAndTrailerToBinaryW(LPCWSTR pszString, DWORD cchString, BYTE *pbBinary, - DWORD *pcbBinary, DWORD *pdwSkip, BOOL exactHeaderAndTrailerMatch) + DWORD *pcbBinary, DWORD *pdwSkip) { LONG ret; LPCWSTR header = CERT_HEADER_START_W; @@ -861,43 +838,20 @@ static LONG Base64WithHeaderAndTrailerToBinaryW(LPCWSTR pszString, } dataBegins = headerBegins + strlenW(header); - if (!exactHeaderAndTrailerMatch) + if (!(dataBegins = strstrW(dataBegins, CERT_DELIMITER_W))) { - if ((dataBegins = strstrW(dataBegins, CERT_DELIMITER_W))) - { - dataBegins += strlenW(CERT_DELIMITER_W); - } - else - { - return ERROR_INVALID_DATA; - } + return ERROR_INVALID_DATA; } + dataBegins += strlenW(CERT_DELIMITER_W); if (*dataBegins == '\r') dataBegins++; if (*dataBegins == '\n') dataBegins++; - if (exactHeaderAndTrailerMatch) - { - trailerBegins = pszString + cchString - strlenW(trailer); - if (pszString[cchString - 1] == '\n') trailerBegins--; - if (pszString[cchString - 2] == '\r') trailerBegins--; - - if (*(trailerBegins-1) == '\n') trailerBegins--; - if (*(trailerBegins-1) == '\r') trailerBegins--; - - if (!strncmpW(trailerBegins, trailer, strlenW(trailer))) - { - return ERROR_INVALID_DATA; - } - } - else + if (!(trailerBegins = strstrW(dataBegins, trailer))) { - if (!(trailerBegins = strstrW(dataBegins, trailer))) - { - return ERROR_INVALID_DATA; - } - if (*(trailerBegins-1) == '\n') trailerBegins--; - if (*(trailerBegins-1) == '\r') trailerBegins--; + return ERROR_INVALID_DATA; } + if (*(trailerBegins-1) == '\n') trailerBegins--; + if (*(trailerBegins-1) == '\r') trailerBegins--; if (pdwSkip) *pdwSkip = headerBegins - pszString; @@ -914,7 +868,7 @@ static LONG Base64HeaderToBinaryW(LPCWSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryW(pszString, cchString, - pbBinary, pcbBinary, pdwSkip, FALSE); + pbBinary, pcbBinary, pdwSkip); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64HEADER; @@ -925,7 +879,7 @@ static LONG Base64RequestHeaderToBinaryW(LPCWSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryW(pszString, cchString, - pbBinary, pcbBinary, pdwSkip, FALSE); + pbBinary, pcbBinary, pdwSkip); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64REQUESTHEADER; @@ -936,7 +890,7 @@ static LONG Base64X509HeaderToBinaryW(LPCWSTR pszString, DWORD cchString, BYTE *pbBinary, DWORD *pcbBinary, DWORD *pdwSkip, DWORD *pdwFlags) { LONG ret = Base64WithHeaderAndTrailerToBinaryW(pszString, cchString, - pbBinary, pcbBinary, pdwSkip, FALSE); + pbBinary, pcbBinary, pdwSkip); if (!ret && pdwFlags) *pdwFlags = CRYPT_STRING_BASE64X509CRLHEADER;

1 0

Alexandre Julliard : Release 2.2.
by Alexandre Julliard Feb. 17, 2017

Feb. 17, 2017

Module: wine Branch: master Commit: 9eb56e25e37b4adec0d72875455ffb787238672f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb56e25e37b4adec0d728754… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 17 21:35:09 2017 +0100 Release 2.2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1067 +++++++++++++++++++++++++++---------------------------------- AUTHORS | 7 + VERSION | 2 +- configure | 18 +- 4 files changed, 497 insertions(+), 597 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9eb56e25e37b4adec0d72…

1 0

Henri Verbeet : wined3d: Introduce a helper function to lookup a wined3d_light_info structure.
by Alexandre Julliard Feb. 17, 2017

Feb. 17, 2017

Module: wine Branch: master Commit: e947aa4b038e6282c7c7dc6e5950a7668c16a9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e947aa4b038e6282c7c7dc6e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 17 14:08:17 2017 +0100 wined3d: Introduce a helper function to lookup a wined3d_light_info structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 64 ++++++------------------------------------ dlls/wined3d/stateblock.c | 15 ++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 25 insertions(+), 56 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8192bf9..e68827c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1513,7 +1513,6 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, { UINT hash_idx = LIGHTMAP_HASHFUNC(light_idx); struct wined3d_light_info *object = NULL; - struct list *e; float rho; TRACE("device %p, light_idx %u, light %p.\n", device, light_idx, light); @@ -1547,15 +1546,7 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - LIST_FOR_EACH(e, &device->update_state->light_map[hash_idx]) - { - object = LIST_ENTRY(e, struct wined3d_light_info, entry); - if (object->OriginalIndex == light_idx) - break; - object = NULL; - } - - if (!object) + if (!(object = wined3d_state_get_light(device->update_state, light_idx))) { TRACE("Adding new light\n"); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); @@ -1670,21 +1661,11 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, HRESULT CDECL wined3d_device_get_light(const struct wined3d_device *device, UINT light_idx, struct wined3d_light *light) { - UINT hash_idx = LIGHTMAP_HASHFUNC(light_idx); - struct wined3d_light_info *light_info = NULL; - struct list *e; + struct wined3d_light_info *light_info; TRACE("device %p, light_idx %u, light %p.\n", device, light_idx, light); - LIST_FOR_EACH(e, &device->state.light_map[hash_idx]) - { - light_info = LIST_ENTRY(e, struct wined3d_light_info, entry); - if (light_info->OriginalIndex == light_idx) - break; - light_info = NULL; - } - - if (!light_info) + if (!(light_info = wined3d_state_get_light(&device->state, light_idx))) { TRACE("Light information requested but light not defined\n"); return WINED3DERR_INVALIDCALL; @@ -1696,36 +1677,17 @@ HRESULT CDECL wined3d_device_get_light(const struct wined3d_device *device, HRESULT CDECL wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable) { - UINT hash_idx = LIGHTMAP_HASHFUNC(light_idx); - struct wined3d_light_info *light_info = NULL; - struct list *e; + struct wined3d_light_info *light_info; TRACE("device %p, light_idx %u, enable %#x.\n", device, light_idx, enable); - LIST_FOR_EACH(e, &device->update_state->light_map[hash_idx]) - { - light_info = LIST_ENTRY(e, struct wined3d_light_info, entry); - if (light_info->OriginalIndex == light_idx) - break; - light_info = NULL; - } - TRACE("Found light %p.\n", light_info); - /* Special case - enabling an undefined light creates one with a strict set of parameters. */ - if (!light_info) + if (!(light_info = wined3d_state_get_light(device->update_state, light_idx))) { TRACE("Light enabled requested but light not defined, so defining one!\n"); wined3d_device_set_light(device, light_idx, &WINED3D_default_light); - /* Search for it again! Should be fairly quick as near head of list. */ - LIST_FOR_EACH(e, &device->update_state->light_map[hash_idx]) - { - light_info = LIST_ENTRY(e, struct wined3d_light_info, entry); - if (light_info->OriginalIndex == light_idx) - break; - light_info = NULL; - } - if (!light_info) + if (!(light_info = wined3d_state_get_light(device->update_state, light_idx))) { FIXME("Adding default lights has failed dismally\n"); return WINED3DERR_INVALIDCALL; @@ -1799,21 +1761,11 @@ HRESULT CDECL wined3d_device_set_light_enable(struct wined3d_device *device, UIN HRESULT CDECL wined3d_device_get_light_enable(const struct wined3d_device *device, UINT light_idx, BOOL *enable) { - UINT hash_idx = LIGHTMAP_HASHFUNC(light_idx); - struct wined3d_light_info *light_info = NULL; - struct list *e; + struct wined3d_light_info *light_info; TRACE("device %p, light_idx %u, enable %p.\n", device, light_idx, enable); - LIST_FOR_EACH(e, &device->state.light_map[hash_idx]) - { - light_info = LIST_ENTRY(e, struct wined3d_light_info, entry); - if (light_info->OriginalIndex == light_idx) - break; - light_info = NULL; - } - - if (!light_info) + if (!(light_info = wined3d_state_get_light(&device->state, light_idx))) { TRACE("Light enabled state requested but light not defined.\n"); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 7ab544d..70e31a2 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -560,6 +560,21 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) return refcount; } +struct wined3d_light_info *wined3d_state_get_light(const struct wined3d_state *state, unsigned int idx) +{ + struct wined3d_light_info *light_info; + unsigned int hash_idx; + + hash_idx = LIGHTMAP_HASHFUNC(idx); + LIST_FOR_EACH_ENTRY(light_info, &state->light_map[hash_idx], struct wined3d_light_info, entry) + { + if (light_info->OriginalIndex == idx) + return light_info; + } + + return NULL; +} + static void wined3d_state_record_lights(struct wined3d_state *dst_state, const struct wined3d_state *src_state) { UINT i; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 49fba06..585055c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3140,6 +3140,8 @@ struct wined3d_stateblock void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN; +struct wined3d_light_info *wined3d_state_get_light(const struct wined3d_state *state, + unsigned int idx) DECLSPEC_HIDDEN; void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN;

1 0