wine-commits February 2015

wine-commits@winehq.org

2 participants
411 discussions

Piotr Caban : user32/tests: Add tests for window clipping with CS_PARENTDC flag.
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: 3d6de8c8a2b105909d77a35c04c5b5dd15401a55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6de8c8a2b105909d77a35c0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 13 11:38:15 2015 +0100 user32/tests: Add tests for window clipping with CS_PARENTDC flag. --- dlls/user32/tests/dce.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index dc78caf..4ce8d5d 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -33,7 +33,7 @@ #define DCX_USESTYLE 0x00010000 #endif -static HWND hwnd_cache, hwnd_owndc, hwnd_classdc, hwnd_classdc2; +static HWND hwnd_cache, hwnd_owndc, hwnd_classdc, hwnd_classdc2, hwnd_parent, hwnd_parentdc; /* test behavior of DC attributes with various GetDC/ReleaseDC combinations */ static void test_dc_attributes(void) @@ -190,7 +190,7 @@ static void test_dc_visrgn(void) { HDC old_hdc, hdc; HRGN hrgn, hrgn2; - RECT rect; + RECT rect, parent_rect; /* cache DC */ @@ -325,6 +325,20 @@ static void test_dc_visrgn(void) ok( !(rect.left >= 20 && rect.top >= 20 && rect.right <= 30 && rect.bottom <= 30), "clip box must have been reset %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); ReleaseDC( hwnd_classdc2, hdc ); + + /* parent DC */ + hdc = GetDC( hwnd_parentdc ); + GetClipBox( hdc, &rect ); + ReleaseDC( hwnd_parentdc, hdc ); + + hdc = GetDC( hwnd_parent ); + GetClipBox( hdc, &parent_rect ); + ReleaseDC( hwnd_parent, hdc ); + + ok( rect.left == parent_rect.left, "rect.left = %d, expected %d\n", rect.left, parent_rect.left ); + ok( rect.top == parent_rect.top, "rect.top = %d, expected %d\n", rect.top, parent_rect.top ); + ok( rect.right == parent_rect.right, "rect.right = %d, expected %d\n", rect.right, parent_rect.right ); + ok( rect.bottom == parent_rect.bottom, "rect.bottom = %d, expected %d\n", rect.bottom, parent_rect.bottom ); } @@ -332,7 +346,7 @@ static void test_dc_visrgn(void) static void test_begin_paint(void) { HDC old_hdc, hdc; - RECT rect; + RECT rect, parent_rect; PAINTSTRUCT ps; /* cache DC */ @@ -405,6 +419,21 @@ static void test_begin_paint(void) GetClipBox( hdc, &rect ); ok( !(rect.left >= 10 && rect.top >= 10 && rect.right <= 20 && rect.bottom <= 20), "clip box should have been reset %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + ReleaseDC( hwnd_classdc2, hdc ); + EndPaint( hwnd_classdc, &ps ); + + /* parent DC */ + RedrawWindow( hwnd_parent, NULL, 0, RDW_VALIDATE|RDW_NOFRAME|RDW_NOERASE ); + RedrawWindow( hwnd_parentdc, NULL, 0, RDW_INVALIDATE ); + hdc = BeginPaint( hwnd_parentdc, &ps ); + GetClipBox( hdc, &rect ); + EndPaint( hwnd_parentdc, &ps ); + GetClientRect( hwnd_parent, &parent_rect ); + + ok( rect.left == parent_rect.left, "rect.left = %d, expected %d\n", rect.left, parent_rect.left ); + ok( rect.top == parent_rect.top, "rect.top = %d, expected %d\n", rect.top, parent_rect.top ); + todo_wine ok( rect.right == parent_rect.right, "rect.right = %d, expected %d\n", rect.right, parent_rect.right ); + todo_wine ok( rect.bottom == parent_rect.bottom, "rect.bottom = %d, expected %d\n", rect.bottom, parent_rect.bottom ); } /* test ScrollWindow with window DCs */ @@ -593,6 +622,9 @@ START_TEST(dce) cls.style = CS_DBLCLKS | CS_CLASSDC; cls.lpszClassName = "classdc_class"; RegisterClassA(&cls); + cls.style = CS_PARENTDC; + cls.lpszClassName = "parentdc_class"; + RegisterClassA(&cls); hwnd_cache = CreateWindowA("cache_class", NULL, WS_OVERLAPPED | WS_VISIBLE, 0, 0, 100, 100, @@ -606,6 +638,11 @@ START_TEST(dce) hwnd_classdc2 = CreateWindowA("classdc_class", NULL, WS_OVERLAPPED | WS_VISIBLE, 200, 200, 100, 100, 0, 0, GetModuleHandleA(0), NULL ); + hwnd_parent = CreateWindowA("static", NULL, WS_OVERLAPPED | WS_VISIBLE, + 400, 0, 100, 100, 0, 0, 0, NULL ); + hwnd_parentdc = CreateWindowA("parentdc_class", NULL, WS_CHILD | WS_VISIBLE, + 0, 0, 1, 1, hwnd_parent, 0, 0, NULL ); + test_dc_attributes(); test_parameters(); test_dc_visrgn(); @@ -614,6 +651,7 @@ START_TEST(dce) test_invisible_create(); test_dc_layout(); + DestroyWindow(hwnd_parent); DestroyWindow(hwnd_classdc2); DestroyWindow(hwnd_classdc); DestroyWindow(hwnd_owndc);

