Michael Stefaniuc : rasapi32: Win64 printf format warning fixes.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Oct 9 06:03:38 CDT 2006


Module: wine
Branch: master
Commit: 7a89060e46b105328277814ca6cfb4da6e1b2814
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7a89060e46b105328277814ca6cfb4da6e1b2814

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Sun Oct  8 23:52:00 2006 +0200

rasapi32: Win64 printf format warning fixes.

---

 dlls/rasapi32/Makefile.in |    1 -
 dlls/rasapi32/rasapi.c    |   46 +++++++++++++++++++++++----------------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in
index b7ec140..11c2a65 100644
--- a/dlls/rasapi32/Makefile.in
+++ b/dlls/rasapi32/Makefile.in
@@ -5,7 +5,6 @@ VPATH     = @srcdir@
 MODULE    = rasapi32.dll
 IMPORTLIB = librasapi32.$(IMPLIBEXT)
 IMPORTS   = kernel32
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 C_SRCS = rasapi.c
 
diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c
index dc43fb2..a2dae0c 100644
--- a/dlls/rasapi32/rasapi.c
+++ b/dlls/rasapi32/rasapi.c
@@ -29,13 +29,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(ras);
 
 DWORD WINAPI RasConnectionNotificationA(HRASCONN hrasconn, HANDLE hEvent, DWORD dwFlags)
 {
-    FIXME("(%p,%p,0x%08lx),stub!\n",hrasconn,hEvent,dwFlags);
+    FIXME("(%p,%p,0x%08x),stub!\n",hrasconn,hEvent,dwFlags);
     return 1;
 }
 
 DWORD WINAPI RasConnectionNotificationW(HRASCONN hrasconn, HANDLE hEvent, DWORD dwFlags)
 {
-    FIXME("(%p,%p,0x%08lx),stub!\n",hrasconn,hEvent,dwFlags);
+    FIXME("(%p,%p,0x%08x),stub!\n",hrasconn,hEvent,dwFlags);
     return 1;
 }
 
