July 2014 - Wine-Commits - list.winehq.org

Jacek Caban : wininet.h: Added InternetCookieState declaration.
by Alexandre Julliard July 4, 2014

July 4, 2014

Module: wine Branch: master Commit: 0d5e3e74d5849c9ae0bc108f363dfe061e61f5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d5e3e74d5849c9ae0bc108f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 4 14:45:07 2014 +0200 wininet.h: Added InternetCookieState declaration. --- include/wininet.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/wininet.h b/include/wininet.h index a1c332b..9e0fb40 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1305,6 +1305,16 @@ BOOLAPI HttpQueryInfoA(HINTERNET ,DWORD ,LPVOID ,LPDWORD ,LPDWORD); BOOLAPI HttpQueryInfoW(HINTERNET ,DWORD ,LPVOID ,LPDWORD ,LPDWORD); #define HttpQueryInfo WINELIB_NAME_AW(HttpQueryInfo) +typedef enum { + COOKIE_STATE_UNKNOWN, + COOKIE_STATE_ACCEPT, + COOKIE_STATE_PROMPT, + COOKIE_STATE_LEASH, + COOKIE_STATE_DOWNGRADE, + COOKIE_STATE_REJECT, + COOKIE_STATE_MAX = COOKIE_STATE_REJECT +} InternetCookieState; + BOOLAPI InternetClearAllPerSiteCookieDecisions(VOID); BOOLAPI InternetEnumPerSiteCookieDecisionA(LPSTR,ULONG *,ULONG *,ULONG);

1 0

Jacek Caban : wininet: Forward InternetSetCookieExA to InternetSetCookieExW instead of InternetSetCookieA.
by Alexandre Julliard July 4, 2014

July 4, 2014

Module: wine Branch: master Commit: 9228a3be52efc80b66951abbfe5999b3e18da4af URL: http://source.winehq.org/git/wine.git/?a=commit;h=9228a3be52efc80b66951abbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 4 14:45:01 2014 +0200 wininet: Forward InternetSetCookieExA to InternetSetCookieExW instead of InternetSetCookieA. --- dlls/wininet/cookie.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index b48cc04..fbc6949 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -1073,12 +1073,22 @@ BOOL WINAPI InternetSetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, DWORD WINAPI InternetSetCookieExA( LPCSTR lpszURL, LPCSTR lpszCookieName, LPCSTR lpszCookieData, DWORD dwFlags, DWORD_PTR dwReserved) { - TRACE("(%s, %s, %s, 0x%08x, 0x%08lx)\n", - debugstr_a(lpszURL), debugstr_a(lpszCookieName), debugstr_a(lpszCookieData), - dwFlags, dwReserved); + WCHAR *data, *url, *name; + DWORD r; - if (dwFlags) FIXME("flags 0x%08x not supported\n", dwFlags); - return InternetSetCookieA(lpszURL, lpszCookieName, lpszCookieData); + TRACE("(%s, %s, %s, %x, %lx)\n", debugstr_a(lpszURL), debugstr_a(lpszCookieName), + debugstr_a(lpszCookieData), dwFlags, dwReserved); + + url = heap_strdupAtoW(lpszURL); + name = heap_strdupAtoW(lpszCookieName); + data = heap_strdupAtoW(lpszCookieData); + + r = InternetSetCookieExW(url, name, data, dwFlags, dwReserved); + + heap_free( data ); + heap_free( name ); + heap_free( url ); + return r; } /***********************************************************************

1 0

Erich E. Hoover : advapi32: Implement RegSetKeySecurity on top of NtSetSecurityObject.
by Alexandre Julliard July 4, 2014

July 4, 2014

