MdeModulePkg: Fix VS2015 warning C4311 & C4312 in RegularExpressionDxe

warning C4311: pointer truncation from 'void *' to 'unsigned long'
warning C4312: conversion from 'unsigned long' to 'void *' of greater size
Update code to convert type to UINTN first, then convert it to other type.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@hpe.com>
Acked-by: Michael Kinney <michael.d.kinney@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19114 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/enc/unicode.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/enc/unicode.c
index 70a1a5207a00becfb22d5396e55457145c17f965..a9066703b849a80590969dd48426b4cc6558e120 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/enc/unicode.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/enc/unicode.c
@@ -10920,12 +10920,12 @@ static int init_case_fold_table(void)
   if (ONIG_IS_NULL(FoldTable)) return ONIGERR_MEMORY;\r
   for (i = 0; i < (int )(sizeof(CaseFold)/sizeof(CaseFold_11_Type)); i++) {\r
     p = &CaseFold[i];\r
   if (ONIG_IS_NULL(FoldTable)) return ONIGERR_MEMORY;\r
   for (i = 0; i < (int )(sizeof(CaseFold)/sizeof(CaseFold_11_Type)); i++) {\r
     p = &CaseFold[i];\r

-    st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )&(p->to));\r
+    st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )(UINTN)&(p->to));\r

   }\r
   for (i = 0; i < (int )(sizeof(CaseFold_Locale)/sizeof(CaseFold_11_Type));\r
        i++) {\r
     p = &CaseFold_Locale[i];\r
   }\r
   for (i = 0; i < (int )(sizeof(CaseFold_Locale)/sizeof(CaseFold_11_Type));\r
        i++) {\r
     p = &CaseFold_Locale[i];\r

-    st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )&(p->to));\r
+    st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )(UINTN)&(p->to));\r

   }\r
 \r
   Unfold1Table = st_init_numtable_with_size(1000);\r
   }\r
 \r
   Unfold1Table = st_init_numtable_with_size(1000);\r


@@ -10934,13 +10934,13 @@ static int init_case_fold_table(void)
   for (i = 0; i < (int )(sizeof(CaseUnfold_11)/sizeof(CaseUnfold_11_Type));\r
        i++) {\r
     p1 = &CaseUnfold_11[i];\r
   for (i = 0; i < (int )(sizeof(CaseUnfold_11)/sizeof(CaseUnfold_11_Type));\r
        i++) {\r
     p1 = &CaseUnfold_11[i];\r

-    st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )&(p1->to));\r
+    st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )(UINTN)&(p1->to));\r

   }\r
   for (i = 0;\r
        i < (int )(sizeof(CaseUnfold_11_Locale)/sizeof(CaseUnfold_11_Type));\r
        i++) {\r
     p1 = &CaseUnfold_11_Locale[i];\r
   }\r
   for (i = 0;\r
        i < (int )(sizeof(CaseUnfold_11_Locale)/sizeof(CaseUnfold_11_Type));\r
        i++) {\r
     p1 = &CaseUnfold_11_Locale[i];\r

-    st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )&(p1->to));\r
+    st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )(UINTN)&(p1->to));\r

   }\r
 \r
   Unfold2Table = st_init_table_with_size(&type_code2_hash, 200);\r
   }\r
 \r
   Unfold2Table = st_init_table_with_size(&type_code2_hash, 200);\r


