July 2018 - Wine-commits - list.winehq.org

Daniel Lehman : gdi32/tests: Add test for clipped polygon.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: wine Branch: master Commit: 418514820f03243c192ca5e6dfd0ab00ec740fd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=418514820f03243c192ca5e6… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jul 13 14:41:55 2018 -0700 gdi32/tests: Add test for clipped polygon. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/path.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 80145fc..2356b96 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -1894,6 +1894,31 @@ static void test_all_functions(void) ReleaseDC( 0, hdc ); } +static void test_clipped_polygon_fill(void) +{ + const POINT pts[3] = {{-10, -10}, {10, -5}, {0, 10}}; + HBRUSH brush, oldbrush; + HBITMAP bmp, oldbmp; + HDC hdc, memdc; + COLORREF col; + + hdc = GetDC( 0 ); + memdc = CreateCompatibleDC( hdc ); + bmp = CreateCompatibleBitmap( hdc, 20, 20 ); + brush = CreateSolidBrush( RGB( 0x11, 0x22, 0x33 ) ); + oldbrush = SelectObject( memdc, brush ); + oldbmp = SelectObject( memdc, bmp ); + Polygon( memdc, pts, ARRAY_SIZE(pts) ); + col = GetPixel( memdc, 1, 1 ); + todo_wine ok( col == RGB( 0x11, 0x22, 0x33 ), "got %06x\n", col ); + SelectObject( memdc, oldbrush ); + SelectObject( memdc, oldbmp ); + DeleteObject( brush ); + DeleteObject( bmp ); + DeleteDC( memdc ); + ReleaseDC( 0, hdc ); +} + START_TEST(path) { test_path_state(); @@ -1906,5 +1931,6 @@ START_TEST(path) test_rectangle(); test_roundrect(); test_ellipse(); + test_clipped_polygon_fill(); test_all_functions(); }

1 0

Daniel Lehman : gdi32: Update edgetable limits with top and bottom.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: wine Branch: master Commit: e976e179ae07d5c6c4d6854a939844d32f6255dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e976e179ae07d5c6c4d6854a… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jul 13 09:45:39 2018 -0700 gdi32: Update edgetable limits with top and bottom. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 4 ++-- dlls/gdi32/tests/path.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 4899d43..cad6428 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2457,8 +2457,8 @@ static unsigned int REGION_CreateEdgeTable(const INT *Count, INT nbpolygons, REGION_InsertEdgeInET(ET, pETEs, top->y, &pSLLBlock, &iSLLBlock); - if (PrevPt->y > ET->ymax) ET->ymax = PrevPt->y; - if (PrevPt->y < ET->ymin) ET->ymin = PrevPt->y; + if (top->y < ET->ymin) ET->ymin = top->y; + if (bottom->y > ET->ymax) ET->ymax = bottom->y; pETEs++; } } diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 2356b96..f4a9d18 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -1910,7 +1910,7 @@ static void test_clipped_polygon_fill(void) oldbmp = SelectObject( memdc, bmp ); Polygon( memdc, pts, ARRAY_SIZE(pts) ); col = GetPixel( memdc, 1, 1 ); - todo_wine ok( col == RGB( 0x11, 0x22, 0x33 ), "got %06x\n", col ); + ok( col == RGB( 0x11, 0x22, 0x33 ), "got %06x\n", col ); SelectObject( memdc, oldbrush ); SelectObject( memdc, oldbmp ); DeleteObject( brush );

1 0

