February 2022 - Wine-commits

Eric Pouech : netstat: Enable compilation with long types.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: f658d9d178ce56f734ec270ab3d47b28fba0b4db URL: https://source.winehq.org/git/wine.git/?a=commit;h=f658d9d178ce56f734ec270a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:56:57 2022 +0100 netstat: 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/netstat/Makefile.in | 1 - programs/netstat/netstat.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/netstat/Makefile.in b/programs/netstat/Makefile.in index 693fde0c1f4..e16d01ba4e9 100644 --- a/programs/netstat/Makefile.in +++ b/programs/netstat/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = netstat.exe IMPORTS = iphlpapi user32 ws2_32 diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index 243fca56055..16238ee097f 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -145,7 +145,7 @@ static WCHAR *NETSTAT_load_message(UINT id) { static const WCHAR failedW[] = {'F','a','i','l','e','d','!','\0'}; if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { - WINE_FIXME("LoadString failed with %d\n", GetLastError()); + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); lstrcpyW(msg, failedW); } return msg;

1 0

Eric Pouech : ping: Enable compilation with long types.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: eb1ff55636355b5fd290ee49fdda7e1bfcb803e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb1ff55636355b5fd290ee49… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:57:03 2022 +0100 ping: 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/ping/Makefile.in | 1 - programs/ping/ping_main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/ping/Makefile.in b/programs/ping/Makefile.in index 9ac4f6e4a3b..0ed66f470ea 100644 --- a/programs/ping/Makefile.in +++ b/programs/ping/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ping.exe IMPORTS = ws2_32 iphlpapi diff --git a/programs/ping/ping_main.c b/programs/ping/ping_main.c index 51246e3f5bf..cf91f051a39 100644 --- a/programs/ping/ping_main.c +++ b/programs/ping/ping_main.c @@ -184,7 +184,7 @@ int __cdecl main(int argc, char** argv) { reply = (ICMP_ECHO_REPLY *) reply_buffer; if (reply->RoundTripTime >= 1) - sprintf(rtt, "=%d", reply->RoundTripTime); + sprintf(rtt, "=%ld", reply->RoundTripTime); else strcpy(rtt, "<1"); printf("Reply from %s: bytes=%d time%sms TTL=%d\n", ip, l,

1 0

Eric Pouech : plugplay: Enable compilation with long types.
by Alexandre Julliard 04 Feb '22

04 Feb '22

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

1 0

Eric Pouech : presentationfontcache: Enable compilation with long types.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 0b4a16fb1d9d1f82b26594c16167cabbea4643c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b4a16fb1d9d1f82b26594c1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:57:17 2022 +0100 presentationfontcache: 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/presentationfontcache/Makefile.in | 1 - programs/presentationfontcache/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/presentationfontcache/Makefile.in b/programs/presentationfontcache/Makefile.in index 34e8ca96d46..412523e1048 100644 --- a/programs/presentationfontcache/Makefile.in +++ b/programs/presentationfontcache/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = presentationfontcache.exe IMPORTS = advapi32 diff --git a/programs/presentationfontcache/main.c b/programs/presentationfontcache/main.c index ab2d0e21061..c3f9a98a2b4 100644 --- a/programs/presentationfontcache/main.c +++ b/programs/presentationfontcache/main.c @@ -51,7 +51,7 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ SetEvent( stop_event ); return NO_ERROR; default: - WINE_FIXME( "got service ctrl %x\n", ctrl ); + WINE_FIXME( "got service ctrl %lx\n", ctrl ); status.dwCurrentState = SERVICE_RUNNING; SetServiceStatus( service_handle, &status ); return NO_ERROR;

1 0

Eric Pouech : regedit: Enable compilation with long types.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: f158558d193583b2e5a3c1cca3279cc20e632fce URL: https://source.winehq.org/git/wine.git/?a=commit;h=f158558d193583b2e5a3c1cc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:57:23 2022 +0100 regedit: 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/regedit/Makefile.in | 1 - programs/regedit/edit.c | 2 +- programs/regedit/framewnd.c | 2 +- programs/regedit/main.c | 2 +- programs/regedit/regedit.c | 6 +++--- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in index d53a1c5ccfc..9f8fb5af165 100644 --- a/programs/regedit/Makefile.in +++ b/programs/regedit/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = regedit.exe IMPORTS = advapi32 DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32 diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 13f2256b2cb..3f99626dd23 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -288,7 +288,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) if (DialogBoxW(0, MAKEINTRESOURCEW(IDD_EDIT_DWORD), hwnd, modify_dlgproc) == IDOK) { DWORD val; CHAR* valueA = GetMultiByteString(stringValueData); - if (sscanf(valueA, isDecimal ? "%u" : "%x", &val)) { + if (sscanf(valueA, isDecimal ? "%lu" : "%lx", &val)) { lRet = RegSetValueExW(hKey, valueName, 0, type, (BYTE*)&val, sizeof(val)); if (lRet == ERROR_SUCCESS) result = TRUE; else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED); diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index bb843a89af4..7a1507bb54e 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -220,7 +220,7 @@ static int add_favourite_key_items(HMENU hMenu, HWND hList) &max_value_len, NULL, NULL, NULL); if (rc != ERROR_SUCCESS) { - ERR("RegQueryInfoKey failed: %d\n", rc); + ERR("RegQueryInfoKey failed: %ld\n", rc); goto exit; } diff --git a/programs/regedit/main.c b/programs/regedit/main.c index d9f81218acb..e0f89255461 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -167,7 +167,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi GetExitCodeProcess( pi.hProcess, &exit_code ); ExitProcess( exit_code ); } - else WINE_ERR( "failed to restart 64-bit %s, err %d\n", wine_dbgstr_w(filename), GetLastError() ); + else WINE_ERR( "failed to restart 64-bit %s, err %ld\n", wine_dbgstr_w(filename), GetLastError() ); Wow64RevertWow64FsRedirection( redir ); } diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index c60d1ddb9b6..d2e27340300 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -59,7 +59,7 @@ static void output_formatstring(const WCHAR *fmt, va_list va_args) fmt, 0, 0, (WCHAR *)&str, 0, &va_args); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); return; } output_writeconsole(str, len); @@ -73,7 +73,7 @@ void WINAPIV output_message(unsigned int id, ...) if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) { - WINE_FIXME("LoadString failed with %d\n", GetLastError()); + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); return; } va_start(va_args, id); @@ -88,7 +88,7 @@ void WINAPIV error_exit(unsigned int id, ...) if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) { - WINE_FIXME("LoadString failed with %u\n", GetLastError()); + WINE_FIXME("LoadString failed with %lu\n", GetLastError()); return; } va_start(va_args, id);

1 0

Eric Pouech : reg: Enable compilation with long types.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 1e5ffcbf2e14a6be96bdea554660d4517287c2e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e5ffcbf2e14a6be96bdea55… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 4 09:57:29 2022 +0100 reg: 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/reg/Makefile.in | 1 - programs/reg/import.c | 2 +- programs/reg/reg.c | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index 635ac7751a4..d7e4e4b65ce 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = reg.exe IMPORTS = advapi32 DELAYIMPORTS = user32 diff --git a/programs/reg/import.c b/programs/reg/import.c index 36d148ca395..6da0148ba3e 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -838,7 +838,7 @@ invalid: /* handler for parser UNKNOWN_DATA state */ static WCHAR *unknown_data_state(struct parser *parser, WCHAR *pos) { - FIXME("Unknown registry data type [0x%x]\n", parser->data_type); + FIXME("Unknown registry data type [0x%lx]\n", parser->data_type); set_state(parser, LINE_START); return pos; diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 1af63498b05..16c05f958c7 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -81,7 +81,7 @@ static void output_formatstring(const WCHAR *fmt, va_list va_args) fmt, 0, 0, (WCHAR *)&str, 0, &va_args); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); return; } output_writeconsole(str, len); @@ -96,7 +96,7 @@ void WINAPIV output_message(unsigned int id, ...) if (!(len = LoadStringW(GetModuleHandleW(NULL), id, (WCHAR *)&fmt, 0))) { - WINE_FIXME("LoadString failed with %d\n", GetLastError()); + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); return; }