@@ -10949,13 +10949,13 @@ static int init_case_fold_table(void)
   for (i = 0; i < (int )(sizeof(CaseUnfold_12)/sizeof(CaseUnfold_12_Type));\r
        i++) {\r
     p2 = &CaseUnfold_12[i];\r
   for (i = 0; i < (int )(sizeof(CaseUnfold_12)/sizeof(CaseUnfold_12_Type));\r
        i++) {\r
     p2 = &CaseUnfold_12[i];\r

-    st_add_direct(Unfold2Table, (st_data_t )p2->from, (st_data_t )(&p2->to));\r
+    st_add_direct(Unfold2Table, (st_data_t )(UINTN)p2->from, (st_data_t )(UINTN)(&p2->to));\r

   }\r
   for (i = 0;\r
        i < (int )(sizeof(CaseUnfold_12_Locale)/sizeof(CaseUnfold_12_Type));\r
        i++) {\r
     p2 = &CaseUnfold_12_Locale[i];\r
   }\r
   for (i = 0;\r
        i < (int )(sizeof(CaseUnfold_12_Locale)/sizeof(CaseUnfold_12_Type));\r
        i++) {\r
     p2 = &CaseUnfold_12_Locale[i];\r

-    st_add_direct(Unfold2Table, (st_data_t )p2->from, (st_data_t )(&p2->to));\r
+    st_add_direct(Unfold2Table, (st_data_t )(UINTN)p2->from, (st_data_t )(UINTN)(&p2->to));\r

   }\r
 \r
   Unfold3Table = st_init_table_with_size(&type_code3_hash, 30);\r
   }\r
 \r
   Unfold3Table = st_init_table_with_size(&type_code3_hash, 30);\r


@@ -10964,7 +10964,7 @@ static int init_case_fold_table(void)
   for (i = 0; i < (int )(sizeof(CaseUnfold_13)/sizeof(CaseUnfold_13_Type));\r
        i++) {\r
     p3 = &CaseUnfold_13[i];\r
   for (i = 0; i < (int )(sizeof(CaseUnfold_13)/sizeof(CaseUnfold_13_Type));\r
        i++) {\r
     p3 = &CaseUnfold_13[i];\r

-    st_add_direct(Unfold3Table, (st_data_t )p3->from, (st_data_t )(&p3->to));\r
+    st_add_direct(Unfold3Table, (st_data_t )(UINTN)p3->from, (st_data_t )(UINTN)(&p3->to));\r

   }\r
 \r
 \r
   }\r
 \r
 \r


@@ -11265,7 +11265,7 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
          }\r
        }\r
 \r
          }\r
        }\r
 \r

-       if (onig_st_lookup(Unfold2Table, (st_data_t )to->code,\r
+       if (onig_st_lookup(Unfold2Table, (st_data_t )(UINTN)to->code,\r

                           (void* )&z2) != 0) {\r
          for (i = 0; i < z2->n; i++) {\r
            if (z2->code[i] == code) continue;\r
                           (void* )&z2) != 0) {\r
          for (i = 0; i < z2->n; i++) {\r
            if (z2->code[i] == code) continue;\r


@@ -11291,7 +11291,7 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
          }\r
        }\r
 \r
          }\r
        }\r
 \r

