June 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : winecfg: Fix pointer truncation in audio setup.
by Alexandre Julliard June 14, 2010

June 14, 2010

Module: wine Branch: master Commit: d57ab26840b83f44a695e76855bba6faeb9a12a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57ab26840b83f44a695e7685… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 14 13:23:57 2010 +0200 winecfg: Fix pointer truncation in audio setup. --- programs/winecfg/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 5cf2b34..c5cebcd 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -51,7 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); #define DEVICE_MASK 0x40000000 #define MAX_NAME_LENGTH 64 -typedef DWORD (WINAPI * MessagePtr)(UINT, UINT, DWORD, DWORD, DWORD); +typedef DWORD (WINAPI * MessagePtr)(UINT, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR); static struct DSOUNDACCEL {

1 0

Hans Leidekker : msi: Add tests for MsiLocateComponent and make them pass.
by Alexandre Julliard June 14, 2010

June 14, 2010

Module: wine Branch: master Commit: ff0f2b35e134cf56a753cb3e049ccc164f253c35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0f2b35e134cf56a753cb3e0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 14 14:21:31 2010 +0200 msi: Add tests for MsiLocateComponent and make them pass. --- dlls/msi/msi.c | 6 ++ dlls/msi/tests/msi.c | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 170 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff0f2b35e134cf56a753c…

1 0

Łukasz Wojniłowicz : winhlp32: Update the Polish translation.
by Alexandre Julliard June 14, 2010

June 14, 2010

Module: wine Branch: master Commit: 1145b29debcfccba417d99e127a5338cac0399e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1145b29debcfccba417d99e12… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Jun 13 21:54:58 2010 +0200 winhlp32: Update the Polish translation. --- programs/winhlp32/Pl.rc | 43 +++++++++++++++++++++++++++---------------- 1 files changed, 27 insertions(+), 16 deletions(-) diff --git a/programs/winhlp32/Pl.rc b/programs/winhlp32/Pl.rc index 7504789..f549b25 100644 --- a/programs/winhlp32/Pl.rc +++ b/programs/winhlp32/Pl.rc @@ -4,6 +4,7 @@ * Copyright 1996 Ulrich Schmid * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2004 Piotr Caban + * Copyright 2010 �ukasz Wojni�owicz * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,9 +23,11 @@ #include "winhelp_res.h" +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Plik" { MENUITEM "&Otw�rz", MNID_FILE_OPEN @@ -43,20 +46,20 @@ MAIN_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT MENUITEM "&Zdefiniuj...", MNID_BKMK_DEFINE } POPUP "&Options" { - POPUP "Help always visible" + POPUP "Pomoc zawsze widoczna" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT - MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "Domy�lnie", MNID_OPTS_HELP_DEFAULT + MENUITEM "Widoczna", MNID_OPTS_HELP_VISIBLE + MENUITEM "Niewidoczna", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "Historia", MNID_OPTS_HISTORY + POPUP "Czcionki" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL - MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE + MENUITEM "Ma�e", MNID_OPTS_FONTS_SMALL + MENUITEM "Normalne", MNID_OPTS_FONTS_NORMAL + MENUITEM "Du�e", MNID_OPTS_FONTS_LARGE END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "U�yj kolor�w systemowych", MNID_OPTS_SYSTEM_COLORS } POPUP "Pomo&c" { MENUITEM "&Pomoc", MNID_HELP_HELPON @@ -69,7 +72,7 @@ MAIN_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Indeks" @@ -77,8 +80,16 @@ CAPTION "Indeks" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Szukaj" +{ + LTEXT "Nie zaimplementowane", -1, 10, 10, 180, 150 +} + /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { STID_WINE_HELP, "WINE - Pomoc" STID_WHERROR, "B��D" @@ -92,12 +103,12 @@ STID_BACK, "&Wstecz" STID_ALL_FILES, "Wszystkie pliki (*.*)" STID_HELP_FILES_HLP, "Pliki pomocy (*.hlp)" STID_FILE_NOT_FOUND_s "Nie znaleziono pliku '%s'. Czy chcesz poszuka� tego pliku samodzielnie?" -STID_NO_RICHEDIT "Nie uda�o si� znale�� modu�u richedit... Wy�wietlenie pomocy nie jest mo�liwe" -STID_PSH_INDEX, "Help topics: " +STID_NO_RICHEDIT "Nie znaleziono implementacji richedit... Wy�wietlenie pomocy nie jest mo�liwe" +STID_PSH_INDEX, "Tematy pomocy: " } -CONTEXT_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +CONTEXT_MENU MENU BEGIN POPUP "" BEGIN

