Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
84f5d8a6
Commit
84f5d8a6
authored
Oct 01, 2018
by
Piotr Caban
Committed by
Alexandre Julliard
Oct 01, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcr120: Added _Cbuild implementation.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
97a7a4ff
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
35 additions
and
4 deletions
+35
-4
api-ms-win-crt-math-l1-1-0.spec
...pi-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec
+1
-1
msvcr120.spec
dlls/msvcr120/msvcr120.spec
+1
-1
msvcr120.c
dlls/msvcr120/tests/msvcr120.c
+23
-0
msvcr120_app.spec
dlls/msvcr120_app/msvcr120_app.spec
+1
-1
math.c
dlls/msvcrt/math.c
+7
-0
msvcrt.h
dlls/msvcrt/msvcrt.h
+1
-0
ucrtbase.spec
dlls/ucrtbase/ucrtbase.spec
+1
-1
No files found.
dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec
View file @
84f5d8a6
...
...
@@ -14,7 +14,7 @@
@ cdecl -arch=i386 _CIsqrt() ucrtbase._CIsqrt
@ cdecl -arch=i386 _CItan() ucrtbase._CItan
@ cdecl -arch=i386 _CItanh() ucrtbase._CItanh
@
stub
_Cbuild
@
cdecl _Cbuild(ptr double double) ucrtbase.
_Cbuild
@ stub _Cmulcc
@ stub _Cmulcr
@ stub _FCbuild
...
...
dlls/msvcr120/msvcr120.spec
View file @
84f5d8a6
...
...
@@ -824,7 +824,7 @@
@ cdecl -arch=i386 _CItanh()
@ cdecl _CRT_RTC_INIT(ptr ptr long long long)
@ cdecl _CRT_RTC_INITW(ptr ptr long long long)
@
stub
_Cbuild
@
cdecl _Cbuild(ptr double double) MSVCR120_
_Cbuild
@ cdecl _CreateFrameInfo(ptr ptr)
@ stdcall _CxxThrowException(ptr ptr)
@ cdecl -arch=i386 -norelay _EH_prolog()
...
...
dlls/msvcr120/tests/msvcr120.c
View file @
84f5d8a6
...
...
@@ -163,6 +163,12 @@ typedef struct
unsigned
int
status
;
}
fenv_t
;
typedef
struct
{
double
r
;
double
i
;
}
_Dcomplex
;
static
char
*
(
CDECL
*
p_setlocale
)(
int
category
,
const
char
*
locale
);
static
struct
MSVCRT_lconv
*
(
CDECL
*
p_localeconv
)(
void
);
static
size_t
(
CDECL
*
p_wcstombs_s
)(
size_t
*
ret
,
char
*
dest
,
size_t
sz
,
const
wchar_t
*
src
,
size_t
max
);
...
...
@@ -184,6 +190,7 @@ static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *);
static
void
(
__cdecl
*
p_free_locale
)(
_locale_t
);
static
unsigned
short
(
__cdecl
*
p_wctype
)(
const
char
*
);
static
int
(
__cdecl
*
p_vsscanf
)(
const
char
*
,
const
char
*
,
__ms_va_list
valist
);
static
_Dcomplex
*
(
__cdecl
*
p__Cbuild
)(
_Dcomplex
*
,
double
,
double
);
/* make sure we use the correct errno */
#undef errno
...
...
@@ -242,6 +249,7 @@ static BOOL init(void)
SET
(
p_fegetenv
,
"fegetenv"
);
SET
(
p__clearfp
,
"_clearfp"
);
SET
(
p_vsscanf
,
"vsscanf"
);
SET
(
p__Cbuild
,
"_Cbuild"
);
if
(
sizeof
(
void
*
)
==
8
)
{
/* 64-bit initialization */
SET
(
p_critical_section_ctor
,
"??0critical_section@Concurrency@@QEAA@XZ"
);
...
...
@@ -935,6 +943,20 @@ static void test_vsscanf(void)
ok
(
v
==
10
,
"got %d.
\n
"
,
v
);
}
static
void
test__Cbuild
(
void
)
{
_Dcomplex
c
;
memset
(
&
c
,
0
,
sizeof
(
c
));
p__Cbuild
(
&
c
,
1
.
0
,
2
.
0
);
ok
(
c
.
r
==
1
.
0
,
"c.r = %lf
\n
"
,
c
.
r
);
ok
(
c
.
i
==
2
.
0
,
"c.i = %lf
\n
"
,
c
.
i
);
p__Cbuild
(
&
c
,
3
.
0
,
NAN
);
ok
(
c
.
r
==
3
.
0
,
"c.r = %lf
\n
"
,
c
.
r
);
ok
(
_isnan
(
c
.
i
),
"c.i = %lf
\n
"
,
c
.
i
);
}
START_TEST
(
msvcr120
)
{
if
(
!
init
())
return
;
...
...
@@ -953,4 +975,5 @@ START_TEST(msvcr120)
test__Condition_variable
();
test_wctype
();
test_vsscanf
();
test__Cbuild
();
}
dlls/msvcr120_app/msvcr120_app.spec
View file @
84f5d8a6
...
...
@@ -818,7 +818,7 @@
@ cdecl -arch=i386 _CIsqrt() msvcr120._CIsqrt
@ cdecl -arch=i386 _CItan() msvcr120._CItan
@ cdecl -arch=i386 _CItanh() msvcr120._CItanh
@
stub
_Cbuild
@
cdecl _Cbuild(ptr double double) msvcr120.
_Cbuild
@ cdecl _CreateFrameInfo(ptr ptr) msvcr120._CreateFrameInfo
@ stdcall _CxxThrowException(ptr ptr) msvcr120._CxxThrowException
@ cdecl -arch=i386 -norelay _EH_prolog() msvcr120._EH_prolog
...
...
dlls/msvcrt/math.c
View file @
84f5d8a6
...
...
@@ -3383,4 +3383,11 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res,
return
res
;
}
_Dcomplex
*
CDECL
MSVCR120__Cbuild
(
_Dcomplex
*
ret
,
double
r
,
double
i
)
{
ret
->
x
=
r
;
ret
->
y
=
i
;
return
ret
;
}
#endif
/* _MSVCR_VER>=120 */
dlls/msvcrt/msvcrt.h
View file @
84f5d8a6
...
...
@@ -458,6 +458,7 @@ struct MSVCRT__complex {
double
x
;
/* Real part */
double
y
;
/* Imaginary part */
};
typedef
struct
MSVCRT__complex
_Dcomplex
;
typedef
struct
MSVCRT__div_t
{
int
quot
;
/* quotient */
...
...
dlls/ucrtbase/ucrtbase.spec
View file @
84f5d8a6
...
...
@@ -14,7 +14,7 @@
@ cdecl -arch=i386 _CIsqrt()
@ cdecl -arch=i386 _CItan()
@ cdecl -arch=i386 _CItanh()
@
stub
_Cbuild
@
cdecl _Cbuild(ptr double double) MSVCR120_
_Cbuild
@ stub _Cmulcc
@ stub _Cmulcr
@ cdecl _CreateFrameInfo(ptr ptr)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment