April 2008 - Wine-commits - list.winehq.org

Maarten Lankhorst : quartz: Copy discontinuity status in acmwrapper.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 4abbf915d398d5a2402c7acf85d7456a488d03ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=4abbf915d398d5a2402c7acf8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 22 13:37:34 2008 -0700 quartz: Copy discontinuity status in acmwrapper. --- dlls/quartz/acmwrapper.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 8df37ef..11b07f1 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -120,11 +120,15 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte if (IMediaSample_IsDiscontinuity(pSample) == S_OK) { res = acmStreamConvert(This->has, &ash, ACM_STREAMCONVERTF_START); + IMediaSample_SetDiscontinuity(pOutSample, TRUE); /* One sample could be converted to multiple packets */ IMediaSample_SetDiscontinuity(pSample, FALSE); } else + { res = acmStreamConvert(This->has, &ash, 0); + IMediaSample_SetDiscontinuity(pOutSample, FALSE); + } if (res) {

1 0

Maarten Lankhorst : quartz: Fix inverted logic in memallocator.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 2f736c4a5a6e1c652073cc5cc49b3e7bf0f42ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f736c4a5a6e1c652073cc5cc… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 22 13:37:05 2008 -0700 quartz: Fix inverted logic in memallocator. --- dlls/quartz/memallocator.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index b473b57..cd87a34 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -610,9 +610,9 @@ static HRESULT WINAPI StdMediaSample2_SetPreroll(IMediaSample2 * iface, BOOL bIs TRACE("(%s)\n", bIsPreroll ? "TRUE" : "FALSE"); if (bIsPreroll) - This->props.dwSampleFlags &= ~AM_SAMPLE_PREROLL; - else This->props.dwSampleFlags |= AM_SAMPLE_PREROLL; + else + This->props.dwSampleFlags &= ~AM_SAMPLE_PREROLL; return S_OK; }

1 0

Maarten Lankhorst : quartz: Fix error message names in tests.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 1e9dbcc5125bd865ad982cc94f7e36c8580faba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e9dbcc5125bd865ad982cc94… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Apr 19 15:33:56 2008 -0700 quartz: Fix error message names in tests. --- dlls/quartz/tests/filtergraph.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 98be4b5..f1728f7 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -79,22 +79,22 @@ static void rungraph(void) Sleep(10); trace("stop -> pause\n"); hr = IMediaControl_Pause(pmc); - ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); + ok(hr==S_OK || hr == S_FALSE, "Cannot pause the graph returned: %x\n", hr); Sleep(10); trace("pause -> run\n"); hr = IMediaControl_Run(pmc); - ok(hr==S_OK || hr == S_FALSE, "Cannot pause the graph returned: %x\n", hr); + ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); Sleep(10); trace("run -> pause\n"); hr = IMediaControl_Pause(pmc); - ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); + ok(hr==S_OK || hr == S_FALSE, "Cannot pause the graph returned: %x\n", hr); Sleep(10); trace("pause -> stop\n"); hr = IMediaControl_Stop(pmc); - ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); + ok(hr==S_OK || hr == S_FALSE, "Cannot stop the graph returned: %x\n", hr); Sleep(10); trace("pause -> run\n"); @@ -103,7 +103,7 @@ static void rungraph(void) trace("run -> stop\n"); hr = IMediaControl_Stop(pmc); - ok(hr==S_OK || hr == S_FALSE, "Cannot start the graph returned: %x\n", hr); + ok(hr==S_OK || hr == S_FALSE, "Cannot stop the graph returned: %x\n", hr); trace("stop -> run\n"); hr = IMediaControl_Run(pmc);

1 0

Maarten Lankhorst : quartz: Optimize the processing thread to fetch one sample while processing another .
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: a0224676905f0b96f2ade672f90cea696a5434bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0224676905f0b96f2ade672f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 18 19:30:25 2008 -0700 quartz: Optimize the processing thread to fetch one sample while processing another. --- dlls/quartz/avisplit.c | 17 ++- dlls/quartz/mpegsplit.c | 4 +- dlls/quartz/parser.c | 2 +- dlls/quartz/parser.h | 2 +- dlls/quartz/pin.c | 361 +++++++++++++++++++++++++++++----------------- dlls/quartz/pin.h | 44 +++++-- dlls/quartz/waveparser.c | 2 +- 7 files changed, 275 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0224676905f0b96f2ade…

1 0

