diff --git a/reactos/dll/win32/hhctrl.ocx/Ko.rc b/reactos/dll/win32/hhctrl.ocx/Ko.rc index e0f023f9ad7..05f7aafe8ba 100644 --- a/reactos/dll/win32/hhctrl.ocx/Ko.rc +++ b/reactos/dll/win32/hhctrl.ocx/Ko.rc @@ -4,7 +4,7 @@ * * Copyright 2005 James Hawkins * Copyright 2005 YunSong Hwang - + * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either diff --git a/reactos/dll/win32/hhctrl.ocx/Pl.rc b/reactos/dll/win32/hhctrl.ocx/Pl.rc index 1323ec3e7e5..40d3089af84 100644 --- a/reactos/dll/win32/hhctrl.ocx/Pl.rc +++ b/reactos/dll/win32/hhctrl.ocx/Pl.rc @@ -38,7 +38,7 @@ BEGIN IDTB_REFRESH "Odœwie¿" IDTB_BACK "Wstecz" IDTB_HOME "Start" - IDTB_SYNC "Sync" + IDTB_SYNC "Synchronizuj" IDTB_PRINT "Drukuj" IDTB_OPTIONS "Opcje" IDTB_FORWARD "Dalej" diff --git a/reactos/dll/win32/hhctrl.ocx/Sv.rc b/reactos/dll/win32/hhctrl.ocx/Sv.rc new file mode 100644 index 00000000000..43b421c2ffb --- /dev/null +++ b/reactos/dll/win32/hhctrl.ocx/Sv.rc @@ -0,0 +1,58 @@ +/* + * HTML Help resources + * Swedish Language Support + * + * Copyright 2007 Daniel Nylander + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CONTENTS "&Innehåll" + IDS_INDEX "I&ndex" + IDS_SEARCH "&Sök" + IDS_FAVORITES "Favor&iter" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "Visa" + IDTB_CONTRACT "Dölj" + IDTB_STOP "Stoppa" + IDTB_REFRESH "Uppdatera" + IDTB_BACK "Bakåt" + IDTB_HOME "Hem" + IDTB_SYNC "Synkronisera" + IDTB_PRINT "Skriv ut" + IDTB_OPTIONS "Alternativ" + IDTB_FORWARD "Framåt" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "Jump1" + IDTB_JUMP2 "Jump2" + IDTB_CUSTOMIZE "Anpassa" + IDTB_ZOOM "Zoom" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END diff --git a/reactos/dll/win32/hhctrl.ocx/chm.c b/reactos/dll/win32/hhctrl.ocx/chm.c index 4c515cd2e99..d65d766a18c 100644 --- a/reactos/dll/win32/hhctrl.ocx/chm.c +++ b/reactos/dll/win32/hhctrl.ocx/chm.c @@ -235,7 +235,7 @@ BOOL LoadWinTypeFromCHM(CHMInfo *pChmInfo, HH_WINTYPEW *pHHWinType) pHHWinType->pszJump2 = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszJump2)); pHHWinType->pszUrlJump1 = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszUrlJump1)); pHHWinType->pszUrlJump2 = strdupAtoW(GetChmString(pChmInfo, (DWORD)pHHWinType->pszUrlJump2)); - + /* FIXME: pszCustomTabs is a list of multiple zero-terminated strings so ReadString won't * work in this case */ diff --git a/reactos/dll/win32/hhctrl.ocx/help.c b/reactos/dll/win32/hhctrl.ocx/help.c index 82eabca8f4e..3bc9e8e6b62 100644 --- a/reactos/dll/win32/hhctrl.ocx/help.c +++ b/reactos/dll/win32/hhctrl.ocx/help.c @@ -143,7 +143,7 @@ static void SB_OnPaint(HWND hWnd) PAINTSTRUCT ps; HDC hdc; RECT rc; - + hdc = BeginPaint(hWnd, &ps); GetClientRect(hWnd, &rc); @@ -159,7 +159,7 @@ static void SB_OnPaint(HWND hWnd) LineTo(hdc, 1, 1); LineTo(hdc, 1, rc.bottom - 1); - + MoveToEx(hdc, 0, rc.bottom, NULL); LineTo(hdc, rc.right, rc.bottom); diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.c b/reactos/dll/win32/hhctrl.ocx/hhctrl.c index 44a1eb3bf7f..2ca3d840f3d 100644 --- a/reactos/dll/win32/hhctrl.ocx/hhctrl.c +++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.c @@ -151,6 +151,16 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat return NULL; /* FIXME */ } + case HH_PRETRANSLATEMESSAGE: { + static BOOL warned = FALSE; + + if (!warned) + { + FIXME("HH_PRETRANSLATEMESSAGE unimplemented\n"); + warned = TRUE; + } + return 0; + } default: FIXME("HH case %s not handled.\n", command_to_string( command )); } diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild b/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild index 715dedc6f8a..4ff43ec3b07 100644 --- a/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild +++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild @@ -1,15 +1,14 @@ + + . include/reactos/wine include/reactos - - - 0x600 - 0x501 - 0x501 + 0x600 + 0x600 wineheaders wine advapi32 diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx_ros.diff b/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx_ros.diff index 79600bbf409..63b8c99d2c7 100644 --- a/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx_ros.diff +++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx_ros.diff @@ -2,17 +2,14 @@ Index: hhctrl.ocx.rbuild =================================================================== --- hhctrl.ocx.rbuild (revision 27782) +++ hhctrl.ocx.rbuild (working copy) -@@ -3,12 +3,14 @@ +@@ -5,9 +5,11 @@ . include/reactos/wine + include/reactos - - - 0x600 - 0x501 - 0x501 + 0x600 + 0x600 + wineheaders wine advapi32 diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.rc b/reactos/dll/win32/hhctrl.ocx/hhctrl.rc index 1e90f81bf7d..1b64557a21f 100644 --- a/reactos/dll/win32/hhctrl.ocx/hhctrl.rc +++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.rc @@ -39,4 +39,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Nl.rc" #include "No.rc" #include "Pl.rc" +#include "Sv.rc" #include "Tr.rc" diff --git a/reactos/dll/win32/hhctrl.ocx/regsvr.c b/reactos/dll/win32/hhctrl.ocx/regsvr.c index cfdc36288c7..fc247c65694 100644 --- a/reactos/dll/win32/hhctrl.ocx/regsvr.c +++ b/reactos/dll/win32/hhctrl.ocx/regsvr.c @@ -115,9 +115,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -206,7 +203,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -313,16 +311,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -434,70 +435,6 @@ error_close_progid_key: return res; } -/*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - /*********************************************************************** * coclass list */ diff --git a/reactos/dll/win32/hhctrl.ocx/version.rc b/reactos/dll/win32/hhctrl.ocx/version.rc index 3a89350e684..bbdfd89db5e 100644 --- a/reactos/dll/win32/hhctrl.ocx/version.rc +++ b/reactos/dll/win32/hhctrl.ocx/version.rc @@ -21,9 +21,9 @@ #define WINE_FILEDESCRIPTION_STR "Wine htmlhelp OCX" #define WINE_FILENAME_STR "hhctrl.ocx" -#define WINE_FILEVERSION 4,72,7325,0 -#define WINE_FILEVERSION_STR "4.72.7325.0" -#define WINE_PRODUCTVERSION 4,72,7325,0 -#define WINE_PRODUCTVERSION_STR "4.72.7325.0" +#define WINE_FILEVERSION 5,2,3790,2744 +#define WINE_FILEVERSION_STR "5.2.3790.2744" +#define WINE_PRODUCTVERSION 5,2,3790,2744 +#define WINE_PRODUCTVERSION_STR "5.2.3790.2744" #include