niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

makefiles: Build all tests with msvcrt.

Browse source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-04-24 12:10:19 +02:00
parent 629f2e10b1
commit d4ef782db7
22 changed files with 34 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dlls/advpack/tests/advpack.c
View file

@ -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)

8
dlls/kernel32/tests/debugger.c
View file

@ -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 WINAPIV WINETEST_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;
} }

8
dlls/kernel32/tests/process.c
View file

@ -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 WINAPIV WINETEST_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);
} }

8
dlls/msi/tests/custom.c
View file

@ -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);

8
dlls/msi/tests/db.c
View file

@ -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, ...)
"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__)

1
dlls/msvcirt/tests/Makefile.in
View file

@ -1,4 +1,3 @@
TESTDLL = msvcirt.dll TESTDLL = msvcirt.dll
APPMODE = -mno-cygwin
C_SRCS = msvcirt.c C_SRCS = msvcirt.c

1
dlls/msvcp100/tests/Makefile.in
View file

@ -1,5 +1,4 @@
TESTDLL = msvcp100.dll TESTDLL = msvcp100.dll
APPMODE = -mno-cygwin
C_SRCS = \ C_SRCS = \
misc.c \ misc.c \

1
dlls/msvcp110/tests/Makefile.in
View file

@ -1,5 +1,4 @@
TESTDLL = msvcp110.dll TESTDLL = msvcp110.dll
APPMODE = -mno-cygwin
C_SRCS = \ C_SRCS = \
msvcp110.c msvcp110.c

1
dlls/msvcp120/tests/Makefile.in
View file

@ -1,5 +1,4 @@
TESTDLL = msvcp120.dll TESTDLL = msvcp120.dll
APPMODE = -mno-cygwin
C_SRCS = \ C_SRCS = \
msvcp120.c msvcp120.c

1
dlls/msvcp140/tests/Makefile.in
View file

@ -1,5 +1,4 @@
TESTDLL = msvcp140.dll TESTDLL = msvcp140.dll
APPMODE = -mno-cygwin
C_SRCS = \ C_SRCS = \
msvcp140.c msvcp140.c

1
dlls/msvcp60/tests/Makefile.in
View file

@ -1,5 +1,4 @@
TESTDLL = msvcp60.dll TESTDLL = msvcp60.dll
APPMODE = -mno-cygwin
C_SRCS = \ C_SRCS = \
ios.c \ ios.c \

1
dlls/msvcp90/tests/Makefile.in
View file

@ -1,5 +1,4 @@
TESTDLL = msvcp90.dll TESTDLL = msvcp90.dll
APPMODE = -mno-cygwin
C_SRCS = \ C_SRCS = \
ios.c \ ios.c \

1
dlls/msvcr100/tests/Makefile.in
View file

@ -1,5 +1,4 @@
TESTDLL = msvcr100.dll TESTDLL = msvcr100.dll
APPMODE = -mno-cygwin
C_SRCS = \ C_SRCS = \
msvcr100.c msvcr100.c

1
dlls/msvcr110/tests/Makefile.in
View file

@ -1,5 +1,4 @@
TESTDLL = msvcr110.dll TESTDLL = msvcr110.dll
APPMODE = -mno-cygwin
C_SRCS = \ C_SRCS = \
msvcr110.c msvcr110.c

1
dlls/msvcr120/tests/Makefile.in
View file

@ -1,5 +1,4 @@
TESTDLL = msvcr120.dll TESTDLL = msvcr120.dll
APPMODE = -mno-cygwin
C_SRCS = \ C_SRCS = \
msvcr120.c msvcr120.c

1
dlls/msvcr90/tests/Makefile.in
View file

@ -1,5 +1,4 @@
TESTDLL = msvcr90.dll TESTDLL = msvcr90.dll
APPMODE = -mno-cygwin
C_SRCS = \ C_SRCS = \
msvcr90.c msvcr90.c

1
dlls/msvcrt/tests/Makefile.in
View file

@ -1,5 +1,4 @@
TESTDLL = msvcrt.dll TESTDLL = msvcrt.dll
APPMODE = -mno-cygwin
EXTRAINCL = -I$(srcdir)/.. EXTRAINCL = -I$(srcdir)/..
IMPORTS = advapi32 IMPORTS = advapi32

1
dlls/msvcrtd/tests/Makefile.in
View file

@ -1,5 +1,4 @@
TESTDLL = msvcrtd.dll TESTDLL = msvcrtd.dll
APPMODE = -mno-cygwin
C_SRCS = \ C_SRCS = \
debug.c debug.c

16
dlls/shell32/tests/shlexec.c
View file

@ -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 WINAPIV WINETEST_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)
***/ ***/
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 WINAPIV WINETEST_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

1
dlls/ucrtbase/tests/Makefile.in
View file

@ -1,5 +1,4 @@
TESTDLL = ucrtbase.dll TESTDLL = ucrtbase.dll
APPMODE = -mno-cygwin
C_SRCS = \ C_SRCS = \
cpp.c \ cpp.c \

10
programs/services/tests/service.c
View file

@ -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);
} }

1
tools/makedep.c
View file

@ -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 );