wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

Hans Leidekker : iphlpapi/tests: Fix a couple of test failures.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: f93bf5ae48f8576db620d3a55265f170289fa299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f93bf5ae48f8576db620d3a55… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 14 14:59:03 2015 +0200 iphlpapi/tests: Fix a couple of test failures. --- dlls/iphlpapi/tests/iphlpapi.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index fc91142..6553581 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1623,7 +1623,7 @@ static void test_CreateSortedAddressPairs(void) ret = pCreateSortedAddressPairs( NULL, 0, dst, 1, 0, &pair, &pair_count ); ok( ret == NO_ERROR, "got %u\n", ret ); ok( pair != NULL, "pair not set\n" ); - ok( pair_count == 1, "got %u\n", pair_count ); + ok( pair_count >= 1, "got %u\n", pair_count ); ok( pair[0].SourceAddress != NULL, "src address not set\n" ); ok( pair[0].DestinationAddress != NULL, "dst address not set\n" ); pFreeMibTable( pair ); @@ -1638,7 +1638,7 @@ static void test_CreateSortedAddressPairs(void) ret = pCreateSortedAddressPairs( NULL, 0, dst, 2, 0, &pair, &pair_count ); ok( ret == NO_ERROR, "got %u\n", ret ); ok( pair != NULL, "pair not set\n" ); - ok( pair_count == 2, "got %u\n", pair_count ); + ok( pair_count >= 2, "got %u\n", pair_count ); ok( pair[0].SourceAddress != NULL, "src address not set\n" ); ok( pair[0].DestinationAddress != NULL, "dst address not set\n" ); ok( pair[1].SourceAddress != NULL, "src address not set\n" ); @@ -1700,11 +1700,11 @@ static void test_interface_identifier_conversion(void) ok( !luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); ok( !luid.Info.IfType, "got %u\n", luid.Info.IfType ); - memset( &luid, 0, sizeof(luid) ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; ret = pConvertInterfaceIndexToLuid( index, &luid ); ok( !ret, "got %u\n", ret ); ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); + ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); /* ConvertInterfaceLuidToIndex */ @@ -1749,10 +1749,12 @@ static void test_interface_identifier_conversion(void) ret = pConvertInterfaceGuidToLuid( &guid, NULL ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - memset( &luid, 0, sizeof(luid) ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; ret = pConvertInterfaceGuidToLuid( &guid, &luid ); ok( !ret, "got %u\n", ret ); - ok( luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); + ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); + ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); + ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); /* ConvertInterfaceLuidToNameW */ ret = pConvertInterfaceLuidToNameW( NULL, NULL, 0 ); @@ -1796,42 +1798,42 @@ static void test_interface_identifier_conversion(void) ret = pConvertInterfaceNameToLuidW( NULL, NULL ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - memset( &luid, 0xff, sizeof(luid) ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; ret = pConvertInterfaceNameToLuidW( NULL, &luid ); ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( !luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); + ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); ok( !luid.Info.IfType, "got %u\n", luid.Info.IfType ); ret = pConvertInterfaceNameToLuidW( nameW, NULL ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - memset( &luid, 0xff, sizeof(luid) ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; ret = pConvertInterfaceNameToLuidW( nameW, &luid ); ok( !ret, "got %u\n", ret ); ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); + ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); /* ConvertInterfaceNameToLuidA */ ret = pConvertInterfaceNameToLuidA( NULL, NULL ); ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); - memset( &luid, 0xff, sizeof(luid) ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; ret = pConvertInterfaceNameToLuidA( NULL, &luid ); ok( ret == ERROR_INVALID_NAME, "got %u\n", ret ); - ok( luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); - ok( luid.Info.IfType, "got %u\n", luid.Info.IfType ); + ok( luid.Info.Reserved == 0xdead, "reserved set\n" ); + ok( luid.Info.NetLuidIndex == 0xdead, "index set\n" ); + ok( luid.Info.IfType == 0xdead, "type set\n" ); ret = pConvertInterfaceNameToLuidA( nameA, NULL ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - memset( &luid, 0xff, sizeof(luid) ); + luid.Info.Reserved = luid.Info.NetLuidIndex = luid.Info.IfType = 0xdead; ret = pConvertInterfaceNameToLuidA( nameA, &luid ); ok( !ret, "got %u\n", ret ); ok( !luid.Info.Reserved, "got %x\n", luid.Info.Reserved ); - ok( luid.Info.NetLuidIndex, "got %u\n", luid.Info.NetLuidIndex ); + ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); } @@ -1864,7 +1866,6 @@ static void test_GetIfEntry2(void) ret = pGetIfEntry2( &row ); ok( ret == NO_ERROR, "got %u\n", ret ); ok( row.InterfaceIndex == index, "got %u\n", index ); - ok( row.InterfaceLuid.Info.NetLuidIndex, "got %u\n", index ); } START_TEST(iphlpapi)

