[core,gcc] fix MONITOR_DEF read/write

coordinates are signed.

Author: akallabeth

libfreerdp/core/gcc.c

@@ -2138,18 +2138,13 @@ BOOL gcc_read_client_monitor_data(wStream* s, rdpMcs* mcs)
 
 	for (UINT32 index = 0; index < monitorCount; index++)
 	{
-		INT32 left = 0;
-		INT32 top = 0;
-		INT32 right = 0;
-		INT32 bottom = 0;
-		INT32 flags = 0;
 		rdpMonitor* current = &settings->MonitorDefArray[index];
 
-		Stream_Read_INT32(s, left);   /* left */
-		Stream_Read_INT32(s, top);    /* top */
-		Stream_Read_INT32(s, right);  /* right */
-		Stream_Read_INT32(s, bottom); /* bottom */
-		Stream_Read_INT32(s, flags);  /* flags */
+		const INT32 left = Stream_Get_INT32(s);    /* left */
+		const INT32 top = Stream_Get_INT32(s);     /* top */
+		const INT32 right = Stream_Get_INT32(s);   /* right */
+		const INT32 bottom = Stream_Get_INT32(s);  /* bottom */
+		const UINT32 flags = Stream_Get_UINT32(s); /* flags */
 		current->x = left;
 		current->y = top;
 		current->width = right - left + 1;
@@ -2205,19 +2200,19 @@ BOOL gcc_write_client_monitor_data(wStream* s, const rdpMcs* mcs)
 		for (UINT32 i = 0; i < settings->MonitorCount; i++)
 		{
 			const rdpMonitor* current = &settings->MonitorDefArray[i];
-			const UINT32 left = WINPR_ASSERTING_INT_CAST(uint32_t, current->x - baseX);
-			const UINT32 top = WINPR_ASSERTING_INT_CAST(uint32_t, current->y - baseY);
-			const UINT32 right = left + WINPR_ASSERTING_INT_CAST(uint32_t, current->width - 1);
-			const UINT32 bottom = top + WINPR_ASSERTING_INT_CAST(uint32_t, current->height - 1);
+			const INT32 left = current->x - baseX;
+			const INT32 top = current->y - baseY;
+			const INT32 right = left + current->width - 1;
+			const INT32 bottom = top + current->height - 1;
 			const UINT32 flags = current->is_primary ? MONITOR_PRIMARY : 0;
 			WLog_DBG(TAG,
-			         "Monitor[%" PRIu32 "]: top=%" PRIu32 ", left=%" PRIu32 ", bottom=%" PRIu32
-			         ", right=%" PRIu32 ", flags=%" PRIu32,
+			         "Monitor[%" PRIu32 "]: top=%" PRId32 ", left=%" PRId32 ", bottom=%" PRId32
+			         ", right=%" PRId32 ", flags=%" PRIu32,
 			         i, top, left, bottom, right, flags);
-			Stream_Write_UINT32(s, left);   /* left */
-			Stream_Write_UINT32(s, top);    /* top */
-			Stream_Write_UINT32(s, right);  /* right */
-			Stream_Write_UINT32(s, bottom); /* bottom */
+			Stream_Write_INT32(s, left);    /* left */
+			Stream_Write_INT32(s, top);     /* top */
+			Stream_Write_INT32(s, right);   /* right */
+			Stream_Write_INT32(s, bottom);  /* bottom */
 			Stream_Write_UINT32(s, flags);  /* flags */
 		}
 	}