July 2021 - Wine-Devel - list.winehq.org

[PATCH 1/9] gdi32: Use get_dc_attr in SetTextAlign.
by Jacek Caban July 27, 2021

July 27, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 24 ----------------- dlls/gdi32/enhmfdrv/dc.c | 4 +-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 19 +++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 +-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/tests/metafile.c | 40 ++++++++++++++++++++++++++++ 10 files changed, 67 insertions(+), 32 deletions(-)

2 1

[PATCH vkd3d 1/2] vkd3d-shader: Emit negation modifier for double-precision float registers.
by Conor McCarthy July 27, 2021

July 27, 2021

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 33e664cf..511f0c34 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3393,7 +3393,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_neg(struct vkd3d_dxbc_compiler *compile uint32_t type_id; type_id = vkd3d_dxbc_compiler_get_type_id_for_reg(compiler, reg, write_mask); - if (reg->data_type == VKD3D_DATA_FLOAT) + if (reg->data_type == VKD3D_DATA_FLOAT || reg->data_type == VKD3D_DATA_DOUBLE) return vkd3d_spirv_build_op_fnegate(builder, type_id, val_id); else if (reg->data_type == VKD3D_DATA_INT) return vkd3d_spirv_build_op_snegate(builder, type_id, val_id); -- 2.32.0

3 5

[PATCH] secur32: Ignore attribute when searching for buffer type
by Julien Loir July 27, 2021

July 27, 2021

Buffer types in PSecBufferDesc can have an optional attribute. When searching, it must be ignored to ensure the buffer type is found. Signed-off-by: Julien Loir <mini.jul.jl(a)gmail.com> --- Example of initialization usage that fails without this patch: https://github.com/matoya/libmatoya/blob/master/src/windows/tlsw.c#L275 --- dlls/secur32/schannel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 515f01d08a3..eb8106e88c7 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -659,7 +659,8 @@ static int schan_find_sec_buffer_idx(const SecBufferDesc *desc, unsigned int sta for (i = start_idx; i < desc->cBuffers; ++i) { buffer = &desc->pBuffers[i]; - if (buffer->BufferType == buffer_type) return i; + if ((buffer->BufferType | SECBUFFER_ATTRMASK) == (buffer_type | SECBUFFER_ATTRMASK)) + return i; } return -1; -- 2.32.0

2 1

[PATCH 1/4] ws2_32: Move the setsockopt(IP_TTL) implementation to ntdll.
by Zebediah Figura July 27, 2021

July 27, 2021

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 4 +++- include/wine/afd.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 3ea722a48ec..9b7e0d47040 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1784,6 +1784,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_GET_IP_TTL: return do_getsockopt( handle, io, IPPROTO_IP, IP_TTL, out_buffer, out_size ); + case IOCTL_AFD_WINE_SET_IP_TTL: + return do_setsockopt( handle, io, IPPROTO_IP, IP_TTL, in_buffer, in_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7fb48698d2a..c86ddee7932 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3711,6 +3711,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IP_TOS: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_TOS, optval, optlen ); + case WS_IP_TTL: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_TTL, optval, optlen ); + case WS_IP_UNBLOCK_SOURCE: { WS_IP_MREQ_SOURCE* val = (void*)optval; @@ -3724,7 +3727,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, convert_sockopt(&level, &optname); break; } - case WS_IP_TTL: #ifdef IP_UNICAST_IF case WS_IP_UNICAST_IF: #endif diff --git a/include/wine/afd.h b/include/wine/afd.h index 9e1802d5833..f0b1e8d6e5f 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -203,6 +203,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IP_TOS WINE_AFD_IOC(258) #define IOCTL_AFD_WINE_SET_IP_TOS WINE_AFD_IOC(259) #define IOCTL_AFD_WINE_GET_IP_TTL WINE_AFD_IOC(260) +#define IOCTL_AFD_WINE_SET_IP_TTL WINE_AFD_IOC(261) struct afd_create_params { -- 2.30.2

2 5

[PATCH] oleaut32/tests: Add more VarParseNumFromStr() hexadecimal/octal tests.
by Francois Gouget July 26, 2021

