wine-commits February 2024

wine-commits@winehq.org

1 participants
716 discussions

Francisco Casas : tests: Add simple test for implicit cast to int.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: vkd3d Branch: master Commit: e62bd1927e53d9628d4f3f5e55eae7321ce662e1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e62bd1927e53d9628d4f3f5e55eae… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Jan 26 22:07:15 2024 -0300 tests: Add simple test for implicit cast to int. --- tests/hlsl/cast-to-int.shader_test | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/hlsl/cast-to-int.shader_test b/tests/hlsl/cast-to-int.shader_test index 385e3375..4605edb8 100644 --- a/tests/hlsl/cast-to-int.shader_test +++ b/tests/hlsl/cast-to-int.shader_test @@ -1,3 +1,19 @@ +[pixel shader todo(sm<4)] +uniform float3 f; + +float4 main() : sv_target +{ + int3 r = f; + + return float4(r, 0); +} + +[test] +uniform 0 float4 10.3 11.5 12.8 13.1 +todo(sm<4) draw quad +probe all rgba (10, 11, 12, 0) + + [pixel shader todo(sm<4)] uniform float f; uniform uint u;

1 0

Francisco Casas : vkd3d-shader/d3dbc: Implement casts from ints to floats as a MOV.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: vkd3d Branch: master Commit: 4b5c7e372196a303db6786f01f9c37589f86d2e8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4b5c7e372196a303db6786f01f9c3… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Oct 20 18:38:12 2023 -0300 vkd3d-shader/d3dbc: Implement casts from ints to floats as a MOV. For temporary registers, SM1-SM3 integer types are internally represented as floating point, so, in order to perform a cast from ints to floats we need a mere MOV. For constant integer registers "iN" there is no operation for casting from a floating point register to them. For address registers "aN", and the loop counting register "aL", vertex shaders have the "mova" operation but we haven't used these registers in any way yet. We probably would want to introduce these as synthetic variables allocated in a special register set. In that case we have to remember to use MOVA instead of MOV in the store operations, but they shouldn't be src or dst of CAST operations. Regarding constant integer registers, in some shaders, constants are expected to be received formatted as an integer, such as: int m; float4 main() : sv_target { float4 res = {0, 0, 0, 0}; for (int k = 0; k < m; ++k) res += k; return res; } which compiles as: // Registers: // // Name Reg Size // ------------ ----- ---- // m i0 1 // ps_3_0 def c0, 0, 1, 0, 0 mov r0, c0.x mov r1.x, c0.x rep i0 add r0, r0, r1.x add r1.x, r1.x, c0.y endrep mov oC0, r0 but this only happens if the integer constant is used directly in an instruction that needs it, and as I said there is no instruction that allows converting them to a float representation. Notice how a more complex shader, that performs operations with this integer variable "m": int m; float4 main() : sv_target { float4 res = {0, 0, 0, 0}; for (int k = 0; k < m * m; ++k) res += k; return res; } gives the following output: // Registers: // // Name Reg Size // ------------ ----- ---- // m c0 1 // ps_3_0 def c1, 0, 0, 1, 0 defi i0, 255, 0, 0, 0 mul r0.x, c0.x, c0.x mov r1, c1.y mov r0.y, c1.y rep i0 mov r0.z, r0.x break_ge r0.y, r0.z add r1, r0.y, r1 add r0.y, r0.y, c1.z endrep mov oC0, r1 Meaning that the uniform "m" is just stored as a floating point in "c0", the constant integer register "i0" is just set to 255 (hoping it is a high enough value) using "defi", and the "break_ge" involving c0 is used to break from the loop. We could potentially use this approach to implement loops from SM3 without expecting the variables being received as constant integer registers. According to the D3D documentation, for SM1-SM3 constant integer registers are only used by the 'loop' and 'rep' instructions. --- libs/vkd3d-shader/d3dbc.c | 82 +++++++++++++++++++++++++++++++++++++++++ tests/hlsl/distance.shader_test | 2 +- tests/hlsl/half.shader_test | 4 +- tests/hlsl/ldexp.shader_test | 4 +- tests/hlsl/lerp.shader_test | 6 +-- 5 files changed, 90 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 9ad9f735..27aec124 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1958,6 +1958,84 @@ static void write_sm1_unary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe write_sm1_instruction(ctx, buffer, &instr); } +static void write_sm1_cast(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + const struct hlsl_ir_node *instr) +{ + struct hlsl_ir_expr *expr = hlsl_ir_expr(instr); + const struct hlsl_ir_node *arg1 = expr->operands[0].node; + const struct hlsl_type *dst_type = expr->node.data_type; + const struct hlsl_type *src_type = arg1->data_type; + + /* Narrowing casts were already lowered. */ + assert(src_type->dimx == dst_type->dimx); + + switch (dst_type->base_type) + { + case HLSL_TYPE_HALF: + case HLSL_TYPE_FLOAT: + switch (src_type->base_type) + { + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + /* Integers are internally represented as floats, so no change is necessary.*/ + case HLSL_TYPE_HALF: + case HLSL_TYPE_FLOAT: + write_sm1_unary_op(ctx, buffer, D3DSIO_MOV, &instr->reg, &arg1->reg, 0, 0); + break; + + case HLSL_TYPE_BOOL: + hlsl_fixme(ctx, &instr->loc, "SM1 cast from bool to float."); + break; + + case HLSL_TYPE_DOUBLE: + hlsl_fixme(ctx, &instr->loc, "SM1 cast from double to float."); + break; + + default: + vkd3d_unreachable(); + } + break; + + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + switch(src_type->base_type) + { + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + write_sm1_unary_op(ctx, buffer, D3DSIO_MOV, &instr->reg, &arg1->reg, 0, 0); + break; + + case HLSL_TYPE_HALF: + case HLSL_TYPE_FLOAT: + hlsl_fixme(ctx, &instr->loc, "SM1 cast from float to integer."); + break; + + case HLSL_TYPE_BOOL: + hlsl_fixme(ctx, &instr->loc, "SM1 cast from bool to integer."); + break; + + case HLSL_TYPE_DOUBLE: + hlsl_fixme(ctx, &instr->loc, "SM1 cast from double to integer."); + break; + + default: + vkd3d_unreachable(); + } + break; + + case HLSL_TYPE_DOUBLE: + hlsl_fixme(ctx, &instr->loc, "SM1 cast to double."); + break; + + case HLSL_TYPE_BOOL: + /* Casts to bool should have already been lowered. */ + default: + hlsl_fixme(ctx, &expr->node.loc, "SM1 cast from %s to %s.\n", + debug_hlsl_type(ctx, src_type), debug_hlsl_type(ctx, dst_type)); + break; + } +} + static void write_sm1_constant_defs(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer) { unsigned int i, x; @@ -2179,6 +2257,10 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b write_sm1_unary_op(ctx, buffer, D3DSIO_ABS, &instr->reg, &arg1->reg, 0, 0); break; + case HLSL_OP1_CAST: + write_sm1_cast(ctx, buffer, instr); + break; + case HLSL_OP1_DSX: write_sm1_unary_op(ctx, buffer, D3DSIO_DSX, &instr->reg, &arg1->reg, 0, 0); break; diff --git a/tests/hlsl/distance.shader_test b/tests/hlsl/distance.shader_test index bf2423c7..3f544645 100644 --- a/tests/hlsl/distance.shader_test +++ b/tests/hlsl/distance.shader_test @@ -13,7 +13,7 @@ uniform 4 float4 2.0 -1.0 4.0 5.0 draw quad probe all rgba (7.483983, 7.483983, 7.483983, 7.483983) 1 -[pixel shader todo(sm<4)] +[pixel shader] uniform int4 x; uniform int4 y; diff --git a/tests/hlsl/half.shader_test b/tests/hlsl/half.shader_test index 8cf7a756..fe7074e4 100644 --- a/tests/hlsl/half.shader_test +++ b/tests/hlsl/half.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target [require] options: backcompat -[pixel shader todo(sm<4)] +[pixel shader] uniform half h; float4 main() : sv_target @@ -19,5 +19,5 @@ float4 main() : sv_target [test] uniform 0 float 10.0 -todo(sm<4) draw quad +draw quad probe all rgba (10.0, 10.0, 10.0, 10.0) diff --git a/tests/hlsl/ldexp.shader_test b/tests/hlsl/ldexp.shader_test index 2d778e07..75492b66 100644 --- a/tests/hlsl/ldexp.shader_test +++ b/tests/hlsl/ldexp.shader_test @@ -14,7 +14,7 @@ draw quad probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) 2 -[pixel shader todo(sm<4)] +[pixel shader] uniform int4 x; uniform int4 y; @@ -28,7 +28,7 @@ if(sm<4) uniform 0 float4 2 3 4 5 if(sm<4) uniform 4 float4 0 -10 10 100 if(sm>=4) uniform 0 int4 2 3 4 5 if(sm>=4) uniform 4 int4 0 -10 10 100 -todo(sm<4) draw quad +draw quad probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) 2 diff --git a/tests/hlsl/lerp.shader_test b/tests/hlsl/lerp.shader_test index 901857df..ae6ef534 100644 --- a/tests/hlsl/lerp.shader_test +++ b/tests/hlsl/lerp.shader_test @@ -16,7 +16,7 @@ draw quad probe all rgba (2.0, -10.0, -2.0, 76.25) -[pixel shader todo(sm<4)] +[pixel shader] uniform int4 x; uniform int4 y; uniform int4 s; @@ -33,8 +33,8 @@ if(sm<4) uniform 8 float4 0 1 -1 1000000 if(sm>=4) uniform 0 int4 2 3 4 0 if(sm>=4) uniform 4 int4 0 -10 10 1000000 if(sm>=4) uniform 8 int4 0 1 -1 1000000 -todo(sm<4) draw quad -probe all rgba (2.0, -10.0, -2.0, 1e12) +draw quad +probe all rgba (2.0, -10.0, -2.0, 1e12) 4 [pixel shader]