1 0

Nikolay Sivov : kernel32: Export RtlPcToFileHeader on x86-64 platform.
by Alexandre Julliard June 14, 2010

June 14, 2010

Module: wine Branch: master Commit: 43d9c9bb41af86bbb151d228240c44cb25211267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d9c9bb41af86bbb151d2282… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 12 15:13:07 2010 +0400 kernel32: Export RtlPcToFileHeader on x86-64 platform. --- dlls/kernel32/kernel32.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1dd449b..f08e752 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -933,6 +933,7 @@ @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory @ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory +@ stdcall -arch=x86_64 RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind @ stdcall -arch=x86_64 RtlUnwindEx(long long ptr long ptr) ntdll.RtlUnwindEx @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind

1 0

Jose Rostagno : notepad: Update Spanish translation.
by Alexandre Julliard June 14, 2010

June 14, 2010

Module: wine Branch: master Commit: b0d1c2ff60eaa6164bcbfc670c1be4ec1a1aa3e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0d1c2ff60eaa6164bcbfc670… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Sat Jun 12 15:02:24 2010 -0300 notepad: Update Spanish translation. --- programs/notepad/Es.rc | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Es.rc b/programs/notepad/Es.rc index d73f167..cd1f95b 100644 --- a/programs/notepad/Es.rc +++ b/programs/notepad/Es.rc @@ -6,6 +6,7 @@ * Proofread 1999 by Jose Marcos Lopez <jose.lopez(a)upcnet.upc.es> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2003,2004 Jos� Manuel Ferrer Ortiz + * Copyright 2010 Jos� Rostagno * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -95,6 +96,14 @@ PUSHBUTTON "Cancelar", IDCANCEL, 180, 21, 40, 15, WS_TABSTO PUSHBUTTON "&Ayuda", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Codificaci�n:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" @@ -123,4 +132,13 @@ STRING_OUT_OF_MEMORY, "No hay suficiente memoria para terminar esta \ tarea.\nCierre una o m�s aplicaciones para \ aumentar la cantidad\nde memoria libre." +STRING_UNICODE_LE, "Unicode (UTF-16)" +STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +Este archivo contiene caracteres Unicode que se perder�n si\n\ +guarda este archivo en la codificaci�n %s.\n\ +Para mantener estos caracteres, haga clic en Cancelar y, a continuaci�n, seleccione\n\ +una de las opciones de Unicode en la lista desplegable de codificaciones.\n\ +Continuar?" }

1 0

Jose Rostagno : localui: Add Spanish translation.
by Alexandre Julliard June 14, 2010

June 14, 2010

