[PATCH 0/2] MR5502: notepad: Use wide character string literals

List overview All Threads

newer

older

[PATCH 0/5] MR793: hlsl: Parse...

[PATCH 0/1] MR792: Draft:...

Isaac Marovitz (＠IsaacMarovitz)

15 Apr 2024 15 Apr '24

9:41 p.m.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/5502

Show replies by date

Isaac Marovitz

15 Apr 15 Apr

9:41 p.m.

New subject: [PATCH 1/2] notepad: Use wide character string literals in main.c.

From: Isaac Marovitz isaacryu@icloud.com

--- programs/notepad/main.c | 73 +++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 39 deletions(-)

diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 69ab5215304..2c72acbe731 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -37,33 +37,32 @@ NOTEPAD_GLOBALS Globals; static ATOM aFINDMSGSTRING; static RECT main_rect;

-static const WCHAR notepad_reg_key[] = {'S','o','f','t','w','a','r','e','\', - 'M','i','c','r','o','s','o','f','t','\','N','o','t','e','p','a','d','\0'}; -static const WCHAR value_fWrap[] = {'f','W','r','a','p','\0'}; -static const WCHAR value_iPointSize[] = {'i','P','o','i','n','t','S','i','z','e','\0'}; -static const WCHAR value_iWindowPosDX[] = {'i','W','i','n','d','o','w','P','o','s','D','X','\0'}; -static const WCHAR value_iWindowPosDY[] = {'i','W','i','n','d','o','w','P','o','s','D','Y','\0'}; -static const WCHAR value_iWindowPosX[] = {'i','W','i','n','d','o','w','P','o','s','X','\0'}; -static const WCHAR value_iWindowPosY[] = {'i','W','i','n','d','o','w','P','o','s','Y','\0'}; -static const WCHAR value_lfCharSet[] = {'l','f','C','h','a','r','S','e','t','\0'}; -static const WCHAR value_lfClipPrecision[] = {'l','f','C','l','i','p','P','r','e','c','i','s','i','o','n','\0'}; -static const WCHAR value_lfEscapement[] = {'l','f','E','s','c','a','p','e','m','e','n','t','\0'}; -static const WCHAR value_lfItalic[] = {'l','f','I','t','a','l','i','c','\0'}; -static const WCHAR value_lfOrientation[] = {'l','f','O','r','i','e','n','t','a','t','i','o','n','\0'}; -static const WCHAR value_lfOutPrecision[] = {'l','f','O','u','t','P','r','e','c','i','s','i','o','n','\0'}; -static const WCHAR value_lfPitchAndFamily[] = {'l','f','P','i','t','c','h','A','n','d','F','a','m','i','l','y','\0'}; -static const WCHAR value_lfQuality[] = {'l','f','Q','u','a','l','i','t','y','\0'}; -static const WCHAR value_lfStrikeOut[] = {'l','f','S','t','r','i','k','e','O','u','t','\0'}; -static const WCHAR value_lfUnderline[] = {'l','f','U','n','d','e','r','l','i','n','e','\0'}; -static const WCHAR value_lfWeight[] = {'l','f','W','e','i','g','h','t','\0'}; -static const WCHAR value_lfFaceName[] = {'l','f','F','a','c','e','N','a','m','e','\0'}; -static const WCHAR value_iMarginTop[] = {'i','M','a','r','g','i','n','T','o','p','\0'}; -static const WCHAR value_iMarginBottom[] = {'i','M','a','r','g','i','n','B','o','t','t','o','m','\0'}; -static const WCHAR value_iMarginLeft[] = {'i','M','a','r','g','i','n','L','e','f','t','\0'}; -static const WCHAR value_iMarginRight[] = {'i','M','a','r','g','i','n','R','i','g','h','t','\0'}; -static const WCHAR value_szHeader[] = {'s','z','H','e','a','d','e','r','\0'}; -static const WCHAR value_szFooter[] = {'s','z','T','r','a','i','l','e','r','\0'}; -static const WCHAR value_bStatusBar[] = {'b','S','t','a','t','u','s','B','a','r','\0'}; +static const WCHAR notepad_reg_key[] = L"Software\Microsoft\Notepad\0"; +static const WCHAR value_fWrap[] = L"fWrap\0"; +static const WCHAR value_iPointSize[] = L"iPointSize\0"; +static const WCHAR value_iWindowPosDX[] = L"iWindowPosDX\0"; +static const WCHAR value_iWindowPosDY[] = L"iWindowPosDY\0"; +static const WCHAR value_iWindowPosX[] = L"iWindowPosX\0"; +static const WCHAR value_iWindowPosY[] = L"iWindowPosY\0"; +static const WCHAR value_lfCharSet[] = L"lfCharSet\0"; +static const WCHAR value_lfClipPrecision[] = L"lfClipPrecision\0"; +static const WCHAR value_lfEscapement[] = L"lfEscapement\0"; +static const WCHAR value_lfItalic[] = L"lfItalic\0"; +static const WCHAR value_lfOrientation[] = L"lfOrientation\0"; +static const WCHAR value_lfOutPrecision[] = L"lfOutPrecision\0"; +static const WCHAR value_lfPitchAndFamily[] = L"lfPitchAndFamily\0"; +static const WCHAR value_lfQuality[] = L"lfQuality\0"; +static const WCHAR value_lfStrikeOut[] = L"lfStrikeOut\0"; +static const WCHAR value_lfUnderline[] = L"lfUnderline\0"; +static const WCHAR value_lfWeight[] = L"lfWeight\0"; +static const WCHAR value_lfFaceName[] = L"lfFaceName\0"; +static const WCHAR value_iMarginTop[] = L"iMarginTop\0"; +static const WCHAR value_iMarginBottom[] = L"iMarginBottom\0"; +static const WCHAR value_iMarginLeft[] = L"iMarginLeft\0"; +static const WCHAR value_iMarginRight[] = L"iMarginRight\0"; +static const WCHAR value_szHeader[] = L"szHeader\0"; +static const WCHAR value_szFooter[] = L"szFooter\0"; +static const WCHAR value_bStatusBar[] = L"bStatusBar\0";

/*********************************************************************** * @@ -207,7 +206,7 @@ static VOID NOTEPAD_SaveSettingToRegistry(void) */ static VOID NOTEPAD_LoadSettingFromRegistry(void) { - static const WCHAR systemW[] = { 'S','y','s','t','e','m','\0' }; + static const WCHAR systemW[] = L"System\0"; HKEY hkey; INT base_length, dx, dy;

@@ -353,16 +352,14 @@ static int NOTEPAD_MenuCommand(WPARAM wParam) static VOID NOTEPAD_InitData(VOID) { LPWSTR p = Globals.szFilter; - static const WCHAR txt_files[] = { '*','.','t','x','t',0 }; - static const WCHAR all_files[] = { '*','.','*',0 };

LoadStringW(Globals.hInstance, STRING_TEXT_FILES_TXT, p, MAX_STRING_LEN); p += lstrlenW(p) + 1; - lstrcpyW(p, txt_files); + lstrcpyW(p, L"*.txt"); p += lstrlenW(p) + 1; LoadStringW(Globals.hInstance, STRING_ALL_FILES, p, MAX_STRING_LEN); p += lstrlenW(p) + 1; - lstrcpyW(p, all_files); + lstrcpyW(p, L"*.*"); p += lstrlenW(p) + 1; *p = '\0'; Globals.hDevMode = NULL; @@ -587,7 +584,6 @@ static LRESULT WINAPI NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam,

case WM_CREATE: { - static const WCHAR editW[] = { 'e','d','i','t',0 }; DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL; RECT rc; @@ -595,7 +591,7 @@ static LRESULT WINAPI NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam,

if (!Globals.bWrapLongLines) dwStyle |= WS_HSCROLL | ES_AUTOHSCROLL;

- Globals.hEdit = CreateWindowExW(WS_EX_CLIENTEDGE, editW, NULL, + Globals.hEdit = CreateWindowExW(WS_EX_CLIENTEDGE, L"edit", NULL, dwStyle, 0, 0, rc.right, rc.bottom, hWnd, NULL, Globals.hInstance, NULL);

@@ -755,7 +751,7 @@ static void HandleCommandLine(LPWSTR cmdline) } else { - static const WCHAR txtW[] = { '.','t','x','t',0 }; + static const WCHAR txtW[] = L".txt";

/* try to find file with ".txt" extension */ if (wcschr(PathFindFileNameW(cmdline), '.')) @@ -819,8 +815,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) HMONITOR monitor; MONITORINFO info; INT x, y; - static const WCHAR className[] = {'N','o','t','e','p','a','d',0}; - static const WCHAR winName[] = {'N','o','t','e','p','a','d',0}; + static const WCHAR name[] = L"Notepad";

InitCommonControls();

@@ -841,7 +836,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) class.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); class.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); class.lpszMenuName = MAKEINTRESOURCEW(MAIN_MENU); - class.lpszClassName = className; + class.lpszClassName = name;

if (!RegisterClassExW(&class)) return FALSE;

@@ -860,7 +855,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) x = y = CW_USEDEFAULT;

