From 617db22df43fca6f63f8fc8e91b43a47af922164 Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Mon, 9 Oct 2006 21:21:22 +0200
Subject: [PATCH] odbc32: Win64 printf format warning fixes.

---
 dlls/odbc32/Makefile.in |  1 -
 dlls/odbc32/proxyodbc.c | 30 +++++++++++++++---------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in
index 40a4a25beef..45bb3a23817 100644
--- a/dlls/odbc32/Makefile.in
+++ b/dlls/odbc32/Makefile.in
@@ -5,7 +5,6 @@ VPATH     = @srcdir@
 MODULE    = odbc32.dll
 IMPORTLIB = libodbc32.$(IMPLIBEXT)
 IMPORTS   = advapi32 kernel32
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 C_SRCS = \
 	proxyodbc.c
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index 1354d85ddb6..a3aa287a4c1 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -220,14 +220,14 @@ static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv)
                         if ((reg_ret = RegSetValueExA (hDrivers, desc, 0,
                                 REG_SZ, (const BYTE *)"Installed", 10)) != ERROR_SUCCESS)
                         {
-                            TRACE ("Error %ld replicating driver %s\n",
+                            TRACE ("Error %d replicating driver %s\n",
                                     reg_ret, desc);
                             success = 0;
                         }
                     }
                     else if (reg_ret != ERROR_SUCCESS)
                     {
-                        TRACE ("Error %ld checking for %s in drivers\n",
+                        TRACE ("Error %d checking for %s in drivers\n",
                                 reg_ret, desc);
                         success = 0;
                     }
@@ -244,12 +244,12 @@ static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv)
                          */
                         if ((reg_ret = RegCloseKey (hThis)) !=
                                 ERROR_SUCCESS)
-                            TRACE ("Error %ld closing %s key\n", reg_ret,
+                            TRACE ("Error %d closing %s key\n", reg_ret,
                                     desc);
                     }
                     else
                     {
-                        TRACE ("Error %ld ensuring driver key %s\n",
+                        TRACE ("Error %d ensuring driver key %s\n",
                                 reg_ret, desc);
                         success = 0;
                     }
@@ -268,21 +268,21 @@ static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv)
             }
             if ((reg_ret = RegCloseKey (hDrivers)) != ERROR_SUCCESS)
             {
-                TRACE ("Error %ld closing hDrivers\n", reg_ret);
+                TRACE ("Error %d closing hDrivers\n", reg_ret);
             }
         }
         else
         {
-            TRACE ("Error %ld opening HKLM\\S\\O\\OI\\Drivers\n", reg_ret);
+            TRACE ("Error %d opening HKLM\\S\\O\\OI\\Drivers\n", reg_ret);
         }
         if ((reg_ret = RegCloseKey (hODBCInst)) != ERROR_SUCCESS)
         {
-            TRACE ("Error %ld closing HKLM\\S\\O\\ODBCINST.INI\n", reg_ret);
+            TRACE ("Error %d closing HKLM\\S\\O\\ODBCINST.INI\n", reg_ret);
         }
     }
     else
     {
-        TRACE ("Error %ld opening HKLM\\S\\O\\ODBCINST.INI\n", reg_ret);
+        TRACE ("Error %d opening HKLM\\S\\O\\ODBCINST.INI\n", reg_ret);
     }
     if (!success)
     {
@@ -355,26 +355,26 @@ static void ODBC_ReplicateODBCToRegistry (int is_user, SQLHENV hEnv)
                         if ((reg_ret = RegSetValueExA (hDSN, DRIVERKEY, 0,
                                 REG_SZ, (LPBYTE)desc, sizedesc)) != ERROR_SUCCESS)
                         {
-                            TRACE ("Error %ld replicating description of "
+                            TRACE ("Error %d replicating description of "
                                     "%s(%s)\n", reg_ret, dsn, desc);
                             success = 0;
                         }
                     }
                     else if (reg_ret != ERROR_SUCCESS)
                     {
-                        TRACE ("Error %ld checking for description of %s\n",
+                        TRACE ("Error %d checking for description of %s\n",
                                 reg_ret, dsn);
                         success = 0;
                     }
                     if ((reg_ret = RegCloseKey (hDSN)) != ERROR_SUCCESS)
                     {
-                        TRACE ("Error %ld closing %s DSN key %s\n",
+                        TRACE ("Error %d closing %s DSN key %s\n",
                                 reg_ret, which, dsn);
                     }
                 }
                 else
                 {
-                    TRACE ("Error %ld opening %s DSN key %s\n",
+                    TRACE ("Error %d opening %s DSN key %s\n",
                             reg_ret, which, dsn);
                     success = 0;
                 }
@@ -394,13 +394,13 @@ static void ODBC_ReplicateODBCToRegistry (int is_user, SQLHENV hEnv)
         }
         if ((reg_ret = RegCloseKey (hODBC)) != ERROR_SUCCESS)
         {
-            TRACE ("Error %ld closing %s ODBC.INI registry key\n", reg_ret,
+            TRACE ("Error %d closing %s ODBC.INI registry key\n", reg_ret,
                     which);
         }
     }
     else
     {
-        TRACE ("Error %ld creating/opening %s ODBC.INI registry key\n",
+        TRACE ("Error %d creating/opening %s ODBC.INI registry key\n",
                 reg_ret, which);
     }
     if (!success)
@@ -467,7 +467,7 @@ static void ODBC_ReplicateToRegistry (void)
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
     int i;
-    TRACE("Initializing or Finalizing proxy ODBC: %p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
+    TRACE("Initializing or Finalizing proxy ODBC: %p,%x,%p\n", hinstDLL, fdwReason, lpvReserved);
 
     if (fdwReason == DLL_PROCESS_ATTACH)
     {