system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 00:54:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

msvcrt: Build with msvcrt headers.

Browse source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-11-19 13:28:52 +01:00
parent be8a81b54c
commit 191bdeaff3
48 changed files with 189 additions and 234 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/crtdll/Makefile.in
View file

@ -1,7 +1,9 @@
EXTRADEFS = -D_MSVCR_VER=0 -D_CRTDLL
EXTRADEFS = -D_CRTDLL -D_CRTIMP=
MODULE = crtdll.dll
PARENTSRC = ../msvcrt
IMPORTS = ntdll
DELAYIMPORTS = advapi32 user32
PARENTSRC = ../msvcrt
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
console.c \

22
dlls/crtdll/crtdll.spec
View file

@ -43,7 +43,7 @@
@ extern _acmdln_dll MSVCRT__acmdln
@ extern _aexit_rtn_dll _aexit_rtn
@ cdecl _amsg_exit(long)
@ cdecl _assert(str str long) MSVCRT__assert
@ cdecl _assert(str str long)
@ extern _basemajor_dll CRTDLL__basemajor_dll
@ extern _baseminor_dll CRTDLL__baseminor_dll
@ extern _baseversion_dll MSVCRT__osver
@ -319,7 +319,7 @@
@ cdecl _unlink(str) MSVCRT__unlink
@ cdecl _unloaddll(long)
@ cdecl _utime(str ptr)
@ cdecl _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf
@ cdecl _vsnprintf(ptr long str ptr)
@ cdecl _vsnwprintf(ptr long wstr ptr) MSVCRT_vsnwprintf
@ cdecl _wcsdup(wstr) MSVCRT__wcsdup
@ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp
@ -433,10 +433,10 @@
@ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs
@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc
@ cdecl memchr(ptr long long) MSVCRT_memchr
@ cdecl memcmp(ptr ptr long) MSVCRT_memcmp
@ cdecl memcpy(ptr ptr long) MSVCRT_memcpy
@ cdecl memmove(ptr ptr long) MSVCRT_memmove
@ cdecl memset(ptr long long) MSVCRT_memset
@ cdecl memcmp(ptr ptr long)
@ cdecl memcpy(ptr ptr long)
@ cdecl memmove(ptr ptr long)
@ cdecl memset(ptr long long)
@ cdecl mktime(ptr) MSVCRT_mktime
@ cdecl modf(double ptr) MSVCRT_modf
@ cdecl perror(str) MSVCRT_perror
@ -463,15 +463,15 @@
@ cdecl sqrt(double) MSVCRT_sqrt
@ cdecl srand(long) MSVCRT_srand
@ varargs sscanf(str str) MSVCRT_sscanf
@ cdecl strcat(str str) MSVCRT_strcat
@ cdecl strchr(str long) MSVCRT_strchr
@ cdecl strcmp(str str) MSVCRT_strcmp
@ cdecl strcat(str str)
@ cdecl strchr(str long)
@ cdecl strcmp(str str)
@ cdecl strcoll(str str) MSVCRT_strcoll
@ cdecl strcpy(ptr str) MSVCRT_strcpy
@ cdecl strcpy(ptr str)
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str) MSVCRT_strlen
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
@ cdecl strncmp(str str long) MSVCRT_strncmp
@ cdecl strncpy(ptr str long) MSVCRT_strncpy

4
dlls/msvcr100/Makefile.in
View file

@ -1,8 +1,10 @@
EXTRADEFS = -D_MSVCR_VER=100
EXTRADEFS = -D_CRTIMP=
MODULE = msvcr100.dll
IMPORTLIB = msvcr100
IMPORTS = ntdll
DELAYIMPORTS = advapi32 user32
PARENTSRC = ../msvcrt
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
console.c \

22
dlls/msvcr100/msvcr100.spec
View file

@ -690,7 +690,7 @@
@ cdecl _aligned_realloc(ptr long long)
@ stub _aligned_recalloc
@ cdecl _amsg_exit(long)
@ cdecl _assert(str str long) MSVCRT__assert
@ cdecl _assert(str str long)
@ cdecl _atodbl(ptr str) MSVCRT__atodbl
@ cdecl _atodbl_l(ptr str ptr) MSVCRT__atodbl_l
@ cdecl _atof_l(str ptr) MSVCRT__atof_l
@ -1453,7 +1453,7 @@
@ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l
@ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p
@ cdecl _vscwprintf_p_l(wstr ptr ptr) MSVCRT__vscwprintf_p_l
@ cdecl -norelay _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf
@ cdecl -norelay _vsnprintf(ptr long str ptr)
@ cdecl _vsnprintf_c(ptr long str ptr) MSVCRT_vsnprintf_c
@ cdecl _vsnprintf_c_l(ptr long str ptr ptr) MSVCRT_vsnprintf_c_l
@ cdecl _vsnprintf_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l
@ -1750,12 +1750,12 @@
@ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s
@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc
@ cdecl memchr(ptr long long) MSVCRT_memchr
@ cdecl memcmp(ptr ptr long) MSVCRT_memcmp
@ cdecl memcpy(ptr ptr long) MSVCRT_memcpy
@ cdecl memcmp(ptr ptr long)
@ cdecl memcpy(ptr ptr long)
@ cdecl memcpy_s(ptr long ptr long) MSVCRT_memcpy_s
@ cdecl memmove(ptr ptr long) MSVCRT_memmove
@ cdecl memmove(ptr ptr long)
@ cdecl memmove_s(ptr long ptr long) MSVCRT_memmove_s
@ cdecl memset(ptr long long) MSVCRT_memset
@ cdecl memset(ptr long long)
@ cdecl modf(double ptr) MSVCRT_modf
@ cdecl -arch=!i386 modff(float ptr) MSVCRT_modff
@ cdecl perror(str) MSVCRT_perror
@ -1795,18 +1795,18 @@
@ cdecl srand(long) MSVCRT_srand
@ varargs sscanf(str str) MSVCRT_sscanf
@ varargs sscanf_s(str str) MSVCRT_sscanf_s
@ cdecl strcat(str str) MSVCRT_strcat
@ cdecl strcat(str str)
@ cdecl strcat_s(str long str) MSVCRT_strcat_s
@ cdecl strchr(str long) MSVCRT_strchr
@ cdecl strcmp(str str) MSVCRT_strcmp
@ cdecl strchr(str long)
@ cdecl strcmp(str str)
@ cdecl strcoll(str str) MSVCRT_strcoll
@ cdecl strcpy(ptr str) MSVCRT_strcpy
@ cdecl strcpy(ptr str)
@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strerror_s(ptr long long) MSVCRT_strerror_s
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str) MSVCRT_strlen
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
@ cdecl strncat_s(str long str long) MSVCRT_strncat_s
@ cdecl strncmp(str str long) MSVCRT_strncmp

4
dlls/msvcr110/Makefile.in
View file

