Author: winesync Date: Thu Nov 29 13:36:22 2007 New Revision: 30866
URL: http://svn.reactos.org/svn/reactos?rev=30866&view=rev Log: Autosyncing with Wine HEAD
Added: trunk/reactos/dll/win32/hhctrl.ocx/Sv.rc (with props) Modified: trunk/reactos/dll/win32/hhctrl.ocx/Ko.rc trunk/reactos/dll/win32/hhctrl.ocx/Pl.rc trunk/reactos/dll/win32/hhctrl.ocx/chm.c trunk/reactos/dll/win32/hhctrl.ocx/help.c trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx_ros.diff trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc trunk/reactos/dll/win32/hhctrl.ocx/regsvr.c trunk/reactos/dll/win32/hhctrl.ocx/version.rc
Modified: trunk/reactos/dll/win32/hhctrl.ocx/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/Ko.rc?... ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/Ko.rc (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/Ko.rc Thu Nov 29 13:36:22 2007 @@ -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
Modified: trunk/reactos/dll/win32/hhctrl.ocx/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/Pl.rc?... ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/Pl.rc (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/Pl.rc Thu Nov 29 13:36:22 2007 @@ -38,7 +38,7 @@ IDTB_REFRESH "Odwie¿" IDTB_BACK "Wstecz" IDTB_HOME "Start" - IDTB_SYNC "Sync" + IDTB_SYNC "Synchronizuj" IDTB_PRINT "Drukuj" IDTB_OPTIONS "Opcje" IDTB_FORWARD "Dalej"
Added: trunk/reactos/dll/win32/hhctrl.ocx/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/Sv.rc?... ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/Sv.rc (added) +++ trunk/reactos/dll/win32/hhctrl.ocx/Sv.rc Thu Nov 29 13:36:22 2007 @@ -1,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
Propchange: trunk/reactos/dll/win32/hhctrl.ocx/Sv.rc ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/dll/win32/hhctrl.ocx/chm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/chm.c?... ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/chm.c (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/chm.c Thu Nov 29 13:36:22 2007 @@ -235,7 +235,7 @@ 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 */
Modified: trunk/reactos/dll/win32/hhctrl.ocx/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/help.c... ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/help.c (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/help.c Thu Nov 29 13:36:22 2007 @@ -143,7 +143,7 @@ PAINTSTRUCT ps; HDC hdc; RECT rc; - + hdc = BeginPaint(hWnd, &ps);
GetClientRect(hWnd, &rc); @@ -159,7 +159,7 @@ LineTo(hdc, 1, 1); LineTo(hdc, 1, rc.bottom - 1);
- + MoveToEx(hdc, 0, rc.bottom, NULL); LineTo(hdc, rc.right, rc.bottom);
Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctrl... ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c Thu Nov 29 13:36:22 2007 @@ -151,6 +151,16 @@
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 )); }
Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctrl... ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild Thu Nov 29 13:36:22 2007 @@ -1,15 +1,14 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="hhctrl" type="win32ocx" baseaddress="${BASEADDRESS_HHCTRL}" installbase="system32" installname="hhctrl.ocx" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="hhctrl.ocx.spec.def" /> <include base="hhctrl">.</include> <include base="ReactOS">include/reactos/wine</include> <include base="ReactOS" root="intermediate">include/reactos</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> <dependency>wineheaders</dependency> <library>wine</library> <library>advapi32</library>
Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctrl... ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx_ros.diff (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx_ros.diff Thu Nov 29 13:36:22 2007 @@ -2,17 +2,14 @@ =================================================================== --- hhctrl.ocx.rbuild (revision 27782) +++ hhctrl.ocx.rbuild (working copy) -@@ -3,12 +3,14 @@ +@@ -5,9 +5,11 @@ <importlibrary definition="hhctrl.ocx.spec.def" /> <include base="hhctrl">.</include> <include base="ReactOS">include/reactos/wine</include> + <include base="ReactOS" root="intermediate">include/reactos</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <dependency>wineheaders</dependency> <library>wine</library> <library>advapi32</library>
Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctrl... ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc Thu Nov 29 13:36:22 2007 @@ -39,4 +39,5 @@ #include "Nl.rc" #include "No.rc" #include "Pl.rc" +#include "Sv.rc" #include "Tr.rc"
Modified: trunk/reactos/dll/win32/hhctrl.ocx/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/regsvr... ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/regsvr.c (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/regsvr.c Thu Nov 29 13:36:22 2007 @@ -115,9 +115,6 @@ 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 @@ 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 @@ 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; } } @@ -431,70 +432,6 @@
error_close_progid_key: RegCloseKey(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; }
Modified: trunk/reactos/dll/win32/hhctrl.ocx/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/versio... ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/version.rc (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/version.rc Thu Nov 29 13:36:22 2007 @@ -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 <wine/wine_common_ver.rc>
-
winesync＠svn.reactos.org