December 2017 - Wine-commits

Jacek Caban : bcrypt: Added support for MD4 hashes.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: e73d4e55a9f5337bf5673339aaf301b64afd060a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e73d4e55a9f5337bf5673339a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 7 19:46:58 2017 +0100 bcrypt: Added support for MD4 hashes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 11 +++++++++++ dlls/bcrypt/bcrypt_main.c | 17 +++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 6 ++++++ include/bcrypt.h | 1 + 4 files changed, 35 insertions(+) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index c58ede8..a75f92a 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -61,6 +61,17 @@ void md2_update(MD2_CTX *ctx, const unsigned char *buf, ULONG len) DECLSPEC_HIDD void md2_finalize(MD2_CTX *ctx, unsigned char *hash) DECLSPEC_HIDDEN; /* Definitions from advapi32 */ +typedef struct tagMD4_CTX { + unsigned int buf[4]; + unsigned int i[2]; + unsigned char in[64]; + unsigned char digest[16]; +} MD4_CTX; + +VOID WINAPI MD4Init(MD4_CTX *ctx); +VOID WINAPI MD4Update(MD4_CTX *ctx, const unsigned char *buf, unsigned int len); +VOID WINAPI MD4Final(MD4_CTX *ctx); + typedef struct { unsigned int i[2]; diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b202184..931db2b 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -146,6 +146,7 @@ enum alg_id { ALG_ID_AES, ALG_ID_MD2, + ALG_ID_MD4, ALG_ID_MD5, ALG_ID_RNG, ALG_ID_SHA1, @@ -165,6 +166,7 @@ static const struct { } alg_props[] = { /* ALG_ID_AES */ { 654, 0, 0, BCRYPT_AES_ALGORITHM }, /* ALG_ID_MD2 */ { 270, 16, 128, BCRYPT_MD2_ALGORITHM }, + /* ALG_ID_MD4 */ { 270, 16, 512, BCRYPT_MD4_ALGORITHM }, /* ALG_ID_MD5 */ { 274, 16, 512, BCRYPT_MD5_ALGORITHM }, /* ALG_ID_RNG */ { 0, 0, 0, BCRYPT_RNG_ALGORITHM }, /* ALG_ID_SHA1 */ { 278, 20, 512, BCRYPT_SHA1_ALGORITHM }, @@ -238,6 +240,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR if (!strcmpW( id, BCRYPT_AES_ALGORITHM )) alg_id = ALG_ID_AES; else if (!strcmpW( id, BCRYPT_MD2_ALGORITHM )) alg_id = ALG_ID_MD2; + else if (!strcmpW( id, BCRYPT_MD4_ALGORITHM )) alg_id = ALG_ID_MD4; else if (!strcmpW( id, BCRYPT_MD5_ALGORITHM )) alg_id = ALG_ID_MD5; else if (!strcmpW( id, BCRYPT_RNG_ALGORITHM )) alg_id = ALG_ID_RNG; else if (!strcmpW( id, BCRYPT_SHA1_ALGORITHM )) alg_id = ALG_ID_SHA1; @@ -291,6 +294,7 @@ struct hash_impl union { MD2_CTX md2; + MD4_CTX md4; MD5_CTX md5; SHA_CTX sha1; SHA256_CTX sha256; @@ -306,6 +310,10 @@ static NTSTATUS hash_init( struct hash_impl *hash, enum alg_id alg_id ) md2_init( &hash->u.md2 ); break; + case ALG_ID_MD4: + MD4Init( &hash->u.md4 ); + break; + case ALG_ID_MD5: MD5Init( &hash->u.md5 ); break; @@ -342,6 +350,10 @@ static NTSTATUS hash_update( struct hash_impl *hash, enum alg_id alg_id, md2_update( &hash->u.md2, input, size ); break; + case ALG_ID_MD4: + MD4Update( &hash->u.md4, input, size ); + break; + case ALG_ID_MD5: MD5Update( &hash->u.md5, input, size ); break; @@ -378,6 +390,11 @@ static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id, md2_finalize( &hash->u.md2, output ); break; + case ALG_ID_MD4: + MD4Final( &hash->u.md4 ); + memcpy( output, hash->u.md4.digest, 16 ); + break; + case ALG_ID_MD5: MD5Final( &hash->u.md5 ); memcpy( output, hash->u.md5.digest, 16 ); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index de04190..6fa04b0 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -329,6 +329,12 @@ static void test_hashes(void) "7f05b0638d77f4a27f3a9c4d353cd648" }, { + "MD4", + 16, + "74b5db93c0b41e36ca7074338fc0b637", + "bc2e8ac4d8248ed21b8d26227a30ea3a" + }, + { "MD5", 16, "e2a3e68d23ce348b8f68b3079de3d4c9", diff --git a/include/bcrypt.h b/include/bcrypt.h index 70928c5..7c3c8d0 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -65,6 +65,7 @@ typedef LONG NTSTATUS; #define BCRYPT_AES_ALGORITHM (const WCHAR []){'A','E','S',0} #define BCRYPT_MD2_ALGORITHM (const WCHAR []){'M','D','2',0} +#define BCRYPT_MD4_ALGORITHM (const WCHAR []){'M','D','4',0} #define BCRYPT_MD5_ALGORITHM (const WCHAR []){'M','D','5',0} #define BCRYPT_RNG_ALGORITHM (const WCHAR []){'R','N','G',0} #define BCRYPT_SHA1_ALGORITHM (const WCHAR []){'S','H','A','1',0}

1 0

Jacek Caban : rsaenh: Use bcrypt for MD4 hashes.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: 2b7fcef811dda082fb0f79aaa2986fa026f426bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b7fcef811dda082fb0f79aaa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 7 19:47:06 2017 +0100 rsaenh: Use bcrypt for MD4 hashes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/implglue.c | 18 ++---------------- dlls/rsaenh/implglue.h | 9 --------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index af87b43..c12a27c 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -33,10 +33,6 @@ #include <stdio.h> -/* Function prototypes copied from dlls/advapi32/crypt_md4.c */ -VOID WINAPI MD4Init( MD4_CTX *ctx ); -VOID WINAPI MD4Update( MD4_CTX *ctx, const unsigned char *buf, unsigned int len ); -VOID WINAPI MD4Final( MD4_CTX *ctx ); /* Function prototypes copied from dlls/advapi32/crypt_md5.c */ VOID WINAPI MD5Init( MD5_CTX *ctx ); VOID WINAPI MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len ); @@ -56,8 +52,8 @@ BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) break; case CALG_MD4: - MD4Init(&pHashContext->md4); - return TRUE; + status = BCryptOpenAlgorithmProvider(&provider, BCRYPT_MD4_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + break; case CALG_MD5: MD5Init(&pHashContext->md5); @@ -95,10 +91,6 @@ BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, const BYTE *pb { switch (aiAlgid) { - case CALG_MD4: - MD4Update(&pHashContext->md4, pbData, dwDataLen); - break; - case CALG_MD5: MD5Update(&pHashContext->md5, pbData, dwDataLen); break; @@ -114,11 +106,6 @@ BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHash { switch (aiAlgid) { - case CALG_MD4: - MD4Final(&pHashContext->md4); - memcpy(pbHashValue, pHashContext->md4.digest, 16); - break; - case CALG_MD5: MD5Final(&pHashContext->md5); memcpy(pbHashValue, pHashContext->md5.digest, 16); @@ -138,7 +125,6 @@ BOOL duplicate_hash_impl(ALG_ID aiAlgid, const HASH_CONTEXT *pSrcHashContext, { switch (aiAlgid) { - case CALG_MD4: case CALG_MD5: *pDestHashContext = *pSrcHashContext; return TRUE; diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 59e98c3..e874aaa 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -29,14 +29,6 @@ #define RSAENH_MAX_HASH_SIZE 104 -/* Next typedef copied from dlls/advapi32/crypt_md4.c */ -typedef struct tagMD4_CTX { - unsigned int buf[4]; - unsigned int i[2]; - unsigned char in[64]; - unsigned char digest[16]; -} MD4_CTX; - /* Next typedef copied from dlls/advapi32/crypt_md5.c */ typedef struct tagMD5_CTX { @@ -47,7 +39,6 @@ typedef struct tagMD5_CTX } MD5_CTX; typedef union tagHASH_CONTEXT { - MD4_CTX md4; MD5_CTX md5; BCRYPT_HASH_HANDLE bcrypt_hash; } HASH_CONTEXT;

1 0

Jacek Caban : rsaenh: Use bcrypt for MD5 hashes.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: wine Branch: master Commit: 3e8556447c135ff2fd9edaffc6ee986e084b4040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e8556447c135ff2fd9edaffc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 7 19:47:13 2017 +0100 rsaenh: Use bcrypt for MD5 hashes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/implglue.c | 43 ++++++------------------------------------- dlls/rsaenh/implglue.h | 10 ---------- 2 files changed, 6 insertions(+), 47 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index c12a27c..f12fc78 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -33,10 +33,6 @@ #include <stdio.h> -/* Function prototypes copied from dlls/advapi32/crypt_md5.c */ -VOID WINAPI MD5Init( MD5_CTX *ctx ); -VOID WINAPI MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len ); -VOID WINAPI MD5Final( MD5_CTX *ctx ); /* Function prototype copied from dlls/advapi32/crypt.c */ BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen); @@ -56,8 +52,8 @@ BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) break; case CALG_MD5: - MD5Init(&pHashContext->md5); - return TRUE; + status = BCryptOpenAlgorithmProvider(&provider, BCRYPT_MD5_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + break; case CALG_SHA: status = BCryptOpenAlgorithmProvider(&provider, BCRYPT_SHA1_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); @@ -89,48 +85,21 @@ BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, const BYTE *pbData, DWORD dwDataLen) { - switch (aiAlgid) - { - case CALG_MD5: - MD5Update(&pHashContext->md5, pbData, dwDataLen); - break; - - default: - BCryptHashData(pHashContext->bcrypt_hash, (UCHAR*)pbData, dwDataLen, 0); - } - + BCryptHashData(pHashContext->bcrypt_hash, (UCHAR*)pbData, dwDataLen, 0); return TRUE; } BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHashValue) { - switch (aiAlgid) - { - case CALG_MD5: - MD5Final(&pHashContext->md5); - memcpy(pbHashValue, pHashContext->md5.digest, 16); - break; - - default: - BCryptFinishHash(pHashContext->bcrypt_hash, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); - BCryptDestroyHash(pHashContext->bcrypt_hash); - break; - } - + BCryptFinishHash(pHashContext->bcrypt_hash, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); + BCryptDestroyHash(pHashContext->bcrypt_hash); return TRUE; } BOOL duplicate_hash_impl(ALG_ID aiAlgid, const HASH_CONTEXT *pSrcHashContext, HASH_CONTEXT *pDestHashContext) { - switch (aiAlgid) - { - case CALG_MD5: - *pDestHashContext = *pSrcHashContext; - return TRUE; - default: - return !BCryptDuplicateHash(pSrcHashContext->bcrypt_hash, &pDestHashContext->bcrypt_hash, NULL, 0, 0); - } + return !BCryptDuplicateHash(pSrcHashContext->bcrypt_hash, &pDestHashContext->bcrypt_hash, NULL, 0, 0); } BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index e874aaa..92323ca 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -29,17 +29,7 @@ #define RSAENH_MAX_HASH_SIZE 104 -/* Next typedef copied from dlls/advapi32/crypt_md5.c */ -typedef struct tagMD5_CTX -{ - unsigned int i[2]; - unsigned int buf[4]; - unsigned char in[64]; - unsigned char digest[16]; -} MD5_CTX; - typedef union tagHASH_CONTEXT { - MD5_CTX md5; BCRYPT_HASH_HANDLE bcrypt_hash; } HASH_CONTEXT;

1 0

Francois Gouget : testbot: Don' t fail setting the Status of a brand new VM.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: tools Branch: master Commit: d4fe0e1bf6dece453384768d25e422ff527d375e URL: http://source.winehq.org/git/tools.git/?a=commit;h=d4fe0e1bf6dece453384768d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 7 04:12:52 2017 +0100 testbot: Don't fail setting the Status of a brand new VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index b931342..30b6124 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -221,7 +221,7 @@ sub Status($;$) my $CurrentStatus = $self->SUPER::Status; return $CurrentStatus if (!defined $NewStatus); - if ($NewStatus ne $CurrentStatus) + if (!defined $CurrentStatus or $NewStatus ne $CurrentStatus) { $self->SUPER::Status($NewStatus); $self->{OldStatus} = $CurrentStatus;

1 0

Francois Gouget : testbot: Document a quirk of Collection::Add().
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: tools Branch: master Commit: 97036c17e646267916d87da7570a420631611d9a URL: http://source.winehq.org/git/tools.git/?a=commit;h=97036c17e646267916d87da7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 7 04:13:09 2017 +0100 testbot: Document a quirk of Collection::Add(). Not only does it not force loading from the database, it marks the Collection as loaded. So if Add() is the first call on a Collection, calling GetKeys() or GetItems() later on will only return the new Item. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 9d3d3ae..1b29ec1 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -168,6 +168,11 @@ sub Load($) Instantiates a new Item and adds it to the Collection. +Note that not only does calling Add() not force loading from the database, +it marks the Collection as loaded. So if Add() is the first call on a +Collection, calling GetKeys() or GetItems() later on will only return the new +Item. + See Item->new() for details on the Item's default column values and for important information regarding its primary key.

1 0

Francois Gouget : testbot: Remove extraneous colons in new() calls.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: tools Branch: master Commit: b4b9a015de557b5efeaa4457b40e8daad952614c URL: http://source.winehq.org/git/tools.git/?a=commit;h=b4b9a015de557b5efeaa4457… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 7 04:13:24 2017 +0100 testbot: Remove extraneous colons in new() calls. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Branches.pm | 4 ++-- testbot/lib/WineTestBot/Roles.pm | 4 ++-- testbot/lib/WineTestBot/Users.pm | 4 ++-- testbot/lib/WineTestBot/VMs.pm | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index 63a582c..bfd24dd 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -97,8 +97,8 @@ sub CreateItem($) sub CreateBranches(;$) { my ($ScopeObject) = @_; - return WineTestBot::Branches::->new("Branches", "Branches", "Branch", - \@PropertyDescriptors, $ScopeObject); + return WineTestBot::Branches->new("Branches", "Branches", "Branch", + \@PropertyDescriptors, $ScopeObject); } 1; diff --git a/testbot/lib/WineTestBot/Roles.pm b/testbot/lib/WineTestBot/Roles.pm index 86c5a13..7c59e6a 100644 --- a/testbot/lib/WineTestBot/Roles.pm +++ b/testbot/lib/WineTestBot/Roles.pm @@ -73,8 +73,8 @@ sub CreateItem($) sub CreateRoles(;$) { my ($ScopeObject) = @_; - return WineTestBot::Roles::->new("Roles", "Roles", "Role", - \@PropertyDescriptors, $ScopeObject); + return WineTestBot::Roles->new("Roles", "Roles", "Role", + \@PropertyDescriptors, $ScopeObject); } 1; diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 9618a18..2139b6d 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -333,8 +333,8 @@ sub CreateItem($) sub CreateUsers(;$) { my ($ScopeObject) = @_; - return WineTestBot::Users::->new("Users", "Users", "User", - \@PropertyDescriptors, $ScopeObject); + return WineTestBot::Users->new("Users", "Users", "User", + \@PropertyDescriptors, $ScopeObject); } sub AuthenticateLDAP($$$) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 30b6124..7db0aa5 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -553,8 +553,8 @@ sub CreateItem($) sub CreateVMs(;$) { my ($ScopeObject) = @_; - return WineTestBot::VMs::->new("VMs", "VMs", "VM", - \@PropertyDescriptors, $ScopeObject); + return WineTestBot::VMs->new("VMs", "VMs", "VM", + \@PropertyDescriptors, $ScopeObject); } sub SortKeysBySortOrder($$)

1 0

Francois Gouget : testbot/web: Use our escapeHTML() instead of calling directly the CGI one.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: tools Branch: master Commit: 96e0fdacae01d741bc0144e8f699f5cccbeaff87 URL: http://source.winehq.org/git/tools.git/?a=commit;h=96e0fdacae01d741bc0144e8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 7 04:13:44 2017 +0100 testbot/web: Use our escapeHTML() instead of calling directly the CGI one. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Login.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index 99757c5..f17d60e 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -21,7 +21,6 @@ use strict; package LoginPage; -use CGI qw(:standard escapeHTML); use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; use WineTestBot::Config; @@ -79,7 +78,7 @@ sub GenerateFields($) if (defined($self->GetParam("Target"))) { print "<div><input type='hidden' name='Target' value='", - escapeHTML($self->GetParam("Target")), "'></div>\n"; + $self->escapeHTML($self->GetParam("Target")), "'></div>\n"; } $self->SUPER::GenerateFields();

1 0

Francois Gouget : testbot/web: Add ids so one can link to a given job on the Home page.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: tools Branch: master Commit: 62bfba14f69d3a021e7945f36f653d539b3690eb URL: http://source.winehq.org/git/tools.git/?a=commit;h=62bfba14f69d3a021e7945f3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 7 04:15:03 2017 +0100 testbot/web: Add ids so one can link to a given job on the Home page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 3f3a91e..b0c2d45 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -87,7 +87,8 @@ sub GenerateDataCell($$$$) my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "Status") { - print "<td><a href='/JobDetails.pl?Key=", uri_escape($Item->GetKey()), "'>"; + my $EscapedKey = uri_escape($Item->GetKey()); + print "<td id='job$EscapedKey'><a href='/JobDetails.pl?Key=$EscapedKey'>"; my %HTMLChunks = ("queued" => "<span class='queued'>queued</span>", "running" => "<span class='running'>running</span>",

1 0

Francois Gouget : testbot/web: Remove some unused escapeHTML() import directives.
by Alexandre Julliard 07 Dec '17

07 Dec '17

Module: tools Branch: master Commit: 4d2bfb54e860c77723c9081a1522105e0a7389cb URL: http://source.winehq.org/git/tools.git/?a=commit;h=4d2bfb54e860c77723c9081a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 7 04:15:14 2017 +0100 testbot/web: Remove some unused escapeHTML() import directives. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Feedback.pl | 1 - testbot/web/ForgotPassword.pl | 1 - testbot/web/ResetPassword.pl | 1 - 3 files changed, 3 deletions(-) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index e22dc3a..ded705a 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -21,7 +21,6 @@ use strict; package FeedbackPage; -use CGI qw(:standard escapeHTML); use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; use WineTestBot::Config; diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index 801b50d..c6240e7 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -21,7 +21,6 @@ use strict; package ForgotPasswordPage; -use CGI qw(:standard escapeHTML); use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; use WineTestBot::Users; diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index d512968..431a4da 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -21,7 +21,6 @@ use strict; package ResetPasswordPage; -use CGI qw(:standard escapeHTML); use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; use WineTestBot::Users;

1 0

Józef Kucia : wined3d: Add support for D3D10+ depth bias.
by Alexandre Julliard 06 Dec '17

06 Dec '17

Module: wine Branch: master Commit: 5d2a3ad3100490fd80d3ee26ba5874f326d6779f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d2a3ad3100490fd80d3ee26b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 6 11:00:34 2017 +0100 wined3d: Add support for D3D10+ depth bias. Direct3D seems to define exact depth bias scale factors per format. In order to make depth bias work reliably across OpenGL drivers we need to slightly adjust depth bias values passed to glPolygonOffset(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/directx.c | 3 ++- dlls/wined3d/state.c | 23 +++++++++++------------ dlls/wined3d/utils.c | 16 ++++++++++++++-- include/wine/wined3d.h | 1 + 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index fe7163f..08c3131 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -580,7 +580,8 @@ BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) { DWORD flags = WINED3D_PRESENT_CONVERSION | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER | WINED3D_SRGB_READ_WRITE_CONTROL | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR - | WINED3D_NO_PRIMITIVE_RESTART | WINED3D_LEGACY_CUBEMAP_FILTERING; + | WINED3D_NO_PRIMITIVE_RESTART | WINED3D_LEGACY_CUBEMAP_FILTERING + | WINED3D_NORMALIZED_DEPTH_BIAS; if (!extended) flags |= WINED3D_VIDMEM_ACCOUNTING; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0b7c747..db1711e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1692,7 +1692,7 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 || state->render_states[WINED3D_RS_DEPTHBIAS]) { const struct wined3d_rendertarget_view *depth = state->fb->depth_stencil; - float scale; + float factor, units, scale; union { @@ -1703,14 +1703,9 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 scale_bias.d = state->render_states[WINED3D_RS_SLOPESCALEDEPTHBIAS]; const_bias.d = state->render_states[WINED3D_RS_DEPTHBIAS]; - gl_info->gl_ops.gl.p_glEnable(GL_POLYGON_OFFSET_FILL); - checkGLcall("glEnable(GL_POLYGON_OFFSET_FILL)"); - if (context->d3d_info->wined3d_creation_flags & WINED3D_LEGACY_DEPTH_BIAS) { - float bias = -(float)const_bias.d; - gl_info->gl_ops.gl.p_glPolygonOffset(bias, bias); - checkGLcall("glPolygonOffset"); + factor = units = -(float)const_bias.d; } else { @@ -1719,24 +1714,28 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 scale = depth->format->depth_bias_scale; TRACE("Depth format %s, using depthbias scale of %.8e.\n", - debug_d3dformat(depth->format->id), scale); + debug_d3dformat(depth->format->id), scale); } else { /* The context manager will reapply this state on a depth stencil change */ - TRACE("No depth stencil, using depthbias scale of 0.0.\n"); + TRACE("No depth stencil, using depth bias scale of 0.0.\n"); scale = 0.0f; } - gl_info->gl_ops.gl.p_glPolygonOffset(scale_bias.f, const_bias.f * scale); - checkGLcall("glPolygonOffset(...)"); + factor = scale_bias.f; + units = const_bias.f * scale; } + + gl_info->gl_ops.gl.p_glEnable(GL_POLYGON_OFFSET_FILL); + gl_info->gl_ops.gl.p_glPolygonOffset(factor, units); } else { gl_info->gl_ops.gl.p_glDisable(GL_POLYGON_OFFSET_FILL); - checkGLcall("glDisable(GL_POLYGON_OFFSET_FILL)"); } + + checkGLcall("depth bias"); } static void state_zvisible(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 76b1d89..b3003f1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3706,7 +3706,8 @@ static float wined3d_adapter_find_polyoffset_scale(struct wined3d_caps_gl_ctx *c return (float)(1u << cur); } -static void init_format_depth_bias_scale(struct wined3d_caps_gl_ctx *ctx) +static void init_format_depth_bias_scale(struct wined3d_caps_gl_ctx *ctx, + const struct wined3d_d3d_info *d3d_info) { const struct wined3d_gl_info *gl_info = ctx->gl_info; unsigned int i; @@ -3719,6 +3720,17 @@ static void init_format_depth_bias_scale(struct wined3d_caps_gl_ctx *ctx) { TRACE("Testing depth bias scale for format %s.\n", debug_d3dformat(format->id)); format->depth_bias_scale = wined3d_adapter_find_polyoffset_scale(ctx, format->glInternal); + + if (!(d3d_info->wined3d_creation_flags & WINED3D_NORMALIZED_DEPTH_BIAS)) + { + /* The single-precision binary floating-point format has + * a significand precision of 24 bits. + */ + if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) + format->depth_bias_scale /= 1u << 24; + else + format->depth_bias_scale /= 1u << format->depth_size; + } } } } @@ -3741,7 +3753,7 @@ BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, struct wi init_format_fbo_compat_info(ctx); init_format_filter_info(gl_info, adapter->driver_info.vendor); if (!init_typeless_formats(gl_info)) goto fail; - init_format_depth_bias_scale(ctx); + init_format_depth_bias_scale(ctx, &adapter->d3d_info); return TRUE; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 282e733..a519e94 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1306,6 +1306,7 @@ enum wined3d_shader_byte_code_format #define WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR 0x00000400 #define WINED3D_NO_PRIMITIVE_RESTART 0x00000800 #define WINED3D_LEGACY_CUBEMAP_FILTERING 0x00001000 +#define WINED3D_NORMALIZED_DEPTH_BIAS 0x00002000 #define WINED3D_RESZ_CODE 0x7fa05000

1 0