January 2018 - Wine-Commits

Nikolay Sivov : ole32/tests: Move stream creation to test function that' s using it.
by Alexandre Julliard Jan. 31, 2018

Jan. 31, 2018

Module: wine Branch: master Commit: b526f7a4e7a018e254cb2dd424dd8ea4bc7d9e78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b526f7a4e7a018e254cb2dd4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 31 09:41:30 2018 +0300 ole32/tests: Move stream creation to test function that's using it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/hglobalstream.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index e20d81b..6a0498a 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -43,16 +43,20 @@ do { \ } \ } while(0) -static void test_streamonhglobal(IStream *pStream) +static void test_streamonhglobal(void) { const char data[] = "Test String"; ULARGE_INTEGER ull; + IStream *pStream; LARGE_INTEGER ll; char buffer[128]; ULONG read; STATSTG statstg; HRESULT hr; + hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + ull.QuadPart = sizeof(data); hr = IStream_SetSize(pStream, ull); ok_ole_success(hr, "IStream_SetSize"); @@ -293,6 +297,8 @@ static void test_streamonhglobal(IStream *pStream) hr = IStream_SetSize(pStream, ull); ok(hr == E_OUTOFMEMORY || broken(hr == S_OK), /* win9x */ "IStream_SetSize with large size should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr); + + IStream_Release(pStream); } static HRESULT WINAPI TestStream_QueryInterface(IStream *iface, REFIID riid, void **ppv) @@ -510,14 +516,7 @@ static void test_freed_hglobal(void) START_TEST(hglobalstream) { - HRESULT hr; - IStream *pStream; - - hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); - ok_ole_success(hr, "CreateStreamOnHGlobal"); - - test_streamonhglobal(pStream); - IStream_Release(pStream); + test_streamonhglobal(); test_copyto(); test_freed_hglobal(); }

1 0

Michael Stefaniuc : gdi32/tests: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Jan. 31, 2018

Jan. 31, 2018

Module: wine Branch: master Commit: 5c3928df94d108b0c472cd8a472278b55d56f351 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c3928df94d108b0c472cd8a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 30 23:41:00 2018 +0100 gdi32/tests: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 117a14f..70e44f3 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -28,6 +28,7 @@ #include "winuser.h" #include "winnls.h" +#include "wine/heap.h" #include "wine/test.h" static inline BOOL match_off_by_n(int a, int b, unsigned int n) @@ -109,22 +110,6 @@ static void init(void) system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - if (!mem) return heap_alloc(size); - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static INT CALLBACK is_truetype_font_installed_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) { if (type != TRUETYPE_FONTTYPE) return 1;

1 0

Michael Stefaniuc : explorerframe: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Jan. 31, 2018

Jan. 31, 2018

