From 2da5f1881224922adc68e3db190279034c29b3e5 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Fri, 23 Aug 2019 16:10:19 -0500 Subject: [PATCH] Rebase against f238e846e701d2039eceb51f2f6e9d936f8c791c. --- ...more-tests-for-RtlIpv4StringToAddres.patch | 69 ------------------- patches/patchinstall.sh | 6 +- 2 files changed, 2 insertions(+), 73 deletions(-) delete mode 100644 patches/ntdll-RtlIpv4StringToAddress/0001-ntdll-tests-Add-more-tests-for-RtlIpv4StringToAddres.patch diff --git a/patches/ntdll-RtlIpv4StringToAddress/0001-ntdll-tests-Add-more-tests-for-RtlIpv4StringToAddres.patch b/patches/ntdll-RtlIpv4StringToAddress/0001-ntdll-tests-Add-more-tests-for-RtlIpv4StringToAddres.patch deleted file mode 100644 index 43b06a97..00000000 --- a/patches/ntdll-RtlIpv4StringToAddress/0001-ntdll-tests-Add-more-tests-for-RtlIpv4StringToAddres.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 50c0f514ad34e7e5cb6675bb8426f9bdd94d5723 Mon Sep 17 00:00:00 2001 -From: Alex Henrie -Date: Thu, 4 Jul 2019 10:22:39 -0600 -Subject: [PATCH 1/3] ntdll/tests: Add more tests for RtlIpv4StringToAddress - -Signed-off-by: Alex Henrie ---- - dlls/ntdll/tests/rtl.c | 29 +++++++++++++++++++++++++++++ - 1 file changed, 29 insertions(+) - -diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c -index 62662cb438..3e1d92c3d2 100644 ---- a/dlls/ntdll/tests/rtl.c -+++ b/dlls/ntdll/tests/rtl.c -@@ -1212,12 +1212,23 @@ static struct - { "1", STATUS_SUCCESS, 1, { 0, 0, 0, 1 }, strict_diff_4, - STATUS_INVALID_PARAMETER, 1, { -1 } }, - { "-1", STATUS_INVALID_PARAMETER, 0, { -1 } }, -+ { "1.2", STATUS_SUCCESS, 3, { 1, 0, 0, 2 }, strict_diff_4, -+ STATUS_INVALID_PARAMETER, 3, { -1 } }, -+ { "1000.2000", STATUS_INVALID_PARAMETER, 9, { -1 } }, -+ { "1.2.", STATUS_INVALID_PARAMETER, 4, { -1 } }, -+ { "1..2", STATUS_INVALID_PARAMETER, 3, { -1 } }, -+ { "1...2", STATUS_INVALID_PARAMETER, 3, { -1 } }, -+ { "1.2.3", STATUS_SUCCESS, 5, { 1, 2, 0, 3 }, strict_diff_4, -+ STATUS_INVALID_PARAMETER, 5, { -1 } }, -+ { "1.2.3.", STATUS_INVALID_PARAMETER, 6, { -1 } }, - { "203569230", STATUS_SUCCESS, 9, { 12, 34, 56, 78 }, strict_diff_4, - STATUS_INVALID_PARAMETER, 9, { -1 } }, - { "1.223756", STATUS_SUCCESS, 8, { 1, 3, 106, 12 }, strict_diff_4, - STATUS_INVALID_PARAMETER, 8, { -1 } }, - { "3.4.756", STATUS_SUCCESS, 7, { 3, 4, 2, 244 }, strict_diff_4, - STATUS_INVALID_PARAMETER, 7, { -1 } }, -+ { "756.3.4", STATUS_INVALID_PARAMETER, 7, { -1 } }, -+ { "3.756.4", STATUS_INVALID_PARAMETER, 7, { -1 } }, - { "3.4.756.1", STATUS_INVALID_PARAMETER, 9, { -1 } }, - { "3.4.65536", STATUS_INVALID_PARAMETER, 9, { -1 } }, - { "3.4.5.6.7", STATUS_INVALID_PARAMETER, 7, { -1 } }, -@@ -1233,9 +1244,27 @@ static struct - { ".1", STATUS_INVALID_PARAMETER, 1, { -1 } }, - { ".1.", STATUS_INVALID_PARAMETER, 1, { -1 } }, - { ".1.2.3", STATUS_INVALID_PARAMETER, 1, { -1 } }, -+ { ".1.2.3.4", STATUS_INVALID_PARAMETER, 1, { -1 } }, - { "0.1.2.3", STATUS_SUCCESS, 7, { 0, 1, 2, 3 } }, - { "0.1.2.3.", STATUS_INVALID_PARAMETER, 7, { -1 } }, - { "[0.1.2.3]", STATUS_INVALID_PARAMETER, 0, { -1 } }, -+ { "0x00010203", STATUS_SUCCESS, 10, { 0, 1, 2, 3 }, strict_diff_4, -+ STATUS_INVALID_PARAMETER, 2, { -1 } }, -+ { "0X00010203", STATUS_SUCCESS, 10, { 0, 1, 2, 3 }, strict_diff_4, -+ STATUS_INVALID_PARAMETER, 2, { -1 } }, -+ { "0x1234", STATUS_SUCCESS, 6, { 0, 0, 18, 52 }, strict_diff_4, -+ STATUS_INVALID_PARAMETER, 2, { -1 } }, -+ { "0x123456789", STATUS_SUCCESS, 11, { 35, 69, 103, 137 }, strict_diff_4, -+ STATUS_INVALID_PARAMETER, 2, { -1 } }, -+ { "0x00010Q03", STATUS_SUCCESS, 7, { 0, 0, 0, 16 }, strict_diff_4 | ex_fail_4, -+ STATUS_INVALID_PARAMETER, 2, { -1 } }, -+ { "x00010203", STATUS_INVALID_PARAMETER, 0, { -1 } }, -+ { "1234BEEF", STATUS_SUCCESS, 4, { 0, 0, 4, 210 }, strict_diff_4 | ex_fail_4, -+ STATUS_INVALID_PARAMETER, 4, { -1 } }, -+ { "017700000001", STATUS_SUCCESS, 12, { 127, 0, 0, 1 }, strict_diff_4, -+ STATUS_INVALID_PARAMETER, 1, { -1 } }, -+ { "0777", STATUS_SUCCESS, 4, { 0, 0, 1, 255 }, strict_diff_4, -+ STATUS_INVALID_PARAMETER, 1, { -1 } }, - { "::1", STATUS_INVALID_PARAMETER, 0, { -1 } }, - { ":1", STATUS_INVALID_PARAMETER, 0, { -1 } }, - }; --- -2.20.1 - diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index b0a3d238..5ecc5015 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "fb5b0c64639c056d55e14011a3b4e6f2d83e7cda" + echo "f238e846e701d2039eceb51f2f6e9d936f8c791c" } # Show version information @@ -5014,14 +5014,12 @@ fi # | * [#46149] ntdll: Implement RtlIpv4StringToAddress(Ex)A/W # | # | Modified files: -# | * dlls/ntdll/ntdll.spec, dlls/ntdll/rtl.c, dlls/ntdll/tests/rtl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec +# | * dlls/ntdll/ntdll.spec, dlls/ntdll/rtl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec # | if test "$enable_ntdll_RtlIpv4StringToAddress" -eq 1; then - patch_apply ntdll-RtlIpv4StringToAddress/0001-ntdll-tests-Add-more-tests-for-RtlIpv4StringToAddres.patch patch_apply ntdll-RtlIpv4StringToAddress/0002-ntdll-Implement-RtlIpv4StringToAddress-Ex-A.patch patch_apply ntdll-RtlIpv4StringToAddress/0003-ntdll-Implement-RtlIpv4StringToAddress-Ex-W.patch ( - printf '%s\n' '+ { "Alex Henrie", "ntdll/tests: Add more tests for RtlIpv4StringToAddress.", 1 },'; printf '%s\n' '+ { "Alex Henrie", "ntdll: Implement RtlIpv4StringToAddress(Ex)A.", 1 },'; printf '%s\n' '+ { "Alex Henrie", "ntdll: Implement RtlIpv4StringToAddress(Ex)W.", 1 },'; ) >> "$patchlist"