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
a2d618ef
Commit
a2d618ef
authored
Apr 20, 2018
by
Piotr Caban
Committed by
Alexandre Julliard
Apr 20, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcp140: Add _Task_impl_base::_IsNonBlockingThread stub.
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
4121ac05
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
1 deletion
+18
-1
msvcp140.spec
dlls/msvcp140/msvcp140.spec
+1
-1
msvcp140.c
dlls/msvcp140/tests/msvcp140.c
+8
-0
misc.c
dlls/msvcp90/misc.c
+9
-0
No files found.
dlls/msvcp140/msvcp140.spec
View file @
a2d618ef
...
@@ -1443,7 +1443,7 @@
...
@@ -1443,7 +1443,7 @@
@ cdecl -arch=win32 ?_Iput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AAVios_base@2@_WPADI@Z(ptr ptr long ptr ptr long ptr long) num_put_wchar__Iput
@ cdecl -arch=win32 ?_Iput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AAVios_base@2@_WPADI@Z(ptr ptr long ptr ptr long ptr long) num_put_wchar__Iput
@ cdecl -arch=win64 ?_Iput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AEAVios_base@2@_WPEAD_K@Z(ptr ptr ptr ptr long ptr long) num_put_wchar__Iput
@ cdecl -arch=win64 ?_Iput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AEAVios_base@2@_WPEAD_K@Z(ptr ptr ptr ptr long ptr long) num_put_wchar__Iput
@ cdecl ?_IsCurrentOriginSTA@_ContextCallback@details@Concurrency@@CA_NXZ(ptr) _ContextCallback__IsCurrentOriginSTA
@ cdecl ?_IsCurrentOriginSTA@_ContextCallback@details@Concurrency@@CA_NXZ(ptr) _ContextCallback__IsCurrentOriginSTA
@
stub ?_IsNonBlockingThread@_Task_impl_base@details@Concurrency@@SA_NXZ
@
cdecl ?_IsNonBlockingThread@_Task_impl_base@details@Concurrency@@SA_NXZ() _Task_impl_base__IsNonBlockingThread
@ cdecl -arch=win32 ?_Locimp_Addfac@_Locimp@locale@std@@CAXPAV123@PAVfacet@23@I@Z(ptr ptr long) locale__Locimp__Locimp_Addfac
@ cdecl -arch=win32 ?_Locimp_Addfac@_Locimp@locale@std@@CAXPAV123@PAVfacet@23@I@Z(ptr ptr long) locale__Locimp__Locimp_Addfac
@ cdecl -arch=win64 ?_Locimp_Addfac@_Locimp@locale@std@@CAXPEAV123@PEAVfacet@23@_K@Z(ptr ptr long) locale__Locimp__Locimp_Addfac
@ cdecl -arch=win64 ?_Locimp_Addfac@_Locimp@locale@std@@CAXPEAV123@PEAVfacet@23@_K@Z(ptr ptr long) locale__Locimp__Locimp_Addfac
@ cdecl -arch=win32 ?_Locimp_ctor@_Locimp@locale@std@@CAXPAV123@ABV123@@Z(ptr ptr) locale__Locimp__Locimp_ctor
@ cdecl -arch=win32 ?_Locimp_ctor@_Locimp@locale@std@@CAXPAV123@ABV123@@Z(ptr ptr) locale__Locimp__Locimp_ctor
...
...
dlls/msvcp140/tests/msvcp140.c
View file @
a2d618ef
...
@@ -149,6 +149,7 @@ enum file_type {
...
@@ -149,6 +149,7 @@ enum file_type {
};
};
static
unsigned
int
(
__cdecl
*
p__Thrd_id
)(
void
);
static
unsigned
int
(
__cdecl
*
p__Thrd_id
)(
void
);
static
MSVCP_bool
(
__cdecl
*
p__Task_impl_base__IsNonBlockingThread
)(
void
);
static
task_continuation_context
*
(
__thiscall
*
p_task_continuation_context_ctor
)(
task_continuation_context
*
);
static
task_continuation_context
*
(
__thiscall
*
p_task_continuation_context_ctor
)(
task_continuation_context
*
);
static
void
(
__thiscall
*
p__ContextCallback__Assign
)(
_ContextCallback
*
,
void
*
);
static
void
(
__thiscall
*
p__ContextCallback__Assign
)(
_ContextCallback
*
,
void
*
);
static
void
(
__thiscall
*
p__ContextCallback__CallInContext
)(
const
_ContextCallback
*
,
function_void_cdecl_void
,
MSVCP_bool
);
static
void
(
__thiscall
*
p__ContextCallback__CallInContext
)(
const
_ContextCallback
*
,
function_void_cdecl_void
,
MSVCP_bool
);
...
@@ -198,6 +199,7 @@ static BOOL init(void)
...
@@ -198,6 +199,7 @@ static BOOL init(void)
}
}
SET
(
p__Thrd_id
,
"_Thrd_id"
);
SET
(
p__Thrd_id
,
"_Thrd_id"
);
SET
(
p__Task_impl_base__IsNonBlockingThread
,
"?_IsNonBlockingThread@_Task_impl_base@details@Concurrency@@SA_NXZ"
);
SET
(
p__ContextCallback__IsCurrentOriginSTA
,
"?_IsCurrentOriginSTA@_ContextCallback@details@Concurrency@@CA_NXZ"
);
SET
(
p__ContextCallback__IsCurrentOriginSTA
,
"?_IsCurrentOriginSTA@_ContextCallback@details@Concurrency@@CA_NXZ"
);
if
(
sizeof
(
void
*
)
==
8
)
{
/* 64-bit initialization */
if
(
sizeof
(
void
*
)
==
8
)
{
/* 64-bit initialization */
...
@@ -276,6 +278,11 @@ static void test_thrd(void)
...
@@ -276,6 +278,11 @@ static void test_thrd(void)
p__Thrd_id
(),
GetCurrentThreadId
());
p__Thrd_id
(),
GetCurrentThreadId
());
}
}
static
void
test__Task_impl_base__IsNonBlockingThread
(
void
)
{
ok
(
!
p__Task_impl_base__IsNonBlockingThread
(),
"_IsNonBlockingThread() returned true
\n
"
);
}
static
struct
{
static
struct
{
int
value
[
2
];
int
value
[
2
];
const
char
*
export_name
;
const
char
*
export_name
;
...
@@ -1058,6 +1065,7 @@ START_TEST(msvcp140)
...
@@ -1058,6 +1065,7 @@ START_TEST(msvcp140)
{
{
if
(
!
init
())
return
;
if
(
!
init
())
return
;
test_thrd
();
test_thrd
();
test__Task_impl_base__IsNonBlockingThread
();
test_vbtable_size_exports
();
test_vbtable_size_exports
();
test_task_continuation_context
();
test_task_continuation_context
();
test__ContextCallback
();
test__ContextCallback
();
...
...
dlls/msvcp90/misc.c
View file @
a2d618ef
...
@@ -2142,3 +2142,12 @@ void __thiscall _vector_base_v4__Internal_throw_exception(void/*_vector_base_v4*
...
@@ -2142,3 +2142,12 @@ void __thiscall _vector_base_v4__Internal_throw_exception(void/*_vector_base_v4*
throw_exception
(
exceptions
[
idx
].
type
,
exceptions
[
idx
].
msg
);
throw_exception
(
exceptions
[
idx
].
type
,
exceptions
[
idx
].
msg
);
}
}
#endif
#endif
#if _MSVCP_VER >= 140
/* ?_IsNonBlockingThread@_Task_impl_base@details@Concurrency@@SA_NXZ */
MSVCP_bool
__cdecl
_Task_impl_base__IsNonBlockingThread
(
void
)
{
FIXME
(
"() stub
\n
"
);
return
FALSE
;
}
#endif
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