wine-commits April 2015

wine-commits@winehq.org

2 participants
451 discussions

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_SetInterpolationMode().
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 1014d9a105609c9c3c6cdf4b5bee76e69b24efae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1014d9a105609c9c3c6cdf4b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 19:31:35 2015 +0200 d2d1: Implement d2d_bitmap_brush_SetInterpolationMode(). --- dlls/d2d1/brush.c | 68 ++++++++++++++++++++++++++++++------------------ dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 44 insertions(+), 25 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 9e45e1a..c15945a 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -499,7 +499,8 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_brush_Release(ID2D1BitmapBrush *iface) if (!refcount) { - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); + if (brush->u.bitmap.sampler_state) + ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); HeapFree(GetProcessHeap(), 0, brush); } @@ -565,7 +566,16 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeY(ID2D1BitmapBrush * static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode(ID2D1BitmapBrush *iface, D2D1_BITMAP_INTERPOLATION_MODE mode) { - FIXME("iface %p, mode %#x stub!\n", iface, mode); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + + TRACE("iface %p, mode %#x.\n", iface, mode); + + brush->u.bitmap.interpolation_mode = mode; + if (brush->u.bitmap.sampler_state) + { + ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); + brush->u.bitmap.sampler_state = NULL; + } } static void STDMETHODCALLTYPE d2d_bitmap_brush_SetBitmap(ID2D1BitmapBrush *iface, ID2D1Bitmap *bitmap) @@ -627,35 +637,16 @@ static const struct ID2D1BitmapBrushVtbl d2d_bitmap_brush_vtbl = HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc) { - D3D10_SAMPLER_DESC sampler_desc; - HRESULT hr; FIXME("Ignoring brush properties.\n"); d2d_brush_init(brush, &render_target->ID2D1RenderTarget_iface, D2D_BRUSH_TYPE_BITMAP, brush_desc, (ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl); brush->u.bitmap.bitmap = unsafe_impl_from_ID2D1Bitmap(bitmap); - - sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; - sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP; - sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; - sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; - sampler_desc.MipLODBias = 0.0f; - sampler_desc.MaxAnisotropy = 0; - sampler_desc.ComparisonFunc = D3D10_COMPARISON_NEVER; - sampler_desc.BorderColor[0] = 0.0f; - sampler_desc.BorderColor[1] = 0.0f; - sampler_desc.BorderColor[2] = 0.0f; - sampler_desc.BorderColor[3] = 0.0f; - sampler_desc.MinLOD = 0.0f; - sampler_desc.MaxLOD = 0.0f; - - if (FAILED(hr = ID3D10Device_CreateSamplerState(render_target->device, - &sampler_desc, &brush->u.bitmap.sampler_state))) - { - ERR("Failed to create sampler state, hr %#x.\n", hr); - return hr; - } + if (bitmap_brush_desc) + brush->u.bitmap.interpolation_mode = bitmap_brush_desc->interpolationMode; + else + brush->u.bitmap.interpolation_mode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR; return S_OK; } @@ -672,9 +663,36 @@ struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device) { + HRESULT hr; + if (brush->type == D2D_BRUSH_TYPE_BITMAP) { ID3D10Device_PSSetShaderResources(device, 0, 1, &brush->u.bitmap.bitmap->view); + if (!brush->u.bitmap.sampler_state) + { + D3D10_SAMPLER_DESC sampler_desc; + + if (brush->u.bitmap.interpolation_mode == D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR) + sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; + else + sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_LINEAR; + sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D10_COMPARISON_NEVER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 0.0f; + + if (FAILED(hr = ID3D10Device_CreateSamplerState(device, + &sampler_desc, &brush->u.bitmap.sampler_state))) + ERR("Failed to create sampler state, hr %#x.\n", hr); + } ID3D10Device_PSSetSamplers(device, 0, 1, &brush->u.bitmap.sampler_state); } } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 48465f2..285c422 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -125,6 +125,7 @@ struct d2d_brush struct { struct d2d_bitmap *bitmap; + D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode; ID3D10SamplerState *sampler_state; } bitmap; } u;