Dmitry Timoshkov : gdi32: Reselect objects into the DC only if scaling factors change.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 3cbd9639da103bb6b5dcd7b78b4fc72edca1b765 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cbd9639da103bb6b5dcd7b78… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 23 17:24:53 2008 +0900 gdi32: Reselect objects into the DC only if scaling factors change. --- dlls/gdi32/dc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index debbde8..cb4de19 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -315,7 +315,8 @@ void DC_UpdateXforms( DC *dc ) /* Reselect the font and pen back into the dc so that the size gets updated. */ - if(memcmp(&oldworld2vport, &dc->xformWorld2Vport, sizeof(oldworld2vport))) + if (oldworld2vport.eM11 != dc->xformWorld2Vport.eM11 || + oldworld2vport.eM22 != dc->xformWorld2Vport.eM22) { SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_FONT)); SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_PEN));

1 0

Eric Pouech : winhelp: Be sure to raise a newly (re) created window in all cases.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: dd39c1f90dd12223c3f90fe1f6c88023379dc1f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd39c1f90dd12223c3f90fe1f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:01:33 2008 +0200 winhelp: Be sure to raise a newly (re)created window in all cases. --- programs/winhelp/winhelp.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 73b0609..4a50c32 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -543,17 +543,27 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe { if (!lstrcmpi(win->lpszName, wpage->wininfo->name)) { + POINT pt = {0, 0}; + SIZE sz = {0, 0}; + DWORD flags = SWP_NOSIZE | SWP_NOMOVE; + WINHELP_DeleteButtons(win); bReUsed = TRUE; SetWindowText(win->hMainWnd, WINHELP_GetCaption(wpage)); if (wpage->wininfo->origin.x != CW_USEDEFAULT && wpage->wininfo->origin.y != CW_USEDEFAULT) - SetWindowPos(win->hMainWnd, HWND_TOP, - wpage->wininfo->origin.x, wpage->wininfo->origin.y, 0, 0, SWP_NOSIZE); + { + pt = wpage->wininfo->origin; + flags &= ~SWP_NOSIZE; + } if (wpage->wininfo->size.cx != CW_USEDEFAULT && wpage->wininfo->size.cy != CW_USEDEFAULT) - SetWindowPos(win->hMainWnd, HWND_TOP, - 0, 0, wpage->wininfo->size.cx, wpage->wininfo->size.cy, SWP_NOMOVE); + { + sz = wpage->wininfo->size; + flags &= ~SWP_NOMOVE; + } + SetWindowPos(win->hMainWnd, HWND_TOP, pt.x, pt.y, sz.cx, sz.cy, flags); + if (wpage->page && wpage->page->file != win->page->file) WINHELP_DeleteBackSet(win); WINHELP_InitFonts(win->hMainWnd);

1 0

Austin English : Spelling fixes.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: c531e2abdb13ffa54c07e62e8369a3d7dba367b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c531e2abdb13ffa54c07e62e8… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 23 00:13:32 2008 -0500 Spelling fixes. --- dlls/comctl32/pager.c | 8 ++++---- dlls/comctl32/toolbar.c | 2 +- dlls/kernel32/comm.c | 4 ++-- dlls/kernel32/console.c | 4 ++-- dlls/ole32/compobj.c | 2 +- dlls/ole32/stubmanager.c | 4 ++-- dlls/oleaut32/typelib.c | 2 +- dlls/wined3d/directx.c | 6 +++--- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/utils.c | 4 ++-- dlls/winex11.drv/xfont.c | 4 ++-- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 2150c43..11a78a9 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -555,8 +555,8 @@ static INT PAGER_SetFixedWidth(PAGER_INFO* infoPtr) { /* Must set the non-scrollable dimension to be less than the full height/width - * so that NCCalcSize is called. The Msoft docs mention 3/4 factor for button - * size, and experimentation shows that affect is almost right. */ + * so that NCCalcSize is called. The Microsoft docs mention 3/4 factor for button + * size, and experimentation shows that the effect is almost right. */ RECT wndRect; INT delta, h; @@ -586,8 +586,8 @@ static INT PAGER_SetFixedHeight(PAGER_INFO* infoPtr) { /* Must set the non-scrollable dimension to be less than the full height/width - * so that NCCalcSize is called. The Msoft docs mention 3/4 factor for button - * size, and experimentation shows that affect is almost right. */ + * so that NCCalcSize is called. The Microsoft docs mention 3/4 factor for button + * size, and experimentation shows that the effect is almost right. */ RECT wndRect; INT delta, w; diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 5746928..7b2ef6e 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4984,7 +4984,7 @@ TOOLBAR_SetRows (HWND hwnd, WPARAM wParam, LPARAM lParam) /* FIXME: Separators make this quite complex */ if (seps) FIXME("Separators unhandled\n"); - /* Round up so more per line, ie less rows */ + /* Round up so more per line, i.e., less rows */ idealWrap = (infoPtr->nNumButtons - hidden + (rows-1)) / rows; /* Calculate ideal wrap point if we are allowed to grow, but cannot diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index 7986636..9eeed3d 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -779,7 +779,7 @@ static void dump_dcb(const DCB* lpdcb) * SetCommState (KERNEL32.@) * * Re-initializes all hardware and control settings of a communications device, - * with values from a device control block without effecting the input and output + * with values from a device control block without affecting the input and output * queues. * * PARAMS @@ -789,7 +789,7 @@ static void dump_dcb(const DCB* lpdcb) * * RETURNS * - * True on success, false on failure eg if the XonChar is equal to the XoffChar. + * True on success, false on failure, e.g., if the XonChar is equal to the XoffChar. */ BOOL WINAPI SetCommState( HANDLE handle, LPDCB lpdcb) { diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index a1e2de6..21ce10a 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1749,8 +1749,8 @@ BOOL WINAPI GenerateConsoleCtrlEvent(DWORD dwCtrlEvent, } SERVER_END_REQ; - /* FIXME: shall this function be synchronous, ie only return when all events - * have been handled by all processes in the given group ? + /* FIXME: Shall this function be synchronous, i.e., only return when all events + * have been handled by all processes in the given group? * As of today, we don't wait... */ return ret; diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a5dfcf2..ed31798 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -206,7 +206,7 @@ static void COMPOBJ_InitProcess( void ) /* Dispatching to the correct thread in an apartment is done through * window messages rather than RPC transports. When an interface is * marshalled into another apartment in the same process, a window of the - * following class is created. The *caller* of CoMarshalInterface (ie the + * following class is created. The *caller* of CoMarshalInterface (i.e., the * application) is responsible for pumping the message loop in that thread. * The WM_USER messages which point to the RPCs are then dispatched to * COM_AptWndProc by the user's code from the apartment in which the interface diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 2243f33..4defe4b 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -87,8 +87,8 @@ struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object) sm->oxid_info.dwAuthnHint = RPC_C_AUTHN_LEVEL_NONE; sm->oxid_info.psa = NULL /* FIXME */; - /* yes, that's right, this starts at zero. that's zero EXTERNAL - * refs, ie nobody has unmarshalled anything yet. we can't have + /* Yes, that's right, this starts at zero. that's zero EXTERNAL + * refs, i.e., nobody has unmarshalled anything yet. We can't have * negative refs because the stub manager cannot be explicitly * killed, it has to die by somebody unmarshalling then releasing * the marshalled ifptr. diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4c710c6..43aedc5 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2170,7 +2170,7 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( break; case TKIND_DISPATCH: /* This is not -1 when the interface is a non-base dual interface or - when a dispinterface wraps an interface ie the idl 'dispinterface x {interface y;};'. + when a dispinterface wraps an interface, i.e., the idl 'dispinterface x {interface y;};'. Note however that GetRefTypeOfImplType(0) always returns a ref to IDispatch and not this interface. */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6c16bc3..6fb0d5e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -175,9 +175,9 @@ glAttribFunc normal_funcs[WINED3DDECLTYPE_UNUSED]; glTexAttribFunc texcoord_funcs[WINED3DDECLTYPE_UNUSED]; /** - * Note: GL seems to trap if GetDeviceCaps is called before any HWND's created - * ie there is no GL Context - Get a default rendering context to enable the - * function query some info from GL + * Note: GL seems to trap if GetDeviceCaps is called before any HWND's created, + * i.e., there is no GL Context - Get a default rendering context to enable the + * function query some info from GL. */ static int wined3d_fake_gl_context_ref = 0; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f7cc085..1c5a97f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -686,7 +686,7 @@ void shader_generate_glsl_declarations( shader_addline(buffer, "attribute vec4 attrib%i;\n", i); } - /* Declare loop registers alx */ + /* Declare loop registers aLx */ for (i = 0; i < reg_maps->loop_depth; i++) { shader_addline(buffer, "int aL%u;\n", i); shader_addline(buffer, "int tmpInt%u;\n", i); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e267540..e2949dd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1583,11 +1583,11 @@ void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTEXTUREOP the form (a1 <operation> a2). However, some of the more complex operations take 3 parameters. Instead of the (sensible) addition of a3, Microsoft added in a third parameter called a0. Therefore these are operations of the form - a0 <operation> a1 <operation> a2, ie the new parameter goes to the front. + a0 <operation> a1 <operation> a2, i.e., the new parameter goes to the front. However, below we treat the new (a0) parameter as src2/opr2, so in the actual functions below, expect their syntax to differ slightly to those listed in the - manuals, ie replace arg1 with arg3, arg2 with arg1 and arg3 with arg2 + manuals, i.e., replace arg1 with arg3, arg2 with arg1 and arg3 with arg2 This affects WINED3DTOP_MULTIPLYADD and WINED3DTOP_LERP */ if (isAlpha) { diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 6137be7..8ab323d 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -1015,7 +1015,7 @@ static BOOL LFD_ComposeLFD( const fontObject* fo, aLFD.charset_encoding = any; break; - case 255: /* no suffix - it ends eg "-ascii" */ + case 255: /* no suffix - it ends, e.g., "-ascii" */ aLFD.charset_encoding = NULL; break; } @@ -1715,7 +1715,7 @@ static LPCSTR XFONT_UnAlias(char* font) XFONT_InitialCapitals(font); /* to remove extra white space */ for( fa = aliasTable; fa; fa = fa->next ) - /* use case insensitive matching to handle eg "MS Sans Serif" */ + /* use case insensitive matching to handle, e.g., "MS Sans Serif" */ if( !strcasecmp( fa->faAlias, font ) ) { TRACE("found alias '%s'->%s'\n", font, fa->faTypeFace );

1 0

Eric Pouech : winhelp: Added ability to locate information within a page ( and to store it inside WNDPAGE).
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: a4480365d7a5892990214a230a8c7147599e4274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4480365d7a5892990214a230… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:00:56 2008 +0200 winhelp: Added ability to locate information within a page (and to store it inside WNDPAGE). --- programs/winhelp/hlpfile.c | 35 ++++++++++++++++++----------------- programs/winhelp/hlpfile.h | 8 ++++---- programs/winhelp/macro.c | 9 +++++---- programs/winhelp/winhelp.c | 17 +++++++++-------- programs/winhelp/winhelp.h | 1 + 5 files changed, 37 insertions(+), 33 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 92a22df..30c678d 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -96,21 +96,12 @@ static HLPFILE_PAGE *HLPFILE_PageByNumber(HLPFILE* hlpfile, UINT wNum) return page; } -/* FIXME: - * this finds the page containing the offset. The offset can either - * refer to the top of the page (offset == page->offset), or - * to some paragraph inside the page... - * As of today, we only return the page... we should also return - * a paragraph, and then, while opening a new page, compute the - * y-offset of the paragraph to be shown and scroll the window - * accordingly - */ /****************************************************************** * HLPFILE_PageByOffset * * */ -HLPFILE_PAGE *HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset) +HLPFILE_PAGE *HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset, ULONG* relative) { HLPFILE_PAGE* page; HLPFILE_PAGE* found; @@ -125,7 +116,10 @@ HLPFILE_PAGE *HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset) for (found = NULL, page = hlpfile->first_page; page; page = page->next) { if (page->offset <= offset && (!found || found->offset < page->offset)) + { + *relative = offset - page->offset; found = page; + } } if (!found) WINE_ERR("Page of offset %u not found in file %s\n", @@ -156,7 +150,7 @@ static int comp_PageByHash(void *p, const void *key, * * HLPFILE_HlpFilePageByHash */ -HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash) +HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash, ULONG* relative) { BYTE *ptr; @@ -166,7 +160,10 @@ HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash) /* For win 3.0 files hash values are really page numbers */ if (hlpfile->version <= 16) + { + *relative = 0; return HLPFILE_PageByNumber(hlpfile, lHash); + } ptr = HLPFILE_BPTreeSearch(hlpfile->Context, LongToPtr(lHash), comp_PageByHash); if (!ptr) @@ -175,14 +172,14 @@ HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash) return NULL; } - return HLPFILE_PageByOffset(hlpfile, GET_UINT(ptr, 4)); + return HLPFILE_PageByOffset(hlpfile, GET_UINT(ptr, 4), relative); } /*********************************************************************** * * HLPFILE_PageByMap */ -HLPFILE_PAGE *HLPFILE_PageByMap(HLPFILE* hlpfile, LONG lMap) +HLPFILE_PAGE *HLPFILE_PageByMap(HLPFILE* hlpfile, LONG lMap, ULONG* relative) { unsigned int i; @@ -193,7 +190,7 @@ HLPFILE_PAGE *HLPFILE_PageByMap(HLPFILE* hlpfile, LONG lMap) for (i = 0; i < hlpfile->wMapLen; i++) { if (hlpfile->Map[i].lMap == lMap) - return HLPFILE_PageByOffset(hlpfile, hlpfile->Map[i].offset); + return HLPFILE_PageByOffset(hlpfile, hlpfile->Map[i].offset, relative); } WINE_ERR("Page of Map %x not found in file %s\n", lMap, hlpfile->lpszPath); @@ -204,14 +201,18 @@ HLPFILE_PAGE *HLPFILE_PageByMap(HLPFILE* hlpfile, LONG lMap) * * HLPFILE_Contents */ -HLPFILE_PAGE* HLPFILE_Contents(HLPFILE *hlpfile) +HLPFILE_PAGE* HLPFILE_Contents(HLPFILE *hlpfile, ULONG* relative) { HLPFILE_PAGE* page = NULL; if (!hlpfile) return NULL; - page = HLPFILE_PageByOffset(hlpfile, hlpfile->contents_start); - if (!page) page = hlpfile->first_page; + page = HLPFILE_PageByOffset(hlpfile, hlpfile->contents_start, relative); + if (!page) + { + page = hlpfile->first_page; + *relative = 0; + } return page; } diff --git a/programs/winhelp/hlpfile.h b/programs/winhelp/hlpfile.h index 739ad38..548a6e2 100644 --- a/programs/winhelp/hlpfile.h +++ b/programs/winhelp/hlpfile.h @@ -188,10 +188,10 @@ typedef int (*HLPFILE_BPTreeCompare)(void *p, const void *key, typedef void (*HLPFILE_BPTreeCallback)(void *p, void **next, void *cookie); HLPFILE* HLPFILE_ReadHlpFile(LPCSTR lpszPath); -HLPFILE_PAGE* HLPFILE_Contents(HLPFILE* hlpfile); -HLPFILE_PAGE* HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash); -HLPFILE_PAGE* HLPFILE_PageByMap(HLPFILE* hlpfile, LONG lMap); -HLPFILE_PAGE* HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset); +HLPFILE_PAGE* HLPFILE_Contents(HLPFILE* hlpfile, ULONG* relative); +HLPFILE_PAGE* HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash, ULONG* relative); +HLPFILE_PAGE* HLPFILE_PageByMap(HLPFILE* hlpfile, LONG lMap, ULONG* relative); +HLPFILE_PAGE* HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset, ULONG* relative); LONG HLPFILE_Hash(LPCSTR lpszContext); void HLPFILE_FreeLink(HLPFILE_LINK* link); void HLPFILE_FreeHlpFile(HLPFILE*); diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index 2c38b01..3681933 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -246,15 +246,16 @@ void CALLBACK MACRO_BookmarkMore(void) void CALLBACK MACRO_BrowseButtons(void) { HLPFILE_PAGE* page = Globals.active_win->page; + ULONG relative; WINE_TRACE("()\n"); MACRO_CreateButton("BTN_PREV", "&<<", "Prev()"); MACRO_CreateButton("BTN_NEXT", "&>>", "Next()"); - if (!HLPFILE_PageByOffset(page->file, page->browse_bwd)) + if (!HLPFILE_PageByOffset(page->file, page->browse_bwd, &relative)) MACRO_DisableButton("BTN_PREV"); - if (!HLPFILE_PageByOffset(page->file, page->browse_fwd)) + if (!HLPFILE_PageByOffset(page->file, page->browse_fwd, &relative)) MACRO_DisableButton("BTN_NEXT"); } @@ -718,7 +719,7 @@ void CALLBACK MACRO_Next(void) WINE_TRACE("()\n"); wp.page = Globals.active_win->page; - wp.page = HLPFILE_PageByOffset(wp.page->file, wp.page->browse_fwd); + wp.page = HLPFILE_PageByOffset(wp.page->file, wp.page->browse_fwd, &wp.relative); if (wp.page) { wp.page->file->wRefCount++; @@ -758,7 +759,7 @@ void CALLBACK MACRO_Prev(void) WINE_TRACE("()\n"); wp.page = Globals.active_win->page; - wp.page = HLPFILE_PageByOffset(wp.page->file, wp.page->browse_bwd); + wp.page = HLPFILE_PageByOffset(wp.page->file, wp.page->browse_bwd, &wp.relative); if (wp.page) { wp.page->file->wRefCount++; diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index bb9ea75..60362d0 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -53,7 +53,7 @@ static void WINHELP_InitFonts(HWND hWnd); static void WINHELP_DeleteLines(WINHELP_WINDOW*); static void WINHELP_DeleteWindow(WINHELP_WINDOW*); static void WINHELP_DeleteButtons(WINHELP_WINDOW*); -static void WINHELP_SetupText(HWND hWnd); +static void WINHELP_SetupText(HWND hWnd, ULONG relative); static WINHELP_LINE_PART* WINHELP_IsOverLink(WINHELP_WINDOW*, WPARAM, LPARAM); WINHELP_GLOBALS Globals = {3, NULL, NULL, TRUE, NULL, NULL, NULL, NULL, {{{NULL,NULL}},0}}; @@ -560,7 +560,8 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe win->page = wpage->page; win->info = wpage->wininfo; - WINHELP_SetupText(GetDlgItem(win->hMainWnd, CTL_ID_TEXT)); + WINHELP_SetupText(GetDlgItem(win->hMainWnd, CTL_ID_TEXT), wpage->relative); + InvalidateRect(win->hMainWnd, NULL, TRUE); if (win->hHistoryWnd) InvalidateRect(win->hHistoryWnd, NULL, TRUE); break; @@ -669,8 +670,8 @@ BOOL WINHELP_CreateHelpWindowByHash(HLPFILE* hlpfile, LONG lHash, wpage.page = NULL; if (hlpfile) - wpage.page = lHash ? HLPFILE_PageByHash(hlpfile, lHash) : - HLPFILE_Contents(hlpfile); + wpage.page = lHash ? HLPFILE_PageByHash(hlpfile, lHash, &wpage.relative) : + HLPFILE_Contents(hlpfile, &wpage.relative); if (wpage.page) wpage.page->file->wRefCount++; wpage.wininfo = wi; return WINHELP_CreateHelpWindow(&wpage, nCmdShow, TRUE); @@ -685,7 +686,7 @@ BOOL WINHELP_CreateHelpWindowByMap(HLPFILE* hlpfile, LONG lMap, { WINHELP_WNDPAGE wpage; - wpage.page = HLPFILE_PageByMap(hlpfile, lMap); + wpage.page = HLPFILE_PageByMap(hlpfile, lMap, &wpage.relative); if (wpage.page) wpage.page->file->wRefCount++; wpage.wininfo = wi; return WINHELP_CreateHelpWindow(&wpage, nCmdShow, TRUE); @@ -700,7 +701,7 @@ BOOL WINHELP_CreateHelpWindowByOffset(HLPFILE* hlpfile, LONG lOffset, { WINHELP_WNDPAGE wpage; - wpage.page = HLPFILE_PageByOffset(hlpfile, lOffset); + wpage.page = HLPFILE_PageByOffset(hlpfile, lOffset, &wpage.relative); if (wpage.page) wpage.page->file->wRefCount++; wpage.wininfo = wi; return WINHELP_CreateHelpWindow(&wpage, nCmdShow, TRUE); @@ -1022,7 +1023,7 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, case WM_WINDOWPOSCHANGED: winpos = (WINDOWPOS*) lParam; - if (!(winpos->flags & SWP_NOSIZE)) WINHELP_SetupText(hWnd); + if (!(winpos->flags & SWP_NOSIZE)) WINHELP_SetupText(hWnd, 0); break; case WM_MOUSEWHEEL: @@ -1359,7 +1360,7 @@ static LRESULT CALLBACK WINHELP_ShadowWndProc(HWND hWnd, UINT msg, WPARAM wParam * * SetupText */ -static void WINHELP_SetupText(HWND hWnd) +static void WINHELP_SetupText(HWND hWnd, ULONG relative) { HDC hDc = GetDC(hWnd); RECT rect; diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index af75261..f8ff0c6 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -95,6 +95,7 @@ typedef struct { HLPFILE_PAGE* page; HLPFILE_WINDOWINFO* wininfo; + ULONG relative; } WINHELP_WNDPAGE; typedef struct tagPageSet

1 0

Eric Pouech : winhelp: Also store the relative offsets of a page in the history and back information sets .
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 857d0e063c9c82c0bf9fcf21fd5df59506fbb9e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=857d0e063c9c82c0bf9fcf21f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:01:02 2008 +0200 winhelp: Also store the relative offsets of a page in the history and back information sets. --- programs/winhelp/winhelp.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 60362d0..4981748 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -485,11 +485,11 @@ void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win) } -static void WINHELP_RememberPage(WINHELP_WINDOW* win, HLPFILE_PAGE* page) +static void WINHELP_RememberPage(WINHELP_WINDOW* win, WINHELP_WNDPAGE* wpage) { unsigned num; - if (!Globals.history.index || Globals.history.set[0].page != page) + if (!Globals.history.index || Globals.history.set[0].page != wpage->page) { num = sizeof(Globals.history.set) / sizeof(Globals.history.set[0]); /* we're full, remove latest entry */ @@ -500,10 +500,9 @@ static void WINHELP_RememberPage(WINHELP_WINDOW* win, HLPFILE_PAGE* page) } memmove(&Globals.history.set[1], &Globals.history.set[0], Globals.history.index * sizeof(Globals.history.set[0])); - Globals.history.set[0].page = page; - Globals.history.set[0].wininfo = win->info; + Globals.history.set[0] = *wpage; Globals.history.index++; - page->file->wRefCount++; + wpage->page->file->wRefCount++; } if (win->hHistoryWnd) InvalidateRect(win->hHistoryWnd, NULL, TRUE); @@ -516,9 +515,8 @@ static void WINHELP_RememberPage(WINHELP_WINDOW* win, HLPFILE_PAGE* page) (num - 1) * sizeof(win->back.set[0])); win->back.index--; } - win->back.set[win->back.index].page = page; - win->back.set[win->back.index++].wininfo = win->info; - page->file->wRefCount++; + win->back.set[win->back.index++] = *wpage; + wpage->page->file->wRefCount++; } /*********************************************************************** @@ -592,7 +590,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe if (!bPopup && wpage->page && remember) { - WINHELP_RememberPage(win, wpage->page); + WINHELP_RememberPage(win, wpage); } if (!bPopup)

1 0

Eric Pouech : winhelp: Simplify most of the helpers dealing with window creation.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 3f1b62f2f76f0c516f0e9e8c239cc57708711950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1b62f2f76f0c516f0e9e8c2… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:01:08 2008 +0200 winhelp: Simplify most of the helpers dealing with window creation. --- programs/winhelp/hlpfile.c | 5 ++- programs/winhelp/macro.c | 25 +++++++---------- programs/winhelp/winhelp.c | 63 +++++++++++-------------------------------- programs/winhelp/winhelp.h | 5 +-- 4 files changed, 32 insertions(+), 66 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 30c678d..c20bead 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -148,13 +148,14 @@ static int comp_PageByHash(void *p, const void *key, /*********************************************************************** * - * HLPFILE_HlpFilePageByHash + * HLPFILE_PageByHash */ HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash, ULONG* relative) { BYTE *ptr; - if (!hlpfile) return 0; + if (!hlpfile) return NULL; + if (!lHash) return HLPFILE_Contents(hlpfile, relative); WINE_TRACE("<%s>[%x]\n", hlpfile->lpszPath, lHash); diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index 3681933..66eac0f 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -506,10 +506,7 @@ void CALLBACK MACRO_FileOpen(void) if (WINHELP_GetOpenFileName(szFile, MAX_PATH)) { - HLPFILE* hlpfile = WINHELP_LookupHelpFile(szFile); - - WINHELP_CreateHelpWindowByHash(hlpfile, 0, - WINHELP_GetWindowInfo(hlpfile, "main"), SW_SHOWNORMAL); + MACRO_JumpContents(szFile, "main"); } } @@ -628,10 +625,10 @@ void CALLBACK MACRO_JumpContents(LPCSTR lpszPath, LPCSTR lpszWindow) HLPFILE* hlpfile; WINE_TRACE("(\"%s\", \"%s\")\n", lpszPath, lpszWindow); - hlpfile = WINHELP_LookupHelpFile(lpszPath); - WINHELP_CreateHelpWindowByHash(hlpfile, 0, - WINHELP_GetWindowInfo(hlpfile, lpszWindow), - SW_NORMAL); + if ((hlpfile = WINHELP_LookupHelpFile(lpszPath))) + WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, 0, + WINHELP_GetWindowInfo(hlpfile, lpszWindow), + SW_NORMAL); } void CALLBACK MACRO_JumpContext(LPCSTR lpszPath, LPCSTR lpszWindow, LONG context) @@ -641,9 +638,9 @@ void CALLBACK MACRO_JumpContext(LPCSTR lpszPath, LPCSTR lpszWindow, LONG context WINE_TRACE("(\"%s\", \"%s\", %d)\n", lpszPath, lpszWindow, context); hlpfile = WINHELP_LookupHelpFile(lpszPath); /* Some madness: what user calls 'context', hlpfile calls 'map' */ - WINHELP_CreateHelpWindowByMap(hlpfile, context, - WINHELP_GetWindowInfo(hlpfile, lpszWindow), - SW_NORMAL); + WINHELP_OpenHelpWindow(HLPFILE_PageByMap, hlpfile, context, + WINHELP_GetWindowInfo(hlpfile, lpszWindow), + SW_NORMAL); } void CALLBACK MACRO_JumpHash(LPCSTR lpszPath, LPCSTR lpszWindow, LONG lHash) @@ -652,9 +649,9 @@ void CALLBACK MACRO_JumpHash(LPCSTR lpszPath, LPCSTR lpszWindow, LONG lHash) WINE_TRACE("(\"%s\", \"%s\", %u)\n", lpszPath, lpszWindow, lHash); hlpfile = WINHELP_LookupHelpFile(lpszPath); - WINHELP_CreateHelpWindowByHash(hlpfile, lHash, - WINHELP_GetWindowInfo(hlpfile, lpszWindow), - SW_NORMAL); + WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, lHash, + WINHELP_GetWindowInfo(hlpfile, lpszWindow), + SW_NORMAL); } void CALLBACK MACRO_JumpHelpOn(void) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 4981748..797bbae 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -304,8 +304,8 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) if (!hlpfile) return 0; } else hlpfile = NULL; - WINHELP_CreateHelpWindowByHash(hlpfile, lHash, - WINHELP_GetWindowInfo(hlpfile, wndname), show); + WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, lHash, + WINHELP_GetWindowInfo(hlpfile, wndname), show); /* Message loop */ while (GetMessage(&msg, 0, 0, 0)) @@ -657,49 +657,17 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe return TRUE; } -/*********************************************************************** - * - * WINHELP_CreateHelpWindowByHash - */ -BOOL WINHELP_CreateHelpWindowByHash(HLPFILE* hlpfile, LONG lHash, - HLPFILE_WINDOWINFO* wi, int nCmdShow) -{ - WINHELP_WNDPAGE wpage; - - wpage.page = NULL; - if (hlpfile) - wpage.page = lHash ? HLPFILE_PageByHash(hlpfile, lHash, &wpage.relative) : - HLPFILE_Contents(hlpfile, &wpage.relative); - if (wpage.page) wpage.page->file->wRefCount++; - wpage.wininfo = wi; - return WINHELP_CreateHelpWindow(&wpage, nCmdShow, TRUE); -} - -/*********************************************************************** - * - * WINHELP_CreateHelpWindowByMap - */ -BOOL WINHELP_CreateHelpWindowByMap(HLPFILE* hlpfile, LONG lMap, - HLPFILE_WINDOWINFO* wi, int nCmdShow) -{ - WINHELP_WNDPAGE wpage; - - wpage.page = HLPFILE_PageByMap(hlpfile, lMap, &wpage.relative); - if (wpage.page) wpage.page->file->wRefCount++; - wpage.wininfo = wi; - return WINHELP_CreateHelpWindow(&wpage, nCmdShow, TRUE); -} - -/*********************************************************************** - * - * WINHELP_CreateHelpWindowByOffset +/****************************************************************** + * WINHELP_OpenHelpWindow + * Main function to search for a page and display it in a window */ -BOOL WINHELP_CreateHelpWindowByOffset(HLPFILE* hlpfile, LONG lOffset, - HLPFILE_WINDOWINFO* wi, int nCmdShow) +BOOL WINHELP_OpenHelpWindow(HLPFILE_PAGE* (*lookup)(HLPFILE*, LONG, ULONG*), + HLPFILE* hlpfile, LONG val, HLPFILE_WINDOWINFO* wi, + int nCmdShow) { WINHELP_WNDPAGE wpage; - wpage.page = HLPFILE_PageByOffset(hlpfile, lOffset, &wpage.relative); + wpage.page = lookup(hlpfile, val, &wpage.relative); if (wpage.page) wpage.page->file->wRefCount++; wpage.wininfo = wi; return WINHELP_CreateHelpWindow(&wpage, nCmdShow, TRUE); @@ -1229,14 +1197,14 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, WINE_WARN("link to window %d/%d\n", part->link->window, hlpfile->numWindows); break; } - WINHELP_CreateHelpWindowByHash(hlpfile, part->link->lHash, wi, - SW_NORMAL); + WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, part->link->lHash, + wi, SW_NORMAL); break; case hlp_link_popup: hlpfile = WINHELP_LookupHelpFile(part->link->lpszString); - if (hlpfile) WINHELP_CreateHelpWindowByHash(hlpfile, part->link->lHash, - WINHELP_GetPopupWindowInfo(hlpfile, hWnd, &mouse), - SW_NORMAL); + if (hlpfile) WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, part->link->lHash, + WINHELP_GetPopupWindowInfo(hlpfile, hWnd, &mouse), + SW_NORMAL); break; case hlp_link_macro: MACRO_ExecuteMacro(part->link->lpszString); @@ -2074,7 +2042,8 @@ BOOL WINHELP_CreateIndexWindow(void) { ret -= 2; WINE_TRACE("got %d as an offset\n", ret); - WINHELP_CreateHelpWindowByOffset(hlpfile, ret, Globals.active_win->info, SW_NORMAL); + WINHELP_OpenHelpWindow(HLPFILE_PageByOffset, hlpfile, ret, + Globals.active_win->info, SW_NORMAL); } return TRUE; } diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index f8ff0c6..a8f211e 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -178,10 +178,9 @@ typedef struct extern WINHELP_GLOBALS Globals; extern FARPROC Callbacks[]; -BOOL WINHELP_CreateHelpWindowByHash(HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int); -BOOL WINHELP_CreateHelpWindowByMap(HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int); -BOOL WINHELP_CreateHelpWindowByOffset(HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int); BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE*, int, BOOL); +BOOL WINHELP_OpenHelpWindow(HLPFILE_PAGE* (*)(HLPFILE*, LONG, ULONG*), + HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int); BOOL WINHELP_GetOpenFileName(LPSTR, int); BOOL WINHELP_CreateIndexWindow(void); void WINHELP_DeleteBackSet(WINHELP_WINDOW*);

1 0