1 0

Eric Pouech : regsvr32: Enable compilation with long types.
by Alexandre Julliard 04 Feb '22

04 Feb '22

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

1 0

Eric Pouech : rpcss: Enable compilation with long types.
by Alexandre Julliard 04 Feb '22

04 Feb '22

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

1 0

Eric Pouech : wbemprox: Use correct integral type.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 60b82dbda483bb49ac0550baa2b0167675343d34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60b82dbda483bb49ac0550ba… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 11:49:30 2022 +0100 wbemprox: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index c71bab80ee2..050e9462a4c 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1939,7 +1939,8 @@ static WCHAR *append_path( const WCHAR *path, const WCHAR *segment, UINT *len ) static WCHAR *get_file_version( const WCHAR *filename ) { VS_FIXEDFILEINFO *info; - DWORD size, len = 4 * 5 + ARRAY_SIZE( L"%u.%u.%u.%u" ); + UINT size; + DWORD len = 4 * 5 + ARRAY_SIZE( L"%u.%u.%u.%u" ); void *block; WCHAR *ret; @@ -2499,7 +2500,8 @@ static WCHAR *get_ip4_string( DWORD addr ) static enum fill_status fill_ip4routetable( struct table *table, const struct expr *cond ) { struct record_ip4routetable *rec; - UINT i, row = 0, offset = 0, size = 0; + UINT i, row = 0, offset = 0; + ULONG size = 0; MIB_IPFORWARDTABLE *forwards; enum fill_status status = FILL_STATUS_UNFILTERED; @@ -3710,8 +3712,8 @@ static enum fill_status fill_service( struct table *table, const struct expr *co ENUM_SERVICE_STATUS_PROCESSW *tmp, *services = NULL; SERVICE_STATUS_PROCESS *status; WCHAR sysnameW[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD len = ARRAY_SIZE( sysnameW ); - UINT i, row = 0, offset = 0, size = 256, needed, count; + DWORD len = ARRAY_SIZE( sysnameW ), needed, count; + UINT i, row = 0, offset = 0, size = 256; enum fill_status fill_status = FILL_STATUS_FAILED; BOOL ret;

1 0

Eric Pouech : winhttp: Use correct integral type.
by Alexandre Julliard 04 Feb '22

04 Feb '22

Module: wine Branch: master Commit: 843a0a38110954e74c6c468a623aa3f02c8cba0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=843a0a38110954e74c6c468a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 11:49:48 2022 +0100 winhttp: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a3a6389a938..c32a33cbaf2 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3586,7 +3586,7 @@ static DWORD socket_drain( struct socket *socket ) return ERROR_SUCCESS; } -static DWORD receive_close_status( struct socket *socket, unsigned int len ) +static DWORD receive_close_status( struct socket *socket, DWORD len ) { DWORD reason_len, ret; @@ -3694,7 +3694,8 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD static void CALLBACK task_socket_receive( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) { struct socket_receive *r = ctx; - DWORD ret, count, type; + DWORD ret, count; + WINHTTP_WEB_SOCKET_BUFFER_TYPE type; TRACE("running %p\n", work); ret = socket_receive( r->socket, r->buf, r->len, &count, &type );

1 0