A bunch of them... nothing fancy A+
---
Eric Pouech (19): programs/attrib: enable compilation with long types programs/cabarc: enable compilation with long types programs/chcp.com: enable compilation with long types programs/conhost: enable compilation with long types programs/[cw]script: enable compilation with long types programs/dxdiag: enable compilation with long types programs/eject: enable compilation with long types programs/explorer: enable compilation with long types programs/fsutil: enable compilation with long types programs/msiexec: enable compilation with long types programs/net: enable compilation with long types programs/netstat: enable compilation with long types programs/ping: enable compilation with long types programs/plugplay: enable compilation with long types programs/presentationfontcache: enable compilation with long types programs/regedit: enable compilation with long types programs/reg: enable compilation with long types programs/regsvr32: enable compilation with long types programs/rpcss: enable compilation with long types
programs/attrib/Makefile.in | 1 - programs/attrib/attrib.c | 6 +-- programs/cabarc/Makefile.in | 1 - programs/cabarc/cabarc.c | 2 +- programs/chcp.com/Makefile.in | 1 - programs/chcp.com/main.c | 4 +- programs/conhost/Makefile.in | 1 - programs/conhost/conhost.c | 18 ++++---- programs/conhost/window.c | 10 ++--- programs/cscript/Makefile.in | 2 +- programs/dxdiag/Makefile.in | 1 - programs/dxdiag/information.c | 2 +- programs/dxdiag/output.c | 6 +-- programs/eject/Makefile.in | 1 - programs/eject/eject.c | 6 +-- 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 +- programs/fsutil/Makefile.in | 1 - programs/fsutil/main.c | 2 +- programs/msiexec/Makefile.in | 1 - programs/msiexec/msiexec.c | 12 ++--- programs/msiexec/service.c | 4 +- programs/net/Makefile.in | 1 - programs/net/net.c | 4 +- programs/netstat/Makefile.in | 1 - programs/netstat/netstat.c | 2 +- programs/ping/Makefile.in | 1 - programs/ping/ping_main.c | 2 +- programs/plugplay/Makefile.in | 1 - programs/plugplay/main.c | 8 ++-- programs/presentationfontcache/Makefile.in | 1 - programs/presentationfontcache/main.c | 2 +- programs/reg/Makefile.in | 1 - programs/reg/import.c | 2 +- programs/reg/reg.c | 4 +- programs/regedit/Makefile.in | 1 - programs/regedit/edit.c | 2 +- programs/regedit/framewnd.c | 2 +- programs/regedit/main.c | 2 +- programs/regedit/regedit.c | 6 +-- programs/regsvr32/Makefile.in | 1 - programs/regsvr32/regsvr32.c | 6 +-- programs/rpcss/Makefile.in | 1 - programs/rpcss/epmp.c | 10 ++--- programs/rpcss/irotp.c | 8 ++-- programs/rpcss/rpcss_main.c | 4 +- programs/wscript/Makefile.in | 1 - programs/wscript/arguments.c | 8 ++-- programs/wscript/host.c | 10 ++--- programs/wscript/main.c | 6 +-- 53 files changed, 111 insertions(+), 130 deletions(-)
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- 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);
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/cabarc/Makefile.in | 1 - programs/cabarc/cabarc.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/programs/cabarc/Makefile.in b/programs/cabarc/Makefile.in index c0c825500de..769df20457d 100644 --- a/programs/cabarc/Makefile.in +++ b/programs/cabarc/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = cabarc.exe IMPORTS = cabinet
diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index 3eb28fe9083..c4622e43046 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -299,7 +299,7 @@ static void create_directories( const WCHAR *name ) { *p = 0; if (!CreateDirectoryW( path, NULL )) - WINE_TRACE("Couldn't create directory %s - error: %d\n", wine_dbgstr_w(path), GetLastError()); + WINE_TRACE("Couldn't create directory %s - error: %ld\n", wine_dbgstr_w(path), GetLastError()); *p = '\'; p = wcschr(p+1, '\'); }
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/chcp.com/Makefile.in | 1 - programs/chcp.com/main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/programs/chcp.com/Makefile.in b/programs/chcp.com/Makefile.in index 7a55d3cf15f..c7037abb10f 100644 --- a/programs/chcp.com/Makefile.in +++ b/programs/chcp.com/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = chcp.com IMPORTS = kernelbase
diff --git a/programs/chcp.com/main.c b/programs/chcp.com/main.c index 31ddba4c137..6c5864d0e19 100644 --- a/programs/chcp.com/main.c +++ b/programs/chcp.com/main.c @@ -56,7 +56,7 @@ static void output_formatstring(const WCHAR *fmt, va_list va_args) fmt, 0, 0, (WCHAR *)&str, 0, &va_args); if (!len && 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; } output_writeconsole(str, len); @@ -71,7 +71,7 @@ static void WINAPIV output_message(unsigned int id, ...)
if (!(len = LoadStringW(GetModuleHandleW(NULL), id, (WCHAR *)&fmt, 0))) { - WINE_FIXME("LoadString failed with %d\n", GetLastError()); + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); return; }
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- 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 );
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- 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)
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- 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; }
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- 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 );
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- 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 --git a/programs/explorer/Makefile.in b/programs/explorer/Makefile.in index 8d5cd94957f..5507d747bb1 100644 --- a/programs/explorer/Makefile.in +++ b/programs/explorer/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = explorer.exe IMPORTS = rpcrt4 user32 gdi32 advapi32 DELAYIMPORTS = comctl32 shell32 oleaut32 ole32 shlwapi diff --git a/programs/explorer/appbar.c b/programs/explorer/appbar.c index 01dda7ec835..443927e30f1 100644 --- a/programs/explorer/appbar.c +++ b/programs/explorer/appbar.c @@ -223,7 +223,7 @@ static UINT_PTR handle_appbarmessage(DWORD msg, struct appbar_data_msg *abd) case ABM_WINDOWPOSCHANGED: return TRUE; default: - WINE_FIXME("SHAppBarMessage(%x) unimplemented\n", msg); + WINE_FIXME("SHAppBarMessage(%lx) unimplemented\n", msg); return FALSE; } } diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 6d577dd0fd1..400cc1d560e 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -84,7 +84,7 @@ static HRESULT load_typelib(void) hres = LoadRegTypeLib(&LIBID_SHDocVw, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); if (FAILED(hres)) { - ERR("LoadRegTypeLib failed: %08x\n", hres); + ERR("LoadRegTypeLib failed: %08lx\n", hres); return hres; }
@@ -107,7 +107,7 @@ static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo)
hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); if (FAILED(hres)) { - ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + ERR("GetTypeInfoOfGuid(%s) failed: %08lx\n", debugstr_guid(tid_ids[tid]), hres); return hres; }
@@ -467,7 +467,7 @@ static BOOL process_changes( const WCHAR *folder, char *buf ) break;
default: - WARN( "unexpected action %u\n", info->Action ); + WARN( "unexpected action %lu\n", info->Action ); break; } if (!info->NextEntryOffset) break; @@ -623,7 +623,7 @@ static WNDPROC desktop_orig_wndproc; /* window procedure for the desktop window */ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPARAM lp ) { - WINE_TRACE( "got msg %04x wp %lx lp %lx\n", message, wp, lp ); + WINE_TRACE( "got msg %04x wp %Ix lp %Ix\n", message, wp, lp );
switch(message) { @@ -852,7 +852,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) strcpy( error, "Make sure that your X server is running and that $DISPLAY is set correctly." ); break; default: - sprintf( error, "Unknown error (%u).", GetLastError() ); + sprintf( error, "Unknown error (%lu).", GetLastError() ); break; } name = next; @@ -897,7 +897,7 @@ static void initialize_display_settings(void) continue; }
- WINE_TRACE( "Device %s current display mode %ux%u %uBits %uHz at %d,%d.\n", + WINE_TRACE( "Device %s current display mode %lux%lu %luBits %luHz at %ld,%ld.\n", wine_dbgstr_w( ddW.DeviceName ), dmW.dmPelsWidth, dmW.dmPelsHeight, dmW.dmBitsPerPel, dmW.dmDisplayFrequency, dmW.u1.s2.dmPosition.x, dmW.u1.s2.dmPosition.y ); @@ -997,7 +997,7 @@ void manage_desktop( WCHAR *arg ) { if (!(desktop = CreateDesktopW( name, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ))) { - WINE_ERR( "failed to create desktop %s error %d\n", wine_dbgstr_w(name), GetLastError() ); + WINE_ERR( "failed to create desktop %s error %ld\n", wine_dbgstr_w(name), GetLastError() ); ExitProcess( 1 ); } SetThreadDesktop( desktop ); @@ -1122,7 +1122,7 @@ static HRESULT WINAPI shellwindows_GetTypeInfoCount(IShellWindows *iface, UINT * static HRESULT WINAPI shellwindows_GetTypeInfo(IShellWindows *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - TRACE("%d %d %p\n", iTInfo, lcid, ppTInfo); + TRACE("%d %ld %p\n", iTInfo, lcid, ppTInfo); return get_typeinfo(IShellWindows_tid, ppTInfo); }
@@ -1133,7 +1133,7 @@ static HRESULT WINAPI shellwindows_GetIDsOfNames(IShellWindows *iface, ITypeInfo *typeinfo; HRESULT hr;
- TRACE("%s %p %d %d %p\n", debugstr_guid(riid), rgszNames, cNames, + TRACE("%s %p %d %ld %p\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
if (!rgszNames || cNames == 0 || !rgDispId) @@ -1157,7 +1157,7 @@ static HRESULT WINAPI shellwindows_Invoke(IShellWindows *iface, ITypeInfo *typeinfo; HRESULT hr;
- TRACE("%d %s %d %08x %p %p %p %p\n", dispIdMember, debugstr_guid(riid), + TRACE("%ld %s %ld %08x %p %p %p %p\n", dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IShellWindows_tid, &typeinfo); @@ -1196,7 +1196,7 @@ static HRESULT WINAPI shellwindows_Register(IShellWindows *iface, struct shellwindows *sw = impl_from_IShellWindows(iface); struct window *window;
- TRACE("iface %p, disp %p, hwnd %#x, class %u, cookie %p.\n", iface, disp, hwnd, class, cookie); + TRACE("iface %p, disp %p, hwnd %#lx, class %u, cookie %p.\n", iface, disp, hwnd, class, cookie);
if (!hwnd) return E_POINTER; @@ -1225,7 +1225,7 @@ static HRESULT WINAPI shellwindows_Register(IShellWindows *iface, static HRESULT WINAPI shellwindows_RegisterPending(IShellWindows *iface, LONG threadid, VARIANT *loc, VARIANT *root, int class, LONG *cookie) { - FIXME("0x%x %s %s 0x%x %p\n", threadid, debugstr_variant(loc), debugstr_variant(root), + FIXME("0x%lx %s %s 0x%x %p\n", threadid, debugstr_variant(loc), debugstr_variant(root), class, cookie); return E_NOTIMPL; } @@ -1235,7 +1235,7 @@ static HRESULT WINAPI shellwindows_Revoke(IShellWindows *iface, LONG cookie) struct shellwindows *sw = impl_from_IShellWindows(iface); unsigned int i;
- TRACE("iface %p, cookie %u.\n", iface, cookie); + TRACE("iface %p, cookie %lu.\n", iface, cookie);
EnterCriticalSection(&sw->cs);
@@ -1259,7 +1259,7 @@ static HRESULT WINAPI shellwindows_OnNavigate(IShellWindows *iface, LONG cookie, struct shellwindows *sw = impl_from_IShellWindows(iface); unsigned int i;
- TRACE("iface %p, cookie %u, location %s.\n", iface, cookie, debugstr_variant(location)); + TRACE("iface %p, cookie %lu, location %s.\n", iface, cookie, debugstr_variant(location));
if (V_VT(location) != (VT_ARRAY | VT_UI1)) { @@ -1292,7 +1292,7 @@ static HRESULT WINAPI shellwindows_OnNavigate(IShellWindows *iface, LONG cookie,
static HRESULT WINAPI shellwindows_OnActivated(IShellWindows *iface, LONG cookie, VARIANT_BOOL active) { - FIXME("0x%x 0x%x\n", cookie, active); + FIXME("0x%lx 0x%x\n", cookie, active); return E_NOTIMPL; }
@@ -1343,7 +1343,7 @@ static HRESULT WINAPI shellwindows_FindWindowSW(IShellWindows *iface, VARIANT *l
static HRESULT WINAPI shellwindows_OnCreated(IShellWindows *iface, LONG cookie, IUnknown *punk) { - FIXME("0x%x %p\n", cookie, punk); + FIXME("0x%lx %p\n", cookie, punk); return E_NOTIMPL; }
@@ -1497,7 +1497,7 @@ static HRESULT WINAPI webbrowser_GetTypeInfo(IWebBrowser2 *iface, UINT iTInfo, L LPTYPEINFO *ppTInfo) { struct shellbrowserwindow *This = impl_from_IWebBrowser2(iface); - TRACE("(%p)->(%d %d %p)\n", This, iTInfo, lcid, ppTInfo); + TRACE("(%p)->(%d %ld %p)\n", This, iTInfo, lcid, ppTInfo); return get_typeinfo(IWebBrowser2_tid, ppTInfo); }
@@ -1509,7 +1509,7 @@ static HRESULT WINAPI webbrowser_GetIDsOfNames(IWebBrowser2 *iface, REFIID riid, ITypeInfo *typeinfo; HRESULT hr;
- TRACE("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + TRACE("(%p)->(%s %p %d %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
if(!rgszNames || cNames == 0 || !rgDispId) @@ -1534,7 +1534,7 @@ static HRESULT WINAPI webbrowser_Invoke(IWebBrowser2 *iface, DISPID dispIdMember ITypeInfo *typeinfo; HRESULT hr;
- TRACE("(%p)->(%d %s %d %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("(%p)->(%ld %s %ld %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
hr = get_typeinfo(IWebBrowser2_tid, &typeinfo); @@ -1666,7 +1666,7 @@ static HRESULT WINAPI webbrowser_get_Left(IWebBrowser2 *iface, LONG *pl) static HRESULT WINAPI webbrowser_put_Left(IWebBrowser2 *iface, LONG Left) { struct shellbrowserwindow *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%d)\n", This, Left); + FIXME("(%p)->(%ld)\n", This, Left); return E_NOTIMPL; }
@@ -1680,7 +1680,7 @@ static HRESULT WINAPI webbrowser_get_Top(IWebBrowser2 *iface, LONG *pl) static HRESULT WINAPI webbrowser_put_Top(IWebBrowser2 *iface, LONG Top) { struct shellbrowserwindow *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%d)\n", This, Top); + FIXME("(%p)->(%ld)\n", This, Top); return E_NOTIMPL; }
@@ -1694,7 +1694,7 @@ static HRESULT WINAPI webbrowser_get_Width(IWebBrowser2 *iface, LONG *pl) static HRESULT WINAPI webbrowser_put_Width(IWebBrowser2 *iface, LONG Width) { struct shellbrowserwindow *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%d)\n", This, Width); + FIXME("(%p)->(%ld)\n", This, Width); return E_NOTIMPL; }
@@ -1708,7 +1708,7 @@ static HRESULT WINAPI webbrowser_get_Height(IWebBrowser2 *iface, LONG *pl) static HRESULT WINAPI webbrowser_put_Height(IWebBrowser2 *iface, LONG Height) { struct shellbrowserwindow *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%d)\n", This, Height); + FIXME("(%p)->(%ld)\n", This, Height); return E_NOTIMPL; }
@@ -2223,7 +2223,7 @@ static HRESULT WINAPI shellbrowser_BrowseObject(IShellBrowser *iface, LPCITEMIDL
static HRESULT WINAPI shellbrowser_GetViewStateStream(IShellBrowser *iface, DWORD mode, IStream **stream) { - FIXME("0x%x %p\n", mode, stream); + FIXME("0x%lx %p\n", mode, stream); return E_NOTIMPL; }
@@ -2236,7 +2236,7 @@ static HRESULT WINAPI shellbrowser_GetControlWindow(IShellBrowser *iface, UINT i static HRESULT WINAPI shellbrowser_SendControlMsg(IShellBrowser *iface, UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *pret) { - FIXME("%d %d %lx %lx %p\n", id, uMsg, wParam, lParam, pret); + FIXME("%d %d %Ix %Ix %p\n", id, uMsg, wParam, lParam, pret); return E_NOTIMPL; }
@@ -2314,5 +2314,5 @@ static void shellwindows_init(void) &shellwindows_classfactory.classreg);
if (FAILED(hr)) - WARN("Failed to register ShellWindows object: %08x\n", hr); + WARN("Failed to register ShellWindows object: %08lx\n", hr); } diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 8fa732d6c1a..c2f5e74afae 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -421,7 +421,7 @@ static void make_explorer_window(parameters_struct *params) V_VT(&empty_var) = VT_EMPTY; if (IShellWindows_FindWindowSW(sw, &var, &empty_var, SWC_EXPLORER, &hwnd, 0, &dispatch) == S_OK) { - TRACE("Found window %#x already browsing path %s.\n", hwnd, debugstr_w(path)); + TRACE("Found window %#lx already browsing path %s.\n", hwnd, debugstr_w(path)); SetForegroundWindow((HWND)(LONG_PTR)hwnd); IShellWindows_Release(sw); return; @@ -665,7 +665,7 @@ static LRESULT CALLBACK explorer_wnd_proc(HWND hwnd, UINT uMsg, WPARAM wParam, L = (explorer_info*)GetWindowLongPtrW(hwnd,EXPLORER_INFO_INDEX); IExplorerBrowser *browser = NULL;
- WINE_TRACE("(hwnd=%p,uMsg=%u,wParam=%lx,lParam=%lx)\n",hwnd,uMsg,wParam,lParam); + WINE_TRACE("(hwnd=%p,uMsg=%u,wParam=%Ix,lParam=%Ix)\n",hwnd,uMsg,wParam,lParam); if(info) browser = info->browser; switch(uMsg) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 0c978451151..5b7216b2904 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -594,7 +594,7 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) } break; default: - WINE_FIXME("unhandled tray message: %ld\n", cds->dwData); + WINE_FIXME("unhandled tray message: %Id\n", cds->dwData); break; }
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- 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);
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- 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; }
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- 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);
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- 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;
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- 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,
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- 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; }
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/presentationfontcache/Makefile.in | 1 - programs/presentationfontcache/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/programs/presentationfontcache/Makefile.in b/programs/presentationfontcache/Makefile.in index 34e8ca96d46..412523e1048 100644 --- a/programs/presentationfontcache/Makefile.in +++ b/programs/presentationfontcache/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = presentationfontcache.exe IMPORTS = advapi32
diff --git a/programs/presentationfontcache/main.c b/programs/presentationfontcache/main.c index ab2d0e21061..c3f9a98a2b4 100644 --- a/programs/presentationfontcache/main.c +++ b/programs/presentationfontcache/main.c @@ -51,7 +51,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;
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/regedit/Makefile.in | 1 - programs/regedit/edit.c | 2 +- programs/regedit/framewnd.c | 2 +- programs/regedit/main.c | 2 +- programs/regedit/regedit.c | 6 +++--- 5 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in index d53a1c5ccfc..9f8fb5af165 100644 --- a/programs/regedit/Makefile.in +++ b/programs/regedit/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = regedit.exe IMPORTS = advapi32 DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32 diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 13f2256b2cb..3f99626dd23 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -288,7 +288,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_DWORD), hwnd, modify_dlgproc) == IDOK) { DWORD val; CHAR* valueA = GetMultiByteString(stringValueData); - if (sscanf(valueA, isDecimal ? "%u" : "%x", &val)) { + if (sscanf(valueA, isDecimal ? "%lu" : "%lx", &val)) { lRet = RegSetValueExW(hKey, valueName, 0, type, (BYTE*)&val, sizeof(val)); if (lRet == ERROR_SUCCESS) result = TRUE; else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED); diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index bb843a89af4..7a1507bb54e 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -220,7 +220,7 @@ static int add_favourite_key_items(HMENU hMenu, HWND hList) &max_value_len, NULL, NULL, NULL); if (rc != ERROR_SUCCESS) { - ERR("RegQueryInfoKey failed: %d\n", rc); + ERR("RegQueryInfoKey failed: %ld\n", rc); goto exit; }
diff --git a/programs/regedit/main.c b/programs/regedit/main.c index d9f81218acb..e0f89255461 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -167,7 +167,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi GetExitCodeProcess( pi.hProcess, &exit_code ); ExitProcess( exit_code ); } - else WINE_ERR( "failed to restart 64-bit %s, err %d\n", wine_dbgstr_w(filename), GetLastError() ); + else WINE_ERR( "failed to restart 64-bit %s, err %ld\n", wine_dbgstr_w(filename), GetLastError() ); Wow64RevertWow64FsRedirection( redir ); }
diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index c60d1ddb9b6..d2e27340300 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -59,7 +59,7 @@ static void output_formatstring(const WCHAR *fmt, va_list va_args) fmt, 0, 0, (WCHAR *)&str, 0, &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; } output_writeconsole(str, len); @@ -73,7 +73,7 @@ void WINAPIV output_message(unsigned int 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; } va_start(va_args, id); @@ -88,7 +88,7 @@ void WINAPIV error_exit(unsigned int id, ...)
if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) { - WINE_FIXME("LoadString failed with %u\n", GetLastError()); + WINE_FIXME("LoadString failed with %lu\n", GetLastError()); return; } va_start(va_args, id);
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/reg/Makefile.in | 1 - programs/reg/import.c | 2 +- programs/reg/reg.c | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index 635ac7751a4..d7e4e4b65ce 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = reg.exe IMPORTS = advapi32 DELAYIMPORTS = user32 diff --git a/programs/reg/import.c b/programs/reg/import.c index 36d148ca395..6da0148ba3e 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -838,7 +838,7 @@ invalid: /* handler for parser UNKNOWN_DATA state */ static WCHAR *unknown_data_state(struct parser *parser, WCHAR *pos) { - FIXME("Unknown registry data type [0x%x]\n", parser->data_type); + FIXME("Unknown registry data type [0x%lx]\n", parser->data_type);
set_state(parser, LINE_START); return pos; diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 1af63498b05..16c05f958c7 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -81,7 +81,7 @@ static void output_formatstring(const WCHAR *fmt, va_list va_args) fmt, 0, 0, (WCHAR *)&str, 0, &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; } output_writeconsole(str, len); @@ -96,7 +96,7 @@ void WINAPIV output_message(unsigned int id, ...)
if (!(len = LoadStringW(GetModuleHandleW(NULL), id, (WCHAR *)&fmt, 0))) { - WINE_FIXME("LoadString failed with %d\n", GetLastError()); + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); return; }
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- 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);
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- 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; }
-
Eric Pouech