some more conversions to long types in programs/ A+ ---
Eric Pouech (24): programs/sc: enable compilation with long types programs/services: enable compilation with long types programs/spoolsv: enable compilation with long types programs/start: enable compilation with long types programs/svchost: enable compilation with long types programs/termsv: enable compilation with long types programs/uninstaller: enable compilation with long types programs/whoami: enable compilation with long types programs/wineboot: enable compilation with long types programs/winebrowser: enable compilation with long types programs/winecfg: enable compilation with long types programs/wineconsole: enable compilation with long types programs/winedbg: enable compilation with long types programs/winedevice: enable compilation with long types programs/winemenubuilder: enable compilation with long types programs/winemsibuilder: enable compilation with long types programs/winetest: enable compilation with long types programs/winhlp32: enable compilation with long types programs/winmgmt: enable compilation with long types programs/winoldap.mod16: enable compilation with long types programs/wordpad: enable compilation with long types programs/wuauserv: enable compilation with long types programs/wusa: enable compilation with long types programs/xcopy: enable compilation with long types
programs/sc/Makefile.in | 1 - programs/sc/sc.c | 22 +++---- programs/services/Makefile.in | 1 - programs/services/rpc.c | 48 +++++++-------- programs/services/services.c | 24 ++++---- programs/services/utils.c | 6 +- programs/spoolsv/Makefile.in | 1 - programs/spoolsv/main.c | 2 +- programs/start/Makefile.in | 1 - programs/start/start.c | 4 +- programs/svchost/Makefile.in | 1 - programs/svchost/svchost.c | 14 ++--- programs/termsv/Makefile.in | 1 - programs/termsv/main.c | 2 +- programs/uninstaller/Makefile.in | 1 - programs/uninstaller/main.c | 8 +-- programs/whoami/Makefile.in | 1 - programs/whoami/main.c | 4 +- programs/wineboot/Makefile.in | 1 - programs/wineboot/shutdown.c | 12 ++-- programs/wineboot/wineboot.c | 38 ++++++------ programs/winebrowser/Makefile.in | 1 - programs/winebrowser/main.c | 6 +- programs/winecfg/Makefile.in | 1 - programs/winecfg/audio.c | 8 +-- programs/winecfg/drive.c | 14 ++--- programs/winecfg/driveui.c | 4 +- programs/winecfg/main.c | 2 +- programs/winecfg/winecfg.c | 14 ++--- programs/winecfg/x11drvdlg.c | 2 +- programs/wineconsole/Makefile.in | 1 - programs/wineconsole/wineconsole.c | 4 +- programs/winedbg/Makefile.in | 1 - programs/winedbg/be_i386.c | 12 ++-- programs/winedbg/be_x86_64.c | 6 +- programs/winedbg/dbg.y | 2 +- programs/winedbg/gdbproxy.c | 52 ++++++++-------- programs/winedbg/info.c | 26 ++++---- programs/winedbg/memory.c | 10 +-- programs/winedbg/stack.c | 12 ++-- programs/winedbg/symbol.c | 2 +- programs/winedbg/tgt_active.c | 44 ++++++------- programs/winedbg/tgt_minidump.c | 4 +- programs/winedbg/types.c | 22 +++---- programs/winedbg/winedbg.c | 10 +-- programs/winedevice/Makefile.in | 1 - programs/winedevice/device.c | 4 +- programs/winemenubuilder/Makefile.in | 1 - programs/winemenubuilder/winemenubuilder.c | 72 +++++++++++----------- programs/winemsibuilder/Makefile.in | 1 - programs/winemsibuilder/main.c | 6 +- programs/winetest/Makefile.in | 1 - programs/winetest/main.c | 6 +- programs/winhlp32/Makefile.in | 1 - programs/winhlp32/hlpfile.c | 38 ++++++------ programs/winhlp32/macro.c | 52 ++++++++-------- programs/winhlp32/winhelp.c | 6 +- programs/winmgmt/Makefile.in | 1 - programs/winmgmt/main.c | 2 +- programs/winoldap.mod16/Makefile.in | 1 - programs/winoldap.mod16/winoldap.c | 2 +- programs/wordpad/Makefile.in | 1 - programs/wordpad/olecallback.c | 8 +-- programs/wordpad/wordpad.c | 6 +- programs/wuauserv/Makefile.in | 1 - programs/wuauserv/main.c | 2 +- programs/wusa/Makefile.in | 1 - programs/wusa/main.c | 2 +- programs/xcopy/Makefile.in | 1 - programs/xcopy/xcopy.c | 14 ++--- 70 files changed, 330 insertions(+), 354 deletions(-)
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/sc/Makefile.in | 1 - programs/sc/sc.c | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/programs/sc/Makefile.in b/programs/sc/Makefile.in index 8d6c4ca4e1b..4ee6b86bdc7 100644 --- a/programs/sc/Makefile.in +++ b/programs/sc/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sc.exe IMPORTS = advapi32
diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 02b476957d6..6cf27d93ac2 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -220,7 +220,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) CloseServiceHandle( service ); ret = TRUE; } - else WINE_TRACE("failed to create service %u\n", GetLastError()); + else WINE_TRACE("failed to create service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"description" )) { @@ -230,10 +230,10 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) SERVICE_DESCRIPTIONW sd; sd.lpDescription = argc > 3 ? (WCHAR *)argv[3] : NULL; ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_DESCRIPTION, &sd ); - if (!ret) WINE_TRACE("failed to set service description %u\n", GetLastError()); + if (!ret) WINE_TRACE("failed to set service description %lu\n", GetLastError()); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %u\n", GetLastError()); + else WINE_TRACE("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"failure" )) { @@ -244,14 +244,14 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (parse_failure_params( argc - 3, argv + 3, &sfa )) { ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_FAILURE_ACTIONS, &sfa ); - if (!ret) WINE_TRACE("failed to set service failure actions %u\n", GetLastError()); + if (!ret) WINE_TRACE("failed to set service failure actions %lu\n", GetLastError()); HeapFree( GetProcessHeap(), 0, sfa.lpsaActions ); } else WINE_WARN("failed to parse failure parameters\n"); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %u\n", GetLastError()); + else WINE_TRACE("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"delete" )) { @@ -259,10 +259,10 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (service) { ret = DeleteService( service ); - if (!ret) WINE_TRACE("failed to delete service %u\n", GetLastError()); + if (!ret) WINE_TRACE("failed to delete service %lu\n", GetLastError()); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %u\n", GetLastError()); + else WINE_TRACE("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"start" )) { @@ -270,10 +270,10 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (service) { ret = StartServiceW( service, argc - 3, argv + 3 ); - if (!ret) WINE_TRACE("failed to start service %u\n", GetLastError()); + if (!ret) WINE_TRACE("failed to start service %lu\n", GetLastError()); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %u\n", GetLastError()); + else WINE_TRACE("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"stop" )) { @@ -281,10 +281,10 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) if (service) { ret = ControlService( service, SERVICE_CONTROL_STOP, &status ); - if (!ret) WINE_TRACE("failed to stop service %u\n", GetLastError()); + if (!ret) WINE_TRACE("failed to stop service %lu\n", GetLastError()); CloseServiceHandle( service ); } - else WINE_TRACE("failed to open service %u\n", GetLastError()); + else WINE_TRACE("failed to open service %lu\n", GetLastError()); } else if (!wcsicmp( argv[1], L"sdset" )) {
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/services/Makefile.in | 1 - programs/services/rpc.c | 48 +++++++++++++++++++++-------------------- programs/services/services.c | 24 ++++++++++----------- programs/services/utils.c | 6 +++-- 4 files changed, 39 insertions(+), 40 deletions(-)
diff --git a/programs/services/Makefile.in b/programs/services/Makefile.in index 4e15c4c18ca..31e77c49082 100644 --- a/programs/services/Makefile.in +++ b/programs/services/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = services.exe IMPORTS = rpcrt4 advapi32 userenv setupapi
diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 0f0a83df421..7e09abaab12 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -222,13 +222,13 @@ static DWORD validate_context_handle(SC_RPC_HANDLE handle, DWORD type, DWORD nee
if (type != SC_HTYPE_DONT_CARE && hdr->type != type) { - WINE_ERR("Handle is of an invalid type (%d, %d)\n", hdr->type, type); + WINE_ERR("Handle is of an invalid type (%d, %ld)\n", hdr->type, type); return ERROR_INVALID_HANDLE; }
if ((needed_access & hdr->access) != needed_access) { - WINE_ERR("Access denied - handle created with access %x, needed %x\n", hdr->access, needed_access); + WINE_ERR("Access denied - handle created with access %lx, needed %lx\n", hdr->access, needed_access); return ERROR_ACCESS_DENIED; }
@@ -271,7 +271,7 @@ DWORD __cdecl svcctl_OpenSCManagerW( { struct sc_manager_handle *manager;
- WINE_TRACE("(%s, %s, %x)\n", wine_dbgstr_w(MachineName), wine_dbgstr_w(DatabaseName), dwAccessMask); + WINE_TRACE("(%s, %s, %lx)\n", wine_dbgstr_w(MachineName), wine_dbgstr_w(DatabaseName), dwAccessMask);
if (DatabaseName != NULL && DatabaseName[0]) { @@ -338,7 +338,7 @@ DWORD __cdecl svcctl_GetServiceDisplayNameW( struct service_entry *entry; DWORD err;
- WINE_TRACE("(%s, %d)\n", wine_dbgstr_w(lpServiceName), *cchBufSize); + WINE_TRACE("(%s, %ld)\n", wine_dbgstr_w(lpServiceName), *cchBufSize);
if ((err = validate_scm_handle(hSCManager, 0, &manager)) != ERROR_SUCCESS) return err; @@ -382,7 +382,7 @@ DWORD __cdecl svcctl_GetServiceKeyNameW( struct sc_manager_handle *manager; DWORD err;
- WINE_TRACE("(%s, %d)\n", wine_dbgstr_w(lpServiceDisplayName), *cchBufSize); + WINE_TRACE("(%s, %ld)\n", wine_dbgstr_w(lpServiceDisplayName), *cchBufSize);
if ((err = validate_scm_handle(hSCManager, 0, &manager)) != ERROR_SUCCESS) return err; @@ -452,7 +452,7 @@ DWORD __cdecl svcctl_OpenServiceW( struct service_entry *entry; DWORD err;
- WINE_TRACE("(%s, 0x%x)\n", wine_dbgstr_w(lpServiceName), dwDesiredAccess); + WINE_TRACE("(%s, 0x%lx)\n", wine_dbgstr_w(lpServiceName), dwDesiredAccess);
if ((err = validate_scm_handle(hSCManager, 0, &manager)) != ERROR_SUCCESS) return err; @@ -564,7 +564,7 @@ static DWORD create_serviceW( struct sc_manager_handle *manager; DWORD err;
- WINE_TRACE("(%s, %s, 0x%x, %s)\n", wine_dbgstr_w(lpServiceName), wine_dbgstr_w(lpDisplayName), dwDesiredAccess, wine_dbgstr_w(lpBinaryPathName)); + WINE_TRACE("(%s, %s, 0x%lx, %s)\n", wine_dbgstr_w(lpServiceName), wine_dbgstr_w(lpDisplayName), dwDesiredAccess, wine_dbgstr_w(lpBinaryPathName));
if ((err = validate_scm_handle(hSCManager, SC_MANAGER_CREATE_SERVICE, &manager)) != ERROR_SUCCESS) return err; @@ -657,7 +657,7 @@ DWORD __cdecl svcctl_CreateServiceW( DWORD dwPasswordSize, SC_RPC_HANDLE *phService) { - WINE_TRACE("(%s, %s, 0x%x, %s)\n", wine_dbgstr_w(lpServiceName), wine_dbgstr_w(lpDisplayName), dwDesiredAccess, wine_dbgstr_w(lpBinaryPathName)); + WINE_TRACE("(%s, %s, 0x%lx, %s)\n", wine_dbgstr_w(lpServiceName), wine_dbgstr_w(lpDisplayName), dwDesiredAccess, wine_dbgstr_w(lpBinaryPathName)); return create_serviceW(hSCManager, lpServiceName, lpDisplayName, dwDesiredAccess, dwServiceType, dwStartType, dwErrorControl, lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, lpDependencies, dwDependenciesSize, lpServiceStartName, lpPassword, dwPasswordSize, phService, FALSE); @@ -950,13 +950,13 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, SC_RPC_CONFI } break; case SERVICE_CONFIG_FAILURE_ACTIONS: - WINE_FIXME( "SERVICE_CONFIG_FAILURE_ACTIONS not implemented: period %u msg %s cmd %s\n", + WINE_FIXME( "SERVICE_CONFIG_FAILURE_ACTIONS not implemented: period %lu msg %s cmd %s\n", config.actions->dwResetPeriod, wine_dbgstr_w(config.actions->lpRebootMsg), wine_dbgstr_w(config.actions->lpCommand) ); break; case SERVICE_CONFIG_PRESHUTDOWN_INFO: - WINE_TRACE( "changing service %p preshutdown timeout to %d\n", + WINE_TRACE( "changing service %p preshutdown timeout to %ld\n", service, config.preshutdown->dwPreshutdownTimeout ); service_lock( service->service_entry ); service->service_entry->preshutdown_timeout = config.preshutdown->dwPreshutdownTimeout; @@ -964,7 +964,7 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, SC_RPC_CONFI service_unlock( service->service_entry ); break; default: - WINE_FIXME("level %u not implemented\n", config.dwInfoLevel); + WINE_FIXME("level %lu not implemented\n", config.dwInfoLevel); err = ERROR_INVALID_LEVEL; break; } @@ -1025,7 +1025,7 @@ DWORD __cdecl svcctl_QueryServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, break;
default: - WINE_FIXME("level %u not implemented\n", level); + WINE_FIXME("level %lu not implemented\n", level); err = ERROR_INVALID_LEVEL; break; } @@ -1168,7 +1168,7 @@ static BOOL process_send_command(struct process_entry *process, const void *data if (!r || count != sizeof *result) { WINE_ERR("service protocol error - failed to read pipe " - "r = %d count = %d!\n", r, count); + "r = %d count = %ld!\n", r, count); *result = (!r ? GetLastError() : ERROR_READ_FAULT); return FALSE; } @@ -1218,7 +1218,7 @@ DWORD __cdecl svcctl_StartServiceW( struct sc_service_handle *service; DWORD err;
- WINE_TRACE("(%p, %d, %p)\n", hService, dwNumServiceArgs, lpServiceArgVectors); + WINE_TRACE("(%p, %ld, %p)\n", hService, dwNumServiceArgs, lpServiceArgVectors);
if ((err = validate_service_handle(hService, SERVICE_START, &service)) != 0) return err; @@ -1246,7 +1246,7 @@ DWORD __cdecl svcctl_ControlService( BOOL shared_process; DWORD result;
- WINE_TRACE("(%p, %d, %p)\n", hService, dwControl, lpServiceStatus); + WINE_TRACE("(%p, %ld, %p)\n", hService, dwControl, lpServiceStatus);
switch (dwControl) { @@ -1399,7 +1399,7 @@ static BOOL map_state(DWORD state, DWORD mask) if (SERVICE_INACTIVE & mask) return TRUE; break; default: - WINE_ERR("unknown state %u\n", state); + WINE_ERR("unknown state %lu\n", state); break; } return FALSE; @@ -1420,7 +1420,7 @@ DWORD __cdecl svcctl_EnumServicesStatusW( struct service_entry *service; struct enum_service_status *s;
- WINE_TRACE("(%p, 0x%x, 0x%x, %p, %u, %p, %p, %p)\n", hmngr, type, state, buffer, size, needed, returned, resume); + WINE_TRACE("(%p, 0x%lx, 0x%lx, %p, %lu, %p, %p, %p)\n", hmngr, type, state, buffer, size, needed, returned, resume);
if (!type || !state) return ERROR_INVALID_PARAMETER; @@ -1536,7 +1536,7 @@ DWORD __cdecl svcctl_EnumServicesStatusExW( struct service_entry *service; struct enum_service_status_process *s;
- WINE_TRACE("(%p, 0x%x, 0x%x, %p, %u, %p, %p, %s)\n", hmngr, type, state, buffer, size, + WINE_TRACE("(%p, 0x%lx, 0x%lx, %p, %lu, %p, %p, %s)\n", hmngr, type, state, buffer, size, needed, returned, wine_dbgstr_w(group));
if (resume_handle) @@ -1654,7 +1654,7 @@ DWORD __cdecl svcctl_CreateServiceWOW64W( DWORD password_size, SC_RPC_HANDLE *service) { - WINE_TRACE("(%s, %s, 0x%x, %s)\n", wine_dbgstr_w(servicename), wine_dbgstr_w(displayname), accessmask, wine_dbgstr_w(imagepath)); + WINE_TRACE("(%s, %s, 0x%lx, %s)\n", wine_dbgstr_w(servicename), wine_dbgstr_w(displayname), accessmask, wine_dbgstr_w(imagepath)); return create_serviceW(scmanager, servicename, displayname, accessmask, service_type, start_type, error_control, imagepath, loadordergroup, tagid, dependencies, depend_size, start_name, password, password_size, service, TRUE); } @@ -1679,7 +1679,7 @@ DWORD __cdecl svcctl_NotifyServiceStatusChange( struct sc_notify_handle *notify; struct sc_handle *hdr = handle;
- WINE_TRACE("(%p, NotifyMask: 0x%x, %p, %p, %p, %p)\n", handle, + WINE_TRACE("(%p, NotifyMask: 0x%lx, %p, %p, %p, %p)\n", handle, params.params->dwNotifyMask, clientprocessguid, scmprocessguid, createremotequeue, hNotify);
@@ -2111,25 +2111,25 @@ DWORD RPC_Init(void)
if (!(cleanup_group = CreateThreadpoolCleanupGroup())) { - WINE_ERR("CreateThreadpoolCleanupGroup failed with error %u\n", GetLastError()); + WINE_ERR("CreateThreadpoolCleanupGroup failed with error %lu\n", GetLastError()); return GetLastError(); }
if ((err = RpcServerUseProtseqEpW(transport, 0, endpoint, NULL)) != ERROR_SUCCESS) { - WINE_ERR("RpcServerUseProtseq failed with error %u\n", err); + WINE_ERR("RpcServerUseProtseq failed with error %lu\n", err); return err; }
if ((err = RpcServerRegisterIf(svcctl_v2_0_s_ifspec, 0, 0)) != ERROR_SUCCESS) { - WINE_ERR("RpcServerRegisterIf failed with error %u\n", err); + WINE_ERR("RpcServerRegisterIf failed with error %lu\n", err); return err; }
if ((err = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE)) != ERROR_SUCCESS) { - WINE_ERR("RpcServerListen failed with error %u\n", err); + WINE_ERR("RpcServerListen failed with error %lu\n", err); return err; }
diff --git a/programs/services/services.c b/programs/services/services.c index d969cf81ab9..87ab319367b 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -371,7 +371,7 @@ static void CALLBACK delayed_autostart_callback(TP_CALLBACK_INSTANCE *instance, TRACE("Starting delayed auto-start service %s\n", debugstr_w(service->name)); err = service_start(service, 0, NULL); if (err != ERROR_SUCCESS) - FIXME("Delayed auto-start service %s failed to start: %d\n", + FIXME("Delayed auto-start service %s failed to start: %ld\n", wine_dbgstr_w(service->name), err); } release_service(service); @@ -394,7 +394,7 @@ static BOOL schedule_delayed_autostart(struct service_entry **services, unsigned
if (!(delayed_autostart_cleanup = CreateThreadpoolCleanupGroup())) { - ERR("CreateThreadpoolCleanupGroup failed with error %u\n", GetLastError()); + ERR("CreateThreadpoolCleanupGroup failed with error %lu\n", GetLastError()); return FALSE; }
@@ -413,7 +413,7 @@ static BOOL schedule_delayed_autostart(struct service_entry **services, unsigned
if (!(timer = CreateThreadpoolTimer(delayed_autostart_callback, params, &environment))) { - ERR("CreateThreadpoolWait failed: %u\n", GetLastError()); + ERR("CreateThreadpoolWait failed: %lu\n", GetLastError()); heap_free(params); return FALSE; } @@ -456,7 +456,7 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) return;
if ((set = SetupDiGetClassDevsW( NULL, rootW, NULL, DIGCF_ALLCLASSES )) == INVALID_HANDLE_VALUE) - WINE_ERR("Failed to enumerate devices, error %#x.\n", GetLastError()); + WINE_ERR("Failed to enumerate devices, error %#lx.\n", GetLastError());
scmdatabase_lock(db);
@@ -497,7 +497,7 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) } err = service_start(service, 0, NULL); if (err != ERROR_SUCCESS) - WINE_FIXME("Auto-start service %s failed to start: %d\n", + WINE_FIXME("Auto-start service %s failed to start: %ld\n", wine_dbgstr_w(service->name), err); release_service(service); } @@ -563,7 +563,7 @@ BOOL validate_service_config(struct service_entry *entry) } break; default: - WINE_ERR("Service %s has an unknown service type (0x%x)\n", wine_dbgstr_w(entry->name), entry->config.dwServiceType); + WINE_ERR("Service %s has an unknown service type (0x%lx)\n", wine_dbgstr_w(entry->name), entry->config.dwServiceType); return FALSE; }
@@ -704,7 +704,7 @@ static DWORD scmdatabase_load_services(struct scmdatabase *db)
if (err != 0) { - WINE_ERR("Error %d reading key %d name - skipping\n", err, i); + WINE_ERR("Error %ld reading key %d name - skipping\n", err, i); continue; }
@@ -722,7 +722,7 @@ static DWORD scmdatabase_load_services(struct scmdatabase *db)
if (err != ERROR_SUCCESS) { - WINE_ERR("Error %d reading registry key for service %s - skipping\n", err, wine_dbgstr_w(szName)); + WINE_ERR("Error %ld reading registry key for service %s - skipping\n", err, wine_dbgstr_w(szName)); free_service_entry(entry); continue; } @@ -1054,7 +1054,7 @@ found:
if ((err = process_create(service_get_pipe_name(), &process))) { - WINE_ERR("failed to create process object for %s, error = %u\n", + WINE_ERR("failed to create process object for %s, error = %lu\n", wine_dbgstr_w(service_entry->name), err); service_unlock(service_entry); HeapFree(GetProcessHeap(), 0, path); @@ -1139,7 +1139,7 @@ static DWORD process_send_start_message(struct process_entry *process, BOOL shar DWORD i, len, result; WCHAR *str, *p;
- WINE_TRACE("%p %s %p %d\n", process, wine_dbgstr_w(name), argv, argc); + WINE_TRACE("%p %s %p %ld\n", process, wine_dbgstr_w(name), argv, argc);
overlapped.hEvent = process->overlapped_event; if (!ConnectNamedPipe(process->control_pipe, &overlapped)) @@ -1221,7 +1221,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * release_process(process); }
- WINE_TRACE("returning %d\n", err); + WINE_TRACE("returning %ld\n", err); return err; }
@@ -1319,6 +1319,6 @@ int __cdecl main(int argc, char *argv[]) if (environment) DestroyEnvironmentBlock(environment);
- WINE_TRACE("services.exe exited with code %d\n", err); + WINE_TRACE("services.exe exited with code %ld\n", err); return err; } diff --git a/programs/services/utils.c b/programs/services/utils.c index f787990da42..357217b4926 100644 --- a/programs/services/utils.c +++ b/programs/services/utils.c @@ -96,7 +96,7 @@ DWORD load_reg_string(HKEY hKey, LPCWSTR szValue, BOOL bExpand, LPWSTR *output) return ERROR_SUCCESS;
failed: - WINE_ERR("Error %d while reading value %s\n", err, wine_dbgstr_w(szValue)); + WINE_ERR("Error %ld while reading value %s\n", err, wine_dbgstr_w(szValue)); HeapFree(GetProcessHeap(), 0, buf); return err; } @@ -131,7 +131,7 @@ DWORD load_reg_multisz(HKEY hKey, LPCWSTR szValue, BOOL bAllowSingle, LPWSTR *ou return ERROR_SUCCESS;
failed: - WINE_ERR("Error %d while reading value %s\n", err, wine_dbgstr_w(szValue)); + WINE_ERR("Error %ld while reading value %s\n", err, wine_dbgstr_w(szValue)); HeapFree(GetProcessHeap(), 0, buf); return err; } @@ -157,6 +157,6 @@ DWORD load_reg_dword(HKEY hKey, LPCWSTR szValue, DWORD *output) return ERROR_SUCCESS;
failed: - WINE_ERR("Error %d while reading value %s\n", err, wine_dbgstr_w(szValue)); + WINE_ERR("Error %ld while reading value %s\n", err, wine_dbgstr_w(szValue)); return err; }
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/spoolsv/Makefile.in | 1 - programs/spoolsv/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/programs/spoolsv/Makefile.in b/programs/spoolsv/Makefile.in index 04c8a5cbeee..5046a9c0861 100644 --- a/programs/spoolsv/Makefile.in +++ b/programs/spoolsv/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = spoolsv.exe IMPORTS = advapi32
diff --git a/programs/spoolsv/main.c b/programs/spoolsv/main.c index 2893fa614a1..3640ccee754 100644 --- a/programs/spoolsv/main.c +++ b/programs/spoolsv/main.c @@ -52,7 +52,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/start/Makefile.in | 1 - programs/start/start.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in index 7dfdd55b794..04bc38808bf 100644 --- a/programs/start/Makefile.in +++ b/programs/start/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = start.exe IMPORTS = shell32 user32
diff --git a/programs/start/start.c b/programs/start/start.c index b5bf8187603..998c439423e 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -98,7 +98,7 @@ static void fatal_string_error(int which, DWORD error_code, const WCHAR *filenam WCHAR msg[2048];
if (!LoadStringW(GetModuleHandleW(NULL), which, msg, ARRAY_SIZE(msg))) - WINE_ERR("LoadString failed, error %d\n", GetLastError()); + WINE_ERR("LoadString failed, error %ld\n", GetLastError());
fatal_error(msg, error_code, filename); } @@ -108,7 +108,7 @@ static void fatal_string(int which) WCHAR msg[2048];
if (!LoadStringW(GetModuleHandleW(NULL), which, msg, ARRAY_SIZE(msg))) - WINE_ERR("LoadString failed, error %d\n", GetLastError()); + WINE_ERR("LoadString failed, error %ld\n", GetLastError());
output(msg); ExitProcess(1);
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/svchost/Makefile.in | 1 - programs/svchost/svchost.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/programs/svchost/Makefile.in b/programs/svchost/Makefile.in index 969a31da11e..f31e393c8af 100644 --- a/programs/svchost/Makefile.in +++ b/programs/svchost/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = svchost.exe IMPORTS = advapi32
diff --git a/programs/svchost/svchost.c b/programs/svchost/svchost.c index 603deef1abd..618147a55c4 100644 --- a/programs/svchost/svchost.c +++ b/programs/svchost/svchost.c @@ -86,7 +86,7 @@ static LPWSTR ExpandEnv(LPWSTR string) size = ExpandEnvironmentStringsW(string, NULL, size); if (size == 0) { - WINE_ERR("cannot expand env vars in %s: %u\n", + WINE_ERR("cannot expand env vars in %s: %lu\n", wine_dbgstr_w(string), GetLastError()); return NULL; } @@ -94,7 +94,7 @@ static LPWSTR ExpandEnv(LPWSTR string) (size + 1) * sizeof(WCHAR)); if (ExpandEnvironmentStringsW(string, expanded_string, size) == 0) { - WINE_ERR("cannot expand env vars in %s: %u\n", + WINE_ERR("cannot expand env vars in %s: %lu\n", wine_dbgstr_w(string), GetLastError()); HeapFree(GetProcessHeap(), 0, expanded_string); return NULL; @@ -134,7 +134,7 @@ static BOOL AddServiceElem(LPWSTR service_name, KEY_READ, &service_hkey); if (ret != ERROR_SUCCESS) { - WINE_ERR("cannot open key %s, err=%d\n", + WINE_ERR("cannot open key %s, err=%ld\n", wine_dbgstr_w(service_param_key), ret); goto cleanup; } @@ -182,7 +182,7 @@ static BOOL AddServiceElem(LPWSTR service_name, library = LoadLibraryExW(dll_name_long, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if (!library) { - WINE_ERR("failed to load library %s, err=%u\n", + WINE_ERR("failed to load library %s, err=%lu\n", wine_dbgstr_w(dll_name_long), GetLastError()); goto cleanup; } @@ -240,7 +240,7 @@ static BOOL StartGroupServices(LPWSTR services) service_name = service_name + lstrlenW(service_name); ++service_name; } - WINE_TRACE("Service group contains %d services\n", service_count); + WINE_TRACE("Service group contains %ld services\n", service_count);
/* Populate the service table */ service_table = HeapAlloc(GetProcessHeap(), 0, @@ -263,7 +263,7 @@ static BOOL StartGroupServices(LPWSTR services)
/* Start the services */ if (!(ret = StartServiceCtrlDispatcherW(service_table))) - WINE_ERR("StartServiceCtrlDispatcherW failed to start %s: %u\n", + WINE_ERR("StartServiceCtrlDispatcherW failed to start %s: %lu\n", wine_dbgstr_w(services), GetLastError());
HeapFree(GetProcessHeap(), 0, service_table); @@ -285,7 +285,7 @@ static BOOL LoadGroup(PWCHAR group_name) KEY_READ, &group_hkey); if (ret != ERROR_SUCCESS) { - WINE_ERR("cannot open key %s, err=%d\n", + WINE_ERR("cannot open key %s, err=%ld\n", wine_dbgstr_w(svchost_path), ret); return FALSE; }
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/termsv/Makefile.in | 1 - programs/termsv/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/programs/termsv/Makefile.in b/programs/termsv/Makefile.in index 9876e2faaba..6a83ee3b9b9 100644 --- a/programs/termsv/Makefile.in +++ b/programs/termsv/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = termsv.exe IMPORTS = advapi32
diff --git a/programs/termsv/main.c b/programs/termsv/main.c index 2ca6d0809df..680f57fc711 100644 --- a/programs/termsv/main.c +++ b/programs/termsv/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/uninstaller/Makefile.in | 1 - programs/uninstaller/main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in index 0fc7d679f19..f7fef51a51c 100644 --- a/programs/uninstaller/Makefile.in +++ b/programs/uninstaller/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = uninstaller.exe IMPORTS = advapi32 DELAYIMPORTS = shlwapi shell32 user32 gdi32 comctl32 diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index d8203b6763b..68d0dfe49f9 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -79,7 +79,7 @@ static void output_formatstring(const WCHAR *fmt, va_list va_args) fmt, 0, 0, (LPWSTR)&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); @@ -93,7 +93,7 @@ static 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); @@ -173,7 +173,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) 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 ); }
@@ -347,7 +347,7 @@ static void UninstallProgram(void) { /* wait for the process to exit */ WaitForSingleObject(info.hProcess, INFINITE); res = GetExitCodeProcess(info.hProcess, &exit_code); - WINE_TRACE("%d: %08x\n", res, exit_code); + WINE_TRACE("%d: %08lx\n", res, exit_code); } else {
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/whoami/Makefile.in | 1 - programs/whoami/main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/programs/whoami/Makefile.in b/programs/whoami/Makefile.in index 8ae2dd94d2f..4898a96f456 100644 --- a/programs/whoami/Makefile.in +++ b/programs/whoami/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = whoami.exe IMPORTS = secur32
diff --git a/programs/whoami/main.c b/programs/whoami/main.c index 297f12c9a91..7f6381d161a 100644 --- a/programs/whoami/main.c +++ b/programs/whoami/main.c @@ -70,7 +70,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) result = GetUserNameExW(NameSamCompatible, NULL, &size); if (result || GetLastError() != ERROR_MORE_DATA) { - WINE_ERR("GetUserNameExW failed, result %d, error %d\n", result, GetLastError()); + WINE_ERR("GetUserNameExW failed, result %d, error %ld\n", result, GetLastError()); return 1; }
@@ -88,7 +88,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) output_write(L"\r\n", 2); } else - WINE_ERR("GetUserNameExW failed, error %d\n", GetLastError()); + WINE_ERR("GetUserNameExW failed, error %ld\n", GetLastError());
HeapFree(GetProcessHeap(), 0, buf); return 0;
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/wineboot/Makefile.in | 1 - programs/wineboot/shutdown.c | 12 ++++++------ programs/wineboot/wineboot.c | 38 +++++++++++++++++++------------------- 3 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index 3b78729dce6..667f8f48702 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineboot.exe IMPORTS = uuid advapi32 ws2_32 kernelbase DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev diff --git a/programs/wineboot/shutdown.c b/programs/wineboot/shutdown.c index 657b3e644d5..0225af0437e 100644 --- a/programs/wineboot/shutdown.c +++ b/programs/wineboot/shutdown.c @@ -96,7 +96,7 @@ static void CALLBACK end_session_message_callback( HWND hwnd, UINT msg, ULONG_PT { struct callback_data *cb_data = (struct callback_data *)data;
- WINE_TRACE( "received response %s hwnd %p lresult %ld\n", + WINE_TRACE( "received response %s hwnd %p lresult %Id\n", msg == WM_QUERYENDSESSION ? "WM_QUERYENDSESSION" : (msg == WM_ENDSESSION ? "WM_ENDSESSION" : "Unknown"), hwnd, lresult );
@@ -143,7 +143,7 @@ static INT_PTR CALLBACK endtask_dlg_proc( HWND hwnd, UINT msg, WPARAM wparam, LP handle = OpenProcess( PROCESS_TERMINATE, FALSE, data->win[0].pid ); if (handle) { - WINE_TRACE( "terminating process %04x\n", data->win[0].pid ); + WINE_TRACE( "terminating process %04lx\n", data->win[0].pid ); TerminateProcess( handle, 0 ); CloseHandle( handle ); data->terminated = TRUE; @@ -297,7 +297,7 @@ static DWORD_PTR send_end_session_messages( struct window_info *win, UINT count, HANDLE handle = OpenProcess( PROCESS_TERMINATE, FALSE, win[0].pid ); if (handle) { - WINE_TRACE( "terminating process %04x\n", win[0].pid ); + WINE_TRACE( "terminating process %04lx\n", win[0].pid ); TerminateProcess( handle, 0 ); CloseHandle( handle ); } @@ -341,14 +341,14 @@ static BOOL CALLBACK shutdown_one_desktop( LPWSTR name, LPARAM force ) hdesk = OpenDesktopW( name, 0, FALSE, GENERIC_ALL ); if (hdesk == NULL) { - WINE_ERR("Cannot open desktop %s, err=%i\n", wine_dbgstr_w(name), GetLastError()); + WINE_ERR("Cannot open desktop %s, err=%li\n", wine_dbgstr_w(name), GetLastError()); return FALSE; }
if (!SetThreadDesktop( hdesk )) { CloseDesktop( hdesk ); - WINE_ERR("Cannot set thread desktop %s, err=%i\n", wine_dbgstr_w(name), GetLastError()); + WINE_ERR("Cannot set thread desktop %s, err=%li\n", wine_dbgstr_w(name), GetLastError()); return FALSE; }
@@ -391,7 +391,7 @@ void kill_processes( BOOL kill_desktop ) { if (process.th32ProcessID == GetCurrentProcessId()) continue; if (process.th32ProcessID == desktop_pid) continue; - WINE_TRACE("killing process %04x %s\n", + WINE_TRACE("killing process %04lx %s\n", process.th32ProcessID, wine_dbgstr_w(process.szExeFile) ); if (!(handle = OpenProcess( PROCESS_TERMINATE, FALSE, process.th32ProcessID ))) continue; diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 4a18265c1de..b82c5ec6524 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -265,7 +265,7 @@ static void create_user_shared_data(void) InitializeObjectAttributes( &attr, &name, OBJ_OPENIF, NULL, NULL ); if ((status = NtOpenSection( &handle, SECTION_ALL_ACCESS, &attr ))) { - ERR( "cannot open __wine_user_shared_data: %x\n", status ); + ERR( "cannot open __wine_user_shared_data: %lx\n", status ); return; } data = MapViewOfFile( handle, FILE_MAP_WRITE, 0, 0, sizeof(*data) ); @@ -951,7 +951,7 @@ static BOOL wininit(void)
if( !MoveFileExW( L"wininit.ini", L"wininit.bak", MOVEFILE_REPLACE_EXISTING) ) { - WINE_ERR("Couldn't rename wininit.ini, error %d\n", GetLastError() ); + WINE_ERR("Couldn't rename wininit.ini, error %ld\n", GetLastError() );
return FALSE; } @@ -1054,7 +1054,7 @@ static DWORD runCmd(LPWSTR cmdline, LPCWSTR dir, BOOL wait, BOOL minimized)
if( !CreateProcessW(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, dir, &si, &info) ) { - WINE_WARN("Failed to run command %s (%d)\n", wine_dbgstr_w(cmdline), GetLastError() ); + WINE_WARN("Failed to run command %s (%ld)\n", wine_dbgstr_w(cmdline), GetLastError() ); return INVALID_RUNCMD_RETURN; }
@@ -1111,23 +1111,23 @@ static void process_run_key( HKEY key, const WCHAR *keyname, BOOL delete, BOOL s
if ((res = RegEnumValueW( runkey, --i, value, &len, 0, &type, (BYTE *)cmdline, &len_data ))) { - WINE_ERR( "Couldn't read value %u (%d).\n", i, res ); + WINE_ERR( "Couldn't read value %lu (%ld).\n", i, res ); continue; } if (delete && (res = RegDeleteValueW( runkey, value ))) { - WINE_ERR( "Couldn't delete value %u (%d). Running command anyways.\n", i, res ); + WINE_ERR( "Couldn't delete value %lu (%ld). Running command anyways.\n", i, res ); } if (type != REG_SZ) { - WINE_ERR( "Incorrect type of value %u (%u).\n", i, type ); + WINE_ERR( "Incorrect type of value %lu (%lu).\n", i, type ); continue; } if (runCmd( cmdline, NULL, synchronous, FALSE ) == INVALID_RUNCMD_RETURN) { - WINE_ERR( "Error running cmd %s (%u).\n", wine_dbgstr_w(cmdline), GetLastError() ); + WINE_ERR( "Error running cmd %s (%lu).\n", wine_dbgstr_w(cmdline), GetLastError() ); } - WINE_TRACE( "Done processing cmd %u.\n", i ); + WINE_TRACE( "Done processing cmd %lu.\n", i ); }
end: @@ -1243,7 +1243,7 @@ static int ProcessWindowsFileProtection(void) dllcache, targetpath, currentpath, tempfile, &sz); if (rc != ERROR_SUCCESS) { - WINE_WARN("WFP: %s error 0x%x\n",wine_dbgstr_w(finddata.cFileName),rc); + WINE_WARN("WFP: %s error 0x%lx\n",wine_dbgstr_w(finddata.cFileName),rc); DeleteFileW(tempfile); }
@@ -1253,7 +1253,7 @@ static int ProcessWindowsFileProtection(void) targetpath[sz++] = '\'; lstrcpynW( targetpath + sz, finddata.cFileName, MAX_PATH - sz ); if (!DeleteFileW( targetpath )) - WINE_WARN( "failed to delete %s: error %u\n", wine_dbgstr_w(targetpath), GetLastError() ); + WINE_WARN( "failed to delete %s: error %lu\n", wine_dbgstr_w(targetpath), GetLastError() );
find_rc = FindNextFileW(find_handle,&finddata); } @@ -1272,7 +1272,7 @@ static BOOL start_services_process(void) if (!CreateProcessW(L"C:\windows\system32\services.exe", NULL, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &si, &pi)) { - WINE_ERR("Couldn't start services.exe: error %u\n", GetLastError()); + WINE_ERR("Couldn't start services.exe: error %lu\n", GetLastError()); return FALSE; } CloseHandle(pi.hThread); @@ -1285,7 +1285,7 @@ static BOOL start_services_process(void) { DWORD exit_code; GetExitCodeProcess(pi.hProcess, &exit_code); - WINE_ERR("Unexpected termination of services.exe - exit code %d\n", exit_code); + WINE_ERR("Unexpected termination of services.exe - exit code %ld\n", exit_code); CloseHandle(pi.hProcess); CloseHandle(wait_handles[0]); return FALSE; @@ -1375,7 +1375,7 @@ static void install_root_pnp_devices(void)
if ((set = SetupDiCreateDeviceInfoList( NULL, NULL )) == INVALID_HANDLE_VALUE) { - WINE_ERR("Failed to create device info list, error %#x.\n", GetLastError()); + WINE_ERR("Failed to create device info list, error %#lx.\n", GetLastError()); return; }
@@ -1384,25 +1384,25 @@ static void install_root_pnp_devices(void) if (!SetupDiCreateDeviceInfoA( set, root_devices[i].name, &GUID_NULL, NULL, NULL, 0, &device)) { if (GetLastError() != ERROR_DEVINST_ALREADY_EXISTS) - WINE_ERR("Failed to create device %s, error %#x.\n", debugstr_a(root_devices[i].name), GetLastError()); + WINE_ERR("Failed to create device %s, error %#lx.\n", debugstr_a(root_devices[i].name), GetLastError()); continue; }
if (!SetupDiSetDeviceRegistryPropertyA(set, &device, SPDRP_HARDWAREID, (const BYTE *)root_devices[i].hardware_id, (strlen(root_devices[i].hardware_id) + 2) * sizeof(WCHAR))) { - WINE_ERR("Failed to set hardware id for %s, error %#x.\n", debugstr_a(root_devices[i].name), GetLastError()); + WINE_ERR("Failed to set hardware id for %s, error %#lx.\n", debugstr_a(root_devices[i].name), GetLastError()); continue; }
if (!SetupDiCallClassInstaller(DIF_REGISTERDEVICE, set, &device)) { - WINE_ERR("Failed to register device %s, error %#x.\n", debugstr_a(root_devices[i].name), GetLastError()); + WINE_ERR("Failed to register device %s, error %#lx.\n", debugstr_a(root_devices[i].name), GetLastError()); continue; }
if (!UpdateDriverForPlugAndPlayDevicesA(NULL, root_devices[i].hardware_id, root_devices[i].infpath, 0, NULL)) - WINE_ERR("Failed to install drivers for %s, error %#x.\n", debugstr_a(root_devices[i].name), GetLastError()); + WINE_ERR("Failed to install drivers for %s, error %#lx.\n", debugstr_a(root_devices[i].name), GetLastError()); }
SetupDiDestroyDeviceInfoList(set); @@ -1613,7 +1613,7 @@ int __cdecl main( int argc, char *argv[] ) end_session = force = init = kill = restart = shutdown = update = FALSE; GetWindowsDirectoryW( windowsdir, MAX_PATH ); if( !SetCurrentDirectoryW( windowsdir ) ) - WINE_ERR("Cannot set the dir to %s (%d)\n", wine_dbgstr_w(windowsdir), GetLastError() ); + WINE_ERR("Cannot set the dir to %s (%ld)\n", wine_dbgstr_w(windowsdir), GetLastError() );
if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) { @@ -1636,7 +1636,7 @@ int __cdecl main( int argc, char *argv[] ) 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 ); }
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/winebrowser/Makefile.in | 1 - programs/winebrowser/main.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/programs/winebrowser/Makefile.in b/programs/winebrowser/Makefile.in index fe4371b6bf2..161be7e08de 100644 --- a/programs/winebrowser/Makefile.in +++ b/programs/winebrowser/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winebrowser.exe IMPORTS = urlmon oleaut32 shell32 user32 advapi32
diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 913c0a8d672..369ecb98002 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -197,7 +197,7 @@ static HDDEDATA CALLBACK ddeCb(UINT uType, UINT uFmt, HCONV hConv, { DWORD size = 0, ret = 0;
- WINE_TRACE("dde_cb: %04x, %04x, %p, %p, %p, %p, %08lx, %08lx\n", + WINE_TRACE("dde_cb: %04x, %04x, %p, %p, %p, %p, %08Ix, %08Ix\n", uType, uFmt, hConv, hsz1, hsz2, hData, dwData1, dwData2);
switch (uType) @@ -213,7 +213,7 @@ static HDDEDATA CALLBACK ddeCb(UINT uType, UINT uFmt, HCONV hConv, else if (!(ddeString = malloc(size))) WINE_ERR("Out of memory\n"); else if (DdeGetData(hData, (LPBYTE)ddeString, size, 0) != size) - WINE_WARN("DdeGetData did not return %d bytes\n", size); + WINE_WARN("DdeGetData did not return %ld bytes\n", size); DdeFreeDataHandle(hData); return (HDDEDATA)DDE_FACK;
@@ -224,7 +224,7 @@ static HDDEDATA CALLBACK ddeCb(UINT uType, UINT uFmt, HCONV hConv, else if (!(ddeString = malloc( (size + 1) * sizeof(WCHAR)))) WINE_ERR("Out of memory\n"); else if (DdeQueryStringW(ddeInst, hsz2, ddeString, size + 1, CP_WINUNICODE) != size) - WINE_WARN("DdeQueryString did not return %d characters\n", size); + WINE_WARN("DdeQueryString did not return %ld characters\n", size); else ret = -2; /* acknowledgment */ return DdeCreateDataHandle(ddeInst, (LPBYTE)&ret, sizeof(ret), 0,
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/winecfg/Makefile.in | 1 - programs/winecfg/audio.c | 8 ++++---- programs/winecfg/drive.c | 14 +++++++------- programs/winecfg/driveui.c | 4 ++-- programs/winecfg/main.c | 2 +- programs/winecfg/winecfg.c | 14 +++++++------- programs/winecfg/x11drvdlg.c | 2 +- 7 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index f7540a55372..84be34eab10 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winecfg.exe IMPORTS = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32
diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index d1cb530e4eb..cd73703a0dd 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -412,7 +412,7 @@ static void apply_speaker_configs(void) CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&devenum);
if(FAILED(hr)){ - ERR("Unable to create MMDeviceEnumerator: 0x%08x\n", hr); + ERR("Unable to create MMDeviceEnumerator: 0x%08lx\n", hr); return; }
@@ -423,14 +423,14 @@ static void apply_speaker_configs(void) hr = IMMDeviceEnumerator_GetDevice(devenum, render_devs[i].id, &dev);
if(FAILED(hr)){ - WARN("Could not get MMDevice for %s: 0x%08x\n", wine_dbgstr_w(render_devs[i].id), hr); + WARN("Could not get MMDevice for %s: 0x%08lx\n", wine_dbgstr_w(render_devs[i].id), hr); continue; }
hr = IMMDevice_OpenPropertyStore(dev, STGM_WRITE, &ps);
if(FAILED(hr)){ - WARN("Could not open property store for %s: 0x%08x\n", wine_dbgstr_w(render_devs[i].id), hr); + WARN("Could not open property store for %s: 0x%08lx\n", wine_dbgstr_w(render_devs[i].id), hr); IMMDevice_Release(dev); continue; } @@ -440,7 +440,7 @@ static void apply_speaker_configs(void) hr = IPropertyStore_SetValue(ps, &PKEY_AudioEndpoint_PhysicalSpeakers, &pv);
if (FAILED(hr)) - WARN("IPropertyStore_SetValue failed for %s: 0x%08x\n", wine_dbgstr_w(render_devs[i].id), hr); + WARN("IPropertyStore_SetValue failed for %s: 0x%08lx\n", wine_dbgstr_w(render_devs[i].id), hr);
IPropertyStore_Release(ps); IMMDevice_Release(dev); diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index b4b4239c003..4d798ef7671 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -85,7 +85,7 @@ ULONG drive_available_mask(char letter) result = ~result; if (letter) result |= DRIVE_MASK_BIT(letter);
- WINE_TRACE("finished drive letter loop with %x\n", result); + WINE_TRACE("finished drive letter loop with %lx\n", result); return result; }
@@ -97,7 +97,7 @@ BOOL add_drive(char letter, const char *targetpath, const char *device, const WC if(drives[driveIndex].in_use) return FALSE;
- WINE_TRACE("letter == '%c', unixpath == %s, device == %s, label == %s, serial == %08x, type == %d\n", + WINE_TRACE("letter == '%c', unixpath == %s, device == %s, label == %s, serial == %08lx, type == %ld\n", letter, wine_dbgstr_a(targetpath), wine_dbgstr_a(device), wine_dbgstr_w(label), serial, type);
@@ -183,7 +183,7 @@ static void set_drive_serial( WCHAR letter, DWORD serial ) HANDLE hFile;
filename[0] = letter; - WINE_TRACE("Putting serial number of %08X into file %s\n", serial, wine_dbgstr_w(filename)); + WINE_TRACE("Putting serial number of %08lX into file %s\n", serial, wine_dbgstr_w(filename)); hFile = CreateFileW(filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile != INVALID_HANDLE_VALUE) @@ -191,7 +191,7 @@ static void set_drive_serial( WCHAR letter, DWORD serial ) DWORD w; char buffer[16];
- sprintf( buffer, "%X\n", serial ); + sprintf( buffer, "%lX\n", serial ); WriteFile(hFile, buffer, strlen(buffer), &w, NULL); CloseHandle(hFile); } @@ -204,7 +204,7 @@ static HANDLE open_mountmgr(void) if ((ret = CreateFileW( MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE) - WINE_ERR( "failed to open mount manager err %u\n", GetLastError() ); + WINE_ERR( "failed to open mount manager err %lu\n", GetLastError() ); return ret; }
@@ -315,10 +315,10 @@ void apply_drive_changes(void) { set_drive_label( drives[i].letter, drives[i].label ); if (drives[i].in_use) set_drive_serial( drives[i].letter, drives[i].serial ); - WINE_TRACE( "set drive %c: to %s type %u\n", 'a' + i, + WINE_TRACE( "set drive %c: to %s type %lu\n", 'a' + i, wine_dbgstr_a(drives[i].unixpath), drives[i].type ); } - else WINE_WARN( "failed to set drive %c: to %s type %u err %u\n", 'a' + i, + else WINE_WARN( "failed to set drive %c: to %s type %lu err %lu\n", 'a' + i, wine_dbgstr_a(drives[i].unixpath), drives[i].type, GetLastError() ); HeapFree( GetProcessHeap(), 0, ioctl ); } diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 35689ac6007..28fc6cf02d6 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -463,7 +463,7 @@ static void update_controls(HWND dialog) set_textW(dialog, IDC_EDIT_LABEL, current_drive->label ? current_drive->label : emptyW);
/* set serial edit text */ - sprintf( serial, "%X", current_drive->serial ); + sprintf( serial, "%lX", current_drive->serial ); set_text(dialog, IDC_EDIT_SERIAL, serial);
set_text(dialog, IDC_EDIT_DEVICE, current_drive->device); @@ -542,7 +542,7 @@ static void on_edit_changed(HWND dialog, WORD id) HeapFree(GetProcessHeap(), 0, serial); current_drive->modified = TRUE;
- WINE_TRACE("set serial to %08X\n", current_drive->serial); + WINE_TRACE("set serial to %08lX\n", current_drive->serial);
/* enable the apply button */ SendMessageW(GetParent(dialog), PSM_CHANGED, (WPARAM) dialog, 0); diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index 77b732d6819..67df9146f3d 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -247,7 +247,7 @@ wWinMain (HINSTANCE hInstance, HINSTANCE hPrev, LPWSTR cmdline, int nShow) 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/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 23aa10cd2d4..ed319e91f5d 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -120,7 +120,7 @@ static WCHAR *get_config_key (HKEY root, const WCHAR *subkey, const WCHAR *name, } else { - WINE_ERR("RegOpenKey failed on wine config key (res=%d)\n", res); + WINE_ERR("RegOpenKey failed on wine config key (res=%ld)\n", res); } goto end; } @@ -133,7 +133,7 @@ static WCHAR *get_config_key (HKEY root, const WCHAR *subkey, const WCHAR *name, goto end; } else if (res != ERROR_SUCCESS) { - WINE_ERR("Couldn't query value's length (res=%d)\n", res); + WINE_ERR("Couldn't query value's length (res=%ld)\n", res); goto end; }
@@ -164,7 +164,7 @@ static int set_config_key(HKEY root, const WCHAR *subkey, REGSAM access, const W DWORD res = 1; HKEY key = NULL;
- WINE_TRACE("subkey=%s: name=%s, value=%p, type=%d\n", wine_dbgstr_w(subkey), + WINE_TRACE("subkey=%s: name=%s, value=%p, type=%ld\n", wine_dbgstr_w(subkey), wine_dbgstr_w(name), value, type);
assert( subkey != NULL ); @@ -189,7 +189,7 @@ static int set_config_key(HKEY root, const WCHAR *subkey, REGSAM access, const W end: if (key && key != root) RegCloseKey(key); if (res != 0) - WINE_ERR("Unable to set configuration key %s in section %s, res=%d\n", + WINE_ERR("Unable to set configuration key %s in section %s, res=%ld\n", wine_dbgstr_w(name), wine_dbgstr_w(subkey), res); return res; } @@ -430,13 +430,13 @@ WCHAR **enumerate_values(HKEY root, const WCHAR *path) else values = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR*));
values[valueslen++] = strdupW(name); - WINE_TRACE("valueslen is now %d\n", valueslen); + WINE_TRACE("valueslen is now %ld\n", valueslen); i++; } } else { - WINE_WARN("failed opening registry key %s, res=0x%x\n", + WINE_WARN("failed opening registry key %s, res=0x%lx\n", wine_dbgstr_w(path), res); }
@@ -610,7 +610,7 @@ BOOL initialize(HINSTANCE hInstance) DWORD res = RegCreateKeyW(HKEY_CURRENT_USER, WINE_KEY_ROOT, &config_key);
if (res != ERROR_SUCCESS) { - WINE_ERR("RegOpenKey failed on wine config key (%d)\n", res); + WINE_ERR("RegOpenKey failed on wine config key (%ld)\n", res); return TRUE; }
diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index f1b543d5311..a480eac7ead 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -245,7 +245,7 @@ static void init_dpi_editbox(HWND hDlg) updating_ui = TRUE;
dwLogpixels = read_logpixels_reg(); - WINE_TRACE("%u\n", dwLogpixels); + WINE_TRACE("%lu\n", dwLogpixels);
SetDlgItemInt(hDlg, IDC_RES_DPIEDIT, dwLogpixels, FALSE);
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/wineconsole/Makefile.in | 1 - programs/wineconsole/wineconsole.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in index 882ee9a3b1d..b859ef8a27a 100644 --- a/programs/wineconsole/Makefile.in +++ b/programs/wineconsole/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineconsole.exe IMPORTS = advapi32 DELAYIMPORTS = comctl32 user32 gdi32 diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index d398e6eb1a8..1924bf791e6 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -44,7 +44,7 @@ int WINAPI wWinMain( HINSTANCE inst, HINSTANCE prev, WCHAR *cmdline, INT show ) FreeConsole(); /* make sure we're not connected to inherited console */ if (!AllocConsole()) { - ERR( "failed to allocate console: %u\n", GetLastError() ); + ERR( "failed to allocate console: %lu\n", GetLastError() ); return 1; }
@@ -63,7 +63,7 @@ int WINAPI wWinMain( HINSTANCE inst, HINSTANCE prev, WCHAR *cmdline, INT show ) INPUT_RECORD ir; DWORD len; exit_code = GetLastError(); - WARN( "CreateProcess failed: %u\n", exit_code ); + WARN( "CreateProcess failed: %lu\n", exit_code ); LoadStringW( GetModuleHandleW( NULL ), IDS_CMD_LAUNCH_FAILED, format, ARRAY_SIZE(format) ); len = wcslen( format ) + wcslen( cmd ); if ((buf = malloc( len * sizeof(WCHAR) )))
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/winedbg/Makefile.in | 1 - programs/winedbg/be_i386.c | 12 +++++---- programs/winedbg/be_x86_64.c | 6 ++--- programs/winedbg/dbg.y | 2 +- programs/winedbg/gdbproxy.c | 52 ++++++++++++++++++++------------------- programs/winedbg/info.c | 26 ++++++++++---------- programs/winedbg/memory.c | 10 ++++---- programs/winedbg/stack.c | 12 +++++---- programs/winedbg/symbol.c | 2 +- programs/winedbg/tgt_active.c | 44 +++++++++++++++++---------------- programs/winedbg/tgt_minidump.c | 4 ++- programs/winedbg/types.c | 22 ++++++++--------- programs/winedbg/winedbg.c | 10 ++++---- 13 files changed, 101 insertions(+), 102 deletions(-)
diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index 2e73adc2496..4e6d90df728 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winedbg.exe IMPORTS = dbghelp advapi32 DELAYIMPORTS = comdlg32 shell32 comctl32 user32 gdi32 ws2_32 diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 262e68894d5..ab86f9ec647 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -143,7 +143,7 @@ static void be_i386_all_print_context(HANDLE hThread, const dbg_ctx_t *pctx) dbg_printf(" FLSW:%04x", LOWORD(ctx->FloatSave.StatusWord));
/* Isolate the condition code bits - note they are not contiguous */ - dbg_printf("(CC:%d%d%d%d", (ctx->FloatSave.StatusWord & 0x00004000) >> 14, + dbg_printf("(CC:%ld%ld%ld%ld", (ctx->FloatSave.StatusWord & 0x00004000) >> 14, (ctx->FloatSave.StatusWord & 0x00000400) >> 10, (ctx->FloatSave.StatusWord & 0x00000200) >> 9, (ctx->FloatSave.StatusWord & 0x00000100) >> 8); @@ -176,7 +176,7 @@ static void be_i386_all_print_context(HANDLE hThread, const dbg_ctx_t *pctx) dbg_printf(")\n");
/* Here are the rest of the registers */ - dbg_printf(" FLES:%08x FLDO:%08x FLDS:%08x FLCNS:%08x\n", + dbg_printf(" FLES:%08lx FLDO:%08lx FLDS:%08lx FLCNS:%08lx\n", ctx->FloatSave.ErrorSelector, ctx->FloatSave.DataOffset, ctx->FloatSave.DataSelector, @@ -194,7 +194,7 @@ static void be_i386_all_print_context(HANDLE hThread, const dbg_ctx_t *pctx)
xmm_area = (XSAVE_FORMAT *) &ctx->ExtendedRegisters;
- dbg_printf(" mxcsr: %04x (", xmm_area->MxCsr ); + dbg_printf(" mxcsr: %04lx (", xmm_area->MxCsr ); for (cnt = 0; cnt < 16; cnt++) if (xmm_area->MxCsr & (1 << cnt)) dbg_printf( " %s", mxcsr_flags[cnt] ); dbg_printf(" )\n"); @@ -251,11 +251,11 @@ static void be_i386_print_context(HANDLE hThread, const dbg_ctx_t *pctx, int all break; case AddrModeFlat: case AddrMode1632: - dbg_printf("\n EIP:%08x ESP:%08x EBP:%08x EFLAGS:%08x(%s)\n", + dbg_printf("\n EIP:%08lx ESP:%08lx EBP:%08lx EFLAGS:%08lx(%s)\n", ctx->Eip, ctx->Esp, ctx->Ebp, ctx->EFlags, buf); - dbg_printf(" EAX:%08x EBX:%08x ECX:%08x EDX:%08x\n", + dbg_printf(" EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx\n", ctx->Eax, ctx->Ebx, ctx->Ecx, ctx->Edx); - dbg_printf(" ESI:%08x EDI:%08x\n", + dbg_printf(" ESI:%08lx EDI:%08lx\n", ctx->Esi, ctx->Edi); break; } diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index d82c4ccb687..a01bbf86575 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -89,7 +89,7 @@ static void be_x86_64_print_context(HANDLE hThread, const dbg_ctx_t *pctx, buf[i] = ' ';
dbg_printf("Register dump:\n"); - dbg_printf(" rip:%016I64x rsp:%016I64x rbp:%016I64x eflags:%08x (%s)\n", + dbg_printf(" rip:%016I64x rsp:%016I64x rbp:%016I64x eflags:%08lx (%s)\n", ctx->Rip, ctx->Rsp, ctx->Rbp, ctx->EFlags, buf); dbg_printf(" rax:%016I64x rbx:%016I64x rcx:%016I64x rdx:%016I64x\n", ctx->Rax, ctx->Rbx, ctx->Rcx, ctx->Rdx); @@ -142,7 +142,7 @@ static void be_x86_64_print_context(HANDLE hThread, const dbg_ctx_t *pctx, if (ctx->u.FltSave.StatusWord & 0x00000080) dbg_printf(" #ES"); /* Error Summary */ if (ctx->u.FltSave.StatusWord & 0x00008000) dbg_printf(" #FB"); /* FPU Busy */ dbg_printf(")\n"); - dbg_printf(" flerr:%04x:%08x fldata:%04x:%08x\n", + dbg_printf(" flerr:%04x:%08lx fldata:%04x:%08lx\n", ctx->u.FltSave.ErrorSelector, ctx->u.FltSave.ErrorOffset, ctx->u.FltSave.DataSelector, ctx->u.FltSave.DataOffset );
@@ -154,7 +154,7 @@ static void be_x86_64_print_context(HANDLE hThread, const dbg_ctx_t *pctx, } dbg_printf("\n");
- dbg_printf(" mxcsr: %04x (", ctx->u.FltSave.MxCsr ); + dbg_printf(" mxcsr: %04lx (", ctx->u.FltSave.MxCsr ); for (i = 0; i < 16; i++) if (ctx->u.FltSave.MxCsr & (1 << i)) dbg_printf( " %s", mxcsr_flags[i] ); dbg_printf(" )\n"); diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index a34fb83d108..ad21e3b81c5 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -445,7 +445,7 @@ static LONG WINAPI wine_dbg_cmd(EXCEPTION_POINTERS *eptr) dbg_interrupt_debuggee(); return EXCEPTION_CONTINUE_EXECUTION; default: - dbg_printf("\nException %x\n", eptr->ExceptionRecord->ExceptionCode); + dbg_printf("\nException %lx\n", eptr->ExceptionRecord->ExceptionCode); break; }
diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 8d8ae30fce5..e7f9ddaf226 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -126,7 +126,7 @@ static void gdbctx_delete_xpoint(struct gdb_context *gdbctx, struct dbg_thread * struct backend_cpu *cpu = process->be_cpu;
if (!cpu->remove_Xpoint(process->handle, process->process_io, ctx, x->type, x->addr, x->value, x->size)) - ERR("%04x:%04x: Couldn't remove breakpoint at:%p/%x type:%d\n", process->pid, thread ? thread->tid : ~0, x->addr, x->size, x->type); + ERR("%04lx:%04lx: Couldn't remove breakpoint at:%p/%x type:%d\n", process->pid, thread ? thread->tid : ~0, x->addr, x->size, x->type);
list_remove(&x->entry); HeapFree(GetProcessHeap(), 0, x); @@ -142,13 +142,13 @@ static void gdbctx_insert_xpoint(struct gdb_context *gdbctx, struct dbg_thread *
if (!cpu->insert_Xpoint(process->handle, process->process_io, ctx, type, addr, &value, size)) { - ERR("%04x:%04x: Couldn't insert breakpoint at:%p/%x type:%d\n", process->pid, thread->tid, addr, size, type); + ERR("%04lx:%04lx: Couldn't insert breakpoint at:%p/%x type:%d\n", process->pid, thread->tid, addr, size, type); return; }
if (!(x = HeapAlloc(GetProcessHeap(), 0, sizeof(struct gdb_xpoint)))) { - ERR("%04x:%04x: Couldn't allocate memory for breakpoint at:%p/%x type:%d\n", process->pid, thread->tid, addr, size, type); + ERR("%04lx:%04lx: Couldn't allocate memory for breakpoint at:%p/%x type:%d\n", process->pid, thread->tid, addr, size, type); return; }
@@ -415,12 +415,12 @@ static void dbg_thread_set_single_step(struct dbg_thread *thread, BOOL enable)
if (!backend->get_context(thread->handle, &ctx)) { - ERR("get_context failed for thread %04x:%04x\n", thread->process->pid, thread->tid); + ERR("get_context failed for thread %04lx:%04lx\n", thread->process->pid, thread->tid); return; } backend->single_step(&ctx, enable); if (!backend->set_context(thread->handle, &ctx)) - ERR("set_context failed for thread %04x:%04x\n", thread->process->pid, thread->tid); + ERR("set_context failed for thread %04lx:%04lx\n", thread->process->pid, thread->tid); }
static unsigned char signal_from_debug_event(DEBUG_EVENT* de) @@ -467,7 +467,7 @@ static unsigned char signal_from_debug_event(DEBUG_EVENT* de) case EXCEPTION_WINE_NAME_THREAD: return HOST_SIGTRAP; default: - ERR("Unknown exception code 0x%08x\n", ec); + ERR("Unknown exception code 0x%08lx\n", ec); return HOST_SIGABRT; } } @@ -494,12 +494,12 @@ static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* e if (gdbctx->process->process_io->read( gdbctx->process->handle, threadname->szName, name, sizeof(name), &read) && read == sizeof(name)) { - fprintf(stderr, "Thread ID=%04x renamed to "%.9s"\n", + fprintf(stderr, "Thread ID=%04lx renamed to "%.9s"\n", threadname->dwThreadID, name); } } else - ERR("Cannot set name of thread %04x\n", threadname->dwThreadID); + ERR("Cannot set name of thread %04lx\n", threadname->dwThreadID); return TRUE; } case EXCEPTION_INVALID_HANDLE: @@ -536,7 +536,7 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load QueryFullProcessImageNameW( gdbctx->process->handle, 0, u.buffer, &size ); dbg_set_process_name(gdbctx->process, u.buffer);
- fprintf(stderr, "%04x:%04x: create process '%s'/%p @%p (%u<%u>)\n", + fprintf(stderr, "%04lx:%04lx: create process '%s'/%p @%p (%lu<%lu>)\n", de->dwProcessId, de->dwThreadId, dbg_W2A(u.buffer, -1), de->u.CreateProcessInfo.lpImageName, @@ -548,7 +548,7 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load if (!dbg_init(gdbctx->process->handle, u.buffer, TRUE)) ERR("Couldn't initiate DbgHelp\n");
- fprintf(stderr, "%04x:%04x: create thread I @%p\n", de->dwProcessId, + fprintf(stderr, "%04lx:%04lx: create thread I @%p\n", de->dwProcessId, de->dwThreadId, de->u.CreateProcessInfo.lpStartAddress);
dbg_load_module(gdbctx->process->handle, de->u.CreateProcessInfo.hFile, u.buffer, @@ -562,7 +562,7 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load case LOAD_DLL_DEBUG_EVENT: fetch_module_name( de->u.LoadDll.lpImageName, de->u.LoadDll.lpBaseOfDll, u.buffer, ARRAY_SIZE(u.buffer) ); - fprintf(stderr, "%04x:%04x: loads DLL %s @%p (%u<%u>)\n", + fprintf(stderr, "%04lx:%04lx: loads DLL %s @%p (%lu<%lu>)\n", de->dwProcessId, de->dwThreadId, dbg_W2A(u.buffer, -1), de->u.LoadDll.lpBaseOfDll, @@ -575,7 +575,7 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load return TRUE;
case UNLOAD_DLL_DEBUG_EVENT: - fprintf(stderr, "%08x:%08x: unload DLL @%p\n", + fprintf(stderr, "%08lx:%08lx: unload DLL @%p\n", de->dwProcessId, de->dwThreadId, de->u.UnloadDll.lpBaseOfDll); SymUnloadModule(gdbctx->process->handle, (DWORD_PTR)de->u.UnloadDll.lpBaseOfDll); @@ -584,7 +584,7 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load return TRUE;
case EXCEPTION_DEBUG_EVENT: - TRACE("%08x:%08x: exception code=0x%08x\n", de->dwProcessId, + TRACE("%08lx:%08lx: exception code=0x%08lx\n", de->dwProcessId, de->dwThreadId, de->u.Exception.ExceptionRecord.ExceptionCode);
if (handle_exception(gdbctx, &de->u.Exception)) @@ -592,7 +592,7 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load break;
case CREATE_THREAD_DEBUG_EVENT: - fprintf(stderr, "%08x:%08x: create thread D @%p\n", de->dwProcessId, + fprintf(stderr, "%08lx:%08lx: create thread D @%p\n", de->dwProcessId, de->dwThreadId, de->u.CreateThread.lpStartAddress);
dbg_add_thread(gdbctx->process, @@ -602,14 +602,14 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load return TRUE;
case EXIT_THREAD_DEBUG_EVENT: - fprintf(stderr, "%08x:%08x: exit thread (%u)\n", + fprintf(stderr, "%08lx:%08lx: exit thread (%lu)\n", de->dwProcessId, de->dwThreadId, de->u.ExitThread.dwExitCode); if ((thread = dbg_get_thread(gdbctx->process, de->dwThreadId))) dbg_del_thread(thread); return TRUE;
case EXIT_PROCESS_DEBUG_EVENT: - fprintf(stderr, "%08x:%08x: exit process (%u)\n", + fprintf(stderr, "%08lx:%08lx: exit process (%lu)\n", de->dwProcessId, de->dwThreadId, de->u.ExitProcess.dwExitCode);
dbg_del_process(gdbctx->process); @@ -620,17 +620,17 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load memory_get_string(gdbctx->process, de->u.DebugString.lpDebugStringData, TRUE, de->u.DebugString.fUnicode, u.bufferA, sizeof(u.bufferA)); - fprintf(stderr, "%08x:%08x: output debug string (%s)\n", + fprintf(stderr, "%08lx:%08lx: output debug string (%s)\n", de->dwProcessId, de->dwThreadId, debugstr_a(u.bufferA)); return TRUE;
case RIP_EVENT: - fprintf(stderr, "%08x:%08x: rip error=%u type=%u\n", de->dwProcessId, + fprintf(stderr, "%08lx:%08lx: rip error=%lu type=%lu\n", de->dwProcessId, de->dwThreadId, de->u.RipInfo.dwError, de->u.RipInfo.dwType); return TRUE;
default: - FIXME("%08x:%08x: unknown event (%u)\n", + FIXME("%08lx:%08lx: unknown event (%lu)\n", de->dwProcessId, de->dwThreadId, de->dwDebugEventCode); }
@@ -744,7 +744,7 @@ static void get_process_info(struct gdb_context* gdbctx, char* buffer, size_t le strcpy(buffer, "Running"); } else - snprintf(buffer, len, "Terminated (%u)", status); + snprintf(buffer, len, "Terminated (%lu)", status);
switch (GetPriorityClass(gdbctx->process->handle)) { @@ -782,12 +782,12 @@ static void get_thread_info(struct gdb_context* gdbctx, unsigned tid, { case -1: break; case 0: strcpy(buffer, "Running"); break; - default: snprintf(buffer, len, "Suspended (%u)", status - 1); + default: snprintf(buffer, len, "Suspended (%lu)", status - 1); } ResumeThread(thd->handle); } else - snprintf(buffer, len, "Terminated (exit code = %u)", status); + snprintf(buffer, len, "Terminated (exit code = %lu)", status); } else { @@ -1297,7 +1297,7 @@ static enum packet_return packet_write_registers(struct gdb_context* gdbctx)
if (!backend->set_context(thread->handle, &ctx)) { - ERR("Failed to set context for tid %04x, error %u\n", thread->tid, GetLastError()); + ERR("Failed to set context for tid %04lx, error %lu\n", thread->tid, GetLastError()); return packet_error; }
@@ -1463,7 +1463,7 @@ static enum packet_return packet_write_register(struct gdb_context* gdbctx) cpu_register_hex_from(gdbctx, &ctx, reg, (const char**)&ptr); if (!backend->set_context(thread->handle, &ctx)) { - ERR("Failed to set context for tid %04x, error %u\n", thread->tid, GetLastError()); + ERR("Failed to set context for tid %04lx, error %lu\n", thread->tid, GetLastError()); return packet_error; }
@@ -1486,7 +1486,7 @@ static void packet_query_monitor_wnd_helper(struct gdb_context* gdbctx, HWND hWn packet_reply_open(gdbctx); packet_reply_add(gdbctx, "O"); snprintf(buffer, sizeof(buffer), - "%*s%04Ix%*s%-17.17s %08x %0*Ix %.14s\n", + "%*s%04Ix%*s%-17.17s %08lx %0*Ix %.14s\n", indent, "", (ULONG_PTR)hWnd, 13 - indent, "", clsName, GetWindowLongW(hWnd, GWL_STYLE), addr_width(gdbctx), (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), @@ -1550,7 +1550,7 @@ static void packet_query_monitor_process(struct gdb_context* gdbctx, int len, co packet_reply_open(gdbctx); packet_reply_add(gdbctx, "O"); snprintf(buffer, sizeof(buffer), - "%c%08x %-8d %08x '%s'\n", + "%c%08lx %-8ld %08lx '%s'\n", deco, entry.th32ProcessID, entry.cntThreads, entry.th32ParentProcessID, entry.szExeFile); packet_reply_hex_to_str(gdbctx, buffer); diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 07b2a5acc8b..3ac00df911d 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -392,7 +392,7 @@ static void info_window(HWND hWnd, int indent) if (!GetWindowTextA(hWnd, wndName, sizeof(wndName))) strcpy(wndName, "-- Empty --");
- dbg_printf("%*s%08Ix%*s %-17.17s %08x %0*Ix %08x %.14s\n", + dbg_printf("%*s%08Ix%*s %-17.17s %08lx %0*Ix %08lx %.14s\n", indent, "", (DWORD_PTR)hWnd, 12 - indent, "", clsName, GetWindowLongW(hWnd, GWL_STYLE), ADDRWIDTH, (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), @@ -435,8 +435,8 @@ void info_win32_window(HWND hWnd, BOOL detailed) /* FIXME missing fields: hmemTaskQ, hrgnUpdate, dce, flags, pProp, scroll */ dbg_printf("next=%p child=%p parent=%p owner=%p class='%s'\n" "inst=%p active=%p idmenu=%08Ix\n" - "style=0x%08x exstyle=0x%08x wndproc=%p text='%s'\n" - "client=%d,%d-%d,%d window=%d,%d-%d,%d sysmenu=%p\n", + "style=0x%08lx exstyle=0x%08lx wndproc=%p text='%s'\n" + "client=%ld,%ld-%ld,%ld window=%ld,%ld-%ld,%ld sysmenu=%p\n", GetWindow(hWnd, GW_HWNDNEXT), GetWindow(hWnd, GW_CHILD), GetParent(hWnd), @@ -502,7 +502,7 @@ static void dump_proc_info(const struct dump_proc* dp, unsigned idx, unsigned de { assert(idx < dp->count); dpe = &dp->entries[idx]; - dbg_printf("%c%08x %-8d ", + dbg_printf("%c%08lx %-8ld ", (dpe->proc.th32ProcessID == (dbg_curr_process ? dbg_curr_process->pid : 0)) ? '>' : ' ', dpe->proc.th32ProcessID, dpe->proc.cntThreads); @@ -616,11 +616,11 @@ void info_win32_threads(void) else exename = "";
- dbg_printf("%08x%s %s\n", + dbg_printf("%08lx%s %s\n", entry.th32OwnerProcessID, p ? " (D)" : "", exename); lastProcessId = entry.th32OwnerProcessID; } - dbg_printf("\t%08x %4d%s\n", + dbg_printf("\t%08lx %4ld%s\n", entry.th32ThreadID, entry.tpBasePri, (entry.th32ThreadID == dbg_curr_tid) ? " <==" : "");
@@ -657,12 +657,12 @@ void info_win32_frame_exceptions(DWORD tid)
if (!thread) { - dbg_printf("Unknown thread id (%04x) in current process\n", tid); + dbg_printf("Unknown thread id (%04lx) in current process\n", tid); return; } if (SuspendThread(thread->handle) == -1) { - dbg_printf("Can't suspend thread id (%04x)\n", tid); + dbg_printf("Can't suspend thread id (%04lx)\n", tid); return; } } @@ -715,7 +715,7 @@ void info_win32_segments(DWORD start, int length) flags[1] = (le.HighWord.Bits.Type & 0x2) ? 'w' : '-'; flags[2] = '-'; } - dbg_printf("%04x: sel=%04x base=%08x limit=%08x %d-bit %c%c%c\n", + dbg_printf("%04lx: sel=%04lx base=%08x limit=%08x %d-bit %c%c%c\n", i, (i << 3) | 7, (le.HighWord.Bits.BaseHi << 24) + (le.HighWord.Bits.BaseMid << 16) + le.BaseLow, @@ -749,7 +749,7 @@ void info_win32_virtual(DWORD pid) hProc = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid); if (hProc == NULL) { - dbg_printf("Cannot open process <%04x>\n", pid); + dbg_printf("Cannot open process <%04lx>\n", pid); return; } } @@ -968,11 +968,11 @@ void info_win32_exception(void) (void*)rec->ExceptionInformation[1], (void*)rec->ExceptionInformation[2], (void*)rec->ExceptionInformation[3]); else - dbg_printf("C++ exception with strange parameter count %d or magic 0x%0*Ix", + dbg_printf("C++ exception with strange parameter count %ld or magic 0x%0*Ix", rec->NumberParameters, ADDRWIDTH, rec->ExceptionInformation[0]); break; default: - dbg_printf("0x%08x", rec->ExceptionCode); + dbg_printf("0x%08lx", rec->ExceptionCode); break; } if (rec->ExceptionFlags & EH_STACK_INVALID) @@ -981,7 +981,7 @@ void info_win32_exception(void) switch (addr.Mode) { case AddrModeFlat: - dbg_printf(" in %d-bit code (%s)", + dbg_printf(" in %ld-bit code (%s)", dbg_curr_process->be_cpu->pointer_size * 8, memory_offset_to_string(hexbuf, addr.Offset, 0)); break; diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 95e1c08e081..faa5ac9ddcb 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -114,7 +114,7 @@ BOOL memory_write_value(const struct dbg_lvalue* lvalue, DWORD size, void* value if (!types_get_info(&lvalue->type, TI_GET_LENGTH, &os)) return FALSE; if (size != os) { - dbg_printf("Size mismatch in memory_write_value, got %u from type while expecting %u\n", + dbg_printf("Size mismatch in memory_write_value, got %lu from type while expecting %lu\n", (DWORD)os, size); return FALSE; } @@ -531,7 +531,7 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) dbg_printf("%s", val_int ? "true" : "false"); break; default: - WINE_FIXME("Unsupported basetype %u\n", bt); + WINE_FIXME("Unsupported basetype %lu\n", bt); break; } break; @@ -619,7 +619,7 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) } break; default: - WINE_FIXME("Unsupported tag %u\n", tag); + WINE_FIXME("Unsupported tag %lu\n", tag); break; } } @@ -739,7 +739,7 @@ void print_address(const ADDRESS64* addr, BOOLEAN with_line)
il.SizeOfStruct = sizeof(il); if (SymGetLineFromAddr64(dbg_curr_process->handle, lin, &disp, &il)) - dbg_printf(" [%s:%u]", il.FileName, il.LineNumber); + dbg_printf(" [%s:%lu]", il.FileName, il.LineNumber); if (im.SizeOfStruct == 0) /* don't display again module if address is in module+disp form */ { im.SizeOfStruct = sizeof(im); @@ -828,6 +828,6 @@ BOOL memory_get_register(DWORD regno, DWORD_PTR** value, char* buffer, int len) return TRUE; } } - if (buffer) snprintf(buffer, len, "<unknown register %u>", regno); + if (buffer) snprintf(buffer, len, "<unknown register %lu>", regno); return FALSE; } diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index c8352d8a994..5d3504f1057 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -288,7 +288,7 @@ static void stack_print_addr_and_args(void) il.SizeOfStruct = sizeof(il); if (SymGetLineFromInlineContext(dbg_curr_process->handle, frm->linear_pc, frm->inline_ctx, 0, &disp, &il)) - dbg_printf(" [%s:%u]", il.FileName, il.LineNumber); + dbg_printf(" [%s:%lu]", il.FileName, il.LineNumber); dbg_printf(" in %s", im.ModuleName); } else dbg_printf(" in %s (+0x%Ix)", im.ModuleName, frm->linear_pc - im.BaseOfImage); @@ -333,7 +333,7 @@ static void backtrace_tid(struct dbg_process* pcs, DWORD tid) struct dbg_thread* thread = dbg_curr_thread;
if (!(dbg_curr_thread = dbg_get_thread(pcs, tid))) - dbg_printf("Unknown thread id (%04x) in process (%04x)\n", tid, pcs->pid); + dbg_printf("Unknown thread id (%04lx) in process (%04lx)\n", tid, pcs->pid); else { dbg_ctx_t ctx = {{0}}; @@ -343,7 +343,7 @@ static void backtrace_tid(struct dbg_process* pcs, DWORD tid) { if (!pcs->be_cpu->get_context(dbg_curr_thread->handle, &ctx)) { - dbg_printf("Can't get context for thread %04x in current process\n", + dbg_printf("Can't get context for thread %04lx in current process\n", tid); } else @@ -353,7 +353,7 @@ static void backtrace_tid(struct dbg_process* pcs, DWORD tid) } ResumeThread(dbg_curr_thread->handle); } - else dbg_printf("Can't suspend thread %04x in current process\n", tid); + else dbg_printf("Can't suspend thread %04lx in current process\n", tid); } dbg_curr_thread = thread; dbg_curr_tid = thread ? thread->tid : 0; @@ -399,7 +399,7 @@ static void backtrace_all(void) { if (!dbg_attach_debuggee(entry.th32OwnerProcessID)) { - dbg_printf("\nwarning: could not attach to %04x\n", + dbg_printf("\nwarning: could not attach to %04lx\n", entry.th32OwnerProcessID); continue; } @@ -407,7 +407,7 @@ static void backtrace_all(void) dbg_active_wait_for_first_exception(); }
- dbg_printf("\nBacktracing for thread %04x in process %04x (%s):\n", + dbg_printf("\nBacktracing for thread %04lx in process %04lx (%s):\n", entry.th32ThreadID, dbg_curr_pid, dbg_W2A(dbg_curr_process->imageName, -1)); backtrace_tid(dbg_curr_process, entry.th32ThreadID); diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 08e0317154e..9cbfc8b77de 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -597,7 +597,7 @@ enum dbg_line_status symbol_get_function_line_status(const ADDRESS64* addr) case SymTagFunction: case SymTagPublicSymbol: break; default: - WINE_FIXME("Unexpected sym-tag 0x%08x\n", sym->Tag); + WINE_FIXME("Unexpected sym-tag 0x%08lx\n", sym->Tag); case SymTagData: return dbg_no_line_info; } diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 70ad7e8b437..8c365a1e55d 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -74,7 +74,7 @@ BOOL dbg_attach_debuggee(DWORD pid)
if (!DebugActiveProcess(pid)) { - dbg_printf("Can't attach process %04x: error %u\n", pid, GetLastError()); + dbg_printf("Can't attach process %04lx: error %lu\n", pid, GetLastError()); dbg_del_process(dbg_curr_process); return FALSE; } @@ -196,7 +196,7 @@ static BOOL dbg_exception_prolog(BOOL is_debug, const EXCEPTION_RECORD* rec) HeapFree(GetProcessHeap(), 0, last_file); last_name = strcpy(HeapAlloc(GetProcessHeap(), 0, strlen(si->Name) + 1), si->Name); last_file = strcpy(HeapAlloc(GetProcessHeap(), 0, strlen(il.FileName) + 1), il.FileName); - dbg_printf("%s () at %s:%u\n", last_name, last_file, il.LineNumber); + dbg_printf("%s () at %s:%lu\n", last_name, last_file, il.LineNumber); } } } @@ -234,7 +234,7 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance
assert(dbg_curr_thread);
- WINE_TRACE("exception=%x first_chance=%c\n", + WINE_TRACE("exception=%lx first_chance=%c\n", rec->ExceptionCode, first_chance ? 'Y' : 'N');
switch (rec->ExceptionCode) @@ -251,11 +251,11 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance pThread = dbg_get_thread(dbg_curr_process, pThreadName->dwThreadID); if(!pThread) { - dbg_printf("Thread ID=%04x not in our list of threads -> can't rename\n", pThreadName->dwThreadID); + dbg_printf("Thread ID=%04lx not in our list of threads -> can't rename\n", pThreadName->dwThreadID); return DBG_CONTINUE; } if (dbg_read_memory(pThreadName->szName, pThread->name, 9)) - dbg_printf("Thread ID=%04x renamed using MS VC6 extension (name=="%.9s")\n", + dbg_printf("Thread ID=%04lx renamed using MS VC6 extension (name=="%.9s")\n", pThread->tid, pThread->name); return DBG_CONTINUE; case EXCEPTION_INVALID_HANDLE: @@ -332,12 +332,12 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) case EXCEPTION_DEBUG_EVENT: if (!dbg_curr_thread) { - WINE_ERR("%04x:%04x: not a registered process or thread (perhaps a 16 bit one ?)\n", + WINE_ERR("%04lx:%04lx: not a registered process or thread (perhaps a 16 bit one ?)\n", de->dwProcessId, de->dwThreadId); break; }
- WINE_TRACE("%04x:%04x: exception code=%08x\n", + WINE_TRACE("%04lx:%04lx: exception code=%08lx\n", de->dwProcessId, de->dwThreadId, de->u.Exception.ExceptionRecord.ExceptionCode);
@@ -373,7 +373,7 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) swprintf(u.buffer, ARRAY_SIZE(u.buffer), L"Process_%08x", dbg_curr_pid); }
- WINE_TRACE("%04x:%04x: create process '%s'/%p @%p (%u<%u>)\n", + WINE_TRACE("%04lx:%04lx: create process '%s'/%p @%p (%lu<%lu>)\n", de->dwProcessId, de->dwThreadId, wine_dbgstr_w(u.buffer), de->u.CreateProcessInfo.lpImageName, @@ -386,9 +386,9 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) dbg_printf("Couldn't initiate DbgHelp\n"); if (!dbg_load_module(dbg_curr_process->handle, de->u.CreateProcessInfo.hFile, u.buffer, (DWORD_PTR)de->u.CreateProcessInfo.lpBaseOfImage, 0)) - dbg_printf("couldn't load main module (%u)\n", GetLastError()); + dbg_printf("couldn't load main module (%lu)\n", GetLastError());
- WINE_TRACE("%04x:%04x: create thread I @%p\n", + WINE_TRACE("%04lx:%04lx: create thread I @%p\n", de->dwProcessId, de->dwThreadId, de->u.CreateProcessInfo.lpStartAddress);
dbg_curr_thread = dbg_add_thread(dbg_curr_process, @@ -405,7 +405,7 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) break;
case EXIT_PROCESS_DEBUG_EVENT: - WINE_TRACE("%04x:%04x: exit process (%d)\n", + WINE_TRACE("%04lx:%04lx: exit process (%ld)\n", de->dwProcessId, de->dwThreadId, de->u.ExitProcess.dwExitCode);
if (dbg_curr_process == NULL) @@ -414,11 +414,11 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) break; } tgt_process_active_close_process(dbg_curr_process, FALSE); - dbg_printf("Process of pid=%04x has terminated\n", de->dwProcessId); + dbg_printf("Process of pid=%04lx has terminated\n", de->dwProcessId); break;
case CREATE_THREAD_DEBUG_EVENT: - WINE_TRACE("%04x:%04x: create thread D @%p\n", + WINE_TRACE("%04lx:%04lx: create thread D @%p\n", de->dwProcessId, de->dwThreadId, de->u.CreateThread.lpStartAddress);
if (dbg_curr_process == NULL) @@ -445,7 +445,7 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) break;
case EXIT_THREAD_DEBUG_EVENT: - WINE_TRACE("%04x:%04x: exit thread (%d)\n", + WINE_TRACE("%04lx:%04lx: exit thread (%ld)\n", de->dwProcessId, de->dwThreadId, de->u.ExitThread.dwExitCode);
if (dbg_curr_thread == NULL) @@ -466,7 +466,7 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) fetch_module_name(de->u.LoadDll.lpImageName, de->u.LoadDll.lpBaseOfDll, u.buffer, ARRAY_SIZE(u.buffer));
- WINE_TRACE("%04x:%04x: loads DLL %s @%p (%u<%u>)\n", + WINE_TRACE("%04lx:%04lx: loads DLL %s @%p (%lu<%lu>)\n", de->dwProcessId, de->dwThreadId, wine_dbgstr_w(u.buffer), de->u.LoadDll.lpBaseOfDll, de->u.LoadDll.dwDebugInfoFileOffset, @@ -485,7 +485,7 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) break;
case UNLOAD_DLL_DEBUG_EVENT: - WINE_TRACE("%04x:%04x: unload DLL @%p\n", + WINE_TRACE("%04lx:%04lx: unload DLL @%p\n", de->dwProcessId, de->dwThreadId, de->u.UnloadDll.lpBaseOfDll); break_delete_xpoints_from_module((DWORD_PTR)de->u.UnloadDll.lpBaseOfDll); @@ -502,18 +502,18 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) memory_get_string(dbg_curr_process, de->u.DebugString.lpDebugStringData, TRUE, de->u.DebugString.fUnicode, u.bufferA, sizeof(u.bufferA)); - WINE_TRACE("%04x:%04x: output debug string (%s)\n", + WINE_TRACE("%04lx:%04lx: output debug string (%s)\n", de->dwProcessId, de->dwThreadId, u.bufferA); break;
case RIP_EVENT: - WINE_TRACE("%04x:%04x: rip error=%u type=%u\n", + WINE_TRACE("%04lx:%04lx: rip error=%lu type=%lu\n", de->dwProcessId, de->dwThreadId, de->u.RipInfo.dwError, de->u.RipInfo.dwType); break;
default: - WINE_TRACE("%04x:%04x: unknown event (%x)\n", + WINE_TRACE("%04lx:%04lx: unknown event (%lx)\n", de->dwProcessId, de->dwThreadId, de->dwDebugEventCode); } if (!cont) return TRUE; /* stop execution */ @@ -537,12 +537,12 @@ static void dbg_resume_debuggee(DWORD cont) if (dbg_curr_thread) { if (!dbg_curr_process->be_cpu->set_context(dbg_curr_thread->handle, &dbg_context)) - dbg_printf("Cannot set ctx on %04x\n", dbg_curr_tid); + dbg_printf("Cannot set ctx on %04lx\n", dbg_curr_tid); } } dbg_interactiveP = FALSE; if (!ContinueDebugEvent(dbg_curr_pid, dbg_curr_tid, cont)) - dbg_printf("Cannot continue on %04x (%08x)\n", dbg_curr_tid, cont); + dbg_printf("Cannot continue on %04lx (%08lx)\n", dbg_curr_tid, cont); }
static void wait_exception(void) @@ -836,7 +836,7 @@ static const char *get_windows_version(void) } }
- snprintf( str, sizeof(str), "%d.%d (%d)", info.dwMajorVersion, + snprintf( str, sizeof(str), "%ld.%ld (%d)", info.dwMajorVersion, info.dwMinorVersion, info.wProductType ); return str; } diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index 368870bde42..6a947cbc2db 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -245,7 +245,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) const char *str; char tmp[128];
- dbg_printf("WineDbg starting on minidump on pid %04x\n", pid); + dbg_printf("WineDbg starting on minidump on pid %04lx\n", pid); switch (msi->ProcessorArchitecture) { case PROCESSOR_ARCHITECTURE_UNKNOWN: @@ -379,7 +379,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) break; default: str = "???"; break; } - dbg_printf(" on Windows %s (%u)\n", str, msi->BuildNumber); + dbg_printf(" on Windows %s (%lu)\n", str, msi->BuildNumber); /* FIXME CSD: msi->CSDVersionRva */
if (sizeof(MINIDUMP_SYSTEM_INFO) + 4 > dir->Location.DataSize && diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 1383f025430..50d1f1b8353 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -68,7 +68,7 @@ dbg_lgint_t types_extract_as_lgint(const struct dbg_lvalue* lvalue, { return (LONG_PTR)memory_to_linear_addr(&lvalue->addr); } - if (tag != SymTagBaseType && lvalue->bitlen) dbg_printf("Unexpected bitfield on tag %d\n", tag); + if (tag != SymTagBaseType && lvalue->bitlen) dbg_printf("Unexpected bitfield on tag %ld\n", tag);
if (psize) *psize = 0; if (issigned) *issigned = FALSE; @@ -124,7 +124,7 @@ dbg_lgint_t types_extract_as_lgint(const struct dbg_lvalue* lvalue, rtn = (ULONG_PTR)memory_to_linear_addr(&lvalue->addr); break; default: - WINE_FIXME("Unsupported tag %u\n", tag); + WINE_FIXME("Unsupported tag %lu\n", tag); RaiseException(DEBUG_STATUS_NOT_AN_INTEGER, 0, 0, NULL); }
@@ -540,7 +540,7 @@ void print_value(const struct dbg_lvalue* lvalue, char format, int level) print_value(&lvalue_field, format, level); break; default: - WINE_FIXME("Unknown tag (%u)\n", tag); + WINE_FIXME("Unknown tag (%lu)\n", tag); RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); break; } @@ -555,7 +555,7 @@ static BOOL CALLBACK print_types_cb(PSYMBOL_INFO sym, ULONG size, void* ctx) struct dbg_type type; type.module = sym->ModBase; type.id = sym->TypeIndex; - dbg_printf("Mod: %0*Ix ID: %08x\n", ADDRWIDTH, type.module, type.id); + dbg_printf("Mod: %0*Ix ID: %08lx\n", ADDRWIDTH, type.module, type.id); types_print_type(&type, TRUE); dbg_printf("\n"); return TRUE; @@ -586,7 +586,7 @@ BOOL types_print_type(const struct dbg_type* type, BOOL details)
if (type->id == dbg_itype_none || !types_get_info(type, TI_GET_SYMTAG, &tag)) { - dbg_printf("--invalid--<%xh>--", type->id); + dbg_printf("--invalid--<%lxh>--", type->id); return FALSE; }
@@ -610,7 +610,7 @@ BOOL types_print_type(const struct dbg_type* type, BOOL details) case UdtStruct: dbg_printf("struct %ls", name); break; case UdtUnion: dbg_printf("union %ls", name); break; case UdtClass: dbg_printf("class %ls", name); break; - default: WINE_ERR("Unsupported UDT type (%d) for %ls\n", udt, name); break; + default: WINE_ERR("Unsupported UDT type (%ld) for %ls\n", udt, name); break; } if (details && types_get_info(type, TI_GET_CHILDRENCOUNT, &count)) @@ -654,7 +654,7 @@ BOOL types_print_type(const struct dbg_type* type, BOOL details) subtype.module = type->module; types_print_type(&subtype, details); if (types_get_info(type, TI_GET_COUNT, &count)) - dbg_printf(" %ls[%d]", name, count); + dbg_printf(" %ls[%ld]", name, count); else dbg_printf(" %ls[]", name); break; @@ -706,7 +706,7 @@ BOOL types_print_type(const struct dbg_type* type, BOOL details) dbg_printf("%ls", name); break; default: - WINE_ERR("Unknown type %u for %ls\n", tag, name); + WINE_ERR("Unknown type %lu for %ls\n", tag, name); break; }
@@ -744,7 +744,7 @@ BOOL types_get_info(const struct dbg_type* type, IMAGEHLP_SYMBOL_TYPE_INFO ti, v case btLong: name = L"long int"; break; case btULong: name = L"unsigned long int"; break; case btComplex: name = L"complex"; break; - default: WINE_FIXME("Unsupported basic type %u\n", bt); return FALSE; + default: WINE_FIXME("Unsupported basic type %lu\n", bt); return FALSE; } X(WCHAR*) = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(name) + 1) * sizeof(WCHAR)); if (X(WCHAR*)) @@ -913,7 +913,7 @@ BOOL types_get_info(const struct dbg_type* type, IMAGEHLP_SYMBOL_TYPE_INFO ti, v default: WINE_FIXME("unsupported %u for XMM register\n", ti); return FALSE; } break; - default: WINE_FIXME("unsupported type id 0x%x\n", type->id); + default: WINE_FIXME("unsupported type id 0x%lx\n", type->id); }
#undef X @@ -1053,7 +1053,7 @@ BOOL types_compare(struct dbg_type type1, struct dbg_type type2, BOOL* equal) /* compare argument type */ break; default: - dbg_printf("Unsupported yet tag %d\n", tag1); + dbg_printf("Unsupported yet tag %ld\n", tag1); return FALSE; } } while (types_get_info(&type1, TI_GET_TYPE, &type1.id) && diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index dab5fbd85a3..95318eeb2f1 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -451,7 +451,7 @@ struct dbg_thread* dbg_add_thread(struct dbg_process* p, DWORD tid, t->addr_mode = AddrModeFlat; t->suspended = FALSE;
- snprintf(t->name, sizeof(t->name), "%04x", tid); + snprintf(t->name, sizeof(t->name), "%04lx", tid);
list_add_head(&p->threads, &t->entry);
@@ -569,7 +569,7 @@ void dbg_start_interactive(const char* filename, HANDLE hFile)
if (dbg_curr_process) { - dbg_printf("WineDbg starting on pid %04x\n", dbg_curr_pid); + dbg_printf("WineDbg starting on pid %04lx\n", dbg_curr_pid); if (dbg_curr_process->active_debuggee) dbg_active_wait_for_first_exception(); }
@@ -614,7 +614,7 @@ static void restart_if_wow64(void) 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 ); } } @@ -680,7 +680,7 @@ int main(int argc, char** argv) hFile = parser_generate_command_file(argv[0], NULL); if (hFile == INVALID_HANDLE_VALUE) { - dbg_printf("Couldn't open temp file (%u)\n", GetLastError()); + dbg_printf("Couldn't open temp file (%lu)\n", GetLastError()); return 1; } argc--; argv++; @@ -694,7 +694,7 @@ int main(int argc, char** argv) NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); if (hFile == INVALID_HANDLE_VALUE) { - dbg_printf("Couldn't open file %s (%u)\n", argv[0], GetLastError()); + dbg_printf("Couldn't open file %s (%lu)\n", argv[0], GetLastError()); return 1; } argc--; argv++;
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/winedevice/Makefile.in | 1 - programs/winedevice/device.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/programs/winedevice/Makefile.in b/programs/winedevice/Makefile.in index dd5349418a9..6f3868013d1 100644 --- a/programs/winedevice/Makefile.in +++ b/programs/winedevice/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winedevice.exe IMPORTS = advapi32 ntoskrnl
diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 07a76b911e9..0a96307a017 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -86,7 +86,7 @@ static DWORD device_handler( DWORD ctrl, const WCHAR *driver_name ) break;
default: - FIXME( "got driver ctrl %x for %s\n", ctrl, wine_dbgstr_w(driver_name) ); + FIXME( "got driver ctrl %lx for %s\n", ctrl, wine_dbgstr_w(driver_name) ); break; }
@@ -113,7 +113,7 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ SetEvent( stop_event ); return NO_ERROR; default: - FIXME( "got service ctrl %x for %s\n", ctrl, wine_dbgstr_w(service_group) ); + FIXME( "got service ctrl %lx for %s\n", ctrl, wine_dbgstr_w(service_group) ); set_service_status( service_handle, SERVICE_RUNNING, SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN ); return NO_ERROR;
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/winemenubuilder/Makefile.in | 1 programs/winemenubuilder/winemenubuilder.c | 72 ++++++++++++++-------------- 2 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in index fe144efc53d..12326d1e4e2 100644 --- a/programs/winemenubuilder/Makefile.in +++ b/programs/winemenubuilder/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winemenubuilder.exe IMPORTS = uuid windowscodecs shell32 shlwapi ole32 user32 advapi32
diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 16dc32a8859..ab8798a88b5 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -361,33 +361,33 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indices, int numInd &IID_IWICImagingFactory, (void**)&factory); if (FAILED(hr)) { - WINE_ERR("error 0x%08X creating IWICImagingFactory\n", hr); + WINE_ERR("error 0x%08lX creating IWICImagingFactory\n", hr); goto end; } hr = IWICImagingFactory_CreateDecoderFromStream(factory, icoFile, NULL, WICDecodeMetadataCacheOnDemand, &decoder); if (FAILED(hr)) { - WINE_ERR("error 0x%08X creating IWICBitmapDecoder\n", hr); + WINE_ERR("error 0x%08lX creating IWICBitmapDecoder\n", hr); goto end; } hr = CoCreateInstance(outputFormat, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapEncoder, (void**)&encoder); if (FAILED(hr)) { - WINE_ERR("error 0x%08X creating bitmap encoder\n", hr); + WINE_ERR("error 0x%08lX creating bitmap encoder\n", hr); goto end; } hr = SHCreateStreamOnFileW(outputFileName, STGM_CREATE | STGM_WRITE, &outputFile); if (FAILED(hr)) { - WINE_ERR("error 0x%08X creating output file %s\n", hr, wine_dbgstr_w(outputFileName)); + WINE_ERR("error 0x%08lX creating output file %s\n", hr, wine_dbgstr_w(outputFileName)); goto end; } hr = IWICBitmapEncoder_Initialize(encoder, outputFile, WICBitmapEncoderNoCache); if (FAILED(hr)) { - WINE_ERR("error 0x%08X initializing encoder\n", hr); + WINE_ERR("error 0x%08lX initializing encoder\n", hr); goto end; }
@@ -402,55 +402,55 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indices, int numInd hr = IWICBitmapDecoder_GetFrame(decoder, indices[i], &sourceFrame); if (FAILED(hr)) { - WINE_ERR("error 0x%08X getting frame %d\n", hr, indices[i]); + WINE_ERR("error 0x%08lX getting frame %d\n", hr, indices[i]); goto endloop; } hr = WICConvertBitmapSource(&GUID_WICPixelFormat32bppBGRA, (IWICBitmapSource*)sourceFrame, &sourceBitmap); if (FAILED(hr)) { - WINE_ERR("error 0x%08X converting bitmap to 32bppBGRA\n", hr); + WINE_ERR("error 0x%08lX converting bitmap to 32bppBGRA\n", hr); goto endloop; } hr = IWICBitmapEncoder_CreateNewFrame(encoder, &dstFrame, &options); if (FAILED(hr)) { - WINE_ERR("error 0x%08X creating encoder frame\n", hr); + WINE_ERR("error 0x%08lX creating encoder frame\n", hr); goto endloop; } hr = IWICBitmapFrameEncode_Initialize(dstFrame, options); if (FAILED(hr)) { - WINE_ERR("error 0x%08X initializing encoder frame\n", hr); + WINE_ERR("error 0x%08lX initializing encoder frame\n", hr); goto endloop; } hr = IWICBitmapSource_GetSize(sourceBitmap, &width, &height); if (FAILED(hr)) { - WINE_ERR("error 0x%08X getting source bitmap size\n", hr); + WINE_ERR("error 0x%08lX getting source bitmap size\n", hr); goto endloop; } hr = IWICBitmapFrameEncode_SetSize(dstFrame, width, height); if (FAILED(hr)) { - WINE_ERR("error 0x%08X setting destination bitmap size\n", hr); + WINE_ERR("error 0x%08lX setting destination bitmap size\n", hr); goto endloop; } hr = IWICBitmapFrameEncode_SetResolution(dstFrame, 96, 96); if (FAILED(hr)) { - WINE_ERR("error 0x%08X setting destination bitmap resolution\n", hr); + WINE_ERR("error 0x%08lX setting destination bitmap resolution\n", hr); goto endloop; } hr = IWICBitmapFrameEncode_WriteSource(dstFrame, sourceBitmap, NULL); if (FAILED(hr)) { - WINE_ERR("error 0x%08X copying bitmaps\n", hr); + WINE_ERR("error 0x%08lX copying bitmaps\n", hr); goto endloop; } hr = IWICBitmapFrameEncode_Commit(dstFrame); if (FAILED(hr)) { - WINE_ERR("error 0x%08X committing frame\n", hr); + WINE_ERR("error 0x%08lX committing frame\n", hr); goto endloop; } endloop: @@ -467,7 +467,7 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indices, int numInd hr = IWICBitmapEncoder_Commit(encoder); if (FAILED(hr)) { - WINE_ERR("error 0x%08X committing encoder\n", hr); + WINE_ERR("error 0x%08lX committing encoder\n", hr); goto end; }
@@ -619,7 +619,7 @@ static IStream *add_module_icons_to_stream(struct IconData16 *iconData16, HMODUL hr = IStream_Write(stream, &iconDir, sizeof(iconDir), &bytesWritten); if (FAILED(hr) || bytesWritten != sizeof(iconDir)) { - WINE_ERR("error 0x%08X writing icon stream\n", hr); + WINE_ERR("error 0x%08lX writing icon stream\n", hr); goto end; } for (i = 0; i < validEntries; i++) @@ -627,13 +627,13 @@ static IStream *add_module_icons_to_stream(struct IconData16 *iconData16, HMODUL hr = IStream_Write(stream, iconDirEntries, validEntries*sizeof(ICONDIRENTRY), &bytesWritten); if (FAILED(hr) || bytesWritten != validEntries*sizeof(ICONDIRENTRY)) { - WINE_ERR("error 0x%08X writing icon dir entries to stream\n", hr); + WINE_ERR("error 0x%08lX writing icon dir entries to stream\n", hr); goto end; } hr = IStream_Write(stream, icons, iconOffset, &bytesWritten); if (FAILED(hr) || bytesWritten != iconOffset) { - WINE_ERR("error 0x%08X writing icon images to stream\n", hr); + WINE_ERR("error 0x%08lX writing icon images to stream\n", hr); goto end; } zero.QuadPart = 0; @@ -671,14 +671,14 @@ static HRESULT open_module16_icon(LPCWSTR szFileName, int nIndex, IStream **ppSt OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, NULL); if (hFile == INVALID_HANDLE_VALUE) { - WINE_WARN("opening %s failed with error %d\n", wine_dbgstr_w(szFileName), GetLastError()); + WINE_WARN("opening %s failed with error %ld\n", wine_dbgstr_w(szFileName), GetLastError()); goto end; }
hFileMapping = CreateFileMappingW(hFile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL); if (hFileMapping == NULL) { - WINE_WARN("CreateFileMapping failed, error %d\n", GetLastError()); + WINE_WARN("CreateFileMapping failed, error %ld\n", GetLastError()); goto end; }
@@ -687,7 +687,7 @@ static HRESULT open_module16_icon(LPCWSTR szFileName, int nIndex, IStream **ppSt fileBytes = MapViewOfFile(hFileMapping, FILE_MAP_READ, 0, 0, 0); if (fileBytes == NULL) { - WINE_WARN("MapViewOfFile failed, error %d\n", GetLastError()); + WINE_WARN("MapViewOfFile failed, error %ld\n", GetLastError()); goto end; }
@@ -810,7 +810,7 @@ static HRESULT open_module_icon(LPCWSTR szFileName, int nIndex, IStream **ppStre return open_module16_icon(szFileName, nIndex, ppStream); else { - WINE_WARN("LoadLibraryExW (%s) failed, error %d\n", + WINE_WARN("LoadLibraryExW (%s) failed, error %ld\n", wine_dbgstr_w(szFileName), GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); } @@ -819,7 +819,7 @@ static HRESULT open_module_icon(LPCWSTR szFileName, int nIndex, IStream **ppStre if (nIndex < 0) { hResInfo = FindResourceW(hModule, MAKEINTRESOURCEW(-nIndex), (LPCWSTR)RT_GROUP_ICON); - WINE_TRACE("FindResourceW (%s) called, return %p, error %d\n", + WINE_TRACE("FindResourceW (%s) called, return %p, error %ld\n", wine_dbgstr_w(szFileName), hResInfo, GetLastError()); } else @@ -831,7 +831,7 @@ static HRESULT open_module_icon(LPCWSTR szFileName, int nIndex, IStream **ppStre EnumResNameProc, (LONG_PTR)&sEnumRes) && sEnumRes.nIndex != -1) { - WINE_TRACE("EnumResourceNamesW failed, error %d\n", GetLastError()); + WINE_TRACE("EnumResourceNamesW failed, error %ld\n", GetLastError()); } }
@@ -872,7 +872,7 @@ static HRESULT read_ico_direntries(IStream *icoStream, ICONDIRENTRY **ppIconDirE if (FAILED(hr) || bytesRead != sizeof(ICONDIR) || (iconDir.idReserved != 0) || (iconDir.idType != 1)) { - WINE_WARN("Invalid ico file format (hr=0x%08X, bytesRead=%d)\n", hr, bytesRead); + WINE_WARN("Invalid ico file format (hr=0x%08lX, bytesRead=%ld)\n", hr, bytesRead); hr = E_FAIL; goto end; } @@ -1143,12 +1143,12 @@ static WCHAR *extract_icon(LPCWSTR icoPathW, int index, const WCHAR *destFilenam hr = open_icon(icoPathW, index, bWait, &stream, &pIconDirEntries, &numEntries); if (FAILED(hr)) { - WINE_WARN("opening icon %s index %d failed, hr=0x%08X\n", wine_dbgstr_w(icoPathW), index, hr); + WINE_WARN("opening icon %s index %d failed, hr=0x%08lX\n", wine_dbgstr_w(icoPathW), index, hr); goto end; } hr = platform_write_icon(stream, pIconDirEntries, numEntries, index, icoPathW, destFilename, &nativeIdentifier); if (FAILED(hr)) - WINE_WARN("writing icon failed, error 0x%08X\n", hr); + WINE_WARN("writing icon failed, error 0x%08lX\n", hr);
end: if (stream) @@ -2376,7 +2376,7 @@ static BOOL WaitForParentProcess( void ) if ((hsnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 )) == INVALID_HANDLE_VALUE) { - WINE_ERR("CreateToolhelp32Snapshot failed, error %d\n", GetLastError()); + WINE_ERR("CreateToolhelp32Snapshot failed, error %ld\n", GetLastError()); goto done; }
@@ -2389,14 +2389,14 @@ static BOOL WaitForParentProcess( void ) } if (!rc) { - WINE_WARN("Unable to find current process id %d when listing processes\n", ourpid); + WINE_WARN("Unable to find current process id %ld when listing processes\n", ourpid); goto done; }
if ((hprocess = OpenProcess( SYNCHRONIZE, FALSE, procentry.th32ParentProcessID )) == NULL) { - WINE_WARN("OpenProcess failed pid=%d, error %d\n", procentry.th32ParentProcessID, + WINE_WARN("OpenProcess failed pid=%ld, error %ld\n", procentry.th32ParentProcessID, GetLastError()); goto done; } @@ -2404,7 +2404,7 @@ static BOOL WaitForParentProcess( void ) if (MsgWaitForMultipleObjects( 1, &hprocess, FALSE, INFINITE, QS_ALLINPUT ) == WAIT_OBJECT_0) ret = TRUE; else - WINE_ERR("Unable to wait for parent process, error %d\n", GetLastError()); + WINE_ERR("Unable to wait for parent process, error %ld\n", GetLastError());
done: if (hprocess) CloseHandle( hprocess ); @@ -2615,7 +2615,7 @@ static void cleanup_menus(void) i++; } else if (lret != ERROR_NO_MORE_ITEMS) - WINE_ERR("error %d reading registry\n", lret); + WINE_ERR("error %ld reading registry\n", lret); heap_free(value); heap_free(data); } @@ -2651,21 +2651,21 @@ static void thumbnail_lnk(LPCWSTR lnkPath, LPCWSTR outputPath) &IID_IShellLinkW, (LPVOID*)&shellLink); if (FAILED(hr)) { - WINE_ERR("could not create IShellLinkW, error 0x%08X\n", hr); + WINE_ERR("could not create IShellLinkW, error 0x%08lX\n", hr); goto end; }
hr = IShellLinkW_QueryInterface(shellLink, &IID_IPersistFile, (LPVOID)&persistFile); if (FAILED(hr)) { - WINE_ERR("could not query IPersistFile, error 0x%08X\n", hr); + WINE_ERR("could not query IPersistFile, error 0x%08lX\n", hr); goto end; }
hr = IPersistFile_Load(persistFile, winLnkPath, STGM_READ); if (FAILED(hr)) { - WINE_ERR("could not read .lnk, error 0x%08X\n", hr); + WINE_ERR("could not read .lnk, error 0x%08lX\n", hr); goto end; }
@@ -2808,7 +2808,7 @@ int PASCAL wWinMain (HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sh hr = CoInitialize(NULL); if (FAILED(hr)) { - WINE_ERR("could not initialize COM, error 0x%08X\n", hr); + WINE_ERR("could not initialize COM, error 0x%08lX\n", hr); return 1; }
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/winemsibuilder/Makefile.in | 1 - programs/winemsibuilder/main.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/programs/winemsibuilder/Makefile.in b/programs/winemsibuilder/Makefile.in index 97ad6f13074..b9e73869645 100644 --- a/programs/winemsibuilder/Makefile.in +++ b/programs/winemsibuilder/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winemsibuilder.exe IMPORTS = msi ole32
diff --git a/programs/winemsibuilder/main.c b/programs/winemsibuilder/main.c index e6c1a4d0f79..3b1221860b3 100644 --- a/programs/winemsibuilder/main.c +++ b/programs/winemsibuilder/main.c @@ -188,7 +188,7 @@ static int add_stream( const WCHAR *msifile, const WCHAR *stream, const WCHAR *f hr = StgOpenStorage( msifile, NULL, STGM_TRANSACTED|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, NULL, 0, &stg ); if (hr != S_OK) { - WINE_WARN( "failed to open storage %s (0x%08x)\n", wine_dbgstr_w(msifile), hr ); + WINE_WARN( "failed to open storage %s (0x%08lx)\n", wine_dbgstr_w(msifile), hr ); return 1; } encname = encode_stream( stream ); @@ -200,13 +200,13 @@ static int add_stream( const WCHAR *msifile, const WCHAR *stream, const WCHAR *f hr = IStorage_CreateStream( stg, encname, STGM_CREATE|STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, 0, &stm ); if (hr != S_OK) { - WINE_WARN( "failed to create stream %s (0x%08x)\n", wine_dbgstr_w(encname), hr ); + WINE_WARN( "failed to create stream %s (0x%08lx)\n", wine_dbgstr_w(encname), hr ); goto done; } handle = CreateFileW( file, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ); if (handle == INVALID_HANDLE_VALUE) { - WINE_WARN( "failed to open file %s (%u)\n", wine_dbgstr_w(file), GetLastError() ); + WINE_WARN( "failed to open file %s (%lu)\n", wine_dbgstr_w(file), GetLastError() ); goto done; } low = GetFileSize( handle, &high );
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/winetest/Makefile.in | 1 - programs/winetest/main.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 3f823f46946..c4d505e4545 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winetest.exe IMPORTS = uuid comctl32 version user32 gdi32 advapi32 wsock32 msvcrt DELAYIMPORTS = ole32 diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 3ffb0185052..b5c3cc54487 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -124,7 +124,7 @@ static char * get_file_version(char * file_name) VS_FIXEDFILEINFO *pFixedVersionInfo; UINT len; if (VerQueryValueA(data, backslash, (LPVOID *)&pFixedVersionInfo, &len)) { - sprintf(version, "%d.%d.%d.%d", + sprintf(version, "%ld.%ld.%ld.%ld", pFixedVersionInfo->dwFileVersionMS >> 16, pFixedVersionInfo->dwFileVersionMS & 0xffff, pFixedVersionInfo->dwFileVersionLS >> 16, @@ -132,14 +132,14 @@ static char * get_file_version(char * file_name) } else sprintf(version, "version not found"); } else - sprintf(version, "version error %u", GetLastError()); + sprintf(version, "version error %lu", GetLastError()); heap_free(data); } else sprintf(version, "version error %u", ERROR_OUTOFMEMORY); } else if (GetLastError() == ERROR_FILE_NOT_FOUND) sprintf(version, "dll is missing"); else - sprintf(version, "version not present %u", GetLastError()); + sprintf(version, "version not present %lu", GetLastError());
return version; }
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/winhlp32/Makefile.in | 1 - programs/winhlp32/hlpfile.c | 38 +++++++++++++++--------------- programs/winhlp32/macro.c | 52 +++++++++++++++++++++-------------------- programs/winhlp32/winhelp.c | 6 ++--- 4 files changed, 48 insertions(+), 49 deletions(-)
diff --git a/programs/winhlp32/Makefile.in b/programs/winhlp32/Makefile.in index 2e712952725..79841972fd0 100644 --- a/programs/winhlp32/Makefile.in +++ b/programs/winhlp32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winhlp32.exe IMPORTS = user32 gdi32 DELAYIMPORTS = shell32 comctl32 comdlg32 diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 3ade6c1d5d0..73c4f4a27af 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -250,7 +250,7 @@ static void HLPFILE_Uncompress2(HLPFILE* hlpfile, const BYTE *ptr, const BYTE *e
if (newptr + (phend - phptr) > newend) { - WINE_FIXME("buffer overflow %p > %p for %lu bytes\n", + WINE_FIXME("buffer overflow %p > %p for %Iu bytes\n", newptr, newend, (SIZE_T)(phend - phptr)); return; } @@ -356,7 +356,7 @@ static void HLPFILE_UncompressRLE(const BYTE* src, const BYTE* end, BYTE* dst, u dst += ch; } if (dst != sdst) - WINE_WARN("Buffer X-flow: d(%lu) instead of d(%u)\n", + WINE_WARN("Buffer X-flow: d(%Iu) instead of d(%u)\n", (SIZE_T)(dst - (sdst - dstsz)), dstsz); }
@@ -373,7 +373,7 @@ HLPFILE_PAGE *HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset, ULONG* relativ
if (!hlpfile) return 0;
- WINE_TRACE("<%s>[%x]\n", debugstr_a(hlpfile->lpszPath), offset); + WINE_TRACE("<%s>[%lx]\n", debugstr_a(hlpfile->lpszPath), offset);
if (offset == 0xFFFFFFFF) return NULL; page = NULL; @@ -387,7 +387,7 @@ HLPFILE_PAGE *HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset, ULONG* relativ } } if (!found) - WINE_ERR("Page of offset %u not found in file %s\n", + WINE_ERR("Page of offset %lu not found in file %s\n", offset, debugstr_a(hlpfile->lpszPath)); return found; } @@ -424,7 +424,7 @@ static int comp_PageByHash(void *p, const void *key, LONG lTest = (INT)GET_UINT(p, 0);
*next = (char *)p+(leaf?8:6); - WINE_TRACE("Comparing '%d' with '%d'\n", lKey, lTest); + WINE_TRACE("Comparing '%ld' with '%ld'\n", lKey, lTest); if (lTest < lKey) return -1; if (lTest > lKey) return 1; return 0; @@ -441,7 +441,7 @@ HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash, ULONG* relative) if (!hlpfile) return NULL; if (!lHash) return HLPFILE_Contents(hlpfile, relative);
- WINE_TRACE("<%s>[%x]\n", debugstr_a(hlpfile->lpszPath), lHash); + WINE_TRACE("<%s>[%lx]\n", debugstr_a(hlpfile->lpszPath), lHash);
/* For win 3.0 files hash values are really page numbers */ if (hlpfile->version <= 16) @@ -453,7 +453,7 @@ HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash, ULONG* relative) ptr = HLPFILE_BPTreeSearch(hlpfile->Context, LongToPtr(lHash), comp_PageByHash); if (!ptr) { - WINE_ERR("Page of hash %x not found in file %s\n", lHash, debugstr_a(hlpfile->lpszPath)); + WINE_ERR("Page of hash %lx not found in file %s\n", lHash, debugstr_a(hlpfile->lpszPath)); return NULL; }
@@ -470,7 +470,7 @@ HLPFILE_PAGE *HLPFILE_PageByMap(HLPFILE* hlpfile, LONG lMap, ULONG* relative)
if (!hlpfile) return 0;
- WINE_TRACE("<%s>[%x]\n", debugstr_a(hlpfile->lpszPath), lMap); + WINE_TRACE("<%s>[%lx]\n", debugstr_a(hlpfile->lpszPath), lMap);
for (i = 0; i < hlpfile->wMapLen; i++) { @@ -478,7 +478,7 @@ HLPFILE_PAGE *HLPFILE_PageByMap(HLPFILE* hlpfile, LONG lMap, ULONG* relative) return HLPFILE_PageByOffset(hlpfile, hlpfile->Map[i].offset, relative); }
- WINE_ERR("Page of Map %x not found in file %s\n", lMap, debugstr_a(hlpfile->lpszPath)); + WINE_ERR("Page of Map %lx not found in file %s\n", lMap, debugstr_a(hlpfile->lpszPath)); return NULL; }
@@ -990,7 +990,7 @@ static BOOL HLPFILE_RtfAddBitmap(struct RtfData* rd, HLPFILE* file, const BYTE* if (bi->bmiHeader.biBitCount > 32) WINE_FIXME("Unknown bit count %u\n", bi->bmiHeader.biBitCount); if (bi->bmiHeader.biPlanes != 1) WINE_FIXME("Unsupported planes %u\n", bi->bmiHeader.biPlanes); bi->bmiHeader.biSizeImage = (((bi->bmiHeader.biWidth * bi->bmiHeader.biBitCount + 31) & ~31) / 8) * bi->bmiHeader.biHeight; - WINE_TRACE("planes=%d bc=%d size=(%d,%d)\n", + WINE_TRACE("planes=%d bc=%d size=(%ld,%ld)\n", bi->bmiHeader.biPlanes, bi->bmiHeader.biBitCount, bi->bmiHeader.biWidth, bi->bmiHeader.biHeight);
@@ -1032,14 +1032,14 @@ static BOOL HLPFILE_RtfAddBitmap(struct RtfData* rd, HLPFILE* file, const BYTE* if (!HLPFILE_RtfAddControl(rd, "{\pict")) goto done; if (type == 0x06) { - sprintf(tmp, "\dibitmap0\picw%d\pich%d", + sprintf(tmp, "\dibitmap0\picw%ld\pich%ld", bi->bmiHeader.biWidth, bi->bmiHeader.biHeight); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; if (!HLPFILE_RtfAddHexBytes(rd, bi, sizeof(*bi) + nc * sizeof(RGBQUAD))) goto done; } else { - sprintf(tmp, "\wbitmap0\wbmbitspixel%d\wbmplanes%d\picw%d\pich%d", + sprintf(tmp, "\wbitmap0\wbmbitspixel%d\wbmplanes%d\picw%ld\pich%ld", bi->bmiHeader.biBitCount, bi->bmiHeader.biPlanes, bi->bmiHeader.biWidth, bi->bmiHeader.biHeight); if (!HLPFILE_RtfAddControl(rd, tmp)) goto done; @@ -1088,7 +1088,7 @@ static BOOL HLPFILE_RtfAddMetaFile(struct RtfData* rd, HLPFILE* file, const
HLPFILE_AddHotSpotLinks(rd, file, beg, hs_size, hs_offset);
- WINE_TRACE("sz=%u csz=%u offs=%u/%u,%u/%u\n", + WINE_TRACE("sz=%lu csz=%lu offs=%lu/%lu,%lu/%lu\n", size, csize, off, (ULONG)(ptr - beg), hs_size, hs_offset);
bits = HLPFILE_DecompressGfx(beg + off, csize, size, pack, &alloc); @@ -1206,7 +1206,7 @@ static HLPFILE_LINK* HLPFILE_AllocLink(struct RtfData* rd, int cookie, else rd->current_link = link;
- WINE_TRACE("Link[%d] to %s@%08x:%d\n", + WINE_TRACE("Link[%d] to %s@%08lx:%d\n", link->cookie, debugstr_a(link->string), link->hash, link->window); return link; } @@ -1323,7 +1323,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, lastcol = -1; for (nc = 0; nc < ncol; /**/) { - WINE_TRACE("looking for format at offset %lu in column %d\n", (SIZE_T)(format - (buf + 0x15)), nc); + WINE_TRACE("looking for format at offset %Iu in column %d\n", (SIZE_T)(format - (buf + 0x15)), nc); if (!HLPFILE_RtfAddControl(rd, "\pard")) goto done; if (buf[0x14] == HLP_TABLE) { @@ -1566,7 +1566,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, rd->char_pos++; break; case 1: - WINE_FIXME("does it work ??? %x<%u>#%u\n", + WINE_FIXME("does it work ??? %x<%lu>#%u\n", GET_SHORT(format, 0), size, GET_SHORT(format, 2)); HLPFILE_RtfAddGfxByAddr(rd, page->file, format + 2, size - 4); @@ -2131,7 +2131,7 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile) wi->win_style = WS_OVERLAPPEDWINDOW; wi->sr_color = (flags & 0x0100) ? GET_UINT(ptr, 86) : 0xFFFFFF; wi->nsr_color = (flags & 0x0200) ? GET_UINT(ptr, 90) : 0xFFFFFF; - WINE_TRACE("System-Window: flags=%c%c%c%c%c%c%c%c type=%s name=%s caption=%s (%d,%d)x(%d,%d)\n", + WINE_TRACE("System-Window: flags=%c%c%c%c%c%c%c%c type=%s name=%s caption=%s (%ld,%ld)x(%ld,%ld)\n", flags & 0x0001 ? 'T' : 't', flags & 0x0002 ? 'N' : 'n', flags & 0x0004 ? 'C' : 'c', @@ -2604,7 +2604,7 @@ static BOOL HLPFILE_AddPage(HLPFILE *hlpfile, const BYTE *buf, const BYTE *end, page->browse_fwd = hlpfile->TOMap[page->browse_fwd]; }
- WINE_TRACE("Added page[%d]: title=%s %08x << %08x >> %08x\n", + WINE_TRACE("Added page[%d]: title=%s %08lx << %08x >> %08lx\n", page->wNumber, debugstr_a(page->lpszTitle), page->browse_bwd, page->offset, page->browse_fwd);
@@ -2707,7 +2707,7 @@ static BOOL HLPFILE_DoReadHlpFile(HLPFILE *hlpfile, LPCSTR lpszPath) offset -= 12; }
- WINE_TRACE("ref=%08x => [%u/%u]\n", ref, index, offset); + WINE_TRACE("ref=%08lx => [%u/%u]\n", ref, index, offset);
if (index >= hlpfile->topic_maplen) {WINE_WARN("maplen\n"); break;} buf = hlpfile->topic_map[index] + offset; diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index 280e6182361..777efbbf74f 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -160,12 +160,12 @@ void CALLBACK MACRO_About(void)
static void CALLBACK MACRO_AddAccelerator(LONG u1, LONG u2, LPCSTR str) { - WINE_FIXME("(%u, %u, %s)\n", u1, u2, debugstr_a(str)); + WINE_FIXME("(%lu, %lu, %s)\n", u1, u2, debugstr_a(str)); }
static void CALLBACK MACRO_ALink(LPCSTR str1, LONG u, LPCSTR str2) { - WINE_FIXME("(%s, %u, %s)\n", debugstr_a(str1), u, debugstr_a(str2)); + WINE_FIXME("(%s, %lu, %s)\n", debugstr_a(str1), u, debugstr_a(str2)); }
void CALLBACK MACRO_Annotate(void) @@ -330,7 +330,7 @@ static void CALLBACK MACRO_Contents(void)
static void CALLBACK MACRO_ControlPanel(LPCSTR str1, LPCSTR str2, LONG u) { - WINE_FIXME("(%s, %s, %u)\n", debugstr_a(str1), debugstr_a(str2), u); + WINE_FIXME("(%s, %s, %lu)\n", debugstr_a(str1), debugstr_a(str2), u); }
void CALLBACK MACRO_CopyDialog(void) @@ -372,7 +372,7 @@ static void CALLBACK MACRO_ExecFile(LPCSTR pgm, LPCSTR args, LONG cmd_show, LPCS { HINSTANCE ret;
- WINE_TRACE("(%s, %s, %u, %s)\n", + WINE_TRACE("(%s, %s, %lu, %s)\n", debugstr_a(pgm), debugstr_a(args), cmd_show, debugstr_a(topic));
ret = ShellExecuteA(Globals.active_win ? Globals.active_win->hMainWnd : NULL, "open", @@ -386,7 +386,7 @@ static void CALLBACK MACRO_ExecFile(LPCSTR pgm, LPCSTR args, LONG cmd_show, LPCS
static void CALLBACK MACRO_ExecProgram(LPCSTR str, LONG u) { - WINE_FIXME("(%s, %u)\n", debugstr_a(str), u); + WINE_FIXME("(%s, %lu)\n", debugstr_a(str), u); }
void CALLBACK MACRO_Exit(void) @@ -399,17 +399,17 @@ void CALLBACK MACRO_Exit(void)
static void CALLBACK MACRO_ExtAbleItem(LPCSTR str, LONG u) { - WINE_FIXME("(%s, %u)\n", debugstr_a(str), u); + WINE_FIXME("(%s, %lu)\n", debugstr_a(str), u); }
static void CALLBACK MACRO_ExtInsertItem(LPCSTR str1, LPCSTR str2, LPCSTR str3, LPCSTR str4, LONG u1, LONG u2) { - WINE_FIXME("(%s, %s, %s, %s, %u, %u)\n", debugstr_a(str1), debugstr_a(str2), debugstr_a(str3), debugstr_a(str4), u1, u2); + WINE_FIXME("(%s, %s, %s, %s, %lu, %lu)\n", debugstr_a(str1), debugstr_a(str2), debugstr_a(str3), debugstr_a(str4), u1, u2); }
static void CALLBACK MACRO_ExtInsertMenu(LPCSTR str1, LPCSTR str2, LPCSTR str3, LONG u1, LONG u2) { - WINE_FIXME("(%s, %s, %s, %u, %u)\n", debugstr_a(str1), debugstr_a(str2), debugstr_a(str3), u1, u2); + WINE_FIXME("(%s, %s, %s, %lu, %lu)\n", debugstr_a(str1), debugstr_a(str2), debugstr_a(str3), u1, u2); }
static BOOL CALLBACK MACRO_FileExist(LPCSTR str) @@ -463,7 +463,7 @@ static void CALLBACK MACRO_FocusWindow(LPCSTR lpszWindow)
static void CALLBACK MACRO_Generate(LPCSTR str, LONG w, LONG l) { - WINE_FIXME("(%s, %x, %x)\n", debugstr_a(str), w, l); + WINE_FIXME("(%s, %lx, %lx)\n", debugstr_a(str), w, l); }
static void CALLBACK MACRO_GotoMark(LPCSTR str) @@ -544,12 +544,12 @@ static BOOL CALLBACK MACRO_InitMPrint(void)
static void CALLBACK MACRO_InsertItem(LPCSTR str1, LPCSTR str2, LPCSTR str3, LPCSTR str4, LONG u) { - WINE_FIXME("(%s, %s, %s, %s, %u)\n", debugstr_a(str1), debugstr_a(str2), debugstr_a(str3), debugstr_a(str4), u); + WINE_FIXME("(%s, %s, %s, %s, %lu)\n", debugstr_a(str1), debugstr_a(str2), debugstr_a(str3), debugstr_a(str4), u); }
static void CALLBACK MACRO_InsertMenu(LPCSTR str1, LPCSTR str2, LONG u) { - WINE_FIXME("(%s, %s, %u)\n", debugstr_a(str1), debugstr_a(str2), u); + WINE_FIXME("(%s, %s, %lu)\n", debugstr_a(str1), debugstr_a(str2), u); }
static BOOL CALLBACK MACRO_IsBook(void) @@ -574,7 +574,7 @@ void CALLBACK MACRO_JumpContext(LPCSTR lpszPath, LPCSTR lpszWindow, LONG context { HLPFILE* hlpfile;
- WINE_TRACE("(%s, %s, %d)\n", debugstr_a(lpszPath), debugstr_a(lpszWindow), context); + WINE_TRACE("(%s, %s, %ld)\n", debugstr_a(lpszPath), debugstr_a(lpszWindow), context); if ((hlpfile = WINHELP_LookupHelpFile(lpszPath))) /* Some madness: what user calls 'context', hlpfile calls 'map' */ WINHELP_OpenHelpWindow(HLPFILE_PageByMap, hlpfile, context, @@ -586,7 +586,7 @@ void CALLBACK MACRO_JumpHash(LPCSTR lpszPath, LPCSTR lpszWindow, LONG lHash) { HLPFILE* hlpfile;
- WINE_TRACE("(%s, %s, %u)\n", debugstr_a(lpszPath), debugstr_a(lpszWindow), lHash); + WINE_TRACE("(%s, %s, %lu)\n", debugstr_a(lpszPath), debugstr_a(lpszWindow), lHash); if (!lpszPath || !lpszPath[0]) hlpfile = MACRO_CurrentWindow()->page->file; else @@ -639,7 +639,7 @@ static void CALLBACK MACRO_JumpKeyword(LPCSTR lpszPath, LPCSTR lpszWindow, LPCST
static void CALLBACK MACRO_KLink(LPCSTR str1, LONG u, LPCSTR str2, LPCSTR str3) { - WINE_FIXME("(%s, %u, %s, %s)\n", debugstr_a(str1), u, debugstr_a(str2), debugstr_a(str3)); + WINE_FIXME("(%s, %lu, %s, %s)\n", debugstr_a(str1), u, debugstr_a(str2), debugstr_a(str3)); }
static void CALLBACK MACRO_Menu(void) @@ -649,7 +649,7 @@ static void CALLBACK MACRO_Menu(void)
static void CALLBACK MACRO_MPrintHash(LONG u) { - WINE_FIXME("(%u)\n", u); + WINE_FIXME("(%lu)\n", u); }
static void CALLBACK MACRO_MPrintID(LPCSTR str) @@ -679,12 +679,12 @@ static void CALLBACK MACRO_NoShow(void)
void CALLBACK MACRO_PopupContext(LPCSTR str, LONG u) { - WINE_FIXME("(%s, %u)\n", debugstr_a(str), u); + WINE_FIXME("(%s, %lu)\n", debugstr_a(str), u); }
static void CALLBACK MACRO_PopupHash(LPCSTR str, LONG u) { - WINE_FIXME("(%s, %u)\n", debugstr_a(str), u); + WINE_FIXME("(%s, %lu)\n", debugstr_a(str), u); }
static void CALLBACK MACRO_PopupId(LPCSTR str1, LPCSTR str2) @@ -694,7 +694,7 @@ static void CALLBACK MACRO_PopupId(LPCSTR str1, LPCSTR str2)
static void CALLBACK MACRO_PositionWindow(LONG i1, LONG i2, LONG u1, LONG u2, LONG u3, LPCSTR str) { - WINE_FIXME("(%i, %i, %u, %u, %u, %s)\n", i1, i2, u1, u2, u3, debugstr_a(str)); + WINE_FIXME("(%li, %li, %lu, %lu, %lu, %s)\n", i1, i2, u1, u2, u3, debugstr_a(str)); }
static void CALLBACK MACRO_Prev(void) @@ -787,7 +787,7 @@ static void CALLBACK MACRO_RegisterRoutine(LPCSTR dll_name, LPCSTR proc, LPCSTR Globals.dlls = dll; dll->handler = (WINHELP_LDLLHandler)GetProcAddress(dll->hLib, "LDLLHandler"); dll->class = dll->handler ? (dll->handler)(DW_WHATMSG, 0, 0) : DC_NOMSG; - WINE_TRACE("Got class %x for DLL %s\n", dll->class, debugstr_a(dll_name)); + WINE_TRACE("Got class %lx for DLL %s\n", dll->class, debugstr_a(dll_name)); if (dll->class & DC_INITTERM) dll->handler(DW_INIT, 0, 0); if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (LONG_PTR)&Callbacks, 0); } @@ -812,7 +812,7 @@ static void CALLBACK MACRO_RegisterRoutine(LPCSTR dll_name, LPCSTR proc, LPCSTR
static void CALLBACK MACRO_RemoveAccelerator(LONG u1, LONG u2) { - WINE_FIXME("(%u, %u)\n", u1, u2); + WINE_FIXME("(%lu, %lu)\n", u1, u2); }
static void CALLBACK MACRO_ResetMenu(void) @@ -832,7 +832,7 @@ static void CALLBACK MACRO_Search(void)
void CALLBACK MACRO_SetContents(LPCSTR str, LONG u) { - WINE_FIXME("(%s, %u)\n", debugstr_a(str), u); + WINE_FIXME("(%s, %lu)\n", debugstr_a(str), u); }
static void CALLBACK MACRO_SetHelpOnFile(LPCSTR str) @@ -851,29 +851,29 @@ static void CALLBACK MACRO_SetPopupColor(LONG r, LONG g, LONG b) { HLPFILE_PAGE* page = MACRO_CurrentWindow()->page;
- WINE_TRACE("(%x, %x, %x)\n", r, g, b); + WINE_TRACE("(%lx, %lx, %lx)\n", r, g, b); page->file->has_popup_color = TRUE; page->file->popup_color = RGB(r, g, b); }
static void CALLBACK MACRO_ShellExecute(LPCSTR str1, LPCSTR str2, LONG u1, LONG u2, LPCSTR str3, LPCSTR str4) { - WINE_FIXME("(%s, %s, %u, %u, %s, %s)\n", debugstr_a(str1), debugstr_a(str2), u1, u2, debugstr_a(str3), debugstr_a(str4)); + WINE_FIXME("(%s, %s, %lu, %lu, %s, %s)\n", debugstr_a(str1), debugstr_a(str2), u1, u2, debugstr_a(str3), debugstr_a(str4)); }
static void CALLBACK MACRO_ShortCut(LPCSTR str1, LPCSTR str2, LONG w, LONG l, LPCSTR str) { - WINE_FIXME("(%s, %s, %x, %x, %s)\n", debugstr_a(str1), debugstr_a(str2), w, l, debugstr_a(str)); + WINE_FIXME("(%s, %s, %lx, %lx, %s)\n", debugstr_a(str1), debugstr_a(str2), w, l, debugstr_a(str)); }
static void CALLBACK MACRO_TCard(LONG u) { - WINE_FIXME("(%u)\n", u); + WINE_FIXME("(%lu)\n", u); }
static void CALLBACK MACRO_Test(LONG u) { - WINE_FIXME("(%u)\n", u); + WINE_FIXME("(%lu)\n", u); }
static BOOL CALLBACK MACRO_TestALink(LPCSTR str) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index a98a76003ba..73db4b58876 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -356,7 +356,7 @@ static LRESULT WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam)
if (cds->dwData != 0xA1DE505) { - WINE_FIXME("Wrong magic number (%08lx)\n", cds->dwData); + WINE_FIXME("Wrong magic number (%08Ix)\n", cds->dwData); return 0; }
@@ -366,7 +366,7 @@ static LRESULT WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam) { char* ptr = (wh->ofsFilename) ? (LPSTR)wh + wh->ofsFilename : NULL;
- WINE_TRACE("Got[%u]: cmd=%u data=%08x fn=%s\n", + WINE_TRACE("Got[%u]: cmd=%u data=%08lx fn=%s\n", wh->size, wh->command, wh->data, debugstr_a(ptr)); switch (wh->command) { @@ -1591,7 +1591,7 @@ BOOL WINHELP_CreateIndexWindow(BOOL is_search) PropertySheetA(&psHead); if (id.jump) { - WINE_TRACE("got %d as an offset\n", id.offset); + WINE_TRACE("got %ld as an offset\n", id.offset); WINHELP_OpenHelpWindow(HLPFILE_PageByOffset, id.hlpfile, id.offset, Globals.active_win->info, SW_NORMAL); }
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/winmgmt/Makefile.in | 1 - programs/winmgmt/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/programs/winmgmt/Makefile.in b/programs/winmgmt/Makefile.in index f12f693ef5d..f1f804d2ed8 100644 --- a/programs/winmgmt/Makefile.in +++ b/programs/winmgmt/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winmgmt.exe IMPORTS = advapi32
diff --git a/programs/winmgmt/main.c b/programs/winmgmt/main.c index bc7150a08ca..70f7441c0c5 100644 --- a/programs/winmgmt/main.c +++ b/programs/winmgmt/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: - 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;
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/winoldap.mod16/Makefile.in | 1 - programs/winoldap.mod16/winoldap.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/programs/winoldap.mod16/Makefile.in b/programs/winoldap.mod16/Makefile.in index 063f77aea15..8d0c73c0956 100644 --- a/programs/winoldap.mod16/Makefile.in +++ b/programs/winoldap.mod16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winoldap.mod16
EXTRADLLFLAGS = -mconsole -m16 diff --git a/programs/winoldap.mod16/winoldap.c b/programs/winoldap.mod16/winoldap.c index c6342d0d90f..e8c5bdb8946 100644 --- a/programs/winoldap.mod16/winoldap.c +++ b/programs/winoldap.mod16/winoldap.c @@ -74,7 +74,7 @@ WORD WINAPI WinMain16( HINSTANCE16 inst, HINSTANCE16 prev, LPSTR cmdline, WORD s { /* Give 10 seconds to the app to come up */ if (wait_input_idle( info.hProcess, 10000 ) == WAIT_FAILED) - WINE_WARN("WaitForInputIdle failed: Error %d\n", GetLastError() ); + WINE_WARN("WaitForInputIdle failed: Error %ld\n", GetLastError() ); ReleaseThunkLock( &count ); WaitForSingleObject( info.hProcess, INFINITE ); RestoreThunkLock( count );
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/wordpad/Makefile.in | 1 - programs/wordpad/olecallback.c | 8 ++++---- programs/wordpad/wordpad.c | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in index e8fc1e38df8..265003a736a 100644 --- a/programs/wordpad/Makefile.in +++ b/programs/wordpad/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wordpad.exe IMPORTS = comdlg32 uuid ole32 shell32 user32 gdi32 advapi32 comctl32
diff --git a/programs/wordpad/olecallback.c b/programs/wordpad/olecallback.c index dcfef5898e6..e3bee7f850b 100644 --- a/programs/wordpad/olecallback.c +++ b/programs/wordpad/olecallback.c @@ -107,7 +107,7 @@ static HRESULT STDMETHODCALLTYPE RichEditOleCallback_QueryInsertObject( LPSTORAGE lpstg, LONG cp) { - WINE_TRACE("(%p, %p, %p, %d)\n", This, lpclsid, lpstg, cp); + WINE_TRACE("(%p, %p, %p, %ld)\n", This, lpclsid, lpstg, cp); return S_OK; }
@@ -127,7 +127,7 @@ static HRESULT STDMETHODCALLTYPE RichEditOleCallback_QueryAcceptData( BOOL fReally, HGLOBAL hMetaPict) { - WINE_TRACE("(%p, %p, %p, %x, %d, %p)\n", + WINE_TRACE("(%p, %p, %p, %lx, %d, %p)\n", This, lpdataobj, lpcfFormat, reco, fReally, hMetaPict); return S_OK; } @@ -146,7 +146,7 @@ static HRESULT STDMETHODCALLTYPE RichEditOleCallback_GetClipboardData( DWORD reco, LPDATAOBJECT *lplpdataobj) { - WINE_TRACE("(%p, %p, %x, %p)\n", This, lpchrg, reco, lplpdataobj); + WINE_TRACE("(%p, %p, %lx, %p)\n", This, lpchrg, reco, lplpdataobj); return E_NOTIMPL; }
@@ -156,7 +156,7 @@ static HRESULT STDMETHODCALLTYPE RichEditOleCallback_GetDragDropEffect( DWORD grfKeyState, LPDWORD pdwEffect) { - WINE_TRACE("(%p, %d, %x, %p)\n", This, fDrag, grfKeyState, pdwEffect); + WINE_TRACE("(%p, %d, %lx, %p)\n", This, fDrag, grfKeyState, pdwEffect); if (pdwEffect) *pdwEffect = DROPEFFECT_COPY; return S_OK; diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index e87475ad06b..7f79eccc8bb 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2023,7 +2023,7 @@ static LRESULT OnCreate( HWND hWnd )
if (!hEditorWnd) { - fprintf(stderr, "Error code %u\n", GetLastError()); + fprintf(stderr, "Error code %lu\n", GetLastError()); return -1; } assert(hEditorWnd); @@ -2164,7 +2164,7 @@ static LRESULT OnNotify( HWND hWnd, LPARAM lParam)
update_font_list();
- sprintf( buf,"selection = %d..%d, line count=%ld", + sprintf( buf,"selection = %ld..%ld, line count=%Id", pSC->chrg.cpMin, pSC->chrg.cpMax, SendMessageW(hwndEditor, EM_GETLINECOUNT, 0, 0)); SetWindowTextA(GetDlgItem(hWnd, IDC_STATUSBAR), buf); @@ -2451,7 +2451,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) SendMessageW(hwndEditor, EM_EXGETSEL, 0, (LPARAM)&range); data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) * (range.cpMax-range.cpMin+1)); SendMessageW(hwndEditor, EM_GETSELTEXT, 0, (LPARAM)data); - sprintf(buf, "Start = %d, End = %d", range.cpMin, range.cpMax); + sprintf(buf, "Start = %ld, End = %ld", range.cpMin, range.cpMax); MessageBoxA(hWnd, buf, "Editor", MB_OK); MessageBoxW(hWnd, data, wszAppTitle, MB_OK); HeapFree( GetProcessHeap(), 0, data);
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/wuauserv/Makefile.in | 1 - programs/wuauserv/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/programs/wuauserv/Makefile.in b/programs/wuauserv/Makefile.in index 1e936127167..6bfaf71ddf4 100644 --- a/programs/wuauserv/Makefile.in +++ b/programs/wuauserv/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wuauserv.exe IMPORTS = advapi32
diff --git a/programs/wuauserv/main.c b/programs/wuauserv/main.c index 8b360131112..79eb84e6703 100644 --- a/programs/wuauserv/main.c +++ b/programs/wuauserv/main.c @@ -53,7 +53,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/wusa/Makefile.in | 1 - programs/wusa/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/programs/wusa/Makefile.in b/programs/wusa/Makefile.in index a5702bfe657..171377bc2f2 100644 --- a/programs/wusa/Makefile.in +++ b/programs/wusa/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wusa.exe IMPORTS = cabinet shlwapi ole32 oleaut32 advapi32
diff --git a/programs/wusa/main.c b/programs/wusa/main.c index bcb795a80fa..d1bb385cd06 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -1035,7 +1035,7 @@ static void restart_as_x86_64(void) CloseHandle(pi.hProcess); CloseHandle(pi.hThread); } - else ERR("Failed to restart 64-bit %s, err %u\n", wine_dbgstr_w(filename), GetLastError()); + else ERR("Failed to restart 64-bit %s, err %lu\n", wine_dbgstr_w(filename), GetLastError()); Wow64RevertWow64FsRedirection(redir);
ExitProcess(exit_code);
Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- programs/xcopy/Makefile.in | 1 - programs/xcopy/xcopy.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in index f51370405da..b22ff7814ec 100644 --- a/programs/xcopy/Makefile.in +++ b/programs/xcopy/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = xcopy.exe IMPORTS = shell32 user32
diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 809f24433a3..0f46a6c42ab 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -79,7 +79,7 @@ static WCHAR *XCOPY_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; @@ -121,7 +121,7 @@ static int WINAPIV XCOPY_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; }
@@ -178,7 +178,7 @@ static void XCOPY_FailMessage(DWORD err) { NULL, err, 0, (LPWSTR) &lpMsgBuf, 0, NULL); if (!status) { - WINE_FIXME("FIXME: Cannot display message for error %d, status %d\n", + WINE_FIXME("FIXME: Cannot display message for error %ld, status %ld\n", err, GetLastError()); } else { XCOPY_wprintf(L"%1\n", lpMsgBuf); @@ -397,7 +397,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec,
/* See if allowed to copy it */ srcAttribs = GetFileAttributesW(copyFrom); - WINE_TRACE("Source attribs: %d\n", srcAttribs); + WINE_TRACE("Source attribs: %ld\n", srcAttribs);
if ((srcAttribs & FILE_ATTRIBUTE_HIDDEN) || (srcAttribs & FILE_ATTRIBUTE_SYSTEM)) { @@ -414,7 +414,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec,
/* See if file exists */ destAttribs = GetFileAttributesW(copyTo); - WINE_TRACE("Dest attribs: %d\n", srcAttribs); + WINE_TRACE("Dest attribs: %ld\n", srcAttribs);
/* Check date ranges if a destination file already exists */ if (!skipFile && (flags & OPT_DATERANGE) && @@ -901,7 +901,7 @@ static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, * Validate the source, expanding to full path ensuring it exists */ if (GetFullPathNameW(suppliedsource, MAX_PATH, actualsource, NULL) == 0) { - WINE_FIXME("Unexpected failure expanding source path (%d)\n", GetLastError()); + WINE_FIXME("Unexpected failure expanding source path (%ld)\n", GetLastError()); return RC_INITERROR; }
@@ -995,7 +995,7 @@ static int XCOPY_ProcessDestParm(WCHAR *supplieddestination, WCHAR *stem, WCHAR * Validate the source, expanding to full path ensuring it exists */ if (GetFullPathNameW(supplieddestination, MAX_PATH, actualdestination, NULL) == 0) { - WINE_FIXME("Unexpected failure expanding source path (%d)\n", GetLastError()); + WINE_FIXME("Unexpected failure expanding source path (%ld)\n", GetLastError()); return RC_INITERROR; }
-
Eric Pouech