wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Bruno Jesus : msvfw32: Simplify error handling in ICSeqCompressFrameStart.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 982fb2fd699333545cfa624448b51416eaf4e80b URL: http://source.winehq.org/git/wine.git/?a=commit;h=982fb2fd699333545cfa62444… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Oct 19 17:47:56 2015 +0800 msvfw32: Simplify error handling in ICSeqCompressFrameStart. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index db56fdf..5aff706 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1433,28 +1433,18 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) *pc->lpbiIn = *lpbiIn; pc->lpBitsPrev = HeapAlloc(GetProcessHeap(), 0, pc->lpbiIn->bmiHeader.biSizeImage); if (!pc->lpBitsPrev) - { - HeapFree(GetProcessHeap(), 0, pc->lpbiIn); - return FALSE; - } + goto error; pc->lpState = HeapAlloc(GetProcessHeap(), 0, sizeof(ICCOMPRESS)); if (!pc->lpState) - { - HeapFree(GetProcessHeap(), 0, pc->lpbiIn); - HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); - return FALSE; - } + goto error; + pc->cbState = sizeof(ICCOMPRESS); pc->lpBitsOut = HeapAlloc(GetProcessHeap(), 0, pc->lpbiOut->bmiHeader.biSizeImage); if (!pc->lpBitsOut) - { - HeapFree(GetProcessHeap(), 0, pc->lpbiIn); - HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); - HeapFree(GetProcessHeap(), 0, pc->lpState); - return FALSE; - } + goto error; + TRACE("Compvars:\n" "\tpc:\n" "\tsize: %i\n" @@ -1483,6 +1473,7 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) icComp->lpbiPrev = &pc->lpbiIn->bmiHeader; return TRUE; } +error: HeapFree(GetProcessHeap(), 0, pc->lpbiIn); HeapFree(GetProcessHeap(), 0, pc->lpBitsPrev); HeapFree(GetProcessHeap(), 0, pc->lpState);

1 0

Nikolay Sivov : strmbase: Switch to void for QualityControlImpl_Destroy().
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 4c80ec023d6affc00ff90a8b4a1a96d075dba9a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c80ec023d6affc00ff90a8b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 11:57:52 2015 +0300 strmbase: Switch to void for QualityControlImpl_Destroy(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/qualitycontrol.c | 4 ++-- dlls/strmbase/strmbase_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index 9bdc251..2e32b57 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -49,9 +49,9 @@ HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControl return S_OK; } -HRESULT QualityControlImpl_Destroy(QualityControlImpl *This) +void QualityControlImpl_Destroy(QualityControlImpl *This) { - return HeapFree(GetProcessHeap(),0,This); + HeapFree(GetProcessHeap(),0,This); } HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index 6363bf5..4e5a25a 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -35,7 +35,7 @@ typedef struct QualityControlImpl { } QualityControlImpl; HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControlImpl **ppv); -HRESULT QualityControlImpl_Destroy(QualityControlImpl *This); +void QualityControlImpl_Destroy(QualityControlImpl *This); HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv); ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface); ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface);

1 0

Nikolay Sivov : strmbase: Remove redundant null pointer check.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 9385e9f78af34e36e5e505dfe2197b07ed76eba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9385e9f78af34e36e5e505dfe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 11:57:51 2015 +0300 strmbase: Remove redundant null pointer check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/dispatch.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index d0f778e..62bc397 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -37,8 +37,6 @@ HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid) if (SUCCEEDED(hr)) { hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, riid, &This->pTypeInfo); - - if (pTypeLib) ITypeLib_Release(pTypeLib); } return hr;

1 0

