winhlp32: Add support for accelerators in general and F1 in particular.

po/ar.po

@@ -10537,7 +10537,8 @@ msgid "Large"
 msgstr ""
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "&مساعدة المساعدة"
 
 #: winhlp32.rc:55

po/bg.po

@@ -10763,7 +10763,8 @@ msgid "Large"
 msgstr "Large"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "&Помощ за помощта"
 
 #: winhlp32.rc:55

po/ca.po

@@ -10429,7 +10429,7 @@ msgid "Large"
 msgstr ""
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+msgid "&Help on help\tF1"
 msgstr ""
 
 #: winhlp32.rc:55

po/cs.po

@@ -11200,7 +11200,8 @@ msgid "Large"
 msgstr "Large"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "&Pomoc k nápovědě"
 
 #: winhlp32.rc:55

po/da.po

@@ -11254,7 +11254,8 @@ msgid "Large"
 msgstr "Large"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "&Brug af Hjælp"
 
 #: winhlp32.rc:55

po/de.po

@@ -11212,7 +11212,8 @@ msgid "Large"
 msgstr "Large"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "&Hilfe benutzen"
 
 #: winhlp32.rc:55

po/el.po

@@ -10550,7 +10550,7 @@ msgid "Large"
 msgstr ""
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+msgid "&Help on help\tF1"
 msgstr ""
 
 #: winhlp32.rc:55

po/en.po

@@ -10775,8 +10775,8 @@ msgid "Large"
 msgstr "Large"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
-msgstr ""
+msgid "&Help on help\tF1"
+msgstr "&Help on help\tF1"
 
 #: winhlp32.rc:55
 msgid "Always on &top"

po/en_US.po

@@ -10935,8 +10935,8 @@ msgid "Large"
 msgstr "Large"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
-msgstr "&Help on help"
+msgid "&Help on help\tF1"
+msgstr "&Help on help\tF1"
 
 #: winhlp32.rc:55
 msgid "Always on &top"

po/eo.po

@@ -10739,7 +10739,8 @@ msgid "Large"
 msgstr "Large"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "Pri Helpanto"
 
 #: winhlp32.rc:55

po/es.po

@@ -11431,7 +11431,8 @@ msgid "Large"
 msgstr "Grande"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "A&yuda sobre la ayuda"
 
 #: winhlp32.rc:55

po/fa.po

@@ -10540,7 +10540,8 @@ msgid "Large"
 msgstr ""
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "&کمک برای کمک"
 
 #: winhlp32.rc:55

po/fi.po

@@ -10857,7 +10857,8 @@ msgid "Large"
 msgstr "Large"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "Apua &Opastuksesta"
 
 #: winhlp32.rc:55

po/fr.po

@@ -11070,7 +11070,8 @@ msgid "Large"
 msgstr "Grande"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "&Utiliser l'aide"
 
 #: winhlp32.rc:55

po/he.po

@@ -11109,7 +11109,8 @@ msgid "Large"
 msgstr "גדולים"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "ע&זרה לעזרה"
 
 #: winhlp32.rc:55

po/hi.po

@@ -10412,7 +10412,7 @@ msgid "Large"
 msgstr ""
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+msgid "&Help on help\tF1"
 msgstr ""
 
 #: winhlp32.rc:55

po/hu.po

@@ -11099,7 +11099,8 @@ msgid "Large"
 msgstr "Large"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "&Használat"
 
 #: winhlp32.rc:55

po/it.po

@@ -11343,7 +11343,8 @@ msgid "Large"
 msgstr "Grandi"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "&Aiuto sulla Guida"
 
 #: winhlp32.rc:55

po/ja.po

@@ -10944,7 +10944,8 @@ msgid "Large"
 msgstr "大"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "ヘルプの使い方(&H)"
 
 #: winhlp32.rc:55

po/ko.po

@@ -10896,7 +10896,8 @@ msgid "Large"
 msgstr "크게"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "도움말 사용법(&H)"
 
 #: winhlp32.rc:55

po/lt.po

@@ -10971,7 +10971,8 @@ msgid "Large"
 msgstr "&Didelis"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "Pa&galba apie žinyną"
 
 #: winhlp32.rc:55

po/ml.po

@@ -10412,7 +10412,7 @@ msgid "Large"
 msgstr ""
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+msgid "&Help on help\tF1"
 msgstr ""
 
 #: winhlp32.rc:55

po/nb_NO.po

@@ -11225,7 +11225,8 @@ msgid "Large"
 msgstr "Stor"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "&Hjelp om hjelp"
 
 #: winhlp32.rc:55

po/nl.po

@@ -11100,7 +11100,8 @@ msgid "Large"
 msgstr "Groot"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "H&ulp bij Help"
 
 #: winhlp32.rc:55

po/or.po

@@ -10412,7 +10412,7 @@ msgid "Large"
 msgstr ""
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+msgid "&Help on help\tF1"
 msgstr ""
 
 #: winhlp32.rc:55

po/pa.po

@@ -10412,7 +10412,7 @@ msgid "Large"
 msgstr ""
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+msgid "&Help on help\tF1"
 msgstr ""
 
 #: winhlp32.rc:55

po/pl.po

@@ -10983,7 +10983,8 @@ msgid "Large"
 msgstr "Duże"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "Pomo&c"
 
 #: winhlp32.rc:55

po/pt_BR.po

@@ -11292,7 +11292,8 @@ msgid "Large"
 msgstr "Grande"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "&Ajuda na ajuda"
 
 #: winhlp32.rc:55

po/pt_PT.po

@@ -11352,7 +11352,8 @@ msgid "Large"
 msgstr "Grande"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "&Ajuda na ajuda"
 
 #: winhlp32.rc:55

po/rm.po

