Module: wine Branch: oldstable Commit: 87ce92d1a7c2e4ed3fd8d98b165cc23d9f0307d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/87ce92d1a7c2e4ed3fd8d98b165cc23...
Author: Alistair Leslie-Hughes leslie_alistair@hotmail.com Date: Sat Sep 24 17:01:35 2022 +1000
odbc: SQLGetInfoW allow NULL parameter InfoValue.
MSDN states, a NULL InfoValue parameter will return as the length. unixODBC which we currently use, handles this scenario.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53714 Signed-off-by: Alistair Leslie-Hughes leslie_alistair@hotmail.com (cherry picked from commit e8b7c1da6cc7de8374c02df126719844e4744bb5) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/odbc32/proxyodbc.c | 12 ------------ 1 file changed, 12 deletions(-)
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 573a5b280a2..d60c2518736 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -1041,12 +1041,6 @@ SQLRETURN WINAPI SQLGetInfo(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQL TRACE("(ConnectionHandle, %p, InfoType %d, InfoValue %p, BufferLength %d, StringLength %p)\n", ConnectionHandle, InfoType, InfoValue, BufferLength, StringLength);
- if (!InfoValue) - { - WARN("Unexpected NULL InfoValue address\n"); - return SQL_ERROR; - } - ret = ODBC_CALL( SQLGetInfo, ¶ms ); TRACE("Returning %d\n", ret); return ret; @@ -2246,12 +2240,6 @@ SQLRETURN WINAPI SQLGetInfoW(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQ TRACE("(ConnectionHandle, %p, InfoType %d, InfoValue %p, BufferLength %d, StringLength %p)\n", ConnectionHandle, InfoType, InfoValue, BufferLength, StringLength);
- if (!InfoValue) - { - WARN("Unexpected NULL InfoValue address\n"); - return SQL_ERROR; - } - ret = ODBC_CALL( SQLGetInfoW, ¶ms ); TRACE("Returning %d\n", ret); return ret;