Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 14:35:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Sync hhctrl with Wine head

Browse source 
svn path=/trunk/; revision=38996
This commit is contained in:
Dmitry Chapyshev 2009-01-21 14:26:42 +00:00
parent 928873cf85
commit 12575f7f33
6 changed files with 67 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/hhctrl.ocx/Ko.rc
View file

@ -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

58
reactos/dll/win32/hhctrl.ocx/Pt.rc Normal file
View file

@ -0,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

2
reactos/dll/win32/hhctrl.ocx/help.c
View file

@ -825,7 +825,7 @@ static BOOL HH_CreateHelpWindow(HHInfo *info)
/* 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;

8
reactos/dll/win32/hhctrl.ocx/hhctrl.h
View file

@ -141,22 +141,22 @@ BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR);
/* 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);
}

1
reactos/dll/win32/hhctrl.ocx/hhctrl.rc
View file

@ -41,6 +41,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#include "Nl.rc"
#include "No.rc"
#include "Pl.rc"
#include "Pt.rc"
#include "Ru.rc"
#include "Si.rc"
#include "Sv.rc"

3
reactos/dll/win32/hhctrl.ocx/regsvr.c
View file

@ -31,6 +31,7 @@
#include "ole2.h"
#include "wine/debug.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
@ -157,7 +158,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list)
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));