@ -1,8 +1,10 @@
EXTRADEFS = -D_MSVCR_VER=110
EXTRADEFS = -D_CRTIMP=
MODULE = msvcr110.dll
IMPORTLIB = msvcr110
IMPORTS = ntdll
DELAYIMPORTS = advapi32 user32
PARENTSRC = ../msvcrt
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
console.c \

22
dlls/msvcr110/msvcr110.spec
View file

@ -1038,7 +1038,7 @@
@ cdecl _aligned_realloc(ptr long long)
@ stub _aligned_recalloc
@ cdecl _amsg_exit(long)
@ cdecl _assert(str str long) MSVCRT__assert
@ cdecl _assert(str str long)
@ cdecl _atodbl(ptr str) MSVCRT__atodbl
@ cdecl _atodbl_l(ptr str ptr) MSVCRT__atodbl_l
@ cdecl _atof_l(str ptr) MSVCRT__atof_l
@ -1810,7 +1810,7 @@
@ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l
@ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p
@ cdecl _vscwprintf_p_l(wstr ptr ptr) MSVCRT__vscwprintf_p_l
@ cdecl -norelay _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf
@ cdecl -norelay _vsnprintf(ptr long str ptr)
@ cdecl _vsnprintf_c(ptr long str ptr) MSVCRT_vsnprintf_c
@ cdecl _vsnprintf_c_l(ptr long str ptr ptr) MSVCRT_vsnprintf_c_l
@ cdecl _vsnprintf_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l
@ -2108,12 +2108,12 @@
@ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s
@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc
@ cdecl memchr(ptr long long) MSVCRT_memchr
@ cdecl memcmp(ptr ptr long) MSVCRT_memcmp
@ cdecl memcpy(ptr ptr long) MSVCRT_memcpy
@ cdecl memcmp(ptr ptr long)
@ cdecl memcpy(ptr ptr long)
@ cdecl memcpy_s(ptr long ptr long) MSVCRT_memcpy_s
@ cdecl memmove(ptr ptr long) MSVCRT_memmove
@ cdecl memmove(ptr ptr long)
@ cdecl memmove_s(ptr long ptr long) MSVCRT_memmove_s
@ cdecl memset(ptr long long) MSVCRT_memset
@ cdecl memset(ptr long long)
@ cdecl modf(double ptr) MSVCRT_modf
@ cdecl -arch=!i386 modff(float ptr) MSVCRT_modff
@ cdecl perror(str) MSVCRT_perror
@ -2153,18 +2153,18 @@
@ cdecl srand(long) MSVCRT_srand
@ varargs sscanf(str str) MSVCRT_sscanf
@ varargs sscanf_s(str str) MSVCRT_sscanf_s
@ cdecl strcat(str str) MSVCRT_strcat
@ cdecl strcat(str str)
@ cdecl strcat_s(str long str) MSVCRT_strcat_s
@ cdecl strchr(str long) MSVCRT_strchr
@ cdecl strcmp(str str) MSVCRT_strcmp
@ cdecl strchr(str long)
@ cdecl strcmp(str str)
@ cdecl strcoll(str str) MSVCRT_strcoll
@ cdecl strcpy(ptr str) MSVCRT_strcpy
@ cdecl strcpy(ptr str)
@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strerror_s(ptr long long) MSVCRT_strerror_s
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str) MSVCRT_strlen
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
@ cdecl strncat_s(str long str long) MSVCRT_strncat_s
@ cdecl strncmp(str str long) MSVCRT_strncmp

4
dlls/msvcr120/Makefile.in
View file

@ -1,8 +1,10 @@
EXTRADEFS = -D_MSVCR_VER=120
EXTRADEFS = -D_CRTIMP=
MODULE = msvcr120.dll
IMPORTLIB = msvcr120
IMPORTS = ntdll
DELAYIMPORTS = advapi32 user32
PARENTSRC = ../msvcrt
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
console.c \

22
dlls/msvcr120/msvcr120.spec
View file

@ -1028,7 +1028,7 @@
@ cdecl _aligned_realloc(ptr long long)
@ stub _aligned_recalloc
@ cdecl _amsg_exit(long)
@ cdecl _assert(str str long) MSVCRT__assert
@ cdecl _assert(str str long)
@ cdecl _atodbl(ptr str) MSVCRT__atodbl
@ cdecl _atodbl_l(ptr str ptr) MSVCRT__atodbl_l
@ cdecl _atof_l(str ptr) MSVCRT__atof_l
@ -1828,7 +1828,7 @@
@ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l
@ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p
@ cdecl _vscwprintf_p_l(wstr ptr ptr) MSVCRT__vscwprintf_p_l
@ cdecl -norelay _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf
@ cdecl -norelay _vsnprintf(ptr long str ptr)
@ cdecl _vsnprintf_c(ptr long str ptr) MSVCRT_vsnprintf_c
@ cdecl _vsnprintf_c_l(ptr long str ptr ptr) MSVCRT_vsnprintf_c_l
@ cdecl _vsnprintf_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l
@ -2285,12 +2285,12 @@
@ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s
@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc
@ cdecl memchr(ptr long long) MSVCRT_memchr
@ cdecl memcmp(ptr ptr long) MSVCRT_memcmp
@ cdecl memcpy(ptr ptr long) MSVCRT_memcpy
@ cdecl memcmp(ptr ptr long)
@ cdecl memcpy(ptr ptr long)
@ cdecl memcpy_s(ptr long ptr long) MSVCRT_memcpy_s
@ cdecl memmove(ptr ptr long) MSVCRT_memmove
@ cdecl memmove(ptr ptr long)
@ cdecl memmove_s(ptr long ptr long) MSVCRT_memmove_s
@ cdecl memset(ptr long long) MSVCRT_memset
@ cdecl memset(ptr long long)
@ cdecl modf(double ptr) MSVCRT_modf
@ cdecl -arch=!i386 modff(float ptr) MSVCRT_modff
@ cdecl nan(str) MSVCR120_nan
@ -2363,18 +2363,18 @@
@ cdecl srand(long) MSVCRT_srand
@ varargs sscanf(str str) MSVCRT_sscanf
@ varargs sscanf_s(str str) MSVCRT_sscanf_s
@ cdecl strcat(str str) MSVCRT_strcat
@ cdecl strcat(str str)
@ cdecl strcat_s(str long str) MSVCRT_strcat_s
@ cdecl strchr(str long) MSVCRT_strchr
@ cdecl strcmp(str str) MSVCRT_strcmp
@ cdecl strchr(str long)
@ cdecl strcmp(str str)
@ cdecl strcoll(str str) MSVCRT_strcoll
@ cdecl strcpy(ptr str) MSVCRT_strcpy
@ cdecl strcpy(ptr str)
@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strerror_s(ptr long long) MSVCRT_strerror_s
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str) MSVCRT_strlen
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
@ cdecl strncat_s(str long str long) MSVCRT_strncat_s
@ cdecl strncmp(str str long) MSVCRT_strncmp

