niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

msvcp: Build without -DWINE_NO_LONG_TYPES.

Browse source 
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech 2022-02-08 19:38:22 +01:00 • committed by Alexandre Julliard
parent 652aef3007
commit df25a1924a
15 changed files with 46 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/msvcirt/Makefile.in
View file

@ -1,5 +1,5 @@
MODULE = msvcirt.dll
EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCIRT
EXTRADEFS = -D_MSVCIRT
PARENTSRC = ../msvcp90
IMPORTS = msvcrt

30
dlls/msvcirt/msvcirt.c
View file

@ -634,7 +634,7 @@ DEFINE_THISCALL_WRAPPER(streambuf_seekoff, 16)
#define call_streambuf_seekoff(this, off, dir, mode) CALL_VTBL_FUNC(this, 12, streampos, (streambuf*, streamoff, ios_seek_dir, int), (this, off, dir, mode))
streampos __thiscall streambuf_seekoff(streambuf *this, streamoff offset, ios_seek_dir dir, int mode)
{
TRACE("(%p %d %d %d)\n", this, offset, dir, mode);
TRACE("(%p %ld %d %d)\n", this, offset, dir, mode);
return EOF;
}
@ -643,7 +643,7 @@ streampos __thiscall streambuf_seekoff(streambuf *this, streamoff offset, ios_se
DEFINE_THISCALL_WRAPPER(streambuf_seekpos, 12)
streampos __thiscall streambuf_seekpos(streambuf *this, streampos pos, int mode)
{
TRACE("(%p %d %d)\n", this, pos, mode);
TRACE("(%p %ld %d)\n", this, pos, mode);
return call_streambuf_seekoff(this, pos, SEEKDIR_beg, mode);
}
@ -1181,7 +1181,7 @@ int __thiscall filebuf_overflow(filebuf *this, int c)
DEFINE_THISCALL_WRAPPER(filebuf_seekoff, 16)
streampos __thiscall filebuf_seekoff(filebuf *this, streamoff offset, ios_seek_dir dir, int mode)
{
TRACE("(%p %d %d %d)\n", this, offset, dir, mode);
TRACE("(%p %ld %d %d)\n", this, offset, dir, mode);
if (call_streambuf_sync(&this->base) == EOF)
return EOF;
return _lseek(this->fd, offset, dir);
@ -1520,7 +1520,7 @@ streampos __thiscall strstreambuf_seekoff(strstreambuf *this, streamoff offset,
{
char *base[3];
TRACE("(%p %d %d %d)\n", this, offset, dir, mode);
TRACE("(%p %ld %d %d)\n", this, offset, dir, mode);
if ((unsigned int)dir > SEEKDIR_end || !(mode & (OPENMODE_in|OPENMODE_out)))
return EOF;
@ -1720,7 +1720,7 @@ int __thiscall stdiobuf_pbackfail(stdiobuf *this, int c)
DEFINE_THISCALL_WRAPPER(stdiobuf_seekoff, 16)
streampos __thiscall stdiobuf_seekoff(stdiobuf *this, streamoff offset, ios_seek_dir dir, int mode)
{
TRACE("(%p %d %d %d)\n", this, offset, dir, mode);
TRACE("(%p %ld %d %d)\n", this, offset, dir, mode);
call_streambuf_overflow(&this->base, EOF);
if (fseek(this->file, offset, dir))
return EOF;
@ -2070,7 +2070,7 @@ LONG __thiscall ios_flags_set(ios *this, LONG flags)
{
LONG prev = this->flags;
TRACE("(%p %x)\n", this, flags);
TRACE("(%p %lx)\n", this, flags);
this->flags = flags;
return prev;
@ -2225,7 +2225,7 @@ LONG __thiscall ios_setf(ios *this, LONG flags)
{
LONG prev = this->flags;
TRACE("(%p %x)\n", this, flags);
TRACE("(%p %lx)\n", this, flags);
ios_lock(this);
this->flags |= flags;
@ -2240,7 +2240,7 @@ LONG __thiscall ios_setf_mask(ios *this, LONG flags, LONG mask)
{
LONG prev = this->flags;
TRACE("(%p %x %x)\n", this, flags, mask);
TRACE("(%p %lx %lx)\n", this, flags, mask);
ios_lock(this);
this->flags = (this->flags & (~mask)) | (flags & mask);
@ -2311,7 +2311,7 @@ LONG __thiscall ios_unsetf(ios *this, LONG flags)
{
LONG prev = this->flags;
TRACE("(%p %x)\n", this, flags);
TRACE("(%p %lx)\n", this, flags);
ios_lock(this);
this->flags &= ~flags;
@ -2607,7 +2607,7 @@ ostream* __thiscall ostream_seekp(ostream *this, streampos pos)
{
ios *base = ostream_get_ios(this);
TRACE("(%p %d)\n", this, pos);
TRACE("(%p %ld)\n", this, pos);
ios_lockbuf(base);
if (streambuf_seekpos(base->sb, pos, OPENMODE_out) == EOF)
@ -2623,7 +2623,7 @@ ostream* __thiscall ostream_seekp_offset(ostream *this, streamoff off, ios_seek_
{
ios *base = ostream_get_ios(this);
TRACE("(%p %d %d)\n", this, off, dir);
TRACE("(%p %ld %d)\n", this, off, dir);
ios_lockbuf(base);
if (call_streambuf_seekoff(base->sb, off, dir, OPENMODE_out) == EOF)
@ -3749,7 +3749,7 @@ istream* __thiscall istream_seekg(istream *this, streampos pos)
{
ios *base = istream_get_ios(this);
TRACE("(%p %d)\n", this, pos);
TRACE("(%p %ld)\n", this, pos);
ios_lockbuf(base);
if (streambuf_seekpos(base->sb, pos, OPENMODE_in) == EOF)
@ -3765,7 +3765,7 @@ istream* __thiscall istream_seekg_offset(istream *this, streamoff off, ios_seek_
{
ios *base = istream_get_ios(this);
TRACE("(%p %d %d)\n", this, off, dir);
TRACE("(%p %ld %d)\n", this, off, dir);
ios_lockbuf(base);
if (call_streambuf_seekoff(base->sb, off, dir, OPENMODE_in) == EOF)
@ -4010,7 +4010,7 @@ static LONG istream_internal_read_integer(istream *this, LONG min_value, LONG ma
int num_base;
LONG ret;
TRACE("(%p %d %d %d)\n", this, min_value, max_value, set_flag);
TRACE("(%p %ld %ld %d)\n", this, min_value, max_value, set_flag);
num_base = istream_getint(this, buffer);
errno = 0;
@ -4035,7 +4035,7 @@ static ULONG istream_internal_read_unsigned_integer(istream *this, LONG min_valu
int num_base;
ULONG ret;
TRACE("(%p %d %u)\n", this, min_value, max_value);
TRACE("(%p %ld %lu)\n", this, min_value, max_value);
num_base = istream_getint(this, buffer);
errno = 0;

2
dlls/msvcp100/Makefile.in
View file

@ -1,6 +1,6 @@
MODULE = msvcp100.dll
IMPORTS = msvcr100
EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=100
EXTRADEFS = -D_MSVCP_VER=100
PARENTSRC = ../msvcp90
C_SRCS = \

2
dlls/msvcp110/Makefile.in
View file

@ -1,6 +1,6 @@
MODULE = msvcp110.dll
IMPORTS = msvcr110
EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=110
EXTRADEFS = -D_MSVCP_VER=110
PARENTSRC = ../msvcp90
C_SRCS = \

2
dlls/msvcp120/Makefile.in
View file

@ -1,6 +1,6 @@
MODULE = msvcp120.dll
IMPORTS = msvcr120
EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=120
EXTRADEFS = -D_MSVCP_VER=120
PARENTSRC = ../msvcp90
C_SRCS = \

2
dlls/msvcp140/Makefile.in
View file

@ -1,5 +1,5 @@
MODULE = msvcp140.dll
EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=140
EXTRADEFS = -D_MSVCP_VER=140
PARENTSRC = ../msvcp90
IMPORTLIB = msvcp140

2
dlls/msvcp60/Makefile.in
View file

@ -1,5 +1,5 @@
MODULE = msvcp60.dll
EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=60
EXTRADEFS = -D_MSVCP_VER=60
PARENTSRC = ../msvcp90
IMPORTS = msvcrt

2
dlls/msvcp60/main.c
View file

@ -94,7 +94,7 @@ static void init_cxx_funcs(void)
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
TRACE("(0x%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason)
{

2
dlls/msvcp70/Makefile.in
View file

@ -1,6 +1,6 @@
MODULE = msvcp70.dll
IMPORTS = msvcr70
EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=70
EXTRADEFS = -D_MSVCP_VER=70
PARENTSRC = ../msvcp90
C_SRCS = \

2
dlls/msvcp71/Makefile.in
View file

@ -1,6 +1,6 @@
MODULE = msvcp71.dll
IMPORTS = msvcr71
EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=71
EXTRADEFS = -D_MSVCP_VER=71
PARENTSRC = ../msvcp90
C_SRCS = \

2
dlls/msvcp80/Makefile.in
View file

@ -1,6 +1,6 @@
MODULE = msvcp80.dll
IMPORTS = msvcr80
EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=80
EXTRADEFS = -D_MSVCP_VER=80
PARENTSRC = ../msvcp90
C_SRCS = \

2
dlls/msvcp90/Makefile.in
View file

@ -1,6 +1,6 @@
MODULE = msvcp90.dll
IMPORTS = msvcr90
EXTRADEFS = -DWINE_NO_LONG_TYPES -D_MSVCP_VER=90
EXTRADEFS = -D_MSVCP_VER=90
C_SRCS = \
details.c \

20
dlls/msvcp90/locale.c
View file

@ -7476,7 +7476,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_long(const num_put *thi
char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */
char fmt[7]; /* strlen("%+#lld")+1 */
TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v);
TRACE("(%p %p %p %d %ld)\n", this, ret, base, fill, v);
return num_put_char__Iput(this, ret, dest, base, fill, tmp,
sprintf(tmp, num_put_char__Ifmt(this, fmt, "ld", base->fmtfl), v));
@ -7492,7 +7492,7 @@ DEFINE_THISCALL_WRAPPER(num_put_char_put_long, 32)
ostreambuf_iterator_char* __thiscall num_put_char_put_long(const num_put *this, ostreambuf_iterator_char *ret,
ostreambuf_iterator_char dest, ios_base *base, char fill, LONG v)
{
TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v);
TRACE("(%p %p %p %d %ld)\n", this, ret, base, fill, v);
return call_num_put_char_do_put_long(this, ret, dest, base, fill, v);
}
@ -7518,7 +7518,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_do_put_ulong(const num_put *th
char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */
char fmt[7]; /* strlen("%+#lld")+1 */
TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v);
TRACE("(%p %p %p %d %ld)\n", this, ret, base, fill, v);
return num_put_char__Iput(this, ret, dest, base, fill, tmp,
sprintf(tmp, num_put_char__Ifmt(this, fmt, "lu", base->fmtfl), v));
@ -7534,7 +7534,7 @@ DEFINE_THISCALL_WRAPPER(num_put_char_put_ulong, 32)
ostreambuf_iterator_char* __thiscall num_put_char_put_ulong(const num_put *this, ostreambuf_iterator_char *ret,
ostreambuf_iterator_char dest, ios_base *base, char fill, ULONG v)
{
TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v);
TRACE("(%p %p %p %d %ld)\n", this, ret, base, fill, v);
return call_num_put_char_do_put_ulong(this, ret, dest, base, fill, v);
}
@ -8375,7 +8375,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_wchar_do_put_long(const num_put *t
char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */
char fmt[7]; /* strlen("%+#lld")+1 */
TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v);
TRACE("(%p %p %p %d %ld)\n", this, ret, base, fill, v);
return num_put_wchar__Iput(this, ret, dest, base, fill, tmp,
sprintf(tmp, num_put_wchar__Ifmt(this, fmt, "ld", base->fmtfl), v));
@ -8394,7 +8394,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_long(const num_put *t
char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */
char fmt[7]; /* strlen("%+#lld")+1 */
TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v);
TRACE("(%p %p %p %d %ld)\n", this, ret, base, fill, v);
return num_put_short__Iput(this, ret, dest, base, fill, tmp,
sprintf(tmp, num_put_wchar__Ifmt(this, fmt, "ld", base->fmtfl), v));
@ -8412,7 +8412,7 @@ DEFINE_THISCALL_WRAPPER(num_put_wchar_put_long, 32)
ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_long(const num_put *this, ostreambuf_iterator_wchar *ret,
ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, LONG v)
{
TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v);
TRACE("(%p %p %p %d %ld)\n", this, ret, base, fill, v);
return call_num_put_wchar_do_put_long(this, ret, dest, base, fill, v);
}
@ -8438,7 +8438,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_wchar_do_put_ulong(const num_put *
char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */
char fmt[7]; /* strlen("%+#lld")+1 */
TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v);
TRACE("(%p %p %p %d %ld)\n", this, ret, base, fill, v);
return num_put_wchar__Iput(this, ret, dest, base, fill, tmp,
sprintf(tmp, num_put_wchar__Ifmt(this, fmt, "lu", base->fmtfl), v));
@ -8457,7 +8457,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_short_do_put_ulong(const num_put *
char tmp[48]; /* 22(8^22>2^64)*2(separators between every digit) + 3(strlen("+0x"))+1 */
char fmt[7]; /* strlen("%+#lld")+1 */
TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v);
TRACE("(%p %p %p %d %ld)\n", this, ret, base, fill, v);
return num_put_short__Iput(this, ret, dest, base, fill, tmp,
sprintf(tmp, num_put_wchar__Ifmt(this, fmt, "lu", base->fmtfl), v));
@ -8475,7 +8475,7 @@ DEFINE_THISCALL_WRAPPER(num_put_wchar_put_ulong, 32)
ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_ulong(const num_put *this, ostreambuf_iterator_wchar *ret,
ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, ULONG v)
{
TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v);
TRACE("(%p %p %p %d %ld)\n", this, ret, base, fill, v);
return call_num_put_wchar_do_put_ulong(this, ret, dest, base, fill, v);
}

18
dlls/msvcp90/misc.c
View file

@ -1224,13 +1224,13 @@ typedef int (__cdecl *_Thrd_start_t)(void*);
int __cdecl _Thrd_equal(_Thrd_t a, _Thrd_t b)
{
TRACE("(%p %u %p %u)\n", a.hnd, a.id, b.hnd, b.id);
TRACE("(%p %lu %p %lu)\n", a.hnd, a.id, b.hnd, b.id);
return a.id == b.id;
}
int __cdecl _Thrd_lt(_Thrd_t a, _Thrd_t b)
{
TRACE("(%p %u %p %u)\n", a.hnd, a.id, b.hnd, b.id);
TRACE("(%p %lu %p %lu)\n", a.hnd, a.id, b.hnd, b.id);
return a.id < b.id;
}
@ -1258,7 +1258,7 @@ static _Thrd_t thread_current(void)
}
ret.id = GetCurrentThreadId();
TRACE("(%p %u)\n", ret.hnd, ret.id);
TRACE("(%p %lu)\n", ret.hnd, ret.id);
return ret;
}
@ -1284,7 +1284,7 @@ ULONGLONG __cdecl _Thrd_current(void)
int __cdecl _Thrd_join(_Thrd_t thr, int *code)
{
TRACE("(%p %u %p)\n", thr.hnd, thr.id, code);
TRACE("(%p %lu %p)\n", thr.hnd, thr.id, code);
if (WaitForSingleObject(thr.hnd, INFINITE))
return _THRD_ERROR;
@ -1469,7 +1469,7 @@ void __thiscall _Pad__Release(_Pad *this)
BOOL CDECL MSVCP__crtInitializeCriticalSectionEx(
CRITICAL_SECTION *cs, DWORD spin_count, DWORD flags)
{
TRACE("(%p %x %x)\n", cs, spin_count, flags);
TRACE("(%p %lx %lx)\n", cs, spin_count, flags);
return InitializeCriticalSectionEx(cs, spin_count, flags);
}
@ -1479,7 +1479,7 @@ BOOL CDECL MSVCP__crtInitializeCriticalSectionEx(
HANDLE CDECL MSVCP__crtCreateEventExW(
SECURITY_ATTRIBUTES *attribs, LPCWSTR name, DWORD flags, DWORD access)
{
TRACE("(%p %s 0x%08x 0x%08x)\n", attribs, debugstr_w(name), flags, access);
TRACE("(%p %s 0x%08lx 0x%08lx)\n", attribs, debugstr_w(name), flags, access);
return CreateEventExW(attribs, name, flags, access);
}
@ -1514,7 +1514,7 @@ HANDLE CDECL MSVCP__crtCreateSemaphoreExW(
SECURITY_ATTRIBUTES *attribs, LONG initial_count, LONG max_count, LPCWSTR name,
DWORD flags, DWORD access)
{
TRACE("(%p %d %d %s 0x%08x 0x%08x)\n", attribs, initial_count, max_count, debugstr_w(name),
TRACE("(%p %ld %ld %s 0x%08lx 0x%08lx)\n", attribs, initial_count, max_count, debugstr_w(name),
flags, access);
return CreateSemaphoreExW(attribs, initial_count, max_count, name, flags, access);
}
@ -1544,7 +1544,7 @@ VOID CDECL MSVCP__crtCloseThreadpoolTimer(TP_TIMER *timer)
VOID CDECL MSVCP__crtSetThreadpoolTimer(TP_TIMER *timer,
FILETIME *due_time, DWORD period, DWORD window_length)
{
TRACE("(%p %p 0x%08x 0x%08x)\n", timer, due_time, period, window_length);
TRACE("(%p %p 0x%08lx 0x%08lx)\n", timer, due_time, period, window_length);
return SetThreadpoolTimer(timer, due_time, period, window_length);
}
@ -1699,7 +1699,7 @@ const char* __cdecl _Syserror_map(int err)
/* ?_Winerror_message@std@@YAKKPEADK@Z */
ULONG __cdecl _Winerror_message(ULONG err, char *buf, ULONG size)
{
TRACE("(%u %p %u)\n", err, buf, size);
TRACE("(%lu %p %lu)\n", err, buf, size);
return FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, err, 0, buf, size, NULL);

2
dlls/msvcp90/msvcp_main.c
View file

@ -189,7 +189,7 @@ static void init_cxx_funcs(void)
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
TRACE("(0x%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason)
{