1 0

Hans Leidekker : iphlpapi: Set the adapter LUID in GetAdaptersAddresses.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: bc334c679a852dc1f3fcb65dc0b659ee29389e49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc334c679a852dc1f3fcb65dc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 14 14:58:41 2015 +0200 iphlpapi: Set the adapter LUID in GetAdaptersAddresses. --- dlls/iphlpapi/iphlpapi_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 4b1261a..e8daa8c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1003,6 +1003,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index aa->PhysicalAddressLength = buflen; aa->IfType = typeFromMibType(type); aa->ConnectionType = connectionTypeFromMibType(type); + aa->Luid.Info.NetLuidIndex = index; + aa->Luid.Info.IfType = aa->IfType; if (num_v4_gateways) {

1 0

Hans Leidekker : wbemprox: Fix evaluation of LIKE queries.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 725c7aec8c3596fa8d183c7b341d1dbadecc91f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=725c7aec8c3596fa8d183c7b3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 14 14:58:13 2015 +0200 wbemprox: Fix evaluation of LIKE queries. --- dlls/wbemprox/query.c | 6 +++--- dlls/wbemprox/tests/query.c | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 6f66603..f01155a 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -63,10 +63,10 @@ static BOOL eval_like( const WCHAR *lstr, const WCHAR *rstr ) { while (*q == '%') q++; if (!*q) return TRUE; - while (*p && toupperW( p[1] ) != toupperW( q[1] )) p++; - if (!*p) return TRUE; + while (*p && *q && toupperW( *p ) == toupperW( *q )) { p++; q++; }; + if (!*p && !*q) return TRUE; } - if (toupperW( *p++ ) != toupperW( *q++ )) return FALSE; + if (*q != '%' && toupperW( *p++ ) != toupperW( *q++ )) return FALSE; } return TRUE; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index b46ff52..09c8734 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -98,7 +98,11 @@ static void test_select( IWbemServices *services ) '\"','\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0','\"',0}; static const WCHAR query9[] = {'S','E','L','E','C','T','\n','a','\r','F','R','O','M','\t','b',0}; - static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8, query9 }; + static const WCHAR query10[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'P','r','o','c','e','s','s',' ','W','H','E','R','E',' ','C','a','p','t','i','o','n',' ', + 'L','I','K','E',' ','"','%','f','i','r','e','f','o','x','.','e','x','e','"',0}; + static const WCHAR *test[] = { query1, query2, query3, query4, query5, query6, query7, query8, query9, query10 }; HRESULT hr; IEnumWbemClassObject *result; BSTR wql = SysAllocString( wqlW );

1 0

