wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : wusa: Enable compilation with long types.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 827988bd8a3bc2abd7de695c5f2cfdb65768056b URL: https://source.winehq.org/git/wine.git/?a=commit;h=827988bd8a3bc2abd7de695c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:41:50 2022 +0100 wusa: 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/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);

1 0

Eric Pouech : wuauserv: Enable compilation with long types.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 2e11d97390ddbd52aa0b9ed9a3435e11eebfefe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e11d97390ddbd52aa0b9ed9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:41:44 2022 +0100 wuauserv: 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/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;

1 0

Eric Pouech : wordpad: Enable compilation with long types.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: e7dda902a0626704bdab654346ece28e3f102e01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7dda902a0626704bdab6543… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:41:38 2022 +0100 wordpad: 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/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);

1 0

Eric Pouech : winoldap.mod16: Enable compilation with long types.
by Alexandre Julliard 07 Feb '22

07 Feb '22

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 : winmgmt: Enable compilation with long types.
by Alexandre Julliard 07 Feb '22

07 Feb '22

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 : winhlp32: Enable compilation with long types.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 54e3c301beea717e75e41b85551d9f5005bcb917 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54e3c301beea717e75e41b85… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:41:19 2022 +0100 winhlp32: 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/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: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54e3c301beea717e75e4…

1 0

Eric Pouech : winetest: Enable compilation with long types.
by Alexandre Julliard 07 Feb '22

07 Feb '22

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 : winemsibuilder: Enable compilation with long types.
by Alexandre Julliard 07 Feb '22

07 Feb '22

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 : winemenubuilder: Enable compilation with long types.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: 11afedfec3d35171365265190a602e81870a9b5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=11afedfec3d3517136526519… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:41:01 2022 +0100 winemenubuilder: 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/winemenubuilder/Makefile.in | 1 - programs/winemenubuilder/winemenubuilder.c | 72 +++++++++++++++--------------- 2 files changed, 36 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=11afedfec3d351713652…

1 0

Eric Pouech : winedevice: Enable compilation with long types.
by Alexandre Julliard 07 Feb '22

07 Feb '22

Module: wine Branch: master Commit: a4ff46823c0effbcc3d41c8720cfa141b8e2cc66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ff46823c0effbcc3d41c87… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 08:40:55 2022 +0100 winedevice: 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/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;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022