February 2024 - Wine-Commits

Daniel Lehman : oleaut32: Handle exponent in VarBstrFromR[48] in non-English locales.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: 834558245bac2e7e85a0e21da66bcf355431ba5d URL: https://gitlab.winehq.org/wine/wine/-/commit/834558245bac2e7e85a0e21da66bcf… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Feb 6 22:46:20 2024 -0800 oleaut32: Handle exponent in VarBstrFromR[48] in non-English locales. --- dlls/oleaut32/tests/vartype.c | 8 ++++---- dlls/oleaut32/vartype.c | 13 ++++++++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index e567f5a5fed..c6772a7be14 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4570,11 +4570,11 @@ static void test_VarBstrFromR4(void) { 1.0e14, L"1E+14" }, { 999999999999999.0, L"1E+15" }, { 1000000000000000.0, L"1E+15" }, - { 1200000000000000.0, L"1,2E+15", TRUE }, + { 1200000000000000.0, L"1,2E+15" }, { 1.0e15, L"1E+15" }, { 1.000e16, L"1E+16" }, - { 1.234e16, L"1,234E+16", TRUE }, + { 1.234e16, L"1,234E+16" }, { M_PI, L"3,141593" }, { 0.0, NULL } @@ -4710,11 +4710,11 @@ static void test_VarBstrFromR8(void) { 1.0e14, L"100000000000000" }, { 999999999999999.0, L"999999999999999" }, { 1000000000000000.0, L"1E+15" }, - { 1200000000000000.0, L"1,2E+15", TRUE }, + { 1200000000000000.0, L"1,2E+15" }, { 1.0e15, L"1E+15" }, { 1.000e16, L"1E+16" }, - { 1.234e16, L"1,234E+16", TRUE }, + { 1.234e16, L"1,234E+16" }, { 0.0, NULL } }; diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index d51cee3ee82..3ab404f33f8 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6497,7 +6497,7 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl } else { - WCHAR *p; + WCHAR *p, *e; WCHAR numbuff[256]; WCHAR empty[] = L""; NUMBERFMTW minFormat; @@ -6512,9 +6512,11 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl (WCHAR *)&minFormat.LeadingZero, sizeof(DWORD)/sizeof(WCHAR) ); /* count number of decimal digits in string */ - p = wcschr( buff, '.' ); - if (p) minFormat.NumDigits = lstrlenW(p + 1); + p = wcschr(buff, '.'); + e = wcschr(p ? ++p : buff, 'E'); + if (p) minFormat.NumDigits = e ? e - p : lstrlenW(p); + if (e) *e = '\0'; numbuff[0] = '\0'; if (!GetNumberFormatW(lcid, 0, buff, &minFormat, numbuff, ARRAY_SIZE(numbuff))) { @@ -6523,6 +6525,11 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl } else { + if (e) + { + *e = 'E'; + wcscat(numbuff, e); + } TRACE("created minimal NLS string %s\n", debugstr_w(numbuff)); bstrOut = SysAllocString(numbuff); }

1 0

Mohamad Al-Jaf : windows.security.authentication.onlineid: Add IOnlineIdSystemAuthenticatorStatics stub interface.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: a3ef7d7487f0bc46e29cd2317a5121cba7c35c10 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3ef7d7487f0bc46e29cd2317a5121… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 18 00:25:06 2022 -0500 windows.security.authentication.onlineid: Add IOnlineIdSystemAuthenticatorStatics stub interface. --- .../authenticator.c | 39 +++++++++ .../private.h | 40 +++++++++ .../tests/onlineid.c | 6 ++ .../windows.security.authentication.onlineid.idl | 96 ++++++++++++++++++++++ 4 files changed, 181 insertions(+)

1 0

