ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wordpad: Fix some unicode bugs.

This commit is contained in:
Andrey Turkin 2008-10-09 22:34:01 +04:00 committed by Alexandre Julliard
parent 2b0013128f
commit 566dcd78fe
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
programs/wordpad/En.rc
View File

@ -238,4 +238,5 @@ BEGIN
STRING_WRITE_ACCESS_DENIED, "You do not have access to save the file." STRING_WRITE_ACCESS_DENIED, "You do not have access to save the file."
STRING_OPEN_FAILED, "Could not open the file." STRING_OPEN_FAILED, "Could not open the file."
STRING_OPEN_ACCESS_DENIED, "You do not have access to open the file." STRING_OPEN_ACCESS_DENIED, "You do not have access to open the file."
STRING_PRINTING_NOT_IMPLEMENTED, "Printing not implemented"
END END

1
programs/wordpad/Ru.rc
View File

@ -234,4 +234,5 @@ BEGIN
"ýòîé îïåðàöèè?" "ýòîé îïåðàöèè?"
STRING_INVALID_NUMBER, "Íåïðàâèëüíûé ÷èñëîâîé ôîðìàò" STRING_INVALID_NUMBER, "Íåïðàâèëüíûé ÷èñëîâîé ôîðìàò"
STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage äîêóìåíòû íå ïîääåðæèâàþòñÿ" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage äîêóìåíòû íå ïîääåðæèâàþòñÿ"
STRING_PRINTING_NOT_IMPLEMENTED, "Ïå÷àòü íå ïîääåðæèâàåòñÿ"
END END

15
programs/wordpad/wordpad.c
View File

@ -49,11 +49,10 @@
#endif #endif
/* use LoadString */ /* use LoadString */
static const WCHAR xszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0}; static const WCHAR wszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0};
static const WCHAR wszRichEditClass[] = {'R','I','C','H','E','D','I','T','2','0','W',0}; static const WCHAR wszRichEditClass[] = {'R','I','C','H','E','D','I','T','2','0','W',0};
static const WCHAR wszMainWndClass[] = {'W','O','R','D','P','A','D','T','O','P',0}; static const WCHAR wszMainWndClass[] = {'W','O','R','D','P','A','D','T','O','P',0};
static const WCHAR wszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0};
static const WCHAR stringFormat[] = {'%','2','d','\0'}; static const WCHAR stringFormat[] = {'%','2','d','\0'};
@ -1153,7 +1152,7 @@ static void HandleCommandLine(LPWSTR cmdline)
} }
if (opt_print) if (opt_print)
MessageBox(hMainWnd, "Printing not implemented", "WordPad", MB_OK); MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_PRINTING_NOT_IMPLEMENTED), wszAppTitle, MB_OK);
} }
static LRESULT handle_findmsg(LPFINDREPLACEW pFr) static LRESULT handle_findmsg(LPFINDREPLACEW pFr)
@ -1946,8 +1945,8 @@ static LRESULT OnNotify( HWND hWnd, LPARAM lParam)
sprintf( buf,"selection = %d..%d, line count=%ld", sprintf( buf,"selection = %d..%d, line count=%ld",
pSC->chrg.cpMin, pSC->chrg.cpMax, pSC->chrg.cpMin, pSC->chrg.cpMax,
SendMessage(hwndEditor, EM_GETLINECOUNT, 0, 0)); SendMessage(hwndEditor, EM_GETLINECOUNT, 0, 0));
SetWindowText(GetDlgItem(hWnd, IDC_STATUSBAR), buf); SetWindowTextA(GetDlgItem(hWnd, IDC_STATUSBAR), buf);
SendMessage(hWnd, WM_USER, 0, 0); SendMessage(hWnd, WM_USER, 0, 0);
return 1; return 1;
} }
@ -2136,7 +2135,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
TEXTRANGEW tr; TEXTRANGEW tr;
GetWindowTextW(hwndEditor, data, nLen+1); GetWindowTextW(hwndEditor, data, nLen+1);
MessageBoxW(NULL, data, xszAppTitle, MB_OK); MessageBoxW(NULL, data, wszAppTitle, MB_OK);
HeapFree( GetProcessHeap(), 0, data); HeapFree( GetProcessHeap(), 0, data);
data = HeapAlloc(GetProcessHeap(), 0, (nLen+1)*sizeof(WCHAR)); data = HeapAlloc(GetProcessHeap(), 0, (nLen+1)*sizeof(WCHAR));
@ -2144,7 +2143,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
tr.chrg.cpMax = nLen; tr.chrg.cpMax = nLen;
tr.lpstrText = data; tr.lpstrText = data;
SendMessage (hwndEditor, EM_GETTEXTRANGE, 0, (LPARAM)&tr); SendMessage (hwndEditor, EM_GETTEXTRANGE, 0, (LPARAM)&tr);
MessageBoxW(NULL, data, xszAppTitle, MB_OK); MessageBoxW(NULL, data, wszAppTitle, MB_OK);
HeapFree( GetProcessHeap(), 0, data ); HeapFree( GetProcessHeap(), 0, data );
/* SendMessage(hwndEditor, EM_SETSEL, 0, -1); */ /* SendMessage(hwndEditor, EM_SETSEL, 0, -1); */
@ -2184,7 +2183,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
SendMessage(hwndEditor, EM_GETSELTEXT, 0, (LPARAM)data); SendMessage(hwndEditor, EM_GETSELTEXT, 0, (LPARAM)data);
sprintf(buf, "Start = %d, End = %d", range.cpMin, range.cpMax); sprintf(buf, "Start = %d, End = %d", range.cpMin, range.cpMax);
MessageBoxA(hWnd, buf, "Editor", MB_OK); MessageBoxA(hWnd, buf, "Editor", MB_OK);
MessageBoxW(hWnd, data, xszAppTitle, MB_OK); MessageBoxW(hWnd, data, wszAppTitle, MB_OK);
HeapFree( GetProcessHeap(), 0, data); HeapFree( GetProcessHeap(), 0, data);
/* SendMessage(hwndEditor, EM_SETSEL, 0, -1); */ /* SendMessage(hwndEditor, EM_SETSEL, 0, -1); */
return 0; return 0;

1
programs/wordpad/wordpad.h
View File

@ -197,6 +197,7 @@
#define STRING_WRITE_ACCESS_DENIED 1708 #define STRING_WRITE_ACCESS_DENIED 1708
#define STRING_OPEN_FAILED 1709 #define STRING_OPEN_FAILED 1709
#define STRING_OPEN_ACCESS_DENIED 1710 #define STRING_OPEN_ACCESS_DENIED 1710
#define STRING_PRINTING_NOT_IMPLEMENTED 1711
LPWSTR file_basename(LPWSTR); LPWSTR file_basename(LPWSTR);