Module: wine Branch: master Commit: 200cb7d3ac19fb1b1105228e1508471691c5d3d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=200cb7d3ac19fb1b1105228e15...
Author: Piotr Caban piotr@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@id@locale@std@@0HA */ int locale_id__Id_cnt = 0;
-static locale__Locimp *global_locale; static locale classic_locale;
+/* ?_Global@_Locimp@locale@std@@0PAV123@A */ +/* ?_Global@_Locimp@locale@std@@0PEAV123@EA */ +locale__Locimp *global_locale = NULL; + /* ?_Clocptr@_Locimp@locale@std@@0PAV123@A */ /* ?_Clocptr@_Locimp@locale@std@@0PEAV123@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@_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Gettrue @ stub -arch=win32 ?_Getyes@_Locinfo@std@@QBEPBDXZ @ stub -arch=win64 ?_Getyes@_Locinfo@std@@QEBAPEBDXZ -# extern -arch=win32 ?_Global@_Locimp@locale@std@@0PAV123@A -# extern -arch=win64 ?_Global@_Locimp@locale@std@@0PEAV123@EA +@ extern -arch=win32 ?_Global@_Locimp@locale@std@@0PAV123@A global_locale +@ extern -arch=win64 ?_Global@_Locimp@locale@std@@0PEAV123@EA global_locale @ thiscall -arch=win32 ?_Gndec@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IAEPADXZ(ptr) basic_streambuf_char__Gndec @ cdecl -arch=win64 ?_Gndec@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IEAAPEADXZ(ptr) basic_streambuf_char__Gndec @ thiscall -arch=win32 ?_Gndec@?$basic_streambuf@GU?$char_traits@G@std@@@std@@IAEPAGXZ(ptr) basic_streambuf_wchar__Gndec