Module: wine Branch: master Commit: f9f3b21fb3a8b8266fa25ae7acb6790195b78f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f3b21fb3a8b8266fa25ae7a… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Jul 4 10:10:45 2014 -0600 advapi32: Implement RegSetKeySecurity on top of NtSetSecurityObject. --- dlls/advapi32/registry.c | 4 ++-- dlls/advapi32/tests/registry.c | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index d568ae0..bb68b3d 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2488,9 +2488,9 @@ LSTATUS WINAPI RegSetKeySecurity( HKEY hkey, SECURITY_INFORMATION SecurityInfo, if (!pSecurityDesc) return ERROR_INVALID_PARAMETER; - FIXME(":(%p,%d,%p): stub\n",hkey,SecurityInfo,pSecurityDesc); + if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; - return ERROR_SUCCESS; + return RtlNtStatusToDosError( NtSetSecurityObject( hkey, SecurityInfo, pSecurityDesc ) ); } diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 0626aff..85f50ce 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1103,14 +1103,15 @@ static void test_reg_open_key(void) } else { - /* The "sanctioned" methods of setting a registry ACL aren't implemented in Wine. */ - bRet = SetKernelObjectSecurity(hkRoot64, DACL_SECURITY_INFORMATION, sd); - ok(bRet == TRUE, - "Expected SetKernelObjectSecurity to return TRUE, got %d, last error %u\n", bRet, GetLastError()); + LONG error; - bRet = SetKernelObjectSecurity(hkRoot32, DACL_SECURITY_INFORMATION, sd); - ok(bRet == TRUE, - "Expected SetKernelObjectSecurity to return TRUE, got %d, last error %u\n", bRet, GetLastError()); + error = RegSetKeySecurity(hkRoot64, DACL_SECURITY_INFORMATION, sd); + ok(error == ERROR_SUCCESS, + "Expected RegSetKeySecurity to return success, got error %u\n", error); + + bRet = RegSetKeySecurity(hkRoot32, DACL_SECURITY_INFORMATION, sd); + ok(error == ERROR_SUCCESS, + "Expected RegSetKeySecurity to return success, got error %u\n", error); hkResult = NULL; ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine", 0, KEY_WOW64_64KEY | KEY_READ, &hkResult); @@ -1264,14 +1265,13 @@ static void test_reg_create_key(void) } else { - /* The "sanctioned" methods of setting a registry ACL aren't implemented in Wine. */ - bRet = SetKernelObjectSecurity(hkRoot64, DACL_SECURITY_INFORMATION, sd); - ok(bRet == TRUE, - "Expected SetKernelObjectSecurity to return TRUE, got %d, last error %u\n", bRet, GetLastError()); - - bRet = SetKernelObjectSecurity(hkRoot32, DACL_SECURITY_INFORMATION, sd); - ok(bRet == TRUE, - "Expected SetKernelObjectSecurity to return TRUE, got %d, last error %u\n", bRet, GetLastError()); + ret = RegSetKeySecurity(hkRoot64, DACL_SECURITY_INFORMATION, sd); + ok(ret == ERROR_SUCCESS, + "Expected RegSetKeySecurity to return success, got error %u\n", ret); + + ret = RegSetKeySecurity(hkRoot32, DACL_SECURITY_INFORMATION, sd); + ok(ret == ERROR_SUCCESS, + "Expected RegSetKeySecurity to return success, got error %u\n", ret); hkey1 = NULL; ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine", 0, NULL, 0,

1 0

Jacek Caban : wininet/tests: Added INTERNET_COOKIE_HTTPONLY tests.
by Alexandre Julliard July 4, 2014

July 4, 2014

Module: wine Branch: master Commit: b4ce0760e5e65f06b91c5afacd12470e1e2c2849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ce0760e5e65f06b91c5afac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 4 14:45:40 2014 +0200 wininet/tests: Added INTERNET_COOKIE_HTTPONLY tests. --- dlls/wininet/tests/internet.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index e2ad17a..17e16ab 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -557,6 +557,46 @@ static void test_complicated_cookie(void) todo_wine ok(!ret, "InternetSetCookie succeeded\n"); } +static void test_cookie_attrs(void) +{ + char buf[100]; + DWORD size, state; + BOOL ret; + + if(!GetProcAddress(GetModuleHandleA("wininet.dll"), "InternetGetSecurityInfoByURLA")) { + win_skip("Skipping cookie attributes tests. Too old IE.\n"); + return; + } + + ret = InternetSetCookieA("http://cookie.attrs.com/bar", NULL, "A=data; httponly"); + ok(!ret && GetLastError() == ERROR_INVALID_OPERATION, "InternetSetCookie returned: %x (%u)\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + state = InternetSetCookieExA("http://cookie.attrs.com/bar", NULL, "A=data; httponly", 0, 0); + ok(state == COOKIE_STATE_REJECT && GetLastError() == ERROR_INVALID_OPERATION, + "InternetSetCookieEx returned: %x (%u)\n", ret, GetLastError()); + + size = sizeof(buf); + ret = InternetGetCookieExA("http://cookie.attrs.com/", NULL, buf, &size, INTERNET_COOKIE_HTTPONLY, NULL); + ok(!ret && GetLastError() == ERROR_NO_MORE_ITEMS, "InternetGetCookieEx returned: %x (%u)\n", ret, GetLastError()); + + state = InternetSetCookieExA("http://cookie.attrs.com/bar",NULL,"A=data; httponly", INTERNET_COOKIE_HTTPONLY, 0); + ok(state == COOKIE_STATE_ACCEPT,"InternetSetCookieEx failed: %u\n", GetLastError()); + + size = sizeof(buf); + ret = InternetGetCookieA("http://cookie.attrs.com/", NULL, buf, &size); + ok(!ret && GetLastError() == ERROR_NO_MORE_ITEMS, "InternetGetCookie returned: %x (%u)\n", ret, GetLastError()); + + size = sizeof(buf); + ret = InternetGetCookieExA("http://cookie.attrs.com/", NULL, buf, &size, 0, NULL); + ok(!ret && GetLastError() == ERROR_NO_MORE_ITEMS, "InternetGetCookieEx returned: %x (%u)\n", ret, GetLastError()); + + size = sizeof(buf); + ret = InternetGetCookieExA("http://cookie.attrs.com/", NULL, buf, &size, INTERNET_COOKIE_HTTPONLY, NULL); + ok(ret, "InternetGetCookieEx failed: %u\n", GetLastError()); + ok(!strcmp(buf, "A=data"), "data = %s\n", buf); +} + static void test_cookie_url(void) { WCHAR bufw[512]; @@ -1618,6 +1658,7 @@ START_TEST(internet) test_get_cookie(); test_complicated_cookie(); test_cookie_url(); + test_cookie_attrs(); test_version(); test_null(); test_Option_PerConnectionOption();

1 0

Jacek Caban : wininet: Added support for INTERNET_COOKIE_HTTPONLY flag to InternetGetCookieEx.
by Alexandre Julliard July 4, 2014

July 4, 2014

Module: wine Branch: master Commit: db441cf58f03396315fb8ae507c1f6fd3a1ed742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db441cf58f03396315fb8ae50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 4 14:45:34 2014 +0200 wininet: Added support for INTERNET_COOKIE_HTTPONLY flag to InternetGetCookieEx. --- dlls/wininet/cookie.c | 7 +++++-- dlls/wininet/http.c | 4 ++-- dlls/wininet/internet.h | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 36e0f60..0af8c38 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -531,7 +531,7 @@ static void COOKIE_deleteDomain(cookie_domain *deadDomain) heap_free(deadDomain); } -DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD *size) +DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD *size, DWORD flags) { static const WCHAR empty_path[] = { '/',0 }; @@ -590,6 +590,9 @@ DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD continue; } + if((cookie_iter->flags & INTERNET_COOKIE_HTTPONLY) && !(flags & INTERNET_COOKIE_HTTPONLY)) + continue; + if (cookie_count) cnt += 2; /* '; ' */ cnt += name_len = strlenW(cookie_iter->lpCookieName); @@ -686,7 +689,7 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, return FALSE; } - res = get_cookie(host, path, lpCookieData, lpdwSize); + res = get_cookie(host, path, lpCookieData, lpdwSize, flags); if(res != ERROR_SUCCESS) SetLastError(res); return res == ERROR_SUCCESS; diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index af57d9e..ffd31e6 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4186,7 +4186,7 @@ static void HTTP_InsertCookies(http_request_t *request) if(!host) return; - if(get_cookie(host->lpszValue, request->path, NULL, &cookie_size) != ERROR_SUCCESS) + if(get_cookie(host->lpszValue, request->path, NULL, &cookie_size, INTERNET_COOKIE_HTTPONLY) != ERROR_SUCCESS) return; size = sizeof(cookieW) + cookie_size * sizeof(WCHAR) + sizeof(szCrLf); @@ -4194,7 +4194,7 @@ static void HTTP_InsertCookies(http_request_t *request) return; cnt += sprintfW(cookies, cookieW); - get_cookie(host->lpszValue, request->path, cookies+cnt, &cookie_size); + get_cookie(host->lpszValue, request->path, cookies+cnt, &cookie_size, INTERNET_COOKIE_HTTPONLY); strcatW(cookies, szCrLf); HTTP_HttpAddRequestHeadersW(request, cookies, strlenW(cookies), HTTP_ADDREQ_FLAG_REPLACE); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 233c40c..2647f98 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -420,7 +420,7 @@ DWORD HTTP_Connect(appinfo_t*,LPCWSTR, BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, struct sockaddr *psa, socklen_t *sa_len) DECLSPEC_HIDDEN; -DWORD get_cookie(const WCHAR*,const WCHAR*,WCHAR*,DWORD*) DECLSPEC_HIDDEN; +DWORD get_cookie(const WCHAR*,const WCHAR*,WCHAR*,DWORD*,DWORD) DECLSPEC_HIDDEN; DWORD set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*,DWORD) DECLSPEC_HIDDEN; void INTERNET_SetLastError(DWORD dwError) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : configure: Always build wine.inf even if we don' t install it.
by Alexandre Julliard July 4, 2014

July 4, 2014

Module: wine Branch: master Commit: 3bbbb6d5a73d8c45329d72f1f980377ede79f4c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bbbb6d5a73d8c45329d72f1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 3 21:20:38 2014 +0200 configure: Always build wine.inf even if we don't install it. --- configure | 4 ++-- configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 97ee520..7c2a944 100755 --- a/configure +++ b/configure @@ -7535,6 +7535,8 @@ loader_programs="$wine_binary wine-installed" libwine_soversion=`expr $libwine_version : '$[0-9]*$\..*'` LOADER_RULES=" +all: wine.inf + install install-lib:: wine-installed \$(INSTALL_PROGRAM) wine-installed \$(DESTDIR)\$(bindir)/$wine_binary @@ -17565,8 +17567,6 @@ clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else as_fn_append LOADER_RULES " -all: wine.inf - install install-lib:: wine.inf install-man-pages \$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls diff --git a/configure.ac b/configure.ac index 7d297b0..c913f9f 100644 --- a/configure.ac +++ b/configure.ac @@ -684,6 +684,8 @@ loader_programs="$wine_binary wine-installed" libwine_soversion=`expr $libwine_version : '$[[0-9]]*$\..*'` AC_SUBST(LOADER_RULES,[" +all: wine.inf + install install-lib:: wine-installed \$(INSTALL_PROGRAM) wine-installed \$(DESTDIR)\$(bindir)/$wine_binary @@ -3557,8 +3559,6 @@ clean:: \$(RM) fonts server tools $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else AS_VAR_APPEND([LOADER_RULES],[" -all: wine.inf - install install-lib:: wine.inf install-man-pages \$(INSTALL_DATA) wine.inf \$(DESTDIR)\$(datadir)/wine/wine.inf \$(INSTALL_DATA) \$(srcdir)/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls

1 0

Jacek Caban : wininet: Forward InternetGetCookieA to InternetGetCookieExA, not the other way around.
by Alexandre Julliard July 3, 2014

July 3, 2014