4
dlls/msvcr70/Makefile.in
View file

@ -1,8 +1,10 @@
EXTRADEFS = -D_MSVCR_VER=70
EXTRADEFS = -D_CRTIMP=
MODULE = msvcr70.dll
IMPORTLIB = msvcr70
IMPORTS = ntdll
DELAYIMPORTS = advapi32 user32
PARENTSRC = ../msvcrt
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
console.c \

22
dlls/msvcr70/msvcr70.spec
View file

@ -233,7 +233,7 @@
@ cdecl _aligned_offset_realloc(ptr long long long)
@ cdecl _aligned_realloc(ptr long long)
@ cdecl _amsg_exit(long)
@ cdecl _assert(str str long) MSVCRT__assert
@ cdecl _assert(str str long)
@ cdecl _atodbl(ptr str) MSVCRT__atodbl
@ cdecl -ret64 _atoi64(str) MSVCRT__atoi64
@ cdecl _atoldbl(ptr str) MSVCRT__atoldbl
@ -586,7 +586,7 @@
@ cdecl _utime64(str ptr)
@ cdecl _vscprintf(str ptr) MSVCRT__vscprintf
@ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf
@ cdecl -norelay _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf
@ cdecl -norelay _vsnprintf(ptr long str ptr)
@ cdecl _vsnwprintf(ptr long wstr ptr) MSVCRT_vsnwprintf
@ cdecl _waccess(wstr long) MSVCRT__waccess
@ cdecl _wasctime(ptr) MSVCRT__wasctime
@ -777,10 +777,10 @@
@ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs
@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc
@ cdecl memchr(ptr long long) MSVCRT_memchr
@ cdecl memcmp(ptr ptr long) MSVCRT_memcmp
@ cdecl memcpy(ptr ptr long) MSVCRT_memcpy
@ cdecl memmove(ptr ptr long) MSVCRT_memmove
@ cdecl memset(ptr long long) MSVCRT_memset
@ cdecl memcmp(ptr ptr long)
@ cdecl memcpy(ptr ptr long)
@ cdecl memmove(ptr ptr long)
@ cdecl memset(ptr long long)
@ cdecl mktime(ptr) MSVCRT_mktime
@ cdecl modf(double ptr) MSVCRT_modf
@ cdecl perror(str) MSVCRT_perror
@ -809,15 +809,15 @@
@ cdecl sqrt(double) MSVCRT_sqrt
@ cdecl srand(long) MSVCRT_srand
@ varargs sscanf(str str) MSVCRT_sscanf
@ cdecl strcat(str str) MSVCRT_strcat
@ cdecl strchr(str long) MSVCRT_strchr
@ cdecl strcmp(str str) MSVCRT_strcmp
@ cdecl strcat(str str)
@ cdecl strchr(str long)
@ cdecl strcmp(str str)
@ cdecl strcoll(str str) MSVCRT_strcoll
@ cdecl strcpy(ptr str) MSVCRT_strcpy
@ cdecl strcpy(ptr str)
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str) MSVCRT_strlen
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
@ cdecl strncmp(str str long) MSVCRT_strncmp
@ cdecl strncpy(ptr str long) MSVCRT_strncpy

4
dlls/msvcr71/Makefile.in
View file

@ -1,8 +1,10 @@
EXTRADEFS = -D_MSVCR_VER=71
EXTRADEFS = -D_CRTIMP=
MODULE = msvcr71.dll
IMPORTLIB = msvcr71
IMPORTS = ntdll
DELAYIMPORTS = advapi32 user32
PARENTSRC = ../msvcrt
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
console.c \

22
dlls/msvcr71/msvcr71.spec
View file

@ -228,7 +228,7 @@
@ cdecl _aligned_offset_realloc(ptr long long long)
@ cdecl _aligned_realloc(ptr long long)
@ cdecl _amsg_exit(long)
@ cdecl _assert(str str long) MSVCRT__assert
@ cdecl _assert(str str long)
@ cdecl _atodbl(ptr str) MSVCRT__atodbl
@ cdecl -ret64 _atoi64(str) ntdll._atoi64
@ cdecl _atoldbl(ptr str) MSVCRT__atoldbl
@ -582,7 +582,7 @@
@ cdecl _utime64(str ptr)
@ cdecl _vscprintf(str ptr) MSVCRT__vscprintf
@ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf
@ cdecl -norelay _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf
@ cdecl -norelay _vsnprintf(ptr long str ptr)
@ cdecl _vsnwprintf(ptr long wstr ptr) MSVCRT_vsnwprintf
@ cdecl _waccess(wstr long) MSVCRT__waccess
@ cdecl _wasctime(ptr) MSVCRT__wasctime
@ -773,10 +773,10 @@
@ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs
@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc
@ cdecl memchr(ptr long long) MSVCRT_memchr
@ cdecl memcmp(ptr ptr long) MSVCRT_memcmp
@ cdecl memcpy(ptr ptr long) MSVCRT_memcpy
@ cdecl memmove(ptr ptr long) MSVCRT_memmove
@ cdecl memset(ptr long long) MSVCRT_memset
@ cdecl memcmp(ptr ptr long)
@ cdecl memcpy(ptr ptr long)
@ cdecl memmove(ptr ptr long)
@ cdecl memset(ptr long long)
@ cdecl mktime(ptr) MSVCRT_mktime
@ cdecl modf(double ptr) MSVCRT_modf
@ cdecl perror(str) MSVCRT_perror
@ -805,15 +805,15 @@
@ cdecl sqrt(double) MSVCRT_sqrt
@ cdecl srand(long) MSVCRT_srand
@ varargs sscanf(str str) MSVCRT_sscanf
@ cdecl strcat(str str) MSVCRT_strcat
@ cdecl strchr(str long) MSVCRT_strchr
@ cdecl strcmp(str str) MSVCRT_strcmp
@ cdecl strcat(str str)
@ cdecl strchr(str long)
@ cdecl strcmp(str str)
@ cdecl strcoll(str str) MSVCRT_strcoll
@ cdecl strcpy(ptr str) MSVCRT_strcpy
@ cdecl strcpy(ptr str)
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str) MSVCRT_strlen
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
@ cdecl strncmp(str str long) MSVCRT_strncmp
@ cdecl strncpy(ptr str long) MSVCRT_strncpy

4
dlls/msvcr80/Makefile.in
View file

@ -1,8 +1,10 @@
EXTRADEFS = -D_MSVCR_VER=80
EXTRADEFS = -D_CRTIMP=
MODULE = msvcr80.dll
IMPORTLIB = msvcr80
IMPORTS = ntdll
DELAYIMPORTS = advapi32 user32
PARENTSRC = ../msvcrt
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
console.c \

22
dlls/msvcr80/msvcr80.spec
View file

@ -354,7 +354,7 @@
@ cdecl _aligned_realloc(ptr long long)
@ stub _aligned_recalloc
@ cdecl _amsg_exit(long)
@ cdecl _assert(str str long) MSVCRT__assert
@ cdecl _assert(str str long)
@ cdecl _atodbl(ptr str) MSVCRT__atodbl
@ cdecl _atodbl_l(ptr str ptr) MSVCRT__atodbl_l
@ cdecl _atof_l(str ptr) MSVCRT__atof_l
@ -1133,7 +1133,7 @@
@ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l
@ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p
@ cdecl _vscwprintf_p_l(wstr ptr ptr) MSVCRT__vscwprintf_p_l
@ cdecl -norelay _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf
@ cdecl -norelay _vsnprintf(ptr long str ptr)
@ cdecl _vsnprintf_c(ptr long str ptr) MSVCRT_vsnprintf_c
@ cdecl _vsnprintf_c_l(ptr long str ptr ptr) MSVCRT_vsnprintf_c_l
@ cdecl _vsnprintf_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l
@ -1431,12 +1431,12 @@
@ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s
@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc
@ cdecl memchr(ptr long long) MSVCRT_memchr
@ cdecl memcmp(ptr ptr long) MSVCRT_memcmp
@ cdecl memcpy(ptr ptr long) MSVCRT_memcpy
@ cdecl memcmp(ptr ptr long)
@ cdecl memcpy(ptr ptr long)
@ cdecl memcpy_s(ptr long ptr long) MSVCRT_memcpy_s
@ cdecl memmove(ptr ptr long) MSVCRT_memmove
@ cdecl memmove(ptr ptr long)
@ cdecl memmove_s(ptr long ptr long) MSVCRT_memmove_s
@ cdecl memset(ptr long long) MSVCRT_memset
@ cdecl memset(ptr long long)
@ cdecl modf(double ptr) MSVCRT_modf
@ cdecl -arch=!i386 modff(float ptr) MSVCRT_modff
@ cdecl perror(str) MSVCRT_perror
@ -1476,18 +1476,18 @@
@ cdecl srand(long) MSVCRT_srand
@ varargs sscanf(str str) MSVCRT_sscanf
@ varargs sscanf_s(str str) MSVCRT_sscanf_s
@ cdecl strcat(str str) MSVCRT_strcat
@ cdecl strcat(str str)
@ cdecl strcat_s(str long str) MSVCRT_strcat_s
@ cdecl strchr(str long) MSVCRT_strchr
@ cdecl strcmp(str str) MSVCRT_strcmp
@ cdecl strchr(str long)
@ cdecl strcmp(str str)
@ cdecl strcoll(str str) MSVCRT_strcoll
@ cdecl strcpy(ptr str) MSVCRT_strcpy
@ cdecl strcpy(ptr str)
@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strerror_s(ptr long long) MSVCRT_strerror_s
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str) MSVCRT_strlen
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
@ cdecl strncat_s(str long str long) MSVCRT_strncat_s
@ cdecl strncmp(str str long) MSVCRT_strncmp

4
dlls/msvcr90/Makefile.in
View file

@ -1,8 +1,10 @@
EXTRADEFS = -D_MSVCR_VER=90
EXTRADEFS = -D_CRTIMP=
MODULE = msvcr90.dll
IMPORTLIB = msvcr90
IMPORTS = ntdll
DELAYIMPORTS = advapi32 user32
PARENTSRC = ../msvcrt
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
console.c \

22
dlls/msvcr90/msvcr90.spec
View file

@ -338,7 +338,7 @@
@ cdecl _aligned_realloc(ptr long long)
@ stub _aligned_recalloc
@ cdecl _amsg_exit(long)
@ cdecl _assert(str str long) MSVCRT__assert
@ cdecl _assert(str str long)
@ cdecl _atodbl(ptr str) MSVCRT__atodbl
@ cdecl _atodbl_l(ptr str ptr) MSVCRT__atodbl_l
@ cdecl _atof_l(str ptr) MSVCRT__atof_l
@ -1108,7 +1108,7 @@
@ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l
@ cdecl _vscwprintf_p(wstr ptr) MSVCRT__vscwprintf_p
@ cdecl _vscwprintf_p_l(wstr ptr ptr) MSVCRT__vscwprintf_p_l
@ cdecl -norelay _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf
@ cdecl -norelay _vsnprintf(ptr long str ptr)
@ cdecl _vsnprintf_c(ptr long str ptr) MSVCRT_vsnprintf_c
@ cdecl _vsnprintf_c_l(ptr long str ptr ptr) MSVCRT_vsnprintf_c_l
@ cdecl _vsnprintf_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l
@ -1403,12 +1403,12 @@
@ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s
@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc
@ cdecl memchr(ptr long long) MSVCRT_memchr
@ cdecl memcmp(ptr ptr long) MSVCRT_memcmp
@ cdecl memcpy(ptr ptr long) MSVCRT_memcpy
@ cdecl memcmp(ptr ptr long)
@ cdecl memcpy(ptr ptr long)
@ cdecl memcpy_s(ptr long ptr long) MSVCRT_memcpy_s
@ cdecl memmove(ptr ptr long) MSVCRT_memmove
@ cdecl memmove(ptr ptr long)
@ cdecl memmove_s(ptr long ptr long) MSVCRT_memmove_s
@ cdecl memset(ptr long long) MSVCRT_memset
@ cdecl memset(ptr long long)
@ cdecl modf(double ptr) MSVCRT_modf
@ cdecl -arch=!i386 modff(float ptr) MSVCRT_modff
@ cdecl perror(str) MSVCRT_perror
@ -1448,18 +1448,18 @@
@ cdecl srand(long) MSVCRT_srand
@ varargs sscanf(str str) MSVCRT_sscanf
@ varargs sscanf_s(str str) MSVCRT_sscanf_s
@ cdecl strcat(str str) MSVCRT_strcat
@ cdecl strcat(str str)
@ cdecl strcat_s(str long str) MSVCRT_strcat_s
@ cdecl strchr(str long) MSVCRT_strchr
@ cdecl strcmp(str str) MSVCRT_strcmp
@ cdecl strchr(str long)
@ cdecl strcmp(str str)
@ cdecl strcoll(str str) MSVCRT_strcoll
@ cdecl strcpy(ptr str) MSVCRT_strcpy
@ cdecl strcpy(ptr str)
@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strerror_s(ptr long long) MSVCRT_strerror_s
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str) MSVCRT_strlen
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
@ cdecl strncat_s(str long str long) MSVCRT_strncat_s
@ cdecl strncmp(str str long) MSVCRT_strncmp

4
dlls/msvcrt/Makefile.in
View file

@ -1,7 +1,9 @@
EXTRADEFS = -D_MSVCR_VER=0
EXTRADEFS = -D_CRTIMP=
MODULE = msvcrt.dll
IMPORTLIB = msvcrt
IMPORTS = ntdll
DELAYIMPORTS = advapi32 user32
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
console.c \

5
dlls/msvcrt/cpp.c
View file

@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include "windef.h"
@ -2071,7 +2068,7 @@ int CDECL MSVCRT_type_info_compare(const type_info140 *l, const type_info140 *r)
int ret;
if (l == r) ret = 0;
else ret = MSVCRT_strcmp(l->mangled + 1, r->mangled + 1);
else ret = strcmp(l->mangled + 1, r->mangled + 1);
TRACE("(%p %p) returning %d\n", l, r, ret);
return ret;
}

4
dlls/msvcrt/crt_main.c
View file

@ -22,10 +22,6 @@
#pragma makedep implib
#endif
#if _MSVCR_VER >= 140
#define _UCRT
#endif
#include <stdarg.h>
#include <stdlib.h>
#include <process.h>

4
dlls/msvcrt/crt_wmain.c
View file

@ -22,10 +22,6 @@
#pragma makedep implib
#endif
#if _MSVCR_VER >= 140
#define _UCRT
#endif
#include <stdarg.h>
#include <stdlib.h>
#include <process.h>

3
dlls/msvcrt/data.c
View file

@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include <math.h>
#include "msvcrt.h"
#include <winnls.h>

3
dlls/msvcrt/dir.c
View file

@ -21,9 +21,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include "windef.h"

3
dlls/msvcrt/except.c
View file

@ -21,9 +21,6 @@
* FIXME: Incomplete support for nested exceptions/try block cleanup.
*/
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include "ntstatus.h"

3
dlls/msvcrt/except_arm.c
View file

@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#ifdef __arm__
#include <stdarg.h>

3
dlls/msvcrt/except_arm64.c
View file

@ -20,9 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#ifdef __aarch64__
#include <stdarg.h>

3
dlls/msvcrt/except_i386.c
View file

@ -25,9 +25,6 @@
* www.thecodeproject.com.
*/
#include "config.h"
#include "wine/port.h"
#ifdef __i386__
#include <stdarg.h>

3
dlls/msvcrt/except_x86_64.c
View file

@ -18,9 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#ifdef __x86_64__
#include <stdarg.h>

2
dlls/msvcrt/exit.c
View file

