[PATCH v2] shcore: Don't return E_FAIL in IStream::SetSize() for read-only mode.
Jactry Zeng
jzeng at codeweavers.com
Tue Feb 5 10:37:37 CST 2019
Signed-off-by: Jactry Zeng <jzeng at codeweavers.com>
--
Regards,
Jactry Zeng
> 在 2019年2月5日，下午11:39，Jactry Zeng <jzeng at codeweavers.com> 写道：
>
> Superseded patch 157554.
>
> ---
> dlls/shcore/main.c | 15 +++++-
> dlls/shcore/tests/shcore.c | 119 +++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 132 insertions(+), 2 deletions(-)
>
> diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c
> index 973b7c7a03..fdf878ed2a 100644
> --- a/dlls/shcore/main.c
> +++ b/dlls/shcore/main.c
> @@ -913,15 +913,26 @@ static HRESULT WINAPI filestream_Seek(IStream *iface, LARGE_INTEGER move, DWORD
> static HRESULT WINAPI filestream_SetSize(IStream *iface, ULARGE_INTEGER size)
> {
> struct shstream *stream = impl_from_IStream(iface);
> + LARGE_INTEGER origin, move;
>
> TRACE("(%p, %s)\n", stream, wine_dbgstr_longlong(size.QuadPart));
>
> - if (!SetFilePointer(stream->u.file.handle, size.QuadPart, NULL, FILE_BEGIN))
> + move.QuadPart = 0;
> + if (!SetFilePointerEx(stream->u.file.handle, move, &origin, FILE_CURRENT))
> return E_FAIL;
>
> - if (!SetEndOfFile(stream->u.file.handle))
> + move.QuadPart = size.QuadPart;
> + if (!SetFilePointerEx(stream->u.file.handle, move, NULL, FILE_BEGIN))
> return E_FAIL;
>
> + if (stream->u.file.mode != STGM_READ)
> + {
> + if (!SetEndOfFile(stream->u.file.handle))
> + return E_FAIL;
> + if (!SetFilePointerEx(stream->u.file.handle, origin, NULL, FILE_BEGIN))
> + return E_FAIL;
> + }
> +
> return S_OK;
> }
>
> diff --git a/dlls/shcore/tests/shcore.c b/dlls/shcore/tests/shcore.c
> index 0738659f7c..2a8ebcc468 100644
> --- a/dlls/shcore/tests/shcore.c
> +++ b/dlls/shcore/tests/shcore.c
> @@ -41,6 +41,8 @@ static LSTATUS (WINAPI *pSHRegGetValueA)(HKEY, const char *, const char *, SRRF,
> static DWORD (WINAPI *pSHQueryValueExA)(HKEY, const char *, DWORD *, DWORD *, void *buff, DWORD *buff_len);
> static DWORD (WINAPI *pSHRegGetPathA)(HKEY, const char *, const char *, char *, DWORD);
> static DWORD (WINAPI *pSHCopyKeyA)(HKEY, const char *, HKEY, DWORD);
> +static HRESULT (WINAPI *pSHCreateStreamOnFileA)(const char *path, DWORD mode, IStream **stream);
> +static HRESULT (WINAPI *pIStream_Size)(IStream *stream, ULARGE_INTEGER *size);
>
> /* Keys used for testing */
> #define REG_TEST_KEY "Software\\Wine\\Test"
> @@ -73,6 +75,8 @@ static void init(HMODULE hshcore)
> X(SHQueryValueExA);
> X(SHRegGetPathA);
> X(SHCopyKeyA);
> + X(SHCreateStreamOnFileA);
> + X(IStream_Size);
> #undef X
> }
>
> @@ -671,6 +675,120 @@ static void test_SHCopyKey(void)
> delete_key( hkey, "Software\\Wine", "Test" );
> }
>
> +#define CHECK_FILE_SIZE(filename,exp_size) _check_file_size(filename, exp_size, __LINE__)
> +static void _check_file_size(const CHAR *filename, LONG exp_size, int line)
> +{
> + HANDLE handle;
> + DWORD file_size = 0xdeadbeef;
> + handle = CreateFileA(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0);
> + file_size = GetFileSize(handle, NULL);
> + ok_(__FILE__,line)(file_size == exp_size, "got wrong file size: %d.\n", file_size);
> + CloseHandle(handle);
> +}
> +
> +#define CHECK_STREAM_SIZE(obj,exp_size) _check_stream_size(obj, exp_size, __LINE__)
> +static void _check_stream_size(IStream *obj, LONG exp_size, int line)
> +{
> + ULARGE_INTEGER stream_size;
> + STATSTG stat;
> + HRESULT hr;
> + stream_size.QuadPart = 0xdeadbeef;
> + hr = pIStream_Size(obj, &stream_size);
> + ok_(__FILE__,line)(hr == S_OK, "IStream_Size failed: 0x%08x.\n", hr);
> + ok_(__FILE__,line)(stream_size.QuadPart == exp_size, "Size(): got wrong size of stream: %s.\n",
> + wine_dbgstr_longlong(stream_size.QuadPart));
> + hr = IStream_Stat(obj, &stat, STATFLAG_NONAME);
> + ok_(__FILE__,line)(hr == S_OK, "IStream_Stat failed: 0x%08x.\n", hr);
> + ok_(__FILE__,line)(stat.cbSize.QuadPart == exp_size, "Stat(): got wrong size of stream: %s.\n",
> + wine_dbgstr_longlong(stat.cbSize.QuadPart));
> +}
> +
> +#define CHECK_STREAM_POS(obj,exp_pos) _check_stream_pos(obj, exp_pos, __LINE__)
> +static void _check_stream_pos(IStream *obj, LONG exp_pos, int line)
> +{
> + LARGE_INTEGER move;
> + ULARGE_INTEGER pos;
> + HRESULT hr;
> + move.QuadPart = 0;
> + pos.QuadPart = 0xdeadbeef;
> + hr = IStream_Seek(obj, move, STREAM_SEEK_CUR, &pos);
> + ok_(__FILE__,line)(hr == S_OK, "IStream_Seek failed: 0x%08x.\n", hr);
> + ok_(__FILE__,line)(pos.QuadPart == exp_pos, "got wrong position: %s.\n",
> + wine_dbgstr_longlong(pos.QuadPart));
> +}
> +
> +static void test_stream_size(void)
> +{
> + static const byte test_data[] = {0x1,0x2,0x3,0x4,0x5,0x6};
> + static const CHAR filename[] = "test_file";
> + IStream *stream, *stream2;
> + HANDLE handle;
> + DWORD written = 0;
> + ULARGE_INTEGER stream_size;
> + HRESULT hr;
> +
> + handle = CreateFileA(filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);
> + ok(handle != INVALID_HANDLE_VALUE, "File creation failed: 0x%08x.\n", GetLastError());
> + WriteFile(handle, test_data, sizeof(test_data), &written, NULL);
> + ok(written == sizeof(test_data), "Failed to write data into file.\n");
> + CloseHandle(handle);
> +
> + /* in read-only mode, SetSize() will success but it has no effect on Size() and the file */
> + hr = pSHCreateStreamOnFileA(filename, STGM_FAILIFTHERE|STGM_READ, &stream);
> + ok(hr == S_OK, "SHCreateStreamOnFileA failed: 0x%08x.\n", hr);
> + CHECK_STREAM_SIZE(stream, sizeof(test_data));
> + stream_size.QuadPart = 0;
> + hr = IStream_SetSize(stream, stream_size);
> + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr);
> + CHECK_STREAM_SIZE(stream, sizeof(test_data));
> + CHECK_STREAM_POS(stream, 0);
> + stream_size.QuadPart = 100;
> + hr = IStream_SetSize(stream, stream_size);
> + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr);
> + CHECK_STREAM_SIZE(stream, sizeof(test_data));
> + CHECK_STREAM_POS(stream, 100);
> + IStream_Release(stream);
> + CHECK_FILE_SIZE(filename, sizeof(test_data));
> +
> + hr = pSHCreateStreamOnFileA(filename, STGM_FAILIFTHERE|STGM_WRITE, &stream);
> + ok(hr == S_OK, "SHCreateStreamOnFileA failed: 0x%08x.\n", hr);
> + hr = pSHCreateStreamOnFileA(filename, STGM_FAILIFTHERE|STGM_READ, &stream2);
> + ok(hr == S_OK, "SHCreateStreamOnFileA failed: 0x%08x.\n", hr);
> + CHECK_STREAM_SIZE(stream, sizeof(test_data));
> + CHECK_STREAM_SIZE(stream2, sizeof(test_data));
> + CHECK_STREAM_POS(stream, 0);
> + CHECK_STREAM_POS(stream2, 0);
> +
> + stream_size.QuadPart = 0;
> + hr = IStream_SetSize(stream, stream_size);
> + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr);
> + CHECK_STREAM_SIZE(stream, 0);
> + CHECK_STREAM_SIZE(stream2, 0);
> + CHECK_STREAM_POS(stream, 0);
> + CHECK_STREAM_POS(stream2, 0);
> +
> + stream_size.QuadPart = 100;
> + hr = IStream_SetSize(stream, stream_size);
> + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr);
> + CHECK_STREAM_SIZE(stream, 100);
> + CHECK_STREAM_SIZE(stream2, 100);
> + CHECK_STREAM_POS(stream, 0);
> + CHECK_STREAM_POS(stream2, 0);
> +
> + stream_size.QuadPart = 90;
> + hr = IStream_SetSize(stream2, stream_size);
> + ok(hr == S_OK, "IStream_SetSize failed: 0x%08x.\n", hr);
> + CHECK_STREAM_SIZE(stream, 100);
> + CHECK_STREAM_SIZE(stream2, 100);
> + CHECK_STREAM_POS(stream, 0);
> + CHECK_STREAM_POS(stream2, 90);
> + IStream_Release(stream);
> + IStream_Release(stream2);
> + CHECK_FILE_SIZE(filename, 100);
> +
> + DeleteFileA(filename);
> +}
> +
> START_TEST(shcore)
> {
> HMODULE hshcore = LoadLibraryA("shcore.dll");
> @@ -695,4 +813,5 @@ START_TEST(shcore)
> test_SHQueryValueEx();
> test_SHRegGetPath();
> test_SHCopyKey();
> + test_stream_size();
> }
> --
> 2.15.2 (Apple Git-101.1)
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-devel/attachments/20190206/00e4034d/attachment-0001.html>
More information about the wine-devel
mailing list