-       if (onig_st_lookup(Unfold3Table, (st_data_t )to->code,\r
+       if (onig_st_lookup(Unfold3Table, (st_data_t )(UINTN)to->code,\r

                           (void* )&z2) != 0) {\r
          for (i = 0; i < z2->n; i++) {\r
            if (z2->code[i] == code) continue;\r
                           (void* )&z2) != 0) {\r
          for (i = 0; i < z2->n; i++) {\r
            if (z2->code[i] == code) continue;\r


@@ -11336,7 +11336,7 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 \r
       clen = enclen(enc, p);\r
       len += clen;\r
 \r
       clen = enclen(enc, p);\r
       len += clen;\r

-      if (onig_st_lookup(Unfold2Table, (st_data_t )codes, (void* )&z2) != 0) {\r
+      if (onig_st_lookup(Unfold2Table, (st_data_t )(UINTN)codes, (void* )&z2) != 0) {\r

        for (i = 0; i < z2->n; i++) {\r
          items[n].byte_len = len;\r
          items[n].code_len = 1;\r
        for (i = 0; i < z2->n; i++) {\r
          items[n].byte_len = len;\r
          items[n].code_len = 1;\r


@@ -11357,7 +11357,7 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 \r
        clen = enclen(enc, p);\r
        len += clen;\r
 \r
        clen = enclen(enc, p);\r
        len += clen;\r

-       if (onig_st_lookup(Unfold3Table, (st_data_t )codes,\r
+       if (onig_st_lookup(Unfold3Table, (st_data_t )(UINTN)codes,\r

                           (void* )&z2) != 0) {\r
          for (i = 0; i < z2->n; i++) {\r
            items[n].byte_len = len;\r
                           (void* )&z2) != 0) {\r
          for (i = 0; i < z2->n; i++) {\r
            items[n].byte_len = len;\r

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
               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
               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
                 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
                 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
                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
 \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
              }\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
                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
 \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
              }\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
 \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
       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
 \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
       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
 \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
       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
 \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
        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
 \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
        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
        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
 \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
        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
          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
 \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
          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
          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
 \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
          n = (int)(pend - pstart);\r
          DATA_ENSURE(n);\r
          sprev = s;\r

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h
index 44589bf999998550d37c9981ea762444016ca737..f48c55764c32c822c08ee5f9bd11ae3f35f107c1 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h
@@ -233,13 +233,13 @@
 \r
 #define GET_ALIGNMENT_PAD_SIZE(addr,pad_size) do {\\r
   (pad_size) = WORD_ALIGNMENT_SIZE \\r
 \r
 #define GET_ALIGNMENT_PAD_SIZE(addr,pad_size) do {\\r
   (pad_size) = WORD_ALIGNMENT_SIZE \\r

-               - ((unsigned int )(addr) % WORD_ALIGNMENT_SIZE);\\r
+               - ((unsigned int )(UINTN)(addr) % WORD_ALIGNMENT_SIZE);\\r

   if ((pad_size) == WORD_ALIGNMENT_SIZE) (pad_size) = 0;\\r
 } while (0)\r
 \r
 #define ALIGNMENT_RIGHT(addr) do {\\r
   (addr) += (WORD_ALIGNMENT_SIZE - 1);\\r
   if ((pad_size) == WORD_ALIGNMENT_SIZE) (pad_size) = 0;\\r
 } while (0)\r
 \r
 #define ALIGNMENT_RIGHT(addr) do {\\r
   (addr) += (WORD_ALIGNMENT_SIZE - 1);\\r

-  (addr) -= ((unsigned int )(addr) % WORD_ALIGNMENT_SIZE);\\r
+  (addr) -= ((unsigned int )(UINTN)(addr) % WORD_ALIGNMENT_SIZE);\\r

 } while (0)\r
 \r
 #endif /* PLATFORM_UNALIGNED_WORD_ACCESS */\r
 } while (0)\r
 \r
 #endif /* PLATFORM_UNALIGNED_WORD_ACCESS */\r

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c
index 01ac2b3136d4364f0c067f48904847f344f981de..4be2f229bc16664f8997153e560c12270eb13755 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regparse.c
@@ -369,7 +369,7 @@ onig_st_lookup_strend(hash_table_type* table, const UChar* str_key,
   key.s   = (UChar* )str_key;\r
   key.end = (UChar* )end_key;\r
 \r
   key.s   = (UChar* )str_key;\r
   key.end = (UChar* )end_key;\r
 \r

-  return onig_st_lookup(table, (st_data_t )(&key), value);\r
+  return onig_st_lookup(table, (st_data_t )(UINTN)(&key), value);\r

 }\r
 \r
 extern int\r
 }\r
 \r
 extern int\r


@@ -382,7 +382,7 @@ onig_st_insert_strend(hash_table_type* table, const UChar* str_key,
   key = (st_str_end_key* )xmalloc(sizeof(st_str_end_key));\r
   key->s   = (UChar* )str_key;\r
   key->end = (UChar* )end_key;\r
   key = (st_str_end_key* )xmalloc(sizeof(st_str_end_key));\r
   key->s   = (UChar* )str_key;\r
   key->end = (UChar* )end_key;\r

-  result = onig_st_insert(table, (st_data_t )key, value);\r
+  result = onig_st_insert(table, (st_data_t )(UINTN)key, value);\r

   if (result) {\r
     xfree(key);\r
   }\r
   if (result) {\r
     xfree(key);\r
   }\r


@@ -534,7 +534,7 @@ onig_foreach_name(regex_t* reg,
     narg.reg  = reg;\r
     narg.arg  = arg;\r
     narg.enc  = reg->enc; /* should be pattern encoding. */\r
     narg.reg  = reg;\r
     narg.arg  = arg;\r
     narg.enc  = reg->enc; /* should be pattern encoding. */\r

-    onig_st_foreach(t, i_names, (HashDataType )&narg);\r
+    onig_st_foreach(t, i_names, (HashDataType )(UINTN)&narg);\r

   }\r
   return narg.ret;\r
 }\r
   }\r
   return narg.ret;\r
 }\r


@@ -562,7 +562,7 @@ onig_renumber_name_table(regex_t* reg, GroupNumRemap* map)
   NameTable* t = (NameTable* )reg->name_table;\r
 \r
   if (IS_NOT_NULL(t)) {\r
   NameTable* t = (NameTable* )reg->name_table;\r
 \r
   if (IS_NOT_NULL(t)) {\r

-    onig_st_foreach(t, i_renumber_name, (HashDataType )map);\r
+    onig_st_foreach(t, i_renumber_name, (HashDataType )(UINTN)map);\r

   }\r
   return 0;\r
 }\r
   }\r
   return 0;\r
 }\r


@@ -742,7 +742,7 @@ name_add(regex_t* reg, UChar* name, UChar* name_end, int backref, ScanEnv* env)
       xfree(e);  return ONIGERR_MEMORY;\r
     }\r
     onig_st_insert_strend(t, e->name, (e->name + (name_end - name)),\r
       xfree(e);  return ONIGERR_MEMORY;\r
     }\r
     onig_st_insert_strend(t, e->name, (e->name + (name_end - name)),\r

-                          (HashDataType )e);\r
+                          (HashDataType )(UINTN)e);\r

 \r
     e->name_len   = (int)(name_end - name);\r
     e->back_num   = 0;\r
 \r
     e->name_len   = (int)(name_end - name);\r
     e->back_num   = 0;\r


