diff --git a/src/Winfile.vcxproj b/src/Winfile.vcxproj
index 16b96e3b..62f6072d 100644
--- a/src/Winfile.vcxproj
+++ b/src/Winfile.vcxproj
@@ -151,7 +151,7 @@
.;%(AdditionalIncludeDirectories)
- ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;%(AdditionalDependencies)
+ ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;htmlhelp.lib;%(AdditionalDependencies)
true
@@ -179,7 +179,7 @@
.;%(AdditionalIncludeDirectories)
- ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;advapi32.lib;gdi32.lib;comctl32.lib;oleaut32.lib;%(AdditionalDependencies)
+ ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;htmlhelp.lib;advapi32.lib;gdi32.lib;comctl32.lib;oleaut32.lib;%(AdditionalDependencies)
true
@@ -203,7 +203,7 @@
.;%(AdditionalIncludeDirectories)
- ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;%(AdditionalDependencies)
+ ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;htmlhelp.lib;%(AdditionalDependencies)
true
@@ -230,7 +230,7 @@
.;%(AdditionalIncludeDirectories)
- ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;advapi32.lib;gdi32.lib;comctl32.lib;oleaut32.lib;%(AdditionalDependencies)
+ ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;htmlhelp.lib;advapi32.lib;gdi32.lib;comctl32.lib;oleaut32.lib;%(AdditionalDependencies)
true
@@ -262,7 +262,7 @@
.;%(AdditionalIncludeDirectories)
- ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;%(AdditionalDependencies)
+ ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;htmlhelp.lib;%(AdditionalDependencies)
true
Windows
MachineX64
@@ -287,7 +287,7 @@
.;%(AdditionalIncludeDirectories)
- ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;%(AdditionalDependencies)
+ ole32.lib;shell32.lib;shlwapi.lib;comctl32.lib;version.lib;htmlhelp.lib;%(AdditionalDependencies)
true
Windows
true
diff --git a/src/lang/res_de-DE.rc b/src/lang/res_de-DE.rc
index 2d5a9a19..9c7b2683 100644
--- a/src/lang/res_de-DE.rc
+++ b/src/lang/res_de-DE.rc
@@ -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
diff --git a/src/lang/res_en-US.rc b/src/lang/res_en-US.rc
index a084017a..85de3a71 100644
--- a/src/lang/res_en-US.rc
+++ b/src/lang/res_en-US.rc
@@ -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
diff --git a/src/lang/res_he-IL.rc b/src/lang/res_he-IL.rc
index 939a8b66..c7810c85 100644
--- a/src/lang/res_he-IL.rc
+++ b/src/lang/res_he-IL.rc
@@ -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
diff --git a/src/lang/res_ja-JP.rc b/src/lang/res_ja-JP.rc
index 3ec36f6d..ebd93ae7 100644
--- a/src/lang/res_ja-JP.rc
+++ b/src/lang/res_ja-JP.rc
@@ -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
diff --git a/src/lang/res_pl-PL.rc b/src/lang/res_pl-PL.rc
index d58ce485..279a15c9 100644
--- a/src/lang/res_pl-PL.rc
+++ b/src/lang/res_pl-PL.rc
@@ -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
diff --git a/src/lang/res_zh-CN.rc b/src/lang/res_zh-CN.rc
index 2d62572f..967aa2d7 100644
--- a/src/lang/res_zh-CN.rc
+++ b/src/lang/res_zh-CN.rc
@@ -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
diff --git a/src/res.h b/src/res.h
index bf637b67..06412a5c 100644
--- a/src/res.h
+++ b/src/res.h
@@ -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 */
diff --git a/src/wfcomman.c b/src/wfcomman.c
index c4cc36ae..fdc7a6de 100644
--- a/src/wfcomman.c
+++ b/src/wfcomman.c
@@ -18,6 +18,7 @@
#include
#include
#include
+#include
#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;
diff --git a/src/wfhelp.h b/src/wfhelp.h
index 067969a5..7f4ae1f3 100644
--- a/src/wfhelp.h
+++ b/src/wfhelp.h
@@ -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)
diff --git a/src/winfile.h b/src/winfile.h
index 782f80ba..b9822dc0 100644
--- a/src/winfile.h
+++ b/src/winfile.h
@@ -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") );
+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];