July 26, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 49 ++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 73bcdb8a260..bed4de469df 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1495,7 +1495,7 @@ static void test_VarParseNumFromStrEn(void) EXPECTFAIL; EXPECTRGB(0,FAILDIG); - /* Octal */ + /* A leading 0 does not an octal number make */ CONVERT("0100", NUMPRS_HEX_OCT); EXPECT(1,NUMPRS_HEX_OCT,0,4,0,2); EXPECTRGB(0,1); @@ -1546,6 +1546,20 @@ static void test_VarParseNumFromStrEn(void) EXPECTRGB(1,2); EXPECTRGB(3,FAILDIG); + /* Only integers are allowed when using an alternative radix */ + CONVERT("&ha.2", NUMPRS_HEX_OCT|NUMPRS_DECIMAL); + if (broken(1)) /* FIXME Reenable once Wine is less broken */ + EXPECT(1,NUMPRS_HEX_OCT|NUMPRS_DECIMAL,NUMPRS_HEX_OCT,3,4,0); + todo_wine ok(np.dwOutFlags == NUMPRS_HEX_OCT, "Got dwOutFlags=%08x\n", np.dwOutFlags); + EXPECTRGB(0,10); + todo_wine EXPECTRGB(1,FAILDIG); + + /* Except if it looks like a plain decimal number */ + CONVERT("01.2", NUMPRS_HEX_OCT|NUMPRS_DECIMAL); + EXPECT(2,NUMPRS_HEX_OCT|NUMPRS_DECIMAL,NUMPRS_DECIMAL,4,0,-1); + EXPECT2(1,2); + EXPECTRGB(3,FAILDIG); + /** NUMPRS_PARENS **/ /* Empty parens = error */ @@ -1584,6 +1598,14 @@ static void test_VarParseNumFromStrEn(void) */ EXPECTRGB(4,FAILDIG); + /* 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); + /* With flag and decimal point, thousands sep. but not decimals consumed */ CONVERT("1,001.0", NUMPRS_THOUSANDS); EXPECT(4,NUMPRS_THOUSANDS,NUMPRS_THOUSANDS,5,0,0); @@ -1636,6 +1658,17 @@ static void test_VarParseNumFromStrEn(void) EXPECT2(1,1); EXPECTRGB(2,FAILDIG); + /* With flag, currency amounts cannot be in hexadecimal */ + CONVERT("$&ha", NUMPRS_HEX_OCT|NUMPRS_CURRENCY); + todo_wine EXPECTFAIL; + + CONVERT("&ha$", NUMPRS_HEX_OCT|NUMPRS_CURRENCY); + if (broken(1)) /* FIXME Reenable once Wine is less broken */ + EXPECT(1,NUMPRS_HEX_OCT|NUMPRS_CURRENCY,NUMPRS_HEX_OCT,3,4,0); + todo_wine ok(np.dwOutFlags == NUMPRS_HEX_OCT, "Got dwOutFlags=%08x\n", np.dwOutFlags); + EXPECTRGB(0,10); + EXPECTRGB(1,FAILDIG); + /* With flag, the sign cannot be repeated before the amount */ CONVERT("$$11", NUMPRS_CURRENCY); EXPECTFAIL; @@ -1768,6 +1801,20 @@ static void test_VarParseNumFromStrEn(void) EXPECT(1,NUMPRS_EXPONENT,NUMPRS_EXPONENT,3,0,1); EXPECT2(1,FAILDIG); + /* With flag, incompatible with NUMPRS_HEX_OCT */ + CONVERT("&o1e1", NUMPRS_HEX_OCT|NUMPRS_EXPONENT); + if (broken(1)) /* FIXME Reenable once Wine is less broken */ + EXPECT(1,NUMPRS_HEX_OCT|NUMPRS_EXPONENT,NUMPRS_HEX_OCT,3,3,0); + todo_wine ok(np.dwOutFlags == NUMPRS_HEX_OCT, "Got dwOutFlags=%08x\n", np.dwOutFlags); + EXPECT2(1,FAILDIG); + + /* With flag, even if it sort of looks like an exponent */ + CONVERT("&h1e2", NUMPRS_HEX_OCT|NUMPRS_EXPONENT); + EXPECT(3,NUMPRS_HEX_OCT|NUMPRS_EXPONENT,NUMPRS_HEX_OCT,5,4,0); + EXPECT2(1,0xe); + EXPECTRGB(2,2); + EXPECTRGB(3,FAILDIG); + /* Negative exponents are accepted without flags */ CONVERT("1e-1", NUMPRS_EXPONENT); EXPECT(1,NUMPRS_EXPONENT,NUMPRS_EXPONENT,4,0,-1); -- 2.20.1

1 0

[PATCH] oleaut32/tests: Test VarParseNumFromStr()'s handling of LOCALE_SMON*.
by Francois Gouget July 26, 2021

