Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use HTML Help instead of Windows Help #211

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+25 −29
Open

Use HTML Help instead of Windows Help #211

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6dedaf
Add missing Polish translations
thecatkitty Sep 20, 2018
5cfdbd4
Convert original Polish translation from Windows 1250 to UTF-8
thecatkitty Sep 20, 2018
3a7e4ac
Merge branch 'lang-pl' of https://github.com/thecatkitty/winfile into…
thecatkitty Jan 17, 2019
328023e
Use HTML Help instead of Windows Help
thecatkitty Jan 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Use HTML Help instead of Windows Help
@thecatkitty
thecatkitty committed Jan 17, 2019
commit 328023e74a3b803df436e0f043c86166f7cf6fb1
12 changes: 6 additions & 6 deletions src/Winfile.vcxproj
View file
Original file line number Diff line number Diff line change
@@ -151,7 +151,7 @@
<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -179,7 +179,7 @@
<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;advapi32.lib;gdi32.lib;comctl32.lib;oleaut32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;htmlhelp.lib;advapi32.lib;gdi32.lib;comctl32.lib;oleaut32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -203,7 +203,7 @@
<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -230,7 +230,7 @@
<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;advapi32.lib;gdi32.lib;comctl32.lib;oleaut32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;htmlhelp.lib;advapi32.lib;gdi32.lib;comctl32.lib;oleaut32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -262,7 +262,7 @@
<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
@@ -287,7 +287,7 @@
<AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;htmlhelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
4 changes: 2 additions & 2 deletions src/lang/res_de-DE.rc
View file
Original file line number Diff line number Diff line change
@@ -117,7 +117,7 @@ BEGIN
BEGIN
MENUITEM "&Hilfethemen", IDM_HELPINDEX
MENUITEM "&Suchen...", IDM_HELPKEYS
MENUITEM "&Hilfe &verwenden", IDM_HELPHELP
//MENUITEM "&Hilfe &verwenden", IDM_HELPHELP
MENUITEM SEPARATOR
MENUITEM "&Über Datei-Manager", IDM_ABOUT
END
@@ -605,7 +605,7 @@ BEGIN

MH_MYITEMS+IDM_HELPINDEX, "Inhalt der Hilfe anzeigen"
MH_MYITEMS+IDM_HELPKEYS, "Suche nach einem Begriff in der Datei-Manager-Hilfe"
MH_MYITEMS+IDM_HELPHELP, "Hilfe über Benutzen von Hilfe"
//MH_MYITEMS+IDM_HELPHELP, "Hilfe über Benutzen von Hilfe"
MH_MYITEMS+IDM_ABOUT, "Anzeige von Informationen über Datei-Manager"
END

4 changes: 2 additions & 2 deletions src/lang/res_en-US.rc
View file
Original file line number Diff line number Diff line change
@@ -117,7 +117,7 @@ BEGIN
BEGIN
MENUITEM "&Contents", IDM_HELPINDEX
MENUITEM "&Search for Help on...", IDM_HELPKEYS
MENUITEM "&How to Use Help", IDM_HELPHELP
//MENUITEM "&How to Use Help", IDM_HELPHELP
MENUITEM SEPARATOR
MENUITEM "&About File Manager...", IDM_ABOUT
END
@@ -607,7 +607,7 @@ BEGIN

MH_MYITEMS+IDM_HELPINDEX, "Displays contents for File Manager Help"
MH_MYITEMS+IDM_HELPKEYS, "Searches for a topic in File Manager Help"
MH_MYITEMS+IDM_HELPHELP, "Displays information about using Help"
//MH_MYITEMS+IDM_HELPHELP, "Displays information about using Help"
MH_MYITEMS+IDM_ABOUT, "Displays information about File Manager"
END

