[PATCH 0/2] MR1705: Some more long type enabling in wined3d.

[eric pouech (＠epo)]

Note: using a standalone MR to stress external change in type.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1705

[PATCH 1/2] wined3d: Reduce usage of long integral types in surface.c.

[Eric Pouech]

From: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/wined3d/surface.c | 16 +++++++++-------
 include/wine/wined3d.h |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index ad854e7f790..4d2ef06be86 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -41,7 +41,7 @@ static void get_color_masks(const struct wined3d_format *format, uint32_t *masks
 }
 
 static void convert_r32_float_r16_float(const BYTE *src, BYTE *dst,
-        DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h)
+        unsigned int pitch_in, unsigned int pitch_out, unsigned int w, unsigned int h)
 {
     unsigned short *dst_s;
     const float *src_f;
@@ -61,7 +61,7 @@ static void convert_r32_float_r16_float(const BYTE *src, BYTE *dst,
 }
 
 static void convert_r5g6b5_x8r8g8b8(const BYTE *src, BYTE *dst,
-        DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h)
+        unsigned int pitch_in, unsigned int pitch_out, unsigned int w, unsigned int h)
 {
     static const unsigned char convert_5to8[] =
     {
@@ -103,7 +103,7 @@ static void convert_r5g6b5_x8r8g8b8(const BYTE *src, BYTE *dst,
 /* We use this for both B8G8R8A8 -> B8G8R8X8 and B8G8R8X8 -> B8G8R8A8, since
  * in both cases we're just setting the X / Alpha channel to 0xff. */
 static void convert_a8r8g8b8_x8r8g8b8(const BYTE *src, BYTE *dst,
-        DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h)
+        unsigned int pitch_in, unsigned int pitch_out, unsigned int w, unsigned int h)
 {
     unsigned int x, y;
 
@@ -127,7 +127,7 @@ static inline BYTE cliptobyte(int x)
 }
 
 static void convert_yuy2_x8r8g8b8(const BYTE *src, BYTE *dst,
-        DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h)
+        unsigned int pitch_in, unsigned int pitch_out, unsigned int w, unsigned int h)
 {
     int c2, d, e, r2 = 0, g2 = 0, b2 = 0;
     unsigned int x, y;
@@ -169,7 +169,7 @@ static void convert_yuy2_x8r8g8b8(const BYTE *src, BYTE *dst,
 }
 
 static void convert_yuy2_r5g6b5(const BYTE *src, BYTE *dst,
-        DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h)
+        unsigned int pitch_in, unsigned int pitch_out, unsigned int w, unsigned int h)
 {
     unsigned int x, y;
     int c2, d, e, r2 = 0, g2 = 0, b2 = 0;
@@ -212,7 +212,9 @@ static void convert_yuy2_r5g6b5(const BYTE *src, BYTE *dst,
 struct d3dfmt_converter_desc
 {
     enum wined3d_format_id from, to;
-    void (*convert)(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h);
+    void (*convert)(const BYTE *src, BYTE *dst,
+                    unsigned int pitch_in, unsigned int pitch_out,
+                    unsigned int w, unsigned int h);
 };
 
 static const struct d3dfmt_converter_desc converters[] =
@@ -968,7 +970,7 @@ do { \
             }
             else
             {
-                DWORD masks[3];
+                uint32_t masks[3];
                 get_color_masks(src_format, masks);
                 keymask = masks[0] | masks[1] | masks[2];
             }
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index ae0bc309b3f..65c68eef3f5 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2002,7 +2002,7 @@ struct wined3d_color_key
 
 struct wined3d_blt_fx
 {
-    DWORD fx;
+    uint32_t fx;
     struct wined3d_color_key dst_color_key;
     struct wined3d_color_key src_color_key;
     enum wined3d_format_id resolve_format_id;
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/1705

[PATCH 2/2] wined3d: Enable long types in surface.c.

[Eric Pouech]

From: Eric Pouech <eric.pouech(a)gmail.com>

---
 dlls/wined3d/surface.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 4d2ef06be86..f20ff328192 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -25,7 +25,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#define WINE_NO_LONG_TYPES /* temporary */
 
 #include "wined3d_private.h"
 
@@ -1417,10 +1416,10 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_
     if (fx)
     {
         TRACE("fx %#x.\n", fx->fx);
-        TRACE("dst_color_key {0x%08x, 0x%08x}.\n",
+        TRACE("dst_color_key {0x%08lx, 0x%08lx}.\n",
                 fx->dst_color_key.color_space_low_value,
                 fx->dst_color_key.color_space_high_value);
-        TRACE("src_color_key {0x%08x, 0x%08x}.\n",
+        TRACE("src_color_key {0x%08lx, 0x%08lx}.\n",
                 fx->src_color_key.color_space_low_value,
                 fx->src_color_key.color_space_high_value);
         TRACE("resolve_format_id %s.\n", debug_d3dformat(fx->resolve_format_id));
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1705

[PATCH 2/2] wined3d: Enable long types in surface.c.

[Marvin]

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=127250

Your paranoid android.


=== debian11 (32 bit report) ===

ws2_32:
sock.c:6775: Test succeeded inside todo block: expected timeout

[Zebediah Figura (＠zfigura)]

We can change wined3d_color_key fields too, I think?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1705#note_18871