winhelp.exe: Renamed to winhlp32.exe.

.gitignore

@@ -696,8 +696,8 @@ programs/winetest/winspool.drv_test.exe
 programs/winetest/wintrust_test.exe
 programs/winetest/ws2_32_test.exe
 programs/winevdm/winevdm
-programs/winhelp/macro.lex.yy.c
-programs/winhelp/winhelp
+programs/winhlp32/macro.lex.yy.c
+programs/winhlp32/winhlp32
 programs/winver/winver
 programs/wordpad/wordpad
 programs/write/write

Makefile.in

@@ -560,7 +560,7 @@ ALL_MAKEFILES = \
 	programs/winepath/Makefile \
 	programs/winetest/Makefile \
 	programs/winevdm/Makefile \
-	programs/winhelp/Makefile \
+	programs/winhlp32/Makefile \
 	programs/winver/Makefile \
 	programs/wordpad/Makefile \
 	programs/write/Makefile \
@@ -986,7 +986,7 @@ programs/winemine/Makefile: programs/winemine/Makefile.in programs/Makeprog.rule
 programs/winepath/Makefile: programs/winepath/Makefile.in programs/Makeprog.rules
 programs/winetest/Makefile: programs/winetest/Makefile.in programs/Makeprog.rules
 programs/winevdm/Makefile: programs/winevdm/Makefile.in programs/Makeprog.rules
-programs/winhelp/Makefile: programs/winhelp/Makefile.in programs/Makeprog.rules
+programs/winhlp32/Makefile: programs/winhlp32/Makefile.in programs/Makeprog.rules
 programs/winver/Makefile: programs/winver/Makefile.in programs/Makeprog.rules
 programs/wordpad/Makefile: programs/wordpad/Makefile.in programs/Makeprog.rules
 programs/write/Makefile: programs/write/Makefile.in programs/Makeprog.rules

configure

@@ -22371,7 +22371,7 @@ ac_config_files="$ac_config_files programs/winetest/Makefile"
 
 ac_config_files="$ac_config_files programs/winevdm/Makefile"
 
-ac_config_files="$ac_config_files programs/winhelp/Makefile"
+ac_config_files="$ac_config_files programs/winhlp32/Makefile"
 
 ac_config_files="$ac_config_files programs/winver/Makefile"
 
@@ -23365,7 +23365,7 @@ do
     "programs/winepath/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winepath/Makefile" ;;
     "programs/winetest/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winetest/Makefile" ;;
     "programs/winevdm/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winevdm/Makefile" ;;
-    "programs/winhelp/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winhelp/Makefile" ;;
+    "programs/winhlp32/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winhlp32/Makefile" ;;
     "programs/winver/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winver/Makefile" ;;
     "programs/wordpad/Makefile") CONFIG_FILES="$CONFIG_FILES programs/wordpad/Makefile" ;;
     "programs/write/Makefile") CONFIG_FILES="$CONFIG_FILES programs/write/Makefile" ;;

configure.ac

@@ -2088,7 +2088,7 @@ AC_CONFIG_FILES([programs/winemine/Makefile])
 AC_CONFIG_FILES([programs/winepath/Makefile])
 AC_CONFIG_FILES([programs/winetest/Makefile])
 AC_CONFIG_FILES([programs/winevdm/Makefile])
-AC_CONFIG_FILES([programs/winhelp/Makefile])
+AC_CONFIG_FILES([programs/winhlp32/Makefile])
 AC_CONFIG_FILES([programs/winver/Makefile])
 AC_CONFIG_FILES([programs/wordpad/Makefile])
 AC_CONFIG_FILES([programs/write/Makefile])

dlls/user32/winhelp.c

@@ -85,9 +85,9 @@ BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand, ULONG_PTR dwD
     if (!hDest) 
     {
         if (wCommand == HELP_QUIT) return TRUE;
-        if (WinExec("winhelp.exe -x", SW_SHOWNORMAL) < 32) 
+        if (WinExec("winhlp32.exe -x", SW_SHOWNORMAL) < 32) 
         {
-            ERR("can't start winhelp.exe -x ?\n");
+            ERR("can't start winhlp32.exe -x ?\n");
             return FALSE;
         }
         if (!(hDest = FindWindowA("MS_WINHELP", NULL))) 

programs/Makefile.in

@@ -46,7 +46,7 @@ SUBDIRS = \
 	winepath \
 	winetest \
 	winevdm \
-	winhelp \
+	winhlp32 \
 	winver \
 	wordpad \
 	write \
@@ -91,7 +91,7 @@ INSTALLSUBDIRS = \
 	winemine \
 	winepath \
 	winevdm \
-	winhelp \
+	winhlp32 \
 	winver \
 	wordpad \
 	write \
@@ -112,8 +112,7 @@ INSTALLPROGS = \
 	winedbg \
 	winefile \
 	winemine \
-	winepath \
-	winhelp
+	winepath
 
 INSTALLDIRS = $(DESTDIR)$(bindir)
 

programs/winhlp32/Makefile.in

@@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = winhelp.exe
+MODULE    = winhlp32.exe
 APPMODE   = -mwindows
 IMPORTS   = comdlg32 shell32 user32 gdi32 kernel32
 

tools/make_makefiles

@@ -46,7 +46,6 @@ my %bin_install =
   "winefile" => 1,
   "winemine" => 1,
   "winepath" => 1,
-  "winhelp" => 1,
 );
 
 # Programs that we don't want to install at all

tools/wine.inf.in

@@ -123,7 +123,7 @@ HKCR,exefile\shell\open\command,,2,"""%1"" %*"
 HKCR,folder\shell\open\ddeexec,,2,"[ViewFolder("%l", %I, %S)]"
 HKCR,folder\shell\open\ddeexec,"NoActivateHandler",2,""
 HKCR,folder\shell\open\ddeexec\application,,2,"Folders"
-HKCR,hlpfile\shell\open\command,,2,"%10%\winhelp.exe %1"
+HKCR,hlpfile\shell\open\command,,2,"%11%\winhlp32.exe %1"
 HKCR,htmlfile\shell\open\command,,2,"%11%\winebrowser.exe -nohome"
 HKCR,htmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,,"
 HKCR,htmlfile\shell\open\ddeexec,"NoActivateHandler",2,""
@@ -2225,6 +2225,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
 10,,regedit.exe
 10,,twain_32.dll
 10,,winhelp.exe
+10,,winhlp32.exe
 10,command,start.exe
 11,,actxprxy.dll
 11,,advapi32.dll
@@ -2284,6 +2285,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
 11,,user32.dll
 11,,version.dll
 11,,winebrowser.exe
+11,,winhlp32.exe
 11,,wininet.dll
 11,,winmm.dll
 11,,winspool.drv