April 2013 - Wine-commits - list.winehq.org

Michael Stefaniuc : dplayx: Merge the IDirectPlay4_SendEx helper.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 7964f423278b410e06ebb456739525a13c22fec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7964f423278b410e06ebb4567… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:05:50 2013 +0100 dplayx: Merge the IDirectPlay4_SendEx helper. --- dlls/dplayx/dplay.c | 188 ++++++++++++++++---------------------------------- 1 files changed, 60 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7964f423278b410e06ebb…

1 0

Michael Stefaniuc : dplayx: Merge the IDirectPlay4_GetMessageQueue helper.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: da430fd17cef850c4ea5005a70e51d18c4636491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da430fd17cef850c4ea5005a7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:06:39 2013 +0100 dplayx: Merge the IDirectPlay4_GetMessageQueue helper. --- dlls/dplayx/dplay.c | 80 +++++++++++++++++++------------------------------- 1 files changed, 31 insertions(+), 49 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 91becd8..b0eb731 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -116,9 +116,6 @@ static HRESULT DP_SecureOpen static HRESULT DP_IF_Receive ( IDirectPlay2Impl* This, LPDPID lpidFrom, LPDPID lpidTo, DWORD dwFlags, LPVOID lpData, LPDWORD lpdwDataSize, BOOL bAnsi ); -static HRESULT DP_IF_GetMessageQueue - ( IDirectPlay4Impl* This, DPID idFrom, DPID idTo, DWORD dwFlags, - LPDWORD lpdwNumMsgs, LPDWORD lpdwNumBytes, BOOL bAnsi ); static HRESULT DP_SP_SendEx ( IDirectPlay2Impl* This, DWORD dwFlags, LPVOID lpData, DWORD dwDataSize, DWORD dwPriority, DWORD dwTimeout, @@ -3981,59 +3978,44 @@ static HRESULT DP_SP_SendEx return DP_OK; } -static HRESULT DP_IF_GetMessageQueue - ( IDirectPlay4Impl* This, DPID idFrom, DPID idTo, DWORD dwFlags, - LPDWORD lpdwNumMsgs, LPDWORD lpdwNumBytes, BOOL bAnsi ) +static HRESULT WINAPI IDirectPlay4AImpl_GetMessageQueue( IDirectPlay4A *iface, DPID from, DPID to, + DWORD flags, DWORD *msgs, DWORD *bytes ) { - HRESULT hr = DP_OK; - - FIXME( "(%p)->(0x%08x,0x%08x,0x%08x,%p,%p,%u): semi stub\n", - This, idFrom, idTo, dwFlags, lpdwNumMsgs, lpdwNumBytes, bAnsi ); - - /* FIXME: Do we need to do idFrom and idTo sanity checking here? */ - /* FIXME: What about sends which are not immediate? */ + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_GetMessageQueue( &This->IDirectPlay4_iface, from, to, flags, msgs, bytes ); +} - if( This->dp2->spData.lpCB->GetMessageQueue ) - { - DPSP_GETMESSAGEQUEUEDATA data; +static HRESULT WINAPI IDirectPlay4Impl_GetMessageQueue( IDirectPlay4 *iface, DPID from, DPID to, + DWORD flags, DWORD *msgs, DWORD *bytes ) +{ + IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); + HRESULT hr = DP_OK; - FIXME( "Calling SP GetMessageQueue - is it right?\n" ); + FIXME( "(%p)->(0x%08x,0x%08x,0x%08x,%p,%p): semi-stub\n", This, from, to, flags, msgs, bytes ); - /* FIXME: None of this is documented :( */ + /* FIXME: Do we need to do from and to sanity checking here? */ + /* FIXME: What about sends which are not immediate? */ - data.lpISP = This->dp2->spData.lpISP; - data.dwFlags = dwFlags; - data.idFrom = idFrom; - data.idTo = idTo; - data.lpdwNumMsgs = lpdwNumMsgs; - data.lpdwNumBytes = lpdwNumBytes; + if ( This->dp2->spData.lpCB->GetMessageQueue ) + { + DPSP_GETMESSAGEQUEUEDATA data; - hr = (*This->dp2->spData.lpCB->GetMessageQueue)( &data ); - } - else - { - FIXME( "No SP for GetMessageQueue - fake some data\n" ); - } + FIXME( "Calling SP GetMessageQueue - is it right?\n" ); - return hr; -} + /* FIXME: None of this is documented :( */ + data.lpISP = This->dp2->spData.lpISP; + data.dwFlags = flags; + data.idFrom = from; + data.idTo = to; + data.lpdwNumMsgs = msgs; + data.lpdwNumBytes = bytes; -static HRESULT WINAPI DirectPlay4AImpl_GetMessageQueue - ( LPDIRECTPLAY4A iface, DPID idFrom, DPID idTo, DWORD dwFlags, - LPDWORD lpdwNumMsgs, LPDWORD lpdwNumBytes ) -{ - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - return DP_IF_GetMessageQueue( This, idFrom, idTo, dwFlags, lpdwNumMsgs, - lpdwNumBytes, TRUE ); -} + hr = (*This->dp2->spData.lpCB->GetMessageQueue)( &data ); + } + else + FIXME( "No SP for GetMessageQueue - fake some data\n" ); -static HRESULT WINAPI DirectPlay4WImpl_GetMessageQueue - ( LPDIRECTPLAY4 iface, DPID idFrom, DPID idTo, DWORD dwFlags, - LPDWORD lpdwNumMsgs, LPDWORD lpdwNumBytes ) -{ - IDirectPlay4Impl *This = (IDirectPlay4Impl *)iface; - return DP_IF_GetMessageQueue( This, idFrom, idTo, dwFlags, lpdwNumMsgs, - lpdwNumBytes, FALSE ); + return hr; } static HRESULT DP_IF_CancelMessage @@ -4190,7 +4172,7 @@ static const IDirectPlay4Vtbl dp4_vt = IDirectPlay4Impl_GetGroupOwner, IDirectPlay4Impl_SetGroupOwner, IDirectPlay4Impl_SendEx, - DirectPlay4WImpl_GetMessageQueue, + IDirectPlay4Impl_GetMessageQueue, DirectPlay4WImpl_CancelMessage, DirectPlay4WImpl_CancelPriority }; @@ -4249,7 +4231,7 @@ static const IDirectPlay4Vtbl dp4A_vt = DirectPlay4AImpl_GetGroupOwner, DirectPlay4AImpl_SetGroupOwner, IDirectPlay4AImpl_SendEx, - DirectPlay4AImpl_GetMessageQueue, + IDirectPlay4AImpl_GetMessageQueue, DirectPlay4AImpl_CancelMessage, DirectPlay4AImpl_CancelPriority };

