January 2018 - Wine-Devel - list.winehq.org

[PATCH 15/20] kerberos: Implement SpMakeSignature.
by Dmitry Timoshkov Jan. 18, 2018

Jan. 18, 2018

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 5e9f49d6a1..1cc21706e2 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -189,6 +189,7 @@ static void *libgssapi_krb5_handle; MAKE_FUNCPTR(gss_accept_sec_context); MAKE_FUNCPTR(gss_acquire_cred); MAKE_FUNCPTR(gss_delete_sec_context); +MAKE_FUNCPTR(gss_get_mic); MAKE_FUNCPTR(gss_import_name); MAKE_FUNCPTR(gss_init_sec_context); MAKE_FUNCPTR(gss_release_buffer); @@ -214,6 +215,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_accept_sec_context) LOAD_FUNCPTR(gss_acquire_cred) LOAD_FUNCPTR(gss_delete_sec_context) + LOAD_FUNCPTR(gss_get_mic) LOAD_FUNCPTR(gss_import_name) LOAD_FUNCPTR(gss_init_sec_context) LOAD_FUNCPTR(gss_release_buffer) @@ -736,11 +738,52 @@ static NTSTATUS NTAPI kerberos_SpInstanceInit(ULONG version, SECPKG_DLL_FUNCTION return STATUS_SUCCESS; } +static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status; + gss_buffer_desc data_buffer, token_buffer; + gss_ctx_id_t ctxt_handle; + int data_idx, token_idx; + + TRACE( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + if (quality_of_protection) FIXME( "ignoring quality_of_protection 0x%08x\n", quality_of_protection ); + if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + + if (!context) return SEC_E_INVALID_HANDLE; + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + /* FIXME: multiple data buffers, read-only buffers */ + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + data_buffer.length = message->pBuffers[data_idx].cbBuffer; + data_buffer.value = message->pBuffers[data_idx].pvBuffer; + + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + token_buffer.length = 0; + token_buffer.value = NULL; + + ret = pgss_get_mic( &minor_status, ctxt_handle, GSS_C_QOP_DEFAULT, &data_buffer, &token_buffer ); + TRACE( "gss_get_mic returned %08x minor status %08x\n", ret, minor_status ); + if (ret == GSS_S_COMPLETE) + { + memcpy( message->pBuffers[token_idx].pvBuffer, token_buffer.value, token_buffer.length ); + message->pBuffers[token_idx].cbBuffer = token_buffer.length; + pgss_release_buffer( &minor_status, &token_buffer ); + } + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { kerberos_SpInstanceInit, NULL, /* SpInitUserModeContext */ - NULL, /* SpMakeSignature */ + kerberos_SpMakeSignature, NULL, /* SpVerifySignature */ NULL, /* SpSealMessage */ NULL, /* SpUnsealMessage */ -- 2.15.1

1 0

[PATCH 14/20] kerberos: Add SpInstanceInit stub.
by Dmitry Timoshkov Jan. 18, 2018

Jan. 18, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index ceba31608b..5e9f49d6a1 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -729,9 +729,16 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, return STATUS_SUCCESS; } +static NTSTATUS NTAPI kerberos_SpInstanceInit(ULONG version, SECPKG_DLL_FUNCTIONS *dll_function_table, void **user_functions) +{ + FIXME("%u,%p,%p: stub\n", version, dll_function_table, user_functions); + + return STATUS_SUCCESS; +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { - NULL, /* SpInstanceInit */ + kerberos_SpInstanceInit, NULL, /* SpInitUserModeContext */ NULL, /* SpMakeSignature */ NULL, /* SpVerifySignature */ -- 2.15.1

1 0

[PATCH 13/20] kerberos: Add SpUserModeInitialize implementation.
by Dmitry Timoshkov Jan. 18, 2018

Jan. 18, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/kerberos.spec | 2 +- dlls/kerberos/krb5_ap.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/kerberos.spec b/dlls/kerberos/kerberos.spec index c41b830e46..7f765b1206 100644 --- a/dlls/kerberos/kerberos.spec +++ b/dlls/kerberos/kerberos.spec @@ -1,7 +1,7 @@ 1 stub SpInitialize 2 stub KerbDomainChangeCallback 3 stdcall SpLsaModeInitialize(long ptr ptr ptr) -4 stub SpUserModeInitialize +4 stdcall SpUserModeInitialize(long ptr ptr ptr) 32 stub SpInstanceInit @ stdcall -private DllMain(long long ptr) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index ddd48df5d1..ceba31608b 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -728,3 +728,33 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, return STATUS_SUCCESS; } + +static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = +{ + NULL, /* SpInstanceInit */ + NULL, /* SpInitUserModeContext */ + NULL, /* SpMakeSignature */ + NULL, /* SpVerifySignature */ + NULL, /* SpSealMessage */ + NULL, /* SpUnsealMessage */ + NULL, /* SpGetContextToken */ + NULL, /* SpQueryContextAttributes */ + NULL, /* SpCompleteAuthToken */ + NULL, /* SpDeleteContext */ + NULL, /* SpFormatCredentialsFn */ + NULL, /* SpMarshallSupplementalCreds */ + NULL, /* SpExportSecurityContext */ + NULL /* SpImportSecurityContext */ +}; + +NTSTATUS NTAPI SpUserModeInitialize(ULONG lsa_version, PULONG package_version, + PSECPKG_USER_FUNCTION_TABLE *table, PULONG table_count) +{ + TRACE("%#x,%p,%p,%p\n", lsa_version, package_version, table, table_count); + + *package_version = SECPKG_INTERFACE_VERSION; + *table = &kerberos_user_table; + *table_count = 1; + + return STATUS_SUCCESS; +} -- 2.15.1

1 0

[PATCH] winebrowser: Fix calling convention for wine_get_unix_file_name().
by Huw Davies Jan. 18, 2018

Jan. 18, 2018

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- programs/winebrowser/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 304ac14bbc..b1c49e7cd1 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -54,7 +54,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winebrowser); -typedef LPSTR (*wine_get_unix_file_name_t)(LPCWSTR unixname); +typedef LPSTR (*CDECL wine_get_unix_file_name_t)(LPCWSTR unixname); static const WCHAR browser_key[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', -- 2.12.0

1 0

[PATCH 2/2] testbot: Purge old jobs based on their Submitted timestamp.
by Francois Gouget Jan. 17, 2018

Jan. 17, 2018

Although it would only happen in case of a major TestBot malfunction, a Job could end up in a state where it will never complete and thus where its Ended field never gets set. So deleting old jobs based on their Ended field could leave us with zombies. This cannot happen with the Submitted timestamp since that field is not nullable. Also, a Job run time is normally very small compared to the expiration time (under a couple of hours compared to several days) so this does not make a significant difference in when a job actually gets deleted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I did get a Job zombie once on my local TestBot but it was due to bugs in the TestBot code (those did not make it to the production server fortunately). Sill, better safe than sorry. testbot/bin/Janitor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 6ac22ded..0f126e87 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -61,7 +61,7 @@ if ($JobPurgeDays != 0) my $Jobs = CreateJobs(); foreach my $Job (@{$Jobs->GetItems()}) { - if (defined($Job->Ended) && $Job->Ended < $DeleteBefore) + if ($Job->Submitted < $DeleteBefore) { LogMsg "Deleting job ", $Job->Id, "\n"; $Job->RmTree(); -- 2.15.1

1 0

[PATCH 1/2] testbot: Require that a Job's Submitted field always be set.
by Francois Gouget Jan. 17, 2018

Jan. 17, 2018

This guarantees we have at least one field to purge old jobs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This requires updating the database schema using update30.sql and restarting the web server and TestBot Engine. testbot/ddl/update30.sql | 4 ++++ testbot/ddl/winetestbot.sql | 2 +- testbot/doc/winetestbot-schema.dia | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 testbot/ddl/update30.sql diff --git a/testbot/ddl/update30.sql b/testbot/ddl/update30.sql new file mode 100644 index 00000000..892d8d18 --- /dev/null +++ b/testbot/ddl/update30.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE Jobs + MODIFY Submitted DATETIME NOT NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index ad8d1a92..cebc2655 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -114,7 +114,7 @@ CREATE TABLE Jobs Priority INT(1) NOT NULL, Status ENUM('queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled') NOT NULL, Remarks VARCHAR(128) NULL, - Submitted DATETIME NULL, + Submitted DATETIME NOT NULL, Ended DATETIME NULL, PatchId INT(7) NULL, FOREIGN KEY (BranchName) REFERENCES Branches(Name), diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index ef7c3ca7..7a948346 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -1450,7 +1450,7 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="nullable"> - <dia:boolean val="true"/> + <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="unique"> <dia:boolean val="false"/> -- 2.15.1

1 0

[PATCH vkd3d 1/8] libs/vkd3d: Add simple format support restrictions.
by Józef Kucia Jan. 17, 2018

Jan. 17, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> In the long term, we may need more complex format support filtering. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- After this change all tests passes with recent Nvidia drivers. --- libs/vkd3d/device.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5cf2ecfe8bdc..d84c5796a91b 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1230,6 +1230,30 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandList(ID3D12Device *if &IID_ID3D12GraphicsCommandList, riid, command_list); } +/* Direct3D feature levels restrict which formats can be optionally supported. */ +static void vkd3d_restrict_format_support_for_feature_level( + D3D12_FEATURE_DATA_FORMAT_SUPPORT *format_support, const struct vkd3d_format *format) +{ + static const D3D12_FEATURE_DATA_FORMAT_SUPPORT blacklisted_format_features[] = + { + {DXGI_FORMAT_B8G8R8A8_TYPELESS, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, + D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, + {DXGI_FORMAT_B8G8R8A8_UNORM, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, + D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(blacklisted_format_features); ++i) + { + if (blacklisted_format_features[i].Format == format->dxgi_format) + { + format_support->Support1 &= ~blacklisted_format_features[i].Support1; + format_support->Support2 &= ~blacklisted_format_features[i].Support2; + break; + } + } +} + static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device *iface, D3D12_FEATURE feature, void *feature_data, UINT feature_data_size) { @@ -1378,6 +1402,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * | D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_SIGNED_MIN_OR_MAX | D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_UNSIGNED_MIN_OR_MAX; + vkd3d_restrict_format_support_for_feature_level(data, format); + return S_OK; } -- 2.13.6

3 17

[PATCH v2] usp10: Re-use script caches for the same font.
by Thomas Faber Jan. 17, 2018

Jan. 17, 2018

v2: use the LOGFONT as the comparison key, not the HDC; add more tests

3 2

[PATCH] po: Update German translation.
by Julian Rüger Jan. 17, 2018

Jan. 17, 2018

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] testbot/Janitor: Don't undefine variables that are going out of scope.
by Francois Gouget Jan. 16, 2018

Jan. 16, 2018

There is no point. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 4f0e4de0..6ac22ded 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -72,7 +72,6 @@ if ($JobPurgeDays != 0) } } } - $Jobs = undef; } # Delete PatchSets that are more than a day old @@ -123,7 +122,6 @@ if ($JobPurgeDays != 0) } } } - $Patches = undef; } # Archive old Jobs, that is remove all their associated files @@ -146,7 +144,6 @@ if ($JobArchiveDays != 0) $Job->Save(); } } - $Jobs = undef; } # Purge the deleted users and VMs if they are not referenced anymore @@ -286,5 +283,4 @@ if ($JobPurgeDays != 0) } } } - $RecordGroups = undef; } -- 2.15.1

1 0