wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : ping: Enable compilation with long types.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: eb1ff55636355b5fd290ee49fdda7e1bfcb803e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb1ff55636355b5fd290ee49… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:57:03 2022 +0100 ping: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/ping/Makefile.in | 1 - programs/ping/ping_main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/ping/Makefile.in b/programs/ping/Makefile.in index 9ac4f6e4a3b..0ed66f470ea 100644 --- a/programs/ping/Makefile.in +++ b/programs/ping/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ping.exe IMPORTS = ws2_32 iphlpapi diff --git a/programs/ping/ping_main.c b/programs/ping/ping_main.c index 51246e3f5bf..cf91f051a39 100644 --- a/programs/ping/ping_main.c +++ b/programs/ping/ping_main.c @@ -184,7 +184,7 @@ int __cdecl main(int argc, char** argv) { reply = (ICMP_ECHO_REPLY *) reply_buffer; if (reply->RoundTripTime >= 1) - sprintf(rtt, "=%d", reply->RoundTripTime); + sprintf(rtt, "=%ld", reply->RoundTripTime); else strcpy(rtt, "<1"); printf("Reply from %s: bytes=%d time%sms TTL=%d\n", ip, l,

1 0

Eric Pouech : netstat: Enable compilation with long types.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: f658d9d178ce56f734ec270ab3d47b28fba0b4db URL: https://source.winehq.org/git/wine.git/?a=commit;h=f658d9d178ce56f734ec270a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:56:57 2022 +0100 netstat: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/netstat/Makefile.in | 1 - programs/netstat/netstat.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/netstat/Makefile.in b/programs/netstat/Makefile.in index 693fde0c1f4..e16d01ba4e9 100644 --- a/programs/netstat/Makefile.in +++ b/programs/netstat/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = netstat.exe IMPORTS = iphlpapi user32 ws2_32 diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index 243fca56055..16238ee097f 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -145,7 +145,7 @@ static WCHAR *NETSTAT_load_message(UINT id) { static const WCHAR failedW[] = {'F','a','i','l','e','d','!','\0'}; if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { - WINE_FIXME("LoadString failed with %d\n", GetLastError()); + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); lstrcpyW(msg, failedW); } return msg;

1 0

Eric Pouech : net: Enable compilation with long types.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: d2a5c5ab4681d5c934724ad833b15faba49dbd9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2a5c5ab4681d5c934724ad8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:56:51 2022 +0100 net: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/net/Makefile.in | 1 - programs/net/net.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/net/Makefile.in b/programs/net/Makefile.in index a4c0f2f238a..eb8e1e48ff3 100644 --- a/programs/net/Makefile.in +++ b/programs/net/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = net.exe IMPORTS = netapi32 user32 advapi32 diff --git a/programs/net/net.c b/programs/net/net.c index a8073956019..f9e64d2e2b9 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -61,7 +61,7 @@ static int output_vprintf(const WCHAR* fmt, va_list va_args) len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, fmt, 0, 0, str, ARRAY_SIZE(str), &va_args); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); else output_write(str, len); return 0; @@ -184,7 +184,7 @@ static BOOL net_enum_services(void) for(i = 0; i < count; i++) { output_printf(L" %1\n", services[i].lpDisplayName); - WINE_TRACE("service=%s state=%d controls=%x\n", + WINE_TRACE("service=%s state=%ld controls=%lx\n", wine_dbgstr_w(services[i].lpServiceName), services[i].ServiceStatusProcess.dwCurrentState, services[i].ServiceStatusProcess.dwControlsAccepted);

1 0

Eric Pouech : msiexec: Enable compilation with long types.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 081bd13f1159b43b4d9167d878217669d0eff3cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=081bd13f1159b43b4d9167d8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:56:44 2022 +0100 msiexec: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msiexec/Makefile.in | 1 - programs/msiexec/msiexec.c | 12 ++++++------ programs/msiexec/service.c | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in index 9aebdbdddf0..e873f7aeaa8 100644 --- a/programs/msiexec/Makefile.in +++ b/programs/msiexec/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msiexec.exe IMPORTS = msi ole32 advapi32 user32 comctl32 diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index e9e74f5c19e..71ecc0e590a 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -61,13 +61,13 @@ static void ShowUsage(int ExitCode) *filename = 0; res = GetModuleFileNameW(hmsi, filename, ARRAY_SIZE(filename)); if (!res) - WINE_ERR("GetModuleFileName failed: %d\n", GetLastError()); + WINE_ERR("GetModuleFileName failed: %ld\n", GetLastError()); len = ARRAY_SIZE(msiexec_version); *msiexec_version = 0; res = MsiGetFileVersionW(filename, msiexec_version, &len, NULL, NULL); if (res) - WINE_ERR("MsiGetFileVersion failed with %d\n", res); + WINE_ERR("MsiGetFileVersion failed with %ld\n", res); /* Return the length of the resource. No typo: The LPWSTR parameter must be a LPWSTR * for this mode */ @@ -413,7 +413,7 @@ static int custom_action_server(const WCHAR *arg) pipe = CreateFileW(buffer, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); if (pipe == INVALID_HANDLE_VALUE) { - ERR("Failed to create custom action server pipe: %u\n", GetLastError()); + ERR("Failed to create custom action server pipe: %lu\n", GetLastError()); return GetLastError(); } @@ -438,12 +438,12 @@ static int custom_action_server(const WCHAR *arg) thread64 = (DWORD_PTR)thread; if (!WriteFile(pipe, &thread64, sizeof(thread64), &size, NULL) || size != sizeof(thread64)) { - ERR("Failed to write to custom action server pipe: %u\n", GetLastError()); + ERR("Failed to write to custom action server pipe: %lu\n", GetLastError()); CoUninitialize(); return GetLastError(); } } - ERR("Failed to read from custom action server pipe: %u\n", GetLastError()); + ERR("Failed to read from custom action server pipe: %lu\n", GetLastError()); CoUninitialize(); return GetLastError(); } @@ -948,7 +948,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine LogFileName = argvW[i]; if(MsiEnableLogW(LogMode, LogFileName, LogAttributes) != ERROR_SUCCESS) { - fprintf(stderr, "Logging in %s (0x%08x, %u) failed\n", + fprintf(stderr, "Logging in %s (0x%08lx, %lu) failed\n", wine_dbgstr_w(LogFileName), LogMode, LogAttributes); ExitProcess(1); } diff --git a/programs/msiexec/service.c b/programs/msiexec/service.c index 735cd5c0fb0..573b3782473 100644 --- a/programs/msiexec/service.c +++ b/programs/msiexec/service.c @@ -83,7 +83,7 @@ static BOOL UpdateSCMStatus(DWORD dwCurrentState, DWORD dwWin32ExitCode, static void WINAPI ServiceCtrlHandler(DWORD code) { - WINE_TRACE("%d\n", code); + WINE_TRACE("%ld\n", code); switch (code) { @@ -93,7 +93,7 @@ static void WINAPI ServiceCtrlHandler(DWORD code) KillService(); break; default: - fprintf(stderr, "Unhandled service control code: %d\n", code); + fprintf(stderr, "Unhandled service control code: %ld\n", code); UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0); break; }

1 0

Eric Pouech : fsutil: Enable compilation with long types.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 34b1c21d15dd103da7b5f57b78d5bd0c378849d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34b1c21d15dd103da7b5f57b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:56:38 2022 +0100 fsutil: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/fsutil/Makefile.in | 1 - programs/fsutil/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in index 676e9d593dd..df1c8ac6657 100644 --- a/programs/fsutil/Makefile.in +++ b/programs/fsutil/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = fsutil.exe IMPORTS = user32 diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c index 46deda8a51d..94151ae9b42 100644 --- a/programs/fsutil/main.c +++ b/programs/fsutil/main.c @@ -59,7 +59,7 @@ static int WINAPIV output_string(int msg, ...) va_end(arguments); if (len == 0 && GetLastError() != NO_ERROR) - WINE_FIXME("Could not format string: le=%u, msg=%d\n", GetLastError(), msg); + WINE_FIXME("Could not format string: le=%lu, msg=%d\n", GetLastError(), msg); else output_write(out, len);

1 0

Eric Pouech : explorer: Enable compilation with long types.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: e299b5af34c1e390d0b1bf6e44c8ef26f8a0c01f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e299b5af34c1e390d0b1bf6e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:56:32 2022 +0100 explorer: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/Makefile.in | 1 - programs/explorer/appbar.c | 2 +- programs/explorer/desktop.c | 52 +++++++++++++++++++++---------------------- programs/explorer/explorer.c | 4 ++-- programs/explorer/systray.c | 2 +- 5 files changed, 30 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e299b5af34c1e390d0b1…

1 0

Eric Pouech : eject: Enable compilation with long types.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: ed875d65e421d9889f5796a105db2bcd3dffff4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed875d65e421d9889f5796a1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:56:26 2022 +0100 eject: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/eject/Makefile.in | 1 - programs/eject/eject.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/eject/Makefile.in b/programs/eject/Makefile.in index 86704201c2b..76274f66d97 100644 --- a/programs/eject/Makefile.in +++ b/programs/eject/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = eject.exe EXTRADLLFLAGS = -mconsole diff --git a/programs/eject/eject.c b/programs/eject/eject.c index e6416eacff7..718848bccdb 100644 --- a/programs/eject/eject.c +++ b/programs/eject/eject.c @@ -70,16 +70,16 @@ static BOOL eject_cd( WCHAR drive ) WINE_TRACE( "ejecting %c:\n", (char)drive ); if (!DeviceIoControl( handle, FSCTL_DISMOUNT_VOLUME, NULL, 0, NULL, 0, &result, NULL )) - WINE_WARN( "FSCTL_DISMOUNT_VOLUME failed with err %d\n", GetLastError() ); + WINE_WARN( "FSCTL_DISMOUNT_VOLUME failed with err %ld\n", GetLastError() ); removal.PreventMediaRemoval = FALSE; if (!DeviceIoControl( handle, IOCTL_STORAGE_MEDIA_REMOVAL, &removal, sizeof(removal), NULL, 0, &result, NULL )) - WINE_WARN( "IOCTL_STORAGE_MEDIA_REMOVAL failed with err %d\n", GetLastError() ); + WINE_WARN( "IOCTL_STORAGE_MEDIA_REMOVAL failed with err %ld\n", GetLastError() ); if (!unmount_only) { if (!DeviceIoControl( handle, IOCTL_STORAGE_EJECT_MEDIA, NULL, 0, NULL, 0, &result, NULL )) - WINE_WARN( "IOCTL_STORAGE_EJECT_MEDIA failed with err %d\n", GetLastError() ); + WINE_WARN( "IOCTL_STORAGE_EJECT_MEDIA failed with err %ld\n", GetLastError() ); } CloseHandle( handle );

1 0

Eric Pouech : dxdiag: Enable compilation with long types.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: a7f8adb5e36aa1268838f23446bd5a585b252e11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7f8adb5e36aa1268838f234… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:56:19 2022 +0100 dxdiag: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/dxdiag/Makefile.in | 1 - programs/dxdiag/information.c | 2 +- programs/dxdiag/output.c | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/dxdiag/Makefile.in b/programs/dxdiag/Makefile.in index 9f2f0f19b14..2ea7a084d19 100644 --- a/programs/dxdiag/Makefile.in +++ b/programs/dxdiag/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dxdiag.exe IMPORTS = dxguid ole32 oleaut32 user32 comctl32 diff --git a/programs/dxdiag/information.c b/programs/dxdiag/information.c index 74fe15f7aec..99c1a6715b2 100644 --- a/programs/dxdiag/information.c +++ b/programs/dxdiag/information.c @@ -190,7 +190,7 @@ struct dxdiag_information *collect_dxdiag_information(BOOL whql_check) &IID_IDxDiagProvider, (void **)&pddp); if (FAILED(hr)) { - WINE_ERR("IDxDiagProvider instance creation failed with 0x%08x\n", hr); + WINE_ERR("IDxDiagProvider instance creation failed with 0x%08lx\n", hr); goto error; } diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index 95941785c1c..a8eb733ba4b 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -85,7 +85,7 @@ static BOOL output_text_field(HANDLE hFile, const char *field_name, DWORD field_ assert(total_len <= sizeof(output_buffer)); - sprintf(sprintf_fmt, "%%%us: ", field_width); + sprintf(sprintf_fmt, "%%%lus: ", field_width); ptr += sprintf(ptr, sprintf_fmt, field_name); ptr += WideCharToMultiByte(CP_ACP, 0, value, value_lenW, ptr, value_lenA, NULL, NULL); @@ -153,7 +153,7 @@ static BOOL output_text_information(struct dxdiag_information *dxdiag_info, cons NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { - WINE_ERR("File creation failed, last error %u\n", GetLastError()); + WINE_ERR("File creation failed, last error %lu\n", GetLastError()); return FALSE; } @@ -277,7 +277,7 @@ static BOOL output_xml_information(struct dxdiag_information *dxdiag_info, const &IID_IXMLDOMDocument, (void **)&xmldoc); if (FAILED(hr)) { - WINE_ERR("IXMLDOMDocument instance creation failed with 0x%08x\n", hr); + WINE_ERR("IXMLDOMDocument instance creation failed with 0x%08lx\n", hr); goto error; }

1 0

Eric Pouech : [cw]script: Enable compilation with long types.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 8008c7d7cf64a1eb70cb3a1306883352d51bfb08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8008c7d7cf64a1eb70cb3a13… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:56:13 2022 +0100 [cw]script: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cscript/Makefile.in | 2 +- programs/wscript/Makefile.in | 1 - programs/wscript/arguments.c | 8 ++++---- programs/wscript/host.c | 10 +++++----- programs/wscript/main.c | 6 +++--- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/programs/cscript/Makefile.in b/programs/cscript/Makefile.in index 2795a66eeca..d87a28fcc54 100644 --- a/programs/cscript/Makefile.in +++ b/programs/cscript/Makefile.in @@ -1,6 +1,6 @@ MODULE = cscript.exe IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 -EXTRADEFS = -DWINE_NO_LONG_TYPES -DCSCRIPT_BUILD +EXTRADEFS = -DCSCRIPT_BUILD PARENTSRC = ../wscript EXTRADLLFLAGS = -mwindows -municode diff --git a/programs/wscript/Makefile.in b/programs/wscript/Makefile.in index 77d276d6c01..33b2e66d9bc 100644 --- a/programs/wscript/Makefile.in +++ b/programs/wscript/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wscript.exe IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 diff --git a/programs/wscript/arguments.c b/programs/wscript/arguments.c index 7961948b6a5..a97752f8452 100644 --- a/programs/wscript/arguments.c +++ b/programs/wscript/arguments.c @@ -70,7 +70,7 @@ static HRESULT WINAPI Arguments2_GetTypeInfoCount(IArguments2 *iface, UINT *pcti static HRESULT WINAPI Arguments2_GetTypeInfo(IArguments2 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - WINE_TRACE("(%x %x %p\n", iTInfo, lcid, ppTInfo); + WINE_TRACE("(%x %lx %p\n", iTInfo, lcid, ppTInfo); ITypeInfo_AddRef(arguments_ti); *ppTInfo = arguments_ti; @@ -80,7 +80,7 @@ static HRESULT WINAPI Arguments2_GetTypeInfo(IArguments2 *iface, UINT iTInfo, LC static HRESULT WINAPI Arguments2_GetIDsOfNames(IArguments2 *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - WINE_TRACE("(%s %p %d %x %p)\n", wine_dbgstr_guid(riid), rgszNames, + WINE_TRACE("(%s %p %d %lx %p)\n", wine_dbgstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return ITypeInfo_GetIDsOfNames(arguments_ti, rgszNames, cNames, rgDispId); @@ -90,7 +90,7 @@ static HRESULT WINAPI Arguments2_Invoke(IArguments2 *iface, DISPID dispIdMember, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - WINE_TRACE("(%d %p %p)\n", dispIdMember, pDispParams, pVarResult); + WINE_TRACE("(%ld %p %p)\n", dispIdMember, pDispParams, pVarResult); return ITypeInfo_Invoke(arguments_ti, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); @@ -98,7 +98,7 @@ static HRESULT WINAPI Arguments2_Invoke(IArguments2 *iface, DISPID dispIdMember, static HRESULT WINAPI Arguments2_Item(IArguments2 *iface, LONG index, BSTR *out_Value) { - WINE_TRACE("(%d %p)\n", index, out_Value); + WINE_TRACE("(%ld %p)\n", index, out_Value); if(index<0 || index >= numOfArgs) return E_INVALIDARG; diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 8765dd271f4..bd16b7b4cbe 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -126,7 +126,7 @@ static HRESULT WINAPI Host_GetTypeInfoCount(IHost *iface, UINT *pctinfo) static HRESULT WINAPI Host_GetTypeInfo(IHost *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - WINE_TRACE("(%x %x %p\n", iTInfo, lcid, ppTInfo); + WINE_TRACE("(%x %lx %p\n", iTInfo, lcid, ppTInfo); ITypeInfo_AddRef(host_ti); *ppTInfo = host_ti; @@ -136,7 +136,7 @@ static HRESULT WINAPI Host_GetTypeInfo(IHost *iface, UINT iTInfo, LCID lcid, static HRESULT WINAPI Host_GetIDsOfNames(IHost *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - WINE_TRACE("(%s %p %d %x %p)\n", wine_dbgstr_guid(riid), rgszNames, + WINE_TRACE("(%s %p %d %lx %p)\n", wine_dbgstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return ITypeInfo_GetIDsOfNames(host_ti, rgszNames, cNames, rgDispId); @@ -146,7 +146,7 @@ static HRESULT WINAPI Host_Invoke(IHost *iface, DISPID dispIdMember, REFIID riid LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - WINE_TRACE("(%d %p %p)\n", dispIdMember, pDispParams, pVarResult); + WINE_TRACE("(%ld %p %p)\n", dispIdMember, pDispParams, pVarResult); return ITypeInfo_Invoke(host_ti, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); @@ -278,7 +278,7 @@ static HRESULT WINAPI Host_get_Timeout(IHost *iface, LONG *out_Timeout) static HRESULT WINAPI Host_put_Timeout(IHost *iface, LONG v) { - WINE_FIXME("(%d)\n", v); + WINE_FIXME("(%ld)\n", v); return E_NOTIMPL; } @@ -396,7 +396,7 @@ static HRESULT WINAPI Host_DisconnectObject(IHost *iface, IDispatch *Object) static HRESULT WINAPI Host_Sleep(IHost *iface, LONG Time) { - WINE_FIXME("(%d)\n", Time); + WINE_FIXME("(%ld)\n", Time); return E_NOTIMPL; } diff --git a/programs/wscript/main.c b/programs/wscript/main.c index a7005a9289c..12571181491 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -81,7 +81,7 @@ static HRESULT WINAPI ActiveScriptSite_GetLCID(IActiveScriptSite *iface, LCID *p static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPCOLESTR pstrName, DWORD dwReturnMask, IUnknown **ppunkItem, ITypeInfo **ppti) { - WINE_TRACE("(%s %x %p %p)\n", wine_dbgstr_w(pstrName), dwReturnMask, ppunkItem, ppti); + WINE_TRACE("(%s %lx %p %p)\n", wine_dbgstr_w(pstrName), dwReturnMask, ppunkItem, ppti); if(lstrcmpW(pstrName, L"WSH") && lstrcmpW(pstrName, L"WScript")) return E_FAIL; @@ -368,13 +368,13 @@ static void run_script(const WCHAR *filename, IActiveScript *script, IActiveScri SCRIPTTEXT_HOSTMANAGESSOURCE|SCRIPTITEM_ISVISIBLE, NULL, NULL); SysFreeString(text); if(FAILED(hres)) { - WINE_FIXME("ParseScriptText failed: %08x\n", hres); + WINE_FIXME("ParseScriptText failed: %08lx\n", hres); return; } hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_STARTED); if(FAILED(hres)) - WINE_FIXME("SetScriptState failed: %08x\n", hres); + WINE_FIXME("SetScriptState failed: %08lx\n", hres); } static BOOL set_host_properties(const WCHAR *prop)

1 0

Eric Pouech : conhost: Enable compilation with long types.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 620305d90ef56038b0f9224760646e14ce4239c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=620305d90ef56038b0f92247… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:56:07 2022 +0100 conhost: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/Makefile.in | 1 - programs/conhost/conhost.c | 18 +++++++++--------- programs/conhost/window.c | 10 +++++----- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/programs/conhost/Makefile.in b/programs/conhost/Makefile.in index 69559c668ad..2a407006697 100644 --- a/programs/conhost/Makefile.in +++ b/programs/conhost/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = conhost.exe IMPORTS = user32 gdi32 advapi32 DELAYIMPORTS = comctl32 diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 3c8d165cbbe..2b137c40fb0 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -162,7 +162,7 @@ static void tty_flush( struct console *console ) TRACE("%s\n", debugstr_an(console->tty_buffer, console->tty_buffer_count)); if (!WriteFile( console->tty_output, console->tty_buffer, console->tty_buffer_count, NULL, NULL )) - WARN( "write failed: %u\n", GetLastError() ); + WARN( "write failed: %lu\n", GetLastError() ); console->tty_buffer_count = 0; } @@ -180,7 +180,7 @@ static void tty_write( struct console *console, const char *buffer, size_t size { assert( !console->tty_buffer_count ); if (!WriteFile( console->tty_output, buffer, size, NULL, NULL )) - WARN( "write failed: %u\n", GetLastError() ); + WARN( "write failed: %lu\n", GetLastError() ); } } @@ -461,7 +461,7 @@ static NTSTATUS read_complete( struct console *console, NTSTATUS status, const v status = wine_server_call( req ); } SERVER_END_REQ; - if (status && (console->read_ioctl || status != STATUS_INVALID_HANDLE)) ERR( "failed: %#x\n", status ); + if (status && (console->read_ioctl || status != STATUS_INVALID_HANDLE)) ERR( "failed: %#lx\n", status ); console->signaled = signal; console->read_ioctl = 0; console->pending_read = 0; @@ -472,7 +472,7 @@ static NTSTATUS read_console_input( struct console *console, size_t out_size ) { size_t count = min( out_size / sizeof(INPUT_RECORD), console->record_count ); - TRACE("count %u\n", count); + TRACE("count %Iu\n", count); read_complete( console, STATUS_SUCCESS, console->records, count * sizeof(*console->records), console->record_count > count ); @@ -1271,7 +1271,7 @@ static NTSTATUS process_console_input( struct console *console ) if (ir.EventType != KEY_EVENT || !ir.Event.KeyEvent.bKeyDown) continue; - TRACE( "key code=%02x scan=%02x char=%02x state=%08x\n", + TRACE( "key code=%02x scan=%02x char=%02x state=%08lx\n", ir.Event.KeyEvent.wVirtualKeyCode, ir.Event.KeyEvent.wVirtualScanCode, ir.Event.KeyEvent.uChar.UnicodeChar, ir.Event.KeyEvent.dwControlKeyState ); @@ -1638,7 +1638,7 @@ static DWORD WINAPI tty_input( void *param ) unsigned int h = condrv_handle( console->tty_input ); status = NtDeviceIoControlFile( console->server, NULL, NULL, NULL, &io, IOCTL_CONDRV_SETUP_INPUT, &h, sizeof(h), NULL, 0 ); - if (status) ERR( "input setup failed: %#x\n", status ); + if (status) ERR( "input setup failed: %#lx\n", status ); } event = CreateEventW( NULL, TRUE, FALSE, NULL ); @@ -1695,7 +1695,7 @@ static DWORD WINAPI tty_input( void *param ) LeaveCriticalSection( &console_section ); } - TRACE( "NtReadFile failed: %#x\n", status ); + TRACE( "NtReadFile failed: %#lx\n", status ); done: EnterCriticalSection( &console_section ); @@ -1705,7 +1705,7 @@ done: unsigned int h = 0; status = NtDeviceIoControlFile( console->server, NULL, NULL, NULL, &io, IOCTL_CONDRV_SETUP_INPUT, &h, sizeof(h), NULL, 0 ); - if (status) ERR( "input restore failed: %#x\n", status ); + if (status) ERR( "input restore failed: %#lx\n", status ); } CloseHandle( console->input_thread ); console->input_thread = NULL; @@ -2632,7 +2632,7 @@ static NTSTATUS process_console_ioctls( struct console *console ) } if (status) { - TRACE( "failed to get next request: %#x\n", status ); + TRACE( "failed to get next request: %#lx\n", status ); return status; } diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 7ad0d48effd..db04ba120e4 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -110,8 +110,8 @@ static const char *debugstr_config( const struct console_config *config ) static const char *debugstr_logfont( const LOGFONTW *lf, unsigned int ft ) { - return wine_dbg_sprintf( "%s%s%s%s lfHeight=%d lfWidth=%d lfEscapement=%d " - "lfOrientation=%d lfWeight=%d lfItalic=%u lfUnderline=%u " + return wine_dbg_sprintf( "%s%s%s%s lfHeight=%ld lfWidth=%ld lfEscapement=%ld " + "lfOrientation=%ld lfWeight=%ld lfItalic=%u lfUnderline=%u " "lfStrikeOut=%u lfCharSet=%u lfPitchAndFamily=%u lfFaceName=%s", (ft & RASTER_FONTTYPE) ? "raster" : "", (ft & TRUETYPE_FONTTYPE) ? "truetype" : "", @@ -124,8 +124,8 @@ static const char *debugstr_logfont( const LOGFONTW *lf, unsigned int ft ) static const char *debugstr_textmetric( const TEXTMETRICW *tm, unsigned int ft ) { - return wine_dbg_sprintf( "%s%s%s%s tmHeight=%d tmAscent=%d tmDescent=%d " - "tmAveCharWidth=%d tmMaxCharWidth=%d tmWeight=%d " + return wine_dbg_sprintf( "%s%s%s%s tmHeight=%ld tmAscent=%ld tmDescent=%ld " + "tmAveCharWidth=%ld tmMaxCharWidth=%ld tmWeight=%ld " "tmPitchAndFamily=%u tmCharSet=%u", (ft & RASTER_FONTTYPE) ? "raster" : "", (ft & TRUETYPE_FONTTYPE) ? "truetype" : "", @@ -2453,7 +2453,7 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp break; case IDS_SCROLL: case IDS_SEARCH: - FIXME( "Unhandled yet command: %lx\n", wparam ); + FIXME( "Unhandled yet command: %Ix\n", wparam ); break; default: return DefWindowProcW( hwnd, msg, wparam, lparam );

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