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

Dylan Smith : richedit: Fixed regression that caused endless loop.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: e86a1d623af8daf6c4807198cd53530403454fcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e86a1d623af8daf6c4807198c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 17 11:55:19 2008 -0400 richedit: Fixed regression that caused endless loop. --- dlls/riched20/wrap.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 90dca83..5fe2209 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -338,7 +338,12 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) /* TAB: we can split before */ if (run->nFlags & MERF_TAB) { wc->bOverflown = TRUE; - return p; + if (wc->pRowStart == p) + /* Don't split before the start of the run, or we will get an + * endless loop. */ + return p->next; + else + return p; } /* graphics: we can split before, if run's width is smaller than row's width */ if ((run->nFlags & MERF_GRAPHICS) && run->nWidth <= wc->nAvailWidth) {

1 0

James Hawkins : kernel32: Don' t get the profile string if the buffer length is zero.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: 978a9317812d8e25d125427ee0cd6e531621fe29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=978a9317812d8e25d125427ee… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Jul 17 12:27:14 2008 -0500 kernel32: Don't get the profile string if the buffer length is zero. --- dlls/kernel32/profile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 8209a2a..74622ad 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -957,7 +957,7 @@ static INT PROFILE_GetString( LPCWSTR section, LPCWSTR key_name, PROFILEKEY *key = NULL; static const WCHAR empty_strW[] = { 0 }; - if(!buffer) return 0; + if(!buffer || !len) return 0; if (!def_val) def_val = empty_strW; if (key_name)

1 0

Mathias Kosch : winex11: Fix typo in X11DRV_SetDIBits optimization.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: f296f27e96d71d713f6a13eb1b7dfb5f5c5deab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f296f27e96d71d713f6a13eb1… Author: Mathias Kosch <info(a)mkosch.de> Date: Thu Jul 17 22:17:13 2008 +0200 winex11: Fix typo in X11DRV_SetDIBits optimization. --- dlls/winex11.drv/dib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index b816601..6fddb0a 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -3998,7 +3998,7 @@ INT X11DRV_SetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, TRACE("syncing compatible set bits to app bits\n"); if ((tmpheight < 0) ^ (bitmap.bmHeight < 0)) { - dbits = (LPBYTE)bits + (dstwidthb * (lines-1)); + dbits += dstwidthb * (lines-1); dstwidthb = -dstwidthb; } X11DRV_DIB_DoProtectDIBSection( physBitmap, PAGE_READWRITE );

1 0

Alexandre Julliard : dbghelp: Always initialize section pointer in ImageDirectoryEntryToDataEx.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: 97429b32f80773f0b77d4a0d273ba520defa3f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=97429b32f80773f0b77d4a0d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 18 11:16:02 2008 +0200 dbghelp: Always initialize section pointer in ImageDirectoryEntryToDataEx. --- dlls/dbghelp/pe_module.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 533cfeb..283962c 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -448,17 +448,14 @@ PVOID WINAPI ImageDirectoryEntryToDataEx( PVOID base, BOOLEAN image, USHORT dir, DWORD addr; *size = 0; + if (section) *section = NULL; if (!(nt = RtlImageNtHeader( base ))) return NULL; if (dir >= nt->OptionalHeader.NumberOfRvaAndSizes) return NULL; if (!(addr = nt->OptionalHeader.DataDirectory[dir].VirtualAddress)) return NULL; *size = nt->OptionalHeader.DataDirectory[dir].Size; - if (image || addr < nt->OptionalHeader.SizeOfHeaders) - { - if (section) *section = NULL; - return (char *)base + addr; - } + if (image || addr < nt->OptionalHeader.SizeOfHeaders) return (char *)base + addr; return RtlImageRvaToVa( nt, (HMODULE)base, addr, section ); }

1 0

James Hawkins : msi: Initialize the update function pointer when creating the control.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: 4cacdc7dba4943934ab97dbcd47fc9ab58cfaed4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cacdc7dba4943934ab97dbcd… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Jul 17 12:28:37 2008 -0500 msi: Initialize the update function pointer when creating the control. --- dlls/msi/dialog.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 0e5799f..8c7c59a 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -417,6 +417,7 @@ static msi_control *msi_dialog_create_window( msi_dialog *dialog, strcpyW( control->name, name ); list_add_head( &dialog->controls, &control->entry ); control->handler = NULL; + control->update = NULL; control->property = NULL; control->value = NULL; control->hBitmap = NULL;

1 0

Alexander Dorofeyev : quartz: Fix interface leak in FilterGraph2_Render.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: bca80e1a647db0d3cbc7863de0084a4fe4559c5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bca80e1a647db0d3cbc7863de… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Jul 17 20:25:35 2008 +0300 quartz: Fix interface leak in FilterGraph2_Render. --- dlls/quartz/filtergraph.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index b2fdf3c..9728c37 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1370,6 +1370,7 @@ error: if (!FAILED(hr)) DebugBreak(); } + IEnumMoniker_Release(pEnumMoniker); if (nbmt) DeleteMediaType(mt); if (SUCCEEDED(hr))

1 0

Alexander Dorofeyev : quartz: Add missing VariantClear after GetFilterInfo calls.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: 1656f6b7cce31bbcc0c72e276aa05b1d87a5dad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1656f6b7cce31bbcc0c72e276… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Jul 17 20:25:29 2008 +0300 quartz: Add missing VariantClear after GetFilterInfo calls. --- dlls/quartz/filtergraph.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 6bc61e5..b2fdf3c 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -994,6 +994,8 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, goto error; } + VariantClear(&var); + hr = IBaseFilter_EnumPins(pfilter, &penumpins); if (FAILED(hr)) { WARN("Enumpins (%x)\n", hr); @@ -1070,6 +1072,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, } error: + VariantClear(&var); if (ppinfilter) IPin_Release(ppinfilter); if (pfilter) { IFilterGraph2_RemoveFilter(iface, pfilter); @@ -1347,6 +1350,9 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) goto error; } TRACE("Connected, recursing %s\n", debugstr_w(V_UNION(&var, bstrVal))); + + VariantClear(&var); + hr = FilterGraph2_RenderRecurse(This, ppinfilter); if (FAILED(hr)) { WARN("Unable to connect recursively (%x)\n", hr); @@ -1356,6 +1362,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) break; error: + VariantClear(&var); if (pfilter) { IFilterGraph2_RemoveFilter(iface, pfilter); IBaseFilter_Release(pfilter);

1 0

Alexander Dorofeyev : quartz: Fix variant handling in GetFilterInfo.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: 1cd83afda34bb70582865ad15c56f447a3d842da URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd83afda34bb70582865ad15… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Jul 17 20:25:22 2008 +0300 quartz: Fix variant handling in GetFilterInfo. Removes unnecessary and unsafe type assignment, adds a missing VariantClear. --- dlls/quartz/filtergraph.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 9ebf026..6bc61e5 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -773,7 +773,6 @@ static HRESULT GetFilterInfo(IMoniker* pMoniker, GUID* pclsid, VARIANT* pvar) HRESULT hr; VariantInit(pvar); - V_VT(pvar) = VT_BSTR; hr = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID*)&pPropBagCat); @@ -783,6 +782,8 @@ static HRESULT GetFilterInfo(IMoniker* pMoniker, GUID* pclsid, VARIANT* pvar) if (SUCCEEDED(hr)) hr = CLSIDFromString(V_UNION(pvar, bstrVal), pclsid); + VariantClear(pvar); + if (SUCCEEDED(hr)) hr = IPropertyBag_Read(pPropBagCat, wszFriendlyName, pvar, NULL);

