- Wine-Devel - list.winehq.org

[PATCH 00/15] Enabling compilation with long types
by Eric Pouech Jan. 28, 2022

Jan. 28, 2022

There are 745 modules to be migrated to using long types. Start by enabling also attribute(format) on msvcrt APIs (for printf and scanf -like APIs) And continue by migration some modules in programs. FWI, I've scripted the migration. Between 80 and 90% of the modules can be done automatically (ie fully migrated without warnings); for the remaining modules, again 80 to 90% of the warnings are fixed automatically. The remaining must be done manually. Regular items to be looked into: - "complex" format strings (multi-line, in static variable, embedded inside macros...) - long/int mismatch (in pointer as argument, in proto vs definition of function...). Here the fix must be decided on a case by case basis. - multi-directories modules (like d3d, msvcrt, atl to name a few). Likely, requires migrating several modules at once. If you're interested at looking into your favorite module, don't hesitate to go back to me (I can provide the raw automated changes if this can help you). The plan is to start to migrate programs/*. Then likely dlls/*. The [dlls/programs]/tests/* shall wait for Fabian to finish the gcc11 todo fixes. A+ -- Eric Pouech (15): include/msvcrt: add attribute((format)) to printf and scanf -like APIs programs/attrib: enable compilation with long types programs/cabarc: enable compilation with long types programs/chcp.com: enable compilation with long types programs/cmd: enable compilation with long types programs/conhost: enable compilation with long types programs/[cw]script: enable compilation with long types programs/dxdiag: enable compilation with long types programs/eject: enable compilation with long types programs/explorer: enable compilation with long types programs/fsutil: enable compilation with long types programs/msiexec: enable compilation with long types programs/net: enable compilation with long types programs/netstat: enable compilation with long types programs/ping: enable compilation with long types dlls/compobj.dll16/compobj.c | 2 +- dlls/crypt32/sip.c | 2 +- dlls/iphlpapi/iphlpapi_main.c | 2 +- dlls/iphlpapi/tests/iphlpapi.c | 4 +- dlls/msdmo/tests/msdmo.c | 2 +- dlls/mshtml/main.c | 2 +- dlls/oleaut32/oleaut.c | 2 +- dlls/oleaut32/typelib.c | 2 +- dlls/rpcrt4/rpcrt4_main.c | 4 +- dlls/shell32/classes.c | 2 +- dlls/shell32/debughlp.c | 2 +- dlls/shell32/shfldr.h | 2 +- dlls/shlwapi/ordinal.c | 2 +- dlls/typelib.dll16/typelib.c | 2 +- dlls/webservices/writer.c | 4 +- include/msvcrt/corecrt.h | 8 +++ include/msvcrt/crtdbg.h | 2 +- include/msvcrt/stdio.h | 90 ++++++++++++++++++++++------------ programs/attrib/Makefile.in | 1 - programs/attrib/attrib.c | 6 +-- programs/cabarc/Makefile.in | 1 - programs/cabarc/cabarc.c | 2 +- programs/chcp.com/Makefile.in | 1 - programs/chcp.com/main.c | 4 +- programs/cmd/Makefile.in | 1 - programs/cmd/builtins.c | 20 ++++---- programs/cmd/directory.c | 4 +- programs/cmd/wcmdmain.c | 14 +++--- programs/conhost/Makefile.in | 1 - programs/conhost/conhost.c | 18 +++---- programs/conhost/window.c | 10 ++-- programs/cscript/Makefile.in | 2 +- programs/dxdiag/Makefile.in | 1 - programs/dxdiag/information.c | 2 +- programs/dxdiag/output.c | 6 +-- programs/eject/Makefile.in | 1 - programs/eject/eject.c | 6 +-- programs/explorer/Makefile.in | 1 - programs/explorer/appbar.c | 2 +- programs/explorer/desktop.c | 52 ++++++++++---------- programs/explorer/explorer.c | 4 +- programs/explorer/systray.c | 2 +- programs/fsutil/Makefile.in | 1 - programs/fsutil/main.c | 2 +- programs/msiexec/Makefile.in | 1 - programs/msiexec/msiexec.c | 12 ++--- programs/msiexec/service.c | 4 +- programs/net/Makefile.in | 1 - programs/net/net.c | 4 +- programs/netstat/Makefile.in | 1 - programs/netstat/netstat.c | 2 +- programs/ping/Makefile.in | 1 - programs/ping/ping_main.c | 2 +- programs/winetest/main.c | 2 +- programs/wscript/Makefile.in | 1 - programs/wscript/arguments.c | 8 +-- programs/wscript/host.c | 10 ++-- programs/wscript/main.c | 6 +-- 58 files changed, 190 insertions(+), 166 deletions(-)

1 15

[PATCH 1/3] wined3d: Use wined3d_buffer_load_location() in wined3d_buffer_get_memory().
by Zebediah Figura Jan. 28, 2022