Hans Leidekker : msi: Use msi_get_package_code in msi_publish_product_properties.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: wine Branch: master Commit: ddf762a82f2c578cd3b0d4ff0c13c8a08641a666 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddf762a82f2c578cd3b0d4ff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 18 11:19:54 2018 +0200 msi: Use msi_get_package_code in msi_publish_product_properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 15f1876..29c6827 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4281,10 +4281,8 @@ static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey) static const WCHAR szClients[] = {'C','l','i','e','n','t','s',0}; static const WCHAR szColon[] = {':',0}; - MSIHANDLE hdb, suminfo; - WCHAR *buffer, *ptr, guids[MAX_PATH], packcode[SQUASHED_GUID_SIZE]; - DWORD langid, size; - UINT r; + WCHAR *buffer, *ptr, *guids, packcode[SQUASHED_GUID_SIZE]; + DWORD langid; buffer = msi_dup_property(package->db, INSTALLPROPERTY_PRODUCTNAMEW); msi_reg_set_val_str(hkey, INSTALLPROPERTY_PRODUCTNAMEW, buffer); @@ -4318,28 +4316,12 @@ static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey) msi_reg_set_val_dword(hkey, INSTALLPROPERTY_INSTANCETYPEW, 0); msi_reg_set_val_str(hkey, szClients, szColon); - hdb = alloc_msihandle(&package->db->hdr); - if (!hdb) - return ERROR_NOT_ENOUGH_MEMORY; - - r = MsiGetSummaryInformationW(hdb, NULL, 0, &suminfo); - MsiCloseHandle(hdb); - if (r != ERROR_SUCCESS) - goto done; - - size = MAX_PATH; - r = MsiSummaryInfoGetPropertyW(suminfo, PID_REVNUMBER, NULL, NULL, - NULL, guids, &size); - if (r != ERROR_SUCCESS) - goto done; - - ptr = strchrW(guids, ';'); - if (ptr) *ptr = 0; + if (!(guids = msi_get_package_code(package->db))) return ERROR_OUTOFMEMORY; + if ((ptr = strchrW(guids, ';'))) *ptr = 0; squash_guid(guids, packcode); + msi_free( guids); msi_reg_set_val_str(hkey, INSTALLPROPERTY_PACKAGECODEW, packcode); -done: - MsiCloseHandle(suminfo); return ERROR_SUCCESS; }

1 0

Hans Leidekker : bcrypt: Move GnuTLS support to a new file.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: wine Branch: master Commit: 018b695efaaa347e52e6b63ffcfa66f6551333aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=018b695efaaa347e52e6b63f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 18 11:20:11 2018 +0200 bcrypt: Move GnuTLS support to a new file. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 1 + dlls/bcrypt/bcrypt_internal.h | 137 +++++ dlls/bcrypt/bcrypt_main.c | 1189 ++++++++--------------------------------- dlls/bcrypt/gnutls.c | 632 ++++++++++++++++++++++ 4 files changed, 1004 insertions(+), 955 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=018b695efaaa347e52e6…

1 0

Hans Leidekker : bcrypt: Move macOS support to a new file.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: wine Branch: master Commit: d265dd88cd93ce6ffe56c9cfd640b064d7c14e29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d265dd88cd93ce6ffe56c9cf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 18 11:20:12 2018 +0200 bcrypt: Move macOS support to a new file. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 1 + dlls/bcrypt/bcrypt_main.c | 180 -------------------------------------- dlls/bcrypt/macos.c | 216 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 217 insertions(+), 180 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d265dd88cd93ce6ffe56…

1 0

Jeremy Newman : update generate_passwd to be stronger
by Jeremy Newman 18 Jul '18

18 Jul '18

Module: appdb Branch: master Commit: ca2c14ebead2840510103198f53216a5e3616208 URL: https://source.winehq.org/git/appdb.git/?a=commit;h=ca2c14ebead284051010319… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Jul 18 13:12:38 2018 -0500 update generate_passwd to be stronger mt_rand in PHP is not considered to be cryptographically stong use openssl_random_pseudo_bytes instead --- include/user.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/user.php b/include/user.php index 5a4b428..6626b0e 100644 --- a/include/user.php +++ b/include/user.php @@ -417,16 +417,16 @@ class User { /** * Creates a new random password. */ - public static function generate_passwd($pass_len = 10) + public static function generate_passwd($pass_len = 20) { - $nps = ""; - mt_srand ((double) microtime() * 1000000); - while (strlen($nps)<$pass_len) - { - $c = chr(mt_rand (0,255)); - if (preg_match("/[a-zA-Z0-9]/", $c)) $nps = $nps.$c; + $alphanum = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + $alphanum_length = strlen($alphanum); + $random = openssl_random_pseudo_bytes($pass_len); + $passwd = ''; + for ($i = 0; $i < $pass_len; ++$i) { + $passwd .= $alphanum[ord($random[$i]) % $alphanum_length]; } - return ($nps); + return $passwd; } /**

1 0