1 0

Alexander Dorofeyev : quartz/tests: Fix interface leaks in filtergraph test .
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: 7c5a4481b176c432a1faf9d9d47c371ef40ce500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5a4481b176c432a1faf9d9d… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Jul 17 20:25:13 2008 +0300 quartz/tests: Fix interface leaks in filtergraph test. --- dlls/quartz/tests/filtergraph.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 103cfa1..e39097b 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -196,6 +196,12 @@ static void test_graph_builder(void) ok(pF2 != NULL, "IGraphBuilder_FindFilterByName returned NULL\n"); hr = IGraphBuilder_FindFilterByName(pgraph, testFilterW, NULL); ok(hr == E_POINTER, "IGraphBuilder_FindFilterByName returned %x\n", hr); + + if (pIn) IPin_Release(pIn); + if (pEnum) IEnumPins_Release(pEnum); + if (pF) IBaseFilter_Release(pF); + if (pF2) IBaseFilter_Release(pF2); + releasefiltergraph(); }

1 0

Alexander Dorofeyev : quartz: Fix interface leak in FilterGraph2_RemoveFilter.
by Alexandre Julliard 18 Jul '08

18 Jul '08

Module: wine Branch: master Commit: 664599933744c55fe95b5b123833423b964855b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=664599933744c55fe95b5b123… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Thu Jul 17 20:24:54 2008 +0300 quartz: Fix interface leak in FilterGraph2_RemoveFilter. --- dlls/quartz/filtergraph.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 19dbb8c..9ebf026 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -515,6 +515,8 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte } h = IPin_Disconnect(ppin); TRACE("Disconnect 2: %08x\n", h); + + IPin_Release(ppin); } IEnumPins_Release(penumpins); }

1 0