February 2022 - Wine-Commits

Alexandre Julliard : api-ms-*: Forward to combase instead of ole32.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 21536c066a8bf30ee3a67d3f4a5dd4d08e2ea321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21536c066a8bf30ee3a67d3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 15:34:30 2022 +0100 api-ms-*: Forward to combase instead of ole32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-com-l1-1-0.spec | 140 ++++++++++----------- .../api-ms-win-core-com-l1-1-1.spec | 140 ++++++++++----------- .../api-ms-win-downlevel-ole32-l1-1-0.spec | 94 +++++++------- tools/make_specfiles | 6 +- 4 files changed, 190 insertions(+), 190 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21536c066a8bf30ee3a6…

1 0

Alexandre Julliard : api-ms-*: Forward to kernelbase instead of user32.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: eb84ed07d90ea9aecf1357f7dfaf2d41fd4a4bc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb84ed07d90ea9aecf1357f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 15:31:16 2022 +0100 api-ms-*: Forward to kernelbase instead of user32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-string-l2-1-0.spec | 20 +++++----- .../api-ms-win-core-stringansi-l1-1-0.spec | 24 ++++++------ .../api-ms-win-core-stringloader-l1-1-1.spec | 4 +- .../api-ms-win-downlevel-user32-l1-1-0.spec | 44 +++++++++++----------- tools/make_specfiles | 8 ++-- 5 files changed, 50 insertions(+), 50 deletions(-) diff --git a/dlls/api-ms-win-core-string-l2-1-0/api-ms-win-core-string-l2-1-0.spec b/dlls/api-ms-win-core-string-l2-1-0/api-ms-win-core-string-l2-1-0.spec index 22209490162..5cf62867e40 100644 --- a/dlls/api-ms-win-core-string-l2-1-0/api-ms-win-core-string-l2-1-0.spec +++ b/dlls/api-ms-win-core-string-l2-1-0/api-ms-win-core-string-l2-1-0.spec @@ -1,10 +1,10 @@ -@ stdcall CharLowerBuffW(wstr long) user32.CharLowerBuffW -@ stdcall CharLowerW(wstr) user32.CharLowerW -@ stdcall CharNextW(wstr) user32.CharNextW -@ stdcall CharPrevW(wstr wstr) user32.CharPrevW -@ stdcall CharUpperBuffW(wstr long) user32.CharUpperBuffW -@ stdcall CharUpperW(wstr) user32.CharUpperW -@ stdcall IsCharAlphaNumericW(long) user32.IsCharAlphaNumericW -@ stdcall IsCharAlphaW(long) user32.IsCharAlphaW -@ stdcall IsCharLowerW(long) user32.IsCharLowerW -@ stdcall IsCharUpperW(long) user32.IsCharUpperW +@ stdcall CharLowerBuffW(wstr long) kernelbase.CharLowerBuffW +@ stdcall CharLowerW(wstr) kernelbase.CharLowerW +@ stdcall CharNextW(wstr) kernelbase.CharNextW +@ stdcall CharPrevW(wstr wstr) kernelbase.CharPrevW +@ stdcall CharUpperBuffW(wstr long) kernelbase.CharUpperBuffW +@ stdcall CharUpperW(wstr) kernelbase.CharUpperW +@ stdcall IsCharAlphaNumericW(long) kernelbase.IsCharAlphaNumericW +@ stdcall IsCharAlphaW(long) kernelbase.IsCharAlphaW +@ stdcall IsCharLowerW(long) kernelbase.IsCharLowerW +@ stdcall IsCharUpperW(long) kernelbase.IsCharUpperW diff --git a/dlls/api-ms-win-core-stringansi-l1-1-0/api-ms-win-core-stringansi-l1-1-0.spec b/dlls/api-ms-win-core-stringansi-l1-1-0/api-ms-win-core-stringansi-l1-1-0.spec index 2c58a160f13..ac8e1d07399 100644 --- a/dlls/api-ms-win-core-stringansi-l1-1-0/api-ms-win-core-stringansi-l1-1-0.spec +++ b/dlls/api-ms-win-core-stringansi-l1-1-0/api-ms-win-core-stringansi-l1-1-0.spec @@ -1,12 +1,12 @@ -@ stdcall CharLowerA(str) user32.CharLowerA -@ stdcall CharLowerBuffA(str long) user32.CharLowerBuffA -@ stdcall CharNextA(str) user32.CharNextA -@ stdcall CharNextExA(long str long) user32.CharNextExA -@ stdcall CharPrevA(str str) user32.CharPrevA -@ stdcall CharPrevExA(long str str long) user32.CharPrevExA -@ stdcall CharUpperA(str) user32.CharUpperA -@ stdcall CharUpperBuffA(str long) user32.CharUpperBuffA -@ stdcall IsCharAlphaA(long) user32.IsCharAlphaA -@ stdcall IsCharAlphaNumericA(long) user32.IsCharAlphaNumericA -@ stdcall IsCharLowerA(long) user32.IsCharLowerA -@ stdcall IsCharUpperA(long) user32.IsCharUpperA +@ stdcall CharLowerA(str) kernelbase.CharLowerA +@ stdcall CharLowerBuffA(str long) kernelbase.CharLowerBuffA +@ stdcall CharNextA(str) kernelbase.CharNextA +@ stdcall CharNextExA(long str long) kernelbase.CharNextExA +@ stdcall CharPrevA(str str) kernelbase.CharPrevA +@ stdcall CharPrevExA(long str str long) kernelbase.CharPrevExA +@ stdcall CharUpperA(str) kernelbase.CharUpperA +@ stdcall CharUpperBuffA(str long) kernelbase.CharUpperBuffA +@ stdcall IsCharAlphaA(long) kernelbase.IsCharAlphaA +@ stdcall IsCharAlphaNumericA(long) kernelbase.IsCharAlphaNumericA +@ stdcall IsCharLowerA(long) kernelbase.IsCharLowerA +@ stdcall IsCharUpperA(long) kernelbase.IsCharUpperA diff --git a/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec b/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec index a60736e055d..c944882a64b 100644 --- a/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec +++ b/dlls/api-ms-win-core-stringloader-l1-1-1/api-ms-win-core-stringloader-l1-1-1.spec @@ -1,2 +1,2 @@ -@ stdcall LoadStringA(long long ptr long) user32.LoadStringA -@ stdcall LoadStringW(long long ptr long) user32.LoadStringW +@ stdcall LoadStringA(long long ptr long) kernelbase.LoadStringA +@ stdcall LoadStringW(long long ptr long) kernelbase.LoadStringW diff --git a/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec b/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec index 182d964b9ca..9d716d596e1 100644 --- a/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec @@ -1,22 +1,22 @@ -@ stdcall CharLowerA(str) user32.CharLowerA -@ stdcall CharLowerBuffA(str long) user32.CharLowerBuffA -@ stdcall CharLowerBuffW(wstr long) user32.CharLowerBuffW -@ stdcall CharLowerW(wstr) user32.CharLowerW -@ stdcall CharNextA(str) user32.CharNextA -@ stdcall CharNextExA(long str long) user32.CharNextExA -@ stdcall CharNextW(wstr) user32.CharNextW -@ stdcall CharPrevA(str str) user32.CharPrevA -@ stdcall CharPrevExA(long str str long) user32.CharPrevExA -@ stdcall CharPrevW(wstr wstr) user32.CharPrevW -@ stdcall CharUpperA(str) user32.CharUpperA -@ stdcall CharUpperBuffA(str long) user32.CharUpperBuffA -@ stdcall CharUpperBuffW(wstr long) user32.CharUpperBuffW -@ stdcall CharUpperW(wstr) user32.CharUpperW -@ stdcall IsCharAlphaA(long) user32.IsCharAlphaA -@ stdcall IsCharAlphaNumericA(long) user32.IsCharAlphaNumericA -@ stdcall IsCharAlphaNumericW(long) user32.IsCharAlphaNumericW -@ stdcall IsCharAlphaW(long) user32.IsCharAlphaW -@ stdcall IsCharLowerA(long) user32.IsCharLowerA -@ stdcall IsCharLowerW(long) user32.IsCharLowerW -@ stdcall IsCharUpperA(long) user32.IsCharUpperA -@ stdcall IsCharUpperW(long) user32.IsCharUpperW +@ stdcall CharLowerA(str) kernelbase.CharLowerA +@ stdcall CharLowerBuffA(str long) kernelbase.CharLowerBuffA +@ stdcall CharLowerBuffW(wstr long) kernelbase.CharLowerBuffW +@ stdcall CharLowerW(wstr) kernelbase.CharLowerW +@ stdcall CharNextA(str) kernelbase.CharNextA +@ stdcall CharNextExA(long str long) kernelbase.CharNextExA +@ stdcall CharNextW(wstr) kernelbase.CharNextW +@ stdcall CharPrevA(str str) kernelbase.CharPrevA +@ stdcall CharPrevExA(long str str long) kernelbase.CharPrevExA +@ stdcall CharPrevW(wstr wstr) kernelbase.CharPrevW +@ stdcall CharUpperA(str) kernelbase.CharUpperA +@ stdcall CharUpperBuffA(str long) kernelbase.CharUpperBuffA +@ stdcall CharUpperBuffW(wstr long) kernelbase.CharUpperBuffW +@ stdcall CharUpperW(wstr) kernelbase.CharUpperW +@ stdcall IsCharAlphaA(long) kernelbase.IsCharAlphaA +@ stdcall IsCharAlphaNumericA(long) kernelbase.IsCharAlphaNumericA +@ stdcall IsCharAlphaNumericW(long) kernelbase.IsCharAlphaNumericW +@ stdcall IsCharAlphaW(long) kernelbase.IsCharAlphaW +@ stdcall IsCharLowerA(long) kernelbase.IsCharLowerA +@ stdcall IsCharLowerW(long) kernelbase.IsCharLowerW +@ stdcall IsCharUpperA(long) kernelbase.IsCharUpperA +@ stdcall IsCharUpperW(long) kernelbase.IsCharUpperW diff --git a/tools/make_specfiles b/tools/make_specfiles index 56e746d256d..915241e2797 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -286,6 +286,9 @@ my @dll_groups = "api-ms-win-core-shlwapi-obsolete-l1-2-0", "api-ms-win-core-sidebyside-l1-1-0", "api-ms-win-core-string-l1-1-0", + "api-ms-win-core-string-l2-1-0", + "api-ms-win-core-stringansi-l1-1-0", + "api-ms-win-core-stringloader-l1-1-1", "api-ms-win-core-synch-ansi-l1-1-0", "api-ms-win-core-synch-l1-1-0", "api-ms-win-core-synch-l1-2-0", @@ -309,6 +312,7 @@ my @dll_groups = "api-ms-win-downlevel-advapi32-l1-1-0", "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-downlevel-shlwapi-l1-1-0", + "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-eventing-classicprovider-l1-1-0", "api-ms-win-eventing-provider-l1-1-0", "api-ms-win-security-base-l1-1-0", @@ -391,10 +395,6 @@ my @dll_groups = ], [ "user32", - "api-ms-win-core-string-l2-1-0", - "api-ms-win-core-stringansi-l1-1-0", - "api-ms-win-core-stringloader-l1-1-1", - "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0", "api-ms-win-ntuser-rectangle-l1-1-0", "api-ms-win-ntuser-sysparams-l1-1-0",

1 0

Alexandre Julliard : api-ms-*: Forward to kernelbase instead of shlwapi.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 485f7003e6566eccdcc8dc7e338ab32dfebf73a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=485f7003e6566eccdcc8dc7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 15:29:53 2022 +0100 api-ms-*: Forward to kernelbase instead of shlwapi. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ...pi-ms-win-core-registryuserspecific-l1-1-0.spec | 50 ++-- .../api-ms-win-core-shlwapi-legacy-l1-1-0.spec | 172 ++++++------ .../api-ms-win-core-shlwapi-obsolete-l1-1-0.spec | 120 ++++---- .../api-ms-win-core-shlwapi-obsolete-l1-2-0.spec | 114 ++++---- .../api-ms-win-core-url-l1-1-0.spec | 76 ++--- .../api-ms-win-downlevel-shlwapi-l1-1-0.spec | 308 ++++++++++----------- tools/make_specfiles | 12 +- 7 files changed, 426 insertions(+), 426 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=485f7003e6566eccdcc8…

1 0

Alexandre Julliard : make_specfiles: Move some ApiSet dlls to the ntdll section.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 0c095ccc2d5c49cc93c2118fd317d43ba63b3127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c095ccc2d5c49cc93c2118f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 17:17:21 2022 +0100 make_specfiles: Move some ApiSet dlls to the ntdll section. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_specfiles | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index fb8c9f90377..c747fb89f05 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -186,10 +186,12 @@ my @dll_groups = ], [ "ntdll", + "api-ms-win-core-apiquery-l1-1-0", + "api-ms-win-core-rtlsupport-l1-1-0", + "api-ms-win-core-rtlsupport-l1-2-0", "api-ms-win-core-xstate-l1-1-0", ], [ - "ntdll", "powrprof", "api-ms-win-power-base-l1-1-0", "api-ms-win-power-setting-l1-1-0", @@ -457,13 +459,8 @@ my @dll_groups = ], [ "msvcrt", - "ntdll", - "ntoskrnl.exe", - "api-ms-win-core-apiquery-l1-1-0", "api-ms-win-core-crt-l1-1-0", "api-ms-win-core-crt-l2-1-0", - "api-ms-win-core-rtlsupport-l1-1-0", - "api-ms-win-core-rtlsupport-l1-2-0", ], [ "gdi32",

1 0

Eric Pouech : httpapi: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 8ea90bec6f50a3a2ac5abf93529fd78fe679bb7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ea90bec6f50a3a2ac5abf93… Author: Eric Pouech <eric.pouech(a)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(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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)

1 0

Eric Pouech : msvfw32: Enable compilation with long types.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 4d9519f5e242325a097b72e2dca6968f8cfa9197 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d9519f5e242325a097b72e2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:30:41 2022 +0100 msvfw32: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/Makefile.in | 1 - dlls/msvfw32/drawdib.c | 18 +++++++++--------- dlls/msvfw32/mciwnd.c | 24 ++++++++++++------------ dlls/msvfw32/msvideo_main.c | 40 ++++++++++++++++++++-------------------- 4 files changed, 41 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d9519f5e242325a097b…

1 0

Eric Pouech : mstask: Enable compilation with long types.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: f58d93bdc94ed9adf638a821815773cc64a92d9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f58d93bdc94ed9adf638a821… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:30:35 2022 +0100 mstask: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/Makefile.in | 1 - dlls/mstask/task.c | 34 +++++++++++++++++----------------- dlls/mstask/task_scheduler.c | 8 ++++---- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in index 0db016ead8a..086d3c0c5ab 100644 --- a/dlls/mstask/Makefile.in +++ b/dlls/mstask/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mstask.dll IMPORTS = rpcrt4 ole32 oleaut32 diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 398cefc58e4..23e9af7f0f3 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -659,7 +659,7 @@ static HRESULT WINAPI MSTASK_ITask_EditWorkItem( HWND hParent, DWORD dwReserved) { - FIXME("(%p, %p, %d): stub\n", iface, hParent, dwReserved); + FIXME("(%p, %p, %ld): stub\n", iface, hParent, dwReserved); return E_NOTIMPL; } @@ -901,7 +901,7 @@ static HRESULT WINAPI MSTASK_ITask_SetFlags(ITask *iface, DWORD flags) { TaskImpl *This = impl_from_ITask(iface); - TRACE("(%p, 0x%08x)\n", iface, flags); + TRACE("(%p, 0x%08lx)\n", iface, flags); This->flags &= 0xffff8000; This->flags |= flags & 0x7fff; This->is_dirty = TRUE; @@ -1127,7 +1127,7 @@ static HRESULT WINAPI MSTASK_ITask_SetPriority( ITask* iface, DWORD dwPriority) { - FIXME("(%p, 0x%08x): stub\n", iface, dwPriority); + FIXME("(%p, 0x%08lx): stub\n", iface, dwPriority); return E_NOTIMPL; } @@ -1145,7 +1145,7 @@ static HRESULT WINAPI MSTASK_ITask_SetTaskFlags( ITask* iface, DWORD dwFlags) { - FIXME("(%p, 0x%08x): stub\n", iface, dwFlags); + FIXME("(%p, 0x%08lx): stub\n", iface, dwFlags); return E_NOTIMPL; } @@ -1162,7 +1162,7 @@ static HRESULT WINAPI MSTASK_ITask_SetMaxRunTime( { TaskImpl *This = impl_from_ITask(iface); - TRACE("(%p, %d)\n", iface, dwMaxRunTime); + TRACE("(%p, %ld)\n", iface, dwMaxRunTime); This->maxRunTime = dwMaxRunTime; This->is_dirty = TRUE; @@ -1229,7 +1229,7 @@ static DWORD load_unicode_strings(ITask *task, BYTE *data, DWORD limit) { if (limit < sizeof(USHORT)) { - TRACE("invalid string %u offset\n", i); + TRACE("invalid string %lu offset\n", i); break; } @@ -1239,11 +1239,11 @@ static DWORD load_unicode_strings(ITask *task, BYTE *data, DWORD limit) limit -= sizeof(USHORT); if (limit < len * sizeof(WCHAR)) { - TRACE("invalid string %u size\n", i); + TRACE("invalid string %lu size\n", i); break; } - TRACE("string %u: %s\n", i, wine_dbgstr_wn((const WCHAR *)data, len)); + TRACE("string %lu: %s\n", i, wine_dbgstr_wn((const WCHAR *)data, len)); switch (i) { @@ -1315,7 +1315,7 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) This->maxRunTime = fixed->maximum_runtime; TRACE("exit_code %#x\n", fixed->exit_code); This->exit_code = fixed->exit_code; - TRACE("status %08x\n", fixed->status); + TRACE("status %08lx\n", fixed->status); This->status = fixed->status; TRACE("flags %08x\n", fixed->flags); This->flags = fixed->flags; @@ -1342,7 +1342,7 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) TRACE("invalid name_size_offset\n"); return SCHED_E_INVALID_TASK; } - TRACE("unicode strings end at %#x\n", fixed->name_size_offset + unicode_strings_size); + TRACE("unicode strings end at %#lx\n", fixed->name_size_offset + unicode_strings_size); if (size < fixed->trigger_offset + sizeof(USHORT)) { @@ -1352,7 +1352,7 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) trigger_count = *(const USHORT *)(data + fixed->trigger_offset); TRACE("trigger_count %u\n", trigger_count); triggers_size = size - fixed->trigger_offset - sizeof(USHORT); - TRACE("triggers_size %u\n", triggers_size); + TRACE("triggers_size %lu\n", triggers_size); task_trigger = (TASK_TRIGGER *)(data + fixed->trigger_offset + sizeof(USHORT)); data += fixed->name_size_offset + unicode_strings_size; @@ -1371,7 +1371,7 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) TRACE("no space for user data\n"); return SCHED_E_INVALID_TASK; } - TRACE("User Data size %#x\n", data_size); + TRACE("User Data size %#lx\n", data_size); ITask_SetWorkItemData(task, data_size, data + sizeof(USHORT)); size -= sizeof(USHORT) + data_size; @@ -1390,13 +1390,13 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) TRACE("no space for reserved data\n"); return SCHED_E_INVALID_TASK; } - TRACE("Reserved Data size %#x\n", data_size); + TRACE("Reserved Data size %#lx\n", data_size); size -= sizeof(USHORT) + data_size; data += sizeof(USHORT) + data_size; /* Trigger Data */ - TRACE("trigger_offset %04x, triggers end at %04x\n", fixed->trigger_offset, + TRACE("trigger_offset %04x, triggers end at %04lx\n", fixed->trigger_offset, (DWORD)(fixed->trigger_offset + sizeof(USHORT) + trigger_count * sizeof(TASK_TRIGGER))); task_trigger = (TASK_TRIGGER *)(data + sizeof(USHORT)); @@ -1449,7 +1449,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Load(IPersistFile *iface, LPCOLESTR fi DWORD access, sharing, size, try; void *data; - TRACE("(%p, %s, 0x%08x)\n", iface, debugstr_w(file_name), mode); + TRACE("(%p, %s, 0x%08lx)\n", iface, debugstr_w(file_name), mode); switch (mode & 0x000f) { @@ -1488,7 +1488,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Load(IPersistFile *iface, LPCOLESTR fi if (GetLastError() != ERROR_SHARING_VIOLATION || try++ >= 3) { - TRACE("Failed to open %s, error %u\n", debugstr_w(file_name), GetLastError()); + TRACE("Failed to open %s, error %lu\n", debugstr_w(file_name), GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); } Sleep(100); @@ -1499,7 +1499,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Load(IPersistFile *iface, LPCOLESTR fi mapping = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, 0); if (!mapping) { - TRACE("Failed to create file mapping %s, error %u\n", debugstr_w(file_name), GetLastError()); + TRACE("Failed to create file mapping %s, error %lu\n", debugstr_w(file_name), GetLastError()); CloseHandle(file); return HRESULT_FROM_WIN32(GetLastError()); } diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 12eeae3565c..d8ccee37f59 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -85,7 +85,7 @@ static ULONG WINAPI EnumWorkItems_AddRef(IEnumWorkItems *iface) { EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); return ref; } @@ -94,7 +94,7 @@ static ULONG WINAPI EnumWorkItems_Release(IEnumWorkItems *iface) EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); if (ref == 0) { @@ -131,7 +131,7 @@ static HRESULT WINAPI EnumWorkItems_Next(IEnumWorkItems *iface, ULONG count, LPW LPWSTR *list; HRESULT hr = S_FALSE; - TRACE("(%p)->(%u %p %p)\n", This, count, names, fetched); + TRACE("(%p)->(%lu %p %p)\n", This, count, names, fetched); if (!count || !names || (!fetched && count > 1)) return E_INVALIDARG; @@ -212,7 +212,7 @@ static HRESULT WINAPI EnumWorkItems_Skip(IEnumWorkItems *iface, ULONG count) ULONG fetched; HRESULT hr; - TRACE("(%p)->(%u)\n", iface, count); + TRACE("(%p)->(%lu)\n", iface, count); hr = EnumWorkItems_Next(iface, count, &names, &fetched); if (SUCCEEDED(hr))

1 0

Eric Pouech : msasn1: Enable compilation with long types.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 2a233ce210aa583026930973946ecfd8461fb3c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a233ce210aa583026930973… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:28:53 2022 +0100 msasn1: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/Makefile.in | 1 - dlls/msasn1/main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msasn1/Makefile.in b/dlls/msasn1/Makefile.in index afdfa2657ee..6d55907cff2 100644 --- a/dlls/msasn1/Makefile.in +++ b/dlls/msasn1/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msasn1.dll IMPORTLIB = msasn1 diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 2ebaa8c485c..4614a5b292e 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -36,7 +36,7 @@ ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, { ASN1module_t module = NULL; - TRACE("(%08x %08x %08x %u %p %p %p %p %u)\n", ver, rule, flags, pdu, encoder, decoder, freemem, size, magic); + TRACE("(%08lx %08x %08lx %lu %p %p %p %p %lu)\n", ver, rule, flags, pdu, encoder, decoder, freemem, size, magic); if (!encoder || !decoder || !freemem || !size) return module; @@ -83,7 +83,7 @@ ASN1error_e WINAPI ASN1_CreateEncoder(ASN1module_t module, ASN1encoding_t *encod { ASN1encoding_t enc; - TRACE("(%p %p %p %u %p)\n", module, encoder, buf, bufsize, parent); + TRACE("(%p %p %p %lu %p)\n", module, encoder, buf, bufsize, parent); if (!module || !encoder) return ASN1_ERR_BADARGS; @@ -133,7 +133,7 @@ ASN1error_e WINAPI ASN1_CreateDecoder(ASN1module_t module, ASN1decoding_t *decod { ASN1decoding_t dec; - TRACE("(%p %p %p %u %p)\n", module, decoder, buf, bufsize, parent); + TRACE("(%p %p %p %lu %p)\n", module, decoder, buf, bufsize, parent); if (!module || !decoder) return ASN1_ERR_BADARGS; @@ -179,7 +179,7 @@ void WINAPI ASN1_CloseDecoder(ASN1decoding_t decoder) ASN1error_e WINAPI ASN1_Decode(ASN1decoding_t decoder, void **outdata, ASN1uint32_t pdunum, ASN1uint32_t flags, ASN1octet_t *buf, ASN1uint32_t bufsize) { - FIXME("(%p %p %u %08x %p %u): Stub!\n", decoder, outdata, pdunum, flags, buf, bufsize); + FIXME("(%p %p %lu %08lx %p %lu): Stub!\n", decoder, outdata, pdunum, flags, buf, bufsize); if (!decoder) return ASN1_ERR_BADARGS;

1 0

Eric Pouech : http.sys: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 3542152c236748733b7c71a9308cbcdc17b02c93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3542152c236748733b7c71a9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 00:23:34 2022 -0600 http.sys: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/Makefile.in | 1 - dlls/http.sys/http.c | 16 ++++++++-------- dlls/http.sys/request.h | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/http.sys/Makefile.in b/dlls/http.sys/Makefile.in index b8740120e84..b79f11cf930 100644 --- a/dlls/http.sys/Makefile.in +++ b/dlls/http.sys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = http.sys IMPORTS = ntoskrnl ws2_32 diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index e655edfeea2..523c70ee12c 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -510,10 +510,10 @@ static void receive_data(struct connection *conn) ioctlsocket(conn->socket, FIONREAD, &available); if (available) { - TRACE("%u more bytes of data available, trying with larger buffer.\n", available); + TRACE("%lu more bytes of data available, trying with larger buffer.\n", available); if (!(conn->buffer = heap_realloc(conn->buffer, conn->len + available))) { - ERR("Failed to allocate %u bytes of memory.\n", conn->len + available); + ERR("Failed to allocate %lu bytes of memory.\n", conn->len + available); close_connection(conn); return; } @@ -730,7 +730,7 @@ static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) struct connection *conn; NTSTATUS ret; - TRACE("addr %s, id %s, flags %#x, bits %u.\n", wine_dbgstr_longlong(params->addr), + TRACE("addr %s, id %s, flags %#lx, bits %lu.\n", wine_dbgstr_longlong(params->addr), wine_dbgstr_longlong(params->id), params->flags, params->bits); EnterCriticalSection(&http_cs); @@ -821,13 +821,13 @@ static NTSTATUS http_receive_body(struct request_queue *queue, IRP *irp) struct connection *conn; NTSTATUS ret; - TRACE("id %s, bits %u.\n", wine_dbgstr_longlong(params->id), params->bits); + TRACE("id %s, bits %lu.\n", wine_dbgstr_longlong(params->id), params->bits); EnterCriticalSection(&http_cs); if ((conn = get_connection(params->id))) { - TRACE("%u bits remaining.\n", conn->content_len); + TRACE("%lu bits remaining.\n", conn->content_len); if (conn->content_len) { @@ -875,7 +875,7 @@ static NTSTATUS WINAPI dispatch_ioctl(DEVICE_OBJECT *device, IRP *irp) ret = http_receive_body(queue, irp); break; default: - FIXME("Unhandled ioctl %#x.\n", stack->Parameters.DeviceIoControl.IoControlCode); + FIXME("Unhandled ioctl %#lx.\n", stack->Parameters.DeviceIoControl.IoControlCode); ret = STATUS_NOT_IMPLEMENTED; } @@ -987,12 +987,12 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) RtlInitUnicodeString(&string, L"\\Device\\Http"); attr.ObjectName = &string; if ((ret = NtCreateDirectoryObject(&directory_obj, 0, &attr)) && ret != STATUS_OBJECT_NAME_COLLISION) - ERR("Failed to create \\Device\\Http directory, status %#x.\n", ret); + ERR("Failed to create \\Device\\Http directory, status %#lx.\n", ret); RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); if ((ret = IoCreateDevice(driver, 0, &string, FILE_DEVICE_UNKNOWN, 0, FALSE, &device_obj))) { - ERR("Failed to create request queue device, status %#x.\n", ret); + ERR("Failed to create request queue device, status %#lx.\n", ret); NtClose(directory_obj); return ret; } diff --git a/dlls/http.sys/request.h b/dlls/http.sys/request.h index a1b77b67dc5..f044db3bb2c 100644 --- a/dlls/http.sys/request.h +++ b/dlls/http.sys/request.h @@ -167,7 +167,7 @@ static NTSTATUS complete_irp(struct connection *conn, IRP *irp) irp_size += unk_headers_count * sizeof(struct http_unknown_header); - TRACE("Need %u bytes, have %u.\n", irp_size, output_len); + TRACE("Need %lu bytes, have %lu.\n", irp_size, output_len); irp->IoStatus.Information = irp_size; memset(irp->AssociatedIrp.SystemBuffer, 0, output_len);

1 0

Eric Pouech : msctfmonitor: Enable compilation with long types.
by Alexandre Julliard Feb. 15, 2022

Feb. 15, 2022

Module: wine Branch: master Commit: 7c73ffc643f7c42972cb96c50daff52f511bf8a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c73ffc643f7c42972cb96c5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 15 07:29:11 2022 +0100 msctfmonitor: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctfmonitor/Makefile.in | 1 - dlls/msctfmonitor/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msctfmonitor/Makefile.in b/dlls/msctfmonitor/Makefile.in index 356f0ca1ce1..dd58e9fb0f6 100644 --- a/dlls/msctfmonitor/Makefile.in +++ b/dlls/msctfmonitor/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msctfmonitor.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msctfmonitor/main.c b/dlls/msctfmonitor/main.c index f609c1a1a25..3116fde1293 100644 --- a/dlls/msctfmonitor/main.c +++ b/dlls/msctfmonitor/main.c @@ -22,6 +22,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctfmonitor); HRESULT WINAPI InitLocalMsCtfMonitor(DWORD flags) { - FIXME("%d stub!\n", flags); + FIXME("%ld stub!\n", flags); return E_FAIL; }

1 0