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
9939b5f5
Commit
9939b5f5
authored
Jun 13, 2015
by
YongHao Hu
Committed by
Alexandre Julliard
Jun 15, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvcp110: Add tr2_sys__Make_dir implementation and test.
parent
64dfb085
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
51 additions
and
6 deletions
+51
-6
msvcp110.spec
dlls/msvcp110/msvcp110.spec
+2
-2
msvcp120.spec
dlls/msvcp120/msvcp120.spec
+2
-2
msvcp120.c
dlls/msvcp120/tests/msvcp120.c
+29
-0
msvcp120_app.spec
dlls/msvcp120_app/msvcp120_app.spec
+2
-2
ios.c
dlls/msvcp90/ios.c
+16
-0
No files found.
dlls/msvcp110/msvcp110.spec
View file @
9939b5f5
...
...
@@ -1617,8 +1617,8 @@
@ stub -arch=win64 ?_MP_Mul@std@@YAXQEA_K_K1@Z
@ stub -arch=win32 ?_MP_Rem@std@@YAXQA_K_K@Z
@ stub -arch=win64 ?_MP_Rem@std@@YAXQEA_K_K@Z
@
stub -arch=win32 ?_Make_dir@sys@tr2@std@@YAHPBD@Z
@
stub -arch=win64 ?_Make_dir@sys@tr2@std@@YAHPEBD@Z
@
cdecl -arch=win32 ?_Make_dir@sys@tr2@std@@YAHPBD@Z(str) tr2_sys__Make_dir
@
cdecl -arch=win64 ?_Make_dir@sys@tr2@std@@YAHPEBD@Z(str) tr2_sys__Make_dir
@ stub -arch=win32 ?_Make_dir@sys@tr2@std@@YAHPB_W@Z
@ stub -arch=win64 ?_Make_dir@sys@tr2@std@@YAHPEB_W@Z
@ cdecl -arch=win32 ?_Makeloc@_Locimp@locale@std@@CAPAV123@ABV_Locinfo@3@HPAV123@PBV23@@Z(ptr long ptr ptr) locale__Locimp__Makeloc
...
...
dlls/msvcp120/msvcp120.spec
View file @
9939b5f5
...
...
@@ -1578,8 +1578,8 @@
@ stub -arch=win64 ?_MP_Mul@std@@YAXQEA_K_K1@Z
@ stub -arch=win32 ?_MP_Rem@std@@YAXQA_K_K@Z
@ stub -arch=win64 ?_MP_Rem@std@@YAXQEA_K_K@Z
@
stub -arch=win32 ?_Make_dir@sys@tr2@std@@YAHPBD@Z
@
stub -arch=win64 ?_Make_dir@sys@tr2@std@@YAHPEBD@Z
@
cdecl -arch=win32 ?_Make_dir@sys@tr2@std@@YAHPBD@Z(str) tr2_sys__Make_dir
@
cdecl -arch=win64 ?_Make_dir@sys@tr2@std@@YAHPEBD@Z(str) tr2_sys__Make_dir
@ stub -arch=win32 ?_Make_dir@sys@tr2@std@@YAHPB_W@Z
@ stub -arch=win64 ?_Make_dir@sys@tr2@std@@YAHPEB_W@Z
@ cdecl -arch=win32 ?_Makeloc@_Locimp@locale@std@@CAPAV123@ABV_Locinfo@3@HPAV123@PBV23@@Z(ptr long ptr ptr) locale__Locimp__Makeloc
...
...
dlls/msvcp120/tests/msvcp120.c
View file @
9939b5f5
...
...
@@ -64,6 +64,7 @@ static ULONGLONG(__cdecl *p_tr2_sys__File_size)(char const*);
static
int
(
__cdecl
*
p_tr2_sys__Equivalent
)(
char
const
*
,
char
const
*
);
static
char
*
(
__cdecl
*
p_tr2_sys__Current_get
)(
char
*
);
static
MSVCP_bool
(
__cdecl
*
p_tr2_sys__Current_set
)(
char
const
*
);
static
int
(
__cdecl
*
p_tr2_sys__Make_dir
)(
char
const
*
);
static
HMODULE
msvcp
;
#define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y)
...
...
@@ -100,6 +101,8 @@ static BOOL init(void)
"?_Current_get@sys@tr2@std@@YAPEADAEAY0BAE@D@Z"
);
SET
(
p_tr2_sys__Current_set
,
"?_Current_set@sys@tr2@std@@YA_NPEBD@Z"
);
SET
(
p_tr2_sys__Make_dir
,
"?_Make_dir@sys@tr2@std@@YAHPEBD@Z"
);
}
else
{
SET
(
p_tr2_sys__File_size
,
"?_File_size@sys@tr2@std@@YA_KPBD@Z"
);
...
...
@@ -109,6 +112,8 @@ static BOOL init(void)
"?_Current_get@sys@tr2@std@@YAPADAAY0BAE@D@Z"
);
SET
(
p_tr2_sys__Current_set
,
"?_Current_set@sys@tr2@std@@YA_NPBD@Z"
);
SET
(
p_tr2_sys__Make_dir
,
"?_Make_dir@sys@tr2@std@@YAHPBD@Z"
);
}
msvcr
=
GetModuleHandleA
(
"msvcr120.dll"
);
...
...
@@ -469,6 +474,29 @@ static void test_tr2_sys__Current_set(void)
ok
(
!
strcmp
(
origin_path
,
current_path
),
"test_tr2_sys__Current_get(): expect: %s, got %s
\n
"
,
origin_path
,
current_path
);
}
static
void
test_tr2_sys__Make_dir
(
void
)
{
int
ret
,
i
;
struct
{
char
const
*
path
;
int
val
;
}
tests
[]
=
{
{
"tr2_test_dir"
,
1
},
{
"tr2_test_dir"
,
0
},
{
NULL
,
-
1
},
{
"??invalid_name>>"
,
-
1
}
};
for
(
i
=
0
;
i
<
sizeof
(
tests
)
/
sizeof
(
tests
[
0
]);
i
++
)
{
errno
=
0xdeadbeef
;
ret
=
p_tr2_sys__Make_dir
(
tests
[
i
].
path
);
ok
(
ret
==
tests
[
i
].
val
,
"tr2_sys__Make_dir(): test %d expect: %d, got %d
\n
"
,
i
+
1
,
tests
[
i
].
val
,
ret
);
ok
(
errno
==
0xdeadbeef
,
"tr2_sys__Make_dir(): test %d errno expect 0xdeadbeef, got %d
\n
"
,
i
+
1
,
errno
);
}
ok
(
RemoveDirectoryA
(
"tr2_test_dir"
),
"Expected tr2_test_dir to exist
\n
"
);
}
START_TEST
(
msvcp120
)
{
if
(
!
init
())
return
;
...
...
@@ -482,5 +510,6 @@ START_TEST(msvcp120)
test_tr2_sys__Equivalent
();
test_tr2_sys__Current_get
();
test_tr2_sys__Current_set
();
test_tr2_sys__Make_dir
();
FreeLibrary
(
msvcp
);
}
dlls/msvcp120_app/msvcp120_app.spec
View file @
9939b5f5
...
...
@@ -1578,8 +1578,8 @@
@ stub -arch=win64 ?_MP_Mul@std@@YAXQEA_K_K1@Z
@ stub -arch=win32 ?_MP_Rem@std@@YAXQA_K_K@Z
@ stub -arch=win64 ?_MP_Rem@std@@YAXQEA_K_K@Z
@
stub -arch=win32
?_Make_dir@sys@tr2@std@@YAHPBD@Z
@
stub -arch=win64
?_Make_dir@sys@tr2@std@@YAHPEBD@Z
@
cdecl -arch=win32 ?_Make_dir@sys@tr2@std@@YAHPBD@Z(str) msvcp120.
?_Make_dir@sys@tr2@std@@YAHPBD@Z
@
cdecl -arch=win64 ?_Make_dir@sys@tr2@std@@YAHPEBD@Z(str) msvcp120.
?_Make_dir@sys@tr2@std@@YAHPEBD@Z
@ stub -arch=win32 ?_Make_dir@sys@tr2@std@@YAHPB_W@Z
@ stub -arch=win64 ?_Make_dir@sys@tr2@std@@YAHPEB_W@Z
@ cdecl -arch=win32 ?_Makeloc@_Locimp@locale@std@@CAPAV123@ABV_Locinfo@3@HPAV123@PBV23@@Z(ptr long ptr ptr) msvcp120.?_Makeloc@_Locimp@locale@std@@CAPAV123@ABV_Locinfo@3@HPAV123@PBV23@@Z
...
...
dlls/msvcp90/ios.c
View file @
9939b5f5
...
...
@@ -14260,6 +14260,22 @@ MSVCP_bool __cdecl tr2_sys__Current_set(char const* path)
return
SetCurrentDirectoryA
(
path
)
!=
0
;
}
/* ?_Make_dir@sys@tr2@std@@YAHPBD@Z */
/* ?_Make_dir@sys@tr2@std@@YAHPEBD@Z */
int
__cdecl
tr2_sys__Make_dir
(
char
const
*
path
)
{
TRACE
(
"(%p)
\n
"
,
path
);
if
(
!
CreateDirectoryA
(
path
,
NULL
))
{
if
(
GetLastError
()
==
ERROR_ALREADY_EXISTS
)
return
0
;
else
return
-
1
;
}
return
1
;
}
/* ??0strstream@std@@QAE@PADHH@Z */
/* ??0strstream@std@@QEAA@PEAD_JH@Z */
#if STREAMSIZE_BITS == 64
...
...
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