wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : rsaenh: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 8a12a30503951fa002dc57126944235d81371d08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a12a30503951fa002dc5712… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:56 2022 +0100 rsaenh: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/Makefile.in | 1 - dlls/rsaenh/handle.c | 10 +++---- dlls/rsaenh/rsaenh.c | 72 ++++++++++++++++++++++++------------------------- 3 files changed, 41 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8a12a30503951fa002dc…

1 0

Eric Pouech : rpcrt4: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: b67a843c1a25b3dcce653b14d213b904f883c009 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b67a843c1a25b3dcce653b14… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:49 2022 +0100 rpcrt4: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/Makefile.in | 2 +- dlls/rpcrt4/cproxy.c | 6 +- dlls/rpcrt4/cstub.c | 8 +-- dlls/rpcrt4/ndr_clientserver.c | 4 +- dlls/rpcrt4/ndr_contexthandle.c | 12 ++-- dlls/rpcrt4/ndr_es.c | 32 ++++----- dlls/rpcrt4/ndr_fullpointer.c | 8 +-- dlls/rpcrt4/ndr_marshall.c | 150 ++++++++++++++++++++-------------------- dlls/rpcrt4/ndr_ole.c | 8 +-- dlls/rpcrt4/ndr_stubless.c | 30 ++++---- dlls/rpcrt4/ndr_typelib.c | 6 +- dlls/rpcrt4/rpc_assoc.c | 2 +- dlls/rpcrt4/rpc_async.c | 2 +- dlls/rpcrt4/rpc_binding.c | 58 ++++++++-------- dlls/rpcrt4/rpc_epmap.c | 20 +++--- dlls/rpcrt4/rpc_message.c | 62 ++++++++--------- dlls/rpcrt4/rpc_server.c | 40 +++++------ dlls/rpcrt4/rpc_transport.c | 76 ++++++++++---------- dlls/rpcrt4/rpcrt4_main.c | 12 ++-- 19 files changed, 269 insertions(+), 269 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b67a843c1a25b3dcce65…

1 0

