Commit 9ddcbb5f authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard

msvcr*: Use correct integral type in Interlocked* calls.

parent d4bd5aaa
...@@ -371,7 +371,7 @@ void __thiscall _Concurrent_queue_base_v4_dummy(_Concurrent_queue_base_v4 *this) ...@@ -371,7 +371,7 @@ void __thiscall _Concurrent_queue_base_v4_dummy(_Concurrent_queue_base_v4 *this)
DEFINE_RTTI_DATA0(_Concurrent_queue_base_v4, 0, ".?AV_Concurrent_queue_base_v4@details@Concurrency@@") DEFINE_RTTI_DATA0(_Concurrent_queue_base_v4, 0, ".?AV_Concurrent_queue_base_v4@details@Concurrency@@")
static int _Runtime_object_id; static LONG _Runtime_object_id;
typedef struct typedef struct
{ {
......
...@@ -385,7 +385,7 @@ void __thiscall _Concurrent_queue_base_v4_dummy(_Concurrent_queue_base_v4 *this) ...@@ -385,7 +385,7 @@ void __thiscall _Concurrent_queue_base_v4_dummy(_Concurrent_queue_base_v4 *this)
DEFINE_RTTI_DATA0(_Concurrent_queue_base_v4, 0, ".?AV_Concurrent_queue_base_v4@details@Concurrency@@") DEFINE_RTTI_DATA0(_Concurrent_queue_base_v4, 0, ".?AV_Concurrent_queue_base_v4@details@Concurrency@@")
static int _Runtime_object_id; static LONG _Runtime_object_id;
typedef struct typedef struct
{ {
......
...@@ -34,8 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); ...@@ -34,8 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
typedef exception cexception; typedef exception cexception;
CREATE_EXCEPTION_OBJECT(cexception) CREATE_EXCEPTION_OBJECT(cexception)
static int context_id = -1; static LONG context_id = -1;
static int scheduler_id = -1; static LONG scheduler_id = -1;
typedef enum { typedef enum {
SchedulerKind, SchedulerKind,
......
...@@ -144,8 +144,8 @@ static int MSVCRT_max_streams = 512, MSVCRT_stream_idx; ...@@ -144,8 +144,8 @@ static int MSVCRT_max_streams = 512, MSVCRT_stream_idx;
static int MSVCRT_umask = 0; static int MSVCRT_umask = 0;
/* INTERNAL: static data for tmpnam and _wtmpname functions */ /* INTERNAL: static data for tmpnam and _wtmpname functions */
static int tmpnam_unique; static LONG tmpnam_unique;
static int tmpnam_s_unique; static LONG tmpnam_s_unique;
static const unsigned int EXE = 'e' << 16 | 'x' << 8 | 'e'; static const unsigned int EXE = 'e' << 16 | 'x' << 8 | 'e';
static const unsigned int BAT = 'b' << 16 | 'a' << 8 | 't'; static const unsigned int BAT = 'b' << 16 | 'a' << 8 | 't';
...@@ -4935,7 +4935,7 @@ void CDECL setbuf(FILE* file, char *buf) ...@@ -4935,7 +4935,7 @@ void CDECL setbuf(FILE* file, char *buf)
setvbuf(file, buf, buf ? _IOFBF : _IONBF, BUFSIZ); setvbuf(file, buf, buf ? _IOFBF : _IONBF, BUFSIZ);
} }
static int tmpnam_helper(char *s, size_t size, int *tmpnam_unique, int tmp_max) static int tmpnam_helper(char *s, size_t size, LONG *tmpnam_unique, int tmp_max)
{ {
char tmpstr[8]; char tmpstr[8];
char *p = s; char *p = s;
...@@ -5006,7 +5006,7 @@ char * CDECL tmpnam(char *s) ...@@ -5006,7 +5006,7 @@ char * CDECL tmpnam(char *s)
return tmpnam_helper(s, -1, &tmpnam_unique, TMP_MAX) ? NULL : s; return tmpnam_helper(s, -1, &tmpnam_unique, TMP_MAX) ? NULL : s;
} }
static int wtmpnam_helper(wchar_t *s, size_t size, int *tmpnam_unique, int tmp_max) static int wtmpnam_helper(wchar_t *s, size_t size, LONG *tmpnam_unique, int tmp_max)
{ {
wchar_t tmpstr[8]; wchar_t tmpstr[8];
wchar_t *p = s; wchar_t *p = s;
......
...@@ -46,7 +46,7 @@ static HANDLE heap, sb_heap; ...@@ -46,7 +46,7 @@ static HANDLE heap, sb_heap;
typedef int (CDECL *MSVCRT_new_handler_func)(size_t size); typedef int (CDECL *MSVCRT_new_handler_func)(size_t size);
static MSVCRT_new_handler_func MSVCRT_new_handler; static MSVCRT_new_handler_func MSVCRT_new_handler;
static int MSVCRT_new_mode; static LONG MSVCRT_new_mode;
/* FIXME - According to documentation it should be 8*1024, at runtime it returns 16 */ /* FIXME - According to documentation it should be 8*1024, at runtime it returns 16 */
static unsigned int MSVCRT_amblksiz = 16; static unsigned int MSVCRT_amblksiz = 16;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment