April 2008 - wine-commits

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

Eric Pouech : winhelp: Store reference to the popup (if any) as a WINHELP_WINDOW pointer.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 6cd9b1a31385388c03bac6a6bb588f495bc64fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd9b1a31385388c03bac6a6b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:01:14 2008 +0200 winhelp: Store reference to the popup (if any) as a WINHELP_WINDOW pointer. --- programs/winhelp/winhelp.c | 34 ++++++++++++++++++++++------------ programs/winhelp/winhelp.h | 2 +- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 797bbae..22424cb 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -56,7 +56,7 @@ static void WINHELP_DeleteButtons(WINHELP_WINDOW*); 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}}; +WINHELP_GLOBALS Globals = {3, NULL, TRUE, NULL, NULL, NULL, NULL, NULL, {{{NULL,NULL}},0}}; #define CTL_ID_BUTTON 0x700 #define CTL_ID_TEXT 0x701 @@ -593,7 +593,9 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe WINHELP_RememberPage(win, wpage); } - if (!bPopup) + if (bPopup) + Globals.active_popup = win; + else Globals.active_win = win; /* Initialize default pushbuttons */ @@ -649,7 +651,6 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe } WINHELP_LayoutMainWindow(win); - if (bPopup) Globals.hPopupWnd = win->hMainWnd; ShowWindow(win->hMainWnd, nCmdShow); UpdateWindow(win->hMainWnd); @@ -736,9 +737,9 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, break; } break; - case WM_DESTROY: - if (Globals.hPopupWnd) DestroyWindow(Globals.hPopupWnd); - break; +/* EPP case WM_DESTROY: */ +/* EPP if (Globals.hPopupWnd) DestroyWindow(Globals.hPopupWnd); */ +/* EPP break; */ case WM_COPYDATA: return WINHELP_HandleCommand((HWND)wParam, lParam); @@ -789,7 +790,6 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, { BOOL bExit; win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); - if (hWnd == Globals.hPopupWnd) Globals.hPopupWnd = 0; bExit = (Globals.wVersion >= 4 && !lstrcmpi(win->lpszName, "main")); WINHELP_DeleteWindow(win); @@ -1172,8 +1172,12 @@ static LRESULT CALLBACK WINHELP_TextWndProc(HWND hWnd, UINT msg, WPARAM wParam, case WM_LBUTTONDOWN: win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); - hPopupWnd = Globals.hPopupWnd; - Globals.hPopupWnd = 0; + if (Globals.active_popup) + { + hPopupWnd = Globals.active_popup->hMainWnd; + Globals.active_popup = NULL; + } + else hPopupWnd = NULL; part = WINHELP_IsOverLink(win, wParam, lParam); if (part) @@ -1739,7 +1743,9 @@ static BOOL WINHELP_SplitLines(HWND hWnd, LPSIZE newsize) */ static void WINHELP_CheckPopup(UINT msg) { - if (!Globals.hPopupWnd) return; + HWND hPopup; + + if (!Globals.active_popup) return; switch (msg) { @@ -1750,8 +1756,9 @@ static void WINHELP_CheckPopup(UINT msg) case WM_NCLBUTTONDOWN: case WM_NCMBUTTONDOWN: case WM_NCRBUTTONDOWN: - DestroyWindow(Globals.hPopupWnd); - Globals.hPopupWnd = 0; + hPopup = Globals.active_popup->hMainWnd; + Globals.active_popup = NULL; + DestroyWindow(hPopup); } } @@ -1834,6 +1841,9 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win) SetActiveWindow(Globals.win_list->hMainWnd); } + if (win == Globals.active_popup) + Globals.active_popup = NULL; + WINHELP_DeleteButtons(win); if (win->hShadowWnd) DestroyWindow(win->hShadowWnd); diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index a8f211e..b3ebac1 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -166,9 +166,9 @@ typedef struct { UINT wVersion; HANDLE hInstance; - HWND hPopupWnd; BOOL isBook; WINHELP_WINDOW* active_win; + WINHELP_WINDOW* active_popup; WINHELP_WINDOW* win_list; WNDPROC button_proc; WINHELP_DLL* dlls;

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

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: 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: Simplified message box handling.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: c631bb0b56fb7c4bd780d0fe4e8a265dfa4e5c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c631bb0b56fb7c4bd780d0fe4… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:00:44 2008 +0200 winhelp: Simplified message box handling. --- programs/winhelp/winhelp.c | 24 ++++-------------------- programs/winhelp/winhelp.h | 1 - 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 0801cd6..303811f 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -759,7 +759,8 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, if (button) MACRO_ExecuteMacro(button->lpszMacro); else if (!HIWORD(wParam)) - WINHELP_MessageBoxIDS(STID_NOT_IMPLEMENTED, 0x121, MB_OK); + MessageBox(0, MAKEINTRESOURCE(STID_NOT_IMPLEMENTED), + MAKEINTRESOURCE(STID_WHERROR), MB_OK); break; } break; @@ -1913,34 +1914,17 @@ static void WINHELP_InitFonts(HWND hWnd) /*********************************************************************** * - * WINHELP_MessageBoxIDS - */ -INT WINHELP_MessageBoxIDS(UINT ids_text, UINT ids_title, WORD type) -{ - CHAR text[MAX_STRING_LEN]; - CHAR title[MAX_STRING_LEN]; - - LoadString(Globals.hInstance, ids_text, text, sizeof(text)); - LoadString(Globals.hInstance, ids_title, title, sizeof(title)); - - return MessageBox(0, text, title, type); -} - -/*********************************************************************** - * - * MAIN_MessageBoxIDS_s + * WINHELP_MessageBoxIDS_s */ INT WINHELP_MessageBoxIDS_s(UINT ids_text, LPCSTR str, UINT ids_title, WORD type) { CHAR text[MAX_STRING_LEN]; - CHAR title[MAX_STRING_LEN]; CHAR newtext[MAX_STRING_LEN + MAX_PATH]; LoadString(Globals.hInstance, ids_text, text, sizeof(text)); - LoadString(Globals.hInstance, ids_title, title, sizeof(title)); wsprintf(newtext, text, str); - return MessageBox(0, newtext, title, type); + return MessageBox(0, newtext, MAKEINTRESOURCE(ids_title), type); } /****************************************************************** diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index 81ce74e..af75261 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -184,7 +184,6 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE*, int, BOOL); BOOL WINHELP_GetOpenFileName(LPSTR, int); BOOL WINHELP_CreateIndexWindow(void); void WINHELP_DeleteBackSet(WINHELP_WINDOW*); -INT WINHELP_MessageBoxIDS(UINT, UINT, WORD); INT WINHELP_MessageBoxIDS_s(UINT, LPCSTR, UINT, WORD); HLPFILE* WINHELP_LookupHelpFile(LPCSTR lpszFile); HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name);

1 0

Eric Pouech : winhelp: Enable/Disable prev/next buttons if there's a prev/ next page.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 3ae5ad8ede5e71b19df8d86e0555cf800019334c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae5ad8ede5e71b19df8d86e0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:00:38 2008 +0200 winhelp: Enable/Disable prev/next buttons if there's a prev/next page. --- programs/winhelp/macro.c | 7 +++++++ programs/winhelp/winhelp.c | 22 +++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index 2ff1ad2..2c38b01 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -245,10 +245,17 @@ void CALLBACK MACRO_BookmarkMore(void) void CALLBACK MACRO_BrowseButtons(void) { + HLPFILE_PAGE* page = Globals.active_win->page; + WINE_TRACE("()\n"); MACRO_CreateButton("BTN_PREV", "&<<", "Prev()"); MACRO_CreateButton("BTN_NEXT", "&>>", "Next()"); + + if (!HLPFILE_PageByOffset(page->file, page->browse_bwd)) + MACRO_DisableButton("BTN_PREV"); + if (!HLPFILE_PageByOffset(page->file, page->browse_fwd)) + MACRO_DisableButton("BTN_NEXT"); } void CALLBACK MACRO_ChangeButtonBinding(LPCSTR id, LPCSTR macro) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 13507d9..0801cd6 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -614,17 +614,6 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe MACRO_CreateButton("BTN_TOPICS", buffer, "Finder()"); } - /* Initialize file specific pushbuttons */ - if (!(wpage->wininfo->win_style & WS_POPUP) && wpage->page) - { - HLPFILE_MACRO *macro; - for (macro = wpage->page->file->first_macro; macro; macro = macro->next) - MACRO_ExecuteMacro(macro->lpszMacro); - - for (macro = wpage->page->first_macro; macro; macro = macro->next) - MACRO_ExecuteMacro(macro->lpszMacro); - } - if (!bReUsed) { win->hMainWnd = CreateWindowEx((bPopup) ? WS_EX_TOOLWINDOW : 0, MAIN_WIN_CLASS_NAME, @@ -644,6 +633,17 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe 0, 0, 0, 0, win->hMainWnd, (HMENU)CTL_ID_TEXT, Globals.hInstance, win); } + /* Initialize file specific pushbuttons */ + if (!(wpage->wininfo->win_style & WS_POPUP) && wpage->page) + { + HLPFILE_MACRO *macro; + for (macro = wpage->page->file->first_macro; macro; macro = macro->next) + MACRO_ExecuteMacro(macro->lpszMacro); + + for (macro = wpage->page->first_macro; macro; macro = macro->next) + MACRO_ExecuteMacro(macro->lpszMacro); + } + WINHELP_LayoutMainWindow(win); if (bPopup) Globals.hPopupWnd = win->hMainWnd;

1 0