Eric Pouech : rasapi32: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: df977dd3bb7eb90bf2eabbca8550e905a7965bb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df977dd3bb7eb90bf2eabbca… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:37 2022 +0100 rasapi32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rasapi32/Makefile.in | 1 - dlls/rasapi32/rasapi.c | 52 +++++++++++++++++++++++------------------------ 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in index e1d31e8c405..ff7e71042f9 100644 --- a/dlls/rasapi32/Makefile.in +++ b/dlls/rasapi32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = rasapi32.dll IMPORTLIB = rasapi32 diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index f70f73caa2c..a7f3baf4953 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -30,13 +30,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(ras); DWORD WINAPI RasConnectionNotificationA(HRASCONN hrasconn, HANDLE hEvent, DWORD dwFlags) { - FIXME("(%p,%p,0x%08x),stub!\n",hrasconn,hEvent,dwFlags); + FIXME("(%p,%p,0x%08lx),stub!\n",hrasconn,hEvent,dwFlags); return 1; } DWORD WINAPI RasConnectionNotificationW(HRASCONN hrasconn, HANDLE hEvent, DWORD dwFlags) { - FIXME("(%p,%p,0x%08x),stub!\n",hrasconn,hEvent,dwFlags); + FIXME("(%p,%p,0x%08lx),stub!\n",hrasconn,hEvent,dwFlags); return 1; } @@ -54,14 +54,14 @@ DWORD WINAPI RasCreatePhonebookEntryW(HWND hwnd, LPCWSTR lpszPhonebook) DWORD WINAPI RasDeleteSubEntryA(LPCSTR lpszPhonebook, LPCSTR lpszEntry, DWORD dwSubEntryId) { - FIXME("(%s,%s,0x%08x),stub!\n",debugstr_a(lpszPhonebook), + FIXME("(%s,%s,0x%08lx),stub!\n",debugstr_a(lpszPhonebook), debugstr_a(lpszEntry),dwSubEntryId); return 0; } DWORD WINAPI RasDeleteSubEntryW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, DWORD dwSubEntryId) { - FIXME("(%s,%s,0x%08x),stub!\n",debugstr_w(lpszPhonebook), + FIXME("(%s,%s,0x%08lx),stub!\n",debugstr_w(lpszPhonebook), debugstr_w(lpszEntry),dwSubEntryId); return 0; } @@ -70,7 +70,7 @@ DWORD WINAPI RasDialA(LPRASDIALEXTENSIONS lpRasDialExtensions, LPCSTR lpszPhoneb LPRASDIALPARAMSA lpRasDialParams, DWORD dwNotifierType, LPVOID lpvNotifier, LPHRASCONN lphRasConn) { - FIXME("(%p,%s,%p,0x%08x,%p,%p),stub!\n",lpRasDialExtensions,debugstr_a(lpszPhonebook), + FIXME("(%p,%s,%p,0x%08lx,%p,%p),stub!\n",lpRasDialExtensions,debugstr_a(lpszPhonebook), lpRasDialParams,dwNotifierType,lpvNotifier,lphRasConn); return 1; } @@ -79,7 +79,7 @@ DWORD WINAPI RasDialW(LPRASDIALEXTENSIONS lpRasDialExtensions, LPCWSTR lpszPhone LPRASDIALPARAMSW lpRasDialParams, DWORD dwNotifierType, LPVOID lpvNotifier, LPHRASCONN lphRasConn) { - FIXME("(%p,%s,%p,0x%08x,%p,%p),stub!\n",lpRasDialExtensions,debugstr_w(lpszPhonebook), + FIXME("(%p,%s,%p,0x%08lx,%p,%p),stub!\n",lpRasDialExtensions,debugstr_w(lpszPhonebook), lpRasDialParams,dwNotifierType,lpvNotifier,lphRasConn); return 1; } @@ -300,7 +300,7 @@ DWORD WINAPI RasGetAutodialAddressW(LPCWSTR a, LPDWORD b, LPRASAUTODIALENTRYW c, */ DWORD WINAPI RasGetAutodialEnableA(DWORD a, LPBOOL b) { - FIXME("(%x,%p),stub!\n",a,b); + FIXME("(%lx,%p),stub!\n",a,b); return 0; } @@ -309,7 +309,7 @@ DWORD WINAPI RasGetAutodialEnableA(DWORD a, LPBOOL b) */ DWORD WINAPI RasGetAutodialEnableW(DWORD a, LPBOOL b) { - FIXME("(%x,%p),stub!\n",a,b); + FIXME("(%lx,%p),stub!\n",a,b); return 0; } @@ -318,7 +318,7 @@ DWORD WINAPI RasGetAutodialEnableW(DWORD a, LPBOOL b) */ DWORD WINAPI RasGetAutodialParamA(DWORD dwKey, LPVOID lpvValue, LPDWORD lpdwcbValue) { - FIXME("(%x,%p,%p),stub!\n",dwKey,lpvValue,lpdwcbValue); + FIXME("(%lx,%p,%p),stub!\n",dwKey,lpvValue,lpdwcbValue); return 0; } @@ -327,7 +327,7 @@ DWORD WINAPI RasGetAutodialParamA(DWORD dwKey, LPVOID lpvValue, LPDWORD lpdwcbVa */ DWORD WINAPI RasGetAutodialParamW(DWORD dwKey, LPVOID lpvValue, LPDWORD lpdwcbValue) { - FIXME("(%x,%p,%p),stub!\n",dwKey,lpvValue,lpdwcbValue); + FIXME("(%lx,%p,%p),stub!\n",dwKey,lpvValue,lpdwcbValue); return 0; } @@ -337,7 +337,7 @@ DWORD WINAPI RasGetAutodialParamW(DWORD dwKey, LPVOID lpvValue, LPDWORD lpdwcbVa DWORD WINAPI RasSetAutodialAddressA(LPCSTR a, DWORD b, LPRASAUTODIALENTRYA c, DWORD d, DWORD e) { - FIXME("(%s,%x,%p,%x,%x),stub!\n",debugstr_a(a),b,c,d,e); + FIXME("(%s,%lx,%p,%lx,%lx),stub!\n",debugstr_a(a),b,c,d,e); return 0; } @@ -347,7 +347,7 @@ DWORD WINAPI RasSetAutodialAddressA(LPCSTR a, DWORD b, LPRASAUTODIALENTRYA c, DWORD WINAPI RasSetAutodialAddressW(LPCWSTR a, DWORD b, LPRASAUTODIALENTRYW c, DWORD d, DWORD e) { - FIXME("(%s,%x,%p,%x,%x),stub!\n",debugstr_w(a),b,c,d,e); + FIXME("(%s,%lx,%p,%lx,%lx),stub!\n",debugstr_w(a),b,c,d,e); return 0; } @@ -356,7 +356,7 @@ DWORD WINAPI RasSetAutodialAddressW(LPCWSTR a, DWORD b, LPRASAUTODIALENTRYW c, */ DWORD WINAPI RasSetAutodialEnableA(DWORD dwDialingLocation, BOOL fEnabled) { - FIXME("(%x,%x),stub!\n",dwDialingLocation,fEnabled); + FIXME("(%lx,%x),stub!\n",dwDialingLocation,fEnabled); return 0; } @@ -365,7 +365,7 @@ DWORD WINAPI RasSetAutodialEnableA(DWORD dwDialingLocation, BOOL fEnabled) */ DWORD WINAPI RasSetAutodialEnableW(DWORD dwDialingLocation, BOOL fEnabled) { - FIXME("(%x,%x),stub!\n",dwDialingLocation,fEnabled); + FIXME("(%lx,%x),stub!\n",dwDialingLocation,fEnabled); return 0; } @@ -374,7 +374,7 @@ DWORD WINAPI RasSetAutodialEnableW(DWORD dwDialingLocation, BOOL fEnabled) */ DWORD WINAPI RasSetAutodialParamA(DWORD a, LPVOID b, DWORD c) { - FIXME("(%x,%p,%x),stub!\n",a,b,c); + FIXME("(%lx,%p,%lx),stub!\n",a,b,c); return 0; } @@ -383,7 +383,7 @@ DWORD WINAPI RasSetAutodialParamA(DWORD a, LPVOID b, DWORD c) */ DWORD WINAPI RasSetAutodialParamW(DWORD a, LPVOID b, DWORD c) { - FIXME("(%x,%p,%x),stub!\n",a,b,c); + FIXME("(%lx,%p,%lx),stub!\n",a,b,c); return 0; } @@ -394,12 +394,12 @@ DWORD WINAPI RasSetEntryPropertiesA(LPCSTR lpszPhonebook, LPCSTR lpszEntry, LPRASENTRYA lpRasEntry, DWORD dwEntryInfoSize, LPBYTE lpbDeviceInfo, DWORD dwDeviceInfoSize ) { - FIXME("(%s,%s,%p,%d,%p,%d), stub!\n", + FIXME("(%s,%s,%p,%ld,%p,%ld), stub!\n", debugstr_a(lpszPhonebook),debugstr_a(lpszEntry), lpRasEntry,dwEntryInfoSize,lpbDeviceInfo,dwDeviceInfoSize ); FIXME("Rasentry:\n"); - FIXME("\tdwfOptions %x\n",lpRasEntry->dwfOptions); + FIXME("\tdwfOptions %lx\n",lpRasEntry->dwfOptions); FIXME("\tszLocalPhoneNumber %s\n",debugstr_a(lpRasEntry->szLocalPhoneNumber)); return 0; } @@ -411,7 +411,7 @@ DWORD WINAPI RasSetEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, LPRASENTRYW lpRasEntry, DWORD dwEntryInfoSize, LPBYTE lpbDeviceInfo, DWORD dwDeviceInfoSize ) { - FIXME("(%s,%s,%p,%d,%p,%d), stub!\n", + FIXME("(%s,%s,%p,%ld,%p,%ld), stub!\n", debugstr_w(lpszPhonebook),debugstr_w(lpszEntry), lpRasEntry,dwEntryInfoSize,lpbDeviceInfo,dwDeviceInfoSize ); @@ -458,13 +458,13 @@ DWORD WINAPI RasGetEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, LP DWORD WINAPI RasGetErrorStringA(UINT uErrorValue, LPSTR lpszErrorString, DWORD cBufSize) { - FIXME("(0x%08x,%p,0x%08x), stub!\n", uErrorValue, lpszErrorString, cBufSize); + FIXME("(0x%08x,%p,0x%08lx), stub!\n", uErrorValue, lpszErrorString, cBufSize); return 1; } DWORD WINAPI RasGetErrorStringW(UINT uErrorValue, LPWSTR lpszErrorString, DWORD cBufSize) { - FIXME("(0x%08x,%p,0x%08x), stub!\n", uErrorValue, lpszErrorString, cBufSize); + FIXME("(0x%08x,%p,0x%08lx), stub!\n", uErrorValue, lpszErrorString, cBufSize); return 1; } @@ -510,13 +510,13 @@ DWORD WINAPI RasSetCredentialsW(const WCHAR *phonebook, const WCHAR *entry, RASC DWORD WINAPI RasSetCustomAuthDataA(const char *phonebook, const char *entry, BYTE *authdata, DWORD size) { - FIXME("(%s,%s,%p,0x%08x), stub!\n", debugstr_a(phonebook), debugstr_a(entry), authdata, size); + FIXME("(%s,%s,%p,0x%08lx), stub!\n", debugstr_a(phonebook), debugstr_a(entry), authdata, size); return 0; } DWORD WINAPI RasSetCustomAuthDataW(const WCHAR *phonebook, const WCHAR *entry, BYTE *authdata, DWORD size) { - FIXME("(%s,%s,%p,0x%08x), stub!\n", debugstr_w(phonebook), debugstr_w(entry), authdata, size); + FIXME("(%s,%s,%p,0x%08lx), stub!\n", debugstr_w(phonebook), debugstr_w(entry), authdata, size); return 0; } @@ -538,7 +538,7 @@ DWORD WINAPI RasSetSubEntryPropertiesA(LPCSTR lpszPhonebook, LPCSTR lpszEntry, D LPRASSUBENTRYA lpRasSubEntry, DWORD dwcbRasSubEntry, LPBYTE lpbDeviceConfig, DWORD dwcbDeviceConfig) { - FIXME("(%s,%s,0x%08x,%p,0x%08x,%p,0x%08x), stub!\n", debugstr_a(lpszPhonebook), + FIXME("(%s,%s,0x%08lx,%p,0x%08lx,%p,0x%08lx), stub!\n", debugstr_a(lpszPhonebook), debugstr_a(lpszEntry), dwSubEntry, lpRasSubEntry, dwcbRasSubEntry, lpbDeviceConfig, dwcbDeviceConfig); return 0; @@ -548,7 +548,7 @@ DWORD WINAPI RasSetSubEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, LPRASSUBENTRYW lpRasSubEntry, DWORD dwcbRasSubEntry, LPBYTE lpbDeviceConfig, DWORD dwcbDeviceConfig) { - FIXME("(%s,%s,0x%08x,%p,0x%08x,%p,0x%08x), stub!\n", debugstr_w(lpszPhonebook), + FIXME("(%s,%s,0x%08lx,%p,0x%08lx,%p,0x%08lx), stub!\n", debugstr_w(lpszPhonebook), debugstr_w(lpszEntry), dwSubEntry, lpRasSubEntry, dwcbRasSubEntry, lpbDeviceConfig, dwcbDeviceConfig); return 0; @@ -556,7 +556,7 @@ DWORD WINAPI RasSetSubEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, DWORD WINAPI RasGetLinkStatistics(HRASCONN connection, DWORD entry, RAS_STATS *statistics) { - FIXME("(%p,%u,%p), stub!\n", connection, entry, statistics); + FIXME("(%p,%lu,%p), stub!\n", connection, entry, statistics); return 0; }

1 0

Eric Pouech : qwave: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 67d35e0342e4b5e93292f23f8b80c958de1c8b3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=67d35e0342e4b5e93292f23f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:31 2022 +0100 qwave: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qwave/Makefile.in | 1 - dlls/qwave/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/qwave/Makefile.in b/dlls/qwave/Makefile.in index b75cbb05423..fee5602d7ba 100644 --- a/dlls/qwave/Makefile.in +++ b/dlls/qwave/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = qwave.dll IMPORTLIB = qwave diff --git a/dlls/qwave/main.c b/dlls/qwave/main.c index fceb5c79503..a8755d993d1 100644 --- a/dlls/qwave/main.c +++ b/dlls/qwave/main.c @@ -39,7 +39,7 @@ BOOL WINAPI QOSCreateHandle(PQOS_VERSION version, PHANDLE handle) BOOL WINAPI QOSAddSocketToFlow(HANDLE handle, SOCKET socket, PSOCKADDR addr, QOS_TRAFFIC_TYPE traffictype, DWORD flags, PQOS_FLOWID flowid) { - FIXME("%p, %lx, %p, %d, 0x%08x, %p stub!\n", handle, socket, addr, traffictype, flags, flowid); + FIXME("%p, %Ix, %p, %d, 0x%08lx, %p stub!\n", handle, socket, addr, traffictype, flags, flowid); SetLastError(ERROR_NOT_SUPPORTED); return FALSE; }

1 0

Eric Pouech : query: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 5a30d6791826ce4f3d1490cf3e745e561df94b3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a30d6791826ce4f3d1490cf… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:25 2022 +0100 query: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/query/Makefile.in | 1 - dlls/query/query_main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/query/Makefile.in b/dlls/query/Makefile.in index 71352a5ff0f..8cdeb9c9765 100644 --- a/dlls/query/Makefile.in +++ b/dlls/query/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = query.dll IMPORTS = uuid diff --git a/dlls/query/query_main.c b/dlls/query/query_main.c index cc1eac596c7..9e27986e022 100644 --- a/dlls/query/query_main.c +++ b/dlls/query/query_main.c @@ -57,7 +57,7 @@ HRESULT WINAPI LocateCatalogsA(CHAR const *pwszScope, ULONG iBm, CHAR *pwszCat, ULONG *pcCat) { - FIXME("%s %u %p %p %p %p\n", debugstr_a(pwszScope), + FIXME("%s %lu %p %p %p %p\n", debugstr_a(pwszScope), iBm, pwszMachine, pcMachine, pwszCat, pcCat); return CI_E_NOT_RUNNING; } @@ -67,7 +67,7 @@ HRESULT WINAPI LocateCatalogsW(WCHAR const *pwszScope, ULONG iBm, WCHAR *pwszCat, ULONG *pcCat) { - FIXME("%s %u %p %p %p %p\n", debugstr_w(pwszScope), + FIXME("%s %lu %p %p %p %p\n", debugstr_w(pwszScope), iBm, pwszMachine, pcMachine, pwszCat, pcCat); return CI_E_NOT_RUNNING; }

1 0

Eric Pouech : qmgr: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 13de3b2ea6357ef64840fa184e9ad9d3dd0dc4e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13de3b2ea6357ef64840fa18… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:19 2022 +0100 qmgr: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/Makefile.in | 1 - dlls/qmgr/enum_files.c | 8 ++++---- dlls/qmgr/enum_jobs.c | 8 ++++---- dlls/qmgr/file.c | 14 +++++++------- dlls/qmgr/job.c | 34 +++++++++++++++++----------------- dlls/qmgr/qmgr.c | 4 ++-- dlls/qmgr/service.c | 6 +++--- 7 files changed, 37 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=13de3b2ea6357ef64840…

1 0

Eric Pouech : pstorec: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 5e4fb4b5e6bcc75706efc481b951a5bc1ffd710e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e4fb4b5e6bcc75706efc481… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:13 2022 +0100 pstorec: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pstorec/Makefile.in | 1 - dlls/pstorec/pstorec.c | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/pstorec/Makefile.in b/dlls/pstorec/Makefile.in index bc92381f7bf..62d06a759b4 100644 --- a/dlls/pstorec/Makefile.in +++ b/dlls/pstorec/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = pstorec.dll IMPORTS = uuid diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c index 8d0293d7e44..44b417db9d2 100644 --- a/dlls/pstorec/pstorec.c +++ b/dlls/pstorec/pstorec.c @@ -78,7 +78,7 @@ static ULONG WINAPI PStore_fnAddRef(IPStore* iface) { PStore_impl *This = impl_from_IPStore(iface); - TRACE("%p %u\n", This, This->ref); + TRACE("%p %lu\n", This, This->ref); return InterlockedIncrement( &This->ref ); } @@ -91,7 +91,7 @@ static ULONG WINAPI PStore_fnRelease(IPStore* iface) PStore_impl *This = impl_from_IPStore(iface); LONG ref; - TRACE("%p %u\n", This, This->ref); + TRACE("%p %lu\n", This, This->ref); ref = InterlockedDecrement( &This->ref ); if( !ref ) @@ -135,7 +135,7 @@ static HRESULT WINAPI PStore_fnSetProvParam( IPStore* This, static HRESULT WINAPI PStore_fnCreateType( IPStore* This, PST_KEY Key, const GUID* pType, PPST_TYPEINFO pInfo, DWORD dwFlags) { - FIXME("%p %08x %s %p(%d,%s) %08x\n", This, Key, debugstr_guid(pType), + FIXME("%p %08lx %s %p(%ld,%s) %08lx\n", This, Key, debugstr_guid(pType), pInfo, pInfo->cbSize, debugstr_w(pInfo->szDisplayName), dwFlags); return E_NOTIMPL; @@ -157,7 +157,7 @@ static HRESULT WINAPI PStore_fnGetTypeInfo( IPStore* This, static HRESULT WINAPI PStore_fnDeleteType( IPStore* This, PST_KEY Key, const GUID* pType, DWORD dwFlags) { - FIXME("%p %d %s %08x\n", This, Key, debugstr_guid(pType), dwFlags); + FIXME("%p %ld %s %08lx\n", This, Key, debugstr_guid(pType), dwFlags); return E_NOTIMPL; } @@ -168,7 +168,7 @@ static HRESULT WINAPI PStore_fnCreateSubtype( IPStore* This, PST_KEY Key, const GUID* pType, const GUID* pSubtype, PPST_TYPEINFO pInfo, PPST_ACCESSRULESET pRules, DWORD dwFlags) { - FIXME("%p %08x %s %s %p %p %08x\n", This, Key, debugstr_guid(pType), + FIXME("%p %08lx %s %s %p %p %08lx\n", This, Key, debugstr_guid(pType), debugstr_guid(pSubtype), pInfo, pRules, dwFlags); return E_NOTIMPL; } @@ -190,7 +190,7 @@ static HRESULT WINAPI PStore_fnGetSubtypeInfo( IPStore* This, static HRESULT WINAPI PStore_fnDeleteSubtype( IPStore* This, PST_KEY Key, const GUID* pType, const GUID* pSubtype, DWORD dwFlags) { - FIXME("%p %u %s %s %08x\n", This, Key, + FIXME("%p %lu %s %s %08lx\n", This, Key, debugstr_guid(pType), debugstr_guid(pSubtype), dwFlags); return E_NOTIMPL; } @@ -255,7 +255,7 @@ static HRESULT WINAPI PStore_fnReadItem( IPStore* This, PST_KEY Key, const GUID* pItemType, const GUID* pItemSubtype, LPCWSTR szItemName, DWORD *cbData, BYTE** pbData, PPST_PROMPTINFO pPromptInfo, DWORD dwFlags) { - FIXME("%p %08x %s %s %s %p %p %p %08x\n", This, Key, + FIXME("%p %08lx %s %s %s %p %p %p %08lx\n", This, Key, debugstr_guid(pItemType), debugstr_guid(pItemSubtype), debugstr_w(szItemName), cbData, pbData, pPromptInfo, dwFlags); return E_NOTIMPL; @@ -269,7 +269,7 @@ static HRESULT WINAPI PStore_fnWriteItem( IPStore* This, PST_KEY Key, DWORD cbData, BYTE* ppbData, PPST_PROMPTINFO pPromptInfo, DWORD dwDefaultConfirmationStyle, DWORD dwFlags) { - FIXME("%p %08x %s %s %s %d %p %p %08x\n", This, Key, + FIXME("%p %08lx %s %s %s %ld %p %p %08lx\n", This, Key, debugstr_guid(pItemType), debugstr_guid(pItemSubtype), debugstr_w(szItemName), cbData, ppbData, pPromptInfo, dwFlags); return E_NOTIMPL; @@ -282,7 +282,7 @@ static HRESULT WINAPI PStore_fnOpenItem( IPStore* This, PST_KEY Key, const GUID* pItemType, const GUID* pItemSubtype, LPCWSTR szItemName, PST_ACCESSMODE ModeFlags, PPST_PROMPTINFO pPromptInfo, DWORD dwFlags ) { - FIXME("(%p,%08x,%s,%s,%s,%08x,%p,%08x) stub\n", This, Key, debugstr_guid(pItemType), + FIXME("(%p,%08lx,%s,%s,%s,%08lx,%p,%08lx) stub\n", This, Key, debugstr_guid(pItemType), debugstr_guid(pItemSubtype), debugstr_w(szItemName), ModeFlags, pPromptInfo, dwFlags); return E_NOTIMPL; } @@ -341,7 +341,7 @@ HRESULT WINAPI PStoreCreateInstance( IPStore** ppProvider, { PStore_impl *ips; - TRACE("%p %s %p %08x\n", ppProvider, debugstr_guid(pProviderID), pReserved, dwFlags); + TRACE("%p %s %p %08lx\n", ppProvider, debugstr_guid(pProviderID), pReserved, dwFlags); ips = HeapAlloc( GetProcessHeap(), 0, sizeof (PStore_impl) ); if( !ips )

1 0

Eric Pouech : propsys: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: a9c797e4538a37716e62bb81c3fed3de39561b41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9c797e4538a37716e62bb81… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:06 2022 +0100 propsys: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/Makefile.in | 1 - dlls/propsys/propstore.c | 8 ++++---- dlls/propsys/propsys_main.c | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/propsys/Makefile.in b/dlls/propsys/Makefile.in index 71fd29a0dfe..166b7751d6e 100644 --- a/dlls/propsys/Makefile.in +++ b/dlls/propsys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = propsys.dll IMPORTLIB = propsys IMPORTS = ole32 oleaut32 uuid diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index 6e0d49057d9..9906df83f6f 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -92,7 +92,7 @@ static ULONG WINAPI PropertyStore_AddRef(IPropertyStoreCache *iface) PropertyStore *This = impl_from_IPropertyStoreCache(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -113,7 +113,7 @@ static ULONG WINAPI PropertyStore_Release(IPropertyStoreCache *iface) PropertyStore *This = impl_from_IPropertyStoreCache(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -159,7 +159,7 @@ static HRESULT WINAPI PropertyStore_GetAt(IPropertyStoreCache *iface, propstore_value *value; HRESULT hr; - TRACE("%p,%d,%p\n", iface, iProp, pkey); + TRACE("%p,%ld,%p\n", iface, iProp, pkey); if (!pkey) return E_POINTER; @@ -478,7 +478,7 @@ HRESULT WINAPI PSCreatePropertyStoreFromObject(IUnknown *obj, DWORD access, REFI { HRESULT hr; - TRACE("(%p, %d, %s, %p)\n", obj, access, debugstr_guid(riid), ret); + TRACE("(%p, %ld, %s, %p)\n", obj, access, debugstr_guid(riid), ret); if (!obj || !ret) return E_POINTER; diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 06150dfad12..6e87b3d3579 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -157,7 +157,7 @@ static HRESULT WINAPI propsys_FormatForDisplay(IPropertySystem *iface, REFPROPERTYKEY key, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS flags, LPWSTR dest, DWORD destlen) { - FIXME("%p %p %x %p %d: stub\n", key, propvar, flags, dest, destlen); + FIXME("%p %p %x %p %ld: stub\n", key, propvar, flags, dest, destlen); return E_NOTIMPL; }

1 0

Eric Pouech : prntvpt: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 08332f4d3da4c7897872c4f552ea33116fd3440a URL: https://source.winehq.org/git/wine.git/?a=commit;h=08332f4d3da4c7897872c4f5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:11:01 2022 +0100 prntvpt: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/Makefile.in | 1 - dlls/prntvpt/main.c | 4 ++-- dlls/prntvpt/ticket.c | 14 +++++++------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/prntvpt/Makefile.in b/dlls/prntvpt/Makefile.in index 7c581662357..77eaf354224 100644 --- a/dlls/prntvpt/Makefile.in +++ b/dlls/prntvpt/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = prntvpt.dll IMPORTLIB = prntvpt IMPORTS = winspool ole32 oleaut32 diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index d6ad0cff46a..e046c6cbaed 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -76,7 +76,7 @@ HRESULT WINAPI PTOpenProvider(PCWSTR printer, DWORD version, HPTPROVIDER *provid { DWORD used_version; - TRACE("%s, %d, %p\n", debugstr_w(printer), version, provider); + TRACE("%s, %ld, %p\n", debugstr_w(printer), version, provider); if (version != 1) return E_INVALIDARG; @@ -87,7 +87,7 @@ HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD p { struct prn_provider *prov; - TRACE("%s, %d, %d, %p, %p\n", debugstr_w(printer), max_version, pref_version, provider, used_version); + TRACE("%s, %ld, %ld, %p, %p\n", debugstr_w(printer), max_version, pref_version, provider, used_version); if (!max_version || !provider || !used_version) return E_INVALIDARG; diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 13aaf80423f..e43cda8be6b 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -574,7 +574,7 @@ static void set_SelectionNamespaces(IXMLDOMDocument2 *doc) { if (!wcscmp(str, L"xmlns") || !wcsncmp(str, L"xmlns:", 6)) { - TRACE("ns[%d]: %s=%s\n", i, wine_dbgstr_w(str), wine_dbgstr_w(V_BSTR(&var))); + TRACE("ns[%ld]: %s=%s\n", i, wine_dbgstr_w(str), wine_dbgstr_w(V_BSTR(&var))); IStream_Write(stream, str, wcslen(str) * sizeof(WCHAR), NULL); IStream_Write(stream, L"=\"", 2 * sizeof(WCHAR), NULL); IStream_Write(stream, V_BSTR(&var), wcslen(V_BSTR(&var)) * sizeof(WCHAR), NULL); @@ -1174,7 +1174,7 @@ while (0) CHECK_FIELD(DM_DITHERTYPE); CHECK_FIELD(DM_PANNINGWIDTH); CHECK_FIELD(DM_PANNINGHEIGHT); - if (fields) TRACE(" %#x", fields); + if (fields) TRACE(" %#lx", fields); TRACE("\n"); #undef CHECK_FIELD } @@ -1192,7 +1192,7 @@ static void dump_devmode(const DEVMODEW *dm) TRACE("dmDriverVersion: 0x%04x\n", dm->dmDriverVersion); TRACE("dmSize: 0x%04x\n", dm->dmSize); TRACE("dmDriverExtra: 0x%04x\n", dm->dmDriverExtra); - TRACE("dmFields: 0x%04x\n", dm->dmFields); + TRACE("dmFields: 0x%04lx\n", dm->dmFields); dump_fields(dm->dmFields); TRACE("dmOrientation: %d\n", dm->u1.s1.dmOrientation); TRACE("dmPaperSize: %d\n", dm->u1.s1.dmPaperSize); @@ -1209,9 +1209,9 @@ static void dump_devmode(const DEVMODEW *dm) TRACE("dmCollate: %d\n", dm->dmCollate); TRACE("dmFormName: %s\n", debugstr_w(dm->dmFormName)); TRACE("dmLogPixels %u\n", dm->dmLogPixels); - TRACE("dmBitsPerPel %u\n", dm->dmBitsPerPel); - TRACE("dmPelsWidth %u\n", dm->dmPelsWidth); - TRACE("dmPelsHeight %u\n", dm->dmPelsHeight); + TRACE("dmBitsPerPel %lu\n", dm->dmBitsPerPel); + TRACE("dmPelsWidth %lu\n", dm->dmPelsWidth); + TRACE("dmPelsHeight %lu\n", dm->dmPelsHeight); } HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER provider, ULONG size, PDEVMODEW dm, @@ -1221,7 +1221,7 @@ HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER provider, ULONG size, P struct ticket ticket; HRESULT hr; - TRACE("%p,%u,%p,%d,%p\n", provider, size, dm, scope, stream); + TRACE("%p,%lu,%p,%d,%p\n", provider, size, dm, scope, stream); if (!is_valid_provider(provider) || !dm || !stream) return E_INVALIDARG;

1 0

Eric Pouech : printui: Enable compilation with long types.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 55f0f125f20877f55bf9e6cae65332295bf92f67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55f0f125f20877f55bf9e6ca… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 07:10:55 2022 +0100 printui: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/printui/Makefile.in | 1 - dlls/printui/printui.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/printui/Makefile.in b/dlls/printui/Makefile.in index eb1dbf899dc..c504f190b2f 100644 --- a/dlls/printui/Makefile.in +++ b/dlls/printui/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = printui.dll IMPORTS = shell32 diff --git a/dlls/printui/printui.c b/dlls/printui/printui.c index 09f527bfb0a..8f65ed27e87 100644 --- a/dlls/printui/printui.c +++ b/dlls/printui/printui.c @@ -220,7 +220,7 @@ void WINAPI PrintUIEntryW(HWND hWnd, HINSTANCE hInst, LPCWSTR pCommand, DWORD nC context_t cx; BOOL res = FALSE; - TRACE("(%p, %p, %s, 0x%x)\n", hWnd, hInst, debugstr_w(pCommand), nCmdShow); + TRACE("(%p, %p, %s, 0x%lx)\n", hWnd, hInst, debugstr_w(pCommand), nCmdShow); memset(&cx, 0, sizeof(context_t)); cx.hWnd = hWnd;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022