From a795f36af7c63d21d7d848d78993c83c66096b48 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Tue, 13 May 2008 18:43:27 +0200 Subject: [PATCH] winhelp.exe: Renamed to winhlp32.exe. --- .gitignore | 4 ++-- Makefile.in | 4 ++-- configure | 4 ++-- configure.ac | 2 +- dlls/user32/winhelp.c | 4 ++-- programs/Makefile.in | 7 +++---- programs/{winhelp => winhlp32}/Bg.rc | 0 programs/{winhelp => winhlp32}/Cs.rc | 0 programs/{winhelp => winhlp32}/Da.rc | 0 programs/{winhelp => winhlp32}/De.rc | 0 programs/{winhelp => winhlp32}/En.rc | 0 programs/{winhelp => winhlp32}/Eo.rc | 0 programs/{winhelp => winhlp32}/Es.rc | 0 programs/{winhelp => winhlp32}/Fi.rc | 0 programs/{winhelp => winhlp32}/Fr.rc | 0 programs/{winhelp => winhlp32}/Hu.rc | 0 programs/{winhelp => winhlp32}/It.rc | 0 programs/{winhelp => winhlp32}/Ko.rc | 0 programs/{winhelp => winhlp32}/Makefile.in | 2 +- programs/{winhelp => winhlp32}/Nl.rc | 0 programs/{winhelp => winhlp32}/No.rc | 0 programs/{winhelp => winhlp32}/Pl.rc | 0 programs/{winhelp => winhlp32}/Pt.rc | 0 programs/{winhelp => winhlp32}/Rm.rc | 0 programs/{winhelp => winhlp32}/Ru.rc | 0 programs/{winhelp => winhlp32}/Si.rc | 0 programs/{winhelp => winhlp32}/Sk.rc | 0 programs/{winhelp => winhlp32}/Sv.rc | 0 programs/{winhelp => winhlp32}/Tr.rc | 0 programs/{winhelp => winhlp32}/Wa.rc | 0 programs/{winhelp => winhlp32}/Zh.rc | 0 programs/{winhelp => winhlp32}/callback.c | 0 programs/{winhelp => winhlp32}/hlpfile.c | 0 programs/{winhelp => winhlp32}/hlpfile.h | 0 programs/{winhelp => winhlp32}/macro.c | 0 programs/{winhelp => winhlp32}/macro.h | 0 programs/{winhelp => winhlp32}/macro.lex.l | 0 programs/{winhelp => winhlp32}/rsrc.rc | 0 programs/{winhelp => winhlp32}/string.c | 0 programs/{winhelp => winhlp32}/winhelp.c | 0 programs/{winhelp => winhlp32}/winhelp.h | 0 programs/{winhelp => winhlp32}/winhelp.ico | Bin programs/{winhelp => winhlp32}/winhelp.svg | 0 programs/{winhelp => winhlp32}/winhelp_res.h | 0 tools/make_makefiles | 1 - tools/wine.inf.in | 4 +++- 46 files changed, 16 insertions(+), 16 deletions(-) rename programs/{winhelp => winhlp32}/Bg.rc (100%) rename programs/{winhelp => winhlp32}/Cs.rc (100%) rename programs/{winhelp => winhlp32}/Da.rc (100%) rename programs/{winhelp => winhlp32}/De.rc (100%) rename programs/{winhelp => winhlp32}/En.rc (100%) rename programs/{winhelp => winhlp32}/Eo.rc (100%) rename programs/{winhelp => winhlp32}/Es.rc (100%) rename programs/{winhelp => winhlp32}/Fi.rc (100%) rename programs/{winhelp => winhlp32}/Fr.rc (100%) rename programs/{winhelp => winhlp32}/Hu.rc (100%) rename programs/{winhelp => winhlp32}/It.rc (100%) rename programs/{winhelp => winhlp32}/Ko.rc (100%) rename programs/{winhelp => winhlp32}/Makefile.in (94%) rename programs/{winhelp => winhlp32}/Nl.rc (100%) rename programs/{winhelp => winhlp32}/No.rc (100%) rename programs/{winhelp => winhlp32}/Pl.rc (100%) rename programs/{winhelp => winhlp32}/Pt.rc (100%) rename programs/{winhelp => winhlp32}/Rm.rc (100%) rename programs/{winhelp => winhlp32}/Ru.rc (100%) rename programs/{winhelp => winhlp32}/Si.rc (100%) rename programs/{winhelp => winhlp32}/Sk.rc (100%) rename programs/{winhelp => winhlp32}/Sv.rc (100%) rename programs/{winhelp => winhlp32}/Tr.rc (100%) rename programs/{winhelp => winhlp32}/Wa.rc (100%) rename programs/{winhelp => winhlp32}/Zh.rc (100%) rename programs/{winhelp => winhlp32}/callback.c (100%) rename programs/{winhelp => winhlp32}/hlpfile.c (100%) rename programs/{winhelp => winhlp32}/hlpfile.h (100%) rename programs/{winhelp => winhlp32}/macro.c (100%) rename programs/{winhelp => winhlp32}/macro.h (100%) rename programs/{winhelp => winhlp32}/macro.lex.l (100%) rename programs/{winhelp => winhlp32}/rsrc.rc (100%) rename programs/{winhelp => winhlp32}/string.c (100%) rename programs/{winhelp => winhlp32}/winhelp.c (100%) rename programs/{winhelp => winhlp32}/winhelp.h (100%) rename programs/{winhelp => winhlp32}/winhelp.ico (100%) rename programs/{winhelp => winhlp32}/winhelp.svg (100%) rename programs/{winhelp => winhlp32}/winhelp_res.h (100%) diff --git a/.gitignore b/.gitignore index b74bd9521cd..aaef4632494 100644 --- a/.gitignore +++ b/.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 diff --git a/Makefile.in b/Makefile.in index aac678dbafc..de131bda0a5 100644 --- a/Makefile.in +++ b/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 diff --git a/configure b/configure index 2419218227d..e572c7fb438 100755 --- a/configure +++ b/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" ;; diff --git a/configure.ac b/configure.ac index e61f68da923..fc81d92a9cb 100644 --- a/configure.ac +++ b/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]) diff --git a/dlls/user32/winhelp.c b/dlls/user32/winhelp.c index 3210de5f50a..1ffb707bd1a 100644 --- a/dlls/user32/winhelp.c +++ b/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))) diff --git a/programs/Makefile.in b/programs/Makefile.in index 7565590be1f..967cd8eb598 100644 --- a/programs/Makefile.in +++ b/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) diff --git a/programs/winhelp/Bg.rc b/programs/winhlp32/Bg.rc similarity index 100% rename from programs/winhelp/Bg.rc rename to programs/winhlp32/Bg.rc diff --git a/programs/winhelp/Cs.rc b/programs/winhlp32/Cs.rc similarity index 100% rename from programs/winhelp/Cs.rc rename to programs/winhlp32/Cs.rc diff --git a/programs/winhelp/Da.rc b/programs/winhlp32/Da.rc similarity index 100% rename from programs/winhelp/Da.rc rename to programs/winhlp32/Da.rc diff --git a/programs/winhelp/De.rc b/programs/winhlp32/De.rc similarity index 100% rename from programs/winhelp/De.rc rename to programs/winhlp32/De.rc diff --git a/programs/winhelp/En.rc b/programs/winhlp32/En.rc similarity index 100% rename from programs/winhelp/En.rc rename to programs/winhlp32/En.rc diff --git a/programs/winhelp/Eo.rc b/programs/winhlp32/Eo.rc similarity index 100% rename from programs/winhelp/Eo.rc rename to programs/winhlp32/Eo.rc diff --git a/programs/winhelp/Es.rc b/programs/winhlp32/Es.rc similarity index 100% rename from programs/winhelp/Es.rc rename to programs/winhlp32/Es.rc diff --git a/programs/winhelp/Fi.rc b/programs/winhlp32/Fi.rc similarity index 100% rename from programs/winhelp/Fi.rc rename to programs/winhlp32/Fi.rc diff --git a/programs/winhelp/Fr.rc b/programs/winhlp32/Fr.rc similarity index 100% rename from programs/winhelp/Fr.rc rename to programs/winhlp32/Fr.rc diff --git a/programs/winhelp/Hu.rc b/programs/winhlp32/Hu.rc similarity index 100% rename from programs/winhelp/Hu.rc rename to programs/winhlp32/Hu.rc diff --git a/programs/winhelp/It.rc b/programs/winhlp32/It.rc similarity index 100% rename from programs/winhelp/It.rc rename to programs/winhlp32/It.rc diff --git a/programs/winhelp/Ko.rc b/programs/winhlp32/Ko.rc similarity index 100% rename from programs/winhelp/Ko.rc rename to programs/winhlp32/Ko.rc diff --git a/programs/winhelp/Makefile.in b/programs/winhlp32/Makefile.in similarity index 94% rename from programs/winhelp/Makefile.in rename to programs/winhlp32/Makefile.in index 1733f94a845..5deecf06d00 100644 --- a/programs/winhelp/Makefile.in +++ b/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 diff --git a/programs/winhelp/Nl.rc b/programs/winhlp32/Nl.rc similarity index 100% rename from programs/winhelp/Nl.rc rename to programs/winhlp32/Nl.rc diff --git a/programs/winhelp/No.rc b/programs/winhlp32/No.rc similarity index 100% rename from programs/winhelp/No.rc rename to programs/winhlp32/No.rc diff --git a/programs/winhelp/Pl.rc b/programs/winhlp32/Pl.rc similarity index 100% rename from programs/winhelp/Pl.rc rename to programs/winhlp32/Pl.rc diff --git a/programs/winhelp/Pt.rc b/programs/winhlp32/Pt.rc similarity index 100% rename from programs/winhelp/Pt.rc rename to programs/winhlp32/Pt.rc diff --git a/programs/winhelp/Rm.rc b/programs/winhlp32/Rm.rc similarity index 100% rename from programs/winhelp/Rm.rc rename to programs/winhlp32/Rm.rc diff --git a/programs/winhelp/Ru.rc b/programs/winhlp32/Ru.rc similarity index 100% rename from programs/winhelp/Ru.rc rename to programs/winhlp32/Ru.rc diff --git a/programs/winhelp/Si.rc b/programs/winhlp32/Si.rc similarity index 100% rename from programs/winhelp/Si.rc rename to programs/winhlp32/Si.rc diff --git a/programs/winhelp/Sk.rc b/programs/winhlp32/Sk.rc similarity index 100% rename from programs/winhelp/Sk.rc rename to programs/winhlp32/Sk.rc diff --git a/programs/winhelp/Sv.rc b/programs/winhlp32/Sv.rc similarity index 100% rename from programs/winhelp/Sv.rc rename to programs/winhlp32/Sv.rc diff --git a/programs/winhelp/Tr.rc b/programs/winhlp32/Tr.rc similarity index 100% rename from programs/winhelp/Tr.rc rename to programs/winhlp32/Tr.rc diff --git a/programs/winhelp/Wa.rc b/programs/winhlp32/Wa.rc similarity index 100% rename from programs/winhelp/Wa.rc rename to programs/winhlp32/Wa.rc diff --git a/programs/winhelp/Zh.rc b/programs/winhlp32/Zh.rc similarity index 100% rename from programs/winhelp/Zh.rc rename to programs/winhlp32/Zh.rc diff --git a/programs/winhelp/callback.c b/programs/winhlp32/callback.c similarity index 100% rename from programs/winhelp/callback.c rename to programs/winhlp32/callback.c diff --git a/programs/winhelp/hlpfile.c b/programs/winhlp32/hlpfile.c similarity index 100% rename from programs/winhelp/hlpfile.c rename to programs/winhlp32/hlpfile.c diff --git a/programs/winhelp/hlpfile.h b/programs/winhlp32/hlpfile.h similarity index 100% rename from programs/winhelp/hlpfile.h rename to programs/winhlp32/hlpfile.h diff --git a/programs/winhelp/macro.c b/programs/winhlp32/macro.c similarity index 100% rename from programs/winhelp/macro.c rename to programs/winhlp32/macro.c diff --git a/programs/winhelp/macro.h b/programs/winhlp32/macro.h similarity index 100% rename from programs/winhelp/macro.h rename to programs/winhlp32/macro.h diff --git a/programs/winhelp/macro.lex.l b/programs/winhlp32/macro.lex.l similarity index 100% rename from programs/winhelp/macro.lex.l rename to programs/winhlp32/macro.lex.l diff --git a/programs/winhelp/rsrc.rc b/programs/winhlp32/rsrc.rc similarity index 100% rename from programs/winhelp/rsrc.rc rename to programs/winhlp32/rsrc.rc diff --git a/programs/winhelp/string.c b/programs/winhlp32/string.c similarity index 100% rename from programs/winhelp/string.c rename to programs/winhlp32/string.c diff --git a/programs/winhelp/winhelp.c b/programs/winhlp32/winhelp.c similarity index 100% rename from programs/winhelp/winhelp.c rename to programs/winhlp32/winhelp.c diff --git a/programs/winhelp/winhelp.h b/programs/winhlp32/winhelp.h similarity index 100% rename from programs/winhelp/winhelp.h rename to programs/winhlp32/winhelp.h diff --git a/programs/winhelp/winhelp.ico b/programs/winhlp32/winhelp.ico similarity index 100% rename from programs/winhelp/winhelp.ico rename to programs/winhlp32/winhelp.ico diff --git a/programs/winhelp/winhelp.svg b/programs/winhlp32/winhelp.svg similarity index 100% rename from programs/winhelp/winhelp.svg rename to programs/winhlp32/winhelp.svg diff --git a/programs/winhelp/winhelp_res.h b/programs/winhlp32/winhelp_res.h similarity index 100% rename from programs/winhelp/winhelp_res.h rename to programs/winhlp32/winhelp_res.h diff --git a/tools/make_makefiles b/tools/make_makefiles index 2a5f6929892..bb492638da7 100755 --- a/tools/make_makefiles +++ b/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 diff --git a/tools/wine.inf.in b/tools/wine.inf.in index bea392efed0..aa18b8706a5 100644 --- a/tools/wine.inf.in +++ b/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