msvcp60: Add MSVCP prefix on exported string functions.

dlls/msvcp60/exception.c

@@ -251,7 +251,7 @@ static logic_error* MSVCP_logic_error_ctor(
     this->e.vtable = &MSVCP_logic_error_vtable;
     this->e.name = NULL;
     this->e.do_free = FALSE;
-    basic_string_char_ctor_cstr(&this->str, name);
+    MSVCP_basic_string_char_ctor_cstr(&this->str, name);
     return this;
 }
 
@@ -263,7 +263,7 @@ logic_error* __thiscall MSVCP_logic_error_copy_ctor(
 {
     TRACE("%p %p\n", this, rhs);
     MSVCP_exception_copy_ctor(&this->e, &rhs->e);
-    basic_string_char_copy_ctor(&this->str, &rhs->str);
+    MSVCP_basic_string_char_copy_ctor(&this->str, &rhs->str);
     this->e.vtable = &MSVCP_logic_error_vtable;
     return this;
 }
@@ -274,7 +274,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_ctor_bstr, 8)
 logic_error* __thiscall MSVCP_logic_error_ctor_bstr(logic_error *this, const basic_string_char *str)
 {
     TRACE("(%p %p)\n", this, str);
-    return MSVCP_logic_error_ctor(this, basic_string_char_c_str(str));
+    return MSVCP_logic_error_ctor(this, MSVCP_basic_string_char_c_str(str));
 }
 
 /* ??1logic_error@std@@UAE@XZ */
@@ -290,7 +290,7 @@ void __thiscall MSVCP_logic_error_dtor(logic_error *this)
 {
     TRACE("%p\n", this);
     MSVCP_exception_dtor(&this->e);
-    basic_string_char_dtor(&this->str);
+    MSVCP_basic_string_char_dtor(&this->str);
 }
 
 DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_vector_dtor, 8)
@@ -329,7 +329,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_what, 4)
 const char* __thiscall MSVCP_logic_error_what(logic_error *this)
 {
     TRACE("%p\n", this);
-    return basic_string_char_c_str(&this->str);
+    return MSVCP_basic_string_char_c_str(&this->str);
 }
 
 DEFINE_RTTI_DATA1(logic_error, 0, &exception_rtti_base_descriptor, ".?AVlogic_error@std@@")
@@ -365,7 +365,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_length_error_ctor_bstr, 8)
 length_error* __thiscall MSVCP_length_error_ctor_bstr(length_error *this, const basic_string_char *str)
 {
         TRACE("(%p %p)\n", this, str);
-        return MSVCP_length_error_ctor(this, basic_string_char_c_str(str));
+        return MSVCP_length_error_ctor(this, MSVCP_basic_string_char_c_str(str));
 }
 
 /* ??4length_error@std@@QAEAAV01@ABV01@@Z */
@@ -410,7 +410,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_out_of_range_ctor_bstr, 8)
 out_of_range* __thiscall MSVCP_out_of_range_ctor_bstr(out_of_range *this, const basic_string_char *str)
 {
     TRACE("(%p %p)\n", this, str);
-    return MSVCP_out_of_range_ctor(this, basic_string_char_c_str(str));
+    return MSVCP_out_of_range_ctor(this, MSVCP_basic_string_char_c_str(str));
 }
 
 /* ??4out_of_range@std@@QAEAAV01@ABV01@@Z */
@@ -480,7 +480,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_ctor_bstr, 8)
 runtime_error* __thiscall MSVCP_runtime_error_ctor_bstr(runtime_error *this, const basic_string_char *str)
 {
     TRACE("(%p %p)\n", this, str);
-    return MSVCP_runtime_error_ctor(this, basic_string_char_c_str(str));
+    return MSVCP_runtime_error_ctor(this, MSVCP_basic_string_char_c_str(str));
 }
 
 DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_vector_dtor, 8)
@@ -509,7 +509,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_what, 4)
 const char* __thiscall MSVCP_runtime_error_what(runtime_error *this)
 {
     TRACE("%p\n", this);
-    return basic_string_char_c_str(&this->str);
+    return MSVCP_basic_string_char_c_str(&this->str);
 }
 
 /* failure class data */

