February 2017 - Wine-commits

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

17 Feb '17

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

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

17 Feb '17

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 17 Feb '17

17 Feb '17

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

Piotr Caban : msvcr120: Add _except1 implementation.
by Alexandre Julliard 17 Feb '17

17 Feb '17

Module: wine Branch: master Commit: 10200af74142c786ca8c7594bfc1fb3ad9cb0ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10200af74142c786ca8c7594b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 17 15:54:25 2017 +0100 msvcr120: Add _except1 implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 92 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 5 files changed, 96 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 8ff4c58..d5ade42 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -62,7 +62,7 @@ @ stub _dsin @ cdecl _dtest(ptr) ucrtbase._dtest @ stub _dunscale -@ stub _except1 +@ cdecl _except1(long long double double long ptr) ucrtbase._except1 @ stub _fd_int @ cdecl _fdclass(float) ucrtbase._fdclass @ stub _fdexp diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 62481c0..db2ae9c 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1124,7 +1124,7 @@ @ extern _environ MSVCRT__environ @ cdecl _eof(long) MSVCRT__eof @ cdecl _errno() MSVCRT__errno -@ stub _except1 +@ cdecl _except1(long long double double long ptr) @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) @ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index a74a140..849e135 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1060,7 +1060,7 @@ @ extern _environ msvcr120._environ @ cdecl _eof(long) msvcr120._eof @ cdecl _errno() msvcr120._errno -@ stub _except1 +@ cdecl _except1(long long double double long ptr) msvcr120._except1 @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) msvcr120._except_handler2 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) msvcr120._except_handler3 @ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) msvcr120._except_handler4_common diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 74685d4..857561b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2986,3 +2986,95 @@ float CDECL MSVCR120_nanf(const char *tagp) { return NAN; } + +/********************************************************************* + * _except1 (MSVCR120.@) + * TODO: + * - find meaning of ignored cw and operation bits + * - unk parameter + */ +double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res, DWORD cw, void *unk) +{ + ULONG_PTR exception_arg; + DWORD exception = 0; + MSVCRT_fenv_t env; + DWORD fpword = 0; + WORD operation; + + TRACE("(%x %x %lf %lf %x %p)\n", fpe, op, arg, res, cw, unk); + +#ifdef _WIN64 + cw = ((cw >> 7) & 0x3f) | ((cw >> 3) & 0xc00); +#endif + operation = op << 5; + exception_arg = (ULONG_PTR)&operation; + + MSVCRT_fegetenv(&env); + + if (fpe & 0x1) { /* overflow */ + if ((fpe == 0x1 && (cw & 0x8)) || (fpe==0x11 && (cw & 0x28))) { + /* 32-bit version also sets SW_INEXACT here */ + env.status |= MSVCRT__SW_OVERFLOW; + if (fpe & 0x10) env.status |= MSVCRT__SW_INEXACT; + res = signbit(res) ? -INFINITY : INFINITY; + } else { + exception = EXCEPTION_FLT_OVERFLOW; + } + } else if (fpe & 0x2) { /* underflow */ + if ((fpe == 0x2 && (cw & 0x10)) || (fpe==0x12 && (cw & 0x30))) { + env.status |= MSVCRT__SW_UNDERFLOW; + if (fpe & 0x10) env.status |= MSVCRT__SW_INEXACT; + res = signbit(res) ? -0.0 : 0.0; + } else { + exception = EXCEPTION_FLT_UNDERFLOW; + } + } else if (fpe & 0x4) { /* zerodivide */ + if ((fpe == 0x4 && (cw & 0x4)) || (fpe==0x14 && (cw & 0x24))) { + env.status |= MSVCRT__SW_ZERODIVIDE; + if (fpe & 0x10) env.status |= MSVCRT__SW_INEXACT; + } else { + exception = EXCEPTION_FLT_DIVIDE_BY_ZERO; + } + } else if (fpe & 0x8) { /* invalid */ + if (fpe == 0x8 && (cw & 0x1)) { + env.status |= MSVCRT__SW_INVALID; + } else { + exception = EXCEPTION_FLT_INVALID_OPERATION; + } + } else if (fpe & 0x10) { /* inexact */ + if (fpe == 0x10 && (cw & 0x20)) { + env.status |= MSVCRT__SW_INEXACT; + } else { + exception = EXCEPTION_FLT_INEXACT_RESULT; + } + } + + if (exception) + env.status = 0; + MSVCRT_fesetenv(&env); + if (exception) + RaiseException(exception, 0, 1, &exception_arg); + + if (cw & 0x1) fpword |= MSVCRT__EM_INVALID; + if (cw & 0x2) fpword |= MSVCRT__EM_DENORMAL; + if (cw & 0x4) fpword |= MSVCRT__EM_ZERODIVIDE; + if (cw & 0x8) fpword |= MSVCRT__EM_OVERFLOW; + if (cw & 0x10) fpword |= MSVCRT__EM_UNDERFLOW; + if (cw & 0x20) fpword |= MSVCRT__EM_INEXACT; + switch (cw & 0xc00) + { + case 0xc00: fpword |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; + case 0x800: fpword |= MSVCRT__RC_UP; break; + case 0x400: fpword |= MSVCRT__RC_DOWN; break; + } + switch (cw & 0x300) + { + case 0x0: fpword |= MSVCRT__PC_24; break; + case 0x200: fpword |= MSVCRT__PC_53; break; + case 0x300: fpword |= MSVCRT__PC_64; break; + } + if (cw & 0x1000) fpword |= MSVCRT__IC_AFFINE; + _control87(fpword, 0xffffffff); + + return res; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 7602698..5c97d8b 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -271,7 +271,7 @@ @ cdecl _endthreadex(long) @ cdecl _eof(long) MSVCRT__eof @ cdecl _errno() MSVCRT__errno -@ stub _except1 +@ cdecl _except1(long long double double long ptr) @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) @ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr)

1 0

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

17 Feb '17

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

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

17 Feb '17

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

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

17 Feb '17

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

Alexandre Julliard : Release 2.2.
by Alexandre Julliard 17 Feb '17

17 Feb '17

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

Tag wine-2.2 : Alexandre Julliard : Release 2.2
by Alexandre Julliard 17 Feb '17

17 Feb '17

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

Nikolay Sivov : regedit: Make it clear whether it is a key or a value that is about to be removed.
by Alexandre Julliard 17 Feb '17

17 Feb '17

Module: wine Branch: master Commit: 71a6eeb7326930a188cbb145eaaeccca51b1e820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a6eeb7326930a188cbb145e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 17 11:57:56 2017 +0000 regedit: Make it clear whether it is a key or a value that is about to be removed. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 161 ++++++++++++++++++++++++-------------------- po/bg.po | 161 ++++++++++++++++++++++++-------------------- po/ca.po | 161 ++++++++++++++++++++++++-------------------- po/cs.po | 161 ++++++++++++++++++++++++-------------------- po/da.po | 161 ++++++++++++++++++++++++-------------------- po/de.po | 161 ++++++++++++++++++++++++-------------------- po/el.po | 157 ++++++++++++++++++++++-------------------- po/en.po | 158 +++++++++++++++++++++++-------------------- po/en_US.po | 158 +++++++++++++++++++++++-------------------- po/eo.po | 161 ++++++++++++++++++++++++-------------------- po/es.po | 161 ++++++++++++++++++++++++-------------------- po/fa.po | 157 ++++++++++++++++++++++-------------------- po/fi.po | 161 ++++++++++++++++++++++++-------------------- po/fr.po | 161 ++++++++++++++++++++++++-------------------- po/he.po | 161 ++++++++++++++++++++++++-------------------- po/hi.po | 157 ++++++++++++++++++++++-------------------- po/hr.po | 161 ++++++++++++++++++++++++-------------------- po/hu.po | 161 ++++++++++++++++++++++++-------------------- po/it.po | 161 ++++++++++++++++++++++++-------------------- po/ja.po | 161 ++++++++++++++++++++++++-------------------- po/ko.po | 161 ++++++++++++++++++++++++-------------------- po/lt.po | 161 ++++++++++++++++++++++++-------------------- po/ml.po | 157 ++++++++++++++++++++++-------------------- po/nb_NO.po | 161 ++++++++++++++++++++++++-------------------- po/nl.po | 161 ++++++++++++++++++++++++-------------------- po/or.po | 157 ++++++++++++++++++++++-------------------- po/pa.po | 157 ++++++++++++++++++++++-------------------- po/pl.po | 161 ++++++++++++++++++++++++-------------------- po/pt_BR.po | 161 ++++++++++++++++++++++++-------------------- po/pt_PT.po | 161 ++++++++++++++++++++++++-------------------- po/rm.po | 158 +++++++++++++++++++++++-------------------- po/ro.po | 161 ++++++++++++++++++++++++-------------------- po/ru.po | 161 ++++++++++++++++++++++++-------------------- po/sk.po | 161 ++++++++++++++++++++++++-------------------- po/sl.po | 161 ++++++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 160 +++++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 160 +++++++++++++++++++++++-------------------- po/sv.po | 161 ++++++++++++++++++++++++-------------------- po/te.po | 157 ++++++++++++++++++++++-------------------- po/th.po | 158 +++++++++++++++++++++++-------------------- po/tr.po | 161 ++++++++++++++++++++++++-------------------- po/uk.po | 161 ++++++++++++++++++++++++-------------------- po/wa.po | 158 +++++++++++++++++++++++-------------------- po/wine.pot | 157 ++++++++++++++++++++++-------------------- po/zh_CN.po | 161 ++++++++++++++++++++++++-------------------- po/zh_TW.po | 161 ++++++++++++++++++++++++-------------------- programs/regedit/edit.c | 5 +- programs/regedit/framewnd.c | 4 +- programs/regedit/regedit.rc | 8 ++- programs/regedit/resource.h | 8 ++- 50 files changed, 3968 insertions(+), 3414 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71a6eeb7326930a188cbb…

1 0