Eric Pouech : winhelp: Fixed JumpId and JumpKeyword with correct signature and implementation.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 7ae1bb28fec6cf6098cd1927ffdc9e6e854c088d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ae1bb28fec6cf6098cd1927f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:00:32 2008 +0200 winhelp: Fixed JumpId and JumpKeyword with correct signature and implementation. --- programs/winhelp/macro.c | 31 ++++++++++++++++++++++++------- programs/winhelp/macro.h | 2 +- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index 85b19ce..2ff1ad2 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -110,7 +110,7 @@ static struct MacroDesc MACRO_Builtins[] = { {"JumpContext", "JC", 0, "SSU", (FARPROC)MACRO_JumpContext}, {"JumpHash", "JH", 0, "SSU", (FARPROC)MACRO_JumpHash}, {"JumpHelpOn", NULL, 0, "", (FARPROC)MACRO_JumpHelpOn}, - {"JumpID", "JI", 0, "SSS", (FARPROC)MACRO_JumpID}, + {"JumpID", "JI", 0, "SS", (FARPROC)MACRO_JumpID}, {"JumpKeyword", "JK", 0, "SSS", (FARPROC)MACRO_JumpKeyword}, {"KLink", "KL", 0, "SUSS", (FARPROC)MACRO_KLink}, {"Menu", "MU", 0, "", (FARPROC)MACRO_Menu}, @@ -654,15 +654,32 @@ void CALLBACK MACRO_JumpHelpOn(void) WINE_FIXME("()\n"); } -/* FIXME: those two macros are wrong - * they should only contain 2 strings, path & window are coded as path>window - */ -void CALLBACK MACRO_JumpID(LPCSTR lpszPath, LPCSTR lpszWindow, LPCSTR topic_id) +void CALLBACK MACRO_JumpID(LPCSTR lpszPathWindow, LPCSTR topic_id) { - WINE_TRACE("(\"%s\", \"%s\", \"%s\")\n", lpszPath, lpszWindow, topic_id); - MACRO_JumpHash(lpszPath, lpszWindow, HLPFILE_Hash(topic_id)); + LPSTR ptr; + + WINE_TRACE("(\"%s\", \"%s\")\n", lpszPathWindow, topic_id); + if ((ptr = strchr(lpszPathWindow, '>')) != NULL) + { + LPSTR tmp; + size_t sz = ptr - lpszPathWindow; + + tmp = HeapAlloc(GetProcessHeap(), 0, sz + 1); + if (tmp) + { + memcpy(tmp, lpszPathWindow, sz); + tmp[sz] = '\0'; + MACRO_JumpHash(tmp, ptr + 1, HLPFILE_Hash(topic_id)); + HeapFree(GetProcessHeap(), 0, tmp); + } + } + else + MACRO_JumpHash(lpszPathWindow, NULL, HLPFILE_Hash(topic_id)); } +/* FIXME: this macros is wrong + * it should only contain 2 strings, path & window are coded as path>window + */ void CALLBACK MACRO_JumpKeyword(LPCSTR lpszPath, LPCSTR lpszWindow, LPCSTR keyword) { WINE_FIXME("(\"%s\", \"%s\", \"%s\")\n", lpszPath, lpszWindow, keyword); diff --git a/programs/winhelp/macro.h b/programs/winhelp/macro.h index b8f736b..ee1fd69 100644 --- a/programs/winhelp/macro.h +++ b/programs/winhelp/macro.h @@ -98,7 +98,7 @@ void CALLBACK MACRO_JumpContents(LPCSTR, LPCSTR); void CALLBACK MACRO_JumpContext(LPCSTR, LPCSTR, LONG); void CALLBACK MACRO_JumpHash(LPCSTR, LPCSTR, LONG); void CALLBACK MACRO_JumpHelpOn(void); -void CALLBACK MACRO_JumpID(LPCSTR, LPCSTR, LPCSTR); +void CALLBACK MACRO_JumpID(LPCSTR, LPCSTR); void CALLBACK MACRO_JumpKeyword(LPCSTR, LPCSTR, LPCSTR); void CALLBACK MACRO_KLink(LPCSTR, LONG, LPCSTR, LPCSTR); void CALLBACK MACRO_Menu(void);

1 0

Eric Pouech : winhelp: Replaced an erroneous FIXME by a TRACE in MACRO_DisableButton().
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 951926e6e548c0b60018ea6d5bbcc66de57496e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=951926e6e548c0b60018ea6d5… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:00:26 2008 +0200 winhelp: Replaced an erroneous FIXME by a TRACE in MACRO_DisableButton(). --- programs/winhelp/macro.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index d43ec9f..85b19ce 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -418,7 +418,7 @@ void CALLBACK MACRO_DisableButton(LPCSTR id) { WINHELP_BUTTON** b; - WINE_FIXME("(\"%s\")\n", id); + WINE_TRACE("(\"%s\")\n", id); b = MACRO_LookupButton(Globals.active_win, id); if (!*b) {WINE_FIXME("Couldn't find button '%s'\n", id); return;}

1 0

Eric Pouech : winhelp: Don' t add a page to the history when using the back button.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 4a89d2910496304d9365ade2a30f684eb4b3e50f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a89d2910496304d9365ade2a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:00:20 2008 +0200 winhelp: Don't add a page to the history when using the back button. --- programs/winhelp/macro.c | 6 +++--- programs/winhelp/winhelp.c | 19 +++++++++---------- programs/winhelp/winhelp.h | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index 877d33f..d43ec9f 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -221,7 +221,7 @@ void CALLBACK MACRO_Back(void) WINE_TRACE("()\n"); if (win && win->back.index >= 2) - WINHELP_CreateHelpWindow(&win->back.set[--win->back.index - 1], SW_SHOW); + WINHELP_CreateHelpWindow(&win->back.set[--win->back.index - 1], SW_SHOW, FALSE); } void CALLBACK MACRO_BackFlush(void) @@ -699,7 +699,7 @@ void CALLBACK MACRO_Next(void) { wp.page->file->wRefCount++; wp.wininfo = Globals.active_win->info; - WINHELP_CreateHelpWindow(&wp, SW_NORMAL); + WINHELP_CreateHelpWindow(&wp, SW_NORMAL, TRUE); } } @@ -739,7 +739,7 @@ void CALLBACK MACRO_Prev(void) { wp.page->file->wRefCount++; wp.wininfo = Globals.active_win->info; - WINHELP_CreateHelpWindow(&wp, SW_NORMAL); + WINHELP_CreateHelpWindow(&wp, SW_NORMAL, TRUE); } } diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index ee7925f..13507d9 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -485,12 +485,10 @@ void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win) } -static void WINHELP_AddHistory(WINHELP_WINDOW* win, HLPFILE_PAGE* page) +static void WINHELP_RememberPage(WINHELP_WINDOW* win, HLPFILE_PAGE* page) { unsigned num; - /* FIXME: when using back, we shouldn't update the history... */ - /* add to history only if different from top of history */ if (!Globals.history.index || Globals.history.set[0].page != page) { num = sizeof(Globals.history.set) / sizeof(Globals.history.set[0]); @@ -527,7 +525,7 @@ static void WINHELP_AddHistory(WINHELP_WINDOW* win, HLPFILE_PAGE* page) * * WINHELP_CreateHelpWindow */ -BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow) +BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remember) { WINHELP_WINDOW* win = NULL; BOOL bPrimary, bPopup, bReUsed = FALSE; @@ -590,9 +588,9 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow) win->hArrowCur = LoadCursorA(0, (LPSTR)IDC_ARROW); win->hHandCur = LoadCursorA(0, (LPSTR)IDC_HAND); - if (!bPopup && wpage->page) + if (!bPopup && wpage->page && remember) { - WINHELP_AddHistory(win, wpage->page); + WINHELP_RememberPage(win, wpage->page); } if (!bPopup) @@ -609,6 +607,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow) MACRO_CreateButton("BTN_SEARCH", buffer, "Search()"); LoadString(Globals.hInstance, STID_BACK, buffer, sizeof(buffer)); MACRO_CreateButton("BTN_BACK", buffer, "Back()"); + if (win->back.index <= 1) MACRO_DisableButton("BTN_BACK"); LoadString(Globals.hInstance, STID_HISTORY, buffer, sizeof(buffer)); MACRO_CreateButton("BTN_HISTORY", buffer, "History()"); LoadString(Globals.hInstance, STID_TOPICS, buffer, sizeof(buffer)); @@ -669,7 +668,7 @@ BOOL WINHELP_CreateHelpWindowByHash(HLPFILE* hlpfile, LONG lHash, HLPFILE_Contents(hlpfile); if (wpage.page) wpage.page->file->wRefCount++; wpage.wininfo = wi; - return WINHELP_CreateHelpWindow(&wpage, nCmdShow); + return WINHELP_CreateHelpWindow(&wpage, nCmdShow, TRUE); } /*********************************************************************** @@ -684,7 +683,7 @@ BOOL WINHELP_CreateHelpWindowByMap(HLPFILE* hlpfile, LONG lMap, wpage.page = HLPFILE_PageByMap(hlpfile, lMap); if (wpage.page) wpage.page->file->wRefCount++; wpage.wininfo = wi; - return WINHELP_CreateHelpWindow(&wpage, nCmdShow); + return WINHELP_CreateHelpWindow(&wpage, nCmdShow, TRUE); } /*********************************************************************** @@ -699,7 +698,7 @@ BOOL WINHELP_CreateHelpWindowByOffset(HLPFILE* hlpfile, LONG lOffset, wpage.page = HLPFILE_PageByOffset(hlpfile, lOffset); if (wpage.page) wpage.page->file->wRefCount++; wpage.wininfo = wi; - return WINHELP_CreateHelpWindow(&wpage, nCmdShow); + return WINHELP_CreateHelpWindow(&wpage, nCmdShow, TRUE); } /*********************************************************************** @@ -1293,7 +1292,7 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara GetTextMetrics(hDc, &tm); i = HIWORD(lParam) / tm.tmHeight; if (i < Globals.history.index) - WINHELP_CreateHelpWindow(&Globals.history.set[i], SW_SHOW); + WINHELP_CreateHelpWindow(&Globals.history.set[i], SW_SHOW, TRUE); ReleaseDC(hWnd, hDc); break; case WM_PAINT: diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index f1f67d2..81ce74e 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -180,7 +180,7 @@ 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 WINHELP_CreateHelpWindow(WINHELP_WNDPAGE*, int, BOOL); BOOL WINHELP_GetOpenFileName(LPSTR, int); BOOL WINHELP_CreateIndexWindow(void); void WINHELP_DeleteBackSet(WINHELP_WINDOW*);

1 0

Eric Pouech : winhelp: Properly display the page title.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 07cf778b2bed2c2dbbfb9408b556850f1d40876b URL: http://source.winehq.org/git/wine.git/?a=commit;h=07cf778b2bed2c2dbbfb9408b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:00:14 2008 +0200 winhelp: Properly display the page title. --- programs/winhelp/winhelp.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index a33c470..ee7925f 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -112,6 +112,12 @@ BOOL WINHELP_GetOpenFileName(LPSTR lpszFile, int len) return GetOpenFileName(&openfilename); } +static char* WINHELP_GetCaption(WINHELP_WNDPAGE* wpage) +{ + if (wpage->wininfo->caption[0]) return wpage->wininfo->caption; + return wpage->page->file->lpszTitle; +} + /*********************************************************************** * * WINHELP_LookupHelpFile @@ -540,7 +546,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow) { WINHELP_DeleteButtons(win); bReUsed = TRUE; - SetWindowText(win->hMainWnd, wpage->wininfo->caption); + SetWindowText(win->hMainWnd, WINHELP_GetCaption(wpage)); if (wpage->wininfo->origin.x != CW_USEDEFAULT && wpage->wininfo->origin.y != CW_USEDEFAULT) SetWindowPos(win->hMainWnd, HWND_TOP, @@ -623,7 +629,7 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow) if (!bReUsed) { win->hMainWnd = CreateWindowEx((bPopup) ? WS_EX_TOOLWINDOW : 0, MAIN_WIN_CLASS_NAME, - wpage->wininfo->caption, + WINHELP_GetCaption(wpage), bPrimary ? WS_OVERLAPPEDWINDOW : wpage->wininfo->win_style, wpage->wininfo->origin.x, wpage->wininfo->origin.y, wpage->wininfo->size.cx, wpage->wininfo->size.cy,

1 0

Eric Pouech : winhelp: Fix the loading of a row in a table (especially, for multiple paragraphs in a single cell).
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: e862e7d84c255fb66089831270415a89b4b0343b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e862e7d84c255fb6608983127… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:00:08 2008 +0200 winhelp: Fix the loading of a row in a table (especially, for multiple paragraphs in a single cell). --- programs/winhelp/hlpfile.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 4424319..815e7f1 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -882,6 +882,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, BYTE *buf, BYTE* end) long size, blocksize, datalen; unsigned short bits; unsigned nc, ncol = 1; + BOOL in_table = FALSE; for (paragraphptr = &page->first_paragraph; *paragraphptr; paragraphptr = &(*paragraphptr)->next) /* Nothing */; @@ -925,6 +926,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, BYTE *buf, BYTE* end) { char type; + in_table = TRUE; ncol = *format++; WINE_TRACE("#cols %u\n", ncol); @@ -934,15 +936,17 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, BYTE *buf, BYTE* end) format += ncol * 4; } - for (nc = 0; nc < ncol; nc++) + for (nc = 0; nc < ncol; /**/) { - WINE_TRACE("looking for format at offset %lu for column %d\n", (SIZE_T)(format - (buf + 0x15)), nc); - if (buf[0x14] == 0x23) + WINE_TRACE("looking for format at offset %lu in column %d\n", (SIZE_T)(format - (buf + 0x15)), nc); + if (in_table) + { + nc = GET_SHORT(format, 0); + if (nc == -1) break; format += 5; - if (buf[0x14] == 0x01) - format += 6; - else - format += 4; + } + else nc++; + format += 4; bits = GET_USHORT(format, 0); format += 2; if (bits & 0x0001) fetch_long(&format); if (bits & 0x0002) fetch_short(&format);

1 0

Eric Pouech : winhelp: Fix window caption index in |SYSTEM.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: e0032f0ceb8cc6bb86e8d4c0cd245505f877ebf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0032f0ceb8cc6bb86e8d4c0c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 22:00:03 2008 +0200 winhelp: Fix window caption index in |SYSTEM. --- programs/winhelp/hlpfile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 2bbc68a..4424319 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -1549,7 +1549,7 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile) else wi->type[0] = '\0'; if (flags & 0x0002) strcpy(wi->name, &str[12]); else wi->name[0] = '\0'; - if (flags & 0x0004) strcpy(wi->caption, &str[23]); + if (flags & 0x0004) strcpy(wi->caption, &str[21]); else lstrcpynA(wi->caption, hlpfile->lpszTitle, sizeof(wi->caption)); wi->origin.x = (flags & 0x0008) ? GET_USHORT(ptr, 76) : CW_USEDEFAULT; wi->origin.y = (flags & 0x0010) ? GET_USHORT(ptr, 78) : CW_USEDEFAULT;