Nikolay Sivov : strmbase: Remove some redundant return value initializers.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 7dd00af7478de1c0d1e8c98445c30a5bf4f815f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd00af7478de1c0d1e8c9844… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 11:57:50 2015 +0300 strmbase: Remove some redundant return value initializers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/audio.c | 2 +- dlls/strmbase/dispatch.c | 2 +- dlls/strmbase/filter.c | 3 +-- dlls/strmbase/outputqueue.c | 3 +-- dlls/strmbase/pin.c | 13 +++++-------- dlls/strmbase/renderer.c | 8 ++++---- dlls/strmbase/transform.c | 2 +- dlls/strmbase/video.c | 2 +- dlls/strmbase/window.c | 2 +- 9 files changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/strmbase/audio.c b/dlls/strmbase/audio.c index e167a79..1b79ec5 100644 --- a/dlls/strmbase/audio.c +++ b/dlls/strmbase/audio.c @@ -70,8 +70,8 @@ HRESULT WINAPI BasicAudioImpl_GetIDsOfNames(IBasicAudio *iface, REFIID riid, LPO HRESULT WINAPI BasicAudioImpl_Invoke(IBasicAudio *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) { BasicAudio *This = impl_from_IBasicAudio(iface); - HRESULT hr = S_OK; ITypeInfo *pTypeInfo; + HRESULT hr; hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); if (SUCCEEDED(hr)) diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index 8f7aa05..d0f778e 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -29,8 +29,8 @@ HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid) { - HRESULT hr = E_FAIL; ITypeLib *pTypeLib; + HRESULT hr; This->pTypeInfo = NULL; hr = LoadRegTypeLib(&LIBID_QuartzTypeLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &pTypeLib); diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 697b243..f1b2d49 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -158,7 +158,6 @@ HRESULT WINAPI BaseFilterImpl_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO * HRESULT WINAPI BaseFilterImpl_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName ) { - HRESULT hr = S_OK; BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%p, %s)\n", This, pGraph, debugstr_w(pName)); @@ -173,7 +172,7 @@ HRESULT WINAPI BaseFilterImpl_JoinFilterGraph(IBaseFilter * iface, IFilterGraph } LeaveCriticalSection(&This->csFilter); - return hr; + return S_OK; } HRESULT WINAPI BaseFilterImpl_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo) diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index 36960e3..842a9f0 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -68,7 +68,6 @@ HRESULT WINAPI OutputQueue_Construct( OutputQueue **ppOutputQueue ) { - HRESULT hr = S_OK; BOOL threaded = FALSE; DWORD tid; @@ -116,7 +115,7 @@ HRESULT WINAPI OutputQueue_Construct( } LeaveCriticalSection(&This->csQueue); - return hr; + return S_OK; } HRESULT WINAPI OutputQueue_Destroy(OutputQueue *pOutputQueue) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index a9c1928..d61469c 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -575,9 +575,9 @@ HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin *This, IMediaSa /* replaces OutputPin_SendSample */ HRESULT WINAPI BaseOutputPinImpl_Deliver(BaseOutputPin *This, IMediaSample * pSample) { - HRESULT hr = S_OK; IMemInputPin * pMemConnected = NULL; PIN_INFO pinInfo; + HRESULT hr; EnterCriticalSection(This->pin.pCritSec); { @@ -615,7 +615,7 @@ HRESULT WINAPI BaseOutputPinImpl_Deliver(BaseOutputPin *This, IMediaSample * pSa /* replaces OutputPin_CommitAllocator */ HRESULT WINAPI BaseOutputPinImpl_Active(BaseOutputPin *This) { - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p)->()\n", This); @@ -635,7 +635,7 @@ HRESULT WINAPI BaseOutputPinImpl_Active(BaseOutputPin *This) /* replaces OutputPin_DecommitAllocator */ HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin *This) { - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p)->()\n", This); @@ -875,12 +875,9 @@ ULONG WINAPI BaseInputPinImpl_Release(IPin * iface) TRACE("(%p)->() Release from %d\n", iface, refCount + 1); if (!refCount) - { BaseInputPin_Destroy(This); - return 0; - } - else - return refCount; + + return refCount; } HRESULT WINAPI BaseInputPinImpl_Connect(IPin * iface, IPin * pConnector, const AM_MEDIA_TYPE * pmt) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 99c9278..fa2545b 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -60,7 +60,7 @@ static HRESULT WINAPI BaseRenderer_InputPin_ReceiveConnection(IPin * iface, IPin { BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); BaseRenderer *renderer = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p/%p)->(%p, %p)\n", This, renderer, pReceivePin, pmt); @@ -99,7 +99,7 @@ static HRESULT WINAPI BaseRenderer_InputPin_Disconnect(IPin * iface) static HRESULT WINAPI BaseRenderer_InputPin_EndOfStream(IPin * iface) { - HRESULT hr = S_OK; + HRESULT hr; BaseInputPin* This = impl_BaseInputPin_from_IPin(iface); BaseRenderer *pFilter = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); @@ -126,7 +126,7 @@ static HRESULT WINAPI BaseRenderer_InputPin_BeginFlush(IPin * iface) { BaseInputPin* This = impl_BaseInputPin_from_IPin(iface); BaseRenderer *pFilter = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p/%p)->()\n", This, iface); @@ -151,7 +151,7 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) { BaseInputPin* This = impl_BaseInputPin_from_IPin(iface); BaseRenderer *pFilter = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p/%p)->()\n", This, pFilter); diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 4d872be..59c89be 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -93,7 +93,7 @@ static HRESULT WINAPI TransformFilter_Input_CheckMediaType(BasePin *iface, const static HRESULT WINAPI TransformFilter_Input_Receive(BaseInputPin *This, IMediaSample *pInSample) { - HRESULT hr = S_FALSE; + HRESULT hr; TransformFilter * pTransform; TRACE("%p\n", This); pTransform = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index 1c4f360..9714d7e 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -77,8 +77,8 @@ HRESULT WINAPI BaseControlVideoImpl_GetIDsOfNames(IBasicVideo *iface, REFIID rii HRESULT WINAPI BaseControlVideoImpl_Invoke(IBasicVideo *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) { BaseControlVideo *This = impl_from_IBasicVideo(iface); - HRESULT hr = S_OK; ITypeInfo *pTypeInfo; + HRESULT hr; hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); if (SUCCEEDED(hr)) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index cb448e3..b4b5aab 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -250,8 +250,8 @@ HRESULT WINAPI BaseControlWindowImpl_GetIDsOfNames(IVideoWindow *iface, REFIID r HRESULT WINAPI BaseControlWindowImpl_Invoke(IVideoWindow *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) { BaseControlWindow* This = impl_from_IVideoWindow(iface); - HRESULT hr = S_OK; ITypeInfo *pTypeInfo; + HRESULT hr; hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); if (SUCCEEDED(hr))

1 0

Nikolay Sivov : dwrite: Respect transform when calculating glyph advances for run analysis.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 08a3e4f29f450b0cf19e1ff70e5dd10d775b99b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a3e4f29f450b0cf19e1ff70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 08:43:05 2015 +0300 dwrite: Respect transform when calculating glyph advances for run analysis. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 4 ++-- dlls/dwrite/font.c | 5 +++-- dlls/dwrite/main.c | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 70aadcc..50c0462 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -130,8 +130,8 @@ extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *refer extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; extern HRESULT create_fontface(DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2**) DECLSPEC_HIDDEN; extern HRESULT create_font_collection(IDWriteFactory2*,IDWriteFontFileEnumerator*,BOOL,IDWriteFontCollection**) DECLSPEC_HIDDEN; -extern HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE,DWRITE_MEASURING_MODE,DWRITE_GLYPH_RUN const*,FLOAT,DWRITE_GRID_FIT_MODE, - DWRITE_TEXT_ANTIALIAS_MODE,FLOAT,FLOAT,IDWriteGlyphRunAnalysis**) DECLSPEC_HIDDEN; +extern HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE,DWRITE_MEASURING_MODE,DWRITE_GLYPH_RUN const*,FLOAT,const DWRITE_MATRIX*, + DWRITE_GRID_FIT_MODE,DWRITE_TEXT_ANTIALIAS_MODE,FLOAT,FLOAT,IDWriteGlyphRunAnalysis**) DECLSPEC_HIDDEN; extern BOOL is_system_collection(IDWriteFontCollection*) DECLSPEC_HIDDEN; extern HRESULT get_local_refkey(const WCHAR*,const FILETIME*,void**,UINT32*) DECLSPEC_HIDDEN; extern HRESULT get_filestream_from_file(IDWriteFontFile*,IDWriteFontFileStream**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 58eb90d..b71d492 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4378,7 +4378,8 @@ static const struct IDWriteGlyphRunAnalysisVtbl glyphrunanalysisvtbl = { }; HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, DWRITE_GLYPH_RUN const *run, - FLOAT ppdip, DWRITE_GRID_FIT_MODE gridfit_mode, DWRITE_TEXT_ANTIALIAS_MODE aa_mode, FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **ret) + FLOAT ppdip, const DWRITE_MATRIX *transform, DWRITE_GRID_FIT_MODE gridfit_mode, DWRITE_TEXT_ANTIALIAS_MODE aa_mode, + FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **ret) { struct dwrite_glyphrunanalysis *analysis; UINT32 i; @@ -4455,7 +4456,7 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA break; case DWRITE_MEASURING_MODE_GDI_CLASSIC: case DWRITE_MEASURING_MODE_GDI_NATURAL: - hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, run->fontEmSize, ppdip, NULL /* FIXME */, + hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, run->fontEmSize, ppdip, transform, measuring_mode == DWRITE_MEASURING_MODE_GDI_NATURAL, run->isSideways, 1, run->glyphIndices + i, &a); if (FAILED(hr)) analysis->advances[i] = 0.0; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index fc9d313..e5ce3aa 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1102,7 +1102,7 @@ static HRESULT WINAPI dwritefactory_CreateGlyphRunAnalysis(IDWriteFactory2 *ifac return E_INVALIDARG; } - return create_glyphrunanalysis(rendering_mode, measuring_mode, run, ppdip, DWRITE_GRID_FIT_MODE_DEFAULT, + return create_glyphrunanalysis(rendering_mode, measuring_mode, run, ppdip, transform, DWRITE_GRID_FIT_MODE_DEFAULT, DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE, originX, originY, analysis); } @@ -1188,7 +1188,7 @@ static HRESULT WINAPI dwritefactory2_CreateGlyphRunAnalysis(IDWriteFactory2 *ifa TRACE("(%p)->(%p %p %d %d %d %d %.2f %.2f %p)\n", This, run, transform, rendering_mode, measuring_mode, gridfit_mode, aa_mode, originX, originY, analysis); - return create_glyphrunanalysis(rendering_mode, measuring_mode, run, 1.0f, gridfit_mode, aa_mode, originX, originY, analysis); + return create_glyphrunanalysis(rendering_mode, measuring_mode, run, 1.0f, transform, gridfit_mode, aa_mode, originX, originY, analysis); } static const struct IDWriteFactory2Vtbl dwritefactoryvtbl = {

1 0

Nikolay Sivov : dwrite: Set bitmap target ppdip factor from context dpi.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 9389bcdb51b4416fdfbe49940d57977b0c7d90b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9389bcdb51b4416fdfbe49940… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 08:43:04 2015 +0300 dwrite: Set bitmap target ppdip factor from context dpi. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index e178f33..53c9c51 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -567,7 +567,7 @@ static HRESULT create_rendertarget(IDWriteFactory *factory, HDC hdc, UINT32 widt } target->m = identity; - target->ppdip = 1.0; + target->ppdip = GetDeviceCaps(target->hdc, LOGPIXELSX) / 96.0f; target->antialiasmode = DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE; target->factory = factory; IDWriteFactory_AddRef(factory);

1 0

Nikolay Sivov : dwrite: Scale run origin by given ppdip run analysis was created with.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: d36a16ea10a724d860c85afd23301332aeb82491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36a16ea10a724d860c85afd2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 08:43:03 2015 +0300 dwrite: Scale run origin by given ppdip run analysis was created with. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a2026ca..58eb90d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4399,8 +4399,8 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA analysis->ready = 0; analysis->bitmap = NULL; analysis->ppdip = ppdip; - analysis->originX = originX; - analysis->originY = originY; + analysis->originX = originX * ppdip; + analysis->originY = originY * ppdip; SetRectEmpty(&analysis->bounds); analysis->run = *run; IDWriteFontFace_AddRef(analysis->run.fontFace);

1 0

Nikolay Sivov : dwrite: Scale glyph run analysis advances and offsets with ppdip factor.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 2fdee67dd2c5799a9edd0715711a3dff0dbeabb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fdee67dd2c5799a9edd07157… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 19 08:43:02 2015 +0300 dwrite: Scale glyph run analysis advances and offsets with ppdip factor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 28 +++++++++++++++++++++------- dlls/dwrite/tests/font.c | 31 ++++++++++++++++++++++--------- 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index bb01ccf..a2026ca 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4381,6 +4381,7 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA FLOAT ppdip, DWRITE_GRID_FIT_MODE gridfit_mode, DWRITE_TEXT_ANTIALIAS_MODE aa_mode, FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **ret) { struct dwrite_glyphrunanalysis *analysis; + UINT32 i; *ret = NULL; @@ -4425,12 +4426,17 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA memcpy(analysis->glyphs, run->glyphIndices, run->glyphCount*sizeof(*run->glyphIndices)); - if (run->glyphAdvances) - memcpy(analysis->advances, run->glyphAdvances, run->glyphCount*sizeof(*run->glyphAdvances)); + if (run->glyphAdvances) { + if (ppdip == 1.0f) + memcpy(analysis->advances, run->glyphAdvances, run->glyphCount*sizeof(*run->glyphAdvances)); + else { + for (i = 0; i < run->glyphCount; i++) + analysis->advances[i] = run->glyphAdvances[i] * ppdip; + } + } else { DWRITE_FONT_METRICS metrics; IDWriteFontFace1 *fontface1; - UINT32 i; IDWriteFontFace_GetMetrics(run->fontFace, &metrics); IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace1, (void**)&fontface1); @@ -4445,7 +4451,7 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA hr = IDWriteFontFace1_GetDesignGlyphAdvances(fontface1, 1, run->glyphIndices + i, &a, run->isSideways); if (FAILED(hr)) a = 0; - analysis->advances[i] = get_scaled_advance_width(a, run->fontEmSize, &metrics); + analysis->advances[i] = get_scaled_advance_width(a, run->fontEmSize, &metrics) * ppdip; break; case DWRITE_MEASURING_MODE_GDI_CLASSIC: case DWRITE_MEASURING_MODE_GDI_NATURAL: @@ -4454,7 +4460,7 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA if (FAILED(hr)) analysis->advances[i] = 0.0; else - analysis->advances[i] = floorf(a * run->fontEmSize * ppdip / metrics.designUnitsPerEm + 0.5f) / ppdip; + analysis->advances[i] = floorf(a * run->fontEmSize * ppdip / metrics.designUnitsPerEm + 0.5f); break; default: ; @@ -4464,8 +4470,16 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA IDWriteFontFace1_Release(fontface1); } - if (run->glyphOffsets) - memcpy(analysis->offsets, run->glyphOffsets, run->glyphCount*sizeof(*run->glyphOffsets)); + if (run->glyphOffsets) { + if (ppdip == 1.0f) + memcpy(analysis->offsets, run->glyphOffsets, run->glyphCount*sizeof(*run->glyphOffsets)); + else { + for (i = 0; i < run->glyphCount; i++) { + analysis->offsets[i].advanceOffset = run->glyphOffsets[i].advanceOffset * ppdip; + analysis->offsets[i].ascenderOffset = run->glyphOffsets[i].ascenderOffset * ppdip; + } + } + } *ret = &analysis->IDWriteGlyphRunAnalysis_iface; return S_OK; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index a2af967..56572f9 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3497,11 +3497,11 @@ static void test_CreateGlyphRunAnalysis(void) DWRITE_GLYPH_RUN run; IDWriteFontFace *face; UINT16 glyph, glyphs[10]; - FLOAT advance; + FLOAT advances[2]; HRESULT hr; UINT32 ch; RECT rect, rect2; - DWRITE_GLYPH_OFFSET offset; + DWRITE_GLYPH_OFFSET offsets[2]; DWRITE_GLYPH_METRICS metrics; DWRITE_FONT_METRICS fm; int i; @@ -3517,17 +3517,17 @@ static void test_CreateGlyphRunAnalysis(void) hr = IDWriteFontFace_GetDesignGlyphMetrics(face, &glyph, 1, &metrics, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); - advance = metrics.advanceWidth; + advances[0] = metrics.advanceWidth; - offset.advanceOffset = 0.0; - offset.ascenderOffset = 0.0; + offsets[0].advanceOffset = 0.0; + offsets[0].ascenderOffset = 0.0; run.fontFace = face; run.fontEmSize = 24.0; run.glyphCount = 1; run.glyphIndices = &glyph; - run.glyphAdvances = &advance; - run.glyphOffsets = &offset; + run.glyphAdvances = advances; + run.glyphOffsets = offsets; run.isSideways = FALSE; run.bidiLevel = 0; @@ -3680,7 +3680,7 @@ static void test_CreateGlyphRunAnalysis(void) run.fontEmSize = 24.0; run.glyphCount = 1; run.glyphIndices = &glyph; - run.glyphAdvances = &advance; + run.glyphAdvances = advances; run.glyphOffsets = NULL; run.isSideways = FALSE; run.bidiLevel = 0; @@ -3719,12 +3719,14 @@ static void test_CreateGlyphRunAnalysis(void) IDWriteGlyphRunAnalysis_Release(analysis); + /* test that advances are scaled according to ppdip too */ glyphs[0] = glyphs[1] = glyph; + advances[0] = advances[1] = 100.0f; run.fontFace = face; run.fontEmSize = 24.0; run.glyphCount = 2; run.glyphIndices = glyphs; - run.glyphAdvances = NULL; + run.glyphAdvances = advances; run.glyphOffsets = NULL; run.isSideways = FALSE; run.bidiLevel = 0; @@ -3739,7 +3741,18 @@ static void test_CreateGlyphRunAnalysis(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(!IsRectEmpty(&rect2), "got empty bounds\n"); ok(!EqualRect(&rect, &rect2), "got wrong rect2\n"); + ok((rect2.right - rect.left) > advances[0], "got rect width %d for advance %f\n", rect.right - rect.left, advances[0]); + IDWriteGlyphRunAnalysis_Release(analysis); + + hr = IDWriteFactory_CreateGlyphRunAnalysis(factory, &run, 2.0, NULL, + DWRITE_RENDERING_MODE_ALIASED, DWRITE_MEASURING_MODE_NATURAL, + 0.0, 0.0, &analysis); + ok(hr == S_OK, "got 0x%08x\n", hr); + SetRectEmpty(&rect); + hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok((rect.right - rect.left) > 2 * advances[0], "got rect width %d for advance %f\n", rect.right - rect.left, advances[0]); IDWriteGlyphRunAnalysis_Release(analysis); IDWriteFontFace_Release(face);

1 0

Dmitry Timoshkov : ntdll: Return from snoop tracing helpers earlier if tracing is disabled.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 6262cc325f1ee03e207ae494d3fd7867dcb7262d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6262cc325f1ee03e207ae494d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 19 10:28:31 2015 +0800 ntdll: Return from snoop tracing helpers earlier if tracing is disabled. This allows turning off and on snooping from task manager. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index ef0af0f..997de1f 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -1085,6 +1085,8 @@ void WINAPI __regs_SNOOP_Entry( CONTEXT *context ) context->Eip = (DWORD)fun->origfun; + if (!TRACE_ON(snoop)) return; + if (TRACE_ON(timestamp)) print_timestamp(); if (fun->name) DPRINTF("%04x:CALL %s.%s(",GetCurrentThreadId(),dll->name,fun->name); @@ -1121,6 +1123,12 @@ void WINAPI __regs_SNOOP_Return( CONTEXT *context ) if (ret->dll->funs[ret->ordinal].nrofargs<0) ret->dll->funs[ret->ordinal].nrofargs=(context->Esp - ret->origESP-4)/4; context->Eip = (DWORD)ret->origreturn; + + if (!TRACE_ON(snoop)) { + ret->origreturn = NULL; /* mark as empty */ + return; + } + if (TRACE_ON(timestamp)) print_timestamp(); if (ret->args) {

1 0

Can Taşan : po: Update Turkish translation.
by Alexandre Julliard 19 Oct '15

19 Oct '15

Module: wine Branch: master Commit: 52e35a09225f7ac0761ff3a999b0bb78998f2e63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e35a09225f7ac0761ff3a99… Author: Can Taşan <betax34(a)hotmail.com> Date: Mon Oct 19 16:12:33 2015 +0900 po: Update Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/tr.po | 1895 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 941 insertions(+), 954 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52e35a09225f7ac0761ff…

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2015