Andrey Turkin : wordpad: Convert some ANSI calls to Unicode.
Alexandre Julliard
julliard at winehq.org
Fri Oct 10 08:06:43 CDT 2008
Module: wine
Branch: master
Commit: c53b772394bb193169af7d55653cbd1576ff0807
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c53b772394bb193169af7d55653cbd1576ff0807
Author: Andrey Turkin <andrey.turkin at gmail.com>
Date: Thu Oct 9 22:34:16 2008 +0400
wordpad: Convert some ANSI calls to Unicode.
---
programs/wordpad/wordpad.c | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c
index 3a77fa0..0cc0454 100644
--- a/programs/wordpad/wordpad.c
+++ b/programs/wordpad/wordpad.c
@@ -36,6 +36,7 @@
#include <math.h>
#include <errno.h>
+#include "wine/unicode.h"
#include "wordpad.h"
#ifdef NONAMELESSUNION
@@ -1284,21 +1285,18 @@ static void append_current_units(LPWSTR buffer)
static void number_with_units(LPWSTR buffer, int number)
{
float converted = (float)number / TWIPS_PER_CM;
- char string[MAX_STRING_LEN];
+ static const WCHAR fmt[] = {'%','.','2','f',' ','%','s','\0'};
- sprintf(string, "%.2f ", converted);
- lstrcatA(string, units_cmA);
- MultiByteToWideChar(CP_ACP, 0, string, -1, buffer, MAX_STRING_LEN);
+ sprintfW(buffer, fmt, converted, units_cmW);
}
static BOOL get_comboexlist_selection(HWND hComboEx, LPWSTR wszBuffer, UINT bufferLength)
{
- HANDLE hHeap;
- COMBOBOXEXITEM cbItem;
+ COMBOBOXEXITEMW cbItem;
COMBOBOXINFO cbInfo;
HWND hCombo, hList;
int idx, result;
- char *szBuffer;
+
hCombo = (HWND)SendMessage(hComboEx, CBEM_GETCOMBOCONTROL, 0, 0);
if (!hCombo)
return FALSE;
@@ -1311,22 +1309,13 @@ static BOOL get_comboexlist_selection(HWND hComboEx, LPWSTR wszBuffer, UINT buff
if (idx < 0)
return FALSE;
- hHeap = GetProcessHeap();
- szBuffer = HeapAlloc(hHeap, HEAP_ZERO_MEMORY, bufferLength);
ZeroMemory(&cbItem, sizeof(cbItem));
cbItem.mask = CBEIF_TEXT;
cbItem.iItem = idx;
- cbItem.pszText = szBuffer;
+ cbItem.pszText = wszBuffer;
cbItem.cchTextMax = bufferLength-1;
- result = SendMessage(hComboEx, CBEM_GETITEM, 0, (LPARAM)&cbItem);
- if (!result)
- {
- HeapFree(hHeap, 0, szBuffer);
- return FALSE;
- }
+ result = SendMessageW(hComboEx, CBEM_GETITEM, 0, (LPARAM)&cbItem);
- result = MultiByteToWideChar(CP_ACP, 0, szBuffer, -1, wszBuffer, bufferLength);
- HeapFree(hHeap, 0, szBuffer);
return result != 0;
}
More information about the wine-cvs
mailing list