Eric Pouech : httpapi: Build without -DWINE_NO_LONG_TYPES.
Alexandre Julliard
julliard at winehq.org
Tue Feb 15 16:07:17 CST 2022
Module: wine
Branch: master
Commit: 8ea90bec6f50a3a2ac5abf93529fd78fe679bb7c
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ea90bec6f50a3a2ac5abf93529fd78fe679bb7c
Author: Eric Pouech <eric.pouech at gmail.com>
Date: Tue Feb 15 00:23:33 2022 -0600
httpapi: Build without -DWINE_NO_LONG_TYPES.
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/httpapi/Makefile.in | 1 -
dlls/httpapi/httpapi_main.c | 54 ++++++++++++++++++++++-----------------------
2 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/dlls/httpapi/Makefile.in b/dlls/httpapi/Makefile.in
index ea9c4223059..94020e9c17e 100644
--- a/dlls/httpapi/Makefile.in
+++ b/dlls/httpapi/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = httpapi.dll
IMPORTLIB = httpapi
IMPORTS = advapi32
diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c
index 52fa6cc1d80..4d2d307ffcb 100644
--- a/dlls/httpapi/httpapi_main.c
+++ b/dlls/httpapi/httpapi_main.c
@@ -53,12 +53,12 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved
{
SC_HANDLE manager, service;
- TRACE("version %u.%u, flags %#x, reserved %p.\n", version.HttpApiMajorVersion,
+ TRACE("version %u.%u, flags %#lx, reserved %p.\n", version.HttpApiMajorVersion,
version.HttpApiMinorVersion, flags, reserved);
if (flags & ~HTTP_INITIALIZE_SERVER)
{
- FIXME("Unhandled flags %#x.\n", flags);
+ FIXME("Unhandled flags %#lx.\n", flags);
return ERROR_SUCCESS;
}
@@ -67,14 +67,14 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved
if (!(service = OpenServiceW(manager, L"http", SERVICE_START)))
{
- ERR("Failed to open HTTP service, error %u.\n", GetLastError());
+ ERR("Failed to open HTTP service, error %lu.\n", GetLastError());
CloseServiceHandle(manager);
return GetLastError();
}
if (!StartServiceW(service, 0, NULL) && GetLastError() != ERROR_SERVICE_ALREADY_RUNNING)
{
- ERR("Failed to start HTTP service, error %u.\n", GetLastError());
+ ERR("Failed to start HTTP service, error %lu.\n", GetLastError());
CloseServiceHandle(service);
CloseServiceHandle(manager);
return GetLastError();
@@ -100,7 +100,7 @@ ULONG WINAPI HttpInitialize(HTTPAPI_VERSION version, ULONG flags, void *reserved
*/
ULONG WINAPI HttpTerminate( ULONG flags, PVOID reserved )
{
- FIXME( "(0x%x, %p): stub!\n", flags, reserved );
+ FIXME( "(0x%lx, %p): stub!\n", flags, reserved );
return NO_ERROR;
}
@@ -123,7 +123,7 @@ ULONG WINAPI HttpTerminate( ULONG flags, PVOID reserved )
ULONG WINAPI HttpDeleteServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID type,
PVOID config, ULONG length, LPOVERLAPPED overlapped )
{
- FIXME( "(%p, %d, %p, %d, %p): stub!\n", handle, type, config, length, overlapped );
+ FIXME( "(%p, %d, %p, %ld, %p): stub!\n", handle, type, config, length, overlapped );
return NO_ERROR;
}
@@ -150,7 +150,7 @@ ULONG WINAPI HttpQueryServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_I
PVOID query, ULONG query_len, PVOID buffer, ULONG buffer_len,
PULONG data_len, LPOVERLAPPED overlapped )
{
- FIXME( "(%p, %d, %p, %d, %p, %d, %p, %p): stub!\n", handle, type, query, query_len,
+ FIXME( "(%p, %d, %p, %ld, %p, %ld, %p, %p): stub!\n", handle, type, query, query_len,
buffer, buffer_len, data_len, overlapped );
return ERROR_FILE_NOT_FOUND;
}
@@ -174,7 +174,7 @@ ULONG WINAPI HttpQueryServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_I
ULONG WINAPI HttpSetServiceConfiguration( HANDLE handle, HTTP_SERVICE_CONFIG_ID type,
PVOID config, ULONG length, LPOVERLAPPED overlapped )
{
- FIXME( "(%p, %d, %p, %d, %p): stub!\n", handle, type, config, length, overlapped );
+ FIXME( "(%p, %d, %p, %ld, %p): stub!\n", handle, type, config, length, overlapped );
return NO_ERROR;
}
@@ -197,7 +197,7 @@ ULONG WINAPI HttpCreateHttpHandle(HANDLE *handle, ULONG reserved)
UNICODE_STRING string;
IO_STATUS_BLOCK iosb;
- TRACE("handle %p, reserved %#x.\n", handle, reserved);
+ TRACE("handle %p, reserved %#lx.\n", handle, reserved);
if (!handle)
return ERROR_INVALID_PARAMETER;
@@ -289,11 +289,11 @@ ULONG WINAPI HttpReceiveRequestEntityBody(HANDLE queue, HTTP_REQUEST_ID id, ULON
ULONG ret = ERROR_SUCCESS;
OVERLAPPED sync_ovl;
- TRACE("queue %p, id %s, flags %#x, buffer %p, size %#x, ret_size %p, ovl %p.\n",
+ TRACE("queue %p, id %s, flags %#lx, buffer %p, size %#lx, ret_size %p, ovl %p.\n",
queue, wine_dbgstr_longlong(id), flags, buffer, size, ret_size, ovl);
if (flags)
- FIXME("Ignoring flags %#x.\n", flags);
+ FIXME("Ignoring flags %#lx.\n", flags);
if (!ovl)
{
@@ -334,11 +334,11 @@ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flag
ULONG ret = ERROR_SUCCESS;
OVERLAPPED sync_ovl;
- TRACE("queue %p, id %s, flags %#x, request %p, size %#x, ret_size %p, ovl %p.\n",
+ TRACE("queue %p, id %s, flags %#lx, request %p, size %#lx, ret_size %p, ovl %p.\n",
queue, wine_dbgstr_longlong(id), flags, request, size, ret_size, ovl);
if (flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY)
- FIXME("Ignoring flags %#x.\n", flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY);
+ FIXME("Ignoring flags %#lx.\n", flags & ~HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY);
if (size < sizeof(HTTP_REQUEST_V1))
return ERROR_INSUFFICIENT_BUFFER;
@@ -426,15 +426,15 @@ ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags,
char *p, dummy[12];
USHORT i;
- TRACE("queue %p, id %s, flags %#x, response %p, cache_policy %p, "
- "ret_size %p, reserved1 %p, reserved2 %#x, ovl %p, log_data %p.\n",
+ TRACE("queue %p, id %s, flags %#lx, response %p, cache_policy %p, "
+ "ret_size %p, reserved1 %p, reserved2 %#lx, ovl %p, log_data %p.\n",
queue, wine_dbgstr_longlong(id), flags, response, cache_policy,
ret_size, reserved1, reserved2, ovl, log_data);
if (flags)
- FIXME("Unhandled flags %#x.\n", flags);
+ FIXME("Unhandled flags %#lx.\n", flags);
if (response->s.Flags)
- FIXME("Unhandled response flags %#x.\n", response->s.Flags);
+ FIXME("Unhandled response flags %#lx.\n", response->s.Flags);
if (cache_policy)
WARN("Ignoring cache_policy.\n");
if (log_data)
@@ -563,7 +563,7 @@ ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION version, HTTP_SERVER_SESSIO
{
struct server_session *session;
- TRACE("version %u.%u, id %p, reserved %u.\n", version.HttpApiMajorVersion,
+ TRACE("version %u.%u, id %p, reserved %lu.\n", version.HttpApiMajorVersion,
version.HttpApiMinorVersion, id, reserved);
if (!id)
@@ -613,7 +613,7 @@ ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID session_id, HTTP_URL_GROU
struct server_session *session;
struct url_group *group;
- TRACE("session_id %s, group_id %p, reserved %#x.\n",
+ TRACE("session_id %s, group_id %p, reserved %#lx.\n",
wine_dbgstr_longlong(session_id), group_id, reserved);
if (!(session = get_server_session(session_id)))
@@ -655,7 +655,7 @@ ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID id, HTTP_SERVER_PROPERTY
{
struct url_group *group = get_url_group(id);
- TRACE("id %s, property %u, value %p, length %u.\n",
+ TRACE("id %s, property %u, value %p, length %lu.\n",
wine_dbgstr_longlong(id), property, value, length);
switch (property)
@@ -687,7 +687,7 @@ ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url,
{
struct url_group *group = get_url_group(id);
- TRACE("id %s, url %s, context %s, reserved %#x.\n", wine_dbgstr_longlong(id),
+ TRACE("id %s, url %s, context %s, reserved %#lx.\n", wine_dbgstr_longlong(id),
debugstr_w(url), wine_dbgstr_longlong(context), reserved);
if (group->url)
@@ -713,13 +713,13 @@ ULONG WINAPI HttpRemoveUrlFromUrlGroup(HTTP_URL_GROUP_ID id, const WCHAR *url, U
{
struct url_group *group = get_url_group(id);
- TRACE("id %s, url %s, flags %#x.\n", wine_dbgstr_longlong(id), debugstr_w(url), flags);
+ TRACE("id %s, url %s, flags %#lx.\n", wine_dbgstr_longlong(id), debugstr_w(url), flags);
if (!group->url)
return ERROR_FILE_NOT_FOUND;
if (flags)
- FIXME("Ignoring flags %#x.\n", flags);
+ FIXME("Ignoring flags %#lx.\n", flags);
heap_free(group->url);
group->url = NULL;
@@ -740,14 +740,14 @@ ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION version, const WCHAR *name,
UNICODE_STRING string;
IO_STATUS_BLOCK iosb;
- TRACE("version %u.%u, name %s, sa %p, flags %#x, handle %p.\n",
+ TRACE("version %u.%u, name %s, sa %p, flags %#lx, handle %p.\n",
version.HttpApiMajorVersion, version.HttpApiMinorVersion,
debugstr_w(name), sa, flags, handle);
if (name)
FIXME("Unhandled name %s.\n", debugstr_w(name));
if (flags)
- FIXME("Unhandled flags %#x.\n", flags);
+ FIXME("Unhandled flags %#lx.\n", flags);
RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue");
attr.ObjectName = &string;
@@ -775,7 +775,7 @@ ULONG WINAPI HttpCloseRequestQueue(HANDLE handle)
ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY property,
void *value, ULONG length, ULONG reserved1, void *reserved2)
{
- FIXME("queue %p, property %u, value %p, length %u, reserved1 %#x, reserved2 %p, stub!\n",
+ FIXME("queue %p, property %u, value %p, length %lu, reserved1 %#lx, reserved2 %p, stub!\n",
queue, property, value, length, reserved1, reserved2);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@@ -786,7 +786,7 @@ ULONG WINAPI HttpSetRequestQueueProperty(HANDLE queue, HTTP_SERVER_PROPERTY prop
ULONG WINAPI HttpSetServerSessionProperty(HTTP_SERVER_SESSION_ID id,
HTTP_SERVER_PROPERTY property, void *value, ULONG length)
{
- TRACE("id %s, property %u, value %p, length %u.\n",
+ TRACE("id %s, property %u, value %p, length %lu.\n",
wine_dbgstr_longlong(id), property, value, length);
switch (property)
More information about the wine-cvs
mailing list