From f8350fc15b8bebdd1f8af84ccbbba7d63618b5aa Mon Sep 17 00:00:00 2001
From: Piotr Caban <piotr@codeweavers.com>
Date: Fri, 14 Sep 2012 12:44:29 +0200
Subject: [PATCH] msvcp90: Remove unused thiscall functions.

---
 dlls/msvcp90/exception.c | 24 ++++++++----------------
 dlls/msvcp90/locale.c    | 20 --------------------
 2 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c
index 6aa3c0d6119..d6841409a2a 100644
--- a/dlls/msvcp90/exception.c
+++ b/dlls/msvcp90/exception.c
@@ -98,8 +98,7 @@ void * __thiscall MSVCP_type_info_vector_dtor(type_info * _this, unsigned int fl
 
 DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" );
 
-DEFINE_THISCALL_WRAPPER(MSVCP_exception_ctor, 8)
-exception* __thiscall MSVCP_exception_ctor(exception *this, const char **name)
+static exception* MSVCP_exception_ctor(exception *this, const char **name)
 {
     TRACE("(%p %s)\n", this, *name);
 
@@ -189,8 +188,7 @@ static const cxx_exception_type exception_cxx_type = {
 /* bad_alloc class data */
 typedef exception bad_alloc;
 
-DEFINE_THISCALL_WRAPPER(MSVCP_bad_alloc_ctor, 8)
-bad_alloc* __thiscall MSVCP_bad_alloc_ctor(bad_alloc *this, const char **name)
+static bad_alloc* MSVCP_bad_alloc_ctor(bad_alloc *this, const char **name)
 {
     TRACE("%p %s\n", this, *name);
     MSVCP_exception_ctor(this, name);
@@ -273,8 +271,7 @@ typedef struct _logic_error {
     basic_string_char str;
 } logic_error;
 
-DEFINE_THISCALL_WRAPPER(MSVCP_logic_error_ctor, 8)
-logic_error* __thiscall MSVCP_logic_error_ctor(
+static logic_error* MSVCP_logic_error_ctor(
         logic_error *this, const char **name)
 {
     TRACE("%p %s\n", this, *name);
@@ -361,8 +358,7 @@ static const cxx_exception_type logic_error_cxx_type = {
 /* length_error class data */
 typedef logic_error length_error;
 
-DEFINE_THISCALL_WRAPPER(MSVCP_length_error_ctor, 8)
-length_error* __thiscall MSVCP_length_error_ctor(
+static length_error* MSVCP_length_error_ctor(
         length_error *this, const char **name)
 {
     TRACE("%p %s\n", this, *name);
@@ -410,8 +406,7 @@ static const cxx_exception_type length_error_cxx_type = {
 /* out_of_range class data */
 typedef logic_error out_of_range;
 
-DEFINE_THISCALL_WRAPPER(MSVCP_out_of_range_ctor, 8)
-out_of_range* __thiscall MSVCP_out_of_range_ctor(
+static out_of_range* MSVCP_out_of_range_ctor(
         out_of_range *this, const char **name)
 {
     TRACE("%p %s\n", this, *name);
@@ -459,8 +454,7 @@ static const cxx_exception_type out_of_range_cxx_type = {
 /* invalid_argument class data */
 typedef logic_error invalid_argument;
 
-DEFINE_THISCALL_WRAPPER(MSVCP_invalid_argument_ctor, 8)
-invalid_argument* __thiscall MSVCP_invalid_argument_ctor(
+static invalid_argument* MSVCP_invalid_argument_ctor(
         invalid_argument *this, const char **name)
 {
     TRACE("%p %s\n", this, *name);
@@ -511,8 +505,7 @@ typedef struct {
     basic_string_char str;
 } runtime_error;
 
-DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_ctor, 8)
-runtime_error* __thiscall MSVCP_runtime_error_ctor(
+static runtime_error* MSVCP_runtime_error_ctor(
         runtime_error *this, const char **name)
 {
     TRACE("%p %s\n", this, *name);
@@ -599,8 +592,7 @@ static const cxx_exception_type runtime_error_cxx_type = {
 /* failure class data */
 typedef runtime_error failure;
 
-DEFINE_THISCALL_WRAPPER(MSVCP_failure_ctor, 8)
-failure* __thiscall MSVCP_failure_ctor(
+static failure* MSVCP_failure_ctor(
         failure *this, const char **name)
 {
     TRACE("%p %s\n", this, *name);
diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c
index 5cca3e009e9..a2b37a74da9 100644
--- a/dlls/msvcp90/locale.c
+++ b/dlls/msvcp90/locale.c
@@ -8356,26 +8356,6 @@ void __thiscall locale_dtor(locale *this)
         locale__Locimp_dtor(this->ptr);
 }
 
-DEFINE_THISCALL_WRAPPER(locale_vector_dtor, 8)
-locale* __thiscall locale_vector_dtor(locale *this, unsigned int flags)
-{
-    TRACE("(%p %x)\n", this, flags);
-    if(flags & 2) {
-        /* we have an array, with the number of elements stored before the first object */
-        INT_PTR i, *ptr = (INT_PTR *)this-1;
-
-        for(i=*ptr-1; i>=0; i--)
-            locale_dtor(this+i);
-        MSVCRT_operator_delete(ptr);
-    } else {
-        locale_dtor(this);
-        if(flags & 1)
-            MSVCRT_operator_delete(this);
-    }
-
-    return this;
-}
-
 /* ??4locale@std@@QAEAAV01@ABV01@@Z */
 /* ??4locale@std@@QEAAAEAV01@AEBV01@@Z */
 DEFINE_THISCALL_WRAPPER(locale_operator_assign, 8)