February 2022 - Wine-Commits

Eric Pouech : winoldap.mod16: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: a513e0673f0faf13e2ea6e02652dbebb3ef10382 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a513e0673f0faf13e2ea6e02… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:41:32 2022 +0100 winoldap.mod16: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/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 );

1 0

Eric Pouech : winemsibuilder: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 69a9931a8272b323485784d7d6746bc962a05db8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69a9931a8272b323485784d7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:41:07 2022 +0100 winemsibuilder: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/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 );

1 0

Eric Pouech : sc: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 70d4f9b0c65fb7787b7952bc78bc26383e6e3319 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d4f9b0c65fb7787b7952bc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:39:37 2022 +0100 sc: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/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" )) {

1 0

Eric Pouech : start: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: e704f0372ed396ddefe6b8c65f71da6d201857b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e704f0372ed396ddefe6b8c6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:39:55 2022 +0100 start: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/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);

1 0

Eric Pouech : termsv: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 86476f1c3ce1de946cf216b5c39c07f2aeb6b4bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=86476f1c3ce1de946cf216b5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:40:07 2022 +0100 termsv: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/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;

1 0

Eric Pouech : services: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: 8edc86c1b341bf5389875473f6caf2eba5b24032 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8edc86c1b341bf5389875473… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:39:43 2022 +0100 services: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/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: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8edc86c1b341bf538987…

1 0

Eric Pouech : winmgmt: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: d909d34f4f583ce735dbc5e5fed82ff020f4dce1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d909d34f4f583ce735dbc5e5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:41:26 2022 +0100 winmgmt: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/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;

1 0

Eric Pouech : winetest: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: d34b3021b324cc5f8ffbcee63679bda33f576ab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d34b3021b324cc5f8ffbcee6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:41:13 2022 +0100 winetest: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/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; }

1 0

Eric Pouech : winedbg: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: b0319099d0e5b68bd696d2ff6ca2b5763c53b884 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0319099d0e5b68bd696d2ff… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:40:49 2022 +0100 winedbg: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/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: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0319099d0e5b68bd696…

1 0

Eric Pouech : wineboot: Enable compilation with long types.
by Alexandre Julliard Feb. 7, 2022

Feb. 7, 2022

Module: wine Branch: master Commit: a6cf9e57d3f60b404e3f6b4ffbaf36c2023dab87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6cf9e57d3f60b404e3f6b4f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:40:25 2022 +0100 wineboot: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/Makefile.in | 1 - programs/wineboot/shutdown.c | 12 ++++++------ programs/wineboot/wineboot.c | 38 +++++++++++++++++++------------------- 3 files changed, 25 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6cf9e57d3f60b404e3f…

1 0