1 0

Eric Pouech : winhelp: Properly handle the back button (in multiple windows , in empty stack...).
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: ccd75350dde23805d82000a9c290cf5d584cdded URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccd75350dde23805d82000a9c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 21:59:57 2008 +0200 winhelp: Properly handle the back button (in multiple windows, in empty stack...). --- programs/winhelp/macro.c | 12 +----------- programs/winhelp/winhelp.c | 22 +++++++++++++++++++--- programs/winhelp/winhelp.h | 1 + 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index ca11b5a..877d33f 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -230,17 +230,7 @@ void CALLBACK MACRO_BackFlush(void) WINE_TRACE("()\n"); - if (win) - { - unsigned int i; - - for (i = 0; i < win->back.index; i++) - { - HLPFILE_FreeHlpFile(win->back.set[i].page->file); - win->back.set[i].page = NULL; - } - win->back.index = 0; - } + if (win) WINHELP_DeleteBackSet(win); } void CALLBACK MACRO_BookmarkDefine(void) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 2011d2a..a33c470 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -549,6 +549,8 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow) wpage->wininfo->size.cy != CW_USEDEFAULT) SetWindowPos(win->hMainWnd, HWND_TOP, 0, 0, wpage->wininfo->size.cx, wpage->wininfo->size.cy, SWP_NOMOVE); + if (wpage->page && wpage->page->file != win->page->file) + WINHELP_DeleteBackSet(win); WINHELP_InitFonts(win->hMainWnd); win->page = wpage->page; @@ -1814,6 +1816,22 @@ static void WINHELP_DeleteButtons(WINHELP_WINDOW* win) win->first_button = NULL; } +/****************************************************************** + * WINHELP_DeleteBackSet + * + */ +void WINHELP_DeleteBackSet(WINHELP_WINDOW* win) +{ + unsigned int i; + + for (i = 0; i < win->back.index; i++) + { + HLPFILE_FreeHlpFile(win->back.set[i].page->file); + win->back.set[i].page = NULL; + } + win->back.index = 0; +} + /*********************************************************************** * * WINHELP_DeleteWindow @@ -1821,7 +1839,6 @@ static void WINHELP_DeleteButtons(WINHELP_WINDOW* win) static void WINHELP_DeleteWindow(WINHELP_WINDOW* win) { WINHELP_WINDOW** w; - unsigned int i; for (w = &Globals.win_list; *w; w = &(*w)->next) { @@ -1846,8 +1863,7 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win) DeleteObject(win->hBrush); - for (i = 0; i < win->back.index; i++) - HLPFILE_FreeHlpFile(win->back.set[i].page->file); + WINHELP_DeleteBackSet(win); if (win->page) HLPFILE_FreeHlpFile(win->page->file); WINHELP_DeleteLines(win); diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index 5b23994..f1f67d2 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -183,6 +183,7 @@ BOOL WINHELP_CreateHelpWindowByOffset(HLPFILE*, LONG, HLPFILE_WINDOWINFO*, int); BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE*, int); BOOL WINHELP_GetOpenFileName(LPSTR, int); BOOL WINHELP_CreateIndexWindow(void); +void WINHELP_DeleteBackSet(WINHELP_WINDOW*); INT WINHELP_MessageBoxIDS(UINT, UINT, WORD); INT WINHELP_MessageBoxIDS_s(UINT, LPCSTR, UINT, WORD); HLPFILE* WINHELP_LookupHelpFile(LPCSTR lpszFile);

1 0

Eric Pouech : winhelp: Present correctly the history when dealing with multiple files.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: d95bcb73a9a06a6985fe33c31b98d4ebccf0c1bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d95bcb73a9a06a6985fe33c31… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 21:59:51 2008 +0200 winhelp: Present correctly the history when dealing with multiple files. --- programs/winhelp/winhelp.c | 39 +++++++++++++++++++++++++++++---------- 1 files changed, 29 insertions(+), 10 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index e5860fa..2011d2a 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -481,14 +481,11 @@ void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win) static void WINHELP_AddHistory(WINHELP_WINDOW* win, HLPFILE_PAGE* page) { - unsigned i, num; + unsigned num; /* FIXME: when using back, we shouldn't update the history... */ - for (i = 0; i < Globals.history.index; i++) - if (Globals.history.set[i].page == page) break; - - /* if the new page is already in the history, do nothing */ - if (i == Globals.history.index) + /* add to history only if different from top of history */ + if (!Globals.history.index || Globals.history.set[0].page != page) { num = sizeof(Globals.history.set) / sizeof(Globals.history.set[0]); /* we're full, remove latest entry */ @@ -503,8 +500,8 @@ static void WINHELP_AddHistory(WINHELP_WINDOW* win, HLPFILE_PAGE* page) Globals.history.set[0].wininfo = win->info; Globals.history.index++; page->file->wRefCount++; - if (win->hHistoryWnd) InvalidateRect(win->hHistoryWnd, NULL, TRUE); } + if (win->hHistoryWnd) InvalidateRect(win->hHistoryWnd, NULL, TRUE); num = sizeof(win->back.set) / sizeof(win->back.set[0]); if (win->back.index == num) @@ -1298,9 +1295,31 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara for (i = 0; i < Globals.history.index; i++) { - TextOut(hDc, 0, i * tm.tmHeight, - Globals.history.set[i].page->lpszTitle, - strlen(Globals.history.set[i].page->lpszTitle)); + if (Globals.history.set[i].page->file == Globals.active_win->page->file) + { + TextOut(hDc, 0, i * tm.tmHeight, + Globals.history.set[i].page->lpszTitle, + strlen(Globals.history.set[i].page->lpszTitle)); + } + else + { + char buffer[1024]; + const char* ptr1; + const char* ptr2; + unsigned len; + + ptr1 = strrchr(Globals.history.set[i].page->file->lpszPath, '\\'); + if (!ptr1) ptr1 = Globals.history.set[i].page->file->lpszPath; + else ptr1++; + ptr2 = strrchr(ptr1, '.'); + len = ptr2 ? ptr2 - ptr1 : strlen(ptr1); + if (len > sizeof(buffer)) len = sizeof(buffer); + memcpy(buffer, ptr1, len); + if (len < sizeof(buffer)) buffer[len++] = ':'; + strncpy(&buffer[len], Globals.history.set[i].page->lpszTitle, sizeof(buffer) - len); + buffer[sizeof(buffer) - 1] = '\0'; + TextOut(hDc, 0, i * tm.tmHeight, buffer, strlen(buffer)); + } } EndPaint(hWnd, &ps); break;

1 0

