May 2016 - Wine-commits - list.winehq.org

Andrey Gusev : user32/tests: Fix a typo in comment.
by Alexandre Julliard 04 May '16

04 May '16

Module: wine Branch: master Commit: f5531dc3473812c35f9be9cb5e5b70872ef0fdf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5531dc3473812c35f9be9cb5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue May 3 16:58:57 2016 +0300 user32/tests: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 65c8e93..e56cdc3 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -819,7 +819,7 @@ static void test_menu_ownerdraw(void) ok( MOD_rc[0].right - MOD_rc[0].left == 2 * MOD_avec + MOD_SIZE, "width of owner drawn menu item is wrong. Got %d expected %d\n", MOD_rc[0].right - MOD_rc[0].left , 2*MOD_avec + MOD_SIZE); - /* test hight */ + /* test height */ ok( MOD_rc[0].bottom - MOD_rc[0].top == GetSystemMetrics( SM_CYMENU) - 1, "Height of owner drawn menu item is wrong. Got %d expected %d\n", MOD_rc[0].bottom - MOD_rc[0].top, GetSystemMetrics( SM_CYMENU) - 1);

1 0

Jacek Caban : wininet: Return synchronously from InternetReadFileEx if there is no more data to read.
by Alexandre Julliard 04 May '16

04 May '16

