June 2016 - Wine-commits - list.winehq.org

Józef Kucia : d3d11: Rename set_{ds, rt, sr}desc_from_resource() functions.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 599aa89fb0c45a4b272c017a1086867898c987b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=599aa89fb0c45a4b272c017a1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 17 10:41:46 2016 +0200 d3d11: Rename set_{ds, rt, sr}desc_from_resource() functions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index c5263ef..122253c 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); -static HRESULT set_dsdesc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Resource *resource) +static HRESULT set_dsv_desc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Resource *resource) { D3D11_RESOURCE_DIMENSION dimension; @@ -114,7 +114,7 @@ static HRESULT set_dsdesc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3 } default: - FIXME("Unhandled resource dimension %#x.\n", dimension); + ERR("Unhandled resource dimension %#x.\n", dimension); case D3D11_RESOURCE_DIMENSION_BUFFER: case D3D11_RESOURCE_DIMENSION_TEXTURE3D: return E_INVALIDARG; @@ -204,7 +204,7 @@ static HRESULT normalize_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Res return S_OK; } -static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resource *resource) +static HRESULT set_rtv_desc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resource *resource) { D3D11_RESOURCE_DIMENSION dimension; HRESULT hr; @@ -438,7 +438,7 @@ static HRESULT normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Res return S_OK; } -static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Resource *resource) +static HRESULT set_srv_desc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Resource *resource) { D3D11_RESOURCE_DIMENSION dimension; @@ -551,7 +551,7 @@ static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, I } default: - FIXME("Unhandled resource dimension %#x.\n", dimension); + ERR("Unhandled resource dimension %#x.\n", dimension); case D3D11_RESOURCE_DIMENSION_BUFFER: return E_INVALIDARG; } @@ -1043,7 +1043,7 @@ static HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, st if (!desc) { - hr = set_dsdesc_from_resource(&view->desc, resource); + hr = set_dsv_desc_from_resource(&view->desc, resource); } else { @@ -1466,7 +1466,7 @@ static HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, st if (!desc) { - hr = set_rtdesc_from_resource(&view->desc, resource); + hr = set_rtv_desc_from_resource(&view->desc, resource); } else { @@ -1935,7 +1935,7 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi if (!desc) { - hr = set_srdesc_from_resource(&view->desc, resource); + hr = set_srv_desc_from_resource(&view->desc, resource); } else {

1 0

Józef Kucia : d3d11: Replace "This" with "device".
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 18069aaa019a6b60bb9fd22266f0a9b3403700cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=18069aaa019a6b60bb9fd2226… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 17 10:41:47 2016 +0200 d3d11: Replace "This" with "device". Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0e4ef97..843639a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2867,20 +2867,20 @@ static ULONG STDMETHODCALLTYPE d3d_device_inner_Release(IUnknown *iface) static HRESULT STDMETHODCALLTYPE d3d10_device_QueryInterface(ID3D10Device1 *iface, REFIID riid, void **ppv) { - struct d3d_device *This = impl_from_ID3D10Device(iface); - return IUnknown_QueryInterface(This->outer_unk, riid, ppv); + struct d3d_device *device = impl_from_ID3D10Device(iface); + return IUnknown_QueryInterface(device->outer_unk, riid, ppv); } static ULONG STDMETHODCALLTYPE d3d10_device_AddRef(ID3D10Device1 *iface) { - struct d3d_device *This = impl_from_ID3D10Device(iface); - return IUnknown_AddRef(This->outer_unk); + struct d3d_device *device = impl_from_ID3D10Device(iface); + return IUnknown_AddRef(device->outer_unk); } static ULONG STDMETHODCALLTYPE d3d10_device_Release(ID3D10Device1 *iface) { - struct d3d_device *This = impl_from_ID3D10Device(iface); - return IUnknown_Release(This->outer_unk); + struct d3d_device *device = impl_from_ID3D10Device(iface); + return IUnknown_Release(device->outer_unk); } /* ID3D10Device methods */ @@ -2928,13 +2928,13 @@ static void STDMETHODCALLTYPE d3d10_device_PSSetShaderResources(ID3D10Device1 *i static void STDMETHODCALLTYPE d3d10_device_PSSetShader(ID3D10Device1 *iface, ID3D10PixelShader *shader) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_pixel_shader *ps = unsafe_impl_from_ID3D10PixelShader(shader); TRACE("iface %p, shader %p\n", iface, shader); wined3d_mutex_lock(); - wined3d_device_set_pixel_shader(This->wined3d_device, ps ? ps->wined3d_shader : NULL); + wined3d_device_set_pixel_shader(device->wined3d_device, ps ? ps->wined3d_shader : NULL); wined3d_mutex_unlock(); } @@ -2961,40 +2961,40 @@ static void STDMETHODCALLTYPE d3d10_device_PSSetSamplers(ID3D10Device1 *iface, static void STDMETHODCALLTYPE d3d10_device_VSSetShader(ID3D10Device1 *iface, ID3D10VertexShader *shader) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_vertex_shader *vs = unsafe_impl_from_ID3D10VertexShader(shader); TRACE("iface %p, shader %p\n", iface, shader); wined3d_mutex_lock(); - wined3d_device_set_vertex_shader(This->wined3d_device, vs ? vs->wined3d_shader : NULL); + wined3d_device_set_vertex_shader(device->wined3d_device, vs ? vs->wined3d_shader : NULL); wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_DrawIndexed(ID3D10Device1 *iface, UINT index_count, UINT start_index_location, INT base_vertex_location) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); TRACE("iface %p, index_count %u, start_index_location %u, base_vertex_location %d.\n", iface, index_count, start_index_location, base_vertex_location); wined3d_mutex_lock(); - wined3d_device_set_base_vertex_index(This->wined3d_device, base_vertex_location); - wined3d_device_draw_indexed_primitive(This->wined3d_device, start_index_location, index_count); + wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_location); + wined3d_device_draw_indexed_primitive(device->wined3d_device, start_index_location, index_count); wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_Draw(ID3D10Device1 *iface, UINT vertex_count, UINT start_vertex_location) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); TRACE("iface %p, vertex_count %u, start_vertex_location %u\n", iface, vertex_count, start_vertex_location); wined3d_mutex_lock(); - wined3d_device_draw_primitive(This->wined3d_device, start_vertex_location, vertex_count); + wined3d_device_draw_primitive(device->wined3d_device, start_vertex_location, vertex_count); wined3d_mutex_unlock(); } @@ -3021,13 +3021,13 @@ static void STDMETHODCALLTYPE d3d10_device_PSSetConstantBuffers(ID3D10Device1 *i static void STDMETHODCALLTYPE d3d10_device_IASetInputLayout(ID3D10Device1 *iface, ID3D10InputLayout *input_layout) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_input_layout *layout = unsafe_impl_from_ID3D10InputLayout(input_layout); TRACE("iface %p, input_layout %p\n", iface, input_layout); wined3d_mutex_lock(); - wined3d_device_set_vertex_declaration(This->wined3d_device, + wined3d_device_set_vertex_declaration(device->wined3d_device, layout ? layout->wined3d_decl : NULL); wined3d_mutex_unlock(); } @@ -3035,7 +3035,7 @@ static void STDMETHODCALLTYPE d3d10_device_IASetInputLayout(ID3D10Device1 *iface static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device1 *iface, UINT start_slot, UINT buffer_count, ID3D10Buffer *const *buffers, const UINT *strides, const UINT *offsets) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); unsigned int i; TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p\n", @@ -3046,7 +3046,7 @@ static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device1 *ifa { struct d3d_buffer *buffer = unsafe_impl_from_ID3D10Buffer(buffers[i]); - wined3d_device_set_stream_source(This->wined3d_device, start_slot + i, + wined3d_device_set_stream_source(device->wined3d_device, start_slot + i, buffer ? buffer->wined3d_buffer : NULL, offsets[i], strides[i]); } wined3d_mutex_unlock(); @@ -3055,14 +3055,14 @@ static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device1 *ifa static void STDMETHODCALLTYPE d3d10_device_IASetIndexBuffer(ID3D10Device1 *iface, ID3D10Buffer *buffer, DXGI_FORMAT format, UINT offset) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_buffer *buffer_impl = unsafe_impl_from_ID3D10Buffer(buffer); TRACE("iface %p, buffer %p, format %s, offset %u.\n", iface, buffer, debug_dxgi_format(format), offset); wined3d_mutex_lock(); - wined3d_device_set_index_buffer(This->wined3d_device, + wined3d_device_set_index_buffer(device->wined3d_device, buffer_impl ? buffer_impl->wined3d_buffer : NULL, wined3dformat_from_dxgi_format(format), offset); wined3d_mutex_unlock(); @@ -3137,12 +3137,12 @@ static void STDMETHODCALLTYPE d3d10_device_GSSetShader(ID3D10Device1 *iface, ID3 static void STDMETHODCALLTYPE d3d10_device_IASetPrimitiveTopology(ID3D10Device1 *iface, D3D10_PRIMITIVE_TOPOLOGY topology) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); TRACE("iface %p, topology %s\n", iface, debug_d3d10_primitive_topology(topology)); wined3d_mutex_lock(); - wined3d_device_set_primitive_type(This->wined3d_device, (enum wined3d_primitive_type)topology); + wined3d_device_set_primitive_type(device->wined3d_device, (enum wined3d_primitive_type)topology); wined3d_mutex_unlock(); } @@ -3794,12 +3794,12 @@ static void STDMETHODCALLTYPE d3d10_device_GSGetShader(ID3D10Device1 *iface, ID3 static void STDMETHODCALLTYPE d3d10_device_IAGetPrimitiveTopology(ID3D10Device1 *iface, D3D10_PRIMITIVE_TOPOLOGY *topology) { - struct d3d_device *This = impl_from_ID3D10Device(iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); TRACE("iface %p, topology %p\n", iface, topology); wined3d_mutex_lock(); - wined3d_device_get_primitive_type(This->wined3d_device, (enum wined3d_primitive_type *)topology); + wined3d_device_get_primitive_type(device->wined3d_device, (enum wined3d_primitive_type *)topology); wined3d_mutex_unlock(); }

