Alexandre Julliard : msvcp: Export a couple of variables and their access function.
Alexandre Julliard
julliard at winehq.org
Wed May 4 13:47:40 CDT 2011
Module: wine
Branch: master
Commit: 5b58de9648884f93e7f06c3ad3cfc8ba50d4d598
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b58de9648884f93e7f06c3ad3cfc8ba50d4d598
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed May 4 13:48:21 2011 +0200
msvcp: Export a couple of variables and their access function.
---
dlls/msvcp100/msvcp100.c | 3 +++
dlls/msvcp100/msvcp100.spec | 2 +-
dlls/msvcp70/msvcp70.spec | 6 +++---
dlls/msvcp71/msvcp71.spec | 6 +++---
dlls/msvcp80/msvcp80.spec | 14 +++++++-------
dlls/msvcp90/msvcp90.spec | 14 +++++++-------
dlls/msvcp90/msvcp90_main.c | 21 +++++++++++++++++++++
7 files changed, 45 insertions(+), 21 deletions(-)
diff --git a/dlls/msvcp100/msvcp100.c b/dlls/msvcp100/msvcp100.c
index 98087a7..ed44b72 100644
--- a/dlls/msvcp100/msvcp100.c
+++ b/dlls/msvcp100/msvcp100.c
@@ -23,6 +23,9 @@
#include "windef.h"
#include "winbase.h"
+/* ?_BADOFF at std@@3_JB -> __int64 const std::_BADOFF */
+const __int64 std_BADOFF = -1;
+
BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved)
{
switch (reason)
diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec
index e37e831..c3d1a8d 100644
--- a/dlls/msvcp100/msvcp100.spec
+++ b/dlls/msvcp100/msvcp100.spec
@@ -767,7 +767,7 @@
@ stub -arch=win32 ?_Assign at _Concurrent_queue_iterator_base_v4@details at Concurrency@@IAEXABV123@@Z
@ stub -arch=win64 ?_Assign at _Concurrent_queue_iterator_base_v4@details at Concurrency@@IEAAXAEBV123@@Z
@ stub ?_Atexit@@YAXP6AXXZ at Z
-# extern -arch=win64 ?_BADOFF at std@@3_JB
+@ extern ?_BADOFF at std@@3_JB std_BADOFF
@ stub -arch=win32 ?_C_str@?$_Yarn at D@std@@QBEPBDXZ
@ stub -arch=win64 ?_C_str@?$_Yarn at D@std@@QEBAPEBDXZ
@ stub -arch=win32 ?_Callfns at ios_base@std@@AAEXW4event at 12@@Z
diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec
index 4484167..dedfb31 100644
--- a/dlls/msvcp70/msvcp70.spec
+++ b/dlls/msvcp70/msvcp70.spec
@@ -1753,8 +1753,8 @@
@ stub -arch=win64 ?_Addfac at locale@std@@QEAAAEAV12 at PEAVfacet@12 at _K1@Z
@ stub -arch=win32 ?_Addstd at ios_base@std@@QAEXXZ
@ stub -arch=win64 ?_Addstd at ios_base@std@@QEAAXXZ
-# extern -arch=win32 ?_BADOFF at std@@3JB
-# extern -arch=win64 ?_BADOFF at std@@3_JB
+@ extern -arch=win32 ?_BADOFF at std@@3JB msvcp90.?_BADOFF at std@@3JB
+@ extern -arch=win64 ?_BADOFF at std@@3_JB msvcp90.?_BADOFF at std@@3_JB
@ stub -arch=win32 ?_Callfns at ios_base@std@@AAEXW4event at 12@@Z
@ stub -arch=win64 ?_Callfns at ios_base@std@@AEAAXW4event at 12@@Z
@ stub -arch=win32 ?_Charalloc@?$allocator at D@std@@QAEPADI at Z
@@ -1814,7 +1814,7 @@
@ stub -arch=win32 ?_Fput@?$num_put at DV?$ostreambuf_iterator at DU?$char_traits at D@std@@@std@@@std@@KA?AV?$ostreambuf_iterator at DU?$char_traits at D@std@@@2 at V32@AAVios_base at 2@DPBDIIII at Z
@ stub -arch=win32 ?_Fput@?$num_put at GV?$ostreambuf_iterator at GU?$char_traits at G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator at GU?$char_traits at G@std@@@2 at V32@AAVios_base at 2@GPBDIIII at Z
@ stub -arch=win32 ?_Fput@?$num_put at _WV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@KA?AV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@2 at V32@AAVios_base at 2@_WPBDIIII at Z
-# extern ?_Fpz at std@@3_JA
+@ extern ?_Fpz at std@@3_JA msvcp90.?_Fpz at std@@3_JA
@ stub -arch=win32 ?_Getcat@?$codecvt at DDH@std@@SAIPAPBVfacet at locale@2@@Z
@ stub -arch=win64 ?_Getcat@?$codecvt at DDH@std@@SA_KPEAPEBVfacet at locale@2@@Z
@ stub -arch=win32 ?_Getcat@?$codecvt at GDH@std@@SAIPAPBVfacet at locale@2@@Z
diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec
index ca453fb..12330af 100644
--- a/dlls/msvcp71/msvcp71.spec
+++ b/dlls/msvcp71/msvcp71.spec
@@ -1941,8 +1941,8 @@
@ stub -arch=win64 ?_Addfac at locale@std@@QEAAAEAV12 at PEAVfacet@12 at _K1@Z
@ stub -arch=win32 ?_Addstd at ios_base@std@@QAEXXZ
@ stub -arch=win64 ?_Addstd at ios_base@std@@QEAAXXZ
-# extern -arch=win32 ?_BADOFF at std@@3JB
-# extern -arch=win64 ?_BADOFF at std@@3_JB
+@ extern -arch=win32 ?_BADOFF at std@@3JB msvcp90.?_BADOFF at std@@3JB
+@ extern -arch=win64 ?_BADOFF at std@@3_JB msvcp90.?_BADOFF at std@@3_JB
@ stub -arch=win32 ?_Callfns at ios_base@std@@AAEXW4event at 12@@Z
@ stub -arch=win64 ?_Callfns at ios_base@std@@AEAAXW4event at 12@@Z
# extern -arch=win32 ?_Clocptr at _Locimp@locale at std@@0PAV123 at A
@@ -2000,7 +2000,7 @@
@ stub -arch=win64 ?_Fput@?$num_put at GV?$ostreambuf_iterator at GU?$char_traits at G@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator at GU?$char_traits at G@std@@@2 at V32@AEAVios_base at 2@GPEBD_K333 at Z
@ stub -arch=win32 ?_Fput@?$num_put at _WV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@2 at V32@AAVios_base at 2@_WPBDIIII at Z
@ stub -arch=win64 ?_Fput@?$num_put at _WV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@2 at V32@AEAVios_base at 2@_WPEBD_K444 at Z
-# extern ?_Fpz at std@@3_JA
+@ extern ?_Fpz at std@@3_JA msvcp90.?_Fpz at std@@3_JA
@ stub -arch=win32 ?_Getcat@?$codecvt at DDH@std@@SAIPAPBVfacet at locale@2@@Z
@ stub -arch=win64 ?_Getcat@?$codecvt at DDH@std@@SA_KPEAPEBVfacet at locale@2@@Z
@ stub -arch=win32 ?_Getcat@?$codecvt at GDH@std@@SAIPAPBVfacet at locale@2@@Z
diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec
index ff1d633..399dd99 100644
--- a/dlls/msvcp80/msvcp80.spec
+++ b/dlls/msvcp80/msvcp80.spec
@@ -2103,10 +2103,10 @@
@ stub -arch=win32 ?_Addstd at ios_base@std@@SAXPAV12@@Z
@ stub -arch=win64 ?_Addstd at ios_base@std@@SAXPEAV12@@Z
@ stub ?_Atexit@@YAXP6AXXZ at Z
-# extern -arch=win32 ?_BADOFF at std@@3JB
-# extern -arch=win64 ?_BADOFF at std@@3_JB
-@ stub -arch=win32 ?_BADOFF_func at std@@YAABJXZ
-@ stub -arch=win64 ?_BADOFF_func at std@@YAAEB_JXZ
+@ extern -arch=win32 ?_BADOFF at std@@3JB msvcp90.?_BADOFF at std@@3JB
+@ extern -arch=win64 ?_BADOFF at std@@3_JB msvcp90.?_BADOFF at std@@3_JB
+@ cdecl -arch=win32 ?_BADOFF_func at std@@YAABJXZ() msvcp90.?_BADOFF_func at std@@YAABJXZ
+@ cdecl -arch=win64 ?_BADOFF_func at std@@YAAEB_JXZ() msvcp90.?_BADOFF_func at std@@YAAEB_JXZ
@ stub -arch=win32 ?_Callfns at ios_base@std@@AAEXW4event at 12@@Z
@ stub -arch=win64 ?_Callfns at ios_base@std@@AEAAXW4event at 12@@Z
@ stub -arch=win32 ?_Cerr_func at std@@YAAAV?$basic_ostream at DU?$char_traits at D@std@@@1 at XZ
@@ -2215,9 +2215,9 @@
@ stub -arch=win64 ?_Fput@?$num_put at GV?$ostreambuf_iterator at GU?$char_traits at G@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator at GU?$char_traits at G@std@@@2 at V32@AEAVios_base at 2@GPEBD_K333 at Z
@ stub -arch=win32 ?_Fput@?$num_put at _WV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@2 at V32@AAVios_base at 2@_WPBDIIII at Z
@ stub -arch=win64 ?_Fput@?$num_put at _WV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@2 at V32@AEAVios_base at 2@_WPEBD_K444 at Z
-# extern ?_Fpz at std@@3_JA
-@ stub -arch=win32 ?_Fpz_func at std@@YAAA_JXZ
-@ stub -arch=win64 ?_Fpz_func at std@@YAAEA_JXZ
+@ extern ?_Fpz at std@@3_JA msvcp90.?_Fpz at std@@3_JA
+@ cdecl -arch=win32 ?_Fpz_func at std@@YAAA_JXZ() msvcp90.?_Fpz_func at std@@YAAA_JXZ
+@ cdecl -arch=win64 ?_Fpz_func at std@@YAAEA_JXZ() msvcp90.?_Fpz_func at std@@YAAEA_JXZ
@ stub -arch=win32 ?_Getcat@?$codecvt at DDH@std@@SAIPAPBVfacet at locale@2@@Z
@ stub -arch=win64 ?_Getcat@?$codecvt at DDH@std@@SA_KPEAPEBVfacet at locale@2@@Z
@ stub -arch=win32 ?_Getcat@?$codecvt at GDH@std@@SAIPAPBVfacet at locale@2@@Z
diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec
index 2857a82..9e5cf0c 100644
--- a/dlls/msvcp90/msvcp90.spec
+++ b/dlls/msvcp90/msvcp90.spec
@@ -2106,10 +2106,10 @@
@ stub -arch=win32 ?_Addstd at ios_base@std@@SAXPAV12@@Z
@ stub -arch=win64 ?_Addstd at ios_base@std@@SAXPEAV12@@Z
@ stub ?_Atexit@@YAXP6AXXZ at Z
-# extern -arch=win32 ?_BADOFF at std@@3JB
-# extern -arch=win64 ?_BADOFF at std@@3_JB
-@ stub -arch=win32 ?_BADOFF_func at std@@YAABJXZ
-@ stub -arch=win64 ?_BADOFF_func at std@@YAAEB_JXZ
+@ extern -arch=win32 ?_BADOFF at std@@3JB std_BADOFF
+@ extern -arch=win64 ?_BADOFF at std@@3_JB std_BADOFF
+@ cdecl -arch=win32 ?_BADOFF_func at std@@YAABJXZ() std_BADOFF_func
+@ cdecl -arch=win64 ?_BADOFF_func at std@@YAAEB_JXZ() std_BADOFF_func
@ stub -arch=win32 ?_Callfns at ios_base@std@@AAEXW4event at 12@@Z
@ stub -arch=win64 ?_Callfns at ios_base@std@@AEAAXW4event at 12@@Z
@ stub -arch=win32 ?_Cerr_func at std@@YAAAV?$basic_ostream at DU?$char_traits at D@std@@@1 at XZ
@@ -2218,9 +2218,9 @@
@ stub -arch=win64 ?_Fput@?$num_put at GV?$ostreambuf_iterator at GU?$char_traits at G@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator at GU?$char_traits at G@std@@@2 at V32@AEAVios_base at 2@GPEBD_K333 at Z
@ stub -arch=win32 ?_Fput@?$num_put at _WV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@2 at V32@AAVios_base at 2@_WPBDIIII at Z
@ stub -arch=win64 ?_Fput@?$num_put at _WV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator at _WU?$char_traits at _W@std@@@2 at V32@AEAVios_base at 2@_WPEBD_K444 at Z
-# extern ?_Fpz at std@@3_JA
-@ stub -arch=win32 ?_Fpz_func at std@@YAAA_JXZ
-@ stub -arch=win64 ?_Fpz_func at std@@YAAEA_JXZ
+@ extern ?_Fpz at std@@3_JA std_Fpz
+@ cdecl -arch=win32 ?_Fpz_func at std@@YAAA_JXZ() std_Fpz_func
+@ cdecl -arch=win64 ?_Fpz_func at std@@YAAEA_JXZ() std_Fpz_func
@ stub -arch=win32 ?_Getcat@?$codecvt at DDH@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z
@ stub -arch=win64 ?_Getcat@?$codecvt at DDH@std@@SA_KPEAPEBVfacet at locale@2 at PEBV42@@Z
@ stub -arch=win32 ?_Getcat@?$codecvt at GDH@std@@SAIPAPBVfacet at locale@2 at PBV42@@Z
diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c
index 9ce763c..75c807e 100644
--- a/dlls/msvcp90/msvcp90_main.c
+++ b/dlls/msvcp90/msvcp90_main.c
@@ -64,3 +64,24 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
return TRUE;
}
+
+/* ?_BADOFF at std@@3JB -> long const std::_BADOFF */
+/* ?_BADOFF at std@@3_JB -> __int64 const std::_BADOFF */
+const INT_PTR std_BADOFF = -1;
+
+/* ?_BADOFF_func at std@@YAABJXZ -> long const & __cdecl std::_BADOFF_func(void) */
+/* ?_BADOFF_func at std@@YAAEB_JXZ -> __int64 const & __ptr64 __cdecl std::_BADOFF_func(void) */
+const INT_PTR * __cdecl std_BADOFF_func(void)
+{
+ return &std_BADOFF;
+}
+
+/* ?_Fpz at std@@3_JA __int64 std::_Fpz */
+__int64 std_Fpz = 0;
+
+/* ?_Fpz_func at std@@YAAA_JXZ -> __int64 & __cdecl std::_Fpz_func(void) */
+/* ?_Fpz_func at std@@YAAEA_JXZ -> __int64 & __ptr64 __cdecl std::_Fpz_func(void) */
+__int64 * __cdecl std_Fpz_func(void)
+{
+ return &std_Fpz;
+}
More information about the wine-cvs
mailing list