[PATCH 0/4] MR1589: Start of enabling long integral types in wined3d.
This enabling will be done on a file basis (instead of directory) to ease review. This serie contains "simple" file migration (mostly refcount and status/GetLastError()) changes. I likely post afterwards each file change in a single MR to ease up review (and potentially changes) without blocking the others. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1589
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 fff6841f4c7..998c0bb9287 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 74c2a1b8b2b..1a4878a8e63 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 7f7324c8b91..71da3a4dc9c 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 8ee7e7fccc9..3b2bb9c97f9 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 1f9774767ba..7e34f54ab03 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 8590bd4800a..591b1151dac 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 994200b737c..d04d03d2a36 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 dde0843fb47..5946532f32e 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 34ee56d5d11..3e390a0f287 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 c32c9580ae9..0ad49176af8 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 91874898025..45786ce25a3 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 1b82d387de8..efdf8d5b9fe 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 7d62af5b31f..a96ae8aff2b 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 346fd1e6497..04f4a70112b 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 c9d5193e291..b94c2d2d5a5 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 47500460a2e..2f77c462128 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 c4b65921ea7..dc43e8fcb4c 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 576da8034c9..1563001d27d 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/1589
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 3b2bb9c97f9..32c96d9f90c 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/1589
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 3e390a0f287..818ee635fe6 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/1589
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/1589
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=126924 Your paranoid android. === debian11 (32 bit report) === ws2_32: protocol.c:2069: Test failed: overlapped result is 0 protocol.c:2071: Test failed: overlapped.Internal = 0
Jan Sikorski (@jsikorski) commented about dlls/wined3d/query.c:
-#define WINE_NO_LONG_TYPES /* temporary */ I'm getting a bunch of warnings in this file: wine/dlls/wined3d/query.c:1749:19: warning: initialization of ‘BOOL (*)(struct wined3d_query *, DWORD)’ {aka ‘int (*)(struct wined3d_query *, long unsigned int)’} from incompatible pointer type ‘BOOL (*)(struct wined3d_query *, uint32_t)’ {aka ‘int (*)(struct wined3d_query *, unsigned int)’} [-Wincompatible-pointer-types] Probably we could just change flags in wined3d_query_ops to be uint32_t everywhere before this commit?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1589#note_18025
Jan Sikorski (@jsikorski) commented about dlls/wined3d/cs.c:
-#define WINE_NO_LONG_TYPES /* temporary */ Also, it looks like gitlab's build noticed a missing change in `wined3d_cs_exec_blt_sub_resource`?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1589#note_18029
On Wed Nov 30 11:43:44 2022 +0000, Jan Sikorski wrote:
I'm getting a bunch of warnings in this file: wine/dlls/wined3d/query.c:1749:19: warning: initialization of ‘BOOL (*)(struct wined3d_query *, DWORD)’ {aka ‘int (*)(struct wined3d_query *, long unsigned int)’} from incompatible pointer type ‘BOOL (*)(struct wined3d_query *, uint32_t)’ {aka ‘int (*)(struct wined3d_query *, unsigned int)’} [-Wincompatible-pointer-types] Probably we could just change flags in wined3d_query_ops to be uint32_t everywhere before this commit? This compiles without warnings here...
from query.c:1603: ``` static BOOL wined3d_query_vk_poll(struct wined3d_query *query, uint32_t flags) ``` from wined3d_private.h:2037 ``` BOOL (*query_poll)(struct wined3d_query *query, uint32_t flags); ``` which should be just fine. the flags' type of these methods has been changed in second commit's of MR!1536 (which is now merged) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1589#note_18036
On Wed Nov 30 12:07:21 2022 +0000, Jan Sikorski wrote:
> Also, it looks like gitlab's build noticed a missing change in `wined3d_cs_exec_blt_sub_resource`?
1) gitlab build failed to update the tree (see first pipeline)
2) no warnings here:
what the pipeline build shows:
- warning from op->data that compiler detects as long
- op's type is: const struct wined3d_cs_blt_sub_resource *
- from cs.c:482:
```
uint32_t flags;
```
so it looks like build tree isn't up to date (same missing commit as previous comment)
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/1589#note_18037
On Wed Nov 30 13:01:02 2022 +0000, eric pouech wrote:
This compiles without warnings here... from query.c:1603: ``` static BOOL wined3d_query_vk_poll(struct wined3d_query *query, uint32_t flags) ``` from wined3d_private.h:2037 ``` BOOL (*query_poll)(struct wined3d_query *query, uint32_t flags); ``` which should be just fine. the flags' type of these methods has been changed in second commit's of MR!1536 (which is now merged) Right, I assumed it was based on top of the previous one and didn't rebase myself. Looks good.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1589#note_18040
This merge request was approved by Jan Sikorski. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1589
so it looks like build tree isn't up to date (same missing commit as previous comment)
That's because you need to rebase your MR on top of the current tip, if it depends on previously merged changes. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1589#note_18045
On Wed Nov 30 13:51:32 2022 +0000, Alexandre Julliard wrote:
so it looks like build tree isn't up to date (same missing commit as previous comment) That's because you need to rebase your MR on top of the current tip, if it depends on previously merged changes. yes the MR was based on non-updated starting point I tried to rebase in gitlab, but it failed :-( do I need to update the MR (with correct starting point) even if Jan approved it?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1589#note_18047
yes the MR was based on non-updated starting point I tried to rebase in gitlab, but it failed :-( do I need to update the MR (with correct starting point) even if Jan approved it?
That would be better. Presumably you have rebased it locally to test it, all you need is to force-push that branch to the MR. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1589#note_18048
participants (5)
-
Alexandre Julliard (＠julliard) -
Eric Pouech
-
eric pouech (＠epo)
-
Jan Sikorski (＠jsikorski)
-
Marvin