1 0

Henri Verbeet : dxgi: Implement dxgi_factory_SetPrivateData().
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: 49ad383e89a11c951c458f7d3c0ae1edf118c240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ad383e89a11c951c458f7d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 13 10:40:52 2015 +0100 dxgi: Implement dxgi_factory_SetPrivateData(). --- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/factory.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 6653c21..45f2404 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -88,6 +88,7 @@ struct dxgi_factory { IDXGIFactory1 IDXGIFactory1_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d *wined3d; UINT adapter_count; IDXGIAdapter1 **adapters; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 1e22f6f..13b72f0 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -83,6 +83,7 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IDXGIFactory1 *iface) EnterCriticalSection(&dxgi_cs); wined3d_decref(factory->wined3d); LeaveCriticalSection(&dxgi_cs); + wined3d_private_store_cleanup(&factory->private_store); HeapFree(GetProcessHeap(), 0, factory); } @@ -92,9 +93,11 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IDXGIFactory1 *iface) static HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateData(IDXGIFactory1 *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_factory *factory = impl_from_IDXGIFactory1(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_set_private_data(&factory->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_factory_SetPrivateDataInterface(IDXGIFactory1 *iface, @@ -284,12 +287,14 @@ static HRESULT dxgi_factory_init(struct dxgi_factory *factory, BOOL extended) factory->IDXGIFactory1_iface.lpVtbl = &dxgi_factory_vtbl; factory->refcount = 1; + wined3d_private_store_init(&factory->private_store); EnterCriticalSection(&dxgi_cs); factory->wined3d = wined3d_create(0); if (!factory->wined3d) { LeaveCriticalSection(&dxgi_cs); + wined3d_private_store_cleanup(&factory->private_store); return DXGI_ERROR_UNSUPPORTED; } @@ -346,6 +351,7 @@ fail: EnterCriticalSection(&dxgi_cs); wined3d_decref(factory->wined3d); LeaveCriticalSection(&dxgi_cs); + wined3d_private_store_cleanup(&factory->private_store); return hr; }

1 0

Henri Verbeet : dxgi: Implement dxgi_adapter_GetPrivateData().
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: 70b2fd3a32a808c81427be5b36ca8e7e46d4d4dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=70b2fd3a32a808c81427be5b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 13 10:40:51 2015 +0100 dxgi: Implement dxgi_adapter_GetPrivateData(). --- dlls/dxgi/adapter.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index b0ed1d8..15a6107 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -99,9 +99,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateDataInterface(IDXGIAdapt static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetPrivateData(IDXGIAdapter1 *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter1(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_get_private_data(&adapter->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetParent(IDXGIAdapter1 *iface, REFIID iid, void **parent)

1 0

Henri Verbeet : dxgi: Implement dxgi_adapter_SetPrivateDataInterface().
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: 141b024eb0c90ce74f98ae46312afc8ef33ae93e URL: http://source.winehq.org/git/wine.git/?a=commit;h=141b024eb0c90ce74f98ae463… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 13 10:40:50 2015 +0100 dxgi: Implement dxgi_adapter_SetPrivateDataInterface(). --- dlls/dxgi/adapter.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 2b1023b..b0ed1d8 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -89,9 +89,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateData(IDXGIAdapter1 *ifac static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateDataInterface(IDXGIAdapter1 *iface, REFGUID guid, const IUnknown *object) { - FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter1(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, object %p.\n", iface, debugstr_guid(guid), object); + + return dxgi_set_private_data_interface(&adapter->private_store, guid, object); } static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetPrivateData(IDXGIAdapter1 *iface,

1 0

Henri Verbeet : dxgi: Implement dxgi_adapter_SetPrivateData().
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: 9dfd95c6cf652ea5ec525fa258582ec11cdc6f4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dfd95c6cf652ea5ec525fa25… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 13 10:40:49 2015 +0100 dxgi: Implement dxgi_adapter_SetPrivateData(). --- dlls/dxgi/adapter.c | 12 ++++++++---- dlls/dxgi/dxgi_private.h | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index a1359f0..2b1023b 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -69,6 +69,7 @@ static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IDXGIAdapter1 *iface) if (!refcount) { IDXGIOutput_Release(adapter->output); + wined3d_private_store_cleanup(&adapter->private_store); HeapFree(GetProcessHeap(), 0, adapter); } @@ -78,9 +79,11 @@ static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IDXGIAdapter1 *iface) static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateData(IDXGIAdapter1 *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter1(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_set_private_data(&adapter->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateDataInterface(IDXGIAdapter1 *iface, @@ -228,11 +231,12 @@ HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, struct dxgi_factory *par adapter->IDXGIAdapter1_iface.lpVtbl = &dxgi_adapter_vtbl; adapter->parent = parent; adapter->refcount = 1; + wined3d_private_store_init(&adapter->private_store); adapter->ordinal = ordinal; - output = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*output)); - if (!output) + if (!(output = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*output)))) { + wined3d_private_store_cleanup(&adapter->private_store); return E_OUTOFMEMORY; } dxgi_output_init(output, adapter); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 55837f9..6653c21 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -129,6 +129,7 @@ struct dxgi_adapter IDXGIAdapter1 IDXGIAdapter1_iface; struct dxgi_factory *parent; LONG refcount; + struct wined3d_private_store private_store; UINT ordinal; IDXGIOutput *output; };

1 0

Henri Verbeet : wined3d: Add support for appending vertex declaration elements.
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: 849149d5d30ced63154f1b54cfb31ebf62c12453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=849149d5d30ced63154f1b54c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 13 10:40:48 2015 +0100 wined3d: Add support for appending vertex declaration elements. --- dlls/d3d10core/inputlayout.c | 2 -- dlls/wined3d/vertexdeclaration.c | 13 +++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++-- include/wine/wined3d.h | 6 ++++-- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index e6ac25e..8350875 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -83,8 +83,6 @@ static HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEME e->usage = 0; e->usage_idx = 0; - if (f->AlignedByteOffset == D3D10_APPEND_ALIGNED_ELEMENT) - FIXME("D3D10_APPEND_ALIGNED_ELEMENT not supported\n"); if (f->InputSlotClass != D3D10_INPUT_PER_VERTEX_DATA) FIXME("Ignoring input slot class (%#x)\n", f->InputSlotClass); if (f->InstanceDataStepRate) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index cf5378c..df3d8ba 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -216,6 +216,19 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara return E_FAIL; } + if (e->offset == WINED3D_APPEND_ALIGNED_ELEMENT) + { + if (!i) + { + e->offset = 0; + } + else + { + struct wined3d_vertex_declaration_element *prev = &declaration->elements[i - 1]; + e->offset = (prev->offset + prev->format->byte_count + 3) & ~3; + } + } + if (e->offset & 0x3) { WARN("Declaration element %u is not 4 byte aligned(%u), returning E_FAIL.\n", i, e->offset); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2c1a00c..d924271 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2422,8 +2422,8 @@ struct wined3d_vertex_declaration_element { const struct wined3d_format *format; BOOL ffp_valid; - WORD input_slot; - WORD offset; + unsigned int input_slot; + unsigned int offset; UINT output_slot; BYTE method; BYTE usage; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2d3336a..089db9e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1494,6 +1494,8 @@ enum wined3d_display_rotation #define WINED3D_SURFACE_DISCARD 0x00000002 #define WINED3D_SURFACE_PIN_SYSMEM 0x00000004 +#define WINED3D_APPEND_ALIGNED_ELEMENT 0xffffffff + struct wined3d_display_mode { UINT width; @@ -1670,8 +1672,8 @@ struct wined3d_clip_status struct wined3d_vertex_element { enum wined3d_format_id format; - WORD input_slot; - WORD offset; + unsigned int input_slot; + unsigned int offset; UINT output_slot; /* D3D 8 & 10 */ BYTE method; BYTE usage;

1 0

Yifu Wang : msvcr120: Fixed bugs in Concurrency::critical_section.
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: a11c8758b2e2c70d4a4cc5ad693b56ef7a5ad05d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a11c8758b2e2c70d4a4cc5ad6… Author: Yifu Wang <ywang(a)esri.com> Date: Tue Dec 30 15:03:36 2014 -0800 msvcr120: Fixed bugs in Concurrency::critical_section. --- dlls/msvcrt/lock.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 328b5b5..6d903dc 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -384,10 +384,11 @@ void __thiscall critical_section_lock(critical_section *this) NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); } - this->unk_active.next = NULL; - if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) - spin_wait_for_next_cs(&q); cs_set_head(this, &q); + if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) { + spin_wait_for_next_cs(&q); + this->unk_active.next = q.next; + } } /* ?try_lock@critical_section@Concurrency@@QAE_NXZ */ @@ -406,11 +407,11 @@ MSVCRT_bool __thiscall critical_section_try_lock(critical_section *this) memset(&q, 0, sizeof(q)); if(!InterlockedCompareExchangePointer(&this->tail, &q, NULL)) { - this->unk_active.next = NULL; - if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) - spin_wait_for_next_cs(&q); - cs_set_head(this, &q); + if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) { + spin_wait_for_next_cs(&q); + this->unk_active.next = q.next; + } return TRUE; } return FALSE; @@ -437,8 +438,10 @@ void __thiscall critical_section_unlock(critical_section *this) break; next = this->unk_active.next; - if(InterlockedCompareExchangePointer(&this->tail, NULL, next) == next) + if(InterlockedCompareExchangePointer(&this->tail, NULL, next) == next) { + HeapFree(GetProcessHeap(), 0, next); return; + } spin_wait_for_next_cs(next); this->unk_active.next = next->next; @@ -491,14 +494,18 @@ MSVCRT_bool __thiscall critical_section_try_lock_for( if(status == STATUS_TIMEOUT) { if(!InterlockedExchange(&q->free, TRUE)) return FALSE; + /* A thread has signaled the event and is block waiting. */ + /* We need to catch the event to wake the thread. */ + NtWaitForKeyedEvent(keyed_event, q, 0, NULL); } } - this->unk_active.next = NULL; - if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, q) != q) + cs_set_head(this, q); + if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, q) != q) { spin_wait_for_next_cs(q); + this->unk_active.next = q->next; + } - cs_set_head(this, q); HeapFree(GetProcessHeap(), 0, q); return TRUE; }

