wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Vincent Povirk : windowscodecs: Use WINCODEC_ERR_UNSUPPORTEDOPERATION in GetColorContexts stubs.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 6f4dba586aae7a9fea7359732bd7e9c4b0e82b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4dba586aae7a9fea7359732… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 25 16:34:59 2012 -0500 windowscodecs: Use WINCODEC_ERR_UNSUPPORTEDOPERATION in GetColorContexts stubs. --- dlls/windowscodecs/pngformat.c | 4 ++-- dlls/windowscodecs/tiffformat.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index d0977b4..686f9c6 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -625,7 +625,7 @@ static HRESULT WINAPI PngDecoder_GetColorContexts(IWICBitmapDecoder *iface, UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { FIXME("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); - return E_NOTIMPL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI PngDecoder_GetThumbnail(IWICBitmapDecoder *iface, @@ -845,7 +845,7 @@ static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *i UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); - return E_NOTIMPL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI PngDecoder_Frame_GetThumbnail(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 05b6aba..cf93540 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -649,7 +649,7 @@ static HRESULT WINAPI TiffDecoder_GetColorContexts(IWICBitmapDecoder *iface, UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { FIXME("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); - return E_NOTIMPL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI TiffDecoder_GetThumbnail(IWICBitmapDecoder *iface, @@ -1099,7 +1099,7 @@ static HRESULT WINAPI TiffFrameDecode_GetColorContexts(IWICBitmapFrameDecode *if UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); - return E_NOTIMPL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI TiffFrameDecode_GetThumbnail(IWICBitmapFrameDecode *iface,

1 0

Detlef Riekenberg : d3dx9_36/tests: Fix copy & paste error in ok messages.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: a695062447ef35d7a78bcb209178362c6f149e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a695062447ef35d7a78bcb209… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 25 23:35:00 2012 +0200 d3dx9_36/tests: Fix copy & paste error in ok messages. --- dlls/d3dx9_36/tests/texture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 06e69e2..3c2cd95 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1314,9 +1314,9 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); ok(hr == D3D_OK, "IDirect3DTexture9_GetLevelDesc returned %#x, expected %#x\n", hr, D3D_OK); ok(desc.Width == 4, "Width is %u, expected 4\n", desc.Width); - ok(desc.Height == 4, "Width is %u, expected 4\n", desc.Height); + ok(desc.Height == 4, "Height is %u, expected 4\n", desc.Height); hr = IDirect3DTexture9_LockRect(texture, 0, &lock_rect, NULL, D3DLOCK_READONLY); - ok(hr == D3D_OK, "IDirect3DTexture9_LockTexture returned %#x, expected %#x\n", hr, D3D_OK); + ok(hr == D3D_OK, "IDirect3DTexture9_LockRect returned %#x, expected %#x\n", hr, D3D_OK); if (SUCCEEDED(hr)) { for (i = 0; i < 16; i++)

1 0

Michael Stefaniuc : dsound: DirectSoundDevice_RemoveBuffer() cannot fail.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: cea6329483260e866a7f2c2b64bb997534c83057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cea6329483260e866a7f2c2b6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 25 23:25:45 2012 +0200 dsound: DirectSoundDevice_RemoveBuffer() cannot fail. --- dlls/dsound/dsound.c | 7 +------ dlls/dsound/dsound_private.h | 4 +--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 666f29f..e5b0e3c 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1080,12 +1080,9 @@ HRESULT DirectSoundDevice_AddBuffer( * Remove secondary buffer from buffer list. * Gets exclusive access to buffer for writing. */ -HRESULT DirectSoundDevice_RemoveBuffer( - DirectSoundDevice * device, - IDirectSoundBufferImpl * pDSB) +void DirectSoundDevice_RemoveBuffer(DirectSoundDevice * device, IDirectSoundBufferImpl * pDSB) { int i; - HRESULT hr = DS_OK; TRACE("(%p, %p)\n", device, pDSB); @@ -1108,6 +1105,4 @@ HRESULT DirectSoundDevice_RemoveBuffer( TRACE("buffer count is now %d\n", device->nrofbuffers); RtlReleaseResource(&(device->buffer_list_lock)); - - return hr; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index d5fb415..247f229 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -118,9 +118,7 @@ HRESULT DirectSoundDevice_Initialize( HRESULT DirectSoundDevice_AddBuffer( DirectSoundDevice * device, IDirectSoundBufferImpl * pDSB) DECLSPEC_HIDDEN; -HRESULT DirectSoundDevice_RemoveBuffer( - DirectSoundDevice * device, - IDirectSoundBufferImpl * pDSB) DECLSPEC_HIDDEN; +void DirectSoundDevice_RemoveBuffer(DirectSoundDevice * device, IDirectSoundBufferImpl * pDSB) DECLSPEC_HIDDEN; HRESULT DirectSoundDevice_CreateSoundBuffer( DirectSoundDevice * device, LPCDSBUFFERDESC dsbd,

1 0

Michael Stefaniuc : dsound: Don' t bother shrinking the secondary buffer list.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 4e06eead8f446f0167e6c92f0cc09f943122a7cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e06eead8f446f0167e6c92f0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 25 23:23:31 2012 +0200 dsound: Don't bother shrinking the secondary buffer list. --- dlls/dsound/dsound.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index a7a6f13..666f29f 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include <stdarg.h> #include <stdio.h> @@ -1090,22 +1091,21 @@ HRESULT DirectSoundDevice_RemoveBuffer( RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); - for (i = 0; i < device->nrofbuffers; i++) - if (device->buffers[i] == pDSB) - break; - - if (i < device->nrofbuffers) { - /* Put the last buffer of the list in the (now empty) position */ - device->buffers[i] = device->buffers[device->nrofbuffers - 1]; - device->nrofbuffers--; - device->buffers = HeapReAlloc(GetProcessHeap(),0,device->buffers,sizeof(LPDIRECTSOUNDBUFFER8)*device->nrofbuffers); - TRACE("buffer count is now %d\n", device->nrofbuffers); - } - - if (device->nrofbuffers == 0) { - HeapFree(GetProcessHeap(),0,device->buffers); + if (device->nrofbuffers == 1) { + assert(device->buffers[0] == pDSB); + HeapFree(GetProcessHeap(), 0, device->buffers); device->buffers = NULL; + } else { + for (i = 0; i < device->nrofbuffers; i++) { + if (device->buffers[i] == pDSB) { + /* Put the last buffer of the list in the (now empty) position */ + device->buffers[i] = device->buffers[device->nrofbuffers - 1]; + break; + } + } } + device->nrofbuffers--; + TRACE("buffer count is now %d\n", device->nrofbuffers); RtlReleaseResource(&(device->buffer_list_lock));

1 0

Piotr Caban : inetcpl.cpl: Added support for clearing cookies and history cache.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 04453937e5cbff9e4c0bff815d22c1ee66188967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04453937e5cbff9e4c0bff815… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 25 18:12:48 2012 +0200 inetcpl.cpl: Added support for clearing cookies and history cache. --- dlls/inetcpl.cpl/Makefile.in | 2 +- dlls/inetcpl.cpl/general.c | 26 +++++++++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index aedaaa9..2f0c1f1 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -1,6 +1,6 @@ MODULE = inetcpl.cpl IMPORTS = comctl32 shlwapi user32 advapi32 -DELAYIMPORTS = cryptui wininet ole32 urlmon +DELAYIMPORTS = cryptui wininet ole32 urlmon shell32 C_SRCS = \ content.c \ diff --git a/dlls/inetcpl.cpl/general.c b/dlls/inetcpl.cpl/general.c index 1d8f027..42948ea 100644 --- a/dlls/inetcpl.cpl/general.c +++ b/dlls/inetcpl.cpl/general.c @@ -29,6 +29,7 @@ #include <winreg.h> #include <shlwapi.h> #include <prsht.h> +#include <shlobj.h> #include "inetcpl.h" #include "wine/debug.h" @@ -47,9 +48,7 @@ static DWORD disabled_general_buttons[] = {IDC_HOME_CURRENT, IDC_HOME_DEFAULT, IDC_HISTORY_SETTINGS, 0}; -static DWORD disabled_delhist_buttons[] = {IDC_DELETE_COOKIES, - IDC_DELETE_HISTORY, - IDC_DELETE_FORM_DATA, +static DWORD disabled_delhist_buttons[] = {IDC_DELETE_FORM_DATA, IDC_DELETE_PASSWORDS, 0}; @@ -64,8 +63,25 @@ static INT_PTR delhist_on_command(HWND hdlg, WPARAM wparam) switch (wparam) { case MAKEWPARAM(IDOK, BN_CLICKED): - if (!FreeUrlCacheSpaceW(NULL, 100, FCS_PERCENT_CACHE_SPACE)) - break; /* Don't close the dialog. */ + if (IsDlgButtonChecked(hdlg, IDC_DELETE_TEMP_FILES)) + FreeUrlCacheSpaceW(NULL, 100, 0); + + if (IsDlgButtonChecked(hdlg, IDC_DELETE_COOKIES)) + { + WCHAR pathW[MAX_PATH]; + + if(SHGetSpecialFolderPathW(NULL, pathW, CSIDL_COOKIES, TRUE)) + FreeUrlCacheSpaceW(pathW, 100, 0); + } + + if (IsDlgButtonChecked(hdlg, IDC_DELETE_HISTORY)) + { + WCHAR pathW[MAX_PATH]; + + if(SHGetSpecialFolderPathW(NULL, pathW, CSIDL_HISTORY, TRUE)) + FreeUrlCacheSpaceW(pathW, 100, 0); + } + EndDialog(hdlg, IDOK); return TRUE;

1 0

Piotr Caban : wininet: Added more GetUrlCacheEntryInfo tests with GET_INSTALLED_ENTRY flag.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 306f53cbf25c37fc439e73a0530e013b50303f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=306f53cbf25c37fc439e73a05… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 25 17:31:55 2012 +0200 wininet: Added more GetUrlCacheEntryInfo tests with GET_INSTALLED_ENTRY flag. --- dlls/wininet/tests/urlcache.c | 188 ++++++++++++++++++++++------------------- 1 files changed, 101 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=306f53cbf25c37fc439e7…

1 0

Piotr Caban : wininet: Ignore unsupported flags in GetUrlCacheEntryInfoEx functions.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: f9e80f588a4716016483cd05dcc8191e8ddfdc3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9e80f588a4716016483cd05d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 25 17:31:35 2012 +0200 wininet: Ignore unsupported flags in GetUrlCacheEntryInfoEx functions. --- dlls/wininet/urlcache.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index befb9b7..eac3402 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1735,11 +1735,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( return FALSE; } if (dwFlags & ~GET_INSTALLED_ENTRY) - { - FIXME("Undocumented flag(s): %x\n", dwFlags); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } + FIXME("ignorring unsupported flags: %x", dwFlags); error = URLCacheContainers_FindContainerA(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) @@ -1879,12 +1875,8 @@ BOOL WINAPI GetUrlCacheEntryInfoExW( SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (dwFlags != 0) - { - FIXME("Undocumented flag(s): %x\n", dwFlags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; - } + if (dwFlags) + FIXME("ignorring unsupported flags: %x", dwFlags); error = URLCacheContainers_FindContainerW(lpszUrl, &pContainer); if (error != ERROR_SUCCESS)

1 0

Piotr Caban : wininet: Fixed handling of GET_INSTALLED_ENTRY flag in GetUrlCacheEntryInfoW.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 7c6f0c947041f9dbc230f2c0c5dcc66e2b89cb0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6f0c947041f9dbc230f2c0c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 25 17:31:19 2012 +0200 wininet: Fixed handling of GET_INSTALLED_ENTRY flag in GetUrlCacheEntryInfoW. --- dlls/wininet/urlcache.c | 99 ++++++++++++++++++++++++----------------------- 1 files changed, 51 insertions(+), 48 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index c0d11b6..befb9b7 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1835,6 +1835,23 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, LPDWORD lpdwCacheEntryInfoBufferSize) { + return GetUrlCacheEntryInfoExW(lpszUrl, lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, NULL, NULL, NULL, 0); +} + +/*********************************************************************** + * GetUrlCacheEntryInfoExW (WININET.@) + * + */ +BOOL WINAPI GetUrlCacheEntryInfoExW( + LPCWSTR lpszUrl, + LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, + LPDWORD lpdwCacheEntryInfoBufSize, + LPWSTR lpszReserved, + LPDWORD lpdwReserved, + LPVOID lpReserved, + DWORD dwFlags) +{ LPURLCACHE_HEADER pHeader; struct _HASH_ENTRY * pHashEntry; const CACHEFILE_ENTRY * pEntry; @@ -1842,7 +1859,32 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, URLCACHECONTAINER * pContainer; DWORD error; - TRACE("(%s, %p, %p)\n", debugstr_w(lpszUrl), lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize); + TRACE("(%s, %p, %p, %p, %p, %p, %x)\n", + debugstr_w(lpszUrl), + lpCacheEntryInfo, + lpdwCacheEntryInfoBufSize, + lpszReserved, + lpdwReserved, + lpReserved, + dwFlags); + + /* Ignore GET_INSTALLED_ENTRY flag in unicode version of function */ + dwFlags &= ~GET_INSTALLED_ENTRY; + + if ((lpszReserved != NULL) || + (lpdwReserved != NULL) || + (lpReserved != NULL)) + { + ERR("Reserved value was not 0\n"); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (dwFlags != 0) + { + FIXME("Undocumented flag(s): %x\n", dwFlags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } error = URLCacheContainers_FindContainerW(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) @@ -1882,18 +1924,18 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, TRACE("Found URL: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); TRACE("Header info: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); - if (lpdwCacheEntryInfoBufferSize) + if (lpdwCacheEntryInfoBufSize) { if (!lpCacheEntryInfo) - *lpdwCacheEntryInfoBufferSize = 0; + *lpdwCacheEntryInfoBufSize = 0; error = URLCache_CopyEntry( - pContainer, - pHeader, - (LPINTERNET_CACHE_ENTRY_INFOA)lpCacheEntryInfo, - lpdwCacheEntryInfoBufferSize, - pUrlEntry, - TRUE /* UNICODE */); + pContainer, + pHeader, + (LPINTERNET_CACHE_ENTRY_INFOA)lpCacheEntryInfo, + lpdwCacheEntryInfoBufSize, + pUrlEntry, + TRUE /* UNICODE */); if (error != ERROR_SUCCESS) { URLCacheContainer_UnlockIndex(pContainer, pHeader); @@ -1909,45 +1951,6 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, } /*********************************************************************** - * GetUrlCacheEntryInfoExW (WININET.@) - * - */ -BOOL WINAPI GetUrlCacheEntryInfoExW( - LPCWSTR lpszUrl, - LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, - LPDWORD lpdwCacheEntryInfoBufSize, - LPWSTR lpszReserved, - LPDWORD lpdwReserved, - LPVOID lpReserved, - DWORD dwFlags) -{ - TRACE("(%s, %p, %p, %p, %p, %p, %x)\n", - debugstr_w(lpszUrl), - lpCacheEntryInfo, - lpdwCacheEntryInfoBufSize, - lpszReserved, - lpdwReserved, - lpReserved, - dwFlags); - - if ((lpszReserved != NULL) || - (lpdwReserved != NULL) || - (lpReserved != NULL)) - { - ERR("Reserved value was not 0\n"); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if (dwFlags != 0) - { - FIXME("Undocumented flag(s): %x\n", dwFlags); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } - return GetUrlCacheEntryInfoW(lpszUrl, lpCacheEntryInfo, lpdwCacheEntryInfoBufSize); -} - -/*********************************************************************** * SetUrlCacheEntryInfoA (WININET.@) */ BOOL WINAPI SetUrlCacheEntryInfoA(

1 0

Piotr Caban : wininet: Fixed handling of GET_INSTALLED_ENTRY flag in GetUrlCacheEntryInfoA.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: a342ded2887997e7b4734a4b0c946e10a40835e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a342ded2887997e7b4734a4b0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 25 17:30:58 2012 +0200 wininet: Fixed handling of GET_INSTALLED_ENTRY flag in GetUrlCacheEntryInfoA. --- dlls/wininet/urlcache.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 25e2ecf..c0d11b6 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -81,6 +81,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); #define HASHTABLE_FLAG_BITS 6 #define PENDING_DELETE_CACHE_ENTRY 0x00400000 +#define INSTALLED_CACHE_ENTRY 0x10000000 +#define GET_INSTALLED_ENTRY 0x200 #define CACHE_CONTAINER_NO_SUBDIR 0xFE #define CACHE_HEADER_DATA_ROOT_LEAK_OFFSET 0x16 @@ -1732,7 +1734,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (dwFlags != 0) + if (dwFlags & ~GET_INSTALLED_ENTRY) { FIXME("Undocumented flag(s): %x\n", dwFlags); SetLastError(ERROR_FILE_NOT_FOUND); @@ -1778,6 +1780,13 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( if (pUrlEntry->dwOffsetHeaderInfo) TRACE("Header info: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); + if((dwFlags & GET_INSTALLED_ENTRY) && !(pUrlEntry->CacheEntryType & INSTALLED_CACHE_ENTRY)) + { + URLCacheContainer_UnlockIndex(pContainer, pHeader); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + if (lpdwCacheEntryInfoBufSize) { if (!lpCacheEntryInfo)

1 0

Piotr Caban : wininet: Move GetUrlCacheEntryInfoA code to GetUrlCacheEntryInfoExA function.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 134db11effd1360e376d9e8afecbd1041f5261ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=134db11effd1360e376d9e8af… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 25 17:30:42 2012 +0200 wininet: Move GetUrlCacheEntryInfoA code to GetUrlCacheEntryInfoExA function. --- dlls/wininet/urlcache.c | 54 +++++++++++++++++++++++----------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 45f447f..25e2ecf 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1708,6 +1708,13 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( LPVOID lpReserved, DWORD dwFlags) { + LPURLCACHE_HEADER pHeader; + struct _HASH_ENTRY * pHashEntry; + const CACHEFILE_ENTRY * pEntry; + const URL_CACHEFILE_ENTRY * pUrlEntry; + URLCACHECONTAINER * pContainer; + DWORD error; + TRACE("(%s, %p, %p, %p, %p, %p, %x)\n", debugstr_a(lpszUrl), lpCacheEntryInfo, @@ -1731,29 +1738,8 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } - return GetUrlCacheEntryInfoA(lpszUrl, lpCacheEntryInfo, lpdwCacheEntryInfoBufSize); -} - -/*********************************************************************** - * GetUrlCacheEntryInfoA (WININET.@) - * - */ -BOOL WINAPI GetUrlCacheEntryInfoA( - IN LPCSTR lpszUrlName, - IN LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo, - IN OUT LPDWORD lpdwCacheEntryInfoBufferSize -) -{ - LPURLCACHE_HEADER pHeader; - struct _HASH_ENTRY * pHashEntry; - const CACHEFILE_ENTRY * pEntry; - const URL_CACHEFILE_ENTRY * pUrlEntry; - URLCACHECONTAINER * pContainer; - DWORD error; - TRACE("(%s, %p, %p)\n", debugstr_a(lpszUrlName), lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize); - - error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer); + error = URLCacheContainers_FindContainerA(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) { SetLastError(error); @@ -1770,10 +1756,10 @@ BOOL WINAPI GetUrlCacheEntryInfoA( if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; - if (!URLCache_FindHash(pHeader, lpszUrlName, &pHashEntry)) + if (!URLCache_FindHash(pHeader, lpszUrl, &pHashEntry)) { URLCacheContainer_UnlockIndex(pContainer, pHeader); - WARN("entry %s not found!\n", debugstr_a(lpszUrlName)); + WARN("entry %s not found!\n", debugstr_a(lpszUrl)); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } @@ -1792,16 +1778,16 @@ BOOL WINAPI GetUrlCacheEntryInfoA( if (pUrlEntry->dwOffsetHeaderInfo) TRACE("Header info: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); - if (lpdwCacheEntryInfoBufferSize) + if (lpdwCacheEntryInfoBufSize) { if (!lpCacheEntryInfo) - *lpdwCacheEntryInfoBufferSize = 0; + *lpdwCacheEntryInfoBufSize = 0; error = URLCache_CopyEntry( pContainer, pHeader, lpCacheEntryInfo, - lpdwCacheEntryInfoBufferSize, + lpdwCacheEntryInfoBufSize, pUrlEntry, FALSE /* ANSI */); if (error != ERROR_SUCCESS) @@ -1819,6 +1805,20 @@ BOOL WINAPI GetUrlCacheEntryInfoA( } /*********************************************************************** + * GetUrlCacheEntryInfoA (WININET.@) + * + */ +BOOL WINAPI GetUrlCacheEntryInfoA( + IN LPCSTR lpszUrlName, + IN LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo, + IN OUT LPDWORD lpdwCacheEntryInfoBufferSize +) +{ + return GetUrlCacheEntryInfoExA(lpszUrlName, lpCacheEntryInfo, + lpdwCacheEntryInfoBufferSize, NULL, NULL, NULL, 0); +} + +/*********************************************************************** * GetUrlCacheEntryInfoW (WININET.@) * */

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2012