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