[PATCH 0/4] MR1612: Start of enabling long types in wined3d.
From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/ati_fragment_shader.c | 1 + dlls/wined3d/buffer.c | 1 + dlls/wined3d/context_gl.c | 1 + dlls/wined3d/cs.c | 1 + dlls/wined3d/device.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/nvidia_texture_shader.c | 1 + dlls/wined3d/palette.c | 1 + dlls/wined3d/query.c | 1 + dlls/wined3d/resource.c | 1 + dlls/wined3d/sampler.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm1.c | 1 + dlls/wined3d/shader_sm4.c | 1 + dlls/wined3d/state.c | 1 + dlls/wined3d/stateblock.c | 1 + dlls/wined3d/surface.c | 1 + dlls/wined3d/swapchain.c | 1 + dlls/wined3d/texture.c | 1 + dlls/wined3d/utils.c | 1 + dlls/wined3d/vertexdeclaration.c | 1 + dlls/wined3d/view.c | 1 + dlls/wined3d/wined3d_main.c | 1 + 28 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 23051f2a58b..07431281259 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wined3d.dll IMPORTLIB = wined3d IMPORTS = $(VKD3D_PE_LIBS) dxguid opengl32 user32 gdi32 advapi32 diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 60a168b5cef..797af89b3f5 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Copyright 2002-2004 Jason Edmeades * Copyright 2003-2004 Raphael Junqueira diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 90ffec4b1f7..d05d33dfd80 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Copyright 2018 Henri Verbeet for CodeWeavers * diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index db70a9853d4..b94e7f0fc5c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Pixel and vertex shaders implementation using ARB_vertex_program * and ARB_fragment_program GL extensions. diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 5aa6c0697e6..7adfa4aeac2 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Fixed function pipeline replacement using GL_ATI_fragment_shader * diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 7d0e3a54a7c..c07d472bea1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Copyright 2002-2005 Jason Edmeades * Copyright 2002-2005 Raphael Junqueira diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index af46cd9dfd7..89b570cc2ab 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Context and render target management in wined3d * diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bda5a377ff6..0f63d118ebc 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Copyright 2013 Henri Verbeet for CodeWeavers * diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7a37a27b0cd..58d81eb46d7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Copyright 2002 Lionel Ulmer * Copyright 2002-2005 Jason Edmeades diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4273c6ebe16..625dd352961 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Copyright 2002-2004 Jason Edmeades * Copyright 2003-2004 Raphael Junqueira diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c7fd94b133a..15a467f841c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * GLSL pixel and vertex shader implementation * diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index a0fdaa6a9ca..71a3de90467 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Fixed function pipeline replacement using GL_NV_register_combiners * and GL_NV_texture_shader diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 9c56d9e3022..d2be22bcc01 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* DirectDraw - IDirectPalette base interface * * Copyright 1997-2000 Marcus Meissner diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 0f3d7eb2bb8..7345e4476dc 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Copyright 2005 Oliver Stieber * Copyright 2007-2008 Stefan Dösinger for CodeWeavers diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 39a74b71c3f..b043f2e505d 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Copyright 2002-2004 Jason Edmeades * Copyright 2003-2004 Raphael Junqueira diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 50302612056..bfd9f8ac987 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Copyright 2012, 2015 Henri Verbeet for CodeWeavers * diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 108f873f725..926e94dff0a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Copyright 2002-2003 Jason Edmeades * Copyright 2002-2003 Raphael Junqueira diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 50969c058f2..09baaad1d26 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Copyright 2002-2003 Jason Edmeades * Copyright 2002-2003 Raphael Junqueira diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 62aba18a235..cbe9267360b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Copyright 2009 Henri Verbeet for CodeWeavers * diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 97e1e6b10ab..1ea54e632b9 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Direct3D state management * diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f0acca461c9..c2d7f2100a0 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * state block implementation * diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f9b6ceedeab..2c20fb3e107 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Copyright 1997-2000 Marcus Meissner * Copyright 1998-2000 Lionel Ulmer diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1712cda2373..f3f55609b2d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Copyright 2002-2003 Jason Edmeades * Copyright 2002-2003 Raphael Junqueira diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ae188ba4290..cc8f03cac94 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Copyright 2002-2005 Jason Edmeades * Copyright 2002-2005 Raphael Junqueira diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 33646485f72..38e52d13760 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Utility functions for the WineD3D Library * diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 67a6417534c..4a1b136ef08 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * vertex declaration implementation * diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 65d7bd67ada..cb4d9344036 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Copyright 2009, 2011 Henri Verbeet for CodeWeavers * diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 3aab52f9309..24424e75c9d 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -1,3 +1,4 @@ +#define WINE_NO_LONG_TYPES /* temporary */ /* * Direct3D wine internal interface main * -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1612
From: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/cs.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0f63d118ebc..9d2eff6d9b6 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1,4 +1,3 @@ -#define WINE_NO_LONG_TYPES /* temporary */ /* * Copyright 2013 Henri Verbeet for CodeWeavers * @@ -3194,8 +3193,8 @@ static void *wined3d_cs_queue_require_space(struct wined3d_cs_queue *queue, size if (new_pos < tail && new_pos) break; - TRACE("Waiting for free space. Head %u, tail %u, packet size %lu.\n", - head, tail, (unsigned long)packet_size); + TRACE("Waiting for free space. Head %lu, tail %lu, packet size %Iu.\n", + head, tail, packet_size); } packet = (struct wined3d_cs_packet *)&queue->data[head]; @@ -4409,7 +4408,7 @@ ULONG CDECL wined3d_command_list_incref(struct wined3d_command_list *list) { ULONG refcount = InterlockedIncrement(&list->refcount); - TRACE("%p increasing refcount to %u.\n", list, refcount); + TRACE("%p increasing refcount to %lu.\n", list, refcount); return refcount; } @@ -4421,7 +4420,7 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) const struct wined3d_cs_packet *packet; SIZE_T i, offset; - TRACE("%p decreasing refcount to %u.\n", list, refcount); + TRACE("%p decreasing refcount to %lu.\n", list, refcount); if (!refcount) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1612
From: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/query.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 7345e4476dc..4ab4d9c13b0 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1,4 +1,3 @@ -#define WINE_NO_LONG_TYPES /* temporary */ /* * Copyright 2005 Oliver Stieber * Copyright 2007-2008 Stefan Dösinger for CodeWeavers @@ -413,7 +412,7 @@ ULONG CDECL wined3d_query_incref(struct wined3d_query *query) { ULONG refcount = InterlockedIncrement(&query->ref); - TRACE("%p increasing refcount to %u.\n", query, refcount); + TRACE("%p increasing refcount to %lu.\n", query, refcount); return refcount; } @@ -432,7 +431,7 @@ ULONG CDECL wined3d_query_decref(struct wined3d_query *query) { ULONG refcount = InterlockedDecrement(&query->ref); - TRACE("%p decreasing refcount to %u.\n", query, refcount); + TRACE("%p decreasing refcount to %lu.\n", query, refcount); if (!refcount) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1612
From: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/sampler.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index bfd9f8ac987..ac2b2292503 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -1,4 +1,3 @@ -#define WINE_NO_LONG_TYPES /* temporary */ /* * Copyright 2012, 2015 Henri Verbeet for CodeWeavers * @@ -26,7 +25,7 @@ ULONG CDECL wined3d_sampler_incref(struct wined3d_sampler *sampler) { ULONG refcount = InterlockedIncrement(&sampler->refcount); - TRACE("%p increasing refcount to %u.\n", sampler, refcount); + TRACE("%p increasing refcount to %lu.\n", sampler, refcount); return refcount; } @@ -35,7 +34,7 @@ ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) { ULONG refcount = wined3d_atomic_decrement_mutex_lock(&sampler->refcount); - TRACE("%p decreasing refcount to %u.\n", sampler, refcount); + TRACE("%p decreasing refcount to %lu.\n", sampler, refcount); if (!refcount) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1612
This merge request was approved by Jan Sikorski. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1612
This merge request is awkward for a couple reasons, namely that it puts #defines above the license identifier (where they are hard to see) and that it contains multiple commits with the same patch subject (ideally the name of the file should be mentioned). With regard to the specific change, though, namely using %lu for "ULONG refcount" variables, I think we can try harder to avoid those types in the first place. I've submitted 1614 for that. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1612#note_18082
This merge request was closed by eric pouech. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1612
participants (4)
-
Eric Pouech -
eric pouech (＠epo)
-
Jan Sikorski (＠jsikorski)
-
Zebediah Figura (＠zfigura)