01/01: [ODBCCP32] Sync with Wine Staging 3.3. CORE-14434

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ca633cc2a48dabd13249d...

commit 4ca633cc2a48dabd13249d7f7c954a74a9451175
Author:     Amine Khaldi [e-mail]
AuthorDate: Tue Mar 20 12:37:14 2018 +0100
Commit:     Amine Khaldi [e-mail]
CommitDate: Tue Mar 20 12:37:14 2018 +0100

[ODBCCP32] Sync with Wine Staging 3.3. CORE-14434
---
 dll/win32/odbccp32/odbccp32.c | 26 ++++++++------------------
 media/doc/README.WINE         |  2 +-
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/dll/win32/odbccp32/odbccp32.c b/dll/win32/odbccp32/odbccp32.c
index 0a41a3d0a9..f9a2269345 100644
--- a/dll/win32/odbccp32/odbccp32.c
+++ b/dll/win32/odbccp32/odbccp32.c
@@ -20,20 +20,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#define WIN32_NO_STATUS
-
 #include <assert.h>
 #include <stdarg.h>

#define COBJMACROS

-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <wine/unicode.h>
-#include <wine/debug.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "winnls.h"
+#include "wine/unicode.h"
+#include "wine/debug.h"
+#include "wine/heap.h"

-#include <odbcinst.h>
+#include "odbcinst.h"

WINE_DEFAULT_DEBUG_CHANNEL(odbc);

@@ -85,16 +85,6 @@ static void clear_errors(void)
     num_errors = 0;
 }

-static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
-{
-    return HeapAlloc(GetProcessHeap(), 0, size);
-}
-
-static inline BOOL heap_free(void *mem)
-{
-    return HeapFree(GetProcessHeap(), 0, mem);
-}
-
 static inline WCHAR *heap_strdupAtoW(const char *str)
 {
     LPWSTR ret = NULL;
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index fd84bb93e7..f2475663e8 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -138,7 +138,7 @@ 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-3.3. Depends on port of Linux ODBC.
-reactos/dll/win32/odbccp32            # Synced to WineStaging-2.9
+reactos/dll/win32/odbccp32            # Synced to WineStaging-3.3
 reactos/dll/win32/ole32               # Synced to Wine-3.0
 reactos/dll/win32/oleacc              # Synced to WineStaging-2.9
 reactos/dll/win32/oleaut32            # Synced to WineStaging-3.3