1 0

Michael Stefaniuc : dplayx: Cleanup the IDirectPlay_Cancel* methods.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 73fa61d3b52275bc1af953cf013f883912826acd URL: http://source.winehq.org/git/wine.git/?a=commit;h=73fa61d3b52275bc1af953cf0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:07:24 2013 +0100 dplayx: Cleanup the IDirectPlay_Cancel* methods. --- dlls/dplayx/dplay.c | 126 +++++++++++++++++++-------------------------------- 1 files changed, 46 insertions(+), 80 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index b0eb731..405aee7 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -120,9 +120,6 @@ static HRESULT DP_SP_SendEx ( IDirectPlay2Impl* This, DWORD dwFlags, LPVOID lpData, DWORD dwDataSize, DWORD dwPriority, DWORD dwTimeout, LPVOID lpContext, LPDWORD lpdwMsgID ); -static HRESULT DP_IF_CancelMessage - ( IDirectPlay4Impl* This, DWORD dwMsgID, DWORD dwFlags, - DWORD dwMinPriority, DWORD dwMaxPriority, BOOL bAnsi ); static BOOL CALLBACK cbDPCreateEnumConnections( LPCGUID lpguidSP, LPVOID lpConnection, DWORD dwConnectionSize, LPCDPNAME lpName, DWORD dwFlags, LPVOID lpContext ); @@ -4018,104 +4015,73 @@ static HRESULT WINAPI IDirectPlay4Impl_GetMessageQueue( IDirectPlay4 *iface, DPI return hr; } -static HRESULT DP_IF_CancelMessage - ( IDirectPlay4Impl* This, DWORD dwMsgID, DWORD dwFlags, - DWORD dwMinPriority, DWORD dwMaxPriority, BOOL bAnsi ) +static HRESULT dplay_cancelmsg ( IDirectPlayImpl* This, DWORD msgid, DWORD flags, DWORD minprio, + DWORD maxprio ) { - HRESULT hr = DP_OK; + HRESULT hr = DP_OK; - FIXME( "(%p)->(0x%08x,0x%08x,%u): semi stub\n", - This, dwMsgID, dwFlags, bAnsi ); + FIXME( "(%p)->(0x%08x,0x%08x): semi stub\n", This, msgid, flags ); - if( This->dp2->spData.lpCB->Cancel ) - { - DPSP_CANCELDATA data; + if ( This->dp2->spData.lpCB->Cancel ) + { + DPSP_CANCELDATA data; - TRACE( "Calling SP Cancel\n" ); + TRACE( "Calling SP Cancel\n" ); - /* FIXME: Undocumented callback */ + /* FIXME: Undocumented callback */ - data.lpISP = This->dp2->spData.lpISP; - data.dwFlags = dwFlags; - data.lprglpvSPMsgID = NULL; - data.cSPMsgID = dwMsgID; - data.dwMinPriority = dwMinPriority; - data.dwMaxPriority = dwMaxPriority; + data.lpISP = This->dp2->spData.lpISP; + data.dwFlags = flags; + data.lprglpvSPMsgID = NULL; + data.cSPMsgID = msgid; + data.dwMinPriority = minprio; + data.dwMaxPriority = maxprio; - hr = (*This->dp2->spData.lpCB->Cancel)( &data ); - } - else - { - FIXME( "SP doesn't implement Cancel\n" ); - } + hr = (*This->dp2->spData.lpCB->Cancel)( &data ); + } + else + FIXME( "SP doesn't implement Cancel\n" ); - return hr; + return hr; } -static HRESULT WINAPI DirectPlay4AImpl_CancelMessage - ( LPDIRECTPLAY4A iface, DWORD dwMsgID, DWORD dwFlags ) +static HRESULT WINAPI IDirectPlay4AImpl_CancelMessage( IDirectPlay4A *iface, DWORD msgid, + DWORD flags ) { - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - - if( dwFlags != 0 ) - { - return DPERR_INVALIDFLAGS; - } - - if( dwMsgID == 0 ) - { - dwFlags |= DPCANCELSEND_ALL; - } - - return DP_IF_CancelMessage( This, dwMsgID, dwFlags, 0, 0, TRUE ); + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_CancelMessage( &This->IDirectPlay4_iface, msgid, flags ); } -static HRESULT WINAPI DirectPlay4WImpl_CancelMessage - ( LPDIRECTPLAY4 iface, DWORD dwMsgID, DWORD dwFlags ) +static HRESULT WINAPI IDirectPlay4Impl_CancelMessage( IDirectPlay4 *iface, DWORD msgid, + DWORD flags ) { - IDirectPlay4Impl *This = (IDirectPlay4Impl *)iface; + IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); - if( dwFlags != 0 ) - { - return DPERR_INVALIDFLAGS; - } + if ( flags != 0 ) + return DPERR_INVALIDFLAGS; - if( dwMsgID == 0 ) - { - dwFlags |= DPCANCELSEND_ALL; - } + if ( msgid == 0 ) + flags |= DPCANCELSEND_ALL; - return DP_IF_CancelMessage( This, dwMsgID, dwFlags, 0, 0, FALSE ); + return dplay_cancelmsg( This, msgid, flags, 0, 0 ); } -static HRESULT WINAPI DirectPlay4AImpl_CancelPriority - ( LPDIRECTPLAY4A iface, DWORD dwMinPriority, DWORD dwMaxPriority, - DWORD dwFlags ) +static HRESULT WINAPI IDirectPlay4AImpl_CancelPriority( IDirectPlay4A *iface, DWORD minprio, + DWORD maxprio, DWORD flags ) { - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - - if( dwFlags != 0 ) - { - return DPERR_INVALIDFLAGS; - } - - return DP_IF_CancelMessage( This, 0, DPCANCELSEND_PRIORITY, dwMinPriority, - dwMaxPriority, TRUE ); + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_CancelPriority( &This->IDirectPlay4_iface, minprio, maxprio, flags ); } -static HRESULT WINAPI DirectPlay4WImpl_CancelPriority - ( LPDIRECTPLAY4 iface, DWORD dwMinPriority, DWORD dwMaxPriority, - DWORD dwFlags ) +static HRESULT WINAPI IDirectPlay4Impl_CancelPriority( IDirectPlay4 *iface, DWORD minprio, + DWORD maxprio, DWORD flags ) { - IDirectPlay4Impl *This = (IDirectPlay4Impl *)iface; + IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); - if( dwFlags != 0 ) - { - return DPERR_INVALIDFLAGS; - } + if ( flags != 0 ) + return DPERR_INVALIDFLAGS; - return DP_IF_CancelMessage( This, 0, DPCANCELSEND_PRIORITY, dwMinPriority, - dwMaxPriority, FALSE ); + return dplay_cancelmsg( This, 0, DPCANCELSEND_PRIORITY, minprio, maxprio ); } /* Note: Hack so we can reuse the old functions without compiler warnings */ @@ -4173,8 +4139,8 @@ static const IDirectPlay4Vtbl dp4_vt = IDirectPlay4Impl_SetGroupOwner, IDirectPlay4Impl_SendEx, IDirectPlay4Impl_GetMessageQueue, - DirectPlay4WImpl_CancelMessage, - DirectPlay4WImpl_CancelPriority + IDirectPlay4Impl_CancelMessage, + IDirectPlay4Impl_CancelPriority }; #undef XCAST @@ -4232,8 +4198,8 @@ static const IDirectPlay4Vtbl dp4A_vt = DirectPlay4AImpl_SetGroupOwner, IDirectPlay4AImpl_SendEx, IDirectPlay4AImpl_GetMessageQueue, - DirectPlay4AImpl_CancelMessage, - DirectPlay4AImpl_CancelPriority + IDirectPlay4AImpl_CancelMessage, + IDirectPlay4AImpl_CancelPriority }; HRESULT dplay_create( REFIID riid, void **ppv )