Fabian Maurer : user32/sysparams: Handle more contexts in GetAwarenessFromDpiAwarenessContext.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: 5ffed8830cbc619219eae9a9f48b5f83bced7ad4 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ffed8830cbc619219eae9a9f48b5f… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Feb 9 20:11:44 2024 +0100 user32/sysparams: Handle more contexts in GetAwarenessFromDpiAwarenessContext. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55630 --- dlls/user32/sysparams.c | 4 ++++ dlls/user32/tests/sysparams.c | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 18e02f1524b..ec8dc11af17 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -656,14 +656,18 @@ DPI_AWARENESS WINAPI GetAwarenessFromDpiAwarenessContext( DPI_AWARENESS_CONTEXT case 0x10: case 0x11: case 0x12: + case 0x22: case 0x80000010: case 0x80000011: case 0x80000012: + case 0x80000022: return (ULONG_PTR)context & 3; case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE: case (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE: case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE: return ~(ULONG_PTR)context; + case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2: + return ~(ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE; default: return DPI_AWARENESS_INVALID; } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index ba6ed0c8b4c..16756ecb06a 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3940,7 +3940,6 @@ static void test_dpi_context(void) ok( awareness == (i & ~0x10), "%Ix: wrong value %u\n", i, awareness ); break; case 0x22: - todo_wine ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, "%Ix: wrong value %u\n", i, awareness ); break; @@ -3967,7 +3966,6 @@ static void test_dpi_context(void) ok( awareness == (i & ~0x10), "%Ix: wrong value %u\n", i | 0x80000000, awareness ); break; case 0x22: - todo_wine ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken ( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, "%Ix: wrong value %u\n", i, awareness ); break; @@ -3989,7 +3987,6 @@ static void test_dpi_context(void) ok( pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ), "%Ix: not valid\n", ~i ); break; case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2: - todo_wine ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken ( awareness == DPI_AWARENESS_INVALID ), "%Ix: wrong value %u\n", ~i, awareness ); break; case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED:

1 0

Mohamad Al-Jaf : windows.security.authentication.onlineid: Add stub DLL.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: 9809102897332169786b71a38359a7ed76aa71b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/9809102897332169786b71a38359a7… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 18 00:12:09 2022 -0500 windows.security.authentication.onlineid: Add stub DLL. --- configure | 3 + configure.ac | 2 + .../Makefile.in | 7 ++ .../authenticator.c | 116 +++++++++++++++++++++ .../classes.idl | 23 ++++ .../main.c | 46 ++++++++ .../private.h | 40 +++++++ .../tests/Makefile.in | 5 + .../tests/onlineid.c | 86 +++++++++++++++ .../windows.security.authentication.onlineid.spec | 3 + 10 files changed, 331 insertions(+)

1 0

Zebediah Figura : kernelbase: Reimplement UrlCanonicalize().
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: 37aabda67ebab9db607bd42a36809274de0fabf3 URL: https://gitlab.winehq.org/wine/wine/-/commit/37aabda67ebab9db607bd42a368092… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 23 00:01:25 2024 -0600 kernelbase: Reimplement UrlCanonicalize(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=23166 --- dlls/kernelbase/path.c | 878 +++++++++++++++++++++++++++++++++-------------- dlls/shlwapi/tests/url.c | 12 +- 2 files changed, 618 insertions(+), 272 deletions(-)

1 0

Zebediah Figura : kernelbase: Use scheme_is_opaque() in UrlIs().
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: 5ca8e4b00d9b95813552d5e43fb3a7d633eedf17 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ca8e4b00d9b95813552d5e43fb3a7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 23 23:42:57 2024 -0600 kernelbase: Use scheme_is_opaque() in UrlIs(). --- dlls/kernelbase/path.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 71f63d25b94..548982e4e7e 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4816,16 +4816,7 @@ BOOL WINAPI UrlIsA(const char *url, URLIS Urlis) case URLIS_OPAQUE: base.cbSize = sizeof(base); if (ParseURLA(url, &base) != S_OK) return FALSE; /* invalid scheme */ - switch (base.nScheme) - { - case URL_SCHEME_MAILTO: - case URL_SCHEME_SHELL: - case URL_SCHEME_JAVASCRIPT: - case URL_SCHEME_VBSCRIPT: - case URL_SCHEME_ABOUT: - return TRUE; - } - return FALSE; + return scheme_is_opaque( base.nScheme ); case URLIS_FILEURL: return (CompareStringA(LOCALE_INVARIANT, NORM_IGNORECASE, url, 5, "file:", 5) == CSTR_EQUAL);

1 0

