diff -crB ./dsc.original/LCM/codec/mof/parser/types.c ./dsc/LCM/codec/mof/parser/types.c
*** ./dsc.original/LCM/codec/mof/parser/types.c	Fri May 16 14:16:46 2014
--- ./dsc/LCM/codec/mof/parser/types.c	Mon Jan 19 21:41:06 2015
***************
*** 3217,3223 ****
          /* Set NULL flag to property */
          if (!(pd->flags & MI_FLAG_NULL) && !pd->value)
          {
!             pd->flags |= MI_FLAG_NULL;
          }
  
          /* See if the property is already in the list */
--- 3217,3224 ----
          /* Set NULL flag to property */
          if (!(pd->flags & MI_FLAG_NULL) && !pd->value)
          {
!             //Commenting for Array's issue suggestted by MSFT - DELL
!             //pd->flags |= MI_FLAG_NULL;
          }
  
          /* See if the property is already in the list */
Only in ./dsc/LCM/codec/mof/parser: types.c.orig
diff -crB ./dsc.original/LCM/codec/mof/parser/utility.c ./dsc/LCM/codec/mof/parser/utility.c
*** ./dsc.original/LCM/codec/mof/parser/utility.c	Fri May 16 14:16:46 2014
--- ./dsc/LCM/codec/mof/parser/utility.c	Mon Jan 19 21:44:26 2015
***************
*** 558,563 ****
--- 558,564 ----
  MI_Result mof_setupbuffer(void * data, size_t nBytes, Batch *batch, MOF_Buffer * b)
  {
      MOF_ENCODING_TYPE e = ANSI;
+     unsigned char *tPtr;
      unsigned char *p = (unsigned char *)data;
      memset(b, 0, sizeof(MOF_Buffer));
  
***************
*** 647,654 ****
              if( *nullPointer != '\0' )
                  return MI_RESULT_NOT_SUPPORTED;
              
!             p[xCount] = (unsigned char) tempBuf[xCount];
!             nullPointer +=2;
          }
          b->e.u = MI_FALSE;
          b->e.o = 0;
--- 648,656 ----
              if( *nullPointer != '\0' )
                  return MI_RESULT_NOT_SUPPORTED;
              
!             tPtr = (unsigned char *) (unsigned short *)&tempBuf[xCount];
!             p[xCount] = tPtr[0];
!             nullPointer +=2;
          }
          b->e.u = MI_FALSE;
          b->e.o = 0;
diff -crB ./dsc.original/LCM/config.mak ./dsc/LCM/config.mak
*** ./dsc.original/LCM/config.mak	Fri May 16 14:16:46 2014
--- ./dsc/LCM/config.mak	Mon Jan 19 21:41:06 2015
***************
*** 1,4 ****
! OMI = $(TOP)/../omi-1.0.8
  OUTPUTDIR = $(OMI)/output
  
  include $(OMI)/config.mak
--- 1,4 ----
! OMI = $(TOP)/../../omi-1.0.8
  OUTPUTDIR = $(OMI)/output
  
  include $(OMI)/config.mak
Only in ./dsc/LCM: config.mak.orig
diff -crB ./dsc.original/LCM/dsc/common/inc/OMI_Error.h ./dsc/LCM/dsc/common/inc/OMI_Error.h
*** ./dsc.original/LCM/dsc/common/inc/OMI_Error.h	Fri May 16 14:16:46 2014
--- ./dsc/LCM/dsc/common/inc/OMI_Error.h	Mon Jan 19 21:41:06 2015
***************
*** 45,50 ****
--- 45,51 ----
      MI_ConstUint32Field error_Code;
      MI_ConstStringField error_Type;
      MI_ConstUint16Field error_Category;
+     MI_ConstStringField OMI_ErrorMessage;
  }
  OMI_Error;
  
Only in ./dsc/LCM/dsc/common/inc: OMI_Error.h.orig
diff -crB ./dsc.original/LCM/dsc/engine/ConfigurationManager/LocalConfigManagerHelper.c ./dsc/LCM/dsc/engine/ConfigurationManager/LocalConfigManagerHelper.c
*** ./dsc.original/LCM/dsc/engine/ConfigurationManager/LocalConfigManagerHelper.c	Fri May 16 14:16:46 2014
--- ./dsc/LCM/dsc/engine/ConfigurationManager/LocalConfigManagerHelper.c	Mon Jan 19 21:41:06 2015
***************
*** 1779,1785 ****
      {
          //first 4 bytes doest not contain the size of the buffer. only possibility is the call is from WMIDCOM protocol
          // and buffer doesn't contain the size.
!         *bufferIndex = 0;
          return;
      }
  }
--- 1779,1785 ----
      {
          //first 4 bytes doest not contain the size of the buffer. only possibility is the call is from WMIDCOM protocol
          // and buffer doesn't contain the size.
!         *bufferIndex = 4;
          return;
      }
  }
