May 2016 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Added IHTMLWindow2:: onunload property implementation.
by Alexandre Julliard May 26, 2016

May 26, 2016

Module: wine Branch: master Commit: 7d2bba46479866d5e532e5188370027fdd9807b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2bba46479866d5e532e5188… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 26 16:16:09 2016 +0200 mshtml: Added IHTMLWindow2::onunload property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 7 ++++++- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlwindow.c | 12 ++++++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 43e742f..0477e91 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -141,6 +141,9 @@ static const WCHAR onselectstartW[] = {'o','n','s','e','l','e','c','t','s','t',' static const WCHAR submitW[] = {'s','u','b','m','i','t',0}; static const WCHAR onsubmitW[] = {'o','n','s','u','b','m','i','t',0}; +static const WCHAR unloadW[] = {'u','n','l','o','a','d',0}; +static const WCHAR onunloadW[] = {'o','n','u','n','l','o','a','d',0}; + static const WCHAR HTMLEventsW[] = {'H','T','M','L','E','v','e','n','t','s',0}; static const WCHAR KeyboardEventW[] = {'K','e','y','b','o','a','r','d','E','v','e','n','t',0}; static const WCHAR MouseEventW[] = {'M','o','u','s','e','E','v','e','n','t',0}; @@ -239,7 +242,9 @@ static const event_info_t event_info[] = { {selectstartW, onselectstartW, EVENTT_MOUSE, DISPID_EVMETH_ONSELECTSTART, EVENT_CANCELABLE}, {submitW, onsubmitW, EVENTT_HTML, DISPID_EVMETH_ONSUBMIT, - EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE|EVENT_HASDEFAULTHANDLERS} + EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE|EVENT_HASDEFAULTHANDLERS}, + {unloadW, onunloadW, EVENTT_HTML, DISPID_EVMETH_ONUNLOAD, + EVENT_FIXME} }; eventid_t str_to_eid(LPCWSTR str) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index f723ef6..cc16fd8 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -49,6 +49,7 @@ typedef enum { EVENTID_SCROLL, EVENTID_SELECTSTART, EVENTID_SUBMIT, + EVENTID_UNLOAD, EVENTID_LAST } eventid_t; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 5f46c2a..2e33c0b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1128,15 +1128,19 @@ static HRESULT WINAPI HTMLWindow2_get_onbeforeunload(IHTMLWindow2 *iface, VARIAN static HRESULT WINAPI HTMLWindow2_put_onunload(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_window_event(This, EVENTID_UNLOAD, &v); } static HRESULT WINAPI HTMLWindow2_get_onunload(IHTMLWindow2 *iface, VARIANT *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_window_event(This, EVENTID_UNLOAD, p); } static HRESULT WINAPI HTMLWindow2_put_onhelp(IHTMLWindow2 *iface, VARIANT v)

1 0

Alistair Leslie-Hughes : d3d11/tests: Test for ID3D11InfoQueue interface.
by Alexandre Julliard May 26, 2016

May 26, 2016

Module: wine Branch: master Commit: 5e9826a6a4f30fa3cd7ab76ee2d41dce9ad1d59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e9826a6a4f30fa3cd7ab76ee… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 26 08:06:40 2016 +0000 d3d11/tests: Test for ID3D11InfoQueue interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0b73b2c..a737771 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -886,6 +886,9 @@ static void test_device_interfaces(void) todo_wine ok(hr == E_NOINTERFACE, "Device should not implement ID3D10Device interface, hr %#x.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(iface); + hr = ID3D11Device_QueryInterface(device, &IID_ID3D11InfoQueue, (void **)&iface); + ok(hr == E_NOINTERFACE, "Found ID3D11InfoQueue interface in non-debug mode, hr %#x.\n", hr); + hr = ID3D11Device_QueryInterface(device, &IID_ID3D10Device1, (void **)&iface); todo_wine ok(hr == E_NOINTERFACE, "Device should not implement ID3D10Device1 interface, hr %#x.\n", hr); if (SUCCEEDED(hr)) IUnknown_Release(iface); @@ -893,6 +896,26 @@ static void test_device_interfaces(void) refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); } + + for (i = 0; i < sizeof(d3d11_feature_levels) / sizeof(*d3d11_feature_levels); ++i) + { + struct device_desc device_desc; + + device_desc.feature_level = &d3d11_feature_levels[i]; + device_desc.flags = D3D11_CREATE_DEVICE_DEBUG; + if (!(device = create_device(&device_desc))) + { + skip("Failed to create device for feature level %#x.\n", d3d11_feature_levels[i]); + continue; + } + + hr = ID3D11Device_QueryInterface(device, &IID_ID3D11InfoQueue, (void **)&iface); + todo_wine ok(hr == S_OK, "Device should implement ID3D11InfoQueue interface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } } static void test_get_immediate_context(void)

1 0

Alexandre Julliard : winex11: Subtract the tray window from the work area in desktop mode.
by Alexandre Julliard May 26, 2016

May 26, 2016

Module: wine Branch: master Commit: 6c6814056f067f863a4cf47f756c9336dcdf8afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c6814056f067f863a4cf47f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 21:47:51 2016 +0900 winex11: Subtract the tray window from the work area in desktop mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xinerama.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 7e28726..0419535 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -87,6 +87,20 @@ static void query_work_area( RECT *rc_work ) } } +static void query_desktop_work_area( RECT *rc_work ) +{ + static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; + RECT rect; + HWND hwnd = FindWindowW( trayW, NULL ); + + if (!hwnd || !IsWindowVisible( hwnd )) return; + if (!GetWindowRect( hwnd, &rect )) return; + if (rect.top) rc_work->bottom = rect.top; + else rc_work->top = rect.bottom; + TRACE( "found tray %p %s work area %s\n", hwnd, + wine_dbgstr_rect( &rect ), wine_dbgstr_rect( rc_work )); +} + #ifdef SONAME_LIBXINERAMA #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -198,6 +212,8 @@ void xinerama_init( unsigned int width, unsigned int height ) default_monitor.rcWork = default_monitor.rcMonitor = rect; if (root_window == DefaultRootWindow( gdi_display )) query_work_area( &default_monitor.rcWork ); + else + query_desktop_work_area( &default_monitor.rcWork ); nb_monitors = 1; monitors = &default_monitor; }

