February 2022 - Wine-Commits

Eric Pouech : wldap32: Use correct integral type.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: d1265abbc48cf6fee43c4c0cde8daa4ea7160169 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1265abbc48cf6fee43c4c0c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 11:50:00 2022 +0100 wldap32: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/ber.c | 8 ++++---- dlls/wldap32/libldap.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index 8387ce36033..f3b18e530b4 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -145,7 +145,7 @@ void CDECL ber_bvfree( BERVAL *berval ) */ ULONG CDECL ber_first_element( BerElement *ber, ULONG *len, char **opaque ) { - struct ber_first_element_params params = { BER(ber), len, opaque }; + struct ber_first_element_params params = { BER(ber), (unsigned int *)len, opaque }; return LDAP_CALL( ber_first_element, &params ); } @@ -265,7 +265,7 @@ BerElement * CDECL ber_init( BERVAL *berval ) */ ULONG CDECL ber_next_element( BerElement *ber, ULONG *len, char *opaque ) { - struct ber_next_element_params params = { BER(ber), len, opaque }; + struct ber_next_element_params params = { BER(ber), (unsigned int *)len, opaque }; return LDAP_CALL( ber_next_element, &params ); } @@ -285,7 +285,7 @@ ULONG CDECL ber_next_element( BerElement *ber, ULONG *len, char *opaque ) */ ULONG CDECL ber_peek_tag( BerElement *ber, ULONG *len ) { - struct ber_peek_tag_params params = { BER(ber), len }; + struct ber_peek_tag_params params = { BER(ber), (unsigned int *)len }; return LDAP_CALL( ber_peek_tag, &params ); } @@ -305,7 +305,7 @@ ULONG CDECL ber_peek_tag( BerElement *ber, ULONG *len ) */ ULONG CDECL ber_skip_tag( BerElement *ber, ULONG *len ) { - struct ber_skip_tag_params params = { BER(ber), len }; + struct ber_skip_tag_params params = { BER(ber), (unsigned int *)len }; return LDAP_CALL( ber_skip_tag, &params ); } diff --git a/dlls/wldap32/libldap.h b/dlls/wldap32/libldap.h index c398b501602..65487f16fe6 100644 --- a/dlls/wldap32/libldap.h +++ b/dlls/wldap32/libldap.h @@ -106,7 +106,7 @@ struct ber_alloc_t_params struct ber_first_element_params { void *ber; - ULONG *ret_len; + unsigned int *ret_len; char **last; };

1 0

Eric Pouech : attrib: Enable compilation with long types.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: 418c4ad7b542bf44426171e4d909a332bb230b6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=418c4ad7b542bf44426171e4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:55:49 2022 +0100 attrib: 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/attrib/Makefile.in | 1 - programs/attrib/attrib.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/attrib/Makefile.in b/programs/attrib/Makefile.in index 128ecf91e32..2c2eade6b69 100644 --- a/programs/attrib/Makefile.in +++ b/programs/attrib/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = attrib.exe IMPORTS = user32 diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index f8257461fe2..4344200b3ec 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -33,7 +33,7 @@ static WCHAR *ATTRIB_LoadMessage(UINT id) static WCHAR msg[MAXSTRING]; 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, L"Failed!"); } return msg; @@ -75,7 +75,7 @@ static int WINAPIV ATTRIB_wprintf(const WCHAR *format, ...) MAX_WRITECONSOLE_SIZE/sizeof(*output_bufW), &parms); va_end(parms); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); return 0; } @@ -143,7 +143,7 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, WIN32_FIND_DATAW fd; WCHAR flags[] = L" "; - WINE_TRACE("Processing dir '%s', spec '%s', %d,%x,%x\n", + WINE_TRACE("Processing dir '%s', spec '%s', %d,%lx,%lx\n", wine_dbgstr_w(rootdir), wine_dbgstr_w(filespec), recurse, attrib_set, attrib_clear);

1 0

Eric Pouech : msiexec: Enable compilation with long types.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

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 : conhost: Enable compilation with long types.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

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

Eric Pouech : [cw]script: Enable compilation with long types.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

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 : eject: Enable compilation with long types.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

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 : explorer: Enable compilation with long types.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

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 : plugplay: Enable compilation with long types.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: 47dc41231597cddd679ea691b37f65164632f1a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47dc41231597cddd679ea691… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:57:09 2022 +0100 plugplay: 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/plugplay/Makefile.in | 1 - programs/plugplay/main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/plugplay/Makefile.in b/programs/plugplay/Makefile.in index 3a491d137b0..137ea28ba43 100644 --- a/programs/plugplay/Makefile.in +++ b/programs/plugplay/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = plugplay.exe IMPORTS = advapi32 rpcrt4 user32 diff --git a/programs/plugplay/main.c b/programs/plugplay/main.c index 366be9c2b46..8426f2204a3 100644 --- a/programs/plugplay/main.c +++ b/programs/plugplay/main.c @@ -190,7 +190,7 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ SetEvent( stop_event ); return NO_ERROR; default: - WINE_FIXME( "got service ctrl %x\n", ctrl ); + WINE_FIXME( "got service ctrl %lx\n", ctrl ); status.dwCurrentState = SERVICE_RUNNING; SetServiceStatus( service_handle, &status ); return NO_ERROR; @@ -208,17 +208,17 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) if ((err = RpcServerUseProtseqEpA( protseq, 0, endpoint, NULL ))) { - ERR("RpcServerUseProtseqEp() failed, error %u\n", err); + ERR("RpcServerUseProtseqEp() failed, error %lu\n", err); return; } if ((err = RpcServerRegisterIf( plugplay_v0_0_s_ifspec, NULL, NULL ))) { - ERR("RpcServerRegisterIf() failed, error %u\n", err); + ERR("RpcServerRegisterIf() failed, error %lu\n", err); return; } if ((err = RpcServerListen( 1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE ))) { - ERR("RpcServerListen() failed, error %u\n", err); + ERR("RpcServerListen() failed, error %lu\n", err); return; }

