Eric Pouech : wined3d: Store version information as unsigned int.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: dec7da286041f4eff7a588faeb0745720489fd43
URL:    https://gitlab.winehq.org/wine/wine/-/commit/dec7da286041f4eff7a588faeb07457...

Author: Eric Pouech <eric.pouech(a)gmail.com>
Date:   Thu Dec  1 00:18:49 2022 +0100

wined3d: Store version information as unsigned int.

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

---

 dlls/wined3d/adapter_gl.c      |  7 ++++---
 dlls/wined3d/shader_sm1.c      |  2 +-
 dlls/wined3d/wined3d_private.h | 10 +++++-----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
index 3131fdadeae..7ea14a4abd5 100644
--- a/dlls/wined3d/adapter_gl.c
+++ b/dlls/wined3d/adapter_gl.c
@@ -1142,7 +1142,7 @@ static void fixup_extensions(struct wined3d_gl_info *gl_info, struct wined3d_cap
     test_pbo_functionality(gl_info);
 }
 
-static DWORD wined3d_parse_gl_version(const char *gl_version)
+static unsigned int wined3d_parse_gl_version(const char *gl_version)
 {
     const char *ptr = gl_version;
     int major, minor;
@@ -3394,7 +3394,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter,
     };
     const char *gl_vendor_str, *gl_renderer_str, *gl_version_str;
     struct wined3d_gl_info *gl_info = &adapter->gl_info;
-    DWORD gl_version, gl_ext_emul_mask;
+    unsigned int gl_version;
+    DWORD gl_ext_emul_mask;
     const char *WGL_Extensions = NULL;
     enum wined3d_gl_vendor gl_vendor;
     GLint context_profile = 0;
@@ -5284,7 +5285,7 @@ end:
 static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl,
         unsigned int ordinal, unsigned int wined3d_creation_flags)
 {
-    static const DWORD supported_gl_versions[] =
+    static const unsigned int supported_gl_versions[] =
     {
         MAKEDWORD_VERSION(4, 4),
         MAKEDWORD_VERSION(3, 2),
diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c
index 50969c058f2..1a2f0fe17dc 100644
--- a/dlls/wined3d/shader_sm1.c
+++ b/dlls/wined3d/shader_sm1.c
@@ -428,7 +428,7 @@ static unsigned int shader_get_param(const struct wined3d_sm1_data *priv, const
 
 static const struct wined3d_sm1_opcode_info *shader_get_opcode(const struct wined3d_sm1_data *priv, DWORD token)
 {
-    DWORD shader_version = WINED3D_SHADER_VERSION(priv->shader_version.major, priv->shader_version.minor);
+    unsigned int shader_version = WINED3D_SHADER_VERSION(priv->shader_version.major, priv->shader_version.minor);
     const struct wined3d_sm1_opcode_info *opcode_table = priv->opcode_table;
     unsigned int i = 0;
 
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index f7c9c75364c..2a6cbd29313 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -510,7 +510,7 @@ enum wined3d_shader_backend
 struct wined3d_settings
 {
     unsigned int cs_multithreaded;
-    DWORD max_gl_version;
+    unsigned int max_gl_version;
     int offscreen_rendering_mode;
     unsigned short pci_vendor_id;
     unsigned short pci_device_id;
@@ -3374,8 +3374,8 @@ void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *g
 
 struct wined3d_gl_info
 {
-    DWORD selected_gl_version;
-    DWORD glsl_version;
+    unsigned int selected_gl_version;
+    unsigned int glsl_version;
     struct wined3d_gl_limits limits;
     DWORD reserved_glsl_constants, reserved_arb_constants;
     DWORD quirks;
@@ -3451,8 +3451,8 @@ struct wined3d_driver_info
     char description[WINED3D_MAX_DEVICE_IDENTIFIER_LENGTH];
     UINT64 vram_bytes;
     UINT64 sysmem_bytes;
-    DWORD version_high;
-    DWORD version_low;
+    unsigned int version_high;
+    unsigned int version_low;
 };
 
 bool wined3d_driver_info_init(struct wined3d_driver_info *driver_info,