Merge branch 'main' of https://github.com/nanoframework/nf-interpreter into develop

Author: josesimoes

src/CLR/CorLib/corlib_native_System_Guid.cpp

@@ -3,13 +3,8 @@
 // Portions Copyright (c) Microsoft Corporation.  All rights reserved.
 // See LICENSE file in the project root for full license information.
 //
-#include "CorLib.h"
 
-//
-//  Generate a new GUID
-//
-//  Based on the version 4 GUID (random)
-//  http://guid.one/guid/make
+#include "CorLib.h"
 
 HRESULT Library_corlib_native_System_Guid::GenerateNewGuid___STATIC__SZARRAY_U1(CLR_RT_StackFrame &stack)
 {
@@ -20,14 +15,19 @@ HRESULT Library_corlib_native_System_Guid::GenerateNewGuid___STATIC__SZARRAY_U1(
     CLR_RT_HeapBlock &top = stack.PushValueAndClear();
 
     // Create a array of 16 bytes on top of stack to return
-    NANOCLR_CHECK_HRESULT(CLR_RT_HeapBlock_Array::CreateInstance(top, 16, g_CLR_RT_WellKnownTypes.UInt8));
+    NANOCLR_CHECK_HRESULT(CLR_RT_HeapBlock_Array::CreateInstance(top, 16, g_CLR_RT_WellKnownTypes.m_UInt8));
     buf = top.DereferenceArray()->GetFirstElement();
 
     rand.Initialize();
-    rand.NextBytes(buf, 16); // fill with random numbers
 
-    buf[7] = (buf[7] & 0x0f) | 0x40; // Set verion
-    buf[9] = (buf[7] & 0x3f) | 0x80; // Set variant
+    // Generate 16 random bytes for the GUID
+    rand.NextBytes(buf, 16);
+
+    // Set the version (version 4, bits 12-15 of time_hi_and_version)
+    buf[7] = (buf[7] & 0x0F) | 0x40;
+
+    // Set the variant (the two most significant bits of clock_seq_hi_and_reserved must be 10)
+    buf[8] = (buf[8] & 0x3F) | 0x80;
 
     NANOCLR_NOCLEANUP();
 }

src/CLR/Debugger/Debugger.cpp

@@ -999,11 +999,11 @@ bool CLR_DBG_Debugger::Monitor_WriteMemory(WP_Message *msg)
     NATIVE_PROFILE_CLR_DEBUGGER();
 
     auto *cmd = (CLR_DBG_Commands_Monitor_WriteMemory *)msg->m_payload;
-    CLR_DBG_Commands_Monitor_WriteMemory_Reply cmdReply;
+    CLR_DBG_Commands_Monitor_WriteMemory_Reply errorCode = AccessMemoryErrorCode_NoError;
 
-    g_CLR_DBG_Debugger->AccessMemory(cmd->address, cmd->length, cmd->data, AccessMemory_Write, &cmdReply);
+    g_CLR_DBG_Debugger->AccessMemory(cmd->address, cmd->length, cmd->data, AccessMemory_Write, &errorCode);
 
-    WP_ReplyToCommand(msg, true, false, &cmdReply, sizeof(cmdReply));
+    WP_ReplyToCommand(msg, errorCode == AccessMemoryErrorCode_NoError, false, &errorCode, sizeof(errorCode));
 
     return true;
 }
@@ -1013,13 +1013,12 @@ bool CLR_DBG_Debugger::Monitor_CheckMemory(WP_Message *msg)
     NATIVE_PROFILE_CLR_DEBUGGER();
 
     auto *cmd = (CLR_DBG_Commands_Monitor_CheckMemory *)msg->m_payload;
-    CLR_DBG_Commands_Monitor_CheckMemory_Reply cmdReply;
-    uint32_t errorCode;
+    CLR_DBG_Commands_Monitor_CheckMemory_Reply errorCode = AccessMemoryErrorCode_NoError;
 
     g_CLR_DBG_Debugger
-        ->AccessMemory(cmd->address, cmd->length, (unsigned char *)&cmdReply, AccessMemory_Check, &errorCode);
+        ->AccessMemory(cmd->address, cmd->length, (unsigned char *)&errorCode, AccessMemory_Check, &errorCode);
 
-    WP_ReplyToCommand(msg, errorCode == AccessMemoryErrorCode_NoError, false, &cmdReply, sizeof(cmdReply));
+    WP_ReplyToCommand(msg, errorCode == AccessMemoryErrorCode_NoError, false, &errorCode, sizeof(errorCode));
 
     return true;
 }
@@ -1029,11 +1028,11 @@ bool CLR_DBG_Debugger::Monitor_EraseMemory(WP_Message *msg)
     NATIVE_PROFILE_CLR_DEBUGGER();
 
     auto *cmd = (CLR_DBG_Commands_Monitor_EraseMemory *)msg->m_payload;
-    CLR_DBG_Commands_Monitor_EraseMemory_Reply cmdReply;
+    CLR_DBG_Commands_Monitor_EraseMemory_Reply errorCode = AccessMemoryErrorCode_NoError;
 
-    g_CLR_DBG_Debugger->AccessMemory(cmd->address, cmd->length, nullptr, AccessMemory_Erase, &cmdReply);
+    g_CLR_DBG_Debugger->AccessMemory(cmd->address, cmd->length, nullptr, AccessMemory_Erase, &errorCode);
 
-    WP_ReplyToCommand(msg, true, false, &cmdReply, sizeof(cmdReply));
+    WP_ReplyToCommand(msg, errorCode == AccessMemoryErrorCode_NoError, false, &errorCode, sizeof(errorCode));
 
     return true;
 }