Nikolay Sivov : include: Added IImgCtx definition.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 8d690e7ef9023f39b0f8cc7f127a641322e5dafe URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d690e7ef9023f39b0f8cc7f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 14 13:04:03 2015 +0300 include: Added IImgCtx definition. --- include/Makefile.in | 1 + include/iimgctx.idl | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index cc55ece..b5229c6 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -57,6 +57,7 @@ PUBLIC_IDL_H_SRCS = \ iads.idl \ icftypes.idl \ iextag.idl \ + iimgctx.idl \ imnact.idl \ imnxport.idl \ indexsrv.idl \ diff --git a/include/iimgctx.idl b/include/iimgctx.idl new file mode 100644 index 0000000..b30eadd --- /dev/null +++ b/include/iimgctx.idl @@ -0,0 +1,70 @@ +/* + * Copyright 2015 Nikolay Sivov 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 + */ + +import "unknwn.idl"; + +cpp_quote("#define IMGCHG_SIZE 0x0001") +cpp_quote("#define IMGCHG_VIEW 0x0002") +cpp_quote("#define IMGCHG_COMPLETE 0x0004") +cpp_quote("#define IMGCHG_ANIMATE 0x0008") +cpp_quote("#define IMGCHG_MASK 0x000f") + +cpp_quote("#define IMGLOAD_NOTLOADED 0x00100000") +cpp_quote("#define IMGLOAD_LOADING 0x00200000") +cpp_quote("#define IMGLOAD_STOPPED 0x00400000") +cpp_quote("#define IMGLOAD_ERROR 0x00800000") +cpp_quote("#define IMGLOAD_COMPLETE 0x01000000") +cpp_quote("#define IMGLOAD_MASK 0x01f00000") + +cpp_quote("#define IMGBITS_NONE 0x02000000") +cpp_quote("#define IMGBITS_PARTIAL 0x04000000") +cpp_quote("#define IMGBITS_TOTAL 0x08000000") +cpp_quote("#define IMGBITS_MASK 0x0e000000") + +cpp_quote("#define IMGANIM_ANIMATED 0x10000000") +cpp_quote("#define IMGANIM_MASK 0x10000000") + +cpp_quote("#define IMGTRANS_OPAQUE 0x20000000") +cpp_quote("#define IMGTRANS_MASK 0x20000000") + +cpp_quote("#define DWN_COLORMODE 0x0000003f") +cpp_quote("#define DWN_DOWNLOADONLY 0x00000040") +cpp_quote("#define DWN_FORCEDITHER 0x00000080") +cpp_quote("#define DWN_RAWIMAGE 0x00000100") +cpp_quote("#define DWN_MIRRORIMAGE 0x00000200") + +typedef void (__stdcall *PFNIMGCTXCALLBACK)(void *, void *); + +[ + local, + object, + uuid(3050f3d7-98b5-11cf-bb82-00aa00bdce0b) +] +interface IImgCtx : IUnknown +{ + HRESULT Load(LPCWSTR url, DWORD flags); + HRESULT SelectChanges(ULONG changeon, ULONG changeoff, BOOL signal); + HRESULT SetCallback(PFNIMGCTXCALLBACK fn, void *priv); + HRESULT Disconnect(); + HRESULT GetUpdateRects(RECT *rect, RECT *img, LONG *pcrc); + HRESULT GetStateInfo(ULONG *state, SIZE *size, BOOL clear_changes); + HRESULT GetPalette(HPALETTE *hpal); + HRESULT Draw(HDC hdc, RECT *bounds); + HRESULT Tile(HDC hdc, POINT *backorg, RECT *clip, SIZE *size); + HRESULT StretchBlt(HDC hdc, int dstX, int dstY, int dstXE, int dstYE, int srcX, int srcY, int srcXE, int srcYE, DWORD rop); +}

1 0

Gerald Pfeifer : d3dcompiler_43: Define BWRITER_SM1_VS and BWRITER_SM1_PS as unsigned constants.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 8bb4525ee03494003efd0e346b296f75e34a0cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bb4525ee03494003efd0e346… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Aug 10 12:31:25 2015 +0200 d3dcompiler_43: Define BWRITER_SM1_VS and BWRITER_SM1_PS as unsigned constants. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 2fafa94..1eea0d2 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -532,8 +532,8 @@ enum bwritershader_param_srcmod_type BWRITERSPSM_NOT, }; -#define BWRITER_SM1_VS 0xfffe -#define BWRITER_SM1_PS 0xffff +#define BWRITER_SM1_VS 0xfffeu +#define BWRITER_SM1_PS 0xffffu #define BWRITERPS_VERSION(major, minor) ((BWRITER_SM1_PS << 16) | ((major) << 8) | (minor)) #define BWRITERVS_VERSION(major, minor) ((BWRITER_SM1_VS << 16) | ((major) << 8) | (minor))

