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

Alistair Leslie-Hughes : d3dcompiler_40: Share source with d3dcompiler_43.
by Alexandre Julliard June 17, 2016

June 17, 2016

Module: wine Branch: master Commit: 775b78e6b06fa8f0e4e4f39dacff4f4ba308c2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=775b78e6b06fa8f0e4e4f39da… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 16 08:02:24 2016 +0000 d3dcompiler_40: Share source with d3dcompiler_43. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_40/Makefile.in | 20 ++++++++++++++- dlls/d3dcompiler_40/d3dcompiler_40.spec | 20 +++++++-------- dlls/d3dcompiler_40/d3dcompiler_40_main.c | 42 ------------------------------- tools/make_specfiles | 1 - 4 files changed, 29 insertions(+), 54 deletions(-) diff --git a/dlls/d3dcompiler_40/Makefile.in b/dlls/d3dcompiler_40/Makefile.in index 744d95e..c74a6a7 100644 --- a/dlls/d3dcompiler_40/Makefile.in +++ b/dlls/d3dcompiler_40/Makefile.in @@ -1,6 +1,24 @@ MODULE = d3dcompiler_40.dll +IMPORTS = dxguid uuid +EXTRALIBS = -lwpp +EXTRADEFS = -DD3D_COMPILER_VERSION=40 +PARENTSRC = ../d3dcompiler_43 C_SRCS = \ - d3dcompiler_40_main.c + asmparser.c \ + blob.c \ + bytecodewriter.c \ + compiler.c \ + main.c \ + reflection.c \ + utils.c + +LEX_SRCS = \ + asmshader.l \ + hlsl.l + +BISON_SRCS = \ + asmshader.y \ + hlsl.y RC_SRCS = version.rc diff --git a/dlls/d3dcompiler_40/d3dcompiler_40.spec b/dlls/d3dcompiler_40/d3dcompiler_40.spec index 858600e..b85c5fb 100644 --- a/dlls/d3dcompiler_40/d3dcompiler_40.spec +++ b/dlls/d3dcompiler_40/d3dcompiler_40.spec @@ -1,12 +1,12 @@ @ stub DebugSetMute -@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile -@ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect -@ stdcall D3DDisassemble(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble -@ stdcall D3DGetDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo -@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob -@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob -@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob -@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess -@ stdcall D3DReflect(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) +@ stub D3DDisassemble10Effect(ptr long ptr) +@ stdcall D3DDisassemble(ptr long long ptr ptr) +@ stdcall D3DGetDebugInfo(ptr long ptr) +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) +@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) +@ stdcall D3DReflect(ptr long ptr ptr) @ stub D3DReturnFailure1 -@ stdcall D3DStripShader(ptr long long ptr) d3dcompiler_43.D3DStripShader +@ stdcall D3DStripShader(ptr long long ptr) diff --git a/dlls/d3dcompiler_40/d3dcompiler_40_main.c b/dlls/d3dcompiler_40/d3dcompiler_40_main.c deleted file mode 100644 index 4453ead..0000000 --- a/dlls/d3dcompiler_40/d3dcompiler_40_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Direct3D shader compiler main file - * - * Copyright 2010 Matteo Bruni for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} diff --git a/tools/make_specfiles b/tools/make_specfiles index cb60f6a..ab0289f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -111,7 +111,6 @@ my @dll_groups = "d3dcompiler_43", "d3dcompiler_47", "d3dcompiler_46", - "d3dcompiler_40", "d3dcompiler_39", "d3dcompiler_38", "d3dcompiler_37",

1 0

Józef Kucia : d3d11: Replace "This" with "device".
by Alexandre Julliard June 17, 2016

June 17, 2016

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

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

June 17, 2016

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

Alex Henrie : ucrtbase: Implement _free_base.
by Alexandre Julliard June 17, 2016

June 17, 2016

Module: wine Branch: master Commit: e4b8bc0edc640b36f2a2a26c53e18edea04fa74c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4b8bc0edc640b36f2a2a26c5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 16 18:02:25 2016 -0600 ucrtbase: Implement _free_base. 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> --- dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec | 2 +- dlls/msvcrt/heap.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec index 6dbd207..418926e 100644 --- a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec +++ b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec @@ -9,7 +9,7 @@ @ cdecl _callnewh(long) ucrtbase._callnewh @ cdecl _calloc_base(long long) ucrtbase._calloc_base @ cdecl _expand(ptr long) ucrtbase._expand -@ stub _free_base +@ cdecl _free_base(ptr) ucrtbase._free_base @ cdecl _get_heap_handle() ucrtbase._get_heap_handle @ cdecl _heapchk() ucrtbase._heapchk @ cdecl _heapmin() ucrtbase._heapmin diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 5803f4a..8a84802 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -422,6 +422,14 @@ void CDECL MSVCRT_free(void* ptr) } /********************************************************************* + * _free_base (UCRTBASE.@) + */ +void CDECL _free_base(void* ptr) +{ + msvcrt_heap_free(ptr); +} + +/********************************************************************* * malloc (MSVCRT.@) */ void* CDECL MSVCRT_malloc(MSVCRT_size_t size) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 551fcd7..ff21fb3 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -333,7 +333,7 @@ @ cdecl _fputwchar(long) MSVCRT__fputwchar @ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock @ cdecl _fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s -@ stub _free_base +@ cdecl _free_base(ptr) @ cdecl _free_locale(ptr) MSVCRT__free_locale @ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64

