Michael Stefaniuc : usp10: Win64 printf format warning fixes.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Oct 5 05:03:24 CDT 2006
Module: wine
Branch: master
Commit: f3cfb89b89e601de9d39f9072d850f587dfd9310
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3cfb89b89e601de9d39f9072d850f587dfd9310
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Thu Oct 5 00:58:37 2006 +0200
usp10: Win64 printf format warning fixes.
---
dlls/usp10/Makefile.in | 1 -
dlls/usp10/usp10.c | 10 +++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/dlls/usp10/Makefile.in b/dlls/usp10/Makefile.in
index 9394beb..9d716d5 100644
--- a/dlls/usp10/Makefile.in
+++ b/dlls/usp10/Makefile.in
@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = usp10.dll
IMPORTLIB = libusp10.$(IMPLIBEXT)
IMPORTS = gdi32 kernel32
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \
usp10.c
diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
index 7fca547..3a226e3 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -187,7 +187,7 @@ HRESULT WINAPI ScriptRecordDigitSubstitu
{
DWORD plgid, sub;
- TRACE("0x%lx, %p\n", locale, sds);
+ TRACE("0x%x, %p\n", locale, sds);
/* This implementation appears to be correct for all languages, but it's
* not clear if sds->DigitSubstitute is ever set to anything except
@@ -447,7 +447,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC h
const BYTE *pbInClass,
SCRIPT_STRING_ANALYSIS *pssa)
{
- FIXME("(%p,%p,%d,%d,%d,0x%lx,%d,%p,%p,%p,%p,%p,%p): stub\n",
+ FIXME("(%p,%p,%d,%d,%d,0x%x,%d,%p,%p,%p,%p,%p,%p): stub\n",
hdc, pString, cString, cGlyphs, iCharset, dwFlags,
iReqWidth, psControl, psState, piDx, pTabdef, pbInClass, pssa);
if (1 > cString || NULL == pString) {
@@ -784,7 +784,7 @@ HRESULT WINAPI ScriptIsComplex(const WCH
{
unsigned int i, j;
- TRACE("(%s,%d,0x%lx)\n", debugstr_wn(chars, len), len, flag);
+ TRACE("(%s,%d,0x%x)\n", debugstr_wn(chars, len), len, flag);
for (i = 0; i < len; i++)
{
@@ -958,7 +958,7 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SC
int cnt;
DWORD hr;
Scriptcache *pScriptcache;
- FIXME("(%p,%p,%s,%d,0x%lx,%p): semi-stub\n", hdc, psc, debugstr_wn(pwcInChars,cChars),
+ FIXME("(%p,%p,%s,%d,0x%x,%p): semi-stub\n", hdc, psc, debugstr_wn(pwcInChars,cChars),
cChars, dwFlags, pwOutGlyphs);
if (!psc)
@@ -1031,7 +1031,7 @@ HRESULT WINAPI ScriptTextOut(const HDC h
if (hr) return S_OK;
else {
- FIXME("ExtTextOut returned:=%ld\n", hr);
+ FIXME("ExtTextOut returned:=%d\n", hr);
return hr;
}
}
More information about the wine-cvs
mailing list