Eric Pouech : msvcrt: Use correct integral types in structs.
Alexandre Julliard
julliard at winehq.org
Thu Feb 3 16:06:57 CST 2022
Module: wine
Branch: master
Commit: d7dad505448591fa9956cdf5d7ff36ba5bb40a2d
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7dad505448591fa9956cdf5d7ff36ba5bb40a2d
Author: Eric Pouech <eric.pouech at gmail.com>
Date: Thu Feb 3 11:50:12 2022 +0100
msvcrt: Use correct integral types in structs.
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcp60/msvcp.h | 2 +-
dlls/msvcp90/exception.c | 2 +-
dlls/msvcp90/msvcp90.h | 2 +-
dlls/msvcrt/concurrency.c | 6 +++---
dlls/msvcrt/cpp.c | 2 +-
dlls/msvcrt/msvcrt.h | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h
index 19078a133e4..2e5b24dccef 100644
--- a/dlls/msvcp60/msvcp.h
+++ b/dlls/msvcp60/msvcp.h
@@ -266,7 +266,7 @@ typedef enum {
typedef struct _iosarray {
struct _iosarray *next;
int index;
- int long_val;
+ LONG long_val;
void *ptr_val;
} IOS_BASE_iosarray;
diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c
index e5b6018fe31..7f1dfd2188a 100644
--- a/dlls/msvcp90/exception.c
+++ b/dlls/msvcp90/exception.c
@@ -954,7 +954,7 @@ int __cdecl __uncaught_exceptions(void)
typedef struct
{
EXCEPTION_RECORD *rec;
- int *ref; /* not binary compatible with native */
+ LONG *ref; /* not binary compatible with native */
} exception_ptr;
/*********************************************************************
diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h
index 4aa88e028d6..052305a8a25 100644
--- a/dlls/msvcp90/msvcp90.h
+++ b/dlls/msvcp90/msvcp90.h
@@ -379,7 +379,7 @@ typedef enum {
typedef struct _iosarray {
struct _iosarray *next;
int index;
- int long_val;
+ LONG long_val;
void *ptr_val;
} IOS_BASE_iosarray;
diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c
index f0a97f98e41..0a393cd0004 100644
--- a/dlls/msvcrt/concurrency.c
+++ b/dlls/msvcrt/concurrency.c
@@ -169,7 +169,7 @@ typedef struct cs_queue
{
struct cs_queue *next;
#if _MSVCR_VER >= 110
- BOOL free;
+ LONG free;
int unknown;
#endif
} cs_queue;
@@ -249,7 +249,7 @@ typedef struct thread_wait_entry
typedef struct thread_wait
{
void *signaled;
- int pending_waits;
+ LONG pending_waits;
thread_wait_entry entries[1];
} thread_wait;
@@ -263,7 +263,7 @@ typedef struct
#if _MSVCR_VER >= 110
typedef struct cv_queue {
struct cv_queue *next;
- BOOL expired;
+ LONG expired;
} cv_queue;
typedef struct {
diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c
index 6617237b055..f3200e046cb 100644
--- a/dlls/msvcrt/cpp.c
+++ b/dlls/msvcrt/cpp.c
@@ -1134,7 +1134,7 @@ const char * __thiscall type_info_name_internal_method(type_info * _this, struct
typedef struct
{
EXCEPTION_RECORD *rec;
- int *ref; /* not binary compatible with native msvcr100 */
+ LONG *ref; /* not binary compatible with native msvcr100 */
} exception_ptr;
#if _MSVCR_VER >= 100
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index e50f3e6991b..1d965ff8ffc 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -66,7 +66,7 @@ typedef struct __lc_time_data {
LCID lcid;
#endif
int unk;
- int refcount;
+ LONG refcount;
#if _MSVCR_VER == 0 || _MSVCR_VER >= 100
union {
const wchar_t *wstr[43];
@@ -90,7 +90,7 @@ typedef struct __lc_time_data {
} __lc_time_data;
typedef struct threadmbcinfostruct {
- int refcount;
+ LONG refcount;
int mbcodepage;
int ismbcodepage;
int mblcid;
More information about the wine-cvs
mailing list