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

Matteo Bruni : d3dx9: Sync ordering of D3DXComputeIMTFromPerVertexSignal spec entry.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: b62c3a894b8a91e6fc1fdb1329d8817f5d7ed398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b62c3a894b8a91e6fc1fdb132… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 28 19:06:03 2016 +0200 d3dx9: Sync ordering of D3DXComputeIMTFromPerVertexSignal spec entry. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b62c3a894b8a91e6fc1fd…

1 0

Jacek Caban : rpcrt4: Added RpcServerRegisterAuthInfoW failure test.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 3b6cb60ea600e83ce0256e37a3b1830bee7456f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6cb60ea600e83ce0256e37a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 27 17:08:46 2016 +0200 rpcrt4: Added RpcServerRegisterAuthInfoW failure test. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/rpc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 400756f..81b598c 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -911,6 +911,14 @@ static void test_RpcServerInqDefaultPrincName(void) HeapFree( GetProcessHeap(), 0, username ); } +static void test_RpcServerRegisterAuthInfo(void) +{ + RPC_STATUS status; + + status = RpcServerRegisterAuthInfoW(NULL, 600, NULL, NULL); + ok(status == RPC_S_UNKNOWN_AUTHN_SERVICE, "status = %x\n", status); +} + START_TEST( rpc ) { UuidConversionAndComparison(); @@ -925,4 +933,5 @@ START_TEST( rpc ) test_UuidCreateSequential(); test_RpcBindingFree(); test_RpcServerInqDefaultPrincName(); + test_RpcServerRegisterAuthInfo(); }

1 0

Jacek Caban : wininet: Include stdlib.h before winsock2.h in http.c.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: a9a6948b7944dccca6831914ea40e5c9aa5929bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9a6948b7944dccca6831914e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 29 17:21:03 2016 +0200 wininet: Include stdlib.h before winsock2.h in http.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a468a84..5436a89 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -29,6 +29,8 @@ #include "config.h" +#include <stdlib.h> + #ifdef HAVE_ZLIB # include <zlib.h> #endif @@ -38,9 +40,9 @@ #include <stdarg.h> #include <stdio.h> -#include <stdlib.h> #include <time.h> #include <assert.h> + #include "windef.h" #include "winbase.h" #include "wininet.h"

1 0

Matteo Bruni : d3dx9: Avoid overflowing debug channel buffer when tracing ASCII effect errors.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 901c96ef9c86067b748f0e59a19b929e42d6f3b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=901c96ef9c86067b748f0e59a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 28 19:06:04 2016 +0200 d3dx9: Avoid overflowing debug channel buffer when tracing ASCII effect errors. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index fd8d59e..42f5aea 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5969,7 +5969,22 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, if (bytecode) ID3D10Blob_Release(bytecode); if (temp_errors) - TRACE("%s\n", (char *)ID3D10Blob_GetBufferPointer(temp_errors)); + { + const char *error_string = ID3D10Blob_GetBufferPointer(temp_errors); + const char *string_ptr; + + while (*error_string) + { + string_ptr = error_string; + while (*string_ptr && *string_ptr != '\n' && *string_ptr != '\r' + && string_ptr - error_string < 80) + ++string_ptr; + TRACE("%s\n", debugstr_an(error_string, string_ptr - error_string)); + error_string = string_ptr; + while (*error_string == '\n' || *error_string == '\r') + ++error_string; + } + } if (errors) *errors = temp_errors; else if (temp_errors)

1 0