July 26, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 276 +++++++++++++++++++++++++++++++--- 1 file changed, 257 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 2bb53939821..73bcdb8a260 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1708,6 +1708,13 @@ static void test_VarParseNumFromStrEn(void) EXPECTRGB(2,1); EXPECTRGB(3,FAILDIG); + /* With flag, the currency cannot replace the decimal sign (see comment about + * the Cape Verdean escudo). + */ + CONVERT("1$99", NUMPRS_CURRENCY|NUMPRS_DECIMAL); + EXPECT(1,NUMPRS_CURRENCY|NUMPRS_DECIMAL,NUMPRS_CURRENCY,2,0,0); + EXPECT2(1,FAILDIG); + /* Thousands flag can also be used with currency */ CONVERT("$1,234", NUMPRS_CURRENCY|NUMPRS_THOUSANDS); EXPECT(4,NUMPRS_CURRENCY|NUMPRS_THOUSANDS,NUMPRS_CURRENCY|NUMPRS_THOUSANDS,6,0,0); @@ -2090,22 +2097,71 @@ static void test_VarParseNumFromStrMisc(void) LCID lcid; NUMPARSE np; BYTE rgb[128]; - OLECHAR t1000[128]; + OLECHAR currency[8], t1000[8], mont1000[8], dec[8], mondec[8]; CHECKPTR(VarParseNumFromStr); - /* Test custom thousand */ + /* Customize the regional settings to perform extra tests */ - if (GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, t1000, ARRAY_SIZE(t1000))) + if (GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, currency, ARRAY_SIZE(currency)) && + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, t1000, ARRAY_SIZE(t1000)) && + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHOUSANDSEP, mont1000, ARRAY_SIZE(mont1000)) && + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, dec, ARRAY_SIZE(dec)) && + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, mondec, ARRAY_SIZE(mondec))) { - OLECHAR wstr[128], separators[] = L"., \xa0"; - int i; + /* Start from a known configuration */ + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, L"$"); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L","); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHOUSANDSEP, L","); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, L"."); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, L"."); + + /* SCURRENCY defaults to '$' */ + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, L""); + hres = wconvert_str(L"$1", ARRAY_SIZE(rgb), NUMPRS_CURRENCY, &np, rgb, LOCALE_USER_DEFAULT, 0); + EXPECT(1,NUMPRS_CURRENCY,NUMPRS_CURRENCY,2,0,0); + EXPECT2(1,FAILDIG); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, L"$"); + + /* STHOUSAND has no default */ + 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; + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L"~"); + + /* But SMONTHOUSANDSEP defaults to ','! */ + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHOUSANDSEP, L""); + hres = wconvert_str(L"$1,000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY, &np, rgb, LOCALE_USER_DEFAULT, 0); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,6,0,3); + EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ + EXPECTRGB(4,FAILDIG); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L","); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHOUSANDSEP, L","); + + /* SDECIMAL defaults to '.' */ + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, L"~"); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, L""); + hres = wconvert_str(L"4.2", ARRAY_SIZE(rgb), NUMPRS_DECIMAL, &np, rgb, LOCALE_USER_DEFAULT, 0); + EXPECT(2,NUMPRS_DECIMAL,NUMPRS_DECIMAL,3,0,-1); + EXPECT2(4,2); + EXPECTRGB(2,FAILDIG); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, L"~"); + + /* But SMONDECIMALSEP has no default! */ + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, L""); + hres = wconvert_str(L"3.9", ARRAY_SIZE(rgb), NUMPRS_DECIMAL|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); + todo_wine EXPECTFAIL; + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, L"."); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, L"."); /* Non-breaking spaces are not allowed if sThousand is a regular space */ SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L" "); hres = wconvert_str(L"1 000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS, &np, rgb, LOCALE_USER_DEFAULT, 0); + if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS,NUMPRS_THOUSANDS,5,0,3); + todo_wine ok(np.dwOutFlags == NUMPRS_THOUSANDS, "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); @@ -2113,33 +2169,215 @@ static void test_VarParseNumFromStrMisc(void) EXPECTFAIL; - /* No separator is allowed if sThousand is set to an empty string */ - SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L""); - for (i = 0; i < ARRAY_SIZE(separators)-1; i++) - { - winetest_push_context("%d", i); - /* Make sure the separator is not confused with the trailing \0 */ - wsprintfW(wstr, L"1%c", separators[i]); + /* Show that NUMPRS_THOUSANDS activates sThousand and that + * NUMPRS_THOUSANDS+NUMPRS_CURRENCY activates sMonThousandSep + * whether a currency sign is present or not. Also the presence of + * sMonThousandSep flags the value as being a currency. + */ + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L"|"); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHOUSANDSEP, L" "); - hres = wconvert_str(wstr, ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine_if(i==2) EXPECTFAIL; + hres = wconvert_str(L"1|000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS, &np, rgb, LOCALE_USER_DEFAULT, 0); + if (broken(1)) /* FIXME Reenable once Wine is less broken */ + EXPECT(1,NUMPRS_THOUSANDS,NUMPRS_THOUSANDS,5,0,3); + todo_wine ok(np.dwOutFlags == NUMPRS_THOUSANDS, "Got dwOutFlags=%08x\n", np.dwOutFlags); + EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ + EXPECTRGB(4,FAILDIG); - winetest_pop_context(); - } + hres = wconvert_str(L"1 000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); + EXPECTFAIL; + + hres = wconvert_str(L"1|000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY, &np, rgb, LOCALE_USER_DEFAULT, 0); + if (broken(1)) /* FIXME Reenable once Wine is less broken */ + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,NUMPRS_THOUSANDS,5,0,3); + todo_wine ok(np.dwOutFlags == NUMPRS_THOUSANDS, "Got dwOutFlags=%08x\n", np.dwOutFlags); + EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ + 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); + + + /* Leading sMonThousandSep are not 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); + EXPECTFAIL; + + /* 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; + + + /* NUMPRS_CURRENCY is not enough for sMonThousandSep */ + hres = wconvert_str(L"1 000", ARRAY_SIZE(rgb), NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); + EXPECTFAIL; + + + /* Even with a currency sign, the regular thousands separator works */ + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, L"$"); + /* Make sure SMONDECIMALSEP is not the currency sign (see the + * Cape Verdean escudo comment). + */ + 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); + 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); + EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ + EXPECTRGB(7,FAILDIG); + + + /* SMONTHOUSANDSEP does not consider regular spaces to be equivalent to + * non-breaking spaces! + */ + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHOUSANDSEP, L"\xa0"); + hres = wconvert_str(L"1 000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); + EXPECTFAIL; + + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L"\xa0"); + 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,5,0,3); + EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ + EXPECTRGB(4,FAILDIG); + + + /* Regular thousands separators also have precedence over the currency ones */ + hres = wconvert_str(L"1\xa0\x30\x30\x30", 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,5,0,3); + EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ + EXPECTRGB(4,FAILDIG); + + + /* Show that the decimal separator masks the thousands one in all + * positions, sometimes even without NUMPRS_DECIMAL. + */ + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L","); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHOUSANDSEP, L"~"); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, L","); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, L"~"); + + hres = wconvert_str(L",1", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_DECIMAL, &np, rgb, LOCALE_USER_DEFAULT, 0); + todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,-1); + todo_wine EXPECTRGB(0,1); + EXPECTRGB(1,FAILDIG); + + hres = wconvert_str(L"1,000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); + todo_wine EXPECTFAIL; + + hres = wconvert_str(L"1,", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_DECIMAL|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_USE_ALL,NUMPRS_DECIMAL,2,0,0); + todo_wine ok(np.dwOutFlags == NUMPRS_DECIMAL, "Got dwOutFlags=%08x\n", np.dwOutFlags); + EXPECT2(1,FAILDIG); + + /* But not for their monetary equivalents */ + hres = wconvert_str(L"~1", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_CURRENCY, &np, rgb, LOCALE_USER_DEFAULT, 0); + todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_CURRENCY,NUMPRS_DECIMAL|NUMPRS_CURRENCY,2,0,-1); + todo_wine EXPECTRGB(0,1); + 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); /* Only the first sThousand character is used (sigh of relief) */ SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L" \xa0"); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHOUSANDSEP, L" \xa0"); hres = wconvert_str(L"1 000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); + todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); - hres = wconvert_str(L"1\xa0\x30\x30\x30", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); + hres = wconvert_str(L"1\xa0\x30\x30\x30", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); + EXPECTFAIL; + + hres = wconvert_str(L"1 \xa0\x30\x30\x30", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); EXPECTFAIL; - SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, t1000); + + /* Show that the currency decimal separator is active even without + * NUMPRS_CURRENCY. + */ + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, L"."); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, L","); + + hres = wconvert_str(L"1.2", ARRAY_SIZE(rgb), NUMPRS_DECIMAL|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); + EXPECT(2,NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_DECIMAL,3,0,-1); + EXPECT2(1,2); + EXPECTRGB(2,FAILDIG); + + hres = wconvert_str(L"1,2", ARRAY_SIZE(rgb), NUMPRS_DECIMAL, &np, rgb, LOCALE_USER_DEFAULT, 0); + if (broken(1)) /* FIXME Reenable once Wine is less broken */ + EXPECT(2,NUMPRS_DECIMAL,NUMPRS_DECIMAL|NUMPRS_CURRENCY,3,0,-1); + todo_wine ok(np.dwOutFlags == (NUMPRS_DECIMAL|NUMPRS_CURRENCY), "Got dwOutFlags=%08x\n", np.dwOutFlags); + EXPECTRGB(0,1); + todo_wine EXPECTRGB(1,2); + EXPECTRGB(2,FAILDIG); + + hres = wconvert_str(L"1.2", ARRAY_SIZE(rgb), NUMPRS_DECIMAL|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); + EXPECT(2,NUMPRS_DECIMAL|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_DECIMAL,3,0,-1); + EXPECT2(1,2); + EXPECTRGB(2,FAILDIG); + + hres = wconvert_str(L"1,2", ARRAY_SIZE(rgb), NUMPRS_DECIMAL|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); + if (broken(1)) /* FIXME Reenable once Wine is less broken */ + EXPECT(2,NUMPRS_DECIMAL|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_DECIMAL|NUMPRS_CURRENCY,3,0,-1); + todo_wine ok(np.dwOutFlags == (NUMPRS_DECIMAL|NUMPRS_CURRENCY), "Got dwOutFlags=%08x\n", np.dwOutFlags); + EXPECTRGB(0,1); + todo_wine EXPECTRGB(1,2); + EXPECTRGB(2,FAILDIG); + + hres = wconvert_str(L"1.2,3", ARRAY_SIZE(rgb), NUMPRS_DECIMAL|NUMPRS_CURRENCY, &np, rgb, LOCALE_USER_DEFAULT, 0); + EXPECT(2,NUMPRS_DECIMAL|NUMPRS_CURRENCY,NUMPRS_DECIMAL,3,0,-1); + EXPECT2(1,2); + EXPECTRGB(2,FAILDIG); + + hres = wconvert_str(L"1,2.3", ARRAY_SIZE(rgb), NUMPRS_DECIMAL, &np, rgb, LOCALE_USER_DEFAULT, 0); + if (broken(1)) /* FIXME Reenable once Wine is less broken */ + EXPECT(2,NUMPRS_DECIMAL,NUMPRS_DECIMAL|NUMPRS_CURRENCY,3,0,-1); + todo_wine ok(np.dwOutFlags == (NUMPRS_DECIMAL|NUMPRS_CURRENCY), "Got dwOutFlags=%08x\n", np.dwOutFlags); + EXPECTRGB(0,1); + todo_wine EXPECTRGB(1,2); + EXPECTRGB(2,FAILDIG); + + + /* In some locales the decimal separator is the currency sign. + * For instance the Cape Verdean escudo. + */ + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, L"$"); + hres = wconvert_str(L"1$99", ARRAY_SIZE(rgb), NUMPRS_DECIMAL|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); + todo_wine EXPECT(3,NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_DECIMAL|NUMPRS_CURRENCY,4,0,-2); + EXPECTRGB(0,1); + todo_wine EXPECTRGB(1,9); + todo_wine EXPECTRGB(2,9); + EXPECTRGB(3,FAILDIG); + + + /* Restore all the settings */ + ok(SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, currency), "Restoring SCURRENCY failed\n"); + ok(SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, t1000), "Restoring STHOUSAND failed\n"); + ok(SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHOUSANDSEP, mont1000), "Restoring SMONTHOUSANDSEP failed\n"); + ok(SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, dec), "Restoring SDECIMAL failed\n"); + ok(SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, mondec), "Restoring SMONDECIMALSEP failed\n"); } -- 2.20.1

1 0

[PATCH v2] wined3d: No longer store a VkDescriptorBufferInfo in the wined3d_buffer_vk structure.
by Zebediah Figura July 26, 2021

July 26, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/buffer.c | 13 ------------- dlls/wined3d/context_vk.c | 28 +++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 11 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4c5e2054fe0..15627bbab65 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1431,19 +1431,6 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf return TRUE; } -const VkDescriptorBufferInfo *wined3d_buffer_vk_get_buffer_info(struct wined3d_buffer_vk *buffer_vk) -{ - if (buffer_vk->bo_user.valid) - return &buffer_vk->buffer_info; - - buffer_vk->buffer_info.buffer = buffer_vk->bo.vk_buffer; - buffer_vk->buffer_info.offset = buffer_vk->bo.buffer_offset; - buffer_vk->buffer_info.range = buffer_vk->b.resource.size; - buffer_vk->bo_user.valid = true; - - return &buffer_vk->buffer_info; -} - static BOOL wined3d_buffer_vk_prepare_location(struct wined3d_buffer *buffer, struct wined3d_context *context, unsigned int location) { diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 4b1bea38370..6ddbfa21d45 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2418,7 +2418,6 @@ static void wined3d_context_vk_bind_vertex_buffers(struct wined3d_context_vk *co VkDeviceSize offsets[ARRAY_SIZE(state->streams)] = {0}; VkBuffer buffers[ARRAY_SIZE(state->streams)]; const struct wined3d_stream_state *stream; - const VkDescriptorBufferInfo *buffer_info; struct wined3d_buffer_vk *buffer_vk; struct wined3d_buffer *buffer; unsigned int i, first, count; @@ -2432,10 +2431,9 @@ static void wined3d_context_vk_bind_vertex_buffers(struct wined3d_context_vk *co if ((buffer = stream->buffer)) { buffer_vk = wined3d_buffer_vk(buffer); - buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); - buffers[count] = buffer_info->buffer; - offsets[count] = buffer_info->offset + stream->offset; + buffers[count] = buffer_vk->bo.vk_buffer; + offsets[count] = buffer_vk->bo.buffer_offset + stream->offset; ++count; continue; } @@ -2457,7 +2455,6 @@ static void wined3d_context_vk_bind_stream_output_buffers(struct wined3d_context VkDeviceSize sizes[ARRAY_SIZE(state->stream_output)]; VkBuffer buffers[ARRAY_SIZE(state->stream_output)]; const struct wined3d_stream_output *stream; - const VkDescriptorBufferInfo *buffer_info; struct wined3d_buffer_vk *buffer_vk; struct wined3d_buffer *buffer; unsigned int i, first, count; @@ -2471,17 +2468,16 @@ static void wined3d_context_vk_bind_stream_output_buffers(struct wined3d_context if ((buffer = stream->buffer)) { buffer_vk = wined3d_buffer_vk(buffer); - buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); - buffers[count] = buffer_info->buffer; + buffers[count] = buffer_vk->bo.vk_buffer; if ((offsets[count] = stream->offset) == ~0u) { FIXME("Appending to stream output buffers not implemented.\n"); offsets[count] = 0; } - sizes[count] = buffer_info->range - offsets[count]; - offsets[count] += buffer_info->offset; - ++count; + sizes[count] = buffer->resource.size - offsets[count]; + offsets[count] += buffer_vk->bo.buffer_offset; + ++count;s continue; } @@ -2664,9 +2660,9 @@ static bool wined3d_shader_descriptor_writes_vk_add_cbv_write(struct wined3d_sha VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, &device_vk->null_resources_vk.buffer_info, NULL, NULL); buffer_vk = wined3d_buffer_vk(buffer); - *buffer_info = *wined3d_buffer_vk_get_buffer_info(buffer_vk); - buffer_info->offset += cb_state->offset; - buffer_info->range = min(cb_state->size, buffer_info->range); + buffer_info->buffer = buffer_vk->bo.vk_buffer; + buffer_info->offset = buffer_vk->bo.buffer_offset + cb_state->offset; + buffer_info->range = min(cb_state->size, buffer->resource.size); if (!wined3d_shader_descriptor_writes_vk_add_write(writes, vk_descriptor_set, binding->binding_idx, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, buffer_info, NULL, NULL)) return false; @@ -3309,7 +3305,6 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_INDEXBUFFER) && state->index_buffer) { - const VkDescriptorBufferInfo *buffer_info; VkIndexType idx_type; if (state->index_format == WINED3DFMT_R16_UINT) @@ -3317,10 +3312,9 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c else idx_type = VK_INDEX_TYPE_UINT32; buffer_vk = wined3d_buffer_vk(state->index_buffer); - buffer_info = wined3d_buffer_vk_get_buffer_info(buffer_vk); wined3d_context_vk_reference_bo(context_vk, &buffer_vk->bo); - VK_CALL(vkCmdBindIndexBuffer(vk_command_buffer, buffer_info->buffer, - buffer_info->offset + state->index_offset, idx_type)); + VK_CALL(vkCmdBindIndexBuffer(vk_command_buffer, buffer_vk->bo.vk_buffer, + buffer_vk->bo.buffer_offset + state->index_offset, idx_type)); } if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a2048fc6ea6..fe450579d12 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4971,7 +4971,6 @@ struct wined3d_buffer_vk struct wined3d_bo_vk bo; struct wined3d_bo_user bo_user; - VkDescriptorBufferInfo buffer_info; uint32_t bind_mask; }; @@ -4982,7 +4981,6 @@ static inline struct wined3d_buffer_vk *wined3d_buffer_vk(struct wined3d_buffer void wined3d_buffer_vk_barrier(struct wined3d_buffer_vk *buffer_vk, struct wined3d_context_vk *context_vk, uint32_t bind_mask) DECLSPEC_HIDDEN; -const VkDescriptorBufferInfo *wined3d_buffer_vk_get_buffer_info(struct wined3d_buffer_vk *buffer_vk) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_vk_init(struct wined3d_buffer_vk *buffer_vk, struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -- 2.30.2

2 1

[PATCH v3] msvcrt: Make the cosh/sinh/tanh functions NAN preserving
by Martin Storsjo July 26, 2021

July 26, 2021

When a NAN is fed as input, return it as-is without mangling it through the calculation (which e.g. loses the sign of the input value). This fixes a regression in a testcase of mine, after switching to the internal implementation of these functions. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- v3: Added initial tests for the modified functions. (Similar tests could probably added for lots of other functions that handle it properly right now already.) The tests are a bit loose (they ignore the quiet/signaling bit instead of require it to be set though) to make the comparison function usable for other functions that haven't been modified to explicitly set the output NAN as quiet). Modified the tanh fix to actually preserve the sign bit too. Didn't integrate the nan handling further into the original algorithm, pending discussion (for how to handle the sign bit that is masked out), but reposting with tests for further discussion. Also, note that tanhf() returns via math_error(), which returns a double. So for those cases, the original input float nan will be cast to a double and back to a float. --- dlls/msvcrt/math.c | 40 +++++++++++++++++++++++++++++----------- dlls/msvcrt/tests/misc.c | 27 +++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d21883757a2..2f0ee6f0918 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1139,6 +1139,9 @@ float CDECL coshf( float x ) UINT32 ui = *(UINT32*)&x; float t; + if (isnan(x)) + return x; + /* |x| */ ui &= 0x7fffffff; x = *(float*)&ui; @@ -1159,7 +1162,7 @@ float CDECL coshf( float x ) return 0.5f * (t + 1 / t); } - /* |x| > log(FLT_MAX) or nan */ + /* |x| > log(FLT_MAX) */ t = __expo2f(x, 1.0f); return t; } @@ -1676,6 +1679,9 @@ float CDECL sinhf( float x ) UINT32 ui = *(UINT32*)&x; float t, h, absx; + if (isnan(x)) + return x; + h = 0.5; if (ui >> 31) h = -h; @@ -1694,7 +1700,7 @@ float CDECL sinhf( float x ) return h * (t + t / (t + 1)); } - /* |x| > logf(FLT_MAX) or nan */ + /* |x| > logf(FLT_MAX) */ t = __expo2f(absx, 2 * h); return t; } @@ -1875,7 +1881,7 @@ float CDECL tanhf( float x ) { UINT32 ui = *(UINT32*)&x; int sign; - float t; + float t, orig_x = x; /* x = |x| */ sign = ui >> 31; @@ -1885,10 +1891,13 @@ float CDECL tanhf( float x ) if (ui > 0x3f0c9f54) { /* |x| > log(3)/2 ~= 0.5493 or nan */ if (ui > 0x41200000) { + if (isnan(x)) { #if _MSVCR_VER < 140 - if (isnan(x)) - return math_error(_DOMAIN, "tanhf", x, 0, x); + return math_error(_DOMAIN, "tanhf", orig_x, 0, orig_x); +#else + return orig_x; #endif + } /* |x| > 10 */ fp_barrierf(x + 0x1p120f); t = 1 + 0 / x; @@ -2769,6 +2778,9 @@ double CDECL cosh( double x ) UINT32 w; double t; + if (isnan(x)) + return x; + /* |x| */ ux &= (uint64_t)-1 / 2; x = *(double*)&ux; @@ -2791,7 +2803,7 @@ double CDECL cosh( double x ) return 0.5 * (t + 1 / t); } - /* |x| > log(DBL_MAX) or nan */ + /* |x| > log(DBL_MAX) */ /* note: the result is stored to handle overflow */ t = __expo2(x, 1.0); return t; @@ -4035,6 +4047,9 @@ double CDECL sinh( double x ) UINT32 w; double t, h, absx; + if (isnan(x)) + return x; + h = 0.5; if (ux >> 63) h = -h; @@ -4054,7 +4069,7 @@ double CDECL sinh( double x ) return h * (t + t / (t + 1)); } - /* |x| > log(DBL_MAX) or nan */ + /* |x| > log(DBL_MAX) */ /* note: the result is stored to handle overflow */ t = __expo2(absx, 2 * h); return t; @@ -4320,7 +4335,7 @@ double CDECL tanh( double x ) UINT64 ui = *(UINT64*)&x; UINT32 w; int sign; - double t; + double t, orig_x = x; /* x = |x| */ sign = ui >> 63; @@ -4331,11 +4346,14 @@ double CDECL tanh( double x ) if (w > 0x3fe193ea) { /* |x| > log(3)/2 ~= 0.5493 or nan */ if (w > 0x40340000) { + if (isnan(x)) { #if _MSVCR_VER < 140 - if (isnan(x)) - return math_error(_DOMAIN, "tanh", x, 0, x); + return math_error(_DOMAIN, "tanh", orig_x, 0, orig_x); +#else + return orig_x; #endif - /* |x| > 20 or nan */ + } + /* |x| > 20 */ /* note: this branch avoids raising overflow */ fp_barrier(x + 0x1p120f); t = 1 - 0 / x; diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index b38915596df..3b05c892ffe 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -491,9 +491,29 @@ static void test_qsort_s(void) ok(tab[i] == i, "data sorted incorrectly on position %d: %d\n", i, tab[i]); } +static int eq_nan(double a, double b) { + /* Check if NANs are equal, ignoring the quiet/signaling bit */ + UINT64 ai = *(UINT64*)&a; + UINT64 bi = *(UINT64*)&b; + UINT64 qbit = (1ULL << 51); + return (ai & ~qbit) == (bi & ~qbit); +} + +static int eq_nanf(float a, float b) { + /* Check if NANs are equal, ignoring the quiet/signaling bit */ + DWORD ai = *(DWORD*)&a; + DWORD bi = *(DWORD*)&b; + DWORD qbit = (1 << 22); + return (ai & ~qbit) == (bi & ~qbit); +} + static void test_math_functions(void) { double ret; + UINT64 test_nan_i = 0xFFF0000000000042ULL; // Negative snan + double test_nan = *(double*)&test_nan_i; + DWORD test_nanf_i = 0xFF800042; // Negative snan + float test_nanf = *(float*)&test_nanf_i; errno = 0xdeadbeef; p_atan(NAN); @@ -525,6 +545,13 @@ static void test_math_functions(void) errno = 0xdeadbeef; p_exp(INFINITY); ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + ok(eq_nan(test_nan, cosh(test_nan)), "cosh not preserving nan\n"); + ok(eq_nan(test_nan, sinh(test_nan)), "sinh not preserving nan\n"); + ok(eq_nan(test_nan, tanh(test_nan)), "tanh not preserving nan\n"); + ok(eq_nanf(test_nanf, coshf(test_nanf)), "coshf not preserving nan\n"); + ok(eq_nanf(test_nanf, sinhf(test_nanf)), "sinhf not preserving nan\n"); + ok(eq_nanf(test_nanf, tanhf(test_nanf)), "tanhf not preserving nan\n"); } static void __cdecl test_thread_func(void *end_thread_type) -- 2.25.1

2 1

[PATCH] conhost: Popup Attributes should match Character Attributes when creating a new screen buffer
by Hugh McMaster July 26, 2021

July 26, 2021

Popup Attributes should match Character Attributes when a new screen buffer is created. The existing Popup Attributes are copied when using a pseudo console. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- dlls/kernel32/tests/console.c | 12 ++++++------ programs/conhost/conhost.c | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5f9342ffd44..6ee00aa49a6 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1049,8 +1049,8 @@ static void test_new_screen_buffer_color_attributes(HANDLE hConOut) ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: " "got %#x, expected %#x\n", csbi2.wAttributes, orig_attr); - todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); - todo_wine ok(csbi2.wPopupAttributes == orig_attr, "Popup Attributes should match Character Attributes\n"); + ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); + ok(csbi2.wPopupAttributes == orig_attr, "Popup Attributes should match Character Attributes\n"); /* Test different Character Attributes */ attr = FOREGROUND_BLUE|BACKGROUND_GREEN; @@ -1070,8 +1070,8 @@ static void test_new_screen_buffer_color_attributes(HANDLE hConOut) ok(csbi2.wAttributes == attr, "Character Attributes should have been copied: " "got %#x, expected %#x\n", csbi2.wAttributes, attr); - todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); - todo_wine ok(csbi2.wPopupAttributes == attr, "Popup Attributes should match Character Attributes\n"); + ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); + ok(csbi2.wPopupAttributes == attr, "Popup Attributes should match Character Attributes\n"); ret = SetConsoleTextAttribute(hConOut, orig_attr); ok(ret, "SetConsoleTextAttribute failed: error %u\n", GetLastError()); @@ -1094,8 +1094,8 @@ static void test_new_screen_buffer_color_attributes(HANDLE hConOut) ok(csbi2.wAttributes == orig_attr, "Character Attributes should have been copied: " "got %#x, expected %#x\n", csbi2.wAttributes, orig_attr); - todo_wine ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); - todo_wine ok(csbi2.wPopupAttributes == orig_attr, "Popup Attributes should match Character Attributes\n"); + ok(csbi2.wPopupAttributes != orig_popup, "Popup Attributes should not match original value\n"); + ok(csbi2.wPopupAttributes == orig_attr, "Popup Attributes should match Character Attributes\n"); csbi.wPopupAttributes = orig_popup; ret = SetConsoleScreenBufferInfoEx(hConOut, &csbi); diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 805df880897..061f09989eb 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -85,7 +85,6 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->cursor_visible = 1; screen_buffer->width = width; screen_buffer->height = height; - screen_buffer->popup_attr = 0xf5; screen_buffer->font.weight = FW_NORMAL; screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE; @@ -96,6 +95,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->win.right = console->active->win.right - console->active->win.left; screen_buffer->win.bottom = console->active->win.bottom - console->active->win.top; screen_buffer->attr = console->active->attr; + screen_buffer->popup_attr = console->active->attr; } else { @@ -104,6 +104,7 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->win.right = width - 1; screen_buffer->win.bottom = height - 1; screen_buffer->attr = FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED; + screen_buffer->popup_attr = 0xf5; } if (wine_rb_put( &screen_buffer_map, LongToPtr(id), &screen_buffer->entry )) -- 2.32.0

3 2

[PATCH] wined3d: Check for failure from wined3d_device_context_require_space() in wined3d_device_context_emit_unmap().
by Zebediah Figura July 26, 2021

July 26, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51485 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 14 ++++++++++++++ dlls/wined3d/cs.c | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f85646050e7..50801064694 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -33104,6 +33104,20 @@ static void test_deferred_context_map(void) ID3D11CommandList_Release(list); + /* Dead Rising unmaps a resource on the wrong context. */ + + hr = ID3D11DeviceContext_Map(immediate, (ID3D11Resource *)buffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D11DeviceContext_Unmap(deferred, (ID3D11Resource *)buffer, 0); + + hr = ID3D11DeviceContext_Map(immediate, (ID3D11Resource *)buffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); + todo_wine ok(hr == E_OUTOFMEMORY, "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + ID3D11DeviceContext_Unmap(immediate, (ID3D11Resource *)buffer, 0); + + ID3D11DeviceContext_Unmap(immediate, (ID3D11Resource *)buffer, 0); + /* Test WRITE_NO_OVERWRITE. */ hr = ID3D11DeviceContext_Map(immediate, (ID3D11Resource *)buffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &map_desc); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 13c0fce5bb1..51e5055c4ab 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2520,7 +2520,8 @@ HRESULT wined3d_device_context_emit_unmap(struct wined3d_device_context *context wined3d_not_from_cs(context->device->cs); - op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP); + if (!(op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP))) + return E_OUTOFMEMORY; op->opcode = WINED3D_CS_OP_UNMAP; op->resource = resource; op->sub_resource_idx = sub_resource_idx; -- 2.30.2

2 1