Piotr Caban : msvcp: Make it possible to shrink allocated memory in basic_string::reserve.

Alexandre Julliard julliard at winehq.org
Tue Sep 24 03:22:01 CDT 2013


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

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Sat Sep 21 13:02:14 2013 +0200

msvcp: Make it possible to shrink allocated memory in basic_string::reserve.

---

 dlls/msvcp71/string.c |    8 ++++----
 dlls/msvcp90/string.c |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/msvcp71/string.c b/dlls/msvcp71/string.c
index 415e514..534d7e7 100644
--- a/dlls/msvcp71/string.c
+++ b/dlls/msvcp71/string.c
@@ -883,8 +883,8 @@ void __thiscall MSVCP_basic_string_char_reserve(basic_string_char *this, MSVCP_s
     if(len > size)
         return;
 
-    basic_string_char_grow(this, size, FALSE);
-    basic_string_char_eos(this, len);
+    if(basic_string_char_grow(this, size, TRUE))
+        basic_string_char_eos(this, len);
 }
 
 /* ??0?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QAE at XZ */
@@ -2618,8 +2618,8 @@ void __thiscall MSVCP_basic_string_wchar_reserve(basic_string_wchar *this, MSVCP
     if(len > size)
         return;
 
-    basic_string_wchar_grow(this, size, FALSE);
-    basic_string_wchar_eos(this, len);
+    if(basic_string_wchar_grow(this, size, TRUE))
+        basic_string_wchar_eos(this, len);
 }
 
 /* ??0?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@QAE at XZ */
diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c
index a0359a1..0772ade 100644
--- a/dlls/msvcp90/string.c
+++ b/dlls/msvcp90/string.c
@@ -915,8 +915,8 @@ void __thiscall MSVCP_basic_string_char_reserve(basic_string_char *this, MSVCP_s
     if(len > size)
         return;
 
-    basic_string_char_grow(this, size, FALSE);
-    basic_string_char_eos(this, len);
+    if(basic_string_char_grow(this, size, TRUE))
+        basic_string_char_eos(this, len);
 }
 
 /* ??0?$basic_string at DU?$char_traits at D@std@@V?$allocator at D@2@@std@@QAE at XZ */
@@ -2770,8 +2770,8 @@ void __thiscall MSVCP_basic_string_wchar_reserve(basic_string_wchar *this, MSVCP
     if(len > size)
         return;
 
-    basic_string_wchar_grow(this, size, FALSE);
-    basic_string_wchar_eos(this, len);
+    if(basic_string_wchar_grow(this, size, TRUE))
+        basic_string_wchar_eos(this, len);
 }
 
 /* ??0?$basic_string at _WU?$char_traits at _W@std@@V?$allocator at _W@2@@std@@QAE at XZ */




More information about the wine-cvs mailing list