diff --git a/patches/inseng-Implementation/0001-inseng-Implement-CIF-reader-and-download-functions.patch b/patches/inseng-Implementation/0001-inseng-Implement-CIF-reader-and-download-functions.patch index a9f18d80..242fc5b0 100644 --- a/patches/inseng-Implementation/0001-inseng-Implement-CIF-reader-and-download-functions.patch +++ b/patches/inseng-Implementation/0001-inseng-Implement-CIF-reader-and-download-functions.patch @@ -1,4 +1,4 @@ -From bfbe6a0ac4ea5d75a58c09e677dfb01bcb2e85cf Mon Sep 17 00:00:00 2001 +From f76d5c65c07a184d56a9be4e8f77fa92886bb309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 5 Sep 2016 15:31:29 +0200 Subject: [PATCH] inseng: Implement CIF reader and download functions. @@ -9,10 +9,10 @@ FIXME: Needs splitting. dlls/inseng/icif.c | 1745 ++++++++++++++++++++++++++++++++++ dlls/inseng/inf.c | 443 +++++++++ dlls/inseng/inseng.spec | 4 +- - dlls/inseng/inseng_main.c | 990 ++++++++++++++++++- + dlls/inseng/inseng_main.c | 989 ++++++++++++++++++- dlls/inseng/inseng_private.h | 79 ++ include/inseng.idl | 276 +++++- - 7 files changed, 3488 insertions(+), 53 deletions(-) + 7 files changed, 3488 insertions(+), 52 deletions(-) create mode 100644 dlls/inseng/icif.c create mode 100644 dlls/inseng/inf.c create mode 100644 dlls/inseng/inseng_private.h @@ -2247,7 +2247,7 @@ index 82c0b4d5fe1..7ae46fad3a7 100644 +@ stdcall GetICifRWFileFromFile(ptr str) @ stub PurgeDownloadDirectory diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c -index c72a12955b8..88017536874 100644 +index f7ce3f173c2..81eb1ec4f13 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -2,6 +2,7 @@ @@ -2258,7 +2258,7 @@ index c72a12955b8..88017536874 100644 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public -@@ -28,17 +29,68 @@ +@@ -28,16 +29,68 @@ #include "winuser.h" #include "ole2.h" #include "rpcproxy.h" @@ -2270,7 +2270,6 @@ index c72a12955b8..88017536874 100644 +#include "inseng_private.h" + #include "wine/debug.h" --#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(inseng); @@ -2328,7 +2327,7 @@ index c72a12955b8..88017536874 100644 }; static inline InstallEngine *impl_from_IInstallEngine2(IInstallEngine2 *iface) -@@ -46,6 +98,250 @@ static inline InstallEngine *impl_from_IInstallEngine2(IInstallEngine2 *iface) +@@ -45,6 +98,250 @@ static inline InstallEngine *impl_from_IInstallEngine2(IInstallEngine2 *iface) return CONTAINING_RECORD(iface, InstallEngine, IInstallEngine2_iface); } @@ -2579,7 +2578,7 @@ index c72a12955b8..88017536874 100644 static HRESULT WINAPI InstallEngine_QueryInterface(IInstallEngine2 *iface, REFIID riid, void **ppv) { InstallEngine *This = impl_from_IInstallEngine2(iface); -@@ -59,13 +355,16 @@ static HRESULT WINAPI InstallEngine_QueryInterface(IInstallEngine2 *iface, REFII +@@ -58,13 +355,16 @@ static HRESULT WINAPI InstallEngine_QueryInterface(IInstallEngine2 *iface, REFII }else if(IsEqualGUID(&IID_IInstallEngine2, riid)) { TRACE("(%p)->(IID_IInstallEngine2 %p)\n", This, ppv); *ppv = &This->IInstallEngine2_iface; @@ -2598,7 +2597,7 @@ index c72a12955b8..88017536874 100644 return S_OK; } -@@ -86,181 +385,726 @@ static ULONG WINAPI InstallEngine_Release(IInstallEngine2 *iface) +@@ -85,181 +385,726 @@ static ULONG WINAPI InstallEngine_Release(IInstallEngine2 *iface) TRACE("(%p) ref=%ld\n", This, ref); @@ -2608,9 +2607,9 @@ index c72a12955b8..88017536874 100644 + if (This->icif) + ICifFile_Release(This->icif); + -+ heap_free(This->baseurl); -+ heap_free(This->downloaddir); - heap_free(This); ++ free(This->baseurl); ++ free(This->downloaddir); + free(This); + } return ref; @@ -3361,7 +3360,7 @@ index c72a12955b8..88017536874 100644 InstallEngine_QueryInterface, InstallEngine_AddRef, InstallEngine_Release, -@@ -290,6 +1134,70 @@ static const IInstallEngine2Vtbl InstallEngine2Vtbl = { +@@ -289,6 +1134,70 @@ static const IInstallEngine2Vtbl InstallEngine2Vtbl = { InstallEngine2_GetICifFile }; @@ -3432,12 +3431,12 @@ index c72a12955b8..88017536874 100644 static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; -@@ -334,12 +1242,14 @@ static HRESULT WINAPI InstallEngineCF_CreateInstance(IClassFactory *iface, IUnkn +@@ -333,12 +1242,14 @@ static HRESULT WINAPI InstallEngineCF_CreateInstance(IClassFactory *iface, IUnkn TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); -- engine = heap_alloc(sizeof(*engine)); -+ engine = heap_alloc_zero(sizeof(*engine)); +- engine = malloc(sizeof(*engine)); ++ engine = calloc(1, sizeof(*engine)); if(!engine) return E_OUTOFMEMORY; diff --git a/patches/odbc-remove-unixodbc/0001-odbc32-Remove-unixODBC-support.patch b/patches/odbc-remove-unixodbc/0001-odbc32-Remove-unixODBC-support.patch index 643d178e..3443e4d1 100644 --- a/patches/odbc-remove-unixodbc/0001-odbc32-Remove-unixODBC-support.patch +++ b/patches/odbc-remove-unixodbc/0001-odbc32-Remove-unixODBC-support.patch @@ -1,4 +1,4 @@ -From d5d4bf5bd38c5567ea475c6528120fdc44b0f7f6 Mon Sep 17 00:00:00 2001 +From 7d53aa3bef76743b3cef0362d1b8206bdbbca087 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 2 Feb 2023 14:20:44 +1100 Subject: [PATCH] odbc32: Remove unixODBC support @@ -6,19 +6,19 @@ Subject: [PATCH] odbc32: Remove unixODBC support --- configure.ac | 3 - dlls/odbc32/Makefile.in | 3 +- - dlls/odbc32/proxyodbc.c | 1326 +++++++-------------------------------- - dlls/odbc32/unixlib.c | 1272 ------------------------------------- + dlls/odbc32/proxyodbc.c | 1326 ++++++---------------------------- + dlls/odbc32/unixlib.c | 1501 --------------------------------------- dlls/odbc32/unixlib.h | 278 -------- include/config.h.in | 3 - - 6 files changed, 237 insertions(+), 2648 deletions(-) + 6 files changed, 237 insertions(+), 2877 deletions(-) delete mode 100644 dlls/odbc32/unixlib.c delete mode 100644 dlls/odbc32/unixlib.h diff --git a/configure.ac b/configure.ac -index 603aadf2924..ba80dfe58f8 100644 +index 3a9ea346a55..077bf9ad390 100644 --- a/configure.ac +++ b/configure.ac -@@ -1796,9 +1796,6 @@ then +@@ -1797,9 +1797,6 @@ then AC_SUBST(PROCSTAT_LIBS,"-lprocstat")]) fi @@ -2626,10 +2626,10 @@ index 679f3d7380e..e8574430e74 100644 -} diff --git a/dlls/odbc32/unixlib.c b/dlls/odbc32/unixlib.c deleted file mode 100644 -index 8458406d8c0..00000000000 +index 2883a5fb56a..00000000000 --- a/dlls/odbc32/unixlib.c +++ /dev/null -@@ -1,1272 +0,0 @@ +@@ -1,1501 +0,0 @@ -/* - * Win32 ODBC functions - * @@ -2822,6 +2822,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLAllocConnect_params *params = args; - +- if (!pSQLAllocConnect) return SQL_ERROR; - return pSQLAllocConnect(params->EnvironmentHandle, params->ConnectionHandle); -} - @@ -2829,6 +2830,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLAllocEnv_params *params = args; - +- if (!pSQLAllocEnv) return SQL_ERROR; - return pSQLAllocEnv(params->EnvironmentHandle); -} - @@ -2836,6 +2838,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLAllocHandle_params *params = args; - +- if (!pSQLAllocHandle) return SQL_ERROR; - return pSQLAllocHandle(params->HandleType, params->InputHandle, params->OutputHandle); -} - @@ -2843,6 +2846,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLAllocHandleStd_params *params = args; - +- if (!pSQLAllocHandleStd) return SQL_ERROR; - return pSQLAllocHandleStd(params->HandleType, params->InputHandle, params->OutputHandle); -} - @@ -2850,6 +2854,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLAllocStmt_params *params = args; - +- if (!pSQLAllocStmt) return SQL_ERROR; - return pSQLAllocStmt(params->ConnectionHandle, params->StatementHandle); -} - @@ -2857,6 +2862,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLBindCol_params *params = args; - +- if (!pSQLBindCol) return SQL_ERROR; - return pSQLBindCol(params->StatementHandle, params->ColumnNumber, params->TargetType, - params->TargetValue, params->BufferLength, params->StrLen_or_Ind); -} @@ -2865,6 +2871,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLBindParam_params *params = args; - +- if (!pSQLBindParam) return SQL_ERROR; - return pSQLBindParam(params->StatementHandle, params->ParameterNumber, params->ValueType, - params->ParameterType, params->LengthPrecision, params->ParameterScale, - params->ParameterValue, params->StrLen_or_Ind); @@ -2874,6 +2881,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLBindParameter_params *params = args; - +- if (!pSQLBindParameter) return SQL_ERROR; - return pSQLBindParameter(params->hstmt, params->ipar, params->fParamType, params->fCType, - params->fSqlType, params->cbColDef, params->ibScale, params->rgbValue, - params->cbValueMax, params->pcbValue); @@ -2883,6 +2891,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLBrowseConnect_params *params = args; - +- if (!pSQLBrowseConnect) return SQL_ERROR; - return pSQLBrowseConnect(params->hdbc, params->szConnStrIn, params->cbConnStrIn, params->szConnStrOut, - params->cbConnStrOutMax, params->pcbConnStrOut); -} @@ -2891,6 +2900,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLBrowseConnectW_params *params = args; - +- if (!pSQLBrowseConnectW) return SQL_ERROR; - return pSQLBrowseConnectW(params->hdbc, params->szConnStrIn, params->cbConnStrIn, params->szConnStrOut, - params->cbConnStrOutMax, params->pcbConnStrOut); -} @@ -2899,6 +2909,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLBulkOperations_params *params = args; - +- if (!pSQLBulkOperations) return SQL_ERROR; - return pSQLBulkOperations(params->StatementHandle, params->Operation); -} - @@ -2906,6 +2917,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLCancel_params *params = args; - +- if (!pSQLCancel) return SQL_ERROR; - return pSQLCancel(params->StatementHandle); -} - @@ -2913,6 +2925,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLCloseCursor_params *params = args; - +- if (!pSQLCloseCursor) return SQL_ERROR; - return pSQLCloseCursor(params->StatementHandle); -} - @@ -2920,6 +2933,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLColAttribute_params *params = args; - +- if (!pSQLColAttribute) return SQL_ERROR; - return pSQLColAttribute(params->StatementHandle, params->ColumnNumber, params->FieldIdentifier, - params->CharacterAttribute, params->BufferLength, params->StringLength, - params->NumericAttribute); @@ -2929,6 +2943,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLColAttributeW_params *params = args; - +- if (!pSQLColAttributeW) return SQL_ERROR; - return pSQLColAttributeW(params->StatementHandle, params->ColumnNumber, params->FieldIdentifier, - params->CharacterAttribute, params->BufferLength, params->StringLength, - params->NumericAttribute); @@ -2938,6 +2953,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLColAttributes_params *params = args; - +- if (!pSQLColAttributes) return SQL_ERROR; - return pSQLColAttributes(params->hstmt, params->icol, params->fDescType, params->rgbDesc, - params->cbDescMax, params->pcbDesc, params->pfDesc); -} @@ -2946,6 +2962,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLColAttributesW_params *params = args; - +- if (!pSQLColAttributesW) return SQL_ERROR; - return pSQLColAttributesW(params->hstmt, params->icol, params->fDescType, params->rgbDesc, - params->cbDescMax, params->pcbDesc, params->pfDesc); -} @@ -2954,6 +2971,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLColumnPrivileges_params *params = args; - +- if (!pSQLColumnPrivileges) return SQL_ERROR; - return pSQLColumnPrivileges(params->hstmt, params->szCatalogName, params->cbCatalogName, - params->szSchemaName, params->cbSchemaName, params->szTableName, - params->cbTableName, params->szColumnName, params->cbColumnName); @@ -2963,6 +2981,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLColumnPrivilegesW_params *params = args; - +- if (!pSQLColumnPrivilegesW) return SQL_ERROR; - return pSQLColumnPrivilegesW(params->hstmt, params->szCatalogName, params->cbCatalogName, - params->szSchemaName, params->cbSchemaName, params->szTableName, - params->cbTableName, params->szColumnName, params->cbColumnName); @@ -2972,6 +2991,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLColumns_params *params = args; - +- if (!pSQLColumns) return SQL_ERROR; - return pSQLColumns(params->StatementHandle, params->CatalogName, params->NameLength1, - params->SchemaName, params->NameLength2, params->TableName, params->NameLength3, - params->ColumnName, params->NameLength4); @@ -2981,6 +3001,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLColumnsW_params *params = args; - +- if (!pSQLColumnsW) return SQL_ERROR; - return pSQLColumnsW(params->StatementHandle, params->CatalogName, params->NameLength1, - params->SchemaName, params->NameLength2, params->TableName, params->NameLength3, - params->ColumnName, params->NameLength4); @@ -2990,6 +3011,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLConnect_params *params = args; - +- if (!pSQLConnect) return SQL_ERROR; - return pSQLConnect(params->ConnectionHandle, params->ServerName, params->NameLength1, params->UserName, - params->NameLength2, params->Authentication, params->NameLength3); -} @@ -2998,6 +3020,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLConnectW_params *params = args; - +- if (!pSQLConnectW) return SQL_ERROR; - return pSQLConnectW(params->ConnectionHandle, params->ServerName, params->NameLength1, - params->UserName, params->NameLength2, params->Authentication, params->NameLength3); -} @@ -3006,6 +3029,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLCopyDesc_params *params = args; - +- if (!pSQLCopyDesc) return SQL_ERROR; - return pSQLCopyDesc(params->SourceDescHandle, params->TargetDescHandle); -} - @@ -3013,6 +3037,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLDataSources_params *params = args; - +- if (!pSQLDataSources) return SQL_ERROR; - return pSQLDataSources(params->EnvironmentHandle, params->Direction, params->ServerName, - params->BufferLength1, params->NameLength1, params->Description, - params->BufferLength2, params->NameLength2); @@ -3022,6 +3047,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLDataSourcesA_params *params = args; - +- if (!pSQLDataSourcesA) return SQL_ERROR; - return pSQLDataSourcesA(params->EnvironmentHandle, params->Direction, params->ServerName, - params->BufferLength1, params->NameLength1, params->Description, - params->BufferLength2, params->NameLength2); @@ -3031,6 +3057,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLDataSourcesW_params *params = args; - +- if (!pSQLDataSourcesW) return SQL_ERROR; - return pSQLDataSourcesW(params->EnvironmentHandle, params->Direction, params->ServerName, - params->BufferLength1, params->NameLength1, params->Description, - params->BufferLength2, params->NameLength2); @@ -3040,6 +3067,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLDescribeCol_params *params = args; - +- if (!pSQLDescribeCol) return SQL_ERROR; - return pSQLDescribeCol(params->StatementHandle, params->ColumnNumber, params->ColumnName, - params->BufferLength, params->NameLength, params->DataType, - params->ColumnSize, params->DecimalDigits, params->Nullable); @@ -3049,6 +3077,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLDescribeColW_params *params = args; - +- if (!pSQLDescribeColW) return SQL_ERROR; - return pSQLDescribeColW(params->StatementHandle, params->ColumnNumber, params->ColumnName, - params->BufferLength, params->NameLength, params->DataType, - params->ColumnSize, params->DecimalDigits, params->Nullable); @@ -3058,6 +3087,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLDescribeParam_params *params = args; - +- if (!pSQLDescribeParam) return SQL_ERROR; - return pSQLDescribeParam(params->hstmt, params->ipar, params->pfSqlType, params->pcbParamDef, - params->pibScale, params->pfNullable); -} @@ -3066,6 +3096,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLDisconnect_params *params = args; - +- if (!pSQLDisconnect) return SQL_ERROR; - return pSQLDisconnect(params->ConnectionHandle); -} - @@ -3073,6 +3104,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLDriverConnect_params *params = args; - +- if (!pSQLDriverConnect) return SQL_ERROR; - return pSQLDriverConnect(params->hdbc, params->hwnd, params->ConnectionString, params->Length, - params->conn_str_out, params->conn_str_out_max, - params->ptr_conn_str_out, params->driver_completion); @@ -3082,6 +3114,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLDriverConnectW_params *params = args; - +- if (!pSQLDriverConnectW) return SQL_ERROR; - return pSQLDriverConnectW(params->ConnectionHandle, params->WindowHandle, params->InConnectionString, - params->Length, params->OutConnectionString, params->BufferLength, - params->Length2, params->DriverCompletion); @@ -3091,6 +3124,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLDrivers_params *params = args; - +- if (!pSQLDrivers) return SQL_ERROR; - return pSQLDrivers(params->EnvironmentHandle, params->fDirection, params->szDriverDesc, - params->cbDriverDescMax, params->pcbDriverDesc, params->szDriverAttributes, - params->cbDriverAttrMax, params->pcbDriverAttr); @@ -3100,6 +3134,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLDriversW_params *params = args; - +- if (!pSQLDriversW) return SQL_ERROR; - return pSQLDriversW(params->EnvironmentHandle, params->fDirection, params->szDriverDesc, - params->cbDriverDescMax, params->pcbDriverDesc, params->szDriverAttributes, - params->cbDriverAttrMax, params->pcbDriverAttr); @@ -3109,6 +3144,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLEndTran_params *params = args; - +- if (!pSQLEndTran) return SQL_ERROR; - return pSQLEndTran(params->HandleType, params->Handle, params->CompletionType); -} - @@ -3116,6 +3152,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLError_params *params = args; - +- if (!pSQLError) return SQL_ERROR; - return pSQLError(params->EnvironmentHandle, params->ConnectionHandle, params->StatementHandle, - params->Sqlstate, params->NativeError, params->MessageText, - params->BufferLength, params->TextLength); @@ -3125,6 +3162,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLErrorW_params *params = args; - +- if (!pSQLErrorW) return SQL_ERROR; - return pSQLErrorW(params->EnvironmentHandle, params->ConnectionHandle, params->StatementHandle, - params->Sqlstate, params->NativeError, params->MessageText, - params->BufferLength, params->TextLength); @@ -3134,6 +3172,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLExecDirect_params *params = args; - +- if (!pSQLExecDirect) return SQL_ERROR; - return pSQLExecDirect(params->StatementHandle, params->StatementText, params->TextLength); -} - @@ -3141,6 +3180,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLExecDirectW_params *params = args; - +- if (!pSQLExecDirectW) return SQL_ERROR; - return pSQLExecDirectW(params->StatementHandle, params->StatementText, params->TextLength); -} - @@ -3148,6 +3188,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLExecute_params *params = args; - +- if (!pSQLExecute) return SQL_ERROR; - return pSQLExecute(params->StatementHandle); -} - @@ -3155,6 +3196,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLExtendedFetch_params *params = args; - +- if (!pSQLExtendedFetch) return SQL_ERROR; - return pSQLExtendedFetch(params->hstmt, params->fFetchType, params->irow, - params->pcrow, params->rgfRowStatus); -} @@ -3163,6 +3205,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLFetch_params *params = args; - +- if (!pSQLFetch) return SQL_ERROR; - return pSQLFetch(params->StatementHandle); -} - @@ -3170,6 +3213,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLFetchScroll_params *params = args; - +- if (!pSQLFetchScroll) return SQL_ERROR; - return pSQLFetchScroll(params->StatementHandle, params->FetchOrientation, params->FetchOffset); -} - @@ -3177,6 +3221,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLForeignKeys_params *params = args; - +- if (!pSQLForeignKeys) return SQL_ERROR; - return pSQLForeignKeys(params->hstmt, params->szPkCatalogName, params->cbPkCatalogName, - params->szPkSchemaName, params->cbPkSchemaName, params->szPkTableName, - params->cbPkTableName, params->szFkCatalogName, params->cbFkCatalogName, @@ -3188,6 +3233,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLForeignKeysW_params *params = args; - +- if (!pSQLForeignKeysW) return SQL_ERROR; - return pSQLForeignKeysW(params->hstmt, params->szPkCatalogName, params->cbPkCatalogName, - params->szPkSchemaName, params->cbPkSchemaName, params->szPkTableName, - params->cbPkTableName, params->szFkCatalogName, params->cbFkCatalogName, @@ -3199,6 +3245,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLFreeConnect_params *params = args; - +- if (!pSQLFreeConnect) return SQL_ERROR; - return pSQLFreeConnect(params->ConnectionHandle); -} - @@ -3206,6 +3253,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLFreeEnv_params *params = args; - +- if (!pSQLFreeEnv) return SQL_ERROR; - return pSQLFreeEnv(params->EnvironmentHandle); -} - @@ -3213,6 +3261,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLFreeHandle_params *params = args; - +- if (!pSQLFreeHandle) return SQL_ERROR; - return pSQLFreeHandle(params->HandleType, params->Handle); -} - @@ -3220,6 +3269,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLFreeStmt_params *params = args; - +- if (!pSQLFreeStmt) return SQL_ERROR; - return pSQLFreeStmt(params->StatementHandle, params->Option); -} - @@ -3227,6 +3277,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetConnectAttr_params *params = args; - +- if (!pSQLGetConnectAttr) return SQL_ERROR; - return pSQLGetConnectAttr(params->ConnectionHandle, params->Attribute, params->Value, - params->BufferLength, params->StringLength); -} @@ -3235,6 +3286,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetConnectAttrW_params *params = args; - +- if (!pSQLGetConnectAttrW) return SQL_ERROR; - return pSQLGetConnectAttrW(params->ConnectionHandle, params->Attribute, params->Value, - params->BufferLength, params->StringLength); -} @@ -3243,6 +3295,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetConnectOption_params *params = args; - +- if (!pSQLGetConnectOption) return SQL_ERROR; - return pSQLGetConnectOption(params->ConnectionHandle, params->Option, params->Value); -} - @@ -3250,6 +3303,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetConnectOptionW_params *params = args; - +- if (!pSQLGetConnectOptionW) return SQL_ERROR; - return pSQLGetConnectOptionW(params->ConnectionHandle, params->Option, params->Value); -} - @@ -3257,6 +3311,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetCursorName_params *params = args; - +- if (!pSQLGetCursorName) return SQL_ERROR; - return pSQLGetCursorName(params->StatementHandle, params->CursorName, params->BufferLength, - params->NameLength); -} @@ -3265,6 +3320,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetCursorNameW_params *params = args; - +- if (!pSQLGetCursorNameW) return SQL_ERROR; - return pSQLGetCursorNameW(params->StatementHandle, params->CursorName, params->BufferLength, - params->NameLength); -} @@ -3273,6 +3329,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetData_params *params = args; - +- if (!pSQLGetData) return SQL_ERROR; - return pSQLGetData(params->StatementHandle, params->ColumnNumber, params->TargetType, - params->TargetValue, params->BufferLength, params->StrLen_or_Ind); -} @@ -3281,6 +3338,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetDescField_params *params = args; - +- if (!pSQLGetDescField) return SQL_ERROR; - return pSQLGetDescField(params->DescriptorHandle, params->RecNumber, params->FieldIdentifier, - params->Value, params->BufferLength, params->StringLength); -} @@ -3289,6 +3347,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetDescFieldW_params *params = args; - +- if (!pSQLGetDescFieldW) return SQL_ERROR; - return pSQLGetDescFieldW(params->DescriptorHandle, params->RecNumber, params->FieldIdentifier, - params->Value, params->BufferLength, params->StringLength); -} @@ -3297,6 +3356,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetDescRec_params *params = args; - +- if (!pSQLGetDescRec) return SQL_ERROR; - return pSQLGetDescRec(params->DescriptorHandle, params->RecNumber, params->Name, params->BufferLength, - params->StringLength, params->Type, params->SubType, params->Length, - params->Precision, params->Scale, params->Nullable); @@ -3306,6 +3366,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetDescRecW_params *params = args; - +- if (!pSQLGetDescRecW) return SQL_ERROR; - return pSQLGetDescRecW(params->DescriptorHandle, params->RecNumber, params->Name, params->BufferLength, - params->StringLength, params->Type, params->SubType, params->Length, - params->Precision, params->Scale, params->Nullable); @@ -3315,6 +3376,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetDiagField_params *params = args; - +- if (!pSQLGetDiagField) return SQL_ERROR; - return pSQLGetDiagField(params->HandleType, params->Handle, params->RecNumber, params->DiagIdentifier, - params->DiagInfo, params->BufferLength, params->StringLength); -} @@ -3323,6 +3385,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetDiagFieldW_params *params = args; - +- if (!pSQLGetDiagFieldW) return SQL_ERROR; - return pSQLGetDiagFieldW(params->HandleType, params->Handle, params->RecNumber, params->DiagIdentifier, - params->DiagInfo, params->BufferLength, params->StringLength); -} @@ -3331,6 +3394,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetDiagRec_params *params = args; - +- if (!pSQLGetDiagRec) return SQL_ERROR; - return pSQLGetDiagRec(params->HandleType, params->Handle, params->RecNumber, params->Sqlstate, - params->NativeError, params->MessageText, params->BufferLength, - params->TextLength); @@ -3340,6 +3404,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetDiagRecA_params *params = args; - +- if (!pSQLGetDiagRecA) return SQL_ERROR; - return pSQLGetDiagRecA(params->HandleType, params->Handle, params->RecNumber, params->Sqlstate, - params->NativeError, params->MessageText, params->BufferLength, - params->TextLength); @@ -3349,6 +3414,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetDiagRecW_params *params = args; - +- if (!pSQLGetDiagRecW) return SQL_ERROR; - return pSQLGetDiagRecW(params->HandleType, params->Handle, params->RecNumber, params->Sqlstate, - params->NativeError, params->MessageText, params->BufferLength, - params->TextLength); @@ -3358,6 +3424,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetEnvAttr_params *params = args; - +- if (!pSQLGetEnvAttr) return SQL_ERROR; - return pSQLGetEnvAttr(params->EnvironmentHandle, params->Attribute, params->Value, - params->BufferLength, params->StringLength); -} @@ -3366,6 +3433,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetFunctions_params *params = args; - +- if (!pSQLGetFunctions) return SQL_ERROR; - return pSQLGetFunctions(params->ConnectionHandle, params->FunctionId, params->Supported); -} - @@ -3373,6 +3441,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetInfo_params *params = args; - +- if (!pSQLGetInfo) return SQL_ERROR; - return pSQLGetInfo(params->ConnectionHandle, params->InfoType, params->InfoValue, - params->BufferLength, params->StringLength); -} @@ -3381,6 +3450,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetInfoW_params *params = args; - +- if (!pSQLGetInfoW) return SQL_ERROR; - return pSQLGetInfoW(params->ConnectionHandle, params->InfoType, params->InfoValue, - params->BufferLength, params->StringLength); -} @@ -3389,6 +3459,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetStmtAttr_params *params = args; - +- if (!pSQLGetStmtAttr) return SQL_ERROR; - return pSQLGetStmtAttr(params->StatementHandle, params->Attribute, params->Value, - params->BufferLength, params->StringLength); -} @@ -3397,6 +3468,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetStmtAttrW_params *params = args; - +- if (!pSQLGetStmtAttrW) return SQL_ERROR; - return pSQLGetStmtAttrW(params->StatementHandle, params->Attribute, params->Value, - params->BufferLength, params->StringLength); -} @@ -3405,6 +3477,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetStmtOption_params *params = args; - +- if (!pSQLGetStmtOption) return SQL_ERROR; - return pSQLGetStmtOption(params->StatementHandle, params->Option, params->Value); -} - @@ -3412,6 +3485,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetTypeInfo_params *params = args; - +- if (!pSQLGetTypeInfo) return SQL_ERROR; - return pSQLGetTypeInfo(params->StatementHandle, params->DataType); -} - @@ -3419,6 +3493,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLGetTypeInfoW_params *params = args; - +- if (!pSQLGetTypeInfoW) return SQL_ERROR; - return pSQLGetTypeInfoW(params->StatementHandle, params->DataType); -} - @@ -3426,6 +3501,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLMoreResults_params *params = args; - +- if (!pSQLMoreResults) return SQL_ERROR; - return pSQLMoreResults(params->StatementHandle); -} - @@ -3433,6 +3509,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLNativeSql_params *params = args; - +- if (!pSQLNativeSql) return SQL_ERROR; - return pSQLNativeSql(params->hdbc, params->szSqlStrIn, params->cbSqlStrIn, params->szSqlStr, - params->cbSqlStrMax, params->pcbSqlStr); -} @@ -3441,6 +3518,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLNativeSqlW_params *params = args; - +- if (!pSQLNativeSqlW) return SQL_ERROR; - return pSQLNativeSqlW(params->hdbc, params->szSqlStrIn, params->cbSqlStrIn, params->szSqlStr, - params->cbSqlStrMax, params->pcbSqlStr); -} @@ -3449,6 +3527,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLNumParams_params *params = args; - +- if (!pSQLNumParams) return SQL_ERROR; - return pSQLNumParams(params->hstmt, params->pcpar); -} - @@ -3456,6 +3535,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLNumResultCols_params *params = args; - +- if (!pSQLNumResultCols) return SQL_ERROR; - return pSQLNumResultCols(params->StatementHandle, params->ColumnCount); -} - @@ -3463,6 +3543,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLParamData_params *params = args; - +- if (!pSQLParamData) return SQL_ERROR; - return pSQLParamData(params->StatementHandle, params->Value); -} - @@ -3470,6 +3551,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLParamOptions_params *params = args; - +- if (!pSQLParamOptions) return SQL_ERROR; - return pSQLParamOptions(params->hstmt, params->crow, params->pirow); -} - @@ -3477,6 +3559,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLPrepare_params *params = args; - +- if (!pSQLPrepare) return SQL_ERROR; - return pSQLPrepare(params->StatementHandle, params->StatementText, params->TextLength); -} - @@ -3484,6 +3567,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLPrepareW_params *params = args; - +- if (!pSQLPrepareW) return SQL_ERROR; - return pSQLPrepareW(params->StatementHandle, params->StatementText, params->TextLength); -} - @@ -3491,6 +3575,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLPrimaryKeys_params *params = args; - +- if (!pSQLPrimaryKeys) return SQL_ERROR; - return pSQLPrimaryKeys(params->hstmt, params->szCatalogName, params->cbCatalogName, - params->szSchemaName, params->cbSchemaName, - params->szTableName, params->cbTableName); @@ -3500,6 +3585,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLPrimaryKeysW_params *params = args; - +- if (!pSQLPrimaryKeysW) return SQL_ERROR; - return pSQLPrimaryKeysW(params->hstmt, params->szCatalogName, params->cbCatalogName, - params->szSchemaName, params->cbSchemaName, - params->szTableName, params->cbTableName); @@ -3509,6 +3595,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLProcedureColumns_params *params = args; - +- if (!pSQLProcedureColumns) return SQL_ERROR; - return pSQLProcedureColumns(params->hstmt, params->szCatalogName, params->cbCatalogName, - params->szSchemaName, params->cbSchemaName, params->szProcName, - params->cbProcName, params->szColumnName, params->cbColumnName); @@ -3518,6 +3605,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLProcedureColumnsW_params *params = args; - +- if (!pSQLProcedureColumnsW) return SQL_ERROR; - return pSQLProcedureColumnsW(params->hstmt, params->szCatalogName, params->cbCatalogName, - params->szSchemaName, params->cbSchemaName, params->szProcName, - params->cbProcName, params->szColumnName, params->cbColumnName); @@ -3527,6 +3615,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLProcedures_params *params = args; - +- if (!pSQLProcedures) return SQL_ERROR; - return pSQLProcedures(params->hstmt, params->szCatalogName, params->cbCatalogName, - params->szSchemaName, params->cbSchemaName, params->szProcName, - params->cbProcName); @@ -3536,6 +3625,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLProceduresW_params *params = args; - +- if (!pSQLProceduresW) return SQL_ERROR; - return pSQLProceduresW(params->hstmt, params->szCatalogName, params->cbCatalogName, - params->szSchemaName, params->cbSchemaName, params->szProcName, - params->cbProcName); @@ -3545,6 +3635,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLPutData_params *params = args; - +- if (!pSQLPutData) return SQL_ERROR; - return pSQLPutData(params->StatementHandle, params->Data, params->StrLen_or_Ind); -} - @@ -3552,6 +3643,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLRowCount_params *params = args; - +- if (!pSQLRowCount) return SQL_ERROR; - return pSQLRowCount(params->StatementHandle, params->RowCount); -} - @@ -3559,6 +3651,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLSetConnectAttr_params *params = args; - +- if (!pSQLSetConnectAttr) return SQL_ERROR; - return pSQLSetConnectAttr(params->ConnectionHandle, params->Attribute, params->Value, - params->StringLength); -} @@ -3567,6 +3660,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLSetConnectAttrW_params *params = args; - +- if (!pSQLSetConnectAttrW) return SQL_ERROR; - return pSQLSetConnectAttrW(params->ConnectionHandle, params->Attribute, params->Value, - params->StringLength); -} @@ -3575,6 +3669,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLSetConnectOption_params *params = args; - +- if (!pSQLSetConnectOption) return SQL_ERROR; - return pSQLSetConnectOption(params->ConnectionHandle, params->Option, params->Value); -} - @@ -3582,6 +3677,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLSetConnectOptionW_params *params = args; - +- if (!pSQLSetConnectOptionW) return SQL_ERROR; - return pSQLSetConnectOptionW(params->ConnectionHandle, params->Option, params->Value); -} - @@ -3589,6 +3685,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLSetCursorName_params *params = args; - +- if (!pSQLSetCursorName) return SQL_ERROR; - return pSQLSetCursorName(params->StatementHandle, params->CursorName, params->NameLength); -} - @@ -3596,6 +3693,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLSetCursorNameW_params *params = args; - +- if (!pSQLSetCursorNameW) return SQL_ERROR; - return pSQLSetCursorNameW(params->StatementHandle, params->CursorName, params->NameLength); -} - @@ -3603,6 +3701,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLSetDescField_params *params = args; - +- if (!pSQLSetDescField) return SQL_ERROR; - return pSQLSetDescField(params->DescriptorHandle, params->RecNumber, params->FieldIdentifier, - params->Value, params->BufferLength); -} @@ -3611,6 +3710,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLSetDescFieldW_params *params = args; - +- if (!pSQLSetDescFieldW) return SQL_ERROR; - return pSQLSetDescFieldW(params->DescriptorHandle, params->RecNumber, params->FieldIdentifier, - params->Value, params->BufferLength); -} @@ -3619,6 +3719,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLSetDescRec_params *params = args; - +- if (!pSQLSetDescRec) return SQL_ERROR; - return pSQLSetDescRec(params->DescriptorHandle, params->RecNumber, params->Type, params->SubType, - params->Length, params->Precision, params->Scale, params->Data, - params->StringLength, params->Indicator); @@ -3628,6 +3729,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLSetEnvAttr_params *params = args; - +- if (!pSQLSetEnvAttr) return SQL_ERROR; - return pSQLSetEnvAttr(params->EnvironmentHandle, params->Attribute, params->Value, params->StringLength); -} - @@ -3635,6 +3737,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLSetParam_params *params = args; - +- if (!pSQLSetParam) return SQL_ERROR; - return pSQLSetParam(params->StatementHandle, params->ParameterNumber, params->ValueType, - params->ParameterType, params->LengthPrecision, params->ParameterScale, - params->ParameterValue, params->StrLen_or_Ind); @@ -3644,6 +3747,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLSetPos_params *params = args; - +- if (!pSQLSetPos) return SQL_ERROR; - return pSQLSetPos(params->hstmt, params->irow, params->fOption, params->fLock); -} - @@ -3651,6 +3755,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLSetScrollOptions_params *params = args; - +- if (!pSQLSetScrollOptions) return SQL_ERROR; - return pSQLSetScrollOptions(params->statement_handle, params->f_concurrency, - params->crow_keyset, params->crow_rowset); -} @@ -3659,6 +3764,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLSetStmtAttr_params *params = args; - +- if (!pSQLSetStmtAttr) return SQL_ERROR; - return pSQLSetStmtAttr(params->StatementHandle, params->Attribute, params->Value, params->StringLength); -} - @@ -3666,6 +3772,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLSetStmtAttrW_params *params = args; - +- if (!pSQLSetStmtAttrW) return SQL_ERROR; - return pSQLSetStmtAttrW(params->StatementHandle, params->Attribute, params->Value, params->StringLength); -} - @@ -3673,6 +3780,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLSetStmtOption_params *params = args; - +- if (!pSQLSetStmtOption) return SQL_ERROR; - return pSQLSetStmtOption(params->StatementHandle, params->Option, params->Value); -} - @@ -3680,6 +3788,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLSpecialColumns_params *params = args; - +- if (!pSQLSpecialColumns) return SQL_ERROR; - return pSQLSpecialColumns(params->StatementHandle, params->IdentifierType, params->CatalogName, - params->NameLength1, params->SchemaName, params->NameLength2, - params->TableName, params->NameLength3, params->Scope, params->Nullable); @@ -3689,6 +3798,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLSpecialColumnsW_params *params = args; - +- if (!pSQLSpecialColumnsW) return SQL_ERROR; - return pSQLSpecialColumnsW(params->StatementHandle, params->IdentifierType, params->CatalogName, - params->NameLength1, params->SchemaName, params->NameLength2, - params->TableName, params->NameLength3, params->Scope, params->Nullable); @@ -3698,6 +3808,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLStatistics_params *params = args; - +- if (!pSQLStatistics) return SQL_ERROR; - return pSQLStatistics(params->StatementHandle, params->CatalogName, params->NameLength1, - params->SchemaName, params->NameLength2, params->TableName, - params->NameLength3, params->Unique, params->Reserved); @@ -3707,6 +3818,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLStatisticsW_params *params = args; - +- if (!pSQLStatisticsW) return SQL_ERROR; - return pSQLStatisticsW(params->StatementHandle, params->CatalogName, params->NameLength1, - params->SchemaName, params->NameLength2, params->TableName, - params->NameLength3, params->Unique, params->Reserved); @@ -3716,6 +3828,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLTablePrivileges_params *params = args; - +- if (!pSQLTablePrivileges) return SQL_ERROR; - return pSQLTablePrivileges(params->hstmt, params->szCatalogName, params->cbCatalogName, - params->szSchemaName, params->cbSchemaName, params->szTableName, - params->cbTableName); @@ -3725,6 +3838,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLTablePrivilegesW_params *params = args; - +- if (!pSQLTablePrivilegesW) return SQL_ERROR; - return pSQLTablePrivilegesW(params->hstmt, params->szCatalogName, params->cbCatalogName, - params->szSchemaName, params->cbSchemaName, params->szTableName, - params->cbTableName); @@ -3734,6 +3848,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLTables_params *params = args; - +- if (!pSQLTables) return SQL_ERROR; - return pSQLTables(params->StatementHandle, params->CatalogName, params->NameLength1, - params->SchemaName, params->NameLength2, params->TableName, - params->NameLength3, params->TableType, params->NameLength4); @@ -3743,6 +3858,7 @@ index 8458406d8c0..00000000000 -{ - struct SQLTablesW_params *params = args; - +- if (!pSQLTablesW) return SQL_ERROR; - return pSQLTablesW(params->StatementHandle, params->CatalogName, params->NameLength1, - params->SchemaName, params->NameLength2, params->TableName, - params->NameLength3, params->TableType, params->NameLength4); @@ -3752,20 +3868,133 @@ index 8458406d8c0..00000000000 -{ - struct SQLTransact_params *params = args; - +- if (!pSQLTransact) return SQL_ERROR; - return pSQLTransact(params->EnvironmentHandle, params->ConnectionHandle, params->CompletionType); -} - --unixlib_entry_t __wine_unix_call_funcs[NB_ODBC_FUNCS] = +-const unixlib_entry_t __wine_unix_call_funcs[NB_ODBC_FUNCS] = -{ - odbc_process_attach, - odbc_process_detach, +- wrap_SQLAllocConnect, +- wrap_SQLAllocEnv, +- wrap_SQLAllocHandle, +- wrap_SQLAllocHandleStd, +- wrap_SQLAllocStmt, +- wrap_SQLBindCol, +- wrap_SQLBindParam, +- wrap_SQLBindParameter, +- wrap_SQLBrowseConnect, +- wrap_SQLBrowseConnectW, +- wrap_SQLBulkOperations, +- wrap_SQLCancel, +- wrap_SQLCloseCursor, +- wrap_SQLColAttribute, +- wrap_SQLColAttributeW, +- wrap_SQLColAttributes, +- wrap_SQLColAttributesW, +- wrap_SQLColumnPrivileges, +- wrap_SQLColumnPrivilegesW, +- wrap_SQLColumns, +- wrap_SQLColumnsW, +- wrap_SQLConnect, +- wrap_SQLConnectW, +- wrap_SQLCopyDesc, +- wrap_SQLDataSources, +- wrap_SQLDataSourcesA, +- wrap_SQLDataSourcesW, +- wrap_SQLDescribeCol, +- wrap_SQLDescribeColW, +- wrap_SQLDescribeParam, +- wrap_SQLDisconnect, +- wrap_SQLDriverConnect, +- wrap_SQLDriverConnectW, +- wrap_SQLDrivers, +- wrap_SQLDriversW, +- wrap_SQLEndTran, +- wrap_SQLError, +- wrap_SQLErrorW, +- wrap_SQLExecDirect, +- wrap_SQLExecDirectW, +- wrap_SQLExecute, +- wrap_SQLExtendedFetch, +- wrap_SQLFetch, +- wrap_SQLFetchScroll, +- wrap_SQLForeignKeys, +- wrap_SQLForeignKeysW, +- wrap_SQLFreeConnect, +- wrap_SQLFreeEnv, +- wrap_SQLFreeHandle, +- wrap_SQLFreeStmt, +- wrap_SQLGetConnectAttr, +- wrap_SQLGetConnectAttrW, +- wrap_SQLGetConnectOption, +- wrap_SQLGetConnectOptionW, +- wrap_SQLGetCursorName, +- wrap_SQLGetCursorNameW, +- wrap_SQLGetData, +- wrap_SQLGetDescField, +- wrap_SQLGetDescFieldW, +- wrap_SQLGetDescRec, +- wrap_SQLGetDescRecW, +- wrap_SQLGetDiagField, +- wrap_SQLGetDiagFieldW, +- wrap_SQLGetDiagRec, +- wrap_SQLGetDiagRecA, +- wrap_SQLGetDiagRecW, +- wrap_SQLGetEnvAttr, +- wrap_SQLGetFunctions, +- wrap_SQLGetInfo, +- wrap_SQLGetInfoW, +- wrap_SQLGetStmtAttr, +- wrap_SQLGetStmtAttrW, +- wrap_SQLGetStmtOption, +- wrap_SQLGetTypeInfo, +- wrap_SQLGetTypeInfoW, +- wrap_SQLMoreResults, +- wrap_SQLNativeSql, +- wrap_SQLNativeSqlW, +- wrap_SQLNumParams, +- wrap_SQLNumResultCols, +- wrap_SQLParamData, +- wrap_SQLParamOptions, +- wrap_SQLPrepare, +- wrap_SQLPrepareW, +- wrap_SQLPrimaryKeys, +- wrap_SQLPrimaryKeysW, +- wrap_SQLProcedureColumns, +- wrap_SQLProcedureColumnsW, +- wrap_SQLProcedures, +- wrap_SQLProceduresW, +- wrap_SQLPutData, +- wrap_SQLRowCount, +- wrap_SQLSetConnectAttr, +- wrap_SQLSetConnectAttrW, +- wrap_SQLSetConnectOption, +- wrap_SQLSetConnectOptionW, +- wrap_SQLSetCursorName, +- wrap_SQLSetCursorNameW, +- wrap_SQLSetDescField, +- wrap_SQLSetDescFieldW, +- wrap_SQLSetDescRec, +- wrap_SQLSetEnvAttr, +- wrap_SQLSetParam, +- wrap_SQLSetPos, +- wrap_SQLSetScrollOptions, +- wrap_SQLSetStmtAttr, +- wrap_SQLSetStmtAttrW, +- wrap_SQLSetStmtOption, +- wrap_SQLSpecialColumns, +- wrap_SQLSpecialColumnsW, +- wrap_SQLStatistics, +- wrap_SQLStatisticsW, +- wrap_SQLTablePrivileges, +- wrap_SQLTablePrivilegesW, +- wrap_SQLTables, +- wrap_SQLTablesW, +- wrap_SQLTransact, -}; - --static NTSTATUS error_func( void *args ) --{ -- return SQL_ERROR; --} -- -static NTSTATUS load_odbc(void) -{ - const char *s = getenv("LIB_ODBC_DRIVER_MANAGER"); @@ -3780,7 +4009,7 @@ index 8458406d8c0..00000000000 - } - -#define LOAD_FUNC(name) \ -- __wine_unix_call_funcs[unix_##name] = (p##name = dlsym( libodbc, #name )) ? wrap_##name : error_func +- p##name = dlsym( libodbc, #name ); - - LOAD_FUNC(SQLAllocConnect); - LOAD_FUNC(SQLAllocEnv); diff --git a/patches/setupapi-DiskSpaceList/0006-setupapi-Implement-SetupAddInstallSectionToDiskSpace.patch b/patches/setupapi-DiskSpaceList/0006-setupapi-Implement-SetupAddInstallSectionToDiskSpace.patch index c7d9a61a..06340c07 100644 --- a/patches/setupapi-DiskSpaceList/0006-setupapi-Implement-SetupAddInstallSectionToDiskSpace.patch +++ b/patches/setupapi-DiskSpaceList/0006-setupapi-Implement-SetupAddInstallSectionToDiskSpace.patch @@ -1,4 +1,4 @@ -From c3ba1fbd5560fa0aaa791d8099ed25be93176b97 Mon Sep 17 00:00:00 2001 +From 0830c90120a304cd215f3891f02fef42e3aa45ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 4 Mar 2016 04:54:37 +0100 Subject: [PATCH] setupapi: Implement SetupAddInstallSectionToDiskSpaceList. @@ -312,28 +312,28 @@ index 8e2eb88bf93..5643f930d9d 100644 + test_SetupAddInstallSectionToDiskSpaceListA(); } diff --git a/include/setupapi.h b/include/setupapi.h -index 21992ead500..41a0f720c7c 100644 +index 831efdd4f50..031bd97f721 100644 --- a/include/setupapi.h +++ b/include/setupapi.h -@@ -1420,6 +1420,18 @@ typedef enum { - void WINAPI InstallHinfSectionA( HWND hwnd, HINSTANCE handle, PCSTR cmdline, INT show ); - void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, PCWSTR cmdline, INT show ); - #define InstallHinfSection WINELIB_NAME_AW(InstallHinfSection) -+BOOL WINAPI IsUserAdmin(VOID); -+PWSTR WINAPI MultiByteToUnicode(PCSTR lpMultiByteStr, UINT uCodePage); -+VOID WINAPI MyFree(PVOID lpMem); -+PVOID WINAPI MyMalloc(DWORD dwSize); -+PVOID WINAPI MyRealloc(PVOID lpSrc, DWORD dwSize); -+DWORD WINAPI OpenAndMapForRead(PCWSTR, PDWORD, PHANDLE, PHANDLE, PVOID *); -+LONG WINAPI QueryRegistryValue(HKEY, PCWSTR, PBYTE *, PDWORD, PDWORD); +@@ -1426,6 +1426,18 @@ typedef enum { + WINSETUPAPI void WINAPI InstallHinfSectionA( HWND hwnd, HINSTANCE handle, PCSTR cmdline, INT show ); + WINSETUPAPI void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, PCWSTR cmdline, INT show ); + #define InstallHinfSection WINELIB_NAME_AW(InstallHinfSection) ++WINSETUPAPI BOOL WINAPI IsUserAdmin(VOID); ++WINSETUPAPI PWSTR WINAPI MultiByteToUnicode(PCSTR lpMultiByteStr, UINT uCodePage); ++WINSETUPAPI VOID WINAPI MyFree(PVOID lpMem); ++WINSETUPAPI PVOID WINAPI MyMalloc(DWORD dwSize); ++WINSETUPAPI PVOID WINAPI MyRealloc(PVOID lpSrc, DWORD dwSize); ++WINSETUPAPI DWORD WINAPI OpenAndMapForRead(PCWSTR, PDWORD, PHANDLE, PHANDLE, PVOID *); ++WINSETUPAPI LONG WINAPI QueryRegistryValue(HKEY, PCWSTR, PBYTE *, PDWORD, PDWORD); +/* RetreiveFileSecurity is not a typo, as per Microsoft's dlls */ -+DWORD WINAPI RetreiveFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR *); -+BOOL WINAPI SetupAddInstallSectionToDiskSpaceListA(HDSKSPC, HINF, HINF, PCSTR, PVOID, UINT); -+BOOL WINAPI SetupAddInstallSectionToDiskSpaceListW(HDSKSPC, HINF, HINF, PCWSTR, PVOID, UINT); ++WINSETUPAPI DWORD WINAPI RetreiveFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR *); ++WINSETUPAPI BOOL WINAPI SetupAddInstallSectionToDiskSpaceListA(HDSKSPC, HINF, HINF, PCSTR, PVOID, UINT); ++WINSETUPAPI BOOL WINAPI SetupAddInstallSectionToDiskSpaceListW(HDSKSPC, HINF, HINF, PCWSTR, PVOID, UINT); +#define SetupAddInstallSectionToDiskSpaceList WINELIB_NAME_AW(SetupAddInstallSectionToDiskSpaceList) - BOOL WINAPI SetupAddSectionToDiskSpaceListA(HDSKSPC, HINF, HINF, PCSTR, UINT, PVOID, UINT); - BOOL WINAPI SetupAddSectionToDiskSpaceListW(HDSKSPC, HINF, HINF, PCWSTR, UINT, PVOID, UINT); - #define SetupAddSectionToDiskSpaceList WINELIB_NAME_AW(SetupAddSectionToDiskSpaceList) + WINSETUPAPI BOOL WINAPI SetupAddSectionToDiskSpaceListA(HDSKSPC, HINF, HINF, PCSTR, UINT, PVOID, UINT); + WINSETUPAPI BOOL WINAPI SetupAddSectionToDiskSpaceListW(HDSKSPC, HINF, HINF, PCWSTR, UINT, PVOID, UINT); + #define SetupAddSectionToDiskSpaceList WINELIB_NAME_AW(SetupAddSectionToDiskSpaceList) -- 2.42.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index 612e13ff..332309e4 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -a3209daea543104fbfac5900bf9ec0c05a0a43fc +cb4939eb0ebfe24d6a818e3de060363a58ef9535