[PATCH 0/1] MR922: odbc: SQLGetInfoW allow NULL parameter InfoValue.

[Alistair Leslie-Hughes (＠alesliehughes)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53714

MSDN states, a NULL InfoValue parameter will return as the length.
unixODBC which we currently use, handles this scenario.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/922

[PATCH 1/1] odbc: SQLGetInfoW allow NULL parameter InfoValue.

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53714

MSDN states, a NULL InfoValue parameter will return as the length.
unixODBC which we currently use, handles this scenario.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
 dlls/odbc32/proxyodbc.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index c1cb44c29fc..714819993ee 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;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/922