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

Maarten Lankhorst : quartz: Make FilterGraph_Connect and ConnectDirect behave better.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: 0d1eea691cd4e39a61fa5be5b5c5592ea7c0aa76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d1eea691cd4e39a61fa5be5b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jun 26 11:13:53 2008 -0700 quartz: Make FilterGraph_Connect and ConnectDirect behave better. Does some security checks that it won't connect a filter to itself, and also cleans up after a failed connection attempt. --- dlls/quartz/filtergraph.c | 183 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 156 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d1eea691cd4e39a61fa5…

1 0

Dan Hipschman : user32: Redefine internal pop-up tracking flags to avoid conflicts.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: 50b98a29466fdebca3a550e40fe5b8e9c26ec8a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50b98a29466fdebca3a550e40… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Jun 26 16:18:05 2008 -0700 user32: Redefine internal pop-up tracking flags to avoid conflicts. These internal flags conflict with the Win32 API flags TPM_RECURSE, TPM_RIGHTBUTTON, and TPM_CENTERALIGN respectively, which are all stored in the same flag UINT. --- dlls/user32/menu.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 88eb72f..b4c1955 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -116,9 +116,9 @@ typedef struct { /* internal flags for menu tracking */ -#define TF_ENDMENU 0x0001 -#define TF_SUSPENDPOPUP 0x0002 -#define TF_SKIPREMOVE 0x0004 +#define TF_ENDMENU 0x10000 +#define TF_SUSPENDPOPUP 0x20000 +#define TF_SKIPREMOVE 0x40000 typedef struct {

1 0

Maarten Lankhorst : quartz: Make removing filters work slightly better.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: 46f4c4b4d8d440500980f8ad46f4fee5886590c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46f4c4b4d8d440500980f8ad4… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jun 26 10:59:10 2008 -0700 quartz: Make removing filters work slightly better. --- dlls/quartz/filtergraph.c | 35 +++++++++++++++++++++++++---------- 1 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 6ceb125..62cdff3 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -279,22 +279,24 @@ static ULONG WINAPI FilterGraphInner_AddRef(IUnknown * iface) { return ref; } -static ULONG WINAPI FilterGraphInner_Release(IUnknown * iface) { +static ULONG WINAPI FilterGraphInner_Release(IUnknown * iface) +{ ICOM_THIS_MULTI(IFilterGraphImpl, IInner_vtbl, iface); ULONG ref = InterlockedDecrement(&This->ref); - + TRACE("(%p)->(): new ref = %d\n", This, ref); - + if (ref == 0) { int i; IMediaControl_Stop((IMediaControl*)&(This->IMediaControl_vtbl)); - if (This->refClock) - IReferenceClock_Release(This->refClock); while (This->nFilters) IFilterGraph2_RemoveFilter((IFilterGraph2*)This, This->ppFiltersInGraph[0]); + if (This->refClock) + IReferenceClock_Release(This->refClock); + for (i = 0; i < This->nItfCacheEntries; i++) { if (This->ItfCacheEntries[i].iface) @@ -439,8 +441,8 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, return hr; } -static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, - IBaseFilter *pFilter) { +static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilter *pFilter) +{ ICOM_THIS_MULTI(IFilterGraphImpl, IFilterGraph2_vtbl, iface); int i; HRESULT hr = E_FAIL; @@ -453,12 +455,21 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, { if (This->ppFiltersInGraph[i] == pFilter) { - IEnumPins *penumpins; - IBaseFilter_Stop(pFilter); + IEnumPins *penumpins = NULL; + FILTER_STATE state; + + TRACE("Removing filter %s\n", debugstr_w(This->pFilterNames[i])); + IBaseFilter_GetState(pFilter, 0, &state); + if (state == State_Running) + IBaseFilter_Pause(pFilter); + if (state != State_Stopped) + IBaseFilter_Stop(pFilter); + hr = IBaseFilter_EnumPins(pFilter, &penumpins); if (SUCCEEDED(hr)) { IPin *ppin; - while(IEnumPins_Next(penumpins, 1, &ppin, NULL) == S_OK) { + while(IEnumPins_Next(penumpins, 1, &ppin, NULL) == S_OK) + { IPin *victim = NULL; HRESULT h; IPin_ConnectedTo(ppin, &victim); @@ -470,6 +481,10 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, { PIN_INFO pinfo; IPin_QueryPinInfo(victim, &pinfo); + + IBaseFilter_GetState(pinfo.pFilter, 0, &state); + if (state == State_Running) + IBaseFilter_Pause(pinfo.pFilter); IBaseFilter_Stop(pinfo.pFilter); IBaseFilter_Release(pinfo.pFilter); h = IPin_Disconnect(victim);

1 0

H. Verbeet : wined3d: Report WINED3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: ad59eaf99844849dac16d79b130631805920db1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad59eaf99844849dac16d79b1… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Jun 27 00:52:07 2008 +0200 wined3d: Report WINED3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING. As far as I can tell we support post ps blending in combination with MRTs fine. Tabula Rasa needs this cap in order to enable some of the higher graphics settings. --- dlls/wined3d/directx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e293d7d..acb147e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2952,13 +2952,13 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINED3DPMISCCAPS_CLIPTLVERTS | WINED3DPMISCCAPS_CLIPPLANESCALEDPOINTS | WINED3DPMISCCAPS_MASKZ | - WINED3DPMISCCAPS_BLENDOP; + WINED3DPMISCCAPS_BLENDOP | + WINED3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING; /* TODO: WINED3DPMISCCAPS_NULLREFERENCE WINED3DPMISCCAPS_INDEPENDENTWRITEMASKS WINED3DPMISCCAPS_FOGANDSPECULARALPHA WINED3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS - WINED3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING WINED3DPMISCCAPS_FOGVERTEXCLAMPED */ if(GL_SUPPORT(EXT_BLEND_EQUATION_SEPARATE) && GL_SUPPORT(EXT_BLEND_FUNC_SEPARATE))

1 0

H. Verbeet : wined3d: Delete depth_blt_texture on IWineD3DDeviceImpl_Uninit3D().
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: 90b7efe2c4e4b5a2ae7b676f3ba89dcaec6756df URL: http://source.winehq.org/git/wine.git/?a=commit;h=90b7efe2c4e4b5a2ae7b676f3… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Jun 27 00:52:13 2008 +0200 wined3d: Delete depth_blt_texture on IWineD3DDeviceImpl_Uninit3D(). --- dlls/wined3d/device.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 67d27e6..f7301d7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2285,6 +2285,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_D /* Destroy the depth blt resources, they will be invalid after the reset. Also free shader * private data, it might contain opengl pointers */ + if(This->depth_blt_texture) { + glDeleteTextures(1, &This->depth_blt_texture); + This->depth_blt_texture = 0; + } This->shader_backend->shader_destroy_depth_blt(iface); This->shader_backend->shader_free_private(iface);

1 0

Dylan Smith : richedit: Ensure caret is seen if moved past end of view over trailing spaces.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: fad2b57cd75578438223ed69133eb06320532498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad2b57cd75578438223ed691… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jun 26 16:17:41 2008 -0400 richedit: Ensure caret is seen if moved past end of view over trailing spaces. --- dlls/riched20/caret.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index a3a3d61..462b98a 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -236,6 +236,10 @@ ME_MoveCaret(ME_TextEditor *editor) ME_GetCursorCoordinates(editor, &editor->pCursors[0], &x, &y, &height); if(editor->bHaveFocus) { + RECT rect; + + GetClientRect(editor->hWnd, &rect); + x = min(x, rect.right-2); CreateCaret(editor->hWnd, NULL, 0, height); SetCaretPos(x, y); }

1 0

Dylan Smith : riched32: Added class style to process double click events.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: add180dde0201d09b64a9d5a6c878ba0a2bb756e URL: http://source.winehq.org/git/wine.git/?a=commit;h=add180dde0201d09b64a9d5a6… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jun 26 16:17:38 2008 -0400 riched32: Added class style to process double click events. --- dlls/riched32/richedit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched32/richedit.c b/dlls/riched32/richedit.c index d13de2f..2640f8d 100644 --- a/dlls/riched32/richedit.c +++ b/dlls/riched32/richedit.c @@ -56,7 +56,7 @@ static BOOL RICHED32_Register(void) WNDCLASSA wndClass; ZeroMemory(&wndClass, sizeof(WNDCLASSA)); - wndClass.style = CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; + wndClass.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; wndClass.lpfnWndProc = RichEdit10ANSIWndProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = 4;

1 0

Dylan Smith : richedit: Caret size must match font size characters to be inserted.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: 438d8e1c58d03ee0e3804b3f6cc427ac2a2e3baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=438d8e1c58d03ee0e3804b3f6… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jun 26 16:17:32 2008 -0400 richedit: Caret size must match font size characters to be inserted. When the caret is at the start of a run, it uses the font of the previous run for inserting characters. The caret size previously was the wrong height for the characters being inserted when the caret was at the start of a line, but not the start of a paragraph so this patch fixes this bug. --- dlls/riched20/caret.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 9f012be..a3a3d61 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -181,9 +181,9 @@ ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, ME_InitContext(&c, editor, hDC); - if (!pCursor->nOffset && !editor->bCaretAtEnd) + if (!pCursor->nOffset) { - ME_DisplayItem *prev = ME_FindItemBack(pCursorRun, diRunOrStartRow); + ME_DisplayItem *prev = ME_FindItemBack(pCursorRun, diRunOrParagraph); assert(prev); if (prev->type == diRun) pSizeRun = prev; @@ -215,8 +215,7 @@ ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, *height = pSizeRun->member.run.nAscent + pSizeRun->member.run.nDescent; *x = run->member.run.pt.x + sz.cx; - *y = para->member.para.nYPos + row->member.row.nBaseline + pSizeRun->member.run.pt.y - pSizeRun->member.run.nAscent - ME_GetYScrollPos(editor); - + *y = para->member.para.nYPos + row->member.row.nBaseline + run->member.run.pt.y - pSizeRun->member.run.nAscent - ME_GetYScrollPos(editor); ME_DestroyContext(&c, editor->hWnd); return; }

1 0

Dylan Smith : richedit: Removed redundant code for getting the insert style .
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: 461830a83d46f1867a6097e1498eaf10ce0a2680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=461830a83d46f1867a6097e14… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jun 26 16:17:17 2008 -0400 richedit: Removed redundant code for getting the insert style. The function ME_GetInsertStyle already checks for the case where there is a selection, so there is no need to duplicate this code for ME_GetSelectionInsertStyle. --- dlls/riched20/caret.c | 14 +------------- 1 files changed, 1 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index dcaab0c..9f012be 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1291,19 +1291,7 @@ void ME_DeleteSelection(ME_TextEditor *editor) ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor) { - ME_Style *style; - int from, to; - - ME_GetSelection(editor, &from, &to); - if (from != to) { - ME_Cursor c; - ME_CursorFromCharOfs(editor, from, &c); - style = c.pRun->member.run.style; - ME_AddRefStyle(style); /* ME_GetInsertStyle has already done that */ - } - else - style = ME_GetInsertStyle(editor, 0); - return style; + return ME_GetInsertStyle(editor, 0); } void ME_SendSelChange(ME_TextEditor *editor)

1 0

Dylan Smith : richedit: Set error codes and stop parsing for some rtf syntax errors.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: 632015dc626f85a61165eab89c976c0fef730a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=632015dc626f85a61165eab89… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jun 26 16:17:25 2008 -0400 richedit: Set error codes and stop parsing for some rtf syntax errors. Checks were added for hexadecimal values that did not have valid characters, and for EOF received before the final closing brace of the rich text stream. The error values were tested on richedit versions 1, 2, 3 & 4.1, and they were all the same for these cases. --- dlls/riched20/editor.c | 7 +++++-- dlls/riched20/reader.c | 8 +++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index f7e20e0..28850f9 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -969,11 +969,11 @@ static void ME_RTFReadHook(RTF_Info *info) { { ME_Style *s; RTFFlushOutputBuffer(info); - if (info->stackTop<=1) { + info->stackTop--; + if (info->stackTop<=0) { info->rtfClass = rtfEOF; return; } - info->stackTop--; assert(info->stackTop >= 0); if (info->styleChanged) { @@ -1101,6 +1101,9 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if (parser.lpRichEditOle) IRichEditOle_Release(parser.lpRichEditOle); + if (!inStream.editstream->dwError && parser.stackTop > 0) + inStream.editstream->dwError = HRESULT_FROM_WIN32(ERROR_HANDLE_EOF); + /* Remove last line break, as mandated by tests. This is not affected by CR/LF counters, since RTF streaming presents only \para tokens, which are converted according to the standard rules: \r for 2.0, \r\n for 1.0 diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 5ee9fa2..760adec 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -638,14 +638,16 @@ static void _RTFGetToken2(RTF_Info *info) { int c2; - if ((c = GetChar (info)) != EOF && (c2 = GetChar (info)) != EOF) + if ((c = GetChar (info)) != EOF && (c2 = GetChar (info)) != EOF + && isxdigit(c) && isxdigit(c2)) { - /* should do isxdigit check! */ info->rtfClass = rtfText; info->rtfMajor = RTFCharToHex (c) * 16 + RTFCharToHex (c2); return; } - /* early eof, whoops (class is rtfUnknown) */ + /* early eof, whoops */ + info->rtfClass = rtfEOF; + info->stream->editstream->dwError = -14; return; }

1 0