Only in ./dsc/LCM/dsc/engine/ConfigurationManager: LocalConfigManagerHelper.c.orig
diff -crB ./dsc.original/LCM/dsc/engine/ConfigurationManager/OMI_LocalConfigManagerHelper.c ./dsc/LCM/dsc/engine/ConfigurationManager/OMI_LocalConfigManagerHelper.c
*** ./dsc.original/LCM/dsc/engine/ConfigurationManager/OMI_LocalConfigManagerHelper.c	Fri May 16 14:16:46 2014
--- ./dsc/LCM/dsc/engine/ConfigurationManager/OMI_LocalConfigManagerHelper.c	Mon Jan 19 21:41:06 2015
***************
*** 212,218 ****
  
  	do {
  		ch = fgetc(stream);
! 		if (ch == EOF)
  			break;
  		if (length + 1 >= allocated)
  		{
--- 212,218 ----
  
  	do {
  		ch = fgetc(stream);
! 		if (ch == (char)EOF)
  			break;
  		if (length + 1 >= allocated)
  		{
Only in ./dsc/LCM/dsc/engine/ConfigurationManager: OMI_LocalConfigManagerHelper.c.orig
diff -crB ./dsc.original/LCM/dsc/engine/ConfigurationManager/omi_schema.c ./dsc/LCM/dsc/engine/ConfigurationManager/omi_schema.c
*** ./dsc.original/LCM/dsc/engine/ConfigurationManager/omi_schema.c	Fri May 16 14:16:46 2014
--- ./dsc/LCM/dsc/engine/ConfigurationManager/omi_schema.c	Mon Jan 19 21:41:06 2015
***************
*** 4977,4983 ****
      MI_T("OMI_Error"), /* propagator */
      NULL,
  };
! 
  static MI_PropertyDecl MI_CONST* MI_CONST OMI_Error_props[] =
  {
      &CIM_Error_ErrorType_prop,
--- 4977,4997 ----
      MI_T("OMI_Error"), /* propagator */
      NULL,
  };
! static MI_CONST MI_PropertyDecl OMI_Error_OMI_ErrorMessage_prop =
! {
!     MI_FLAG_PROPERTY, /* flags */
!     0x006F6510, /* code */
!     MI_T("OMI_ErrorMessage"), /* name */
!     NULL, /* qualifiers */
!     0, /* numQualifiers */
!     MI_STRING, /* type */
!     NULL, /* className */
!     0, /* subscript */
!     offsetof(OMI_Error, OMI_ErrorMessage), /* offset */
!     MI_T("OMI_Error"), /* origin */
!     MI_T("OMI_Error"), /* propagator */
!     NULL,
! };
  static MI_PropertyDecl MI_CONST* MI_CONST OMI_Error_props[] =
  {
      &CIM_Error_ErrorType_prop,
***************
*** 4998,5003 ****
--- 5012,5018 ----
      &OMI_Error_error_Code_prop,
      &OMI_Error_error_Type_prop,
      &OMI_Error_error_Category_prop,
+     &OMI_Error_OMI_ErrorMessage_prop,
  };
  
  static MI_CONST MI_Boolean OMI_Error_Indication_qual_value = 1;
Only in ./dsc/LCM/dsc/engine/ConfigurationManager: omi_schema.c.orig
diff -crB ./dsc.original/LCM/dsc/engine/ConsistencyInvoker/ConsistencyInvoker.c ./dsc/LCM/dsc/engine/ConsistencyInvoker/ConsistencyInvoker.c
*** ./dsc.original/LCM/dsc/engine/ConsistencyInvoker/ConsistencyInvoker.c	Fri May 16 14:16:46 2014
--- ./dsc/LCM/dsc/engine/ConsistencyInvoker/ConsistencyInvoker.c	Mon Jan 19 21:41:06 2015
***************
*** 32,38 ****
  #if defined(_MSC_VER)
  #define DSCENGINE_NAMESPACE MI_T("root\\microsoft\\windows\\desiredstateconfiguration")
  #else
! #define DSCENGINE_NAMESPACE MI_T("/dsc")
  #endif
  
  int main(int argc, char *argv[])
--- 32,38 ----
  #if defined(_MSC_VER)
  #define DSCENGINE_NAMESPACE MI_T("root\\microsoft\\windows\\desiredstateconfiguration")
  #else
! #define DSCENGINE_NAMESPACE MI_T("root/Microsoft/Windows/DesiredStateConfiguration")
  #endif
  
  int main(int argc, char *argv[])
Only in ./dsc/LCM/dsc/engine/ConsistencyInvoker: ConsistencyInvoker.c.orig
diff -crB ./dsc.original/LCM/dsc/engine/ConsistencyInvoker/GNUmakefile ./dsc/LCM/dsc/engine/ConsistencyInvoker/GNUmakefile
*** ./dsc.original/LCM/dsc/engine/ConsistencyInvoker/GNUmakefile	Fri May 16 14:16:46 2014
--- ./dsc/LCM/dsc/engine/ConsistencyInvoker/GNUmakefile	Mon Jan 19 21:41:06 2015
***************
*** 2,8 ****
  TOP = ../../..
  include $(TOP)/config.mak
  
! CPROGRAM = consistencyinvoker
  SOURCES = ConsistencyInvoker.c
  
  INCLUDES = $(OMI) $(OMI)/common $(TOP)/codec/common $(OMI)/nits/base $(DSCTOP)/common/inc $(DSCTOP)/engine/EngineHelper 
--- 2,8 ----
  TOP = ../../..
  include $(TOP)/config.mak
  
! CPROGRAM = ConsistencyInvoker
  SOURCES = ConsistencyInvoker.c
  
  INCLUDES = $(OMI) $(OMI)/common $(TOP)/codec/common $(OMI)/nits/base $(DSCTOP)/common/inc $(DSCTOP)/engine/EngineHelper 
Only in ./dsc/LCM/dsc/engine/ConsistencyInvoker: GNUmakefile.orig
diff -crB ./dsc.original/LCM/omiutils/OMI_Error.h ./dsc/LCM/omiutils/OMI_Error.h
*** ./dsc.original/LCM/omiutils/OMI_Error.h	Fri May 16 14:16:46 2014
--- ./dsc/LCM/omiutils/OMI_Error.h	Mon Jan 19 21:41:06 2015
***************
*** 45,50 ****
--- 45,51 ----
      MI_ConstUint32Field error_Code;
      MI_ConstStringField error_Type;
      MI_ConstUint16Field error_Category;
+     MI_ConstStringField OMI_ErrorMessage;
  }
  OMI_Error;
  
Only in ./dsc/LCM/omiutils: OMI_Error.h.orig
diff -crB ./dsc.original/LCM/omiutils/errors.c ./dsc/LCM/omiutils/errors.c
*** ./dsc.original/LCM/omiutils/errors.c	Fri May 16 14:16:46 2014
--- ./dsc/LCM/omiutils/errors.c	Mon Jan 19 21:41:06 2015
***************
*** 1631,1637 ****
      MI_T("OMI_Error"), /* propagator */
      NULL,
  };
! 
  static MI_PropertyDecl MI_CONST* MI_CONST OMI_Error_props[] =
  {
      &CIM_Error_ErrorType_prop,
--- 1631,1651 ----
      MI_T("OMI_Error"), /* propagator */
      NULL,
  };
! static MI_CONST MI_PropertyDecl OMI_Error_OMI_ErrorMessage_prop =
! {
!     MI_FLAG_PROPERTY, /* flags */
!     0x006F6510, /* code */
!     MI_T("OMI_ErrorMessage"), /* name */
!     NULL, /* qualifiers */
!     0, /* numQualifiers */
!     MI_STRING, /* type */
!     NULL, /* className */
!     0, /* subscript */
!     offsetof(OMI_Error, OMI_ErrorMessage), /* offset */
!     MI_T("OMI_Error"), /* origin */
!     MI_T("OMI_Error"), /* propagator */
!     NULL,
! };
  static MI_PropertyDecl MI_CONST* MI_CONST OMI_Error_props[] =
  {
      &CIM_Error_ErrorType_prop,
***************
*** 1652,1657 ****
--- 1666,1672 ----
      &OMI_Error_error_Code_prop,
      &OMI_Error_error_Type_prop,
      &OMI_Error_error_Category_prop,
+     &OMI_Error_OMI_ErrorMessage_prop,
  };
diff -crB ./dsc.original/LCM/dsc/engine/EngineHelper/EventWrapper.c ./dsc/LCM/dsc/engine/EngineHelper/EventWrapper.c
*** ./dsc.original/LCM/dsc/engine/EngineHelper/EventWrapper.c   Thu Mar  5 11:58:53 2015
--- ./dsc/LCM/dsc/engine/EngineHelper/EventWrapper.c    Wed Apr 22 06:55:49 2015
***************
*** 70,79 ****

  static int _GetDSCTimeStamp(_Pre_writable_size_(TIMESTAMP_SIZE) char buf[TIMESTAMP_SIZE])
  {
!     MI_Uint64 usec = (MI_Uint64) CPU_GetTimeStamp();
!     time_t t = usec / 1000000;
      struct tm tm;
!     localtime_r(&t, &tm);
      sprintf(
          buf,
          "%02u/%02u/%02u %02u:%02u:%02u",
--- 70,79 ----

  static int _GetDSCTimeStamp(_Pre_writable_size_(TIMESTAMP_SIZE) char buf[TIMESTAMP_SIZE])
  {
!     time_t ltime;
      struct tm tm;
!     ltime = time(NULL);
!     localtime_r(&ltime, &tm);
      sprintf(
          buf,
          "%02u/%02u/%02u %02u:%02u:%02u",