Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 13:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ODBC32] Sync with Wine Staging 3.3. CORE-14434

Browse source
This commit is contained in:
Amine Khaldi 2018-03-20 12:36:12 +01:00
parent 8361200df0
commit f47d676d3f
2 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
dll/win32/odbc32/proxyodbc.c
View file

@ -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);

2
media/doc/README.WINE
View file

@ -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