1 0

Eric Pouech : regsvr32: Enable compilation with long types.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: cf63513af39f6835f0cec9b229593f87f5d6d62c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf63513af39f6835f0cec9b2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:57:36 2022 +0100 regsvr32: 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/regsvr32/Makefile.in | 1 - programs/regsvr32/regsvr32.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/regsvr32/Makefile.in b/programs/regsvr32/Makefile.in index ed8374a2cb6..38779634408 100644 --- a/programs/regsvr32/Makefile.in +++ b/programs/regsvr32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = regsvr32.exe IMPORTS = ole32 user32 kernelbase diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index c56479015d8..0efa6bcd839 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -47,7 +47,7 @@ static void WINAPIV output_write(UINT id, ...) if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) { - WINE_FIXME("LoadString failed with %d\n", GetLastError()); + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); return; } @@ -57,7 +57,7 @@ static void WINAPIV output_write(UINT id, ...) va_end(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)); return; } @@ -153,7 +153,7 @@ static void reexec_self( WORD machine ) } else { - WINE_TRACE("failed to restart, err=%d\n", GetLastError()); + WINE_TRACE("failed to restart, err=%ld\n", GetLastError()); } Wow64RevertWow64FsRedirection(cookie); HeapFree(GetProcessHeap(), 0, cmdline);

1 0

Eric Pouech : rpcss: Enable compilation with long types.
by Alexandre Julliard Feb. 4, 2022

Feb. 4, 2022

