October 2006 - Wine-commits

Mikołaj Zalewski : winefile: Update Polish translation .
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 0d003d80138fbc0a4ad4aad9c95a6df3ef583b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d003d80138fbc0a4ad4aad9c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Oct 8 23:23:10 2006 +0200 winefile: Update Polish translation. --- programs/winefile/Pl.rc | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/programs/winefile/Pl.rc b/programs/winefile/Pl.rc index a4acd0e..42e5051 100644 --- a/programs/winefile/Pl.rc +++ b/programs/winefile/Pl.rc @@ -262,3 +262,27 @@ STRINGTABLE IDS_FREE_SPACE_FMT "%s z %s wolne" } + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "LICENCJA" +IDS_LICENSE, +"This library is free software; you can redistribute it and/or \ +modify it under the terms of the GNU Lesser General Public \ +License as published by the Free Software Foundation; either \ +version 2.1 of the License, or (at your option) any later version.\n\ +This library is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details.\n\ +You should have received a copy of the GNU Lesser General Public \ +License along with this library; if not, write to the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" + +IDS_WARRANTY_CAPTION, "BEZ GWARANCJI" +IDS_WARRANTY, +"This library is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details." +}

1 0

Mikołaj Zalewski : notepad: Update Polish translation.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 0ec034b2e81e155a83f4ebf1bd30d3d46c49e6e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec034b2e81e155a83f4ebf1b… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Oct 8 23:19:01 2006 +0200 notepad: Update Polish translation. --- programs/notepad/Pl.rc | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Pl.rc b/programs/notepad/Pl.rc index 61cadf2..b2d24e5 100644 --- a/programs/notepad/Pl.rc +++ b/programs/notepad/Pl.rc @@ -127,3 +127,28 @@ STRING_OUT_OF_MEMORY, Zamknij jedn� lub wi�cej aplikacji aby zwi�kszy� ilo�� wolnej pami�ci." } + + +STRINGTABLE DISCARDABLE +{ +IDS_LICENSE_CAPTION, "LICENCJA" +IDS_LICENSE, +"This library is free software; you can redistribute it and/or \ +modify it under the terms of the GNU Lesser General Public \ +License as published by the Free Software Foundation; either \ +version 2.1 of the License, or (at your option) any later version.\n\ +This library is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details.\n\ +You should have received a copy of the GNU Lesser General Public \ +License along with this library; if not, write to the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" + +IDS_WARRANTY_CAPTION, "BEZ GWARANCJI" +IDS_WARRANTY, +"This library is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details." +}

1 0

Mikołaj Zalewski : progman: Add Polish translation.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 925a4e0eb2a6e9a60003ddf0b3064c136c18ea4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=925a4e0eb2a6e9a60003ddf0b… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Oct 8 23:17:04 2006 +0200 progman: Add Polish translation. --- programs/progman/Pl.rc | 240 ++++++++++++++++++++++++++++++++++++++++++++++ programs/progman/rsrc.rc | 1 2 files changed, 241 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=925a4e0eb2a6e9a60003d…

1 0

Michael Stefaniuc : dmscript: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 34a323dc885e4a78159ae97c4898621f7c09e7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a323dc885e4a78159ae97c4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 23:52:35 2006 +0200 dmscript: Win64 printf format warning fixes. --- dlls/dmscript/Makefile.in | 1 - dlls/dmscript/dmscript_main.c | 4 ++-- dlls/dmscript/script.c | 32 ++++++++++++++++---------------- dlls/dmscript/scripttrack.c | 18 +++++++++--------- 4 files changed, 27 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34a323dc885e4a78159ae…

1 0

Michael Stefaniuc : rasapi32: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 7a89060e46b105328277814ca6cfb4da6e1b2814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a89060e46b105328277814ca… Author: Michael Stefaniuc <mstefani(a)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;

1 0

Michael Stefaniuc : rsaenh: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 7c7e1943ca9aec9a27503c60a6fc6be5a06b8c3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c7e1943ca9aec9a27503c60a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 23:51:30 2006 +0200 rsaenh: Win64 printf format warning fixes. --- dlls/rsaenh/Makefile.in | 2 +- dlls/rsaenh/rsaenh.c | 50 ++++++++++++++++++++++++----------------------- 2 files changed, 26 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c7e1943ca9aec9a27503…