Module: wine Branch: master Commit: 2fbbc384a00557fab0bfc3b2a525add02abeae81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fbbc384a00557fab0bfc3b2a… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Sat Jun 12 14:50:09 2010 -0300 localui: Add Spanish translation. --- dlls/localui/Makefile.in | 1 + dlls/localui/ui_Es.rc | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/localui/Makefile.in b/dlls/localui/Makefile.in index 5f5f0b9..d104f98 100644 --- a/dlls/localui/Makefile.in +++ b/dlls/localui/Makefile.in @@ -13,6 +13,7 @@ RC_SRCS = \ ui_Da.rc \ ui_De.rc \ ui_En.rc \ + ui_Es.rc \ ui_Fr.rc \ ui_It.rc \ ui_Ja.rc \ diff --git a/dlls/localui/ui_Es.rc b/dlls/localui/ui_Es.rc new file mode 100644 index 0000000..f3f1bce --- /dev/null +++ b/dlls/localui/ui_Es.rc @@ -0,0 +1,58 @@ +/* + * Spanish resources for localui + * + * Copyright 2010 José Rostagno + * + * 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 + */ + +#include "localui.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Agregar un puerto local" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ingrese el nombre del puerto a agregar:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "Aceptar", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Cancelar", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Configurar puerto LPT" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Tiempo de espera (segundos)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&Reintentar transmisión:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "Aceptar", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Cancelar", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Puerto local" + IDS_INVALIDNAME "'%s' no es un nombre de puerto válido" + IDS_PORTEXISTS "El puerto %s ya existe" + IDS_NOTHINGTOCONFIG "Este puerto no tiene opciones para configurar" +}

1 0

Nikolay Sivov : msxml3: Avoid SysStringLen() testing for an empty string in ::createNode().
by Alexandre Julliard June 14, 2010

June 14, 2010

Module: wine Branch: master Commit: 36117911171dc30fd1c64ce972ecf7cc479bb63f URL: http://source.winehq.org/git/wine.git/?a=commit;h=36117911171dc30fd1c64ce97… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 13 04:23:23 2010 +0400 msxml3: Avoid SysStringLen() testing for an empty string in ::createNode(). --- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/tests/domdoc.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index d72d20b..e24077e 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1368,7 +1368,7 @@ static HRESULT WINAPI domdoc_createNode( case NODE_ATTRIBUTE: case NODE_ENTITY_REFERENCE: case NODE_PROCESSING_INSTRUCTION: - if (!name || SysStringLen(name) == 0) return E_FAIL; + if (!name || *name == 0) return E_FAIL; default: break; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a743e51..cbba0cd 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1988,6 +1988,17 @@ static void test_create(void) if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); SysFreeString(str); + /* a name is required for attribute, try a BSTR with first null wchar */ + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ATTRIBUTE; + str = SysAllocString( szstr1 ); + str[0] = 0; + node = (IXMLDOMNode*)0x1; + r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); + ok( r == E_FAIL, "returns %08x\n", r ); + ok( node == (void*)0x1, "expected same ptr, got %p\n", node); + SysFreeString(str); + /* NODE_PROCESSING_INSTRUCTION */ V_VT(&var) = VT_I1; V_I1(&var) = NODE_PROCESSING_INSTRUCTION;

1 0

Nikolay Sivov : msxml3: Use defined macros to access internal XPath structures.
by Alexandre Julliard June 14, 2010

June 14, 2010

