[PATCH 1/3] winex11.drv: Change slave to a more neutral word

[André Hentschel]

Signed-off-by: André Hentschel 
---
 dlls/winex11.drv/xrandr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c
index f61a5b190e9..a42b3c274ca 100644
--- a/dlls/winex11.drv/xrandr.c
+++ b/dlls/winex11.drv/xrandr.c
@@ -946,7 +946,7 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new
         if (!output_info->crtc || !crtc_info->mode)
             detached = TRUE;

-        /* Ignore mirroring output slaves because mirrored monitors are under the same adapter */
+        /* Ignore mirroring output replicas because mirrored monitors are under the same adapter */
         mirrored = FALSE;
         if (!detached)
         {
@@ -968,7 +968,7 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new
                     continue;

/* Some outputs may have the same coordinates, aka mirrored. Choose the output with
-                 * the lowest value as primary and the rest will then be slaves in a mirroring set */
+                 * the lowest value as primary and the rest will then be replicas in a mirroring set */
                 if (crtc_info->x == enum_crtc_info->x &&
                     crtc_info->y == enum_crtc_info->y &&
                     crtc_info->width == enum_crtc_info->width &&
@@ -1077,7 +1077,7 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor *
             goto done;
     }

-    /* Inactive but attached monitor, no need to check for mirrored/slave monitors */
+    /* Inactive but attached monitor, no need to check for mirrored/replica monitors */
     if (!output_info->crtc || !crtc_info->mode)
     {
         lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW );

[PATCH 2/3] ntdll: Change master/slave to more neutral words

[André Hentschel]

see also: https://en.wikipedia.org/wiki/Parallel_ATA#Master_and_slave_clarification

Signed-off-by: André Hentschel 
---
 dlls/ntdll/unix/cdrom.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c
index a0e66a92a23..7dcbd10871b 100644
--- a/dlls/ntdll/unix/cdrom.c
+++ b/dlls/ntdll/unix/cdrom.c
@@ -2029,7 +2029,7 @@ static NTSTATUS CDROM_GetAddress(int fd, SCSI_ADDRESS* address)

address->PortNumber = portnum; /* primary=0 secondary=1 for ide */
     address->PathId = busid;       /* always 0 for ide */
-    address->TargetId = targetid;  /* master=0 slave=1 for ide */
+    address->TargetId = targetid;  /* "Device 0"=0 "Device 1"=1 for ide */
     address->Lun = lun;
     return STATUS_SUCCESS;
 }

[PATCH 3/3] comctl32: Clarify a comment

[André Hentschel]

Signed-off-by: André Hentschel 
---
 dlls/comctl32/comboex.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c
index c3c39be3058..61b63831361 100644
--- a/dlls/comctl32/comboex.c
+++ b/dlls/comctl32/comboex.c
@@ -1379,9 +1379,7 @@ static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT const *di
     } else {
    /* drawing combo/edit entry */
    if (IsWindowVisible(infoPtr->hwndEdit)) {
-	    /* if we have an edit control, the slave the
-             * selection state to the Edit focus state
-	     */
+	    /* if we have an edit control, set the selection state from the edit focus state */
        if (infoPtr->flags & WCBE_EDITFOCUSED)
    	drawstate = ILD_SELECTED;
    } else