1 0

Alexandre Julliard : explorer: Fix hiding the taskbar when there are no system tray items.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 5e1e682a173e009cfdbc7947ff9493550dba0fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1e682a173e009cfdbc7947f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 17 12:08:03 2016 +0900 explorer: Fix hiding the taskbar when there are no system tray items. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index fe8af86..97cffbc 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -118,6 +118,7 @@ static HWND balloon_window; #define WM_POPUPSYSTEMMENU 0x0313 +static void do_hide_systray(void); static void do_show_systray(void); /* Retrieves icon record by owner window and ID */ @@ -366,7 +367,7 @@ static BOOL hide_icon(struct icon *icon) invalidate_icons( icon->display, nb_displayed ); icon->display = -1; - if (!nb_displayed && !enable_shell) ShowWindow( tray_window, SW_HIDE ); + if (!nb_displayed && !enable_shell) do_hide_systray(); update_balloon( icon ); update_tooltip_position( icon ); @@ -747,7 +748,7 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l return handle_incoming((HWND)wparam, (COPYDATASTRUCT *)lparam); case WM_DISPLAYCHANGE: - if (hide_systray) do_hide_systray(); + if (hide_systray || (!nb_displayed && !enable_shell)) do_hide_systray(); else do_show_systray(); break;

1 0

