Use WINAPIV for variadic functions.

Should fix https://bugs.winehq.org/show_bug.cgi?id=44099
This commit is contained in:
Zebediah Figura 2018-04-16 18:27:37 -05:00
parent de87a73aac
commit 3e2b8a53bb
3 changed files with 16 additions and 16 deletions

View File

@ -1,4 +1,4 @@
From 05b8bc95cff5742cf02b67afa3d6fc875d26e041 Mon Sep 17 00:00:00 2001
From 0616176a3276be4ae49dc86c7d96b11240afca78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 6 Aug 2017 03:15:34 +0200
Subject: [PATCH] programs/runas: Basic implementation for starting processes
@ -17,10 +17,10 @@ Subject: [PATCH] programs/runas: Basic implementation for starting processes
create mode 100644 programs/runas/runas.rc
diff --git a/configure.ac b/configure.ac
index cfc2080..5c97c1c 100644
index b9ef668..404ab7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3847,6 +3847,7 @@ WINE_CONFIG_MAKEFILE(programs/regedit/tests)
@@ -3879,6 +3879,7 @@ WINE_CONFIG_MAKEFILE(programs/regedit/tests)
WINE_CONFIG_MAKEFILE(programs/regsvcs)
WINE_CONFIG_MAKEFILE(programs/regsvr32)
WINE_CONFIG_MAKEFILE(programs/rpcss)
@ -44,7 +44,7 @@ index 0000000..be9434b
+RC_SRCS = runas.rc
diff --git a/programs/runas/runas.c b/programs/runas/runas.c
new file mode 100644
index 0000000..cfd1c73
index 0000000..8e96aff
--- /dev/null
+++ b/programs/runas/runas.c
@@ -0,0 +1,214 @@
@ -125,7 +125,7 @@ index 0000000..cfd1c73
+ LocalFree(str);
+}
+
+static void __cdecl output_message(unsigned int id, ...)
+static void WINAPIV output_message(unsigned int id, ...)
+{
+ WCHAR fmt[1024];
+ __ms_va_list va_args;
@ -340,5 +340,5 @@ index 0000000..f9297a4
+ %2!u!: %3\n"
+}
--
1.9.1
2.7.4

View File

@ -1,4 +1,4 @@
From 1cb4681d22018a93485336d10b73b3a6a05a34a0 Mon Sep 17 00:00:00 2001
From e78ec7f2036c1bdf46d4ecc7db1574847ca7f54f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 1 Apr 2016 01:29:51 +0200
Subject: [PATCH] fsutil: Add fsutil program with support for creating hard
@ -67,7 +67,7 @@ index 0000000..593f817
+ STRING_HARDLINK_CREATE_USAGE, "Syntax: fsutil hardlink create old new\n\n"
+}
diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c
index 2bce87e..41370b5 100644
index 2bce87e..5084196 100644
--- a/programs/fsutil/main.c
+++ b/programs/fsutil/main.c
@@ -1,5 +1,6 @@
@ -129,7 +129,7 @@ index 2bce87e..41370b5 100644
+ return 0;
+}
+
+static int __cdecl output_string(int msg, ...)
+static int WINAPIV output_string(int msg, ...)
+{
+ WCHAR fmt[8192];
+ __ms_va_list arguments;

View File

@ -1,4 +1,4 @@
From 187eb1628d5f74e40e1d37c1924d54c655d6efd0 Mon Sep 17 00:00:00 2001
From 457588a8b59ec77c1078692176e8eea160f8a5d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 8 May 2017 23:01:28 +0200
Subject: aclui: Add basic ACE viewer.
@ -15,7 +15,7 @@ Subject: aclui: Add basic ACE viewer.
create mode 100644 dlls/aclui/user_icons.bmp
diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/Makefile.in
index f5b401cbc2c..9d6d0cf39c8 100644
index f5b401c..9d6d0cf 100644
--- a/dlls/aclui/Makefile.in
+++ b/dlls/aclui/Makefile.in
@@ -1,4 +1,7 @@
@ -28,7 +28,7 @@ index f5b401cbc2c..9d6d0cf39c8 100644
+RC_SRCS = aclui.rc
diff --git a/dlls/aclui/aclui.rc b/dlls/aclui/aclui.rc
new file mode 100644
index 00000000000..08f8b567314
index 0000000..08f8b56
--- /dev/null
+++ b/dlls/aclui/aclui.rc
@@ -0,0 +1,58 @@
@ -91,7 +91,7 @@ index 00000000000..08f8b567314
+/* @makedep: user_icons.bmp */
+IDB_USER_ICONS BITMAP user_icons.bmp
diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c
index 808f1f09eec..1539ae0d467 100644
index 808f1f0..12e4374 100644
--- a/dlls/aclui/aclui_main.c
+++ b/dlls/aclui/aclui_main.c
@@ -22,17 +22,53 @@
@ -160,7 +160,7 @@ index 808f1f09eec..1539ae0d467 100644
}
-HPROPSHEETPAGE WINAPI CreateSecurityPage(LPSECURITYINFO psi)
+static WCHAR* CDECL load_formatstr(UINT resource, ...)
+static WCHAR* WINAPIV load_formatstr(UINT resource, ...)
+{
+ __ms_va_list valist;
+ WCHAR *str, fmtstr[256];
@ -644,7 +644,7 @@ index 808f1f09eec..1539ae0d467 100644
+}
diff --git a/dlls/aclui/resource.h b/dlls/aclui/resource.h
new file mode 100644
index 00000000000..ba3eb8160ab
index 0000000..ba3eb81
--- /dev/null
+++ b/dlls/aclui/resource.h
@@ -0,0 +1,38 @@
@ -722,5 +722,5 @@ literal 0
HcmV?d00001
--
2.12.2
2.7.4