1 0

Piotr Caban : wininet: Add support for reading connection settings binary blobs from registry.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: bbf222ca726db1efaa7c0a4d33194b03e45cea0f URL: https://gitlab.winehq.org/wine/wine/-/commit/bbf222ca726db1efaa7c0a4d33194b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 6 19:58:29 2024 +0100 wininet: Add support for reading connection settings binary blobs from registry. --- dlls/wininet/internet.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 96 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b8c45355d9d..54063a25b7e 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -643,6 +643,79 @@ static WCHAR *get_http_proxy( const WCHAR *proxy ) return ret; } +static LONG connection_settings_read( const connection_settings *settings, DWORD *pos, DWORD size, WCHAR **str) +{ + int len, wlen; + + *str = NULL; + if (*pos + sizeof(int) >= size) + return ERROR_SUCCESS; + memcpy( &len, settings->data + *pos, sizeof(int) ); + *pos += sizeof(int); + + if (*pos + len >= size) + { + *pos = size; + return ERROR_SUCCESS; + } + wlen = MultiByteToWideChar( CP_UTF8, 0, (const char *)settings->data + *pos, len, NULL, 0 ); + if (wlen) + { + *str = malloc( (wlen + 1) * sizeof(WCHAR) ); + if (!*str) + { + *pos = size; + return ERROR_OUTOFMEMORY; + } + MultiByteToWideChar( CP_UTF8, 0, (const char *)settings->data + *pos, len, *str, wlen ); + (*str)[wlen] = 0; + *pos += len; + } + return ERROR_SUCCESS; +} + +static LONG load_connection_settings( HKEY key, const WCHAR *connection, proxyinfo_t *lpwpi ) +{ + connection_settings *settings = NULL; + DWORD type, pos, size = 0; + LONG res; + + while ((res = RegQueryValueExW( key, connection, NULL, &type, (BYTE*)settings, &size )) == ERROR_MORE_DATA || + (!res && !settings)) + { + connection_settings *new_settings = realloc(settings, size); + if(!new_settings) + { + free( settings ); + return ERROR_OUTOFMEMORY; + } + settings = new_settings; + } + + memset(lpwpi, 0, sizeof(*lpwpi)); + if (res || type != REG_BINARY || size < FIELD_OFFSET( connection_settings, data )) + { + lpwpi->flags |= PROXY_TYPE_DIRECT | PROXY_TYPE_AUTO_DETECT; + free( settings ); + return ERROR_SUCCESS; + } + + lpwpi->flags = settings->flags; + size -= FIELD_OFFSET( connection_settings, data ); + pos = 0; + res = connection_settings_read( settings, &pos, size, &lpwpi->proxy ); + if (!res) + res = connection_settings_read( settings, &pos, size, &lpwpi->proxyBypass ); + if (!res) + res = connection_settings_read( settings, &pos, size, &lpwpi->autoconf_url ); + if (res) + { + FreeProxyInfo( lpwpi ); + return res; + } + return ERROR_SUCCESS; +} + /*********************************************************************** * INTERNET_LoadProxySettings * @@ -657,7 +730,7 @@ static WCHAR *get_http_proxy( const WCHAR *proxy ) static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) { DWORD type, len, val; - HKEY key; + HKEY key, con; LONG ret; memset( lpwpi, 0, sizeof(*lpwpi) ); @@ -665,19 +738,30 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) if ((ret = RegOpenKeyW( HKEY_CURRENT_USER, szInternetSettings, &key ))) return ret; + if (!(ret = RegOpenKeyW( key, L"Connections", &con ))) + { + load_connection_settings( con, L"DefaultConnectionSettings", lpwpi ); + RegCloseKey( con ); + } + len = sizeof(DWORD); if (RegQueryValueExW( key, L"ProxyEnable", NULL, &type, (BYTE *)&val, &len ) || type != REG_DWORD) { - val = 0; + val = !!(lpwpi->flags & PROXY_TYPE_PROXY); if((ret = RegSetValueExW( key, L"ProxyEnable", 0, REG_DWORD, (BYTE *)&val, sizeof(DWORD) ))) { RegCloseKey( key ); + FreeProxyInfo( lpwpi ); return ret; } } + else if (val) + { + lpwpi->flags |= PROXY_TYPE_PROXY; + } else { - lpwpi->flags |= (val ? PROXY_TYPE_PROXY : PROXY_TYPE_DIRECT); + lpwpi->flags &= ~PROXY_TYPE_PROXY; } /* figure out how much memory the proxy setting takes */ @@ -688,12 +772,18 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) if (!(szProxy = malloc( len ))) { RegCloseKey( key ); + FreeProxyInfo( lpwpi ); return ERROR_OUTOFMEMORY; } RegQueryValueExW( key, L"ProxyServer", NULL, &type, (BYTE*)szProxy, &len ); + free( lpwpi->proxy ); lpwpi->proxy = szProxy; - TRACE("proxy server (from registry%s) = %s\n", lpwpi->flags & PROXY_TYPE_PROXY ? "" : ", disabled", + } + + if (lpwpi->proxy) + { + TRACE("proxy (from registry%s) = %s\n", lpwpi->flags & PROXY_TYPE_PROXY ? "" : ", disabled", debugstr_w(lpwpi->proxy)); } else @@ -713,6 +803,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } RegQueryValueExW( key, L"ProxyOverride", NULL, &type, (BYTE*)szProxy, &len ); + free( lpwpi->proxyBypass ); lpwpi->proxyBypass = szProxy; TRACE("http proxy bypass (from registry) = %s\n", debugstr_w(lpwpi->proxyBypass)); } @@ -734,6 +825,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) RegQueryValueExW( key, L"AutoConfigURL", NULL, &type, (BYTE*)autoconf_url, &len ); lpwpi->flags |= PROXY_TYPE_AUTO_PROXY_URL; + free( lpwpi->autoconf_url ); lpwpi->autoconf_url = autoconf_url; TRACE("AutoConfigURL = %s\n", debugstr_w(lpwpi->autoconf_url)); }