4 changes: 2 additions & 2 deletions src/lang/res_he-IL.rc
View file
Original file line number Diff line number Diff line change
@@ -117,7 +117,7 @@ BEGIN
BEGIN
MENUITEM "&תוכן", IDM_HELPINDEX
MENUITEM "&חיפוש עזרה לגבי...", IDM_HELPKEYS
MENUITEM "&כיצד להשתמש בעזרה", IDM_HELPHELP
//MENUITEM "&כיצד להשתמש בעזרה", IDM_HELPHELP
MENUITEM SEPARATOR
MENUITEM "&אודות מנהל הקבצים...", IDM_ABOUT
END
@@ -607,7 +607,7 @@ BEGIN

MH_MYITEMS+IDM_HELPINDEX, "הצגת תוכן העזרה של מנהל הקבצים"
MH_MYITEMS+IDM_HELPKEYS, "חיפוש נושא בעזרה עבור מנהל הקבצים"
MH_MYITEMS+IDM_HELPHELP, "הצגת מידע אודות השימוש בעזרה"
//MH_MYITEMS+IDM_HELPHELP, "הצגת מידע אודות השימוש בעזרה"
MH_MYITEMS+IDM_ABOUT, "הצגת מידע אודות מנהל הקבצים"
END

4 changes: 2 additions & 2 deletions src/lang/res_ja-JP.rc
View file
Original file line number Diff line number Diff line change
@@ -117,7 +117,7 @@ BEGIN
BEGIN
MENUITEM "目次(&C)", IDM_HELPINDEX
MENUITEM "ヘルプの検索(&S)...", IDM_HELPKEYS
MENUITEM "ヘルプの使い方(&H)", IDM_HELPHELP
//MENUITEM "ヘルプの使い方(&H)", IDM_HELPHELP
MENUITEM SEPARATOR
MENUITEM "ファイル マネージャーについて(&A)...", IDM_ABOUT
END
@@ -605,7 +605,7 @@ BEGIN

MH_MYITEMS+IDM_HELPINDEX, "ファイル マネージャーのヘルプのコンテンツを表示する"
MH_MYITEMS+IDM_HELPKEYS, "ファイル マネージャーのヘルプのトピックを表示する"
MH_MYITEMS+IDM_HELPHELP, "ヘルプの使い方について表示する"
//MH_MYITEMS+IDM_HELPHELP, "ヘルプの使い方について表示する"
MH_MYITEMS+IDM_ABOUT, "ファイル マネージャーについて表示する"
END

4 changes: 2 additions & 2 deletions src/lang/res_pl-PL.rc
View file
Original file line number Diff line number Diff line change
@@ -117,7 +117,7 @@ BEGIN
BEGIN
MENUITEM "&Spis treści", IDM_HELPINDEX
MENUITEM "&Pomoc na temat...", IDM_HELPKEYS
MENUITEM "&Korzystanie z Pomocy", IDM_HELPHELP
//MENUITEM "&Korzystanie z Pomocy", IDM_HELPHELP
MENUITEM SEPARATOR
MENUITEM "Me&nedżer plików - informacje...", IDM_ABOUT
END
@@ -607,7 +607,7 @@ BEGIN

MH_MYITEMS+IDM_HELPINDEX, "Wyświetla spis treści Pomocy Menedżera plików"
MH_MYITEMS+IDM_HELPKEYS, "Wyszukuje zagadnienia w Pomocy Menedżera plików"
MH_MYITEMS+IDM_HELPHELP, "Wyświetla informacje o korzystaniu z Pomocy"
//MH_MYITEMS+IDM_HELPHELP, "Wyświetla informacje o korzystaniu z Pomocy"
MH_MYITEMS+IDM_ABOUT, "Wyświetla informacje o Menedżerze plików"
END

4 changes: 2 additions & 2 deletions src/lang/res_zh-CN.rc
View file
Original file line number Diff line number Diff line change
@@ -117,7 +117,7 @@ BEGIN
BEGIN
MENUITEM "目录(&C)", IDM_HELPINDEX
MENUITEM "查找帮助主题(&S)...", IDM_HELPKEYS
MENUITEM "帮助使用方法(&H)", IDM_HELPHELP
//MENUITEM "帮助使用方法(&H)", IDM_HELPHELP
MENUITEM SEPARATOR
MENUITEM "关于文件管理器(&A)...", IDM_ABOUT
END
@@ -590,7 +590,7 @@ BEGIN