Eric Pouech : winhelp: Store the history in correct order.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: db5902baeeb24d926b6351ed55eccf4be35e9988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db5902baeeb24d926b6351ed5… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 21:59:45 2008 +0200 winhelp: Store the history in correct order. --- programs/winhelp/winhelp.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index e0f2532..e5860fa 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -491,16 +491,17 @@ static void WINHELP_AddHistory(WINHELP_WINDOW* win, HLPFILE_PAGE* page) if (i == Globals.history.index) { num = sizeof(Globals.history.set) / sizeof(Globals.history.set[0]); + /* we're full, remove latest entry */ if (Globals.history.index == num) { - /* we're full, remove latest entry */ - HLPFILE_FreeHlpFile(Globals.history.set[0].page->file); - memmove(&Globals.history.set[0], &Globals.history.set[1], - (num - 1) * sizeof(Globals.history.set[0])); + HLPFILE_FreeHlpFile(Globals.history.set[num - 1].page->file); Globals.history.index--; } - Globals.history.set[Globals.history.index].page = page; - Globals.history.set[Globals.history.index++].wininfo = win->info; + 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.index++; page->file->wRefCount++; if (win->hHistoryWnd) InvalidateRect(win->hHistoryWnd, NULL, TRUE); } @@ -1297,7 +1298,8 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara for (i = 0; i < Globals.history.index; i++) { - TextOut(hDc, 0, i * tm.tmHeight, Globals.history.set[i].page->lpszTitle, + TextOut(hDc, 0, i * tm.tmHeight, + Globals.history.set[i].page->lpszTitle, strlen(Globals.history.set[i].page->lpszTitle)); } EndPaint(hWnd, &ps);

1 0

Eric Pouech : winhelp: Added the notion of WINHELP_WNDPAGE and use it to move the history to the global variables .
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 6d40dbe3da1cecd770961b633e326a375396a9c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d40dbe3da1cecd770961b633… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 21:59:38 2008 +0200 winhelp: Added the notion of WINHELP_WNDPAGE and use it to move the history to the global variables. --- programs/winhelp/macro.c | 39 ++++++------ programs/winhelp/winhelp.c | 144 ++++++++++++++++++++++---------------------- programs/winhelp/winhelp.h | 22 +++++-- 3 files changed, 109 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d40dbe3da1cecd770961…

1 0

Eric Pouech : winhelp: Get rid of the reuse concept for Windows and refactor the code a bit for window creation / deletion.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 7a608ea627612f83339ebb6adeacd491478145d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a608ea627612f83339ebb6ad… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Apr 22 21:59:31 2008 +0200 winhelp: Get rid of the reuse concept for Windows and refactor the code a bit for window creation / deletion. --- programs/winhelp/winhelp.c | 259 ++++++++++++++++++++------------------------ 1 files changed, 118 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a608ea627612f83339eb…

1 0

Dan Kegel : winecfg: Restrict dpi slider to sane values.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: faaccca59be08be547ec4e1948b6306eff3808a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faaccca59be08be547ec4e194… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Apr 22 17:56:36 2008 -0700 winecfg: Restrict dpi slider to sane values. --- programs/winecfg/x11drvdlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index bfa6ec5..c0ec058 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -35,9 +35,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); -#define RES_MAXLEN 5 /* the maximum number of characters in a screen dimension. 5 digits should be plenty, what kind of crazy person runs their screen >10,000 pixels across? */ +#define RES_MAXLEN 5 /* max number of digits in a screen dimension. 5 digits should be plenty */ #define MINDPI 96 -#define MAXDPI 480 +#define MAXDPI 144 /* making this too high surprises and hurts users */ #define DEFDPI 96 #define IDT_DPIEDIT 0x1234

1 0

Dan Hipschman : wininet: Remove custom content-length/ type headers from redirects.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: a1ebffb4527e083d3a39762851fbc3d76b5ecfa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1ebffb4527e083d3a3976285… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Apr 22 15:48:28 2008 -0700 wininet: Remove custom content-length/type headers from redirects. --- dlls/wininet/http.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c47a994..3f50d5c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2861,10 +2861,13 @@ static BOOL HTTP_GetRequestURL(WININETHTTPREQW *req, LPWSTR buf) */ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) { + static const WCHAR szContentType[] = {'C','o','n','t','e','n','t','-','T','y','p','e',0}; + static const WCHAR szContentLength[] = {'C','o','n','t','e','n','t','-','L','e','n','g','t','h',0}; LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; LPWININETAPPINFOW hIC = lpwhs->lpAppInfo; BOOL using_proxy = hIC->lpszProxy && hIC->lpszProxy[0]; WCHAR path[INTERNET_MAX_URL_LENGTH]; + int index; if(lpszUrl[0]=='/') { @@ -3051,6 +3054,14 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) } } + /* Remove custom content-type/length headers on redirects. */ + index = HTTP_GetCustomHeaderIndex(lpwhr, szContentType, 0, TRUE); + if (0 <= index) + HTTP_DeleteCustomHeader(lpwhr, index); + index = HTTP_GetCustomHeaderIndex(lpwhr, szContentLength, 0, TRUE); + if (0 <= index) + HTTP_DeleteCustomHeader(lpwhr, index); + return TRUE; }

1 0

Andrew Talbot : netapi32: Remove unused variable.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 34480aef09a6aa840d93f5eb4325db22fcd15bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=34480aef09a6aa840d93f5eb4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 22 22:04:56 2008 +0100 netapi32: Remove unused variable. --- dlls/netapi32/wksta.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index 1eb22d6..6914d02 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -348,7 +348,6 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, { PWKSTA_USER_INFO_1 ui; PWKSTA_USER_INFO_0 ui0; - DWORD dwSize; LSA_OBJECT_ATTRIBUTES ObjectAttributes; LSA_HANDLE PolicyHandle; PPOLICY_ACCOUNT_DOMAIN_INFO DomainInfo; @@ -405,7 +404,6 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, oth_domains_sz * sizeof(WCHAR)); /* get data */ - dwSize = username_sz; lstrcpyW(ui->wkui1_username, ui0->wkui0_username); NetApiBufferFree(ui0);

1 0

Andrew Talbot : ntdll: Remove unused variables.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 664349eacc7ac841e2f75e16b2e7ef189d85696a URL: http://source.winehq.org/git/wine.git/?a=commit;h=664349eacc7ac841e2f75e16b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 22 22:05:03 2008 +0100 ntdll: Remove unused variables. --- dlls/ntdll/cdrom.c | 8 -------- dlls/ntdll/loadorder.c | 5 ++--- dlls/ntdll/path.c | 3 +-- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index e53e41d..47bda87 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -815,7 +815,6 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA { NTSTATUS ret = STATUS_NOT_SUPPORTED; #ifdef linux - unsigned size; SUB_Q_HEADER* hdr = (SUB_Q_HEADER*)data; int io; struct cdrom_subchnl sc; @@ -860,7 +859,6 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA switch (fmt->Format) { case IOCTL_CDROM_CURRENT_POSITION: - size = sizeof(SUB_Q_CURRENT_POSITION); RtlEnterCriticalSection( &cache_section ); if (hdr->AudioStatus==AUDIO_STATUS_IN_PROGRESS) { data->CurrentPosition.FormatCode = IOCTL_CDROM_CURRENT_POSITION; @@ -889,7 +887,6 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA RtlLeaveCriticalSection( &cache_section ); break; case IOCTL_CDROM_MEDIA_CATALOG: - size = sizeof(SUB_Q_MEDIA_CATALOG_NUMBER); data->MediaCatalog.FormatCode = IOCTL_CDROM_MEDIA_CATALOG; { struct cdrom_mcn mcn; @@ -902,7 +899,6 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA } break; case IOCTL_CDROM_TRACK_ISRC: - size = sizeof(SUB_Q_CURRENT_POSITION); FIXME("TrackIsrc: NIY on linux\n"); data->TrackIsrc.FormatCode = IOCTL_CDROM_TRACK_ISRC; data->TrackIsrc.Tcval = 0; @@ -913,7 +909,6 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA end: ret = CDROM_GetStatusCode(io); #elif defined(__FreeBSD__) || defined(__NetBSD__) - unsigned size; SUB_Q_HEADER* hdr = (SUB_Q_HEADER*)data; int io; struct ioc_read_subchannel read_sc; @@ -974,7 +969,6 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA switch (fmt->Format) { case IOCTL_CDROM_CURRENT_POSITION: - size = sizeof(SUB_Q_CURRENT_POSITION); RtlEnterCriticalSection( &cache_section ); if (hdr->AudioStatus==AUDIO_STATUS_IN_PROGRESS) { data->CurrentPosition.FormatCode = IOCTL_CDROM_CURRENT_POSITION; @@ -1000,13 +994,11 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA RtlLeaveCriticalSection( &cache_section ); break; case IOCTL_CDROM_MEDIA_CATALOG: - size = sizeof(SUB_Q_MEDIA_CATALOG_NUMBER); data->MediaCatalog.FormatCode = IOCTL_CDROM_MEDIA_CATALOG; data->MediaCatalog.Mcval = sc.what.media_catalog.mc_valid; memcpy(data->MediaCatalog.MediaCatalog, sc.what.media_catalog.mc_number, 15); break; case IOCTL_CDROM_TRACK_ISRC: - size = sizeof(SUB_Q_CURRENT_POSITION); data->TrackIsrc.FormatCode = IOCTL_CDROM_TRACK_ISRC; data->TrackIsrc.Tcval = sc.what.track_info.ti_valid; memcpy(data->TrackIsrc.TrackIsrc, sc.what.track_info.ti_number, 15); diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index c31b633..ae50a4c 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -376,12 +376,11 @@ static enum loadorder get_registry_value( HANDLE hkey, const WCHAR *module ) UNICODE_STRING valueW; char buffer[80]; DWORD count; - BOOL ret; RtlInitUnicodeString( &valueW, module ); - if ((ret = !NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, - buffer, sizeof(buffer), &count ))) + if (!NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, + buffer, sizeof(buffer), &count )) { WCHAR *str = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)buffer)->Data; return parse_load_order( str ); diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index d7be183..a6fb090 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -596,7 +596,6 @@ static const WCHAR *skip_unc_prefix( const WCHAR *ptr ) static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size) { ULONG reqsize = 0, mark = 0, dep = 0, deplen; - DOS_PATHNAME_TYPE type; LPWSTR ins_str = NULL; LPCWSTR ptr; const UNICODE_STRING* cd; @@ -613,7 +612,7 @@ static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size) else cd = &NtCurrentTeb()->Peb->ProcessParameters->CurrentDirectory.DosPath; - switch (type = RtlDetermineDosPathNameType_U(name)) + switch (RtlDetermineDosPathNameType_U(name)) { case UNC_PATH: /* \\foo */ ptr = skip_unc_prefix( name );

1 0