Jacek Caban : mshtml: Added IElementSelector interface stub implementation.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: ba9da24d7cff5601b6482f7dc66787ccd8297948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba9da24d7cff5601b6482f7dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 16 19:29:46 2016 +0200 mshtml: Added IElementSelector interface stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 5 ++- 2 files changed, 84 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 67c8460..8aac47b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4020,6 +4020,83 @@ static const IHTMLUniqueNameVtbl HTMLUniqueNameVtbl = { HTMLUniqueName_get_uniqueID }; +static inline HTMLElement *impl_from_IElementSelector(IElementSelector *iface) +{ + return CONTAINING_RECORD(iface, HTMLElement, IElementSelector_iface); +} + +static HRESULT WINAPI ElementSelector_QueryInterface(IElementSelector *iface, REFIID riid, void **ppv) +{ + HTMLElement *This = impl_from_IElementSelector(iface); + return IHTMLElement_QueryInterface(&This->IHTMLElement_iface, riid, ppv); +} + +static ULONG WINAPI ElementSelector_AddRef(IElementSelector *iface) +{ + HTMLElement *This = impl_from_IElementSelector(iface); + return IHTMLElement_AddRef(&This->IHTMLElement_iface); +} + +static ULONG WINAPI ElementSelector_Release(IElementSelector *iface) +{ + HTMLElement *This = impl_from_IElementSelector(iface); + return IHTMLElement_Release(&This->IHTMLElement_iface); +} + +static HRESULT WINAPI ElementSelector_GetTypeInfoCount(IElementSelector *iface, UINT *pctinfo) +{ + HTMLElement *This = impl_from_IElementSelector(iface); + return IDispatchEx_GetTypeInfoCount(&This->node.event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI ElementSelector_GetTypeInfo(IElementSelector *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLElement *This = impl_from_IElementSelector(iface); + return IDispatchEx_GetTypeInfo(&This->node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI ElementSelector_GetIDsOfNames(IElementSelector *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLElement *This = impl_from_IElementSelector(iface); + return IDispatchEx_GetIDsOfNames(&This->node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI ElementSelector_Invoke(IElementSelector *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLElement *This = impl_from_IElementSelector(iface); + return IDispatchEx_Invoke(&This->node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI ElementSelector_querySelector(IElementSelector *iface, BSTR v, IHTMLElement **pel) +{ + HTMLElement *This = impl_from_IElementSelector(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pel); + return E_NOTIMPL; +} + +static HRESULT WINAPI ElementSelector_querySelectorAll(IElementSelector *iface, BSTR v, IHTMLDOMChildrenCollection **pel) +{ + HTMLElement *This = impl_from_IElementSelector(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pel); + return E_NOTIMPL; +} + +static const IElementSelectorVtbl ElementSelectorVtbl = { + ElementSelector_QueryInterface, + ElementSelector_AddRef, + ElementSelector_Release, + ElementSelector_GetTypeInfoCount, + ElementSelector_GetTypeInfo, + ElementSelector_GetIDsOfNames, + ElementSelector_Invoke, + ElementSelector_querySelector, + ElementSelector_querySelectorAll +}; + static inline HTMLElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { return CONTAINING_RECORD(iface, HTMLElement, node); @@ -4043,6 +4120,8 @@ HRESULT HTMLElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) *ppv = &This->IHTMLElement4_iface; }else if(IsEqualGUID(&IID_IHTMLUniqueName, riid)) { *ppv = &This->IHTMLUniqueName_iface; + }else if(IsEqualGUID(&IID_IElementSelector, riid)) { + *ppv = &This->IElementSelector_iface; }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { *ppv = &This->cp_container.IConnectionPointContainer_iface; }else { @@ -4313,6 +4392,7 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMHTMLElemen This->IHTMLElement3_iface.lpVtbl = &HTMLElement3Vtbl; This->IHTMLElement4_iface.lpVtbl = &HTMLElement4Vtbl; This->IHTMLUniqueName_iface.lpVtbl = &HTMLUniqueNameVtbl; + This->IElementSelector_iface.lpVtbl = &ElementSelectorVtbl; if(dispex_data && !dispex_data->vtbl) dispex_data->vtbl = &HTMLElement_dispex_vtbl; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d378bdd..9d07047 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -125,6 +125,7 @@ typedef struct event_target_t event_target_t; XDIID(HTMLDocumentEvents) \ XDIID(HTMLElementEvents2) \ XIID(IDocumentSelector) \ + XIID(IElementSelector) \ XIID(IHTMLAnchorElement) \ XIID(IHTMLAreaElement) \ XIID(IHTMLAttributeCollection) \ @@ -717,6 +718,7 @@ typedef struct { IHTMLElement3 IHTMLElement3_iface; IHTMLElement4 IHTMLElement4_iface; IHTMLUniqueName IHTMLUniqueName_iface; + IElementSelector IElementSelector_iface; nsIDOMHTMLElement *nselem; HTMLStyle *style; @@ -733,7 +735,8 @@ typedef struct { IHTMLElement2_tid, \ IHTMLElement3_tid, \ IHTMLElement4_tid, \ - IHTMLUniqueName_tid + IHTMLUniqueName_tid, \ + IElementSelector_tid extern cp_static_data_t HTMLElementEvents2_data DECLSPEC_HIDDEN; #define HTMLELEMENT_CPC {&DIID_HTMLElementEvents2, &HTMLElementEvents2_data}

1 0

Alex Henrie : ucrtbase: Implement _(un)lock_locales.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: c044cf410d10a78c76a2ea7e8e07d602713f9616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c044cf410d10a78c76a2ea7e8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 14 12:28:12 2016 -0600 ucrtbase: Implement _(un)lock_locales. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-locale-l1-1-0.spec | 4 ++-- dlls/msvcrt/locale.c | 16 ++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec index 9749808..c7e5aae 100644 --- a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec +++ b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec @@ -11,9 +11,9 @@ @ cdecl _free_locale(ptr) ucrtbase._free_locale @ cdecl _get_current_locale() ucrtbase._get_current_locale @ cdecl _getmbcp() ucrtbase._getmbcp -@ stub _lock_locales +@ cdecl _lock_locales() ucrtbase._lock_locales @ cdecl _setmbcp(long) ucrtbase._setmbcp -@ stub _unlock_locales +@ cdecl _unlock_locales() ucrtbase._unlock_locales @ stub _wcreate_locale @ cdecl _wsetlocale(long wstr) ucrtbase._wsetlocale @ cdecl localeconv() ucrtbase.localeconv diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index eed5a37..74da555 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1592,6 +1592,22 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, } /********************************************************************* + * _lock_locales (UCRTBASE.@) + */ +void CDECL _lock_locales(void) +{ + LOCK_LOCALE +} + +/********************************************************************* + * _unlock_locales (UCRTBASE.@) + */ +void CDECL _unlock_locales(void) +{ + UNLOCK_LOCALE +} + +/********************************************************************* * _create_locale (MSVCRT.@) */ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 14ffa63..690072b 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -563,7 +563,7 @@ @ cdecl _localtime64(ptr) MSVCRT__localtime64 @ cdecl _localtime64_s(ptr ptr) @ cdecl _lock_file(ptr) MSVCRT__lock_file -@ stub _lock_locales +@ cdecl _lock_locales() @ cdecl _locking(long long long) MSVCRT__locking @ cdecl _logb(double) MSVCRT__logb @ cdecl -arch=arm,x86_64 _logbf(float) MSVCRT__logbf @@ -2000,7 +2000,7 @@ @ cdecl _unlink(str) MSVCRT__unlink @ cdecl _unloaddll(long) @ cdecl _unlock_file(ptr) MSVCRT__unlock_file -@ stub _unlock_locales +@ cdecl _unlock_locales() @ cdecl _utime32(str ptr) @ cdecl _utime64(str ptr) @ cdecl _waccess(wstr long) MSVCRT__waccess

1 0

Alexandre Julliard : msvcrt: Get rid of the LOCK_LOCALE macros.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 1edd0f4d1dfb73230efea006be69edee8698ea35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1edd0f4d1dfb73230efea006b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 23:44:41 2016 +0900 msvcrt: Get rid of the LOCK_LOCALE macros. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 74da555..024ec99 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -49,10 +49,6 @@ LCID MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1] = { 0 }; int MSVCRT___mb_cur_max = 1; static unsigned char charmax = CHAR_MAX; -/* MT */ -#define LOCK_LOCALE _mlock(_SETLOCALE_LOCK); -#define UNLOCK_LOCALE _munlock(_SETLOCALE_LOCK); - #define MSVCRT_LEADBYTE 0x8000 #define MSVCRT_C1_DEFINED 0x200 @@ -1596,7 +1592,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, */ void CDECL _lock_locales(void) { - LOCK_LOCALE + _mlock(_SETLOCALE_LOCK); } /********************************************************************* @@ -1604,7 +1600,7 @@ void CDECL _lock_locales(void) */ void CDECL _unlock_locales(void) { - UNLOCK_LOCALE + _munlock(_SETLOCALE_LOCK); } /********************************************************************* @@ -1661,7 +1657,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) return NULL; } - LOCK_LOCALE; + _lock_locales(); if(locinfo->lc_handle[MSVCRT_LC_COLLATE]!=newlocinfo->lc_handle[MSVCRT_LC_COLLATE] || locinfo->lc_id[MSVCRT_LC_COLLATE].wCodePage!=newlocinfo->lc_id[MSVCRT_LC_COLLATE].wCodePage) { @@ -1816,7 +1812,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) } free_locinfo(newlocinfo); - UNLOCK_LOCALE; + _unlock_locales(); if(locinfo == MSVCRT_locale->locinfo) { int i; @@ -1858,14 +1854,14 @@ MSVCRT_wchar_t* CDECL MSVCRT__wsetlocale(int category, const MSVCRT_wchar_t* wlo MSVCRT_wcstombs(locale, wlocale, len); } - LOCK_LOCALE; + _lock_locales(); ret = MSVCRT_setlocale(category, locale); MSVCRT_free(locale); if(ret && MSVCRT_mbstowcs(current_lc_all, ret, MAX_LOCALE_LENGTH)==-1) ret = NULL; - UNLOCK_LOCALE; + _unlock_locales(); return ret ? current_lc_all : NULL; } @@ -1921,9 +1917,9 @@ BOOL msvcrt_init_locale(void) { int i; - LOCK_LOCALE; + _lock_locales(); MSVCRT_locale = MSVCRT__create_locale(0, "C"); - UNLOCK_LOCALE; + _unlock_locales(); if(!MSVCRT_locale) return FALSE;

1 0

Michael Stefaniuc : user32/tests: Add some IsRectEmpty() tests.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 41d01871fef296dc717cf2c4f0bdbb07f5266acd URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d01871fef296dc717cf2c4f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 16 14:44:04 2016 +0200 user32/tests: Add some IsRectEmpty() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/uitools.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/user32/tests/uitools.c b/dlls/user32/tests/uitools.c index f3365ba..27a4179 100644 --- a/dlls/user32/tests/uitools.c +++ b/dlls/user32/tests/uitools.c @@ -146,6 +146,42 @@ static void test_EqualRect(void) ok(ret, "got %d\n", ret); } +static void test_IsRectEmpty(void) +{ + BOOL ret; + unsigned int i; + static const struct { + RECT rect; + BOOL ret; + } rtest[] = { + {{0, 0, 0, 0}, TRUE}, + {{127, 131, 127, 131}, TRUE}, + {{MAXLONG, MAXLONG, MAXLONG, MAXLONG}, TRUE}, + {{-1, -1, -1, -1}, TRUE}, + {{-2011, -2017, -2011, -2017}, TRUE}, + {{MINLONG, MINLONG, MINLONG, MINLONG}, TRUE}, + /* Only width or height are 0 */ + {{31, 37, 31, 41}, TRUE}, + {{881, 883, 887, 883}, TRUE}, + {{-1721, 1723, -1721, 7213}, TRUE}, + /* Negative width and/or height */ + {{11, 13, 5, 7}, TRUE}, + {{-11, -13, -19, -23}, TRUE}, + {{11, 13, -17, 19}, TRUE}, + {{11, 13, 17, 11}, TRUE}, + /* Non emty rects */ + {{101, 103, 107, 109}, FALSE}, + {{1, -9, 7, 3}, FALSE}, + {{-109, -107, -103, -101}, FALSE}, + }; + + for (i = 0; i < sizeof(rtest)/sizeof(rtest[0]); i++) { + ret = IsRectEmpty(&rtest[i].rect); + ok(ret == rtest[i].ret, "Test %d: IsRectEmpty returned %s for %s\n", i, + ret ? "TRUE" : "FALSE", wine_dbgstr_rect(&rtest[i].rect)); + } +} + static void test_SetRect(void) { RECT rect; @@ -170,5 +206,6 @@ START_TEST(uitools) test_FillRect(); test_SubtractRect(); test_EqualRect(); + test_IsRectEmpty(); test_SetRect(); }

1 0

Ken Thomases : kernel32: Overhaul the locale determination on the Mac.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: d90f29d817517b7c7bd6737f268598f0ccd5295a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90f29d817517b7c7bd6737f2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 15 14:34:04 2016 -0500 kernel32: Overhaul the locale determination on the Mac. The C library locale is inadequate for conveying the Mac user settings between LOCALE_Init() and setup_unix_locales(). The set of locales supported by the C library can't express the combinations allowed in user settings. Setting LANG to a user-settings-derived locale when there's no corresponding C library locale is actually worse than leaving it unset. It will prevent the C library from honoring the LC_* variables (other than LC_ALL). That's why Terminal.app won't set LANG in that case, it just sets LC_CTYPE=UTF-8. This commit makes Wine follow similar logic in not setting LANG if the C library doesn't support the Mac user settings. Rather, it uses a wrapper around setlocale() to query the locale. That wrapper returns a value representing the Mac user settings if the C library comes up empty. It also has logic to handle Terminal's setting LC_CTYPE=UTF-8, since parse_locale_name() can't handle that properly. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 206 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 150 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d90f29d817517b7c7bd67…

1 0

Austin English : kernel32: Implement GetLargePageMinimum.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 4d313e6475383e5aa1ebd8c0917f1f11f5c81f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d313e6475383e5aa1ebd8c09… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jun 15 23:43:46 2016 +0200 kernel32: Implement GetLargePageMinimum. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-memory-l1-1-1.spec | 2 +- dlls/kernel32/cpu.c | 12 ++++++++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/process.c | 16 ++++++++++++++++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec index 5d3eb13..959e65d 100644 --- a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec +++ b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec @@ -3,7 +3,7 @@ @ stdcall CreateFileMappingW(long ptr long long long wstr) kernel32.CreateFileMappingW @ stdcall CreateMemoryResourceNotification(long) kernel32.CreateMemoryResourceNotification @ stdcall FlushViewOfFile(ptr long) kernel32.FlushViewOfFile -@ stub GetLargePageMinimum +@ stdcall GetLargePageMinimum() kernel32.GetLargePageMinimum @ stub GetProcessWorkingSetSizeEx @ stdcall GetSystemFileCacheSize(ptr ptr ptr) kernel32.GetSystemFileCacheSize @ stdcall GetWriteWatch(long ptr long ptr ptr ptr) kernel32.GetWriteWatch diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index f48fcf0..3a7a5e8 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -291,3 +291,15 @@ err: } return TRUE; } + +/*********************************************************************** + * GetLargePageMinimum (KERNEL32.@) + */ +SIZE_T WINAPI GetLargePageMinimum(void) +{ +#if defined(__i386___) || defined(__x86_64__) + return 2 * 1024 * 1024; +#endif + FIXME("Not implemented on your platform/architecture.\n"); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ec7155b6e..0fc4dcb 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -696,7 +696,7 @@ @ stdcall GetHandleInformation(long ptr) @ stub -i386 GetLSCallbackTarget @ stub -i386 GetLSCallbackTemplate -# @ stub GetLargePageMinimum +@ stdcall GetLargePageMinimum() @ stdcall GetLargestConsoleWindowSize(long) @ stdcall GetLastError() @ stub GetLinguistLangSize diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 61dcdc2..ad7885c 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -88,6 +88,7 @@ static BOOL (WINAPI *pProcess32Next)(HANDLE, PROCESSENTRY32*); static BOOL (WINAPI *pThread32First)(HANDLE, THREADENTRY32*); static BOOL (WINAPI *pThread32Next)(HANDLE, THREADENTRY32*); static BOOL (WINAPI *pGetLogicalProcessorInformationEx)(LOGICAL_PROCESSOR_RELATIONSHIP,SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*,DWORD*); +static SIZE_T (WINAPI *pGetLargePageMinimum)(void); /* ############################### */ static char base[MAX_PATH]; @@ -252,6 +253,7 @@ static BOOL init(void) pThread32First = (void *)GetProcAddress(hkernel32, "Thread32First"); pThread32Next = (void *)GetProcAddress(hkernel32, "Thread32Next"); pGetLogicalProcessorInformationEx = (void *)GetProcAddress(hkernel32, "GetLogicalProcessorInformationEx"); + pGetLargePageMinimum = (void *)GetProcAddress(hkernel32, "GetLargePageMinimum"); return TRUE; } @@ -3138,6 +3140,19 @@ static void test_GetLogicalProcessorInformationEx(void) HeapFree(GetProcessHeap(), 0, info); } +static void test_largepages(void) +{ + SIZE_T size; + + if (!pGetLargePageMinimum) { + skip("No GetLargePageMinimum support.\n"); + return; + } + size = pGetLargePageMinimum(); + + ok((size == 0) || (size == 2*1024*1024) || (size == 4*1024*1024), "GetLargePageMinimum reports %ld size\n", size); +} + START_TEST(process) { HANDLE job; @@ -3210,6 +3225,7 @@ START_TEST(process) test_GetNumaProcessorNode(); test_session_info(); test_GetLogicalProcessorInformationEx(); + test_largepages(); /* things that can be tested: * lookup: check the way program to be executed is searched

1 0

Andrey Gusev : include: Add D3DX10_FILTER_FLAG type declaration.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: ddf84783119623507f544a2042aaeddb6b705104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf84783119623507f544a204… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 16 00:00:48 2016 +0200 include: Add D3DX10_FILTER_FLAG type declaration. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dx10tex.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h index d44edf2..9142c82 100644 --- a/include/d3dx10tex.h +++ b/include/d3dx10tex.h @@ -19,6 +19,27 @@ #ifndef __D3DX10TEX_H__ #define __D3DX10TEX_H__ +typedef enum D3DX10_FILTER_FLAG +{ + D3DX10_FILTER_NONE = 0x00000001, + D3DX10_FILTER_POINT = 0x00000002, + D3DX10_FILTER_LINEAR = 0x00000003, + D3DX10_FILTER_TRIANGLE = 0x00000004, + D3DX10_FILTER_BOX = 0x00000005, + + D3DX10_FILTER_MIRROR_U = 0x00010000, + D3DX10_FILTER_MIRROR_V = 0x00020000, + D3DX10_FILTER_MIRROR_W = 0x00040000, + D3DX10_FILTER_MIRROR = 0x00070000, + + D3DX10_FILTER_DITHER = 0x00080000, + D3DX10_FILTER_DITHER_DIFFUSION = 0x00100000, + + D3DX10_FILTER_SRGB_IN = 0x00200000, + D3DX10_FILTER_SRGB_OUT = 0x00400000, + D3DX10_FILTER_SRGB = 0x00600000, +} D3DX10_FILTER_FLAG; + typedef enum D3DX10_IMAGE_FILE_FORMAT { D3DX10_IFF_BMP = 0,

1 0