March 2017 - Wine-commits - list.winehq.org

Józef Kucia : d3d10core/tests: Add test for unbinding shader resource view.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 241e99dc24815b2cff651f725cf97581e4eaa837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=241e99dc24815b2cff651f725… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 10 09:10:59 2017 +0100 d3d10core/tests: Add test for unbinding shader resource view. 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 | 88 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index fda0c64..7819362 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -10558,6 +10558,93 @@ static void test_shader_input_registers_limits(void) release_test_context(&test_context); } +static void test_unbind_shader_resource_view(void) +{ + struct d3d10core_test_context test_context; + D3D10_SUBRESOURCE_DATA resource_data; + ID3D10ShaderResourceView *srv, *srv2; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10Texture2D *texture; + ID3D10PixelShader *ps; + ID3D10Device *device; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture2D t0; + Texture2D t1; + SamplerState s; + + float4 main() : SV_Target + { + return min(t0.Sample(s, float2(0, 0)) + t1.Sample(s, float2(0, 0)), 1.0f); + } +#endif + 0x43425844, 0x698dc0cb, 0x0bf322b8, 0xee127418, 0xfe9214ce, 0x00000001, 0x00000168, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000f0, 0x00000040, 0x0000003c, + 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04001858, + 0x00107000, 0x00000001, 0x00005555, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, + 0x0c000045, 0x001000f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0c000045, 0x001000f2, 0x00000001, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00107e46, 0x00000001, 0x00106000, 0x00000000, + 0x07000000, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x0a000033, + 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, + 0x3f800000, 0x0100003e, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD texture_data[] = {0xff00ff00}; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + texture_desc.Width = 1; + texture_desc.Height = 1; + texture_desc.MipLevels = 0; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + resource_data.pSysMem = texture_data; + resource_data.SysMemPitch = sizeof(texture_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &srv); + ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x.\n", hr); + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + ID3D10Device_PSSetShaderResources(device, 0, 1, &srv); + ID3D10Device_PSSetShaderResources(device, 1, 1, &srv); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + + srv2 = NULL; + ID3D10Device_PSSetShaderResources(device, 0, 1, &srv2); + ID3D10Device_PSSetShaderResources(device, 1, 1, &srv2); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + draw_quad(&test_context); + todo_wine check_texture_color(test_context.backbuffer, 0x00000000, 1); + + ID3D10PixelShader_Release(ps); + ID3D10ShaderResourceView_Release(srv); + ID3D10Texture2D_Release(texture); + release_test_context(&test_context); +} + static void test_stencil_separate(void) { struct d3d10core_test_context test_context; @@ -11527,6 +11614,7 @@ START_TEST(device) test_required_format_support(); test_ddy(); test_shader_input_registers_limits(); + test_unbind_shader_resource_view(); test_stencil_separate(); test_sm4_ret_instruction(); test_primitive_restart();

1 0

Józef Kucia : d3d11/tests: Fix render target format in test_resinfo_instruction().
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: f58fe845b52ab0bf2b9d9b088c984347468f2e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f58fe845b52ab0bf2b9d9b088… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 10 09:11:00 2017 +0100 d3d11/tests: Fix render target format in test_resinfo_instruction(). 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 94a5a8f..2bcbec8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -14069,7 +14069,7 @@ static void test_resinfo_instruction(void) texture_desc.Height = 64; texture_desc.MipLevels = 1; texture_desc.ArraySize = 1; - texture_desc.Format = DXGI_FORMAT_R32G32B32A32_UINT; + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; texture_desc.Usage = D3D11_USAGE_DEFAULT;

1 0

Józef Kucia : d3d10core/tests: Fix render target format in test_resinfo_instruction().
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 3b684f8175e7c2ab53855eff84fbd9b205196b7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b684f8175e7c2ab53855eff8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 10 09:11:01 2017 +0100 d3d10core/tests: Fix render target format in test_resinfo_instruction(). 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 7819362..4b757d8 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -11202,7 +11202,7 @@ static void test_resinfo_instruction(void) texture_desc.Height = 64; texture_desc.MipLevels = 1; texture_desc.ArraySize = 1; - texture_desc.Format = DXGI_FORMAT_R32G32B32A32_UINT; + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; texture_desc.Usage = D3D10_USAGE_DEFAULT;

1 0

André Hentschel : iphlpapi: Add stub for NotifyUnicastIpAddressChange.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 0bf31be76e1b8152238f4da88eceec1645729197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bf31be76e1b8152238f4da88… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 8 21:22:22 2017 +0100 iphlpapi: Add stub for NotifyUnicastIpAddressChange. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 12 ++++++++++++ include/netioapi.h | 11 +++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 1a1f8f7..d69b80e 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -239,7 +239,7 @@ @ stub NotifyRouteChangeEx #@ stub NotifyStableUnicastIpAddressTable #@ stub NotifyTeredoPortChange -#@ stub NotifyUnicastIpAddressChange +@ stdcall NotifyUnicastIpAddressChange(long ptr ptr long ptr) #@ stub NTPTimeToNTFileTime #@ stub NTTimeToNTPTime #@ stub ParseNetworkString diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 12767c3..51d05ed 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2674,6 +2674,18 @@ DWORD WINAPI NotifyRouteChange(PHANDLE Handle, LPOVERLAPPED overlapped) /****************************************************************** + * NotifyUnicastIpAddressChange (IPHLPAPI.@) + */ +DWORD WINAPI NotifyUnicastIpAddressChange(ADDRESS_FAMILY family, PUNICAST_IPADDRESS_CHANGE_CALLBACK callback, + PVOID context, BOOLEAN init_notify, PHANDLE handle) +{ + FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): stub\n", + family, callback, context, init_notify, handle); + if (handle) *handle = NULL; + return ERROR_NOT_SUPPORTED; +} + +/****************************************************************** * SendARP (IPHLPAPI.@) * * Send an ARP request. diff --git a/include/netioapi.h b/include/netioapi.h index 2faa5d6..7c4917b 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -21,6 +21,14 @@ #include <ntddndis.h> +typedef enum _MIB_NOTIFICATION_TYPE +{ + MibParameterNotification, + MibAddInstance, + MibDeleteInstance, + MibInitialNotification, +} MIB_NOTIFICATION_TYPE, *PMIB_NOTIFICATION_TYPE; + typedef struct _MIB_IF_ROW2 { NET_LUID InterfaceLuid; @@ -98,6 +106,9 @@ typedef struct _MIB_UNICASTIPADDRESS_ROW LARGE_INTEGER CreationTimeStamp; } MIB_UNICASTIPADDRESS_ROW, *PMIB_UNICASTIPADDRESS_ROW; +typedef VOID (WINAPI *PUNICAST_IPADDRESS_CHANGE_CALLBACK)(PVOID, PMIB_UNICASTIPADDRESS_ROW, + MIB_NOTIFICATION_TYPE); + DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID*,NET_LUID*); DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX,NET_LUID*); DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID*,GUID*);

1 0

Henri Verbeet : usp10: Use heap_alloc_zero() instead of HeapAlloc() with HEAP_ZERO_MEMORY.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 77e5a2fba9c89a7c33fb2e2790c2433f4fdd928a URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e5a2fba9c89a7c33fb2e279… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 9 10:37:06 2017 +0100 usp10: Use heap_alloc_zero() instead of HeapAlloc() with HEAP_ZERO_MEMORY. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 8 ++++---- dlls/usp10/usp10.c | 15 --------------- dlls/usp10/usp10_internal.h | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 3bbf5ec..6d6a25e 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2472,7 +2472,7 @@ static void GSUB_initialize_script_cache(ScriptCache *psc) TRACE("initializing %i scripts in this font\n",psc->script_count); if (psc->script_count) { - psc->scripts = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(LoadedScript) * psc->script_count); + psc->scripts = heap_alloc_zero(psc->script_count * sizeof(*psc->scripts)); for (i = 0; i < psc->script_count; i++) { int offset = GET_BE_WORD(script->ScriptRecord[i].Script); @@ -2504,7 +2504,7 @@ static void GPOS_expand_script_cache(ScriptCache *psc) TRACE("initializing %i scripts in this font\n",psc->script_count); if (psc->script_count) { - psc->scripts = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(LoadedScript) * psc->script_count); + psc->scripts = heap_alloc_zero(psc->script_count * sizeof(*psc->scripts)); for (i = 0; i < psc->script_count; i++) { int offset = GET_BE_WORD(script->ScriptRecord[i].Script); @@ -2602,7 +2602,7 @@ static void GSUB_initialize_language_cache(LoadedScript *script) { TRACE("Deflang %p, LangCount %i\n",script->default_language.gsub_table, script->language_count); - script->languages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LoadedLanguage) * script->language_count); + script->languages = heap_alloc_zero(script->language_count * sizeof(*script->languages)); for (i = 0; i < script->language_count; i++) { @@ -2639,7 +2639,7 @@ static void GPOS_expand_language_cache(LoadedScript *script) int i; script->language_count = count; - script->languages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LoadedLanguage) * script->language_count); + script->languages = heap_alloc_zero(script->language_count * sizeof(*script->languages)); for (i = 0; i < script->language_count; i++) { diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 8a8a62f..a1be308 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -708,21 +708,6 @@ typedef struct { WORD target; } FindGlyph_struct; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - /* TODO Fix font properties on Arabic locale */ static inline BOOL set_cache_font_properties(const HDC hdc, ScriptCache *sc) { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 989620d..fa9b6c2 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -212,6 +212,21 @@ typedef struct { enum {lex_Halant, lex_Composed_Vowel, lex_Matra_post, lex_Matra_pre, lex_Matra_above, lex_Matra_below, lex_ZWJ, lex_ZWNJ, lex_NBSP, lex_Modifier, lex_Vowel, lex_Consonant, lex_Generic, lex_Ra, lex_Vedic, lex_Anudatta, lex_Nukta}; +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + static inline BOOL is_consonant( int type ) { return (type == lex_Ra || type == lex_Consonant);

1 0

Henri Verbeet : usp10: Use heap_alloc() instead of HeapAlloc().
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 6a0e5bb79dbc66c062fcb068c1c12baca901fc8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0e5bb79dbc66c062fcb068c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 9 10:37:07 2017 +0100 usp10: Use heap_alloc() instead of HeapAlloc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/bidi.c | 18 ++++++------- dlls/usp10/breaking.c | 4 +-- dlls/usp10/indic.c | 2 +- dlls/usp10/opentype.c | 70 +++++++++++++++++++++++++++++++-------------------- dlls/usp10/shape.c | 46 ++++++++++++++++----------------- 5 files changed, 78 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a0e5bb79dbc66c062fcb…

1 0

Henri Verbeet : usp10: Use heap_free() instead of HeapFree().
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: c3dc9edc256d215bfa78f2e91eab5de910b99bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3dc9edc256d215bfa78f2e91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 9 10:37:08 2017 +0100 usp10: Use heap_free() instead of HeapFree(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/bidi.c | 14 +++++------ dlls/usp10/breaking.c | 4 ++-- dlls/usp10/shape.c | 64 +++++++++++++++++++++++++-------------------------- 3 files changed, 41 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3dc9edc256d215bfa78f…

1 0

Austin English : ntoskrnl.exe: Add KeWaitForMultipleObjects stub.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: ce9b40d79bdf8668344a91719d2f6384afd2ddf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce9b40d79bdf8668344a91719… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 24 15:35:23 2014 -0600 ntoskrnl.exe: Add KeWaitForMultipleObjects stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index b72f42c..f022f4c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1999,6 +1999,19 @@ NTSTATUS WINAPI KeWaitForSingleObject(PVOID Object, } /*********************************************************************** + * KeWaitForMultipleObjects (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG Count, PVOID Object[], WAIT_TYPE WaitType, + KWAIT_REASON WaitReason, KPROCESSOR_MODE WaitMode, + BOOLEAN Alertable, PLARGE_INTEGER Timeout, + PKWAIT_BLOCK WaitBlockArray) +{ + FIXME( "stub: %u, %p, %d, %d, %d, %d, %p, %p\n", Count, Object, WaitType, WaitReason, WaitMode, + Alertable, Timeout, WaitBlockArray ); + return STATUS_NOT_IMPLEMENTED; +} + +/*********************************************************************** * IoRegisterFileSystem (NTOSKRNL.EXE.@) */ VOID WINAPI IoRegisterFileSystem(PDEVICE_OBJECT DeviceObject) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index e223ead..7cd5146 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -629,7 +629,7 @@ @ stub KeUpdateRunTime @ stub KeUpdateSystemTime @ stub KeUserModeCallback -@ stub KeWaitForMultipleObjects +@ stdcall KeWaitForMultipleObjects(long ptr long long long long ptr ptr) @ stdcall KeWaitForMutexObject(ptr long long long ptr) @ stdcall KeWaitForSingleObject(ptr long long long ptr) @ stub KiBugCheckData

1 0

Nikolay Sivov : xmllite/reader: Return static empty string as xml declaration node value.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 1ccc1f2f26eddba37438a88e18cd41fa931e6b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ccc1f2f26eddba37438a88e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 10 11:06:38 2017 +0300 xmllite/reader: Return static empty string as xml declaration node value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 67 ++++++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 28da5e1..1805758 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1328,7 +1328,6 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader) reader->empty_element.position = position; reader_set_strvalue(reader, StringValue_LocalName, &strval_xml); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_xml); - reader_set_strvalue(reader, StringValue_Value, &strval_empty); return S_OK; } @@ -3171,26 +3170,17 @@ static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, const WCHAR **ret, return S_OK; } -static BOOL is_namespace_definition(xmlreader *reader) -{ - const strval *local = &reader->strvalues[StringValue_LocalName]; - const strval *prefix = &reader->strvalues[StringValue_Prefix]; - - if (reader_get_nodetype(reader) != XmlNodeType_Attribute) - return FALSE; - - return ((strval_eq(reader, prefix, &strval_empty) && strval_eq(reader, local, &strval_xmlns)) || - strval_eq(reader, prefix, &strval_xmlns)); -} - static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, UINT *len) { xmlreader *reader = impl_from_IXmlReader(iface); strval *val = &reader->strvalues[StringValue_Value]; + UINT length; TRACE("(%p)->(%p %p)\n", reader, value, len); *value = NULL; + if (!len) + len = &length; if ((reader->nodetype == XmlNodeType_Comment && !val->str && !val->len) || is_reader_pending(reader)) { @@ -3204,29 +3194,46 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, if (is_reader_pending(reader)) return E_PENDING; } - if (!val->str) + switch (reader_get_nodetype(reader)) { - WCHAR *ptr = reader_alloc(reader, (val->len+1)*sizeof(WCHAR)); - if (!ptr) return E_OUTOFMEMORY; - memcpy(ptr, reader_get_strptr(reader, val), val->len*sizeof(WCHAR)); - ptr[val->len] = 0; - val->str = ptr; - } + case XmlNodeType_XmlDeclaration: + *value = emptyW; + *len = 0; + break; + case XmlNodeType_Attribute: + { + const strval *local = &reader->strvalues[StringValue_LocalName]; + const strval *prefix = &reader->strvalues[StringValue_Prefix]; - /* For namespace definition attributes return values from namespace list */ - if (is_namespace_definition(reader)) { - const strval *local = &reader->strvalues[StringValue_LocalName]; - struct ns *ns; + /* For namespace definition attributes return values from namespace list */ + if (((strval_eq(reader, prefix, &strval_empty) && strval_eq(reader, local, &strval_xmlns)) || + strval_eq(reader, prefix, &strval_xmlns))) + { + struct ns *ns; - ns = reader_lookup_ns(reader, local); - if (!ns) - ns = reader_lookup_nsdef(reader); + if (!(ns = reader_lookup_ns(reader, local))) + ns = reader_lookup_nsdef(reader); - val = &ns->uri; + *value = ns->uri.str; + *len = ns->uri.len; + break; + } + } + /* fallthrough */ + default: + if (!val->str) + { + WCHAR *ptr = reader_alloc(reader, (val->len+1)*sizeof(WCHAR)); + if (!ptr) return E_OUTOFMEMORY; + memcpy(ptr, reader_get_strptr(reader, val), val->len*sizeof(WCHAR)); + ptr[val->len] = 0; + val->str = ptr; + } + *value = val->str; + *len = val->len; + break; } - *value = val->str; - if (len) *len = val->len; return S_OK; }

1 0

Nikolay Sivov : xmllite/reader: Explicitly return empty static string as local name for nodes without names.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 52f91932acd26ababbb6fad9434107cafccc2ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=52f91932acd26ababbb6fad94… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 10 11:06:39 2017 +0300 xmllite/reader: Explicitly return empty static string as local name for nodes without names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 15 ++++++++------- dlls/xmllite/tests/reader.c | 22 +++++++--------------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 1805758..1dba23c 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1353,7 +1353,6 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader->nodetype = XmlNodeType_Comment; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_Comment; - reader_set_strvalue(reader, StringValue_LocalName, NULL); reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); } @@ -1376,7 +1375,6 @@ static HRESULT reader_parse_comment(xmlreader *reader) /* skip rest of markup '->' */ reader_skipn(reader, 3); - reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); reader->resume[XmlReadResume_Body] = 0; @@ -2343,7 +2341,6 @@ static HRESULT reader_parse_cdata(xmlreader *reader) reader->nodetype = XmlNodeType_CDATA; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_CDATA; - reader_set_strvalue(reader, StringValue_LocalName, NULL); reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); } @@ -2360,7 +2357,6 @@ static HRESULT reader_parse_cdata(xmlreader *reader) reader_skipn(reader, 3); TRACE("%s\n", debug_strval(reader, &value)); - reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); reader->resume[XmlReadResume_Body] = 0; @@ -2404,7 +2400,6 @@ static HRESULT reader_parse_chardata(xmlreader *reader) reader->nodetype = is_wchar_space(*ptr) ? XmlNodeType_Whitespace : XmlNodeType_Text; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_CharData; - reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, NULL); } @@ -3090,7 +3085,6 @@ static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, const WCHAR * static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, UINT *len) { xmlreader *This = impl_from_IXmlReader(iface); - XmlNodeType nodetype; UINT length; TRACE("(%p)->(%p %p)\n", This, name, len); @@ -3098,8 +3092,15 @@ static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, U if (!len) len = &length; - switch ((nodetype = reader_get_nodetype(This))) + switch (reader_get_nodetype(This)) { + case XmlNodeType_Text: + case XmlNodeType_CDATA: + case XmlNodeType_Comment: + case XmlNodeType_Whitespace: + *name = emptyW; + *len = 0; + break; case XmlNodeType_Element: case XmlNodeType_EndElement: /* empty elements are not added to the stack */ diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 208e4be..31b5ce8 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1010,19 +1010,15 @@ static void test_read_comment(void) str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->name), "got %u\n", len); - str_exp = a2w(test->name); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - free_str(str_exp); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); len = 1; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->name), "got %u\n", len); - str_exp = a2w(test->name); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - free_str(str_exp); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); /* value */ len = 1; @@ -1696,21 +1692,17 @@ static void test_read_cdata(void) ok(type == XmlNodeType_CDATA, "got %d for %s\n", type, test->xml); - str_exp = a2w(test->name); - len = 1; str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->name), "got %u\n", len); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); str = NULL; hr = IXmlReader_GetLocalName(reader, &str, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - - free_str(str_exp); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); len = 1; str = NULL;

1 0