1 0

Alexandre Julliard : server: Return a valid position also in posted messages.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 247275aec3ca9fbc8aa8b554319610ba57bb4f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=247275aec3ca9fbc8aa8b5543… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 27 17:24:15 2015 +0900 server: Return a valid position also in posted messages. --- dlls/user32/message.c | 14 ++++------ dlls/user32/tests/win.c | 12 ++++---- include/wine/server_protocol.h | 6 ++-- server/protocol.def | 4 +-- server/queue.c | 63 ++++++++++++++++++++++++++++-------------- server/request.h | 10 ++++--- server/trace.c | 2 ++ 7 files changed, 67 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=247275aec3ca9fbc8aa8b…

1 0

Nikolay Sivov : dmime: No need to allocate description separately for IDirectMusicGraph.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: b508c85c666932a31d866049e92e364e06cad30a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b508c85c666932a31d866049e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 00:53:47 2015 +0300 dmime: No need to allocate description separately for IDirectMusicGraph. --- dlls/dmime/graph.c | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index a784007..9e9c2fb 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -29,7 +29,7 @@ struct IDirectMusicGraphImpl { LONG ref; /* IDirectMusicGraphImpl fields */ - LPDMUS_OBJECTDESC pDesc; + DMUS_OBJECTDESC desc; WORD num_tools; struct list Tools; }; @@ -218,8 +218,7 @@ static HRESULT WINAPI DirectMusicObject_GetDescriptor(IDirectMusicObject *iface, { IDirectMusicGraphImpl *This = impl_from_IDirectMusicObject(iface); TRACE("(%p, %p)\n", This, desc); - /* I think we shouldn't return pointer here since then values can be changed; it'd be a mess */ - memcpy(desc, This->pDesc, This->pDesc->dwSize); + *desc = This->desc; return S_OK; } @@ -231,31 +230,31 @@ static HRESULT WINAPI DirectMusicObject_SetDescriptor(IDirectMusicObject *iface, /* According to MSDN, we should copy only given values, not whole struct */ if (pDesc->dwValidData & DMUS_OBJ_OBJECT) - This->pDesc->guidObject = pDesc->guidObject; + This->desc.guidObject = pDesc->guidObject; if (pDesc->dwValidData & DMUS_OBJ_CLASS) - This->pDesc->guidClass = pDesc->guidClass; + This->desc.guidClass = pDesc->guidClass; if (pDesc->dwValidData & DMUS_OBJ_NAME) - lstrcpynW (This->pDesc->wszName, pDesc->wszName, DMUS_MAX_NAME); + lstrcpynW (This->desc.wszName, pDesc->wszName, DMUS_MAX_NAME); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) - lstrcpynW (This->pDesc->wszCategory, pDesc->wszCategory, DMUS_MAX_CATEGORY); + lstrcpynW (This->desc.wszCategory, pDesc->wszCategory, DMUS_MAX_CATEGORY); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) - lstrcpynW (This->pDesc->wszFileName, pDesc->wszFileName, DMUS_MAX_FILENAME); + lstrcpynW (This->desc.wszFileName, pDesc->wszFileName, DMUS_MAX_FILENAME); if (pDesc->dwValidData & DMUS_OBJ_VERSION) - This->pDesc->vVersion = pDesc->vVersion; + This->desc.vVersion = pDesc->vVersion; if (pDesc->dwValidData & DMUS_OBJ_DATE) - This->pDesc->ftDate = pDesc->ftDate; + This->desc.ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { - This->pDesc->llMemLength = pDesc->llMemLength; - memcpy(This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength); + This->desc.llMemLength = pDesc->llMemLength; + memcpy(This->desc.pbMemData, pDesc->pbMemData, pDesc->llMemLength); } /* according to MSDN, we copy the stream */ if (pDesc->dwValidData & DMUS_OBJ_STREAM) - IStream_Clone(pDesc->pStream, &This->pDesc->pStream); + IStream_Clone(pDesc->pStream, &This->desc.pStream); /* add new flags */ - This->pDesc->dwValidData |= pDesc->dwValidData; + This->desc.dwValidData |= pDesc->dwValidData; return S_OK; } @@ -479,20 +478,20 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream* pStm) switch (chunkID) { case DMUS_FOURCC_GUID_CHUNK: { TRACE_(dmfile)(": GUID chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_OBJECT; - IStream_Read (pStm, &This->pDesc->guidObject, chunkSize, NULL); + This->desc.dwValidData |= DMUS_OBJ_OBJECT; + IStream_Read (pStm, &This->desc.guidObject, chunkSize, NULL); break; } case DMUS_FOURCC_VERSION_CHUNK: { TRACE_(dmfile)(": version chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_VERSION; - IStream_Read (pStm, &This->pDesc->vVersion, chunkSize, NULL); + This->desc.dwValidData |= DMUS_OBJ_VERSION; + IStream_Read (pStm, &This->desc.vVersion, chunkSize, NULL); break; } case DMUS_FOURCC_CATEGORY_CHUNK: { TRACE_(dmfile)(": category chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_CATEGORY; - IStream_Read (pStm, This->pDesc->wszCategory, chunkSize, NULL); + This->desc.dwValidData |= DMUS_OBJ_CATEGORY; + IStream_Read (pStm, This->desc.wszCategory, chunkSize, NULL); break; } case FOURCC_LIST: { @@ -514,8 +513,8 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream* pStm) case mmioFOURCC('I','N','A','M'): case DMUS_FOURCC_UNAM_CHUNK: { TRACE_(dmfile)(": name chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStm, This->pDesc->wszName, chunkSize, NULL); + This->desc.dwValidData |= DMUS_OBJ_NAME; + IStream_Read (pStm, This->desc.wszName, chunkSize, NULL); break; } case mmioFOURCC('I','A','R','T'): @@ -639,10 +638,9 @@ HRESULT WINAPI create_dmgraph(REFIID riid, void **ret_iface) obj->IDirectMusicGraph_iface.lpVtbl = &DirectMusicGraphVtbl; obj->IDirectMusicObject_iface.lpVtbl = &DirectMusicObjectVtbl; obj->IPersistStream_iface.lpVtbl = &PersistStreamVtbl; - obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); - DM_STRUCT_INIT(obj->pDesc); - obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; - obj->pDesc->guidClass = CLSID_DirectMusicGraph; + DM_STRUCT_INIT(&obj->desc); + obj->desc.dwValidData |= DMUS_OBJ_CLASS; + obj->desc.guidClass = CLSID_DirectMusicGraph; obj->ref = 1; list_init(&obj->Tools);

1 0

Nikolay Sivov : dmime/tests: Fix some failures on Win2k VMs.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 494c67402849566e425231eb7912a90cc8fed370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=494c67402849566e425231eb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 00:45:00 2015 +0300 dmime/tests: Fix some failures on Win2k VMs. --- dlls/dmime/tests/dmime.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index f833a10..18586fd 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -421,9 +421,10 @@ static void test_graph(void) hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - ok(IsEqualGUID(&class, &CLSID_DirectMusicGraph), - "Expected class CLSID_DirectMusicGraph got %s\n", wine_dbgstr_guid(&class)); + ok(hr == S_OK || broken(hr == E_NOTIMPL) /* win2k */, "IPersistStream_GetClassID failed: %08x\n", hr); + if (hr == S_OK) + ok(IsEqualGUID(&class, &CLSID_DirectMusicGraph), + "Expected class CLSID_DirectMusicGraph got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps); @@ -452,9 +453,10 @@ static void test_segment(void) hr = IDirectMusicSegment_QueryInterface(dms, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - ok(IsEqualGUID(&class, &CLSID_DirectMusicSegment), - "Expected class CLSID_DirectMusicSegment got %s\n", wine_dbgstr_guid(&class)); + ok(hr == S_OK || broken(hr == E_NOTIMPL) /* win2k */, "IPersistStream_GetClassID failed: %08x\n", hr); + if (hr == S_OK) + ok(IsEqualGUID(&class, &CLSID_DirectMusicSegment), + "Expected class CLSID_DirectMusicSegment got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps);

1 0

Nikolay Sivov : dmime: Implement GetClassID() for IDirectMusicGraph.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: c6bc5f1a1ce5fb1a952ec443481505cd6ec85bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6bc5f1a1ce5fb1a952ec4434… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 00:42:54 2015 +0300 dmime: Implement GetClassID() for IDirectMusicGraph. --- dlls/dmime/graph.c | 5 +++-- dlls/dmime/tests/dmime.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index 7975a4f..a784007 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -439,8 +439,9 @@ static ULONG WINAPI PersistStream_Release(IPersistStream *iface) static HRESULT WINAPI PersistStream_GetClassID(IPersistStream *iface, CLSID *clsid) { IDirectMusicGraphImpl *This = impl_from_IPersistStream(iface); - FIXME("(%p) %p: stub\n", This, clsid); - return E_NOTIMPL; + TRACE("(%p) %p\n", This, clsid); + *clsid = CLSID_DirectMusicGraph; + return S_OK; } static HRESULT WINAPI PersistStream_IsDirty(IPersistStream *iface) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index f7c018f..f833a10 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -421,8 +421,8 @@ static void test_graph(void) hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); hr = IPersistStream_GetClassID(ps, &class); - todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicGraph), + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, &CLSID_DirectMusicGraph), "Expected class CLSID_DirectMusicGraph got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */

1 0

Nikolay Sivov : dmime: Fix a couple of trace messages.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 2d77891fab46d44fd694053012ca304cb9f89c07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d77891fab46d44fd69405301… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 00:38:53 2015 +0300 dmime: Fix a couple of trace messages. --- dlls/dmime/graph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index 76d4706..7975a4f 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -600,14 +600,14 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream* pStm) static HRESULT WINAPI PersistStream_Save(IPersistStream *iface, IStream *stream, BOOL clear_dirty) { IDirectMusicGraphImpl *This = impl_from_IPersistStream(iface); - FIXME("(%p) %p %d\n", This, stream, clear_dirty); + TRACE("(%p) %p %d\n", This, stream, clear_dirty); return E_NOTIMPL; } static HRESULT WINAPI PersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size) { IDirectMusicGraphImpl *This = impl_from_IPersistStream(iface); - FIXME("(%p) %p\n", This, size); + TRACE("(%p) %p\n", This, size); return E_NOTIMPL; }

1 0

Nikolay Sivov : dwrite: Implement ApplyCharacterSpacing().
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 14158a71db73c4bfb4c293f67277fc2e79d310cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=14158a71db73c4bfb4c293f67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 00:20:32 2015 +0300 dwrite: Implement ApplyCharacterSpacing(). --- dlls/dwrite/analyzer.c | 219 ++++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/analyzer.c | 162 ++++++++++++++++++++++++++++++++ 2 files changed, 379 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14158a71db73c4bfb4c29…

