Merge remote-tracking branch 'origin/master'

Author: Oldes

make/Rebol3.xcworkspace/contents.xcworkspacedata

@@ -50,6 +50,24 @@
 	req = Use_Port_State(port, RDI_CLIPBOARD, sizeof(REBREQ));
 
 	switch (action) {
+	case A_UPDATE:
+		// Update the port object after a READ or WRITE operation.
+		// This is normally called by the WAKE-UP function.
+		arg = OFV(port, STD_PORT_DATA);
+		if (req->command == RDC_READ) {
+			len = req->actual;
+			if (GET_FLAG(req->flags, RRF_WIDE)) {
+				len /= sizeof(REBUNI); //correct length
+				// Copy the string (convert to latin-8 if it fits):
+				Set_Binary(arg, Copy_Wide_Str(req->data, len));
+			} else {
+				Set_Binary(arg, Copy_OS_Str(req->data, len));
+			}
+		}
+		else if (req->command == RDC_WRITE) {
+			SET_NONE(arg);  // Write is done.
+		}
+		return R_NONE;
 
 	case A_READ:
 		// This device is opened on the READ:
@@ -63,13 +81,15 @@
 
 		// Copy and set the string result:
 		arg = OFV(port, STD_PORT_DATA);
-
-		// If wide, correct length:
+		
 		len = req->actual;
-		if (GET_FLAG(req->flags, RRF_WIDE)) len /= sizeof(REBUNI);
-
-		// Copy the string (convert to latin-8 if it fits):
-		Set_String(arg, Copy_OS_Str(req->data, len));
+		if (GET_FLAG(req->flags, RRF_WIDE)) {
+			len /= sizeof(REBUNI); //correct length
+			// Copy the string (convert to latin-8 if it fits):
+			Set_String(arg, Copy_Wide_Str(req->data, len));
+		} else {
+			Set_String(arg, Copy_OS_Str(req->data, len));
+		}
 
 		OS_FREE(req->data); // release the copy buffer
 		req->data = 0;

make/Rebol3.xcworkspace/xcuserdata/oldes.xcuserdatad/UserInterfaceState.xcuserstate

@@ -113,21 +113,14 @@
 
 /***********************************************************************
 **
-*/	REBSER *Copy_OS_Str(void *src, REBINT len)
+*/	REBSER *Copy_Wide_Str(void *src, REBINT len)
 /*
-**		Create a REBOL string series from an OS native string.
-**
-**		For example, in Win32 with the wide char interface, we must
-**		convert wide char strings, minimizing to bytes if possible.
-**
-**		For Linux the char string could be UTF-8, so that must be
-**		converted to REBOL Unicode or Latin byte strings.
-**
-***********************************************************************/
+**		Create a REBOL string series from a wide char string.
+**		Minimize to bytes if possible
+*/
 {
-#ifdef OS_WIDE_CHAR
 	REBSER *dst;
-	REBUNI *str = (REBUNI*)src;	
+	REBUNI *str = (REBUNI*)src;
 	if (Is_Wide(str, len)) {
 		REBUNI *up;
 		dst = Make_Unicode(len);
@@ -145,6 +138,24 @@
 		*bp = 0;
 	}
 	return dst;
+}
+
+/***********************************************************************
+**
+*/	REBSER *Copy_OS_Str(void *src, REBINT len)
+/*
+**		Create a REBOL string series from an OS native string.
+**
+**		For example, in Win32 with the wide char interface, we must
+**		convert wide char strings, minimizing to bytes if possible.
+**
+**		For Linux the char string could be UTF-8, so that must be
+**		converted to REBOL Unicode or Latin byte strings.
+**
+***********************************************************************/
+{
+#ifdef OS_WIDE_CHAR
+	return Copy_Wide_Str(src, len);
 #else
 	return Decode_UTF_String((REBYTE*)src, len, 8, FALSE);
 #endif