1 0

Sebastian Lackner : d3dcompiler: Implement semi-stub for D3DCompile2.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: e0a9ea6c684a6579b5deafc4cd6383e247b81079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0a9ea6c684a6579b5deafc4c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 29 17:58:02 2015 +0200 d3dcompiler: Implement semi-stub for D3DCompile2. --- dlls/d3dcompiler_43/compiler.c | 28 ++++++++++++++++++++++++---- dlls/d3dcompiler_46/d3dcompiler_46.spec | 2 +- dlls/d3dcompiler_47/d3dcompiler_47.spec | 2 +- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 5dce856..33ef916 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -692,16 +692,23 @@ static HRESULT compile_shader(const char *preproc_shader, const char *target, co return S_OK; } -HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, +HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, - const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages) + const char *target, UINT sflags, UINT eflags, UINT secondary_flags, + const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, + ID3DBlob **error_messages) { HRESULT hr; TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s,\n" - "target %s, sflags %#x, eflags %#x, shader %p, error_messages %p\n", + "target %s, sflags %#x, eflags %#x, secondary_flags %#x, secondary_data %p,\n" + "secondary_data_size %lu, shader %p, error_messages %p\n", data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), - debugstr_a(target), sflags, eflags, shader, error_messages); + debugstr_a(target), sflags, eflags, secondary_flags, secondary_data, + secondary_data_size, shader, error_messages); + + if (secondary_data) + FIXME("secondary data not implemented yet\n"); if (shader) *shader = NULL; if (error_messages) *error_messages = NULL; @@ -717,6 +724,19 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena return hr; } +HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, + const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages) +{ + TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s,\n" + "target %s, sflags %#x, eflags %#x, shader %p, error_messages %p\n", + data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), + debugstr_a(target), sflags, eflags, shader, error_messages); + + return D3DCompile2(data, data_size, filename, defines, include, entrypoint, target, sflags, + eflags, 0, NULL, 0, shader, error_messages); +} + HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages) diff --git a/dlls/d3dcompiler_46/d3dcompiler_46.spec b/dlls/d3dcompiler_46/d3dcompiler_46.spec index e36a8c0..1b145c8a 100644 --- a/dlls/d3dcompiler_46/d3dcompiler_46.spec +++ b/dlls/d3dcompiler_46/d3dcompiler_46.spec @@ -1,6 +1,6 @@ @ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) @ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) -@ stub D3DCompile2 +@ stdcall D3DCompile2(ptr long str ptr ptr str str long long long ptr long ptr ptr) @ stdcall D3DCompileFromFile(wstr ptr ptr str str long long ptr ptr) @ stub D3DCompressShaders @ stdcall D3DCreateBlob(long ptr) diff --git a/dlls/d3dcompiler_47/d3dcompiler_47.spec b/dlls/d3dcompiler_47/d3dcompiler_47.spec index a0df93e..efa4767 100644 --- a/dlls/d3dcompiler_47/d3dcompiler_47.spec +++ b/dlls/d3dcompiler_47/d3dcompiler_47.spec @@ -1,6 +1,6 @@ @ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) @ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) -@ stub D3DCompile2 +@ stdcall D3DCompile2(ptr long str ptr ptr str str long long long ptr long ptr ptr) @ stdcall D3DCompileFromFile(wstr ptr ptr str str long long ptr ptr) @ stub D3DCompressShaders @ stdcall D3DCreateBlob(long ptr)

1 0

Alistair Leslie-Hughes : d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 1a0fc895f1f0fd393acb6e76dbd8702196458154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a0fc895f1f0fd393acb6e76d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 23 19:09:32 2015 +1000 d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs. --- dlls/d3dcompiler_43/compiler.c | 9 +++++++++ dlls/d3dcompiler_46/d3dcompiler_46.spec | 2 +- dlls/d3dcompiler_47/d3dcompiler_47.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 114b4c1..5dce856 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -763,3 +763,12 @@ HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T size, UINT flags, const c data, size, flags, comments, disassembly); return E_NOTIMPL; } + +HRESULT WINAPI D3DCompileFromFile(const WCHAR *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *includes, + const char *entrypoint, const char *target, UINT flags1, UINT flags2, ID3DBlob **code, ID3DBlob **errors) +{ + FIXME("filename %s, defines %p, includes %p, entrypoint %s, target %s, flags1 %x, flags2 %x, code %p, errors %p\n", + debugstr_w(filename), defines, includes, debugstr_a(entrypoint), debugstr_a(target), flags1, flags2, code, errors); + + return E_NOTIMPL; +} diff --git a/dlls/d3dcompiler_46/d3dcompiler_46.spec b/dlls/d3dcompiler_46/d3dcompiler_46.spec index 5811b40..e36a8c0 100644 --- a/dlls/d3dcompiler_46/d3dcompiler_46.spec +++ b/dlls/d3dcompiler_46/d3dcompiler_46.spec @@ -1,7 +1,7 @@ @ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) @ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) @ stub D3DCompile2 -@ stub D3DCompileFromFile +@ stdcall D3DCompileFromFile(wstr ptr ptr str str long long ptr ptr) @ stub D3DCompressShaders @ stdcall D3DCreateBlob(long ptr) @ stub D3DDecompressShaders diff --git a/dlls/d3dcompiler_47/d3dcompiler_47.spec b/dlls/d3dcompiler_47/d3dcompiler_47.spec index 40ad977..a0df93e 100644 --- a/dlls/d3dcompiler_47/d3dcompiler_47.spec +++ b/dlls/d3dcompiler_47/d3dcompiler_47.spec @@ -1,7 +1,7 @@ @ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) @ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) @ stub D3DCompile2 -@ stub D3DCompileFromFile +@ stdcall D3DCompileFromFile(wstr ptr ptr str str long long ptr ptr) @ stub D3DCompressShaders @ stdcall D3DCreateBlob(long ptr) @ stub D3DCreateFunctionLinkingGraph