Module: wine Branch: master Commit: 87fffa1ebfb71fe7a34aa989fa88f85409dbb62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=87fffa1ebfb71fe7a34aa989f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 12:39:21 2016 +0200 wininet: Return synchronously from InternetReadFileEx if there is no more data to read. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 775ff61..67b4a24 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3145,7 +3145,7 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO if (TryEnterCriticalSection( &req->read_section )) { - if (get_avail_data(req)) + if (get_avail_data(req) || end_of_read_data(req)) { res = HTTPREQ_Read(req, buf, size, &read); LeaveCriticalSection( &req->read_section );

1 0

Jacek Caban : wininet: Added support for IRF_NO_WAIT flag.
by Alexandre Julliard 04 May '16

04 May '16

Module: wine Branch: master Commit: 9e08c5518706715518c9ecb7af87cf2b3e9b8726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e08c5518706715518c9ecb7a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 12:39:43 2016 +0200 wininet: Added support for IRF_NO_WAIT flag. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 67b4a24..646619b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3112,14 +3112,19 @@ static void AsyncReadFileExProc(task_header_t *hdr) { read_file_ex_task_t *task = (read_file_ex_task_t*)hdr; http_request_t *req = (http_request_t*)task->hdr.hdr; - DWORD res; + DWORD res = ERROR_SUCCESS, read = 0, buffered = 0; - TRACE("INTERNETREADFILEEXW %p\n", task->hdr.hdr); + TRACE("%p\n", req); - res = HTTPREQ_Read(req, task->buf, task->size, task->ret_read); + if(task->ret_read) + res = HTTPREQ_Read(req, task->buf, task->size, &read); + if(res == ERROR_SUCCESS) + res = refill_read_buffer(req, task->ret_read ? BLOCKING_DISALLOW : BLOCKING_ALLOW, &buffered); if (res == ERROR_SUCCESS) { - DWORD read = *task->ret_read; + if(task->ret_read) + *task->ret_read = read; + read += buffered; INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, &read, sizeof(read)); } @@ -3134,6 +3139,8 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO http_request_t *req = (http_request_t*)hdr; DWORD res, read, cread, error = ERROR_SUCCESS; + TRACE("(%p %p %u %x)\n", req, buf, size, flags); + if (flags & ~(IRF_ASYNC|IRF_NO_WAIT)) FIXME("these dwFlags aren't implemented: 0x%x\n", flags & ~(IRF_ASYNC|IRF_NO_WAIT)); @@ -3157,7 +3164,7 @@ static DWORD HTTPREQ_ReadFileEx(object_header_t *hdr, void *buf, DWORD size, DWO task = alloc_async_task(&req->hdr, AsyncReadFileExProc, sizeof(*task)); task->buf = buf; task->size = size; - task->ret_read = ret_read; + task->ret_read = (flags & IRF_NO_WAIT) ? NULL : ret_read; INTERNET_AsyncCall(&task->hdr);

1 0

Hugh McMaster : reg: Output the number of matches when querying the registry recursively.
by Alexandre Julliard 03 May '16

03 May '16

1 0

Hugh McMaster : reg: Output line break before displaying query output.
by Alexandre Julliard 03 May '16

03 May '16

Module: wine Branch: master Commit: 7b9a1a355fe64b540a35a03dfbd8a38f20b019ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b9a1a355fe64b540a35a03df… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 2 12:06:33 2016 +0000 reg: Output line break before displaying query output. This matches Windows' behaviour. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index df3b453..7852e74 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -833,6 +833,7 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL { WCHAR *p; HKEY root, key; + WCHAR newlineW[] = {'\n',0}; int ret; if (!sane_path(key_name)) @@ -860,6 +861,8 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL return 1; } + output_string(newlineW); + if (value_name || value_empty) { ret = query_value(key, value_name, key_name, recurse);

1 0

Alistair Leslie-Hughes : d3d11shader.h: Add ID3D11Module, ID3D11ModuleInstance interfaces.
by Alexandre Julliard 03 May '16

03 May '16

Module: wine Branch: master Commit: 8bc6d0153c8746af5b89e58b76b81c12f0ea9465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bc6d0153c8746af5b89e58b7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 2 09:32:05 2016 +0000 d3d11shader.h: Add ID3D11Module, ID3D11ModuleInstance interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11shader.h | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/include/d3d11shader.h b/include/d3d11shader.h index 9ee78a8..f9c3b95 100644 --- a/include/d3d11shader.h +++ b/include/d3d11shader.h @@ -205,4 +205,45 @@ DECLARE_INTERFACE_(ID3D11ShaderReflection, IUnknown) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D11ModuleInstance, 0x469e07f7, 0x45a, 0x48d5, 0xaa, 0x12, 0x68, 0xa4, 0x78, 0xcd, 0xf7, 0x5d); + +#define INTERFACE ID3D11ModuleInstance +DECLARE_INTERFACE_(ID3D11ModuleInstance, IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + + /* ID3D11ModuleInstance methods */ + STDMETHOD(BindConstantBuffer)(THIS_ UINT srcslot, UINT dstslot, UINT dstoffset) PURE; + STDMETHOD(BindConstantBufferByName)(THIS_ const char *name, UINT dstslot, UINT dstoffset) PURE; + + STDMETHOD(BindResource)(THIS_ UINT srcslot, UINT dstslot, UINT count) PURE; + STDMETHOD(BindResourceByName)(THIS_ const char *name, UINT dstslot, UINT count) PURE; + + STDMETHOD(BindSampler)(THIS_ UINT srcslot, UINT dstslot, UINT count) PURE; + STDMETHOD(BindSamplerByName)(THIS_ const char *name, UINT dstslot, UINT count) PURE; + + STDMETHOD(BindUnorderedAccessView)(THIS_ UINT srcslot, UINT dstslot, UINT count) PURE; + STDMETHOD(BindUnorderedAccessViewByName)(THIS_ const char *name, UINT dstslot, UINT count) PURE; + + STDMETHOD(BindResourceAsUnorderedAccessView)(THIS_ UINT srcslot, UINT dstslot, UINT count) PURE; + STDMETHOD(BindResourceAsUnorderedAccessViewByName)(THIS_ const char *name, UINT dstslot, UINT count) PURE; +}; +#undef INTERFACE + +DEFINE_GUID(IID_ID3D11Module, 0xcac701ee, 0x80fc, 0x4122, 0x82, 0x42, 0x10, 0xb3, 0x9c, 0x8c, 0xec, 0x34); + +#define INTERFACE ID3D11Module +DECLARE_INTERFACE_(ID3D11Module, IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + + /* ID3D11Module methods */ + STDMETHOD(CreateInstance)(THIS_ const char *instnamespace, ID3D11ModuleInstance **moduleinstance) PURE; +}; +#undef INTERFACE + #endif

1 0

Alistair Leslie-Hughes : d3dcompiler: Add D3DLoadModule stub.
by Alexandre Julliard 03 May '16

03 May '16

Module: wine Branch: master Commit: 5fb90db781cf5a0534716d57e186fe03fbb58169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb90db781cf5a0534716d57e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 2 09:32:17 2016 +0000 d3dcompiler: Add D3DLoadModule stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/compiler.c | 6 ++++++ dlls/d3dcompiler_47/d3dcompiler_47.spec | 2 +- include/d3dcompiler.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 17e58fe..36e793e 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -792,3 +792,9 @@ HRESULT WINAPI D3DCompileFromFile(const WCHAR *filename, const D3D_SHADER_MACRO return E_NOTIMPL; } + +HRESULT WINAPI D3DLoadModule(const void *data, SIZE_T size, ID3D11Module **module) +{ + FIXME("data %p, size %lu, module %p stub!\n", data, size, module); + return E_NOTIMPL; +} diff --git a/dlls/d3dcompiler_47/d3dcompiler_47.spec b/dlls/d3dcompiler_47/d3dcompiler_47.spec index 9b2cb7d..05bc793 100644 --- a/dlls/d3dcompiler_47/d3dcompiler_47.spec +++ b/dlls/d3dcompiler_47/d3dcompiler_47.spec @@ -17,7 +17,7 @@ @ stdcall D3DGetInputSignatureBlob(ptr long ptr) @ stdcall D3DGetOutputSignatureBlob(ptr long ptr) @ stub D3DGetTraceInstructionOffsets -@ stub D3DLoadModule +@ stdcall D3DLoadModule(ptr long ptr) @ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) @ stdcall D3DReadFileToBlob(wstr ptr) @ stdcall D3DReflect(ptr long ptr ptr) diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 3f1fdb3..5d60792 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -120,6 +120,8 @@ typedef HRESULT (WINAPI *pD3DPreprocess)(const void *data, SIZE_T size, const ch const D3D_SHADER_MACRO *defines, ID3DInclude *include, ID3DBlob **shader, ID3DBlob **error_messages); +HRESULT WINAPI D3DLoadModule(const void *data, SIZE_T size, ID3D11Module **module); + #ifdef __cplusplus } #endif

1 0

Paul Gofman : d3dx9: Add 'exp' preshader opcode.
by Alexandre Julliard 03 May '16

03 May '16

Module: wine Branch: master Commit: 2925d6e6ec23e4fa9a2830b6318fdab8360540ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=2925d6e6ec23e4fa9a2830b63… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon May 2 18:38:27 2016 +0300 d3dx9: Add 'exp' preshader opcode. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 3 ++ dlls/d3dx9_36/tests/effect.c | 96 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 2287f15..a16c065 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -43,6 +43,7 @@ enum pres_ops PRESHADER_OP_SIN, PRESHADER_OP_COS, PRESHADER_OP_RSQ, + PRESHADER_OP_EXP, }; typedef double (*pres_op_func)(double *args, int n); @@ -80,6 +81,7 @@ static double pres_rsq(double *args, int n) else return 1.0 / sqrt(v); } +static double pres_exp(double *args, int n) {return pow(2.0, args[0]);} #define PRES_OPCODE_MASK 0x7ff00000 #define PRES_OPCODE_SHIFT 20 @@ -119,6 +121,7 @@ static const struct op_info pres_op_info[] = {0x108, "sin", 1, 0, pres_sin}, /* PRESHADER_OP_SIN */ {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ {0x107, "rsq", 1, 0, pres_rsq}, /* PRESHADER_OP_RSQ */ + {0x105, "exp", 1, 0, pres_exp}, /* PRESHADER_OP_EXP */ }; enum pres_value_type diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 9d58a80..aea3ded 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3886,6 +3886,101 @@ static void test_effect_preshader(IDirect3DDevice9 *device) effect->lpVtbl->Release(effect); } +struct test_preshader_op_def +{ + const char *mnem; + unsigned int opcode; + unsigned int args_count; + unsigned int expected_result[4]; + D3DXVECTOR4 fvect1, fvect2; + unsigned int ulps; + BOOL todo[4]; +}; + +static void test_preshader_op(IDirect3DDevice9 *device, const DWORD *sample_effect_blob, + unsigned int sample_effect_blob_size, const struct test_preshader_op_def *test) +{ + static const struct + { + unsigned int pos; + unsigned int result_index; + } + blob_position[] = + { + {0, 0}, + {2468, 0}, + {2319, 2} + }; + DWORD *test_effect_blob; + HRESULT hr; + ID3DXEffect *effect; + D3DLIGHT9 light; + unsigned int i, passes_count; + float *v; + unsigned int op_pos, op_step; + D3DXHANDLE param; + + op_step = 2 + (test->args_count + 1) * 3; + op_pos = blob_position[test->args_count].pos; + + test_effect_blob = HeapAlloc(GetProcessHeap(), 0, sample_effect_blob_size); + memcpy(test_effect_blob, sample_effect_blob, sample_effect_blob_size); + for (i = 0; i < 4; ++i) + test_effect_blob[op_pos + i * op_step] = test->opcode; + + hr = D3DXCreateEffect(device, test_effect_blob, sample_effect_blob_size, + NULL, NULL, 0, NULL, &effect, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->Begin(effect, &passes_count, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + param = effect->lpVtbl->GetParameterByName(effect, NULL, "opvect1"); + ok(!!param, "GetParameterByName failed.\n"); + hr = effect->lpVtbl->SetVector(effect, param, &test->fvect1); + ok(hr == D3D_OK, "SetVector failed, hr %#x.\n", hr); + + if (test->args_count > 1) + { + param = effect->lpVtbl->GetParameterByName(effect, NULL, "opvect2"); + ok(!!param, "GetParameterByName failed.\n"); + hr = effect->lpVtbl->SetVector(effect, param, &test->fvect2); + ok(hr == D3D_OK, "SetVector failed, hr %#x.\n", hr); + } + + hr = effect->lpVtbl->BeginPass(effect, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = IDirect3DDevice9_GetLight(device, blob_position[test->args_count].result_index, &light); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + v = &light.Diffuse.r; + for (i = 0; i < 4; ++i) + todo_wine_if(test->todo[i]) + ok(compare_float(v[i], ((float *)test->expected_result)[i], test->ulps), + "Operation %s, component %u, expected %#x (%g), got %#x (%g).\n", test->mnem, i, + test->expected_result[i], ((float *)test->expected_result)[i], ((unsigned int *)v)[i], v[i]); + + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->End(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + effect->lpVtbl->Release(effect); + HeapFree(GetProcessHeap(), 0, test_effect_blob); +} + +static void test_effect_preshader_ops(IDirect3DDevice9 *device) +{ + static const struct test_preshader_op_def op_tests[] = + { + {"exp", 0x10500001, 1, {0x3f800000, 0x3f800000, 0x3e5edc66, 0x7f800000}, + {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(op_tests); ++i) + test_preshader_op(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), + &op_tests[i]); +} + START_TEST(effect) { HWND wnd; @@ -3927,6 +4022,7 @@ START_TEST(effect) test_effect_compilation_errors(device); test_effect_states(device); test_effect_preshader(device); + test_effect_preshader_ops(device); count = IDirect3DDevice9_Release(device); ok(count == 0, "The device was not properly freed: refcount %u\n", count);