@@ -10490,7 +10490,7 @@ msgstr "Large"
 
 #: winhlp32.rc:54
 #, fuzzy
-msgid "&Help on help"
+msgid "&Help on help\tF1"
 msgstr "&Douvrar l'ag�d"
 
 #: winhlp32.rc:55

po/ro.po

@@ -11587,7 +11587,8 @@ msgid "Large"
 msgstr "Mare"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "&Ajutor la ajutor"
 
 #: winhlp32.rc:55

po/ru.po

@@ -10960,7 +10960,8 @@ msgid "Large"
 msgstr "Крупный"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "&Использование справки"
 
 #: winhlp32.rc:55

po/sk.po

@@ -10718,7 +10718,7 @@ msgid "Large"
 msgstr "Large"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+msgid "&Help on help\tF1"
 msgstr ""
 
 #: winhlp32.rc:55

po/sl.po

@@ -11387,7 +11387,8 @@ msgid "Large"
 msgstr "Velika"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "&O pomoči"
 
 #: winhlp32.rc:55

po/sr_RS@cyrillic.po

@@ -10910,7 +10910,8 @@ msgid "Large"
 msgstr ""
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "&Помоћ за помоћ"
 
 #: winhlp32.rc:55

po/sr_RS@latin.po

@@ -10986,7 +10986,8 @@ msgid "Large"
 msgstr "Veliki"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "&Pomoć za pomoć"
 
 #: winhlp32.rc:55

po/sv.po

@@ -11038,7 +11038,8 @@ msgid "Large"
 msgstr "Stort"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "Användning &av hjälp"
 
 #: winhlp32.rc:55

po/te.po

@@ -10412,7 +10412,7 @@ msgid "Large"
 msgstr ""
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+msgid "&Help on help\tF1"
 msgstr ""
 
 #: winhlp32.rc:55

po/th.po

@@ -10581,7 +10581,8 @@ msgid "Large"
 msgstr ""
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "เกี่ยวกับช่วยเหลีอ"
 
 #: winhlp32.rc:55

po/tr.po

@@ -11368,7 +11368,8 @@ msgid "Large"
 msgstr "Large"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "&Yardım kullanımı"
 
 #: winhlp32.rc:55

po/uk.po

@@ -10968,7 +10968,8 @@ msgid "Large"
 msgstr "Великий"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "&Використання Довідки"
 
 #: winhlp32.rc:55

po/wa.po

@@ -10557,7 +10557,8 @@ msgid "Large"
 msgstr "Large"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "&Aide so l' Aide"
 
 #: winhlp32.rc:55

po/wine.pot

@@ -10381,7 +10381,7 @@ msgid "Large"
 msgstr ""
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+msgid "&Help on help\tF1"
 msgstr ""
 
 #: winhlp32.rc:55

po/zh_CN.po

@@ -10887,7 +10887,8 @@ msgid "Large"
 msgstr "大号"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "如何使用帮助(&H)"
 
 #: winhlp32.rc:55

po/zh_TW.po

@@ -10948,7 +10948,8 @@ msgid "Large"
 msgstr "大號"
 
 #: winhlp32.rc:54
-msgid "&Help on help"
+#, fuzzy
+msgid "&Help on help\tF1"
 msgstr "如何使用幫助(&H)"
 
 #: winhlp32.rc:55

programs/winhlp32/winhelp.c

@@ -1347,7 +1347,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
 
     case WM_COMMAND:
         win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0);
-        switch (wParam)
+        switch (LOWORD(wParam))
 	{
             /* Menu FILE */
 	case MNID_FILE_OPEN:    MACRO_FileOpen();       break;
@@ -1654,6 +1654,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show)
     static CHAR         default_wndname[] = "main";
     LPSTR               wndname = default_wndname;
     WINHELP_DLL*        dll;
+    HACCEL              hAccel;
 
     Globals.hInstance = hInstance;
 
@@ -1725,10 +1726,15 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show)
                            WINHELP_GetWindowInfo(hlpfile, wndname), show);
 
     /* Message loop */
+    hAccel = LoadAcceleratorsW(hInstance, MAKEINTRESOURCEW(MAIN_ACCEL));
     while ((Globals.win_list || Globals.active_popup) && GetMessage(&msg, 0, 0, 0))
     {
-        TranslateMessage(&msg);
-        DispatchMessage(&msg);
+        HWND hWnd = Globals.active_win ? Globals.active_win->hMainWnd : NULL;
+        if (!TranslateAcceleratorW(hWnd, hAccel, &msg))
+	{
+            TranslateMessage(&msg);
+            DispatchMessage(&msg);
+        }
     }
     for (dll = Globals.dlls; dll; dll = dll->next)
     {

programs/winhlp32/winhelp_res.h

@@ -29,6 +29,7 @@
 
 #define MAIN_MENU		0xF000
 #define CONTEXT_MENU            0xF001
+#define MAIN_ACCEL              0xF002
 
 #define STID_WINE_HELP		0x120
 #define STID_WHERROR		0x121

programs/winhlp32/winhlp32.rc

@@ -51,7 +51,7 @@ MAIN_MENU MENU
   END
  }
  POPUP "&Help" {
-   MENUITEM "&Help on help", MNID_HELP_HELPON
+   MENUITEM "&Help on help\tF1", MNID_HELP_HELPON
    MENUITEM "Always on &top", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
    MENUITEM "&About Wine Help", MNID_HELP_ABOUT
@@ -94,5 +94,11 @@ STID_PSH_INDEX,		"Help topics: "
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
+
+MAIN_ACCEL ACCELERATORS
+{
+    VK_F1, MNID_HELP_HELPON, VIRTKEY
+}
+
 /* @makedep: winhelp.ico */
 IDI_WINHELP ICON winhelp.ico