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
53299946
Commit
53299946
authored
Aug 31, 2016
by
Daniel Lehman
Committed by
Alexandre Julliard
Sep 14, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcp140: Add _Thrd_id.
Signed-off-by:
Daniel Lehman
<
dlehman@esri.com
>
Signed-off-by:
Piotr Caban
<
piotr@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
9e5f9209
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
69 additions
and
1 deletion
+69
-1
configure
configure
+1
-0
configure.ac
configure.ac
+1
-0
msvcp140.spec
dlls/msvcp140/msvcp140.spec
+1
-1
Makefile.in
dlls/msvcp140/tests/Makefile.in
+5
-0
msvcp140.c
dlls/msvcp140/tests/msvcp140.c
+55
-0
misc.c
dlls/msvcp90/misc.c
+6
-0
No files found.
configure
View file @
53299946
...
...
@@ -18016,6 +18016,7 @@ wine_fn_config_dll msvcp120 enable_msvcp120
wine_fn_config_test dlls/msvcp120/tests msvcp120_test
wine_fn_config_dll msvcp120_app enable_msvcp120_app
wine_fn_config_dll msvcp140 enable_msvcp140
wine_fn_config_test dlls/msvcp140/tests msvcp140_test
wine_fn_config_dll msvcp60 enable_msvcp60
wine_fn_config_test dlls/msvcp60/tests msvcp60_test
wine_fn_config_dll msvcp70 enable_msvcp70
...
...
configure.ac
View file @
53299946
...
...
@@ -3135,6 +3135,7 @@ WINE_CONFIG_DLL(msvcp120)
WINE_CONFIG_TEST(dlls/msvcp120/tests)
WINE_CONFIG_DLL(msvcp120_app)
WINE_CONFIG_DLL(msvcp140)
WINE_CONFIG_TEST(dlls/msvcp140/tests)
WINE_CONFIG_DLL(msvcp60)
WINE_CONFIG_TEST(dlls/msvcp60/tests)
WINE_CONFIG_DLL(msvcp70)
...
...
dlls/msvcp140/msvcp140.spec
View file @
53299946
...
...
@@ -3726,7 +3726,7 @@
@ cdecl _Thrd_equal(ptr ptr) _Thrd_equal
@ stub _Thrd_exit
@ cdecl _Thrd_hardware_concurrency() _Thrd_hardware_concurrency
@
stub
_Thrd_id
@
cdecl _Thrd_id()
_Thrd_id
@ cdecl _Thrd_join(ptr long) _Thrd_join
@ cdecl _Thrd_sleep(ptr) _Thrd_sleep
@ cdecl _Thrd_start(ptr ptr ptr) msvcp110._Thrd_start
...
...
dlls/msvcp140/tests/Makefile.in
0 → 100644
View file @
53299946
TESTDLL
=
msvcp140.dll
APPMODE
=
-mno-cygwin
C_SRCS
=
\
msvcp140.c
dlls/msvcp140/tests/msvcp140.c
0 → 100644
View file @
53299946
/*
* Copyright 2016 Daniel Lehman
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* 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 <stdio.h>
#include "wine/test.h"
#include "winbase.h"
static
unsigned
int
(
__cdecl
*
p__Thrd_id
)(
void
);
static
HMODULE
msvcp
;
#define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y)
#define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0)
static
BOOL
init
(
void
)
{
msvcp
=
LoadLibraryA
(
"msvcp140.dll"
);
if
(
!
msvcp
)
{
win_skip
(
"msvcp140.dll not installed
\n
"
);
return
FALSE
;
}
SET
(
p__Thrd_id
,
"_Thrd_id"
);
return
TRUE
;
}
static
void
test_thrd
(
void
)
{
ok
(
p__Thrd_id
()
==
GetCurrentThreadId
(),
"expected same id, got _Thrd_id %u GetCurrentThreadId %u
\n
"
,
p__Thrd_id
(),
GetCurrentThreadId
());
}
START_TEST
(
msvcp140
)
{
if
(
!
init
())
return
;
test_thrd
();
FreeLibrary
(
msvcp
);
}
dlls/msvcp90/misc.c
View file @
53299946
...
...
@@ -988,6 +988,12 @@ unsigned int __cdecl _Thrd_hardware_concurrency(void)
return
val
;
}
unsigned
int
__cdecl
_Thrd_id
(
void
)
{
TRACE
(
"()
\n
"
);
return
GetCurrentThreadId
();
}
/* ??0_Pad@std@@QAE@XZ */
/* ??0_Pad@std@@QEAA@XZ */
DEFINE_THISCALL_WRAPPER
(
_Pad_ctor
,
4
)
...
...
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