Jacek Caban : rpcrt4: Moved AcquireCredentialHandle call to RPCRT4_ServerGetRegisteredAuthInfo.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: f3e5e76da97dac32f3d7d7678649239bc1508502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e5e76da97dac32f3d7d7678… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 27 17:08:40 2016 +0200 rpcrt4: Moved AcquireCredentialHandle call to RPCRT4_ServerGetRegisteredAuthInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 47 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index bb77237..d77354d 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1310,9 +1310,11 @@ struct rpc_server_registered_auth_info { struct list entry; TimeStamp exp; + BOOL cred_acquired; CredHandle cred; ULONG max_token; USHORT auth_type; + WCHAR *principal; }; static RPC_STATUS find_security_package(ULONG auth_type, SecPkgInfoW **packages_buf, SecPkgInfoW **ret) @@ -1357,6 +1359,28 @@ RPC_STATUS RPCRT4_ServerGetRegisteredAuthInfo( { if (auth_info->auth_type == auth_type) { + if (!auth_info->cred_acquired) + { + SecPkgInfoW *packages, *package; + SECURITY_STATUS sec_status; + + status = find_security_package(auth_info->auth_type, &packages, &package); + if (status != RPC_S_OK) + break; + + sec_status = AcquireCredentialsHandleW((SEC_WCHAR *)auth_info->principal, package->Name, + SECPKG_CRED_INBOUND, NULL, NULL, NULL, NULL, + &auth_info->cred, &auth_info->exp); + FreeContextBuffer(packages); + if (sec_status != SEC_E_OK) + { + status = RPC_S_SEC_PKG_ERROR; + break; + } + + auth_info->cred_acquired = TRUE; + } + *cred = auth_info->cred; *exp = auth_info->exp; *max_token = auth_info->max_token; @@ -1376,7 +1400,9 @@ void RPCRT4_ServerFreeAllRegisteredAuthInfo(void) EnterCriticalSection(&server_auth_info_cs); LIST_FOR_EACH_ENTRY_SAFE(auth_info, cursor2, &server_registered_auth_info, struct rpc_server_registered_auth_info, entry) { - FreeCredentialsHandle(&auth_info->cred); + if (auth_info->cred_acquired) + FreeCredentialsHandle(&auth_info->cred); + HeapFree(GetProcessHeap(), 0, auth_info->principal); HeapFree(GetProcessHeap(), 0, auth_info); } LeaveCriticalSection(&server_auth_info_cs); @@ -1409,9 +1435,6 @@ RPC_STATUS WINAPI RpcServerRegisterAuthInfoA( RPC_CSTR ServerPrincName, ULONG Au RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( RPC_WSTR ServerPrincName, ULONG AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn, LPVOID Arg ) { - SECURITY_STATUS sec_status; - CredHandle cred; - TimeStamp exp; struct rpc_server_registered_auth_info *auth_info; SecPkgInfoW *packages, *package; ULONG max_token; @@ -1423,24 +1446,20 @@ RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( RPC_WSTR ServerPrincName, ULONG Au if (status != RPC_S_OK) return status; - sec_status = AcquireCredentialsHandleW((SEC_WCHAR *)ServerPrincName, - package->Name, - SECPKG_CRED_INBOUND, NULL, NULL, - NULL, NULL, &cred, &exp); max_token = package->cbMaxToken; FreeContextBuffer(packages); - if (sec_status != SEC_E_OK) - return RPC_S_SEC_PKG_ERROR; auth_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*auth_info)); if (!auth_info) - { - FreeCredentialsHandle(&cred); + return RPC_S_OUT_OF_RESOURCES; + + if (!ServerPrincName) { + auth_info->principal = NULL; + }else if (!(auth_info->principal = RPCRT4_strdupW(ServerPrincName))) { + HeapFree(GetProcessHeap(), 0, auth_info); return RPC_S_OUT_OF_RESOURCES; } - auth_info->exp = exp; - auth_info->cred = cred; auth_info->max_token = max_token; auth_info->auth_type = AuthnSvc;

1 0

Andrey Gusev : d3dx10: Implement D3DX10CompileFromMemory.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 40c2b7357314407c06ed76be3af1429cb5c36d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=40c2b7357314407c06ed76be3… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jun 29 11:19:56 2016 +0300 d3dx10: Implement D3DX10CompileFromMemory. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/Makefile.in | 3 ++- dlls/d3dx10_43/async.c | 45 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx10_43/d3dx10_43.spec | 2 +- include/d3dx10async.h | 6 ++++++ 4 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index 9338aca..5f1eccb 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -1,8 +1,9 @@ MODULE = d3dx10_43.dll IMPORTLIB = d3dx10 -IMPORTS = d3d10_1 dxguid +IMPORTS = d3d10_1 d3dcompiler dxguid C_SRCS = \ + async.c \ d3dx10_43_main.c RC_SRCS = version.rc diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c new file mode 100644 index 0000000..879e420 --- /dev/null +++ b/dlls/d3dx10_43/async.c @@ -0,0 +1,45 @@ +/* + * Copyright 2016 Andrey Gusev + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" +#include "d3d10_1.h" +#include "d3dx10.h" +#include "d3dx10core.h" +#include "d3dcompiler.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +HRESULT WINAPI D3DX10CompileFromMemory(const char *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entry_point, + const char *target, UINT sflags, UINT eflags, ID3DX10ThreadPump *pump, ID3D10Blob **shader, + ID3D10Blob **error_messages, HRESULT *hresult) +{ + TRACE("data %s, data_size %lu, filename %s, defines %p, include %p, entry_point %s, target %s, " + "sflags %#x, eflags %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", + debugstr_a(data), data_size, debugstr_a(filename), defines, include, entry_point, + debugstr_a(target), sflags, eflags, pump, shader, error_messages, hresult); + + if (pump) + FIXME("Unimplemented ID3DX10ThreadPump handling.\n"); + + return D3DCompile(data, data_size, filename, defines, include, entry_point, target, + sflags, eflags, shader, error_messages); +} diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 99aa8f3..ab696e8 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -2,7 +2,7 @@ @ stdcall D3DX10CheckVersion(long long) @ stub D3DX10CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr) @ stub D3DX10CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr) -@ stub D3DX10CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) +@ stdcall D3DX10CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) @ stub D3DX10CompileFromResourceA(long str str ptr ptr str str long long ptr ptr ptr ptr) @ stub D3DX10CompileFromResourceW(long wstr wstr ptr ptr str str long long ptr ptr ptr ptr) @ stub D3DX10ComputeNormalMap(ptr long long long ptr) diff --git a/include/d3dx10async.h b/include/d3dx10async.h index 85219d2..d195d3a 100644 --- a/include/d3dx10async.h +++ b/include/d3dx10async.h @@ -19,6 +19,12 @@ #ifndef __D3DX10ASYNC_H__ #define __D3DX10ASYNC_H__ +#include "d3dx10.h" + +HRESULT WINAPI D3DX10CompileFromMemory(const char *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entry_point, + const char *target, UINT sflags, UINT eflags, ID3DX10ThreadPump *pump, ID3D10Blob **shader, + ID3D10Blob **error_messages, HRESULT *hresult); HRESULT WINAPI D3DX10CreateEffectFromFileA(const char *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device,

1 0

Jacek Caban : secur32: Added Kerberos provider stub implementation.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 0524963d7d9b26e6d130804f95c99bc2dbb318ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=0524963d7d9b26e6d130804f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 27 17:07:38 2016 +0200 secur32: Added Kerberos provider stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/Makefile.in | 1 + dlls/secur32/kerberos.c | 323 +++++++++++++++++++++++++++++++++++++++++++ dlls/secur32/secur32.c | 1 + dlls/secur32/secur32_priv.h | 1 + dlls/secur32/tests/secur32.c | 53 +++++++ 5 files changed, 379 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0524963d7d9b26e6d1308…

1 0

Andrey Gusev : d3dx11: Fix a typo in TRACE() message.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 3668b425b1d37df417d60429f1922d4812ffa245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3668b425b1d37df417d60429f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jun 29 11:27:17 2016 +0300 d3dx11: Fix a typo in TRACE() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_43/async.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c index c809f2c..b5a6ded 100644 --- a/dlls/d3dx11_43/async.c +++ b/dlls/d3dx11_43/async.c @@ -31,7 +31,7 @@ HRESULT WINAPI D3DX11CompileFromMemory(const char *data, SIZE_T data_size, const ID3D10Blob **error_messages, HRESULT *hresult) { TRACE("data %s, data_size %lu, filename %s, defines %p, include %p, entry_point %s, target %s, " - "sflags %#x, eflage %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", + "sflags %#x, eflags %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", debugstr_a(data), data_size, debugstr_a(filename), defines, include, entry_point, debugstr_a(target), sflags, eflags, pump, shader, error_messages, hresult);

1 0

Jacek Caban : rpcrt4: Forward RpcServerRegisterAuthInfoA to RpcServerRegisterAuthInfoW.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: a7b1e61fa6075c38f45072b8a28beb03672cdc17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7b1e61fa6075c38f45072b8a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 27 17:08:14 2016 +0200 rpcrt4: Forward RpcServerRegisterAuthInfoA to RpcServerRegisterAuthInfoW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 57 +++++------------------------------------------- 1 file changed, 6 insertions(+), 51 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 809ecef..4210258 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1358,63 +1358,18 @@ void RPCRT4_ServerFreeAllRegisteredAuthInfo(void) RPC_STATUS WINAPI RpcServerRegisterAuthInfoA( RPC_CSTR ServerPrincName, ULONG AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn, LPVOID Arg ) { - SECURITY_STATUS sec_status; - CredHandle cred; - TimeStamp exp; - ULONG package_count; - ULONG i; - PSecPkgInfoA packages; - ULONG max_token; - struct rpc_server_registered_auth_info *auth_info; + WCHAR *principal_name = NULL; + RPC_STATUS status; TRACE("(%s,%u,%p,%p)\n", ServerPrincName, AuthnSvc, GetKeyFn, Arg); - sec_status = EnumerateSecurityPackagesA(&package_count, &packages); - if (sec_status != SEC_E_OK) - { - ERR("EnumerateSecurityPackagesA failed with error 0x%08x\n", - sec_status); - return RPC_S_SEC_PKG_ERROR; - } - - for (i = 0; i < package_count; i++) - if (packages[i].wRPCID == AuthnSvc) - break; - - if (i == package_count) - { - WARN("unsupported AuthnSvc %u\n", AuthnSvc); - FreeContextBuffer(packages); - return RPC_S_UNKNOWN_AUTHN_SERVICE; - } - TRACE("found package %s for service %u\n", packages[i].Name, - AuthnSvc); - sec_status = AcquireCredentialsHandleA((SEC_CHAR *)ServerPrincName, - packages[i].Name, - SECPKG_CRED_INBOUND, NULL, NULL, - NULL, NULL, &cred, &exp); - max_token = packages[i].cbMaxToken; - FreeContextBuffer(packages); - if (sec_status != SEC_E_OK) - return RPC_S_SEC_PKG_ERROR; - - auth_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*auth_info)); - if (!auth_info) - { - FreeCredentialsHandle(&cred); + if(ServerPrincName && !(principal_name = RPCRT4_strdupAtoW((const char*)ServerPrincName))) return RPC_S_OUT_OF_RESOURCES; - } - - auth_info->exp = exp; - auth_info->cred = cred; - auth_info->max_token = max_token; - auth_info->auth_type = AuthnSvc; - EnterCriticalSection(&server_auth_info_cs); - list_add_tail(&server_registered_auth_info, &auth_info->entry); - LeaveCriticalSection(&server_auth_info_cs); + status = RpcServerRegisterAuthInfoW(principal_name, AuthnSvc, GetKeyFn, Arg); - return RPC_S_OK; + HeapFree(GetProcessHeap(), 0, principal_name); + return status; } /***********************************************************************

1 0

Jacek Caban : rpcrt4: Moved EnumerateSecurityPackagesW call to helper function.
by Alexandre Julliard July 3, 2016

July 3, 2016

Module: wine Branch: master Commit: 6cdbde64ea8fab7240ef90660a544317ae580187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cdbde64ea8fab7240ef90660… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 27 17:08:28 2016 +0200 rpcrt4: Moved EnumerateSecurityPackagesW call to helper function. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 64 +++++++++++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 25 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 4210258..bb77237 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1315,6 +1315,37 @@ struct rpc_server_registered_auth_info USHORT auth_type; }; +static RPC_STATUS find_security_package(ULONG auth_type, SecPkgInfoW **packages_buf, SecPkgInfoW **ret) +{ + SECURITY_STATUS sec_status; + SecPkgInfoW *packages; + ULONG package_count; + ULONG i; + + sec_status = EnumerateSecurityPackagesW(&package_count, &packages); + if (sec_status != SEC_E_OK) + { + ERR("EnumerateSecurityPackagesW failed with error 0x%08x\n", sec_status); + return RPC_S_SEC_PKG_ERROR; + } + + for (i = 0; i < package_count; i++) + if (packages[i].wRPCID == auth_type) + break; + + if (i == package_count) + { + WARN("unsupported AuthnSvc %u\n", auth_type); + FreeContextBuffer(packages); + return RPC_S_UNKNOWN_AUTHN_SERVICE; + } + + TRACE("found package %s for service %u\n", debugstr_w(packages[i].Name), auth_type); + *packages_buf = packages; + *ret = packages + i; + return RPC_S_OK; +} + RPC_STATUS RPCRT4_ServerGetRegisteredAuthInfo( USHORT auth_type, CredHandle *cred, TimeStamp *exp, ULONG *max_token) { @@ -1381,39 +1412,22 @@ RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( RPC_WSTR ServerPrincName, ULONG Au SECURITY_STATUS sec_status; CredHandle cred; TimeStamp exp; - ULONG package_count; - ULONG i; - PSecPkgInfoW packages; - ULONG max_token; struct rpc_server_registered_auth_info *auth_info; + SecPkgInfoW *packages, *package; + ULONG max_token; + RPC_STATUS status; TRACE("(%s,%u,%p,%p)\n", debugstr_w(ServerPrincName), AuthnSvc, GetKeyFn, Arg); - sec_status = EnumerateSecurityPackagesW(&package_count, &packages); - if (sec_status != SEC_E_OK) - { - ERR("EnumerateSecurityPackagesW failed with error 0x%08x\n", - sec_status); - return RPC_S_SEC_PKG_ERROR; - } - - for (i = 0; i < package_count; i++) - if (packages[i].wRPCID == AuthnSvc) - break; + status = find_security_package(AuthnSvc, &packages, &package); + if (status != RPC_S_OK) + return status; - if (i == package_count) - { - WARN("unsupported AuthnSvc %u\n", AuthnSvc); - FreeContextBuffer(packages); - return RPC_S_UNKNOWN_AUTHN_SERVICE; - } - TRACE("found package %s for service %u\n", debugstr_w(packages[i].Name), - AuthnSvc); sec_status = AcquireCredentialsHandleW((SEC_WCHAR *)ServerPrincName, - packages[i].Name, + package->Name, SECPKG_CRED_INBOUND, NULL, NULL, NULL, NULL, &cred, &exp); - max_token = packages[i].cbMaxToken; + max_token = package->cbMaxToken; FreeContextBuffer(packages); if (sec_status != SEC_E_OK) return RPC_S_SEC_PKG_ERROR;

1 0