Sync Winhelp to Wine 0.9.53 (WOW, NOT ONE WARNING!!! OMGWTFBBQ)

svn path=/trunk/; revision=31890

reactos/base/applications/winhelp/callback.c

@@ -39,7 +39,7 @@ static HANDLE CALLBACK WHD_Open(LPSTR name, BYTE flags)
 {
     unsigned    mode = 0;
 
-    //WINE_FIXME("(%s %x)\n", wine_dbgstr_a(name), flags);
+    WINE_FIXME("(%s %x)\n", wine_dbgstr_a(name), flags);
     switch (flags)
     {
     case 0: mode = GENERIC_READ | GENERIC_WRITE; break;
@@ -160,19 +160,19 @@ static LONG CALLBACK WHD_API(LPSTR x, WORD xx, DWORD xxx)
 
 FARPROC Callbacks[] =
 {
-    (FARPROC)WHD_GetFSError,
+    (FARPROC)WHD_GetFSError, 
-    (FARPROC)WHD_Open,
+    (FARPROC)WHD_Open, 
-    (FARPROC)WHD_Close,
+    (FARPROC)WHD_Close, 
-    (FARPROC)WHD_OpenBag,
+    (FARPROC)WHD_OpenBag, 
     (FARPROC)WHD_CloseBag,
     (FARPROC)WHD_ReadBag,
     (FARPROC)WHD_TellBag,
     (FARPROC)WHD_SeekBag,
-    (FARPROC)WHD_IsEofBag,
+    (FARPROC)WHD_IsEofBag, 
     (FARPROC)WHD_SizeBag,
     (FARPROC)WHD_Access,
-    (FARPROC)WHD_LLInfoFromBag,
+    (FARPROC)WHD_LLInfoFromBag, 
-    (FARPROC)WHD_LLInfoFromFile,
+    (FARPROC)WHD_LLInfoFromFile, 
     (FARPROC)WHD_Error,
     (FARPROC)WHD_ErrorString,
     (FARPROC)WHD_GetInfo,

reactos/base/applications/winhelp/hlpfile.h

@@ -3,6 +3,7 @@
  *
  * Copyright    1996 Ulrich Schmid
  *              2002 Eric Pouech
+ *              2007 Kirill K. Smirnov
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,7 +22,7 @@
 
 struct tagHelpFile;
 
-typedef struct
+typedef struct 
 {
     char        type[10];
     char        name[9];
@@ -63,9 +64,9 @@ typedef struct tagHlpFileParagraph
         struct
         {
             unsigned                    pos;    /* 0: center, 1: left, 2: right */
-            union
+            union 
             {
-                struct
+                struct 
                 {
                     HBITMAP             hBitmap;
                 } bmp;
@@ -102,12 +103,6 @@ typedef struct tagHlpFilePage
     struct tagHlpFileFile*      file;
 } HLPFILE_PAGE;
 
-typedef struct
-{
-    LONG                        lHash;
-    unsigned long               offset;
-} HLPFILE_CONTEXT;
-
 typedef struct
 {
     LONG                        lMap;
@@ -127,9 +122,11 @@ typedef struct tagHlpFileFile
     LPSTR                       lpszTitle;
     LPSTR                       lpszCopyright;
     HLPFILE_PAGE*               first_page;
+    HLPFILE_PAGE*               last_page;
     HLPFILE_MACRO*              first_macro;
-    unsigned                    wContextLen;
+    BYTE*                       Context;
-    HLPFILE_CONTEXT*            Context;
+    BYTE*                       kwbtree;
+    BYTE*                       kwdata;
     unsigned                    wMapLen;
     HLPFILE_MAP*                Map;
     unsigned long               contents_start;
@@ -141,7 +138,11 @@ typedef struct tagHlpFileFile
 
     unsigned short              version;
     unsigned short              flags;
-    unsigned                    hasPhrases; /* Phrases or PhrIndex/PhrImage */
+    unsigned short              tbsize;     /* topic block size */
+    unsigned short              dsize;      /* decompress size */
+    unsigned short              compressed;
+    unsigned                    hasPhrases;   /* file has |Phrases */
+    unsigned                    hasPhrases40; /* file has |PhrIndex/|PhrImage */
 
     unsigned                    numBmps;
     HBITMAP*                    bmps;
@@ -153,6 +154,28 @@ typedef struct tagHlpFileFile
     HLPFILE_WINDOWINFO*         windows;
 } HLPFILE;
 
+/*
+ * Compare function type for HLPFILE_BPTreeSearch function.
+ *
+ * PARAMS
+ *     p       [I] pointer to testing block (key + data)
+ *     key     [I] pointer to key value to look for
+ *     leaf    [I] whether this function called for index of leaf page
+ *     next    [O] pointer to pointer to next block
+ */
+typedef int (*HLPFILE_BPTreeCompare)(void *p, const void *key,
+                                     int leaf, void **next);
+
+/*
+ * Callback function type for HLPFILE_BPTreeEnum function.
+ *
+ * PARAMS
+ *     p       [I]  pointer to data block
+ *     next    [O]  pointer to pointer to next block
+ *     cookie  [IO] cookie data
+ */
+typedef void (*HLPFILE_BPTreeCallback)(void *p, void **next, void *cookie);
+
 HLPFILE*      HLPFILE_ReadHlpFile(LPCSTR lpszPath);
 HLPFILE_PAGE* HLPFILE_Contents(HLPFILE* hlpfile);
 HLPFILE_PAGE* HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash);
@@ -161,3 +184,6 @@ HLPFILE_PAGE* HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset);
 LONG          HLPFILE_Hash(LPCSTR lpszContext);
 void          HLPFILE_FreeLink(HLPFILE_LINK* link);
 void          HLPFILE_FreeHlpFile(HLPFILE*);
+
+void* HLPFILE_BPTreeSearch(BYTE*, const void*, HLPFILE_BPTreeCompare);
+void  HLPFILE_BPTreeEnum(BYTE*, HLPFILE_BPTreeCallback cb, void *cookie);

reactos/base/applications/winhelp/lang/bg-BG.rc

@@ -1,8 +1,7 @@
 /*
- * Help Viewer
+ * Help Viewer Bulgarian resource
  *
- * Copyright 1996 Ulrich Schmid
+ * Copyright 2005 Milko Krachounov
- * Copyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,59 +18,52 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
-
 /* Menu */
 
-MAIN_MENU MENU
+MAIN_MENU MENU LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
-BEGIN
+{
- POPUP "&Ôàéë"
+ POPUP "&Ôàéë" {
- BEGIN
+  MENUITEM "&Îòâîðè", MNID_FILE_OPEN
-  MENUITEM "&Îòâàðÿíå", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "&Ïå÷àò", MNID_FILE_PRINT
-  MENUITEM "&Íàñòðîéêè íà ïå÷àòà÷à...", MNID_FILE_SETUP
+  MENUITEM "&Íàñòðîéêà íà ïðèíòåðà...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
-  MENUITEM "Èç&õîä", MNID_FILE_EXIT
+  MENUITEM "&Èçõîä", MNID_FILE_EXIT
- END
+ }
- POPUP "&Îáðàáîòêà"
+ POPUP "&Ðåäàêòèðàíå" {
- BEGIN
+   MENUITEM "&Êîïèðàé...", MNID_EDIT_COPYDLG
-   MENUITEM "Çà&ïîìíÿíå", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Ðàçÿñíÿâàíå...", MNID_EDIT_ANNOTATE
+   MENUITEM "&Àíîòèðàé...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "&Îòìåòêà"
+ POPUP "&Îòìåòêè" {
- BEGIN
+   MENUITEM "&Çàäàé...", MNID_BKMK_DEFINE
-   MENUITEM "&Çàäàâàíå...", MNID_BKMK_DEFINE
+ }
- END
+ POPUP "&Ïîìîù" {
- POPUP "Ïîìî&ù"
+   MENUITEM "Ïîìîù &çà ïîìîùòà", MNID_HELP_HELPON
- BEGIN
+   MENUITEM "Âèíàãè îò&ãîðå", MNID_HELP_HELPTOP
-   MENUITEM "Ïîìîù çà &ïîìîùòà", MNID_HELP_HELPON
-   MENUITEM "Âèíàãè îòãîðå", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "&Ñâåäåíèÿ...", MNID_HELP_ABOUT
+   MENUITEM "&Èíôîðìàöèÿ...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "&Çà...", MNID_HELP_WINE
+   MENUITEM "&Îòíîñíî WINE", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 /* Strings */
-
+STRINGTABLE DISCARDABLE LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
-STRINGTABLE DISCARDABLE
+{
-BEGIN
+STID_WINE_HELP, 	"WINE Ïîìîù"
-STID_WINE_HELP, 	"Ïîìîù"
 STID_WHERROR, 		"ÃÐÅØÊÀ"
 STID_WARNING,  		"ÏÐÅÄÓÏÐÅÆÄÅÍÈÅ"
-STID_INFO,  		"Ñâåäåíèå"
+STID_INFO,  		"Èíôîðìàöèÿ"
-STID_NOT_IMPLEMENTED, 	"Íå å ãîòîâî"
+STID_NOT_IMPLEMENTED, 	"Íå å ðåàëèçèðàíî"
-STID_HLPFILE_ERROR_s, 	"Ãðåøêà ïðè ÷åòåíå íà ïîìîùåí ôàéë `%s'"
+STID_HLPFILE_ERROR_s, 	"Ãðåøêà ïðè ÷åòåíå íà ïîìîùíèÿ ôàéë `%s'"
 STID_CONTENTS, 		"&Ñúäúðæàíèå"
-STID_SEARCH, 		"&Òúðñåíå"
+STID_SEARCH, 		"&Òúðñè"
-STID_BACK, 		"Íà&çàä"
+STID_BACK, 		"&Íàçàä"
-STID_HISTORY, 		"&Äíåâíèê"
+STID_HISTORY, 		"&Èñòîðèÿ"
 STID_TOPICS,		"&Òåìè"
 STID_ALL_FILES, 	"Âñè÷êè ôàéëîâå (*.*)"
 STID_HELP_FILES_HLP, 	"Ïîìîùíè ôàéëîâå (*.hlp)"
-STID_FILE_NOT_FOUND_s	"Íå íàìèðàì '%s'. Èñêàòå ëè äà ãî íàìåðèòå ñàìè?"
+STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
-END
+}

reactos/base/applications/winhelp/lang/cs-CZ.rc

@@ -23,33 +23,27 @@
 
 /* Czech strings in CP1250 */
 
-LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
-
 /* Menu */
 
-MAIN_MENU MENU
+MAIN_MENU MENU LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
-BEGIN
+{
- POPUP "&Soubor"
+ POPUP "&Soubor" {
- BEGIN
   MENUITEM "&Otevøít", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "&Tisk", MNID_FILE_PRINT
   MENUITEM "Na&stavení tisku...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "&Konec", MNID_FILE_EXIT
- END
+ }
- POPUP "Úprav&y"
+ POPUP "Úprav&y" {
- BEGIN
    MENUITEM "&Kopírovat...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "P&oznamenat si...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "&Záložka"
+ POPUP "&Záložka" {
- BEGIN
    MENUITEM "Pøi&dat...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "&Nápovìda"
+ POPUP "&Nápovìda" {
- BEGIN
    MENUITEM "Náp&ovìda k nápovìdì", MNID_HELP_HELPON
    MENUITEM "Vždy na &vrchu", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -57,13 +51,12 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "O &WINE", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 /* Strings */
-
+STRINGTABLE DISCARDABLE LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
-STRINGTABLE DISCARDABLE
+{
-BEGIN
 STID_WINE_HELP, 	"Nápovìda WINE"
 STID_WHERROR, 		"CHYBA"
 STID_WARNING,  		"VAROVÁNÍ"
@@ -78,4 +71,4 @@ STID_TOPICS,		"&T
 STID_ALL_FILES, 	"Všechny soubory (*.*)"
 STID_HELP_FILES_HLP, 	"Soubory nápovìdy (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
-END
+}

reactos/base/applications/winhelp/lang/da-DK.rc

@@ -19,33 +19,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
-
 /* Menu */
 
-MAIN_MENU MENU
+MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
-BEGIN
+{
- POPUP "&Filer"
+ POPUP "&Filer" {
- BEGIN
   MENUITEM "Å&bn...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "&Udskriv emne", MNID_FILE_PRINT
   MENUITEM "&Indstil printer", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "&Afslut", MNID_FILE_EXIT
- END
+ }
- POPUP "&Rediger"
+ POPUP "&Rediger" {
- BEGIN
    MENUITEM "K&opier...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "&Anmærk...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "Bog&mærke"
+ POPUP "Bog&mærke" {
- BEGIN
    MENUITEM "&Definer...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "&Hjælp"
+ POPUP "&Hjælp" {
- BEGIN
    MENUITEM "&Brug af Hjælp", MNID_HELP_HELPON
    MENUITEM "Altid &øverst", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -53,14 +47,14 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "Om &WINE", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
-BEGIN
+{
 STID_WINE_HELP, 	"WINE Hjælp"
 STID_WHERROR, 		"FEJL"
 STID_WARNING,  		"ADVARSEL"
@@ -75,4 +69,4 @@ STID_TOPICS, 		"To&pics"
 STID_ALL_FILES, 	"Alle filer (*.*)"
 STID_HELP_FILES_HLP, 	"Hjælpe filer (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
-END
+}

reactos/base/applications/winhelp/lang/de-DE.rc

@@ -19,33 +19,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-
 /* Menu */
 
-MAIN_MENU MENU
+MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-BEGIN
+{
- POPUP "&Datei"
+ POPUP "&Datei" {
- BEGIN
   MENUITEM "Ö&ffnen...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "Thema &drucken", MNID_FILE_PRINT
   MENUITEM "Drucker&einrichtung...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "&Beenden", MNID_FILE_EXIT
- END
+ }
- POPUP "&Bearbeiten"
+ POPUP "&Bearbeiten" {
- BEGIN
    MENUITEM "&Kopieren...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "&Anmerken...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "&Lesezeichen"
+ POPUP "&Lesezeichen" {
- BEGIN
    MENUITEM "&Definieren...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "&Hilfe"
+ POPUP "&Hilfe" {
- BEGIN
    MENUITEM "&Hilfe benutzen", MNID_HELP_HELPON
    MENUITEM "Immer im &Vordergrund", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -53,13 +47,13 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "&Über WINE", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-BEGIN
+{
 STID_WINE_HELP, 	"WINE Hilfe"
 STID_WHERROR, 		"FEHLER"
 STID_WARNING,  		"ACHTUNG"
@@ -73,5 +67,5 @@ STID_HISTORY, 		"&Bisher"
 STID_TOPICS, 		"&Topics"
 STID_ALL_FILES, 	"Alle Dateien (*.*)"
 STID_HELP_FILES_HLP, 	"Hilfe-Dateien (*.hlp)"
-STID_FILE_NOT_FOUND_s	"Kann %s' nicht finden. Wollen Sie nach der Datei suchen?"
+STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
-END
+}

reactos/base/applications/winhelp/lang/en-US.rc

@@ -19,33 +19,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
 /* Menu */
 
-MAIN_MENU MENU
+MAIN_MENU MENU LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-BEGIN
+{
- POPUP "&File"
+ POPUP "&File" {
- BEGIN
   MENUITEM "&Open", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "&Print", MNID_FILE_PRINT
   MENUITEM "Printer &setup...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "E&xit", MNID_FILE_EXIT
- END
+ }
- POPUP "&Edit"
+ POPUP "&Edit" {
- BEGIN
    MENUITEM "&Copy...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "&Bookmark"
+ POPUP "&Bookmark" {
- BEGIN
    MENUITEM "&Define...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "&Help"
+ POPUP "&Help" {
- BEGIN
    MENUITEM "Help &on help", MNID_HELP_HELPON
    MENUITEM "Always on &top", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -53,13 +47,22 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "&About WINE", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
+
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Index"
+{
+    LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
+    PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12
+    PUSHBUTTON "&Cancel", IDCANCEL, 120, 170, 50, 12
+}
 
 /* Strings */
-
+STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-STRINGTABLE DISCARDABLE
+{
-BEGIN
 STID_WINE_HELP, 	"WINE Help"
 STID_WHERROR, 		"ERROR"
 STID_WARNING,  		"WARNING"
@@ -74,4 +77,4 @@ STID_TOPICS,		"&Topics"
 STID_ALL_FILES, 	"All files (*.*)"
 STID_HELP_FILES_HLP, 	"Help files (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
-END
+}

reactos/base/applications/winhelp/lang/eo-EO.rc

@@ -21,33 +21,27 @@
 
 /* Cxapelitaj literoj estas en Latin-3 iso8859-3 */
 
-LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
-
 /* Menu */
 
-MAIN_MENU MENU
+MAIN_MENU MENU LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
-BEGIN
+{
- POPUP "&Dosiero"
+ POPUP "&Dosiero" {
- BEGIN
   MENUITEM "&Malfermu", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "&Presu", MNID_FILE_PRINT
   MENUITEM "&Impozu Printilon...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "&Finu", MNID_FILE_EXIT
- END
+ }
- POPUP "&Redakto"
+ POPUP "&Redakto" {
- BEGIN
    MENUITEM "&Kopiu...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "&Notu...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "&Legosigno"
+ POPUP "&Legosigno" {
- BEGIN
    MENUITEM "&Difinu...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "&Helpo"
+ POPUP "&Helpo" {
- BEGIN
    MENUITEM "&Helpu pri helpo", MNID_HELP_HELPON
    MENUITEM "Æiam &supre", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -55,13 +49,12 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "&Pri WINE", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 /* Strings */
-
+STRINGTABLE DISCARDABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
-STRINGTABLE DISCARDABLE
+{
-BEGIN
 STID_WINE_HELP, 	"WINE Helpanto"
 STID_WHERROR, 		"ERARO"
 STID_WARNING,  	"ATENTU"
@@ -76,4 +69,4 @@ STID_TOPICS,		"&Temoj"
 STID_ALL_FILES, 	"Tutaj dosieroj (*.*)"
 STID_HELP_FILES_HLP, 	"Helpaj dosieroj (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
-END
+}

reactos/base/applications/winhelp/lang/es-ES.rc

@@ -20,33 +20,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-
 /* Menu */
 
-MAIN_MENU MENU
+MAIN_MENU MENU LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-BEGIN
+{
- POPUP "&Archivo"
+ POPUP "&Archivo" {
- BEGIN
   MENUITEM "A&brir...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "&Imprimir", MNID_FILE_PRINT
   MENUITEM "&Configuración impresora...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "&Salir", MNID_FILE_EXIT
- END
+ }
- POPUP "&Editar"
+ POPUP "&Editar" {
- BEGIN
    MENUITEM "&Copiar...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "&Anotar...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "&Marcador"
+ POPUP "&Marcador" {
- BEGIN
    MENUITEM "&Definir...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "A&yuda"
+ POPUP "A&yuda" {
- BEGIN
    MENUITEM "&Ayuda sobre la ayuda", MNID_HELP_HELPON
    MENUITEM "&Siempre visible", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -54,13 +48,12 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "&Acerca de WINE", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 /* Strings */
-
+STRINGTABLE DISCARDABLE LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-STRINGTABLE DISCARDABLE
+{
-BEGIN
 STID_WINE_HELP, 	"Ayuda de WINE"
 STID_WHERROR, 		"ERROR"
 STID_WARNING,  		"ADVERTENCIA"
@@ -75,4 +68,4 @@ STID_TOPICS,		"&Temas"
 STID_ALL_FILES, 	"Todos los archivos (*.*)"
 STID_HELP_FILES_HLP, 	"Archivos de ayuda (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
-END
+}

reactos/base/applications/winhelp/lang/fi-FI.rc

@@ -20,33 +20,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
-
 /* Menu */
 
-MAIN_MENU MENU
+MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
-BEGIN
+{
- POPUP "&Tiedosto"
+ POPUP "&Tiedosto" {
- BEGIN
   MENUITEM "&Avaa...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "&Tulosta", MNID_FILE_PRINT
   MENUITEM "&Kirjoittimen asetukset...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "&Lopeta", MNID_FILE_EXIT
- END
+ }
- POPUP "&Muokkaa"
+ POPUP "&Muokkaa" {
- BEGIN
    MENUITEM "&Kopioi...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "&Huomautus...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "&Kirjanmerkki"
+ POPUP "&Kirjanmerkki" {
- BEGIN
    MENUITEM "&Aseta...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "&Ohje"
+ POPUP "&Ohje" {
- BEGIN
    MENUITEM "&Ohjeen käyttö", MNID_HELP_HELPON
    MENUITEM "&Aina päällimmäisenä", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -54,13 +48,13 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "&Tietoja WINEstä", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
-BEGIN
+{
 STID_WINE_HELP, 	"WINE Ohje"
 STID_WHERROR, 		"VIRHE"
 STID_WARNING,  		"VAROITUS"
@@ -75,4 +69,4 @@ STID_TOPICS,		"T&opics"
 STID_ALL_FILES, 	"Kaikki tiedostot (*.*)"
 STID_HELP_FILES_HLP, 	"Ohjetiedostot (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
-END
+}

reactos/base/applications/winhelp/lang/fr-FR.rc

@@ -24,28 +24,24 @@
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 MAIN_MENU MENU
-BEGIN
+{
- POPUP "&Fichier"
+ POPUP "&Fichier" {
- BEGIN
   MENUITEM "&Ouvrir", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "Im&primer", MNID_FILE_PRINT
   MENUITEM "&Configuration de l'imprimante...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "&Quitter", MNID_FILE_EXIT
- END
+ }
- POPUP "É&dition"
+ POPUP "É&dition" {
- BEGIN
    MENUITEM "&Copier...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "&Annotation...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "&Signet"
+ POPUP "&Signet" {
- BEGIN
    MENUITEM "&Définir...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "Aid&e"
+ POPUP "Aid&e" {
- BEGIN
    MENUITEM "&Utiliser l'aide", MNID_HELP_HELPON
    MENUITEM "&Toujours visible", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -53,18 +49,18 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "À &propos de WINE", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 /* Strings */
 STRINGTABLE DISCARDABLE
-BEGIN
+{
 STID_WINE_HELP, 	"Aide de WINE"
 STID_WHERROR, 		"ERREUR"
 STID_WARNING,  		"ATTENTION"
 STID_INFO,  		"Information"
 STID_NOT_IMPLEMENTED, 	"Non implémenté"
-STID_HLPFILE_ERROR_s, 	"Une erreur est survenue en lisant le fichier d'aide « %s »"
+STID_HLPFILE_ERROR_s, 	"Une erreur est survenue en lisant le fichier d'aide « %s »"
 STID_CONTENTS, 		"&Index"
 STID_SEARCH, 		"&Rechercher"
 STID_BACK, 		"&Précédent"
@@ -72,5 +68,5 @@ STID_HISTORY, 		"&Historique"
 STID_TOPICS,		"&Sujets"
 STID_ALL_FILES, 	"Tous fichiers (*.*)"
 STID_HELP_FILES_HLP, 	"Fichiers d'aide (*.hlp)"
-STID_FILE_NOT_FOUND_s	"Impossible de trouver '%s'. Voulez-vous rechercher ce fichier ?"
+STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
-END
+}

reactos/base/applications/winhelp/lang/hu-HU.rc

@@ -20,33 +20,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
-
 /* Menu */
 
-MAIN_MENU MENU
+MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
-BEGIN
+{
- POPUP "&Fájl"
+ POPUP "&Fájl" {
- BEGIN
   MENUITEM "&Megnyitás...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "&Nyomtatás", MNID_FILE_PRINT
   MENUITEM "Nyomtató &beállítás...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "&Kilépés", MNID_FILE_EXIT
- END
+ }
- POPUP "&Szerkesztés"
+ POPUP "&Szerkesztés" {
- BEGIN
    MENUITEM "&Másolás...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "&Jegyzet...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "&Könyvjelzõ"
+ POPUP "&Könyvjelzõ" {
- BEGIN
    MENUITEM "&Definiálás...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "&Súgó"
+ POPUP "&Súgó" {
- BEGIN
    MENUITEM "&Használat", MNID_HELP_HELPON
    MENUITEM "Mindig &legfelül", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -54,13 +48,13 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "&&A WINE-ról", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
-BEGIN
+{
 STID_WINE_HELP, 	"WINE súgó"
 STID_WHERROR, 		"HIBA"
 STID_WARNING,  		"FIGYELMEZTETÉS"
@@ -75,4 +69,4 @@ STID_TOPICS,		"&T
 STID_ALL_FILES, 	"Minden fájl (*.*)"
 STID_HELP_FILES_HLP, 	"Súgó fájlok (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
-END
+}

reactos/base/applications/winhelp/lang/it-IT.rc

@@ -19,33 +19,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
-
 /* Menu */
 
-MAIN_MENU MENU
+MAIN_MENU MENU LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
-BEGIN
+{
- POPUP "&File"
+ POPUP "&File" {
- BEGIN
   MENUITEM "&Apri...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "S&tampa", MNID_FILE_PRINT
   MENUITEM "&Setup stampante...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "&Esci", MNID_FILE_EXIT
- END
+ }
- POPUP "&Modifica"
+ POPUP "&Modifica" {
- BEGIN
    MENUITEM "&Copia...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "&Annota...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "&Segnalibro"
+ POPUP "&Segnalibro" {
- BEGIN
    MENUITEM "&Definisci...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "&?"
+ POPUP "&?" {
- BEGIN
    MENUITEM "&Aiuto sulla guida", MNID_HELP_HELPON
    MENUITEM "Sempre in primo &piano", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -53,25 +47,25 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "&Informazion su WINE", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
-BEGIN
+{
-STID_WINE_HELP,         "Guida di WINE"
+STID_WINE_HELP, 	"Guida di WINE"
-STID_WHERROR,           "ERRORE"
+STID_WHERROR, 		"ERRORE"
-STID_WARNING,           "ATTENZIONE"
+STID_WARNING,  		"ATTENZIONE"
-STID_INFO,              "Informazione"
+STID_INFO,  		"Informazione"
 STID_NOT_IMPLEMENTED, 	"Non ancora implementato"
 STID_HLPFILE_ERROR_s, 	"Errore di lettura del file della Guida `%s'"
-STID_CONTENTS,          "&Sommario"
+STID_CONTENTS, 		"&Sommario"
-STID_SEARCH,            "&Trova"
+STID_SEARCH, 		"&Trova"
-STID_BACK,              "&Precedente"
+STID_BACK, 		"&Precedente"
-STID_HISTORY,           "&Cronologia"
+STID_HISTORY, 		"&Cronologia"
-STID_TOPICS,            "&Argomenti"
+STID_TOPICS,		"&Argomenti"
-STID_ALL_FILES,         "Tutti i file (*.*)"
+STID_ALL_FILES, 	"Tutti i file (*.*)"
 STID_HELP_FILES_HLP, 	"File della Guida (*.hlp)"
-STID_FILE_NOT_FOUND_s	"Impossibile trovare '%s'. Volete indicare voi dove si trova il file?"
+STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
-END
+}

reactos/base/applications/winhelp/lang/ko-KO.rc

@@ -19,33 +19,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
-
 /* Menu */
 
-MAIN_MENU MENU
+MAIN_MENU MENU LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL
-BEGIN
+{
- POPUP "파일(&F)"
+ POPUP "파일(&F)" {
- BEGIN
   MENUITEM "열기(&O)...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "인쇄(&P)", MNID_FILE_PRINT
   MENUITEM "프린터 설정(&S)...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "종료(&E)", MNID_FILE_EXIT
- END
+ }
- POPUP "편집(&E)"
+ POPUP "편집(&E)" {
- BEGIN
    MENUITEM "복사(&C)...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "주석(&A)...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "책갈피(&B)"
+ POPUP "책갈피(&B)" {
- BEGIN
    MENUITEM "정의(&D)...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "도움말(&H)"
+ POPUP "도움말(&H)" {
- BEGIN
    MENUITEM "도움말 사용법(&O)", MNID_HELP_HELPON
    MENUITEM "항상 위(&T)", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -53,13 +47,13 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "Wine에 관하여(&A)", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL
-BEGIN
+{
 STID_WINE_HELP, 	"Wine 도움말"
 STID_WHERROR, 		"오류"
 STID_WARNING,  		"경고"
@@ -74,4 +68,4 @@ STID_TOPICS,		"
 STID_ALL_FILES, 	"모든 파일 (*.*)"
 STID_HELP_FILES_HLP, 	"도움말 파일 (*.hlp)"
 STID_FILE_NOT_FOUND_s	"%s을 찾을 수 없습니다'. 이 파일을 스스로 찾겠습니까?"
-END
+}

reactos/base/applications/winhelp/lang/nb-NO.rc

@@ -18,33 +18,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
-
 /* Menu */
 
-MAIN_MENU MENU
+MAIN_MENU MENU LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
-BEGIN
+{
- POPUP "&Fil"
+ POPUP "&Fil" {
- BEGIN
   MENUITEM "&Åpne", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "Skriv &ut", MNID_FILE_PRINT
   MENUITEM "Opp&sett av skriveren . . .", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "&Avslutt", MNID_FILE_EXIT
- END
+ }
- POPUP "R&ediger"
+ POPUP "R&ediger" {
- BEGIN
    MENUITEM "&Kopier . . .", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "K&ommenter . . .", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "&Bokmerke"
+ POPUP "&Bokmerke" {
- BEGIN
    MENUITEM "&Definer . . .", MNID_BKMK_DEFINE
- END
+ }
- POPUP "&Hjelp"
+ POPUP "&Hjelp" {
- BEGIN
    MENUITEM "&Hjelp til Hjelp", MNID_HELP_HELPON
    MENUITEM "All&tid øverst", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -52,12 +46,12 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "&om WINE", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 /* Strings */
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
-BEGIN
+{
 STID_WINE_HELP, 	"Hjelp"
 STID_WHERROR, 		"FEIL"
 STID_WARNING,  		"ADVARSEL"
@@ -72,4 +66,4 @@ STID_TOPICS,		"&Emner"
 STID_ALL_FILES, 	"Alle filer (*.*)"
 STID_HELP_FILES_HLP, 	"Hjelp-filer (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
-END
+}

reactos/base/applications/winhelp/lang/nl-NL.rc

@@ -18,33 +18,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
-
 /* Menu */
 
-MAIN_MENU MENU
+MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
-BEGIN
+{
- POPUP "&Bestand"
+ POPUP "&Bestand" {
- BEGIN
   MENUITEM "&Openen", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "Af&drukken", MNID_FILE_PRINT
   MENUITEM "&Printerinstellingen...", MNID_FILE_SETUP
   MENUITEM SEPARATOR
   MENUITEM "&Afsluiten", MNID_FILE_EXIT
- END
+ }
- POPUP "&Bewerken"
+ POPUP "&Bewerken" {
- BEGIN
    MENUITEM "&Kopiëren...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "&Annoteren...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "&Favorieten"
+ POPUP "&Favorieten" {
- BEGIN
    MENUITEM "&Aanmaken...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "&Help"
+ POPUP "&Help" {
- BEGIN
    MENUITEM "Hulp &bij help", MNID_HELP_HELPON
    MENUITEM "Altijd &zichtbaar", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -52,12 +46,12 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "&Over WINE", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 /* Strings */
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
-BEGIN
+{
 STID_WINE_HELP, 	"WINE Help"
 STID_WHERROR, 		"FOUT"
 STID_WARNING,  		"WAARSCHUWING"
@@ -72,4 +66,4 @@ STID_TOPICS,		"&Onderwerpen"
 STID_ALL_FILES, 	"Alle bestanden (*.*)"
 STID_HELP_FILES_HLP, 	"Helpbestanden (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
-END
+}

reactos/base/applications/winhelp/lang/pl-PL.rc

@@ -20,33 +20,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-
 /* Menu */
 
-MAIN_MENU MENU
+MAIN_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-BEGIN
+{
- POPUP "&Plik"
+ POPUP "&Plik" {
- BEGIN
   MENUITEM "&Otwórz", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "&Drukuj", MNID_FILE_PRINT
   MENUITEM "&Ustawienia drukarki...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "&Wyjœcie", MNID_FILE_EXIT
- END
+ }
- POPUP "&Edycja"
+ POPUP "&Edycja" {
- BEGIN
    MENUITEM "&Kopiuj...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "&Skomentuj...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "&Zak³adka"
+ POPUP "&Zak³adka" {
- BEGIN
    MENUITEM "&Zdefiniuj...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "Pomo&c"
+ POPUP "Pomo&c" {
- BEGIN
    MENUITEM "&Pomoc", MNID_HELP_HELPON
    MENUITEM "&Zawsze na wierzchu", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -54,12 +48,12 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "&O programie WINE", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 /* Strings */
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-BEGIN
+{
 STID_WINE_HELP, 	"WINE - Pomoc"
 STID_WHERROR, 		"B£¥D"
 STID_WARNING,  		"OSTRZE¯ENIE"
@@ -73,5 +67,5 @@ STID_HISTORY, 		"&Historia"
 STID_TOPICS,		"&Tematy"
 STID_ALL_FILES, 	"Wszystkie pliki (*.*)"
 STID_HELP_FILES_HLP, 	"Pliki pomocy (*.hlp)"
-STID_FILE_NOT_FOUND_s	"Nie mo¿na odnaleŸæ pliku '%s'. Czy chcesz spróbowaæ zlokalizowaæ ten plik samodzielnie?"
+STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
-END
+}

reactos/base/applications/winhelp/lang/pt-BR.rc

@@ -6,7 +6,7 @@
  * Portuguese translation by Gustavo Junior Alves <alves@correionet.com.br>
  * Copyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>
  * Copyright 2003 Marcelo Duarte
- * Copyright 2004 Américo José Melo
+ * Copyright 2004,2007 Américo José Melo
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -28,28 +28,24 @@
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 MAIN_MENU MENU
-BEGIN
+{
- POPUP "&Arquivo"
+ POPUP "&Arquivo" {
- BEGIN
   MENUITEM "&Abrir...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "&Imprimir", MNID_FILE_PRINT
   MENUITEM "&Configurar Impressora...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "Sai&r", MNID_FILE_EXIT
- END
+ }
- POPUP "&Editar"
+ POPUP "&Editar" {
- BEGIN
    MENUITEM "&Copiar...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "&Anotar...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "In&dicador"
+ POPUP "In&dicador" {
- BEGIN
    MENUITEM "&Definir...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "Aj&uda"
+ POPUP "Aj&uda" {
- BEGIN
    MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON
    MENUITEM "Sempre &visível", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -57,13 +53,46 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "&Sobre WINE", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+MAIN_MENU MENU
+{
+ POPUP "&Ficheiro" {
+  MENUITEM "&Abrir...", MNID_FILE_OPEN
+  MENUITEM SEPARATOR
+  MENUITEM "&Imprimir", MNID_FILE_PRINT
+  MENUITEM "&Configurar Impressora...", MNID_FILE_SETUP
+   MENUITEM SEPARATOR
+  MENUITEM "Sai&r", MNID_FILE_EXIT
+ }
+ POPUP "&Editar" {
+   MENUITEM "&Copiar...", MNID_EDIT_COPYDLG
+   MENUITEM SEPARATOR
+   MENUITEM "&Anotar...", MNID_EDIT_ANNOTATE
+ }
+ POPUP "In&dicador" {
+   MENUITEM "&Definir...", MNID_BKMK_DEFINE
+ }
+ POPUP "Aj&uda" {
+   MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON
+   MENUITEM "Sempre &visível", MNID_HELP_HELPTOP
+   MENUITEM SEPARATOR
+   MENUITEM "&Informações...", MNID_HELP_ABOUT
+#ifdef WINELIB
+   MENUITEM "&Acerca do WINE", MNID_HELP_WINE
+#endif
+ }
+}
 
 /* Strings */
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
 STRINGTABLE DISCARDABLE
-BEGIN
+{
 STID_WINE_HELP, 	"Ajuda WINE"
 STID_WHERROR, 		"ERRO"
 STID_WARNING,  		"AVISO"
@@ -78,4 +107,24 @@ STID_TOPICS,		"&T
 STID_ALL_FILES, 	"Todos os arquivos (*.*)"
 STID_HELP_FILES_HLP, 	"Arquivos de ajuda (*.hlp)"
 STID_FILE_NOT_FOUND_s   "Cannot find '%s'. Do you want to find this file yourself?"
-END
+}
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+STRINGTABLE DISCARDABLE
+{
+STID_WINE_HELP, 	"Ajuda WINE"
+STID_WHERROR, 		"ERRO"
+STID_WARNING,  		"AVISO"
+STID_INFO,  		"Informação"
+STID_NOT_IMPLEMENTED, 	"Não implementado"
+STID_HLPFILE_ERROR_s, 	"Erro encontrado na leitura do ficheiro de ajuda '%s'"
+STID_CONTENTS, 		"&Conteúdo"
+STID_SEARCH, 		"&Procurar"
+STID_BACK, 		"&Voltar"
+STID_HISTORY, 		"&Histórico"
+STID_TOPICS,		"&Tópicos"
+STID_ALL_FILES, 	"Todos os ficheiros (*.*)"
+STID_HELP_FILES_HLP, 	"Ficheiros de ajuda (*.hlp)"
+STID_FILE_NOT_FOUND_s	"Não é possível encontrar '%s'. Deseja procurar este ficheiro você mesmo?"
+}

reactos/base/applications/winhelp/lang/ru-RU.rc

@@ -18,33 +18,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-
 /* Menu */
 
-MAIN_MENU MENU
+MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-BEGIN
+{
- POPUP "&Ôàéë"
+ POPUP "&Ôàéë" {
- BEGIN
   MENUITEM "&Îòêðûòü", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "&Ïå÷àòàòü", MNID_FILE_PRINT
   MENUITEM "Íàñòðîéêà &ïðèíòåðà...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "&Âûõîä", MNID_FILE_EXIT
- END
+ }
- POPUP "&Ïðàâêà"
+ POPUP "&Ïðàâêà" {
- BEGIN
    MENUITEM "&Êîïèðîâàòü...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "&Çàìåòêè...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "&Çàêëàäêà"
+ POPUP "&Çàêëàäêà" {
- BEGIN
    MENUITEM "&Îïðåäåëèòü...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "&Ñïðàâêà"
+ POPUP "&Ñïðàâêà" {
- BEGIN
    MENUITEM "Ïîìîùü &ïî ïîìîùè", MNID_HELP_HELPON
    MENUITEM "Âñåãäà &ñâåðõó", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -52,12 +46,22 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "&Î Wine", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
+
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Óêàçàòåëü"
+{
+    LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER
+    PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12
+    PUSHBUTTON "&Îòìåíà", IDCANCEL, 120, 170, 50, 12
+}
 
 /* Strings */
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-BEGIN
+{
 STID_WINE_HELP, 	"Ñïðàâêà WINE"
 STID_WHERROR, 		"ÎØÈÁÊÀ"
 STID_WARNING,  		"ÂÍÈÌÀÍÈÅ"
@@ -72,4 +76,4 @@ STID_TOPICS,		"&
 STID_ALL_FILES, 	"Âñå ôàéëû (*.*)"
 STID_HELP_FILES_HLP, 	"Ôàéëû ñïðàâêè (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Íå ìîãó íàéòè '%s'. Âû õîòèòå íàéòè ýòîò ôàéë ñàìîñòîÿòåëüíî?"
-END
+}

reactos/base/applications/winhelp/lang/sk-SK.rc

@@ -1,10 +1,3 @@
-/*
-* FILE:        base/applications/winhelp/lang/sk-SK.rc
-* PURPOSE:     Slovak Language File for winhelp
-* TRANSLATOR:  Kario (kario@szm.sk)
-* DATE OF TR:  04-08-2007
-*/
-
 /*
  * Help Viewer
  *
@@ -25,55 +18,49 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
+MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
-
+{
-MAIN_MENU MENU
+ POPUP "&Súbor" {
-BEGIN
- POPUP "&Súbor"
- BEGIN
    MENUITEM "&Otvori<72>...", MNID_FILE_OPEN
    MENUITEM SEPARATOR
    MENUITEM "&Tlaèi<C3A8>", MNID_FILE_PRINT
    MENUITEM "&Nastavenie tlaèe...", MNID_FILE_SETUP
    MENUITEM "U&konèi<C3A8>", MNID_FILE_EXIT
- END
+ }
- POPUP "&Upravi<76>"
+ POPUP "&Upravi<76>" {
- BEGIN
    MENUITEM "Kopí&rova<76>...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "&Skomentova<76>...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "&Záložka"
+ POPUP "&Záložka" {
- BEGIN
    MENUITEM "&Definova<76>...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "&Pomocík"
+ POPUP "&Pomoc" {
- BEGIN
+   MENUITEM "Pomoc &na pomoci", MNID_HELP_HELPON
-   MENUITEM "&Ako použi<C5BE> Pomocníka", MNID_HELP_HELPON
    MENUITEM "Vždy na &vrchu", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
    MENUITEM "&Info...", MNID_HELP_ABOUT
 #ifdef WINELIB
-   MENUITEM "È&o je ReactOS", MNID_HELP_WINE
+   MENUITEM "O& WINE", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 /* Strings */
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
-BEGIN
+{
-STID_WINE_HELP,             "Pomocník ReactOSu"
+STID_WINE_HELP,             "WINE Pomoc"
 STID_WHERROR,               "CHYBA"
-STID_WARNING,               "UPOZORNENIE"
+STID_WARNING,               "VAROVANIE"
 STID_INFO,                  "Informácie"
 STID_NOT_IMPLEMENTED,       "Neimplementované"
-STID_HLPFILE_ERROR_s,       "Pri pokuse otvori<72> súbor pomocníka '%s' sa vyskytla chyba."
+STID_HLPFILE_ERROR_s,       "Chyba poèas èítania súboru `%s'"
 STID_CONTENTS,              "&Obsah"
 STID_SEARCH,                "&H¾ada<64>"
 STID_BACK,                  "&Spä<70>"
 STID_HISTORY,               "&História"
-STID_TOPICS,		    "&Témy"
+STID_TOPICS,		    "&Topics"
 STID_ALL_FILES,             "Všetky súbory (*.*)"
 STID_HELP_FILES_HLP,        "Súbory pomoci (*.hlp)"
-STID_FILE_NOT_FOUND_s       "Súbor '%s' nebol nájdený. Chcete sa pokúsi<73> nájs<6A> tento súbor sami?"
+STID_FILE_NOT_FOUND_s       "Cannot find '%s'. Do you want to find this file yourself?"
-END
+}

reactos/base/applications/winhelp/lang/sl-SI.rc

@@ -18,33 +18,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
-
 /* Menu */
 
-MAIN_MENU MENU
+MAIN_MENU MENU LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
-BEGIN
+{
- POPUP "&Datoteka"
+ POPUP "&Datoteka" {
- BEGIN
   MENUITEM "&Odpri ...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "Na&tisni temo ...", MNID_FILE_PRINT
   MENUITEM "&Priprava tiskalnika", MNID_FILE_SETUP
   MENUITEM SEPARATOR
   MENUITEM "Iz&hod", MNID_FILE_EXIT
- END
+ }
- POPUP "&Urejanje"
+ POPUP "&Urejanje" {
- BEGIN
    MENUITEM "&Kopiraj", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "&Pripombe ...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "&Zaznamek"
+ POPUP "&Zaznamek" {
- BEGIN
    MENUITEM "&Doloèi ...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "&Pomoè"
+ POPUP "&Pomoè" {
- BEGIN
    MENUITEM "&O pomoèi", MNID_HELP_HELPON
    MENUITEM "Vedno na &vrhu", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -52,12 +46,12 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "&O WINE", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 /* Strings */
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
-BEGIN
+{
 STID_WINE_HELP, 		"WINE Pomoè"
 STID_WHERROR, 		"NAPAKA"
 STID_WARNING,  		"OPOZORILO"
@@ -72,4 +66,4 @@ STID_TOPICS,		"&Vsebina"
 STID_ALL_FILES, 		"Vse datiteke (*.*)"
 STID_HELP_FILES_HLP, 	"Datoteke s pomoèjo (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
-END
+}

reactos/base/applications/winhelp/lang/sv-SE.rc

@@ -4,6 +4,7 @@
  * Copyright 1996 Ulrich Schmid
  * Swedish language by Karl Backström <karl_b@geocities.com>
  * Copyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>
+ * Copyright 2007 Daniel Nylander
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,59 +21,52 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
-
 /* Menu */
 
-MAIN_MENU MENU
+MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
-BEGIN
+{
- POPUP "&Arkiv"
+ POPUP "&Arkiv" {
- BEGIN
+  MENUITEM "&Öppna", MNID_FILE_OPEN
-  MENUITEM "&Öppna...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "&Skriv ut", MNID_FILE_PRINT
-  MENUITEM "Skrivar &inställningar...", MNID_FILE_SETUP
+  MENUITEM "Skrivar&konfiguration...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
-  MENUITEM "&Avsluta", MNID_FILE_EXIT
+  MENUITEM "A&vsluta", MNID_FILE_EXIT
- END
+ }
- POPUP "&Redigera"
+ POPUP "R&edigera" {
- BEGIN
    MENUITEM "&Kopiera...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
-   MENUITEM "&Markera...", MNID_EDIT_ANNOTATE
+   MENUITEM "&Kommentera...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "&Bokmärke"
+ POPUP "&Bokmärke" {
- BEGIN
+   MENUITEM "&Definiera...", MNID_BKMK_DEFINE
-   MENUITEM "&Defingera...", MNID_BKMK_DEFINE
+ }
- END
+ POPUP "&Hjälp" {
- POPUP "&Hjälp"
+   MENUITEM "Hjälp &för hjälp", MNID_HELP_HELPON
- BEGIN
+   MENUITEM "Alltid &överst", MNID_HELP_HELPTOP
-   MENUITEM "Användningen &av hjälp", MNID_HELP_HELPON
-   MENUITEM "Alltid &överst", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
-   MENUITEM "&Information...", MNID_HELP_ABOUT
+   MENUITEM "&Info...", MNID_HELP_ABOUT
 #ifdef WINELIB
    MENUITEM "&Om WINE", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 /* Strings */
-
+STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
-STRINGTABLE DISCARDABLE
+{
-BEGIN
+STID_WINE_HELP, 	"WINE Hjälp"
-STID_WINE_HELP, 	"WINE Hjälp"
 STID_WHERROR, 		"FEL"
 STID_WARNING,  		"VARNING"
 STID_INFO,  		"Information"
-STID_NOT_IMPLEMENTED, 	"Ej implementererat"
+STID_NOT_IMPLEMENTED, 	"Inte implementerat"
-STID_HLPFILE_ERROR_s, 	"FEL vid läsning av hjälp filen `%s'"
+STID_HLPFILE_ERROR_s, 	"Fel vid läsning av hjälpfilen `%s'"
-STID_CONTENTS, 		"&Innehåll"
+STID_CONTENTS, 		"&Innehåll"
-STID_SEARCH, 		"&Sök"
+STID_SEARCH, 		"&Sök"
-STID_BACK, 		"&Tillbaka"
+STID_BACK, 		"&Bakåt"
-STID_HISTORY, 		"&Översikt"
+STID_HISTORY, 		"&Historik"
-STID_TOPICS,		"T&opics"
+STID_TOPICS,		"&Ämnen"
-STID_ALL_FILES, 	"Alla filer (*.*))"
+STID_ALL_FILES, 	"Alla filer (*.*)"
-STID_HELP_FILES_HLP, 	"Hjälp filer (*.hlp)"
+STID_HELP_FILES_HLP, 	"Hjälpfiler (*.hlp)"
-STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
+STID_FILE_NOT_FOUND_s	"Kan inte hitta '%s'. Vill du söka efter denna fil?"
-END
+}

reactos/base/applications/winhelp/lang/tr-TR.rc

@@ -18,33 +18,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
-
 /* Menu */
 
-MAIN_MENU MENU
+MAIN_MENU MENU LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
-BEGIN
+{
- POPUP "&Dosya"
+ POPUP "&Dosya" {
- BEGIN
   MENUITEM "&Aç", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "Ya&zdýr", MNID_FILE_PRINT
   MENUITEM "&Yazýcý ayarlarý...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "&Çýkýþ", MNID_FILE_EXIT
- END
+ }
- POPUP "Dü&zen"
+ POPUP "Dü&zen" {
- BEGIN
    MENUITEM "K&opyala...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "&Annotate...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "Yer Ý&mleri"
+ POPUP "Yer Ý&mleri" {
- BEGIN
    MENUITEM "&Tanýmla...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "&Yardým"
+ POPUP "&Yardým" {
- BEGIN
    MENUITEM "&Yardým Kullanýmý", MNID_HELP_HELPON
    MENUITEM "&Her Zaman Üstte", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -52,12 +46,12 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "WINE &Hakkýnda", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 /* Strings */
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
-BEGIN
+{
 STID_WINE_HELP, 	"WINE Yardým"
 STID_WHERROR, 		"HATA"
 STID_WARNING,  		"UYARI"
@@ -72,4 +66,4 @@ STID_TOPICS,		"&Konular"
 STID_ALL_FILES, 	"Tüm dosyalar (*.*)"
 STID_HELP_FILES_HLP, 	"Yardým dosyalarý (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
-END
+}

reactos/base/applications/winhelp/lang/va-VA.rc

@@ -27,28 +27,24 @@
 *  not supported today
 */
 MAIN_MENU MENU LANGUAGE LANG_, SUBLANG_DEFAULT
-BEGIN
+{
- POPUP "&Datoteca"
+ POPUP "&Datoteca" {
- BEGIN
   MENUITEM "&Rivir", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "&Stampar tema", MNID_FILE_PRINT
   MENUITEM "&Installaziun dal stampader...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "&Finir", MNID_FILE_EXIT
- END
+ }
- POPUP "&Lavurar"
+ POPUP "&Lavurar" {
- BEGIN
    MENUITEM "Capchar", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "&Annotaziun...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "&Marca"
+ POPUP "&Marca" {
- BEGIN
    MENUITEM "&Definir...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "&Agüd"
+ POPUP "&Agüd" {
- BEGIN
    MENUITEM "&Douvrar l'agüd", MNID_HELP_HELPON
    MENUITEM "Adüna da&vant", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -56,13 +52,13 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "Davart &WINE", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 /* Strings */
 
 STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
-BEGIN
+{
 WINE_HELP, 		"WINE agüd"
 WHERROR, 		"SBAGL"
 WARNING,  		"ATTENZIUN"
@@ -77,4 +73,4 @@ TOPICS,			"T&opics"
 ALL_FILES, 		"Tuot las datotecas (*.*)"
 HELP_FILES_HLP, 	"Datotecas d'agüd (*.hlp)"
 STID_FILE_NOT_FOUND_s   "Cannot find '%s'. Do you want to find this file yourself?"
-END
+}

reactos/base/applications/winhelp/lang/wa-WA.rc

@@ -20,33 +20,29 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-LANGUAGE LANG_WALON, SUBLANG_DEFAULT
+#ifdef LANG_WALON
 
 /* Menu */
 
-MAIN_MENU MENU
+MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_DEFAULT
-BEGIN
+{
- POPUP "&Fitchî"
+ POPUP "&Fitchî" {
- BEGIN
   MENUITEM "&Drovî...", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "&Rexhe", MNID_FILE_PRINT
   MENUITEM "&Apontiaedje del scrirece...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "Moussî &Foû", MNID_FILE_EXIT
- END
+ }
- POPUP "&Candjî"
+ POPUP "&Candjî" {
- BEGIN
    MENUITEM "&Copyî...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "&Sicrîre...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "&Rimårkes"
+ POPUP "&Rimårkes" {
- BEGIN
    MENUITEM "&Defini...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "&Aide"
+ POPUP "&Aide" {
- BEGIN
    MENUITEM "&Aide so l' Aide", MNID_HELP_HELPON
    MENUITEM "Todi &Visibe", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -54,13 +50,13 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "Å &dfait di WINEE", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 /* Strings */
 
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT
-BEGIN
+{
 STID_WINE_HELP, 	"Aidance di WINE"
 STID_WHERROR, 		"AROKE"
 STID_WARNING,  		"ADVERTIXHMINT"
@@ -75,4 +71,6 @@ STID_TOPICS,		"&Topics"
 STID_ALL_FILES, 	"Tos les fitchîs (*.*)"
 STID_HELP_FILES_HLP, 	"Fitchîs d' aide (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
-END
+}
+
+#endif  /* LANG_WALON */

reactos/base/applications/winhelp/lang/zh-CN.rc

@@ -21,31 +21,25 @@
 
 /* Menu */
 
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
+MAIN_MENU MENU LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-
+{
-MAIN_MENU MENU
+ POPUP "文件（&F）" {
-BEGIN
- POPUP "文件（&F）"
- BEGIN
   MENUITEM "打开（&O）", MNID_FILE_OPEN
   MENUITEM SEPARATOR
   MENUITEM "打印（&P）", MNID_FILE_PRINT
   MENUITEM "打印机设置（&S）...", MNID_FILE_SETUP
    MENUITEM SEPARATOR
   MENUITEM "退出（&E）", MNID_FILE_EXIT
- END
+ }
- POPUP "编辑（&E）"
+ POPUP "编辑（&E）" {
- BEGIN
    MENUITEM "复制（&C）...", MNID_EDIT_COPYDLG
    MENUITEM SEPARATOR
    MENUITEM "注释（&A）...", MNID_EDIT_ANNOTATE
- END
+ }
- POPUP "书签（&B）"
+ POPUP "书签（&B）" {
- BEGIN
    MENUITEM "定义（&D）...", MNID_BKMK_DEFINE
- END
+ }
- POPUP "帮助（&H）"
+ POPUP "帮助（&H）" {
- BEGIN
    MENUITEM "如何使用帮助（&O）", MNID_HELP_HELPON
    MENUITEM "总是在最前面（&T）", MNID_HELP_HELPTOP
    MENUITEM SEPARATOR
@@ -53,12 +47,12 @@ BEGIN
 #ifdef WINELIB
    MENUITEM "关于 WINE（&A）", MNID_HELP_WINE
 #endif
- END
+ }
-END
+}
 
 /* Strings */
-STRINGTABLE DISCARDABLE
+STRINGTABLE DISCARDABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-BEGIN
+{
 STID_WINE_HELP, 	"WINE 帮助"
 STID_WHERROR, 		"错误"
 STID_WARNING,  		"警告"
@@ -73,4 +67,4 @@ STID_TOPICS,		"
 STID_ALL_FILES, 	"所有文件 (*.*)"
 STID_HELP_FILES_HLP, 	"帮助文件 (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"
-END
+}

reactos/base/applications/winhelp/lex.yy.c

@@ -417,7 +417,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhelp);
 static LPCSTR  macroptr;
 static LPSTR   strptr;
 static int     quote_stack[32];
-static int     quote_stk_idx = 0;
+static unsigned int quote_stk_idx = 0;
 struct lexret  yylval;
 
 #define YY_INPUT(buf,result,max_size)\
@@ -1689,8 +1689,8 @@ static int MACRO_CallBoolFunc(FARPROC fn, const char* args, void** ret);
  */
 static int MACRO_CheckArgs(void* pa[], unsigned max, const char* args)
 {
-    int         t;
+    int t;
-    int         len = 0, idx = 0;
+    unsigned int len = 0, idx = 0;
 
     WINE_TRACE("Checking %s\n", args);
 
@@ -1706,24 +1706,24 @@ static int MACRO_CheckArgs(void* pa[], unsigned max, const char* args)
 
             switch (*args)
             {
-            case 'S':
+            case 'S': 
                 if (t != STRING)
                 {WINE_WARN("missing S\n");return -1;}
-                pa[idx] = (void*)yylval.string;
+                pa[idx] = (void*)yylval.string;  
                 break;
             case 'U':
             case 'I':
                 if (t != INTEGER)
-                {WINE_WARN("missing U\n");return -1;}
+                {WINE_WARN("missing U\n");return -1;}   
-                pa[idx] = (void*)yylval.integer;
+                pa[idx] = (void*)yylval.integer; 
                 break;
             case 'B':
-                if (t != BOOL_FUNCTION)
+                if (t != BOOL_FUNCTION) 
-                {WINE_WARN("missing B\n");return -1;}
+                {WINE_WARN("missing B\n");return -1;}   
                 if (MACRO_CallBoolFunc(yylval.function, yylval.proto, &pa[idx]) == 0)
                     return -1;
                 break;
-            default:
+            default: 
                 WINE_WARN("unexpected %s while args is %c\n", ts(t), *args);
                 return -1;
             }
@@ -1802,7 +1802,7 @@ BOOL MACRO_ExecuteMacro(LPCSTR macro)
 {
     int t;
 
-    //WINE_TRACE("%s\n", wine_dbgstr_a(macro));
+    WINE_TRACE("%s\n", wine_dbgstr_a(macro));
 
     macroptr = macro;
 

reactos/base/applications/winhelp/macro.c

@@ -233,7 +233,7 @@ void CALLBACK MACRO_BackFlush(void)
 
     if (win)
     {
-        int     i;
+        unsigned int i;
 
         for (i = 0; i < win->backIndex; i++)
         {
@@ -523,7 +523,7 @@ void CALLBACK MACRO_Find(void)
 
 void CALLBACK MACRO_Finder(void)
 {
-    WINE_FIXME("()\n");
+    WINHELP_CreateIndexWindow();
 }
 
 void CALLBACK MACRO_FloatingMenu(void)
@@ -807,7 +807,7 @@ void CALLBACK MACRO_RegisterRoutine(LPCSTR dll_name, LPCSTR proc, LPCSTR args)
     {
         HANDLE hLib = LoadLibrary(dll_name);
 
-        /* FIXME: the library will not be unloaded until exit of program
+        /* FIXME: the library will not be unloaded until exit of program 
          * We don't send the DW_TERM message
          */
         WINE_TRACE("Loading %s\n", dll_name);

reactos/base/applications/winhelp/macro.h

@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef __MACRO_H__
-#define __MACRO_H__
-
 #include <stdarg.h>
 
 #include "windef.h"
@@ -136,5 +133,3 @@ void CALLBACK MACRO_UpdateWindow(LPCSTR, LPCSTR);
 /* Local Variables:    */
 /* c-file-style: "GNU" */
 /* End:                */
-
-#endif /* __MACRO_H__ */

reactos/base/applications/winhelp/macro.lex.l

@@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhelp);
 static LPCSTR  macroptr;
 static LPSTR   strptr;
 static int     quote_stack[32];
-static int     quote_stk_idx = 0;
+static unsigned int quote_stk_idx = 0;
 struct lexret  yylval;
 
 #define YY_INPUT(buf,result,max_size)\
@@ -143,8 +143,8 @@ static int MACRO_CallBoolFunc(FARPROC fn, const char* args, void** ret);
  */
 static int MACRO_CheckArgs(void* pa[], unsigned max, const char* args)
 {
-    int         t;
+    int t;
-    int         len = 0, idx = 0;
+    unsigned int len = 0, idx = 0;
 
     WINE_TRACE("Checking %s\n", args);
 
@@ -256,7 +256,7 @@ BOOL MACRO_ExecuteMacro(LPCSTR macro)
 {
     int t;
 
-    //WINE_TRACE("%s\n", wine_dbgstr_a(macro));
+    WINE_TRACE("%s\n", wine_dbgstr_a(macro));
 
     macroptr = macro;
 

reactos/base/applications/winhelp/rsrc.rc

@@ -19,7 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <windef.h>
+#include <winuser.h>
+
 #include "winhelp.h"
 #include "winhelp_res.h"
 
@@ -41,7 +43,7 @@
 #include "lang/nb-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/pt-BR.rc"
-#include "lang/pt-PT.rc"
+//#include "lang/pt-PT.rc"
 #include "lang/ru-RU.rc"
 #include "lang/sl-SI.rc"
 #include "lang/sk-SK.rc"

reactos/base/applications/winhelp/winhelp.c

@@ -178,7 +178,7 @@ HLPFILE_WINDOWINFO*     WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name)
     {
         strcpy(mwi.type, "primary");
         strcpy(mwi.name, "main");
-        if (!LoadString(Globals.hInstance, STID_WINE_HELP,
+        if (!LoadString(Globals.hInstance, STID_WINE_HELP, 
                         mwi.caption, sizeof(mwi.caption)))
             strcpy(mwi.caption, hlpfile->lpszTitle);
         mwi.origin.x = mwi.origin.y = mwi.size.cx = mwi.size.cy = CW_USEDEFAULT;
@@ -199,7 +199,7 @@ static HLPFILE_WINDOWINFO*     WINHELP_GetPopupWindowInfo(HLPFILE* hlpfile, HWND
     static      HLPFILE_WINDOWINFO      wi;
 
     RECT parent_rect;
-
+    
     wi.type[0] = wi.name[0] = wi.caption[0] = '\0';
 
     /* Calculate horizontal size and position of a popup window */
@@ -214,7 +214,7 @@ static HLPFILE_WINDOWINFO*     WINHELP_GetPopupWindowInfo(HLPFILE* hlpfile, HWND
     wi.origin.x  = max(wi.origin.x, 0);
 
     wi.style = SW_SHOW;
-    wi.win_style = WS_POPUPWINDOW;
+    wi.win_style = WS_POPUP | WS_BORDER;
     wi.sr_color = wi.sr_color = 0xFFFFFF;
 
     return &wi;
@@ -261,7 +261,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show)
             break;
 
         case 'x':
-            show = SW_HIDE;
+            show = SW_HIDE; 
             Globals.isBook = FALSE;
             break;
 
@@ -295,7 +295,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show)
         if (!hlpfile) return 0;
     }
     else hlpfile = NULL;
-    WINHELP_CreateHelpWindowByHash(hlpfile, lHash,
+    WINHELP_CreateHelpWindowByHash(hlpfile, lHash, 
                                    WINHELP_GetWindowInfo(hlpfile, wndname), show);
 
     /* Message loop */
@@ -326,13 +326,13 @@ static BOOL WINHELP_RegisterWinClasses(void)
     class_main.hInstance           = Globals.hInstance;
     class_main.hIcon               = LoadIcon(0, IDI_APPLICATION);
     class_main.hCursor             = LoadCursor(0, IDC_ARROW);
-    class_main.hbrBackground       = GetStockObject(WHITE_BRUSH);
+    class_main.hbrBackground       = (HBRUSH)(COLOR_WINDOW+1);
     class_main.lpszMenuName        = 0;
     class_main.lpszClassName       = MAIN_WIN_CLASS_NAME;
 
     class_button_box               = class_main;
     class_button_box.lpfnWndProc   = WINHELP_ButtonBoxWndProc;
-    class_button_box.hbrBackground = GetStockObject(GRAY_BRUSH);
+    class_button_box.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1);
     class_button_box.lpszClassName = BUTTON_BOX_WIN_CLASS_NAME;
 
     class_text = class_main;
@@ -342,7 +342,7 @@ static BOOL WINHELP_RegisterWinClasses(void)
 
     class_shadow = class_main;
     class_shadow.lpfnWndProc       = WINHELP_ShadowWndProc;
-    class_shadow.hbrBackground     = GetStockObject(GRAY_BRUSH);
+    class_shadow.hbrBackground     = (HBRUSH)(COLOR_3DDKSHADOW+1);
     class_shadow.lpszClassName     = SHADOW_WIN_CLASS_NAME;
 
     class_history = class_main;
@@ -440,11 +440,13 @@ static LRESULT  WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam)
         /* case HELP_PARTIALKEY: */
         /* case HELP_MULTIKEY: */
         /* case HELP_SETWINPOS: */
-            WINE_FIXME("Unknown command (%x) for remote winhelp control\n", wh->command);
+        default:
+            WINE_FIXME("Unhandled command (%x) for remote winhelp control\n", wh->command);
             break;
         }
     }
-    return 0L;
+    /* Always return success for now */
+    return 1;
 }
 
 /******************************************************************
@@ -452,7 +454,7 @@ static LRESULT  WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam)
  *
  *
  */
-static BOOL     WINHELP_ReuseWindow(WINHELP_WINDOW* win, WINHELP_WINDOW* oldwin,
+static BOOL     WINHELP_ReuseWindow(WINHELP_WINDOW* win, WINHELP_WINDOW* oldwin, 
                                     HLPFILE_PAGE* page, int nCmdShow)
 {
     unsigned int i;
@@ -461,8 +463,8 @@ static BOOL     WINHELP_ReuseWindow(WINHELP_WINDOW* win, WINHELP_WINDOW* oldwin,
     win->hButtonBoxWnd = oldwin->hButtonBoxWnd;
     win->hTextWnd      = oldwin->hTextWnd;
     win->hHistoryWnd   = oldwin->hHistoryWnd;
-    oldwin->hMainWnd = oldwin->hButtonBoxWnd = oldwin->hTextWnd = oldwin->hHistoryWnd = 0;
+    oldwin->hMainWnd   = oldwin->hButtonBoxWnd = oldwin->hTextWnd = oldwin->hHistoryWnd = 0;
-    win->hBrush = oldwin->hBrush;
+    win->hBrush        = CreateSolidBrush(win->info->sr_color);
 
     SetWindowLong(win->hMainWnd,      0, (LONG)win);
     SetWindowLong(win->hButtonBoxWnd, 0, (LONG)win);
@@ -502,7 +504,7 @@ static BOOL     WINHELP_ReuseWindow(WINHELP_WINDOW* win, WINHELP_WINDOW* oldwin,
                 {
                     /* we're full, remove latest entry */
                     HLPFILE_FreeHlpFile(win->history[0]->file);
-                    memmove(&win->history[0], &win->history[1],
+                    memmove(&win->history[0], &win->history[1], 
                             (num - 1) * sizeof(win->history[0]));
                     win->histIndex--;
                 }
@@ -522,7 +524,7 @@ static BOOL     WINHELP_ReuseWindow(WINHELP_WINDOW* win, WINHELP_WINDOW* oldwin,
             {
                 /* we're full, remove latest entry */
                 HLPFILE_FreeHlpFile(win->back[0]->file);
-                memmove(&win->back[0], &win->back[1],
+                memmove(&win->back[0], &win->back[1], 
                         (num - 1) * sizeof(win->back[0]));
                 win->backIndex--;
             }
@@ -550,6 +552,7 @@ BOOL WINHELP_CreateHelpWindow(HLPFILE_PAGE* page, HLPFILE_WINDOWINFO* wi,
     BOOL bPrimary;
     BOOL bPopup;
     LPSTR name;
+    DWORD ex_style;
 
     bPrimary = !lstrcmpi(wi->name, "main");
     bPopup = wi->win_style & WS_POPUP;
@@ -622,8 +625,10 @@ BOOL WINHELP_CreateHelpWindow(HLPFILE_PAGE* page, HLPFILE_WINDOWINFO* wi,
         }
     }
 
-    hWnd = CreateWindow(bPopup ? TEXT_WIN_CLASS_NAME : MAIN_WIN_CLASS_NAME,
+    ex_style = 0;
-                        wi->caption,
+    if (bPopup) ex_style = WS_EX_TOOLWINDOW;
+    hWnd = CreateWindowEx(ex_style, bPopup ? TEXT_WIN_CLASS_NAME : MAIN_WIN_CLASS_NAME,
+                        wi->caption, 
                         bPrimary ? WS_OVERLAPPEDWINDOW : wi->win_style,
                         wi->origin.x, wi->origin.y, wi->size.cx, wi->size.cy,
                         NULL, bPrimary ? LoadMenu(Globals.hInstance, MAKEINTRESOURCE(MAIN_MENU)) : 0,
@@ -639,13 +644,13 @@ BOOL WINHELP_CreateHelpWindow(HLPFILE_PAGE* page, HLPFILE_WINDOWINFO* wi,
  *
  *           WINHELP_CreateHelpWindowByHash
  */
-BOOL WINHELP_CreateHelpWindowByHash(HLPFILE* hlpfile, LONG lHash,
+BOOL WINHELP_CreateHelpWindowByHash(HLPFILE* hlpfile, LONG lHash, 
                                     HLPFILE_WINDOWINFO* wi, int nCmdShow)
 {
     HLPFILE_PAGE*       page = NULL;
 
     if (hlpfile)
-        page = lHash ? HLPFILE_PageByHash(hlpfile, lHash) :
+        page = lHash ? HLPFILE_PageByHash(hlpfile, lHash) : 
             HLPFILE_Contents(hlpfile);
     if (page) page->file->wRefCount++;
     return WINHELP_CreateHelpWindow(page, wi, nCmdShow);
@@ -665,6 +670,20 @@ BOOL WINHELP_CreateHelpWindowByMap(HLPFILE* hlpfile, LONG lMap,
     return WINHELP_CreateHelpWindow(page, wi, nCmdShow);
 }
 
+/***********************************************************************
+ *
+ *           WINHELP_CreateHelpWindowByOffset
+ */
+BOOL WINHELP_CreateHelpWindowByOffset(HLPFILE* hlpfile, LONG lOffset,
+                                      HLPFILE_WINDOWINFO* wi, int nCmdShow)
+{
+    HLPFILE_PAGE*       page = NULL;
+
+    page = HLPFILE_PageByOffset(hlpfile, lOffset);
+    if (page) page->file->wRefCount++;
+    return WINHELP_CreateHelpWindow(page, wi, nCmdShow);
+}
+
 /***********************************************************************
  *
  *           WINHELP_MainWndProc
@@ -776,7 +795,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam,
             GetScrollRange(win->hTextWnd, SB_VERT, &min, &max);
 
             if (keyDelta == 0)
-            {
+            {            
                 GetClientRect(win->hTextWnd, &rect);
                 keyDelta = (rect.bottom - rect.top) / 2;
                 if (wParam == VK_PRIOR)
@@ -982,7 +1001,7 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam,
             new_window_size.cy = old_window_size.cy - old_client_size.cy + new_client_size.cy;
 
             win->hShadowWnd =
-                CreateWindow(SHADOW_WIN_CLASS_NAME, "", WS_POPUP,
+                CreateWindowEx(WS_EX_TOOLWINDOW, SHADOW_WIN_CLASS_NAME, "", WS_POPUP,
                              origin.x + SHADOW_DX, origin.y + SHADOW_DY,
                              new_window_size.cx, new_window_size.cy,
                              0, 0, Globals.hInstance, 0);
@@ -1039,7 +1058,7 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam,
 	INT   Min, Max;
 	INT   CurPos = GetScrollPos(hWnd, SB_VERT);
 	INT   dy;
-
+	
 	GetScrollRange(hWnd, SB_VERT, &Min, &Max);
 	GetClientRect(hWnd, &rect);
 
@@ -1200,7 +1219,7 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam,
                 hlpfile = WINHELP_LookupHelpFile(part->link->lpszString);
                 if (part->link->window == -1)
                     wi = win->info;
-                else if ((part->link->window >= 0) && (part->link->window < hlpfile->numWindows))
+                else if (part->link->window < hlpfile->numWindows)
                     wi = &hlpfile->windows[part->link->window];
                 else
                 {
@@ -1212,7 +1231,7 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam,
                 break;
             case hlp_link_popup:
                 hlpfile = WINHELP_LookupHelpFile(part->link->lpszString);
-                if (hlpfile) WINHELP_CreateHelpWindowByHash(hlpfile, part->link->lHash,
+                if (hlpfile) WINHELP_CreateHelpWindowByHash(hlpfile, part->link->lHash, 
                                                WINHELP_GetPopupWindowInfo(hlpfile, hWnd, &mouse),
                                                SW_NORMAL);
                 break;
@@ -1234,7 +1253,6 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam,
         if (hWnd == Globals.hPopupWnd) Globals.hPopupWnd = 0;
 
         bExit = (Globals.wVersion >= 4 && !lstrcmpi(win->lpszName, "main"));
-        DeleteObject(win->hBrush);
 
         WINHELP_DeleteWindow(win);
 
@@ -1300,7 +1318,7 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara
 
         for (i = 0; i < win->histIndex; i++)
         {
-            TextOut(hDc, 0, i * tm.tmHeight, win->history[i]->lpszTitle,
+            TextOut(hDc, 0, i * tm.tmHeight, win->history[i]->lpszTitle, 
                     strlen(win->history[i]->lpszTitle));
         }
         EndPaint(hWnd, &ps);
@@ -1677,7 +1695,7 @@ static BOOL WINHELP_SplitLines(HWND hWnd, LPSIZE newsize)
                 if (p->cookie == para_bitmap)
                 {
                     DIBSECTION              dibs;
-
+                    
                     GetObject(p->u.gfx.u.bmp.hBitmap, sizeof(dibs), &dibs);
                     gfxSize.cx = dibs.dsBm.bmWidth;
                     gfxSize.cy = dibs.dsBm.bmHeight;
@@ -1815,6 +1833,8 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win)
     if (win->hShadowWnd) DestroyWindow(win->hShadowWnd);
     if (win->hHistoryWnd) DestroyWindow(win->hHistoryWnd);
 
+    DeleteObject(win->hBrush);
+
     for (i = 0; i < win->histIndex; i++)
     {
         HLPFILE_FreeHlpFile(win->history[i]->file);
@@ -1836,13 +1856,13 @@ static void WINHELP_InitFonts(HWND hWnd)
 {
     WINHELP_WINDOW *win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0);
     LOGFONT logfontlist[] = {
-        {-10, 0, 0, 0, 400, 0, 0, 0, 0, 0, 0, 0, 32, "Helv"},
+        {-10, 0, 0, 0, 400, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, "Helv"},
-        {-12, 0, 0, 0, 700, 0, 0, 0, 0, 0, 0, 0, 32, "Helv"},
+        {-12, 0, 0, 0, 700, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, "Helv"},
-        {-12, 0, 0, 0, 700, 0, 0, 0, 0, 0, 0, 0, 32, "Helv"},
+        {-12, 0, 0, 0, 700, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, "Helv"},
-        {-12, 0, 0, 0, 400, 0, 0, 0, 0, 0, 0, 0, 32, "Helv"},
+        {-12, 0, 0, 0, 400, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, "Helv"},
-        {-12, 0, 0, 0, 700, 0, 0, 0, 0, 0, 0, 0, 32, "Helv"},
+        {-12, 0, 0, 0, 700, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, "Helv"},
-        {-10, 0, 0, 0, 700, 0, 0, 0, 0, 0, 0, 0, 32, "Helv"},
+        {-10, 0, 0, 0, 700, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, "Helv"},
-        { -8, 0, 0, 0, 400, 0, 0, 0, 0, 0, 0, 0, 32, "Helv"}};
+        { -8, 0, 0, 0, 400, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, "Helv"}};
 #define FONTS_LEN (sizeof(logfontlist)/sizeof(*logfontlist))
 
     static HFONT fonts[FONTS_LEN];
@@ -1914,7 +1934,7 @@ WINHELP_LINE_PART* WINHELP_IsOverLink(WINHELP_WINDOW* win, WPARAM wParam, LPARAM
     {
         for (part = &line->first_part; part; part = part->next)
         {
-            if (part->link &&
+            if (part->link && 
                 part->link->lpszString &&
                 part->rect.left   <= mouse.x &&
                 part->rect.right  >= mouse.x &&
@@ -1928,3 +1948,118 @@ WINHELP_LINE_PART* WINHELP_IsOverLink(WINHELP_WINDOW* win, WPARAM wParam, LPARAM
 
     return NULL;
 }
+
+/**************************************************************************
+ * cb_KWBTree
+ *
+ * HLPFILE_BPTreeCallback enumeration function for '|KWBTREE' internal file.
+ *
+ */
+static void cb_KWBTree(void *p, void **next, void *cookie)
+{
+    HWND hListWnd = (HWND)cookie;
+    int count;
+
+    WINE_TRACE("Adding '%s' to search list\n", (char *)p);
+    SendMessage(hListWnd, LB_INSERTSTRING, -1, (LPARAM)p);
+    count = SendMessage(hListWnd, LB_GETCOUNT, 0, 0);
+    SendMessage(hListWnd, LB_SETITEMDATA, count-1, (LPARAM)p);
+    *next = (char*)p + strlen((char*)p) + 7;
+}
+
+/**************************************************************************
+ * WINHELP_IndexDlgProc
+ *
+ * Index dialog callback function.
+ *
+ * nResult passed to EndDialog:
+ *   1: CANCEL button
+ *  >1: valid offset value +2.
+ *  EndDialog itself can return 0 (error).
+ */
+INT_PTR CALLBACK WINHELP_SearchDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+    static HLPFILE *file;
+    int sel;
+    ULONG offset = 1;
+
+    switch (msg)
+    {
+    case WM_INITDIALOG:
+        file = (HLPFILE *)lParam;
+        HLPFILE_BPTreeEnum(file->kwbtree, cb_KWBTree,
+                           GetDlgItem(hWnd, IDC_INDEXLIST));
+        return TRUE;
+    case WM_COMMAND:
+        switch (LOWORD(wParam))
+        {
+        case IDOK:
+            sel = SendDlgItemMessage(hWnd, IDC_INDEXLIST, LB_GETCURSEL, 0, 0);
+            if (sel != LB_ERR)
+            {
+                BYTE *p;
+                int count;
+
+                p = (BYTE*)SendDlgItemMessage(hWnd, IDC_INDEXLIST,
+                                              LB_GETITEMDATA, sel, 0);
+                count = *(short*)((char *)p + strlen((char *)p) + 1);
+                if (count > 1)
+                {
+                    MessageBox(hWnd, "count > 1 not supported yet", "Error", MB_OK | MB_ICONSTOP);
+                    return TRUE;
+                }
+                offset = *(ULONG*)((char *)p + strlen((char *)p) + 3);
+                offset = *(long*)(file->kwdata + offset + 9);
+                if (offset == 0xFFFFFFFF)
+                {
+                    MessageBox(hWnd, "macro keywords not supported yet", "Error", MB_OK | MB_ICONSTOP);
+                    return TRUE;
+                }
+                offset += 2;
+            }
+            /* Fall through */
+        case IDCANCEL:
+            EndDialog(hWnd, offset);
+            return TRUE;
+        default:
+            break;
+        }
+    default:
+        break;
+    }
+    return FALSE;
+}
+
+/**************************************************************************
+ * WINHELP_CreateIndexWindow
+ *
+ * Displays a dialog with keywords of current help file.
+ *
+ */
+BOOL WINHELP_CreateIndexWindow(void)
+{
+    int ret;
+    HLPFILE *hlpfile;
+
+    if (Globals.active_win && Globals.active_win->page && Globals.active_win->page->file)
+        hlpfile = Globals.active_win->page->file;
+    else
+        return FALSE;
+
+    if (hlpfile->kwbtree == NULL)
+    {
+        WINE_TRACE("No index provided\n");
+        return FALSE;
+    }
+
+    ret = DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_INDEX),
+                         Globals.active_win->hMainWnd, WINHELP_SearchDlgProc,
+                         (LPARAM)hlpfile);
+    if (ret > 1)
+    {
+        ret -= 2;
+        WINE_TRACE("got %d as an offset\n", ret);
+        WINHELP_CreateHelpWindowByOffset(hlpfile, ret, Globals.active_win->info, SW_NORMAL);
+    }
+    return TRUE;
+}

reactos/base/applications/winhelp/winhelp.h

@@ -20,9 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef __WINHELP_H__
-#define __WINHELP_H__
-
 #define MAX_LANGUAGE_NUMBER     255
 #define MAX_STRING_LEN          255
 
@@ -175,8 +172,10 @@ extern FARPROC         Callbacks[];
 
 BOOL WINHELP_CreateHelpWindowByHash(HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int);
 BOOL WINHELP_CreateHelpWindowByMap(HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int);
+BOOL WINHELP_CreateHelpWindowByOffset(HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int);
 BOOL WINHELP_CreateHelpWindow(HLPFILE_PAGE*, HLPFILE_WINDOWINFO*, int);
 BOOL WINHELP_GetOpenFileName(LPSTR, int);
+BOOL WINHELP_CreateIndexWindow(void);
 INT  WINHELP_MessageBoxIDS(UINT, UINT, WORD);
 INT  WINHELP_MessageBoxIDS_s(UINT, LPCSTR, UINT, WORD);
 HLPFILE* WINHELP_LookupHelpFile(LPCSTR lpszFile);
@@ -194,5 +193,3 @@ extern const char STRING_DIALOG_TEST[];
 
 /* Buttons */
 #define WH_FIRST_BUTTON     500
-
-#endif /* __WINHELP_H__ */

reactos/base/applications/winhelp/winhelp_res.h

@@ -30,3 +30,6 @@
 #define STID_HELP_FILES_HLP	0x12C
 #define STID_DIALOG_TEST	0x12D
 #define STID_FILE_NOT_FOUND_s	0x12E
+
+#define IDD_INDEX               0x150
+#define IDC_INDEXLIST           0x151