https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f47d676d3f9e940dfa70106e0a1b30248eb61462
commit f47d676d3f9e940dfa70106e0a1b30248eb61462 Author: Amine Khaldi <[email protected]> AuthorDate: Tue Mar 20 12:36:12 2018 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Tue Mar 20 12:36:12 2018 +0100 [ODBC32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/odbc32/proxyodbc.c | 36 +++++++++++++++++++----------------- media/doc/README.WINE | 2 +- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dll/win32/odbc32/proxyodbc.c b/dll/win32/odbc32/proxyodbc.c index 0ed5e030c0..7e6368eb93 100644 --- a/dll/win32/odbc32/proxyodbc.c +++ b/dll/win32/odbc32/proxyodbc.c @@ -25,30 +25,32 @@ * */ -#define WIN32_NO_STATUS +#include "config.h" +#include "wine/port.h" -#include <config.h> -#include <wine/port.h> - -//#include <stdarg.h> -//#include <stdio.h> -//#include <stdlib.h> -//#include <string.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <assert.h> -#include <windef.h> -//#include "winbase.h" -#include <winreg.h> +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#ifndef __REACTOS__ +#include "wine/debug.h" +#endif +#include "wine/library.h" +#include "wine/unicode.h" -//#include "sql.h" -//#include "sqltypes.h" -#include <sqlext.h> +#include "sql.h" +#include "sqltypes.h" +#include "sqlext.h" +#ifdef __REACTOS__ #undef TRACE_ON - #include <wine/debug.h> -#include <wine/library.h> -#include <wine/unicode.h> +#endif static BOOL ODBC_LoadDriverManager(void); static BOOL ODBC_LoadDMFunctions(void); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index a53cb231fc..fd84bb93e7 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -137,7 +137,7 @@ reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 reactos/dll/win32/npptools # Synced to WineStaging-3.3 reactos/dll/win32/ntdsapi # Synced to WineStaging-3.3 reactos/dll/win32/objsel # Synced to WineStaging-3.3 -reactos/dll/win32/odbc32 # Synced to WineStaging-2.9. Depends on port of Linux ODBC. +reactos/dll/win32/odbc32 # Synced to WineStaging-3.3. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to WineStaging-2.9 reactos/dll/win32/ole32 # Synced to Wine-3.0 reactos/dll/win32/oleacc # Synced to WineStaging-2.9