1 0

Alex Henrie : ucrtbase: Implement _realloc_base.
by Alexandre Julliard June 17, 2016

June 17, 2016

Module: wine Branch: master Commit: 8a69c5d81f8deb472df18a8e16e57efef2eb9a9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a69c5d81f8deb472df18a8e1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 16 18:02:26 2016 -0600 ucrtbase: Implement _realloc_base. 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> --- dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec | 2 +- dlls/msvcrt/heap.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec index 418926e..0a99e87 100644 --- a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec +++ b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec @@ -18,7 +18,7 @@ @ cdecl _msize(ptr) ucrtbase._msize @ stub _query_new_handler @ stub _query_new_mode -@ stub _realloc_base +@ cdecl _realloc_base(ptr long) ucrtbase._realloc_base @ cdecl _recalloc(ptr long long) ucrtbase._recalloc @ cdecl _set_new_mode(long) ucrtbase._set_new_mode @ cdecl calloc(long long) ucrtbase.calloc diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 8a84802..3ae2599 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -460,6 +460,14 @@ void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size) } /********************************************************************* + * _realloc_base (UCRTBASE.@) + */ +void* CDECL _realloc_base(void* ptr, MSVCRT_size_t size) +{ + return MSVCRT_realloc(ptr, size); +} + +/********************************************************************* * _recalloc (MSVCR100.@) */ void* CDECL _recalloc(void *mem, MSVCRT_size_t num, MSVCRT_size_t size) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index ff21fb3..64f6276 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1859,7 +1859,7 @@ @ stub _query_new_handler @ stub _query_new_mode @ cdecl _read(long ptr long) MSVCRT__read -@ stub _realloc_base +@ cdecl _realloc_base(ptr long) @ cdecl _recalloc(ptr long long) @ cdecl _register_onexit_function(ptr ptr) MSVCRT__register_onexit_function @ stub _register_thread_local_exe_atexit_callback

1 0

Jacek Caban : mshtml: Added IHTMLButtonElement::get_type implementation.
by Alexandre Julliard June 17, 2016

June 17, 2016

