July 2009 - Wine-commits - list.winehq.org

Aurimas Fišeras : winmm: Add Lithuanian translation.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: f404fd787f730b02867ee549e3cdd7922981db50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f404fd787f730b02867ee549e… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jul 1 19:28:21 2009 +0300 winmm: Add Lithuanian translation. --- dlls/winmm/winmm_Lt.rc | 133 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/winmm/winmm_res.rc | 1 + 2 files changed, 134 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f404fd787f730b02867ee…

1 0

Frédéric Delanoy : comdlg32: Improve French translation.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: a9f3bd06fde361de3682446df1e9933cc2103894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f3bd06fde361de3682446df… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 1 19:05:18 2009 +0200 comdlg32: Improve French translation. --- dlls/comdlg32/cdlg_Fr.rc | 110 +++++++++++++++++++++++----------------------- 1 files changed, 55 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9f3bd06fde361de36824…

1 0

Michael Stefaniuc : hhctrl.ocx: Fix a memory leak on an error path (Smatch) .
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: d6eb5eb7c6f828474da2436023f422725016b119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6eb5eb7c6f828474da243602… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:32:31 2009 +0200 hhctrl.ocx: Fix a memory leak on an error path (Smatch). --- dlls/hhctrl.ocx/chm.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index c3a7499..b7df8e7 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -370,8 +370,10 @@ CHMInfo *OpenCHM(LPCWSTR szFile) if (!(ret = heap_alloc_zero(sizeof(CHMInfo)))) return NULL; - if (!(ret->szFile = strdupW(szFile))) + if (!(ret->szFile = strdupW(szFile))) { + heap_free(ret); return NULL; + } hres = CoCreateInstance(&CLSID_ITStorage, NULL, CLSCTX_INPROC_SERVER, &IID_IITStorage, (void **) &ret->pITStorage) ;

1 0

