July 2024 - Wine-Commits - list.winehq.org

Hans Leidekker : odbc32: Reimplement SQLDataSources() using registry functions.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: 58a23e1939271eceb3e42daa11f8dde3c3da8c53 URL: https://gitlab.winehq.org/wine/wine/-/commit/58a23e1939271eceb3e42daa11f8dd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 5 15:29:20 2024 +0200 odbc32: Reimplement SQLDataSources() using registry functions. --- dlls/odbc32/proxyodbc.c | 120 ++++++++++++++++++++++++++++++------- dlls/odbc32/unixlib.c | 156 ------------------------------------------------ dlls/odbc32/unixlib.h | 58 ++---------------- 3 files changed, 105 insertions(+), 229 deletions(-)

1 0

Hans Leidekker : odbc32: Introduce a Windows driver loader and forward a couple of functions.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: 56554cd72b4f4c6bf450218e390fc5838fef4db8 URL: https://gitlab.winehq.org/wine/wine/-/commit/56554cd72b4f4c6bf450218e390fc5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 5 16:15:10 2024 +0200 odbc32: Introduce a Windows driver loader and forward a couple of functions. Forwarding is decided by looking at the driver filename. If the data source specifies a driver filename ending in .dll, assume it's a Windows driver, otherwise assume it's a Unix driver. --- dlls/odbc32/proxyodbc.c | 664 ++++++++++++++++++++++++++++++++++++++++++------ dlls/odbc32/unixlib.c | 10 +- dlls/odbc32/unixlib.h | 25 +- 3 files changed, 600 insertions(+), 99 deletions(-)

1 0

Rémi Bernon : ddraw/tests: Flush messages and X11 events between some tests.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: 60458cebc7dc50d1a5dd952c38bf1605a0ba0be3 URL: https://gitlab.winehq.org/wine/wine/-/commit/60458cebc7dc50d1a5dd952c38bf16… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jul 3 12:07:13 2024 +0200 ddraw/tests: Flush messages and X11 events between some tests. This test appear to be sensitive to pending ConfigureNotify events which will otherwise overwrite window resizes triggered by cooperative level and display mode changes. --- dlls/ddraw/tests/ddraw2.c | 2 ++ dlls/ddraw/tests/ddraw4.c | 2 ++ dlls/ddraw/tests/ddraw7.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 4841a4f0b8a..48a49815c58 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -3784,6 +3784,8 @@ static void test_coop_level_mode_set(void) hr = IDirectDraw2_RestoreDisplayMode(ddraw); ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr); + flush_events(); /* flush any pending window resize X11 event */ + /* If the window is changed at the same time, messages are sent to the new window. */ hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#lx.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 00b5d27f55c..8abd9cd44fd 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4020,6 +4020,8 @@ static void test_coop_level_mode_set(void) hr = IDirectDraw4_RestoreDisplayMode(ddraw); ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr); + flush_events(); /* flush any pending window resize X11 event */ + /* If the window is changed at the same time, messages are sent to the new window. */ hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#lx.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 39be7a1b1e8..3e03d3e4dd6 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3792,6 +3792,8 @@ static void test_coop_level_mode_set(void) hr = IDirectDraw7_RestoreDisplayMode(ddraw); ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#lx.\n", hr); + flush_events(); /* flush any pending window resize X11 event */ + /* If the window is changed at the same time, messages are sent to the new window. */ hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#lx.\n", hr);

1 0

Hans Leidekker : odbc32: Turn SQLBindParam() into a stub.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: 5b510de672baaa57f624457e2c3501b61f3cd070 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b510de672baaa57f624457e2c3501… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 5 13:56:41 2024 +0200 odbc32: Turn SQLBindParam() into a stub. This function is not exported by current Windows drivers. --- dlls/odbc32/proxyodbc.c | 66 +++------------------------------------------- dlls/odbc32/tests/odbc32.c | 35 ------------------------ dlls/odbc32/unixlib.c | 39 --------------------------- dlls/odbc32/unixlib.h | 24 ----------------- 4 files changed, 3 insertions(+), 161 deletions(-)

1 0