1 0

Mark Harmstone : include: Add buffered animation functions to uxtheme.h.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 4a1ebd7369ee8d7044a62887d9813c7aa3a5eeff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a1ebd7369ee8d7044a62887d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Apr 25 19:37:54 2015 +0100 include: Add buffered animation functions to uxtheme.h. --- include/uxtheme.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/uxtheme.h b/include/uxtheme.h index fa0d3cb..e6994a1 100644 --- a/include/uxtheme.h +++ b/include/uxtheme.h @@ -213,4 +213,32 @@ HDC WINAPI GetBufferedPaintDC(HPAINTBUFFER); HDC WINAPI GetBufferedPaintTargetDC(HPAINTBUFFER); HRESULT WINAPI GetBufferedPaintTargetRect(HPAINTBUFFER, RECT *prc); +/* double-buffered animation functions */ + +typedef HANDLE HANIMATIONBUFFER; + +typedef enum _BP_ANIMATIONSTYLE +{ + BPAS_NONE, + BPAS_LINEAR, + BPAS_CUBIC, + BPAS_SINE +} BP_ANIMATIONSTYLE; + +typedef struct _BP_ANIMATIONPARAMS +{ + DWORD cbSize; + DWORD dwFlags; + BP_ANIMATIONSTYLE style; + DWORD dwDuration; +} BP_ANIMATIONPARAMS, *PBP_ANIMATIONPARAMS; + +HANIMATIONBUFFER WINAPI BeginBufferedAnimation(HWND, HDC, const RECT *, + BP_BUFFERFORMAT, BP_PAINTPARAMS *, + BP_ANIMATIONPARAMS *, HDC *, HDC *); + +BOOL WINAPI BufferedPaintRenderAnimation(HWND, HDC); +HRESULT WINAPI BufferedPaintStopAllAnimations(HWND); +HRESULT WINAPI EndBufferedAnimation(HANIMATIONBUFFER, BOOL); + #endif

