commit 193cf50a09d724995f273acea623404276e98ec4
author Alexandre Julliard <julliard@winehq.org> Tue Jan 01 00:24:30 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Jan 01 00:24:30 2002 +0000
tree 234cbaf8c19631aae63e5423c5d82673209f0578
parent 424a080c308c559782317ef57f8366625b648e97

Removed some of the calls to HEAP_strdup* functions.

windows/nonclient.c

diff --git a/windows/nonclient.c b/windows/nonclient.c
index ac89529..36bcc8f 100644
--- a/windows/nonclient.c
+++ b/windows/nonclient.c
@@ -11,7 +11,6 @@
 #include "version.h"
 #include "win.h"
 #include "user.h"
-#include "heap.h"
 #include "dce.h"
 #include "controls.h"
 #include "cursoricon.h"
@@ -259,22 +258,38 @@
 
 /***********************************************************************
  *		DrawCaptionTempA (USER32.@)
- *
- * PARAMS
- *
- * RETURNS
- *     Success:
- *     Failure:
  */
+BOOL WINAPI DrawCaptionTempA (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont,
+                              HICON hIcon, LPCSTR str, UINT uFlags)
+{
+    LPWSTR strW;
+    INT len;
+    BOOL ret = FALSE;
 
-BOOL WINAPI
-DrawCaptionTempA (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont,
-		    HICON hIcon, LPCSTR str, UINT uFlags)
+    if (!(uFlags & DC_TEXT) || !str)
+        return DrawCaptionTempW( hwnd, hdc, rect, hFont, hIcon, NULL, uFlags );
+
+    len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 );
+    if ((strW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) )))
+    {
+        MultiByteToWideChar( CP_ACP, 0, str, -1, strW, len );
+        ret = DrawCaptionTempW (hwnd, hdc, rect, hFont, hIcon, strW, uFlags);
+        HeapFree( GetProcessHeap (), 0, strW );
+    }
+    return ret;
+}
+
+
+/***********************************************************************
+ *		DrawCaptionTempW (USER32.@)
+ */
+BOOL WINAPI DrawCaptionTempW (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont,
+                              HICON hIcon, LPCWSTR str, UINT uFlags)
 {
     RECT   rc = *rect;
 
-    TRACE("(%08x,%08x,%p,%08x,%08x,\"%s\",%08x)\n",
-          hwnd, hdc, rect, hFont, hIcon, str, uFlags);
+    TRACE("(%08x,%08x,%p,%08x,%08x,%s,%08x)\n",
+          hwnd, hdc, rect, hFont, hIcon, debugstr_w(str), uFlags);
 
     /* drawing background */
     if (uFlags & DC_INBUTTON) {
@@ -332,13 +347,13 @@
 	}
 
 	if (str)
-	    DrawTextA (hdc, str, -1, &rc,
+	    DrawTextW (hdc, str, -1, &rc,
 			 DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_LEFT);
 	else {
-	    CHAR szText[128];
+	    WCHAR szText[128];
 	    INT nLen;
-	    nLen = GetWindowTextA (hwnd, szText, 128);
-	    DrawTextA (hdc, szText, nLen, &rc,
+	    nLen = GetWindowTextW (hwnd, szText, 128);
+	    DrawTextW (hdc, szText, nLen, &rc,
 			 DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_LEFT);
 	}
 
@@ -357,27 +372,6 @@
 
 
 /***********************************************************************
- *		DrawCaptionTempW (USER32.@)
- *
- * PARAMS
- *
- * RETURNS
- *     Success:
- *     Failure:
- */
-
-BOOL WINAPI
-DrawCaptionTempW (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont,
-		    HICON hIcon, LPCWSTR str, UINT uFlags)
-{
-    LPSTR p = HEAP_strdupWtoA (GetProcessHeap (), 0, str);
-    BOOL res = DrawCaptionTempA (hwnd, hdc, rect, hFont, hIcon, p, uFlags);
-    HeapFree (GetProcessHeap (), 0, p);
-    return res;
-}
-
-
-/***********************************************************************
  *		AdjustWindowRect (USER.102)
  */
 BOOL16 WINAPI AdjustWindowRect16( LPRECT16 rect, DWORD style, BOOL16 menu )