@@ -53,14 +53,14 @@ DWORD WINAPI RasCreatePhonebookEntryW(HW
 
 DWORD WINAPI RasDeleteSubEntryA(LPCSTR lpszPhonebook, LPCSTR lpszEntry, DWORD dwSubEntryId)
 {
-    FIXME("(%s,%s,0x%08lx),stub!\n",debugstr_a(lpszPhonebook),
+    FIXME("(%s,%s,0x%08x),stub!\n",debugstr_a(lpszPhonebook),
           debugstr_a(lpszEntry),dwSubEntryId);
     return 0;
 }
 
 DWORD WINAPI RasDeleteSubEntryW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, DWORD dwSubEntryId)
 {
-    FIXME("(%s,%s,0x%08lx),stub!\n",debugstr_w(lpszPhonebook),
+    FIXME("(%s,%s,0x%08x),stub!\n",debugstr_w(lpszPhonebook),
           debugstr_w(lpszEntry),dwSubEntryId);
     return 0;
 }
@@ -69,7 +69,7 @@ DWORD WINAPI RasDialA(LPRASDIALEXTENSION
                       LPRASDIALPARAMSA lpRasDialParams, DWORD dwNotifierType,
                       LPVOID lpvNotifier, LPHRASCONN lphRasConn)
 {
-    FIXME("(%p,%s,%p,0x%08lx,%p,%p),stub!\n",lpRasDialExtensions,debugstr_a(lpszPhonebook),
+    FIXME("(%p,%s,%p,0x%08x,%p,%p),stub!\n",lpRasDialExtensions,debugstr_a(lpszPhonebook),
           lpRasDialParams,dwNotifierType,lpvNotifier,lphRasConn);
     return 1;
 }
@@ -78,7 +78,7 @@ DWORD WINAPI RasDialW(LPRASDIALEXTENSION
                       LPRASDIALPARAMSW lpRasDialParams, DWORD dwNotifierType,
                       LPVOID lpvNotifier, LPHRASCONN lphRasConn)
 {
-    FIXME("(%p,%s,%p,0x%08lx,%p,%p),stub!\n",lpRasDialExtensions,debugstr_w(lpszPhonebook),
+    FIXME("(%p,%s,%p,0x%08x,%p,%p),stub!\n",lpRasDialExtensions,debugstr_w(lpszPhonebook),
           lpRasDialParams,dwNotifierType,lpvNotifier,lphRasConn);
     return 1;
 }
@@ -288,7 +288,7 @@ DWORD WINAPI RasGetAutodialAddressW(LPCW
  */
 DWORD WINAPI RasGetAutodialEnableA(DWORD a, LPBOOL b)
 {
-	FIXME("(%lx,%p),stub!\n",a,b);
+	FIXME("(%x,%p),stub!\n",a,b);
 	return 0;
 }
 
@@ -297,7 +297,7 @@ DWORD WINAPI RasGetAutodialEnableA(DWORD
  */
 DWORD WINAPI RasGetAutodialEnableW(DWORD a, LPBOOL b)
 {
-	FIXME("(%lx,%p),stub!\n",a,b);
+	FIXME("(%x,%p),stub!\n",a,b);
 	return 0;
 }
 
@@ -306,7 +306,7 @@ DWORD WINAPI RasGetAutodialEnableW(DWORD
  */
 DWORD WINAPI RasGetAutodialParamA(DWORD dwKey, LPVOID lpvValue, LPDWORD lpdwcbValue)
 {
-	FIXME("(%lx,%p,%p),stub!\n",dwKey,lpvValue,lpdwcbValue);
+	FIXME("(%x,%p,%p),stub!\n",dwKey,lpvValue,lpdwcbValue);
 	return 0;
 }
 
@@ -315,7 +315,7 @@ DWORD WINAPI RasGetAutodialParamA(DWORD 
  */
 DWORD WINAPI RasGetAutodialParamW(DWORD dwKey, LPVOID lpvValue, LPDWORD lpdwcbValue)
 {
-	FIXME("(%lx,%p,%p),stub!\n",dwKey,lpvValue,lpdwcbValue);
+	FIXME("(%x,%p,%p),stub!\n",dwKey,lpvValue,lpdwcbValue);
 	return 0;
 }
 
@@ -325,7 +325,7 @@ DWORD WINAPI RasGetAutodialParamW(DWORD 
 DWORD WINAPI RasSetAutodialAddressA(LPCSTR a, DWORD b, LPRASAUTODIALENTRYA c,
 					DWORD d, DWORD e)
 {
-	FIXME("(%s,%lx,%p,%lx,%lx),stub!\n",debugstr_a(a),b,c,d,e);
+	FIXME("(%s,%x,%p,%x,%x),stub!\n",debugstr_a(a),b,c,d,e);
 	return 0;
 }
 
@@ -335,7 +335,7 @@ DWORD WINAPI RasSetAutodialAddressA(LPCS
 DWORD WINAPI RasSetAutodialAddressW(LPCWSTR a, DWORD b, LPRASAUTODIALENTRYW c,
 					DWORD d, DWORD e)
 {
-	FIXME("(%s,%lx,%p,%lx,%lx),stub!\n",debugstr_w(a),b,c,d,e);
+	FIXME("(%s,%x,%p,%x,%x),stub!\n",debugstr_w(a),b,c,d,e);
 	return 0;
 }
 
@@ -344,7 +344,7 @@ DWORD WINAPI RasSetAutodialAddressW(LPCW
  */
 DWORD WINAPI RasSetAutodialEnableA(DWORD dwDialingLocation, BOOL fEnabled)
 {
-	FIXME("(%lx,%x),stub!\n",dwDialingLocation,fEnabled);
+	FIXME("(%x,%x),stub!\n",dwDialingLocation,fEnabled);
 	return 0;
 }
 
@@ -353,7 +353,7 @@ DWORD WINAPI RasSetAutodialEnableA(DWORD
  */
 DWORD WINAPI RasSetAutodialEnableW(DWORD dwDialingLocation, BOOL fEnabled)
 {
-	FIXME("(%lx,%x),stub!\n",dwDialingLocation,fEnabled);
+	FIXME("(%x,%x),stub!\n",dwDialingLocation,fEnabled);
 	return 0;
 }
 
@@ -362,7 +362,7 @@ DWORD WINAPI RasSetAutodialEnableW(DWORD
  */
 DWORD WINAPI RasSetAutodialParamA(DWORD a, LPVOID b, DWORD c)
 {
-	FIXME("(%lx,%p,%lx),stub!\n",a,b,c);
+	FIXME("(%x,%p,%x),stub!\n",a,b,c);
 	return 0;
 }
 
@@ -371,7 +371,7 @@ DWORD WINAPI RasSetAutodialParamA(DWORD 
  */
 DWORD WINAPI RasSetAutodialParamW(DWORD a, LPVOID b, DWORD c)
 {
-	FIXME("(%lx,%p,%lx),stub!\n",a,b,c);
+	FIXME("(%x,%p,%x),stub!\n",a,b,c);
 	return 0;
 }
 
@@ -382,12 +382,12 @@ DWORD WINAPI RasSetEntryPropertiesA(LPCS
 	LPRASENTRYA lpRasEntry, DWORD dwEntryInfoSize, LPBYTE lpbDeviceInfo,
 	DWORD dwDeviceInfoSize
 ) {
-	FIXME("(%s,%s,%p,%ld,%p,%ld), stub!\n",
+	FIXME("(%s,%s,%p,%d,%p,%d), stub!\n",
 		debugstr_a(lpszPhonebook),debugstr_a(lpszEntry),
 		lpRasEntry,dwEntryInfoSize,lpbDeviceInfo,dwDeviceInfoSize
 	);
 	FIXME("Rasentry:\n");
-	FIXME("\tdwfOptions %lx\n",lpRasEntry->dwfOptions);
+	FIXME("\tdwfOptions %x\n",lpRasEntry->dwfOptions);
 	FIXME("\tszLocalPhoneNumber %s\n",debugstr_a(lpRasEntry->szLocalPhoneNumber));
 	return 0;
 }
@@ -399,7 +399,7 @@ DWORD WINAPI RasSetEntryPropertiesW(LPCW
 	LPRASENTRYW lpRasEntry, DWORD dwEntryInfoSize, LPBYTE lpbDeviceInfo,
 	DWORD dwDeviceInfoSize
 ) {
-	FIXME("(%s,%s,%p,%ld,%p,%ld), stub!\n",
+	FIXME("(%s,%s,%p,%d,%p,%d), stub!\n",
 		debugstr_w(lpszPhonebook),debugstr_w(lpszEntry),
 		lpRasEntry,dwEntryInfoSize,lpbDeviceInfo,dwDeviceInfoSize
 	);
@@ -446,13 +446,13 @@ DWORD WINAPI RasGetEntryPropertiesW(LPCW
 
 DWORD WINAPI RasGetErrorStringA(UINT uErrorValue, LPSTR lpszErrorString, DWORD cBufSize)
 {
-    FIXME("(0x%08x,%p,0x%08lx), stub!\n", uErrorValue, lpszErrorString, cBufSize);
+    FIXME("(0x%08x,%p,0x%08x), stub!\n", uErrorValue, lpszErrorString, cBufSize);
     return 1;
 }
 
 DWORD WINAPI RasGetErrorStringW(UINT uErrorValue, LPWSTR lpszErrorString, DWORD cBufSize)
 {
-    FIXME("(0x%08x,%p,0x%08lx), stub!\n", uErrorValue, lpszErrorString, cBufSize);
+    FIXME("(0x%08x,%p,0x%08x), stub!\n", uErrorValue, lpszErrorString, cBufSize);
     return 1;
 }
 
@@ -502,7 +502,7 @@ DWORD WINAPI RasSetSubEntryPropertiesA(L
                                        LPRASSUBENTRYA lpRasSubEntry, DWORD dwcbRasSubEntry,
                                        LPBYTE lpbDeviceConfig, DWORD dwcbDeviceConfig)
 {
-    FIXME("(%s,%s,0x%08lx,%p,0x%08lx,%p,0x%08lx), stub!\n", debugstr_a(lpszPhonebook),
+    FIXME("(%s,%s,0x%08x,%p,0x%08x,%p,0x%08x), stub!\n", debugstr_a(lpszPhonebook),
           debugstr_a(lpszEntry), dwSubEntry, lpRasSubEntry, dwcbRasSubEntry, lpbDeviceConfig,
           dwcbDeviceConfig);
     return 0;
@@ -512,7 +512,7 @@ DWORD WINAPI RasSetSubEntryPropertiesW(L
                                        LPRASSUBENTRYW lpRasSubEntry, DWORD dwcbRasSubEntry,
                                        LPBYTE lpbDeviceConfig, DWORD dwcbDeviceConfig)
 {
-    FIXME("(%s,%s,0x%08lx,%p,0x%08lx,%p,0x%08lx), stub!\n", debugstr_w(lpszPhonebook),
+    FIXME("(%s,%s,0x%08x,%p,0x%08x,%p,0x%08x), stub!\n", debugstr_w(lpszPhonebook),
           debugstr_w(lpszEntry), dwSubEntry, lpRasSubEntry, dwcbRasSubEntry, lpbDeviceConfig,
           dwcbDeviceConfig);
     return 0;




More information about the wine-cvs mailing list