Jan. 28, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/buffer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b42c7bd919a..3d66af3e5e6 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -653,14 +653,12 @@ DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_co if (locations & WINED3D_LOCATION_DISCARDED) { locations = ((buffer->flags & WINED3D_BUFFER_USE_BO) ? WINED3D_LOCATION_BUFFER : WINED3D_LOCATION_SYSMEM); - if (!wined3d_buffer_prepare_location(buffer, context, locations)) + if (!wined3d_buffer_load_location(buffer, context, locations)) { data->buffer_object = 0; data->addr = NULL; return 0; } - wined3d_buffer_validate_location(buffer, locations); - wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_DISCARDED); } if (locations & WINED3D_LOCATION_BUFFER) { -- 2.34.1

4 7

[PATCH vkd3d v2 2/2] vkd3d: Replace atomic_add_fetch() by InterlockedAdd().
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

By analogy with InterlockedIncrement. It avoids the need for a configure check on Windows platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- v2: make enqueued_fence_count a LONG as well --- include/private/vkd3d_common.h | 13 ++++--------- libs/vkd3d/command.c | 6 +++--- libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index d22c26c098c7..1e19758abc40 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -201,6 +201,10 @@ static inline LONG InterlockedIncrement(LONG volatile *x) { return __sync_add_and_fetch(x, 1); } +static inline LONG InterlockedAdd(LONG volatile *x, LONG val) +{ + return __sync_add_and_fetch(x, val); +} # else # error "InterlockedIncrement() not implemented for this platform" # endif /* HAVE_SYNC_ADD_AND_FETCH */ @@ -215,15 +219,6 @@ static inline LONG InterlockedDecrement(LONG volatile *x) # endif #endif /* _WIN32 */ -#if HAVE_SYNC_ADD_AND_FETCH -# define atomic_add_fetch(ptr, val) __sync_add_and_fetch(ptr, val) -#elif defined(_MSC_VER) -/* InterlockedAdd returns value after increment, like add_and_fetch. */ -# define atomic_add_fetch(ptr, val) InterlockedAdd(ptr, val) -#else -# error "atomic_add_fetch() not implemented for this platform" -#endif /* HAVE_SYNC_ADD_AND_FETCH */ - static inline void vkd3d_parse_version(const char *version, int *major, int *minor) { *major = atoi(version); diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2cf1eba23d94..f1ec6be3fd20 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -288,7 +288,7 @@ static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, s LONG count; int rc; - if (!(count = atomic_add_fetch(&fence->pending_worker_operation_count, 0))) + if (!(count = InterlockedAdd(&fence->pending_worker_operation_count, 0))) return; WARN("Waiting for %u pending fence operations (fence %p).\n", count, fence); @@ -299,7 +299,7 @@ static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, s return; } - while ((count = atomic_add_fetch(&fence->pending_worker_operation_count, 0))) + while ((count = InterlockedAdd(&fence->pending_worker_operation_count, 0))) { TRACE("Still waiting for %u pending fence operations (fence %p).\n", count, fence); @@ -410,7 +410,7 @@ static void *vkd3d_fence_worker_main(void *arg) { vkd3d_wait_for_gpu_fences(worker); - if (!worker->fence_count || atomic_add_fetch(&worker->enqueued_fence_count, 0)) + if (!worker->fence_count || InterlockedAdd(&worker->enqueued_fence_count, 0)) { if ((rc = pthread_mutex_lock(&worker->mutex))) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 136b020330a9..d21cd411ec8a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -192,7 +192,7 @@ struct vkd3d_fence_worker bool should_exit; bool pending_fence_destruction; - size_t enqueued_fence_count; + LONG enqueued_fence_count; struct vkd3d_enqueued_fence { VkFence vk_fence; -- 2.34.1

2 1

[PATCH vkd3d v2 1/2] vkd3d: Always use _BitScanReverse on Windows.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Use ULONG instead of unsigned long for non-Mingw msvcrt builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- v2: unchanged --- include/private/vkd3d_common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index b7ce9ae4046a..d22c26c098c7 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -88,10 +88,10 @@ static inline bool vkd3d_bitmask_is_contiguous(unsigned int mask) /* Undefined for x == 0. */ static inline unsigned int vkd3d_log2i(unsigned int x) { -#ifdef _MSC_VER +#ifdef _WIN32 /* _BitScanReverse returns the index of the highest set bit, * unlike clz which is 31 - index. */ - unsigned long result; + ULONG result; _BitScanReverse(&result, x); return (unsigned int)result; #elif defined(HAVE_BUILTIN_CLZ) -- 2.34.1

2 1

[PATCH vkd3d 1/2] vkd3d: Always use _BitScanReverse on Windows.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Use ULONG instead of unsigned long for non-Mingw msvcrt builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index b7ce9ae4046a..d22c26c098c7 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -88,10 +88,10 @@ static inline bool vkd3d_bitmask_is_contiguous(unsigned int mask) /* Undefined for x == 0. */ static inline unsigned int vkd3d_log2i(unsigned int x) { -#ifdef _MSC_VER +#ifdef _WIN32 /* _BitScanReverse returns the index of the highest set bit, * unlike clz which is 31 - index. */ - unsigned long result; + ULONG result; _BitScanReverse(&result, x); return (unsigned int)result; #elif defined(HAVE_BUILTIN_CLZ) -- 2.34.1

2 1

[PATCH] iphlpapi: Avoid use of uninitialized variable
by Gerald Pfeifer Jan. 28, 2022

Jan. 28, 2022

In gateway_and_prefix_addresses_alloc prefix_len isn't set in the error case, but used unconditionally. Avoid this by initializing upon declaration. (Identified by GCC 12.) Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/iphlpapi/iphlpapi_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c94f869c9f9..720f8147476 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -992,7 +992,8 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG struct nsi_ipv6_forward_key *key6; IP_ADAPTER_GATEWAY_ADDRESS *gw, **gw_next; IP_ADAPTER_PREFIX *prefix, **prefix_next; - DWORD err, count, i, prefix_len, key_size = (family == AF_INET) ? sizeof(*key4) : sizeof(*key6); + DWORD err, count, i, prefix_len = 0; + DWORD key_size = (family == AF_INET) ? sizeof(*key4) : sizeof(*key6); DWORD sockaddr_size = (family == AF_INET) ? sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6); SOCKADDR_INET sockaddr; NET_LUID *luid; -- 2.32.0

2 2

[PATCH vkd3d 2/2] vkd3d: Replace atomic_add_fetch() by InterlockedAdd().
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

By analogy with InterlockedIncrement. It avoids the need for a configure check on Windows platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_common.h | 13 ++++--------- libs/vkd3d/command.c | 6 +++--- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index d22c26c098c7..1e19758abc40 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -201,6 +201,10 @@ static inline LONG InterlockedIncrement(LONG volatile *x) { return __sync_add_and_fetch(x, 1); } +static inline LONG InterlockedAdd(LONG volatile *x, LONG val) +{ + return __sync_add_and_fetch(x, val); +} # else # error "InterlockedIncrement() not implemented for this platform" # endif /* HAVE_SYNC_ADD_AND_FETCH */ @@ -215,15 +219,6 @@ static inline LONG InterlockedDecrement(LONG volatile *x) # endif #endif /* _WIN32 */ -#if HAVE_SYNC_ADD_AND_FETCH -# define atomic_add_fetch(ptr, val) __sync_add_and_fetch(ptr, val) -#elif defined(_MSC_VER) -/* InterlockedAdd returns value after increment, like add_and_fetch. */ -# define atomic_add_fetch(ptr, val) InterlockedAdd(ptr, val) -#else -# error "atomic_add_fetch() not implemented for this platform" -#endif /* HAVE_SYNC_ADD_AND_FETCH */ - static inline void vkd3d_parse_version(const char *version, int *major, int *minor) { *major = atoi(version); diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2cf1eba23d94..f1ec6be3fd20 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -288,7 +288,7 @@ static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, s LONG count; int rc; - if (!(count = atomic_add_fetch(&fence->pending_worker_operation_count, 0))) + if (!(count = InterlockedAdd(&fence->pending_worker_operation_count, 0))) return; WARN("Waiting for %u pending fence operations (fence %p).\n", count, fence); @@ -299,7 +299,7 @@ static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, s return; } - while ((count = atomic_add_fetch(&fence->pending_worker_operation_count, 0))) + while ((count = InterlockedAdd(&fence->pending_worker_operation_count, 0))) { TRACE("Still waiting for %u pending fence operations (fence %p).\n", count, fence); @@ -410,7 +410,7 @@ static void *vkd3d_fence_worker_main(void *arg) { vkd3d_wait_for_gpu_fences(worker); - if (!worker->fence_count || atomic_add_fetch(&worker->enqueued_fence_count, 0)) + if (!worker->fence_count || InterlockedAdd(&worker->enqueued_fence_count, 0)) { if ((rc = pthread_mutex_lock(&worker->mutex))) { -- 2.34.1

2 1

[PATCH v3 6/6] msvcp140_atomic_wait: Implement __std_bulk_submit_threadpool_work.
by Piotr Caban Jan. 28, 2022

Jan. 28, 2022

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 7 +++++++ .../msvcp140_atomic_wait.spec | 2 +- .../tests/msvcp140_atomic_wait.c | 20 +++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-)

1 0

[PATCH v3 5/6] msvcp140_atomic_wait: Implement __std_close_threadpool_work.
by Piotr Caban Jan. 28, 2022

Jan. 28, 2022

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c | 9 ++++++--- 3 files changed, 13 insertions(+), 4 deletions(-)

1 0

[PATCH v3 4/6] msvcp140_atomic_wait: Implement __std_wait_for_threadpool_work_callbacks.
by Piotr Caban Jan. 28, 2022

Jan. 28, 2022

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c | 7 +++++-- 3 files changed, 12 insertions(+), 3 deletions(-)

1 0