Piotr Caban : msvcp60: Added locale::_Locimp::_Global export.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 200cb7d3ac19fb1b1105228e1508471691c5d3d6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=200cb7d3ac19fb1b1105228e1508471691c5d3d6

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Tue Nov 27 21:11:47 2012 +0000

msvcp60: Added locale::_Locimp::_Global export.

---

 dlls/msvcp60/locale.c     |    5 ++++-
 dlls/msvcp60/msvcp60.spec |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c
index 9b71334..f225b4d 100644
--- a/dlls/msvcp60/locale.c
+++ b/dlls/msvcp60/locale.c
@@ -98,9 +98,12 @@ typedef struct {
 /* ?_Id_cnt at id@locale at std@@0HA */
 int locale_id__Id_cnt = 0;
 
-static locale__Locimp *global_locale;
 static locale classic_locale;
 
+/* ?_Global at _Locimp@locale at std@@0PAV123 at A */
+/* ?_Global at _Locimp@locale at std@@0PEAV123 at EA */
+locale__Locimp *global_locale = NULL;
+
 /* ?_Clocptr at _Locimp@locale at std@@0PAV123 at A */
 /* ?_Clocptr at _Locimp@locale at std@@0PEAV123 at EA */
 locale__Locimp *locale__Locimp__Clocptr = NULL;
diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec
index 27cae4b..121cf11 100644
--- a/dlls/msvcp60/msvcp60.spec
+++ b/dlls/msvcp60/msvcp60.spec
@@ -2184,8 +2184,8 @@
 @ cdecl -arch=win64 ?_Gettrue at _Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Gettrue
 @ stub -arch=win32 ?_Getyes at _Locinfo@std@@QBEPBDXZ
 @ stub -arch=win64 ?_Getyes at _Locinfo@std@@QEBAPEBDXZ
-# extern -arch=win32 ?_Global at _Locimp@locale at std@@0PAV123 at A
-# extern -arch=win64 ?_Global at _Locimp@locale at std@@0PEAV123 at EA
+@ extern -arch=win32 ?_Global at _Locimp@locale at std@@0PAV123 at A global_locale
+@ extern -arch=win64 ?_Global at _Locimp@locale at std@@0PEAV123 at EA global_locale
 @ thiscall -arch=win32 ?_Gndec@?$basic_streambuf at DU?$char_traits at D@std@@@std@@IAEPADXZ(ptr) basic_streambuf_char__Gndec
 @ cdecl -arch=win64 ?_Gndec@?$basic_streambuf at DU?$char_traits at D@std@@@std@@IEAAPEADXZ(ptr) basic_streambuf_char__Gndec
 @ thiscall -arch=win32 ?_Gndec@?$basic_streambuf at GU?$char_traits at G@std@@@std@@IAEPAGXZ(ptr) basic_streambuf_wchar__Gndec