21 Jan
2009
21 Jan
'09
2:26 p.m.
Author: dchapyshev
Date: Wed Jan 21 08:26:42 2009
New Revision: 38996
URL: http://svn.reactos.org/svn/reactos?rev=38996&view=rev
Log:
- Sync hhctrl with Wine head
Added:
trunk/reactos/dll/win32/hhctrl.ocx/Pt.rc (with props)
Modified:
trunk/reactos/dll/win32/hhctrl.ocx/Ko.rc
trunk/reactos/dll/win32/hhctrl.ocx/help.c
trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h
trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc
trunk/reactos/dll/win32/hhctrl.ocx/regsvr.c
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 [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/Ko.rc [iso-8859-1] Wed Jan 21 08:26:42 2009
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE
BEGIN
Added: trunk/reactos/dll/win32/hhctrl.ocx/Pt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/Pt.rc…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/Pt.rc (added)
+++ trunk/reactos/dll/win32/hhctrl.ocx/Pt.rc [iso-8859-1] Wed Jan 21 08:26:42 2009
@@ -1,0 +1,58 @@
+/*
+ * HTML Help resources
+ * Portuguese Language Support
+ *
+ * Copyright 2008 Ricardo Filipe
+ *
+ * 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_PORTUGUESE, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+ IDS_CONTENTS "&Conteúdos"
+ IDS_INDEX "&Índice"
+ IDS_SEARCH "&Pesquisar"
+ IDS_FAVORITES "&Favoritos"
+END
+
+STRINGTABLE
+BEGIN
+ IDTB_EXPAND "Mostrar"
+ IDTB_CONTRACT "Esconder"
+ IDTB_STOP "Parar"
+ IDTB_REFRESH "Actualizar"
+ IDTB_BACK "Retroceder"
+ IDTB_HOME "Início"
+ IDTB_SYNC "Sincronizar"
+ IDTB_PRINT "Imprimir"
+ IDTB_OPTIONS "Opções"
+ IDTB_FORWARD "Avançar"
+ 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 "Personalizar"
+ IDTB_ZOOM "Zoom"
+ IDTB_TOC_NEXT "IDTB_TOC_NEXT"
+ IDTB_TOC_PREV "IDTB_TOC_PREV"
+END
Propchange: trunk/reactos/dll/win32/hhctrl.ocx/Pt.rc
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/dll/win32/hhctrl.ocx/help.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/help.…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/help.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/help.c [iso-8859-1] Wed Jan 21 08:26:42 2009
@@ -825,7 +825,7 @@
/* Read in window parameters if available */
if (info->WinType.fsValidMembers & HHWIN_PARAM_STYLES)
- dwStyles = info->WinType.dwStyles;
+ dwStyles = info->WinType.dwStyles | WS_OVERLAPPEDWINDOW;
else
dwStyles = WS_OVERLAPPEDWINDOW | WS_VISIBLE |
WS_CLIPSIBLINGS | WS_CLIPCHILDREN;
Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h [iso-8859-1] Wed Jan 21 08:26:42 2009
@@ -141,22 +141,22 @@
/* memory allocation functions */
-static inline void __WINE_ALLOC_SIZE(1) *heap_alloc(size_t len)
+static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len)
{
return HeapAlloc(GetProcessHeap(), 0, len);
}
-static inline void __WINE_ALLOC_SIZE(1) *heap_alloc_zero(size_t len)
+static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len)
{
return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len);
}
-static inline void __WINE_ALLOC_SIZE(2) *heap_realloc(void *mem, size_t len)
+static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len)
{
return HeapReAlloc(GetProcessHeap(), 0, mem, len);
}
-static inline void __WINE_ALLOC_SIZE(2) *heap_realloc_zero(void *mem, size_t len)
+static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len)
{
return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len);
}
Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc [iso-8859-1] Wed Jan 21 08:26:42 2009
@@ -41,6 +41,7 @@
#include "Nl.rc"
#include "No.rc"
#include "Pl.rc"
+#include "Pt.rc"
#include "Ru.rc"
#include "Si.rc"
#include "Sv.rc"
Modified: trunk/reactos/dll/win32/hhctrl.ocx/regsvr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/regsv…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/regsvr.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/regsvr.c [iso-8859-1] Wed Jan 21 08:26:42 2009
@@ -31,6 +31,7 @@
#include "ole2.h"
#include "wine/debug.h"
+#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
@@ -157,7 +158,7 @@
KEY_READ | KEY_WRITE, NULL, &key, NULL);
if (res != ERROR_SUCCESS) goto error_close_iid_key;
- wsprintfW(buf, fmt, list->num_methods);
+ sprintfW(buf, fmt, list->num_methods);
res = RegSetValueExW(key, NULL, 0, REG_SZ,
(CONST BYTE*)buf,
(lstrlenW(buf) + 1) * sizeof(WCHAR));
5779
days inactive
5779
days old
0 comments
1 participants
participants (1)
-
dchapyshev＠svn.reactos.org