Module: wine Branch: master Commit: fdcd7e8fbe2c0996a1164ed91b67bea9cefb6db8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdcd7e8fbe2c0996a1164ed9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 30 23:40:57 2018 +0100 explorerframe: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/explorerframe_main.h | 10 ---------- dlls/explorerframe/taskbarlist.c | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/explorerframe/explorerframe_main.h b/dlls/explorerframe/explorerframe_main.h index ec8b363..14e551c 100644 --- a/dlls/explorerframe/explorerframe_main.h +++ b/dlls/explorerframe/explorerframe_main.h @@ -34,14 +34,4 @@ static inline void EFRAME_UnlockModule(void) { InterlockedDecrement( &EFRAME_ref HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) DECLSPEC_HIDDEN; HRESULT TaskbarList_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #endif /* __WINE_EXPLORERFRAME_H */ diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index 26a2c1a..a50f8a9 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -21,6 +21,7 @@ #include "explorerframe_main.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(explorerframe);

1 0

Dmitry Timoshkov : secur32: Implement AcquireCredentialsHandle in the SSP/ AP wrapper.
by Alexandre Julliard Jan. 31, 2018

Jan. 31, 2018

Module: wine Branch: master Commit: 94f582f3c5c502a8b8d108ba766a9e491dd80c7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=94f582f3c5c502a8b8d108ba… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 18 23:54:01 2018 +0800 secur32: Implement AcquireCredentialsHandle in the SSP/AP wrapper. Partially based on Hans Leidekker's work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 136 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 876da56..2ec3818 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -243,12 +243,146 @@ static SECPKG_DLL_FUNCTIONS lsa_dll_dispatch = lsa_RegisterCallback }; +static SECURITY_STATUS lsa_lookup_package(SEC_WCHAR *nameW, struct lsa_package **lsa_package) +{ + ULONG i; + UNICODE_STRING package_name, name; + + for (i = 0; i < loaded_packages_count; i++) + { + if (RtlAnsiStringToUnicodeString(&package_name, loaded_packages[i].name, TRUE)) + return SEC_E_INSUFFICIENT_MEMORY; + + RtlInitUnicodeString(&name, nameW); + + if (RtlEqualUnicodeString(&package_name, &name, TRUE)) + { + RtlFreeUnicodeString(&package_name); + *lsa_package = &loaded_packages[i]; + return SEC_E_OK; + } + + RtlFreeUnicodeString(&package_name); + } + + return SEC_E_SECPKG_NOT_FOUND; +} + +static SECURITY_STATUS WINAPI lsa_AcquireCredentialsHandleW( + SEC_WCHAR *principal, SEC_WCHAR *package, ULONG credentials_use, + LUID *logon_id, void *auth_data, SEC_GET_KEY_FN get_key_fn, + void *get_key_arg, CredHandle *credential, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + struct lsa_package *lsa_package; + UNICODE_STRING principal_us; + LSA_SEC_HANDLE lsa_credential; + + TRACE("%s %s %#x %p %p %p %p %p\n", debugstr_w(principal), debugstr_w(package), + credentials_use, auth_data, get_key_fn, get_key_arg, credential, ts_expiry); + + if (!credential) return SEC_E_INVALID_HANDLE; + if (!package) return SEC_E_SECPKG_NOT_FOUND; + + status = lsa_lookup_package(package, &lsa_package); + if (status != SEC_E_OK) return status; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->SpAcquireCredentialsHandle) + return SEC_E_UNSUPPORTED_FUNCTION; + + if (principal) + RtlInitUnicodeString(&principal_us, principal); + + status = lsa_package->lsa_api->SpAcquireCredentialsHandle(principal ? &principal_us : NULL, + credentials_use, logon_id, auth_data, get_key_fn, get_key_arg, &lsa_credential, ts_expiry); + if (status == SEC_E_OK) + { + credential->dwLower = (ULONG_PTR)lsa_credential; + credential->dwUpper = (ULONG_PTR)lsa_package; + } + return status; +} + +static SECURITY_STATUS WINAPI lsa_AcquireCredentialsHandleA( + SEC_CHAR *principal, SEC_CHAR *package, ULONG credentials_use, + LUID *logon_id, void *auth_data, SEC_GET_KEY_FN get_key_fn, + void *get_key_arg, CredHandle *credential, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status = SEC_E_INSUFFICIENT_MEMORY; + int len_user = 0, len_domain = 0, len_passwd = 0; + SEC_WCHAR *principalW = NULL, *packageW = NULL, *user = NULL, *domain = NULL, *passwd = NULL; + SEC_WINNT_AUTH_IDENTITY_W *auth_dataW = NULL; + SEC_WINNT_AUTH_IDENTITY_A *id = NULL; + + TRACE("%s %s %#x %p %p %p %p %p\n", debugstr_a(principal), debugstr_a(package), + credentials_use, auth_data, get_key_fn, get_key_arg, credential, ts_expiry); + + if (principal) + { + int len = MultiByteToWideChar( CP_ACP, 0, principal, -1, NULL, 0 ); + if (!(principalW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, principal, -1, principalW, len ); + } + if (package) + { + int len = MultiByteToWideChar( CP_ACP, 0, package, -1, NULL, 0 ); + if (!(packageW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, package, -1, packageW, len ); + } + if (auth_data) + { + id = (PSEC_WINNT_AUTH_IDENTITY_A)auth_data; + + if (id->Flags == SEC_WINNT_AUTH_IDENTITY_ANSI) + { + if (!(auth_dataW = HeapAlloc( GetProcessHeap(), 0, sizeof(SEC_WINNT_AUTH_IDENTITY_W) ))) goto done; + if (id->UserLength) + { + len_user = MultiByteToWideChar( CP_ACP, 0, (char *)id->User, id->UserLength, NULL, 0 ); + if (!(user = HeapAlloc( GetProcessHeap(), 0, len_user * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->User, id->UserLength, user, len_user ); + } + if (id->DomainLength) + { + len_domain = MultiByteToWideChar( CP_ACP, 0, (char *)id->Domain, id->DomainLength, NULL, 0 ); + if (!(domain = HeapAlloc( GetProcessHeap(), 0, len_domain * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->Domain, id->DomainLength, domain, len_domain ); + } + if (id->PasswordLength) + { + len_passwd = MultiByteToWideChar( CP_ACP, 0, (char *)id->Password, id->PasswordLength, NULL, 0 ); + if (!(passwd = HeapAlloc( GetProcessHeap(), 0, len_passwd * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->Password, id->PasswordLength, passwd, len_passwd ); + } + auth_dataW->Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; + auth_dataW->User = user; + auth_dataW->UserLength = len_user; + auth_dataW->Domain = domain; + auth_dataW->DomainLength = len_domain; + auth_dataW->Password = passwd; + auth_dataW->PasswordLength = len_passwd; + } + else auth_dataW = (PSEC_WINNT_AUTH_IDENTITY_W)auth_data; + } + + status = lsa_AcquireCredentialsHandleW( principalW, packageW, credentials_use, logon_id, auth_dataW, get_key_fn, + get_key_arg, credential, ts_expiry ); +done: + if (auth_dataW != (SEC_WINNT_AUTH_IDENTITY_W *)id) HeapFree( GetProcessHeap(), 0, auth_dataW ); + HeapFree( GetProcessHeap(), 0, packageW ); + HeapFree( GetProcessHeap(), 0, principalW ); + HeapFree( GetProcessHeap(), 0, user ); + HeapFree( GetProcessHeap(), 0, domain ); + HeapFree( GetProcessHeap(), 0, passwd ); + return status; +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, NULL, /* EnumerateSecurityPackagesW */ NULL, /* QueryCredentialsAttributesW */ - NULL, /* AcquireCredentialsHandleW */ + lsa_AcquireCredentialsHandleW, NULL, /* FreeCredentialsHandle */ NULL, /* Reserved2 */ NULL, /* InitializeSecurityContextW */ @@ -280,7 +414,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = 1, NULL, /* EnumerateSecurityPackagesA */ NULL, /* QueryCredentialsAttributesA */ - NULL, /* AcquireCredentialsHandleA */ + lsa_AcquireCredentialsHandleA, NULL, /* FreeCredentialsHandle */ NULL, /* Reserved2 */ NULL, /* InitializeSecurityContextA */

1 0

Michael Stefaniuc : dnsapi: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Jan. 31, 2018

Jan. 31, 2018

Module: wine Branch: master Commit: 37ed8ef2b920055123fc11cd9081e995eea24c13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37ed8ef2b920055123fc11cd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 30 23:40:59 2018 +0100 dnsapi: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/dnsapi.h | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index 8a02521..0b67973 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -22,20 +22,7 @@ # error You must include config.h to use this header #endif -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); -} +#include "wine/heap.h" static inline LPSTR dns_strdup_a( LPCSTR src ) {

1 0

Dmitry Timoshkov : secur32: Add support for loading SSP/ AP dll as an SSPI provider.
by Alexandre Julliard Jan. 31, 2018

Jan. 31, 2018

Module: wine Branch: master Commit: d1561be528975f3fb897d999a08370a99dc50738 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1561be528975f3fb897d999… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 18 23:53:58 2018 +0800 secur32: Add support for loading SSP/AP dll as an SSPI provider. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 135 insertions(+), 19 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 1028c18..876da56 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2004 Juan Lang * Copyright (C) 2007 Kai Blin - * Copyright (C) 2017 Dmitry Timoshkov + * Copyright (C) 2017, 2018 Dmitry Timoshkov * * Local Security Authority functions, as far as secur32 has them. * @@ -31,10 +31,12 @@ #include "ntsecapi.h" #include "ntsecpkg.h" #include "winternl.h" +#include "rpc.h" +#include "secur32_priv.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(lsa); +WINE_DEFAULT_DEBUG_CHANNEL(secur32); #define LSA_MAGIC ('L' << 24 | 'S' << 16 | 'A' << 8 | ' ') @@ -42,10 +44,10 @@ struct lsa_package { ULONG package_id; HMODULE mod; - ULONG version; LSA_STRING *name; - SECPKG_FUNCTION_TABLE *api; - ULONG table_count; + ULONG lsa_api_version, lsa_table_count, user_api_version, user_table_count; + SECPKG_FUNCTION_TABLE *lsa_api; + SECPKG_USER_FUNCTION_TABLE *user_api; }; static struct lsa_package *loaded_packages; @@ -69,8 +71,8 @@ NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE lsa_handle, ULONG package_id { if (loaded_packages[i].package_id == package_id) { - if (loaded_packages[i].api->CallPackageUntrusted) - return loaded_packages[i].api->CallPackageUntrusted(NULL /* FIXME*/, + if (loaded_packages[i].lsa_api->CallPackageUntrusted) + return loaded_packages[i].lsa_api->CallPackageUntrusted(NULL /* FIXME*/, in_buffer, NULL, in_buffer_length, out_buffer, out_buffer_length, status); return SEC_E_UNSUPPORTED_FUNCTION; @@ -228,6 +230,83 @@ static LSA_DISPATCH_TABLE lsa_dispatch = lsa_CopyFromClientBuffer }; +static NTSTATUS NTAPI lsa_RegisterCallback(ULONG callback_id, PLSA_CALLBACK_FUNCTION callback) +{ + FIXME("%u,%p: stub\n", callback_id, callback); + return STATUS_NOT_IMPLEMENTED; +} + +static SECPKG_DLL_FUNCTIONS lsa_dll_dispatch = +{ + lsa_AllocateLsaHeap, + lsa_FreeLsaHeap, + lsa_RegisterCallback +}; + +static const SecurityFunctionTableW lsa_sspi_tableW = +{ + 1, + NULL, /* EnumerateSecurityPackagesW */ + NULL, /* QueryCredentialsAttributesW */ + NULL, /* AcquireCredentialsHandleW */ + NULL, /* FreeCredentialsHandle */ + NULL, /* Reserved2 */ + NULL, /* InitializeSecurityContextW */ + NULL, /* AcceptSecurityContext */ + NULL, /* CompleteAuthToken */ + NULL, /* DeleteSecurityContext */ + NULL, /* ApplyControlToken */ + NULL, /* QueryContextAttributesW */ + NULL, /* ImpersonateSecurityContext */ + NULL, /* RevertSecurityContext */ + NULL, /* MakeSignature */ + NULL, /* VerifySignature */ + NULL, /* FreeContextBuffer */ + NULL, /* QuerySecurityPackageInfoW */ + NULL, /* Reserved3 */ + NULL, /* Reserved4 */ + NULL, /* ExportSecurityContext */ + NULL, /* ImportSecurityContextW */ + NULL, /* AddCredentialsW */ + NULL, /* Reserved8 */ + NULL, /* QuerySecurityContextToken */ + NULL, /* EncryptMessage */ + NULL, /* DecryptMessage */ + NULL, /* SetContextAttributesW */ +}; + +static const SecurityFunctionTableA lsa_sspi_tableA = +{ + 1, + NULL, /* EnumerateSecurityPackagesA */ + NULL, /* QueryCredentialsAttributesA */ + NULL, /* AcquireCredentialsHandleA */ + NULL, /* FreeCredentialsHandle */ + NULL, /* Reserved2 */ + NULL, /* InitializeSecurityContextA */ + NULL, /* AcceptSecurityContext */ + NULL, /* CompleteAuthToken */ + NULL, /* DeleteSecurityContext */ + NULL, /* ApplyControlToken */ + NULL, /* QueryContextAttributesA */ + NULL, /* ImpersonateSecurityContext */ + NULL, /* RevertSecurityContext */ + NULL, /* MakeSignature */ + NULL, /* VerifySignature */ + NULL, /* FreeContextBuffer */ + NULL, /* QuerySecurityPackageInfoA */ + NULL, /* Reserved3 */ + NULL, /* Reserved4 */ + NULL, /* ExportSecurityContext */ + NULL, /* ImportSecurityContextA */ + NULL, /* AddCredentialsA */ + NULL, /* Reserved8 */ + NULL, /* QuerySecurityContextToken */ + NULL, /* EncryptMessage */ + NULL, /* DecryptMessage */ + NULL, /* SetContextAttributesA */ +}; + static void add_package(struct lsa_package *package) { struct lsa_package *new_loaded_packages; @@ -247,26 +326,41 @@ static void add_package(struct lsa_package *package) static BOOL load_package(const WCHAR *name, struct lsa_package *package, ULONG package_id) { - NTSTATUS (NTAPI *lsa_mode_init)(ULONG,PULONG,PSECPKG_FUNCTION_TABLE *, PULONG); + NTSTATUS (NTAPI *pSpLsaModeInitialize)(ULONG, PULONG, PSECPKG_FUNCTION_TABLE *, PULONG); + NTSTATUS (NTAPI *pSpUserModeInitialize)(ULONG, PULONG, PSECPKG_USER_FUNCTION_TABLE *, PULONG); + + memset(package, 0, sizeof(*package)); package->mod = LoadLibraryW(name); if (!package->mod) return FALSE; - lsa_mode_init = (void *)GetProcAddress(package->mod, "SpLsaModeInitialize"); - if (lsa_mode_init) + pSpLsaModeInitialize = (void *)GetProcAddress(package->mod, "SpLsaModeInitialize"); + if (pSpLsaModeInitialize) { NTSTATUS status; - status = lsa_mode_init(SECPKG_INTERFACE_VERSION, &package->version, &package->api, &package->table_count); + status = pSpLsaModeInitialize(SECPKG_INTERFACE_VERSION, &package->lsa_api_version, &package->lsa_api, &package->lsa_table_count); if (status == STATUS_SUCCESS) { - status = package->api->InitializePackage(package_id, &lsa_dispatch, NULL, NULL, &package->name); + status = package->lsa_api->InitializePackage(package_id, &lsa_dispatch, NULL, NULL, &package->name); if (status == STATUS_SUCCESS) { TRACE("%s => %p, name %s, version %#x, api table %p, table count %u\n", debugstr_w(name), package->mod, debugstr_an(package->name->Buffer, package->name->Length), - package->version, package->api, package->table_count); + package->lsa_api_version, package->lsa_api, package->lsa_table_count); package->package_id = package_id; + + status = package->lsa_api->Initialize(package_id, NULL /* FIXME: params */, NULL); + if (status == STATUS_SUCCESS) + { + pSpUserModeInitialize = (void *)GetProcAddress(package->mod, "SpUserModeInitialize"); + if (pSpUserModeInitialize) + { + status = pSpUserModeInitialize(SECPKG_INTERFACE_VERSION, &package->user_api_version, &package->user_api, &package->user_table_count); + if (status == STATUS_SUCCESS) + package->user_api->InstanceInit(SECPKG_INTERFACE_VERSION, &lsa_dll_dispatch, NULL); + } + } return TRUE; } } @@ -278,16 +372,17 @@ static BOOL load_package(const WCHAR *name, struct lsa_package *package, ULONG p #define MAX_SERVICE_NAME 260 -static BOOL WINAPI load_auth_packages(INIT_ONCE *init_once, void *param, void **context) +void load_auth_packages(void) { static const WCHAR LSA_KEY[] = { 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\','L','s','a',0 }; DWORD err, i; HKEY root; + SecureProvider *provider; err = RegOpenKeyExW(HKEY_LOCAL_MACHINE, LSA_KEY, 0, KEY_READ, &root); - if (err != ERROR_SUCCESS) return FALSE; + if (err != ERROR_SUCCESS) return; i = 0; for (;;) @@ -310,19 +405,40 @@ static BOOL WINAPI load_auth_packages(INIT_ONCE *init_once, void *param, void ** RegCloseKey(root); - return TRUE; + if (!loaded_packages_count) return; + + provider = SECUR32_addProvider(&lsa_sspi_tableA, &lsa_sspi_tableW, NULL); + if (!provider) + { + ERR("Failed to add SSP/AP provider\n"); + return; + } + + for (i = 0; i < loaded_packages_count; i++) + { + SecPkgInfoW *info; + + info = HeapAlloc(GetProcessHeap(), 0, loaded_packages[i].lsa_table_count * sizeof(*info)); + if (info) + { + NTSTATUS status; + + status = loaded_packages[i].lsa_api->GetInfo(info); + if (status == STATUS_SUCCESS) + SECUR32_addPackages(provider, loaded_packages[i].lsa_table_count, NULL, info); + + HeapFree(GetProcessHeap(), 0, info); + } + } } NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE lsa_handle, PLSA_STRING package_name, PULONG package_id) { - static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; ULONG i; TRACE("%p %p %p\n", lsa_handle, package_name, package_id); - InitOnceExecuteOnce(&init_once, load_auth_packages, NULL, NULL); - for (i = 0; i < loaded_packages_count; i++) { if (!RtlCompareString(loaded_packages[i].name, package_name, FALSE))

1 0

Francois Gouget : ole32/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard Jan. 31, 2018

Jan. 31, 2018

Module: wine Branch: master Commit: baa74bd862960981ab66216d27de204b042a4385 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baa74bd862960981ab66216d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 31 03:41:16 2018 +0100 ole32/tests: Add a trailing '\n' to ok() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index aef1037..f1e0134 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2795,7 +2795,7 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) ok(hr == S_OK, "CoInitializeEx failed with error 0x%08x\n", hr); hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "CreateStreamOnHGlobal failed: %08x", hr); + ok(hr == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hr); hr = CoMarshalInterface(stream, &IID_IUnknown, &Test_Unknown, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok(hr == S_OK, "CoMarshalInterface should have returned S_OK instead of 0x%08x\n", hr); @@ -2806,7 +2806,7 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) PostThreadMessageW(GetCurrentThreadId(), WM_QUIT, 0, 0); hr = CoRegisterMessageFilter(&MessageFilter, NULL); - ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x", hr); + ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x\n", hr); thread = CreateThread(NULL, 0, cowait_unmarshal_thread, stream, 0, &tid); ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); @@ -2817,7 +2817,7 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) CloseHandle(thread); hr = CoRegisterMessageFilter(NULL, NULL); - ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x", hr); + ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x\n", hr); IStream_Release(stream);

