April 2021 - Wine-Commits - list.winehq.org

Jeremy Newman : remove mailman password, recaptcha is in use
by Jeremy Newman April 29, 2021

April 29, 2021

Module: website Branch: master Commit: 84272777cdd1dee500af0dd83f34b9104b1c01de URL: https://source.winehq.org/git/website.git/?a=commit;h=84272777cdd1dee500af0… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Apr 29 09:41:56 2021 -0500 remove mailman password, recaptcha is in use --- include/plugins/mailman_key.php | 14 -------------- js/utils.js | 11 ----------- templates/en/forums.template | 19 ------------------- templates/nl/forums.template | 23 ----------------------- templates/zh-cn/forums.template | 13 ------------- 5 files changed, 80 deletions(-) diff --git a/include/plugins/mailman_key.php b/include/plugins/mailman_key.php deleted file mode 100644 index 89de3fee..00000000 --- a/include/plugins/mailman_key.php +++ /dev/null @@ -1,14 +0,0 @@ -<?php - -/* - WineHQ Mailman Key - by Jeremy Newman <jnewman(a)codeweavers.com> -*/ - -if (file_exists($config->mailman_key)) - echo base64_encode(trim(file_get_contents($config->mailman_key))); -else - echo "ERROR: Unable to load key!"; - -// done -?> diff --git a/js/utils.js b/js/utils.js index d9ea8ddb..a07fe62d 100644 --- a/js/utils.js +++ b/js/utils.js @@ -13,7 +13,6 @@ var web_root = $_SRC.web_root; */ $(document).ready(function() { - // top nav - responsive pull menu (function(){ var pull = $('#whq-tabs .whq-tabs-menu'); @@ -27,16 +26,6 @@ $(document).ready(function() menu.removeAttr('style'); }); })(); - - // reveal forum code - $('.getForumKey').click(function(e){ - e.preventDefault(); - var code = $(this).data('code'); - code = atob(code); - $(this).hide().after('<code>' + code + '</code>'); - $(this).removeClass('getForumKey').removeClass('cursor'); - }); - }); /* diff --git a/templates/en/forums.template b/templates/en/forums.template index 81d333dd..9f467ecf 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -32,25 +32,6 @@ subject line of <code>"subscribe"</code>. To unsubscribe, use a subject line of <code>"unsubscribe <password></i>"</code> using the password you got when you subscribed, or just use <a href="//www.winehq.org/mailman/listinfo">the Mailman web interface</a>.</p> -<div class="alert alert-warning"> - <h3 class="nomargin-top"><i class="fa fa-info-circle"></i> Web Interface is password protected</h3> - <p> - Due to an increase in bot traffic attempting to subscribe to our lists, the URL to access the Mailman web interface is password protected. - </p> - <p> - <b>Username:</b> <code>mailman</code><br> - <b>Password:</b> <code class="getForumKey bold cursor" data-code=" -">**********************</code> - </p> - <p> - Click the code to reveal the actual password. - </p> - <p> - <b>Note:</b> This password updates regularly, so check back here for changes.<br> - <b>Warning:</b> Entering the password wrong multiple times will result in a 24 hour ban from the website. - </p> -</div> - <p><b>Note:</b> You should be subscribed to the lists before you post to them, otherwise your posting will be treated as possible spam by the mailing list software.</p> diff --git a/templates/nl/forums.template b/templates/nl/forums.template index ffe6e2d4..0bbc33d4 100644 --- a/templates/nl/forums.template +++ b/templates/nl/forums.template @@ -31,29 +31,6 @@ naar <code><listname>-request(a)winehq.org</code> met als onderwerp als u inschrijft.) Of gebruik <a href="//www.winehq.org/mailman/listinfo">de Mailman gebruikersomgeving</a> website.</p> - -<div class="alert alert-warning"> - <h3 class="nomargin-top"><i class="fa fa-info-circle"></i> De gebruikersomgeving heeft een wachtwoord</h3> - <p> - Omdat er steeds meer bots proberen in te schrijven, is de website van Mailman met een wachtwoord beveiligd. - </p> - <p> - <table> - <tr> - <td><b>Gebruikersnaam:</b></td> - <td><code>mailman</code></td> - </tr> - <tr> - <td><b>Wachtwoord:</b></td> - <td><code class="getForumKey bold cursor" data-code=" -">**********************</code></td> - <tr> - </table> - </p> - <p>Klik op de code om het wachtwoord te tonen.<br> - Dit wachtwoord wordt van tijd tot tijd veranderd.</p> -</div> - <p><b>Let op:</b> Voordat u naar een bericht naar maillijst stuurt, moet u ingeschreven zijn. Anders behandeld de software van de mailinglijsten uw bericht als spam.</p> diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index b38cafe8..8e283c21 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -25,19 +25,6 @@ WWW</a>，或者发送一封标题为 <code>"subscribe"</code> 的邮件到 <cod 如果想取消订阅，则使用 <code>"unsubscribe <密码></i>"</code> 作为标题，密码是你在你订阅时获得的。或者直接使用 <a href="//www.winehq.org/mailman/listinfo">Mailman web 界面</a>。</p> -<div class="alert alert-warning"> - <h3 class="nomargin-top"><i class="fa fa-info-circle"></i> Web 界面需要密码登录</h3> - <p> - 因为邮件列表不断得受到爬虫干扰，访问 Mailman 的 web 界面开启了密码保护。 - </p> - <p> - <b>用户名：</b> <code>mailman</code><br> - <b>密码：</b> <code class="getForumKey bold cursor" data-code=" -">**********************</code> - </p> - <p>密码会时不时更新，请从这里获取最新的密码。</p> -</div> - <p><b>注意：</b> 你必须订阅后才能发送邮件到列表，否则你的邮件将被邮件列表软件判定为垃圾邮件。</p> <ul class="roomy">

