) {\r
Walker++;\r
} else {\r
- if (*Walker == L'-' && (UINTN)(Walker - PrevWalker) == mGuidDataLen[Index]) {\r
+ if (*Walker == L'-' && (((UINTN)Walker - (UINTN)PrevWalker) / sizeof (CHAR16)) == mGuidDataLen[Index]) {\r
Walker++;\r
PrevWalker = Walker;\r
Index++;\r
}\r
}\r
\r
- if ((UINTN)(Walker - PrevWalker) == mGuidDataLen[Index]) {\r
+ if ((((UINTN)Walker - (UINTN)PrevWalker) / sizeof (CHAR16)) == mGuidDataLen[Index]) {\r
return TRUE;\r
} else {\r
return FALSE;\r