MdeModulePkg: Fix VS2015 warning C4311 & C4312 in RegularExpressionDxe

[mirror_edk2.git] / MdeModulePkg / Universal / RegularExpressionDxe / Oniguruma / regexec.c

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c
index 5e3ffa1838e1fa942e08322b12bfcb93b47e1baa..160c995fa4e77f3ccf2d905ad17bd566fdbbadfb 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c
@@ -863,7 +863,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
               if (BIT_STATUS_AT(reg->bt_mem_end, k->u.mem.num))\\r
                 endp = STACK_AT(k->u.mem.end)->u.mem.pstr;\\r
               else\\r
-                endp = (UChar* )k->u.mem.end;\\r
+                endp = (UChar* )(UINTN)k->u.mem.end;\\r
               if (STACK_AT(k->u.mem.start)->u.mem.pstr != endp) {\\r
                 (isnull) = 0; break;\\r
               }\\r
@@ -904,7 +904,7 @@ stack_double(OnigStackType** arg_stk_base, OnigStackType** arg_stk_end,
                 if (BIT_STATUS_AT(reg->bt_mem_end, k->u.mem.num))\\r
                   endp = STACK_AT(k->u.mem.end)->u.mem.pstr;\\r
                 else\\r
-                  endp = (UChar* )k->u.mem.end;\\r
+                  endp = (UChar* )(UINTN)k->u.mem.end;\\r
                 if (STACK_AT(k->u.mem.start)->u.mem.pstr != endp) {\\r
                   (isnull) = 0; break;\\r
                 }\\r
@@ -1344,11 +1344,11 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
                if (BIT_STATUS_AT(reg->bt_mem_start, i))\r
                  rmt[i].rm_so = (regoff_t)(STACK_AT(mem_start_stk[i])->u.mem.pstr - str);\r
                else\r
-                 rmt[i].rm_so = (regoff_t)((UChar* )((void* )(mem_start_stk[i])) - str);\r
+                 rmt[i].rm_so = (regoff_t)((UChar* )((void* )(UINTN)(mem_start_stk[i])) - str);\r
 \r
                rmt[i].rm_eo = (regoff_t)((BIT_STATUS_AT(reg->bt_mem_end, i)\r
                                ? STACK_AT(mem_end_stk[i])->u.mem.pstr\r
-                               : (UChar* )((void* )mem_end_stk[i])) - str);\r
+                               : (UChar* )((void* )(UINTN)mem_end_stk[i])) - str);\r
              }\r
              else {\r
                rmt[i].rm_so = rmt[i].rm_eo = ONIG_REGION_NOTPOS;\r
@@ -1364,11 +1364,11 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
                if (BIT_STATUS_AT(reg->bt_mem_start, i))\r
                  region->beg[i] = (int)(STACK_AT(mem_start_stk[i])->u.mem.pstr - str);\r
                else\r
-                 region->beg[i] = (int)((UChar* )((void* )mem_start_stk[i]) - str);\r
+                 region->beg[i] = (int)((UChar* )((void* )(UINTN)mem_start_stk[i]) - str);\r
 \r
                region->end[i] = (int)((BIT_STATUS_AT(reg->bt_mem_end, i)\r
                                  ? STACK_AT(mem_end_stk[i])->u.mem.pstr\r
-                                 : (UChar* )((void* )mem_end_stk[i])) - str);\r
+                                 : (UChar* )((void* )(UINTN)mem_end_stk[i])) - str);\r
              }\r
              else {\r
                region->beg[i] = region->end[i] = ONIG_REGION_NOTPOS;\r
@@ -2082,7 +2082,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 \r
     case OP_MEMORY_START:  MOP_IN(OP_MEMORY_START);\r
       GET_MEMNUM_INC(mem, p);\r
-      mem_start_stk[mem] = (OnigStackIndex )((void* )s);\r
+      mem_start_stk[mem] = (OnigStackIndex )(UINTN)((void* )s);\r
       MOP_OUT;\r
       continue;\r
       break;\r
@@ -2096,7 +2096,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 \r
     case OP_MEMORY_END:  MOP_IN(OP_MEMORY_END);\r
       GET_MEMNUM_INC(mem, p);\r
-      mem_end_stk[mem] = (OnigStackIndex )((void* )s);\r
+      mem_end_stk[mem] = (OnigStackIndex )(UINTN)((void* )s);\r
       MOP_OUT;\r
       continue;\r
       break;\r
@@ -2113,13 +2113,13 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 \r
     case OP_MEMORY_END_REC:  MOP_IN(OP_MEMORY_END_REC);\r
       GET_MEMNUM_INC(mem, p);\r
-      mem_end_stk[mem] = (OnigStackIndex )((void* )s);\r
+      mem_end_stk[mem] = (OnigStackIndex )(UINTN)((void* )s);\r
       STACK_GET_MEM_START(mem, stkp);\r
 \r
       if (BIT_STATUS_AT(reg->bt_mem_start, mem))\r
        mem_start_stk[mem] = GET_STACK_INDEX(stkp);\r
       else\r
-       mem_start_stk[mem] = (OnigStackIndex )((void* )stkp->u.mem.pstr);\r
+       mem_start_stk[mem] = (OnigStackIndex )(UINTN)((void* )stkp->u.mem.pstr);\r
 \r
       STACK_PUSH_MEM_END_MARK(mem);\r
       MOP_OUT;\r
@@ -2153,11 +2153,11 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
        if (BIT_STATUS_AT(reg->bt_mem_start, mem))\r
          pstart = STACK_AT(mem_start_stk[mem])->u.mem.pstr;\r
        else\r
-         pstart = (UChar* )((void* )mem_start_stk[mem]);\r
+         pstart = (UChar* )((void* )(UINTN)mem_start_stk[mem]);\r
 \r
        pend = (BIT_STATUS_AT(reg->bt_mem_end, mem)\r
                ? STACK_AT(mem_end_stk[mem])->u.mem.pstr\r
-               : (UChar* )((void* )mem_end_stk[mem]));\r
+               : (UChar* )((void* )(UINTN)mem_end_stk[mem]));\r
        n = (int)(pend - pstart);\r
        DATA_ENSURE(n);\r
        sprev = s;\r
