[PATCH 0/4] MR609: vkd3d: Avoid (U)LONGs in device.c.

[PATCH 1/4] vkd3d: Use vkd3d_atomic_increment_u32() in vkd3d_instance_incref().

[Henri Verbeet]

From: Henri Verbeet

---
 libs/vkd3d/device.c        | 4 ++--
 libs/vkd3d/vkd3d_private.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index 2b8558175..e7147afa0 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -750,7 +750,7 @@ static void vkd3d_destroy_instance(struct vkd3d_instance *instance)

ULONG vkd3d_instance_incref(struct vkd3d_instance *instance)
 {
-    ULONG refcount = InterlockedIncrement(&instance->refcount);
+    unsigned int refcount = vkd3d_atomic_increment_u32(&instance->refcount);

TRACE("%p increasing refcount to %u.\n", instance, refcount);

@@ -759,7 +759,7 @@ ULONG vkd3d_instance_incref(struct vkd3d_instance *instance)

ULONG vkd3d_instance_decref(struct vkd3d_instance *instance)
 {
-    ULONG refcount = InterlockedDecrement(&instance->refcount);
+    unsigned int refcount = InterlockedDecrement((LONG *)&instance->refcount);

TRACE("%p decreasing refcount to %u.\n", instance, refcount);

diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index 64a01c41a..cf6548c97 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -192,7 +192,7 @@ struct vkd3d_instance

uint64_t host_ticks_per_second;

-    LONG refcount;
+    unsigned int refcount;
 };

#ifdef _WIN32

[PATCH 2/4] vkd3d: Use vkd3d_atomic_decrement_u32() in vkd3d_instance_decref().

[Henri Verbeet]

From: Henri Verbeet

---
 libs/vkd3d/device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index e7147afa0..3a0afeb64 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -759,7 +759,7 @@ ULONG vkd3d_instance_incref(struct vkd3d_instance *instance)

ULONG vkd3d_instance_decref(struct vkd3d_instance *instance)
 {
-    unsigned int refcount = InterlockedDecrement((LONG *)&instance->refcount);
+    unsigned int refcount = vkd3d_atomic_decrement_u32(&instance->refcount);

TRACE("%p decreasing refcount to %u.\n", instance, refcount);

[PATCH 3/4] vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_device_AddRef().

[Henri Verbeet]

From: Henri Verbeet

---
 libs/vkd3d/device.c        | 4 ++--
 libs/vkd3d/vkd3d_private.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index 3a0afeb64..859600ac4 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -2531,7 +2531,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_QueryInterface(ID3D12Device5 *ifac
 static ULONG STDMETHODCALLTYPE d3d12_device_AddRef(ID3D12Device5 *iface)
 {
     struct d3d12_device *device = impl_from_ID3D12Device5(iface);
-    ULONG refcount = InterlockedIncrement(&device->refcount);
+    unsigned int refcount = vkd3d_atomic_increment_u32(&device->refcount);

TRACE("%p increasing refcount to %u.\n", device, refcount);

@@ -2563,7 +2563,7 @@ static HRESULT device_worker_stop(struct d3d12_device *device)
 static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device5 *iface)
 {
     struct d3d12_device *device = impl_from_ID3D12Device5(iface);
-    ULONG refcount = InterlockedDecrement(&device->refcount);
+    unsigned int refcount = InterlockedDecrement((LONG *)&device->refcount);

TRACE("%p decreasing refcount to %u.\n", device, refcount);

diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index cf6548c97..ec83d350e 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -1749,7 +1749,7 @@ struct vkd3d_desc_object_cache
 struct d3d12_device
 {
     ID3D12Device5 ID3D12Device5_iface;
-    LONG refcount;
+    unsigned int refcount;

VkDevice vk_device;
     VkPhysicalDevice vk_physical_device;

[PATCH 4/4] vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_device_Release().

[Henri Verbeet]

From: Henri Verbeet

---
 libs/vkd3d/device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index 859600ac4..3f63e6040 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -2563,7 +2563,7 @@ static HRESULT device_worker_stop(struct d3d12_device *device)
 static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device5 *iface)
 {
     struct d3d12_device *device = impl_from_ID3D12Device5(iface);
-    unsigned int refcount = InterlockedDecrement((LONG *)&device->refcount);
+    unsigned int refcount = vkd3d_atomic_decrement_u32(&device->refcount);

TRACE("%p decreasing refcount to %u.\n", device, refcount);

[PATCH 0/4] MR609: vkd3d: Avoid (U)LONGs in device.c. - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.