winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
October 2006
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
1032 discussions
Start a n
N
ew thread
Hans Leidekker : shell32/tests: Win64 printf format warning fixes.
by Alexandre Julliard
09 Oct '06
09 Oct '06
Module: wine Branch: master Commit: e5c1a014dfe5f08f31a544b88c4c875654ace429 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e5c1a014dfe5f08f31a544b88…
Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Oct 7 20:18:17 2006 +0200 shell32/tests: Win64 printf format warning fixes. --- dlls/shell32/tests/Makefile.in | 1 dlls/shell32/tests/shelllink.c | 124 ++++++++++++----------- dlls/shell32/tests/shellpath.c | 36 +++---- dlls/shell32/tests/shlexec.c | 26 ++--- dlls/shell32/tests/shlfileop.c | 98 +++++++++--------- dlls/shell32/tests/shlfolder.c | 214 ++++++++++++++++++++-------------------- 6 files changed, 249 insertions(+), 250 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5c1a014dfe5f08f31a54…
1
0
0
0
Hans Leidekker : shell32: Win64 printf format warning fixes.
by Alexandre Julliard
09 Oct '06
09 Oct '06
Module: wine Branch: master Commit: 89e1d2948246edc5297f5f337af77ef15fb57046 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=89e1d2948246edc5297f5f337…
Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Oct 7 20:18:14 2006 +0200 shell32: Win64 printf format warning fixes. --- dlls/shell32/Makefile.in | 2 + dlls/shell32/autocomplete.c | 10 +++-- dlls/shell32/brsfolder.c | 10 +++-- dlls/shell32/changenotify.c | 22 ++++++------ dlls/shell32/classes.c | 2 + dlls/shell32/clipboard.c | 2 + dlls/shell32/control.c | 8 ++-- dlls/shell32/cpanelfolder.c | 32 ++++++++--------- dlls/shell32/dataobject.c | 14 ++++--- dlls/shell32/debughlp.c | 4 +- dlls/shell32/dialogs.c | 2 + dlls/shell32/dragdrophelper.c | 10 +++-- dlls/shell32/enumidlist.c | 10 +++-- dlls/shell32/folders.c | 4 +- dlls/shell32/pidl.c | 26 +++++++------- dlls/shell32/shell32_main.c | 16 ++++---- dlls/shell32/shelllink.c | 36 +++++++++---------- dlls/shell32/shellole.c | 10 +++-- dlls/shell32/shellord.c | 78 +++++++++++++++++++++-------------------- dlls/shell32/shellpath.c | 42 +++++++++++----------- dlls/shell32/shellstring.c | 8 ++-- dlls/shell32/shfldr_desktop.c | 22 ++++++------ dlls/shell32/shfldr_fs.c | 32 ++++++++--------- dlls/shell32/shfldr_mycomp.c | 24 ++++++------- dlls/shell32/shfldr_unixfs.c | 16 ++++---- dlls/shell32/shlexec.c | 10 +++-- dlls/shell32/shlfolder.c | 20 +++++------ dlls/shell32/shlfsbind.c | 4 +- dlls/shell32/shlmenu.c | 16 ++++---- dlls/shell32/shlview.c | 38 ++++++++++---------- dlls/shell32/shv_bg_cmenu.c | 6 ++- dlls/shell32/shv_item_cmenu.c | 4 +- dlls/shell32/systray.c | 2 + 33 files changed, 271 insertions(+), 271 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=89e1d2948246edc5297f5…
1
0
0
0
Michael Stefaniuc : user/tests: Win64 printf format warning fixes.
by Alexandre Julliard
09 Oct '06
09 Oct '06
Module: wine Branch: master Commit: 66ef2f253da5129de97623f65341cf2e799150bc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=66ef2f253da5129de97623f65…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 7 21:45:11 2006 +0200 user/tests: Win64 printf format warning fixes. --- dlls/user/tests/Makefile.in | 1 dlls/user/tests/class.c | 30 ++-- dlls/user/tests/clipboard.c | 24 ++- dlls/user/tests/dce.c | 46 +++--- dlls/user/tests/dde.c | 24 ++- dlls/user/tests/dialog.c | 2 dlls/user/tests/edit.c | 18 +-- dlls/user/tests/input.c | 2 dlls/user/tests/listbox.c | 14 +- dlls/user/tests/menu.c | 80 ++++++----- dlls/user/tests/monitor.c | 6 - dlls/user/tests/msg.c | 278 ++++++++++++++++++++------------------- dlls/user/tests/resource.c | 12 +- dlls/user/tests/sysparams.c | 250 ++++++++++++++++++----------------- dlls/user/tests/text.c | 34 ++--- dlls/user/tests/win.c | 298 +++++++++++++++++++++--------------------- dlls/user/tests/winstation.c | 16 +- dlls/user/tests/wsprintf.c | 4 - 18 files changed, 569 insertions(+), 570 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=66ef2f253da5129de9762…
1
0
0
0
Michael Stefaniuc : dxerr8: Win64 printf format warning fixes.
by Alexandre Julliard
09 Oct '06
09 Oct '06
Module: wine Branch: master Commit: a76b29e0ba228a459f9b06d0f34fe594e8f66618 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a76b29e0ba228a459f9b06d0f…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 00:51:40 2006 +0200 dxerr8: Win64 printf format warning fixes. --- dlls/dxerr8/Makefile.in | 1 - dlls/dxerr8/dxerr8.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/dxerr8/Makefile.in b/dlls/dxerr8/Makefile.in index 71468fe..54cb982 100644 --- a/dlls/dxerr8/Makefile.in +++ b/dlls/dxerr8/Makefile.in @@ -3,7 +3,6 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = libdxerr8.a -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ dxerr8.c diff --git a/dlls/dxerr8/dxerr8.c b/dlls/dxerr8/dxerr8.c index 94c9b7b..57d5425 100644 --- a/dlls/dxerr8/dxerr8.c +++ b/dlls/dxerr8/dxerr8.c @@ -54,7 +54,7 @@ #include "errors.h" const char * WINAPI DXGetErrorString8A(HRESULT hr) { unsigned int i, j, k = 0; - TRACE("(0x%08lx)\n", hr); + TRACE("(0x%08x)\n", hr); for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { j = k + (i / 2); @@ -73,7 +73,7 @@ const WCHAR * WINAPI DXGetErrorString8W( { static const WCHAR unknown[] = { 'U', 'n', 'k', 'n', 'o', 'w', 'n', 0 }; unsigned int i, j, k = 0; - TRACE("(0x%08lx)\n", hr); + TRACE("(0x%08x)\n", hr); for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { j = k + (i / 2); @@ -91,7 +91,7 @@ const WCHAR * WINAPI DXGetErrorString8W( const char * WINAPI DXGetErrorDescription8A(HRESULT hr) { unsigned int i, j, k = 0; - TRACE("(0x%08lx)\n", hr); + TRACE("(0x%08x)\n", hr); for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { j = k + (i / 2); @@ -110,7 +110,7 @@ const WCHAR * WINAPI DXGetErrorDescripti { static const WCHAR na[] = { 'n', '/', 'a', 0 }; unsigned int i, j, k = 0; - TRACE("(0x%08lx)\n", hr); + TRACE("(0x%08x)\n", hr); for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { j = k + (i / 2); @@ -128,14 +128,14 @@ const WCHAR * WINAPI DXGetErrorDescripti HRESULT WINAPI DXTraceA(const char* strFile, DWORD dwLine, HRESULT hr, const char* strMsg, BOOL bPopMsgBox) { char msg[1024]; - TRACE("(%p,%ld,0x%08lx,%p,%d)\n", strFile, dwLine, hr, strMsg, bPopMsgBox); + TRACE("(%p,%d,0x%08x,%p,%d)\n", strFile, dwLine, hr, strMsg, bPopMsgBox); if (bPopMsgBox) { - snprintf(msg, sizeof(msg), "File: %s\nLine: %ld\nError Code: %s (0x%08lx)\nCalling: %s", + snprintf(msg, sizeof(msg), "File: %s\nLine: %d\nError Code: %s (0x%08x)\nCalling: %s", strFile, dwLine, DXGetErrorString8A(hr), hr, strMsg); MessageBoxA(0, msg, "Unexpected error encountered", MB_OK|MB_ICONERROR); } else { - snprintf(msg, sizeof(msg), "%s(%ld): %s (hr=%s (0x%08lx))", strFile, + snprintf(msg, sizeof(msg), "%s(%d): %s (hr=%s (0x%08x))", strFile, dwLine, strMsg, DXGetErrorString8A(hr), hr); OutputDebugStringA(msg); } @@ -146,7 +146,7 @@ HRESULT WINAPI DXTraceA(const char* strF HRESULT WINAPI DXTraceW(const char* strFile, DWORD dwLine, HRESULT hr, const WCHAR* strMsg, BOOL bPopMsgBox) { WCHAR msg[1024]; - TRACE("(%p,%ld,0x%08lx,%p,%d)\n", strFile, dwLine, hr, strMsg, bPopMsgBox); + TRACE("(%p,%d,0x%08x,%p,%d)\n", strFile, dwLine, hr, strMsg, bPopMsgBox); if (bPopMsgBox) { static const WCHAR format[] = { 'F','i','l','e',':',' ','%','s','\\','n','L','i','n',
1
0
0
0
Michael Stefaniuc : olecli32: Win64 printf format warning fixes.
by Alexandre Julliard
09 Oct '06
09 Oct '06
Module: wine Branch: master Commit: c1da70490dcfd5833345ce06f7e52b559b064292 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c1da70490dcfd5833345ce06f…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 00:51:18 2006 +0200 olecli32: Win64 printf format warning fixes. --- dlls/olecli32/Makefile.in | 1 - dlls/olecli32/olecli16.c | 14 +++++++------- dlls/olecli32/olecli_main.c | 14 +++++++------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/olecli32/Makefile.in b/dlls/olecli32/Makefile.in index a2dc3c8..334e8e1 100644 --- a/dlls/olecli32/Makefile.in +++ b/dlls/olecli32/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = olecli32.dll IMPORTLIB = libolecli32.$(IMPLIBEXT) IMPORTS = ole32 gdi32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ olecli_main.c diff --git a/dlls/olecli32/olecli16.c b/dlls/olecli32/olecli16.c index 7545fbf..a1da30a 100644 --- a/dlls/olecli32/olecli16.c +++ b/dlls/olecli32/olecli16.c @@ -199,7 +199,7 @@ static LONG OLE_current_handle; */ OLESTATUS WINAPI OleSavedClientDoc16(LHCLIENTDOC hDoc) { - FIXME("(%ld: stub\n", hDoc); + FIXME("(%d: stub\n", hDoc); return OLE_OK; } @@ -219,7 +219,7 @@ OLESTATUS WINAPI OleRegisterClientDoc16( */ OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC hDoc, LPCSTR newName) { - FIXME("(%ld,%s,...): stub\n",hDoc, newName); + FIXME("(%d,%s,...): stub\n",hDoc, newName); return OLE_OK; } @@ -228,7 +228,7 @@ OLESTATUS WINAPI OleRenameClientDoc16(LH */ OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC hServerDoc) { - FIXME("(%ld): stub\n",hServerDoc); + FIXME("(%d): stub\n",hServerDoc); return OLE_OK; } @@ -237,7 +237,7 @@ OLESTATUS WINAPI OleRevokeClientDoc16(LH */ OLESTATUS WINAPI OleRevertClientDoc16(LHCLIENTDOC hServerDoc) { - FIXME("(%ld): stub\n", hServerDoc); + FIXME("(%d): stub\n", hServerDoc); return OLE_OK; } @@ -246,7 +246,7 @@ OLESTATUS WINAPI OleRevertClientDoc16(LH */ OLESTATUS WINAPI OleEnumObjects16(LHCLIENTDOC hServerDoc, SEGPTR data) { - FIXME("(%ld, %04x:%04x): stub\n", hServerDoc, HIWORD(data), + FIXME("(%d, %04x:%04x): stub\n", hServerDoc, HIWORD(data), LOWORD(data)); return OLE_OK; } @@ -258,7 +258,7 @@ OLESTATUS WINAPI OleCreateLinkFromClip16 LPCSTR xname, SEGPTR lpoleob, UINT16 render, UINT16 clipformat ) { - FIXME("(%s, %04x:%04x, %ld, %s, %04x:%04x, %d, %d): stub!\n", + FIXME("(%s, %04x:%04x, %d, %s, %04x:%04x, %d, %d): stub!\n", name, HIWORD(olecli), LOWORD(olecli), hclientdoc, xname, HIWORD(lpoleob), LOWORD(lpoleob), render, clipformat); return OLE_OK; @@ -305,7 +305,7 @@ OLESTATUS WINAPI OleCreateFromClip16( LP LPCSTR xname, SEGPTR lpoleob, UINT16 render, UINT16 clipformat ) { - FIXME("(%s, %04x:%04x, %ld, %s, %04x:%04x, %d, %d): stub!\n", + FIXME("(%s, %04x:%04x, %d, %s, %04x:%04x, %d, %d): stub!\n", name, HIWORD(olecli), LOWORD(olecli), hclientdoc, xname, HIWORD(lpoleob), LOWORD(lpoleob), render, clipformat); return OLE_OK; diff --git a/dlls/olecli32/olecli_main.c b/dlls/olecli32/olecli_main.c index 99574ac..d751522 100644 --- a/dlls/olecli32/olecli_main.c +++ b/dlls/olecli32/olecli_main.c @@ -199,7 +199,7 @@ static LONG OLE_current_handle; */ OLESTATUS WINAPI OleSavedClientDoc(LHCLIENTDOC hDoc) { - FIXME("(%ld: stub\n", hDoc); + FIXME("(%d: stub\n", hDoc); return OLE_OK; } @@ -219,7 +219,7 @@ OLESTATUS WINAPI OleRegisterClientDoc(LP */ OLESTATUS WINAPI OleRenameClientDoc(LHCLIENTDOC hDoc, LPCSTR newName) { - FIXME("(%ld,%s,...): stub\n",hDoc, newName); + FIXME("(%d,%s,...): stub\n",hDoc, newName); return OLE_OK; } @@ -228,7 +228,7 @@ OLESTATUS WINAPI OleRenameClientDoc(LHCL */ OLESTATUS WINAPI OleRevokeClientDoc(LHCLIENTDOC hServerDoc) { - FIXME("(%ld): stub\n",hServerDoc); + FIXME("(%d): stub\n",hServerDoc); return OLE_OK; } @@ -239,7 +239,7 @@ OLESTATUS WINAPI OleCreateLinkFromClip( LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname, _LPOLEOBJECT *lpoleob,OLEOPT_RENDER render,OLECLIPFORMAT clipformat ) { - FIXME("(%s,%p,%08lx,%s,%p,%d,%ld): stub!\n", + FIXME("(%s,%p,%08x,%s,%p,%d,%d): stub!\n", name,olecli,hclientdoc,xname,lpoleob,render,clipformat); return OLE_OK; } @@ -248,7 +248,7 @@ OLESTATUS WINAPI OleCreateLinkFromClip( * OleQueryLinkFromClip [OLECLI32.9] */ OLESTATUS WINAPI OleQueryLinkFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) { - FIXME("(%s,%d,%ld): stub!\n",name,render,clipformat); + FIXME("(%s,%d,%d): stub!\n",name,render,clipformat); return OLE_OK; } @@ -256,7 +256,7 @@ OLESTATUS WINAPI OleQueryLinkFromClip(LP * OleQueryCreateFromClip [OLECLI32.10] */ OLESTATUS WINAPI OleQueryCreateFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) { - FIXME("(%s,%d,%ld): stub!\n",name,render,clipformat); + FIXME("(%s,%d,%d): stub!\n",name,render,clipformat); return OLE_OK; } @@ -296,7 +296,7 @@ OLESTATUS WINAPI OleCreateFromClip( LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname, _LPOLEOBJECT *lpoleob,OLEOPT_RENDER render, OLECLIPFORMAT clipformat ) { - FIXME("(%s,%p,%08lx,%s,%p,%d,%ld): stub!\n", + FIXME("(%s,%p,%08x,%s,%p,%d,%d): stub!\n", name,olecli,hclientdoc,xname,lpoleob,render,clipformat); /* clipb type, object kreieren entsprechend etc. */ return OLE_OK;
1
0
0
0
Michael Stefaniuc : dxerr9: Win64 printf format warning fixes.
by Alexandre Julliard
09 Oct '06
09 Oct '06
Module: wine Branch: master Commit: 814fd44205e9c9c7714686c0bc9ad4d0207874b6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=814fd44205e9c9c7714686c0b…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 00:50:14 2006 +0200 dxerr9: Win64 printf format warning fixes. --- dlls/dxerr9/Makefile.in | 1 - dlls/dxerr9/dxerr9.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/dxerr9/Makefile.in b/dlls/dxerr9/Makefile.in index d40946d..eb4e114 100644 --- a/dlls/dxerr9/Makefile.in +++ b/dlls/dxerr9/Makefile.in @@ -3,7 +3,6 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = libdxerr9.a -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ dxerr9.c diff --git a/dlls/dxerr9/dxerr9.c b/dlls/dxerr9/dxerr9.c index e419925..7bfb91b 100644 --- a/dlls/dxerr9/dxerr9.c +++ b/dlls/dxerr9/dxerr9.c @@ -58,7 +58,7 @@ #include "errors.h" const char * WINAPI DXGetErrorString9A(HRESULT hr) { unsigned int i, j, k = 0; - TRACE("(0x%08lx)\n", hr); + TRACE("(0x%08x)\n", hr); for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { j = k + (i / 2); @@ -77,7 +77,7 @@ const WCHAR * WINAPI DXGetErrorString9W( { static const WCHAR unknown[] = { 'U', 'n', 'k', 'n', 'o', 'w', 'n', 0 }; unsigned int i, j, k = 0; - TRACE("(0x%08lx)\n", hr); + TRACE("(0x%08x)\n", hr); for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { j = k + (i / 2); @@ -95,7 +95,7 @@ const WCHAR * WINAPI DXGetErrorString9W( const char * WINAPI DXGetErrorDescription9A(HRESULT hr) { unsigned int i, j, k = 0; - TRACE("(0x%08lx)\n", hr); + TRACE("(0x%08x)\n", hr); for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { j = k + (i / 2); @@ -114,7 +114,7 @@ const WCHAR * WINAPI DXGetErrorDescripti { static const WCHAR na[] = { 'n', '/', 'a', 0 }; unsigned int i, j, k = 0; - TRACE("(0x%08lx)\n", hr); + TRACE("(0x%08x)\n", hr); for (i = sizeof(info)/sizeof(info[0]); i != 0; i /= 2) { j = k + (i / 2); @@ -132,14 +132,14 @@ const WCHAR * WINAPI DXGetErrorDescripti HRESULT WINAPI DXTraceA(const char* strFile, DWORD dwLine, HRESULT hr, const char* strMsg, BOOL bPopMsgBox) { char msg[1024]; - TRACE("(%p,%ld,0x%08lx,%p,%d)\n", strFile, dwLine, hr, strMsg, bPopMsgBox); + TRACE("(%p,%d,0x%08x,%p,%d)\n", strFile, dwLine, hr, strMsg, bPopMsgBox); if (bPopMsgBox) { - snprintf(msg, sizeof(msg), "File: %s\nLine: %ld\nError Code: %s (0x%08lx)\nCalling: %s", + snprintf(msg, sizeof(msg), "File: %s\nLine: %d\nError Code: %s (0x%08x)\nCalling: %s", strFile, dwLine, DXGetErrorString9A(hr), hr, strMsg); MessageBoxA(0, msg, "Unexpected error encountered", MB_OK|MB_ICONERROR); } else { - snprintf(msg, sizeof(msg), "%s(%ld): %s (hr=%s (0x%08lx))", strFile, + snprintf(msg, sizeof(msg), "%s(%d): %s (hr=%s (0x%08x))", strFile, dwLine, strMsg, DXGetErrorString9A(hr), hr); OutputDebugStringA(msg); } @@ -150,7 +150,7 @@ HRESULT WINAPI DXTraceA(const char* strF HRESULT WINAPI DXTraceW(const char* strFile, DWORD dwLine, HRESULT hr, const WCHAR* strMsg, BOOL bPopMsgBox) { WCHAR msg[1024]; - TRACE("(%p,%ld,0x%08lx,%p,%d)\n", strFile, dwLine, hr, strMsg, bPopMsgBox); + TRACE("(%p,%d,0x%08x,%p,%d)\n", strFile, dwLine, hr, strMsg, bPopMsgBox); if (bPopMsgBox) { static const WCHAR format[] = { 'F','i','l','e',':',' ','%','s','\\','n','L','i','n',
1
0
0
0
Michael Stefaniuc : olesvr32: Win64 printf format warning fixes.
by Alexandre Julliard
09 Oct '06
09 Oct '06
Module: wine Branch: master Commit: b4c6e46926f23c4d8ec8989e7c2c4a1901a3df62 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b4c6e46926f23c4d8ec8989e7…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 00:49:45 2006 +0200 olesvr32: Win64 printf format warning fixes. --- dlls/olesvr32/Makefile.in | 1 - dlls/olesvr32/olesvr_main.c | 30 +++++++++++++++--------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/olesvr32/Makefile.in b/dlls/olesvr32/Makefile.in index 5ea89a5..3a234dd 100644 --- a/dlls/olesvr32/Makefile.in +++ b/dlls/olesvr32/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = olesvr32.dll IMPORTLIB = libolesvr32.$(IMPLIBEXT) IMPORTS = kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ olesvr_main.c diff --git a/dlls/olesvr32/olesvr_main.c b/dlls/olesvr32/olesvr_main.c index 06a32df..3d22cb7 100644 --- a/dlls/olesvr32/olesvr_main.c +++ b/dlls/olesvr32/olesvr_main.c @@ -150,7 +150,7 @@ OLESTATUS WINAPI OleRegisterServer16( LP */ OLESTATUS WINAPI OleBlockServer16(LHSERVER hServer) { - FIXME("(%ld): stub\n",hServer); + FIXME("(%d): stub\n",hServer); return OLE_OK; } @@ -159,7 +159,7 @@ OLESTATUS WINAPI OleBlockServer16(LHSERV */ OLESTATUS WINAPI OleBlockServer(LHSERVER hServer) { - FIXME("(%ld): stub\n",hServer); + FIXME("(%d): stub\n",hServer); return OLE_OK; } @@ -168,7 +168,7 @@ OLESTATUS WINAPI OleBlockServer(LHSERVER */ OLESTATUS WINAPI OleUnblockServer16(LHSERVER hServer, BOOL16 *block) { - FIXME("(%ld): stub\n",hServer); + FIXME("(%d): stub\n",hServer); /* no more blocked messages :) */ *block=FALSE; return OLE_OK; @@ -179,7 +179,7 @@ OLESTATUS WINAPI OleUnblockServer16(LHSE */ OLESTATUS WINAPI OleUnblockServer(LHSERVER hServer, BOOL *block) { - FIXME("(%ld): stub\n",hServer); + FIXME("(%d): stub\n",hServer); /* no more blocked messages :) */ *block=FALSE; return OLE_OK; @@ -192,7 +192,7 @@ OLESTATUS WINAPI OleRegisterServerDoc16( LPOLESERVERDOC document, LHSERVERDOC *hRet) { - FIXME("(%ld,%s): stub\n",hServer, docname); + FIXME("(%d,%s): stub\n",hServer, docname); *hRet=++OLE_current_handle; return OLE_OK; } @@ -202,7 +202,7 @@ OLESTATUS WINAPI OleRegisterServerDoc16( */ OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC hServerDoc) { - FIXME("%ld - stub\n",hServerDoc); + FIXME("%d - stub\n",hServerDoc); return OLE_OK; } @@ -211,7 +211,7 @@ OLESTATUS WINAPI OleRevokeServerDoc16(LH */ OLESTATUS WINAPI OleRevokeServerDoc(LHSERVERDOC hServerDoc) { - FIXME("(%ld): stub\n",hServerDoc); + FIXME("(%d): stub\n",hServerDoc); return OLE_OK; } @@ -220,7 +220,7 @@ OLESTATUS WINAPI OleRevokeServerDoc(LHSE */ OLESTATUS WINAPI OleRevokeServer16(LHSERVER hServer) { - FIXME("%ld - stub\n",hServer); + FIXME("%d - stub\n",hServer); return OLE_OK; } @@ -240,7 +240,7 @@ OLESTATUS WINAPI OleRegisterServerDoc( L LPOLESERVERDOC document, LHSERVERDOC *hRet) { - FIXME("(%ld,%s): stub\n", hServer, docname); + FIXME("(%d,%s): stub\n", hServer, docname); *hRet=++OLE_current_handle; return OLE_OK; } @@ -251,7 +251,7 @@ OLESTATUS WINAPI OleRegisterServerDoc( L */ OLESTATUS WINAPI OleRenameServerDoc16(LHSERVERDOC hDoc, LPCSTR newName) { - FIXME("(%ld,%s): stub.\n", hDoc, newName); + FIXME("(%d,%s): stub.\n", hDoc, newName); return OLE_OK; } @@ -261,7 +261,7 @@ OLESTATUS WINAPI OleRenameServerDoc16(LH */ OLESTATUS WINAPI OleRenameServerDoc(LHSERVERDOC hDoc, LPCSTR newName) { - FIXME("(%ld,%s): stub.\n",hDoc, newName); + FIXME("(%d,%s): stub.\n",hDoc, newName); return OLE_OK; } @@ -271,7 +271,7 @@ OLESTATUS WINAPI OleRenameServerDoc(LHSE */ OLESTATUS WINAPI OleRevertServerDoc16(LHSERVERDOC hDoc) { - FIXME("(%ld): stub.\n", hDoc); + FIXME("(%d): stub.\n", hDoc); return OLE_OK; } @@ -281,7 +281,7 @@ OLESTATUS WINAPI OleRevertServerDoc16(LH */ OLESTATUS WINAPI OleRevertServerDoc(LHSERVERDOC hDoc) { - FIXME("(%ld): stub.\n", hDoc); + FIXME("(%d): stub.\n", hDoc); return OLE_OK; } @@ -291,7 +291,7 @@ OLESTATUS WINAPI OleRevertServerDoc(LHSE */ OLESTATUS WINAPI OleSavedServerDoc16(LHSERVERDOC hDoc) { - FIXME("(%ld): stub.\n", hDoc); + FIXME("(%d): stub.\n", hDoc); return OLE_OK; } @@ -301,6 +301,6 @@ OLESTATUS WINAPI OleSavedServerDoc16(LHS */ OLESTATUS WINAPI OleSavedServerDoc(LHSERVERDOC hDoc) { - FIXME("(%ld): stub.\n", hDoc); + FIXME("(%d): stub.\n", hDoc); return OLE_OK; }
1
0
0
0
Michael Stefaniuc : quartz/tests: Win64 printf format warning fixes.
by Alexandre Julliard
09 Oct '06
09 Oct '06
Module: wine Branch: master Commit: 44e65a0facb84c14c63447837187a2aea2791b8c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=44e65a0facb84c14c63447837…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 00:48:51 2006 +0200 quartz/tests: Win64 printf format warning fixes. --- dlls/quartz/tests/Makefile.in | 1 - dlls/quartz/tests/filtergraph.c | 18 +++++++++--------- dlls/quartz/tests/memallocator.c | 12 ++++++------ 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 42851f5..2c8bdc1 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ TESTDLL = quartz.dll IMPORTS = ole32 user32 gdi32 kernel32 EXTRALIBS = -lstrmiids -EXTRADEFS = -DWINE_NO_LONG_AS_INT CTESTS = \ filtergraph.c \ diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 3c80e13..fe26baf 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -42,7 +42,7 @@ static void renderfile(void) HRESULT hr; hr = IGraphBuilder_RenderFile(pgraph, file, NULL); - ok(hr==S_OK, "RenderFile returned: %lx\n", hr); + ok(hr==S_OK, "RenderFile returned: %x\n", hr); } static void rungraph(void) @@ -53,28 +53,28 @@ static void rungraph(void) HANDLE hEvent; hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaControl, (LPVOID*)&pmc); - ok(hr==S_OK, "Cannot get IMediaControl interface returned: %lx\n", hr); + ok(hr==S_OK, "Cannot get IMediaControl interface returned: %x\n", hr); hr = IMediaControl_Run(pmc); - ok(hr==S_FALSE, "Cannot run the graph returned: %lx\n", hr); + ok(hr==S_FALSE, "Cannot run the graph returned: %x\n", hr); hr = IGraphBuilder_QueryInterface(pgraph, &IID_IMediaEvent, (LPVOID*)&pme); - ok(hr==S_OK, "Cannot get IMediaEvent interface returned: %lx\n", hr); + ok(hr==S_OK, "Cannot get IMediaEvent interface returned: %x\n", hr); hr = IMediaEvent_GetEventHandle(pme, (OAEVENT*)&hEvent); - ok(hr==S_OK, "Cannot get event handle returned: %lx\n", hr); + ok(hr==S_OK, "Cannot get event handle returned: %x\n", hr); /* WaitForSingleObject(hEvent, INFINITE); */ Sleep(20000); hr = IMediaControl_Release(pme); - ok(hr==2, "Releasing mediaevent returned: %lx\n", hr); + ok(hr==2, "Releasing mediaevent returned: %x\n", hr); hr = IMediaControl_Stop(pmc); - ok(hr==S_OK, "Cannot stop the graph returned: %lx\n", hr); + ok(hr==S_OK, "Cannot stop the graph returned: %x\n", hr); hr = IMediaControl_Release(pmc); - ok(hr==1, "Releasing mediacontrol returned: %lx\n", hr); + ok(hr==1, "Releasing mediacontrol returned: %x\n", hr); } static void releasefiltergraph(void) @@ -82,7 +82,7 @@ static void releasefiltergraph(void) HRESULT hr; hr = IGraphBuilder_Release(pgraph); - ok(hr==0, "Releasing filtergraph returned: %lx\n", hr); + ok(hr==0, "Releasing filtergraph returned: %x\n", hr); } START_TEST(filtergraph) diff --git a/dlls/quartz/tests/memallocator.c b/dlls/quartz/tests/memallocator.c index 0914d27..0a01db9 100644 --- a/dlls/quartz/tests/memallocator.c +++ b/dlls/quartz/tests/memallocator.c @@ -33,7 +33,7 @@ static void CommitDecommitTest(void) HRESULT hr; hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)&pMemAllocator); - ok(hr==S_OK, "Unable to create memory allocator %lx\n", hr); + ok(hr==S_OK, "Unable to create memory allocator %x\n", hr); if (hr == S_OK) { @@ -46,17 +46,17 @@ static void CommitDecommitTest(void) RequestedProps.cbPrefix = 0; hr = IMemAllocator_SetProperties(pMemAllocator, &RequestedProps, &ActualProps); - ok(hr==S_OK, "SetProperties returned: %lx\n", hr); + ok(hr==S_OK, "SetProperties returned: %x\n", hr); hr = IMemAllocator_Commit(pMemAllocator); - ok(hr==S_OK, "Commit returned: %lx\n", hr); + ok(hr==S_OK, "Commit returned: %x\n", hr); hr = IMemAllocator_Commit(pMemAllocator); - ok(hr==S_OK, "Commit returned: %lx\n", hr); + ok(hr==S_OK, "Commit returned: %x\n", hr); hr = IMemAllocator_Decommit(pMemAllocator); - ok(hr==S_OK, "Decommit returned: %lx\n", hr); + ok(hr==S_OK, "Decommit returned: %x\n", hr); hr = IMemAllocator_Decommit(pMemAllocator); - ok(hr==S_OK, "Cecommit returned: %lx\n", hr); + ok(hr==S_OK, "Cecommit returned: %x\n", hr); IMemAllocator_Release(pMemAllocator); }
1
0
0
0
Michael Stefaniuc : rpcrt4/tests: Win64 printf format warning fixes.
by Alexandre Julliard
09 Oct '06
09 Oct '06
Module: wine Branch: master Commit: 14c551bc3a370aa8980e1100685b9b40be1e9f66 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=14c551bc3a370aa8980e11006…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 00:48:22 2006 +0200 rpcrt4/tests: Win64 printf format warning fixes. --- dlls/rpcrt4/tests/Makefile.in | 1 - dlls/rpcrt4/tests/cstub.c | 18 +++++++++--------- dlls/rpcrt4/tests/ndr_marshall.c | 6 +++--- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/rpcrt4/tests/Makefile.in b/dlls/rpcrt4/tests/Makefile.in index 4511cad..036cd21 100644 --- a/dlls/rpcrt4/tests/Makefile.in +++ b/dlls/rpcrt4/tests/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ TESTDLL = rpcrt4.dll IMPORTS = ole32 rpcrt4 kernel32 EXTRALIBS = -luuid -EXTRADEFS = -DWINE_NO_LONG_AS_INT CTESTS = \ cstub.c \ diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 3a4c7b4..0377092 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -447,7 +447,7 @@ static IPSFactoryBuffer *test_NdrDllGetC r = NdrDllGetClassObject(&PSDispatch, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, &PSDispatch, &PSFactoryBuffer); - ok(r == S_OK, "ret %08lx\n", r); + ok(r == S_OK, "ret %08x\n", r); ok(ppsf != NULL, "ppsf == NULL\n"); ok(PSFactoryBuffer.pProxyFileList == proxy_file_list, "pfl not the same\n"); @@ -567,7 +567,7 @@ static IRpcStubBuffer *create_stub(IPSFa HRESULT r; r = IPSFactoryBuffer_CreateStub(ppsf, iid, obj, &pstub); - ok(r == expected_result, "CreateStub returned %08lx expected %08lx\n", r, expected_result); + ok(r == expected_result, "CreateStub returned %08x expected %08x\n", r, expected_result); return pstub; } @@ -704,14 +704,14 @@ static void test_Connect(IPSFactoryBuffe obj = (IUnknown*)&new_vtbl; r = IRpcStubBuffer_Connect(pstub, obj); - ok(r == S_OK, "r %08lx\n", r); + ok(r == S_OK, "r %08x\n", r); ok(connect_test_orig_release_called == 1, "release called %d\n", connect_test_orig_release_called); ok(cstd_stub->pvServerObject == (void*)0xcafebabe, "pvServerObject %p\n", cstd_stub->pvServerObject); cstd_stub->pvServerObject = (IUnknown*)&orig_vtbl; obj = (IUnknown*)&new_fail_vtbl; r = IRpcStubBuffer_Connect(pstub, obj); - ok(r == E_NOINTERFACE, "r %08lx\n", r); + ok(r == E_NOINTERFACE, "r %08x\n", r); ok(cstd_stub->pvServerObject == (void*)0xdeadbeef, "pvServerObject %p\n", cstd_stub->pvServerObject); ok(connect_test_orig_release_called == 2, "release called %d\n", connect_test_orig_release_called); @@ -786,15 +786,15 @@ static void test_Release(IPSFactoryBuffe todo_wine { ok(connect_test_orig_release_called == 0, "release called %d\n", connect_test_orig_release_called); } - ok(PSFactoryBuffer.RefCount == facbuf_refs - 1, "factory buffer refs %ld orig %ld\n", PSFactoryBuffer.RefCount, facbuf_refs); + ok(PSFactoryBuffer.RefCount == facbuf_refs - 1, "factory buffer refs %ld orig %d\n", PSFactoryBuffer.RefCount, facbuf_refs); /* This shows that NdrCStdStubBuffer_Release calls Release on its 2nd arg, rather than on This->pPSFactory (which are usually the same and indeed it's odd that _Release requires this 2nd arg). */ pstub = create_stub(ppsf, &IID_if1, obj, S_OK); - ok(PSFactoryBuffer.RefCount == facbuf_refs, "factory buffer refs %ld orig %ld\n", PSFactoryBuffer.RefCount, facbuf_refs); + ok(PSFactoryBuffer.RefCount == facbuf_refs, "factory buffer refs %ld orig %d\n", PSFactoryBuffer.RefCount, facbuf_refs); NdrCStdStubBuffer_Release(pstub, (IPSFactoryBuffer*)pretend_psfacbuf); ok(release_test_psfacbuf_release_called == 1, "pretend_psfacbuf_release called %d\n", release_test_psfacbuf_release_called); - ok(PSFactoryBuffer.RefCount == facbuf_refs, "factory buffer refs %ld orig %ld\n", PSFactoryBuffer.RefCount, facbuf_refs); + ok(PSFactoryBuffer.RefCount == facbuf_refs, "factory buffer refs %ld orig %d\n", PSFactoryBuffer.RefCount, facbuf_refs); } static HRESULT WINAPI delegating_invoke_test_QI(ITypeLib *pUnk, REFIID iid, void** ppv) @@ -877,8 +877,8 @@ #else #endif if(r == S_OK) { - ok(*(DWORD*)msg.Buffer == 0xabcdef, "buf[0] %08lx\n", *(DWORD*)msg.Buffer); - ok(*((DWORD*)msg.Buffer + 1) == S_OK, "buf[1] %08lx\n", *((DWORD*)msg.Buffer + 1)); + ok(*(DWORD*)msg.Buffer == 0xabcdef, "buf[0] %08x\n", *(DWORD*)msg.Buffer); + ok(*((DWORD*)msg.Buffer + 1) == S_OK, "buf[1] %08x\n", *((DWORD*)msg.Buffer + 1)); } IRpcStubBuffer_Release(pstub); } diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 67ac531..086f587 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -447,7 +447,7 @@ static void test_simple_struct_marshal(c ptr = NdrSimpleStructMarshall( &StubMsg, (unsigned char*)memsrc, formattypes ); ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart); - ok(!memcmp(StubMsg.BufferStart, wiredata, wiredatalen), "%s: incorrectly marshaled %08lx %08lx %08lx\n", msgpfx, *(DWORD*)StubMsg.BufferStart,*((DWORD*)StubMsg.BufferStart+1),*((DWORD*)StubMsg.BufferStart+2)); + ok(!memcmp(StubMsg.BufferStart, wiredata, wiredatalen), "%s: incorrectly marshaled %08x %08x %08x\n", msgpfx, *(DWORD*)StubMsg.BufferStart,*((DWORD*)StubMsg.BufferStart+1),*((DWORD*)StubMsg.BufferStart+2)); #if 0 StubMsg.Buffer = StubMsg.BufferStart; @@ -929,13 +929,13 @@ todo_wine { } if(mem_list) { - ok(mem_list->magic == magic_MEML, "magic %08lx\n", mem_list->magic); + ok(mem_list->magic == magic_MEML, "magic %08x\n", mem_list->magic); ok(mem_list->ptr == p2, "ptr != p2\n"); ok(mem_list->next != NULL, "next NULL\n"); mem_list = mem_list->next; if(mem_list) { - ok(mem_list->magic == magic_MEML, "magic %08lx\n", mem_list->magic); + ok(mem_list->magic == magic_MEML, "magic %08x\n", mem_list->magic); ok(mem_list->ptr == p1, "ptr != p2\n"); ok(mem_list->next == NULL, "next %p\n", mem_list->next); }
1
0
0
0
Michael Stefaniuc : psapi: Win64 printf format warning fixes.
by Alexandre Julliard
09 Oct '06
09 Oct '06
Module: wine Branch: master Commit: bcd0836f1d5f7374882e7e2f4b09abba5d90a376 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=bcd0836f1d5f7374882e7e2f4…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 00:46:41 2006 +0200 psapi: Win64 printf format warning fixes. --- dlls/psapi/Makefile.in | 1 - dlls/psapi/psapi_main.c | 30 +++++++++++++++--------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/psapi/Makefile.in b/dlls/psapi/Makefile.in index 4959289..8bd5546 100644 --- a/dlls/psapi/Makefile.in +++ b/dlls/psapi/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = psapi.dll IMPORTLIB = libpsapi.$(IMPLIBEXT) IMPORTS = kernel32 ntdll -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ psapi_main.c diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index 4556052..0313475 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -160,7 +160,7 @@ BOOL WINAPI EmptyWorkingSet(HANDLE hProc */ BOOL WINAPI EnumDeviceDrivers(LPVOID *lpImageBase, DWORD cb, LPDWORD lpcbNeeded) { - FIXME("(%p, %ld, %p): stub\n", lpImageBase, cb, lpcbNeeded); + FIXME("(%p, %d, %p): stub\n", lpImageBase, cb, lpcbNeeded); if (lpcbNeeded) *lpcbNeeded = 0; @@ -271,7 +271,7 @@ BOOL WINAPI EnumProcessModules(HANDLE hP DWORD WINAPI GetDeviceDriverBaseNameA(LPVOID ImageBase, LPSTR lpBaseName, DWORD nSize) { - FIXME("(%p, %p, %ld): stub\n", ImageBase, lpBaseName, nSize); + FIXME("(%p, %p, %d): stub\n", ImageBase, lpBaseName, nSize); if (lpBaseName && nSize) lpBaseName[0] = '\0'; @@ -285,7 +285,7 @@ DWORD WINAPI GetDeviceDriverBaseNameA(LP DWORD WINAPI GetDeviceDriverBaseNameW(LPVOID ImageBase, LPWSTR lpBaseName, DWORD nSize) { - FIXME("(%p, %p, %ld): stub\n", ImageBase, lpBaseName, nSize); + FIXME("(%p, %p, %d): stub\n", ImageBase, lpBaseName, nSize); if (lpBaseName && nSize) lpBaseName[0] = '\0'; @@ -299,7 +299,7 @@ DWORD WINAPI GetDeviceDriverBaseNameW(LP DWORD WINAPI GetDeviceDriverFileNameA(LPVOID ImageBase, LPSTR lpFilename, DWORD nSize) { - FIXME("(%p, %p, %ld): stub\n", ImageBase, lpFilename, nSize); + FIXME("(%p, %p, %d): stub\n", ImageBase, lpFilename, nSize); if (lpFilename && nSize) lpFilename[0] = '\0'; @@ -313,7 +313,7 @@ DWORD WINAPI GetDeviceDriverFileNameA(LP DWORD WINAPI GetDeviceDriverFileNameW(LPVOID ImageBase, LPWSTR lpFilename, DWORD nSize) { - FIXME("(%p, %p, %ld): stub\n", ImageBase, lpFilename, nSize); + FIXME("(%p, %p, %d): stub\n", ImageBase, lpFilename, nSize); if (lpFilename && nSize) lpFilename[0] = '\0'; @@ -327,7 +327,7 @@ DWORD WINAPI GetDeviceDriverFileNameW(LP DWORD WINAPI GetMappedFileNameA(HANDLE hProcess, LPVOID lpv, LPSTR lpFilename, DWORD nSize) { - FIXME("(%p, %p, %p, %ld): stub\n", hProcess, lpv, lpFilename, nSize); + FIXME("(%p, %p, %p, %d): stub\n", hProcess, lpv, lpFilename, nSize); if (lpFilename && nSize) lpFilename[0] = '\0'; @@ -341,7 +341,7 @@ DWORD WINAPI GetMappedFileNameA(HANDLE h DWORD WINAPI GetMappedFileNameW(HANDLE hProcess, LPVOID lpv, LPWSTR lpFilename, DWORD nSize) { - FIXME("(%p, %p, %p, %ld): stub\n", hProcess, lpv, lpFilename, nSize); + FIXME("(%p, %p, %p, %d): stub\n", hProcess, lpv, lpFilename, nSize); if (lpFilename && nSize) lpFilename[0] = '\0'; @@ -364,7 +364,7 @@ DWORD WINAPI GetModuleBaseNameA(HANDLE h } lpBaseNameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * nSize); buflenW = GetModuleBaseNameW(hProcess, hModule, lpBaseNameW, nSize); - TRACE("%ld, %s\n", buflenW, debugstr_w(lpBaseNameW)); + TRACE("%d, %s\n", buflenW, debugstr_w(lpBaseNameW)); if (buflenW) { ret = WideCharToMultiByte(CP_ACP, 0, lpBaseNameW, buflenW, @@ -403,7 +403,7 @@ DWORD WINAPI GetModuleFileNameExA(HANDLE { WCHAR *ptr; - TRACE("(hProcess=%p, hModule=%p, %p, %ld)\n", + TRACE("(hProcess=%p, hModule=%p, %p, %d)\n", hProcess, hModule, lpFileName, nSize); if (!lpFileName || !nSize) return 0; @@ -481,7 +481,7 @@ BOOL WINAPI GetPerformanceInfo( PPERFORM { NTSTATUS status; - TRACE( "(%p, %ld)\n", info, size ); + TRACE( "(%p, %d)\n", info, size ); status = NtQueryInformationProcess( GetCurrentProcess(), SystemPerformanceInformation, info, size, NULL ); @@ -498,7 +498,7 @@ BOOL WINAPI GetPerformanceInfo( PPERFORM */ DWORD WINAPI GetProcessImageFileNameA( HANDLE process, LPSTR file, DWORD size ) { - FIXME("(%p, %p, %ld) stub\n", process, file, size ); + FIXME("(%p, %p, %d) stub\n", process, file, size ); return 0; } @@ -507,7 +507,7 @@ DWORD WINAPI GetProcessImageFileNameA( H */ DWORD WINAPI GetProcessImageFileNameW( HANDLE process, LPWSTR file, DWORD size ) { - FIXME("(%p, %p, %ld) stub\n", process, file, size ); + FIXME("(%p, %p, %d) stub\n", process, file, size ); return 0; } @@ -559,7 +559,7 @@ BOOL WINAPI GetWsChanges( HANDLE process { NTSTATUS status; - TRACE( "(%p, %p, %ld)\n", process, watchinfo, size ); + TRACE( "(%p, %p, %d)\n", process, watchinfo, size ); status = NtQueryVirtualMemory( process, NULL, ProcessWorkingSetWatch, watchinfo, size, NULL ); @@ -588,7 +588,7 @@ BOOL WINAPI QueryWorkingSet( HANDLE proc { NTSTATUS status; - TRACE( "(%p, %p, %ld)\n", process, buffer, size ); + TRACE( "(%p, %p, %d)\n", process, buffer, size ); status = NtQueryVirtualMemory( process, NULL, MemoryWorkingSetList, buffer, size, NULL ); @@ -607,7 +607,7 @@ BOOL WINAPI QueryWorkingSetEx( HANDLE pr { NTSTATUS status; - TRACE( "(%p, %p, %ld)\n", process, buffer, size ); + TRACE( "(%p, %p, %d)\n", process, buffer, size ); status = NtQueryVirtualMemory( process, NULL, MemoryWorkingSetList, buffer, size, NULL );
1
0
0
0
← Newer
1
...
70
71
72
73
74
75
76
...
104
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
Results per page:
10
25
50
100
200