Hans Leidekker : odbc32: Replicate Unix data sources to the ODBC Data Sources key.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: f3ac9b1448e1706af75016262dc6323067850fd1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3ac9b1448e1706af75016262dc632… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 5 14:46:13 2024 +0200 odbc32: Replicate Unix data sources to the ODBC Data Sources key. --- dlls/odbc32/unixlib.c | 340 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 225 insertions(+), 115 deletions(-)

1 0

Hans Leidekker : odbc32: Reimplement SQLDrivers() using registry functions.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: 948299bc1f30ea5782db9387bc43ba28fb43a084 URL: https://gitlab.winehq.org/wine/wine/-/commit/948299bc1f30ea5782db9387bc43ba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 5 15:11:19 2024 +0200 odbc32: Reimplement SQLDrivers() using registry functions. --- dlls/odbc32/proxyodbc.c | 99 +++++++++++++++++++++++++++++++++++++++------- dlls/odbc32/tests/odbc32.c | 3 +- dlls/odbc32/unixlib.h | 2 + 3 files changed, 87 insertions(+), 17 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index e295f052ee7..03ef72c780c 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -43,7 +43,6 @@ #include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(odbc); -WINE_DECLARE_DEBUG_CHANNEL(winediag); #define ODBC_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params ) @@ -1934,6 +1933,14 @@ SQLRETURN WINAPI SQLTablePrivileges(SQLHSTMT StatementHandle, SQLCHAR *CatalogNa return ret; } +static HKEY open_drivers_key( void ) +{ + static const WCHAR driversW[] = L"Software\\ODBC\\ODBCINST.INI\\ODBC Drivers"; + HKEY key; + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, driversW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL )) return key; + return NULL; +} + /************************************************************************* * SQLDrivers [ODBC32.071] */ @@ -1942,10 +1949,10 @@ SQLRETURN WINAPI SQLDrivers(SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, S SQLCHAR *DriverAttributes, SQLSMALLINT BufferLength2, SQLSMALLINT *AttributesLength) { - struct SQLDrivers_params params = { 0, Direction, DriverDescription, BufferLength1, DescriptionLength, - DriverAttributes, BufferLength2, AttributesLength }; struct handle *handle = EnvironmentHandle; - SQLRETURN ret; + DWORD len_desc = BufferLength1; + SQLRETURN ret = SQL_ERROR; + LONG res; TRACE("(EnvironmentHandle %p, Direction %d, DriverDescription %p, BufferLength1 %d, DescriptionLength %p," " DriverAttributes %p, BufferLength2 %d, AttributesLength %p)\n", EnvironmentHandle, Direction, @@ -1953,12 +1960,43 @@ SQLRETURN WINAPI SQLDrivers(SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, S if (!handle) return SQL_INVALID_HANDLE; - params.EnvironmentHandle = handle->unix_handle; - ret = ODBC_CALL( SQLDrivers, &params ); + if (Direction == SQL_FETCH_FIRST) + { + handle->drivers_idx = 0; + RegCloseKey( handle->drivers_key ); + if (!(handle->drivers_key = open_drivers_key())) return SQL_ERROR; + } + + res = RegEnumValueA( handle->drivers_key, handle->drivers_idx, (char *)DriverDescription, &len_desc, + NULL, NULL, NULL, NULL ); + if (res == ERROR_NO_MORE_ITEMS) + { + ret = SQL_NO_DATA; + goto done; + } + else if (res == ERROR_SUCCESS) + { + if (DescriptionLength) *DescriptionLength = len_desc; + + handle->drivers_idx++; + ret = SQL_SUCCESS; + } + else goto done; - if (ret == SQL_NO_DATA && Direction == SQL_FETCH_FIRST) - ERR_(winediag)("No ODBC drivers could be found. Check the settings for your libodbc provider.\n"); + if (DriverAttributes) + { + FIXME( "read attributes from registry\n" ); + if (BufferLength2 >= 2) memset( DriverAttributes, 0, 2 ); + } + if (AttributesLength) *AttributesLength = 2; +done: + if (ret) + { + RegCloseKey( handle->drivers_key ); + handle->drivers_key = NULL; + handle->drivers_idx = 0; + } TRACE("Returning %d\n", ret); return ret; } @@ -2940,10 +2978,10 @@ SQLRETURN WINAPI SQLDriversW(SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, SQLSMALLINT BufferLength1, SQLSMALLINT *DescriptionLength, SQLWCHAR *DriverAttributes, SQLSMALLINT BufferLength2, SQLSMALLINT *AttributesLength) { - struct SQLDriversW_params params = { 0, Direction, DriverDescription, BufferLength1, DescriptionLength, - DriverAttributes, BufferLength2, AttributesLength }; struct handle *handle = EnvironmentHandle; - SQLRETURN ret; + DWORD len_desc = BufferLength1; + SQLRETURN ret = SQL_ERROR; + LONG res; TRACE("(EnvironmentHandle %p, Direction %d, DriverDescription %p, BufferLength1 %d, DescriptionLength %p," " DriverAttributes %p, BufferLength2 %d, AttributesLength %p)\n", EnvironmentHandle, Direction, @@ -2951,12 +2989,43 @@ SQLRETURN WINAPI SQLDriversW(SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, if (!handle) return SQL_INVALID_HANDLE; - params.EnvironmentHandle = handle->unix_handle; - ret = ODBC_CALL( SQLDriversW, &params ); + if (Direction == SQL_FETCH_FIRST) + { + handle->drivers_idx = 0; + RegCloseKey( handle->drivers_key ); + if (!(handle->drivers_key = open_drivers_key())) return SQL_ERROR; + } - if (ret == SQL_NO_DATA && Direction == SQL_FETCH_FIRST) - ERR_(winediag)("No ODBC drivers could be found. Check the settings for your libodbc provider.\n"); + res = RegEnumValueW( handle->drivers_key, handle->drivers_idx, DriverDescription, &len_desc, + NULL, NULL, NULL, NULL ); + if (res == ERROR_NO_MORE_ITEMS) + { + ret = SQL_NO_DATA; + goto done; + } + else if (res == ERROR_SUCCESS) + { + if (DescriptionLength) *DescriptionLength = len_desc; + handle->drivers_idx++; + ret = SQL_SUCCESS; + } + else goto done; + + if (DriverAttributes) + { + FIXME( "read attributes from registry\n" ); + if (BufferLength2 >= 2) memset( DriverAttributes, 0, 2 * sizeof(WCHAR) ); + } + if (AttributesLength) *AttributesLength = 2; + +done: + if (ret) + { + RegCloseKey( handle->drivers_key ); + handle->drivers_key = NULL; + handle->drivers_idx = 0; + } TRACE("Returning %d\n", ret); return ret; } diff --git a/dlls/odbc32/tests/odbc32.c b/dlls/odbc32/tests/odbc32.c index fafc63003b7..5a3b0c6f817 100644 --- a/dlls/odbc32/tests/odbc32.c +++ b/dlls/odbc32/tests/odbc32.c @@ -184,8 +184,7 @@ static void test_SQLDrivers( void ) ok( len, "unexpected len\n" ); ok( len2, "unexpected len\n" ); ok( desc[0], "empty string\n" ); - ok( attrs[0], "empty string\n" ); - trace( "desc %s len %d attrs %s len %d\n", desc, len, attrs, len2 ); + trace( "desc %s len %d\n", desc, len ); } ret = SQLFreeEnv( env ); diff --git a/dlls/odbc32/unixlib.h b/dlls/odbc32/unixlib.h index 7cb245c52f3..5e4d799b509 100644 --- a/dlls/odbc32/unixlib.h +++ b/dlls/odbc32/unixlib.h @@ -190,6 +190,8 @@ struct param_binding struct handle { UINT64 unix_handle; + UINT32 drivers_idx; + void *drivers_key; struct param_binding bind_col; struct param_binding bind_parameter; UINT32 row_count; /* number of rows returned by SQLFetch() */