1 0

Indrek Altpere : mshtml: Handle nsIDOMWindow_GetFrames returning NULL.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 2cfe3cac0ce15e97b1b3fe374ad6f3d8da4075e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cfe3cac0ce15e97b1b3fe374… Author: Indrek Altpere <efbiaiinzinz(a)hotmail.com> Date: Sun Aug 9 09:24:04 2015 +0300 mshtml: Handle nsIDOMWindow_GetFrames returning NULL. --- dlls/mshtml/htmlwindow.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b5b906a..280a5d7 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -380,6 +380,11 @@ HRESULT get_frame_by_name(HTMLOuterWindow *This, const WCHAR *name, BOOL deep, H return E_FAIL; } + if(!nsframes) { + WARN("nsIDOMWindow_GetFrames returned NULL nsframes: %p\n", This->nswindow); + return DISP_E_MEMBERNOTFOUND; + } + nsAString_InitDepend(&name_str, name); nsres = nsIDOMWindowCollection_NamedItem(nsframes, &name_str, &nswindow); nsAString_Finish(&name_str);

1 0

Zhenbo Li : mshtml: Add IHTMLSelectElement::form property implementation.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: a15751ab7371efc5c27e208916ff5402df5c17a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a15751ab7371efc5c27e20891… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat Aug 8 11:14:47 2015 +0800 mshtml: Add IHTMLSelectElement::form property implementation. --- dlls/mshtml/htmlselect.c | 39 +++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 899c8e5..3c869ff 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -371,8 +371,43 @@ static HRESULT WINAPI HTMLSelectElement_get_disabled(IHTMLSelectElement *iface, static HRESULT WINAPI HTMLSelectElement_get_form(IHTMLSelectElement *iface, IHTMLFormElement **p) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMHTMLFormElement *nsform; + nsIDOMNode *form_node; + HTMLDOMNode *node; + HRESULT hres; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + nsres = nsIDOMHTMLSelectElement_GetForm(This->nsselect, &nsform); + FIXME("get form %08x : %p\n", nsres, nsform); + if (NS_FAILED(nsres)) { + ERR("GetForm failed: %08x, nsform: %p\n", nsres, nsform); + *p = NULL; + return E_FAIL; + } + if (nsform == NULL) { + TRACE("nsform not found\n"); + *p = NULL; + return S_OK; + } + + nsres = nsIDOMHTMLFormElement_QueryInterface(nsform, &IID_nsIDOMNode, (void**)&form_node); + nsIDOMHTMLFormElement_Release(nsform); + assert(nsres == NS_OK); + + hres = get_node(This->element.node.doc, form_node, TRUE, &node); + nsIDOMNode_Release(form_node); + if (FAILED(hres)) + return hres; + + hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)p); + + node_release(node); + return hres; } static HRESULT WINAPI HTMLSelectElement_add(IHTMLSelectElement *iface, IHTMLElement *element, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index fff65d8..3f68d87 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4313,6 +4313,40 @@ static void test_form_target(IUnknown *unk) IHTMLFormElement_Release(form); } +static void test_select_form(IUnknown *uselect, IUnknown *uform) +{ + IHTMLSelectElement *select = get_select_iface(uselect); + IHTMLFormElement *form; + HRESULT hres; + + hres = IHTMLSelectElement_get_form(select, NULL); + ok(hres == E_POINTER, "got %08x\n, expected E_POINTER\n", hres); + + hres = IHTMLSelectElement_get_form(select, &form); + ok(hres == S_OK, "get_form failed: %08x\n", hres); + ok(form != NULL, "form == NULL\n"); + + test_form_length((IUnknown*)form, 1); + test_form_elements((IUnknown*)form); + test_form_name((IUnknown*)form, "form_name"); + + ok(iface_cmp(uform, (IUnknown*)form), "Expected %p, got %p\n", uform, form); + + IHTMLSelectElement_Release(select); + IHTMLFormElement_Release(form); +} + +static void test_select_form_notfound(IHTMLSelectElement *select) +{ + IHTMLFormElement *form; + HRESULT hres; + + form = (IHTMLFormElement*)0xdeadbeef; + hres = IHTMLSelectElement_get_form(select, &form); + ok(hres == S_OK, "get_form failed: %08x\n", hres); + ok(form == NULL, "got %p\n", form); +} + #define test_meta_name(a,b) _test_meta_name(__LINE__,a,b) static void _test_meta_name(unsigned line, IUnknown *unk, const char *exname) { @@ -4948,6 +4982,7 @@ static void test_select_elem(IHTMLSelectElement *select) test_select_name(select, NULL); test_select_set_name(select, "select-name"); test_select_name(select, "select-name"); + test_select_form_notfound(select); test_select_get_disabled(select, VARIANT_FALSE); test_select_set_disabled(select, VARIANT_TRUE); @@ -8491,6 +8526,16 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + test_elem_set_innerhtml((IUnknown*)div, + "<form id=\"form\" name=\"form_name\"><select id=\"sform\"></select></form>"); + elem = get_elem_by_id(doc, "sform", TRUE); + elem2 = get_elem_by_id(doc, "form", TRUE); + if(elem && elem2) { + test_select_form((IUnknown*)elem, (IUnknown*)elem2); + IHTMLElement_Release(elem); + IHTMLElement_Release(elem2); + } + test_attr(div); test_blocked(doc, div); test_elem_names(doc);