Michael Stefaniuc : notepad: Fix the Finnish translation.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 55b1a1977e55e81db77ae1fe2c35dd659e522cc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b1a1977e55e81db77ae1fe2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 00:36:41 2009 +0200 notepad: Fix the Finnish translation. --- programs/notepad/Fi.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Fi.rc b/programs/notepad/Fi.rc index bd4b204..914a03f 100644 --- a/programs/notepad/Fi.rc +++ b/programs/notepad/Fi.rc @@ -52,6 +52,7 @@ POPUP "&Muokkaa" { POPUP "&Etsi" { MENUITEM "Etsi...", CMD_SEARCH MENUITEM "Etsi &seuraava\tF3", CMD_SEARCH_NEXT + MENUITEM "&Korvaa...\tCtrl+H", CMD_REPLACE } POPUP "&Apua" { MENUITEM "&Sis�lt�", CMD_HELP_CONTENTS

1 0

Hans Leidekker : mlang: Implement IMultiLanguage2_IsCodePageInstallable.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: c2eee9f5fcff0307f5453e176f9a71b941aae4c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2eee9f5fcff0307f5453e176… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 1 16:30:00 2009 +0200 mlang: Implement IMultiLanguage2_IsCodePageInstallable. --- dlls/mlang/mlang.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 180e1ad..c28e695 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3125,8 +3125,10 @@ static HRESULT WINAPI fnIMultiLanguage2_IsCodePageInstallable( IMultiLanguage3* iface, UINT uiCodePage) { - FIXME("%u\n", uiCodePage); - return E_NOTIMPL; + TRACE("%u\n", uiCodePage); + + /* FIXME: the installable set is usually larger than the set of valid codepages */ + return IMultiLanguage2_ValidateCodePageEx(iface, uiCodePage, NULL, CPIOD_PEEK); } static HRESULT WINAPI fnIMultiLanguage2_SetMimeDBSource(

1 0

Aric Stewart : notepad: Update Japanese resource.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 1c09598c283f5e6fccebdf9efe7e9f3ea1626373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c09598c283f5e6fccebdf9ef… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jul 1 08:30:14 2009 -0500 notepad: Update Japanese resource. --- programs/notepad/Ja.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Ja.rc b/programs/notepad/Ja.rc index 5513932..1ad4062 100644 --- a/programs/notepad/Ja.rc +++ b/programs/notepad/Ja.rc @@ -56,6 +56,7 @@ POPUP "編集(&E)" { POPUP "検索(&S)" { MENUITEM "検索(&S)...\tCtrl+F", CMD_SEARCH MENUITEM "次を検索(&S)\tF3", CMD_SEARCH_NEXT + MENUITEM "置き換える(&R)...\tCtrl+H", CMD_REPLACE } POPUP "ヘルプ(&H)" { MENUITEM "目次(&C)", CMD_HELP_CONTENTS

1 0

Alexandre Julliard : preloader: Reserve addresses only up to 0x68000000, that should be enough for ole32.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 4d35f3f2704fe2cda261af0e2d112bfde32fc60b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d35f3f2704fe2cda261af0e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 16:02:55 2009 +0200 preloader: Reserve addresses only up to 0x68000000, that should be enough for ole32. --- loader/preloader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index e7ac0c1..087d04b 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -110,7 +110,7 @@ static struct wine_preload_info preload_info[] = { { (void *)0x00000000, 0x00010000 }, /* low 64k */ { (void *)0x00010000, 0x00100000 }, /* DOS area */ - { (void *)0x00110000, 0x6fef0000 }, /* low memory area */ + { (void *)0x00110000, 0x67ef0000 }, /* low memory area */ { (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared heap + virtual heap */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ { 0, 0 } /* end of list */

1 0

Hans Leidekker : hhctrl.ocx: Don't leak the CHM filename.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: abad7f4f76b6e4f094f10123b2b2ab6a4a4c3f7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=abad7f4f76b6e4f094f10123b… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Jul 1 11:53:19 2009 +0200 hhctrl.ocx: Don't leak the CHM filename. --- dlls/hhctrl.ocx/chm.c | 1 + dlls/hhctrl.ocx/hhctrl.h | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index e8d036b..dbf174d 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -423,6 +423,7 @@ CHMInfo *CloseCHM(CHMInfo *chm) heap_free(chm->defTitle); heap_free(chm->defTopic); heap_free(chm->defToc); + heap_free(chm->szFile); heap_free(chm); return NULL; diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 795bea4..83d39f5 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -69,7 +69,7 @@ typedef struct CHMInfo { IITStorage *pITStorage; IStorage *pStorage; - LPCWSTR szFile; + WCHAR *szFile; IStream *strings_stream; char **strings;

1 0

Hans Leidekker : hhctrl.ocx: Remove some dead code.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 28f91290003675f2962f837b5009c65cf2cca9ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=28f91290003675f2962f837b5… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Jul 1 11:54:07 2009 +0200 hhctrl.ocx: Remove some dead code. This condition is inside the switch block for HH_DISPLAY_SEARCH, so it can never evaluate to true. --- dlls/hhctrl.ocx/hhctrl.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 5e707b9..10e04bc 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -119,11 +119,6 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat filename = chm_file; index += 2; /* advance beyond "::" for calling NavigateToChm() later */ } - else - { - if (command!=HH_DISPLAY_SEARCH) /* FIXME - use HH_FTS_QUERYW structure in data */ - index = (const WCHAR*)data; - } info = CreateHelpViewer(filename); if(!info)

1 0

Hans Leidekker : hhctrl.ocx: Try the Windows help directory if the specified file does not exist.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: bbfe59bc93738e95208d215800d716e4b3594794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfe59bc93738e95208d21580… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Jul 1 11:54:44 2009 +0200 hhctrl.ocx: Try the Windows help directory if the specified file does not exist. --- dlls/hhctrl.ocx/chm.c | 9 +++++---- dlls/hhctrl.ocx/hhctrl.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index dbf174d..c3a7499 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -362,15 +362,16 @@ IStream *GetChmStream(CHMInfo *info, LPCWSTR parent_chm, ChmPath *chm_file) /* Opens the CHM file for reading */ CHMInfo *OpenCHM(LPCWSTR szFile) { - WCHAR file[MAX_PATH] = {0}; HRESULT hres; + CHMInfo *ret; static const WCHAR wszSTRINGS[] = {'#','S','T','R','I','N','G','S',0}; - CHMInfo *ret = heap_alloc_zero(sizeof(CHMInfo)); + if (!(ret = heap_alloc_zero(sizeof(CHMInfo)))) + return NULL; - GetFullPathNameW(szFile, sizeof(file)/sizeof(file[0]), file, NULL); - ret->szFile = strdupW(file); + if (!(ret->szFile = strdupW(szFile))) + return NULL; hres = CoCreateInstance(&CLSID_ITStorage, NULL, CLSCTX_INPROC_SERVER, &IID_IITStorage, (void **) &ret->pITStorage) ; diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 10e04bc..8268a21 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -86,11 +86,27 @@ static const char *command_to_string(UINT command) #undef X } +static BOOL resolve_filename(const WCHAR *filename, WCHAR *fullname, DWORD buflen) +{ + static const WCHAR helpW[] = {'\\','h','e','l','p','\\',0}; + + GetFullPathNameW(filename, buflen, fullname, NULL); + if (GetFileAttributesW(fullname) == INVALID_FILE_ATTRIBUTES) + { + GetWindowsDirectoryW(fullname, buflen); + strcatW(fullname, helpW); + strcatW(fullname, filename); + } + return (GetFileAttributesW(fullname) != INVALID_FILE_ATTRIBUTES); +} + /****************************************************************** * HtmlHelpW (HHCTRL.OCX.15) */ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR data) { + WCHAR fullname[MAX_PATH]; + TRACE("(%p, %s, command=%s, data=%lx)\n", caller, debugstr_w( filename ), command_to_string( command ), data); @@ -120,7 +136,13 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat index += 2; /* advance beyond "::" for calling NavigateToChm() later */ } - info = CreateHelpViewer(filename); + if (!resolve_filename(filename, fullname, MAX_PATH)) + { + WARN("can't find %s\n", debugstr_w(filename)); + return 0; + } + + info = CreateHelpViewer(fullname); if(!info) return NULL; @@ -142,7 +164,13 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat if (!filename) return NULL; - info = CreateHelpViewer(filename); + if (!resolve_filename(filename, fullname, MAX_PATH)) + { + WARN("can't find %s\n", debugstr_w(filename)); + return 0; + } + + info = CreateHelpViewer(fullname); if(!info) return NULL;

1 0