wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

Hans Leidekker : webservices: Implement WsReadElement.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: ec0cae49d2746eacf6a5ef4d5d23fa81905d32c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec0cae49d2746eacf6a5ef4d5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 18 13:51:21 2016 +0200 webservices: Implement WsReadElement. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 18 ++++++++++++++++++ dlls/webservices/tests/reader.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 3 +++ 4 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9337f19..c79f8cc 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3598,6 +3598,24 @@ HRESULT WINAPI WsReadType( WS_XML_READER *handle, WS_TYPE_MAPPING mapping, WS_TY } /************************************************************************** + * WsReadElement [webservices.@] + */ +HRESULT WINAPI WsReadElement( WS_XML_READER *handle, const WS_ELEMENT_DESCRIPTION *desc, + WS_READ_OPTION option, WS_HEAP *heap, void *value, ULONG size, + WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + + TRACE( "%p %p %u %p %p %u %p\n", handle, desc, option, heap, value, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader || !desc || !value) return E_INVALIDARG; + + return read_type( reader, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->elementLocalName, + desc->elementNs, desc->typeDescription, option, heap, value, size ); +} + +/************************************************************************** * WsSetErrorProperty [webservices.@] */ HRESULT WINAPI WsSetErrorProperty( WS_ERROR *handle, WS_ERROR_PROPERTY_ID id, const void *value, diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index bc200e2..4430a76 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3271,6 +3271,43 @@ static void test_double(void) WsFreeHeap( heap ); } +static void test_WsReadElement(void) +{ + WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; + HRESULT hr; + WS_XML_READER *reader; + WS_ELEMENT_DESCRIPTION desc; + UINT32 val; + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + desc.elementLocalName = &localname; + desc.elementNs = &ns; + desc.type = WS_UINT32_TYPE; + desc.typeDescription = NULL; + + prepare_struct_type_test( reader, "<t>1</t>" ); + hr = WsReadElement( NULL, &desc, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + prepare_struct_type_test( reader, "<t>1</t>" ); + hr = WsReadElement( reader, NULL, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + prepare_struct_type_test( reader, "<t>1</t>" ); + hr = WsReadElement( reader, &desc, WS_READ_REQUIRED_VALUE, NULL, NULL, sizeof(val), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + prepare_struct_type_test( reader, "<t>1</t>" ); + val = 0xdeadbeef; + hr = WsReadElement( reader, &desc, WS_READ_REQUIRED_VALUE, NULL, &val, sizeof(val), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( val == 1, "got %u\n", val ); + + WsFreeReader( reader ); +} + START_TEST(reader) { test_WsCreateError(); @@ -3300,4 +3337,5 @@ START_TEST(reader) test_WsDateTimeToFileTime(); test_WsFileTimeToDateTime(); test_double(); + test_WsReadElement(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 6ff4718..9b58d99 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -107,7 +107,7 @@ @ stub WsReadBytes @ stub WsReadChars @ stub WsReadCharsUtf8 -@ stub WsReadElement +@ stdcall WsReadElement(ptr ptr long ptr ptr long ptr) @ stdcall WsReadEndAttribute(ptr ptr) @ stdcall WsReadEndElement(ptr ptr) @ stub WsReadEndpointAddressExtension diff --git a/include/webservices.h b/include/webservices.h index a55072f..62e1182 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1069,6 +1069,8 @@ HRESULT WINAPI WsOpenServiceProxy(WS_SERVICE_PROXY*, const WS_ENDPOINT_ADDRESS*, WS_ERROR*); HRESULT WINAPI WsReadAttribute(WS_XML_READER*, const WS_ATTRIBUTE_DESCRIPTION*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsReadElement(WS_XML_READER*, const WS_ELEMENT_DESCRIPTION*, WS_READ_OPTION, + WS_HEAP*, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsReadEndAttribute(WS_XML_READER*, WS_ERROR*); HRESULT WINAPI WsReadEndElement(WS_XML_READER*, WS_ERROR*); HRESULT WINAPI WsReadNode(WS_XML_READER*, WS_ERROR*); @@ -1078,6 +1080,7 @@ HRESULT WINAPI WsReadToStartElement(WS_XML_READER*, const WS_XML_STRING*, const BOOL*, WS_ERROR*); HRESULT WINAPI WsReadType(WS_XML_READER*, WS_TYPE_MAPPING, WS_TYPE, const void*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsReadValue(WS_XML_READER*, WS_VALUE_TYPE, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsResetHeap(WS_HEAP*, WS_ERROR*); HRESULT WINAPI WsSendMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*);

1 0

Hans Leidekker : webservices: Add support for reading double values.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 524fa65734fbc20135db89b6fa68464aadfc8148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=524fa65734fbc20135db89b6f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 18 13:51:20 2016 +0200 webservices: Add support for reading double values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 210 ++++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 96 ++++++++++++++++++ 2 files changed, 306 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=524fa65734fbc20135db8…

1 0

Austin English : dbghelp: Add forwards for EnumerateLoadedModulesEx/ EnumerateLoadedModulesExW.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 6e0366fd5ea0a3a56f4680d4b477be1562f534d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e0366fd5ea0a3a56f4680d4b… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 11 16:31:13 2016 -0500 dbghelp: Add forwards for EnumerateLoadedModulesEx/EnumerateLoadedModulesExW. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.spec | 4 ++-- include/dbghelp.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 6004f95..3655f8c 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -4,8 +4,8 @@ @ stdcall EnumDirTreeW(long wstr wstr ptr ptr ptr) @ stdcall EnumerateLoadedModules(long ptr ptr) @ stdcall EnumerateLoadedModules64(long ptr ptr) -@ stub EnumerateLoadedModulesEx -@ stub EnumerateLoadedModulesExW +@ stdcall EnumerateLoadedModulesEx(long ptr ptr) EnumerateLoadedModules64 +@ stdcall EnumerateLoadedModulesExW(long ptr ptr) EnumerateLoadedModulesW64 @ stdcall EnumerateLoadedModulesW64(long ptr ptr) @ stdcall ExtensionApiVersion() @ stdcall FindDebugInfoFile(str str ptr) diff --git a/include/dbghelp.h b/include/dbghelp.h index 2fd9ef0..e6015ff 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -908,6 +908,8 @@ typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACK64)(PCSTR, DWORD64, ULONG, P BOOL WINAPI EnumerateLoadedModules64(HANDLE, PENUMLOADED_MODULES_CALLBACK64, PVOID); typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACKW64)(PCWSTR, DWORD64, ULONG, PVOID); BOOL WINAPI EnumerateLoadedModulesW64(HANDLE, PENUMLOADED_MODULES_CALLBACKW64, PVOID); +BOOL WINAPI EnumerateLoadedModulesEx(HANDLE, PENUMLOADED_MODULES_CALLBACK64, PVOID); +BOOL WINAPI EnumerateLoadedModulesExW(HANDLE, PENUMLOADED_MODULES_CALLBACKW64, PVOID); typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACK64)(PCSTR, DWORD64, PVOID); BOOL WINAPI SymEnumerateModules64(HANDLE, PSYM_ENUMMODULES_CALLBACK64, PVOID); typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACKW64)(PCWSTR, DWORD64, PVOID);

1 0

Frédéric Delanoy : oleaut32: Fix a typo in an comment.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: c12845216cb254fd902ffa30668aa74b1b184ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c12845216cb254fd902ffa306… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed May 18 12:10:33 2016 +0200 oleaut32: Fix a typo in an comment. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 8f274ba..31c9ab9 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -217,7 +217,7 @@ typedef struct { /* after this may follow an array with default value pointers if the * appropriate bit in the FKCCIC field has been set: - * INT oDefautlValue[nrargs]; + * INT oDefaultValue[nrargs]; */ /* Parameter info one per argument*/

1 0

Frédéric Delanoy : ntdll: Fix a typo in an comment.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 07a87666a1b0e2e394df4e6cf78d1c2393b47143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07a87666a1b0e2e394df4e6cf… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed May 18 12:10:32 2016 +0200 ntdll: Fix a typo in an comment. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 781750b..15510e2 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1894,7 +1894,7 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa /*********************************************************************** * tp_object_submit (internal) * - * Submits a threadpool object to the associcated threadpool. This + * Submits a threadpool object to the associated threadpool. This * function has to be VOID because TpPostWork can never fail on Windows. */ static void tp_object_submit( struct threadpool_object *object, BOOL signaled )

1 0

Nikolay Sivov : dwrite: Be prepared for 0 face_id passed to face requester.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: e0e937e19a12d6f488644dfaf8bb2c25e5cd54cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e937e19a12d6f488644dfaf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 18 10:11:39 2016 +0300 dwrite: Be prepared for 0 face_id passed to face requester. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/freetype.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index d8afa69..b6d785f 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -107,6 +107,11 @@ static FT_Error face_requester(FTC_FaceID face_id, FT_Library library, FT_Pointe *face = NULL; + if (!fontface) { + WARN("NULL fontface requested.\n"); + return FT_Err_Ok; + } + count = 1; hr = IDWriteFontFace_GetFiles(fontface, &count, &file); if (FAILED(hr))

1 0

Józef Kucia : d3d10core/tests: Use D3D10 enum values instead of D3D11 ones.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: c653dbd1b4ee36091fdd7b70717bcde5713f2eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=c653dbd1b4ee36091fdd7b707… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 18 00:04:41 2016 +0200 d3d10core/tests: Use D3D10 enum values instead of D3D11 ones. 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 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 9500060..fd077b5 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -880,8 +880,8 @@ static void test_texture2d_interfaces(void) desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; desc.SampleDesc.Count = 1; desc.SampleDesc.Quality = 0; - desc.Usage = D3D11_USAGE_DEFAULT; - desc.BindFlags = D3D11_BIND_RENDER_TARGET; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = D3D10_BIND_RENDER_TARGET; desc.CPUAccessFlags = 0; desc.MiscFlags = 0; @@ -997,15 +997,15 @@ static void test_create_texture3d(void) } tests[] = { - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_VERTEX_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_INDEX_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_CONSTANT_BUFFER, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_VERTEX_BUFFER, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_INDEX_BUFFER, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_CONSTANT_BUFFER, FALSE, TRUE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_BIND_DEPTH_STENCIL, FALSE, FALSE}, - {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, - {DXGI_FORMAT_D32_FLOAT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, D3D10_BIND_DEPTH_STENCIL, FALSE, FALSE}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D10_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_D32_FLOAT, D3D10_BIND_RENDER_TARGET, FALSE, FALSE}, }; if (!(device = create_device()))

1 0

Józef Kucia : d3d10core/tests: Use abbreviations for long D3D10 enum value names.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 856c913d05701dd09fc56f7317791ee46a4a7465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=856c913d05701dd09fc56f731… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 18 00:04:40 2016 +0200 d3d10core/tests: Use abbreviations for long D3D10 enum value names. 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 | 136 ++++++++++++++++++++++-------------------- 1 file changed, 71 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=856c913d05701dd09fc56…

1 0

Józef Kucia : d3d11/tests: Use abbreviations for long D3D11 enum value names.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 7c599a414745d4b1fde8e411360f8c23d5f19466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c599a414745d4b1fde8e4113… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 18 00:04:39 2016 +0200 d3d11/tests: Use abbreviations for long D3D11 enum value names. 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/tests/d3d11.c | 136 +++++++++++++++++++++++++---------------------- 1 file changed, 71 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c599a414745d4b1fde8e…

1 0

Józef Kucia : d3d11: Accept DXGI_FORMAT_UNKNOWN as format in view descriptions.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 4a86e3d4975826ffeddfbd98f3c1c6d83819d438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a86e3d4975826ffeddfbd98f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 18 00:04:38 2016 +0200 d3d11: Accept DXGI_FORMAT_UNKNOWN as format in view 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 | 6 +- dlls/d3d11/tests/d3d11.c | 6 +- dlls/d3d11/view.c | 168 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 171 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a86e3d4975826ffeddfb…

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2016