[PATCH 05/24] programs/svchost: enable compilation with long types
Eric Pouech
eric.pouech at gmail.com
Mon Feb 7 01:40:01 CST 2022
Signed-off-by: Eric Pouech <eric.pouech at 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;
}
More information about the wine-devel
mailing list