1 0

Piotr Caban : wininet: Add support for writing connection settings binary blobs from registry.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: fac555fe68830f33c4f43906ca8d09b034df5ad1 URL: https://gitlab.winehq.org/wine/wine/-/commit/fac555fe68830f33c4f43906ca8d09… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 6 20:50:08 2024 +0100 wininet: Add support for writing connection settings binary blobs from registry. --- dlls/wininet/internet.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 22f0023bba2..b8c45355d9d 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -89,6 +89,21 @@ typedef struct LPWSTR autoconf_url; } proxyinfo_t; +#define CONNECTION_SETTINGS_VERSION 0x46 +typedef struct { + DWORD version; + DWORD id; + DWORD flags; + BYTE data[1]; + /* DWORD proxy_server_len; */ + /* UTF8 proxy_server[proxy_server_len]; */ + /* DWORD bypass_list_len; */ + /* UTF8 bypass_list[bypass_list_len]; */ + /* DWORD configuration_script_len; */ + /* UTF8 configuration_script[configuration_script_len]; */ + /* DWORD unk[8]; set to 0 */ +} connection_settings; + static ULONG max_conns = 2, max_1_0_conns = 4; static ULONG connect_timeout = 60000; @@ -316,6 +331,48 @@ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) return S_OK; } +static void connection_settings_write( connection_settings *settings, DWORD *pos, DWORD size, const WCHAR *str ) +{ + int len = 0; + + if (str) + { + len = wcslen( str ); + len = WideCharToMultiByte( CP_UTF8, 0, str, len, settings ? (char*)settings->data + *pos + sizeof(len) : NULL, + settings ? size - *pos - sizeof(len) : 0, NULL, NULL ); + } + if (settings) + memcpy(settings->data + *pos, &len, sizeof(len)); + *pos += sizeof(len) + len; +} + +static LONG save_connection_settings( HKEY key, const WCHAR *connection, proxyinfo_t *lpwpi ) +{ + connection_settings *settings; + DWORD size = 0, pos = 0; + LONG ret; + + connection_settings_write( NULL, &size, 0, lpwpi->proxy ); + connection_settings_write( NULL, &size, 0, lpwpi->proxyBypass ); + connection_settings_write( NULL, &size, 0, lpwpi->autoconf_url ); + size += sizeof(DWORD) * 10; /* unknown fields */ + + settings = calloc( 1, FIELD_OFFSET(connection_settings, data[size]) ); + if (!settings) + return ERROR_OUTOFMEMORY; + + settings->version = CONNECTION_SETTINGS_VERSION; + settings->flags = lpwpi->flags; + connection_settings_write( settings, &pos, size, lpwpi->proxy ); + connection_settings_write( settings, &pos, size, lpwpi->proxyBypass ); + connection_settings_write( settings, &pos, size, lpwpi->autoconf_url ); + + ret = RegSetValueExW(key, connection, 0, REG_BINARY, (BYTE*)settings, + FIELD_OFFSET(connection_settings, data[size])); + free(settings); + return ret; +} + /*********************************************************************** * INTERNET_SaveProxySettings * @@ -326,13 +383,26 @@ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) */ static LONG INTERNET_SaveProxySettings( proxyinfo_t *lpwpi ) { - HKEY key; + HKEY key, con; DWORD val; LONG ret; if ((ret = RegOpenKeyW( HKEY_CURRENT_USER, szInternetSettings, &key ))) return ret; + if ((ret = RegCreateKeyExW( key, L"Connections", 0, NULL, 0, KEY_WRITE, NULL, &con, NULL ))) + { + RegCloseKey( key ); + return ret; + } + ret = save_connection_settings( con, L"DefaultConnectionSettings", lpwpi ); + RegCloseKey( con ); + if (ret) + { + RegCloseKey( key ); + return ret; + } + val = !!(lpwpi->flags & PROXY_TYPE_PROXY); if ((ret = RegSetValueExW( key, L"ProxyEnable", 0, REG_DWORD, (BYTE*)&val, sizeof(DWORD)))) {

