August 2015 - Wine-commits - list.winehq.org

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

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

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

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

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

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 : 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 : include: Add missing SSPI declarations.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 3031484579a07a8169ce01063e7cfbd00d3a092e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3031484579a07a8169ce01063… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 14 14:59:25 2015 +0200 include: Add missing SSPI declarations. --- include/sspi.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/sspi.h b/include/sspi.h index b8761a5..501406f 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -87,6 +87,29 @@ typedef struct _UNICODE_STRING { typedef UNICODE_STRING SECURITY_STRING, *PSECURITY_STRING; +#define SSPIPFC_CREDPROV_DO_NOT_SAVE 0x00000001 +#define SSPIPFC_NO_CHECKBOX 0x00000002 + +typedef void *PSEC_WINNT_AUTH_IDENTITY_OPAQUE; + +SECURITY_STATUS SEC_ENTRY SspiEncodeAuthIdentityAsStrings( + PSEC_WINNT_AUTH_IDENTITY_OPAQUE, PCWSTR *, PCWSTR *, PCWSTR *); + +SECURITY_STATUS SEC_ENTRY SspiEncodeStringsAsAuthIdentity( + PCWSTR, PCWSTR, PCWSTR, PSEC_WINNT_AUTH_IDENTITY_OPAQUE *); + +ULONG SEC_ENTRY SspiPromptForCredentialsA(PCSTR, void *, + ULONG, PCSTR, PSEC_WINNT_AUTH_IDENTITY_OPAQUE, + PSEC_WINNT_AUTH_IDENTITY_OPAQUE *, int *, ULONG); +ULONG SEC_ENTRY SspiPromptForCredentialsW(PCWSTR, void *, + ULONG, PCWSTR, PSEC_WINNT_AUTH_IDENTITY_OPAQUE, + PSEC_WINNT_AUTH_IDENTITY_OPAQUE *, int *, ULONG); +#define SspiPromptForCredentials WINELIB_NAME_AW(SspiPromptForCredentials) + +void SEC_ENTRY SspiFreeAuthIdentity(PSEC_WINNT_AUTH_IDENTITY_OPAQUE); +void SEC_ENTRY SspiLocalFree(void *); +void SEC_ENTRY SspiZeroAuthIdentity(PSEC_WINNT_AUTH_IDENTITY_OPAQUE); + typedef struct _SecPkgInfoA { ULONG fCapabilities;

1 0

Hans Leidekker : secur32: Implement a couple of identity helper functions.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 419362c8510455b37d1043bf08feb9f2867f03d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=419362c8510455b37d1043bf0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 14 14:59:52 2015 +0200 secur32: Implement a couple of identity helper functions. --- dlls/secur32/secur32.c | 106 +++++++++++++++++++++++++++++++++++++++++++ dlls/secur32/secur32.spec | 5 ++ dlls/secur32/tests/secur32.c | 101 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 212 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=419362c8510455b37d104…

1 0

Hans Leidekker : credui: Add a partial implementation of SspiPromptForCredentials.
by Alexandre Julliard 17 Aug '15

17 Aug '15

Module: wine Branch: master Commit: 92468f785e6e8f140a484ea0d213a9f6f29576a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92468f785e6e8f140a484ea0d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 14 15:00:23 2015 +0200 credui: Add a partial implementation of SspiPromptForCredentials. --- dlls/credui/credui.spec | 1 + dlls/credui/credui_main.c | 82 +++++++++++++++++++++++++++++++++++++++++++++- dlls/credui/tests/credui.c | 72 ++++++++++++++++++++++++++++++++++++++++ include/wincred.h | 1 + 4 files changed, 155 insertions(+), 1 deletion(-) diff --git a/dlls/credui/credui.spec b/dlls/credui/credui.spec index d32a602..891416c 100644 --- a/dlls/credui/credui.spec +++ b/dlls/credui/credui.spec @@ -15,3 +15,4 @@ @ stub DllGetClassObject @ stub DllRegisterServer @ stub DllUnregisterServer +@ stdcall SspiPromptForCredentialsW(wstr ptr long wstr ptr ptr ptr long) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index c7b2da4..beb3c58 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -25,6 +25,8 @@ #include "winnt.h" #include "winuser.h" #include "wincred.h" +#include "rpc.h" +#include "sspi.h" #include "commctrl.h" #include "credui_resources.h" @@ -558,7 +560,8 @@ static BOOL find_existing_credential(const WCHAR *target, WCHAR *username, ULONG if (!CredEnumerateW(target, 0, &count, &credentials)) return FALSE; for (i = 0; i < count; i++) { - if (credentials[i]->Type != CRED_TYPE_DOMAIN_PASSWORD) + if (credentials[i]->Type != CRED_TYPE_DOMAIN_PASSWORD && + credentials[i]->Type != CRED_TYPE_GENERIC) { FIXME("no support for type %u credentials\n", credentials[i]->Type); continue; @@ -849,3 +852,80 @@ BOOL WINAPI CredUIInitControls(void) FIXME("() stub\n"); return TRUE; } + +/****************************************************************************** + * SspiPromptForCredentialsW [CREDUI.@] + */ +ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, + DWORD error, PCWSTR package, + PSEC_WINNT_AUTH_IDENTITY_OPAQUE input_id, + PSEC_WINNT_AUTH_IDENTITY_OPAQUE *output_id, + BOOL *save, DWORD sspi_flags ) +{ + static const WCHAR basicW[] = {'B','a','s','i','c',0}; + static const WCHAR ntlmW[] = {'N','T','L','M',0}; + static const WCHAR negotiateW[] = {'N','e','g','o','t','i','a','t','e',0}; + WCHAR username[CREDUI_MAX_USERNAME_LENGTH + 1] = {0}; + WCHAR password[CREDUI_MAX_PASSWORD_LENGTH + 1] = {0}; + DWORD len_username = sizeof(username) / sizeof(username[0]); + DWORD len_password = sizeof(password) / sizeof(password[0]); + DWORD ret, flags; + CREDUI_INFOW *cred_info = info; + + FIXME( "(%s, %p, %u, %s, %p, %p, %p, %x) stub\n", debugstr_w(target), info, + error, debugstr_w(package), input_id, output_id, save, sspi_flags ); + + if (!target) return ERROR_INVALID_PARAMETER; + if (!package || (strcmpiW( package, basicW ) && strcmpiW( package, ntlmW ) && + strcmpiW( package, negotiateW ))) + { + FIXME( "package %s not supported\n", debugstr_w(package) ); + return ERROR_NO_SUCH_PACKAGE; + } + if (input_id) + { + FIXME( "input identity not supported\n" ); + return ERROR_CALL_NOT_IMPLEMENTED; + } + + flags = CREDUI_FLAGS_ALWAYS_SHOW_UI | CREDUI_FLAGS_GENERIC_CREDENTIALS; + + if (sspi_flags & SSPIPFC_CREDPROV_DO_NOT_SAVE) + flags |= CREDUI_FLAGS_DO_NOT_PERSIST; + + if (!(sspi_flags & SSPIPFC_NO_CHECKBOX)) + flags |= CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX; + + find_existing_credential( target, username, len_username, password, len_password ); + + if (!(ret = CredUIPromptForCredentialsW( cred_info, target, NULL, error, username, + len_username, password, len_password, save, flags ))) + { + SEC_WINNT_AUTH_IDENTITY_W *id; + DWORD size = sizeof(*id); + WCHAR *ptr; + + len_username = strlenW( username ); + len_password = strlenW( password ); + + size += (len_username + 1) * sizeof(WCHAR); + size += (len_password + 1) * sizeof(WCHAR); + if (!(id = HeapAlloc( GetProcessHeap(), 0, size ))) return ERROR_OUTOFMEMORY; + ptr = (WCHAR *)(id + 1); + + memcpy( ptr, username, (len_username + 1) * sizeof(WCHAR) ); + id->User = ptr; + id->UserLength = len_username; + ptr += len_username + 1; + id->Domain = NULL; + id->DomainLength = 0; + memcpy( ptr, password, (len_password + 1) * sizeof(WCHAR) ); + id->Password = ptr; + id->PasswordLength = len_password; + id->Flags = 0; + + *output_id = id; + } + + return ret; +} diff --git a/dlls/credui/tests/credui.c b/dlls/credui/tests/credui.c index 18fc5bc..1f5aa02 100644 --- a/dlls/credui/tests/credui.c +++ b/dlls/credui/tests/credui.c @@ -23,9 +23,17 @@ #include "windef.h" #include "winbase.h" #include "wincred.h" +#include "sspi.h" #include "wine/test.h" +static SECURITY_STATUS (SEC_ENTRY *pSspiEncodeAuthIdentityAsStrings) + (PSEC_WINNT_AUTH_IDENTITY_OPAQUE,PCWSTR*,PCWSTR*,PCWSTR*); +static void (SEC_ENTRY *pSspiFreeAuthIdentity) + (PSEC_WINNT_AUTH_IDENTITY_OPAQUE); +static ULONG (SEC_ENTRY *pSspiPromptForCredentialsW) + (PCWSTR,void*,ULONG,PCWSTR,PSEC_WINNT_AUTH_IDENTITY_OPAQUE,PSEC_WINNT_AUTH_IDENTITY_OPAQUE*,int*,ULONG); + static void test_CredUIPromptForCredentials(void) { static const WCHAR wszServerName[] = {'W','i','n','e','T','e','s','t',0}; @@ -140,7 +148,71 @@ static void test_CredUIPromptForCredentials(void) } } +static void test_SspiPromptForCredentials(void) +{ + static const WCHAR targetW[] = {'S','s','p','i','T','e','s','t',0}; + static const WCHAR basicW[] = {'b','a','s','i','c',0}; + ULONG ret; + SECURITY_STATUS status; + CREDUI_INFOW info; + PSEC_WINNT_AUTH_IDENTITY_OPAQUE id; + const WCHAR *username, *domain, *creds; + int save; + + if (!pSspiPromptForCredentialsW || !pSspiFreeAuthIdentity) + { + win_skip( "SspiPromptForCredentialsW is missing\n" ); + return; + } + + info.cbSize = sizeof(info); + info.hwndParent = NULL; + info.pszMessageText = targetW; + info.pszCaptionText = basicW; + info.hbmBanner = NULL; + ret = pSspiPromptForCredentialsW( NULL, &info, 0, basicW, NULL, &id, &save, 0 ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + ret = pSspiPromptForCredentialsW( targetW, &info, 0, NULL, NULL, &id, &save, 0 ); + ok( ret == ERROR_NO_SUCH_PACKAGE, "got %u\n", ret ); + + if (winetest_interactive) + { + id = NULL; + save = -1; + ret = pSspiPromptForCredentialsW( targetW, &info, 0, basicW, NULL, &id, &save, 0 ); + ok( ret == ERROR_SUCCESS || ret == ERROR_CANCELLED, "got %u\n", ret ); + if (ret == ERROR_SUCCESS) + { + ok( id != NULL, "id not set\n" ); + ok( save == TRUE || save == FALSE, "got %d\n", save ); + + username = creds = NULL; + domain = (const WCHAR *)0xdeadbeef; + status = pSspiEncodeAuthIdentityAsStrings( id, &username, &domain, &creds ); + ok( status == SEC_E_OK, "got %u\n", status ); + ok( username != NULL, "username not set\n" ); + ok( domain == NULL, "domain not set\n" ); + ok( creds != NULL, "creds not set\n" ); + pSspiFreeAuthIdentity( id ); + } + } +} + START_TEST(credui) { + HMODULE hcredui = GetModuleHandleA( "credui.dll" ), hsecur32 = LoadLibraryA( "secur32.dll" ); + + if (hcredui) + pSspiPromptForCredentialsW = (void *)GetProcAddress( hcredui, "SspiPromptForCredentialsW" ); + if (hsecur32) + { + pSspiEncodeAuthIdentityAsStrings = (void *)GetProcAddress( hsecur32, "SspiEncodeAuthIdentityAsStrings" ); + pSspiFreeAuthIdentity = (void *)GetProcAddress( hsecur32, "SspiFreeAuthIdentity" ); + } + test_CredUIPromptForCredentials(); + test_SspiPromptForCredentials(); + + FreeLibrary( hsecur32 ); } diff --git a/include/wincred.h b/include/wincred.h index d0a75a7..f238c05 100644 --- a/include/wincred.h +++ b/include/wincred.h @@ -184,6 +184,7 @@ typedef struct _BINARY_BLOB_CREDENTIAL_INFO #define CRED_MAX_ATTRIBUTES 64 #define CRED_MAX_BLOB_SIZE 512 +#define CRED_MAX_CREDENTIAL_BLOB_SIZE (5 * CRED_MAX_BLOB_SIZE) #define CREDUI_MAX_MESSAGE_LENGTH 32767 #define CREDUI_MAX_CAPTION_LENGTH 128

1 0