1 0

Michael Stefaniuc : dpnet: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: ef1be6b4f33e2e75f69a8af9751f3147cd719c24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef1be6b4f33e2e75f69a8af97… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 23:50:09 2006 +0200 dpnet: Win64 printf format warning fixes. --- dlls/dpnet/Makefile.in | 1 - dlls/dpnet/address.c | 14 +++++++------- dlls/dpnet/client.c | 42 +++++++++++++++++++++--------------------- dlls/dpnet/dpnet_main.c | 2 +- 4 files changed, 29 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef1be6b4f33e2e75f69a8…

1 0

Michael Stefaniuc : dswave: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 162218b6ca1fe3f72ba6f49d30f843c3efc9ca26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=162218b6ca1fe3f72ba6f49d3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 23:50:59 2006 +0200 dswave: Win64 printf format warning fixes. --- dlls/dswave/Makefile.in | 1 - dlls/dswave/dswave.c | 42 +++++++++++++++++++++--------------------- dlls/dswave/dswave_main.c | 4 ++-- 3 files changed, 23 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=162218b6ca1fe3f72ba6f…

1 0

Michael Stefaniuc : hlink: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: a77310fa137c3657d33b9eff83178c1a108e8c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77310fa137c3657d33b9eff8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 19:37:11 2006 +0200 hlink: Win64 printf format warning fixes. --- dlls/hlink/Makefile.in | 1 - dlls/hlink/browse_ctx.c | 10 +++++----- dlls/hlink/hlink_main.c | 22 +++++++++++----------- dlls/hlink/link.c | 24 ++++++++++++------------ 4 files changed, 28 insertions(+), 29 deletions(-) diff --git a/dlls/hlink/Makefile.in b/dlls/hlink/Makefile.in index 9d8651c..d7ceff2 100644 --- a/dlls/hlink/Makefile.in +++ b/dlls/hlink/Makefile.in @@ -7,7 +7,6 @@ IMPORTS = shell32 ole32 advapi32 kerne IMPORTLIB = libhlink.$(IMPLIBEXT) DELAYIMPORTS = urlmon EXTRALIBS = -luuid -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ browse_ctx.c \ diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 5658392..f36fd2f 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -91,7 +91,7 @@ static ULONG WINAPI IHlinkBC_fnAddRef (I HlinkBCImpl *This = (HlinkBCImpl*)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, refCount - 1); + TRACE("(%p)->(count=%u)\n", This, refCount - 1); return refCount; } @@ -101,7 +101,7 @@ static ULONG WINAPI IHlinkBC_fnRelease ( HlinkBCImpl *This = (HlinkBCImpl*)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, refCount + 1); + TRACE("(%p)->(count=%u)\n", This, refCount + 1); if (refCount) return refCount; @@ -122,7 +122,7 @@ static HRESULT WINAPI IHlinkBC_Register( IMoniker *composite; IRunningObjectTable *ROT; - FIXME("(%p)->(%li %p %p %p)\n", This, dwReserved, piunk, pimk, pdwRegister); + FIXME("(%p)->(%i %p %p %p)\n", This, dwReserved, piunk, pimk, pdwRegister); CreateItemMoniker(NULL, szIdent, &mon); CreateGenericComposite(mon, pimk, &composite); @@ -151,7 +151,7 @@ static HRESULT WINAPI IHlinkBC_Revoke(IH IRunningObjectTable *ROT; HlinkBCImpl *This = (HlinkBCImpl*)iface; - FIXME("(%p)->(%li)\n", This, dwRegister); + FIXME("(%p)->(%i)\n", This, dwRegister); GetRunningObjectTable(0, &ROT); r = IRunningObjectTable_Revoke(ROT, dwRegister); @@ -203,7 +203,7 @@ static HRESULT WINAPI IHlinkBC_OnNavigat { HlinkBCImpl *This = (HlinkBCImpl*)iface; - FIXME("(%p)->(%li %p %s %s %p)\n", This, grfHLNF, pmkTarget, + FIXME("(%p)->(%i %p %s %s %p)\n", This, grfHLNF, pmkTarget, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), puHLID); return S_OK; diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index ec2c5d0..f0f0039 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -52,7 +52,7 @@ typedef struct BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p %ld %p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("%p %d %p\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { @@ -80,7 +80,7 @@ HRESULT WINAPI HlinkCreateFromMoniker( I IHlink *hl = NULL; HRESULT r = S_OK; - TRACE("%p %s %s %p %li %p %s %p\n", pimkTrgt, debugstr_w(pwzLocation), + TRACE("%p %s %s %p %i %p %s %p\n", pimkTrgt, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), pihlsite, dwSiteData, piunkOuter, debugstr_guid(riid), ppvObj); @@ -99,7 +99,7 @@ HRESULT WINAPI HlinkCreateFromMoniker( I *ppvObj = hl; - TRACE("Returning %li\n",r); + TRACE("Returning %i\n",r); return r; } @@ -111,7 +111,7 @@ HRESULT WINAPI HlinkCreateFromString( LP IHlink *hl = NULL; HRESULT r = S_OK; - TRACE("%s %s %s %p %li %p %s %p\n", debugstr_w(pwzTarget), + TRACE("%s %s %s %p %i %p %s %p\n", debugstr_w(pwzTarget), debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), pihlsite, dwSiteData, piunkOuter, debugstr_guid(riid), ppvObj); @@ -154,7 +154,7 @@ HRESULT WINAPI HlinkCreateFromString( LP if (pihlsite) IHlink_SetHlinkSite(hl, pihlsite, dwSiteData); - TRACE("Returning %li\n",r); + TRACE("Returning %i\n",r); *ppvObj = hl; return r; @@ -169,7 +169,7 @@ HRESULT WINAPI HlinkCreateBrowseContext( r = CoCreateInstance(&CLSID_StdHlinkBrowseContext, piunkOuter, CLSCTX_INPROC_SERVER, riid, ppvObj); - TRACE("returning %li\n",r); + TRACE("returning %i\n",r); return r; } @@ -180,7 +180,7 @@ HRESULT WINAPI HlinkNavigate(IHlink *phl { HRESULT r = S_OK; - TRACE("%p %p %li %p %p %p\n", phl, phlFrame, grfHLNF, pbc, pbsc, phlbc); + TRACE("%p %p %i %p %p %p\n", phl, phlFrame, grfHLNF, pbc, pbsc, phlbc); if (phlFrame) r = IHlinkFrame_Navigate(phlFrame, grfHLNF, pbc, pbsc, phl); @@ -196,7 +196,7 @@ HRESULT WINAPI HlinkOnNavigate( IHlinkFr { HRESULT r = S_OK; - TRACE("%p %p %li %p %s %s %p\n",phlFrame, phlbc, grfHLNF, pmkTarget, + TRACE("%p %p %i %p %s %s %p\n",phlFrame, phlbc, grfHLNF, pmkTarget, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), puHLID); r = IHlinkBrowseContext_OnNavigateHlink(phlbc, grfHLNF, pmkTarget, @@ -213,7 +213,7 @@ HRESULT WINAPI HlinkCreateFromData(IData IHlinkSite *pihlsite, DWORD dwSiteData, IUnknown *piunkOuter, REFIID riid, void **ppvObj) { - FIXME("%p %p %ld %p %p %p\n", + FIXME("%p %p %d %p %p %p\n", piDataObj, pihlsite, dwSiteData, piunkOuter, riid, ppvObj); *ppvObj = NULL; return E_NOTIMPL; @@ -243,7 +243,7 @@ HRESULT WINAPI HlinkNavigateToStringRefe HRESULT r; IHlink *hlink = NULL; - FIXME("%s %s %p %08lx %p %08lx %p %p %p\n", + FIXME("%s %s %p %08x %p %08x %p %p %p\n", debugstr_w(pwzTarget), debugstr_w(pwzLocation), pihlsite, dwSiteData, pihlframe, grfHLNF, pibc, pibsc, pihlbc); @@ -275,7 +275,7 @@ HRESULT WINAPI HlinkIsShortcut(LPCWSTR p HRESULT WINAPI HlinkTranslateURL(LPCWSTR pwzURL, DWORD grfFlags, LPWSTR *ppwzTranslatedURL) { - FIXME("(%s %08lx %p)\n", debugstr_w(pwzURL), grfFlags, ppwzTranslatedURL); + FIXME("(%s %08x %p)\n", debugstr_w(pwzURL), grfFlags, ppwzTranslatedURL); return E_NOTIMPL; } diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 4d3b074..4d86764 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -167,7 +167,7 @@ static ULONG WINAPI IHlink_fnAddRef (IHl HlinkImpl *This = (HlinkImpl*)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, refCount - 1); + TRACE("(%p)->(count=%u)\n", This, refCount - 1); return refCount; } @@ -177,7 +177,7 @@ static ULONG WINAPI IHlink_fnRelease (IH HlinkImpl *This = (HlinkImpl*)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, refCount + 1); + TRACE("(%p)->(count=%u)\n", This, refCount + 1); if (refCount) return refCount; @@ -199,7 +199,7 @@ static HRESULT WINAPI IHlink_fnSetHlinkS { HlinkImpl *This = (HlinkImpl*)iface; - TRACE("(%p)->(%p %li)\n", This, pihlSite, dwSiteData); + TRACE("(%p)->(%p %i)\n", This, pihlSite, dwSiteData); if (This->Site) IHlinkSite_Release(This->Site); @@ -234,7 +234,7 @@ static HRESULT WINAPI IHlink_fnSetMonike { HlinkImpl *This = (HlinkImpl*)iface; - FIXME("(%p)->(%li %p %s)\n", This, rfHLSETF, pmkTarget, + FIXME("(%p)->(%i %p %s)\n", This, rfHLSETF, pmkTarget, debugstr_w(pwzLocation)); if (This->Moniker) @@ -255,7 +255,7 @@ static HRESULT WINAPI IHlink_fnSetString { HlinkImpl *This = (HlinkImpl*)iface; - TRACE("(%p)->(%li %s %s)\n", This, grfHLSETF, debugstr_w(pwzTarget), + TRACE("(%p)->(%i %s %s)\n", This, grfHLSETF, debugstr_w(pwzTarget), debugstr_w(pwzLocation)); if (grfHLSETF & HLINKSETF_TARGET) @@ -277,7 +277,7 @@ static HRESULT WINAPI IHlink_fnGetMonike { HlinkImpl *This = (HlinkImpl*)iface; - TRACE("(%p) -> (%li %p %p)\n", This, dwWhichRef, ppimkTarget, + TRACE("(%p) -> (%i %p %p)\n", This, dwWhichRef, ppimkTarget, ppwzLocation); if(ppimkTarget) @@ -294,7 +294,7 @@ static HRESULT WINAPI IHlink_fnGetString { HlinkImpl *This = (HlinkImpl*)iface; - FIXME("(%p) -> (%li %p %p)\n", This, dwWhichRef, ppwzTarget, ppwzLocation); + FIXME("(%p) -> (%i %p %p)\n", This, dwWhichRef, ppwzTarget, ppwzLocation); if (ppwzTarget) { @@ -345,7 +345,7 @@ static HRESULT WINAPI IHlink_fnGetFriend { HlinkImpl *This = (HlinkImpl*)iface; - TRACE("(%p) -> (%li %p)\n", This, grfHLFNAMEF, ppwzFriendlyName); + TRACE("(%p) -> (%i %p)\n", This, grfHLFNAMEF, ppwzFriendlyName); /* FIXME: Only using explicitly set and cached friendly names */ @@ -406,7 +406,7 @@ static HRESULT WINAPI IHlink_fnNavigate( HlinkImpl *This = (HlinkImpl*)iface; IMoniker *mon = NULL; - FIXME("Semi-Stub:(%p)->(%li %p %p %p)\n", This, grfHLNF, pbc, pbsc, phbc); + FIXME("Semi-Stub:(%p)->(%i %p %p %p)\n", This, grfHLNF, pbc, pbsc, phbc); if (This->Site) IHlinkSite_ReadyToNavigate(This->Site, This->SiteData, 0); @@ -426,7 +426,7 @@ static HRESULT WINAPI IHlink_fnNavigate( r = IMoniker_BindToObject(mon, bcxt, NULL, &IID_IHlinkTarget, (LPVOID*)&target); - TRACE("IHlinkTarget returned 0x%lx\n", r); + TRACE("IHlinkTarget returned 0x%x\n", r); if (r == S_OK) { IHlinkTarget_SetBrowseContext(target, phbc); @@ -645,7 +645,7 @@ static HRESULT WINAPI IPersistStream_fnL /* FIXME: unknown header values */ r = OleLoadFromStream(pStm, &IID_IMoniker, (LPVOID*)&(This->Moniker)); - TRACE("Load Result 0x%lx (%p)\n", r, This->Moniker); + TRACE("Load Result 0x%x (%p)\n", r, This->Moniker); return r; } @@ -680,7 +680,7 @@ static HRESULT WINAPI IPersistStream_fnS } IMoniker_Release(moniker); } - TRACE("Save Result 0x%lx\n", r); + TRACE("Save Result 0x%x\n", r); return r; }

1 0

Michael Stefaniuc : qcap: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 079bb8a51d550d0238235cd3ba0b957c094662f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=079bb8a51d550d0238235cd3b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 19:36:31 2006 +0200 qcap: Win64 printf format warning fixes. --- dlls/qcap/Makefile.in | 1 - dlls/qcap/capturegraph.c | 4 ++-- dlls/qcap/enummedia.c | 6 +++--- dlls/qcap/enumpins.c | 4 ++-- dlls/qcap/pin.c | 6 +++--- dlls/qcap/v4l.c | 14 +++++++------- dlls/qcap/vfwcapture.c | 18 +++++++++--------- 7 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index 1943a70..0b6805a 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = qcap.dll IMPORTS = ole32 oleaut32 user32 gdi32 advapi32 kernel32 EXTRALIBS = -lstrmiids -luuid -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ capturegraph.c \ diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index a656ba2..3211790 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -145,7 +145,7 @@ fnCaptureGraphBuilder2_AddRef(ICaptureGr CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder2(iface); DWORD ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p)->() AddRef from %ld\n", This, iface, ref - 1); + TRACE("(%p/%p)->() AddRef from %d\n", This, iface, ref - 1); return ref; } @@ -155,7 +155,7 @@ fnCaptureGraphBuilder2_Release(ICaptureG CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder2(iface); DWORD ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p)->() Release from %ld\n", This, iface, ref + 1); + TRACE("(%p/%p)->() Release from %d\n", This, iface, ref + 1); if (!ref) { diff --git a/dlls/qcap/enummedia.c b/dlls/qcap/enummedia.c index 8f33611..a82a94c 100644 --- a/dlls/qcap/enummedia.c +++ b/dlls/qcap/enummedia.c @@ -189,8 +189,8 @@ static HRESULT WINAPI IEnumMediaTypesImp cFetched = min(This->enumMediaDetails.cMediaTypes, This->uIndex + cMediaTypes) - This->uIndex; - TRACE("(%lu, %p, %p)\n", cMediaTypes, ppMediaTypes, pcFetched); - TRACE("Next uIndex: %lu, cFetched: %lu\n", This->uIndex, cFetched); + TRACE("(%u, %p, %p)\n", cMediaTypes, ppMediaTypes, pcFetched); + TRACE("Next uIndex: %u, cFetched: %u\n", This->uIndex, cFetched); if (cFetched > 0) { @@ -221,7 +221,7 @@ static HRESULT WINAPI IEnumMediaTypesImp { IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; - TRACE("(%lu)\n", cMediaTypes); + TRACE("(%u)\n", cMediaTypes); if (This->uIndex + cMediaTypes < This->enumMediaDetails.cMediaTypes) { diff --git a/dlls/qcap/enumpins.c b/dlls/qcap/enumpins.c index 114ca88..8b06fe7 100644 --- a/dlls/qcap/enumpins.c +++ b/dlls/qcap/enumpins.c @@ -116,7 +116,7 @@ static HRESULT WINAPI IEnumPinsImpl_Next cFetched = min(This->enumPinDetails.cPins, This->uIndex + cPins) - This->uIndex; - TRACE("(%lu, %p, %p)\n", cPins, ppPins, pcFetched); + TRACE("(%u, %p, %p)\n", cPins, ppPins, pcFetched); if (cFetched > 0) { @@ -141,7 +141,7 @@ static HRESULT WINAPI IEnumPinsImpl_Skip { IEnumPinsImpl *This = (IEnumPinsImpl *)iface; - TRACE("(%lu)\n", cPins); + TRACE("(%u)\n", cPins); if (This->uIndex + cPins < This->enumPinDetails.cPins) { diff --git a/dlls/qcap/pin.c b/dlls/qcap/pin.c index 366563d..d306307 100644 --- a/dlls/qcap/pin.c +++ b/dlls/qcap/pin.c @@ -219,7 +219,7 @@ static HRESULT OutputPin_ConnectSpecific DeleteMediaType(&This->pin.mtCurrent); } - TRACE(" -- %lx\n", hr); + TRACE(" -- %x\n", hr); return hr; } @@ -318,7 +318,7 @@ HRESULT WINAPI OutputPin_Connect(IPin * } /* if succeeded */ LeaveCriticalSection(This->pin.pCritSec); - TRACE(" -- %lx\n", hr); + TRACE(" -- %x\n", hr); return hr; } @@ -361,7 +361,7 @@ HRESULT OutputPin_GetDeliveryBuffer(Outp { HRESULT hr; - TRACE("(%p, %p, %p, %lx)\n", ppSample, tStart, tStop, dwFlags); + TRACE("(%p, %p, %p, %x)\n", ppSample, tStart, tStop, dwFlags); EnterCriticalSection(This->pin.pCritSec); { diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 5dc9b6a..ea844d1 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -241,7 +241,7 @@ HRESULT qcap_driver_set_format(Capture * if (format->bmiHeader.biBitCount != 24 || format->bmiHeader.biCompression != BI_RGB) { - FIXME("unsupported media type %d %ld\n", format->bmiHeader.biBitCount, + FIXME("unsupported media type %d %d\n", format->bmiHeader.biBitCount, format->bmiHeader.biCompression ); return VFW_E_INVALIDMEDIATYPE; } @@ -299,7 +299,7 @@ HRESULT qcap_driver_get_format(Capture * mT[0]->bTemporalCompression = FALSE; mT[0]->pUnk = NULL; mT[0]->lSampleSize = capBox->outputwidth * capBox->outputheight * capBox->bitDepth / 8; - TRACE("Output format: %dx%d - %d bits = %lu KB\n", capBox->outputwidth, + TRACE("Output format: %dx%d - %d bits = %u KB\n", capBox->outputwidth, capBox->outputheight, capBox->bitDepth, mT[0]->lSampleSize/1024); vi->rcSource.left = 0; vi->rcSource.top = 0; vi->rcTarget.left = 0; vi->rcTarget.top = 0; @@ -608,14 +608,14 @@ static DWORD WINAPI ReadThread(LPVOID lP capBox->renderer(capBox, pOutput, pInput); Resize(capBox, pTarget, pOutput); hr = OutputPin_SendSample((OutputPin *)capBox->pOut, pSample); - TRACE("%p -> Frame %lu: %lx\n", capBox, ++framecount, hr); + TRACE("%p -> Frame %lu: %x\n", capBox, ++framecount, hr); IMediaSample_Release(pSample); V4l_FreeFrame(capBox); } LeaveCriticalSection(&capBox->CritSect); if (FAILED(hr) && hr != VFW_E_NOT_CONNECTED) { - ERR("Received error: %lx\n", hr); + ERR("Received error: %x\n", hr); goto cfail; } } @@ -678,7 +678,7 @@ HRESULT qcap_driver_run(Capture *capBox, if (pAlloc) IMemAllocator_Release(pAlloc); - TRACE("Committing allocator: %lx\n", hr); + TRACE("Committing allocator: %x\n", hr); } thread = CreateThread(NULL, 0, ReadThread, capBox, 0, NULL); @@ -689,7 +689,7 @@ HRESULT qcap_driver_run(Capture *capBox, LeaveCriticalSection(&capBox->CritSect); return S_OK; } - ERR("Creating thread failed.. %lx\n", GetLastError()); + ERR("Creating thread failed.. %x\n", GetLastError()); LeaveCriticalSection(&capBox->CritSect); return E_FAIL; } @@ -762,7 +762,7 @@ HRESULT qcap_driver_stop(Capture *capBox IPin_Release(pConnect); if (hr != S_OK && hr != VFW_E_NOT_COMMITTED) - WARN("Decommitting allocator: %lx\n", hr); + WARN("Decommitting allocator: %x\n", hr); } V4l_Unprepare(capBox); } diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index c336602..ace2b55 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -178,7 +178,7 @@ static ULONG WINAPI VfwCapture_AddRef(IB VfwCapture *This = (VfwCapture *)iface; ULONG refCount = InterlockedIncrement(&This->refCount); - TRACE("%p->() New refcount: %ld\n", This, refCount); + TRACE("%p->() New refcount: %d\n", This, refCount); return refCount; } @@ -188,7 +188,7 @@ static ULONG WINAPI VfwCapture_Release(I VfwCapture *This = (VfwCapture *)iface; ULONG refCount = InterlockedDecrement(&This->refCount); - TRACE("%p->() New refcount: %ld\n", This, refCount); + TRACE("%p->() New refcount: %d\n", This, refCount); if (!refCount) { @@ -246,7 +246,7 @@ static HRESULT WINAPI VfwCapture_Pause(I static HRESULT WINAPI VfwCapture_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { VfwCapture *This = (VfwCapture *)iface; - TRACE("(%lx%08lx)\n", (ULONG)(tStart >> 32), (ULONG)tStart); + TRACE("(%x%08x)\n", (ULONG)(tStart >> 32), (ULONG)tStart); return qcap_driver_run(This->driver_info, &This->state); } @@ -256,7 +256,7 @@ VfwCapture_GetState( IBaseFilter * iface { VfwCapture *This = (VfwCapture *)iface; - TRACE("(%lu, %p)\n", dwMilliSecsTimeout, pState); + TRACE("(%u, %p)\n", dwMilliSecsTimeout, pState); *pState = This->state; return S_OK; @@ -412,7 +412,7 @@ AMStreamConfig_SetFormat(IAMStreamConfig if (pin->pConnectedTo != NULL) { hr = IPin_QueryAccept(pin->pConnectedTo, pmt); - TRACE("Would accept: %ld\n", hr); + TRACE("Would accept: %d\n", hr); if (hr == S_FALSE) return VFW_E_INVALIDMEDIATYPE; } @@ -424,7 +424,7 @@ AMStreamConfig_SetFormat(IAMStreamConfig if (SUCCEEDED(hr)) TRACE("Reconnection completed, with new media format..\n"); } - TRACE("Returning: %ld\n", hr); + TRACE("Returning: %d\n", hr); return hr; } @@ -796,7 +796,7 @@ static ULONG WINAPI VfwPin_AddRef(IPin * VfwPinImpl *This = (VfwPinImpl *)iface; ULONG refCount = InterlockedIncrement(&This->pin.pin.refCount); - TRACE("() -> new refcount: %lu\n", refCount); + TRACE("() -> new refcount: %u\n", refCount); return refCount; } @@ -807,7 +807,7 @@ VfwPin_Release(IPin * iface) VfwPinImpl *This = (VfwPinImpl *)iface; ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount); - TRACE("() -> new refcount: %lu\n", refCount); + TRACE("() -> new refcount: %u\n", refCount); if (!refCount) { @@ -830,7 +830,7 @@ VfwPin_EnumMediaTypes(IPin * iface, IEnu emd.pMediaTypes = pmt; if (SUCCEEDED(hr)) hr = IEnumMediaTypesImpl_Construct(&emd, ppEnum); - TRACE("%p -- %lx\n", This, hr); + TRACE("%p -- %x\n", This, hr); DeleteMediaType(pmt); return hr; }

1 0