Andrew Talbot : oleaut32: Remove unused variables.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: ba742868e50244e300c2c0a5f7d21ce2adcd04bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba742868e50244e300c2c0a5f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 22 22:05:10 2008 +0100 oleaut32: Remove unused variables. --- dlls/oleaut32/typelib.c | 15 +++++++-------- dlls/oleaut32/varformat.c | 2 -- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 123810b..4c710c6 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2024,7 +2024,6 @@ static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs, static void MSFT_DoRefType(TLBContext *pcx, ITypeLibImpl *pTL, int offset) { - int j; TLBRefType *ref; TRACE_(typelib)("TLB context %p, TLB offset %x\n", pcx, offset); @@ -2046,7 +2045,7 @@ static void MSFT_DoRefType(TLBContext *pcx, ITypeLibImpl *pTL, MSFT_ReadLEDWords(&impinfo, sizeof(impinfo), pcx, pcx->pTblDir->pImpInfo.offset + (offset & 0xfffffffc)); - for(j=0;pImpLib;j++){ /* search the known offsets of all import libraries */ + while (pImpLib){ /* search the known offsets of all import libraries */ if(pImpLib->offset==impinfo.oImpFile) break; pImpLib=pImpLib->next; } @@ -3284,7 +3283,7 @@ static void SLTG_ProcessCoClass(char *pBlk, ITypeInfoImpl *pTI, char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, SLTG_TypeInfoTail *pTITail) { - char *pFirstItem, *pNextItem; + char *pFirstItem; sltg_ref_lookup_t *ref_lookup = NULL; if(pTIHeader->href_table != 0xffffffff) { @@ -3292,10 +3291,10 @@ static void SLTG_ProcessCoClass(char *pBlk, ITypeInfoImpl *pTI, pNameTable); } - pFirstItem = pNextItem = pBlk; + pFirstItem = pBlk; if(*(WORD*)pFirstItem == SLTG_IMPL_MAGIC) { - pNextItem = SLTG_DoImpls(pFirstItem, pTI, FALSE, ref_lookup); + SLTG_DoImpls(pFirstItem, pTI, FALSE, ref_lookup); } HeapFree(GetProcessHeap(), 0, ref_lookup); } @@ -3305,7 +3304,7 @@ static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI, char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, const SLTG_TypeInfoTail *pTITail) { - char *pFirstItem, *pNextItem; + char *pFirstItem; sltg_ref_lookup_t *ref_lookup = NULL; if(pTIHeader->href_table != 0xffffffff) { @@ -3313,10 +3312,10 @@ static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI, pNameTable); } - pFirstItem = pNextItem = pBlk; + pFirstItem = pBlk; if(*(WORD*)pFirstItem == SLTG_IMPL_MAGIC) { - pNextItem = SLTG_DoImpls(pFirstItem, pTI, TRUE, ref_lookup); + SLTG_DoImpls(pFirstItem, pTI, TRUE, ref_lookup); } if (pTITail->funcs_off != 0xffff) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 399009c..3b35d38 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -522,7 +522,6 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok, FMT_HEADER *header = (FMT_HEADER*)rgbTok; FMT_STRING_HEADER *str_header = (FMT_STRING_HEADER*)(rgbTok + sizeof(FMT_HEADER)); FMT_NUMBER_HEADER *num_header = (FMT_NUMBER_HEADER*)str_header; - FMT_DATE_HEADER *date_header = (FMT_DATE_HEADER*)str_header; BYTE* pOut = rgbTok + sizeof(FMT_HEADER) + sizeof(FMT_STRING_HEADER); BYTE* pLastHours = NULL; BYTE fmt_number = 0; @@ -591,7 +590,6 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok, header->starts[fmt_number] = pOut - rgbTok; str_header = (FMT_STRING_HEADER*)pOut; num_header = (FMT_NUMBER_HEADER*)pOut; - date_header = (FMT_DATE_HEADER*)pOut; memset(str_header, 0, sizeof(FMT_STRING_HEADER)); pOut += sizeof(FMT_STRING_HEADER); fmt_state = 0;

1 0

Andrew Talbot : msvcrt: Remove unused variable.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: bacd4516d69dff48943caa4d0a1875bc4828719a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bacd4516d69dff48943caa4d0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 22 22:04:43 2008 +0100 msvcrt: Remove unused variable. --- dlls/msvcrt/undname.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 16991eb..93030b2 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -893,7 +893,6 @@ static BOOL handle_data(struct parsed_symbol* sym) struct datatype_t ct; char* name = NULL; BOOL ret = FALSE; - char dt; /* 0 private static * 1 protected static @@ -924,7 +923,7 @@ static BOOL handle_data(struct parsed_symbol* sym) name = get_class_string(sym, 0); - switch (dt = *sym->current++) + switch (*sym->current++) { case '0': case '1': case '2': case '3': case '4': case '5':

1 0

Andrew Talbot : msvfw32: Remove unused variable.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 7b0c084e502238fad7fd2d5654b7a8b5678b3512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0c084e502238fad7fd2d565… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 22 22:04:49 2008 +0100 msvfw32: Remove unused variable. --- dlls/msvfw32/drawdib.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msvfw32/drawdib.c b/dlls/msvfw32/drawdib.c index 137716d..902f0ca 100644 --- a/dlls/msvfw32/drawdib.c +++ b/dlls/msvfw32/drawdib.c @@ -458,7 +458,6 @@ HPALETTE VFWAPI DrawDibGetPalette(HDRAWDIB hdd) UINT VFWAPI DrawDibRealize(HDRAWDIB hdd, HDC hdc, BOOL fBackground) { WINE_HDD *whdd; - HPALETTE oldPal; UINT ret = 0; FIXME("(%p, %p, %d), stub\n", hdd, hdc, fBackground); @@ -475,7 +474,7 @@ UINT VFWAPI DrawDibRealize(HDRAWDIB hdd, HDC hdc, BOOL fBackground) if (!whdd->hpal) whdd->hpal = CreateHalftonePalette(hdc); - oldPal = SelectPalette(hdc, whdd->hpal, fBackground); + SelectPalette(hdc, whdd->hpal, fBackground); ret = RealizePalette(hdc); out:

1 0

Paul Vriens : gdi32/tests: Run tests on win9x again.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 55902e0ce0e80dd3b6c50a7fc85a4f2d28cfb43b URL: http://source.winehq.org/git/wine.git/?a=commit;h=55902e0ce0e80dd3b6c50a7fc… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Apr 22 20:47:29 2008 +0200 gdi32/tests: Run tests on win9x again. --- dlls/gdi32/tests/font.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 803994b..c627521 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -492,7 +492,7 @@ static void test_GetCharABCWidths(void) hfont = SelectObject(hdc, hfont); nb = pGetGlyphIndicesW(hdc, str, 1, glyphs, 0); - ok(nb == 1, "pGetGlyphIndicesW should have returned 1\n"); + ok(nb == 1, "GetGlyphIndicesW should have returned 1\n"); ret = pGetCharABCWidthsI(NULL, 0, 1, glyphs, abc); ok(!ret, "GetCharABCWidthsI should have failed\n"); @@ -602,7 +602,7 @@ static void test_GetGlyphIndices(void) HFONT hOldFont; if (!pGetGlyphIndicesW) { - skip("GetGlyphIndices not available on platform\n"); + skip("GetGlyphIndicesW not available on platform\n"); return; } @@ -611,12 +611,12 @@ static void test_GetGlyphIndices(void) ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n"); flags |= GGI_MARK_NONEXISTING_GLYPHS; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); - ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); - ok((glyphs[4] == 0x001f || glyphs[4] == 0xffff /* Vista */), "GetGlyphIndices should have returned a nonexistent char not %04x\n", glyphs[4]); + ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); + ok((glyphs[4] == 0x001f || glyphs[4] == 0xffff /* Vista */), "GetGlyphIndicesW should have returned a nonexistent char not %04x\n", glyphs[4]); flags = 0; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); - ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); - ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndices should have returned a %04x not %04x\n", + ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); + ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndicesW should have returned a %04x not %04x\n", textm.tmDefaultChar, glyphs[4]); if(!is_font_installed("Tahoma")) @@ -633,14 +633,14 @@ static void test_GetGlyphIndices(void) ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n"); flags |= GGI_MARK_NONEXISTING_GLYPHS; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); - ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); - ok(glyphs[4] == 0xffff, "GetGlyphIndices should have returned 0xffff char not %04x\n", glyphs[4]); + ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); + ok(glyphs[4] == 0xffff, "GetGlyphIndicesW should have returned 0xffff char not %04x\n", glyphs[4]); flags = 0; testtext[0] = textm.tmDefaultChar; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); - ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); - todo_wine ok(glyphs[0] == 0, "GetGlyphIndices for tmDefaultChar should be 0 not %04x\n", glyphs[0]); - ok(glyphs[4] == 0, "GetGlyphIndices should have returned 0 not %04x\n", glyphs[4]); + ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); + todo_wine ok(glyphs[0] == 0, "GetGlyphIndicesW for tmDefaultChar should be 0 not %04x\n", glyphs[0]); + ok(glyphs[4] == 0, "GetGlyphIndicesW should have returned 0 not %04x\n", glyphs[4]); DeleteObject(SelectObject(hdc, hOldFont)); } @@ -1130,7 +1130,7 @@ static BOOL get_glyph_indices(INT charset, UINT code_page, WORD *idx, UINT count SetLastError(0xdeadbeef); ret = pGetGlyphIndicesW(hdc, unicode_buf, count, idx, 0); - ok(ret == count, "GetGlyphIndicesA error %u\n", GetLastError()); + ok(ret == count, "GetGlyphIndicesW error %u\n", GetLastError()); } else { @@ -1513,7 +1513,7 @@ static void test_negative_width(HDC hdc, const LOGFONTA *lf) hfont_prev = SelectObject(hdc, hfont); - ret = GetGlyphIndicesA(hdc, "x", 1, &idx, GGI_MARK_NONEXISTING_GLYPHS); + ret = pGetGlyphIndicesA(hdc, "x", 1, &idx, GGI_MARK_NONEXISTING_GLYPHS); if (ret == GDI_ERROR || idx == 0xffff) { SelectObject(hdc, hfont_prev);

1 0

Joris Huizer : mshtml: Fixed copy/paste mistake.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 1a0bf043bc6cdf37eab345ab266a771498250453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a0bf043bc6cdf37eab345ab2… Author: Joris Huizer <jorishuizer@debian> Date: Tue Apr 22 16:27:32 2008 +0200 mshtml: Fixed copy/paste mistake. --- dlls/mshtml/htmldoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0bb2ebf..425fb39 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1361,7 +1361,7 @@ static ULONG WINAPI DocDispatchEx_Release(IDispatchEx *iface) { HTMLDocument *This = DISPEX_THIS(iface); - return IHTMLWindow2_AddRef(HTMLDOC(This)); + return IHTMLWindow2_Release(HTMLDOC(This)); } static HRESULT WINAPI DocDispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pctinfo)

1 0

