wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against d41a1f0183f5686fa3ed1b42c4de07e393833925.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2024-05-22 07:49:58 +10:00
parent 791a70faf0
commit 68925c8f61
3 changed files with 88 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
patches/odbc-remove-unixodbc/0001-odbc32-Remove-unixODBC-support.patch
View File

@ -1,4 +1,4 @@
From f7f5c6d628fe1daf849b97f28cfe2c536cb6081e Mon Sep 17 00:00:00 2001
From a2aef9e7d59d7f967fa7a0d341a6b13dd52a2ce0 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 2 Feb 2023 14:20:44 +1100
Subject: [PATCH] odbc32: Remove unixODBC support
@ -6,10 +6,10 @@ Subject: [PATCH] odbc32: Remove unixODBC support
---
configure.ac | 10 -
dlls/odbc32/Makefile.in | 5 +-
dlls/odbc32/proxyodbc.c | 1970 +++++----------------
dlls/odbc32/proxyodbc.c | 1968 +++++----------------
dlls/odbc32/unixlib.c | 3673 ---------------------------------------
dlls/odbc32/unixlib.h | 1256 -------------
5 files changed, 419 insertions(+), 6495 deletions(-)
5 files changed, 419 insertions(+), 6493 deletions(-)
delete mode 100644 dlls/odbc32/unixlib.c
delete mode 100644 dlls/odbc32/unixlib.h
@ -51,7 +51,7 @@ index 0ec0ae8eaf4..a42f1473d67 100644
- unixlib.c
+ rsrc.rc
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index c1c43ab8641..3927d00673e 100644
index d5c271bdfa2..3927d00673e 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -40,36 +40,19 @@
@ -654,13 +654,13 @@ index c1c43ab8641..3927d00673e 100644
- struct SQLFetch_params params;
- struct handle *handle = StatementHandle;
- SQLRETURN ret;
-
- TRACE("(StatementHandle %p)\n", StatementHandle);
+ SQLRETURN ret = SQL_ERROR;
- TRACE("(StatementHandle %p)\n", StatementHandle);
- if (!handle) return SQL_INVALID_HANDLE;
+ FIXME("(StatementHandle %p)\n", StatementHandle);
- if (!handle) return SQL_INVALID_HANDLE;
-
- params.StatementHandle = handle->unix_handle;
- if (SUCCESS(( ret = ODBC_CALL( SQLFetch, &params )))) update_result_lengths( handle );
- TRACE("Returning %d\n", ret);
@ -695,13 +695,13 @@ index c1c43ab8641..3927d00673e 100644
- struct SQLFreeConnect_params params;
- struct handle *handle = ConnectionHandle;
- SQLRETURN ret;
-
- TRACE("(ConnectionHandle %p)\n", ConnectionHandle);
+ SQLRETURN ret = SQL_ERROR;
- TRACE("(ConnectionHandle %p)\n", ConnectionHandle);
- if (!handle) return SQL_INVALID_HANDLE;
+ FIXME("(ConnectionHandle %p)\n", ConnectionHandle);
- if (!handle) return SQL_INVALID_HANDLE;
-
- params.ConnectionHandle = handle->unix_handle;
- ret = ODBC_CALL( SQLFreeConnect, &params );
- free( handle );
@ -745,13 +745,13 @@ index c1c43ab8641..3927d00673e 100644
- struct SQLFreeHandle_params params;
- struct handle *handle = Handle;
- SQLRETURN ret;
-
- TRACE("(HandleType %d, Handle %p)\n", HandleType, Handle);
+ SQLRETURN ret = SQL_ERROR;
- TRACE("(HandleType %d, Handle %p)\n", HandleType, Handle);
- if (!handle) return SQL_INVALID_HANDLE;
+ FIXME("(HandleType %d, Handle %p)\n", HandleType, Handle);
- if (!handle) return SQL_INVALID_HANDLE;
-
- params.HandleType = HandleType;
- params.Handle = handle->unix_handle;
- ret = ODBC_CALL( SQLFreeHandle, &params );
@ -768,13 +768,13 @@ index c1c43ab8641..3927d00673e 100644
- struct SQLFreeStmt_params params;
- struct handle *handle = StatementHandle;
- SQLRETURN ret;
-
- TRACE("(StatementHandle %p, Option %d)\n", StatementHandle, Option);
+ SQLRETURN ret = SQL_ERROR;
- if (!handle) return SQL_INVALID_HANDLE;
- TRACE("(StatementHandle %p, Option %d)\n", StatementHandle, Option);
+ FIXME("(StatementHandle %p, Option %d)\n", StatementHandle, Option);
- if (!handle) return SQL_INVALID_HANDLE;
-
- params.StatementHandle = handle->unix_handle;
- params.Option = Option;
- ret = ODBC_CALL( SQLFreeStmt, &params );
@ -993,13 +993,13 @@ index c1c43ab8641..3927d00673e 100644
- struct SQLGetFunctions_params params = { 0, FunctionId, Supported };
- struct handle *handle = ConnectionHandle;
- SQLRETURN ret;
-
- TRACE("(ConnectionHandle %p, FunctionId %d, Supported %p)\n", ConnectionHandle, FunctionId, Supported);
+ SQLRETURN ret = SQL_ERROR;
- if (!handle) return SQL_INVALID_HANDLE;
- TRACE("(ConnectionHandle %p, FunctionId %d, Supported %p)\n", ConnectionHandle, FunctionId, Supported);
+ FIXME("(ConnectionHandle %p, FunctionId %d, Supported %p)\n", ConnectionHandle, FunctionId, Supported);
- if (!handle) return SQL_INVALID_HANDLE;
-
- params.ConnectionHandle = handle->unix_handle;
- ret = ODBC_CALL( SQLGetFunctions, &params );
- TRACE("Returning %d\n", ret);
@ -1060,13 +1060,13 @@ index c1c43ab8641..3927d00673e 100644
- struct SQLGetStmtOption_params params = { 0, Option, Value };
- struct handle *handle = StatementHandle;
- SQLRETURN ret;
-
- TRACE("(StatementHandle %p, Option %d, Value %p)\n", StatementHandle, Option, Value);
+ SQLRETURN ret = SQL_ERROR;
- TRACE("(StatementHandle %p, Option %d, Value %p)\n", StatementHandle, Option, Value);
- if (!handle) return SQL_INVALID_HANDLE;
+ FIXME("(StatementHandle %p, Option %d, Value %p)\n", StatementHandle, Option, Value);
- if (!handle) return SQL_INVALID_HANDLE;
-
- params.StatementHandle = handle->unix_handle;
- ret = ODBC_CALL( SQLGetStmtOption, &params );
- TRACE("Returning %d\n", ret);
@ -1080,13 +1080,13 @@ index c1c43ab8641..3927d00673e 100644
- struct SQLGetTypeInfo_params params = { 0, DataType };
- struct handle *handle = StatementHandle;
- SQLRETURN ret;
-
- TRACE("(StatementHandle %p, DataType %d)\n", StatementHandle, DataType);
+ SQLRETURN ret = SQL_ERROR;
- if (!handle) return SQL_INVALID_HANDLE;
- TRACE("(StatementHandle %p, DataType %d)\n", StatementHandle, DataType);
+ FIXME("(StatementHandle %p, DataType %d)\n", StatementHandle, DataType);
- if (!handle) return SQL_INVALID_HANDLE;
-
- params.StatementHandle = handle->unix_handle;
- ret = ODBC_CALL( SQLGetTypeInfo, &params );
- TRACE("Returning %d\n", ret);
@ -1100,13 +1100,13 @@ index c1c43ab8641..3927d00673e 100644
- struct SQLNumResultCols_params params = { 0, ColumnCount };
- struct handle *handle = StatementHandle;
- SQLRETURN ret;
-
- TRACE("(StatementHandle %p, ColumnCount %p)\n", StatementHandle, ColumnCount);
+ SQLRETURN ret = SQL_ERROR;
- TRACE("(StatementHandle %p, ColumnCount %p)\n", StatementHandle, ColumnCount);
- if (!handle) return SQL_INVALID_HANDLE;
+ FIXME("(StatementHandle %p, ColumnCount %p)\n", StatementHandle, ColumnCount);
- if (!handle) return SQL_INVALID_HANDLE;
-
- params.StatementHandle = handle->unix_handle;
- ret = ODBC_CALL( SQLNumResultCols, &params );
- TRACE("Returning %d ColumnCount %d\n", ret, *ColumnCount);
@ -1161,13 +1161,13 @@ index c1c43ab8641..3927d00673e 100644
- struct SQLPutData_params params = { 0, Data, StrLen_or_Ind };
- struct handle *handle = StatementHandle;
- SQLRETURN ret;
-
- TRACE("(StatementHandle %p, Data %p, StrLen_or_Ind %s)\n", StatementHandle, Data, debugstr_sqllen(StrLen_or_Ind));
+ SQLRETURN ret = SQL_ERROR;
- TRACE("(StatementHandle %p, Data %p, StrLen_or_Ind %s)\n", StatementHandle, Data, debugstr_sqllen(StrLen_or_Ind));
- if (!handle) return SQL_INVALID_HANDLE;
+ FIXME("(StatementHandle %p, Data %p, StrLen_or_Ind %s)\n", StatementHandle, Data, debugstr_sqllen(StrLen_or_Ind));
- if (!handle) return SQL_INVALID_HANDLE;
-
- params.StatementHandle = handle->unix_handle;
- ret = ODBC_CALL( SQLPutData, &params );
- TRACE("Returning %d\n", ret);
@ -1182,13 +1182,13 @@ index c1c43ab8641..3927d00673e 100644
- struct handle *handle = StatementHandle;
- INT64 count;
- SQLRETURN ret;
-
- TRACE("(StatementHandle %p, RowCount %p)\n", StatementHandle, RowCount);
+ SQLRETURN ret = SQL_ERROR;
- if (!handle) return SQL_INVALID_HANDLE;
- TRACE("(StatementHandle %p, RowCount %p)\n", StatementHandle, RowCount);
+ FIXME("(StatementHandle %p, RowCount %p)\n", StatementHandle, RowCount);
- if (!handle) return SQL_INVALID_HANDLE;
-
- params.StatementHandle = handle->unix_handle;
- params.RowCount = &count;
- if (SUCCESS((ret = ODBC_CALL( SQLRowCount, &params ))) && RowCount)
@ -1312,7 +1312,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -1266,18 +766,11 @@ SQLRETURN WINAPI SQLSetDescRec(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber,
@@ -1266,16 +766,11 @@ SQLRETURN WINAPI SQLSetDescRec(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber,
SQLRETURN WINAPI SQLSetEnvAttr(SQLHENV EnvironmentHandle, SQLINTEGER Attribute, SQLPOINTER Value,
SQLINTEGER StringLength)
{
@ -1325,15 +1325,13 @@ index c1c43ab8641..3927d00673e 100644
+ FIXME("(EnvironmentHandle %p, Attribute %d, Value %p, StringLength %d)\n", EnvironmentHandle, Attribute, Value,
StringLength);
- if (!handle) return SQL_INVALID_HANDLE;
-
- params.EnvironmentHandle = handle->unix_handle;
- params.EnvironmentHandle = handle ? handle->unix_handle : 0;
- ret = ODBC_CALL( SQLSetEnvAttr, &params );
- TRACE("Returning %d\n", ret);
return ret;
}
@@ -1288,22 +781,12 @@ SQLRETURN WINAPI SQLSetParam(SQLHSTMT StatementHandle, SQLUSMALLINT ParameterNum
@@ -1286,22 +781,12 @@ SQLRETURN WINAPI SQLSetParam(SQLHSTMT StatementHandle, SQLUSMALLINT ParameterNum
SQLSMALLINT ParameterType, SQLULEN LengthPrecision, SQLSMALLINT ParameterScale,
SQLPOINTER ParameterValue, SQLLEN *StrLen_or_Ind)
{
@ -1358,7 +1356,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -1313,18 +796,11 @@ SQLRETURN WINAPI SQLSetParam(SQLHSTMT StatementHandle, SQLUSMALLINT ParameterNum
@@ -1311,18 +796,11 @@ SQLRETURN WINAPI SQLSetParam(SQLHSTMT StatementHandle, SQLUSMALLINT ParameterNum
SQLRETURN WINAPI SQLSetStmtAttr(SQLHSTMT StatementHandle, SQLINTEGER Attribute, SQLPOINTER Value,
SQLINTEGER StringLength)
{
@ -1379,7 +1377,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -1333,17 +809,10 @@ SQLRETURN WINAPI SQLSetStmtAttr(SQLHSTMT StatementHandle, SQLINTEGER Attribute,
@@ -1331,17 +809,10 @@ SQLRETURN WINAPI SQLSetStmtAttr(SQLHSTMT StatementHandle, SQLINTEGER Attribute,
*/
SQLRETURN WINAPI SQLSetStmtOption(SQLHSTMT StatementHandle, SQLUSMALLINT Option, SQLULEN Value)
{
@ -1399,7 +1397,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -1355,22 +824,14 @@ SQLRETURN WINAPI SQLSpecialColumns(SQLHSTMT StatementHandle, SQLUSMALLINT Identi
@@ -1353,22 +824,14 @@ SQLRETURN WINAPI SQLSpecialColumns(SQLHSTMT StatementHandle, SQLUSMALLINT Identi
SQLCHAR *TableName, SQLSMALLINT NameLength3, SQLUSMALLINT Scope,
SQLUSMALLINT Nullable)
{
@ -1424,7 +1422,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -1381,22 +842,14 @@ SQLRETURN WINAPI SQLStatistics(SQLHSTMT StatementHandle, SQLCHAR *CatalogName, S
@@ -1379,22 +842,14 @@ SQLRETURN WINAPI SQLStatistics(SQLHSTMT StatementHandle, SQLCHAR *CatalogName, S
SQLCHAR *SchemaName, SQLSMALLINT NameLength2, SQLCHAR *TableName,
SQLSMALLINT NameLength3, SQLUSMALLINT Unique, SQLUSMALLINT Reserved)
{
@ -1449,7 +1447,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -1407,23 +860,15 @@ SQLRETURN WINAPI SQLTables(SQLHSTMT StatementHandle, SQLCHAR *CatalogName, SQLSM
@@ -1405,23 +860,15 @@ SQLRETURN WINAPI SQLTables(SQLHSTMT StatementHandle, SQLCHAR *CatalogName, SQLSM
SQLCHAR *SchemaName, SQLSMALLINT NameLength2, SQLCHAR *TableName,
SQLSMALLINT NameLength3, SQLCHAR *TableType, SQLSMALLINT NameLength4)
{
@ -1475,7 +1473,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -1432,42 +877,27 @@ SQLRETURN WINAPI SQLTables(SQLHSTMT StatementHandle, SQLCHAR *CatalogName, SQLSM
@@ -1430,42 +877,27 @@ SQLRETURN WINAPI SQLTables(SQLHSTMT StatementHandle, SQLCHAR *CatalogName, SQLSM
*/
SQLRETURN WINAPI SQLTransact(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle, SQLUSMALLINT CompletionType)
{
@ -1527,7 +1525,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -1476,149 +906,96 @@ SQLRETURN WINAPI SQLBrowseConnect(SQLHDBC ConnectionHandle, SQLCHAR *InConnectio
@@ -1474,149 +906,96 @@ SQLRETURN WINAPI SQLBrowseConnect(SQLHDBC ConnectionHandle, SQLCHAR *InConnectio
*/
SQLRETURN WINAPI SQLBulkOperations(SQLHSTMT StatementHandle, SQLSMALLINT Operation)
{
@ -1720,7 +1718,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -1627,381 +1004,213 @@ SQLRETURN WINAPI SQLForeignKeys(SQLHSTMT StatementHandle, SQLCHAR *PkCatalogName
@@ -1625,381 +1004,213 @@ SQLRETURN WINAPI SQLForeignKeys(SQLHSTMT StatementHandle, SQLCHAR *PkCatalogName
*/
SQLRETURN WINAPI SQLMoreResults(SQLHSTMT StatementHandle)
{
@ -2190,7 +2188,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2012,20 +1221,12 @@ SQLRETURN WINAPI SQLConnectW(SQLHDBC ConnectionHandle, WCHAR *ServerName, SQLSMA
@@ -2010,20 +1221,12 @@ SQLRETURN WINAPI SQLConnectW(SQLHDBC ConnectionHandle, WCHAR *ServerName, SQLSMA
WCHAR *UserName, SQLSMALLINT NameLength2, WCHAR *Authentication,
SQLSMALLINT NameLength3)
{
@ -2213,7 +2211,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2036,36 +1237,15 @@ SQLRETURN WINAPI SQLDescribeColW(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNu
@@ -2034,36 +1237,15 @@ SQLRETURN WINAPI SQLDescribeColW(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNu
SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, SQLSMALLINT *DataType,
SQLULEN *ColumnSize, SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable)
{
@ -2253,7 +2251,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2073,28 +1253,15 @@ SQLRETURN WINAPI SQLDescribeColW(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNu
@@ -2071,28 +1253,15 @@ SQLRETURN WINAPI SQLDescribeColW(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNu
* SQLErrorW [ODBC32.110]
*/
SQLRETURN WINAPI SQLErrorW(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle, SQLHSTMT StatementHandle,
@ -2286,7 +2284,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2103,18 +1270,11 @@ SQLRETURN WINAPI SQLErrorW(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle,
@@ -2101,18 +1270,11 @@ SQLRETURN WINAPI SQLErrorW(SQLHENV EnvironmentHandle, SQLHDBC ConnectionHandle,
*/
SQLRETURN WINAPI SQLExecDirectW(SQLHSTMT StatementHandle, WCHAR *StatementText, SQLINTEGER TextLength)
{
@ -2307,7 +2305,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2124,18 +1284,11 @@ SQLRETURN WINAPI SQLExecDirectW(SQLHSTMT StatementHandle, WCHAR *StatementText,
@@ -2122,18 +1284,11 @@ SQLRETURN WINAPI SQLExecDirectW(SQLHSTMT StatementHandle, WCHAR *StatementText,
SQLRETURN WINAPI SQLGetCursorNameW(SQLHSTMT StatementHandle, WCHAR *CursorName, SQLSMALLINT BufferLength,
SQLSMALLINT *NameLength)
{
@ -2328,7 +2326,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2144,18 +1297,11 @@ SQLRETURN WINAPI SQLGetCursorNameW(SQLHSTMT StatementHandle, WCHAR *CursorName,
@@ -2142,18 +1297,11 @@ SQLRETURN WINAPI SQLGetCursorNameW(SQLHSTMT StatementHandle, WCHAR *CursorName,
*/
SQLRETURN WINAPI SQLPrepareW(SQLHSTMT StatementHandle, WCHAR *StatementText, SQLINTEGER TextLength)
{
@ -2349,7 +2347,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2164,18 +1310,11 @@ SQLRETURN WINAPI SQLPrepareW(SQLHSTMT StatementHandle, WCHAR *StatementText, SQL
@@ -2162,18 +1310,11 @@ SQLRETURN WINAPI SQLPrepareW(SQLHSTMT StatementHandle, WCHAR *StatementText, SQL
*/
SQLRETURN WINAPI SQLSetCursorNameW(SQLHSTMT StatementHandle, WCHAR *CursorName, SQLSMALLINT NameLength)
{
@ -2370,7 +2368,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2187,30 +1326,12 @@ SQLRETURN WINAPI SQLColAttributeW(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnN
@@ -2185,30 +1326,12 @@ SQLRETURN WINAPI SQLColAttributeW(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnN
SQLSMALLINT BufferLength, SQLSMALLINT *StringLength,
SQLLEN *NumericAttribute)
{
@ -2403,7 +2401,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2220,18 +1341,11 @@ SQLRETURN WINAPI SQLColAttributeW(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnN
@@ -2218,18 +1341,11 @@ SQLRETURN WINAPI SQLColAttributeW(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnN
SQLRETURN WINAPI SQLGetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER Attribute, SQLPOINTER Value,
SQLINTEGER BufferLength, SQLINTEGER *StringLength)
{
@ -2424,7 +2422,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2241,18 +1355,11 @@ SQLRETURN WINAPI SQLGetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER Attribu
@@ -2239,18 +1355,11 @@ SQLRETURN WINAPI SQLGetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER Attribu
SQLRETURN WINAPI SQLGetDescFieldW(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
SQLPOINTER Value, SQLINTEGER BufferLength, SQLINTEGER *StringLength)
{
@ -2445,7 +2443,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2264,22 +1371,12 @@ SQLRETURN WINAPI SQLGetDescRecW(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber
@@ -2262,22 +1371,12 @@ SQLRETURN WINAPI SQLGetDescRecW(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber
SQLSMALLINT *SubType, SQLLEN *Length, SQLSMALLINT *Precision,
SQLSMALLINT *Scale, SQLSMALLINT *Nullable)
{
@ -2470,7 +2468,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2290,43 +1387,27 @@ SQLRETURN WINAPI SQLGetDiagFieldW(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLS
@@ -2288,43 +1387,27 @@ SQLRETURN WINAPI SQLGetDiagFieldW(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLS
SQLSMALLINT DiagIdentifier, SQLPOINTER DiagInfo, SQLSMALLINT BufferLength,
SQLSMALLINT *StringLength)
{
@ -2522,7 +2520,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2336,11 +1417,9 @@ SQLRETURN WINAPI SQLGetDiagRecW(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMA
@@ -2334,11 +1417,9 @@ SQLRETURN WINAPI SQLGetDiagRecW(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMA
SQLRETURN WINAPI SQLGetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Attribute, SQLPOINTER Value,
SQLINTEGER BufferLength, SQLINTEGER *StringLength)
{
@ -2536,7 +2534,7 @@ index c1c43ab8641..3927d00673e 100644
Attribute, Value, BufferLength, StringLength);
if (!Value)
@@ -2349,11 +1428,6 @@ SQLRETURN WINAPI SQLGetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Attribute,
@@ -2347,11 +1428,6 @@ SQLRETURN WINAPI SQLGetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Attribute,
return SQL_ERROR;
}
@ -2548,7 +2546,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2363,18 +1437,11 @@ SQLRETURN WINAPI SQLGetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Attribute,
@@ -2361,18 +1437,11 @@ SQLRETURN WINAPI SQLGetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Attribute,
SQLRETURN WINAPI SQLSetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER Attribute, SQLPOINTER Value,
SQLINTEGER StringLength)
{
@ -2570,7 +2568,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2385,21 +1452,14 @@ SQLRETURN WINAPI SQLColumnsW(SQLHSTMT StatementHandle, WCHAR *CatalogName, SQLSM
@@ -2383,21 +1452,14 @@ SQLRETURN WINAPI SQLColumnsW(SQLHSTMT StatementHandle, WCHAR *CatalogName, SQLSM
WCHAR *SchemaName, SQLSMALLINT NameLength2, WCHAR *TableName,
SQLSMALLINT NameLength3, WCHAR *ColumnName, SQLSMALLINT NameLength4)
{
@ -2595,7 +2593,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2410,21 +1470,13 @@ SQLRETURN WINAPI SQLDriverConnectW(SQLHDBC ConnectionHandle, SQLHWND WindowHandl
@@ -2408,21 +1470,13 @@ SQLRETURN WINAPI SQLDriverConnectW(SQLHDBC ConnectionHandle, SQLHWND WindowHandl
SQLSMALLINT Length, WCHAR *OutConnectionString, SQLSMALLINT BufferLength,
SQLSMALLINT *Length2, SQLUSMALLINT DriverCompletion)
{
@ -2619,7 +2617,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2433,17 +1485,10 @@ SQLRETURN WINAPI SQLDriverConnectW(SQLHDBC ConnectionHandle, SQLHWND WindowHandl
@@ -2431,17 +1485,10 @@ SQLRETURN WINAPI SQLDriverConnectW(SQLHDBC ConnectionHandle, SQLHWND WindowHandl
*/
SQLRETURN WINAPI SQLGetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLPOINTER Value)
{
@ -2639,7 +2637,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2453,18 +1498,11 @@ SQLRETURN WINAPI SQLGetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Opt
@@ -2451,18 +1498,11 @@ SQLRETURN WINAPI SQLGetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Opt
SQLRETURN WINAPI SQLGetInfoW(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQLPOINTER InfoValue,
SQLSMALLINT BufferLength, SQLSMALLINT *StringLength)
{
@ -2660,7 +2658,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2473,17 +1511,10 @@ SQLRETURN WINAPI SQLGetInfoW(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQ
@@ -2471,17 +1511,10 @@ SQLRETURN WINAPI SQLGetInfoW(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQ
*/
SQLRETURN WINAPI SQLGetTypeInfoW(SQLHSTMT StatementHandle, SQLSMALLINT DataType)
{
@ -2680,7 +2678,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2492,17 +1523,10 @@ SQLRETURN WINAPI SQLGetTypeInfoW(SQLHSTMT StatementHandle, SQLSMALLINT DataType)
@@ -2490,17 +1523,10 @@ SQLRETURN WINAPI SQLGetTypeInfoW(SQLHSTMT StatementHandle, SQLSMALLINT DataType)
*/
SQLRETURN WINAPI SQLSetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLLEN Value)
{
@ -2700,7 +2698,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2514,21 +1538,13 @@ SQLRETURN WINAPI SQLSpecialColumnsW(SQLHSTMT StatementHandle, SQLUSMALLINT Ident
@@ -2512,21 +1538,13 @@ SQLRETURN WINAPI SQLSpecialColumnsW(SQLHSTMT StatementHandle, SQLUSMALLINT Ident
SQLSMALLINT NameLength2, SQLWCHAR *TableName, SQLSMALLINT NameLength3,
SQLUSMALLINT Scope, SQLUSMALLINT Nullable)
{
@ -2724,7 +2722,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2539,21 +1555,13 @@ SQLRETURN WINAPI SQLStatisticsW(SQLHSTMT StatementHandle, SQLWCHAR *CatalogName,
@@ -2537,21 +1555,13 @@ SQLRETURN WINAPI SQLStatisticsW(SQLHSTMT StatementHandle, SQLWCHAR *CatalogName,
SQLWCHAR *SchemaName, SQLSMALLINT NameLength2, SQLWCHAR *TableName,
SQLSMALLINT NameLength3, SQLUSMALLINT Unique, SQLUSMALLINT Reserved)
{
@ -2748,7 +2746,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2564,71 +1572,47 @@ SQLRETURN WINAPI SQLTablesW(SQLHSTMT StatementHandle, SQLWCHAR *CatalogName, SQL
@@ -2562,71 +1572,47 @@ SQLRETURN WINAPI SQLTablesW(SQLHSTMT StatementHandle, SQLWCHAR *CatalogName, SQL
SQLWCHAR *SchemaName, SQLSMALLINT NameLength2, SQLWCHAR *TableName,
SQLSMALLINT NameLength3, SQLWCHAR *TableType, SQLSMALLINT NameLength4)
{
@ -2838,7 +2836,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2639,215 +1623,136 @@ SQLRETURN WINAPI SQLDataSourcesW(SQLHENV EnvironmentHandle, SQLUSMALLINT Directi
@@ -2637,215 +1623,136 @@ SQLRETURN WINAPI SQLDataSourcesW(SQLHENV EnvironmentHandle, SQLUSMALLINT Directi
SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1, WCHAR *Description,
SQLSMALLINT BufferLength2, SQLSMALLINT *NameLength2)
{
@ -3117,7 +3115,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2857,18 +1762,11 @@ SQLRETURN WINAPI SQLDriversW(SQLHENV EnvironmentHandle, SQLUSMALLINT Direction,
@@ -2855,18 +1762,11 @@ SQLRETURN WINAPI SQLDriversW(SQLHENV EnvironmentHandle, SQLUSMALLINT Direction,
SQLRETURN WINAPI SQLSetDescFieldW(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumber, SQLSMALLINT FieldIdentifier,
SQLPOINTER Value, SQLINTEGER BufferLength)
{
@ -3138,7 +3136,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2878,24 +1776,11 @@ SQLRETURN WINAPI SQLSetDescFieldW(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumb
@@ -2876,24 +1776,11 @@ SQLRETURN WINAPI SQLSetDescFieldW(SQLHDESC DescriptorHandle, SQLSMALLINT RecNumb
SQLRETURN WINAPI SQLSetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Attribute, SQLPOINTER Value,
SQLINTEGER StringLength)
{
@ -3166,7 +3164,7 @@ index c1c43ab8641..3927d00673e 100644
return ret;
}
@@ -2903,33 +1788,14 @@ SQLRETURN WINAPI SQLSetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Attribute,
@@ -2901,33 +1788,14 @@ SQLRETURN WINAPI SQLSetStmtAttrW(SQLHSTMT StatementHandle, SQLINTEGER Attribute,
* SQLGetDiagRecA [ODBC32.236]
*/
SQLRETURN WINAPI SQLGetDiagRecA(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMALLINT RecNumber,

28
patches/user32-rawinput-mouse/0004-server-Add-send_hardware_message-flags-for-rawinput-.patch
View File

@ -1,7 +1,7 @@
From 5e9af0573526693cbc98ad8282b5f2023c6b5bf7 Mon Sep 17 00:00:00 2001
From b08aae4c2d967c0c66f4349584d2e33de353b5ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 26 Aug 2019 14:37:20 +0200
Subject: [PATCH 4/7] server: Add send_hardware_message flags for rawinput
Subject: [PATCH] server: Add send_hardware_message flags for rawinput
translation.
---
@ -26,10 +26,10 @@ index f947fec7fea..4ded432bd99 100644
{
UINT flags;
diff --git a/server/protocol.def b/server/protocol.def
index 7b21aa16636..8e483bf3bbf 100644
index 054d47eb81f..d847f046eeb 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -2126,7 +2126,7 @@ enum message_type
@@ -2164,7 +2164,7 @@ enum message_type
@REQ(send_hardware_message)
user_handle_t win; /* window handle */
hw_input_t input; /* input data */
@ -38,7 +38,7 @@ index 7b21aa16636..8e483bf3bbf 100644
VARARG(report,bytes); /* HID report data */
@REPLY
int wait; /* do we need to wait for a reply? */
@@ -2135,7 +2135,6 @@ enum message_type
@@ -2173,7 +2173,6 @@ enum message_type
int new_x; /* new cursor position */
int new_y;
@END
@ -47,10 +47,10 @@ index 7b21aa16636..8e483bf3bbf 100644
/* Get a message from the current queue */
diff --git a/server/queue.c b/server/queue.c
index 67c03c10b40..0687a7feac1 100644
index 938e3e310e5..eb3a2b0326e 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -1983,7 +1983,7 @@ static void dispatch_rawinput_message( struct desktop *desktop, struct rawinput_
@@ -2027,7 +2027,7 @@ static void dispatch_rawinput_message( struct desktop *desktop, struct rawinput_
/* queue a hardware message for a mouse event */
static int queue_mouse_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input,
@ -59,7 +59,7 @@ index 67c03c10b40..0687a7feac1 100644
{
const struct rawinput_device *device;
struct hardware_msg_data *msg_data;
@@ -2038,7 +2038,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
@@ -2082,7 +2082,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
y = desktop->cursor.y;
}
@ -68,7 +68,7 @@ index 67c03c10b40..0687a7feac1 100644
{
memset( &raw_msg, 0, sizeof(raw_msg) );
raw_msg.foreground = foreground;
@@ -2060,6 +2060,8 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
@@ -2104,6 +2104,8 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
return 0;
}
@ -77,7 +77,7 @@ index 67c03c10b40..0687a7feac1 100644
for (i = 0; i < ARRAY_SIZE( messages ); i++)
{
if (!messages[i]) continue;
@@ -2091,7 +2093,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
@@ -2135,7 +2137,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons
/* queue a hardware message for a keyboard event */
static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input,
@ -86,8 +86,8 @@ index 67c03c10b40..0687a7feac1 100644
{
struct hw_msg_source source = { IMDT_KEYBOARD, origin };
const struct rawinput_device *device;
@@ -2168,7 +2170,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c
break;
@@ -2234,7 +2236,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c
}
}
- if ((foreground = get_foreground_thread( desktop, win )))
@ -95,7 +95,7 @@ index 67c03c10b40..0687a7feac1 100644
{
struct rawinput_message raw_msg = {0};
raw_msg.foreground = foreground;
@@ -2189,6 +2191,8 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c
@@ -2255,6 +2257,8 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c
return 0;
}
@ -104,7 +104,7 @@ index 67c03c10b40..0687a7feac1 100644
if (!(msg = alloc_hardware_message( input->kbd.info, source, time, 0 ))) return 0;
msg_data = msg->data;
@@ -2936,10 +2940,10 @@ DECL_HANDLER(send_hardware_message)
@@ -3010,10 +3014,10 @@ DECL_HANDLER(send_hardware_message)
switch (req->input.type)
{
case INPUT_MOUSE:

2
staging/upstream-commit
View File

@ -1 +1 @@
fd1da4521e68042cbb3ce88124415c22761ae9dd
d41a1f0183f5686fa3ed1b42c4de07e393833925