wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

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

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

Eric Pouech : winhelp: Fix the link kind (and color) of the 0xEA-0xEF family.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 0c18020ca980a14027cbc72faf8f5af99877f5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c18020ca980a14027cbc72fa… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:01:27 2008 +0200 winhelp: Fix the link kind (and color) of the 0xEA-0xEF family. --- programs/winhelp/hlpfile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index c20bead..498136d 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1193,9 +1193,9 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, BYTE *buf, BYTE* end) break; } HLPFILE_FreeLink(attributes.link); - attributes.link = HLPFILE_AllocLink((*format & 4) ? hlp_link_link : hlp_link_popup, + attributes.link = HLPFILE_AllocLink((*format & 1) ? hlp_link_link : hlp_link_popup, ptr, GET_UINT(format, 4), - !(*format & 1), wnd); + !(*format & 4), wnd); } format += 3 + GET_USHORT(format, 1); break;

1 0

Eric Pouech : winhelp: Now use the icon out of hlpfile if any.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 61cc510623656b537025d03f034fd51e70721545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61cc510623656b537025d03f0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:00:50 2008 +0200 winhelp: Now use the icon out of hlpfile if any. --- programs/winhelp/hlpfile.c | 10 ++++++++++ programs/winhelp/hlpfile.h | 1 + programs/winhelp/winhelp.c | 5 +++++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 815e7f1..92a22df 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1534,6 +1534,15 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile) *m = macro; break; + case 5: + if (GET_USHORT(ptr, 4 + 4) != 1) + WINE_FIXME("More than one icon, picking up first\n"); + /* 0x16 is sizeof(CURSORICONDIR), see user32/user_private.h */ + hlpfile->hIcon = CreateIconFromResourceEx(ptr + 4 + 0x16, + GET_USHORT(ptr, 2) - 0x16, TRUE, + 0x30000, 0, 0, 0); + break; + case 6: if (GET_USHORT(ptr, 2) != 90) {WINE_WARN("system6\n");break;} @@ -2261,6 +2270,7 @@ void HLPFILE_FreeHlpFile(HLPFILE* hlpfile) HLPFILE_DeletePage(hlpfile->first_page); HLPFILE_DeleteMacro(hlpfile->first_macro); + DestroyIcon(hlpfile->hIcon); if (hlpfile->numWindows) HeapFree(GetProcessHeap(), 0, hlpfile->windows); HeapFree(GetProcessHeap(), 0, hlpfile->Context); HeapFree(GetProcessHeap(), 0, hlpfile->Map); diff --git a/programs/winhelp/hlpfile.h b/programs/winhelp/hlpfile.h index 8a27205..739ad38 100644 --- a/programs/winhelp/hlpfile.h +++ b/programs/winhelp/hlpfile.h @@ -162,6 +162,7 @@ typedef struct tagHlpFileFile unsigned numWindows; HLPFILE_WINDOWINFO* windows; + HICON hIcon; } HLPFILE; /* diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 303811f..bb9ea75 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -530,6 +530,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe WINHELP_WINDOW* win = NULL; BOOL bPrimary, bPopup, bReUsed = FALSE; LPSTR name; + HICON hIcon; bPrimary = !lstrcmpi(wpage->wininfo->name, "main"); bPopup = !bPrimary && (wpage->wininfo->win_style & WS_POPUP); @@ -633,6 +634,10 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe 0, 0, 0, 0, win->hMainWnd, (HMENU)CTL_ID_TEXT, Globals.hInstance, win); } + hIcon = (wpage->page) ? wpage->page->file->hIcon : NULL; + if (!hIcon) hIcon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_WINHELP)); + SendMessage(win->hMainWnd, WM_SETICON, ICON_SMALL, (DWORD_PTR)hIcon); + /* Initialize file specific pushbuttons */ if (!(wpage->wininfo->win_style & WS_POPUP) && wpage->page) {

1 0

Eric Pouech : winhelp: Popup' s background color should be inherited from parent.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: b2061c26b8f30ff7ece0a23ca5a35d6aac58771b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2061c26b8f30ff7ece0a23ca… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:01:21 2008 +0200 winhelp: Popup's background color should be inherited from parent. --- programs/winhelp/winhelp.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 22424cb..73b0609 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -203,7 +203,8 @@ HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name) * * */ -static HLPFILE_WINDOWINFO* WINHELP_GetPopupWindowInfo(HLPFILE* hlpfile, HWND hParentWnd, POINT* mouse) +static HLPFILE_WINDOWINFO* WINHELP_GetPopupWindowInfo(HLPFILE* hlpfile, + WINHELP_WINDOW* parent, POINT* mouse) { static HLPFILE_WINDOWINFO wi; @@ -212,19 +213,20 @@ static HLPFILE_WINDOWINFO* WINHELP_GetPopupWindowInfo(HLPFILE* hlpfile, HWND wi.type[0] = wi.name[0] = wi.caption[0] = '\0'; /* Calculate horizontal size and position of a popup window */ - GetWindowRect(hParentWnd, &parent_rect); + GetWindowRect(parent->hMainWnd, &parent_rect); wi.size.cx = (parent_rect.right - parent_rect.left) / 2; wi.size.cy = 10; /* need a non null value, so that border are taken into account while computing */ wi.origin = *mouse; - ClientToScreen(hParentWnd, &wi.origin); + ClientToScreen(parent->hMainWnd, &wi.origin); wi.origin.x -= wi.size.cx / 2; wi.origin.x = min(wi.origin.x, GetSystemMetrics(SM_CXSCREEN) - wi.size.cx); wi.origin.x = max(wi.origin.x, 0); wi.style = SW_SHOW; wi.win_style = WS_POPUP | WS_BORDER; - wi.sr_color = wi.sr_color = 0xFFFFFF; + wi.sr_color = parent->info->sr_color; + wi.nsr_color = 0xFFFFFF; return &wi; } @@ -1207,7 +1209,7 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, case hlp_link_popup: hlpfile = WINHELP_LookupHelpFile(part->link->lpszString); if (hlpfile) WINHELP_OpenHelpWindow(HLPFILE_PageByHash, hlpfile, part->link->lHash, - WINHELP_GetPopupWindowInfo(hlpfile, hWnd, &mouse), + WINHELP_GetPopupWindowInfo(hlpfile, win, &mouse), SW_NORMAL); break; case hlp_link_macro:

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2008