Fabian Maurer : user32/sysparams: Only allow dpi awareness tests to return invalid on windows.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: d34cbe61db29a7e387fb033dec5510c2214c0548 URL: https://gitlab.winehq.org/wine/wine/-/commit/d34cbe61db29a7e387fb033dec5510… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Feb 9 20:07:11 2024 +0100 user32/sysparams: Only allow dpi awareness tests to return invalid on windows. We can't use IsValidDpiAwarenessContext since this uses GetAwarenessFromDpiAwarenessContext which we're testing --- dlls/user32/tests/sysparams.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 3f25baf3589..ba6ed0c8b4c 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3929,18 +3929,19 @@ static void test_dpi_context(void) switch (i) { case 0x10: - ok( awareness == DPI_AWARENESS_UNAWARE || awareness == DPI_AWARENESS_INVALID /* Win10 1709+ */, + ok( awareness == DPI_AWARENESS_UNAWARE || broken( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, "%Ix: wrong value %u\n", i, awareness ); break; case 0x11: - ok( awareness == DPI_AWARENESS_SYSTEM_AWARE || awareness == DPI_AWARENESS_INVALID /* Win10 1709+ */, + ok( awareness == DPI_AWARENESS_SYSTEM_AWARE || broken( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, "%Ix: wrong value %u\n", i, awareness ); break; case 0x12: ok( awareness == (i & ~0x10), "%Ix: wrong value %u\n", i, awareness ); break; case 0x22: - ok( awareness == DPI_AWARENESS_INVALID || awareness == DPI_AWARENESS_PER_MONITOR_AWARE /* Win10 1709+ */, + todo_wine + ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, "%Ix: wrong value %u\n", i, awareness ); break; default: @@ -3955,18 +3956,19 @@ static void test_dpi_context(void) switch (i) { case 0x10: - ok( awareness == DPI_AWARENESS_UNAWARE || awareness == DPI_AWARENESS_INVALID /* Win10 1709+ */, + ok( awareness == DPI_AWARENESS_UNAWARE || broken( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, "%Ix: wrong value %u\n", i | 0x80000000, awareness ); break; case 0x11: - ok( awareness == DPI_AWARENESS_SYSTEM_AWARE || awareness == DPI_AWARENESS_INVALID /* Win10 1709+ */, + ok( awareness == DPI_AWARENESS_SYSTEM_AWARE || broken( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, "%Ix: wrong value %u\n", i | 0x80000000, awareness ); break; case 0x12: ok( awareness == (i & ~0x10), "%Ix: wrong value %u\n", i | 0x80000000, awareness ); break; case 0x22: - ok( awareness == DPI_AWARENESS_INVALID || awareness == DPI_AWARENESS_PER_MONITOR_AWARE /* Win10 1709+ */, + todo_wine + ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken ( awareness == DPI_AWARENESS_INVALID ) /* Win10 1709+ */, "%Ix: wrong value %u\n", i, awareness ); break; default: @@ -3987,16 +3989,12 @@ static void test_dpi_context(void) ok( pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ), "%Ix: not valid\n", ~i ); break; case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2: - if (pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i )) - ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE, "%Ix: wrong value %u\n", ~i, awareness ); - else - ok( awareness == DPI_AWARENESS_INVALID, "%Ix: wrong value %u\n", ~i, awareness ); + todo_wine + ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE || broken ( awareness == DPI_AWARENESS_INVALID ), "%Ix: wrong value %u\n", ~i, awareness ); break; case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED: - if (pIsValidDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i )) - ok( awareness == DPI_AWARENESS_UNAWARE, "%Ix: wrong value %u\n", ~i, awareness ); - else - ok( awareness == DPI_AWARENESS_INVALID, "%Ix: wrong value %u\n", ~i, awareness ); + todo_wine + ok( awareness == DPI_AWARENESS_UNAWARE || broken ( awareness == DPI_AWARENESS_INVALID ), "%Ix: wrong value %u\n", ~i, awareness ); break; default: ok( awareness == DPI_AWARENESS_INVALID, "%Ix: wrong value %u\n", ~i, awareness );

1 0

