August 2021 - Wine-Commits - list.winehq.org

Alex Henrie : include: Add remaining IPv6 socket options.
by Alexandre Julliard Aug. 6, 2021

Aug. 6, 2021

Module: wine Branch: master Commit: 8e1f149ecd7c6288979591b8602f478aa0da2c5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e1f149ecd7c6288979591b8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 5 23:26:26 2021 -0600 include: Add remaining IPv6 socket options. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2ipdef.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index 0938db2db9f..d5a4dab6ce0 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -207,6 +207,17 @@ typedef struct WS(in6_pktinfo) { #define IPV6_UNICAST_IF 31 #define IPV6_RTHDR 32 #define IPV6_RECVRTHDR 38 +#define IPV6_TCLASS 39 +#define IPV6_RECVTCLASS 40 +#define IPV6_ECN 50 +#define IPV6_PKTINFO_EX 51 +#define IPV6_WFP_REDIRECT_RECORDS 60 +#define IPV6_WFP_REDIRECT_CONTEXT 70 +#define IPV6_MTU_DISCOVER 71 +#define IPV6_MTU 72 +#define IPV6_NRT_INTERFACE 74 +#define IPV6_RECVERR 75 +#define IPV6_USER_MTU 76 #else #define WS_IPV6_OPTIONS 1 #define WS_IPV6_HDRINCL 2 @@ -231,6 +242,17 @@ typedef struct WS(in6_pktinfo) { #define WS_IPV6_UNICAST_IF 31 #define WS_IPV6_RTHDR 32 #define WS_IPV6_RECVRTHDR 38 +#define WS_IPV6_TCLASS 39 +#define WS_IPV6_RECVTCLASS 40 +#define WS_IPV6_ECN 50 +#define WS_IPV6_PKTINFO_EX 51 +#define WS_IPV6_WFP_REDIRECT_RECORDS 60 +#define WS_IPV6_WFP_REDIRECT_CONTEXT 70 +#define WS_IPV6_MTU_DISCOVER 71 +#define WS_IPV6_MTU 72 +#define WS_IPV6_NRT_INTERFACE 74 +#define WS_IPV6_RECVERR 75 +#define WS_IPV6_USER_MTU 76 #endif /* USE_WS_PREFIX */ #ifndef USE_WS_PREFIX

1 0

Nikolay Sivov : include: Add d3dx10 vector and matrix types.
by Alexandre Julliard Aug. 6, 2021

Aug. 6, 2021

Module: wine Branch: master Commit: 7ac3a7341ea9bf9d1440d9e6b652bcf3fdc999f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ac3a7341ea9bf9d1440d9e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 5 23:21:21 2021 +0200 include: Add d3dx10 vector and matrix types. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dx10math.h | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/include/d3dx10math.h b/include/d3dx10math.h index c8bcfd2ce4e..5790fbdf63b 100644 --- a/include/d3dx10math.h +++ b/include/d3dx10math.h @@ -24,6 +24,34 @@ #include <math.h> +#ifndef D3DVECTOR_DEFINED +#define D3DVECTOR_DEFINED +typedef struct _D3DVECTOR +{ + float x; + float y; + float z; +} D3DVECTOR; +#endif + +#ifndef D3DMATRIX_DEFINED +#define D3DMATRIX_DEFINED +typedef struct _D3DMATRIX +{ + union + { + struct + { + float _11, _12, _13, _14; + float _21, _22, _23, _24; + float _31, _32, _33, _34; + float _41, _42, _43, _44; + }; + float m[4][4]; + }; +} D3DMATRIX; +#endif + typedef enum _D3DX_CPU_OPTIMIZATION { D3DX_NOT_OPTIMIZED, @@ -82,6 +110,142 @@ public: float r, g, b, a; } D3DXCOLOR, *LPD3DXCOLOR; +typedef struct D3DXVECTOR2 +{ +#ifdef __cplusplus + D3DXVECTOR2() {}; + D3DXVECTOR2(const float *pf); + D3DXVECTOR2(float fx, float fy); + + operator float* (); + operator const float* () const; + + D3DXVECTOR2& operator += (const D3DXVECTOR2&); + D3DXVECTOR2& operator -= (const D3DXVECTOR2&); + D3DXVECTOR2& operator *= (float); + D3DXVECTOR2& operator /= (float); + + D3DXVECTOR2 operator + () const; + D3DXVECTOR2 operator - () const; + + D3DXVECTOR2 operator + (const D3DXVECTOR2&) const; + D3DXVECTOR2 operator - (const D3DXVECTOR2&) const; + D3DXVECTOR2 operator * (float) const; + D3DXVECTOR2 operator / (float) const; + + friend D3DXVECTOR2 operator * (float, const D3DXVECTOR2&); + + BOOL operator == (const D3DXVECTOR2&) const; + BOOL operator != (const D3DXVECTOR2&) const; +#endif /* __cplusplus */ + float x, y; +} D3DXVECTOR2, *LPD3DXVECTOR2; + +#ifdef __cplusplus +typedef struct D3DXVECTOR3 : public D3DVECTOR +{ + D3DXVECTOR3() {}; + D3DXVECTOR3(const float *pf); + D3DXVECTOR3(const D3DVECTOR& v); + D3DXVECTOR3(float fx, float fy, float fz); + + operator float* (); + operator const float* () const; + + D3DXVECTOR3& operator += (const D3DXVECTOR3&); + D3DXVECTOR3& operator -= (const D3DXVECTOR3&); + D3DXVECTOR3& operator *= (float); + D3DXVECTOR3& operator /= (float); + + D3DXVECTOR3 operator + () const; + D3DXVECTOR3 operator - () const; + + D3DXVECTOR3 operator + (const D3DXVECTOR3&) const; + D3DXVECTOR3 operator - (const D3DXVECTOR3&) const; + D3DXVECTOR3 operator * (float) const; + D3DXVECTOR3 operator / (float) const; + + friend D3DXVECTOR3 operator * (float, const struct D3DXVECTOR3&); + + BOOL operator == (const D3DXVECTOR3&) const; + BOOL operator != (const D3DXVECTOR3&) const; +} D3DXVECTOR3, *LPD3DXVECTOR3; +#else /* !__cplusplus */ +typedef struct _D3DVECTOR D3DXVECTOR3, *LPD3DXVECTOR3; +#endif /* !__cplusplus */ + +typedef struct D3DXVECTOR4 +{ +#ifdef __cplusplus + D3DXVECTOR4() {}; + D3DXVECTOR4(const float *pf); + D3DXVECTOR4(float fx, float fy, float fz, float fw); + + operator float* (); + operator const float* () const; + + D3DXVECTOR4& operator += (const D3DXVECTOR4&); + D3DXVECTOR4& operator -= (const D3DXVECTOR4&); + D3DXVECTOR4& operator *= (float); + D3DXVECTOR4& operator /= (float); + + D3DXVECTOR4 operator + () const; + D3DXVECTOR4 operator - () const; + + D3DXVECTOR4 operator + (const D3DXVECTOR4&) const; + D3DXVECTOR4 operator - (const D3DXVECTOR4&) const; + D3DXVECTOR4 operator * (float) const; + D3DXVECTOR4 operator / (float) const; + + friend D3DXVECTOR4 operator * (float, const D3DXVECTOR4&); + + BOOL operator == (const D3DXVECTOR4&) const; + BOOL operator != (const D3DXVECTOR4&) const; +#endif /* __cplusplus */ + float x, y, z, w; +} D3DXVECTOR4, *LPD3DXVECTOR4; + +#ifdef __cplusplus +typedef struct D3DXMATRIX : public D3DMATRIX +{ + D3DXMATRIX() {}; + D3DXMATRIX(const float *pf); + D3DXMATRIX(const D3DMATRIX& mat); + D3DXMATRIX(float f11, float f12, float f13, float f14, + float f21, float f22, float f23, float f24, + float f31, float f32, float f33, float f34, + float f41, float f42, float f43, float f44); + + float& operator () (UINT row, UINT col); + float operator () (UINT row, UINT col) const; + + operator float* (); + operator const float* () const; + + D3DXMATRIX& operator *= (const D3DXMATRIX&); + D3DXMATRIX& operator += (const D3DXMATRIX&); + D3DXMATRIX& operator -= (const D3DXMATRIX&); + D3DXMATRIX& operator *= (float); + D3DXMATRIX& operator /= (float); + + D3DXMATRIX operator + () const; + D3DXMATRIX operator - () const; + + D3DXMATRIX operator * (const D3DXMATRIX&) const; + D3DXMATRIX operator + (const D3DXMATRIX&) const; + D3DXMATRIX operator - (const D3DXMATRIX&) const; + D3DXMATRIX operator * (float) const; + D3DXMATRIX operator / (float) const; + + friend D3DXMATRIX operator * (float, const D3DXMATRIX&); + + BOOL operator == (const D3DXMATRIX&) const; + BOOL operator != (const D3DXMATRIX&) const; +} D3DXMATRIX, *LPD3DXMATRIX; +#else /* !__cplusplus */ +typedef struct _D3DMATRIX D3DXMATRIX, *LPD3DXMATRIX; +#endif /* !__cplusplus */ + #ifdef __cplusplus extern "C" { #endif

1 0

Francois Gouget : oleaut32: Fix VarParseNumFromStr()'s handling of currency thousands separators.
by Alexandre Julliard Aug. 6, 2021

Aug. 6, 2021

Module: wine Branch: master Commit: 9e4524ffb09be6bba828ea66b8fe1bb64b996b66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e4524ffb09be6bba828ea66… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 6 12:53:09 2021 +0200 oleaut32: Fix VarParseNumFromStr()'s handling of currency thousands separators. They are have no default, are not allowed before the first digit, are unaffected by the presence / absence of a currency symbol, can be mixed with regular digit separators, are incompatible with hexadecimal and octal numbers (as are regular digit separators), and mask trailing spaces. Also they don't match regular spaces when set to a non-breaking space. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 19 +++++-------------- dlls/oleaut32/variant.c | 36 +++++++++++++++++++++++++++++++----- 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index ecc8e8b0f11..fbcfba32c80 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1600,11 +1600,8 @@ static void test_VarParseNumFromStrEn(void) /* With flag, thousands sep. and following digits consumed */ CONVERT("&h1,000", NUMPRS_HEX_OCT|NUMPRS_THOUSANDS); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_HEX_OCT|NUMPRS_THOUSANDS,NUMPRS_HEX_OCT,3,4,0); - todo_wine ok(np.dwOutFlags == NUMPRS_HEX_OCT, "Got dwOutFlags=%08x\n", np.dwOutFlags); - EXPECTRGB(0,1); - todo_wine EXPECTRGB(1,FAILDIG); + EXPECTRGB(1,FAILDIG); /* With flag and decimal point, thousands sep. but not decimals consumed */ CONVERT("1,001.0", NUMPRS_THOUSANDS); @@ -2174,7 +2171,7 @@ static void test_VarParseNumFromStrMisc(void) SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHOUSANDSEP, L"~"); SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L""); hres = wconvert_str(L"1,000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECTFAIL; + EXPECTFAIL; SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L"~"); /* But SMONTHOUSANDSEP defaults to ','! */ @@ -2236,9 +2233,7 @@ static void test_VarParseNumFromStrMisc(void) EXPECTRGB(4,FAILDIG); hres = wconvert_str(L"1 000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,5,0,3); - todo_wine ok(np.dwOutFlags == (NUMPRS_THOUSANDS|NUMPRS_CURRENCY), "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); @@ -2249,15 +2244,13 @@ static void test_VarParseNumFromStrMisc(void) /* But trailing ones are allowed (same as sThousand) */ hres = wconvert_str(L"1 000 ", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,6,0,3); - todo_wine ok(np.dwOutFlags == (NUMPRS_THOUSANDS|NUMPRS_CURRENCY), "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); /* And they break NUMPRS_TRAILING_WHITE (same as sThousand) */ hres = wconvert_str(L"1000 ", ARRAY_SIZE(rgb), NUMPRS_TRAILING_WHITE|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECTFAIL; + EXPECTFAIL; /* NUMPRS_CURRENCY is not enough for sMonThousandSep */ @@ -2272,13 +2265,13 @@ static void test_VarParseNumFromStrMisc(void) */ SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, L"/"); hres = wconvert_str(L"$1|000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,6,0,3); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,6,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); /* Mixing both thousands separators is allowed */ hres = wconvert_str(L"1 000|000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,9,0,6); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,9,0,6); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(7,FAILDIG); @@ -2330,9 +2323,7 @@ static void test_VarParseNumFromStrMisc(void) EXPECTRGB(1,FAILDIG); hres = wconvert_str(L"1~", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,2,0,0); - todo_wine ok(np.dwOutFlags == (NUMPRS_THOUSANDS|NUMPRS_CURRENCY), "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECT2(1,FAILDIG); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 264b9f6594b..2ec07817460 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1510,7 +1510,7 @@ HRESULT WINAPI VarUdateFromDate(DATE dateIn, ULONG dwFlags, UDATE *lpUdate) /* Get the valid number characters for an lcid */ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID lcid, DWORD dwFlags) { - static const VARIANT_NUMBER_CHARS defaultChars = { '-','+','.',',','$',0,'.',',' }; + static const VARIANT_NUMBER_CHARS defaultChars = { '-','+','.',0,'$',0,'.',',' }; LCTYPE lctype = dwFlags & LOCALE_NOUSEROVERRIDE; WCHAR buff[4]; @@ -1633,6 +1633,11 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla { return DISP_E_TYPEMISMATCH; /* Not allowed before the first digit */ } + else if ((pNumprs->dwInFlags & (NUMPRS_THOUSANDS|NUMPRS_CURRENCY)) == (NUMPRS_THOUSANDS|NUMPRS_CURRENCY) && + chars.cCurrencyDigitSeparator && *lpszStr == chars.cCurrencyDigitSeparator) + { + return DISP_E_TYPEMISMATCH; /* Not allowed before the first digit */ + } else if (pNumprs->dwInFlags & NUMPRS_LEADING_PLUS && *lpszStr == chars.cPositiveSymbol && !(pNumprs->dwOutFlags & NUMPRS_LEADING_PLUS)) @@ -1659,8 +1664,6 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla lpszStr += chars.cCurrencyLocal2 ? 2 : 1; /* Only accept currency characters */ chars.cDecimalPoint = chars.cCurrencyDecimalPoint; - chars.cDigitSeparator = chars.cCurrencyDigitSeparator; - cDigitSeparator2 = chars.cDigitSeparator == 0xa0 ? ' ' : 0; } else if (pNumprs->dwInFlags & NUMPRS_PARENS && *lpszStr == '(' && !(pNumprs->dwOutFlags & NUMPRS_PARENS)) @@ -1677,7 +1680,6 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla { /* Only accept non-currency characters */ chars.cCurrencyDecimalPoint = chars.cDecimalPoint; - chars.cCurrencyDigitSeparator = chars.cDigitSeparator; } if ((*lpszStr == '&' && (*(lpszStr+1) == 'H' || *(lpszStr+1) == 'h')) && @@ -1769,12 +1771,20 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla } } else if (pNumprs->dwInFlags & NUMPRS_THOUSANDS && + !(pNumprs->dwOutFlags & NUMPRS_HEX_OCT) && ((chars.cDigitSeparator && *lpszStr == chars.cDigitSeparator) || (cDigitSeparator2 && *lpszStr == cDigitSeparator2))) { pNumprs->dwOutFlags |= NUMPRS_THOUSANDS; cchUsed++; } + else if ((pNumprs->dwInFlags & (NUMPRS_THOUSANDS|NUMPRS_CURRENCY)) == (NUMPRS_THOUSANDS|NUMPRS_CURRENCY) && + !(pNumprs->dwOutFlags & NUMPRS_HEX_OCT) && + chars.cCurrencyDigitSeparator && *lpszStr == chars.cCurrencyDigitSeparator) + { + pNumprs->dwOutFlags |= NUMPRS_THOUSANDS|NUMPRS_CURRENCY; + cchUsed++; + } else if (*lpszStr == chars.cDecimalPoint && pNumprs->dwInFlags & NUMPRS_DECIMAL && !(pNumprs->dwOutFlags & (NUMPRS_DECIMAL|NUMPRS_EXPONENT))) @@ -1901,7 +1911,8 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla if ((chars.cDigitSeparator && *lpszStr == chars.cDigitSeparator) || (cDigitSeparator2 && *lpszStr == cDigitSeparator2)) { - if (pNumprs->dwInFlags & NUMPRS_THOUSANDS) + if (pNumprs->dwInFlags & NUMPRS_THOUSANDS && + !(pNumprs->dwOutFlags & NUMPRS_HEX_OCT)) { pNumprs->dwOutFlags |= NUMPRS_THOUSANDS; cchUsed++; @@ -1913,6 +1924,21 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla break; } } + else if (*lpszStr == chars.cCurrencyDigitSeparator) + { + if ((pNumprs->dwInFlags & (NUMPRS_THOUSANDS|NUMPRS_CURRENCY)) == (NUMPRS_THOUSANDS|NUMPRS_CURRENCY) && + !(pNumprs->dwOutFlags & NUMPRS_HEX_OCT)) + { + pNumprs->dwOutFlags |= NUMPRS_THOUSANDS|NUMPRS_CURRENCY; + cchUsed++; + lpszStr++; + } + else + { + /* Not allowed, even with NUMPRS_TRAILING_WHITE */ + break; + } + } else if ((pNumprs->dwInFlags & NUMPRS_TRAILING_WHITE) && iswspace(*lpszStr)) { pNumprs->dwOutFlags |= NUMPRS_TRAILING_WHITE;

1 0

Dmitry Timoshkov : ole32/tests: Add more tests for CoIncrementMTAUsage/CoDecrementMTAUsage.
by Alexandre Julliard Aug. 6, 2021

Aug. 6, 2021

Module: wine Branch: master Commit: 251ab17af7d6162fed951afea417dd11b34d8a26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=251ab17af7d6162fed951afe… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 28 16:43:49 2021 +0300 ole32/tests: Add more tests for CoIncrementMTAUsage/CoDecrementMTAUsage. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index d1e947e393f..1d46a5b9c13 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -4098,6 +4098,25 @@ static void test_mta_usage(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE); + + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE); + + cookie = 0; + hr = pCoIncrementMTAUsage(&cookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(cookie != NULL, "Unexpected cookie %p.\n", cookie); + + test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE); + + hr = pCoDecrementMTAUsage(cookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + CoUninitialize(); + + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE); } static void test_CoCreateInstanceFromApp(void)

