[PATCH 5/7] user32: Change slave to a more neutral word

[André Hentschel]

Signed-off-by: André Hentschel <nerv(a)dawncrow.de>
---
 dlls/user32/sysparams.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
index 82ed8513646..3094251cca9 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -3910,7 +3910,7 @@ static BOOL update_monitor_cache(void)
     HANDLE mutex = NULL;
     DWORD state_flags;
     BOOL ret = FALSE;
-    BOOL mirrored_slave;
+    BOOL mirrored_secondary;
     DWORD i = 0, j;
     DWORD type;
 
@@ -3956,17 +3956,17 @@ static BOOL update_monitor_cache(void)
                                         (BYTE *)&monitors[monitor_count].rcMonitor, sizeof(RECT), NULL, 0 ))
             goto fail;
 
-        /* Mirrored slave monitors also don't get enumerated */
-        mirrored_slave = FALSE;
+        /* Mirrored secondary monitors also don't get enumerated */
+        mirrored_secondary = FALSE;
         for (j = 0; j < monitor_count; j++)
         {
             if (EqualRect(&monitors[j].rcMonitor, &monitors[monitor_count].rcMonitor))
             {
-                mirrored_slave = TRUE;
+                mirrored_secondary = TRUE;
                 break;
             }
         }
-        if (mirrored_slave)
+        if (mirrored_secondary)
             continue;
 
         if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type,
-- 
2.17.1

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=73535

Your paranoid android.


=== debiant (32 bit Chinese:China report) ===

user32:
clipboard.c:1130: Test failed: OpenClipboard failed: 5
clipboard.c:1132: Test failed: WM_RENDERFORMAT received 000d, expected 0000
clipboard.c:1142: Test failed: WM_RENDERFORMAT received 0000
clipboard.c:1146: Test failed: didn't get data for CF_OEMTEXT
clipboard.c:1148: Test failed: WM_RENDERFORMAT received 0000
clipboard.c:1152: Test failed: sequence diff 0
clipboard.c:1155: Test failed: CloseClipboard failed: 1418
clipboard.c:1017: Test failed: wait failed
clipboard.c:1157: Test failed: WM_DRAWCLIPBOARD not received
clipboard.c:1157: Test failed: WM_CLIPBOARDUPDATE not received

=== debiant (64 bit WoW report) ===

user32:
clipboard.c:760: Test failed: 5: gle 5
clipboard.c:765: Test failed: 5.0: got 0000 instead of 0002
clipboard.c:805: Test failed: 5: gle 1418
clipboard.c:815: Test failed: 5: count 3
clipboard.c:818: Test failed: 5: gle 1418
clipboard.c:852: Test failed: 5: format 0002 got data 00070042
clipboard.c:853: Test failed: 5.0: formats 00000000 have been rendered
clipboard.c:858: Test failed: 5.0: formats 00000000 have been rendered
clipboard.c:852: Test failed: 5: format 0008 got data 00C0E480
clipboard.c:853: Test failed: 5.1: formats 00000000 have been rendered
clipboard.c:858: Test failed: 5.1: formats 00000000 have been rendered
clipboard.c:852: Test failed: 5: format 0011 got data 00C0E650
clipboard.c:853: Test failed: 5.2: formats 00000000 have been rendered
clipboard.c:858: Test failed: 5.2: formats 00000000 have been rendered
msg.c:15880: Test failed: OpenClipboard failed, err=5
msg.c:15880: Test failed: EmptyClipboard failed, err=1418
msg.c:15880: Test failed: CloseClipboard failed, err=1418

[Zhiyi Zhang]

On 6/16/20 9:35 PM, André Hentschel wrote:
> Signed-off-by: André Hentschel <nerv(a)dawncrow.de>
> ---
>  dlls/user32/sysparams.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
> index 82ed8513646..3094251cca9 100644
> --- a/dlls/user32/sysparams.c
> +++ b/dlls/user32/sysparams.c
> @@ -3910,7 +3910,7 @@ static BOOL update_monitor_cache(void)
>      HANDLE mutex = NULL;
>      DWORD state_flags;
>      BOOL ret = FALSE;
> -    BOOL mirrored_slave;
> +    BOOL mirrored_secondary;
>      DWORD i = 0, j;
>      DWORD type;
>
> @@ -3956,17 +3956,17 @@ static BOOL update_monitor_cache(void)
>                                          (BYTE *)&monitors[monitor_count].rcMonitor, sizeof(RECT), NULL, 0 ))
>              goto fail;
>
> -        /* Mirrored slave monitors also don't get enumerated */
> -        mirrored_slave = FALSE;
> +        /* Mirrored secondary monitors also don't get enumerated */
> +        mirrored_secondary = FALSE;
> Hi André,

Maybe it's my English. But the 'secondary' here is a bit confusing as it could mean secondary in all monitors,
not merely secondary in a mirroring set. I've sent a v2 using 'replica'. That should avoid the confusion.

Thanks,
Zhiyi
> for (j = 0; j < monitor_count; j++)
>          {
>              if (EqualRect(&monitors[j].rcMonitor, &monitors[monitor_count].rcMonitor))
>              {
> -                mirrored_slave = TRUE;
> +                mirrored_secondary = TRUE;
>                  break;
>              }
>          }
> -        if (mirrored_slave)
> +        if (mirrored_secondary)
>              continue;
>
> if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type,