September 2020 - Wine-devel

[PATCH v2 2/5] winmm: Don't reuse old timer IDs.
by Piotr Caban 30 Sep '20

30 Sep '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winmm/time.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)

1 0

[PATCH v2 1/5] winmm: Remove unneeded TIME_TimeToDie, the thread ends when list is empty.
by Piotr Caban 30 Sep '20

30 Sep '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - don't assign 0 timer ID on overflow (only patches 2 and 3 were changed) dlls/winmm/time.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)

1 0

[PATCH 5/5] winmm: Add more timer tests.
by Piotr Caban 30 Sep '20

30 Sep '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winmm/tests/timer.c | 55 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+)

1 0

[PATCH 4/5] winmm: Destroy timer after calling callback.
by Piotr Caban 30 Sep '20

30 Sep '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winmm/time.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)

1 0

[PATCH 3/5] winmm: Avoid allocations in timeSetEvent.
by Piotr Caban 30 Sep '20

30 Sep '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winmm/time.c | 118 +++++++++++++++++++++------------------------- 1 file changed, 54 insertions(+), 64 deletions(-)

1 0

[PATCH 2/5] winmm: Don't reuse old timer IDs.
by Piotr Caban 30 Sep '20

30 Sep '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winmm/time.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)

1 0

[PATCH 1/5] winmm: Remove unneeded TIME_TimeToDie, the thread ends when list is empty.
by Piotr Caban 30 Sep '20

30 Sep '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winmm/time.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)

1 0

[PATCH] mfreadwrite/tests: Add return value test (Coverity).
by Nikolay Sivov 30 Sep '20

30 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/tests/mfplat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 8ed94289703..84581f9be9a 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -438,11 +438,13 @@ static struct test_media_stream *create_test_stream(DWORD stream_index, IMFMedia struct test_media_stream *stream; IMFPresentationDescriptor *pd; BOOL selected; + HRESULT hr; stream = heap_alloc_zero(sizeof(*stream)); stream->IMFMediaStream_iface.lpVtbl = &test_media_stream_vtbl; stream->refcount = 1; - MFCreateEventQueue(&stream->event_queue); + hr = MFCreateEventQueue(&stream->event_queue); + ok(hr == S_OK, "Failed to create event queue, hr %#x.\n", hr); stream->source = source; IMFMediaSource_AddRef(stream->source); stream->is_new = TRUE; -- 2.28.0

1 0

[PATCH 1/3] d3dx10: Implement D3DX10GetImageInfoFromFileW().
by Matteo Bruni 30 Sep '20

30 Sep '20

From: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 4 +- dlls/d3dx10_43/texture.c | 70 ++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 640e83fcd0fb..e33b8326461d 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1383,12 +1383,10 @@ static void test_get_image_info(void) check_image_info(&image_info, i, __LINE__); } - todo_wine { hr = D3DX10GetImageInfoFromFileW(NULL, NULL, &image_info, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); hr = D3DX10GetImageInfoFromFileW(L"deadbeaf", NULL, &image_info, NULL); ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - } for (i = 0; i < ARRAY_SIZE(test_image); ++i) { @@ -1396,7 +1394,7 @@ static void test_get_image_info(void) hr = D3DX10GetImageInfoFromFileW(path, NULL, &image_info, NULL); delete_file(test_filename); - todo_wine + todo_wine_if(test_image[i].expected.ImageFileFormat == D3DX10_IFF_WMP) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); if (hr != S_OK) continue; diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 63e6d71546da..b87134514814 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -17,6 +17,7 @@ */ #include "wine/debug.h" +#include "wine/heap.h" #define COBJMACROS @@ -96,6 +97,57 @@ static DXGI_FORMAT get_d3dx10_dds_format(DXGI_FORMAT format) return format; } +static HRESULT load_file(const WCHAR *filename, void **buffer, DWORD *size) +{ + HRESULT hr = S_OK; + DWORD bytes_read; + HANDLE file; + BOOL ret; + + file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + + *size = GetFileSize(file, NULL); + if (*size == INVALID_FILE_SIZE) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + + *buffer = heap_alloc(*size); + if (!*buffer) + { + hr = E_OUTOFMEMORY; + goto done; + } + + ret = ReadFile(file, *buffer, *size, &bytes_read, NULL); + if (!ret) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + if (bytes_read != *size) + { + hr = E_FAIL; + goto done; + } + +done: + if (FAILED(hr)) + { + heap_free(*buffer); + *buffer = NULL; + } + if (file != INVALID_HANDLE_VALUE) + CloseHandle(file); + return hr; +} + HRESULT WINAPI D3DX10GetImageInfoFromFileA(const char *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, HRESULT *result) { @@ -107,9 +159,23 @@ HRESULT WINAPI D3DX10GetImageInfoFromFileA(const char *src_file, ID3DX10ThreadPu HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, HRESULT *result) { - FIXME("src_file %s, pump %p, info %p, result %p\n", debugstr_w(src_file), pump, info, result); + void *buffer = NULL; + DWORD size = 0; + HRESULT hr; - return E_NOTIMPL; + TRACE("src_file %s, pump %p, info %p, result %p.\n", debugstr_w(src_file), pump, info, result); + + if (!src_file || !info) + return E_FAIL; + + if (FAILED(load_file(src_file, &buffer, &size))) + return D3D10_ERROR_FILE_NOT_FOUND; + + hr = D3DX10GetImageInfoFromMemory(buffer, size, pump, info, result); + + heap_free(buffer); + + return hr; } HRESULT WINAPI D3DX10GetImageInfoFromResourceA(HMODULE module, const char *resource, ID3DX10ThreadPump *pump, -- 2.26.2

1 2

[PATCH] combase: Remove dead assignment (Coverity).
by Nikolay Sivov 30 Sep '20

30 Sep '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/hglobalstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/combase/hglobalstream.c b/dlls/combase/hglobalstream.c index 5cbb280fd5e..d957fae2c7d 100644 --- a/dlls/combase/hglobalstream.c +++ b/dlls/combase/hglobalstream.c @@ -299,7 +299,7 @@ static HRESULT WINAPI stream_CopyTo(IStream *iface, IStream *dest, ULARGE_INTEGE while (cb.QuadPart > 0) { - ULONG chunk_size = chunk_size = cb.QuadPart >= sizeof(buffer) ? sizeof(buffer) : cb.u.LowPart; + ULONG chunk_size = cb.QuadPart >= sizeof(buffer) ? sizeof(buffer) : cb.u.LowPart; ULONG chunk_read, chunk_written; hr = IStream_Read(iface, buffer, chunk_size, &chunk_read); -- 2.28.0

1 0