1 0

Piotr Caban : wininet/tests: Cleanup INTERNET_OPTION_PER_CONNECTION_OPTION tests.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 707685642cab99f4708e2f49652da37b5a263be6 URL: https://gitlab.winehq.org/wine/wine/-/commit/707685642cab99f4708e2f49652da3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 15 14:48:03 2024 +0100 wininet/tests: Cleanup INTERNET_OPTION_PER_CONNECTION_OPTION tests. --- dlls/wininet/tests/internet.c | 190 +++++++++++++++--------------------------- 1 file changed, 66 insertions(+), 124 deletions(-)

1 0

Piotr Caban : wininet: Use GlobalAlloc in InternetQueryOption(INTERNET_OPTION_PER_CONNECTION_OPTION).
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 9ea0a1072dd28cb8f06577384f82991acf7dc690 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ea0a1072dd28cb8f06577384f8299… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 15 13:55:28 2024 +0100 wininet: Use GlobalAlloc in InternetQueryOption(INTERNET_OPTION_PER_CONNECTION_OPTION). So the allocator matches with documentation. --- dlls/wininet/internet.c | 4 ++-- dlls/wininet/tests/internet.c | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index fe11cb6f501..22f0023bba2 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2606,7 +2606,7 @@ static WCHAR *copy_optionW(WCHAR *value) return NULL; len = (wcslen(value) + 1) * sizeof(WCHAR); - if (!(tmp = HeapAlloc(GetProcessHeap(), 0, len))) + if (!(tmp = GlobalAlloc(0, len))) return NULL; return memcpy(tmp, value, len); @@ -2621,7 +2621,7 @@ static char *copy_optionA(WCHAR *value) return NULL; len = WideCharToMultiByte(CP_ACP, 0, value, -1, NULL, 0, NULL, NULL); - if (!(tmp = HeapAlloc(GetProcessHeap(), 0, len))) + if (!(tmp = GlobalAlloc(0, len))) return NULL; WideCharToMultiByte(CP_ACP, 0, value, -1, tmp, len, NULL, NULL); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 715b03f95fb..32504382477 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1317,7 +1317,7 @@ static void test_Option_PerConnectionOption(void) ret = HeapValidate(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue); ok(ret, "HeapValidate failed, last error %lu\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue); + GlobalFree(list.pOptions[0].Value.pszValue); HeapFree(GetProcessHeap(), 0, list.pOptions); /* disable the proxy server */ @@ -1381,6 +1381,7 @@ static void test_Option_PerConnectionOption(void) ret = InternetSetOptionW(ses, INTERNET_OPTION_PER_CONNECTION_OPTION, &list, size); ok(ret == TRUE, "InternetSetOption should've succeeded\n"); + GlobalFree(list.pOptions[0].Value.pszValue); HeapFree(GetProcessHeap(), 0, list.pOptions); InternetCloseHandle(ses); @@ -1443,7 +1444,7 @@ static void test_Option_PerConnectionOptionA(void) "Retrieved flags should've been PROXY_TYPE_PROXY, was: %ld\n", list.pOptions[1].Value.dwValue); - HeapFree(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue); + GlobalFree(list.pOptions[0].Value.pszValue); HeapFree(GetProcessHeap(), 0, list.pOptions); /* test with NULL as proxy server */ @@ -1469,7 +1470,7 @@ static void test_Option_PerConnectionOptionA(void) "Retrieved proxy server should've been NULL, was: \"%s\"\n", list.pOptions[0].Value.pszValue); - HeapFree(GetProcessHeap(), 0, list.pOptions[0].Value.pszValue); + GlobalFree(list.pOptions[0].Value.pszValue); HeapFree(GetProcessHeap(), 0, list.pOptions); /* restore original settings */ @@ -1480,6 +1481,7 @@ static void test_Option_PerConnectionOptionA(void) &list, size); ok(ret == TRUE, "InternetSetOption should've succeeded\n"); + GlobalFree(list.pOptions[0].Value.pszValue); HeapFree(GetProcessHeap(), 0, list.pOptions); InternetCloseHandle(ses);

1 0

Piotr Caban : wininet: Fix buffer size calculation in InternetQueryOption(INTERNET_OPTION_PER_CONNECTION_OPTION).
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: 7dcdfd7bf23bfa6d1aa6b50bbb4bffe024fac98f URL: https://gitlab.winehq.org/wine/wine/-/commit/7dcdfd7bf23bfa6d1aa6b50bbb4bff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 15 13:49:41 2024 +0100 wininet: Fix buffer size calculation in InternetQueryOption(INTERNET_OPTION_PER_CONNECTION_OPTION). --- dlls/wininet/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b74015146ea..fe11cb6f501 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2620,7 +2620,7 @@ static char *copy_optionA(WCHAR *value) if (!value) return NULL; - len = wcslen(value) * 3 + 1; + len = WideCharToMultiByte(CP_ACP, 0, value, -1, NULL, 0, NULL, NULL); if (!(tmp = HeapAlloc(GetProcessHeap(), 0, len))) return NULL;

1 0

Piotr Caban : wininet: Test INTERNET_OPTION_PER_CONNECTION_OPTION on process settings.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: wine Branch: master Commit: f54acf3de01ab8e7870fd7e5482e156fd965138a URL: https://gitlab.winehq.org/wine/wine/-/commit/f54acf3de01ab8e7870fd7e5482e15… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 15 14:02:30 2024 +0100 wininet: Test INTERNET_OPTION_PER_CONNECTION_OPTION on process settings. Setting invalid proxy server has some side effects. --- dlls/wininet/tests/internet.c | 91 ++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 57 deletions(-)

1 0

Conor McCarthy : vkd3d: Implement ID3D12Resource2.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: vkd3d Branch: master Commit: 6d4782ed7f7e06cff31313c3170ea5e6bc281254 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6d4782ed7f7e06cff31313c3170ea… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 5 14:57:35 2024 +1000 vkd3d: Implement ID3D12Resource2. --- include/vkd3d.h | 2 +- libs/vkd3d/command.c | 14 ++--- libs/vkd3d/device.c | 107 +++++++++++++++++++++++++++++--------- libs/vkd3d/resource.c | 125 +++++++++++++++++++++++++-------------------- libs/vkd3d/vkd3d_private.h | 34 ++++++------ 5 files changed, 179 insertions(+), 103 deletions(-)

1 0

Conor McCarthy : tests/d3d12: Add a test for zero description count in test_resource_allocation_info().
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: vkd3d Branch: master Commit: 99947deeb7a93dfa5aa45e6de3a5fa8923f5667b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/99947deeb7a93dfa5aa45e6de3a5f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Feb 6 10:39:22 2024 +1000 tests/d3d12: Add a test for zero description count in test_resource_allocation_info(). --- tests/d3d12.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index ac40c641..d7933ed6 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32214,6 +32214,10 @@ static void test_resource_allocation_info(void) return; } + info = ID3D12Device_GetResourceAllocationInfo(device, 0, 0, &desc); + ok(info.SizeInBytes == 0, "Got unexpected size %"PRIu64".\n", info.SizeInBytes); + /* Alignment on AMD Windows is 1, but this doesn't seem important to check. */ + desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; desc.Alignment = 0; desc.Width = 32;

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2024