1 0

Alexandre Julliard : user32: Use the monitor rectangle to position icons on the desktop.
by Alexandre Julliard May 26, 2016

May 26, 2016

Module: wine Branch: master Commit: b4bccfee05ac49e1c685d86c6ac3cea375f07381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4bccfee05ac49e1c685d86c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 16:38:36 2016 +0900 user32: Use the monitor rectangle to position icons on the desktop. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index e0e4a62..cf54329 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -859,7 +859,17 @@ static POINT WINPOS_FindIconPos( HWND hwnd, POINT pt ) SystemParametersInfoW( SPI_GETMINIMIZEDMETRICS, sizeof(metrics), &metrics, 0 ); parent = GetAncestor( hwnd, GA_PARENT ); - GetClientRect( parent, &rectParent ); + if (parent == GetDesktopWindow()) + { + MONITORINFO mon_info; + HMONITOR monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ); + + mon_info.cbSize = sizeof( mon_info ); + GetMonitorInfoW( monitor, &mon_info ); + rectParent = mon_info.rcWork; + } + else GetClientRect( parent, &rectParent ); + if ((pt.x >= rectParent.left) && (pt.x + GetSystemMetrics(SM_CXICON) < rectParent.right) && (pt.y >= rectParent.top) && (pt.y + GetSystemMetrics(SM_CYICON) < rectParent.bottom)) return pt; /* The icon already has a suitable position */ @@ -2486,7 +2496,18 @@ UINT WINAPI ArrangeIconicWindows( HWND parent ) metrics.cbSize = sizeof(metrics); SystemParametersInfoW( SPI_GETMINIMIZEDMETRICS, sizeof(metrics), &metrics, 0 ); - GetClientRect( parent, &rectParent ); + + if (parent == GetDesktopWindow()) + { + MONITORINFO mon_info; + HMONITOR monitor = MonitorFromWindow( 0, MONITOR_DEFAULTTOPRIMARY ); + + mon_info.cbSize = sizeof( mon_info ); + GetMonitorInfoW( monitor, &mon_info ); + rectParent = mon_info.rcWork; + } + else GetClientRect( parent, &rectParent ); + x = y = 0; xspacing = GetSystemMetrics(SM_CXICONSPACING); yspacing = GetSystemMetrics(SM_CYICONSPACING);

