[MSPAINT] Distinguish between icons and cursors (#5884)

- Convert icons/*_cur.ico to the cursor files (*.cur).
- The hot spot is (16, 16) (default).
- Rename icons/ folder as img/.
- Use LoadCursorW instead of LoadIconW
  for cursors.
- Use CURSOR statements for cursor files
  instead of ICON statements in rsrc.rc.
- I used GIMP to convert the icon files to the PNG files.
- I used RealWorld Cursor Editor to convert the PNG files to the cursor files.
CORE-19297

base/applications/mspaint/CMakeLists.txt

@@ -28,7 +28,7 @@ list(APPEND SOURCE
     winproc.cpp
     precomp.h)
 
-file(GLOB mspaint_rc_deps icons/*.*)
+file(GLOB mspaint_rc_deps img/*.*)
 add_rc_deps(rsrc.rc ${mspaint_rc_deps})
 add_executable(mspaint ${SOURCE} rsrc.rc)
 set_module_type(mspaint win32gui UNICODE)

base/applications/mspaint/canvas.cpp

@@ -659,19 +659,19 @@ LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL
         switch (toolsModel.GetActiveTool())
         {
             case TOOL_FILL:
-                ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_FILL)));
+                ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_FILL)));
                 break;
             case TOOL_COLOR:
-                ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_COLOR)));
+                ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_COLOR)));
                 break;
             case TOOL_ZOOM:
-                ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_ZOOM)));
+                ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_ZOOM)));
                 break;
             case TOOL_PEN:
-                ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_PEN)));
+                ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_PEN)));
                 break;
             case TOOL_AIRBRUSH:
-                ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_AIRBRUSH)));
+                ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_AIRBRUSH)));
                 break;
             default:
                 ::SetCursor(::LoadCursorW(NULL, (LPCWSTR)IDC_CROSS));

base/applications/mspaint/lang/bg-BG.rc

@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-bg-BG.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-bg-BG.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/cs-CZ.rc

@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-cs-CZ.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-cs-CZ.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/de-DE.rc

@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-de-DE.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-de-DE.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/en-GB.rc

@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-en-GB.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-en-GB.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/en-US.rc

@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
-IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar.bmp"
+IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/es-ES.rc

@@ -10,7 +10,7 @@
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-es-ES.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-es-ES.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/et-EE.rc

@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-et-EE.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-et-EE.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/eu-ES.rc

@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-eu-ES.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-eu-ES.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/fr-FR.rc

@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-fr-FR.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-fr-FR.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/he-IL.rc

@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-he-IL.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-he-IL.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/hu-HU.rc

@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-hu-HU.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-hu-HU.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/id-ID.rc

@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-id-ID.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-id-ID.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/it-IT.rc

@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-it-IT.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-it-IT.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/ja-JP.rc

@@ -9,7 +9,7 @@
 
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-ja-JP.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-ja-JP.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/nl-NL.rc

@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-nl-NL.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-nl-NL.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/no-NO.rc

@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-no-NO.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-no-NO.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/pl-PL.rc

@@ -10,7 +10,7 @@
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-pl-PL.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-pl-PL.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/pt-BR.rc

@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-pt-BR.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-pt-BR.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/pt-PT.rc

@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-pt-PT.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-pt-PT.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/ro-RO.rc

@@ -9,7 +9,7 @@
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-ro-RO.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-ro-RO.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/ru-RU.rc

@@ -11,7 +11,7 @@
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-ru-RU.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-ru-RU.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/sk-SK.rc

@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-sk-SK.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-sk-SK.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/sq-AL.rc

@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-sq-AL.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-sq-AL.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/sv-SE.rc

@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-sv-SE.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-sv-SE.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/tr-TR.rc

@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-tr-TR.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-tr-TR.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/uk-UA.rc

@@ -9,7 +9,7 @@
 
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-uk-UA.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-uk-UA.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/vi-VN.rc

@@ -7,7 +7,7 @@
 
 LANGUAGE LANG_VIETNAMESE, SUBLANG_VIETNAMESE_VIETNAM
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-vi-VN.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-vi-VN.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/zh-CN.rc

@@ -10,7 +10,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-zh-CN.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-zh-CN.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/zh-HK.rc

@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-zh-HK.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-zh-HK.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/lang/zh-TW.rc

@@ -8,7 +8,7 @@
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
-//IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-zh-TW.bmp"
+//IDB_FONTSTOOLBAR BITMAP "img/fontstoolbar-zh-TW.bmp"
 
 ID_MENU MENU
 BEGIN

base/applications/mspaint/rsrc.rc

@@ -21,24 +21,24 @@
 
 /* Icons */
 
-IDI_APPICON ICON "icons/paint.ico"
+IDI_APPICON ICON "img/paint.ico"
 
-IDB_TOOLBARICONS BITMAP "icons/iconbar.bmp"
+IDB_TOOLBARICONS BITMAP "img/iconbar.bmp"
 
-IDI_TRANSPARENT ICON "icons/transparent.ico"
-IDI_NONTRANSPARENT ICON "icons/nontransparent.ico"
+IDI_TRANSPARENT ICON "img/transparent.ico"
+IDI_NONTRANSPARENT ICON "img/nontransparent.ico"
 
-IDC_FILL ICON "icons/fill_cur.ico"
-IDC_COLOR ICON "icons/color_cur.ico"
-IDC_ZOOM ICON "icons/zoom_cur.ico"
-IDC_PEN ICON "icons/pen_cur.ico"
-IDC_AIRBRUSH ICON "icons/airbrush_cur.ico"
-IDC_HANDDRAG CURSOR "icons/handdrag.cur"
+IDC_FILL CURSOR "img/fill.cur"
+IDC_COLOR CURSOR "img/color.cur"
+IDC_ZOOM CURSOR "img/zoom.cur"
+IDC_PEN CURSOR "img/pen.cur"
+IDC_AIRBRUSH CURSOR "img/airbrush.cur"
+IDC_HANDDRAG CURSOR "img/handdrag.cur"
 
-IDI_HORZSTRETCH ICON "icons/horzstretch.ico"
-IDI_VERTSTRETCH ICON "icons/vertstretch.ico"
-IDI_HORZSKEW ICON "icons/horzskew.ico"
-IDI_VERTSKEW ICON "icons/vertskew.ico"
+IDI_HORZSTRETCH ICON "img/horzstretch.ico"
+IDI_VERTSTRETCH ICON "img/vertstretch.ico"
+IDI_HORZSKEW ICON "img/horzskew.ico"
+IDI_VERTSKEW ICON "img/vertskew.ico"
 
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "mspaint.exe.manifest"