1 0

Michael Stefaniuc : dplayx: Assimilate the rest of the inherited methods into IDirectPlay4.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 52d1aec827ad7aba6637d14b94e4fc75d005eb6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=52d1aec827ad7aba6637d14b9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:08:00 2013 +0100 dplayx: Assimilate the rest of the inherited methods into IDirectPlay4. --- dlls/dplayx/dplay.c | 150 +++++++++++++++++++++++---------------------------- 1 files changed, 68 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52d1aec827ad7aba6637d…

1 0

Lucas Zawacki : Added Portuguese translation for release 1.5.27
by Jeremy Newman 01 Apr '13

01 Apr '13

Module: website Branch: master Commit: 6b075fcdea37b1d2a996ca7c794061c25425fda2 URL: http://source.winehq.org/git/website.git/?a=commit;h=6b075fcdea37b1d2a996ca… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Apr 1 18:10:18 2013 -0300 Added Portuguese translation for release 1.5.27 --- news/pt/2013032901.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/pt/2013032901.xml b/news/pt/2013032901.xml new file mode 100644 index 0000000..9cc83dd --- /dev/null +++ b/news/pt/2013032901.xml @@ -0,0 +1,14 @@ +<news> +<date>29 de Março de 2013</date> +<title>Wine 1.5.27 lançado</title> +<body> + A versão de desenvolvimento 1.5.27 já está disponível agora. + <a href="{$root}/announce/1.5.27">Novidades</a> desta versão: +<ul> + <li>Suporte à bandeja do sistema no driver para Mac.</li> + <li>Várias melhorias no runtime C.</li> + <li>Ícones grandes para todas as aplicações embutidas.</li> + <li>Várias correções de bugs.</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.27.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Piotr Caban : wininet: Correctly set SYSTEMTIME year in HTTP_HttpQueryInfoW .
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: ef4db477f08a7f83d506621876b46b2a623edd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef4db477f08a7f83d50662187… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 15:06:26 2013 +0200 wininet: Correctly set SYSTEMTIME year in HTTP_HttpQueryInfoW. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d0ed459..18279da 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3541,7 +3541,7 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, STHook->wDayOfWeek = tmpTM.tm_wday; STHook->wMonth = tmpTM.tm_mon + 1; STHook->wSecond = tmpTM.tm_sec; - STHook->wYear = tmpTM.tm_year; + STHook->wYear = 1900+tmpTM.tm_year; TRACE(" returning time: %04d/%02d/%02d - %d - %02d:%02d:%02d.%02d\n", STHook->wYear, STHook->wMonth, STHook->wDay, STHook->wDayOfWeek,

1 0

Piotr Caban : cryptnet: Handle SystemTimeToFileTime failure in HTTP_RetrieveEncodedObjectW.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: c3a23a99a2357a6fb007d5d513091ee61e7943e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3a23a99a2357a6fb007d5d51… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 15:06:05 2013 +0200 cryptnet: Handle SystemTimeToFileTime failure in HTTP_RetrieveEncodedObjectW. --- dlls/cryptnet/cryptnet_main.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index ddfdbce..da66e66 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -957,18 +957,12 @@ static BOOL WINAPI HTTP_RetrieveEncodedObjectW(LPCWSTR pszURL, if (ret && !(dwRetrievalFlags & CRYPT_DONT_CACHE_RESULT)) { SYSTEMTIME st; + FILETIME ft; DWORD len = sizeof(st); - if (HttpQueryInfoW(hHttp, - HTTP_QUERY_EXPIRES | HTTP_QUERY_FLAG_SYSTEMTIME, &st, - &len, NULL)) - { - FILETIME ft; - - SystemTimeToFileTime(&st, &ft); - CRYPT_CacheURL(pszURL, pObject, dwRetrievalFlags, - ft); - } + if (HttpQueryInfoW(hHttp, HTTP_QUERY_EXPIRES | HTTP_QUERY_FLAG_SYSTEMTIME, + &st, &len, NULL) && SystemTimeToFileTime(&st, &ft)) + CRYPT_CacheURL(pszURL, pObject, dwRetrievalFlags, ft); } InternetCloseHandle(hHttp); }

1 0

Piotr Caban : wininet: Support Punycode in GetUrlCacheEntryInfoExW.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 940176d8cb270d621989d6876bc2405f5176bb70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=940176d8cb270d621989d6876… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:14:32 2013 +0200 wininet: Support Punycode in GetUrlCacheEntryInfoExW. --- dlls/wininet/urlcache.c | 338 ++++++++++++++++++++++------------------------- 1 files changed, 158 insertions(+), 180 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=940176d8cb270d621989d…

1 0

Piotr Caban : wininet: Support Punycode in SetUrlCacheEntryInfoW.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: f08e79ce9252c929e345ddfce2bd1f54c36b9b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f08e79ce9252c929e345ddfce… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:14:56 2013 +0200 wininet: Support Punycode in SetUrlCacheEntryInfoW. --- dlls/wininet/urlcache.c | 103 ++++++++++++++--------------------------------- 1 files changed, 30 insertions(+), 73 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 9759f8d..059129e 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1351,31 +1351,31 @@ static DWORD urlcache_copy_entry( * urlcache_set_entry_info (Internal) * * Helper for SetUrlCacheEntryInfo{A,W}. Sets fields in URL entry - * according to the flags set by dwFieldControl. + * according to the flags set by field_control. * * RETURNS * ERROR_SUCCESS if the buffer was big enough * ERROR_INSUFFICIENT_BUFFER if the buffer was too small * */ -static DWORD urlcache_set_entry_info(entry_url * pUrlEntry, const INTERNET_CACHE_ENTRY_INFOW * lpCacheEntryInfo, DWORD dwFieldControl) +static DWORD urlcache_set_entry_info(entry_url *url_entry, const INTERNET_CACHE_ENTRY_INFOA *entry_info, DWORD field_control) { - if (dwFieldControl & CACHE_ENTRY_ACCTIME_FC) - pUrlEntry->access_time = lpCacheEntryInfo->LastAccessTime; - if (dwFieldControl & CACHE_ENTRY_ATTRIBUTE_FC) - pUrlEntry->cache_entry_type = lpCacheEntryInfo->CacheEntryType; - if (dwFieldControl & CACHE_ENTRY_EXEMPT_DELTA_FC) - pUrlEntry->exempt_delta = lpCacheEntryInfo->u.dwExemptDelta; - if (dwFieldControl & CACHE_ENTRY_EXPTIME_FC) - file_time_to_dos_date_time(&lpCacheEntryInfo->ExpireTime, &pUrlEntry->expire_date, &pUrlEntry->expire_time); - if (dwFieldControl & CACHE_ENTRY_HEADERINFO_FC) + if (field_control & CACHE_ENTRY_ACCTIME_FC) + url_entry->access_time = entry_info->LastAccessTime; + if (field_control & CACHE_ENTRY_ATTRIBUTE_FC) + url_entry->cache_entry_type = entry_info->CacheEntryType; + if (field_control & CACHE_ENTRY_EXEMPT_DELTA_FC) + url_entry->exempt_delta = entry_info->u.dwExemptDelta; + if (field_control & CACHE_ENTRY_EXPTIME_FC) + file_time_to_dos_date_time(&entry_info->ExpireTime, &url_entry->expire_date, &url_entry->expire_time); + if (field_control & CACHE_ENTRY_HEADERINFO_FC) FIXME("CACHE_ENTRY_HEADERINFO_FC unimplemented\n"); - if (dwFieldControl & CACHE_ENTRY_HITRATE_FC) - pUrlEntry->hit_rate = lpCacheEntryInfo->dwHitRate; - if (dwFieldControl & CACHE_ENTRY_MODTIME_FC) - pUrlEntry->modification_time = lpCacheEntryInfo->LastModifiedTime; - if (dwFieldControl & CACHE_ENTRY_SYNCTIME_FC) - file_time_to_dos_date_time(&lpCacheEntryInfo->LastAccessTime, &pUrlEntry->sync_date, &pUrlEntry->sync_time); + if (field_control & CACHE_ENTRY_HITRATE_FC) + url_entry->hit_rate = entry_info->dwHitRate; + if (field_control & CACHE_ENTRY_MODTIME_FC) + url_entry->modification_time = entry_info->LastModifiedTime; + if (field_control & CACHE_ENTRY_SYNCTIME_FC) + file_time_to_dos_date_time(&entry_info->LastAccessTime, &url_entry->sync_date, &url_entry->sync_time); return ERROR_SUCCESS; } @@ -1973,10 +1973,9 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, /*********************************************************************** * SetUrlCacheEntryInfoA (WININET.@) */ -BOOL WINAPI SetUrlCacheEntryInfoA( - LPCSTR lpszUrlName, - LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo, - DWORD dwFieldControl) +BOOL WINAPI SetUrlCacheEntryInfoA(LPCSTR lpszUrlName, + LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo, + DWORD dwFieldControl) { urlcache_header *pHeader; struct hash_entry *pHashEntry; @@ -2020,10 +2019,7 @@ BOOL WINAPI SetUrlCacheEntryInfoA( return FALSE; } - urlcache_set_entry_info( - (entry_url *)pEntry, - (const INTERNET_CACHE_ENTRY_INFOW *)lpCacheEntryInfo, - dwFieldControl); + urlcache_set_entry_info((entry_url*)pEntry, lpCacheEntryInfo, dwFieldControl); cache_container_unlock_index(pContainer, pHeader); @@ -2033,58 +2029,19 @@ BOOL WINAPI SetUrlCacheEntryInfoA( /*********************************************************************** * SetUrlCacheEntryInfoW (WININET.@) */ -BOOL WINAPI SetUrlCacheEntryInfoW(LPCWSTR lpszUrl, LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, DWORD dwFieldControl) +BOOL WINAPI SetUrlCacheEntryInfoW(LPCWSTR lpszUrl, + LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, + DWORD dwFieldControl) { - urlcache_header *pHeader; - struct hash_entry *pHashEntry; - entry_header *pEntry; - cache_container *pContainer; - DWORD error; - - TRACE("(%s, %p, 0x%08x)\n", debugstr_w(lpszUrl), lpCacheEntryInfo, dwFieldControl); - - error = cache_containers_findW(lpszUrl, &pContainer); - if (error != ERROR_SUCCESS) - { - SetLastError(error); - return FALSE; - } - - error = cache_container_open_index(pContainer, MIN_BLOCK_NO); - if (error != ERROR_SUCCESS) - { - SetLastError(error); - return FALSE; - } - - if (!(pHeader = cache_container_lock_index(pContainer))) - return FALSE; - - if (!urlcache_find_hash_entryW(pHeader, lpszUrl, &pHashEntry)) - { - cache_container_unlock_index(pContainer, pHeader); - WARN("entry %s not found!\n", debugstr_w(lpszUrl)); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } + char *url; + BOOL ret; - pEntry = (entry_header*)((LPBYTE)pHeader + pHashEntry->offset); - if (pEntry->signature != URL_SIGNATURE) - { - cache_container_unlock_index(pContainer, pHeader); - FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPSTR)&pEntry->signature, sizeof(DWORD))); - SetLastError(ERROR_FILE_NOT_FOUND); + if(!urlcache_encode_url_alloc(lpszUrl, &url)) return FALSE; - } - - urlcache_set_entry_info( - (entry_url *)pEntry, - lpCacheEntryInfo, - dwFieldControl); - - cache_container_unlock_index(pContainer, pHeader); - return TRUE; + ret = SetUrlCacheEntryInfoA(url, (INTERNET_CACHE_ENTRY_INFOA*)lpCacheEntryInfo, dwFieldControl); + heap_free(url); + return ret; } /***********************************************************************

1 0

Piotr Caban : wininet: Support Punycode in RetrieveUrlCacheEntryFileW.
by Alexandre Julliard 01 Apr '13

01 Apr '13

Module: wine Branch: master Commit: 4345e44dbbe99eac0659b46f7d872eb68602446d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4345e44dbbe99eac0659b46f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 13:15:15 2013 +0200 wininet: Support Punycode in RetrieveUrlCacheEntryFileW. --- dlls/wininet/urlcache.c | 207 +++++++++++++---------------------------------- 1 files changed, 57 insertions(+), 150 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 059129e..f5f86c5 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2044,204 +2044,111 @@ BOOL WINAPI SetUrlCacheEntryInfoW(LPCWSTR lpszUrl, return ret; } -/*********************************************************************** - * RetrieveUrlCacheEntryFileA (WININET.@) - * - */ -BOOL WINAPI RetrieveUrlCacheEntryFileA( - IN LPCSTR lpszUrlName, - OUT LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo, - IN OUT LPDWORD lpdwCacheEntryInfoBufferSize, - IN DWORD dwReserved - ) +static BOOL urlcache_entry_get_file(const char *url, void *entry_info, DWORD *size, BOOL unicode) { - urlcache_header *pHeader; - struct hash_entry *pHashEntry; - entry_header *pEntry; - entry_url * pUrlEntry; - cache_container *pContainer; + urlcache_header *header; + struct hash_entry *hash_entry; + entry_url *url_entry; + cache_container *container; DWORD error; - TRACE("(%s, %p, %p, 0x%08x)\n", - debugstr_a(lpszUrlName), - lpCacheEntryInfo, - lpdwCacheEntryInfoBufferSize, - dwReserved); + TRACE("(%s, %p, %p, %x)\n", debugstr_a(url), entry_info, size, unicode); - if (!lpszUrlName || !lpdwCacheEntryInfoBufferSize || - (!lpCacheEntryInfo && *lpdwCacheEntryInfoBufferSize)) - { + if(!url || !size || (!entry_info && *size)) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - error = cache_containers_find(lpszUrlName, &pContainer); - if (error != ERROR_SUCCESS) - { + error = cache_containers_find(url, &container); + if(error != ERROR_SUCCESS) { SetLastError(error); return FALSE; } - error = cache_container_open_index(pContainer, MIN_BLOCK_NO); - if (error != ERROR_SUCCESS) - { + error = cache_container_open_index(container, MIN_BLOCK_NO); + if (error != ERROR_SUCCESS) { SetLastError(error); return FALSE; } - if (!(pHeader = cache_container_lock_index(pContainer))) + if (!(header = cache_container_lock_index(container))) return FALSE; - if (!urlcache_find_hash_entry(pHeader, lpszUrlName, &pHashEntry)) - { - cache_container_unlock_index(pContainer, pHeader); - TRACE("entry %s not found!\n", lpszUrlName); + if (!urlcache_find_hash_entry(header, url, &hash_entry)) { + cache_container_unlock_index(container, header); + TRACE("entry %s not found!\n", url); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } - pEntry = (entry_header*)((LPBYTE)pHeader + pHashEntry->offset); - if (pEntry->signature != URL_SIGNATURE) - { - cache_container_unlock_index(pContainer, pHeader); - FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPSTR)&pEntry->signature, sizeof(DWORD))); + url_entry = (entry_url*)((LPBYTE)header + hash_entry->offset); + if(url_entry->header.signature != URL_SIGNATURE) { + cache_container_unlock_index(container, header); + FIXME("Trying to retrieve entry of unknown format %s\n", + debugstr_an((LPSTR)&url_entry->header.signature, sizeof(DWORD))); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } - pUrlEntry = (entry_url *)pEntry; - if (!pUrlEntry->local_name_off) - { - cache_container_unlock_index(pContainer, pHeader); + if(!url_entry->local_name_off) { + cache_container_unlock_index(container, header); SetLastError(ERROR_INVALID_DATA); return FALSE; } - TRACE("Found URL: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->url_off)); - TRACE("Header info: %s\n", debugstr_an((LPCSTR)pUrlEntry + pUrlEntry->header_info_off, - pUrlEntry->header_info_size)); + TRACE("Found URL: %s\n", debugstr_a((LPCSTR)url_entry + url_entry->url_off)); + TRACE("Header info: %s\n", debugstr_an((LPCSTR)url_entry + url_entry->header_info_off, + url_entry->header_info_size)); - error = urlcache_copy_entry(pContainer, pHeader, lpCacheEntryInfo, - lpdwCacheEntryInfoBufferSize, pUrlEntry, - FALSE); - if (error != ERROR_SUCCESS) - { - cache_container_unlock_index(pContainer, pHeader); + error = urlcache_copy_entry(container, header, entry_info, + size, url_entry, unicode); + if(error != ERROR_SUCCESS) { + cache_container_unlock_index(container, header); SetLastError(error); return FALSE; } - TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->local_name_off)); + TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)url_entry + url_entry->local_name_off)); - pUrlEntry->hit_rate++; - pUrlEntry->use_count++; - urlcache_hash_entry_set_flags(pHashEntry, HASHTABLE_LOCK); - GetSystemTimeAsFileTime(&pUrlEntry->access_time); + url_entry->hit_rate++; + url_entry->use_count++; + urlcache_hash_entry_set_flags(hash_entry, HASHTABLE_LOCK); + GetSystemTimeAsFileTime(&url_entry->access_time); - cache_container_unlock_index(pContainer, pHeader); + cache_container_unlock_index(container, header); return TRUE; } /*********************************************************************** - * RetrieveUrlCacheEntryFileW (WININET.@) + * RetrieveUrlCacheEntryFileA (WININET.@) * */ -BOOL WINAPI RetrieveUrlCacheEntryFileW( - IN LPCWSTR lpszUrlName, - OUT LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, - IN OUT LPDWORD lpdwCacheEntryInfoBufferSize, - IN DWORD dwReserved - ) +BOOL WINAPI RetrieveUrlCacheEntryFileA(LPCSTR lpszUrlName, + LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo, + LPDWORD lpdwCacheEntryInfoBufferSize, DWORD dwReserved) { - urlcache_header *pHeader; - struct hash_entry *pHashEntry; - entry_header *pEntry; - entry_url * pUrlEntry; - cache_container *pContainer; - DWORD error; - - TRACE("(%s, %p, %p, 0x%08x)\n", - debugstr_w(lpszUrlName), - lpCacheEntryInfo, - lpdwCacheEntryInfoBufferSize, - dwReserved); - - if (!lpszUrlName || !lpdwCacheEntryInfoBufferSize || - (!lpCacheEntryInfo && *lpdwCacheEntryInfoBufferSize)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - error = cache_containers_findW(lpszUrlName, &pContainer); - if (error != ERROR_SUCCESS) - { - SetLastError(error); - return FALSE; - } - - error = cache_container_open_index(pContainer, MIN_BLOCK_NO); - if (error != ERROR_SUCCESS) - { - SetLastError(error); - return FALSE; - } - - if (!(pHeader = cache_container_lock_index(pContainer))) - return FALSE; - - if (!urlcache_find_hash_entryW(pHeader, lpszUrlName, &pHashEntry)) - { - cache_container_unlock_index(pContainer, pHeader); - TRACE("entry %s not found!\n", debugstr_w(lpszUrlName)); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } - - pEntry = (entry_header*)((LPBYTE)pHeader + pHashEntry->offset); - if (pEntry->signature != URL_SIGNATURE) - { - cache_container_unlock_index(pContainer, pHeader); - FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPSTR)&pEntry->signature, sizeof(DWORD))); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } - - pUrlEntry = (entry_url *)pEntry; - if (!pUrlEntry->local_name_off) - { - cache_container_unlock_index(pContainer, pHeader); - SetLastError(ERROR_INVALID_DATA); - return FALSE; - } + return urlcache_entry_get_file(lpszUrlName, lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, FALSE); +} - TRACE("Found URL: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->url_off)); - TRACE("Header info: %s\n", debugstr_an((LPCSTR)pUrlEntry + pUrlEntry->header_info_off, - pUrlEntry->header_info_size)); +/*********************************************************************** + * RetrieveUrlCacheEntryFileW (WININET.@) + * + */ +BOOL WINAPI RetrieveUrlCacheEntryFileW(LPCWSTR lpszUrlName, + LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, + LPDWORD lpdwCacheEntryInfoBufferSize, DWORD dwReserved) +{ + char *url; + BOOL ret; - error = urlcache_copy_entry( - pContainer, - pHeader, - (LPINTERNET_CACHE_ENTRY_INFOA)lpCacheEntryInfo, - lpdwCacheEntryInfoBufferSize, - pUrlEntry, - TRUE /* UNICODE */); - if (error != ERROR_SUCCESS) - { - cache_container_unlock_index(pContainer, pHeader); - SetLastError(error); + if(!urlcache_encode_url_alloc(lpszUrlName, &url)) return FALSE; - } - TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->local_name_off)); - pUrlEntry->hit_rate++; - pUrlEntry->use_count++; - urlcache_hash_entry_set_flags(pHashEntry, HASHTABLE_LOCK); - GetSystemTimeAsFileTime(&pUrlEntry->access_time); - - cache_container_unlock_index(pContainer, pHeader); - - return TRUE; + ret = urlcache_entry_get_file(url, lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, TRUE); + heap_free(url); + return ret; } static BOOL urlcache_entry_delete(const cache_container *pContainer,

1 0