Thomas Faber : msvcp60: Fix build with MSVC.

Alexandre Julliard julliard at winehq.org
Fri Mar 9 12:34:18 CST 2012


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

Author: Thomas Faber <thfabba at gmx.de>
Date:   Wed Mar  7 09:23:50 2012 +0100

msvcp60: Fix build with MSVC.

---

 dlls/msvcp60/memory.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/msvcp60/memory.c b/dlls/msvcp60/memory.c
index 6f6a77a..4407cfe 100644
--- a/dlls/msvcp60/memory.c
+++ b/dlls/msvcp60/memory.c
@@ -80,7 +80,7 @@ void __thiscall MSVCP_allocator_char_deallocate(void *this, char *ptr, MSVCP_siz
 DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate, 8)
 char* __thiscall MSVCP_allocator_char_allocate(void *this, MSVCP_size_t count)
 {
-    return MSVCRT_operator_new(sizeof(char[count]));
+    return MSVCRT_operator_new(count);
 }
 
 /* ?allocate@?$allocator at D@std@@QAEPADIPBX at Z */
@@ -177,7 +177,7 @@ wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void *this, MSVCP_size_t coun
         return NULL;
     }
 
-    return MSVCRT_operator_new(sizeof(wchar_t[count]));
+    return MSVCRT_operator_new(count * sizeof(wchar_t));
 }
 
 /* ?allocate@?$allocator at _W@std@@QAEPA_WIPBX at Z */
@@ -276,7 +276,7 @@ unsigned short* __thiscall MSVCP_allocator_short_allocate(
         return NULL;
     }
 
-    return MSVCRT_operator_new(sizeof(unsigned short[count]));
+    return MSVCRT_operator_new(count * sizeof(unsigned short));
 }
 
 /* ?allocate@?$allocator at G@std@@QAEPAGIPBX at Z */




More information about the wine-cvs mailing list