1 0

Piotr Caban : msvcrt: Fix typo in asin error handling.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: e9f0fc12dcd88cc7ba84b35a87e03b5e7aaadba8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9f0fc12dcd88cc7ba84b35a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 28 19:34:13 2021 +0200 msvcrt: Fix typo in asin error handling. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 9e75f2977a7..a202733ced4 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -942,7 +942,7 @@ double CDECL asin( double x ) if (isnan(x)) { #ifdef __i386__ - return math_error(_DOMAIN, "sqrt", x, 0, x); + return math_error(_DOMAIN, "asin", x, 0, x); #else return x; #endif

1 0

Piotr Caban : msvcrt: Import y0 implementation from musl.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: 8f8fa9182af7a2995940a5e17cf074bc849f2c0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f8fa9182af7a2995940a5e1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 28 19:34:23 2021 +0200 msvcrt: Import y0 implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 54 ++++++++++++++++++++++++++++++++++++++++----------- dlls/msvcrt/unixlib.c | 14 ------------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 --- 6 files changed, 43 insertions(+), 31 deletions(-) diff --git a/configure b/configure index c53edc9323b..14e4bc87ce9 100755 --- a/configure +++ b/configure @@ -19662,7 +19662,6 @@ for ac_func in \ tgammaf \ trunc \ truncf \ - y0 \ y1 \ yn diff --git a/configure.ac b/configure.ac index 04f11623b79..daa7203748c 100644 --- a/configure.ac +++ b/configure.ac @@ -2706,7 +2706,6 @@ AC_CHECK_FUNCS(\ tgammaf \ trunc \ truncf \ - y0 \ y1 \ yn ) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 4ffc0d25833..1355eb7998f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2696,18 +2696,50 @@ double CDECL _jn(int n, double num) /********************************************************************* * _y0 (MSVCRT.@) */ -double CDECL _y0(double num) -{ - double retval; +double CDECL _y0(double x) +{ + static const double tpi = 6.36619772367581382433e-01, + u00 = -7.38042951086872317523e-02, + u01 = 1.76666452509181115538e-01, + u02 = -1.38185671945596898896e-02, + u03 = 3.47453432093683650238e-04, + u04 = -3.81407053724364161125e-06, + u05 = 1.95590137035022920206e-08, + u06 = -3.98205194132103398453e-11, + v01 = 1.27304834834123699328e-02, + v02 = 7.60068627350353253702e-05, + v03 = 2.59150851840457805467e-07, + v04 = 4.41110311332675467403e-10; + + double z, u, v; + unsigned int ix, lx; - if (!isfinite(num)) *_errno() = EDOM; - retval = unix_funcs->y0( num ); - if (_fpclass(retval) == _FPCLASS_NINF) - { - *_errno() = EDOM; - retval = NAN; - } - return retval; + ix = *(ULONGLONG*)&x >> 32; + lx = *(ULONGLONG*)&x; + + /* y0(nan)=nan, y0(<0)=nan, y0(0)=-inf, y0(inf)=0 */ + if ((ix << 1 | lx) == 0) + return math_error(_OVERFLOW, "_y0", x, 0, -INFINITY); + if (isnan(x)) + return x; + if (ix >> 31) + return math_error(_DOMAIN, "_y0", x, 0, 0 / (x - x)); + if (ix >= 0x7ff00000) + return 1 / x; + + if (ix >= 0x40000000) { /* x >= 2 */ + /* large ulp errors near zeros: 3.958, 7.086,.. */ + return j0_y0_approx(ix, x, TRUE); + } + + if (ix >= 0x3e400000) { /* x >= 2**-27 */ + /* large ulp error near the first zero, x ~= 0.89 */ + z = x * x; + u = u00 + z * (u01 + z * (u02 + z * (u03 + z * (u04 + z * (u05 + z * u06))))); + v = 1.0 + z * (v01 + z * (v02 + z * (v03 + z * v04))); + return u / v + tpi * (j0(x) * log(x)); + } + return u00 + tpi * log(x); } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index ed9b971c72a..8be8559337c 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -965,19 +965,6 @@ static float CDECL unix_tgammaf(float x) #endif } -/********************************************************************* - * y0 - */ -static double CDECL unix_y0(double num) -{ -#ifdef HAVE_Y0 - return y0(num); -#else - FIXME("not implemented\n"); - return 0; -#endif -} - /********************************************************************* * y1 */ @@ -1093,7 +1080,6 @@ static const struct unix_funcs funcs = unix_tgammaf, unix_trunc, unix_truncf, - unix_y0, unix_y1, unix_yn }; diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 0c8182be2d6..6a23637c7e2 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -110,7 +110,6 @@ struct unix_funcs float (CDECL *tgammaf)(float x); double (CDECL *trunc)(double x); float (CDECL *truncf)(float x); - double (CDECL *y0)(double num); double (CDECL *y1)(double num); double (CDECL *yn)(int order, double num); }; diff --git a/include/config.h.in b/include/config.h.in index 18368d52baf..a37ab5383ff 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1172,9 +1172,6 @@ /* Define if Xrandr has the XRRGetProviderResources function */ #undef HAVE_XRRGETPROVIDERRESOURCES -/* Define to 1 if you have the `y0' function. */ -#undef HAVE_Y0 - /* Define to 1 if you have the `y1' function. */ #undef HAVE_Y1

1 0

Hugh McMaster : reg/tests: Rework syntax tests for the 'copy' operation.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: 1ce21dbb5f2eed468c3748a2de1f25744e10e04c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ce21dbb5f2eed468c3748a2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 28 19:22:24 2021 +1000 reg/tests: Rework syntax tests for the 'copy' operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/copy.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index a8956d7e9a0..31223a3d314 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -18,15 +18,12 @@ #include "reg_test.h" -#define COPY_DEST KEY_WINE "\\reg_copy" +#define COPY_SRC KEY_WINE "\\reg_copy" -static void test_copy(void) +static void test_command_syntax(void) { DWORD r; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); - verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); - run_reg_exe("reg copy", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -63,37 +60,38 @@ static void test_copy(void) run_reg_exe("reg copy /f /s", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /f", &r); + run_reg_exe("reg copy HKCU\\" COPY_SRC " /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " foo /f", &r); + run_reg_exe("reg copy HKCU\\" COPY_SRC " foo /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg copy /f HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE, &r); + run_reg_exe("reg copy /f HKCU\\" COPY_SRC " HKCU\\" KEY_BASE, &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg copy /f HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST, &r); + run_reg_exe("reg copy HKCU\\" COPY_SRC " /f HKCU\\" KEY_BASE, &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /f HKEY_CURRENT_USER\\" COPY_DEST, &r); + run_reg_exe("reg copy HKCU\\" COPY_SRC " /s HKCU\\" KEY_BASE, &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " /s HKEY_CURRENT_USER\\" COPY_DEST, &r); + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /a", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST " /a", &r); + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /f /a", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" COPY_DEST " /f /a", &r); + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE, &r); + /* Source and destination keys are the same */ + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" COPY_SRC, &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE " /f", &r); + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" COPY_SRC " /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg copy HKEY_CURRENT_USER\\" KEY_BASE " HKEY_CURRENT_USER\\" KEY_BASE " /s /f", &r); + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" COPY_SRC " /s /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } @@ -106,5 +104,5 @@ START_TEST(copy) return; } - test_copy(); + test_command_syntax(); }

1 0

Piotr Caban : msvcrt: Import j0 implementation from musl.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: c739e2222355c0c937d9560ac31f68d546e41d4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c739e2222355c0c937d9560a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 28 19:34:17 2021 +0200 msvcrt: Import j0 implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 238 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 14 --- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 - 6 files changed, 235 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c739e2222355c0c937d9…

1 0

Paul Gofman : kernel32: Add stub for SetThreadSelectedCpuSets().
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: 96abde9eac97dc0fa5ff6ec8176e51cc3673fb44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96abde9eac97dc0fa5ff6ec8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 28 20:01:45 2021 +0300 kernel32: Add stub for SetThreadSelectedCpuSets(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-3.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/memory.c | 11 +++++++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec index 8f2daaefe74..77893f24225 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec @@ -7,4 +7,4 @@ @ stub SetProcessInformation @ stdcall SetThreadDescription(ptr wstr) kernel32.SetThreadDescription @ stdcall SetThreadIdealProcessor(long long) kernel32.SetThreadIdealProcessor -@ stub SetThreadSelectedCpuSets +@ stdcall SetThreadSelectedCpuSets(ptr ptr long) kernel32.SetThreadSelectedCpuSets diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 6948ba45fce..87e67d3743d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1471,6 +1471,7 @@ @ stdcall -import SetThreadPreferredUILanguages(long ptr ptr) @ stdcall -import SetThreadPriority(long long) @ stdcall -import SetThreadPriorityBoost(long long) +@ stdcall -import SetThreadSelectedCpuSets(ptr ptr long) @ stdcall -import SetThreadStackGuarantee(ptr) # @ stub SetThreadToken @ stdcall -import SetThreadUILanguage(long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 28cfd842223..9a66c5c2ac0 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1494,7 +1494,7 @@ @ stdcall SetThreadPreferredUILanguages(long ptr ptr) @ stdcall SetThreadPriority(long long) @ stdcall SetThreadPriorityBoost(long long) -# @ stub SetThreadSelectedCpuSets +@ stdcall SetThreadSelectedCpuSets(ptr ptr long) @ stdcall SetThreadStackGuarantee(ptr) @ stdcall SetThreadToken(ptr ptr) @ stdcall SetThreadUILanguage(long) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 4b71c0cc6ec..fb5f5100399 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -1168,6 +1168,17 @@ BOOL WINAPI GetSystemCpuSetInformation(SYSTEM_CPU_SET_INFORMATION *info, ULONG b } +/*********************************************************************** + * SetThreadSelectedCpuSets (kernelbase.@) + */ +BOOL WINAPI SetThreadSelectedCpuSets(HANDLE thread, const ULONG *cpu_set_ids, ULONG count) +{ + FIXME( "thread %p, cpu_set_ids %p, count %u stub.\n", thread, cpu_set_ids, count ); + + return TRUE; +} + + /********************************************************************** * GetNumaHighestNodeNumber (kernelbase.@) */

1 0

Hugh McMaster : reg/tests: Verify that only the (Default) value is overwritten when neither /v nor /ve is specified.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: 8203c5db0248d38f06af55411ac4f4c89976fad2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8203c5db0248d38f06af5541… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 28 21:52:18 2021 +1000 reg/tests: Verify that only the (Default) value is overwritten when neither /v nor /ve is specified. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 6973eefd892..fdd09c885bc 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -384,6 +384,15 @@ static void test_add(void) verify_reg(hkey, "Test2", REG_DWORD, &dword, sizeof(dword), 0); todo_wine verify_reg(hkey, NULL, REG_SZ, "", 1, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_NONE /d Test /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + verify_key(HKEY_CURRENT_USER, KEY_BASE); + verify_key(hkey, "Subkey"); + verify_reg(hkey, "Test1", REG_SZ, "Value1", 7, 0); + verify_reg(hkey, "Test2", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, NULL, REG_NONE, "T\0e\0s\0t\0\0", 10, 0); + close_key(hkey); delete_tree(HKEY_CURRENT_USER, KEY_BASE); }

1 0

Hugh McMaster : reg: Don't enumerate a registry key for subkeys if we know the key does not have subkeys.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: 33cfc644a055a9bc88253ae8d8c824ad603e7a02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33cfc644a055a9bc88253ae8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 28 19:19:32 2021 +1000 reg: Don't enumerate a registry key for subkeys if we know the key does not have subkeys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/query.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/programs/reg/query.c b/programs/reg/query.c index 66e54548688..7e42719faf9 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -213,7 +213,7 @@ static int query_value(HKEY hkey, WCHAR *value_name, WCHAR *path, BOOL recurse) static int query_all(HKEY hkey, WCHAR *path, BOOL recurse, BOOL recursing) { LONG rc; - DWORD num_values; + DWORD num_subkeys, num_values; DWORD max_value_len = 256, value_len; DWORD max_data_bytes = 2048, data_size; DWORD subkey_len; @@ -222,8 +222,8 @@ static int query_all(HKEY hkey, WCHAR *path, BOOL recurse, BOOL recursing) BYTE *data; HKEY subkey; - rc = RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, - &num_values, NULL, NULL, NULL, NULL); + rc = RegQueryInfoKeyW(hkey, NULL, NULL, NULL, &num_subkeys, NULL, + NULL, &num_values, NULL, NULL, NULL, NULL); if (rc) return 1; if (num_values || recursing) @@ -265,6 +265,9 @@ static int query_all(HKEY hkey, WCHAR *path, BOOL recurse, BOOL recursing) if (i || recursing) output_string(newlineW); + if (!num_subkeys) + return 0; + subkey_name = malloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); path_len = lstrlenW(path);

1 0

Alexandre Julliard : ntdll: Check all supported architectures in is_builtin_path().
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: 620c0818bfa4554ee6d44ec2433c25ece598746b URL: https://source.winehq.org/git/wine.git/?a=commit;h=620c0818bfa4554ee6d44ec2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 28 10:03:04 2021 +0200 ntdll: Check all supported architectures in is_builtin_path(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 72 +++++++++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 26 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index e6a6cd26779..154ab9a5234 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1434,39 +1434,59 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, } +/*************************************************************************** + * get_machine_wow64_dir + * + * cf. GetSystemWow64Directory2. + */ +const WCHAR *get_machine_wow64_dir( WORD machine ) +{ + static const WCHAR system32[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2','\\',0}; + static const WCHAR syswow64[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','w','o','w','6','4','\\',0}; + static const WCHAR sysarm32[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','a','r','m','3','2','\\',0}; + static const WCHAR sysx8664[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','x','8','6','6','4','\\',0}; + static const WCHAR sysarm64[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','a','r','m','6','4','\\',0}; + + if (machine == supported_machines[0]) machine = IMAGE_FILE_MACHINE_TARGET_HOST; + + switch (machine) + { + case IMAGE_FILE_MACHINE_TARGET_HOST: return system32; + case IMAGE_FILE_MACHINE_I386: return syswow64; + case IMAGE_FILE_MACHINE_ARMNT: return sysarm32; + case IMAGE_FILE_MACHINE_AMD64: return sysx8664; + case IMAGE_FILE_MACHINE_ARM64: return sysarm64; + default: return NULL; + } +} + + /*************************************************************************** * is_builtin_path + * + * Check if path is inside a system directory, to support loading builtins + * when the corresponding file doesn't exist yet. */ BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ) { - static const WCHAR wow64W[] = {'\\','?','?','\\','c',':','\\','w','i','n','d','o','w','s','\\', - 's','y','s','w','o','w','6','4'}; - unsigned int len; + unsigned int i, len = path->Length / sizeof(WCHAR), dirlen; + const WCHAR *sysdir, *p = path->Buffer; /* only fake builtin existence during prefix bootstrap */ if (!is_prefix_bootstrap) return FALSE; - *machine = current_machine; - if (path->Length > wcslen(system_dir) * sizeof(WCHAR) && - !wcsnicmp( path->Buffer, system_dir, wcslen(system_dir) )) + for (i = 0; i < supported_machines_count; i++) { - if (is_wow64) *machine = IMAGE_FILE_MACHINE_AMD64; - goto found; - } - if ((is_win64 || is_wow64) && path->Length > sizeof(wow64W) && - !wcsnicmp( path->Buffer, wow64W, ARRAY_SIZE(wow64W) )) - { - *machine = IMAGE_FILE_MACHINE_I386; - goto found; + sysdir = get_machine_wow64_dir( supported_machines[i] ); + dirlen = wcslen( sysdir ); + if (len <= dirlen) continue; + if (wcsnicmp( p, sysdir, dirlen )) continue; + /* check for remaining path components */ + for (p += dirlen, len -= dirlen; len; p++, len--) if (*p == '\\') return FALSE; + *machine = supported_machines[i]; + return TRUE; } return FALSE; - -found: - /* check that there are no other path components */ - len = wcslen(system_dir); - while (len < path->Length / sizeof(WCHAR) && path->Buffer[len] == '\\') len++; - while (len < path->Length / sizeof(WCHAR) && path->Buffer[len] != '\\') len++; - return (len == path->Length / sizeof(WCHAR)); } @@ -1585,15 +1605,15 @@ failed: */ NTSTATUS load_start_exe( WCHAR **image, void **module ) { - static const WCHAR startW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', - 's','y','s','t','e','m','3','2','\\','s','t','a','r','t','.','e','x','e',0}; - static const WCHAR startwow64W[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', - 's','y','s','w','o','w','6','4','\\','s','t','a','r','t','.','e','x','e',0}; + static const WCHAR startW[] = {'s','t','a','r','t','.','e','x','e',0}; + WCHAR buffer[sizeof("\\??\\C:\\windows\\system32\\start.exe")]; UNICODE_STRING nt_name; NTSTATUS status; SIZE_T size; - init_unicode_string( &nt_name, is_wow64 ? startwow64W : startW ); + wcscpy( buffer, get_machine_wow64_dir( current_machine )); + wcscat( buffer, startW ); + init_unicode_string( &nt_name, buffer ); status = find_builtin_dll( &nt_name, module, &size, &main_image_info, current_machine, FALSE ); if (status) {

1 0

Alexandre Julliard : makefiles: Install Unix binaries into an architecture-specific directory.
by Alexandre Julliard April 28, 2021

April 28, 2021

Module: wine Branch: master Commit: 2801d6341cda4f52fcc362da4629c576b859fbb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2801d6341cda4f52fcc362da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 28 11:40:39 2021 +0200 makefiles: Install Unix binaries into an architecture-specific directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 33 ++++++++++++++++++++++++++++----- loader/main.c | 18 +++++++++++++++--- tools/makedep.c | 19 +++++++++++-------- 3 files changed, 54 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 154ab9a5234..a575fb21b76 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -91,6 +91,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(module); +#ifdef __i386__ +static const char so_dir[] = "/i386-unix"; +#elif defined(__x86_64__) +static const char so_dir[] = "/x86_64-unix"; +#elif defined(__arm__) +static const char so_dir[] = "/arm-unix"; +#elif defined(__aarch64__) +static const char so_dir[] = "/aarch64-unix"; +#else +static const char so_dir[] = ""; +#endif + void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) = NULL; NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) = NULL; void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) = NULL; @@ -114,6 +126,7 @@ static const BOOL use_preloader = FALSE; static char *argv0; static const char *bin_dir; static const char *dll_dir; +static const char *ntdll_dir; static SIZE_T dll_path_maxlen; static int *p___wine_main_argc; static char ***p___wine_main_argv; @@ -331,11 +344,12 @@ static void init_paths( char *argv[] ) argv0 = strdup( argv[0] ); - if (!dladdr( init_paths, &info ) || !(dll_dir = realpath_dirname( info.dli_fname ))) + if (!dladdr( init_paths, &info ) || !(ntdll_dir = realpath_dirname( info.dli_fname ))) fatal_error( "cannot get path to ntdll.so\n" ); - if (!(build_dir = remove_tail( dll_dir, "/dlls/ntdll" ))) + if (!(build_dir = remove_tail( ntdll_dir, "/dlls/ntdll" ))) { + if (!(dll_dir = remove_tail( ntdll_dir, so_dir ))) dll_dir = ntdll_dir; #if (defined(__linux__) && !defined(__ANDROID__)) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) bin_dir = realpath_dirname( "/proc/self/exe" ); #elif defined (__FreeBSD__) || defined(__DragonFly__) @@ -1349,6 +1363,14 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T ptr = prepend( ptr, dll_paths[i], strlen(dll_paths[i]) ); status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); /* use so dir for unix lib */ + ptr = file + pos; + ptr = prepend( ptr, so_dir, strlen(so_dir) ); + ptr = prepend( ptr, dll_paths[i], strlen(dll_paths[i]) ); + if (status != STATUS_DLL_NOT_FOUND) goto done; + strcpy( file + pos + len + 1, ".so" ); + status = open_builtin_so_file( ptr, &attr, module, image_info, prefer_native ); + if (status != STATUS_DLL_NOT_FOUND) goto done; + file[pos + len + 1] = 0; ptr = prepend( file + pos, dll_paths[i], strlen(dll_paths[i]) ); if (status != STATUS_DLL_NOT_FOUND) goto done; status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); @@ -1725,12 +1747,13 @@ static void load_ntdll(void) init_unicode_string( &str, path ); InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); - name = malloc( strlen( dll_dir ) + strlen( pe_dir ) + sizeof("/ntdll.dll.so") ); - sprintf( name, "%s%s/ntdll.dll", dll_dir, build_dir ? "" : pe_dir ); + name = malloc( strlen( ntdll_dir ) + strlen( pe_dir ) + sizeof("/ntdll.dll.so") ); + if (build_dir) sprintf( name, "%s/ntdll.dll", ntdll_dir ); + else sprintf( name, "%s%s/ntdll.dll", dll_dir, pe_dir ); status = open_builtin_pe_file( name, &attr, &module, &size, &info, current_machine, FALSE ); if (status == STATUS_DLL_NOT_FOUND) { - sprintf( name, "%s/ntdll.dll.so", dll_dir ); + sprintf( name, "%s/ntdll.dll.so", ntdll_dir ); status = open_builtin_so_file( name, &attr, &module, &info, FALSE ); } if (status == STATUS_IMAGE_NOT_AT_BASE) relocate_ntdll( module ); diff --git a/loader/main.c b/loader/main.c index fb40e90f977..86c2b28263e 100644 --- a/loader/main.c +++ b/loader/main.c @@ -112,6 +112,17 @@ static void *try_dlopen( const char *dir, const char *name ) static void *load_ntdll( char *argv0 ) { +#ifdef __i386__ +#define SO_DIR "i386-unix/" +#elif defined(__x86_64__) +#define SO_DIR "x86_64-unix/" +#elif defined(__arm__) +#define SO_DIR "arm-unix/" +#elif defined(__aarch64__) +#define SO_DIR "aarch64-unix/" +#else +#define SO_DIR "" +#endif const char *self = get_self_exe( argv0 ); char *path, *p; void *handle = NULL; @@ -123,7 +134,7 @@ static void *load_ntdll( char *argv0 ) handle = try_dlopen( p, "dlls/ntdll/ntdll.so" ); free( p ); } - else handle = try_dlopen( path, BIN_TO_DLLDIR "/ntdll.so" ); + else handle = try_dlopen( path, BIN_TO_DLLDIR "/" SO_DIR "ntdll.so" ); free( path ); } @@ -132,13 +143,14 @@ static void *load_ntdll( char *argv0 ) path = strdup( path ); for (p = strtok( path, ":" ); p; p = strtok( NULL, ":" )) { - handle = try_dlopen( p, "ntdll.so" ); + handle = try_dlopen( p, SO_DIR "ntdll.so" ); + if (!handle) handle = try_dlopen( p, "ntdll.so" ); if (handle) break; } free( path ); } - if (!handle && !self) handle = try_dlopen( DLLDIR, "ntdll.so" ); + if (!handle && !self) handle = try_dlopen( DLLDIR, SO_DIR "ntdll.so" ); return handle; } diff --git a/tools/makedep.c b/tools/makedep.c index 0092f22b3b0..638af2b6a44 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -159,6 +159,7 @@ static const char *dll_ext; static const char *man_ext; static const char *arch; static const char *pe_dir; +static const char *so_dir; static const char *crosstarget; static const char *crossdebug; static const char *fontforge; @@ -2613,7 +2614,7 @@ static int cmp_string_length( const char **a, const char **b ) static void output_uninstall_rules( struct makefile *make ) { static const char *dirs_order[] = - { "$(includedir)", "$(mandir)", "$(fontdir)", "$(datadir)", "$(dlldir)" }; + { "$(includedir)", "$(mandir)", "$(fontdir)", "$(nlsdir)", "$(datadir)", "$(dlldir)" }; struct strarray uninstall_dirs = empty_strarray; unsigned int i, j; @@ -3313,7 +3314,7 @@ static void output_module( struct makefile *make ) strarray_add( &make->all_targets, strmake( "%s%s", make->module, dll_ext )); strarray_add( &make->all_targets, strmake( "%s.fake", make->module )); add_install_rule( make, make->module, strmake( "%s%s", make->module, dll_ext ), - strmake( "p$(dlldir)/%s%s", make->module, dll_ext )); + strmake( "p%s/%s%s", so_dir, make->module, dll_ext )); add_install_rule( make, make->module, strmake( "%s.fake", make->module ), strmake( "d%s/%s", pe_dir, make->module )); output( "%s%s %s.fake:", module_path, dll_ext, module_path ); @@ -3368,7 +3369,7 @@ static void output_module( struct makefile *make ) strarray_addall( &unix_libs, add_unix_libraries( make, &unix_deps )); strarray_add( &make->all_targets, unix_lib ); - add_install_rule( make, make->module, unix_lib, strmake( "p$(dlldir)/%s", unix_lib )); + add_install_rule( make, make->module, unix_lib, strmake( "p%s/%s", so_dir, unix_lib )); output( "%s:", obj_dir_path( make, unix_lib )); if (spec_file) output_filename( spec_file ); output_filenames_obj_dir( make, make->unixobj_files ); @@ -3402,7 +3403,7 @@ static void output_module( struct makefile *make ) output( "\n" ); add_install_rule( make, make->importlib, strmake( "lib%s.def", make->importlib ), - strmake( "d$(dlldir)/lib%s.def", make->importlib )); + strmake( "d%s/lib%s.def", so_dir, make->importlib )); } else { @@ -3424,7 +3425,7 @@ static void output_module( struct makefile *make ) output( "\n" ); add_install_rule( make, make->importlib, strmake( "lib%s.a", make->importlib ), - strmake( "d$(dlldir)/lib%s.a", make->importlib )); + strmake( "d%s/lib%s.a", so_dir, make->importlib )); } if (crosstarget) { @@ -3478,8 +3479,7 @@ static void output_static_lib( struct makefile *make ) output_filenames_obj_dir( make, make->object_files ); output_filenames_obj_dir( make, make->unixobj_files ); output( " && %s $@\n", ranlib ); - add_install_rule( make, make->staticlib, make->staticlib, - strmake( "d$(dlldir)/%s", make->staticlib )); + add_install_rule( make, make->staticlib, make->staticlib, strmake( "d%s/%s", so_dir, make->staticlib )); if (crosstarget && make->module) { char *name = replace_extension( make->staticlib, ".a", ".cross.a" ); @@ -4428,9 +4428,12 @@ int main( int argc, char *argv[] ) if (!tools_ext) tools_ext = ""; if (!man_ext) man_ext = "3w"; if (arch) + { + so_dir = strmake( "$(dlldir)/%s-unix", arch ); pe_dir = strmake( "$(dlldir)/%s-windows", arch ); + } else - pe_dir = "$(dlldir)"; + so_dir = pe_dir = "$(dlldir)"; top_makefile->src_dir = root_src_dir; subdirs = get_expanded_make_var_array( top_makefile, "SUBDIRS" );

1 0