1 0

Henri Verbeet : d3d10: Initialise the type tree in D3D10CreateEffectFromMemory() (AFL).
by Alexandre Julliard May 26, 2016

May 26, 2016

Module: wine Branch: master Commit: c8ef7e835caacb807996a2beb0335ef6baf304dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8ef7e835caacb807996a2beb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 25 20:04:05 2016 +0200 d3d10: Initialise the type tree in D3D10CreateEffectFromMemory() (AFL). Otherwise we'd crash if we failed parsing the effect before parse_fx10_body(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_main.c | 23 +++++++++++++++++++++++ dlls/d3d10/effect.c | 22 ---------------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 0f2af09..6ca75b6 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -199,6 +199,22 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER return S_OK; } +static int d3d10_effect_type_compare(const void *key, const struct wine_rb_entry *entry) +{ + const struct d3d10_effect_type *t = WINE_RB_ENTRY_VALUE(entry, const struct d3d10_effect_type, entry); + const DWORD *id = key; + + return *id - t->id; +} + +static const struct wine_rb_functions d3d10_effect_type_rb_functions = +{ + d3d10_rb_alloc, + d3d10_rb_realloc, + d3d10_rb_free, + d3d10_effect_type_compare, +}; + HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect) { @@ -215,6 +231,13 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl return E_OUTOFMEMORY; } + if (wine_rb_init(&object->types, &d3d10_effect_type_rb_functions) == -1) + { + ERR("Failed to initialize type rbtree.\n"); + HeapFree(GetProcessHeap(), 0, object); + return E_FAIL; + } + object->ID3D10Effect_iface.lpVtbl = &d3d10_effect_vtbl; object->refcount = 1; ID3D10Device_AddRef(device); diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 1ce022b..6955445 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2066,14 +2066,6 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, return S_OK; } -static int d3d10_effect_type_compare(const void *key, const struct wine_rb_entry *entry) -{ - const struct d3d10_effect_type *t = WINE_RB_ENTRY_VALUE(entry, const struct d3d10_effect_type, entry); - const DWORD *id = key; - - return *id - t->id; -} - static void d3d10_effect_type_member_destroy(struct d3d10_effect_type_member *typem) { TRACE("effect type member %p.\n", typem); @@ -2110,26 +2102,12 @@ static void d3d10_effect_type_destroy(struct wine_rb_entry *entry, void *context HeapFree(GetProcessHeap(), 0, t); } -static const struct wine_rb_functions d3d10_effect_type_rb_functions = -{ - d3d10_rb_alloc, - d3d10_rb_realloc, - d3d10_rb_free, - d3d10_effect_type_compare, -}; - static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD data_size) { const char *ptr = data + e->index_offset; unsigned int i; HRESULT hr; - if (wine_rb_init(&e->types, &d3d10_effect_type_rb_functions) == -1) - { - ERR("Failed to initialize type rbtree.\n"); - return E_FAIL; - } - if (!(e->local_buffers = d3d10_calloc(e->local_buffer_count, sizeof(*e->local_buffers)))) { ERR("Failed to allocate local buffer memory.\n");

1 0

Henri Verbeet : d3d10: Introduce fx10_copy_string() (AFL).
by Alexandre Julliard May 26, 2016

May 26, 2016