Module: wine Branch: master Commit: 2551f092035eb6dbf18e5d6a5813a3963e3a9249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2551f092035eb6dbf18e5d6a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 3 16:31:12 2014 +0200 wininet: Forward InternetGetCookieA to InternetGetCookieExA, not the other way around. --- dlls/wininet/cookie.c | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index d20ad26..9d7c98a 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -691,7 +691,7 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, /*********************************************************************** - * InternetGetCookieA (WININET.@) + * InternetGetCookieExA (WININET.@) * * Retrieve cookie from the specified url * @@ -700,20 +700,20 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, * FALSE on failure * */ -BOOL WINAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, - LPSTR lpCookieData, LPDWORD lpdwSize) +BOOL WINAPI InternetGetCookieExA(LPCSTR lpszUrl, LPCSTR lpszCookieName, + LPSTR lpCookieData, LPDWORD lpdwSize, DWORD flags, void *reserved) { WCHAR *url, *name; DWORD len, size; BOOL r; - TRACE("(%s %s %p %p(%u))\n", debugstr_a(lpszUrl), debugstr_a(lpszCookieName), - lpCookieData, lpdwSize, lpdwSize ? *lpdwSize : 0); + TRACE("(%s %s %p %p(%u) %x %p)\n", debugstr_a(lpszUrl), debugstr_a(lpszCookieName), + lpCookieData, lpdwSize, lpdwSize ? *lpdwSize : 0, flags, reserved); url = heap_strdupAtoW(lpszUrl); name = heap_strdupAtoW(lpszCookieName); - r = InternetGetCookieW( url, name, NULL, &len ); + r = InternetGetCookieExW( url, name, NULL, &len, flags, reserved ); if( r ) { WCHAR *szCookieData; @@ -725,7 +725,7 @@ BOOL WINAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, } else { - r = InternetGetCookieW( url, name, szCookieData, &len ); + r = InternetGetCookieExW( url, name, szCookieData, &len, flags, reserved ); if(r) { size = WideCharToMultiByte( CP_ACP, 0, szCookieData, len, NULL, 0, NULL, NULL); @@ -748,6 +748,17 @@ BOOL WINAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, return r; } +/*********************************************************************** + * InternetGetCookieA (WININET.@) + * + * See InternetGetCookieW. + */ +BOOL WINAPI InternetGetCookieA(const char *url, const char *name, char *data, DWORD *size) +{ + TRACE("(%s, %s, %s, %p)\n", debugstr_a(url), debugstr_a(name), debugstr_a(data), size); + + return InternetGetCookieExA(url, name, data, size, 0, NULL); +} /*********************************************************************** * IsDomainLegalCookieDomainW (WININET.@) @@ -1078,22 +1089,6 @@ DWORD WINAPI InternetSetCookieExW( LPCWSTR lpszURL, LPCWSTR lpszCookieName, LPCW } /*********************************************************************** - * InternetGetCookieExA (WININET.@) - * - * See InternetGetCookieExW. - */ -BOOL WINAPI InternetGetCookieExA( LPCSTR pchURL, LPCSTR pchCookieName, LPSTR pchCookieData, - LPDWORD pcchCookieData, DWORD dwFlags, LPVOID lpReserved) -{ - TRACE("(%s, %s, %s, %p, 0x%08x, %p)\n", - debugstr_a(pchURL), debugstr_a(pchCookieName), debugstr_a(pchCookieData), - pcchCookieData, dwFlags, lpReserved); - - if (dwFlags) FIXME("flags 0x%08x not supported\n", dwFlags); - return InternetGetCookieA(pchURL, pchCookieName, pchCookieData, pcchCookieData); -} - -/*********************************************************************** * InternetGetCookieExW (WININET.@) * * Retrieve cookie for the specified URL.

1 0

Piotr Caban : ole32: Don't do any message processing when we' re already done with dragdrop operation.
by Alexandre Julliard July 3, 2014

July 3, 2014

Module: wine Branch: master Commit: cdf2c5f2cb3e5969bc83fdae0731a44a8941e68e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf2c5f2cb3e5969bc83fdae0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 3 16:28:20 2014 +0200 ole32: Don't do any message processing when we're already done with dragdrop operation. --- dlls/ole32/ole2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index a017c1b..786fdb4 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2205,7 +2205,9 @@ static LRESULT WINAPI OLEDD_DragTrackerWindowProc( case WM_MBUTTONDOWN: case WM_RBUTTONDOWN: { - OLEDD_TrackStateChange((TrackerWindowInfo*)GetWindowLongPtrA(hwnd, 0)); + TrackerWindowInfo *trackerInfo = (TrackerWindowInfo*)GetWindowLongPtrA(hwnd, 0); + if (trackerInfo->trackingDone) break; + OLEDD_TrackStateChange(trackerInfo); break; } case WM_DESTROY:

1 0

Jacek Caban : wininet.h: Added missing INTERNET_COOKIE_* flags.
by Alexandre Julliard July 3, 2014

July 3, 2014

Module: wine Branch: master Commit: 50ccf65fe6c7cfa81d20d17dead787eabc2c6db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50ccf65fe6c7cfa81d20d17de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 3 16:46:11 2014 +0200 wininet.h: Added missing INTERNET_COOKIE_* flags. --- include/wininet.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/wininet.h b/include/wininet.h index 331055c..a1c332b 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1321,6 +1321,8 @@ BOOLAPI InternetEnumPerSiteCookieDecisionW(LPWSTR,ULONG *,ULONG *,ULONG); #define INTERNET_COOKIE_IS_RESTRICTED 0x00000200 #define INTERNET_COOKIE_IE6 0x00000400 #define INTERNET_COOKIE_IS_LEGACY 0x00000800 +#define INTERNET_COOKIE_NON_SCRIPT 0x00001000 +#define INTERNET_COOKIE_HTTPONLY 0x00002000 BOOLAPI InternetGetCookieExA(LPCSTR,LPCSTR,LPSTR,LPDWORD,DWORD,LPVOID); BOOLAPI InternetGetCookieExW(LPCWSTR,LPCWSTR,LPWSTR,LPDWORD,DWORD,LPVOID);

1 0

Jacek Caban : wininet: Forward InternetGetCookieW to InternetGetCookieExW, not the other way around.
by Alexandre Julliard July 3, 2014

July 3, 2014

Module: wine Branch: master Commit: 69c4115c10242c965edfffab86a5937e78005f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=69c4115c10242c965edfffab8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 3 16:31:23 2014 +0200 wininet: Forward InternetGetCookieW to InternetGetCookieExW, not the other way around. --- dlls/wininet/cookie.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 9d7c98a..b48cc04 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -649,7 +649,7 @@ DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD } /*********************************************************************** - * InternetGetCookieW (WININET.@) + * InternetGetCookieExW (WININET.@) * * Retrieve cookie from the specified url * @@ -661,14 +661,17 @@ DWORD get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD * FALSE on failure * */ -BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, - LPWSTR lpCookieData, LPDWORD lpdwSize) +BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, + LPWSTR lpCookieData, LPDWORD lpdwSize, DWORD flags, void *reserved) { WCHAR host[INTERNET_MAX_HOST_NAME_LENGTH], path[INTERNET_MAX_PATH_LENGTH]; DWORD res; BOOL ret; - TRACE("(%s, %s, %p, %p)\n", debugstr_w(lpszUrl),debugstr_w(lpszCookieName), lpCookieData, lpdwSize); + TRACE("(%s, %s, %p, %p, %x, %p)\n", debugstr_w(lpszUrl),debugstr_w(lpszCookieName), lpCookieData, lpdwSize, flags, reserved); + + if (flags) + FIXME("flags 0x%08x not supported\n", flags); if (!lpszUrl) { @@ -689,6 +692,17 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, return res == ERROR_SUCCESS; } +/*********************************************************************** + * InternetGetCookieW (WININET.@) + * + * Retrieve cookie for the specified URL. + */ +BOOL WINAPI InternetGetCookieW(const WCHAR *url, const WCHAR *name, WCHAR *data, DWORD *size) +{ + TRACE("(%s, %s, %s, %p)\n", debugstr_w(url), debugstr_w(name), debugstr_w(data), size); + + return InternetGetCookieExW(url, name, data, size, 0, NULL); +} /*********************************************************************** * InternetGetCookieExA (WININET.@) @@ -1089,27 +1103,6 @@ DWORD WINAPI InternetSetCookieExW( LPCWSTR lpszURL, LPCWSTR lpszCookieName, LPCW } /*********************************************************************** - * InternetGetCookieExW (WININET.@) - * - * Retrieve cookie for the specified URL. - * - * RETURNS - * TRUE on success - * FALSE on failure - * - */ -BOOL WINAPI InternetGetCookieExW( LPCWSTR pchURL, LPCWSTR pchCookieName, LPWSTR pchCookieData, - LPDWORD pcchCookieData, DWORD dwFlags, LPVOID lpReserved) -{ - TRACE("(%s, %s, %s, %p, 0x%08x, %p)\n", - debugstr_w(pchURL), debugstr_w(pchCookieName), debugstr_w(pchCookieData), - pcchCookieData, dwFlags, lpReserved); - - if (dwFlags) FIXME("flags 0x%08x not supported\n", dwFlags); - return InternetGetCookieW(pchURL, pchCookieName, pchCookieData, pcchCookieData); -} - -/*********************************************************************** * InternetClearAllPerSiteCookieDecisions (WININET.@) * * Clears all per-site decisions about cookies.

1 0

Jactry Zeng : riched20: Initialize ed->reOle in ME_MakeEditor().
by Alexandre Julliard July 3, 2014

July 3, 2014

Module: wine Branch: master Commit: 10e6a665fdd9f964679c977504d6cdfdef7f448b URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e6a665fdd9f964679c97750… Author: Jactry Zeng <wine(a)jactry.com> Date: Fri Jul 4 00:03:14 2014 +0800 riched20: Initialize ed->reOle in ME_MakeEditor(). --- dlls/riched20/editor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 06d8690..f0d6590 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2744,6 +2744,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->hwndParent = NULL; ed->sizeWindow.cx = ed->sizeWindow.cy = 0; ed->texthost = texthost; + ed->reOle = NULL; ed->bEmulateVersion10 = bEmulateVersion10; ed->styleFlags = 0; ITextHost_TxGetPropertyBits(texthost,

1 0

Bruno Jesus : ws2_32: Improve WSAStartup/WSACleanup tracing.
by Alexandre Julliard July 3, 2014

July 3, 2014

Module: wine Branch: master Commit: adde46f55255c4fb378ccbd75f9a8fad5d3f1c0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=adde46f55255c4fb378ccbd75… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jul 3 11:18:28 2014 -0300 ws2_32: Improve WSAStartup/WSACleanup tracing. --- dlls/ws2_32/socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0e738f1..5900c8f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1238,7 +1238,7 @@ int WINAPI WSAStartup(WORD wVersionRequested, LPWSADATA lpWSAData) /* don't do anything with lpWSAData->lpVendorInfo */ /* (some apps don't allocate the space for this field) */ - TRACE("succeeded\n"); + TRACE("succeeded starts: %d\n", num_startup); return 0; } @@ -1250,6 +1250,7 @@ INT WINAPI WSACleanup(void) { if (num_startup) { num_startup--; + TRACE("pending cleanups: %d\n", num_startup); return 0; } SetLastError(WSANOTINITIALISED);

1 0

Frédéric Delanoy : ntdll: Avoid potential integer overflow when computing median position in bsearch.
by Alexandre Julliard July 3, 2014

July 3, 2014

Module: wine Branch: master Commit: ec3a9a54f57646bf1b103a8c416306c44e4a412b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec3a9a54f57646bf1b103a8c4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 3 12:19:25 2014 +0200 ntdll: Avoid potential integer overflow when computing median position in bsearch. --- dlls/ntdll/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 659d504..ad1b43b 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -299,7 +299,7 @@ NTDLL_bsearch( const void *key, const void *base, size_t nmemb, while (min <= max) { - ssize_t cursor = (min + max) / 2; + ssize_t cursor = min + (max - min) / 2; int ret = compar(key,(const char *)base+(cursor*size)); if (!ret) return (char*)base+(cursor*size);

1 0

Gediminas Jakutis : d3dx9: Add adjacency generation for D3DXCreateSphere() .
by Alexandre Julliard July 3, 2014

July 3, 2014

Module: wine Branch: master Commit: dc115a2c917f9fa2b951292795e5717703755c93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc115a2c917f9fa2b95129279… Author: Gediminas Jakutis <gediminas(a)varciai.lt> Date: Thu Jul 3 01:42:11 2014 +0300 d3dx9: Add adjacency generation for D3DXCreateSphere(). --- dlls/d3dx9_36/mesh.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 1a2b020..3b3784b 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -4693,12 +4693,6 @@ HRESULT WINAPI D3DXCreateSphere(struct IDirect3DDevice9 *device, float radius, U return D3DERR_INVALIDCALL; } - if (adjacency) - { - FIXME("Case of adjacency != NULL not implemented.\n"); - return E_NOTIMPL; - } - number_of_vertices = 2 + slices * (stacks-1); number_of_faces = 2 * slices + (stacks - 2) * (2 * slices); @@ -4836,6 +4830,24 @@ HRESULT WINAPI D3DXCreateSphere(struct IDirect3DDevice9 *device, float radius, U free_sincos_table(&phi); sphere->lpVtbl->UnlockIndexBuffer(sphere); sphere->lpVtbl->UnlockVertexBuffer(sphere); + + + if (adjacency) + { + if (FAILED(hr = D3DXCreateBuffer(number_of_faces * sizeof(DWORD) * 3, adjacency))) + { + sphere->lpVtbl->Release(sphere); + return hr; + } + + if (FAILED(hr = sphere->lpVtbl->GenerateAdjacency(sphere, 0.0f, (*adjacency)->lpVtbl->GetBufferPointer(*adjacency)))) + { + (*adjacency)->lpVtbl->Release(*adjacency); + sphere->lpVtbl->Release(sphere); + return hr; + } + } + *mesh = sphere; return D3D_OK;

1 0

Bruno Jesus : ws2_32: Only declare IPX support if the required definitions are found.
by Alexandre Julliard July 3, 2014

July 3, 2014

Module: wine Branch: master Commit: 543314d449ad0de1e5e3703f8091e5c594e922db URL: http://source.winehq.org/git/wine.git/?a=commit;h=543314d449ad0de1e5e3703f8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jul 3 01:01:53 2014 -0300 ws2_32: Only declare IPX support if the required definitions are found. --- dlls/ws2_32/socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e1d0ce5..0e738f1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -100,7 +100,6 @@ #ifdef HAVE_NETIPX_IPX_H # include <netipx/ipx.h> -# define HAS_IPX #elif defined(HAVE_LINUX_IPX_H) # ifdef HAVE_ASM_TYPES_H # include <asm/types.h> @@ -109,6 +108,8 @@ # include <linux/types.h> # endif # include <linux/ipx.h> +#endif +#if defined(SOL_IPX) || defined(SO_DEFAULT_HEADERS) # define HAS_IPX #endif

1 0

Vincent Povirk : winebrowser: Manually percent-encode file: paths for unix filenames.
by Alexandre Julliard July 2, 2014

July 2, 2014

Module: wine Branch: master Commit: ee17213f37da3b869b79cab6cfa1e039d8db13da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee17213f37da3b869b79cab6c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 27 15:44:32 2014 -0500 winebrowser: Manually percent-encode file: paths for unix filenames. --- programs/winebrowser/main.c | 60 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 54 insertions(+), 6 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 22f3a93..6ce7707 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -309,6 +309,59 @@ done: return ret; } +static WCHAR *encode_unix_path(const char *src) +{ + int len = 1; + const char *tmp_src; + WCHAR *dst, *tmp_dst; + const char safe_chars[] = "/-_.~@&=+$,:"; + const char hex_digits[] = "0123456789ABCDEF"; + + tmp_src = src; + + while (*tmp_src != 0) + { + if ((*tmp_src >= 'a' && *tmp_src <= 'z') || + (*tmp_src >= 'A' && *tmp_src <= 'Z') || + (*tmp_src >= '0' && *tmp_src <= '9') || + strchr(safe_chars, *tmp_src)) + len += 1; + else + len += 3; + tmp_src++; + } + + dst = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + + if (!dst) + return NULL; + + tmp_src = src; + tmp_dst = dst; + + while (*tmp_src != 0) + { + if ((*tmp_src >= 'a' && *tmp_src <= 'z') || + (*tmp_src >= 'A' && *tmp_src <= 'Z') || + (*tmp_src >= '0' && *tmp_src <= '9') || + strchr(safe_chars, *tmp_src)) + { + *tmp_dst++ = *tmp_src; + } + else + { + *tmp_dst++ = '%'; + *tmp_dst++ = hex_digits[*(unsigned char*)(tmp_src) / 16]; + *tmp_dst++ = hex_digits[*tmp_src & 0xf]; + } + tmp_src++; + } + + *tmp_dst = 0; + + return dst; +} + static IUri *convert_file_uri(IUri *uri) { wine_get_unix_file_name_t wine_get_unix_file_name_ptr; @@ -333,12 +386,7 @@ static IUri *convert_file_uri(IUri *uri) unixpath = wine_get_unix_file_name_ptr(filename); SysFreeString(filename); if(unixpath && stat(unixpath, &dummy) >= 0) { - int len; - - len = MultiByteToWideChar(CP_UNIXCP, 0, unixpath, -1, NULL, 0); - new_path = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - if(new_path) - MultiByteToWideChar(CP_UNIXCP, 0, unixpath, -1, new_path, len); + new_path = encode_unix_path(unixpath); HeapFree(GetProcessHeap(), 0, unixpath); }else { WINE_WARN("File %s does not exist\n", wine_dbgstr_a(unixpath));

1 0

Jacek Caban : urlmon.idl: Added missing Uri_CREATE_* flags.
by Alexandre Julliard July 2, 2014

July 2, 2014

Module: wine Branch: master Commit: 1b5a12618408e42b7062aede0bf31abe3dbffa93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b5a12618408e42b7062aede0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 2 13:28:01 2014 +0200 urlmon.idl: Added missing Uri_CREATE_* flags. --- include/urlmon.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/urlmon.idl b/include/urlmon.idl index 2ccba5b..a9b665c 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1848,6 +1848,8 @@ cpp_quote("#define Uri_CREATE_NO_PRE_PROCESS_HTML_URI 0x1000") cpp_quote("#define Uri_CREATE_IE_SETTINGS 0x2000") cpp_quote("#define Uri_CREATE_NO_IE_SETTINGS 0x4000") cpp_quote("#define Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS 0x8000") +cpp_quote("#define Uri_CREATE_NORMALIZE_INTL_CHARACTERS 0x00010000") +cpp_quote("#define Uri_CREATE_CANONICALIZE_ABSOLUTE 0x00020000") cpp_quote("#define Uri_DISPLAY_NO_FRAGMENT 0x00000001") cpp_quote("#define Uri_PUNYCODE_IDN_HOST 0x00000002")

1 0

Jacek Caban : iphlpapi: Protect res_init call with critical section.
by Alexandre Julliard July 2, 2014

July 2, 2014

Module: wine Branch: master Commit: ef1342bae711aa798f5fa6e5cb9260237395b304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef1342bae711aa798f5fa6e5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 1 17:00:36 2014 +0200 iphlpapi: Protect res_init call with critical section. --- dlls/iphlpapi/iphlpapi_main.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8c55048..70a063b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1068,10 +1068,21 @@ static void sockaddr_in6_to_WS_storage( SOCKADDR_STORAGE *dst, const struct sock #ifdef HAVE_STRUCT___RES_STATE /* call res_init() just once because of a bug in Mac OS X 10.4 */ /* Call once per thread on systems that have per-thread _res. */ + +static CRITICAL_SECTION res_init_cs; +static CRITICAL_SECTION_DEBUG res_init_cs_debug = { + 0, 0, &res_init_cs, + { &res_init_cs_debug.ProcessLocksList, &res_init_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": res_init_cs") } +}; +static CRITICAL_SECTION res_init_cs = { &res_init_cs_debug, -1, 0, 0, 0, 0 }; + static void initialise_resolver(void) { + EnterCriticalSection(&res_init_cs); if ((_res.options & RES_INIT) == 0) res_init(); + LeaveCriticalSection(&res_init_cs); } static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only )

1 0

Nikolay Sivov : advapi32: Implement RegSetKeyValue().
by Alexandre Julliard July 2, 2014

July 2, 2014

Module: wine Branch: master Commit: 7041b4db8539db28b06bb873c07f3a3006eca41a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7041b4db8539db28b06bb873c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 2 21:23:27 2014 +0400 advapi32: Implement RegSetKeyValue(). --- dlls/advapi32/advapi32.spec | 4 +-- dlls/advapi32/registry.c | 77 ++++++++++++++++++++++++++---------------- dlls/advapi32/tests/registry.c | 33 ++++++++++++++++++ include/winreg.h | 2 ++ 4 files changed, 85 insertions(+), 31 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 0efdc2c..b4bf440 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -645,8 +645,8 @@ # @ stub RegSaveKeyExW @ stdcall RegSaveKeyW(long ptr ptr) @ stdcall RegSetKeySecurity(long long ptr) -# @ stub RegSetKeyValueA -# @ stub RegSetKeyValueW +@ stdcall RegSetKeyValueA(long str str long ptr long) +@ stdcall RegSetKeyValueW(long wstr wstr long ptr long) @ stdcall RegSetValueA(long str long ptr long) @ stdcall RegSetValueExA(long str long long ptr long) @ stdcall RegSetValueExW(long wstr long long ptr long) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index c7ba3ef..d568ae0 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1276,61 +1276,80 @@ LSTATUS WINAPI RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD typ * Sets the data for the default or unnamed value of a reg key. * * PARAMS - * hKey [I] Handle to an open key. - * lpSubKey [I] Name of a subkey of hKey. - * dwType [I] Type of information to store. - * lpData [I] String that contains the data to set for the default value. - * cbData [I] Ignored. + * hkey [I] Handle to an open key. + * subkey [I] Name of a subkey of hKey. + * type [I] Type of information to store. + * data [I] String that contains the data to set for the default value. + * count [I] Ignored. * * RETURNS * Success: ERROR_SUCCESS * Failure: nonzero error code from Winerror.h */ -LSTATUS WINAPI RegSetValueW( HKEY hkey, LPCWSTR name, DWORD type, LPCWSTR data, DWORD count ) +LSTATUS WINAPI RegSetValueW( HKEY hkey, LPCWSTR subkey, DWORD type, LPCWSTR data, DWORD count ) { - HKEY subkey = hkey; - DWORD ret; - - TRACE("(%p,%s,%d,%s,%d)\n", hkey, debugstr_w(name), type, debugstr_w(data), count ); + TRACE("(%p,%s,%d,%s,%d)\n", hkey, debugstr_w(subkey), type, debugstr_w(data), count ); if (type != REG_SZ || !data) return ERROR_INVALID_PARAMETER; - if (name && name[0]) /* need to create the subkey */ - { - if ((ret = RegCreateKeyW( hkey, name, &subkey )) != ERROR_SUCCESS) return ret; - } - - ret = RegSetValueExW( subkey, NULL, 0, REG_SZ, (const BYTE*)data, - (strlenW( data ) + 1) * sizeof(WCHAR) ); - if (subkey != hkey) RegCloseKey( subkey ); - return ret; + return RegSetKeyValueW( hkey, subkey, NULL, type, data, (strlenW(data) + 1)*sizeof(WCHAR) ); } - /****************************************************************************** * RegSetValueA [ADVAPI32.@] * * See RegSetValueW. */ -LSTATUS WINAPI RegSetValueA( HKEY hkey, LPCSTR name, DWORD type, LPCSTR data, DWORD count ) +LSTATUS WINAPI RegSetValueA( HKEY hkey, LPCSTR subkey, DWORD type, LPCSTR data, DWORD count ) { - HKEY subkey = hkey; - DWORD ret; - - TRACE("(%p,%s,%d,%s,%d)\n", hkey, debugstr_a(name), type, debugstr_a(data), count ); + TRACE("(%p,%s,%d,%s,%d)\n", hkey, debugstr_a(subkey), type, debugstr_a(data), count ); if (type != REG_SZ || !data) return ERROR_INVALID_PARAMETER; - if (name && name[0]) /* need to create the subkey */ + return RegSetKeyValueA( hkey, subkey, NULL, type, data, strlen(data) + 1 ); +} + +/****************************************************************************** + * RegSetKeyValueW [ADVAPI32.@] + */ +LONG WINAPI RegSetKeyValueW( HKEY hkey, LPCWSTR subkey, LPCWSTR name, DWORD type, const void *data, DWORD len ) +{ + HKEY hsubkey = NULL; + DWORD ret; + + TRACE("(%p,%s,%s,%d,%p,%d)\n", hkey, debugstr_w(subkey), debugstr_w(name), type, data, len ); + + if (subkey && subkey[0]) /* need to create the subkey */ { - if ((ret = RegCreateKeyA( hkey, name, &subkey )) != ERROR_SUCCESS) return ret; + if ((ret = RegCreateKeyW( hkey, subkey, &hsubkey )) != ERROR_SUCCESS) return ret; + hkey = hsubkey; } - ret = RegSetValueExA( subkey, NULL, 0, REG_SZ, (const BYTE*)data, strlen(data)+1 ); - if (subkey != hkey) RegCloseKey( subkey ); + + ret = RegSetValueExW( hkey, name, 0, type, (const BYTE*)data, len ); + if (hsubkey) RegCloseKey( hsubkey ); return ret; } +/****************************************************************************** + * RegSetKeyValueA [ADVAPI32.@] + */ +LONG WINAPI RegSetKeyValueA( HKEY hkey, LPCSTR subkey, LPCSTR name, DWORD type, const void *data, DWORD len ) +{ + HKEY hsubkey = NULL; + DWORD ret; + + TRACE("(%p,%s,%s,%d,%p,%d)\n", hkey, debugstr_a(subkey), debugstr_a(name), type, data, len ); + if (subkey && subkey[0]) /* need to create the subkey */ + { + if ((ret = RegCreateKeyA( hkey, subkey, &hsubkey )) != ERROR_SUCCESS) return ret; + hkey = hsubkey; + } + + ret = RegSetValueExA( hkey, name, 0, type, (const BYTE*)data, len ); + if (hsubkey) RegCloseKey( hsubkey ); + return ret; +} /****************************************************************************** * RegQueryValueExW [ADVAPI32.@] diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 7c4db40..0626aff 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -48,6 +48,7 @@ static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(UNICODE_STRING*); static NTSTATUS (WINAPI * pRtlFreeUnicodeString)(PUNICODE_STRING); static LONG (WINAPI *pRegDeleteKeyValueA)(HKEY,LPCSTR,LPCSTR); +static LONG (WINAPI *pRegSetKeyValueW)(HKEY,LPCWSTR,LPCWSTR,DWORD,const void*,DWORD); static BOOL limited_user; @@ -137,6 +138,7 @@ static void InitFunctionPtrs(void) ADVAPI32_GET_PROC(RegDeleteTreeA); ADVAPI32_GET_PROC(RegDeleteKeyExA); ADVAPI32_GET_PROC(RegDeleteKeyValueA); + ADVAPI32_GET_PROC(RegSetKeyValueW); pIsWow64Process = (void *)GetProcAddress( hkernel32, "IsWow64Process" ); pRtlFormatCurrentUserKeyPath = (void *)GetProcAddress( hntdll, "RtlFormatCurrentUserKeyPath" ); @@ -433,6 +435,37 @@ static void test_set_value(void) ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); ret = RegSetValueExW(hkey_main, name2W, 0, REG_DWORD, (const BYTE *)1, 1); ok(ret == ERROR_NOACCESS, "RegSetValueExW should have failed with ERROR_NOACCESS: %d, GLE=%d\n", ret, GetLastError()); + + /* RegSetKeyValue */ + if (!pRegSetKeyValueW) + win_skip("RegSetKeyValue() is not supported.\n"); + else + { + static const WCHAR subkeyW[] = {'s','u','b','k','e','y',0}; + DWORD len, type; + HKEY subkey; + + ret = pRegSetKeyValueW(hkey_main, NULL, name1W, REG_SZ, (const BYTE*)string2W, sizeof(string2W)); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + test_hkey_main_Value_A(name1A, string2A, sizeof(string2A)); + test_hkey_main_Value_W(name1W, string2W, sizeof(string2W)); + + ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_SZ, string1W, sizeof(string1W)); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ret = RegOpenKeyExW(hkey_main, subkeyW, 0, KEY_QUERY_VALUE, &subkey); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + type = len = 0; + ret = RegQueryValueExW(subkey, name1W, 0, &type, NULL, &len); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + ok(len == sizeof(string1W), "got %d\n", len); + ok(type == REG_SZ, "got type %d\n", type); + + ret = pRegSetKeyValueW(hkey_main, subkeyW, name1W, REG_SZ, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + RegCloseKey(subkey); + } } static void create_test_entries(void) diff --git a/include/winreg.h b/include/winreg.h index 56d9650..cf6bd47 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -169,6 +169,8 @@ WINADVAPI LSTATUS WINAPI RegSaveKeyA(HKEY,LPCSTR,LPSECURITY_ATTRIBUTES); WINADVAPI LSTATUS WINAPI RegSaveKeyW(HKEY,LPCWSTR,LPSECURITY_ATTRIBUTES); #define RegSaveKey WINELIB_NAME_AW(RegSaveKey) WINADVAPI LSTATUS WINAPI RegSetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); +WINADVAPI LSTATUS WINAPI RegSetKeyValueA(HKEY,LPCSTR,LPCSTR,DWORD,const void*,DWORD); +WINADVAPI LSTATUS WINAPI RegSetKeyValueW(HKEY,LPCWSTR,LPCWSTR,DWORD,const void*,DWORD); WINADVAPI LSTATUS WINAPI RegSetValueA(HKEY,LPCSTR,DWORD,LPCSTR,DWORD); WINADVAPI LSTATUS WINAPI RegSetValueW(HKEY,LPCWSTR,DWORD,LPCWSTR,DWORD); #define RegSetValue WINELIB_NAME_AW(RegSetValue)

1 0

Zhenbo Li : shlwapi/tests: Add tests for PathIsRelativeA/W.
by Alexandre Julliard July 2, 2014

July 2, 2014

Module: wine Branch: master Commit: 9d59d4e5502c15703d1c6813bdab09175356b965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d59d4e5502c15703d1c6813b… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Wed Jul 2 23:55:02 2014 +0800 shlwapi/tests: Add tests for PathIsRelativeA/W. --- dlls/shlwapi/tests/path.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index a2e5594..9fe70cd 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -36,6 +36,8 @@ static HRESULT (WINAPI *pPathCreateFromUrlAlloc)(LPCWSTR, LPWSTR*, DWORD); static BOOL (WINAPI *pPathAppendA)(LPSTR, LPCSTR); static BOOL (WINAPI *pPathUnExpandEnvStringsA)(LPCSTR, LPSTR, UINT); static BOOL (WINAPI *pPathUnExpandEnvStringsW)(LPCWSTR, LPWSTR, UINT); +static BOOL (WINAPI *pPathIsRelativeA)(LPCSTR); +static BOOL (WINAPI *pPathIsRelativeW)(LPCWSTR); /* ################ */ @@ -1585,6 +1587,62 @@ static void test_PathUnExpandEnvStrings(void) ok(!lstrcmpW(buffW, pathW), "wrong unexpanded string %s, expected %s\n", wine_dbgstr_w(buffW), wine_dbgstr_w(pathW)); } +static const struct { + const char *path; + BOOL expect; +} test_path_is_relative[] = { + {NULL, TRUE}, + {"\0", TRUE}, + {"test.txt", TRUE}, + {"\\\\folder\\test.txt", FALSE}, + {"file://folder/test.txt", TRUE}, + {"C:\\test.txt", FALSE}, + {"file:///C:/test.txt", TRUE} +}; + +void test_PathIsRelativeA(void) +{ + BOOL ret; + int i, num; + + if (!pPathIsRelativeA) { + win_skip("PathIsRelativeA not available\n"); + return; + } + + num = sizeof(test_path_is_relative) / sizeof(test_path_is_relative[0]); + for (i = 0; i < num; i++) { + ret = pPathIsRelativeA(test_path_is_relative[i].path); + ok(ret == test_path_is_relative[i].expect, + "PathIsRelativeA(\"%s\") expects %d, got %d.\n", + test_path_is_relative[i].path, test_path_is_relative[i].expect, ret); + } +} + +void test_PathIsRelativeW(void) +{ + BOOL ret; + int i, num; + LPWSTR path; + + if (!pPathIsRelativeW) { + win_skip("PathIsRelativeA not available\n"); + return; + } + + num = sizeof(test_path_is_relative) / sizeof(test_path_is_relative[0]); + for (i = 0; i < num; i++) { + path = GetWideString(test_path_is_relative[i].path); + + ret = pPathIsRelativeW(path); + ok(ret == test_path_is_relative[i].expect, + "PathIsRelativeW(\"%s\") expects %d, got %d.\n", + test_path_is_relative[i].path, test_path_is_relative[i].expect, ret); + + FreeWideString(path); + } +} + START_TEST(path) { HMODULE hShlwapi = GetModuleHandleA("shlwapi.dll"); @@ -1604,6 +1662,8 @@ START_TEST(path) pPathAppendA = (void*)GetProcAddress(hShlwapi, "PathAppendA"); pPathUnExpandEnvStringsA = (void*)GetProcAddress(hShlwapi, "PathUnExpandEnvStringsA"); pPathUnExpandEnvStringsW = (void*)GetProcAddress(hShlwapi, "PathUnExpandEnvStringsW"); + pPathIsRelativeA = (void*)GetProcAddress(hShlwapi, "PathIsRelativeA"); + pPathIsRelativeW = (void*)GetProcAddress(hShlwapi, "PathIsRelativeW"); test_PathSearchAndQualify(); test_PathCreateFromUrl(); @@ -1626,4 +1686,6 @@ START_TEST(path) test_PathUnquoteSpaces(); test_PathGetDriveNumber(); test_PathUnExpandEnvStrings(); + test_PathIsRelativeA(); + test_PathIsRelativeW(); }

1 0

Sebastian Lackner : wininet: Fix invalid memory access in HTTP_QUERY_RAW_HEADERS (Valgrind).
by Alexandre Julliard July 2, 2014

July 2, 2014

Module: wine Branch: master Commit: 8fd44a3d2b7438fbf1e7fcfa7482147999ff4851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd44a3d2b7438fbf1e7fcfa7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 2 01:23:40 2014 +0200 wininet: Fix invalid memory access in HTTP_QUERY_RAW_HEADERS (Valgrind). --- dlls/wininet/http.c | 4 ++-- dlls/wininet/tests/http.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b5e6a73..bb53a03 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3589,12 +3589,12 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, TRACE("returning data: %s\n", debugstr_wn(headers, len / sizeof(WCHAR))); - for (i=0; i<len; i++) + for (i = 0; i < len / sizeof(WCHAR); i++) { if (headers[i] == '\n') headers[i] = 0; } - memcpy(lpBuffer, headers, len + sizeof(WCHAR)); + memcpy(lpBuffer, headers, len); } *lpdwBufferLength = len - sizeof(WCHAR); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 4e8ea5b..a8b55fd 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -465,6 +465,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) char *post_data = NULL; BOOL res, on_async = TRUE; CHAR buffer[4000]; + WCHAR wbuffer[4000]; DWORD length, length2, index, exlen = 0, post_len = 0; const char *types[2] = { "*", NULL }; HINTERNET hi, hic = 0, hor = 0; @@ -649,6 +650,37 @@ static void InternetReadFile_test(int flags, const test_data_t *test) ok(buffer[length2+1] == 0x77, "Expected 0x77, got %02X\n", buffer[length2+1]); ok(length2 == length, "Value should not have changed: %d != %d\n", length2, length); + length = sizeof(wbuffer)-sizeof(WCHAR); + memset(wbuffer, 0x77, sizeof(wbuffer)); + res = HttpQueryInfoW(hor, HTTP_QUERY_RAW_HEADERS, wbuffer, &length, 0x0); + ok(res, "HttpQueryInfoW(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); + ok(length % sizeof(WCHAR) == 0, "Expected that length is a multiple of sizeof(WCHAR), got %d.\n", length); + length /= sizeof(WCHAR); + /* show that the function writes data past the length returned */ + ok(wbuffer[length-2], "Expected any header character, got 0x0000\n"); + ok(!wbuffer[length-1], "Expected 0x0000, got %04X\n", wbuffer[length-1]); + ok(!wbuffer[length], "Expected 0x0000, got %04X\n", wbuffer[length]); + ok(wbuffer[length+1] == 0x7777 || broken(wbuffer[length+1] != 0x7777), + "Expected 0x7777, got %04X\n", wbuffer[length+1]); + + length2 = length*sizeof(WCHAR); + res = HttpQueryInfoW(hor,HTTP_QUERY_RAW_HEADERS,wbuffer,&length2,0x0); + ok(!res, "Expected 0x00, got %d\n", res); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected last error: %d\n", GetLastError()); + ok(length2 % sizeof(WCHAR) == 0, "Expected that length is a multiple of sizeof(WCHAR), got %d.\n", length2); + length2 /= sizeof(WCHAR); + ok(length2 == length+1, "Expected %d, got %d\n", length+1, length2); + /* the in length of the buffer must be +1 but the length returned does not count this */ + length2 = (length+1)*sizeof(WCHAR); + memset(wbuffer, 0x77, sizeof(wbuffer)); + res = HttpQueryInfoW(hor,HTTP_QUERY_RAW_HEADERS,wbuffer,&length2,0x0); + ok(res, "HttpQueryInfoW(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); + ok(length2 % sizeof(WCHAR) == 0, "Expected that length is a multiple of sizeof(WCHAR), got %d.\n", length2); + length2 /= sizeof(WCHAR); + ok(!wbuffer[length2], "Expected 0x0000, got %04X\n", wbuffer[length2]); + ok(wbuffer[length2+1] == 0x7777, "Expected 0x7777, got %04X\n", wbuffer[length2+1]); + ok(length2 == length, "Value should not have changed: %d != %d\n", length2, length); + length = sizeof(buffer); res = InternetQueryOptionA(hor, INTERNET_OPTION_URL, buffer, &length); ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError());

1 0

Andrew Eikum : winecoreaudio.drv: Use AUHAL API instead of AudioQueue.
by Alexandre Julliard July 2, 2014

July 2, 2014

Module: wine Branch: master Commit: 46928d381ee4dcf95a0ac409be52729407f4eaca URL: http://source.winehq.org/git/wine.git/?a=commit;h=46928d381ee4dcf95a0ac409b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jul 1 14:53:45 2014 -0500 winecoreaudio.drv: Use AUHAL API instead of AudioQueue. --- dlls/winecoreaudio.drv/mmdevdrv.c | 1181 +++++++++++++++++++------------------ 1 file changed, 603 insertions(+), 578 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46928d381ee4dcf95a0ac…

1 0

Vincent Povirk : winebrowser: Don't use IUriBuilder with unix file: uri's.
by Alexandre Julliard July 2, 2014

July 2, 2014

Module: wine Branch: master Commit: 5af3b8c97e8f537d8a4f01382acb7127bcfb8f3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af3b8c97e8f537d8a4f01382… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 1 14:09:39 2014 -0500 winebrowser: Don't use IUriBuilder with unix file: uri's. --- programs/winebrowser/main.c | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 6938e1e..cb9ea73 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -311,11 +311,12 @@ done: static WCHAR *encode_unix_path(const char *src) { - int len = 1; const char *tmp_src; WCHAR *dst, *tmp_dst; const char safe_chars[] = "/-_.~@&=+$,:"; const char hex_digits[] = "0123456789ABCDEF"; + const WCHAR schema[] = {'f','i','l','e',':','/','/',0}; + int len = sizeof(schema)/sizeof(schema[0]); tmp_src = src; @@ -336,8 +337,10 @@ static WCHAR *encode_unix_path(const char *src) if (!dst) return NULL; + strcpyW(dst, schema); + tmp_src = src; - tmp_dst = dst; + tmp_dst = dst + strlenW(dst); while (*tmp_src != 0) { @@ -362,15 +365,13 @@ static WCHAR *encode_unix_path(const char *src) return dst; } -static IUri *convert_file_uri(IUri *uri) +static WCHAR *convert_file_uri(IUri *uri) { wine_get_unix_file_name_t wine_get_unix_file_name_ptr; - IUriBuilder *uri_builder; struct stat dummy; WCHAR *new_path; char *unixpath; BSTR filename; - IUri *new_uri; HRESULT hres; /* check if the argument is a local file */ @@ -399,19 +400,7 @@ static IUri *convert_file_uri(IUri *uri) WINE_TRACE("New path: %s\n", wine_dbgstr_w(new_path)); - hres = CreateIUriBuilder(uri, 0, 0, &uri_builder); - if(SUCCEEDED(hres) && new_path) - hres = IUriBuilder_SetPath(uri_builder, new_path); - HeapFree(GetProcessHeap(), 0, new_path); - if(FAILED(hres)) - return NULL; - - hres = IUriBuilder_CreateUri(uri_builder, 0, 0, 0, &new_uri); - IUriBuilder_Release(uri_builder); - if(FAILED(hres)) - return NULL; - - return new_uri; + return new_path; } /***************************************************************************** @@ -423,7 +412,7 @@ int wmain(int argc, WCHAR *argv[]) static const WCHAR nohomeW[] = {'-','n','o','h','o','m','e',0}; WCHAR *url = argv[1]; - BSTR display_uri; + BSTR display_uri = NULL; DWORD scheme; IUri *uri; HRESULT hres; @@ -451,18 +440,14 @@ int wmain(int argc, WCHAR *argv[]) IUri_GetScheme(uri, &scheme); if(scheme == URL_SCHEME_FILE) { - IUri *file_uri; - - file_uri = convert_file_uri(uri); - if(file_uri) { - IUri_Release(uri); - uri = file_uri; - }else { + display_uri = convert_file_uri(uri); + if(!display_uri) { WINE_ERR("Failed to convert file URL to unix path\n"); } } - hres = IUri_GetDisplayUri(uri, &display_uri); + if (!display_uri) + hres = IUri_GetDisplayUri(uri, &display_uri); IUri_Release(uri); if(FAILED(hres)) return -1;

1 0

Vincent Povirk : winebrowser: Add traces for file uri conversion steps.
by Alexandre Julliard July 2, 2014

July 2, 2014

Module: wine Branch: master Commit: c5f000632f75010739c0b7c21e85c368e8a1c9ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5f000632f75010739c0b7c21… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 1 11:37:39 2014 -0500 winebrowser: Add traces for file uri conversion steps. --- programs/winebrowser/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 6ce7707..6938e1e 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -383,9 +383,12 @@ static IUri *convert_file_uri(IUri *uri) if(FAILED(hres)) return NULL; + WINE_TRACE("Windows path: %s\n", wine_dbgstr_w(filename)); + unixpath = wine_get_unix_file_name_ptr(filename); SysFreeString(filename); if(unixpath && stat(unixpath, &dummy) >= 0) { + WINE_TRACE("Unix path: %s\n", wine_dbgstr_a(unixpath)); new_path = encode_unix_path(unixpath); HeapFree(GetProcessHeap(), 0, unixpath); }else { @@ -394,6 +397,8 @@ static IUri *convert_file_uri(IUri *uri) new_path = NULL; } + WINE_TRACE("New path: %s\n", wine_dbgstr_w(new_path)); + hres = CreateIUriBuilder(uri, 0, 0, &uri_builder); if(SUCCEEDED(hres) && new_path) hres = IUriBuilder_SetPath(uri_builder, new_path);

1 0

Jacek Caban : urlmon: Don' t decode percent-encoded characters in file URLs with implicit scheme.
by Alexandre Julliard July 2, 2014

July 2, 2014

Module: wine Branch: master Commit: e656914fbf4cdb774c8db8dc9ebf631693a1fdb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e656914fbf4cdb774c8db8dc9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 2 13:22:50 2014 +0200 urlmon: Don't decode percent-encoded characters in file URLs with implicit scheme. --- dlls/urlmon/uri.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 2fe0113..1f18bc6 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -2838,7 +2838,7 @@ static BOOL canonicalize_authority(const parse_data *data, Uri *uri, DWORD flags * file:///c:/test%test -> file:///c:/test%25test */ static DWORD canonicalize_path_hierarchical(const WCHAR *path, DWORD path_len, URL_SCHEME scheme_type, BOOL has_host, DWORD flags, - WCHAR *ret_path) { + BOOL is_implicit_scheme, WCHAR *ret_path) { const BOOL known_scheme = scheme_type != URL_SCHEME_UNKNOWN; const BOOL is_file = scheme_type == URL_SCHEME_FILE; const BOOL is_res = scheme_type == URL_SCHEME_RES; @@ -2904,7 +2904,7 @@ static DWORD canonicalize_path_hierarchical(const WCHAR *path, DWORD path_len, U len += 3; do_default_action = FALSE; } else if((is_unreserved(val) && known_scheme) || - (is_file && (is_unreserved(val) || is_reserved(val) || + (is_file && !is_implicit_scheme && (is_unreserved(val) || is_reserved(val) || (val && flags&Uri_CREATE_FILE_USE_DOS_PATH && !is_forbidden_dos_path_char(val))))) { if(ret_path) ret_path[len] = val; @@ -2929,7 +2929,7 @@ static DWORD canonicalize_path_hierarchical(const WCHAR *path, DWORD path_len, U } } else if(known_scheme && !is_res && !is_unreserved(*ptr) && !is_reserved(*ptr) && (!(flags & Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS) || is_file)) { - if(!(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH))) { + if(!is_file || !(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { /* Escape the forbidden character. */ if(ret_path) pct_encode_val(*ptr, ret_path+len); @@ -3122,7 +3122,7 @@ static BOOL canonicalize_hierpart(const parse_data *data, Uri *uri, DWORD flags, if(!computeOnly) uri->path_start = uri->canon_len; uri->path_len = canonicalize_path_hierarchical(data->path, data->path_len, data->scheme_type, data->host_len != 0, - flags, computeOnly ? NULL : uri->canon_uri+uri->canon_len); + flags, data->has_implicit_scheme, computeOnly ? NULL : uri->canon_uri+uri->canon_len); uri->canon_len += uri->path_len; if(!computeOnly && !uri->path_len) uri->path_start = -1; @@ -3889,8 +3889,8 @@ static HRESULT compare_file_paths(const Uri *a, const Uri *b, BOOL *ret) return S_OK; } - len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, NULL); - len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, NULL); + len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, FALSE, NULL); + len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, FALSE, NULL); canon_path_a = heap_alloc(len_a*sizeof(WCHAR)); if(!canon_path_a) @@ -3901,8 +3901,8 @@ static HRESULT compare_file_paths(const Uri *a, const Uri *b, BOOL *ret) return E_OUTOFMEMORY; } - len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, canon_path_a); - len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, canon_path_b); + len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, FALSE, canon_path_a); + len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, FALSE, canon_path_b); *ret = len_a == len_b && !memicmpW(canon_path_a, canon_path_b, len_a);

1 0