1 0

Zhenbo Li : mshtml: Add IHTMLSelectElement::name property implementation.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: f7b9dd9525e1643097f60296874a70e4f77e1741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b9dd9525e1643097f602968… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat Aug 8 11:14:21 2015 +0800 mshtml: Add IHTMLSelectElement::name property implementation. --- dlls/mshtml/htmlselect.c | 35 ++++++++++++++--------------------- dlls/mshtml/tests/dom.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index e55d7ea..899c8e5 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -205,40 +205,33 @@ static HRESULT WINAPI HTMLSelectElement_get_multiple(IHTMLSelectElement *iface, static HRESULT WINAPI HTMLSelectElement_put_name(IHTMLSelectElement *iface, BSTR v) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + nsAString_InitDepend(&str, v); + nsres = nsIDOMHTMLSelectElement_SetName(This->nsselect, &str); + nsAString_Finish(&str); + + if(NS_FAILED(nsres)) { + ERR("SetName failed: %08x\n", nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLSelectElement_get_name(IHTMLSelectElement *iface, BSTR *p) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); nsAString name_str; - const PRUnichar *name = NULL; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); nsAString_Init(&name_str, NULL); - nsres = nsIDOMHTMLSelectElement_GetName(This->nsselect, &name_str); - if(NS_SUCCEEDED(nsres)) { - static const WCHAR wszGarbage[] = {'g','a','r','b','a','g','e',0}; - - nsAString_GetData(&name_str, &name); - - /* - * Native never returns empty string here. If an element has no name, - * name of previous element or ramdom data is returned. - */ - *p = SysAllocString(*name ? name : wszGarbage); - }else { - ERR("GetName failed: %08x\n", nsres); - } - nsAString_Finish(&name_str); - - TRACE("name=%s\n", debugstr_w(*p)); - return S_OK; + return return_nsstr(nsres, &name_str, p); } static HRESULT WINAPI HTMLSelectElement_get_options(IHTMLSelectElement *iface, IDispatch **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7088c52..fff65d8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2217,6 +2217,37 @@ static void _test_select_set_size(unsigned line, IHTMLSelectElement *select, LON ok_(__FILE__,line) (hres == exhres, "put_size(%d) got %08x, expect %08x\n", val, hres, exhres); } +#define test_select_name(s,v) _test_select_name(__LINE__,s,v) +static void _test_select_name(unsigned line, IHTMLSelectElement *select, const char *extext) +{ + HRESULT hres; + BSTR text; + + text = NULL; + hres = IHTMLSelectElement_get_name(select, &text); + ok_(__FILE__,line) (hres == S_OK, "get_name failed: %08x\n", hres); + if(extext) { + ok_(__FILE__,line) (text != NULL, "text == NULL\n"); + ok_(__FILE__,line) (!strcmp_wa(text, extext), "name = %s, expected %s\n", + wine_dbgstr_w(text), extext); + SysFreeString(text); + } else + ok_(__FILE__,line) (text == NULL, "text(%p) = %s\n", text, wine_dbgstr_w(text)); +} + +#define test_select_set_name(s,v) _test_select_set_name(__LINE__,s,v) +static void _test_select_set_name(unsigned line, IHTMLSelectElement *select, const char *text) +{ + HRESULT hres; + BSTR bstr; + + bstr = a2bstr(text); + + hres = IHTMLSelectElement_put_name(select, bstr); + ok_(__FILE__,line) (hres == S_OK, "put_name(%s) failed: %08x\n", wine_dbgstr_w(bstr), hres); + SysFreeString(bstr); +} + #define test_range_text(r,t) _test_range_text(__LINE__,r,t) static void _test_range_text(unsigned line, IHTMLTxtRange *range, const char *extext) { @@ -4914,6 +4945,10 @@ static void test_select_elem(IHTMLSelectElement *select) test_select_set_size(select, 3, S_OK); test_select_size(select, 3); + test_select_name(select, NULL); + test_select_set_name(select, "select-name"); + test_select_name(select, "select-name"); + test_select_get_disabled(select, VARIANT_FALSE); test_select_set_disabled(select, VARIANT_TRUE); test_select_set_disabled(select, VARIANT_FALSE);

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
51
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 August 2015