Eric Pouech : msvcp: Use correct integral types.

Alexandre Julliard julliard at winehq.org
Thu Feb 3 16:06:57 CST 2022


Module: wine
Branch: master
Commit: 3fb30b5d75a201b9afb8f1cfaa978faa35499cbf
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3fb30b5d75a201b9afb8f1cfaa978faa35499cbf

Author: Eric Pouech <eric.pouech at gmail.com>
Date:   Thu Feb  3 11:50:18 2022 +0100

msvcp: Use correct integral types.

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/ios.c    | 4 ++--
 dlls/msvcp90/ios.c    | 4 ++--
 dlls/msvcp90/locale.c | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c
index 495817a54db..9cb78e9dd8e 100644
--- a/dlls/msvcp60/ios.c
+++ b/dlls/msvcp60/ios.c
@@ -8442,7 +8442,7 @@ basic_istream_char* __thiscall basic_istream_char_read_int(basic_istream_char *t
         istreambuf_iterator_char first={0}, last={0};
 
         first.strbuf = strbuf;
-        num_get_char_get_long(numget, &last, first, last, &base->base, &state, v);
+        num_get_char_get_long(numget, &last, first, last, &base->base, &state, (LONG*)v);
     }
     basic_istream_char_sentry_destroy(this);
 
@@ -9953,7 +9953,7 @@ static basic_istream_wchar* basic_istream_read_int(basic_istream_wchar *this, in
         istreambuf_iterator_wchar first={0}, last={0};
 
         first.strbuf = strbuf;
-        num_get_wchar_get_long(numget, &last, first, last, &base->base, &state, v);
+        num_get_wchar_get_long(numget, &last, first, last, &base->base, &state, (LONG*)v);
     }
     basic_istream_wchar_sentry_destroy(this);
 
diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c
index 21cf33a505c..a4a8657e74f 100644
--- a/dlls/msvcp90/ios.c
+++ b/dlls/msvcp90/ios.c
@@ -8978,7 +8978,7 @@ basic_istream_char* __thiscall basic_istream_char_read_int(basic_istream_char *t
         istreambuf_iterator_char first={0}, last={0};
 
         first.strbuf = strbuf;
-        num_get_char_get_long(numget, &last, first, last, &base->base, &state, v);
+        num_get_char_get_long(numget, &last, first, last, &base->base, &state, (LONG*)v);
     }
     basic_istream_char_sentry_destroy(this);
 
@@ -10560,7 +10560,7 @@ static basic_istream_wchar* basic_istream_read_int(basic_istream_wchar *this, in
         istreambuf_iterator_wchar first={0}, last={0};
 
         first.strbuf = strbuf;
-        num_get_wchar_get_long(numget, &last, first, last, &base->base, &state, v);
+        num_get_wchar_get_long(numget, &last, first, last, &base->base, &state, (LONG*)v);
     }
     basic_istream_wchar_sentry_destroy(this);
 
diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c
index 116f3c75e5d..dd7fea203eb 100644
--- a/dlls/msvcp90/locale.c
+++ b/dlls/msvcp90/locale.c
@@ -5931,7 +5931,7 @@ istreambuf_iterator_wchar *__thiscall num_get_wchar_do_get_uint(const num_get *t
     istreambuf_iterator_wchar first, istreambuf_iterator_wchar last, ios_base *base, int *state, unsigned int *pval)
 {
     TRACE("(%p %p %p %p %p)\n", this, ret, base, state, pval);
-    return num_get_wchar_do_get_ulong(this, ret, first, last, base, state, pval);
+    return num_get_wchar_do_get_ulong(this, ret, first, last, base, state, (ULONG*)pval);
 }
 
 /* ?do_get@?$num_get at GV?$istreambuf_iterator at GU?$char_traits at G@std@@@std@@@std@@MBE?AV?$istreambuf_iterator at GU?$char_traits at G@std@@@2 at V32@0AAVios_base at 2@AAHAAI at Z */
@@ -5941,7 +5941,7 @@ istreambuf_iterator_wchar *__thiscall num_get_short_do_get_uint(const num_get *t
     istreambuf_iterator_wchar first, istreambuf_iterator_wchar last, ios_base *base, int *state, unsigned int *pval)
 {
     TRACE("(%p %p %p %p %p)\n", this, ret, base, state, pval);
-    return num_get_short_do_get_ulong(this, ret, first, last, base, state, pval);
+    return num_get_short_do_get_ulong(this, ret, first, last, base, state, (ULONG*)pval);
 }
 
 /* ?get@?$num_get at _WV?$istreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@QBE?AV?$istreambuf_iterator at _WU?$char_traits at _W@std@@@2 at V32@0AAVios_base at 2@AAHAAI at Z */
@@ -6921,7 +6921,7 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_uint(const num_get *thi
     istreambuf_iterator_char first, istreambuf_iterator_char last, ios_base *base, int *state, unsigned int *pval)
 {
     TRACE("(%p %p %p %p %p)\n", this, ret, base, state, pval);
-    return num_get_char_do_get_ulong(this, ret, first, last, base, state, pval);
+    return num_get_char_do_get_ulong(this, ret, first, last, base, state, (ULONG*)pval);
 }
 
 /* ?get@?$num_get at DV?$istreambuf_iterator at DU?$char_traits at D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator at DU?$char_traits at D@std@@@2 at V32@0AAVios_base at 2@AAHAAI at Z */




More information about the wine-cvs mailing list