Module: wine Branch: master Commit: bc3337f86f926c9e0899f1792eab5380eee6c3b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc3337f86f926c9e0899f1792… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 13 01:45:52 2010 +0400 msxml3: Use defined macros to access internal XPath structures. --- dlls/msxml3/queryresult.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c index eab83a9..2c6f23e 100644 --- a/dlls/msxml3/queryresult.c +++ b/dlls/msxml3/queryresult.c @@ -227,7 +227,7 @@ static HRESULT WINAPI queryresult_get_item( if (index < 0 || index >= xmlXPathNodeSetGetLength(This->result->nodesetval)) return S_FALSE; - *listItem = create_node(This->result->nodesetval->nodeTab[index]); + *listItem = create_node(xmlXPathNodeSetItem(This->result->nodesetval, index)); This->resultPos = index + 1; return S_OK; @@ -264,7 +264,7 @@ static HRESULT WINAPI queryresult_nextNode( if (This->resultPos >= xmlXPathNodeSetGetLength(This->result->nodesetval)) return S_FALSE; - *nextItem = create_node(This->result->nodesetval->nodeTab[This->resultPos]); + *nextItem = create_node(xmlXPathNodeSetItem(This->result->nodesetval, This->resultPos)); This->resultPos++; return S_OK; } @@ -379,7 +379,6 @@ HRESULT queryresult_create(xmlNodePtr node, LPWSTR szQuery, IXMLDOMNodeList **ou xmlChar *str = xmlChar_from_wchar(szQuery); HRESULT hr; - TRACE("(%p, %s, %p)\n", node, wine_dbgstr_w(szQuery), out); *out = NULL; @@ -412,8 +411,7 @@ HRESULT queryresult_create(xmlNodePtr node, LPWSTR szQuery, IXMLDOMNodeList **ou cleanup: if (This != NULL && FAILED(hr)) IXMLDOMNodeList_Release( (IXMLDOMNodeList*) &This->lpVtbl ); - if (ctxt != NULL) - xmlXPathFreeContext(ctxt); + xmlXPathFreeContext(ctxt); heap_free(str); return hr; }

1 0

Eric Pouech : winmm: Only compute dwFileSize for MMIO objects with a DOS ioproc.
by Alexandre Julliard June 14, 2010

June 14, 2010

Module: wine Branch: master Commit: 258d42982cf526b3d9c59ccb522b27db3f519541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=258d42982cf526b3d9c59ccb5… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jun 13 15:41:01 2010 +0200 winmm: Only compute dwFileSize for MMIO objects with a DOS ioproc. --- dlls/winmm/mmio.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 75439a4..f13e090 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -667,7 +667,13 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, (LPARAM)szFileName, 0, FALSE); /* grab file size, when possible */ - if ((pos = _llseek((HFILE)wm->info.adwInfo[0], 0, SEEK_CUR)) != -1) + /* FIXME: the code around dwFileSize is: + * - probably broken + * - needs to be tested when the app installs its own IOproc + * - likely to be removed + * So, restrict dwFileSize usage to DOS ioprocs + */ + if (wm->info.fccIOProc == FOURCC_DOS && (pos = _llseek((HFILE)wm->info.adwInfo[0], 0, SEEK_CUR)) != -1) { wm->dwFileSize = _llseek((HFILE)wm->info.adwInfo[0], 0, SEEK_END); _llseek((HFILE)wm->info.adwInfo[0], pos, SEEK_SET);

1 0

Eric Pouech : winhelp: When following a link, don't do it into a popup, but its parent.
by Alexandre Julliard June 14, 2010

June 14, 2010

Module: wine Branch: master Commit: 0f234ce461a32f87939a44e29577bf213669a14f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f234ce461a32f87939a44e29… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jun 13 15:39:35 2010 +0200 winhelp: When following a link, don't do it into a popup, but its parent. --- programs/winhlp32/winhelp.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index a5a0f31..582ab3e 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -912,7 +912,10 @@ static BOOL WINHELP_HandleTextMouse(WINHELP_WINDOW* win, UINT msg, LPARAM lParam if ((hlpfile = WINHELP_LookupHelpFile(link->string))) { if (link->window == -1) + { wi = win->info; + if (wi->win_style & WS_POPUP) wi = Globals.active_win->info; + } else if (link->window < hlpfile->numWindows) wi = &hlpfile->windows[link->window]; else @@ -971,9 +974,10 @@ static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam (HWND)lParam == Globals.active_popup->hMainWnd || GetWindow((HWND)lParam, GW_OWNER) == Globals.active_win->hMainWnd) break; + /* fall through */ case WM_LBUTTONDOWN: - if (WINHELP_HandleTextMouse(Globals.active_popup, msg, lParam)) - return FALSE; + if (msg == WM_LBUTTONDOWN) + WINHELP_HandleTextMouse(Globals.active_popup, msg, lParam); /* fall through */ case WM_MBUTTONDOWN: case WM_RBUTTONDOWN:

1 0