Frans Kool : start: Fixed Dutch translations.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 30a00e8dfd605d7e8d6b8d8e4566a3c27ded39a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30a00e8dfd605d7e8d6b8d8e4… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Tue Apr 22 15:44:59 2008 +0200 start: Fixed Dutch translations. --- programs/start/Nl.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/start/Nl.rc b/programs/start/Nl.rc index 14c0355..d6202b3 100644 --- a/programs/start/Nl.rc +++ b/programs/start/Nl.rc @@ -2,6 +2,7 @@ * Start (Dutch resources) * * Copyright 2003 Hans Leidekker + * Copyright 2008 Frans Kool * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,6 +33,7 @@ Options: \n\ /MAX[imized] Start het programma gemaximaliseerd. \n\ /R[estored] Start het programma normaal (noch geminimaliseerd noch gemaximaliseerd). \n\ /W[ait] Wacht totdat het gestarte programma is be�indigd, eindig dan met de exit code van dat programma. \n\ +/Unix Gebruik een Unix bestandsnaam en start het bestand als de windows verkenner. \n\ /L Laat de gebruikerslicentie zien. \n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel \n\ @@ -59,4 +61,6 @@ See the COPYING.LIB file for license information. \n\ " STRING_EXECFAIL "Programma kan niet worden gestart, of er is geen programma verbonden met het opgegeven bestand.\nShellExecuteEx is mislukt" + +STRING_UNIXFAIL "Kon de opgegeven Unix bestandsnaam niet omzetten naar een DOS bestandsnaam." }

1 0

Jeff Latimer : user32/tests: Fix typedefs & function definitions so that the code compiles in visual C++ 2005 .
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 41e757c812e5a2abd22839475451eda63b9e1964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41e757c812e5a2abd22839475… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Apr 22 23:49:42 2008 +1000 user32/tests: Fix typedefs & function definitions so that the code compiles in visual C++ 2005. --- dlls/user32/tests/broadcast.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index 5806ed9..67e767e 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -32,8 +32,8 @@ #include "wine/test.h" -typedef LONG WINAPI (*PBROADCAST)( DWORD,LPDWORD,UINT,WPARAM,LPARAM ); -typedef LONG WINAPI (*PBROADCASTEX)( DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO ); +typedef LONG (WINAPI *PBROADCAST)( DWORD,LPDWORD,UINT,WPARAM,LPARAM ); +typedef LONG (WINAPI *PBROADCASTEX)( DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO ); static PBROADCAST pBroadcastA; static PBROADCAST pBroadcastW; static PBROADCASTEX pBroadcastExA; @@ -249,8 +249,8 @@ static void test_parametersEx(PBROADCASTEX broadcastex) PulseEvent(hevent); } -static BOOL WINAPI (*pOpenProcessToken)(HANDLE, DWORD, HANDLE*); -static BOOL WINAPI (*pAdjustTokenPrivileges)(HANDLE, BOOL, PTOKEN_PRIVILEGES, DWORD, PTOKEN_PRIVILEGES, PDWORD); +static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, HANDLE*); +static BOOL (WINAPI *pAdjustTokenPrivileges)(HANDLE, BOOL, PTOKEN_PRIVILEGES, DWORD, PTOKEN_PRIVILEGES, PDWORD); static void test_noprivileges(void) {

1 0

ByeongSik Jeon : shdoclc: Update Korean translation.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: fcbc9fad96912fe47eb0473500618cca679aff4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcbc9fad96912fe47eb047350… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Tue Apr 22 21:43:56 2008 +0900 shdoclc: Update Korean translation. --- dlls/shdoclc/Ko.rc | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/shdoclc/Ko.rc b/dlls/shdoclc/Ko.rc index dde528b..d038994 100644 --- a/dlls/shdoclc/Ko.rc +++ b/dlls/shdoclc/Ko.rc @@ -18,7 +18,18 @@ */ -LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_MESSAGE_BOX_TITLE, "Wine ��ͳ� Explorer" +} + +STRINGTABLE DISCARDABLE +{ + IDS_PRINT_HEADER_TEMPLATE "&w&bPage &p" /* FIXME: should be "&w&bPage &p of &P" */ + IDS_PRINT_FOOTER_TEMPLATE "&u&b&d" +} IDR_BROWSE_CONTEXT_MENU MENU {

1 0

ByeongSik Jeon : net: Update Korean translation.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 2440834b42f5b2a5462cdfe930b137e548a35f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2440834b42f5b2a5462cdfe93… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Tue Apr 22 21:43:48 2008 +0900 net: Update Korean translation. --- programs/net/Ko.rc | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/programs/net/Ko.rc b/programs/net/Ko.rc index 8d78dde..23055f5 100644 --- a/programs/net/Ko.rc +++ b/programs/net/Ko.rc @@ -20,22 +20,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "�� ɾ�� :\n\nNET [ HELP | START | STOP ]\n" + STRING_USAGE, "�� ɾ�� :\n\nNET [ HELP | START | STOP | USE ]\n" STRING_START_USAGE, "�� .\n" STRING_STOP_USAGE, "�� .\n" - STRING_STOP_DEP, "�� : %s\n" + STRING_STOP_DEP, "��ӵ� �� : %s\n" STRING_CANT_STOP, "%s ��񽺸� �� ϴ�\n" STRING_NO_SCM, "�� ڸ� �ٷ� �� ϴ�.\n" - STRING_NO_SVCHANDLE, "��񽺸� �ٷ� �� ϴ�.\n" + STRING_NO_SVCHANDLE, "�� ڵ�� ϴ�.\n" STRING_START_SVC, "%s ��񽺴� ��.\n" STRING_START_SVC_SUCCESS, " %s �� .\n" STRING_START_SVC_FAIL, "%s �� .\n" STRING_STOP_SVC, "%s �� .\n" STRING_STOP_SVC_SUCCESS, "%s �� .\n" STRING_STOP_SVC_FAIL, "%s �� .\n" - STRING_HELP_USAGE, "��ɾ� ��:\n\nNET HELP ��ɾ� \n -or-\nNET ��ɾ� /HELP\n\n �� ɾ�:\n NET HELP NET START NET STOP\n" + STRING_HELP_USAGE, "��ɾ� ��:\n\nNET HELP ��ɾ� \n -or-\nNET ��ɾ� /HELP\n\n"\ + " �� ɾ�:\n NET HELP NET START NET STOP\n" + STRING_NO_ENTRIES, "��Ʈ�� ֽ��ϴ�.\n" + STRING_USE_HEADER, "\n�� \n---------------------------------------------------------------\n" + STRING_USE_ENTRY, "%s %S %S �� ҽ�: %lu\n" }

1 0

ByeongSik Jeon : reg: Add Korean translation.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 651ec32174887a8c3163951412458ded1ef9052d URL: http://source.winehq.org/git/wine.git/?a=commit;h=651ec32174887a8c316395141… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Tue Apr 22 21:43:33 2008 +0900 reg: Add Korean translation. --- programs/reg/Ko.rc | 30 ++++++++++++++++++++++++++++++ programs/reg/rsrc.rc | 1 + 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/programs/reg/Ko.rc b/programs/reg/Ko.rc new file mode 100644 index 0000000..74d3225 --- /dev/null +++ b/programs/reg/Ko.rc @@ -0,0 +1,30 @@ +/* + * REG.EXE - Wine-compatible reg program. + * Korean language support + * + * Copyright 2008 Andrew Riedi + * + * 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_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "��ɾ� ��:\n\nREG [ ADD | DELETE | QUERY ]\nREG command /?\n" + STRING_ADD_USAGE, "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY key_name [/v value_name | /ve] [/s]\n" +} diff --git a/programs/reg/rsrc.rc b/programs/reg/rsrc.rc index 571993b..3589048 100644 --- a/programs/reg/rsrc.rc +++ b/programs/reg/rsrc.rc @@ -23,6 +23,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "En.rc" +#include "Ko.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc"

1 0

ByeongSik Jeon : start: Update Korean translation.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 4183a1dcaf7b8a95587c0544a0bb716620c4470f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4183a1dcaf7b8a95587c0544a… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Tue Apr 22 21:43:41 2008 +0900 start: Update Korean translation. --- programs/start/Ko.rc | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/start/Ko.rc b/programs/start/Ko.rc index 13b48d0..4b75f45 100644 --- a/programs/start/Ko.rc +++ b/programs/start/Ko.rc @@ -20,9 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE { STRING_USAGE, "Ǯ�׸�� Ű�ų� �� Ͽ� ÷��ؼ� ��Ǵ� Ǯ�׸�� \n\ Usage: \n\ @@ -33,7 +33,8 @@ Options: \n\ /M[inimized] Ǯ�׸� �ּ�ȭ ��·� ��. \n\ /MAX[imized] Ǯ�׸� �ִ�ȭ ��·� ��. \n\ /R[estored] Ǯ�׸�� ·� ��۽�Ű�� (�ּ�ȭ�� ƴϰ� �ִ�ȭ�� ƴ�). \n\ -/W[ait] ��۵� Ǯ�׸�� ٸ�, �� ڵ带 ��. \n\ +/W[ait] ��۵� Ǯ�׸�� ٸ�, �� ڵ带 ��. \n\ +/Unix Use a Unix filename and start the file like windows explorer. \n\ /L �� ̼�� \n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel \n\ @@ -60,5 +61,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. \n\ See the COPYING.LIB file for license information. \n\ " -STRING_EXECFAIL "Ǯ�׸�� ʾҰų�, �� Ͽ��  Ǯ�׸�� Ǿ�� ʽ��ϴ�.\nShellExecuteEx ��" +STRING_EXECFAIL "��α׷�� ų�, �� Ͽ� �� α׷�� ϴ�.\nShellExecuteEx ��" + +STRING_UNIXFAIL "�� Unix ��ϸ�� DOS ��ϸ�� ٲ� �� ϴ�." }

1 0

Erik de Castro Lopo : include: Fix "warning: cast from pointer to integer of different size".
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: fc9f8dac17282f8f56d1d0fcb2209837dfb304be URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc9f8dac17282f8f56d1d0fcb… Author: Erik de Castro Lopo <mle+win(a)mega-nerd.com> Date: Tue Apr 22 22:24:41 2008 +1000 include: Fix "warning: cast from pointer to integer of different size". --- include/wine/list.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/list.h b/include/wine/list.h index b018a1f..b610e5e 100644 --- a/include/wine/list.h +++ b/include/wine/list.h @@ -225,6 +225,6 @@ static inline void list_move_head( struct list *dst, struct list *src ) /* get pointer to object containing list element */ #define LIST_ENTRY(elem, type, field) \ - ((type *)((char *)(elem) - (unsigned int)(&((type *)0)->field))) + ((type *)((char *)(elem) - (unsigned long)(&((type *)0)->field))) #endif /* __WINE_SERVER_LIST_H */

1 0