@@ -2185,11 +2185,11 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
        if (BIT_STATUS_AT(reg->bt_mem_start, mem))\r
          pstart = STACK_AT(mem_start_stk[mem])->u.mem.pstr;\r
        else\r
-         pstart = (UChar* )((void* )mem_start_stk[mem]);\r
+         pstart = (UChar* )((void* )(UINTN)mem_start_stk[mem]);\r
 \r
        pend = (BIT_STATUS_AT(reg->bt_mem_end, mem)\r
                ? STACK_AT(mem_end_stk[mem])->u.mem.pstr\r
-               : (UChar* )((void* )mem_end_stk[mem]));\r
+               : (UChar* )((void* )(UINTN)mem_end_stk[mem]));\r
        n = (int)(pend - pstart);\r
        DATA_ENSURE(n);\r
        sprev = s;\r
@@ -2217,11 +2217,11 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
          if (BIT_STATUS_AT(reg->bt_mem_start, mem))\r
            pstart = STACK_AT(mem_start_stk[mem])->u.mem.pstr;\r
          else\r
-           pstart = (UChar* )((void* )mem_start_stk[mem]);\r
+           pstart = (UChar* )((void* )(UINTN)mem_start_stk[mem]);\r
 \r
          pend = (BIT_STATUS_AT(reg->bt_mem_end, mem)\r
                  ? STACK_AT(mem_end_stk[mem])->u.mem.pstr\r
-                 : (UChar* )((void* )mem_end_stk[mem]));\r
+                 : (UChar* )((void* )(UINTN)mem_end_stk[mem]));\r
          n = (int)(pend - pstart);\r
          DATA_ENSURE(n);\r
          sprev = s;\r
@@ -2256,11 +2256,11 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
          if (BIT_STATUS_AT(reg->bt_mem_start, mem))\r
            pstart = STACK_AT(mem_start_stk[mem])->u.mem.pstr;\r
          else\r
-           pstart = (UChar* )((void* )mem_start_stk[mem]);\r
+           pstart = (UChar* )((void* )(UINTN)mem_start_stk[mem]);\r
 \r
          pend = (BIT_STATUS_AT(reg->bt_mem_end, mem)\r
                  ? STACK_AT(mem_end_stk[mem])->u.mem.pstr\r
-                 : (UChar* )((void* )mem_end_stk[mem]));\r
+                 : (UChar* )((void* )(UINTN)mem_end_stk[mem]));\r
          n = (int)(pend - pstart);\r
          DATA_ENSURE(n);\r
          sprev = s;\r