winhelp: Removed the topics button, and forward search and topics to the same prop sheet.

programs/winhlp32/Bg.rc

@@ -77,7 +77,6 @@ STID_HLPFILE_ERROR_s, 	"      `%s'"
 STID_CONTENTS, 		"&"
 STID_SEARCH, 		"&"
 STID_BACK, 		"&"
-STID_TOPICS,		"&"
 STID_ALL_FILES, 	"  (*.*)"
 STID_HELP_FILES_HLP, 	"  (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"

programs/winhlp32/Cs.rc

@@ -82,7 +82,6 @@ STID_HLPFILE_ERROR_s, 	"Nelze pest soubor npovdy `%s'"
 STID_CONTENTS, 		"&Obsah"
 STID_SEARCH, 		"&Hledat"
 STID_BACK, 		"&Zpt"
-STID_TOPICS,		"&Tmata"
 STID_ALL_FILES, 	"Vechny soubory (*.*)"
 STID_HELP_FILES_HLP, 	"Soubory npovdy (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"

programs/winhlp32/Da.rc

@@ -89,7 +89,6 @@ STID_HLPFILE_ERROR_s, 	"Fejl ved indlsning af filen `%s'"
 STID_CONTENTS, 		"&Indhold"
 STID_SEARCH, 		"&Sg"
 STID_BACK, 		"&Tilbage"
-STID_TOPICS, 		"&Emner"
 STID_ALL_FILES, 	"Alle filer (*.*)"
 STID_HELP_FILES_HLP, 	"Hjlpe filer (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Kan ikke finde '%s'. Vil du selv finde filen?"

programs/winhlp32/De.rc

@@ -89,7 +89,6 @@ STID_HLPFILE_ERROR_s, 	"Fehler beim Lesen der Hilfe-Datei `%s'"
 STID_CONTENTS, 		"&Inhalt"
 STID_SEARCH, 		"&Suchen"
 STID_BACK, 		"&Zurck"
-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?"

programs/winhlp32/En.rc

@@ -76,6 +76,14 @@ CAPTION "Index"
     PUSHBUTTON "&Cancel", IDCANCEL, 120, 170, 50, 12
 }
 
+IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+CAPTION "Search"
+{
+    LTEXT  "Not implemented yet", -1, 10, 10, 180, 150
+}
+
 /* Strings */
 STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 {
@@ -88,7 +96,6 @@ STID_HLPFILE_ERROR_s, 	"Error while reading the help file `%s'"
 STID_CONTENTS, 		"&Contents"
 STID_SEARCH, 		"&Search"
 STID_BACK, 		"&Back"
-STID_TOPICS,		"&Topics"
 STID_ALL_FILES, 	"All files (*.*)"
 STID_HELP_FILES_HLP, 	"Help files (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"

programs/winhlp32/Eo.rc

@@ -80,7 +80,6 @@ STID_HLPFILE_ERROR_s, 	"Eraro dum la legado de helpdosiero `%s'"
 STID_CONTENTS, 	"&Enhavo"
 STID_SEARCH, 		"&Seru"
 STID_BACK, 		"&Retro"
-STID_TOPICS,		"&Temoj"
 STID_ALL_FILES, 	"Tutaj dosieroj (*.*)"
 STID_HELP_FILES_HLP, 	"Helpaj dosieroj (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"

programs/winhlp32/Es.rc

@@ -79,7 +79,6 @@ STID_HLPFILE_ERROR_s, 	"Error al leer el archivo de ayuda `%s'"
 STID_CONTENTS, 		"&ndice"
 STID_SEARCH, 		"&Buscar"
 STID_BACK, 		"&Anterior"
-STID_TOPICS,		"&Temas"
 STID_ALL_FILES, 	"Todos los archivos (*.*)"
 STID_HELP_FILES_HLP, 	"Archivos de ayuda (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"

programs/winhlp32/Fi.rc

@@ -80,7 +80,6 @@ STID_HLPFILE_ERROR_s, 	"Virhe luettaessa ohjetiedostoa `%s'"
 STID_CONTENTS, 		"&Sisllys"
 STID_SEARCH, 		"&Etsi"
 STID_BACK, 		"&Takaisin"
-STID_TOPICS,		"T&opics"
 STID_ALL_FILES, 	"Kaikki tiedostot (*.*)"
 STID_HELP_FILES_HLP, 	"Ohjetiedostot (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"

programs/winhlp32/Fr.rc

@@ -91,7 +91,6 @@ STID_HLPFILE_ERROR_s, 	"Une erreur est survenue en lisant le fichier d'aide %s
 STID_CONTENTS, 		"&Index"
 STID_SEARCH, 		"&Rechercher"
 STID_BACK, 		"&Prcdent"
-STID_TOPICS,		"&Sujets"
 STID_ALL_FILES, 	"Tous fichiers (*.*)"
 STID_HELP_FILES_HLP, 	"Fichiers d'aide (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Impossible de trouver %s. Souhaitez-vous rechercher ce fichier vous-mme?"

programs/winhlp32/Hu.rc

@@ -80,7 +80,6 @@ STID_HLPFILE_ERROR_s, 	"Hiba a `%s' file olvassakor"
 STID_CONTENTS, 		"&Tartalom"
 STID_SEARCH, 		"&Keress"
 STID_BACK, 		"&Vissza"
-STID_TOPICS,		"&Tmakrk"
 STID_ALL_FILES, 	"Minden fjl (*.*)"
 STID_HELP_FILES_HLP, 	"Sg fjlok (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"

programs/winhlp32/It.rc

@@ -79,7 +79,6 @@ STID_HLPFILE_ERROR_s, 	"Errore di lettura del file della Guida `%s'"
 STID_CONTENTS, 		"&Sommario"
 STID_SEARCH, 		"&Trova"
 STID_BACK, 		"&Precedente"
-STID_TOPICS,		"&Argomenti"
 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?"

programs/winhlp32/Ko.rc

@@ -91,7 +91,6 @@ STID_HLPFILE_ERROR_s, 	"도움말 파일 `%s'를 읽는 도중 오류 발생"
 STID_CONTENTS, 		"목차(&C)"
 STID_SEARCH, 		"찾기(&S)"
 STID_BACK, 		"뒤로(&B)"
-STID_TOPICS,		"목차(&T)"
 STID_ALL_FILES, 	"모든 파일 (*.*)"
 STID_HELP_FILES_HLP, 	"도움말 파일 (*.hlp)"
 STID_FILE_NOT_FOUND_s	"%s을 찾을 수 없습니다'. 이 파일을 직접 찾겠습니까?"

programs/winhlp32/Nl.rc

@@ -88,7 +88,6 @@ STID_HLPFILE_ERROR_s, 	"Fout bij het lezen van het helpbestand `%s'"
 STID_CONTENTS, 		"&Inhoud"
 STID_SEARCH, 		"&Zoeken"
 STID_BACK, 		"&Terug"
-STID_TOPICS,		"&Onderwerpen"
 STID_ALL_FILES, 	"Alle bestanden (*.*)"
 STID_HELP_FILES_HLP, 	"Helpbestanden (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Kan '%s' niet openen. Wilt u zelf dit bestand zoeken?"

programs/winhlp32/No.rc

@@ -87,7 +87,6 @@ STID_HLPFILE_ERROR_s, 	"Feil ved lesing av hjelpefilen '%s'"
 STID_CONTENTS, 		"&Innhold"
 STID_SEARCH, 		"&Sk"
 STID_BACK, 		"Til&bake"
-STID_TOPICS,		"&Emner"
 STID_ALL_FILES, 	"Alle filer (*.*)"
 STID_HELP_FILES_HLP, 	"Hjelp-filer (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"

programs/winhlp32/Pl.rc

@@ -89,7 +89,6 @@ STID_HLPFILE_ERROR_s, 	"Bd w trakcie odczytu pliku pomocy `%s'"
 STID_CONTENTS, 		"&Zawarto"
 STID_SEARCH, 		"&Szukaj"
 STID_BACK, 		"&Wstecz"
-STID_TOPICS,		"&Tematy"
 STID_ALL_FILES, 	"Wszystkie pliki (*.*)"
 STID_HELP_FILES_HLP, 	"Pliki pomocy (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Nie znaleziono pliku '%s'. Czy chcesz poszuka tego pliku samodzielnie?"

programs/winhlp32/Pt.rc

@@ -134,7 +134,6 @@ STID_HLPFILE_ERROR_s, 	"Erro encontrado na leitura do arquivo de ajuda '%s'"
 STID_CONTENTS, 		"&Contedo"
 STID_SEARCH, 		"&Procurar"
 STID_BACK, 		"&Voltar"
-STID_TOPICS,		"&Tpicos"
 STID_ALL_FILES, 	"Todos os arquivos (*.*)"
 STID_HELP_FILES_HLP, 	"Arquivos de ajuda (*.hlp)"
 STID_FILE_NOT_FOUND_s   "Cannot find '%s'. Do you want to find this file yourself?"
@@ -155,7 +154,6 @@ STID_HLPFILE_ERROR_s, 	"Erro encontrado na leitura do ficheiro de ajuda '%s'"
 STID_CONTENTS, 		"&Contedo"
 STID_SEARCH, 		"&Procurar"
 STID_BACK, 		"&Voltar"
-STID_TOPICS,		"&Tpicos"
 STID_ALL_FILES, 	"Todos os ficheiros (*.*)"
 STID_HELP_FILES_HLP, 	"Ficheiros de ajuda (*.hlp)"
 STID_FILE_NOT_FOUND_s	"No  possvel encontrar '%s'. Deseja procurar este ficheiro voc mesmo?"

programs/winhlp32/Rm.rc

@@ -82,7 +82,6 @@ STID_HLPFILE_ERROR_s,   "Sbagl cun leger la datoteca d'ag�d `%s'"
 STID_CONTENTS,          "&Cuntgn�"
 STID_SEARCH,            "&Tscherchar"
 STID_BACK,              "&Inavo"
-STID_TOPICS,            "T&opics"
 STID_ALL_FILES,         "Tuot las datotecas (*.*)"
 STID_HELP_FILES_HLP,    "Datotecas d'ag�d (*.hlp)"
 STID_FILE_NOT_FOUND_s   "Cannot find '%s'. Do you want to find this file yourself?"

programs/winhlp32/Ru.rc

@@ -87,7 +87,6 @@ STID_HLPFILE_ERROR_s, 	"     `%s'"
 STID_CONTENTS, 		"&"
 STID_SEARCH, 		"&"
 STID_BACK, 		"&"
-STID_TOPICS,		"&"
 STID_ALL_FILES, 	"  (*.*)"
 STID_HELP_FILES_HLP, 	"  (*.hlp)"
 STID_FILE_NOT_FOUND_s	"   '%s'.      ?"

programs/winhlp32/Si.rc

@@ -89,7 +89,6 @@ STID_HLPFILE_ERROR_s, 	"Napaka pri branju datoteke s pomočjo `%s'"
 STID_CONTENTS, 		"&Teme pomoči"
 STID_SEARCH, 		"&Iskanje"
 STID_BACK, 		"&Nazaj"
-STID_TOPICS,		"&Vsebina"
 STID_ALL_FILES, 	"Vse datoteke (*.*)"
 STID_HELP_FILES_HLP, 	"Datoteke s pomočjo (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Ne najdem datoteke '%s'. Ali jo želite poiskati sami?"

programs/winhlp32/Sk.rc

@@ -75,7 +75,6 @@ STID_HLPFILE_ERROR_s,       "Chyba poas tania sboru `%s'"
 STID_CONTENTS,              "&Obsah"
 STID_SEARCH,                "&Hada"
 STID_BACK,                  "&Sp"
-STID_TOPICS,		    "&Topics"
 STID_ALL_FILES,             "Vetky sbory (*.*)"
 STID_HELP_FILES_HLP,        "Sbory pomoci (*.hlp)"
 STID_FILE_NOT_FOUND_s       "Cannot find '%s'. Do you want to find this file yourself?"

programs/winhlp32/Sv.rc

@@ -80,7 +80,6 @@ STID_HLPFILE_ERROR_s, 	"Fel vid läsning av hjälpfilen `%s'"
 STID_CONTENTS, 		"&Innehåll"
 STID_SEARCH, 		"&Sök"
 STID_BACK, 		"&Bakåt"
-STID_TOPICS,		"&Ämnen"
 STID_ALL_FILES, 	"Alla filer (*.*)"
 STID_HELP_FILES_HLP, 	"Hjälpfiler (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Kan inte hitta '%s'. Vill du söka efter denna fil?"

programs/winhlp32/Tr.rc

@@ -77,7 +77,6 @@ STID_HLPFILE_ERROR_s, 	"'%s' yardm dosyas alrken hata"
 STID_CONTENTS, 		"&indekiler"
 STID_SEARCH, 		"&Ara"
 STID_BACK, 		"&Geri"
-STID_TOPICS,		"&Konular"
 STID_ALL_FILES, 	"Tm dosyalar (*.*)"
 STID_HELP_FILES_HLP, 	"Yardm dosyalar (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"

programs/winhlp32/Wa.rc

@@ -82,7 +82,6 @@ STID_HLPFILE_ERROR_s, 	"Yk n' a nn st  moumint di lere li fitch d' aide `%s
 STID_CONTENTS, 		"&dvins"
 STID_SEARCH, 		"C&wer"
 STID_BACK, 		"n &Er"
-STID_TOPICS,		"&Topics"
 STID_ALL_FILES, 	"Tos les fitchs (*.*)"
 STID_HELP_FILES_HLP, 	"Fitchs d' aide (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"

programs/winhlp32/Zh.rc

@@ -78,7 +78,6 @@ STID_HLPFILE_ERROR_s, 	"读入帮助文件 ‘%s’ 时发生错误"
 STID_CONTENTS, 		"内容（&C）"
 STID_SEARCH, 		"搜索（&S）"
 STID_BACK, 		"返回（&B）"
-STID_TOPICS,		"主题（&T）"
 STID_ALL_FILES, 	"所有文件 (*.*)"
 STID_HELP_FILES_HLP, 	"帮助文件 (*.hlp)"
 STID_FILE_NOT_FOUND_s	"Cannot find '%s'. Do you want to find this file yourself?"

programs/winhlp32/macro.c

@@ -517,7 +517,7 @@ void CALLBACK MACRO_Find(void)
 
 void CALLBACK MACRO_Finder(void)
 {
-    WINHELP_CreateIndexWindow();
+    WINHELP_CreateIndexWindow(FALSE);
 }
 
 void CALLBACK MACRO_FloatingMenu(void)
@@ -880,7 +880,7 @@ void CALLBACK MACRO_SaveMark(LPCSTR str)
 
 void CALLBACK MACRO_Search(void)
 {
-    WINE_FIXME("()\n");
+    WINHELP_CreateIndexWindow(TRUE);
 }
 
 void CALLBACK MACRO_SetContents(LPCSTR str, LONG u)

programs/winhlp32/winhelp.c

@@ -632,8 +632,6 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe
         LoadString(Globals.hInstance, STID_BACK, buffer, sizeof(buffer));
         MACRO_CreateButton("BTN_BACK", buffer, "Back()");
         if (win->back.index <= 1) MACRO_DisableButton("BTN_BACK");
-        LoadString(Globals.hInstance, STID_TOPICS, buffer, sizeof(buffer));
-        MACRO_CreateButton("BTN_TOPICS", buffer, "Finder()");
     }
 
     if (!bReUsed)