Zebediah Figura : shlwapi/tests: Add many more tests for UrlCanonicalize().
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: f74f8b9ef37dd9cd7ee3a2b0022934ba33215d96 URL: https://gitlab.winehq.org/wine/wine/-/commit/f74f8b9ef37dd9cd7ee3a2b0022934… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 23 23:44:13 2024 -0600 shlwapi/tests: Add many more tests for UrlCanonicalize(). --- dlls/shlwapi/tests/url.c | 1165 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 1083 insertions(+), 82 deletions(-)

1 0

Zebediah Figura : kernelbase: Do not use isalnum() with Unicode characters.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: 13d48ed315fe4119f06b8d42dc14ee91eb7e43f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/13d48ed315fe4119f06b8d42dc14ee… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 6 11:04:05 2024 -0600 kernelbase: Do not use isalnum() with Unicode characters. It does not expect code points higher than U+00FF and will read past the end of the ctypes[] array. --- dlls/kernelbase/path.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 40ddf840045..067bb0c87a7 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -1769,7 +1769,7 @@ UINT WINAPI PathGetCharTypeW(WCHAR ch) { if (ch < 126) { - if (((ch & 0x1) && ch != ';') || !ch || isalnum(ch) || ch == '$' || ch == '&' || ch == '(' || + if (((ch & 0x1) && ch != ';') || !ch || iswalnum(ch) || ch == '$' || ch == '&' || ch == '(' || ch == '.' || ch == '@' || ch == '^' || ch == '\'' || ch == '`') { flags |= GCT_SHORTCHAR; /* All these are valid for DOS */ @@ -2824,7 +2824,7 @@ HRESULT WINAPI ParseURLW(const WCHAR *url, PARSEDURLW *result) if (result->cbSize != sizeof(*result)) return E_INVALIDARG; - while (*ptr && (isalnum(*ptr) || *ptr == '-' || *ptr == '+' || *ptr == '.')) + while (*ptr && (iswalnum(*ptr) || *ptr == '-' || *ptr == '+' || *ptr == '.')) ptr++; if (*ptr != ':' || ptr <= url + 1) @@ -3260,7 +3260,7 @@ static BOOL url_needs_escape(WCHAR ch, DWORD flags, DWORD int_flags) if (ch <= 31 || (ch >= 127 && ch <= 255) ) return TRUE; - if (isalnum(ch)) + if (iswalnum(ch)) return FALSE; switch (ch) { @@ -3655,9 +3655,9 @@ HRESULT WINAPI UrlCanonicalizeW(const WCHAR *src_url, WCHAR *canonicalized, DWOR switch (state) { case 0: - if (!isalnum(*wk1)) {state = 3; break;} + if (!iswalnum(*wk1)) {state = 3; break;} *wk2++ = *wk1++; - if (!isalnum(*wk1)) {state = 3; break;} + if (!iswalnum(*wk1)) {state = 3; break;} *wk2++ = *wk1++; state = 1; break; @@ -3743,12 +3743,12 @@ HRESULT WINAPI UrlCanonicalizeW(const WCHAR *src_url, WCHAR *canonicalized, DWOR } break; case 4: - if (!isalnum(*wk1) && (*wk1 != '-') && (*wk1 != '.') && (*wk1 != ':')) + if (!iswalnum(*wk1) && (*wk1 != '-') && (*wk1 != '.') && (*wk1 != ':')) { state = 3; break; } - while (isalnum(*wk1) || (*wk1 == '-') || (*wk1 == '.') || (*wk1 == ':')) + while (iswalnum(*wk1) || (*wk1 == '-') || (*wk1 == '.') || (*wk1 == ':')) *wk2++ = *wk1++; state = 5; if (!*wk1) @@ -4225,7 +4225,7 @@ HRESULT WINAPI UrlGetPartA(const char *url, char *out, DWORD *out_len, DWORD par static const WCHAR *parse_scheme( const WCHAR *p ) { - while (isalnum( *p ) || *p == '+' || *p == '-' || *p == '.') + while (iswalnum( *p ) || *p == '+' || *p == '-' || *p == '.') ++p; return p; }

1 0

Zebediah Figura : kernelbase: Do not canonicalize the relative part in UrlCombine().
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: 80a92c07f566e396e68280316efb46ba5fb9099a URL: https://gitlab.winehq.org/wine/wine/-/commit/80a92c07f566e396e68280316efb46… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 23 00:33:45 2024 -0600 kernelbase: Do not canonicalize the relative part in UrlCombine(). --- dlls/kernelbase/path.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 067bb0c87a7..5f25135ba11 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4662,7 +4662,7 @@ HRESULT WINAPI UrlCombineA(const char *base, const char *relative, char *combine HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *combined, DWORD *combined_len, DWORD flags) { DWORD i, len, process_case = 0, myflags, sizeloc = 0; - LPWSTR work, preliminary, mbase, mrelative; + LPWSTR work, preliminary, mbase, canonicalized; PARSEDURLW base, relative; HRESULT hr; @@ -4677,7 +4677,7 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co /* Get space for duplicates of the input and the output */ preliminary = heap_alloc(3 * INTERNET_MAX_URL_LENGTH * sizeof(WCHAR)); mbase = preliminary + INTERNET_MAX_URL_LENGTH; - mrelative = mbase + INTERNET_MAX_URL_LENGTH; + canonicalized = mbase + INTERNET_MAX_URL_LENGTH; *preliminary = '\0'; /* Canonicalize the base input prior to looking for the scheme */ @@ -4685,10 +4685,6 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co len = INTERNET_MAX_URL_LENGTH; UrlCanonicalizeW(baseW, mbase, &len, myflags); - /* Canonicalize the relative input prior to looking for the scheme */ - len = INTERNET_MAX_URL_LENGTH; - UrlCanonicalizeW(relativeW, mrelative, &len, myflags); - /* See if the base has a scheme */ if (ParseURLW(mbase, &base) != S_OK) { @@ -4787,12 +4783,12 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co * the last '/' */ - if (ParseURLW(mrelative, &relative) != S_OK) + if (ParseURLW(relativeW, &relative) != S_OK) { /* No scheme in relative */ TRACE("no scheme detected in Relative\n"); - relative.pszSuffix = mrelative; /* case 3,4,5 depends on this */ - relative.cchSuffix = lstrlenW(mrelative); + relative.pszSuffix = relativeW; /* case 3,4,5 depends on this */ + relative.cchSuffix = lstrlenW( relativeW ); if (*relativeW == ':') { /* Case that is either left alone or uses base. */ @@ -4804,26 +4800,26 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co process_case = 1; break; } - if (is_drive_spec( mrelative )) + if (is_drive_spec( relativeW )) { /* case that becomes "file:///" */ lstrcpyW(preliminary, L"file:///"); process_case = 1; break; } - if (*mrelative == '/' && *(mrelative+1) == '/') + if (relativeW[0] == '/' && relativeW[1] == '/') { /* Relative has location and the rest. */ process_case = 3; break; } - if (*mrelative == '/') + if (*relativeW == '/') { /* Relative is root to location. */ process_case = 4; break; } - if (*mrelative == '#') + if (*relativeW == '#') { if (!(work = wcschr(base.pszSuffix+base.cchSuffix, '#'))) work = (LPWSTR)base.pszSuffix + lstrlenW(base.pszSuffix); @@ -4880,12 +4876,12 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co { case 1: /* Return relative appended to whatever is in combined (which may the string "file:///" */ - lstrcatW(preliminary, mrelative); + lstrcatW(preliminary, relativeW); break; case 2: /* Relative replaces scheme and location */ - lstrcpyW(preliminary, mrelative); + lstrcpyW(preliminary, relativeW); break; case 3: @@ -4920,12 +4916,11 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co if (hr == S_OK) { - /* Reuse mrelative as temp storage as it's already allocated and not needed anymore */ if (*combined_len == 0) *combined_len = 1; - hr = UrlCanonicalizeW(preliminary, mrelative, combined_len, flags & ~URL_FILE_USE_PATHURL); + hr = UrlCanonicalizeW(preliminary, canonicalized, combined_len, flags & ~URL_FILE_USE_PATHURL); if (SUCCEEDED(hr) && combined) - lstrcpyW(combined, mrelative); + lstrcpyW( combined, canonicalized ); TRACE("return-%ld len=%ld, %s\n", process_case, *combined_len, debugstr_w(combined)); }

1 0