[PATCH 1/2] comctl32/button: Use messages to get control text

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov 
---
 dlls/comctl32/button.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c
index 2f5a5b3f17..dccddf9f52 100644
--- a/dlls/comctl32/button.c
+++ b/dlls/comctl32/button.c
@@ -223,9 +223,10 @@ static inline void paint_button( HWND hwnd, LONG style, UINT action )
 /* retrieve the button text; returned buffer must be freed by caller */
 static inline WCHAR *get_button_text( HWND hwnd )
 {
-    static const INT len = 512;
+    INT len = GetWindowTextLengthW( hwnd );
     WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) );
-    if (buffer) InternalGetWindowText( hwnd, buffer, len + 1 );
+    if (buffer)
+        GetWindowTextW( hwnd, buffer, len + 1 );
     return buffer;
 }

[PATCH 2/2] comctl32/button: Use the global memory allocation helpers

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov 
---
 dlls/comctl32/button.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c
index dccddf9f52..7184d19374 100644
--- a/dlls/comctl32/button.c
+++ b/dlls/comctl32/button.c
@@ -67,6 +67,7 @@
 #include "uxtheme.h"
 #include "vssym32.h"
 #include "wine/debug.h"
+#include "wine/heap.h"

#include "comctl32.h"

@@ -224,7 +225,7 @@ static inline void paint_button( HWND hwnd, LONG style, UINT action )
 static inline WCHAR *get_button_text( HWND hwnd )
 {
     INT len = GetWindowTextLengthW( hwnd );
-    WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) );
+    WCHAR *buffer = heap_alloc( (len + 1) * sizeof(WCHAR) );
     if (buffer)
         GetWindowTextW( hwnd, buffer, len + 1 );
     return buffer;
@@ -732,14 +733,14 @@ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc)
           if (!(text = get_button_text( hwnd ))) goto empty_rect;
           if (!text[0])
           {
-              HeapFree( GetProcessHeap(), 0, text );
+              heap_free( text );
               goto empty_rect;
           }

if ((hFont = get_button_font( hwnd ))) hPrevFont = SelectObject( hdc, hFont );
           DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT);
           if (hPrevFont) SelectObject( hdc, hPrevFont );
-          HeapFree( GetProcessHeap(), 0, text );
+          heap_free( text );
           break;
       }

@@ -873,7 +874,7 @@ static void BUTTON_DrawLabel(HWND hwnd, HDC hdc, UINT dtFlags, const RECT *rc)

DrawStateW(hdc, hbr, lpOutputProc, lp, wp, rc->left, rc->top,
               rc->right - rc->left, rc->bottom - rc->top, flags);
-   HeapFree( GetProcessHeap(), 0, text );
+   heap_free( text );
 }

/**********************************************************************
@@ -1278,7 +1279,7 @@ static void PB_ThemedPaint(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawSta
     if (text)
     {
         DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &textRect);
-        HeapFree(GetProcessHeap(), 0, text);
+        heap_free(text);
     }

if (focused)
@@ -1378,7 +1379,7 @@ static void CB_ThemedPaint(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawSta
             DrawFocusRect( hDC, &focusRect );
         }

-        HeapFree(GetProcessHeap(), 0, text);
+        heap_free(text);
     }

if (created_font) DeleteObject(font);
@@ -1438,7 +1439,7 @@ static void GB_ThemedPaint(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawSta
     {
         InflateRect(&textRect, -2, 0);
         DrawThemeText(theme, hDC, BP_GROUPBOX, state, text, lstrlenW(text), 0, 0, &textRect);
-        HeapFree(GetProcessHeap(), 0, text);
+        heap_free(text);
     }

if (created_font) DeleteObject(font);