Alexandre Julliard : localspl: Avoid creating zero-length string values in the registry.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: aa4775ef9458e5988c434a91a5f3aa28f9db3529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4775ef9458e5988c434a91a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 22 17:05:10 2008 +0200 localspl: Avoid creating zero-length string values in the registry. --- dlls/localspl/localspl_main.c | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index 8efb7cb..1b828f0 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -399,6 +399,7 @@ static BOOL WINAPI fpGetPrinterDriverDirectory(LPWSTR pName, LPWSTR pEnvironment */ static BOOL WINAPI myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCopyFlags, BOOL lazy) { + static const WCHAR emptyW[1]; const printenv_t *env; apd_data_t apd; DRIVER_INFO_8W di; @@ -493,14 +494,20 @@ static BOOL WINAPI myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD d apd_copyfile(di.pConfigFile, &apd); /* settings for level 3 */ - RegSetValueExW(hdrv, help_fileW, 0, REG_SZ, (LPBYTE) di.pHelpFile, - di.pHelpFile ? (lstrlenW(di.pHelpFile)+1)* sizeof(WCHAR) : 0); + if (di.pHelpFile) + RegSetValueExW(hdrv, help_fileW, 0, REG_SZ, (LPBYTE) di.pHelpFile, + (lstrlenW(di.pHelpFile)+1)* sizeof(WCHAR)); + else + RegSetValueExW(hdrv, help_fileW, 0, REG_SZ, (LPBYTE)emptyW, sizeof(emptyW)); apd_copyfile(di.pHelpFile, &apd); ptr = di.pDependentFiles; - RegSetValueExW(hdrv, dependent_filesW, 0, REG_MULTI_SZ, (LPBYTE) di.pDependentFiles, - di.pDependentFiles ? multi_sz_lenW(di.pDependentFiles) : 0); + if (ptr) + RegSetValueExW(hdrv, dependent_filesW, 0, REG_MULTI_SZ, (LPBYTE) di.pDependentFiles, + multi_sz_lenW(di.pDependentFiles)); + else + RegSetValueExW(hdrv, dependent_filesW, 0, REG_MULTI_SZ, (LPBYTE)emptyW, sizeof(emptyW)); while ((ptr != NULL) && (ptr[0])) { if (apd_copyfile(ptr, &apd)) { ptr += lstrlenW(ptr) + 1; @@ -512,15 +519,24 @@ static BOOL WINAPI myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD d } } /* The language-Monitor was already copied by the caller to "%SystemRoot%\system32" */ - RegSetValueExW(hdrv, monitorW, 0, REG_SZ, (LPBYTE) di.pMonitorName, - di.pMonitorName ? (lstrlenW(di.pMonitorName)+1)* sizeof(WCHAR) : 0); + if (di.pMonitorName) + RegSetValueExW(hdrv, monitorW, 0, REG_SZ, (LPBYTE) di.pMonitorName, + (lstrlenW(di.pMonitorName)+1)* sizeof(WCHAR)); + else + RegSetValueExW(hdrv, monitorW, 0, REG_SZ, (LPBYTE)emptyW, sizeof(emptyW)); - RegSetValueExW(hdrv, datatypeW, 0, REG_SZ, (LPBYTE) di.pDefaultDataType, - di.pDefaultDataType ? (lstrlenW(di.pDefaultDataType)+1)* sizeof(WCHAR) : 0); + if (di.pDefaultDataType) + RegSetValueExW(hdrv, datatypeW, 0, REG_SZ, (LPBYTE) di.pDefaultDataType, + (lstrlenW(di.pDefaultDataType)+1)* sizeof(WCHAR)); + else + RegSetValueExW(hdrv, datatypeW, 0, REG_SZ, (LPBYTE)emptyW, sizeof(emptyW)); /* settings for level 4 */ - RegSetValueExW(hdrv, previous_namesW, 0, REG_MULTI_SZ, (LPBYTE) di.pszzPreviousNames, - di.pszzPreviousNames ? multi_sz_lenW(di.pszzPreviousNames) : 0); + if (di.pszzPreviousNames) + RegSetValueExW(hdrv, previous_namesW, 0, REG_MULTI_SZ, (LPBYTE) di.pszzPreviousNames, + multi_sz_lenW(di.pszzPreviousNames)); + else + RegSetValueExW(hdrv, previous_namesW, 0, REG_MULTI_SZ, (LPBYTE)emptyW, sizeof(emptyW)); if (level > 5) TRACE("level %u for Driver %s is incomplete\n", level, debugstr_w(di.pName));

1 0

Alexandre Julliard : msi: Avoid creating zero-length string values in the registry.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 06bf8ea291576ab03be01f11bb0c7466336ff1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=06bf8ea291576ab03be01f11b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 22 17:05:05 2008 +0200 msi: Avoid creating zero-length string values in the registry. --- dlls/msi/action.c | 6 ++++-- dlls/msi/registry.c | 7 +++++-- dlls/msi/source.c | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 11a4ad7..44fae9d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2426,7 +2426,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) { static const WCHAR szEmpty[] = {0}; value_data = (LPSTR)strdupW(szEmpty); - size = 0; + size = sizeof(szEmpty); type = REG_SZ; } @@ -3772,8 +3772,10 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) size = strlenW(feature->Feature_Parent)*sizeof(WCHAR); if (!absent) { + static const WCHAR emptyW[] = {0}; + size += sizeof(WCHAR); RegSetValueExW(hukey,feature->Feature,0,REG_SZ, - (LPBYTE)feature->Feature_Parent,size); + (LPBYTE)(feature->Feature_Parent ? feature->Feature_Parent : emptyW),size); } else { diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 74f84f7..b95d5bb 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -381,7 +381,7 @@ DWORD msi_version_str_to_dword(LPCWSTR p) LPWSTR msi_version_dword_to_str(DWORD version) { - const WCHAR fmt[] = { '%','u','.','%','u','.','%','u',0 }; + static const WCHAR fmt[] = { '%','u','.','%','u','.','%','u',0 }; LPWSTR str = msi_alloc(20); sprintfW(str, fmt, (version&0xff000000)>>24, @@ -392,7 +392,10 @@ LPWSTR msi_version_dword_to_str(DWORD version) LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ) { - DWORD len = value ? (lstrlenW(value) + 1) * sizeof (WCHAR) : 0; + static const WCHAR emptyW[] = {0}; + DWORD len; + if (!value) value = emptyW; + len = (lstrlenW(value) + 1) * sizeof (WCHAR); return RegSetValueExW( hkey, name, 0, REG_SZ, (const BYTE *)value, len ); } diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 0f9e087..4c38116 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -822,7 +822,7 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, } else if (strcmpW(INSTALLPROPERTY_PACKAGENAMEW, szProperty)==0) { - DWORD size = lstrlenW(szValue)*sizeof(WCHAR); + DWORD size = (lstrlenW(szValue) + 1) * sizeof(WCHAR); rc = RegSetValueExW(sourcekey, INSTALLPROPERTY_PACKAGENAMEW, 0, REG_SZ, (const BYTE *)szValue, size); if (rc != ERROR_SUCCESS)

1 0

Alexandre Julliard : winex11: Moved the ConfigureNotify handler to event.c.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 31ed6473bef708a66e29627d523140b10a3d056a URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ed6473bef708a66e29627d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 22 16:56:31 2008 +0200 winex11: Moved the ConfigureNotify handler to event.c. --- dlls/winex11.drv/event.c | 64 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/winpos.c | 63 -------------------------------------------- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index adbf585..2cb8cc8 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -77,6 +77,7 @@ static void X11DRV_FocusIn( HWND hwnd, XEvent *event ); static void X11DRV_FocusOut( HWND hwnd, XEvent *event ); static void X11DRV_Expose( HWND hwnd, XEvent *event ); static void X11DRV_MapNotify( HWND hwnd, XEvent *event ); +static void X11DRV_ConfigureNotify( HWND hwnd, XEvent *event ); static void X11DRV_PropertyNotify( HWND hwnd, XEvent *event ); static void X11DRV_ClientMessage( HWND hwnd, XEvent *event ); @@ -731,6 +732,69 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) /*********************************************************************** + * X11DRV_ConfigureNotify + */ +void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) +{ + XConfigureEvent *event = &xev->xconfigure; + struct x11drv_win_data *data; + RECT rect; + UINT flags; + int cx, cy, x = event->x, y = event->y; + + if (!hwnd) return; + if (!(data = X11DRV_get_win_data( hwnd ))) return; + if (!data->mapped || data->iconic) return; + + /* Get geometry */ + + if (!event->send_event) /* normal event, need to map coordinates to the root */ + { + Window child; + wine_tsx11_lock(); + XTranslateCoordinates( event->display, data->whole_window, root_window, + 0, 0, &x, &y, &child ); + wine_tsx11_unlock(); + } + rect.left = x; + rect.top = y; + rect.right = x + event->width; + rect.bottom = y + event->height; + OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); + TRACE( "win %p new X rect %d,%d,%dx%d (event %d,%d,%dx%d)\n", + hwnd, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, + event->x, event->y, event->width, event->height ); + X11DRV_X_to_window_rect( data, &rect ); + + x = rect.left; + y = rect.top; + cx = rect.right - rect.left; + cy = rect.bottom - rect.top; + flags = SWP_NOACTIVATE | SWP_NOZORDER; + + /* Compare what has changed */ + + GetWindowRect( hwnd, &rect ); + if (rect.left == x && rect.top == y) flags |= SWP_NOMOVE; + else + TRACE( "%p moving from (%d,%d) to (%d,%d)\n", + hwnd, rect.left, rect.top, x, y ); + + if ((rect.right - rect.left == cx && rect.bottom - rect.top == cy) || + (IsRectEmpty( &rect ) && event->width == 1 && event->height == 1)) + { + if (flags & SWP_NOMOVE) return; /* if nothing changed, don't do anything */ + flags |= SWP_NOSIZE; + } + else + TRACE( "%p resizing from (%dx%d) to (%dx%d)\n", + hwnd, rect.right - rect.left, rect.bottom - rect.top, cx, cy ); + + SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); +} + + +/*********************************************************************** * get_window_wm_state */ int get_window_wm_state( Display *display, struct x11drv_win_data *data ) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 2f7ab13..5348ec6 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -534,66 +534,3 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) EnumWindows( update_windows_on_desktop_resize, (LPARAM)&resize_data ); } - - -/*********************************************************************** - * X11DRV_ConfigureNotify - */ -void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) -{ - XConfigureEvent *event = &xev->xconfigure; - struct x11drv_win_data *data; - RECT rect; - UINT flags; - int cx, cy, x = event->x, y = event->y; - - if (!hwnd) return; - if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->mapped || data->iconic) return; - - /* Get geometry */ - - if (!event->send_event) /* normal event, need to map coordinates to the root */ - { - Window child; - wine_tsx11_lock(); - XTranslateCoordinates( event->display, data->whole_window, root_window, - 0, 0, &x, &y, &child ); - wine_tsx11_unlock(); - } - rect.left = x; - rect.top = y; - rect.right = x + event->width; - rect.bottom = y + event->height; - OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); - TRACE( "win %p new X rect %d,%d,%dx%d (event %d,%d,%dx%d)\n", - hwnd, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, - event->x, event->y, event->width, event->height ); - X11DRV_X_to_window_rect( data, &rect ); - - x = rect.left; - y = rect.top; - cx = rect.right - rect.left; - cy = rect.bottom - rect.top; - flags = SWP_NOACTIVATE | SWP_NOZORDER; - - /* Compare what has changed */ - - GetWindowRect( hwnd, &rect ); - if (rect.left == x && rect.top == y) flags |= SWP_NOMOVE; - else - TRACE( "%p moving from (%d,%d) to (%d,%d)\n", - hwnd, rect.left, rect.top, x, y ); - - if ((rect.right - rect.left == cx && rect.bottom - rect.top == cy) || - (IsRectEmpty( &rect ) && event->width == 1 && event->height == 1)) - { - if (flags & SWP_NOMOVE) return; /* if nothing changed, don't do anything */ - flags |= SWP_NOSIZE; - } - else - TRACE( "%p resizing from (%dx%d) to (%dx%d)\n", - hwnd, rect.right - rect.left, rect.bottom - rect.top, cx, cy ); - - SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); -} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 450153b..287acbb 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -643,7 +643,6 @@ extern void X11DRV_EnterNotify( HWND hwnd, XEvent *event ); extern void X11DRV_KeyEvent( HWND hwnd, XEvent *event ); extern void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ); extern void X11DRV_DestroyNotify( HWND hwnd, XEvent *event ); -extern void X11DRV_ConfigureNotify( HWND hwnd, XEvent *event ); extern void X11DRV_SelectionRequest( HWND hWnd, XEvent *event ); extern void X11DRV_SelectionClear( HWND hWnd, XEvent *event ); extern void X11DRV_MappingNotify( HWND hWnd, XEvent *event );