1 0

Alistair Leslie-Hughes : d3dx9: Stub D3DXCreateKeyframedAnimationSet().
by Alexandre Julliard Jan. 31, 2018

Jan. 31, 2018

Module: wine Branch: master Commit: 5db63eb3caa3afa12c5e2342416a62cfe1f7f9f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5db63eb3caa3afa12c5e2342… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 31 02:02:22 2018 +0100 d3dx9: Stub D3DXCreateKeyframedAnimationSet(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- 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/animation.c | 12 ++++++++++++ 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 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- 21 files changed, 32 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5db63eb3caa3afa12c5e…

1 0

Michael Stefaniuc : hhctrl.ocx: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Jan. 31, 2018

Jan. 31, 2018

Module: wine Branch: master Commit: 0f697d992ae8df25326143b3ff1e3a305b3ce13f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f697d992ae8df25326143b3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 30 23:41:01 2018 +0100 hhctrl.ocx: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/hhctrl.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 5318b5f..b358f54 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -40,6 +40,7 @@ #include "wine/itss.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" #define WB_GOBACK 0 @@ -244,31 +245,11 @@ HHInfo *find_window(const WCHAR *window) DECLSPEC_HIDDEN; /* memory allocation functions */ -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); -} - static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); } -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR strdupW(LPCWSTR str) { LPWSTR ret;

1 0

Michael Stefaniuc : iccvid: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Jan. 31, 2018

Jan. 31, 2018

Module: wine Branch: master Commit: 1796e7be1cee8de69988ae3da73c681a14ddfad6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1796e7be1cee8de69988ae3d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 30 23:41:02 2018 +0100 iccvid: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iccvid/iccvid.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index e5d5147..89d282b 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -51,6 +51,7 @@ #include "iccvid_private.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(iccvid); @@ -81,16 +82,6 @@ typedef struct _ICCVID_Info cinepak_info *cvinfo; } ICCVID_Info; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - /* ------------------------------------------------------------------------ */ static unsigned char *in_buffer, uiclip[1024], *uiclp = NULL;

1 0