Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
d4ef782d
Commit
d4ef782d
authored
Apr 24, 2019
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Build all tests with msvcrt.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
629f2e10
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
34 additions
and
47 deletions
+34
-47
advpack.c
dlls/advpack/tests/advpack.c
+4
-4
debugger.c
dlls/kernel32/tests/debugger.c
+4
-4
process.c
dlls/kernel32/tests/process.c
+4
-4
custom.c
dlls/msi/tests/custom.c
+4
-4
db.c
dlls/msi/tests/db.c
+4
-4
Makefile.in
dlls/msvcirt/tests/Makefile.in
+0
-1
Makefile.in
dlls/msvcp100/tests/Makefile.in
+0
-1
Makefile.in
dlls/msvcp110/tests/Makefile.in
+0
-1
Makefile.in
dlls/msvcp120/tests/Makefile.in
+0
-1
Makefile.in
dlls/msvcp140/tests/Makefile.in
+0
-1
Makefile.in
dlls/msvcp60/tests/Makefile.in
+0
-1
Makefile.in
dlls/msvcp90/tests/Makefile.in
+0
-1
Makefile.in
dlls/msvcr100/tests/Makefile.in
+0
-1
Makefile.in
dlls/msvcr110/tests/Makefile.in
+0
-1
Makefile.in
dlls/msvcr120/tests/Makefile.in
+0
-1
Makefile.in
dlls/msvcr90/tests/Makefile.in
+0
-1
Makefile.in
dlls/msvcrt/tests/Makefile.in
+0
-1
Makefile.in
dlls/msvcrtd/tests/Makefile.in
+0
-1
shlexec.c
dlls/shell32/tests/shlexec.c
+8
-8
Makefile.in
dlls/ucrtbase/tests/Makefile.in
+0
-1
service.c
programs/services/tests/service.c
+5
-5
makedep.c
tools/makedep.c
+1
-0
No files found.
dlls/advpack/tests/advpack.c
View file @
d4ef782d
...
@@ -189,14 +189,14 @@ static void delnode_test(void)
...
@@ -189,14 +189,14 @@ static void delnode_test(void)
ok
(
hr
==
S_OK
,
"DelNode failed deleting a directory containing multiple files
\n
"
);
ok
(
hr
==
S_OK
,
"DelNode failed deleting a directory containing multiple files
\n
"
);
}
}
static
void
append_str
(
char
**
str
,
const
char
*
data
,
...)
static
void
WINAPIV
append_str
(
char
**
str
,
const
char
*
data
,
...)
{
{
va_list
valist
;
__ms_
va_list
valist
;
va_start
(
valist
,
data
);
__ms_
va_start
(
valist
,
data
);
vsprintf
(
*
str
,
data
,
valist
);
vsprintf
(
*
str
,
data
,
valist
);
*
str
+=
strlen
(
*
str
);
*
str
+=
strlen
(
*
str
);
va_end
(
valist
);
__ms_
va_end
(
valist
);
}
}
static
void
create_inf_file
(
void
)
static
void
create_inf_file
(
void
)
...
...
dlls/kernel32/tests/debugger.c
View file @
d4ef782d
...
@@ -42,13 +42,13 @@ static BOOL (WINAPI *pIsDebuggerPresent)(void);
...
@@ -42,13 +42,13 @@ static BOOL (WINAPI *pIsDebuggerPresent)(void);
static
LONG
child_failures
;
static
LONG
child_failures
;
static
void
WINETEST_PRINTF_ATTR
(
2
,
3
)
test_child_ok
(
int
condition
,
const
char
*
msg
,
...)
static
void
WIN
APIV
WIN
ETEST_PRINTF_ATTR
(
2
,
3
)
test_child_ok
(
int
condition
,
const
char
*
msg
,
...)
{
{
va_list
valist
;
__ms_
va_list
valist
;
va_start
(
valist
,
msg
);
__ms_
va_start
(
valist
,
msg
);
winetest_vok
(
condition
,
msg
,
valist
);
winetest_vok
(
condition
,
msg
,
valist
);
va_end
(
valist
);
__ms_
va_end
(
valist
);
if
(
!
condition
)
++
child_failures
;
if
(
!
condition
)
++
child_failures
;
}
}
...
...
dlls/kernel32/tests/process.c
View file @
d4ef782d
...
@@ -281,15 +281,15 @@ static void get_file_name(char* buf)
...
@@ -281,15 +281,15 @@ static void get_file_name(char* buf)
* static void childPrintf
* static void childPrintf
*
*
*/
*/
static
void
WINETEST_PRINTF_ATTR
(
2
,
3
)
childPrintf
(
HANDLE
h
,
const
char
*
fmt
,
...)
static
void
WIN
APIV
WIN
ETEST_PRINTF_ATTR
(
2
,
3
)
childPrintf
(
HANDLE
h
,
const
char
*
fmt
,
...)
{
{
va_list
valist
;
__ms_va_list
valist
;
char
buffer
[
1024
+
4
*
MAX_LISTED_ENV_VAR
];
char
buffer
[
1024
+
4
*
MAX_LISTED_ENV_VAR
];
DWORD
w
;
DWORD
w
;
va_start
(
valist
,
fmt
);
__ms_
va_start
(
valist
,
fmt
);
vsprintf
(
buffer
,
fmt
,
valist
);
vsprintf
(
buffer
,
fmt
,
valist
);
va_end
(
valist
);
__ms_
va_end
(
valist
);
WriteFile
(
h
,
buffer
,
strlen
(
buffer
),
&
w
,
NULL
);
WriteFile
(
h
,
buffer
,
strlen
(
buffer
),
&
w
,
NULL
);
}
}
...
...
dlls/msi/tests/custom.c
View file @
d4ef782d
...
@@ -34,15 +34,15 @@
...
@@ -34,15 +34,15 @@
static
int
todo_level
,
todo_do_loop
;
static
int
todo_level
,
todo_do_loop
;
static
void
ok_
(
MSIHANDLE
hinst
,
int
todo
,
const
char
*
file
,
int
line
,
int
condition
,
const
char
*
msg
,
...)
static
void
WINAPIV
ok_
(
MSIHANDLE
hinst
,
int
todo
,
const
char
*
file
,
int
line
,
int
condition
,
const
char
*
msg
,
...)
{
{
static
char
buffer
[
2000
];
static
char
buffer
[
2000
];
MSIHANDLE
record
;
MSIHANDLE
record
;
va_list
valist
;
__ms_
va_list
valist
;
va_start
(
valist
,
msg
);
__ms_
va_start
(
valist
,
msg
);
vsprintf
(
buffer
,
msg
,
valist
);
vsprintf
(
buffer
,
msg
,
valist
);
va_end
(
valist
);
__ms_
va_end
(
valist
);
record
=
MsiCreateRecord
(
5
);
record
=
MsiCreateRecord
(
5
);
MsiRecordSetInteger
(
record
,
1
,
todo
);
MsiRecordSetInteger
(
record
,
1
,
todo
);
...
...
dlls/msi/tests/db.c
View file @
d4ef782d
...
@@ -36,15 +36,15 @@ static const char *mstfile = "winetst-db.mst";
...
@@ -36,15 +36,15 @@ static const char *mstfile = "winetst-db.mst";
static
const
WCHAR
msifileW
[]
=
{
'w'
,
'i'
,
'n'
,
'e'
,
't'
,
'e'
,
's'
,
't'
,
'-'
,
'd'
,
'b'
,
'.'
,
'm'
,
's'
,
'i'
,
0
};
static
const
WCHAR
msifileW
[]
=
{
'w'
,
'i'
,
'n'
,
'e'
,
't'
,
'e'
,
's'
,
't'
,
'-'
,
'd'
,
'b'
,
'.'
,
'm'
,
's'
,
'i'
,
0
};
static
const
WCHAR
msifile2W
[]
=
{
'w'
,
'i'
,
'n'
,
'e'
,
't'
,
's'
,
't'
,
'2'
,
'-'
,
'd'
,
'b'
,
'.'
,
'm'
,
's'
,
'i'
,
0
};
static
const
WCHAR
msifile2W
[]
=
{
'w'
,
'i'
,
'n'
,
'e'
,
't'
,
's'
,
't'
,
'2'
,
'-'
,
'd'
,
'b'
,
'.'
,
'm'
,
's'
,
'i'
,
0
};
static
void
check_record_
(
int
line
,
MSIHANDLE
rec
,
UINT
count
,
...)
static
void
WINAPIV
check_record_
(
int
line
,
MSIHANDLE
rec
,
UINT
count
,
...)
{
{
va_list
args
;
__ms_
va_list
args
;
UINT
i
;
UINT
i
;
ok_
(
__FILE__
,
line
)(
count
==
MsiRecordGetFieldCount
(
rec
),
ok_
(
__FILE__
,
line
)(
count
==
MsiRecordGetFieldCount
(
rec
),
"expected %u fields, got %u
\n
"
,
count
,
MsiRecordGetFieldCount
(
rec
));
"expected %u fields, got %u
\n
"
,
count
,
MsiRecordGetFieldCount
(
rec
));
va_start
(
args
,
count
);
__ms_
va_start
(
args
,
count
);
for
(
i
=
1
;
i
<=
count
;
++
i
)
for
(
i
=
1
;
i
<=
count
;
++
i
)
{
{
...
@@ -57,7 +57,7 @@ static void check_record_(int line, MSIHANDLE rec, UINT count, ...)
...
@@ -57,7 +57,7 @@ static void check_record_(int line, MSIHANDLE rec, UINT count, ...)
"field %u: expected
\"
%s
\"
, got
\"
%s
\"\n
"
,
i
,
expect
,
buffer
);
"field %u: expected
\"
%s
\"
, got
\"
%s
\"\n
"
,
i
,
expect
,
buffer
);
}
}
va_end
(
args
);
__ms_
va_end
(
args
);
}
}
#define check_record(rec, ...) check_record_(__LINE__, rec, __VA_ARGS__)
#define check_record(rec, ...) check_record_(__LINE__, rec, __VA_ARGS__)
...
...
dlls/msvcirt/tests/Makefile.in
View file @
d4ef782d
TESTDLL
=
msvcirt.dll
TESTDLL
=
msvcirt.dll
APPMODE
=
-mno-cygwin
C_SRCS
=
msvcirt.c
C_SRCS
=
msvcirt.c
dlls/msvcp100/tests/Makefile.in
View file @
d4ef782d
TESTDLL
=
msvcp100.dll
TESTDLL
=
msvcp100.dll
APPMODE
=
-mno-cygwin
C_SRCS
=
\
C_SRCS
=
\
misc.c
\
misc.c
\
...
...
dlls/msvcp110/tests/Makefile.in
View file @
d4ef782d
TESTDLL
=
msvcp110.dll
TESTDLL
=
msvcp110.dll
APPMODE
=
-mno-cygwin
C_SRCS
=
\
C_SRCS
=
\
msvcp110.c
msvcp110.c
dlls/msvcp120/tests/Makefile.in
View file @
d4ef782d
TESTDLL
=
msvcp120.dll
TESTDLL
=
msvcp120.dll
APPMODE
=
-mno-cygwin
C_SRCS
=
\
C_SRCS
=
\
msvcp120.c
msvcp120.c
dlls/msvcp140/tests/Makefile.in
View file @
d4ef782d
TESTDLL
=
msvcp140.dll
TESTDLL
=
msvcp140.dll
APPMODE
=
-mno-cygwin
C_SRCS
=
\
C_SRCS
=
\
msvcp140.c
msvcp140.c
dlls/msvcp60/tests/Makefile.in
View file @
d4ef782d
TESTDLL
=
msvcp60.dll
TESTDLL
=
msvcp60.dll
APPMODE
=
-mno-cygwin
C_SRCS
=
\
C_SRCS
=
\
ios.c
\
ios.c
\
...
...
dlls/msvcp90/tests/Makefile.in
View file @
d4ef782d
TESTDLL
=
msvcp90.dll
TESTDLL
=
msvcp90.dll
APPMODE
=
-mno-cygwin
C_SRCS
=
\
C_SRCS
=
\
ios.c
\
ios.c
\
...
...
dlls/msvcr100/tests/Makefile.in
View file @
d4ef782d
TESTDLL
=
msvcr100.dll
TESTDLL
=
msvcr100.dll
APPMODE
=
-mno-cygwin
C_SRCS
=
\
C_SRCS
=
\
msvcr100.c
msvcr100.c
dlls/msvcr110/tests/Makefile.in
View file @
d4ef782d
TESTDLL
=
msvcr110.dll
TESTDLL
=
msvcr110.dll
APPMODE
=
-mno-cygwin
C_SRCS
=
\
C_SRCS
=
\
msvcr110.c
msvcr110.c
dlls/msvcr120/tests/Makefile.in
View file @
d4ef782d
TESTDLL
=
msvcr120.dll
TESTDLL
=
msvcr120.dll
APPMODE
=
-mno-cygwin
C_SRCS
=
\
C_SRCS
=
\
msvcr120.c
msvcr120.c
dlls/msvcr90/tests/Makefile.in
View file @
d4ef782d
TESTDLL
=
msvcr90.dll
TESTDLL
=
msvcr90.dll
APPMODE
=
-mno-cygwin
C_SRCS
=
\
C_SRCS
=
\
msvcr90.c
msvcr90.c
...
...
dlls/msvcrt/tests/Makefile.in
View file @
d4ef782d
TESTDLL
=
msvcrt.dll
TESTDLL
=
msvcrt.dll
APPMODE
=
-mno-cygwin
EXTRAINCL
=
-I
$(srcdir)
/..
EXTRAINCL
=
-I
$(srcdir)
/..
IMPORTS
=
advapi32
IMPORTS
=
advapi32
...
...
dlls/msvcrtd/tests/Makefile.in
View file @
d4ef782d
TESTDLL
=
msvcrtd.dll
TESTDLL
=
msvcrtd.dll
APPMODE
=
-mno-cygwin
C_SRCS
=
\
C_SRCS
=
\
debug.c
debug.c
dlls/shell32/tests/shlexec.c
View file @
d4ef782d
...
@@ -117,15 +117,15 @@ static char* decodeA(const char* str)
...
@@ -117,15 +117,15 @@ static char* decodeA(const char* str)
return
ptr
;
return
ptr
;
}
}
static
void
WINETEST_PRINTF_ATTR
(
2
,
3
)
childPrintf
(
HANDLE
h
,
const
char
*
fmt
,
...)
static
void
WIN
APIV
WIN
ETEST_PRINTF_ATTR
(
2
,
3
)
childPrintf
(
HANDLE
h
,
const
char
*
fmt
,
...)
{
{
va_list
valist
;
__ms_va_list
valist
;
char
buffer
[
1024
];
char
buffer
[
1024
];
DWORD
w
;
DWORD
w
;
va_start
(
valist
,
fmt
);
__ms_
va_start
(
valist
,
fmt
);
vsprintf
(
buffer
,
fmt
,
valist
);
vsprintf
(
buffer
,
fmt
,
valist
);
va_end
(
valist
);
__ms_
va_end
(
valist
);
WriteFile
(
h
,
buffer
,
strlen
(
buffer
),
&
w
,
NULL
);
WriteFile
(
h
,
buffer
,
strlen
(
buffer
),
&
w
,
NULL
);
}
}
...
@@ -351,16 +351,16 @@ static void dump_child_(const char* file, int line)
...
@@ -351,16 +351,16 @@ static void dump_child_(const char* file, int line)
***/
***/
static
char
shell_call
[
2048
];
static
char
shell_call
[
2048
];
static
void
WINETEST_PRINTF_ATTR
(
2
,
3
)
_okShell
(
int
condition
,
const
char
*
msg
,
...)
static
void
WIN
APIV
WIN
ETEST_PRINTF_ATTR
(
2
,
3
)
_okShell
(
int
condition
,
const
char
*
msg
,
...)
{
{
va_list
valist
;
__ms_
va_list
valist
;
char
buffer
[
2048
];
char
buffer
[
2048
];
strcpy
(
buffer
,
shell_call
);
strcpy
(
buffer
,
shell_call
);
strcat
(
buffer
,
" "
);
strcat
(
buffer
,
" "
);
va_start
(
valist
,
msg
);
__ms_
va_start
(
valist
,
msg
);
vsprintf
(
buffer
+
strlen
(
buffer
),
msg
,
valist
);
vsprintf
(
buffer
+
strlen
(
buffer
),
msg
,
valist
);
va_end
(
valist
);
__ms_
va_end
(
valist
);
winetest_ok
(
condition
,
"%s"
,
buffer
);
winetest_ok
(
condition
,
"%s"
,
buffer
);
}
}
#define okShell_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : _okShell
#define okShell_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : _okShell
...
...
dlls/ucrtbase/tests/Makefile.in
View file @
d4ef782d
TESTDLL
=
ucrtbase.dll
TESTDLL
=
ucrtbase.dll
APPMODE
=
-mno-cygwin
C_SRCS
=
\
C_SRCS
=
\
cpp.c
\
cpp.c
\
...
...
programs/services/tests/service.c
View file @
d4ef782d
...
@@ -56,14 +56,14 @@ static inline void service_event(const char *event)
...
@@ -56,14 +56,14 @@ static inline void service_event(const char *event)
send_msg
(
"EVENT"
,
event
);
send_msg
(
"EVENT"
,
event
);
}
}
static
void
service_ok
(
int
cnd
,
const
char
*
msg
,
...)
static
void
WINAPIV
service_ok
(
int
cnd
,
const
char
*
msg
,
...)
{
{
va_list
valist
;
__ms_
va_list
valist
;
char
buf
[
512
];
char
buf
[
512
];
va_start
(
valist
,
msg
);
__ms_
va_start
(
valist
,
msg
);
vsprintf
(
buf
,
msg
,
valist
);
vsprintf
(
buf
,
msg
,
valist
);
va_end
(
valist
);
__ms_
va_end
(
valist
);
send_msg
(
cnd
?
"OK"
:
"FAIL"
,
buf
);
send_msg
(
cnd
?
"OK"
:
"FAIL"
,
buf
);
}
}
...
...
tools/makedep.c
View file @
d4ef782d
...
@@ -4029,6 +4029,7 @@ static void load_sources( struct makefile *make )
...
@@ -4029,6 +4029,7 @@ static void load_sources( struct makefile *make )
make
->
extra_targets
=
get_expanded_make_var_array
(
make
,
"EXTRA_TARGETS"
);
make
->
extra_targets
=
get_expanded_make_var_array
(
make
,
"EXTRA_TARGETS"
);
if
(
make
->
module
&&
strendswith
(
make
->
module
,
".a"
))
make
->
staticlib
=
make
->
module
;
if
(
make
->
module
&&
strendswith
(
make
->
module
,
".a"
))
make
->
staticlib
=
make
->
module
;
if
(
make
->
testdll
)
strarray_add
(
&
make
->
extradllflags
,
"-mno-cygwin"
);
strarray_addall
(
&
make
->
extradllflags
,
get_expanded_make_var_array
(
make
,
"APPMODE"
));
strarray_addall
(
&
make
->
extradllflags
,
get_expanded_make_var_array
(
make
,
"APPMODE"
));
make
->
disabled
=
make
->
base_dir
&&
strarray_exists
(
&
disabled_dirs
,
make
->
base_dir
);
make
->
disabled
=
make
->
base_dir
&&
strarray_exists
(
&
disabled_dirs
,
make
->
base_dir
);
...
...
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