1 0

Alex Henrie : kernelbase: Ensure null termination in RegGetValue[AW].
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: 73d2f2285b0436612793ef29ebec3f3f60aa9b3f URL: https://gitlab.winehq.org/wine/wine/-/commit/73d2f2285b0436612793ef29ebec3f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 9 00:42:51 2024 -0600 kernelbase: Ensure null termination in RegGetValue[AW]. --- dlls/advapi32/tests/registry.c | 20 +++++------ dlls/kernelbase/registry.c | 76 ++++++++++++++++++++++++++---------------- 2 files changed, 58 insertions(+), 38 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 17085cb6b1c..0f77b2fa066 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -914,13 +914,13 @@ static void test_get_value(void) size = 0; ret = pRegGetValueA(hkey_main, NULL, "TP1_ZB_SZ", RRF_RT_REG_SZ, &type, NULL, &size); ok(ret == ERROR_SUCCESS, "ret=%ld\n", ret); - todo_wine ok(size == 1, "size=%ld\n", size); + ok(size == 1, "size=%ld\n", size); ok(type == REG_SZ, "type=%ld\n", type); ret = pRegGetValueA(hkey_main, NULL, "TP1_ZB_SZ", RRF_RT_REG_SZ, &type, buf, &size); ok(ret == ERROR_SUCCESS, "ret=%ld\n", ret); - todo_wine ok(size == 1, "size=%ld\n", size); + ok(size == 1, "size=%ld\n", size); ok(type == REG_SZ, "type=%ld\n", type); - todo_wine ok(!strcmp(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(!strcmp(buf, ""), "Expected \"\", got \"%s\"\n", buf); /* Query REG_SZ using RRF_RT_REG_SZ|RRF_NOEXPAND (ok) */ buf[0] = 0; type = 0xdeadbeef; size = sizeof(buf); @@ -2219,15 +2219,15 @@ static void test_string_termination(void) { outsize = insize; ret = pRegGetValueA(subkey, NULL, "stringtest", RRF_RT_REG_SZ, NULL, buffer, &outsize); - todo_wine ok(ret == ERROR_MORE_DATA, "RegGetValueA returned: %ld\n", ret); - todo_wine ok(outsize == insize + 1, "wrong size: %lu != %lu\n", outsize, insize + 1); + ok(ret == ERROR_MORE_DATA, "RegGetValueA returned: %ld\n", ret); + ok(outsize == insize + 1, "wrong size: %lu != %lu\n", outsize, insize + 1); memset(buffer, 0xbd, sizeof(buffer)); ret = pRegGetValueA(subkey, NULL, "stringtest", RRF_RT_REG_SZ, NULL, buffer, &outsize); ok(ret == ERROR_SUCCESS, "RegGetValueA returned: %ld\n", ret); - todo_wine ok(outsize == insize + 1, "wrong size: %lu != %lu\n", outsize, insize + 1); + ok(outsize == insize + 1, "wrong size: %lu != %lu\n", outsize, insize + 1); ok(memcmp(buffer, string, insize) == 0, "bad string: %s/%lu != %s\n", debugstr_an((char*)buffer, insize), insize, string); - todo_wine ok(buffer[insize] == 0, "buffer overflow at %lu %02x\n", insize, buffer[insize]); + ok(buffer[insize] == 0, "buffer overflow at %lu %02x\n", insize, buffer[insize]); } RegDeleteKeyA(subkey, ""); @@ -2332,13 +2332,13 @@ static void test_multistring_termination(void) { outsize = insize; ret = pRegGetValueA(subkey, NULL, "multistringtest", RRF_RT_REG_SZ, NULL, buffer, &outsize); - todo_wine ok(ret == ERROR_MORE_DATA, "RegGetValueA returned: %ld\n", ret); - todo_wine ok(outsize == insize + 1, "wrong size: %lu != %lu\n", outsize, insize + 1); + ok(ret == ERROR_MORE_DATA, "RegGetValueA returned: %ld\n", ret); + ok(outsize == insize + 1, "wrong size: %lu != %lu\n", outsize, insize + 1); outsize = insize + 2; memset(buffer, 0xbd, sizeof(buffer)); ret = pRegGetValueA(subkey, NULL, "multistringtest", RRF_RT_REG_SZ, NULL, buffer, &outsize); ok(ret == ERROR_SUCCESS, "RegGetValueA returned: %ld\n", ret); - todo_wine ok(outsize == insize + 1, "wrong size: %lu != %lu\n", outsize, insize + 1); + ok(outsize == insize + 1, "wrong size: %lu != %lu\n", outsize, insize + 1); ok(buffer[insize] == 0, "buffer overflow at %lu %02x\n", insize, buffer[insize + 1]); ok(buffer[insize + 1] == 0xbd, "buffer overflow at %lu %02x\n", insize, buffer[insize + 1]); } diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index ee57a4acdd1..8471376bf96 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -1955,16 +1955,18 @@ LSTATUS WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, ret = RegQueryValueExW(hKey, pszValue, NULL, &dwType, pvData, &cbData); - /* If we are going to expand we need to read in the whole the value even - * if the passed buffer was too small as the expanded string might be - * smaller than the unexpanded one and could fit into cbData bytes. */ - if ((ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) && - dwType == REG_EXPAND_SZ && !(dwFlags & RRF_NOEXPAND)) + /* If the value is a string, we need to read in the whole value to be able + * to know exactly how many bytes are needed after expanding the string and + * ensuring that it is null-terminated. */ + if (is_string(dwType) && + (ret == ERROR_MORE_DATA || + (ret == ERROR_SUCCESS && dwType == REG_EXPAND_SZ && !(dwFlags & RRF_NOEXPAND)) || + (ret == ERROR_SUCCESS && (cbData < sizeof(WCHAR) || (pvData && *((WCHAR *)pvData + cbData / sizeof(WCHAR) - 1)))))) { do { heap_free(pvBuf); - pvBuf = heap_alloc(cbData); + pvBuf = heap_alloc(cbData + sizeof(WCHAR)); if (!pvBuf) { ret = ERROR_NOT_ENOUGH_MEMORY; @@ -1981,25 +1983,33 @@ LSTATUS WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, * overlapping buffers. */ CopyMemory(pvBuf, pvData, cbData); } - - /* Both the type or the value itself could have been modified in - * between so we have to keep retrying until the buffer is large - * enough or we no longer have to expand the value. */ - } while (dwType == REG_EXPAND_SZ && ret == ERROR_MORE_DATA); + } while (ret == ERROR_MORE_DATA); if (ret == ERROR_SUCCESS) { + /* Ensure null termination */ + if (cbData < sizeof(WCHAR) || *((WCHAR *)pvBuf + cbData / sizeof(WCHAR) - 1)) + { + *((WCHAR *)pvBuf + cbData / sizeof(WCHAR)) = 0; + cbData += sizeof(WCHAR); + } + /* Recheck dwType in case it changed since the first call */ - if (dwType == REG_EXPAND_SZ) + if (dwType == REG_EXPAND_SZ && !(dwFlags & RRF_NOEXPAND)) { cbData = ExpandEnvironmentStringsW(pvBuf, pvData, pcbData ? *pcbData : 0) * sizeof(WCHAR); dwType = REG_SZ; - if(pvData && pcbData && cbData > *pcbData) + if (pvData && cbData > *pcbData) ret = ERROR_MORE_DATA; } else if (pvData) - CopyMemory(pvData, pvBuf, *pcbData); + { + if (cbData > *pcbData) + ret = ERROR_MORE_DATA; + else + CopyMemory(pvData, pvBuf, cbData); + } } heap_free(pvBuf); @@ -2060,16 +2070,18 @@ LSTATUS WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, ret = RegQueryValueExA(hKey, pszValue, NULL, &dwType, pvData, &cbData); - /* If we are going to expand we need to read in the whole the value even - * if the passed buffer was too small as the expanded string might be - * smaller than the unexpanded one and could fit into cbData bytes. */ - if ((ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) && - dwType == REG_EXPAND_SZ && !(dwFlags & RRF_NOEXPAND)) + /* If the value is a string, we need to read in the whole value to be able + * to know exactly how many bytes are needed after expanding the string and + * ensuring that it is null-terminated. */ + if (is_string(dwType) && + (ret == ERROR_MORE_DATA || + (ret == ERROR_SUCCESS && dwType == REG_EXPAND_SZ && !(dwFlags & RRF_NOEXPAND)) || + (ret == ERROR_SUCCESS && (!cbData || (pvData && *((char *)pvData + cbData - 1)))))) { do { heap_free(pvBuf); - pvBuf = heap_alloc(cbData); + pvBuf = heap_alloc(cbData + 1); if (!pvBuf) { ret = ERROR_NOT_ENOUGH_MEMORY; @@ -2086,25 +2098,33 @@ LSTATUS WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, * overlapping buffers. */ CopyMemory(pvBuf, pvData, cbData); } - - /* Both the type or the value itself could have been modified in - * between so we have to keep retrying until the buffer is large - * enough or we no longer have to expand the value. */ - } while (dwType == REG_EXPAND_SZ && ret == ERROR_MORE_DATA); + } while (ret == ERROR_MORE_DATA); if (ret == ERROR_SUCCESS) { + /* Ensure null termination */ + if (!cbData || *((char *)pvBuf + cbData - 1)) + { + *((char *)pvBuf + cbData) = 0; + cbData++; + } + /* Recheck dwType in case it changed since the first call */ - if (dwType == REG_EXPAND_SZ) + if (dwType == REG_EXPAND_SZ && !(dwFlags & RRF_NOEXPAND)) { cbData = ExpandEnvironmentStringsA(pvBuf, pvData, pcbData ? *pcbData : 0); dwType = REG_SZ; - if(pvData && pcbData && cbData > *pcbData) + if (pvData && cbData > *pcbData) ret = ERROR_MORE_DATA; } else if (pvData) - CopyMemory(pvData, pvBuf, *pcbData); + { + if (cbData > *pcbData) + ret = ERROR_MORE_DATA; + else + CopyMemory(pvData, pvBuf, cbData); + } } heap_free(pvBuf);

