wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Jeremy Newman : remove mailman password, recaptcha is in use
by Jeremy Newman 29 Apr '21

29 Apr '21

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: Import y0 implementation from musl.
by Alexandre Julliard 28 Apr '21

28 Apr '21

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

Piotr Caban : msvcrt: Import j0 implementation from musl.
by Alexandre Julliard 28 Apr '21

28 Apr '21

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

Piotr Caban : msvcrt: Fix typo in asin error handling.
by Alexandre Julliard 28 Apr '21

28 Apr '21

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

Paul Gofman : kernel32: Add stub for SetThreadSelectedCpuSets().
by Alexandre Julliard 28 Apr '21

28 Apr '21

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 28 Apr '21

28 Apr '21

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/tests: Rework syntax tests for the 'copy' operation.
by Alexandre Julliard 28 Apr '21

28 Apr '21

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

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

28 Apr '21

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

Hugh McMaster : reg: Print a new line when recursing and the current key has no registry values.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: 35ccb87a767394ea3054c8890ad7b245e431290d URL: https://source.winehq.org/git/wine.git/?a=commit;h=35ccb87a767394ea3054c889… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 28 19:19:31 2021 +1000 reg: Print a new line when recursing and the current key has no registry values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/query.c | 2 +- programs/reg/tests/query.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/reg/query.c b/programs/reg/query.c index 4af6c7f5449..66e54548688 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -262,7 +262,7 @@ static int query_all(HKEY hkey, WCHAR *path, BOOL recurse, BOOL recursing) free(data); free(value_name); - if (i || recurse) + if (i || recursing) output_string(newlineW); subkey_name = malloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index 4ccbab58cb8..76186794f5e 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -286,7 +286,7 @@ static void test_query(void) read_reg_output("reg query HKCU\\" KEY_BASE " /s", buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test8b, FALSE, TODO_REG_COMPARE); + compare_query(buf, test8b, FALSE, 0); delete_tree(HKEY_CURRENT_USER, KEY_BASE); }

1 0

Hugh McMaster : reg: Only print the name of the registry key if it contains values or we are recursing.
by Alexandre Julliard 28 Apr '21

28 Apr '21

Module: wine Branch: master Commit: ec0a799ea8884479d7b56b81fb9fdd106f1a751b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec0a799ea8884479d7b56b81… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 28 19:19:30 2021 +1000 reg: Only print the name of the registry key if it contains values or we are recursing. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/query.c | 14 ++++++++++---- programs/reg/tests/query.c | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/programs/reg/query.c b/programs/reg/query.c index efcd16f8ad5..4af6c7f5449 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -210,9 +210,10 @@ static int query_value(HKEY hkey, WCHAR *value_name, WCHAR *path, BOOL recurse) return 0; } -static int query_all(HKEY hkey, WCHAR *path, BOOL recurse) +static int query_all(HKEY hkey, WCHAR *path, BOOL recurse, BOOL recursing) { LONG rc; + DWORD num_values; DWORD max_value_len = 256, value_len; DWORD max_data_bytes = 2048, data_size; DWORD subkey_len; @@ -221,7 +222,12 @@ static int query_all(HKEY hkey, WCHAR *path, BOOL recurse) BYTE *data; HKEY subkey; - output_string(L"%1\n", path); + rc = RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, + &num_values, NULL, NULL, NULL, NULL); + if (rc) return 1; + + if (num_values || recursing) + output_string(L"%1\n", path); value_name = malloc(max_value_len * sizeof(WCHAR)); data = malloc(max_data_bytes); @@ -275,7 +281,7 @@ static int query_all(HKEY hkey, WCHAR *path, BOOL recurse) subkey_path = build_subkey_path(path, path_len, subkey_name, subkey_len); if (!RegOpenKeyExW(hkey, subkey_name, 0, KEY_READ, &subkey)) { - query_all(subkey, subkey_path, recurse); + query_all(subkey, subkey_path, recurse, TRUE); RegCloseKey(subkey); } free(subkey_path); @@ -311,7 +317,7 @@ static int run_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, output_message(STRING_MATCHES_FOUND, num_values_found); } else - ret = query_all(hkey, key_name, recurse); + ret = query_all(hkey, key_name, recurse, FALSE); RegCloseKey(hkey); diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index a8720da8da1..4ccbab58cb8 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -282,7 +282,7 @@ static void test_query(void) read_reg_output("reg query HKCU\\" KEY_BASE, buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - compare_query(buf, test8a, FALSE, TODO_REG_COMPARE); + compare_query(buf, test8a, FALSE, 0); read_reg_output("reg query HKCU\\" KEY_BASE " /s", buf, sizeof(buf), &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021