Piotr Caban : msvcp110: Add placeholder::_Ph* exports.
Alexandre Julliard
julliard at winehq.org
Mon May 8 17:21:22 CDT 2017
Module: wine
Branch: master
Commit: f95c26ab697c9538a3fefb6a39821846526036a9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f95c26ab697c9538a3fefb6a39821846526036a9
Author: Piotr Caban <piotr at codeweavers.com>
Date: Fri May 5 22:25:15 2017 +0200
msvcp110: Add placeholder::_Ph* exports.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcp110/msvcp110.spec | 40 ++++++++++++++++++-------------------
dlls/msvcp120/msvcp120.spec | 40 ++++++++++++++++++-------------------
dlls/msvcp120_app/msvcp120_app.spec | 40 ++++++++++++++++++-------------------
dlls/msvcp90/misc.c | 13 ++++++++++++
4 files changed, 73 insertions(+), 60 deletions(-)
diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec
index 52524c5..17e8531 100644
--- a/dlls/msvcp110/msvcp110.spec
+++ b/dlls/msvcp110/msvcp110.spec
@@ -1077,26 +1077,26 @@
@ stub -arch=win64 ?NFS_Free at details@Concurrency@@YAXPEAX at Z
@ stub -arch=win32 ?NFS_GetLineSize at details@Concurrency@@YAIXZ
@ stub -arch=win64 ?NFS_GetLineSize at details@Concurrency@@YA_KXZ
-# extern ?_10 at placeholders@std@@3V?$_Ph@$09 at 2@A
-# extern ?_11 at placeholders@std@@3V?$_Ph@$0L@@2 at A
-# extern ?_12 at placeholders@std@@3V?$_Ph@$0M@@2 at A
-# extern ?_13 at placeholders@std@@3V?$_Ph@$0N@@2 at A
-# extern ?_14 at placeholders@std@@3V?$_Ph@$0O@@2 at A
-# extern ?_15 at placeholders@std@@3V?$_Ph@$0P@@2 at A
-# extern ?_16 at placeholders@std@@3V?$_Ph@$0BA@@2 at A
-# extern ?_17 at placeholders@std@@3V?$_Ph@$0BB@@2 at A
-# extern ?_18 at placeholders@std@@3V?$_Ph@$0BC@@2 at A
-# extern ?_19 at placeholders@std@@3V?$_Ph@$0BD@@2 at A
-# extern ?_1 at placeholders@std@@3V?$_Ph@$00 at 2@A
-# extern ?_20 at placeholders@std@@3V?$_Ph@$0BE@@2 at A
-# extern ?_2 at placeholders@std@@3V?$_Ph@$01 at 2@A
-# extern ?_3 at placeholders@std@@3V?$_Ph@$02 at 2@A
-# extern ?_4 at placeholders@std@@3V?$_Ph@$03 at 2@A
-# extern ?_5 at placeholders@std@@3V?$_Ph@$04 at 2@A
-# extern ?_6 at placeholders@std@@3V?$_Ph@$05 at 2@A
-# extern ?_7 at placeholders@std@@3V?$_Ph@$06 at 2@A
-# extern ?_8 at placeholders@std@@3V?$_Ph@$07 at 2@A
-# extern ?_9 at placeholders@std@@3V?$_Ph@$08 at 2@A
+@ extern ?_10 at placeholders@std@@3V?$_Ph@$09 at 2@A _Ph_10
+@ extern ?_11 at placeholders@std@@3V?$_Ph@$0L@@2 at A _Ph_11
+@ extern ?_12 at placeholders@std@@3V?$_Ph@$0M@@2 at A _Ph_12
+@ extern ?_13 at placeholders@std@@3V?$_Ph@$0N@@2 at A _Ph_13
+@ extern ?_14 at placeholders@std@@3V?$_Ph@$0O@@2 at A _Ph_14
+@ extern ?_15 at placeholders@std@@3V?$_Ph@$0P@@2 at A _Ph_15
+@ extern ?_16 at placeholders@std@@3V?$_Ph@$0BA@@2 at A _Ph_16
+@ extern ?_17 at placeholders@std@@3V?$_Ph@$0BB@@2 at A _Ph_17
+@ extern ?_18 at placeholders@std@@3V?$_Ph@$0BC@@2 at A _Ph_18
+@ extern ?_19 at placeholders@std@@3V?$_Ph@$0BD@@2 at A _Ph_19
+@ extern ?_1 at placeholders@std@@3V?$_Ph@$00 at 2@A _Ph_1
+@ extern ?_20 at placeholders@std@@3V?$_Ph@$0BE@@2 at A _Ph_20
+@ extern ?_2 at placeholders@std@@3V?$_Ph@$01 at 2@A _Ph_2
+@ extern ?_3 at placeholders@std@@3V?$_Ph@$02 at 2@A _Ph_3
+@ extern ?_4 at placeholders@std@@3V?$_Ph@$03 at 2@A _Ph_4
+@ extern ?_5 at placeholders@std@@3V?$_Ph@$04 at 2@A _Ph_5
+@ extern ?_6 at placeholders@std@@3V?$_Ph@$05 at 2@A _Ph_6
+@ extern ?_7 at placeholders@std@@3V?$_Ph@$06 at 2@A _Ph_7
+@ extern ?_8 at placeholders@std@@3V?$_Ph@$07 at 2@A _Ph_8
+@ extern ?_9 at placeholders@std@@3V?$_Ph@$08 at 2@A _Ph_9
@ stub -arch=arm ?_Add_vtordisp1@?$basic_ios at DU?$char_traits at D@std@@@std@@UAAXXZ
@ stub -arch=i386 ?_Add_vtordisp1@?$basic_ios at DU?$char_traits at D@std@@@std@@UAEXXZ
@ stub -arch=win64 ?_Add_vtordisp1@?$basic_ios at DU?$char_traits at D@std@@@std@@UEAAXXZ
diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec
index 173728a..0146719 100644
--- a/dlls/msvcp120/msvcp120.spec
+++ b/dlls/msvcp120/msvcp120.spec
@@ -1078,26 +1078,26 @@
@ stub -arch=win64 ?NFS_Free at details@Concurrency@@YAXPEAX at Z
@ stub -arch=win32 ?NFS_GetLineSize at details@Concurrency@@YAIXZ
@ stub -arch=win64 ?NFS_GetLineSize at details@Concurrency@@YA_KXZ
-# extern ?_10 at placeholders@std@@3V?$_Ph@$09 at 2@A
-# extern ?_11 at placeholders@std@@3V?$_Ph@$0L@@2 at A
-# extern ?_12 at placeholders@std@@3V?$_Ph@$0M@@2 at A
-# extern ?_13 at placeholders@std@@3V?$_Ph@$0N@@2 at A
-# extern ?_14 at placeholders@std@@3V?$_Ph@$0O@@2 at A
-# extern ?_15 at placeholders@std@@3V?$_Ph@$0P@@2 at A
-# extern ?_16 at placeholders@std@@3V?$_Ph@$0BA@@2 at A
-# extern ?_17 at placeholders@std@@3V?$_Ph@$0BB@@2 at A
-# extern ?_18 at placeholders@std@@3V?$_Ph@$0BC@@2 at A
-# extern ?_19 at placeholders@std@@3V?$_Ph@$0BD@@2 at A
-# extern ?_1 at placeholders@std@@3V?$_Ph@$00 at 2@A
-# extern ?_20 at placeholders@std@@3V?$_Ph@$0BE@@2 at A
-# extern ?_2 at placeholders@std@@3V?$_Ph@$01 at 2@A
-# extern ?_3 at placeholders@std@@3V?$_Ph@$02 at 2@A
-# extern ?_4 at placeholders@std@@3V?$_Ph@$03 at 2@A
-# extern ?_5 at placeholders@std@@3V?$_Ph@$04 at 2@A
-# extern ?_6 at placeholders@std@@3V?$_Ph@$05 at 2@A
-# extern ?_7 at placeholders@std@@3V?$_Ph@$06 at 2@A
-# extern ?_8 at placeholders@std@@3V?$_Ph@$07 at 2@A
-# extern ?_9 at placeholders@std@@3V?$_Ph@$08 at 2@A
+@ extern ?_10 at placeholders@std@@3V?$_Ph@$09 at 2@A _Ph_10
+@ extern ?_11 at placeholders@std@@3V?$_Ph@$0L@@2 at A _Ph_11
+@ extern ?_12 at placeholders@std@@3V?$_Ph@$0M@@2 at A _Ph_12
+@ extern ?_13 at placeholders@std@@3V?$_Ph@$0N@@2 at A _Ph_13
+@ extern ?_14 at placeholders@std@@3V?$_Ph@$0O@@2 at A _Ph_14
+@ extern ?_15 at placeholders@std@@3V?$_Ph@$0P@@2 at A _Ph_15
+@ extern ?_16 at placeholders@std@@3V?$_Ph@$0BA@@2 at A _Ph_16
+@ extern ?_17 at placeholders@std@@3V?$_Ph@$0BB@@2 at A _Ph_17
+@ extern ?_18 at placeholders@std@@3V?$_Ph@$0BC@@2 at A _Ph_18
+@ extern ?_19 at placeholders@std@@3V?$_Ph@$0BD@@2 at A _Ph_19
+@ extern ?_1 at placeholders@std@@3V?$_Ph@$00 at 2@A _Ph_1
+@ extern ?_20 at placeholders@std@@3V?$_Ph@$0BE@@2 at A _Ph_20
+@ extern ?_2 at placeholders@std@@3V?$_Ph@$01 at 2@A _Ph_2
+@ extern ?_3 at placeholders@std@@3V?$_Ph@$02 at 2@A _Ph_3
+@ extern ?_4 at placeholders@std@@3V?$_Ph@$03 at 2@A _Ph_4
+@ extern ?_5 at placeholders@std@@3V?$_Ph@$04 at 2@A _Ph_5
+@ extern ?_6 at placeholders@std@@3V?$_Ph@$05 at 2@A _Ph_6
+@ extern ?_7 at placeholders@std@@3V?$_Ph@$06 at 2@A _Ph_7
+@ extern ?_8 at placeholders@std@@3V?$_Ph@$07 at 2@A _Ph_8
+@ extern ?_9 at placeholders@std@@3V?$_Ph@$08 at 2@A _Ph_9
@ cdecl -arch=arm ?_Addcats at _Locinfo@std@@QAAAAV12 at HPBD@Z(ptr long str) _Locinfo__Addcats
@ thiscall -arch=i386 ?_Addcats at _Locinfo@std@@QAEAAV12 at HPBD@Z(ptr long str) _Locinfo__Addcats
@ cdecl -arch=win64 ?_Addcats at _Locinfo@std@@QEAAAEAV12 at HPEBD@Z(ptr long str) _Locinfo__Addcats
diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec
index 8a03b41..70fa429 100644
--- a/dlls/msvcp120_app/msvcp120_app.spec
+++ b/dlls/msvcp120_app/msvcp120_app.spec
@@ -1078,26 +1078,26 @@
@ stub -arch=win64 ?NFS_Free at details@Concurrency@@YAXPEAX at Z
@ stub -arch=win32 ?NFS_GetLineSize at details@Concurrency@@YAIXZ
@ stub -arch=win64 ?NFS_GetLineSize at details@Concurrency@@YA_KXZ
-# extern ?_10 at placeholders@std@@3V?$_Ph@$09 at 2@A
-# extern ?_11 at placeholders@std@@3V?$_Ph@$0L@@2 at A
-# extern ?_12 at placeholders@std@@3V?$_Ph@$0M@@2 at A
-# extern ?_13 at placeholders@std@@3V?$_Ph@$0N@@2 at A
-# extern ?_14 at placeholders@std@@3V?$_Ph@$0O@@2 at A
-# extern ?_15 at placeholders@std@@3V?$_Ph@$0P@@2 at A
-# extern ?_16 at placeholders@std@@3V?$_Ph@$0BA@@2 at A
-# extern ?_17 at placeholders@std@@3V?$_Ph@$0BB@@2 at A
-# extern ?_18 at placeholders@std@@3V?$_Ph@$0BC@@2 at A
-# extern ?_19 at placeholders@std@@3V?$_Ph@$0BD@@2 at A
-# extern ?_1 at placeholders@std@@3V?$_Ph@$00 at 2@A
-# extern ?_20 at placeholders@std@@3V?$_Ph@$0BE@@2 at A
-# extern ?_2 at placeholders@std@@3V?$_Ph@$01 at 2@A
-# extern ?_3 at placeholders@std@@3V?$_Ph@$02 at 2@A
-# extern ?_4 at placeholders@std@@3V?$_Ph@$03 at 2@A
-# extern ?_5 at placeholders@std@@3V?$_Ph@$04 at 2@A
-# extern ?_6 at placeholders@std@@3V?$_Ph@$05 at 2@A
-# extern ?_7 at placeholders@std@@3V?$_Ph@$06 at 2@A
-# extern ?_8 at placeholders@std@@3V?$_Ph@$07 at 2@A
-# extern ?_9 at placeholders@std@@3V?$_Ph@$08 at 2@A
+@ extern ?_10 at placeholders@std@@3V?$_Ph@$09 at 2@A msvcp120.?_10 at placeholders@std@@3V?$_Ph@$09 at 2@A
+@ extern ?_11 at placeholders@std@@3V?$_Ph@$0L@@2 at A msvcp120.?_11 at placeholders@std@@3V?$_Ph@$0L@@2 at A
+@ extern ?_12 at placeholders@std@@3V?$_Ph@$0M@@2 at A msvcp120.?_12 at placeholders@std@@3V?$_Ph@$0M@@2 at A
+@ extern ?_13 at placeholders@std@@3V?$_Ph@$0N@@2 at A msvcp120.?_13 at placeholders@std@@3V?$_Ph@$0N@@2 at A
+@ extern ?_14 at placeholders@std@@3V?$_Ph@$0O@@2 at A msvcp120.?_14 at placeholders@std@@3V?$_Ph@$0O@@2 at A
+@ extern ?_15 at placeholders@std@@3V?$_Ph@$0P@@2 at A msvcp120.?_15 at placeholders@std@@3V?$_Ph@$0P@@2 at A
+@ extern ?_16 at placeholders@std@@3V?$_Ph@$0BA@@2 at A msvcp120.?_16 at placeholders@std@@3V?$_Ph@$0BA@@2 at A
+@ extern ?_17 at placeholders@std@@3V?$_Ph@$0BB@@2 at A msvcp120.?_17 at placeholders@std@@3V?$_Ph@$0BB@@2 at A
+@ extern ?_18 at placeholders@std@@3V?$_Ph@$0BC@@2 at A msvcp120.?_18 at placeholders@std@@3V?$_Ph@$0BC@@2 at A
+@ extern ?_19 at placeholders@std@@3V?$_Ph@$0BD@@2 at A msvcp120.?_19 at placeholders@std@@3V?$_Ph@$0BD@@2 at A
+@ extern ?_1 at placeholders@std@@3V?$_Ph@$00 at 2@A msvcp120.?_1 at placeholders@std@@3V?$_Ph@$00 at 2@A
+@ extern ?_20 at placeholders@std@@3V?$_Ph@$0BE@@2 at A msvcp120.?_20 at placeholders@std@@3V?$_Ph@$0BE@@2 at A
+@ extern ?_2 at placeholders@std@@3V?$_Ph@$01 at 2@A msvcp120.?_2 at placeholders@std@@3V?$_Ph@$01 at 2@A
+@ extern ?_3 at placeholders@std@@3V?$_Ph@$02 at 2@A msvcp120.?_3 at placeholders@std@@3V?$_Ph@$02 at 2@A
+@ extern ?_4 at placeholders@std@@3V?$_Ph@$03 at 2@A msvcp120.?_4 at placeholders@std@@3V?$_Ph@$03 at 2@A
+@ extern ?_5 at placeholders@std@@3V?$_Ph@$04 at 2@A msvcp120.?_5 at placeholders@std@@3V?$_Ph@$04 at 2@A
+@ extern ?_6 at placeholders@std@@3V?$_Ph@$05 at 2@A msvcp120.?_6 at placeholders@std@@3V?$_Ph@$05 at 2@A
+@ extern ?_7 at placeholders@std@@3V?$_Ph@$06 at 2@A msvcp120.?_7 at placeholders@std@@3V?$_Ph@$06 at 2@A
+@ extern ?_8 at placeholders@std@@3V?$_Ph@$07 at 2@A msvcp120.?_8 at placeholders@std@@3V?$_Ph@$07 at 2@A
+@ extern ?_9 at placeholders@std@@3V?$_Ph@$08 at 2@A msvcp120.?_9 at placeholders@std@@3V?$_Ph@$08 at 2@A
@ cdecl -arch=arm ?_Addcats at _Locinfo@std@@QAAAAV12 at HPBD@Z(ptr long str) msvcp120.?_Addcats at _Locinfo@std@@QAAAAV12 at HPBD@Z
@ thiscall -arch=i386 ?_Addcats at _Locinfo@std@@QAEAAV12 at HPBD@Z(ptr long str) msvcp120.?_Addcats at _Locinfo@std@@QAEAAV12 at HPBD@Z
@ cdecl -arch=win64 ?_Addcats at _Locinfo@std@@QEAAAEAV12 at HPEBD@Z(ptr long str) msvcp120.?_Addcats at _Locinfo@std@@QEAAAEAV12 at HPEBD@Z
diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c
index 828c4c2..28d1af3 100644
--- a/dlls/msvcp90/misc.c
+++ b/dlls/msvcp90/misc.c
@@ -1632,3 +1632,16 @@ void __cdecl _Release_chore(_Threadpool_chore *chore)
chore->work = NULL;
}
#endif
+
+#if _MSVCP_VER >= 110 && _MSVCP_VER <= 120
+typedef struct {
+ char dummy;
+} _Ph;
+
+/* ?_1 at placeholders@std@@3V?$_Ph@$00 at 2@A */
+/* ?_20 at placeholders@std@@3V?$_Ph@$0BE@@2 at A */
+_Ph _Ph_1 = {0}, _Ph_2 = {0}, _Ph_3 = {0}, _Ph_4 = {0}, _Ph_5 = {0};
+_Ph _Ph_6 = {0}, _Ph_7 = {0}, _Ph_8 = {0}, _Ph_9 = {0}, _Ph_10 = {0};
+_Ph _Ph_11 = {0}, _Ph_12 = {0}, _Ph_13 = {0}, _Ph_14 = {0}, _Ph_15 = {0};
+_Ph _Ph_16 = {0}, _Ph_17 = {0}, _Ph_18 = {0}, _Ph_19 = {0}, _Ph_20 = {0};
+#endif
More information about the wine-cvs
mailing list