1 0

Mark Harmstone : comctl32: Draw the focus rect on themed checkboxes.
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: f21a968d1cf733dc7d9897780a91b0e73f1e18c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21a968d1cf733dc7d9897780… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Feb 10 22:02:02 2015 +0000 comctl32: Draw the focus rect on themed checkboxes. --- dlls/comctl32/theme_button.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 0f0db6d..3935333 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -47,7 +47,7 @@ typedef enum STATE_DEFAULTED } ButtonState; -typedef void (*pfThemedPaint)(HTHEME theme, HWND hwnd, HDC hdc, ButtonState drawState, UINT dtFlags); +typedef void (*pfThemedPaint)(HTHEME theme, HWND hwnd, HDC hdc, ButtonState drawState, UINT dtFlags, BOOL focused); static UINT get_drawtext_flags(DWORD style, DWORD ex_style) { @@ -100,7 +100,7 @@ static inline WCHAR *get_button_text(HWND hwnd) return text; } -static void PB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags) +static void PB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) { static const int states[] = { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_DEFAULTED }; @@ -125,7 +125,7 @@ static void PB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN if (hPrevFont) SelectObject(hDC, hPrevFont); } -static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags) +static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) { static const int cb_states[3][5] = { @@ -143,8 +143,7 @@ static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN static const int cb_size = 13; RECT bgRect, textRect; - HFONT font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); - HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; + HFONT font, hPrevFont = NULL; LRESULT checkState = SendMessageW(hwnd, BM_GETCHECK, 0, 0); DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); int part = ((dwStyle & BUTTON_TYPE) == BS_RADIOBUTTON) || ((dwStyle & BUTTON_TYPE) == BS_AUTORADIOBUTTON) @@ -154,6 +153,21 @@ static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN ? cb_states[ checkState ][ drawState ] : rb_states[ checkState ][ drawState ]; WCHAR *text = get_button_text(hwnd); + LOGFONTW lf; + BOOL created_font = FALSE; + + HRESULT hr = GetThemeFont(theme, hDC, part, state, TMT_FONT, &lf); + if (SUCCEEDED(hr)) { + font = CreateFontIndirectW(&lf); + if (!font) + TRACE("Failed to create font\n"); + else { + TRACE("font = %s\n", debugstr_w(lf.lfFaceName)); + hPrevFont = SelectObject(hDC, font); + created_font = TRUE; + } + } else + font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); GetClientRect(hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, part, state, &bgRect, &textRect); @@ -172,13 +186,29 @@ static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN if (text) { DrawThemeText(theme, hDC, part, state, text, lstrlenW(text), dtFlags, 0, &textRect); + + if (focused) + { + RECT focusRect; + + focusRect = textRect; + + DrawTextW(hDC, text, lstrlenW(text), &focusRect, dtFlags | DT_CALCRECT); + + if (focusRect.right < textRect.right) focusRect.right++; + focusRect.bottom = textRect.bottom; + + DrawFocusRect( hDC, &focusRect ); + } + HeapFree(GetProcessHeap(), 0, text); } + if (created_font) DeleteObject(font); if (hPrevFont) SelectObject(hDC, hPrevFont); } -static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags) +static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) { static const int states[] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; @@ -281,7 +311,7 @@ static BOOL BUTTON_Paint(HTHEME theme, HWND hwnd, HDC hParamDC) else drawState = STATE_DISABLED; hDC = hParamDC ? hParamDC : BeginPaint(hwnd, &ps); - paint(theme, hwnd, hDC, drawState, dtFlags); + paint(theme, hwnd, hDC, drawState, dtFlags, state & BST_FOCUS); if (!hParamDC) EndPaint(hwnd, &ps); return TRUE; }

