[dreimer] 33736: Updated winhelp from wine and renamed accordingly from winhelp to winhlp32.
Author: dreimer Date: Wed May 28 02:43:38 2008 New Revision: 33736
URL: http://svn.reactos.org/svn/reactos?rev=33736&view=rev Log: Updated winhelp from wine and renamed accordingly from winhelp to winhlp32.
Added: trunk/reactos/base/applications/winhlp32/ - copied from r33735, trunk/reactos/base/applications/winhelp/ trunk/reactos/base/applications/winhlp32/winhlp32.rbuild (with props) Removed: trunk/reactos/base/applications/winhelp/ trunk/reactos/base/applications/winhlp32/winhelp.rbuild Modified: trunk/reactos/base/applications/applications.rbuild trunk/reactos/base/applications/winhlp32/lang/da-DK.rc trunk/reactos/base/applications/winhlp32/lang/de-DE.rc trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc trunk/reactos/base/applications/winhlp32/lang/it-IT.rc trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc trunk/reactos/base/applications/winhlp32/winhelp.c
Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicati... ============================================================================== --- trunk/reactos/base/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/applications.rbuild [iso-8859-1] Wed May 28 02:43:38 2008 @@ -72,8 +72,8 @@ <directory name="taskmgr"> <xi:include href="taskmgr/taskmgr.rbuild" /> </directory> - <directory name="winhelp"> - <xi:include href="winhelp/winhelp.rbuild" /> + <directory name="winhlp32"> + <xi:include href="winhlp32/winhlp32.rbuild" /> </directory> <directory name="wordpad"> <xi:include href="wordpad/wordpad.rbuild" />
Modified: trunk/reactos/base/applications/winhlp32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/da-DK.rc [iso-8859-1] Wed May 28 02:43:38 2008 @@ -3,6 +3,7 @@ * * Copyright 1997 Henrik Olsen * Copyright 2002 Sylvain Petreolle spetreolle@yahoo.fr + * Copyright 2008 Jens Albretsenjens@albretsen.dk * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,7 +25,7 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT { POPUP "&Filer" { - MENUITEM "Å&bn...", MNID_FILE_OPEN + MENUITEM "Å&ben...", MNID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "&Udskriv emne", MNID_FILE_PRINT MENUITEM "&Indstil printer", MNID_FILE_SETUP @@ -43,16 +44,24 @@ MENUITEM "&Brug af Hjælp", MNID_HELP_HELPON MENUITEM "Altid &øverst", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "&Info...", MNID_HELP_ABOUT + MENUITEM "&Information...", MNID_HELP_ABOUT #ifdef WINELIB MENUITEM "Om &WINE", MNID_HELP_WINE #endif } }
+IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_DANISH, 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 "&Annuller", IDCANCEL, 120, 170, 50, 12 +}
/* Strings */ - STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT { STID_WINE_HELP, "WINE Hjælp" @@ -65,9 +74,9 @@ STID_SEARCH, "&Søg" STID_BACK, "&Tilbage" STID_HISTORY, "&Oversigt" -STID_TOPICS, "To&pics" +STID_TOPICS, "&Emner" 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?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_FILE_NOT_FOUND_s "Kan ikke finde '%s'. Vil du selv finde filen?" +STID_NO_RICHEDIT "Kan ikke finde en 'richedit' implementering... Afbryder" }
Modified: trunk/reactos/base/applications/winhlp32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/de-DE.rc [iso-8859-1] Wed May 28 02:43:38 2008 @@ -73,10 +73,33 @@ STID_CONTENTS, "&Inhalt" STID_SEARCH, "&Suchen" STID_BACK, "&Zurück" -STID_HISTORY, "&Bisher" +STID_HISTORY, "&Chronik" STID_TOPICS, "&Themen" STID_ALL_FILES, "Alle Dateien (*.*)" STID_HELP_FILES_HLP, "Hilfe-Dateien (*.hlp)" STID_FILE_NOT_FOUND_s "'%s' konnte nicht gefunden werden. Wollen Sie selber nach dieser Datei suchen?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_NO_RICHEDIT "Die Richedit Implementation konnte nicht gefunden werden... Breche ab." } + +CONTEXT_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +BEGIN +POPUP "" +BEGIN +MENUITEM "Anmerken...", MNID_CTXT_ANNOTATE +MENUITEM "Kopieren", MNID_CTXT_COPY +MENUITEM "Drucken...", MNID_CTXT_PRINT +POPUP "Schriftgröße" +BEGIN +MENUITEM "Klein", MNID_CTXT_FONTS_SMALL +MENUITEM "Normal", MNID_CTXT_FONTS_NORMAL +MENUITEM "Groß", MNID_CTXT_FONTS_LARGE +END +POPUP "Hilfe immer sichtbar" +BEGIN +MENUITEM "Standard", MNID_CTXT_HELP_DEFAULT +MENUITEM "Sichtbar", MNID_CTXT_HELP_VISIBLE +MENUITEM "Nicht sichtbar", MNID_CTXT_HELP_NONVISIBLE +END +MENUITEM "Systemfarben verwenden", MNID_CTXT_SYSTEM_COLORS +END +END
Modified: trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc [iso-8859-1] Wed May 28 02:43:38 2008 @@ -53,7 +53,7 @@ } }
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Index" @@ -64,7 +64,7 @@ }
/* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL { STID_WINE_HELP, "Aide de WINE" STID_WHERROR, "ERREUR"
Modified: trunk/reactos/base/applications/winhlp32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/it-IT.rc [iso-8859-1] Wed May 28 02:43:38 2008 @@ -68,5 +68,5 @@ STID_ALL_FILES, "Tutti i file (*.*)" STID_HELP_FILES_HLP, "File della Guida (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" -STID_NO_RICHEDIT "Impossibile trovare una implementazione di richedit ... Interruzione in corso" +STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" }
Modified: trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc [iso-8859-1] Wed May 28 02:43:38 2008 @@ -80,3 +80,27 @@ STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" } + + +CONTEXT_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +BEGIN + POPUP "" + BEGIN + MENUITEM "Adnotacja...", MNID_CTXT_ANNOTATE + MENUITEM "Kopiuj", MNID_CTXT_COPY + MENUITEM "Drukuj...", MNID_CTXT_PRINT + POPUP "Czcionka" + BEGIN + MENUITEM "Ma³a", MNID_CTXT_FONTS_SMALL + MENUITEM "Normalna", MNID_CTXT_FONTS_NORMAL + MENUITEM "Du¿a", MNID_CTXT_FONTS_LARGE + END + POPUP "Pomoc zawsze widoczna" + BEGIN + MENUITEM "Domylnie", MNID_CTXT_HELP_DEFAULT + MENUITEM "Widoczna", MNID_CTXT_HELP_VISIBLE + MENUITEM "Niewidoczna", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "U¿yj kolorów systemowych", MNID_CTXT_SYSTEM_COLORS + END +END
Modified: trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc [iso-8859-1] Wed May 28 02:43:38 2008 @@ -76,5 +76,28 @@ STID_ALL_FILES, "Âñå ôàéëû (*.*)" STID_HELP_FILES_HLP, "Ôàéëû ñïðàâêè (*.hlp)" STID_FILE_NOT_FOUND_s "Íå ìîãó íàéòè '%s'. Âû õîòèòå íàéòè ýòîò ôàéë ñàìîñòîÿòåëüíî?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_NO_RICHEDIT "Íå ìîãó íàéòè richedit" } + +CONTEXT_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +BEGIN + POPUP "" + BEGIN + MENUITEM "Çàìåòêè...", MNID_CTXT_ANNOTATE + MENUITEM "Êîïèðîâàòü", MNID_CTXT_COPY + MENUITEM "Ïå÷àòü...", MNID_CTXT_PRINT + POPUP "Øðèôò" + BEGIN + MENUITEM "Ìåëêèé", MNID_CTXT_FONTS_SMALL + MENUITEM "Îáû÷íûé", MNID_CTXT_FONTS_NORMAL + MENUITEM "Êðóïíûé", MNID_CTXT_FONTS_LARGE + END + POPUP "Âèäèìîñòü îêíà ñïðàâêè" + BEGIN + MENUITEM "Ïî óìîë÷àíèþ", MNID_CTXT_HELP_DEFAULT + MENUITEM "Íàâåðõó", MNID_CTXT_HELP_VISIBLE + MENUITEM "Íå íàâåðõó", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Èñïîëüçîâàòü ñèñòåìíûå öâåòà", MNID_CTXT_SYSTEM_COLORS + END +END
Modified: trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc [iso-8859-1] Wed May 28 02:43:38 2008 @@ -23,7 +23,7 @@
/* Menu */
-MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL { POPUP "&Arkiv" { MENUITEM "&Ãppna", MNID_FILE_OPEN @@ -53,7 +53,7 @@ }
/* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL { STID_WINE_HELP, "WINE Hjälp" STID_WHERROR, "FEL"
Modified: trunk/reactos/base/applications/winhlp32/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Wed May 28 02:43:38 2008 @@ -1001,7 +1001,7 @@ } pt.x = (int)(short)LOWORD(msgf->lParam); pt.y = (int)(short)HIWORD(msgf->lParam); - ClientToScreen(hWnd, &pt); + ClientToScreen(msgf->nmhdr.hwndFrom, &pt); TrackPopupMenu(GetSubMenu(hMenu, 0), TPM_LEFTALIGN|TPM_TOPALIGN, pt.x, pt.y, 0, hWnd, NULL); DestroyMenu(hMenu);
Removed: trunk/reactos/base/applications/winhlp32/winhelp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/w... ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.rbuild (removed) @@ -1,20 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="winhelp" type="win32gui" installbase="system32" installname="winhelp.exe" unicode="no" allowwarnings="true"> - <include base="winhelp">.</include> - <define name="_WIN32_IE">0x0600</define> - <define name="_WIN32_WINNT">0x0501</define> - <library>wine</library> - <library>comdlg32</library> - <library>shell32</library> - <library>user32</library> - <library>gdi32</library> - <library>kernel32</library> - <file>callback.c</file> - <file>hlpfile.c</file> - <file>macro.c</file> - <file>string.c</file> - <file>winhelp.c</file> - <file>lex.yy.c</file> - <file>rsrc.rc</file> -</module>
Added: trunk/reactos/base/applications/winhlp32/winhlp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhlp32.rbuild (added) +++ trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] Wed May 28 02:43:38 2008 @@ -1,0 +1,20 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="winhlp32" type="win32gui" installbase="system32" installname="winhlp32.exe" unicode="no" allowwarnings="true"> + <include base="winhlp32">.</include> + <define name="_WIN32_IE">0x0600</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>wine</library> + <library>comdlg32</library> + <library>shell32</library> + <library>user32</library> + <library>gdi32</library> + <library>kernel32</library> + <file>callback.c</file> + <file>hlpfile.c</file> + <file>macro.c</file> + <file>string.c</file> + <file>winhelp.c</file> + <file>lex.yy.c</file> + <file>rsrc.rc</file> +</module>
Propchange: trunk/reactos/base/applications/winhlp32/winhlp32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native
-
dreimer＠svn.reactos.org