1 0

Alex Henrie : windowscodecs: Use RegQueryValueExW in ComponentInfo_GetStringValue.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: wine Branch: master Commit: 5f4bb29232247fd12b44eaffcc396765d2953918 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f4bb29232247fd12b44eaffcc3967… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jul 8 23:00:57 2024 -0600 windowscodecs: Use RegQueryValueExW in ComponentInfo_GetStringValue. --- dlls/windowscodecs/info.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index f42fc8932c9..67704365c06 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -50,8 +50,7 @@ static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, if (!actual_size) return E_INVALIDARG; - ret = RegGetValueW(classkey, NULL, value, RRF_RT_REG_SZ|RRF_NOEXPAND, NULL, - buffer, &cbdata); + ret = RegQueryValueExW(classkey, value, 0, NULL, (void *)buffer, &cbdata); if (ret == ERROR_FILE_NOT_FOUND) {

1 0

Petrichor Park : vkd3d-shader/hlsl: Implement the faceforward() intrinsic.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: vkd3d Branch: master Commit: 746222b349e9c009ed270fb5ca400497dfb43709 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/746222b349e9c009ed270fb5ca400… Author: Petrichor Park <ppark(a)codeweavers.com> Date: Fri Jun 21 10:19:17 2024 -0500 vkd3d-shader/hlsl: Implement the faceforward() intrinsic. --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.y | 29 +++++++++++++++++++++ tests/hlsl/faceforward.shader_test | 52 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) diff --git a/Makefile.am b/Makefile.am index 73b2bd7c..1d418845 100644 --- a/Makefile.am +++ b/Makefile.am @@ -108,6 +108,7 @@ vkd3d_shader_tests = \ tests/hlsl/entry-point-semantics.shader_test \ tests/hlsl/exp.shader_test \ tests/hlsl/expr-indexing.shader_test \ + tests/hlsl/faceforward.shader_test \ tests/hlsl/float-comparison.shader_test \ tests/hlsl/floor.shader_test \ tests/hlsl/fmod.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 80e73e38..ed6b41bf 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3614,6 +3614,34 @@ static bool intrinsic_exp2(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_EXP2, arg, loc); } +static bool intrinsic_faceforward(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_function_decl *func; + struct hlsl_type *type; + char *body; + + static const char template[] = + "%s faceforward(%s n, %s i, %s ng)\n" + "{\n" + " return dot(i, ng) < 0 ? n : -n;\n" + "}\n"; + + if (!(type = elementwise_intrinsic_get_common_type(ctx, params, loc))) + return false; + type = hlsl_get_numeric_type(ctx, type->class, HLSL_TYPE_FLOAT, type->dimx, type->dimy); + + if (!(body = hlsl_sprintf_alloc(ctx, template, + type->name, type->name, type->name, type->name))) + return false; + func = hlsl_compile_internal_function(ctx, "faceforward", body); + vkd3d_free(body); + if (!func) + return false; + + return add_user_call(ctx, func, params, loc); +} + static bool intrinsic_floor(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -4687,6 +4715,7 @@ intrinsic_functions[] = {"dot", 2, true, intrinsic_dot}, {"exp", 1, true, intrinsic_exp}, {"exp2", 1, true, intrinsic_exp2}, + {"faceforward", 3, true, intrinsic_faceforward}, {"floor", 1, true, intrinsic_floor}, {"fmod", 2, true, intrinsic_fmod}, {"frac", 1, true, intrinsic_frac}, diff --git a/tests/hlsl/faceforward.shader_test b/tests/hlsl/faceforward.shader_test new file mode 100644 index 00000000..a7835855 --- /dev/null +++ b/tests/hlsl/faceforward.shader_test @@ -0,0 +1,52 @@ +[pixel shader] +uniform float4 n; +uniform float4 i; +uniform float4 ng; + +float4 main() : sv_target +{ + return faceforward(n, i, ng); +} + +[test] +uniform 0 float4 10.0 20.0 30.0 40.0 +uniform 4 float4 1.0 0.0 0.0 0.0 +uniform 8 float4 1.0 0.2 0.0 0.0 +todo(glsl) draw quad +probe (0, 0) rgba (-10.0, -20.0, -30.0, -40.0) + +uniform 0 float4 10.0 20.0 30.0 40.0 +uniform 4 float4 1.0 0.0 0.0 0.0 +uniform 8 float4 1.0 -0.2 0.0 0.0 +todo(glsl) draw quad +probe (0, 0) rgba (-10.0, -20.0, -30.0, -40.0) + +uniform 0 float4 10.0 20.0 30.0 40.0 +uniform 4 float4 1.0 0.0 0.0 0.0 +uniform 8 float4 -1.0 0.0 0.0 0.0 +todo(glsl) draw quad +probe (0, 0) rgba (10.0, 20.0, 30.0, 40.0) + +uniform 0 float4 10.0 20.0 30.0 40.0 +uniform 4 float4 0.0 -1.0 0.0 0.0 +uniform 8 float4 0.0 1.0 0.0 0.0 +todo(glsl) draw quad +probe (0, 0) rgba (10.0, 20.0, 30.0, 40.0) + +uniform 0 float4 10.0 20.0 30.0 40.0 +uniform 4 float4 1.0 0.0 0.0 0.0 +uniform 8 float4 0.0 1.0 0.0 0.0 +todo(glsl) draw quad +probe (0, 0) rgba (-10.0, -20.0, -30.0, -40.0) + +uniform 0 float4 10.0 20.0 30.0 40.0 +uniform 4 float4 0.0 0.0 0.0 0.0 +uniform 8 float4 0.0 1.0 0.0 0.0 +todo(glsl) draw quad +probe (0, 0) rgba (-10.0, -20.0, -30.0, -40.0) + +uniform 0 float4 10.0 20.0 30.0 40.0 +uniform 4 float4 0.0 0.0 0.0 0.0 +uniform 8 float4 0.0 0.0 0.0 0.0 +todo(glsl) draw quad +probe (0, 0) rgba (-10.0, -20.0, -30.0, -40.0)

1 0

Francisco Casas : vkd3d-shader/hlsl: Validate state block function calls.
by Alexandre Julliard July 9, 2024

July 9, 2024

Module: vkd3d Branch: master Commit: 60c8a813a33a7de53b7ac312d5f1b3940c7c46e0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/60c8a813a33a7de53b7ac312d5f1b… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Jun 6 17:50:05 2024 -0400 vkd3d-shader/hlsl: Validate state block function calls. --- libs/vkd3d-shader/fx.c | 64 ++++++++++++++++++++++ libs/vkd3d-shader/hlsl.h | 3 + libs/vkd3d-shader/hlsl.y | 2 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/hlsl/state-block-function-syntax.shader_test | 4 +- 5 files changed, 72 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 14ff9c4e..0857ebb6 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -56,6 +56,70 @@ static void string_storage_destroy(struct rb_entry *entry, void *context) vkd3d_free(string_entry); } +struct state_block_function_info +{ + const char *name; + unsigned int min_args, max_args; +}; + +static const struct state_block_function_info *get_state_block_function_info(const char *name) +{ + static const struct state_block_function_info valid_functions[] = + { + {"SetBlendState", 3, 3}, + {"SetDepthStencilState", 2, 2}, + {"SetRasterizerState", 1, 1}, + {"SetVertexShader", 1, 1}, + {"SetDomainShader", 1, 1}, + {"SetHullShader", 1, 1}, + {"SetGeometryShader", 1, 1}, + {"SetPixelShader", 1, 1}, + {"SetComputeShader", 1, 1}, + {"OMSetRenderTargets", 2, 9}, + }; + + for (unsigned int i = 0; i < ARRAY_SIZE(valid_functions); ++i) + { + if (!strcmp(name, valid_functions[i].name)) + return &valid_functions[i]; + } + return NULL; +} + +bool hlsl_validate_state_block_entry(struct hlsl_ctx *ctx, struct hlsl_state_block_entry *entry, + const struct vkd3d_shader_location *loc) +{ + if (entry->is_function_call) + { + const struct state_block_function_info *info = get_state_block_function_info(entry->name); + + if (!info) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_STATE_BLOCK_ENTRY, + "Invalid state block function '%s'.", entry->name); + return false; + } + if (entry->args_count < info->min_args || entry->args_count > info->max_args) + { + if (info->min_args == info->max_args) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_STATE_BLOCK_ENTRY, + "Invalid argument count for state block function '%s' (expected %u).", + entry->name, info->min_args); + } + else + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_STATE_BLOCK_ENTRY, + "Invalid argument count for state block function '%s' (expected from %u to %u).", + entry->name, info->min_args, info->max_args); + } + return false; + } + } + + return true; +} + struct fx_write_context; struct fx_write_context_ops diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 65e5ab17..4a17818e 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1293,6 +1293,9 @@ bool hlsl_clone_block(struct hlsl_ctx *ctx, struct hlsl_block *dst_block, const void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *func); void hlsl_dump_var_default_values(const struct hlsl_ir_var *var); +bool hlsl_validate_state_block_entry(struct hlsl_ctx *ctx, struct hlsl_state_block_entry *entry, + const struct vkd3d_shader_location *loc); + void hlsl_run_const_passes(struct hlsl_ctx *ctx, struct hlsl_block *body); int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 7cba28cd..80e73e38 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -7405,6 +7405,8 @@ state_block: hlsl_src_from_node(&entry->args[i], $4.args[i]); vkd3d_free($4.args); + hlsl_validate_state_block_entry(ctx, entry, &@4); + $$ = $1; state_block_add_entry($$, entry); } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 7d1f4942..f038fd89 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -151,6 +151,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_DUPLICATE_SWITCH_CASE = 5028, VKD3D_SHADER_ERROR_HLSL_MISSING_TECHNIQUE = 5029, VKD3D_SHADER_ERROR_HLSL_UNKNOWN_MODIFIER = 5030, + VKD3D_SHADER_ERROR_HLSL_INVALID_STATE_BLOCK_ENTRY = 5031, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO = 5301, diff --git a/tests/hlsl/state-block-function-syntax.shader_test b/tests/hlsl/state-block-function-syntax.shader_test index da9387b0..6b7d85e3 100644 --- a/tests/hlsl/state-block-function-syntax.shader_test +++ b/tests/hlsl/state-block-function-syntax.shader_test @@ -27,7 +27,7 @@ sampler sam float4 main() : sv_target { return 0; } -[pixel shader fail(sm<6) todo] +[pixel shader fail(sm<6)] sampler sam { SetSomeotherState(); @@ -36,7 +36,7 @@ sampler sam float4 main() : sv_target { return 0; } -[pixel shader fail(sm<6) todo] +[pixel shader fail(sm<6)] sampler sam { Setblendstate(1, 2, 3); // Test case-sensitivity.

1 0