@@ -1623,12 +1621,41 @@ INT_PTR CALLBACK WINHELP_IndexDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM
 }
 
 /**************************************************************************
+ * WINHELP_SearchDlgProc
+ *
+ */
+INT_PTR CALLBACK WINHELP_SearchDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+    static struct index_data* id;
+
+    switch (msg)
+    {
+    case WM_INITDIALOG:
+        id = (struct index_data*)((PROPSHEETPAGE*)lParam)->lParam;
+        return TRUE;
+    case WM_NOTIFY:
+	switch (((NMHDR*)lParam)->code)
+	{
+	case PSN_APPLY:
+            SetWindowLongPtr(hWnd, DWLP_MSGRESULT, PSNRET_NOERROR);
+            return TRUE;
+        default:
+            return FALSE;
+        }
+        break;
+    default:
+        break;
+    }
+    return FALSE;
+}
+
+/**************************************************************************
  * WINHELP_CreateIndexWindow
  *
  * Displays a dialog with keywords of current help file.
  *
  */
-BOOL WINHELP_CreateIndexWindow(void)
+BOOL WINHELP_CreateIndexWindow(BOOL is_search)
 {
     HPROPSHEETPAGE      psPage[3];
     PROPSHEETPAGE       psp;
@@ -1660,6 +1687,11 @@ BOOL WINHELP_CreateIndexWindow(void)
     psp.pfnDlgProc = WINHELP_IndexDlgProc;
     psPage[0] = CreatePropertySheetPage(&psp);
 
+    psp.u.pszTemplate = MAKEINTRESOURCE(IDD_SEARCH);
+    psp.lParam = (LPARAM)&id;
+    psp.pfnDlgProc = WINHELP_SearchDlgProc;
+    psPage[1] = CreatePropertySheetPage(&psp);
+
     memset(&psHead, 0, sizeof(psHead));
     psHead.dwSize = sizeof(psHead);
 
@@ -1667,7 +1699,8 @@ BOOL WINHELP_CreateIndexWindow(void)
     strcat(buf, Globals.active_win->info->caption);
 
     psHead.pszCaption = buf;
-    psHead.nPages = 1;
+    psHead.nPages = 2;
+    psHead.u2.nStartPage = is_search ? 1 : 0;
     psHead.hwndParent = Globals.active_win->hMainWnd;
     psHead.u3.phpage = psPage;
     psHead.dwFlags = PSH_NOAPPLYNOW;

programs/winhlp32/winhelp.h

@@ -146,7 +146,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE*, int, BOOL);
 BOOL WINHELP_OpenHelpWindow(HLPFILE_PAGE* (*)(HLPFILE*, LONG, ULONG*),
                             HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int);
 BOOL WINHELP_GetOpenFileName(LPSTR, int);
-BOOL WINHELP_CreateIndexWindow(void);
+BOOL WINHELP_CreateIndexWindow(BOOL);
 void WINHELP_DeleteBackSet(WINHELP_WINDOW*);
 INT  WINHELP_MessageBoxIDS_s(UINT, LPCSTR, UINT, WORD);
 HLPFILE* WINHELP_LookupHelpFile(LPCSTR lpszFile);

programs/winhlp32/winhelp_res.h

@@ -45,7 +45,6 @@
 #define STID_CONTENTS 		0x126
 #define STID_SEARCH	 	0x127
 #define STID_BACK 		0x128
-#define STID_TOPICS 		0x12A
 #define STID_ALL_FILES 		0x12B
 #define STID_HELP_FILES_HLP	0x12C
 #define STID_DIALOG_TEST	0x12D
@@ -55,5 +54,6 @@
 
 #define IDD_INDEX               0x150
 #define IDC_INDEXLIST           0x151
+#define IDD_SEARCH              0x152
 
 #define IDI_WINHELP             0xF00