Globals.hMainWnd = - CreateWindowW(className, winName, WS_OVERLAPPEDWINDOW, x, y, + CreateWindowW(name, name, WS_OVERLAPPEDWINDOW, x, y, main_rect.right - main_rect.left, main_rect.bottom - main_rect.top, NULL, NULL, Globals.hInstance, NULL); if (!Globals.hMainWnd)

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5502

Isaac Marovitz

9:41 p.m.

New subject: [PATCH 2/2] notepad: Use wide character string literals in dialog.c.

From: Isaac Marovitz isaacryu@icloud.com

--- programs/notepad/dialog.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 3865bc55426..54d5a92619a 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -37,7 +37,7 @@ #define SPACES_IN_TAB 8 #define PRINT_LEN_MAX 500

-static const WCHAR helpfileW[] = { 'n','o','t','e','p','a','d','.','h','l','p',0 }; +static const WCHAR helpfileW[] = L"notepad.hlp";

static INT_PTR WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam);

@@ -102,9 +102,9 @@ VOID ShowLastError(void) */ void UpdateWindowCaption(void) { - static const WCHAR hyphenW[] = { ' ','-',' ',0 }; + static const WCHAR hyphenW[] = L" - "; WCHAR szNotepad[64]; - WCHAR szCaption[ARRAY_SIZE(Globals.szFileTitle) + ARRAY_SIZE(hyphenW) + ARRAY_SIZE(szNotepad)]; + WCHAR szCaption[ARRAY_SIZE(Globals.szFileTitle) + lstrlenW(hyphenW) + ARRAY_SIZE(szNotepad)];

if (Globals.szFileTitle[0] != '\0') lstrcpyW(szCaption, Globals.szFileTitle); @@ -358,7 +358,7 @@ static inline ENCODING detect_encoding_of_buffer(const void* buffer, int size)

void DoOpenFile(LPCWSTR szFileName, ENCODING enc) { - static const WCHAR dotlog[] = { '.','L','O','G',0 }; + static const WCHAR dotlog[] = L".LOG"; HANDLE hFile; LPSTR pTemp; DWORD size; @@ -531,8 +531,8 @@ static ENCODING detect_encoding_of_file(LPCWSTR szFileName) static LPWSTR dialog_print_to_file(HWND hMainWnd) { OPENFILENAMEW ofn; - static WCHAR file[MAX_PATH] = {'o','u','t','p','u','t','.','p','r','n',0}; - static const WCHAR defExt[] = {'p','r','n',0}; + static WCHAR file[MAX_PATH] = L"output.prn"; + static const WCHAR defExt[] = L"prn";

ZeroMemory(&ofn, sizeof(ofn));

@@ -613,8 +613,8 @@ VOID DIALOG_FileOpen(VOID) { OPENFILENAMEW openfilename; WCHAR szPath[MAX_PATH]; - static const WCHAR szDefaultExt[] = { 't','x','t',0 }; - static const WCHAR txt_files[] = { '*','.','t','x','t',0 }; + static const WCHAR szDefaultExt[] = L"txt"; + static const WCHAR txt_files[] = L"*.txt";

ZeroMemory(&openfilename, sizeof(openfilename));

@@ -660,8 +660,8 @@ BOOL DIALOG_FileSaveAs(VOID) { OPENFILENAMEW saveas; WCHAR szPath[MAX_PATH]; - static const WCHAR szDefaultExt[] = { 't','x','t',0 }; - static const WCHAR txt_files[] = { '*','.','t','x','t',0 }; + static const WCHAR szDefaultExt[] = L"txt"; + static const WCHAR txt_files[] = L"*.txt";

ZeroMemory(&saveas, sizeof(saveas));

@@ -793,8 +793,8 @@ static BOOL notepad_print_page(HDC hdc, RECT *rc, BOOL dopage, int page, LPTEXTI { if (StartPage(hdc) <= 0) { - static const WCHAR failedW[] = { 'S','t','a','r','t','P','a','g','e',' ','f','a','i','l','e','d',0 }; - static const WCHAR errorW[] = { 'P','r','i','n','t',' ','E','r','r','o','r',0 }; + static const WCHAR failedW[] = L"StartPage failed"; + static const WCHAR errorW[] = L"Print Error"; MessageBoxW(Globals.hMainWnd, failedW, errorW, MB_ICONEXCLAMATION); HeapFree(GetProcessHeap(), 0, footer_text); return FALSE; @@ -1061,7 +1061,7 @@ VOID DIALOG_EditTimeDate(VOID) { SYSTEMTIME st; WCHAR szDate[MAX_STRING_LEN]; - static const WCHAR spaceW[] = { ' ',0 }; + static const WCHAR spaceW[] = L" ";

GetLocalTime(&st);

@@ -1077,7 +1077,6 @@ VOID DIALOG_EditTimeDate(VOID) VOID DIALOG_EditWrap(VOID) { BOOL modify = FALSE; - static const WCHAR editW[] = { 'e','d','i','t',0 }; DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | ES_AUTOVSCROLL | ES_MULTILINE; RECT rc; @@ -1096,7 +1095,7 @@ VOID DIALOG_EditWrap(VOID) DestroyWindow(Globals.hEdit); GetClientRect(Globals.hMainWnd, &rc); if( Globals.bWrapLongLines ) dwStyle |= WS_HSCROLL | ES_AUTOHSCROLL; - Globals.hEdit = CreateWindowExW(WS_EX_CLIENTEDGE, editW, NULL, dwStyle, + Globals.hEdit = CreateWindowExW(WS_EX_CLIENTEDGE, L"edit", NULL, dwStyle, 0, 0, rc.right, rc.bottom, Globals.hMainWnd, NULL, Globals.hInstance, NULL); SendMessageW(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, FALSE); @@ -1200,7 +1199,7 @@ VOID DIALOG_HelpContents(VOID)

VOID DIALOG_HelpAboutNotepad(VOID) { - static const WCHAR notepadW[] = { 'W','i','n','e',' ','N','o','t','e','p','a','d',0 }; + static const WCHAR notepadW[] = L"Wine Notepad"; WCHAR szNotepad[MAX_STRING_LEN]; HICON icon = LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDI_NOTEPAD), IMAGE_ICON, 48, 48, LR_SHARED); @@ -1254,8 +1253,8 @@ static INT_PTR WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wPara case IDHELP: { /* FIXME: Bring this to work */ - static const WCHAR sorryW[] = { 'S','o','r','r','y',',',' ','n','o',' ','h','e','l','p',' ','a','v','a','i','l','a','b','l','e',0 }; - static const WCHAR helpW[] = { 'H','e','l','p',0 }; + static const WCHAR sorryW[] = L"Sorry, no help available"; + static const WCHAR helpW[] = L"Help"; MessageBoxW(Globals.hMainWnd, sorryW, helpW, MB_ICONEXCLAMATION); return TRUE; }

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5502

297

Age (days ago)

297

Last active (days ago)

wine-gitlab@winehq.org

2 comments

2 participants

tags (0)

participants (2)

Isaac Marovitz
Isaac Marovitz (＠IsaacMarovitz)