Module: wine Branch: master Commit: 5f7a55f85ee243fbdc6ae973c46c25668a48e690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f7a55f85ee243fbdc6ae973c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 16 19:32:34 2016 +0200 mshtml: Added IHTMLButtonElement::get_type implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlinput.c | 10 ++++++++-- dlls/mshtml/tests/dom.c | 18 +++++++++++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index e83cbc1..0b6eb33 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1621,8 +1621,14 @@ static HRESULT WINAPI HTMLButtonElement_Invoke(IHTMLButtonElement *iface, DISPID static HRESULT WINAPI HTMLButtonElement_get_type(IHTMLButtonElement *iface, BSTR *p) { HTMLButtonElement *This = impl_from_IHTMLButtonElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString type_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&type_str, NULL); + nsres = nsIDOMHTMLButtonElement_GetType(This->nsbutton, &type_str); + return return_nsstr(nsres, &type_str, p); } static HRESULT WINAPI HTMLButtonElement_put_value(IHTMLButtonElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 52227d3..9788e56 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -54,7 +54,7 @@ static const char elem_test_str[] = "<a id=\"a\" href=\"http://test\" name=\"x\">link</a>" "<label for=\"in\" id=\"labelid\">Label:</label>" "<input id=\"in\" class=\"testclass\" tabIndex=\"2\" title=\"test title\" />" - "<button id=\"btnid\"></button>" + "<button id=\"btnid\" type=\"submit\"></button>" "<select id=\"s\"><option id=\"x\" value=\"val1\">opt1</option><option id=\"y\">opt2</option></select>" "<textarea id=\"X\">text text</textarea>" "<table id=\"tbl\"><tbody><tr></tr><tr id=\"row2\"><td id=\"td1\">td1 text</td><td id=\"td2\">td2 text</td></tr></tbody></table>" @@ -6929,10 +6929,26 @@ static void _test_button_set_disabled(unsigned line, IHTMLElement *elem, VARIANT _test_button_get_disabled(line, elem, b); } +#define test_button_type(a,b) _test_button_type(__LINE__,a,b) +static void _test_button_type(unsigned line, IHTMLElement *elem, const char *extype) +{ + IHTMLButtonElement *button = _get_button_iface(line, (IUnknown*)elem); + BSTR str; + HRESULT hres; + + hres = IHTMLButtonElement_get_type(button, &str); + ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(str, extype), "type = %s, expected %s\n", wine_dbgstr_w(str), extype); + SysFreeString(str); + + IHTMLButtonElement_Release(button); +} + static void test_button_elem(IHTMLElement *elem) { test_button_name(elem, NULL); set_button_name(elem, "button name"); + test_button_type(elem, "submit"); test_elem_istextedit(elem, VARIANT_TRUE); }

1 0

Jacek Caban : mshtml: Added IElementSelector:: querySelectorAll implementation.
by Alexandre Julliard June 17, 2016

June 17, 2016

Module: wine Branch: master Commit: 2e4fa65d0982a955fcb5b9b2a5726d9a65982990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4fa65d0982a955fcb5b9b2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 16 19:29:56 2016 +0200 mshtml: Added IElementSelector::querySelectorAll implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 19 +++++++++++++++++-- dlls/mshtml/tests/dom.c | 26 ++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8aac47b..76434c8 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4081,8 +4081,23 @@ static HRESULT WINAPI ElementSelector_querySelector(IElementSelector *iface, BST 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; + nsIDOMNodeList *node_list; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLElement_QuerySelectorAll(This->nselem, &nsstr, &node_list); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("QuerySelectorAll failed: %08x\n", nsres); + return E_FAIL; + } + + *pel = create_child_collection(This->node.doc, node_list); + nsIDOMNodeList_Release(node_list); + return *pel ? S_OK : E_OUTOFMEMORY; } static const IElementSelectorVtbl ElementSelectorVtbl = { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 47c8827..52227d3 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7906,10 +7906,11 @@ static void test_enum_children(IUnknown *unk, unsigned len) IEnumVARIANT_Release(enum_var); } -static void test_doc_selector(IHTMLDocument2 *doc, IHTMLElement *div) +static void test_selectors(IHTMLDocument2 *doc, IHTMLElement *div) { IHTMLDOMChildrenCollection *collection; IDocumentSelector *doc_selector; + IElementSelector *elem_selector; BSTR str; HRESULT hres; @@ -7939,6 +7940,27 @@ static void test_doc_selector(IHTMLDocument2 *doc, IHTMLElement *div) IHTMLDOMChildrenCollection_Release(collection); IDocumentSelector_Release(doc_selector); + + hres = IHTMLElement_QueryInterface(div, &IID_IElementSelector, (void**)&elem_selector); + ok(hres == S_OK, "Could not get IElementSelector iface: %08x\n", hres); + + collection = NULL; + str = a2bstr("nomatch"); + hres = IElementSelector_querySelectorAll(elem_selector, str, &collection); + ok(hres == S_OK, "querySelectorAll failed: %08x\n", hres); + ok(collection != NULL, "collection == NULL\n"); + test_children_collection_length(collection, 0); + IHTMLDOMChildrenCollection_Release(collection); + + collection = NULL; + str = a2bstr(".cl1"); + hres = IElementSelector_querySelectorAll(elem_selector, str, &collection); + ok(hres == S_OK, "querySelectorAll failed: %08x\n", hres); + ok(collection != NULL, "collection == NULL\n"); + test_children_collection_length(collection, 2); + IHTMLDOMChildrenCollection_Release(collection); + + IElementSelector_Release(elem_selector); } static void test_elems(IHTMLDocument2 *doc) @@ -9005,7 +9027,7 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem2); } - test_doc_selector(doc, div); + test_selectors(doc, div); test_elem_set_innerhtml((IUnknown*)div, "<div id=\"elemid\">test</div>"); elem = get_elem_by_id(doc, "elemid", TRUE);

1 0

Józef Kucia : d3d10core/tests: Add test for invalid DSV descriptions.
by Alexandre Julliard June 17, 2016

June 17, 2016

Module: wine Branch: master Commit: 348507522d0bc1527a5387c0a8b02c4a85dab040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=348507522d0bc1527a5387c0a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 17 10:41:45 2016 +0200 d3d10core/tests: Add test for invalid DSV descriptions. 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/d3d10core/tests/device.c | 145 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 118 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=348507522d0bc1527a538…

1 0

Józef Kucia : d3d10core/tests: Add test for invalid RTV descriptions.
by Alexandre Julliard June 17, 2016

June 17, 2016

Module: wine Branch: master Commit: 8929be2c2378d7075c05e7518647989fdfe82f71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8929be2c2378d7075c05e7518… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 17 10:41:44 2016 +0200 d3d10core/tests: Add test for invalid RTV descriptions. 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/d3d10core/tests/device.c | 163 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 147 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8929be2c2378d7075c05e…

1 0

Józef Kucia : d3d10core/tests: Add test for invalid SRV descriptions.
by Alexandre Julliard June 17, 2016

June 17, 2016

Module: wine Branch: master Commit: 09dbd7bef831929bd81bcabc00b584d44761ad66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09dbd7bef831929bd81bcabc0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 17 10:41:43 2016 +0200 d3d10core/tests: Add test for invalid SRV descriptions. 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/d3d10core/tests/device.c | 279 +++++++++++++++++++++++++++++++++++------- 1 file changed, 232 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=09dbd7bef831929bd81bc…

1 0