1 0

Scott Ritchie : Update download and download-deb for Ubuntu Hardy
by Jeremy Newman 22 Apr '08

22 Apr '08

Module: website Branch: master Commit: 31cb52b1f9b0f3897443fc14a6396b42265bb0f2 URL: http://source.winehq.org/git/website.git/?a=commit;h=31cb52b1f9b0f3897443fc… Author: Scott Ritchie <scott(a)open-vote.org> Date: Tue Apr 22 03:53:44 2008 -0700 Update download and download-deb for Ubuntu Hardy Update download and download-deb pages for Ubuntu Hardy; simplify instructions and remove old versions of Ubuntu not receiving updates. Thanks, Scott Ritchie >From 180d0dd65c9352a157ddad6a5343cf21a405ec3b Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)scott-desktop.(none)> Date: Tue, 22 Apr 2008 03:49:09 -0700 Subject: Update download and download-deb page for Ubuntu Hardy; simplify instructions. --- templates/en/download-deb.template | 49 ++++++++++++++---------------------- templates/en/download.template | 2 +- 2 files changed, 20 insertions(+), 31 deletions(-) diff --git a/templates/en/download-deb.template b/templates/en/download-deb.template index 2cf6894..0e117c9 100644 --- a/templates/en/download-deb.template +++ b/templates/en/download-deb.template @@ -4,55 +4,44 @@ Wine for Ubuntu, Debian, and Debian-based distributions <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></h1> -Debian and Debian-based distributions, such as Ubuntu, utilize a special tool +Debian and Debian-based distributions such as Ubuntu utilize a special tool for managing packages known as APT. APT is able to automagically install all of the needed dependencies for a software package, as well as keep the package up to date, by scanning what are known as APT repositories. Debian-based -distributions have their own repositories of software, many of which include -Wine, however we keep our own repository of the latest available packages here -for download. +distributions have their own repositories of software that include Wine, +however we keep our own repository of the latest available packages here for +download. -There used to be graphical instructions here, however we have found that the terminal commands are actually simpler to -describe and quicker for the user to input. Because the commands below use sudo, you may have to enter your user +There used to be graphical instructions here, however we have found that the +terminal commands are actually simpler to describe and quicker for the user to +input. Because the commands below use sudo, you may have to enter your user password after hitting enter. <h2>Adding the WineHQ APT Repository:</h2> -First, open a terminal window. Then add the repository's key to your system's -list of trusted APT keys by copy and pasting the following: +First, open a terminal window (Applications->Accessories->Terminal). Then +add the repository's key to your system's list of trusted APT keys by copy and +pasting the following: wget -q http://wine.budgetdedicated.com/apt/387EE263.gpg -O- | sudo apt-key add - Next, add the repository to your system's list of APT sources: -For Ubuntu Gutsy (7.10): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/gutsy.list -O /etc/apt/sources.list.d/winehq.list -For Ubuntu Feisty (7.04): -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/feisty.list -O /etc/apt/sources.list.d/winehq.list -For Ubuntu Edgy (6.10): *64-bit packages not available* -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/edgy.list -O /etc/apt/sources.list.d/winehq.list -For Ubuntu Dapper (6.06): *64-bit packages not available* -sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/dapper.list -O /etc/apt/sources.list.d/winehq.list +For Ubuntu Hardy (8.04): +sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/hardy.list -O /etc/apt/sources.list.d/winehq.list For Debian Etch (4.0): sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/etch.list -O /etc/apt/sources.list.d/winehq.list -Then, you can install Wine from WineHQ like it were any other package, such as by -using the Synaptic Package Manager under System->Administration. Alternatively, you -can install from the terminal by running 'sudo apt-get update' to update APT's -package information and then 'sudo apt-get install wine'. +Then, you can install Wine by <a href="apt://wine">clicking this link</a>. +Alternatively, you can install by going to Applications->Add/Remove and +searching for Wine. <h2>Upgrading to a new version of Ubuntu</h2> -If you are upgrading the entire system, such as going from Ubuntu 7.04 to 7.10, you will need to -come back to this page and enter the command for the new version above. The built in update manager -will not switch the Wine repository automatically. - -<h2>64-bit Users:</h2> - -If you are using a very old version of Ubuntu where 64 bit packages are not available -and would still like a working Wine package, there is a relatively easy hack that can be -used to install the 32-bit package and have it function normally. See -<a href="http://wiki.winehq.org/UbuntuAMD64">this page on the Wine wiki</a> for more details. +If you are upgrading the entire system, such as going from Ubuntu 7.10 to +8.04, you will need to come back to this page and enter the command for the new +version above. The built in update manager will not switch the Wine repository +automatically. <h2>Older .deb packages</h2> diff --git a/templates/en/download.template b/templates/en/download.template index 8f7dd71..d0bbd9a 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -69,7 +69,7 @@ for post-installation instructions. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/site/download-deb">Ubuntu</a> - binary and source .debs for Ubuntu Gutsy (7.10), Feisty (7.04), Edgy (6.10), and Dapper (6.06) + binary and source .debs for Ubuntu Hardy (8.04) <td><a href="mailto:scott@open-vote.org">Scott Ritchie</a></td> </tr>

1 0

Dan Kegel : update LGPL url, specify version
by Jeremy Newman 22 Apr '08

22 Apr '08

Module: website Branch: master Commit: 48c9171c52a21a5d09248098baa007343658b2ed URL: http://source.winehq.org/git/website.git/?a=commit;h=48c9171c52a21a5d092480… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Apr 19 08:58:10 2008 -0700 update LGPL url, specify version Somebody on wine-users asked us to clarify this, so: --- templates/en/home_about.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/en/home_about.template b/templates/en/home_about.template index aed434a..8af3209 100644 --- a/templates/en/home_about.template +++ b/templates/en/home_about.template @@ -26,5 +26,5 @@ at the <a href="{$root}/site/docs/wineusr-guide/index">User Guide</a>. Wine is free software. The <a href="http://www.winehq.org/site/license"> -licensing terms</a> are the <a href="http://www.gnu.org/copyleft/lesser.html"> -GNU Lesser General Public License</a>. +licensing terms</a> are the <a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"> +GNU Lesser General Public License version 2.1</a>.

1 0

Rob Shearman : widl: Remove duplicated code in the form of the write_struct_expr function by enhancing write_expr to allow toplevel identifiers to be prefixed by a string , if specified.
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: 1a0d28bf0225ac9a6f3ef4d85d3586d35d1e8699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a0d28bf0225ac9a6f3ef4d85… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 22 11:37:07 2008 +0100 widl: Remove duplicated code in the form of the write_struct_expr function by enhancing write_expr to allow toplevel identifiers to be prefixed by a string, if specified. --- tools/widl/expr.c | 114 ++++++++++++++++++++------------- tools/widl/expr.h | 2 +- tools/widl/header.c | 4 +- tools/widl/proxy.c | 4 +- tools/widl/typegen.c | 172 +++---------------------------------------------- 5 files changed, 84 insertions(+), 212 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a0d28bf0225ac9a6f3ef…

1 0

Rob Shearman : widl: Use expr_resolve_type to get the type of the identifier in write_conf_or_var_desc .
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: 39a1fa672a6ca33505af8ef6db6d3e63414b06c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a1fa672a6ca33505af8ef6d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 22 11:36:54 2008 +0100 widl: Use expr_resolve_type to get the type of the identifier in write_conf_or_var_desc. Remove the conversion of pointer types into base types as this was only needed due to lack of proper type resolving. --- tools/widl/typegen.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 8a4b8f5..7a5f6f9 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -655,6 +655,8 @@ static size_t write_conf_or_var_desc(FILE *file, const type_t *structure, error("write_conf_or_var_desc: couldn't find variable %s in structure\n", subexpr->u.sval); + correlation_variable = expr_resolve_type(NULL, structure, expr); + offset -= baseoff; correlation_variable_type = correlation_variable->type; @@ -683,15 +685,6 @@ static size_t write_conf_or_var_desc(FILE *file, const type_t *structure, case RPC_FC_ULONG: param_type = RPC_FC_ULONG; break; - case RPC_FC_RP: - case RPC_FC_UP: - case RPC_FC_OP: - case RPC_FC_FP: - if (sizeof(void *) == 4) /* FIXME */ - param_type = RPC_FC_LONG; - else - param_type = RPC_FC_HYPER; - break; default: error("write_conf_or_var_desc: conformance variable type not supported 0x%x\n", correlation_variable_type);

1 0

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