@ -314,7 +314,7 @@ void CDECL MSVCRT__wassert(const MSVCRT_wchar_t* str, const MSVCRT_wchar_t* file
/*********************************************************************
* _assert (MSVCRT.@)
*/
void CDECL MSVCRT__assert(const char* str, const char* file, unsigned int line)
void CDECL _assert(const char* str, const char* file, unsigned int line)
{
MSVCRT_wchar_t strW[1024], fileW[1024];

5
dlls/msvcrt/file.c
View file

@ -26,15 +26,10 @@
* Use the file flag hints O_SEQUENTIAL, O_RANDOM, O_SHORT_LIVED
*/
#include "config.h"
#include "wine/port.h"
#define __iob_func mingw___iob_func
#include <stdarg.h>
#include <stdio.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <sys/types.h>
#include <limits.h>

1
dlls/msvcrt/heap.c
View file

@ -21,7 +21,6 @@
* handler and non atomic heap operations
*/
#include "config.h"
#include "msvcrt.h"
#include "mtdll.h"
#include "wine/debug.h"

4
dlls/msvcrt/locale.c
View file

@ -18,13 +18,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include <limits.h>
#include <locale.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include "windef.h"
#include "winbase.h"

3
dlls/msvcrt/lock.c
View file

@ -16,9 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include "wine/debug.h"

9
dlls/msvcrt/math.c
View file

@ -35,16 +35,9 @@
* ====================================================
*/
#include "config.h"
#include "wine/port.h"
#include <stdio.h>
#define __USE_ISOC9X 1
#define __USE_ISOC99 1
#include <math.h>
#ifdef HAVE_IEEEFP_H
#include <ieeefp.h>
#endif
#include "msvcrt.h"
#include "winternl.h"
@ -323,7 +316,7 @@ static float asinf_R(float z)
pS2 = -8.6563630030e-03,
qS1 = -7.0662963390e-01;
float_t p, q;
float p, q;
p = z * (pS0 + z * (pS1 + z * pS2));
q = 1.0f + z * qS1;
return p / q;

2
dlls/msvcrt/mbcs.c
View file

@ -129,7 +129,7 @@ static inline unsigned char* u_strncat( unsigned char* dst, const unsigned char*
static inline int u_strcmp( const unsigned char *s1, const unsigned char *s2 )
{
return MSVCRT_strcmp( (const char*)s1, (const char*)s2 );
return strcmp( (const char*)s1, (const char*)s2 );
}
static inline int u_strcasecmp( const unsigned char *s1, const unsigned char *s2 )

4
dlls/msvcrt/misc.c
View file

@ -18,10 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include <stdlib.h>
#include <sys/types.h>
#include "msvcrt.h"
#include "wine/debug.h"

1
dlls/msvcrt/msvcrt.h
View file

@ -1119,7 +1119,6 @@ MSVCRT___time64_t __cdecl MSVCRT__time64(MSVCRT___time64_t*);
MSVCRT_FILE* __cdecl MSVCRT__fdopen(int, const char *);
MSVCRT_FILE* __cdecl MSVCRT__wfdopen(int, const MSVCRT_wchar_t *);
int WINAPIV MSVCRT_fwprintf(MSVCRT_FILE *file, const MSVCRT_wchar_t *format, ...);
int __cdecl MSVCRT_vsnprintf(char *str, MSVCRT_size_t len, const char *format, __ms_va_list valist);
int __cdecl MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len,
const MSVCRT_wchar_t *format, __ms_va_list valist );
int WINAPIV MSVCRT__snwprintf(MSVCRT_wchar_t*, MSVCRT_size_t, const MSVCRT_wchar_t*, ...);

24
dlls/msvcrt/msvcrt.spec
View file

@ -326,7 +326,7 @@
@ cdecl _aligned_realloc(ptr long long)
# stub _aligned_realloc_dbg(ptr long long str long)
@ cdecl _amsg_exit(long)
@ cdecl _assert(str str long) MSVCRT__assert
@ cdecl _assert(str str long)
@ cdecl _atodbl(ptr str) MSVCRT__atodbl
@ cdecl _atodbl_l(ptr str ptr) MSVCRT__atodbl_l
@ cdecl _atof_l(str ptr) MSVCRT__atof_l
@ -1062,7 +1062,7 @@
@ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf
@ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l
@ cdecl _vscwprintf_p_l(wstr ptr ptr) MSVCRT__vscwprintf_p_l
@ cdecl -norelay _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf
@ cdecl -norelay _vsnprintf(ptr long str ptr)
@ cdecl _vsnprintf_c(ptr long str ptr) MSVCRT_vsnprintf_c
@ cdecl _vsnprintf_c_l(ptr long str ptr ptr) MSVCRT_vsnprintf_c_l
@ cdecl _vsnprintf_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l
@ -1371,12 +1371,12 @@
@ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s
@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc
@ cdecl memchr(ptr long long) MSVCRT_memchr
@ cdecl memcmp(ptr ptr long) MSVCRT_memcmp
@ cdecl memcpy(ptr ptr long) MSVCRT_memcpy
@ cdecl memcmp(ptr ptr long)
@ cdecl memcpy(ptr ptr long)
@ cdecl memcpy_s(ptr long ptr long) MSVCRT_memcpy_s
@ cdecl memmove(ptr ptr long) MSVCRT_memmove
@ cdecl memmove(ptr ptr long)
@ cdecl memmove_s(ptr long ptr long) MSVCRT_memmove_s
@ cdecl memset(ptr long long) MSVCRT_memset
@ cdecl memset(ptr long long)
@ cdecl mktime(ptr) MSVCRT_mktime
@ cdecl modf(double ptr) MSVCRT_modf
@ cdecl -arch=!i386 modff(float ptr) MSVCRT_modff
@ -1417,18 +1417,18 @@
@ cdecl srand(long) MSVCRT_srand
@ varargs sscanf(str str) MSVCRT_sscanf
@ varargs sscanf_s(str str) MSVCRT_sscanf_s
@ cdecl strcat(str str) MSVCRT_strcat
@ cdecl strcat(str str)
@ cdecl strcat_s(str long str) MSVCRT_strcat_s
@ cdecl strchr(str long) MSVCRT_strchr
@ cdecl strcmp(str str) MSVCRT_strcmp
@ cdecl strchr(str long)
@ cdecl strcmp(str str)
@ cdecl strcoll(str str) MSVCRT_strcoll
@ cdecl strcpy(ptr str) MSVCRT_strcpy
@ cdecl strcpy(ptr str)
@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strerror_s(ptr long long) MSVCRT_strerror_s
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str) MSVCRT_strlen
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
@ cdecl strncat_s(str long str long) MSVCRT_strncat_s
@ cdecl strncmp(str str long) MSVCRT_strncmp
@ -1472,7 +1472,7 @@
@ cdecl vfwprintf_s(ptr wstr ptr) MSVCRT_vfwprintf_s
@ cdecl vprintf(str ptr) MSVCRT_vprintf
@ cdecl vprintf_s(str ptr) MSVCRT_vprintf_s
@ cdecl vsnprintf(ptr long str ptr) MSVCRT_vsnprintf
@ cdecl vsnprintf(ptr long str ptr) _vsnprintf
@ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf
@ cdecl vsprintf_s(ptr long str ptr) MSVCRT_vsprintf_s
@ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf

1
dlls/msvcrt/onexit.c
View file

@ -23,7 +23,6 @@
#pragma makedep implib
#endif
#define _CRTIMP
#include <process.h>
#include "msvcrt.h"
#include "mtdll.h"

1
dlls/msvcrt/process.c
View file

@ -26,7 +26,6 @@
* open file handles, sometimes not. The docs are confusing
* -No check for maximum path/argument/environment size is done
*/
#include "config.h"
#include <stdarg.h>

2
dlls/msvcrt/scheduler.c
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include <stdarg.h>
#include "windef.h"

28
dlls/msvcrt/string.c
View file

@ -21,10 +21,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define _ISOC99_SOURCE
#include "config.h"
#include "wine/port.h"
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
@ -1153,7 +1149,7 @@ int CDECL MSVCRT_strcoll_l( const char* str1, const char* str2, MSVCRT__locale_t
locinfo = locale->locinfo;
if(!locinfo->lc_handle[MSVCRT_LC_COLLATE])
return MSVCRT_strcmp(str1, str2);
return strcmp(str1, str2);
return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, -1, str2, -1)-CSTR_EQUAL;
}
@ -1263,7 +1259,7 @@ char* __cdecl MSVCRT_strncpy(char *dst, const char *src, MSVCRT_size_t len)
/*********************************************************************
* strcpy (MSVCRT.@)
*/
char* CDECL MSVCRT_strcpy(char *dst, const char *src)
char* CDECL strcpy(char *dst, const char *src)
{
char *ret = dst;
while ((*dst++ = *src++));
@ -1324,7 +1320,7 @@ int CDECL MSVCRT_strcat_s( char* dst, MSVCRT_size_t elem, const char* src )
/*********************************************************************
* strcat (MSVCRT.@)
*/
char* __cdecl MSVCRT_strcat( char *dst, const char *src )
char* __cdecl strcat( char *dst, const char *src )
{
char *d = dst;
while (*d) d++;
@ -1502,7 +1498,7 @@ int CDECL MSVCRT__atoldbl(MSVCRT__LDOUBLE *value, const char *str)
/*********************************************************************
* strlen (MSVCRT.@)
*/
MSVCRT_size_t __cdecl MSVCRT_strlen(const char *str)
size_t __cdecl strlen(const char *str)
{
const char *s = str;
while (*s) s++;
@ -2461,7 +2457,7 @@ int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I1
/*********************************************************************
* memcmp (MSVCRT.@)
*/
int __cdecl MSVCRT_memcmp(const void *ptr1, const void *ptr2, MSVCRT_size_t n)
int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n)
{
const unsigned char *p1, *p2;
@ -2481,7 +2477,7 @@ int __cdecl MSVCRT_memcmp(const void *ptr1, const void *ptr2, MSVCRT_size_t n)
#else
# define MERGE(w1, sh1, w2, sh2) ((w1 >> sh1) | (w2 << sh2))
#endif
void * __cdecl MSVCRT_memmove(void *dst, const void *src, MSVCRT_size_t n)
void * __cdecl memmove(void *dst, const void *src, size_t n)
{
unsigned char *d = dst;
const unsigned char *s = src;
@ -2580,15 +2576,15 @@ void * __cdecl MSVCRT_memmove(void *dst, const void *src, MSVCRT_size_t n)
/*********************************************************************
* memcpy (MSVCRT.@)
*/
void * __cdecl MSVCRT_memcpy(void *dst, const void *src, MSVCRT_size_t n)
void * __cdecl memcpy(void *dst, const void *src, size_t n)
{
return MSVCRT_memmove(dst, src, n);
return memmove(dst, src, n);
}
/*********************************************************************
* memset (MSVCRT.@)
*/
void* __cdecl MSVCRT_memset(void *dst, int c, MSVCRT_size_t n)
void* __cdecl memset(void *dst, int c, size_t n)
{
volatile unsigned char *d = dst; /* avoid gcc optimizations */
while (n--) *d++ = c;
@ -2598,7 +2594,7 @@ void* __cdecl MSVCRT_memset(void *dst, int c, MSVCRT_size_t n)
/*********************************************************************
* strchr (MSVCRT.@)
*/
char* __cdecl MSVCRT_strchr(const char *str, int c)
char* __cdecl strchr(const char *str, int c)
{
do
{
@ -2631,7 +2627,7 @@ void* __cdecl MSVCRT_memchr(const void *ptr, int c, MSVCRT_size_t n)
/*********************************************************************
* strcmp (MSVCRT.@)
*/
int __cdecl MSVCRT_strcmp(const char *str1, const char *str2)
int __cdecl strcmp(const char *str1, const char *str2)
{
while (*str1 && *str1 == *str2) { str1++; str2++; }
if ((unsigned char)*str1 > (unsigned char)*str2) return 1;
@ -2721,7 +2717,7 @@ char* __cdecl MSVCRT_strstr(const char *haystack, const char *needle)
MSVCRT_size_t i, j, len, needle_len, lps_len;
BYTE lps[256];
needle_len = MSVCRT_strlen(needle);
needle_len = strlen(needle);
if (!needle_len) return (char*)haystack;
lps_len = needle_len > ARRAY_SIZE(lps) ? ARRAY_SIZE(lps) : needle_len;

2
dlls/msvcrt/time.c
View file

@ -22,8 +22,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include <stdlib.h>
#include "msvcrt.h"

3
dlls/msvcrt/undname.c
View file

@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>

27
dlls/msvcrt/wcs.c
View file

@ -18,8 +18,6 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#include <limits.h>
#include <stdio.h>
@ -832,11 +830,12 @@ printf_arg arg_clbk_positional(void *ctx, int pos, int type, __ms_va_list *valis
return args[pos];
}
#if _MSVCR_VER < 140
/*********************************************************************
* _vsnprintf (MSVCRT.@)
*/
int CDECL MSVCRT_vsnprintf( char *str, MSVCRT_size_t len,
const char *format, __ms_va_list valist )
int CDECL _vsnprintf( char *str, size_t len, const char *format, __ms_va_list valist )
{
static const char nullbyte = '\0';
struct _str_ctx_a ctx = {len, str};
@ -848,7 +847,7 @@ int CDECL MSVCRT_vsnprintf( char *str, MSVCRT_size_t len,
return ret;
}
#if _MSVCR_VER>=140
#else
static int puts_clbk_str_c99_a(void *ctx, int len, const char *str)
{
@ -873,8 +872,8 @@ static int puts_clbk_str_c99_a(void *ctx, int len, const char *str)
/*********************************************************************
* __stdio_common_vsprintf (UCRTBASE.@)
*/
int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MSVCRT_size_t len, const char *format,
MSVCRT__locale_t locale, __ms_va_list valist )
int CDECL __stdio_common_vsprintf( unsigned __int64 options, char *str, size_t len, const char *format,
_locale_t locale, __ms_va_list valist )
{
static const char nullbyte = '\0';
struct _str_ctx_a ctx = {len, str};
@ -883,7 +882,7 @@ int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MS
if (options & ~UCRTBASE_PRINTF_MASK)
FIXME("options %s not handled\n", wine_dbgstr_longlong(options));
ret = pf_printf_a(puts_clbk_str_c99_a,
&ctx, format, locale, options & UCRTBASE_PRINTF_MASK, arg_clbk_valist, NULL, &valist);
&ctx, format, (MSVCRT__locale_t)locale, options & UCRTBASE_PRINTF_MASK, arg_clbk_valist, NULL, &valist);
puts_clbk_str_a(&ctx, 1, &nullbyte);
if(!str)
@ -1118,7 +1117,7 @@ int CDECL MSVCRT__stdio_common_vsprintf_s( unsigned __int64 options,
*/
int CDECL MSVCRT_vsprintf( char *str, const char *format, __ms_va_list valist)
{
return MSVCRT_vsnprintf(str, INT_MAX, format, valist);
return vsnprintf(str, INT_MAX, format, valist);
}
/*********************************************************************
@ -1126,7 +1125,7 @@ int CDECL MSVCRT_vsprintf( char *str, const char *format, __ms_va_list valist)
*/
int CDECL MSVCRT_vsprintf_s( char *str, MSVCRT_size_t num, const char *format, __ms_va_list valist)
{
return MSVCRT_vsnprintf(str, num, format, valist);
return vsnprintf(str, num, format, valist);
}
/*********************************************************************
@ -1134,7 +1133,7 @@ int CDECL MSVCRT_vsprintf_s( char *str, MSVCRT_size_t num, const char *format, _
*/
int CDECL MSVCRT__vscprintf( const char *format, __ms_va_list valist )
{
return MSVCRT_vsnprintf( NULL, INT_MAX, format, valist );
return MSVCRT_vsnprintf_l( NULL, INT_MAX, format, NULL, valist );
}
/*********************************************************************
@ -1192,7 +1191,7 @@ int WINAPIV MSVCRT__snprintf(char *str, MSVCRT_size_t len, const char *format, .
int retval;
__ms_va_list valist;
__ms_va_start(valist, format);
retval = MSVCRT_vsnprintf(str, len, format, valist);
retval = vsnprintf(str, len, format, valist);
__ms_va_end(valist);
return retval;
}
@ -1530,7 +1529,7 @@ int WINAPIV MSVCRT_sprintf( char *str, const char *format, ... )
int r;
__ms_va_start( ap, format );
r = MSVCRT_vsnprintf( str, INT_MAX, format, ap );
r = vsnprintf( str, INT_MAX, format, ap );
__ms_va_end( ap );
return r;
}
@ -1544,7 +1543,7 @@ int WINAPIV MSVCRT_sprintf_s( char *str, MSVCRT_size_t num, const char *format,
int r;
__ms_va_start( ap, format );
r = MSVCRT_vsnprintf( str, num, format, ap );
r = vsnprintf( str, num, format, ap );
__ms_va_end( ap );
return r;
}

4
dlls/msvcrtd/Makefile.in
View file

@ -1,8 +1,10 @@
EXTRADEFS = -D_MSVCR_VER=0
EXTRADEFS = -D_CRTIMP=
MODULE = msvcrtd.dll
IMPORTLIB = msvcrtd
IMPORTS = ntdll
PARENTSRC = ../msvcrt
DELAYIMPORTS = advapi32 user32
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
console.c \

22
dlls/msvcrtd/msvcrtd.spec
View file

@ -216,7 +216,7 @@
@ extern -arch=i386 _adjust_fdiv MSVCRT__adjust_fdiv
@ extern _aexit_rtn
@ cdecl _amsg_exit(long)
@ cdecl _assert(str str long) MSVCRT__assert
@ cdecl _assert(str str long)
@ cdecl _atodbl(ptr str) MSVCRT__atodbl
@ cdecl -ret64 _atoi64(str) MSVCRT__atoi64
@ cdecl _atoldbl(ptr str) MSVCRT__atoldbl
@ -548,7 +548,7 @@
@ cdecl _unloaddll(long)
@ cdecl _unlock(long)
@ cdecl _utime(str ptr)
@ cdecl _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf
@ cdecl _vsnprintf(ptr long str ptr)
@ cdecl _vsnwprintf(ptr long wstr ptr) MSVCRT_vsnwprintf
@ cdecl _waccess(wstr long) MSVCRT__waccess
@ cdecl _wasctime(ptr) MSVCRT__wasctime
@ -729,10 +729,10 @@
@ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs
@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc
@ cdecl memchr(ptr long long) MSVCRT_memchr
@ cdecl memcmp(ptr ptr long) MSVCRT_memcmp
@ cdecl memcpy(ptr ptr long) MSVCRT_memcpy
@ cdecl memmove(ptr ptr long) MSVCRT_memmove
@ cdecl memset(ptr long long) MSVCRT_memset
@ cdecl memcmp(ptr ptr long)
@ cdecl memcpy(ptr ptr long)
@ cdecl memmove(ptr ptr long)
@ cdecl memset(ptr long long)
@ cdecl mktime(ptr) MSVCRT_mktime
@ cdecl modf(double ptr) MSVCRT_modf
@ cdecl perror(str) MSVCRT_perror
@ -761,15 +761,15 @@
@ cdecl sqrt(double) MSVCRT_sqrt
@ cdecl srand(long) MSVCRT_srand
@ varargs sscanf(str str) MSVCRT_sscanf
@ cdecl strcat(str str) MSVCRT_strcat
@ cdecl strchr(str long) MSVCRT_strchr
@ cdecl strcmp(str str) MSVCRT_strcmp
@ cdecl strcat(str str)
@ cdecl strchr(str long)
@ cdecl strcmp(str str)
@ cdecl strcoll(str str) MSVCRT_strcoll
@ cdecl strcpy(ptr str) MSVCRT_strcpy
@ cdecl strcpy(ptr str)
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str) MSVCRT_strlen
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
@ cdecl strncmp(str str long) MSVCRT_strncmp
@ cdecl strncpy(ptr str long) MSVCRT_strncpy

4
dlls/ucrtbase/Makefile.in
View file

@ -1,8 +1,10 @@
EXTRADEFS = -D_MSVCR_VER=140
EXTRADEFS = -D_CRTIMP=
MODULE = ucrtbase.dll
IMPORTLIB = ucrtbase
IMPORTS = ntdll
DELAYIMPORTS = advapi32 user32
PARENTSRC = ../msvcrt
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
console.c \

26
dlls/ucrtbase/ucrtbase.spec
View file

@ -156,7 +156,7 @@
@ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwscanf
@ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s
@ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s
@ cdecl -norelay __stdio_common_vsprintf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf
@ cdecl -norelay __stdio_common_vsprintf(int64 ptr long str ptr ptr)
@ cdecl __stdio_common_vsprintf_p(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_p
@ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_s
@ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsscanf
@ -189,7 +189,7 @@
@ stub _aligned_offset_recalloc
@ cdecl _aligned_realloc(ptr long long)
@ stub _aligned_recalloc
@ cdecl _assert(str str long) MSVCRT__assert
@ cdecl _assert(str str long)
@ cdecl _atodbl(ptr str) MSVCRT__atodbl
@ cdecl _atodbl_l(ptr str ptr) MSVCRT__atodbl_l
@ cdecl _atof_l(str ptr) MSVCRT__atof_l
@ -820,7 +820,7 @@
@ cdecl _o___stdio_common_vfwscanf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwscanf
@ cdecl _o___stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s
@ cdecl _o___stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s
@ cdecl _o___stdio_common_vsprintf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf
@ cdecl _o___stdio_common_vsprintf(int64 ptr long str ptr ptr) __stdio_common_vsprintf
@ cdecl _o___stdio_common_vsprintf_p(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_p
@ cdecl _o___stdio_common_vsprintf_s(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_s
@ cdecl _o___stdio_common_vsscanf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsscanf
@ -1718,7 +1718,7 @@
@ cdecl _o_mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s
@ cdecl _o_mbtowc(ptr str long) MSVCRT_mbtowc
@ cdecl _o_memcpy_s(ptr long ptr long) MSVCRT_memcpy_s
@ cdecl _o_memset(ptr long long) MSVCRT_memset
@ cdecl _o_memset(ptr long long) memset
@ cdecl _o_modf(double ptr) MSVCRT_modf
@ cdecl -arch=!i386 _o_modff(float ptr) MSVCRT_modff
@ cdecl _o_nan(str) MSVCR120_nan
@ -2421,12 +2421,12 @@
@ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s
@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc
@ cdecl memchr(ptr long long) MSVCRT_memchr
@ cdecl memcmp(ptr ptr long) MSVCRT_memcmp
@ cdecl memcpy(ptr ptr long) MSVCRT_memcpy
@ cdecl memcmp(ptr ptr long)
@ cdecl memcpy(ptr ptr long)
@ cdecl memcpy_s(ptr long ptr long) MSVCRT_memcpy_s
@ cdecl memmove(ptr ptr long) MSVCRT_memmove
@ cdecl memmove(ptr ptr long)
@ cdecl memmove_s(ptr long ptr long) MSVCRT_memmove_s
@ cdecl memset(ptr long long) MSVCRT_memset
@ cdecl memset(ptr long long)
@ cdecl modf(double ptr) MSVCRT_modf
@ cdecl -arch=!i386 modff(float ptr) MSVCRT_modff
@ cdecl nan(str) MSVCR120_nan
@ -2494,18 +2494,18 @@
@ cdecl sqrt(double) MSVCRT_sqrt
@ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf
@ cdecl srand(long) MSVCRT_srand
@ cdecl strcat(str str) MSVCRT_strcat
@ cdecl strcat(str str)
@ cdecl strcat_s(str long str) MSVCRT_strcat_s
@ cdecl strchr(str long) MSVCRT_strchr
@ cdecl strcmp(str str) MSVCRT_strcmp
@ cdecl strchr(str long)
@ cdecl strcmp(str str)
@ cdecl strcoll(str str) MSVCRT_strcoll
@ cdecl strcpy(ptr str) MSVCRT_strcpy
@ cdecl strcpy(ptr str)
@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s
@ cdecl strcspn(str str) MSVCRT_strcspn
@ cdecl strerror(long) MSVCRT_strerror
@ cdecl strerror_s(ptr long long) MSVCRT_strerror_s
@ cdecl strftime(ptr long str ptr) MSVCRT_strftime
@ cdecl strlen(str) MSVCRT_strlen
@ cdecl strlen(str)
@ cdecl strncat(str str long) MSVCRT_strncat
@ cdecl strncat_s(str long str long) MSVCRT_strncat_s
@ cdecl strncmp(str str long) MSVCRT_strncmp