From 5b58de9648884f93e7f06c3ad3cfc8ba50d4d598 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Wed, 4 May 2011 13:48:21 +0200
Subject: [PATCH] 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 98087a7029e..ed44b72192b 100644
--- a/dlls/msvcp100/msvcp100.c
+++ b/dlls/msvcp100/msvcp100.c
@@ -23,6 +23,9 @@
 #include "windef.h"
 #include "winbase.h"
 
+/* ?_BADOFF@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 e37e8312e9d..c3d1a8d92c5 100644
--- a/dlls/msvcp100/msvcp100.spec
+++ b/dlls/msvcp100/msvcp100.spec
@@ -767,7 +767,7 @@
 @ stub -arch=win32 ?_Assign@_Concurrent_queue_iterator_base_v4@details@Concurrency@@IAEXABV123@@Z
 @ stub -arch=win64 ?_Assign@_Concurrent_queue_iterator_base_v4@details@Concurrency@@IEAAXAEBV123@@Z
 @ stub ?_Atexit@@YAXP6AXXZ@Z
-# extern -arch=win64 ?_BADOFF@std@@3_JB
+@ extern ?_BADOFF@std@@3_JB std_BADOFF
 @ stub -arch=win32 ?_C_str@?$_Yarn@D@std@@QBEPBDXZ
 @ stub -arch=win64 ?_C_str@?$_Yarn@D@std@@QEBAPEBDXZ
 @ stub -arch=win32 ?_Callfns@ios_base@std@@AAEXW4event@12@@Z
diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec
index 44841677725..dedfb31c621 100644
--- a/dlls/msvcp70/msvcp70.spec
+++ b/dlls/msvcp70/msvcp70.spec
@@ -1753,8 +1753,8 @@
 @ stub -arch=win64 ?_Addfac@locale@std@@QEAAAEAV12@PEAVfacet@12@_K1@Z
 @ stub -arch=win32 ?_Addstd@ios_base@std@@QAEXXZ
 @ stub -arch=win64 ?_Addstd@ios_base@std@@QEAAXXZ
-# extern -arch=win32 ?_BADOFF@std@@3JB
-# extern -arch=win64 ?_BADOFF@std@@3_JB
+@ extern -arch=win32 ?_BADOFF@std@@3JB msvcp90.?_BADOFF@std@@3JB
+@ extern -arch=win64 ?_BADOFF@std@@3_JB msvcp90.?_BADOFF@std@@3_JB
 @ stub -arch=win32 ?_Callfns@ios_base@std@@AAEXW4event@12@@Z
 @ stub -arch=win64 ?_Callfns@ios_base@std@@AEAAXW4event@12@@Z
 @ stub -arch=win32 ?_Charalloc@?$allocator@D@std@@QAEPADI@Z
@@ -1814,7 +1814,7 @@
 @ stub -arch=win32 ?_Fput@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AAVios_base@2@DPBDIIII@Z
 @ stub -arch=win32 ?_Fput@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@AAVios_base@2@GPBDIIII@Z
 @ stub -arch=win32 ?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AAVios_base@2@_WPBDIIII@Z
-# extern ?_Fpz@std@@3_JA
+@ extern ?_Fpz@std@@3_JA msvcp90.?_Fpz@std@@3_JA
 @ stub -arch=win32 ?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@@Z
 @ stub -arch=win64 ?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@@Z
 @ stub -arch=win32 ?_Getcat@?$codecvt@GDH@std@@SAIPAPBVfacet@locale@2@@Z
diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec
index ca453fb4000..12330af5510 100644
--- a/dlls/msvcp71/msvcp71.spec
+++ b/dlls/msvcp71/msvcp71.spec
@@ -1941,8 +1941,8 @@
 @ stub -arch=win64 ?_Addfac@locale@std@@QEAAAEAV12@PEAVfacet@12@_K1@Z
 @ stub -arch=win32 ?_Addstd@ios_base@std@@QAEXXZ
 @ stub -arch=win64 ?_Addstd@ios_base@std@@QEAAXXZ
-# extern -arch=win32 ?_BADOFF@std@@3JB
-# extern -arch=win64 ?_BADOFF@std@@3_JB
+@ extern -arch=win32 ?_BADOFF@std@@3JB msvcp90.?_BADOFF@std@@3JB
+@ extern -arch=win64 ?_BADOFF@std@@3_JB msvcp90.?_BADOFF@std@@3_JB
 @ stub -arch=win32 ?_Callfns@ios_base@std@@AAEXW4event@12@@Z
 @ stub -arch=win64 ?_Callfns@ios_base@std@@AEAAXW4event@12@@Z
 # extern -arch=win32 ?_Clocptr@_Locimp@locale@std@@0PAV123@A
@@ -2000,7 +2000,7 @@
 @ stub -arch=win64 ?_Fput@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@AEAVios_base@2@GPEBD_K333@Z
 @ stub -arch=win32 ?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AAVios_base@2@_WPBDIIII@Z
 @ stub -arch=win64 ?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AEAVios_base@2@_WPEBD_K444@Z
-# extern ?_Fpz@std@@3_JA
+@ extern ?_Fpz@std@@3_JA msvcp90.?_Fpz@std@@3_JA
 @ stub -arch=win32 ?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@@Z
 @ stub -arch=win64 ?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@@Z
 @ stub -arch=win32 ?_Getcat@?$codecvt@GDH@std@@SAIPAPBVfacet@locale@2@@Z
diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec
index ff1d6338287..399dd999da7 100644
--- a/dlls/msvcp80/msvcp80.spec
+++ b/dlls/msvcp80/msvcp80.spec
@@ -2103,10 +2103,10 @@
 @ stub -arch=win32 ?_Addstd@ios_base@std@@SAXPAV12@@Z
 @ stub -arch=win64 ?_Addstd@ios_base@std@@SAXPEAV12@@Z
 @ stub ?_Atexit@@YAXP6AXXZ@Z
-# extern -arch=win32 ?_BADOFF@std@@3JB
-# extern -arch=win64 ?_BADOFF@std@@3_JB
-@ stub -arch=win32 ?_BADOFF_func@std@@YAABJXZ
-@ stub -arch=win64 ?_BADOFF_func@std@@YAAEB_JXZ
+@ extern -arch=win32 ?_BADOFF@std@@3JB msvcp90.?_BADOFF@std@@3JB
+@ extern -arch=win64 ?_BADOFF@std@@3_JB msvcp90.?_BADOFF@std@@3_JB
+@ cdecl -arch=win32 ?_BADOFF_func@std@@YAABJXZ() msvcp90.?_BADOFF_func@std@@YAABJXZ
+@ cdecl -arch=win64 ?_BADOFF_func@std@@YAAEB_JXZ() msvcp90.?_BADOFF_func@std@@YAAEB_JXZ
 @ stub -arch=win32 ?_Callfns@ios_base@std@@AAEXW4event@12@@Z
 @ stub -arch=win64 ?_Callfns@ios_base@std@@AEAAXW4event@12@@Z
 @ stub -arch=win32 ?_Cerr_func@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@1@XZ
@@ -2215,9 +2215,9 @@
 @ stub -arch=win64 ?_Fput@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@AEAVios_base@2@GPEBD_K333@Z
 @ stub -arch=win32 ?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AAVios_base@2@_WPBDIIII@Z
 @ stub -arch=win64 ?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AEAVios_base@2@_WPEBD_K444@Z
-# extern ?_Fpz@std@@3_JA
-@ stub -arch=win32 ?_Fpz_func@std@@YAAA_JXZ
-@ stub -arch=win64 ?_Fpz_func@std@@YAAEA_JXZ
+@ extern ?_Fpz@std@@3_JA msvcp90.?_Fpz@std@@3_JA
+@ cdecl -arch=win32 ?_Fpz_func@std@@YAAA_JXZ() msvcp90.?_Fpz_func@std@@YAAA_JXZ
+@ cdecl -arch=win64 ?_Fpz_func@std@@YAAEA_JXZ() msvcp90.?_Fpz_func@std@@YAAEA_JXZ
 @ stub -arch=win32 ?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@@Z
 @ stub -arch=win64 ?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@@Z
 @ stub -arch=win32 ?_Getcat@?$codecvt@GDH@std@@SAIPAPBVfacet@locale@2@@Z
diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec
index 2857a82b224..9e5cf0c58d8 100644
--- a/dlls/msvcp90/msvcp90.spec
+++ b/dlls/msvcp90/msvcp90.spec
@@ -2106,10 +2106,10 @@
 @ stub -arch=win32 ?_Addstd@ios_base@std@@SAXPAV12@@Z
 @ stub -arch=win64 ?_Addstd@ios_base@std@@SAXPEAV12@@Z
 @ stub ?_Atexit@@YAXP6AXXZ@Z
-# extern -arch=win32 ?_BADOFF@std@@3JB
-# extern -arch=win64 ?_BADOFF@std@@3_JB
-@ stub -arch=win32 ?_BADOFF_func@std@@YAABJXZ
-@ stub -arch=win64 ?_BADOFF_func@std@@YAAEB_JXZ
+@ extern -arch=win32 ?_BADOFF@std@@3JB std_BADOFF
+@ extern -arch=win64 ?_BADOFF@std@@3_JB std_BADOFF
+@ cdecl -arch=win32 ?_BADOFF_func@std@@YAABJXZ() std_BADOFF_func
+@ cdecl -arch=win64 ?_BADOFF_func@std@@YAAEB_JXZ() std_BADOFF_func
 @ stub -arch=win32 ?_Callfns@ios_base@std@@AAEXW4event@12@@Z
 @ stub -arch=win64 ?_Callfns@ios_base@std@@AEAAXW4event@12@@Z
 @ stub -arch=win32 ?_Cerr_func@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@1@XZ
@@ -2218,9 +2218,9 @@
 @ stub -arch=win64 ?_Fput@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@AEAVios_base@2@GPEBD_K333@Z
 @ stub -arch=win32 ?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AAVios_base@2@_WPBDIIII@Z
 @ stub -arch=win64 ?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AEAVios_base@2@_WPEBD_K444@Z
-# extern ?_Fpz@std@@3_JA
-@ stub -arch=win32 ?_Fpz_func@std@@YAAA_JXZ
-@ stub -arch=win64 ?_Fpz_func@std@@YAAEA_JXZ
+@ extern ?_Fpz@std@@3_JA std_Fpz
+@ cdecl -arch=win32 ?_Fpz_func@std@@YAAA_JXZ() std_Fpz_func
+@ cdecl -arch=win64 ?_Fpz_func@std@@YAAEA_JXZ() std_Fpz_func
 @ stub -arch=win32 ?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@PBV42@@Z
 @ stub -arch=win64 ?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z
 @ stub -arch=win32 ?_Getcat@?$codecvt@GDH@std@@SAIPAPBVfacet@locale@2@PBV42@@Z
diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c
index 9ce763ce084..75c807efe05 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@std@@3JB -> long const std::_BADOFF */
+/* ?_BADOFF@std@@3_JB -> __int64 const std::_BADOFF */
+const INT_PTR std_BADOFF = -1;
+
+/* ?_BADOFF_func@std@@YAABJXZ -> long const & __cdecl std::_BADOFF_func(void) */
+/* ?_BADOFF_func@std@@YAAEB_JXZ -> __int64 const & __ptr64 __cdecl std::_BADOFF_func(void) */
+const INT_PTR * __cdecl std_BADOFF_func(void)
+{
+    return &std_BADOFF;
+}
+
+/* ?_Fpz@std@@3_JA  __int64 std::_Fpz */
+__int64 std_Fpz = 0;
+
+/* ?_Fpz_func@std@@YAAA_JXZ -> __int64 & __cdecl std::_Fpz_func(void) */
+/* ?_Fpz_func@std@@YAAEA_JXZ -> __int64 & __ptr64 __cdecl std::_Fpz_func(void) */
+__int64 * __cdecl std_Fpz_func(void)
+{
+    return &std_Fpz;
+}