[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit 7ae375641f837e6692acbed1d0819ed36e10dace
Author: Thomas Faber <thfabba at gmx.de>
Date:   Wed Mar 7 09:23:50 2012 +0100

    msvcp60: Fix build with MSVC.
    (cherry picked from commit 44feaf9bd8dd6402d3f5aabd12a0c0634e3714a7)

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 */

-- 
Debian Wine packaging