@@ -5217,7 +5217,7 @@ parse_exp(Node** np, OnigToken* tok, int term,
               }\r
             }\r
             else {\r
               }\r
             }\r
             else {\r

-              if (onig_st_lookup(OnigTypeCClassTable, (st_data_t )&key,\r
+              if (onig_st_lookup(OnigTypeCClassTable, (st_data_t )(UINTN)&key,\r

                                  (st_data_t* )np)) {\r
                 THREAD_ATOMIC_END;\r
                 break;\r
                                  (st_data_t* )np)) {\r
                 THREAD_ATOMIC_END;\r
                 break;\r


@@ -5235,8 +5235,8 @@ parse_exp(Node** np, OnigToken* tok, int term,
             NCCLASS_SET_SHARE(cc);\r
             new_key = (type_cclass_key* )xmalloc(sizeof(type_cclass_key));\r
            xmemcpy(new_key, &key, sizeof(type_cclass_key));\r
             NCCLASS_SET_SHARE(cc);\r
             new_key = (type_cclass_key* )xmalloc(sizeof(type_cclass_key));\r
            xmemcpy(new_key, &key, sizeof(type_cclass_key));\r

-            onig_st_add_direct(OnigTypeCClassTable, (st_data_t )new_key,\r
-                               (st_data_t )*np);\r
+            onig_st_add_direct(OnigTypeCClassTable, (st_data_t )(UINTN)new_key,\r
+                               (st_data_t )(UINTN)*np);\r

             \r
             THREAD_ATOMIC_END;\r
           }\r
             \r
             THREAD_ATOMIC_END;\r
           }\r