diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index b028c38b7ee..6d8d04c5086 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -798,8 +798,8 @@ VOID DIALOG_HelpAboutNotepad(VOID) { static const WCHAR notepadW[] = { 'W','i','n','e',' ','N','o','t','e','p','a','d',0 }; WCHAR szNotepad[MAX_STRING_LEN]; - HICON icon = LoadImageW( Globals.hInstance, MAKEINTRESOURCE(IDI_NOTEPAD), - IMAGE_ICON, 48, 48, LR_SHARED ); + HICON icon = LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDI_NOTEPAD), + IMAGE_ICON, 48, 48, LR_SHARED); LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad)); ShellAbout(Globals.hMainWnd, szNotepad, notepadW, icon); @@ -812,8 +812,8 @@ VOID DIALOG_HelpAboutNotepad(VOID) */ VOID DIALOG_FilePageSetup(void) { - DialogBox(Globals.hInstance, MAKEINTRESOURCE(DIALOG_PAGESETUP), - Globals.hMainWnd, DIALOG_PAGESETUP_DlgProc); + DialogBoxW(Globals.hInstance, MAKEINTRESOURCEW(DIALOG_PAGESETUP), + Globals.hMainWnd, DIALOG_PAGESETUP_DlgProc); } diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 8f7520e9386..7f987ae1ce5 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -736,10 +736,10 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) class.cbSize = sizeof(class); class.lpfnWndProc = NOTEPAD_WndProc; class.hInstance = Globals.hInstance; - class.hIcon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_NOTEPAD)); - class.hCursor = LoadCursor(0, IDC_ARROW); + class.hIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(IDI_NOTEPAD)); + class.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); class.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); - class.lpszMenuName = MAKEINTRESOURCE(MAIN_MENU); + class.lpszMenuName = MAKEINTRESOURCEW(MAIN_MENU); class.lpszClassName = className; if (!RegisterClassEx(&class)) return FALSE; @@ -777,7 +777,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) HandleCommandLine(GetCommandLine()); - hAccel = LoadAccelerators( hInstance, MAKEINTRESOURCE(ID_ACCEL) ); + hAccel = LoadAcceleratorsW(hInstance, MAKEINTRESOURCEW(ID_ACCEL)); while (GetMessage(&msg, 0, 0, 0)) {