1 0

Paul Gofman : d3dx9: Add test for 0 * INF preshader operation.
by Alexandre Julliard 03 May '16

03 May '16

Module: wine Branch: master Commit: a5fcc4d2a2ef065014d7502c612091b3e7cb5265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5fcc4d2a2ef065014d7502c6… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon May 2 18:38:28 2016 +0300 d3dx9: Add test for 0 * INF preshader operation. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index aea3ded..4ef4d4c 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3973,6 +3973,8 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device) { {"exp", 0x10500001, 1, {0x3f800000, 0x3f800000, 0x3e5edc66, 0x7f800000}, {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, + {"0 * INF", 0x20500004, 2, {0xffc00000, 0xffc00000, 0xc0d33334, 0x7f800000}, + {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {INFINITY, INFINITY, 3.0f, 4.0f}}, }; unsigned int i;

1 0

Michael Müller : quartz: FileSource_Load should not fail on unknown file formats.
by Alexandre Julliard 03 May '16

03 May '16

Module: wine Branch: master Commit: 355a3248d4b239ad2442ca5245511c59aaa24952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=355a3248d4b239ad2442ca524… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Apr 29 22:13:35 2016 +0200 quartz: FileSource_Load should not fail on unknown file formats. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 5 +++-- dlls/quartz/tests/avisplitter.c | 17 +++++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index f0f85fd..269dd13 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -655,8 +655,9 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi hr = GetClassMediaFile(pReader, pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL); if (FAILED(hr)) { - CoTaskMemFree(This->pmt); - This->pmt = NULL; + This->pmt->majortype = MEDIATYPE_Stream; + This->pmt->subtype = MEDIASUBTYPE_NULL; + hr = S_OK; } } else diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index aa938c1..78ca8b8 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -217,6 +217,12 @@ static void test_filesourcefilter(void) 12, &MEDIASUBTYPE_WAVE, }, + { + "unknown format", + "Hello World", + 11, + NULL, /* FIXME: should be &MEDIASUBTYPE_NULL */ + }, }; WCHAR path[MAX_PATH], temp[MAX_PATH]; IFileSourceFilter *filesource; @@ -277,10 +283,13 @@ static void test_filesourcefilter(void) ok(hr == S_OK, "expected S_OK, got %08x\n", hr); ok(!lstrcmpW(olepath, path), "expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(olepath)); - ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Stream), - "expected MEDIATYPE_Stream, got %s\n", wine_dbgstr_guid(&mt.majortype)); - ok(IsEqualGUID(&mt.subtype, tests[i].subtype), - "expected %s, got %s\n", wine_dbgstr_guid(tests[i].subtype), wine_dbgstr_guid(&mt.subtype)); + if (tests[i].subtype) + { + ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Stream), + "expected MEDIATYPE_Stream, got %s\n", wine_dbgstr_guid(&mt.majortype)); + ok(IsEqualGUID(&mt.subtype, tests[i].subtype), + "expected %s, got %s\n", wine_dbgstr_guid(tests[i].subtype), wine_dbgstr_guid(&mt.subtype)); + } CoTaskMemFree(olepath); IFileSourceFilter_Release(filesource);

1 0