1 0

Mark Harmstone : include: Add buffered paint functions to uxtheme.h.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 85d6a5b9c97dc3fbdab15f868a44e163380d3355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d6a5b9c97dc3fbdab15f868… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Apr 25 19:37:46 2015 +0100 include: Add buffered paint functions to uxtheme.h. --- include/uxtheme.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/uxtheme.h b/include/uxtheme.h index 4a43154..fa0d3cb 100644 --- a/include/uxtheme.h +++ b/include/uxtheme.h @@ -206,4 +206,11 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC, const RECT *, BP_BUFFERFORMAT, HRESULT WINAPI EndBufferedPaint(HPAINTBUFFER, BOOL); +HRESULT WINAPI BufferedPaintClear(HPAINTBUFFER, const RECT *); +HRESULT WINAPI BufferedPaintSetAlpha(HPAINTBUFFER, const RECT *, BYTE); +HRESULT WINAPI GetBufferedPaintBits(HPAINTBUFFER, RGBQUAD **, int *); +HDC WINAPI GetBufferedPaintDC(HPAINTBUFFER); +HDC WINAPI GetBufferedPaintTargetDC(HPAINTBUFFER); +HRESULT WINAPI GetBufferedPaintTargetRect(HPAINTBUFFER, RECT *prc); + #endif

1 0

Gerald Pfeifer : urlmon: Simplify a (redundant) expression in parse_canonicalize.
by Alexandre Julliard 27 Apr '15

27 Apr '15

Module: wine Branch: master Commit: 2cfdaaef557c1e2cb6b7454695e2c4ca3e381fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cfdaaef557c1e2cb6b745469… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Apr 25 21:18:18 2015 +0200 urlmon: Simplify a (redundant) expression in parse_canonicalize. --- dlls/urlmon/uri.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index e43d372..48b485b 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6842,8 +6842,7 @@ static HRESULT parse_canonicalize(const Uri *uri, DWORD flags, LPWSTR output, ptr = uri->canon_uri+uri->scheme_start+uri->scheme_len+1; pptr = &ptr; } - reduce_path = !(flags & URL_NO_META) && - !(flags & URL_DONT_SIMPLIFY) && + reduce_path = !(flags & URL_DONT_SIMPLIFY) && ptr && check_hierarchical(pptr); for(ptr = uri->canon_uri; ptr < uri->canon_uri+uri->canon_len; ++ptr) {

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
46
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 April 2015