MH_MYITEMS+IDM_HELPINDEX, "显示文件管理器的“帮助”内容"
MH_MYITEMS+IDM_HELPKEYS, "在“文件管理器帮助“里搜索一个主题"
MH_MYITEMS+IDM_HELPHELP, "显示关于使用“帮助“的信息"
//MH_MYITEMS+IDM_HELPHELP, "显示关于使用“帮助“的信息"
MH_MYITEMS+IDM_ABOUT, "显示关于文件管理器的信息"
END

1 change: 0 additions & 1 deletion src/res.h
View file
Original file line number Diff line number Diff line change
@@ -180,7 +180,6 @@
#define IDM_HELPKEYS 0x001E
#define IDM_HELPCOMMANDS 0x0020
#define IDM_HELPPROCS 0x0021
#define IDM_HELPHELP 1802
#define IDM_ABOUT 1803

#define IDM_DRIVELISTJUMP 2000 /* for defining an accelerator */
11 changes: 4 additions & 7 deletions src/wfcomman.c
View file
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@
#include <shlobj.h>
#include <commctrl.h>
#include <ole2.h>
#include <htmlhelp.h>

#ifndef HELP_PARTIALKEY
#define HELP_PARTIALKEY 0x0105L // call the search engine in winhelp
@@ -2104,20 +2105,16 @@ AppCommandProc(register DWORD id)
}

case IDM_HELPINDEX:
dwFlags = HELP_INDEX;
dwFlags = HH_DISPLAY_INDEX;
goto ACPCallHelp;

case IDM_HELPKEYS:
dwFlags = HELP_PARTIALKEY;
goto ACPCallHelp;

case IDM_HELPHELP:
dwFlags = HELP_HELPONHELP;
dwFlags = HH_DISPLAY_TOC;
goto ACPCallHelp;

ACPCallHelp:
SetCurrentDirectory(szOriginalDirPath);
if (!WinHelp(hwndFrame, szWinfileHelp, dwFlags, (ULONG_PTR)szNULL))
if (!HtmlHelp(hwndFrame, szWinfileHtmlHelp, dwFlags, (DWORD_PTR)NULL))
MyMessageBox(hwndFrame, IDS_WINFILE, IDS_WINHELPERR, MB_OK | MB_ICONEXCLAMATION | MB_SYSTEMMODAL);
break;

1 change: 0 additions & 1 deletion src/wfhelp.h
View file
Original file line number Diff line number Diff line change
@@ -129,7 +129,6 @@
#define IDH_HELPKEYS (IDM_HELPKEYS + IDH_HELPFIRST)
#define IDH_HELPCOMMANDS (IDM_HELPCOMMANDS + IDH_HELPFIRST)
#define IDH_HELPPROCS (IDM_HELPPROCS + IDH_HELPFIRST)
#define IDH_HELPHELP (IDM_HELPHELP + IDH_HELPFIRST)
#define IDH_ABOUT (IDM_ABOUT + IDH_HELPFIRST)

#define IDH_LOWERCASE (IDM_LOWERCASE + IDH_HELPFIRST)
5 changes: 3 additions & 2 deletions src/winfile.h
View file
Original file line number Diff line number Diff line change
@@ -1342,8 +1342,9 @@ Extern LARGE_INTEGER qTotalSpace;

Extern HWND hwndStatus EQ( NULL );

Extern TCHAR szWinfileHelp[] EQ( TEXT("WINFILE.HLP") );
Extern WCHAR wszWinfileHelp[] EQ( L"WINFILE.HLP" );
Extern TCHAR szWinfileHelp[] EQ( TEXT("..\\X86\\WINFILE.HLP") );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are these path changes needed/related?

Extern WCHAR wszWinfileHelp[] EQ( L"..\\X86\\WINFILE.HLP" );
Extern TCHAR szWinfileHtmlHelp[] EQ( TEXT("..\\X86\\WINFILE.CHM") );

Extern INT iNumExtensions EQ( 0 );
Extern EXTENSION extensions[MAX_EXTENSIONS];