1 0

Mark Harmstone : comctl32: Always redraw background on checkbox repaint.
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: b8d3f1fe247290d5751f3c06c1847929410085a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d3f1fe247290d5751f3c06c… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Feb 10 21:58:01 2015 +0000 comctl32: Always redraw background on checkbox repaint. --- dlls/comctl32/theme_button.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 78d7cc4..0f0db6d 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -166,8 +166,8 @@ static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN bgRect.right = bgRect.left + cb_size; textRect.left = bgRect.right + 6; - if (IsThemeBackgroundPartiallyTransparent(theme, part, state)) - DrawThemeParentBackground(hwnd, hDC, NULL); + DrawThemeParentBackground(hwnd, hDC, NULL); + DrawThemeBackground(theme, hDC, part, state, &bgRect, NULL); if (text) {

1 0

Uwe Bonnes : ntdll: Add more serial speed settings.
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: 2148248976d5f1bef8ef12f80f9cf94e9ee869ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=2148248976d5f1bef8ef12f80… Author: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> Date: Thu Feb 12 17:53:28 2015 +0100 ntdll: Add more serial speed settings. --- dlls/ntdll/serial.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index b03ac61..9f73ce6 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -171,6 +171,36 @@ static NTSTATUS get_baud_rate(int fd, SERIAL_BAUD_RATE* sbr) #ifdef B460800 case B460800: sbr->BaudRate = 460800; break; #endif +#ifdef B500000 + case B500000: sbr->BaudRate = 500000; break; +#endif +#ifdef B921600 + case B921600: sbr->BaudRate = 921600; break; +#endif +#ifdef B1000000 + case B1000000: sbr->BaudRate = 1000000; break; +#endif +#ifdef B1152000 + case B1152000: sbr->BaudRate = 1152000; break; +#endif +#ifdef B1500000 + case B1500000: sbr->BaudRate = 1500000; break; +#endif +#ifdef B2000000 + case B2000000: sbr->BaudRate = 2000000; break; +#endif +#ifdef B2500000 + case B2500000: sbr->BaudRate = 2500000; break; +#endif +#ifdef B3000000 + case B3000000: sbr->BaudRate = 3000000; break; +#endif +#ifdef B3500000 + case B3500000: sbr->BaudRate = 3500000; break; +#endif +#ifdef B4000000 + case B4000000: sbr->BaudRate = 4000000; break; +#endif default: ERR("unknown speed %x\n", speed); return STATUS_INVALID_PARAMETER; @@ -478,6 +508,36 @@ static NTSTATUS set_baud_rate(int fd, const SERIAL_BAUD_RATE* sbr) #ifdef B460800 case 460800: cfsetospeed( &port, B460800 ); break; #endif +#ifdef B500000 + case 500000: cfsetospeed( &port, B500000 ); break; +#endif +#ifdef B921600 + case 921600: cfsetospeed( &port, B921600 ); break; +#endif +#ifdef B1000000 + case 1000000: cfsetospeed( &port, B1000000 ); break; +#endif +#ifdef B1152000 + case 1152000: cfsetospeed( &port, B1152000 ); break; +#endif +#ifdef B1500000 + case 1500000: cfsetospeed( &port, B1500000 ); break; +#endif +#ifdef B2000000 + case 2000000: cfsetospeed( &port, B2000000 ); break; +#endif +#ifdef B2500000 + case 2500000: cfsetospeed( &port, B2500000 ); break; +#endif +#ifdef B3000000 + case 3000000: cfsetospeed( &port, B3000000 ); break; +#endif +#ifdef B3500000 + case 3500000: cfsetospeed( &port, B3500000 ); break; +#endif +#ifdef B4000000 + case 4000000: cfsetospeed( &port, B4000000 ); break; +#endif default: #if defined (HAVE_LINUX_SERIAL_H) && defined (TIOCSSERIAL) {

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
42
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 February 2015