1 0

Zebediah Figura : ws2_32: Read protocols from the etc/protocol file.
by Alexandre Julliard Aug. 6, 2021

Aug. 6, 2021

Module: wine Branch: master Commit: 8504e40d5b5e7076b998b36e6291515b863482cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8504e40d5b5e7076b998b36e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 4 21:20:45 2021 -0500 ws2_32: Read protocols from the etc/protocol file. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/Makefile.in | 2 +- dlls/ws2_32/protocol.c | 262 ++++++++++++++++++++++++++++++++++++------------ 2 files changed, 198 insertions(+), 66 deletions(-) diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in index 77983bba66f..691c8fe1d65 100644 --- a/dlls/ws2_32/Makefile.in +++ b/dlls/ws2_32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -DUSE_WS_PREFIX MODULE = ws2_32.dll IMPORTLIB = ws2_32 -DELAYIMPORTS = iphlpapi user32 +DELAYIMPORTS = advapi32 iphlpapi user32 EXTRALIBS = $(POLL_LIBS) C_SRCS = \ diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 8b39d5c3274..c1789fb4c77 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -981,33 +981,64 @@ static int list_dup( char **src, char **dst, int item_size ) return p - (char *)dst; } -static const struct -{ - int prot; - const char *names[3]; -} -protocols[] = -{ - { 0, {"ip", "IP"}}, - { 1, {"icmp", "ICMP"}}, - { 3, {"ggp", "GGP"}}, - { 6, {"tcp", "TCP"}}, - { 8, {"egp", "EGP"}}, - {12, {"pup", "PUP"}}, - {17, {"udp", "UDP"}}, - {20, {"hmp", "HMP"}}, - {22, {"xns-idp", "XNS-IDP"}}, - {27, {"rdp", "RDP"}}, - {41, {"ipv6", "IPv6"}}, - {43, {"ipv6-route", "IPv6-Route"}}, - {44, {"ipv6-frag", "IPv6-Frag"}}, - {50, {"esp", "ESP"}}, - {51, {"ah", "AH"}}, - {58, {"ipv6-icmp", "IPv6-ICMP"}}, - {59, {"ipv6-nonxt", "IPv6-NoNxt"}}, - {60, {"ipv6-opts", "IPv6-Opts"}}, - {66, {"rvd", "RVD"}}, -}; + +static char *read_etc_file( const WCHAR *filename, DWORD *ret_size ) +{ + static const WCHAR key_pathW[] = {'S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','S','e','r','v','i','c','e','s', + '\\','t','c','p','i','p', + '\\','P','a','r','a','m','e','t','e','r','s',0}; + static const WCHAR databasepathW[] = {'D','a','t','a','b','a','s','e','P','a','t','h',0}; + static const WCHAR backslashW[] = {'\\',0}; + WCHAR path[MAX_PATH]; + DWORD size = sizeof(path); + HANDLE file; + char *data; + LONG ret; + + if ((ret = RegGetValueW( HKEY_LOCAL_MACHINE, key_pathW, databasepathW, RRF_RT_REG_SZ, NULL, path, &size ))) + { + ERR( "failed to get database path, error %u\n", ret ); + return NULL; + } + lstrcatW( path, backslashW ); + lstrcatW( path, filename ); + + file = CreateFileW( path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ); + if (file == INVALID_HANDLE_VALUE) + { + ERR( "failed to open %s, error %u\n", debugstr_w( path ), GetLastError() ); + return NULL; + } + + size = GetFileSize( file, NULL ); + if (!(data = HeapAlloc( GetProcessHeap(), 0, size )) || + !ReadFile( file, data, size, ret_size, NULL )) + { + WARN( "failed to read file, error %u\n", GetLastError() ); + HeapFree( GetProcessHeap(), 0, data ); + data = NULL; + } + CloseHandle( file ); + return data; +} + +/* returns "end" if there was no space */ +static char *next_space( const char *p, const char *end ) +{ + while (p < end && !isspace( *p )) + ++p; + return (char *)p; +} + +/* returns "end" if there was no non-space */ +static char *next_non_space( const char *p, const char *end ) +{ + while (p < end && isspace( *p )) + ++p; + return (char *)p; +} static struct WS_protoent *get_protoent_buffer( unsigned int size ) { @@ -1024,18 +1055,111 @@ static struct WS_protoent *get_protoent_buffer( unsigned int size ) return data->pe_buffer; } -static struct WS_protoent *create_protoent( const char *name, char **aliases, int prot ) +/* Parse the first valid line into a protoent structure, returning NULL if + * there is no valid line. Updates cursor to point to the start of the next + * line or the end of the file. */ +static struct WS_protoent *get_next_protocol( const char **cursor, const char *end ) { - struct WS_protoent *ret; - unsigned int size = sizeof(*ret) + strlen( name ) + sizeof(char *) + list_size( aliases, 0 ); + const char *p = *cursor; - if (!(ret = get_protoent_buffer( size ))) return NULL; - ret->p_proto = prot; - ret->p_name = (char *)(ret + 1); - strcpy( ret->p_name, name ); - ret->p_aliases = (char **)ret->p_name + strlen( name ) / sizeof(char *) + 1; - list_dup( aliases, ret->p_aliases, 0 ); - return ret; + while (p < end) + { + const char *line_end, *next_line; + size_t needed_size, line_len; + unsigned int alias_count = 0; + struct WS_protoent *proto; + const char *name; + int number; + char *q; + + for (line_end = p; line_end < end && *line_end != '\n' && *line_end != '#'; ++line_end) + ; + TRACE( "parsing line %s\n", debugstr_an(p, line_end - p) ); + + for (next_line = line_end; next_line < end && *next_line != '\n'; ++next_line) + ; + if (next_line < end) + ++next_line; /* skip over the newline */ + + p = next_non_space( p, line_end ); + if (p == line_end) + { + p = next_line; + continue; + } + + /* parse the name */ + + name = p; + line_len = line_end - name; + + p = next_space( p, line_end ); + if (p == line_end) + { + p = next_line; + continue; + } + + p = next_non_space( p, line_end ); + + /* parse the number */ + + number = atoi( p ); + + p = next_space( p, line_end ); + p = next_non_space( p, line_end ); + + /* we will copy the entire line after the protoent structure, then + * replace spaces with null bytes as necessary */ + + while (p < line_end) + { + ++alias_count; + + p = next_space( p, line_end ); + p = next_non_space( p, line_end ); + } + needed_size = sizeof(*proto) + line_len + 1 + (alias_count + 1) * sizeof(char *); + + if (!(proto = get_protoent_buffer( needed_size ))) + { + SetLastError( WSAENOBUFS ); + return NULL; + } + + proto->p_proto = number; + proto->p_aliases = (char **)(proto + 1); + proto->p_name = (char *)(proto->p_aliases + alias_count + 1); + + memcpy( proto->p_name, name, line_len ); + proto->p_name[line_len] = 0; + + line_end = proto->p_name + line_len; + + q = proto->p_name; + q = next_space( q, line_end ); + *q++ = 0; + q = next_non_space( q, line_end ); + /* skip over the number */ + q = next_space( q, line_end ); + q = next_non_space( q, line_end ); + + alias_count = 0; + while (q < line_end) + { + proto->p_aliases[alias_count++] = q; + q = next_space( q, line_end ); + if (q < line_end) *q++ = 0; + q = next_non_space( q, line_end ); + } + proto->p_aliases[alias_count] = NULL; + + *cursor = next_line; + return proto; + } + + SetLastError( WSANO_DATA ); + return NULL; } @@ -1044,25 +1168,29 @@ static struct WS_protoent *create_protoent( const char *name, char **aliases, in */ struct WS_protoent * WINAPI WS_getprotobyname( const char *name ) { - struct WS_protoent *retval = NULL; - unsigned int i; + static const WCHAR protocolW[] = {'p','r','o','t','o','c','o','l',0}; + struct WS_protoent *proto; + const char *cursor; + char *file; + DWORD size; - for (i = 0; i < ARRAY_SIZE(protocols); i++) + TRACE( "%s\n", debugstr_a(name) ); + + if (!(file = read_etc_file( protocolW, &size ))) { - if (!_strnicmp( protocols[i].names[0], name, -1 )) - { - retval = create_protoent( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); - break; - } + SetLastError( WSANO_DATA ); + return NULL; } - if (!retval) + + cursor = file; + while ((proto = get_next_protocol( &cursor, file + size ))) { - WARN( "protocol %s not found\n", debugstr_a(name) ); - SetLastError( WSANO_DATA ); + if (!strcasecmp( proto->p_name, name )) + break; } - TRACE( "%s ret %p\n", debugstr_a(name), retval ); - return retval; + + HeapFree( GetProcessHeap(), 0, file ); + return proto; } @@ -1071,25 +1199,29 @@ struct WS_protoent * WINAPI WS_getprotobyname( const char *name ) */ struct WS_protoent * WINAPI WS_getprotobynumber( int number ) { - struct WS_protoent *retval = NULL; - unsigned int i; + static const WCHAR protocolW[] = {'p','r','o','t','o','c','o','l',0}; + struct WS_protoent *proto; + const char *cursor; + char *file; + DWORD size; + + TRACE( "%d\n", number ); - for (i = 0; i < ARRAY_SIZE(protocols); i++) + if (!(file = read_etc_file( protocolW, &size ))) { - if (protocols[i].prot == number) - { - retval = create_protoent( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); - break; - } + SetLastError( WSANO_DATA ); + return NULL; } - if (!retval) + + cursor = file; + while ((proto = get_next_protocol( &cursor, file + size ))) { - WARN( "protocol %d not found\n", number ); - SetLastError( WSANO_DATA ); + if (proto->p_proto == number) + break; } - TRACE( "%d ret %p\n", number, retval ); - return retval; + + HeapFree( GetProcessHeap(), 0, file ); + return proto; }

1 0

Francois Gouget : ws2_32: Add a trailing linefeed to a FIXME().
by Alexandre Julliard Aug. 6, 2021

Aug. 6, 2021

Module: wine Branch: master Commit: c909e69fe4e5465273b9d91ea046dfb208eeb15a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c909e69fe4e5465273b9d91e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 6 12:52:39 2021 +0200 ws2_32: Add a trailing linefeed to a FIXME(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/unixlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 21a6e4b27c2..eb5b3daf401 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -383,7 +383,7 @@ static unsigned int errno_from_unix( int err ) case EREMOTE: return WSAEREMOTE; #endif default: - FIXME( "unknown error: %s", strerror( err ) ); + FIXME( "unknown error: %s\n", strerror( err ) ); return WSAEFAULT; } }

1 0

Francois Gouget : winetest/build-patterns: Allow hiding groups of reports on the patterns pages.
by Alexandre Julliard Aug. 6, 2021

Aug. 6, 2021

Module: tools Branch: master Commit: 6af0cf682379549a8c5db45eb7585f91950d0054 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6af0cf682379549a8c5db45… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 6 13:09:46 2021 +0200 winetest/build-patterns: Allow hiding groups of reports on the patterns pages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 22 +++++++++++++++++++--- winetest/patterns.js | 26 +++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index fc6f7ed..a1691db 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1465,8 +1465,22 @@ EOF if (!$nolist) { my @table = ("<details><summary>Page cutomization</summary> -<div class='detailsbox'><p>Uncheck the reports you do not want to see on this page.</p> -<table width='100%'>"); +<div class='detailsbox'><p>This section lets you select the reports to show on this page.</p><p>"); + if (!$subpage or $subpage eq "-tb-win") + { + push @table, "<label><input id='tbwin' class='groupcb' type='checkbox' checked> Show the TestBot Windows reports</label><br>"; + } + if (!$subpage or $subpage eq "-tb-wine") + { + push @table, "<label><input id='tbwine' class='groupcb' type='checkbox' checked> Show the Testbot Wine reports</label><br>"; + } + if (!$subpage) + { + push @table, "<label><input id='win' class='groupcb' type='checkbox' checked> Show the other Windows reports</label><br> +<label><input id='wine' class='groupcb' type='checkbox' checked> Show the other Wine reports</label>"; + } + push @table, "</p><p>Use the table below to hide specific reports.</p><table width='100%'>"; + my @reportmap; for (my $i = 0; $i < @sortedreports; $i++) { @@ -1482,7 +1496,9 @@ EOF my $reportindex = $reportmap[$i + $c]; last if (!defined $reportindex); my $reportdir = $sortedreports[$reportindex] || ""; - push @table, "<td><label><input class='reportcb' type='checkbox' id='$reportdir' checked> $reportdir</label></td>"; + my $report = $reports{$reportdir}; + my $group = " data-group='". ($report->{tag} =~ /^newtb-/ ? "tb" : "") . ($report->{is_wine} ? "wine" : "win") ."'"; + push @table, "<td><label><input class='reportcb'$group type='checkbox' id='$reportdir' checked> $reportdir</label></td>"; } push @table, "</tr>"; } diff --git a/winetest/patterns.js b/winetest/patterns.js index a70df07..80ac4b8 100644 --- a/winetest/patterns.js +++ b/winetest/patterns.js @@ -50,6 +50,24 @@ function refreshPage(changes) } } +function toggledGroupCB(e) +{ + const group = e.target.id; + const checked = e.target.checked; + + const changes = {}; + for (let key in cbs) + { + const cb = cbs[key]; + if (cb.group == group) + { + cb.dom.checked = checked; + changes[key] = checked; + } + } + refreshPage(changes); +} + function toggledReportCB(e) { const cb = e.target; @@ -60,11 +78,17 @@ function toggledReportCB(e) function init() { + document.querySelectorAll("input.groupcb").forEach(domcb => { + domcb.addEventListener('click', toggledGroupCB); + }); + const changes = {}; cbs = {}; document.querySelectorAll("input.reportcb").forEach(domcb => { - cbs[domcb.id] = { checked: true, /* all reports are shown by default */ + cbs[domcb.id] = { dom: domcb, + checked: true, /* all reports are shown by default */ display: domcb.style.display, + group: domcb.getAttribute("data-group"), patlines: [] }; changes[domcb.id] = domcb.checked;

1 0

Francois Gouget : winetest/build-patterns: Allow hiding some reports on the patterns page.
by Alexandre Julliard Aug. 6, 2021

Aug. 6, 2021

Module: tools Branch: master Commit: c129867cc86bfcd63567456e8a459b07531021ef URL: https://source.winehq.org/git/tools.git/?a=commit;h=c129867cc86bfcd63567456… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 6 13:09:43 2021 +0200 winetest/build-patterns: Allow hiding some reports on the patterns page. This allows zooming on the results of a specific machine or test configuration. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 31 ++++++++++++++- winetest/patterns.js | 100 ++++++++++++++++++++++++++++++++++++++++++++++++ winetest/report.css | 6 +++ 3 files changed, 135 insertions(+), 2 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index d530ad2..fc6f7ed 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -20,6 +20,7 @@ use strict; use warnings; use open ':utf8'; use CGI qw(:standard); +use POSIX; # ceil() use Text::CSV::Encoded; use Time::Piece; @@ -980,7 +981,7 @@ sub write_pattern_line($$$) my ($html, $test, $reportdir) = @_; my $testreport = $test->{testreports}->{$reportdir}; - print $html "<div class='pattern'>"; + print $html "<div class='patline' data-id='$reportdir'><div class='pattern'>"; my $has_newmode; my ($range_symbol, $range_count) = ("", 0); @@ -1086,7 +1087,7 @@ sub write_pattern_line($$$) } my $label = $reportdir; $label = "<b>$label</b>" if ($has_newmode); - print $html "</div> $label\n"; + print $html "</div> $label\n</div>"; } sub index2symbol($) @@ -1288,6 +1289,7 @@ sub write_patterns_page($$$) <head> <title>$title</title> <link rel="stylesheet" href="/report.css" type="text/css"> + <script type="text/javascript" defer="true" src="/patterns.js"></script> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body> @@ -1462,6 +1464,31 @@ EOF $tests{0}->{desc} .= "</ul>"; if (!$nolist) { + my @table = ("<details><summary>Page cutomization</summary> +<div class='detailsbox'><p>Uncheck the reports you do not want to see on this page.</p> +<table width='100%'>"); + my @reportmap; + for (my $i = 0; $i < @sortedreports; $i++) + { + my $reportdir = $sortedreports[$i]; + push @reportmap, $i if ($pagereports->{$reportdir}); + } + my $count = @reportmap; + for (my $i = 0; $i < ceil($count/4); $i++) + { + push @table, "<tr>"; + for (my $c = 0; $c < $count; $c += ceil($count/4)) + { + my $reportindex = $reportmap[$i + $c]; + last if (!defined $reportindex); + my $reportdir = $sortedreports[$reportindex] || ""; + push @table, "<td><label><input class='reportcb' type='checkbox' id='$reportdir' checked> $reportdir</label></td>"; + } + push @table, "</tr>"; + } + push @table, "</div></table></details>"; + $tests{0}->{desc} .= join("", @table); + $tests{0}->{desc} .= "<p>Unlike the other patterns on this page, the one below shows the number of failed test units for each configuration.</p>"; } diff --git a/winetest/patterns.js b/winetest/patterns.js new file mode 100644 index 0000000..a70df07 --- /dev/null +++ b/winetest/patterns.js @@ -0,0 +1,100 @@ +/* Hide / show reports on the patterns page + * + * Copyright 2021 Francois Gouget + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +"use strict"; + +var cbs; + +function refreshPage(changes) +{ + for (let key in changes) + { + const cb = cbs[key]; + if (cb.checked == changes[key]) continue; + + if (changes[key]) + { + cb.patlines.forEach(patline => { + patline.dom.style.display = patline.display; + const test = patline.test; + if (++test.linecount == 1 && test.id != "summary") + test.dom.style.display = test.display; + }); + } + else + { + cb.patlines.forEach(patline => { + patline.dom.style.display = "none"; + const test = patline.test; + if (--test.linecount == 0 && test.id != "summary") + test.dom.style.display = "none"; + }); + } + + cb.checked = changes[key]; + } +} + +function toggledReportCB(e) +{ + const cb = e.target; + const changes = {}; + changes[cb.id] = cb.checked; + refreshPage(changes); +} + +function init() +{ + const changes = {}; + cbs = {}; + document.querySelectorAll("input.reportcb").forEach(domcb => { + cbs[domcb.id] = { checked: true, /* all reports are shown by default */ + display: domcb.style.display, + patlines: [] + }; + changes[domcb.id] = domcb.checked; + domcb.addEventListener('click', toggledReportCB); + }); + + document.querySelectorAll("div.testfile").forEach(domtest => { + const test = { id: domtest.id, + dom: domtest, + display: domtest.style.display, + linecount: 0 + }; + + domtest.querySelectorAll("div.patline").forEach(domline => { + const cb = cbs[domline.getAttribute("data-id")]; + if (cb) + { + cb.patlines.push({ dom: domline, + display: domline.style.display, + test: test + }); + if (cb.checked) test.linecount++; + } + }); + }); + + /* When reloading a page the browser may preserve the checkbox state + * so reapply them to the rest of the page. + */ + refreshPage(changes); +} + +window.addEventListener('load', init); diff --git a/winetest/report.css b/winetest/report.css index 4594c5d..f193bc3 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -70,6 +70,12 @@ table.output td { float: right; } +.detailsbox { + margin: 5px 1em 0 1em; + padding: 0 5px 5px; + border: 1px solid #601919; +} + .pattern { display: inline-block; font-family: monospace;

1 0

Zebediah Figura : vkd3d-shader: Move SM4 byte code definitions to a separate header.
by Alexandre Julliard Aug. 6, 2021

Aug. 6, 2021

Module: vkd3d Branch: master Commit: 688cdb218e2721b89c7ad9314b8400d92fbaea94 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=688cdb218e2721b89c7ad93… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 4 21:21:07 2021 -0500 vkd3d-shader: Move SM4 byte code definitions to a separate header. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + libs/vkd3d-shader/dxbc.c | 460 +---------------------------- libs/vkd3d-shader/sm4.h | 488 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 13 - 4 files changed, 490 insertions(+), 472 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=688cdb218e2721b89c7…

1 0

Chip Davis : configure: Also extract the cross target from Clang compilers.
by Alexandre Julliard Aug. 6, 2021

Aug. 6, 2021

Module: vkd3d Branch: master Commit: 73bc52c273bc92f4b86dd85823380aa75c68c05f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=73bc52c273bc92f4b86dd85… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Aug 4 14:19:08 2021 -0500 configure: Also extract the cross target from Clang compilers. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- m4/check-mingw-prog.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/check-mingw-prog.m4 b/m4/check-mingw-prog.m4 index ac3e07d..94fe795 100644 --- a/m4/check-mingw-prog.m4 +++ b/m4/check-mingw-prog.m4 @@ -15,7 +15,7 @@ AS_VAR_IF([vkd3d_cross_cc], [$3], AC_MSG_CHECKING([whether $CC works]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]) - $2=`expr "$CC" : '$.*$-gcc'`], + $2=`expr "$CC" : '$.*$-gcc' \| "$CC" : '$.*$-clang'`], [AC_MSG_RESULT([no])]) CC="$vkd3d_cc_saved"]) AS_VAR_POPDEF([vkd3d_cross_cc])dnl @@ -34,7 +34,7 @@ AS_VAR_IF([vkd3d_cross_cc], [$3], AC_MSG_CHECKING([whether $CC works]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]) - $2=`expr "$CC" : '$.*$-gcc'`], + $2=`expr "$CC" : '$.*$-gcc' \| "$CC" : '$.*$-clang'`], [AC_MSG_RESULT([no])]) CC="$vkd3d_cc_saved"]) AS_VAR_POPDEF([vkd3d_cross_cc])dnl

1 0