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
e55149f8
Commit
e55149f8
authored
Aug 10, 2015
by
YongHao Hu
Committed by
Alexandre Julliard
Aug 17, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcp110: Add tr2_sys__Current_set_wchar implementation and test.
parent
ee77fc3b
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
7 deletions
+21
-7
msvcp110.spec
dlls/msvcp110/msvcp110.spec
+2
-2
msvcp120.spec
dlls/msvcp120/msvcp120.spec
+2
-2
msvcp120.c
dlls/msvcp120/tests/msvcp120.c
+7
-1
msvcp120_app.spec
dlls/msvcp120_app/msvcp120_app.spec
+2
-2
ios.c
dlls/msvcp90/ios.c
+8
-0
No files found.
dlls/msvcp110/msvcp110.spec
View file @
e55149f8
...
@@ -1173,8 +1173,8 @@
...
@@ -1173,8 +1173,8 @@
@ cdecl -arch=win64 ?_Current_get@sys@tr2@std@@YAPEA_WPEA_W@Z(ptr) tr2_sys__Current_get_wchar
@ cdecl -arch=win64 ?_Current_get@sys@tr2@std@@YAPEA_WPEA_W@Z(ptr) tr2_sys__Current_get_wchar
@ cdecl -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPBD@Z(str) tr2_sys__Current_set
@ cdecl -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPBD@Z(str) tr2_sys__Current_set
@ cdecl -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEBD@Z(str) tr2_sys__Current_set
@ cdecl -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEBD@Z(str) tr2_sys__Current_set
@
stub -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPB_W@Z
@
cdecl -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPB_W@Z(wstr) tr2_sys__Current_set_wchar
@
stub -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEB_W@Z
@
cdecl -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEB_W@Z(wstr) tr2_sys__Current_set_wchar
@ cdecl -arch=arm ?_Decref@facet@locale@std@@UAAPAV_Facet_base@3@XZ(ptr) locale_facet__Decref
@ cdecl -arch=arm ?_Decref@facet@locale@std@@UAAPAV_Facet_base@3@XZ(ptr) locale_facet__Decref
@ thiscall -arch=i386 ?_Decref@facet@locale@std@@UAEPAV_Facet_base@3@XZ(ptr) locale_facet__Decref
@ thiscall -arch=i386 ?_Decref@facet@locale@std@@UAEPAV_Facet_base@3@XZ(ptr) locale_facet__Decref
@ cdecl -arch=win64 ?_Decref@facet@locale@std@@UEAAPEAV_Facet_base@3@XZ(ptr) locale_facet__Decref
@ cdecl -arch=win64 ?_Decref@facet@locale@std@@UEAAPEAV_Facet_base@3@XZ(ptr) locale_facet__Decref
...
...
dlls/msvcp120/msvcp120.spec
View file @
e55149f8
...
@@ -1138,8 +1138,8 @@
...
@@ -1138,8 +1138,8 @@
@ cdecl -arch=win64 ?_Current_get@sys@tr2@std@@YAPEA_WAEAY0BAE@_W@Z(ptr) tr2_sys__Current_get_wchar
@ cdecl -arch=win64 ?_Current_get@sys@tr2@std@@YAPEA_WAEAY0BAE@_W@Z(ptr) tr2_sys__Current_get_wchar
@ cdecl -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPBD@Z(str) tr2_sys__Current_set
@ cdecl -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPBD@Z(str) tr2_sys__Current_set
@ cdecl -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEBD@Z(str) tr2_sys__Current_set
@ cdecl -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEBD@Z(str) tr2_sys__Current_set
@
stub -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPB_W@Z
@
cdecl -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPB_W@Z(wstr) tr2_sys__Current_set_wchar
@
stub -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEB_W@Z
@
cdecl -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEB_W@Z(wstr) tr2_sys__Current_set_wchar
@ cdecl -arch=arm ?_Decref@facet@locale@std@@UAAPAV_Facet_base@3@XZ(ptr) locale_facet__Decref
@ cdecl -arch=arm ?_Decref@facet@locale@std@@UAAPAV_Facet_base@3@XZ(ptr) locale_facet__Decref
@ thiscall -arch=i386 ?_Decref@facet@locale@std@@UAEPAV_Facet_base@3@XZ(ptr) locale_facet__Decref
@ thiscall -arch=i386 ?_Decref@facet@locale@std@@UAEPAV_Facet_base@3@XZ(ptr) locale_facet__Decref
@ cdecl -arch=win64 ?_Decref@facet@locale@std@@UEAAPEAV_Facet_base@3@XZ(ptr) locale_facet__Decref
@ cdecl -arch=win64 ?_Decref@facet@locale@std@@UEAAPEAV_Facet_base@3@XZ(ptr) locale_facet__Decref
...
...
dlls/msvcp120/tests/msvcp120.c
View file @
e55149f8
...
@@ -79,6 +79,7 @@ static int (__cdecl *p_tr2_sys__Equivalent_wchar)(WCHAR const*, WCHAR const*);
...
@@ -79,6 +79,7 @@ static int (__cdecl *p_tr2_sys__Equivalent_wchar)(WCHAR const*, WCHAR const*);
static
char
*
(
__cdecl
*
p_tr2_sys__Current_get
)(
char
*
);
static
char
*
(
__cdecl
*
p_tr2_sys__Current_get
)(
char
*
);
static
WCHAR
*
(
__cdecl
*
p_tr2_sys__Current_get_wchar
)(
WCHAR
*
);
static
WCHAR
*
(
__cdecl
*
p_tr2_sys__Current_get_wchar
)(
WCHAR
*
);
static
MSVCP_bool
(
__cdecl
*
p_tr2_sys__Current_set
)(
char
const
*
);
static
MSVCP_bool
(
__cdecl
*
p_tr2_sys__Current_set
)(
char
const
*
);
static
MSVCP_bool
(
__cdecl
*
p_tr2_sys__Current_set_wchar
)(
WCHAR
const
*
);
static
int
(
__cdecl
*
p_tr2_sys__Make_dir
)(
char
const
*
);
static
int
(
__cdecl
*
p_tr2_sys__Make_dir
)(
char
const
*
);
static
MSVCP_bool
(
__cdecl
*
p_tr2_sys__Remove_dir
)(
char
const
*
);
static
MSVCP_bool
(
__cdecl
*
p_tr2_sys__Remove_dir
)(
char
const
*
);
static
int
(
__cdecl
*
p_tr2_sys__Copy_file
)(
char
const
*
,
char
const
*
,
MSVCP_bool
);
static
int
(
__cdecl
*
p_tr2_sys__Copy_file
)(
char
const
*
,
char
const
*
,
MSVCP_bool
);
...
@@ -128,6 +129,8 @@ static BOOL init(void)
...
@@ -128,6 +129,8 @@ static BOOL init(void)
"?_Current_get@sys@tr2@std@@YAPEA_WAEAY0BAE@_W@Z"
);
"?_Current_get@sys@tr2@std@@YAPEA_WAEAY0BAE@_W@Z"
);
SET
(
p_tr2_sys__Current_set
,
SET
(
p_tr2_sys__Current_set
,
"?_Current_set@sys@tr2@std@@YA_NPEBD@Z"
);
"?_Current_set@sys@tr2@std@@YA_NPEBD@Z"
);
SET
(
p_tr2_sys__Current_set_wchar
,
"?_Current_set@sys@tr2@std@@YA_NPEB_W@Z"
);
SET
(
p_tr2_sys__Make_dir
,
SET
(
p_tr2_sys__Make_dir
,
"?_Make_dir@sys@tr2@std@@YAHPEBD@Z"
);
"?_Make_dir@sys@tr2@std@@YAHPEBD@Z"
);
SET
(
p_tr2_sys__Remove_dir
,
SET
(
p_tr2_sys__Remove_dir
,
...
@@ -157,6 +160,8 @@ static BOOL init(void)
...
@@ -157,6 +160,8 @@ static BOOL init(void)
"?_Current_get@sys@tr2@std@@YAPA_WAAY0BAE@_W@Z"
);
"?_Current_get@sys@tr2@std@@YAPA_WAAY0BAE@_W@Z"
);
SET
(
p_tr2_sys__Current_set
,
SET
(
p_tr2_sys__Current_set
,
"?_Current_set@sys@tr2@std@@YA_NPBD@Z"
);
"?_Current_set@sys@tr2@std@@YA_NPBD@Z"
);
SET
(
p_tr2_sys__Current_set_wchar
,
"?_Current_set@sys@tr2@std@@YA_NPB_W@Z"
);
SET
(
p_tr2_sys__Make_dir
,
SET
(
p_tr2_sys__Make_dir
,
"?_Make_dir@sys@tr2@std@@YAHPBD@Z"
);
"?_Make_dir@sys@tr2@std@@YAHPBD@Z"
);
SET
(
p_tr2_sys__Remove_dir
,
SET
(
p_tr2_sys__Remove_dir
,
...
@@ -516,6 +521,7 @@ static void test_tr2_sys__Current_set(void)
...
@@ -516,6 +521,7 @@ static void test_tr2_sys__Current_set(void)
{
{
char
temp_path
[
MAX_PATH
],
current_path
[
MAX_PATH
],
origin_path
[
MAX_PATH
];
char
temp_path
[
MAX_PATH
],
current_path
[
MAX_PATH
],
origin_path
[
MAX_PATH
];
char
*
temp
;
char
*
temp
;
WCHAR
testW
[]
=
{
'.'
,
'/'
,
0
};
memset
(
temp_path
,
0
,
MAX_PATH
);
memset
(
temp_path
,
0
,
MAX_PATH
);
GetTempPathA
(
MAX_PATH
,
temp_path
);
GetTempPathA
(
MAX_PATH
,
temp_path
);
memset
(
origin_path
,
0
,
MAX_PATH
);
memset
(
origin_path
,
0
,
MAX_PATH
);
...
@@ -530,7 +536,7 @@ static void test_tr2_sys__Current_set(void)
...
@@ -530,7 +536,7 @@ static void test_tr2_sys__Current_set(void)
temp
[
strlen
(
temp
)]
=
'\\'
;
temp
[
strlen
(
temp
)]
=
'\\'
;
ok
(
!
strcmp
(
temp_path
,
current_path
),
"test_tr2_sys__Current_get(): expect: %s, got %s
\n
"
,
temp_path
,
current_path
);
ok
(
!
strcmp
(
temp_path
,
current_path
),
"test_tr2_sys__Current_get(): expect: %s, got %s
\n
"
,
temp_path
,
current_path
);
ok
(
p_tr2_sys__Current_set
(
"./"
),
"p_tr2_sys__Current_set
to temp_path failed
\n
"
);
ok
(
p_tr2_sys__Current_set
_wchar
(
testW
),
"p_tr2_sys__Current_set_wchar
to temp_path failed
\n
"
);
memset
(
current_path
,
0
,
MAX_PATH
);
memset
(
current_path
,
0
,
MAX_PATH
);
temp
=
p_tr2_sys__Current_get
(
current_path
);
temp
=
p_tr2_sys__Current_get
(
current_path
);
ok
(
temp
==
current_path
,
"p_tr2_sys__Current_get returned different buffer
\n
"
);
ok
(
temp
==
current_path
,
"p_tr2_sys__Current_get returned different buffer
\n
"
);
...
...
dlls/msvcp120_app/msvcp120_app.spec
View file @
e55149f8
...
@@ -1138,8 +1138,8 @@
...
@@ -1138,8 +1138,8 @@
@ cdecl -arch=win64 ?_Current_get@sys@tr2@std@@YAPEA_WAEAY0BAE@_W@Z(ptr) msvcp120.?_Current_get@sys@tr2@std@@YAPEA_WAEAY0BAE@_W@Z
@ cdecl -arch=win64 ?_Current_get@sys@tr2@std@@YAPEA_WAEAY0BAE@_W@Z(ptr) msvcp120.?_Current_get@sys@tr2@std@@YAPEA_WAEAY0BAE@_W@Z
@ cdecl -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPBD@Z(str) msvcp120.?_Current_set@sys@tr2@std@@YA_NPBD@Z
@ cdecl -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPBD@Z(str) msvcp120.?_Current_set@sys@tr2@std@@YA_NPBD@Z
@ cdecl -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEBD@Z(str) msvcp120.?_Current_set@sys@tr2@std@@YA_NPEBD@Z
@ cdecl -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEBD@Z(str) msvcp120.?_Current_set@sys@tr2@std@@YA_NPEBD@Z
@
stub -arch=win32
?_Current_set@sys@tr2@std@@YA_NPB_W@Z
@
cdecl -arch=win32 ?_Current_set@sys@tr2@std@@YA_NPB_W@Z(wstr) msvcp120.
?_Current_set@sys@tr2@std@@YA_NPB_W@Z
@
stub -arch=win64
?_Current_set@sys@tr2@std@@YA_NPEB_W@Z
@
cdecl -arch=win64 ?_Current_set@sys@tr2@std@@YA_NPEB_W@Z(wstr) msvcp120.
?_Current_set@sys@tr2@std@@YA_NPEB_W@Z
@ cdecl -arch=arm ?_Decref@facet@locale@std@@UAAPAV_Facet_base@3@XZ(ptr) msvcp120.?_Decref@facet@locale@std@@UAAPAV_Facet_base@3@XZ
@ cdecl -arch=arm ?_Decref@facet@locale@std@@UAAPAV_Facet_base@3@XZ(ptr) msvcp120.?_Decref@facet@locale@std@@UAAPAV_Facet_base@3@XZ
@ thiscall -arch=i386 ?_Decref@facet@locale@std@@UAEPAV_Facet_base@3@XZ(ptr) msvcp120.?_Decref@facet@locale@std@@UAEPAV_Facet_base@3@XZ
@ thiscall -arch=i386 ?_Decref@facet@locale@std@@UAEPAV_Facet_base@3@XZ(ptr) msvcp120.?_Decref@facet@locale@std@@UAEPAV_Facet_base@3@XZ
@ cdecl -arch=win64 ?_Decref@facet@locale@std@@UEAAPEAV_Facet_base@3@XZ(ptr) msvcp120.?_Decref@facet@locale@std@@UEAAPEAV_Facet_base@3@XZ
@ cdecl -arch=win64 ?_Decref@facet@locale@std@@UEAAPEAV_Facet_base@3@XZ(ptr) msvcp120.?_Decref@facet@locale@std@@UEAAPEAV_Facet_base@3@XZ
...
...
dlls/msvcp90/ios.c
View file @
e55149f8
...
@@ -14801,6 +14801,14 @@ WCHAR* __cdecl tr2_sys__Current_get_wchar(WCHAR *current_path)
...
@@ -14801,6 +14801,14 @@ WCHAR* __cdecl tr2_sys__Current_get_wchar(WCHAR *current_path)
return
current_path
;
return
current_path
;
}
}
/* ?_Current_set@sys@tr2@std@@YA_NPB_W@Z */
/* ?_Current_set@sys@tr2@std@@YA_NPEB_W@Z */
MSVCP_bool
__cdecl
tr2_sys__Current_set_wchar
(
WCHAR
const
*
path
)
{
TRACE
(
"(%s)
\n
"
,
debugstr_w
(
path
));
return
SetCurrentDirectoryW
(
path
)
!=
0
;
}
/* ??1_Winit@std@@QAE@XZ */
/* ??1_Winit@std@@QAE@XZ */
/* ??1_Winit@std@@QAE@XZ */
/* ??1_Winit@std@@QAE@XZ */
DEFINE_THISCALL_WRAPPER
(
_Winit_dtor
,
4
)
DEFINE_THISCALL_WRAPPER
(
_Winit_dtor
,
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