dlls/msvcp60/msvcp.h

@@ -41,17 +41,17 @@ typedef struct
     MSVCP_size_t res;
 } basic_string_char;
 
-basic_string_char* __thiscall basic_string_char_ctor(basic_string_char*);
-basic_string_char* basic_string_char_ctor_cstr(basic_string_char*, const char*);
-basic_string_char* basic_string_char_ctor_cstr_len(basic_string_char*, const char*, MSVCP_size_t);
-basic_string_char* __thiscall basic_string_char_copy_ctor(basic_string_char*, const basic_string_char*);
-void __thiscall basic_string_char_dtor(basic_string_char*);
-const char* __thiscall basic_string_char_c_str(const basic_string_char*);
-void basic_string_char_clear(basic_string_char*);
-basic_string_char* __thiscall basic_string_char_append_ch(basic_string_char*, char);
-MSVCP_size_t __thiscall basic_string_char_length(const basic_string_char*);
-basic_string_char* __thiscall basic_string_char_append_len_ch(basic_string_char*, MSVCP_size_t, char);
-basic_string_char* __thiscall basic_string_char_assign(basic_string_char*, const basic_string_char*);
+basic_string_char* __thiscall MSVCP_basic_string_char_ctor(basic_string_char*);
+basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr(basic_string_char*, const char*);
+basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr_len(basic_string_char*, const char*, MSVCP_size_t);
+basic_string_char* __thiscall MSVCP_basic_string_char_copy_ctor(basic_string_char*, const basic_string_char*);
+void __thiscall MSVCP_basic_string_char_dtor(basic_string_char*);
+const char* __thiscall MSVCP_basic_string_char_c_str(const basic_string_char*);
+void __thiscall MSVCP_basic_string_char_clear(basic_string_char*);
+basic_string_char* __thiscall MSVCP_basic_string_char_append_ch(basic_string_char*, char);
+MSVCP_size_t __thiscall MSVCP_basic_string_char_length(const basic_string_char*);
+basic_string_char* __thiscall MSVCP_basic_string_char_append_len_ch(basic_string_char*, MSVCP_size_t, char);
+basic_string_char* __thiscall MSVCP_basic_string_char_assign(basic_string_char*, const basic_string_char*);
 
 typedef struct
 {
@@ -61,14 +61,14 @@ typedef struct
     MSVCP_size_t res;
 } basic_string_wchar;
 
-basic_string_wchar* __thiscall basic_string_wchar_ctor(basic_string_wchar*);
-basic_string_wchar* basic_string_wchar_ctor_cstr(basic_string_wchar*, const wchar_t*);
-basic_string_wchar* basic_string_wchar_ctor_cstr_len(basic_string_wchar*, const wchar_t*, MSVCP_size_t);
-void __thiscall basic_string_wchar_dtor(basic_string_wchar*);
-const wchar_t* __thiscall basic_string_wchar_c_str(const basic_string_wchar*);
-void basic_string_wchar_clear(basic_string_wchar*);
-basic_string_wchar* __thiscall basic_string_wchar_append_ch(basic_string_wchar*, wchar_t);
-MSVCP_size_t __thiscall basic_string_wchar_length(const basic_string_wchar*);
+basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor(basic_string_wchar*);
+basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr(basic_string_wchar*, const wchar_t*);
+basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr_len(basic_string_wchar*, const wchar_t*, MSVCP_size_t);
+void __thiscall MSVCP_basic_string_wchar_dtor(basic_string_wchar*);
+const wchar_t* __thiscall MSVCP_basic_string_wchar_c_str(const basic_string_wchar*);
+void __thiscall MSVCP_basic_string_wchar_clear(basic_string_wchar*);
+basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_ch(basic_string_wchar*, wchar_t);
+MSVCP_size_t __thiscall MSVCP_basic_string_wchar_length(const basic_string_wchar*);
 
 char* __thiscall MSVCP_allocator_char_allocate(void*, MSVCP_size_t);
 void __thiscall MSVCP_allocator_char_deallocate(void*, char*, MSVCP_size_t);