Module: wine Branch: master Commit: f172957423d94fdb2a3ee2a51bc058773593d540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f172957423d94fdb2a3ee2a5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:57:42 2022 +0100 rpcss: 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/rpcss/Makefile.in | 1 - programs/rpcss/epmp.c | 10 +++++----- programs/rpcss/irotp.c | 8 ++++---- programs/rpcss/rpcss_main.c | 4 ++-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/programs/rpcss/Makefile.in b/programs/rpcss/Makefile.in index b7a451f0001..a4d3533e55e 100644 --- a/programs/rpcss/Makefile.in +++ b/programs/rpcss/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = rpcss.exe IMPORTS = rpcrt4 advapi32 diff --git a/programs/rpcss/epmp.c b/programs/rpcss/epmp.c index 656fa9cd246..2a13aaccb8b 100644 --- a/programs/rpcss/epmp.c +++ b/programs/rpcss/epmp.c @@ -98,7 +98,7 @@ void __cdecl ept_insert(handle_t h, unsigned32 i; RPC_STATUS rpc_status; - WINE_TRACE("(%p, %u, %p, %u, %p)\n", h, num_ents, entries, replace, status); + WINE_TRACE("(%p, %lu, %p, %lu, %p)\n", h, num_ents, entries, replace, status); *status = RPC_S_OK; @@ -119,7 +119,7 @@ void __cdecl ept_insert(handle_t h, &entry->address); if (rpc_status != RPC_S_OK) { - WINE_WARN("TowerExplode failed %u\n", rpc_status); + WINE_WARN("TowerExplode failed %lu\n", rpc_status); *status = rpc_status; HeapFree(GetProcessHeap(), 0, entry); break; /* FIXME: more cleanup? */ @@ -149,7 +149,7 @@ void __cdecl ept_delete(handle_t h, *status = RPC_S_OK; - WINE_TRACE("(%p, %u, %p, %p)\n", h, num_ents, entries, status); + WINE_TRACE("(%p, %lu, %p, %p)\n", h, num_ents, entries, status); EnterCriticalSection(&csEpm); @@ -215,7 +215,7 @@ void __cdecl ept_map(handle_t h, *status = RPC_S_OK; *num_towers = 0; - WINE_TRACE("(%p, %p, %p, %p, %u, %p, %p, %p)\n", h, object, map_tower, + WINE_TRACE("(%p, %p, %p, %p, %lu, %p, %p, %p)\n", h, object, map_tower, entry_handle, max_towers, num_towers, towers, status); rpc_status = TowerExplode(map_tower, &iface, &syntax, &protseq, @@ -282,7 +282,7 @@ void __cdecl ept_mgmt_delete(handle_t h, twr_p_t tower, error_status_t *status) { - WINE_FIXME("(%p, %d, %p, %p, %p): stub\n", h, object_speced, object, tower, status); + WINE_FIXME("(%p, %ld, %p, %p, %p): stub\n", h, object_speced, object, tower, status); *status = EPT_S_CANT_PERFORM_OP; } diff --git a/programs/rpcss/irotp.c b/programs/rpcss/irotp.c index 05abb90ad88..47a88852a2d 100644 --- a/programs/rpcss/irotp.c +++ b/programs/rpcss/irotp.c @@ -84,7 +84,7 @@ HRESULT __cdecl IrotRegister( if (grfFlags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT)) { - WINE_ERR("Invalid grfFlags: 0x%08x\n", grfFlags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT)); + WINE_ERR("Invalid grfFlags: 0x%08lx\n", grfFlags & ~(ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT)); return E_INVALIDARG; } @@ -132,7 +132,7 @@ HRESULT __cdecl IrotRegister( !memcmp(&data->abData, &existing_rot_entry->moniker_data->abData, data->ulCntData)) { hr = MK_S_MONIKERALREADYREGISTERED; - WINE_TRACE("moniker already registered with cookie %d\n", existing_rot_entry->cookie); + WINE_TRACE("moniker already registered with cookie %ld\n", existing_rot_entry->cookie); break; } } @@ -157,7 +157,7 @@ HRESULT __cdecl IrotRevoke( { struct rot_entry *rot_entry; - WINE_TRACE("%d\n", cookie); + WINE_TRACE("%ld\n", cookie); EnterCriticalSection(&csRunningObjectTable); LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, struct rot_entry, entry) @@ -269,7 +269,7 @@ HRESULT __cdecl IrotNoteChangeTime( { struct rot_entry *rot_entry; - WINE_TRACE("%d %p\n", cookie, last_modified_time); + WINE_TRACE("%ld %p\n", cookie, last_modified_time); EnterCriticalSection(&csRunningObjectTable); LIST_FOR_EACH_ENTRY(rot_entry, &RunningObjectTable, struct rot_entry, entry) diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c index 99b4020882b..2fef34d1171 100644 --- a/programs/rpcss/rpcss_main.c +++ b/programs/rpcss/rpcss_main.c @@ -230,7 +230,7 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ SetEvent( exit_event ); return NO_ERROR; default: - FIXME( "got service ctrl %x\n", ctrl ); + FIXME( "got service ctrl %lx\n", ctrl ); status.dwCurrentState = SERVICE_RUNNING; SetServiceStatus( service_handle, &status ); return NO_ERROR; @@ -246,7 +246,7 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) if ((ret = RPCSS_Initialize())) { - WARN("Failed to initialize rpc interfaces, status %d.\n", ret); + WARN("Failed to initialize rpc interfaces, status %ld.\n", ret); return; }

1 0