Francois Gouget : testbot/WineSendLog: Remove a couple of redundant lines.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: tools Branch: master Commit: eb2dfc6b26d4895a35315fbc500aea46a9a3479b URL: https://source.winehq.org/git/tools.git/?a=commit;h=eb2dfc6b26d4895a35315fb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 18 17:32:09 2018 +0200 testbot/WineSendLog: Remove a couple of redundant lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 51830ad..f1cb74e 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -475,8 +475,6 @@ EOF # Filter out failures that happened in the full test suite: # the test suite is run against code which is already in Wine # so any failure it reported is not caused by this patch. - my $LogFiles = GetLogFileNames($TaskDir); - my $LogName = $LogFiles->[0] || "log"; $MessagesFromLog = CompareLogs("$LatestName.log", "$TaskDir/$LogName", $BaseName, $StepTask->CmdLineArg); }

1 0

Francois Gouget : testbot/Janitor: Only compute the latest file ages when needed.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: tools Branch: master Commit: 381d88c6b01512b40dc04400d9fc475adc955732 URL: https://source.winehq.org/git/tools.git/?a=commit;h=381d88c6b01512b40dc0440… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 18 17:32:25 2018 +0200 testbot/Janitor: Only compute the latest file ages when needed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index a9cdd52..18bbc3d 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -310,9 +310,6 @@ if (opendir(my $dh, "$DataDir/latest")) foreach my $Entry (@Entries) { next if ($Entry eq "." or $Entry eq ".."); - $Entry =~ m%^([^/]+)$%; - my $FileName = "$DataDir/latest/$1"; - my $Age = int((-M $FileName) + 0.5); if ($Entry =~ /^(.*)_[a-z0-9]+\.(?:err|log)$/) { @@ -329,6 +326,9 @@ if (opendir(my $dh, "$DataDir/latest")) Trace "Found a suspicious latest file: $Entry\n"; if ($JobPurgeDays != 0) { + $Entry =~ m%^([^/]+)$%; # untaint + my $FileName = "$DataDir/latest/$1"; + my $Age = int((-M $FileName) + 0.5); if ($Age >= $JobPurgeDays + 7) { DeletePath($FileName);

1 0

Józef Kucia : libs/vkd3d-shader: Add debug name for vDomainLocation register.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: vkd3d Branch: master Commit: 6e8dae9d625bf7e281b1d3f49afe2efefe9a836f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6e8dae9d625bf7e281b1d3f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 12:05:43 2018 +0200 libs/vkd3d-shader: Add debug name for vDomainLocation register. 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> --- libs/vkd3d-shader/spirv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 3260b28..d236db9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2160,6 +2160,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_DEPTHOUT: snprintf(buffer, buffer_size, "oDepth"); break; + case VKD3DSPR_TESSCOORD: + snprintf(buffer, buffer_size, "vDomainLocation"); + break; case VKD3DSPR_THREADID: snprintf(buffer, buffer_size, "vThreadID"); break;

1 0

Józef Kucia : libs/vkd3d: Process shader stages according to pipeline order.
by Alexandre Julliard 18 Jul '18

18 Jul '18

Module: vkd3d Branch: master Commit: d266a5f7d05c9ddf6983e64d3f4d1a2bffcf19c5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d266a5f7d05c9ddf6983e64… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 12:05:44 2018 +0200 libs/vkd3d: Process shader stages according to pipeline order. 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> --- libs/vkd3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 19e6549..1c550e2 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1829,10 +1829,10 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_stages[] = { {VK_SHADER_STAGE_VERTEX_BIT, offsetof(D3D12_GRAPHICS_PIPELINE_STATE_DESC, VS)}, - {VK_SHADER_STAGE_FRAGMENT_BIT, offsetof(D3D12_GRAPHICS_PIPELINE_STATE_DESC, PS)}, - {VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT, offsetof(D3D12_GRAPHICS_PIPELINE_STATE_DESC, DS)}, {VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT, offsetof(D3D12_GRAPHICS_PIPELINE_STATE_DESC, HS)}, + {VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT, offsetof(D3D12_GRAPHICS_PIPELINE_STATE_DESC, DS)}, {VK_SHADER_STAGE_GEOMETRY_BIT, offsetof(D3D12_GRAPHICS_PIPELINE_STATE_DESC, GS)}, + {VK_SHADER_STAGE_FRAGMENT_BIT, offsetof(D3D12_GRAPHICS_PIPELINE_STATE_DESC, PS)}, }; state->ID3D12PipelineState_iface.lpVtbl = &d3d12_pipeline_state_vtbl;

1 0