Module: wine Branch: master Commit: d76f7f12042b1c82002537b2d7b6823fdb778238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76f7f12042b1c82002537b2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 25 20:04:02 2016 +0200 d3d10: Introduce fx10_copy_string() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 142 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 90 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d76f7f12042b1c8200253…

1 0

Henri Verbeet : d3d10: Introduce a helper function to allocate arrays (AFL ).
by Alexandre Julliard May 26, 2016

May 26, 2016

Module: wine Branch: master Commit: 775c7edbc3d687ee082c9d31d199c4aaa395c4e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=775c7edbc3d687ee082c9d31d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 25 20:04:01 2016 +0200 d3d10: Introduce a helper function to allocate arrays (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 7 ++++++ dlls/d3d10/effect.c | 54 ++++++++++++++++------------------------------ 2 files changed, 25 insertions(+), 36 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index dc41224..6f75295 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -282,6 +282,13 @@ HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte HRESULT parse_dxbc(const char *data, SIZE_T data_size, HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) DECLSPEC_HIDDEN; +static inline void *d3d10_calloc(SIZE_T count, SIZE_T size) +{ + if (count > ~(SIZE_T)0 / size) + return NULL; + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, count * size); +} + static inline void read_dword(const char **ptr, DWORD *d) { memcpy(d, *ptr, sizeof(*d)); diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index df35640..2e1d2c6 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -310,8 +310,7 @@ static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct return E_INVALIDARG; } - e = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*e)); - if (!e) + if (!(e = d3d10_calloc(count, sizeof(*e)))) { ERR("Failed to allocate signature memory.\n"); return E_OUTOFMEMORY; @@ -621,8 +620,7 @@ static HRESULT parse_fx10_type(struct d3d10_effect_type *t, const char *ptr, con t->basetype = 0; t->type_class = D3D10_SVC_STRUCT; - t->members = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, t->member_count * sizeof(*t->members)); - if (!t->members) + if (!(t->members = d3d10_calloc(t->member_count, sizeof(*t->members)))) { ERR("Failed to allocate members memory.\n"); return E_OUTOFMEMORY; @@ -866,8 +864,7 @@ static HRESULT copy_variableinfo_from_type(struct d3d10_effect_variable *v) if (v->type->member_count) { - v->members = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, v->type->member_count * sizeof(*v->members)); - if (!v->members) + if (!(v->members = d3d10_calloc(v->type->member_count, sizeof(*v->members)))) { ERR("Failed to allocate members memory.\n"); return E_OUTOFMEMORY; @@ -909,8 +906,7 @@ static HRESULT copy_variableinfo_from_type(struct d3d10_effect_variable *v) { unsigned int bufferoffset = v->buffer_offset; - v->elements = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, v->type->element_count * sizeof(*v->elements)); - if (!v->elements) + if (!(v->elements = d3d10_calloc(v->type->element_count, sizeof(*v->elements)))) { ERR("Failed to allocate elements memory.\n"); return E_OUTOFMEMORY; @@ -1464,8 +1460,7 @@ static HRESULT parse_fx10_pass(struct d3d10_effect_pass *p, const char **ptr, co read_dword(ptr, &p->annotation_count); TRACE("Pass has %u annotations.\n", p->annotation_count); - p->annotations = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, p->annotation_count * sizeof(*p->annotations)); - if (!p->annotations) + if (!(p->annotations = d3d10_calloc(p->annotation_count, sizeof(*p->annotations)))) { ERR("Failed to allocate pass annotations memory.\n"); return E_OUTOFMEMORY; @@ -1482,8 +1477,7 @@ static HRESULT parse_fx10_pass(struct d3d10_effect_pass *p, const char **ptr, co if (FAILED(hr)) return hr; } - p->objects = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, p->object_count * sizeof(*p->objects)); - if (!p->objects) + if (!(p->objects = d3d10_calloc(p->object_count, sizeof(*p->objects)))) { ERR("Failed to allocate effect objects memory.\n"); return E_OUTOFMEMORY; @@ -1528,8 +1522,7 @@ static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char read_dword(ptr, &t->annotation_count); TRACE("Technique has %u annotations.\n", t->annotation_count); - t->annotations = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, t->annotation_count * sizeof(*t->annotations)); - if (!t->annotations) + if (!(t->annotations = d3d10_calloc(t->annotation_count, sizeof(*t->annotations)))) { ERR("Failed to allocate technique annotations memory.\n"); return E_OUTOFMEMORY; @@ -1546,8 +1539,7 @@ static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char if (FAILED(hr)) return hr; } - t->passes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, t->pass_count * sizeof(*t->passes)); - if (!t->passes) + if (!(t->passes = d3d10_calloc(t->pass_count, sizeof(*t->passes)))) { ERR("Failed to allocate passes memory\n"); return E_OUTOFMEMORY; @@ -1597,8 +1589,7 @@ static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char * read_dword(ptr, &v->annotation_count); TRACE("Variable has %u annotations.\n", v->annotation_count); - v->annotations = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, v->annotation_count * sizeof(*v->annotations)); - if (!v->annotations) + if (!(v->annotations = d3d10_calloc(v->annotation_count, sizeof(*v->annotations)))) { ERR("Failed to allocate variable annotations memory.\n"); return E_OUTOFMEMORY; @@ -1771,8 +1762,7 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const read_dword(ptr, &v->annotation_count); TRACE("Variable has %u annotations.\n", v->annotation_count); - v->annotations = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, v->annotation_count * sizeof(*v->annotations)); - if (!v->annotations) + if (!(v->annotations = d3d10_calloc(v->annotation_count, sizeof(*v->annotations)))) { ERR("Failed to allocate variable annotations memory.\n"); return E_OUTOFMEMORY; @@ -1860,8 +1850,7 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_variable *l, const ch read_dword(ptr, &l->annotation_count); TRACE("Local buffer has %u annotations.\n", l->annotation_count); - l->annotations = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, l->annotation_count * sizeof(*l->annotations)); - if (!l->annotations) + if (!(l->annotations = d3d10_calloc(l->annotation_count, sizeof(*l->annotations)))) { ERR("Failed to allocate local buffer annotations memory.\n"); return E_OUTOFMEMORY; @@ -1878,15 +1867,13 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_variable *l, const ch if (FAILED(hr)) return hr; } - l->members = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, l->type->member_count * sizeof(*l->members)); - if (!l->members) + if (!(l->members = d3d10_calloc(l->type->member_count, sizeof(*l->members)))) { ERR("Failed to allocate members memory.\n"); return E_OUTOFMEMORY; } - l->type->members = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, l->type->member_count * sizeof(*l->type->members)); - if (!l->type->members) + if (!(l->type->members = d3d10_calloc(l->type->member_count, sizeof(*l->type->members)))) { ERR("Failed to allocate type members memory.\n"); return E_OUTOFMEMORY; @@ -2048,36 +2035,31 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d return E_FAIL; } - e->local_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, e->local_buffer_count * sizeof(*e->local_buffers)); - if (!e->local_buffers) + if (!(e->local_buffers = d3d10_calloc(e->local_buffer_count, sizeof(*e->local_buffers)))) { ERR("Failed to allocate local buffer memory.\n"); return E_OUTOFMEMORY; } - e->local_variables = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, e->local_variable_count * sizeof(*e->local_variables)); - if (!e->local_variables) + if (!(e->local_variables = d3d10_calloc(e->local_variable_count, sizeof(*e->local_variables)))) { ERR("Failed to allocate local variable memory.\n"); return E_OUTOFMEMORY; } - e->anonymous_shaders = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, e->anonymous_shader_count * sizeof(*e->anonymous_shaders)); - if (!e->anonymous_shaders) + if (!(e->anonymous_shaders = d3d10_calloc(e->anonymous_shader_count, sizeof(*e->anonymous_shaders)))) { ERR("Failed to allocate anonymous shaders memory\n"); return E_OUTOFMEMORY; } - e->used_shaders = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, e->used_shader_count * sizeof(*e->used_shaders)); - if (!e->used_shaders) + if (!(e->used_shaders = d3d10_calloc(e->used_shader_count, sizeof(*e->used_shaders)))) { ERR("Failed to allocate used shaders memory\n"); return E_OUTOFMEMORY; } - e->techniques = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, e->technique_count * sizeof(*e->techniques)); - if (!e->techniques) + if (!(e->techniques = d3d10_calloc(e->technique_count, sizeof(*e->techniques)))) { ERR("Failed to allocate techniques memory\n"); return E_OUTOFMEMORY;

1 0

Alexandre Julliard : user32: Take the arrange flags into account when positioning icon windows.
by Alexandre Julliard May 26, 2016

May 26, 2016

Module: wine Branch: master Commit: 100239d90fb7e3bb1d83a165c60e4280c7a4276e URL: http://source.winehq.org/git/wine.git/?a=commit;h=100239d90fb7e3bb1d83a165c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 13:53:37 2016 +0900 user32: Take the arrange flags into account when positioning icon windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 61 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 14 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 4915aad..e0e4a62 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -852,7 +852,11 @@ static POINT WINPOS_FindIconPos( HWND hwnd, POINT pt ) RECT rect, rectParent; HWND parent, child; HRGN hrgn, tmp; - int xspacing, yspacing; + int x, y, xspacing, yspacing; + MINIMIZEDMETRICS metrics; + + metrics.cbSize = sizeof(metrics); + SystemParametersInfoW( SPI_GETMINIMIZEDMETRICS, sizeof(metrics), &metrics, 0 ); parent = GetAncestor( hwnd, GA_PARENT ); GetClientRect( parent, &rectParent ); @@ -868,7 +872,7 @@ static POINT WINPOS_FindIconPos( HWND hwnd, POINT pt ) hrgn = CreateRectRgn( 0, 0, 0, 0 ); tmp = CreateRectRgn( 0, 0, 0, 0 ); - for (child = GetWindow( parent, GW_HWNDFIRST ); child; child = GetWindow( child, GW_HWNDNEXT )) + for (child = GetWindow( parent, GW_CHILD ); child; child = GetWindow( child, GW_HWNDNEXT )) { if (child == hwnd) continue; if ((GetWindowLongW( child, GWL_STYLE ) & (WS_VISIBLE|WS_MINIMIZE)) != (WS_VISIBLE|WS_MINIMIZE)) @@ -881,12 +885,30 @@ static POINT WINPOS_FindIconPos( HWND hwnd, POINT pt ) } DeleteObject( tmp ); - for (rect.bottom = rectParent.bottom; rect.bottom >= yspacing; rect.bottom -= yspacing) + for (y = 0; y < (rectParent.bottom - rectParent.top) / yspacing; y++) { - for (rect.left = rectParent.left; rect.left <= rectParent.right - xspacing; rect.left += xspacing) + if (metrics.iArrange & ARW_STARTTOP) { - rect.right = rect.left + xspacing; + rect.top = rectParent.top + y * yspacing; + rect.bottom = rect.top + yspacing; + } + else + { + rect.bottom = rectParent.bottom - y * yspacing; rect.top = rect.bottom - yspacing; + } + for (x = 0; x < (rectParent.right - rectParent.left) / xspacing; x++) + { + if (metrics.iArrange & ARW_STARTRIGHT) + { + rect.right = rectParent.right - x * xspacing; + rect.left = rect.right - xspacing; + } + else + { + rect.left = rectParent.left + x * xspacing; + rect.right = rect.left + xspacing; + } if (!RectInRegion( hrgn, &rect )) { /* No window was found, so it's OK for us */ @@ -2459,10 +2481,13 @@ UINT WINAPI ArrangeIconicWindows( HWND parent ) RECT rectParent; HWND hwndChild; INT x, y, xspacing, yspacing; + POINT pt; + MINIMIZEDMETRICS metrics; + metrics.cbSize = sizeof(metrics); + SystemParametersInfoW( SPI_GETMINIMIZEDMETRICS, sizeof(metrics), &metrics, 0 ); GetClientRect( parent, &rectParent ); - x = rectParent.left; - y = rectParent.bottom; + x = y = 0; xspacing = GetSystemMetrics(SM_CXICONSPACING); yspacing = GetSystemMetrics(SM_CYICONSPACING); @@ -2473,17 +2498,25 @@ UINT WINAPI ArrangeIconicWindows( HWND parent ) { WINPOS_ShowIconTitle( hwndChild, FALSE ); - SetWindowPos( hwndChild, 0, x + (xspacing - GetSystemMetrics(SM_CXICON)) / 2, - y - yspacing - GetSystemMetrics(SM_CYICON)/2, 0, 0, - SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); + if (metrics.iArrange & ARW_STARTRIGHT) + pt.x = rectParent.right - (x + 1) * xspacing; + else + pt.x = rectParent.left + x * xspacing; + if (metrics.iArrange & ARW_STARTTOP) + pt.y = rectParent.top + y * yspacing; + else + pt.y = rectParent.bottom - (y + 1) * yspacing; + + SetWindowPos( hwndChild, 0, pt.x + (xspacing - GetSystemMetrics(SM_CXICON)) / 2, + pt.y + (yspacing - GetSystemMetrics(SM_CYICON)) / 2, 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); if( IsWindow(hwndChild) ) WINPOS_ShowIconTitle(hwndChild , TRUE ); - if (x <= rectParent.right - xspacing) x += xspacing; - else + if (++x >= (rectParent.right - rectParent.left) / xspacing) { - x = rectParent.left; - y -= yspacing; + x = 0; + y++; } } hwndChild = GetWindow( hwndChild, GW_HWNDNEXT );

1 0

Henri Verbeet : d3d10: Validate offsets and sizes in read_value_list() ( AFL).
by Alexandre Julliard May 26, 2016

May 26, 2016

Module: wine Branch: master Commit: 6042c2a36bde1c7ce7c8046bd9f1ee31d2be516c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6042c2a36bde1c7ce7c8046bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 25 20:04:04 2016 +0200 d3d10: Validate offsets and sizes in read_value_list() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 378f23f..1ce022b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1178,17 +1178,31 @@ static BOOL read_int8_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, INT8 } } -static BOOL read_value_list(const char *ptr, D3D_SHADER_VARIABLE_TYPE out_type, - UINT out_base, UINT out_size, void *out_data) +static BOOL read_value_list(const char *data, size_t data_size, DWORD offset, + D3D_SHADER_VARIABLE_TYPE out_type, UINT out_base, UINT out_size, void *out_data) { D3D_SHADER_VARIABLE_TYPE in_type; + const char *ptr; DWORD t, value; DWORD count, i; + if (offset >= data_size || !require_space(offset, 1, sizeof(count), data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + return FALSE; + } + + ptr = data + offset; read_dword(&ptr, &count); if (count != out_size) return FALSE; + if (!require_space(ptr - data, count, 2 * sizeof(DWORD), data_size)) + { + WARN("Invalid value count %#x (offset %#x, data size %#lx).\n", count, offset, (long)data_size); + return FALSE; + } + TRACE("%u values:\n", count); for (i = 0; i < count; ++i) { @@ -1228,8 +1242,8 @@ static BOOL read_value_list(const char *ptr, D3D_SHADER_VARIABLE_TYPE out_type, return TRUE; } -static BOOL parse_fx10_state_group(const char **ptr, const char *data, - D3D_SHADER_VARIABLE_TYPE container_type, void *container) +static BOOL parse_fx10_state_group(const char *data, size_t data_size, + const char **ptr, D3D_SHADER_VARIABLE_TYPE container_type, void *container) { const struct d3d10_effect_state_property_info *property_info; UINT value_offset; @@ -1269,7 +1283,7 @@ static BOOL parse_fx10_state_group(const char **ptr, const char *data, return FALSE; } - if (!read_value_list(data + value_offset, property_info->type, idx, + if (!read_value_list(data, data_size, value_offset, property_info->type, idx, property_info->size, (char *)container + property_info->offset)) { ERR("Failed to read values for property %#x.\n", id); @@ -1335,7 +1349,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; case D3D10_EOT_STENCIL_REF: - if (!read_value_list(data + offset, D3D10_SVT_UINT, 0, 1, &o->pass->stencil_ref)) + if (!read_value_list(data, data_size, offset, D3D10_SVT_UINT, 0, 1, &o->pass->stencil_ref)) { ERR("Failed to read stencil ref.\n"); return E_FAIL; @@ -1343,7 +1357,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; case D3D10_EOT_SAMPLE_MASK: - if (!read_value_list(data + offset, D3D10_SVT_UINT, 0, 1, &o->pass->sample_mask)) + if (!read_value_list(data, data_size, offset, D3D10_SVT_UINT, 0, 1, &o->pass->sample_mask)) { FIXME("Failed to read sample mask.\n"); return E_FAIL; @@ -1351,7 +1365,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; case D3D10_EOT_BLEND_FACTOR: - if (!read_value_list(data + offset, D3D10_SVT_FLOAT, 0, 4, &o->pass->blend_factor[0])) + if (!read_value_list(data, data_size, offset, D3D10_SVT_FLOAT, 0, 4, &o->pass->blend_factor[0])) { FIXME("Failed to read blend factor.\n"); return E_FAIL; @@ -1822,7 +1836,7 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, var = v; memcpy(&var->u.state.desc, storage_info->default_state, storage_info->size); - if (!parse_fx10_state_group(ptr, data, var->type->basetype, &var->u.state.desc)) + if (!parse_fx10_state_group(data, data_size, ptr, var->type->basetype, &var->u.state.desc)) { ERR("Failed to read property list.\n"); return E_FAIL;

1 0

Alexandre Julliard : user32: Make spacing consistent between DrawCaptionTemp and NC_DrawCaption.
by Alexandre Julliard May 26, 2016

May 26, 2016

Module: wine Branch: master Commit: 5fdcacad0ad73195cd52250a23f3b489f16a7a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fdcacad0ad73195cd52250a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 22:12:08 2016 +0900 user32: Make spacing consistent between DrawCaptionTemp and NC_DrawCaption. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index d3598b1..3352e46 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -312,12 +312,13 @@ BOOL WINAPI DrawCaptionTempW (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, if (!hIcon) hIcon = NC_IconForWindow(hwnd); DrawIconEx (hdc, pt.x, pt.y, hIcon, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0, 0, DI_NORMAL); - rc.left += (rc.bottom - rc.top); + rc.left = pt.x + GetSystemMetrics( SM_CXSMICON ); } /* drawing text */ if (uFlags & DC_TEXT) { HFONT hOldFont; + WCHAR text[128]; if (uFlags & DC_INBUTTON) SetTextColor (hdc, GetSysColor (COLOR_BTNTEXT)); @@ -340,16 +341,14 @@ BOOL WINAPI DrawCaptionTempW (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, hOldFont = SelectObject (hdc, hNewFont); } - if (str) - DrawTextW (hdc, str, -1, &rc, - DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_LEFT); - else { - WCHAR szText[128]; - INT nLen; - nLen = GetWindowTextW (hwnd, szText, 128); - DrawTextW (hdc, szText, nLen, &rc, - DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_LEFT); + if (!str) + { + if (!GetWindowTextW( hwnd, text, sizeof(text)/sizeof(WCHAR) )) text[0] = 0; + str = text; } + rc.left += 2; + DrawTextW( hdc, str, -1, &rc, ((uFlags & 0x4000) ? DT_CENTER : DT_LEFT) | + DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_END_ELLIPSIS ); if (hFont) SelectObject (hdc, hOldFont);

1 0