From 796a93ffc0c4d034cdf67bf72defebdfbfeec94c Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Fri, 6 Oct 2006 23:01:28 +0200
Subject: [PATCH] serialui: Win64 printf format warning fixes.

---
 dlls/serialui/Makefile.in |  1 -
 dlls/serialui/confdlg.c   | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in
index 1326d5f0e1c..bdd50f6f4ff 100644
--- a/dlls/serialui/Makefile.in
+++ b/dlls/serialui/Makefile.in
@@ -5,7 +5,6 @@ VPATH     = @srcdir@
 MODULE    = serialui.dll
 IMPORTLIB = libserialui.$(IMPLIBEXT)
 IMPORTS   = user32 advapi32 kernel32
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 C_SRCS = \
 	confdlg.c
diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c
index e1854d13a8f..465c4e29328 100644
--- a/dlls/serialui/confdlg.c
+++ b/dlls/serialui/confdlg.c
@@ -64,7 +64,7 @@ HMODULE SERIALUI_hModule = 0;
 
 BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-    TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
+    TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved);
 
     switch (fdwReason) {
 	case DLL_PROCESS_ATTACH:
@@ -177,13 +177,13 @@ static BOOL SERIALUI_GetConfItems(HWND hDlg, DWORD id, LPCPARAM2STR table, LPDWO
 
     if( (!hControl) || (!lpdwVal))
     {
-        TRACE("Couldn't get window handle for item %lx\n",id);
+        TRACE("Couldn't get window handle for item %x\n",id);
         return FALSE;
     }
 
     if(!GetWindowTextA(hControl, &lpEntry[0], sizeof(lpEntry)))
     {
-        TRACE("Couldn't get window text for item %lx\n",id);
+        TRACE("Couldn't get window text for item %x\n",id);
         return FALSE;
     }
     /* TRACE("%ld contains %s\n",id, lpEntry); */
@@ -293,7 +293,7 @@ static void SERIALUI_DialogInfoToDCB(HWND hDlg, SERIALUI_DialogInfo *info)
     SERIALUI_GetConfItems( hDlg, IDC_DATA, &SERIALUI_Data2Str, &dwByteSize);
     SERIALUI_GetConfItems( hDlg, IDC_FLOW, &SERIALUI_Flow2Str, &dwFlowControl );
 
-    TRACE("baud=%ld stop=%ld parity=%ld data=%ld flow=%ld\n",
+    TRACE("baud=%d stop=%d parity=%d data=%d flow=%d\n",
           dwBaudRate, dwStopBits, dwParity, dwByteSize, dwFlowControl);
 
     lpdcb->BaudRate = dwBaudRate;
@@ -488,7 +488,7 @@ BOOL WINAPI drvSetDefaultCommConfigW(
     DWORD r,dwDCBSize;
     static const WCHAR fmt[] = {'%','s','\\','%','s',0 };
 
-    TRACE("%p %p %lx\n",lpszDevice,lpCommConfig,dwSize);
+    TRACE("%p %p %x\n",lpszDevice,lpCommConfig,dwSize);
 
     if(!lpCommConfig)
         return FALSE;
@@ -507,7 +507,7 @@ BOOL WINAPI drvSetDefaultCommConfigW(
         dwDCBSize = sizeof (DCB);
         r = RegSetValueExW( hKeyPort, lpszDCB, 0, REG_BINARY,
                             (LPBYTE)&lpCommConfig->dcb,dwDCBSize);
-        TRACE("write key r=%ld\n",r);
+        TRACE("write key r=%d\n",r);
         RegCloseKey(hKeyPort);
     }