From 7c9f9bc0c1b0a5624138c43a3648254bf6840071 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 22 Jun 2018 10:17:35 +1000 Subject: [PATCH] Rebase against 9ef8fa2a0bfb559475e17d2562892085f0e2a90f --- ..._36-Implement-ID3DXFontImpl_DrawText.patch | 16 +-- ...-NULL-terminated-strings-in-ID3DXFon.patch | 44 +++---- ...storing-DOS-attributes-in-NtCreateFi.patch | 18 +-- ...s-for-RtlIpv4StringToAddressEx-try-5.patch | 116 ++---------------- patches/patchinstall.sh | 2 +- ...uffer-when-call-to-InternetCanonical.patch | 18 +-- 6 files changed, 57 insertions(+), 157 deletions(-) diff --git a/patches/d3dx9_36-DrawText/0001-d3dx9_36-Implement-ID3DXFontImpl_DrawText.patch b/patches/d3dx9_36-DrawText/0001-d3dx9_36-Implement-ID3DXFontImpl_DrawText.patch index 7e877fbd..5253f58d 100644 --- a/patches/d3dx9_36-DrawText/0001-d3dx9_36-Implement-ID3DXFontImpl_DrawText.patch +++ b/patches/d3dx9_36-DrawText/0001-d3dx9_36-Implement-ID3DXFontImpl_DrawText.patch @@ -1,7 +1,7 @@ -From e8e425059101d8c719a8aea674f1c1da3d9a1085 Mon Sep 17 00:00:00 2001 +From b1655e88c9c7b4b87ae87d06261ce3db4fac1432 Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Sun, 26 May 2013 19:42:08 +0200 -Subject: d3dx9_36: Implement ID3DXFontImpl_DrawText. +Subject: [PATCH] d3dx9_36: Implement ID3DXFontImpl_DrawText. Changes by Sebastian Lackner : * Use pitch value for locked buffer instead of assuming that pitch = width * bytesperpixel @@ -21,10 +21,10 @@ Changes by Sebastian Lackner : 1 file changed, 210 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c -index dd1243e..7152dab 100644 +index 5522dea..916ce4c 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c -@@ -36,8 +36,29 @@ struct d3dx_font +@@ -35,8 +35,29 @@ struct d3dx_font HDC hdc; HFONT hfont; @@ -54,7 +54,7 @@ index dd1243e..7152dab 100644 static inline struct d3dx_font *impl_from_ID3DXFont(ID3DXFont *iface) { return CONTAINING_RECORD(iface, struct d3dx_font, ID3DXFont_iface); -@@ -64,19 +85,27 @@ static HRESULT WINAPI ID3DXFontImpl_QueryInterface(ID3DXFont *iface, REFIID riid +@@ -63,19 +84,27 @@ static HRESULT WINAPI ID3DXFontImpl_QueryInterface(ID3DXFont *iface, REFIID riid static ULONG WINAPI ID3DXFontImpl_AddRef(ID3DXFont *iface) { struct d3dx_font *This = impl_from_ID3DXFont(iface); @@ -85,7 +85,7 @@ index dd1243e..7152dab 100644 DeleteObject(This->hfont); DeleteDC(This->hdc); IDirect3DDevice9_Release(This->device); -@@ -179,17 +208,170 @@ static HRESULT WINAPI ID3DXFontImpl_PreloadTextW(ID3DXFont *iface, const WCHAR * +@@ -178,17 +207,170 @@ static HRESULT WINAPI ID3DXFontImpl_PreloadTextW(ID3DXFont *iface, const WCHAR * static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite, const char *string, INT count, RECT *rect, DWORD format, D3DCOLOR color) { @@ -260,7 +260,7 @@ index dd1243e..7152dab 100644 } static HRESULT WINAPI ID3DXFontImpl_OnLostDevice(ID3DXFont *iface) -@@ -303,46 +485,55 @@ HRESULT WINAPI D3DXCreateFontIndirectW(IDirect3DDevice9 *device, const D3DXFONT_ +@@ -302,46 +484,55 @@ HRESULT WINAPI D3DXCreateFontIndirectW(IDirect3DDevice9 *device, const D3DXFONT_ TRACE("(%p, %p, %p)\n", device, desc, font); @@ -329,5 +329,5 @@ index dd1243e..7152dab 100644 return D3D_OK; } -- -2.4.5 +1.9.1 diff --git a/patches/d3dx9_36-DrawText/0003-d3dx9_36-Support-NULL-terminated-strings-in-ID3DXFon.patch b/patches/d3dx9_36-DrawText/0003-d3dx9_36-Support-NULL-terminated-strings-in-ID3DXFon.patch index d9b94198..6a371bc7 100644 --- a/patches/d3dx9_36-DrawText/0003-d3dx9_36-Support-NULL-terminated-strings-in-ID3DXFon.patch +++ b/patches/d3dx9_36-DrawText/0003-d3dx9_36-Support-NULL-terminated-strings-in-ID3DXFon.patch @@ -1,19 +1,20 @@ -From f28e6a98185ce7dd1137f2f04861c097e75e72a9 Mon Sep 17 00:00:00 2001 +From 657fcdbe239c1c1b37414acb82df75a27f643f38 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 4 Dec 2015 09:22:35 +1100 -Subject: d3dx9_36: Support NULL terminated strings in ID3DXFont_DrawText +Subject: [PATCH] d3dx9_36: Support NULL terminated strings in + ID3DXFont_DrawText Signed-off-by: Alistair Leslie-Hughes --- dlls/d3dx9_36/font.c | 10 ++++++++-- - dlls/d3dx9_36/tests/core.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- - 2 files changed, 53 insertions(+), 3 deletions(-) + dlls/d3dx9_36/tests/core.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c -index d6dcd6c..63aa828 100644 +index 921dada..518a9dc 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c -@@ -214,9 +214,12 @@ static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite, +@@ -213,9 +213,12 @@ static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite, TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n", iface, sprite, debugstr_a(string), count, wine_dbgstr_rect(rect), format, color); @@ -27,7 +28,7 @@ index d6dcd6c..63aa828 100644 countW = MultiByteToWideChar(CP_ACP, 0, string, count, NULL, 0); stringW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)); if (stringW) -@@ -239,9 +242,12 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, +@@ -238,9 +241,12 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n", iface, sprite, debugstr_w(string), count, wine_dbgstr_rect(rect), format, color); @@ -42,28 +43,19 @@ index d6dcd6c..63aa828 100644 while (count > 0 && !string[count-1]) count--; diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c -index 1c379fb..c931260 100644 +index 91e458b..b95c23f 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c -@@ -321,6 +321,8 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) - { 12, 256, 5 }, - { 72, 256, 8 } - }; -+ static const WCHAR testW[] = {'t','e','s','t',0}; +@@ -306,6 +306,7 @@ static void test_ID3DXSprite(IDirect3DDevice9 *device) + static void test_ID3DXFont(IDirect3DDevice9 *device) + { + static const WCHAR testW[] = {'t','e','s','t',0}; + static const char testA[] = "test"; + static const struct + { + int font_height; +@@ -637,6 +638,49 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) - - /* D3DXCreateFont */ -@@ -463,7 +465,6 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) - /* ID3DXFont_PreloadText */ - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); - if(SUCCEEDED(hr)) { -- const WCHAR testW[] = {'t','e','s','t',0}; - - todo_wine { - hr = ID3DXFont_PreloadTextA(font, NULL, -1); -@@ -591,6 +592,49 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) - } ID3DXFont_Release(font); } + @@ -113,5 +105,5 @@ index 1c379fb..c931260 100644 static void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device) -- -2.6.2 +1.9.1 diff --git a/patches/ntdll-DOS_Attributes/0004-ntdll-Implement-storing-DOS-attributes-in-NtCreateFi.patch b/patches/ntdll-DOS_Attributes/0004-ntdll-Implement-storing-DOS-attributes-in-NtCreateFi.patch index 0d57e28f..82f24c66 100644 --- a/patches/ntdll-DOS_Attributes/0004-ntdll-Implement-storing-DOS-attributes-in-NtCreateFi.patch +++ b/patches/ntdll-DOS_Attributes/0004-ntdll-Implement-storing-DOS-attributes-in-NtCreateFi.patch @@ -1,7 +1,7 @@ -From 547a16f5cfaae95ca1bc3e18833132ae89b8e88e Mon Sep 17 00:00:00 2001 +From e8aeb367e785ab32686c94c11b18ddcee9911206 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Wed, 20 Aug 2014 15:28:00 -0600 -Subject: ntdll: Implement storing DOS attributes in NtCreateFile. +Subject: [PATCH] ntdll: Implement storing DOS attributes in NtCreateFile. --- dlls/ntdll/file.c | 76 ++++++++++++++++++++++++++++---------------- @@ -11,7 +11,7 @@ Subject: ntdll: Implement storing DOS attributes in NtCreateFile. 4 files changed, 82 insertions(+), 40 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c -index 37446a9..0b33acd 100644 +index 38c555e..3a96d3b 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -224,6 +224,21 @@ int get_file_info( const char *path, struct stat *st, ULONG *attr ) @@ -130,7 +130,7 @@ index 37446a9..0b33acd 100644 } diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c -index 431471a..e579573 100644 +index 2c6170b..0eed603 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -55,7 +55,6 @@ static NTSTATUS (WINAPI *pRtlWow64EnableFsRedirectionEx)( ULONG disable, ULONG * @@ -166,8 +166,8 @@ index 431471a..e579573 100644 + { 0, FILE_ATTRIBUTE_DIRECTORY, {'.'}, ". directory" }, + { 0, FILE_ATTRIBUTE_DIRECTORY, {'.','.'}, ".. directory" } }; - static const int test_dir_count = sizeof(testfiles) / sizeof(testfiles[0]); - static const int max_test_dir_size = sizeof(testfiles) / sizeof(testfiles[0]) + 5; /* size of above plus some for .. etc */ + static const int test_dir_count = ARRAY_SIZE(testfiles); + static const int max_test_dir_size = ARRAY_SIZE(testfiles) + 5; /* size of above plus some for .. etc */ @@ -162,8 +161,7 @@ static void tally_test_file(FILE_BOTH_DIRECTORY_INFORMATION *dir_info) if (namelen != len || memcmp(nameW, testfiles[i].name, len*sizeof(WCHAR))) continue; @@ -179,10 +179,10 @@ index 431471a..e579573 100644 } testfiles[i].nfound++; diff --git a/include/wine/port.h b/include/wine/port.h -index 445a25e..04ae7a6 100644 +index e30a744..741cf27 100644 --- a/include/wine/port.h +++ b/include/wine/port.h -@@ -373,6 +373,8 @@ extern int xattr_fget( int filedes, const char *name, void *value, size_t size ) +@@ -401,6 +401,8 @@ extern int xattr_fget( int filedes, const char *name, void *value, size_t size ) extern int xattr_fremove( int filedes, const char *name ); extern int xattr_fset( int filedes, const char *name, void *value, size_t size ); extern int xattr_get( const char *path, const char *name, void *value, size_t size ); @@ -220,5 +220,5 @@ index 6918c99..683e7a6 100644 +#endif +} -- -2.8.0 +1.9.1 diff --git a/patches/ntdll-RtlIpStringToAddress_Tests/0003-ntdll-tests-Tests-for-RtlIpv4StringToAddressEx-try-5.patch b/patches/ntdll-RtlIpStringToAddress_Tests/0003-ntdll-tests-Tests-for-RtlIpv4StringToAddressEx-try-5.patch index 3a065f35..53e75ffb 100644 --- a/patches/ntdll-RtlIpStringToAddress_Tests/0003-ntdll-tests-Tests-for-RtlIpv4StringToAddressEx-try-5.patch +++ b/patches/ntdll-RtlIpStringToAddress_Tests/0003-ntdll-tests-Tests-for-RtlIpv4StringToAddressEx-try-5.patch @@ -1,7 +1,8 @@ -From a2f2703bd49023e395090c6ed8b7b6d2e7722680 Mon Sep 17 00:00:00 2001 +From 9d8678d25267e66aff7134f064fddb4eac5c5641 Mon Sep 17 00:00:00 2001 From: Mark Jansen Date: Sun, 8 Mar 2015 18:24:48 +0100 -Subject: ntdll/tests: Tests for RtlIpv4StringToAddressEx (try 5, resend) +Subject: [PATCH] ntdll/tests: Tests for RtlIpv4StringToAddressEx (try 5, + resend) Changes from try4: -Remove leftover comments @@ -11,14 +12,14 @@ Changes from try3: -Change strict_is_different to a flag -Add ipv4 init function to avoid code duplication --- - dlls/ntdll/tests/rtl.c | 371 ++++++++++++++++++++++++++++++++----------------- - 1 file changed, 247 insertions(+), 124 deletions(-) + dlls/ntdll/tests/rtl.c | 284 ++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 246 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c -index 5d789d1..79c4974 100644 +index cf14e65..941a92c 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c -@@ -90,6 +90,7 @@ static IMAGE_BASE_RELOCATION *(WINAPI *pLdrProcessRelocationBlock)(void*,UINT,US +@@ -92,6 +92,7 @@ static IMAGE_BASE_RELOCATION *(WINAPI *pLdrProcessRelocationBlock)(void*,UINT,US static CHAR * (WINAPI *pRtlIpv4AddressToStringA)(const IN_ADDR *, LPSTR); static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); static NTSTATUS (WINAPI *pRtlIpv4StringToAddressA)(PCSTR, BOOLEAN, PCSTR *, IN_ADDR *); @@ -26,7 +27,7 @@ index 5d789d1..79c4974 100644 static NTSTATUS (WINAPI *pRtlIpv6StringToAddressA)(PCSTR, PCSTR *, struct in6_addr *); static NTSTATUS (WINAPI *pRtlIpv6StringToAddressW)(PCWSTR, PCWSTR *, struct in6_addr *); static NTSTATUS (WINAPI *pRtlIpv6StringToAddressExA)(PCSTR, struct in6_addr *, PULONG, PUSHORT); -@@ -142,6 +143,7 @@ static void InitFunctionPtrs(void) +@@ -159,6 +160,7 @@ static void InitFunctionPtrs(void) pRtlIpv4AddressToStringA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringA"); pRtlIpv4AddressToStringExA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringExA"); pRtlIpv4StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv4StringToAddressA"); @@ -34,7 +35,7 @@ index 5d789d1..79c4974 100644 pRtlIpv6StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv6StringToAddressA"); pRtlIpv6StringToAddressW = (void *)GetProcAddress(hntdll, "RtlIpv6StringToAddressW"); pRtlIpv6StringToAddressExA = (void *)GetProcAddress(hntdll, "RtlIpv6StringToAddressExA"); -@@ -1331,98 +1333,109 @@ static void test_RtlIpv4AddressToStringEx(void) +@@ -1157,6 +1159,102 @@ static void test_RtlIpv4AddressToStringEx(void) res, size, buffer); } @@ -137,100 +138,7 @@ index 5d789d1..79c4974 100644 static void test_RtlIpv4StringToAddress(void) { NTSTATUS res; - IN_ADDR ip, expected_ip; - PCSTR terminator; - CHAR dummy; -- struct -- { -- PCSTR address; -- NTSTATUS res; -- int terminator_offset; -- int ip[4]; -- BOOL strict_is_different; -- NTSTATUS res_strict; -- int terminator_offset_strict; -- int ip_strict[4]; -- } tests[] = -- { -- { "", STATUS_INVALID_PARAMETER, 0, { -1 } }, -- { " ", STATUS_INVALID_PARAMETER, 0, { -1 } }, -- { "1.1.1.1", STATUS_SUCCESS, 7, { 1, 1, 1, 1 } }, -- { "0.0.0.0", STATUS_SUCCESS, 7, { 0, 0, 0, 0 } }, -- { "255.255.255.255", STATUS_SUCCESS, 15, { 255, 255, 255, 255 } }, -- { "255.255.255.255:123", -- STATUS_SUCCESS, 15, { 255, 255, 255, 255 } }, -- { "255.255.255.256", STATUS_INVALID_PARAMETER, 15, { -1 } }, -- { "255.255.255.4294967295", -- STATUS_INVALID_PARAMETER, 22, { -1 } }, -- { "255.255.255.4294967296", -- STATUS_INVALID_PARAMETER, 21, { -1 } }, -- { "255.255.255.4294967297", -- STATUS_INVALID_PARAMETER, 21, { -1 } }, -- { "a", STATUS_INVALID_PARAMETER, 0, { -1 } }, -- { "1.1.1.0xaA", STATUS_SUCCESS, 10, { 1, 1, 1, 170 }, -- TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, -- { "1.1.1.0XaA", STATUS_SUCCESS, 10, { 1, 1, 1, 170 }, -- TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, -- { "1.1.1.0x", STATUS_INVALID_PARAMETER, 8, { -1 } }, -- { "1.1.1.0xff", STATUS_SUCCESS, 10, { 1, 1, 1, 255 }, -- TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, -- { "1.1.1.0x100", STATUS_INVALID_PARAMETER, 11, { -1 }, -- TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, -- { "1.1.1.0xffffffff",STATUS_INVALID_PARAMETER, 16, { -1 }, -- TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, -- { "1.1.1.0x100000000", -- STATUS_INVALID_PARAMETER, 16, { -1, 0, 0, 0 }, -- TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, -- { "1.1.1.010", STATUS_SUCCESS, 9, { 1, 1, 1, 8 }, -- TRUE, STATUS_INVALID_PARAMETER, 7, { -1 } }, -- { "1.1.1.00", STATUS_SUCCESS, 8, { 1, 1, 1, 0 }, -- TRUE, STATUS_INVALID_PARAMETER, 7, { -1 } }, -- { "1.1.1.007", STATUS_SUCCESS, 9, { 1, 1, 1, 7 }, -- TRUE, STATUS_INVALID_PARAMETER, 7, { -1 } }, -- { "1.1.1.08", STATUS_INVALID_PARAMETER, 7, { -1 } }, -- { "1.1.1.008", STATUS_SUCCESS, 8, { 1, 1, 1, 0 }, -- TRUE, STATUS_INVALID_PARAMETER, 7, { -1 } }, -- { "1.1.1.0a", STATUS_SUCCESS, 7, { 1, 1, 1, 0 } }, -- { "1.1.1.0o10", STATUS_SUCCESS, 7, { 1, 1, 1, 0 } }, -- { "1.1.1.0b10", STATUS_SUCCESS, 7, { 1, 1, 1, 0 } }, -- { "1.1.1.-2", STATUS_INVALID_PARAMETER, 6, { -1 } }, -- { "1", STATUS_SUCCESS, 1, { 0, 0, 0, 1 }, -- TRUE, STATUS_INVALID_PARAMETER, 1, { -1 } }, -- { "-1", STATUS_INVALID_PARAMETER, 0, { -1 } }, -- { "203569230", STATUS_SUCCESS, 9, { 12, 34, 56, 78 }, -- TRUE, STATUS_INVALID_PARAMETER, 9, { -1 } }, -- { "1.223756", STATUS_SUCCESS, 8, { 1, 3, 106, 12 }, -- TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, -- { "3.4.756", STATUS_SUCCESS, 7, { 3, 4, 2, 244 }, -- TRUE, 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 } }, -- { "3.4.5.+6", STATUS_INVALID_PARAMETER, 6, { -1 } }, -- { " 3.4.5.6", STATUS_INVALID_PARAMETER, 0, { -1 } }, -- { "\t3.4.5.6", STATUS_INVALID_PARAMETER, 0, { -1 } }, -- { "3.4.5.6 ", STATUS_SUCCESS, 7, { 3, 4, 5, 6 } }, -- { "3. 4.5.6", STATUS_INVALID_PARAMETER, 2, { -1 } }, -- { ".", STATUS_INVALID_PARAMETER, 1, { -1 } }, -- { "..", STATUS_INVALID_PARAMETER, 1, { -1 } }, -- { "1.", STATUS_INVALID_PARAMETER, 2, { -1 } }, -- { "1..", STATUS_INVALID_PARAMETER, 3, { -1 } }, -- { ".1", STATUS_INVALID_PARAMETER, 1, { -1 } }, -- { ".1.", STATUS_INVALID_PARAMETER, 1, { -1 } }, -- { ".1.2.3", 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 } }, -- { "::1", STATUS_INVALID_PARAMETER, 0, { -1 } }, -- { ":1", STATUS_INVALID_PARAMETER, 0, { -1 } }, -- }; -- const int testcount = sizeof(tests) / sizeof(tests[0]); -- int i; -+ unsigned int i; - - if (!pRtlIpv4StringToAddressA) - { -@@ -1444,65 +1457,174 @@ static void test_RtlIpv4StringToAddress(void) +@@ -1270,65 +1368,174 @@ static void test_RtlIpv4StringToAddress(void) */ } @@ -443,7 +351,7 @@ index 5d789d1..79c4974 100644 /* ipv6 addresses based on the set from https://github.com/beaugunderson/javascript-ipv6/tree/master/test/data */ static const struct -@@ -2318,6 +2440,7 @@ START_TEST(rtl) +@@ -3300,6 +3507,7 @@ START_TEST(rtl) test_RtlIpv4AddressToString(); test_RtlIpv4AddressToStringEx(); test_RtlIpv4StringToAddress(); @@ -452,5 +360,5 @@ index 5d789d1..79c4974 100644 test_RtlIpv6StringToAddressEx(); test_LdrAddRefDll(); -- -2.3.1 +1.9.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 99e8e09f..5a3360ee 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "cba24001e482fa8a8a1fbf5d5390539e2792b1aa" + echo "9ef8fa2a0bfb559475e17d2562892085f0e2a90f" } # Show version information diff --git a/patches/wininet-InternetCrackUrlW/0002-wininet-Resize-buffer-when-call-to-InternetCanonical.patch b/patches/wininet-InternetCrackUrlW/0002-wininet-Resize-buffer-when-call-to-InternetCanonical.patch index 894becaf..df53c016 100644 --- a/patches/wininet-InternetCrackUrlW/0002-wininet-Resize-buffer-when-call-to-InternetCanonical.patch +++ b/patches/wininet-InternetCrackUrlW/0002-wininet-Resize-buffer-when-call-to-InternetCanonical.patch @@ -1,8 +1,8 @@ -From 51710ebbc5afe6c6e9eb4a74dda121b8355f4f33 Mon Sep 17 00:00:00 2001 +From 77f892d376d01bce431b582e046f6bc1c34a824f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 16 May 2016 22:36:25 +0200 -Subject: wininet: Resize buffer when call to InternetCanonicalizeUrlW fails in - InternetCrackUrlW. +Subject: [PATCH] wininet: Resize buffer when call to InternetCanonicalizeUrlW + fails in InternetCrackUrlW. --- dlls/wininet/internet.c | 21 ++++++++++++++++++--- @@ -10,10 +10,10 @@ Subject: wininet: Resize buffer when call to InternetCanonicalizeUrlW fails in 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c -index 4e1f3b9..c525b79 100644 +index 0a0f8a7..1fbfd66 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c -@@ -1666,7 +1666,7 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF +@@ -1664,7 +1664,7 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF if (dwFlags & ICU_DECODE) { @@ -22,7 +22,7 @@ index 4e1f3b9..c525b79 100644 DWORD len = dwUrlLength + 1; BOOL ret; -@@ -1675,9 +1675,24 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF +@@ -1673,9 +1673,24 @@ BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwF SetLastError(ERROR_OUTOFMEMORY); return FALSE; } @@ -50,12 +50,12 @@ index 4e1f3b9..c525b79 100644 return ret; } diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c -index 7b1fd72..b774f1b 100644 +index 18c77b6..19ae7c3 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -816,9 +816,9 @@ static void InternetCrackUrlW_test(void) comp.lpszUrlPath = urlpart; - comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); + comp.dwUrlPathLength = ARRAY_SIZE(urlpart); r = InternetCrackUrlW(url3, 0, ICU_DECODE, &comp); - todo_wine ok(r, "InternetCrackUrlW failed unexpectedly\n"); - todo_wine ok(!strcmp_wa(host, "x.org"), "host is %s, should be x.org\n", wine_dbgstr_w(host)); @@ -67,5 +67,5 @@ index 7b1fd72..b774f1b 100644 static void fill_url_components(URL_COMPONENTSA *lpUrlComponents) -- -2.8.0 +1.9.1