February 2020 - Wine-Commits

Gabriel Ivăncescu : vbscript/tests: Add tests for named item script dispatches.
by Alexandre Julliard Feb. 18, 2020

Feb. 18, 2020

Module: wine Branch: master Commit: 553cb05b415c00234914d51779d0eca11a8ea92c URL: https://source.winehq.org/git/wine.git/?a=commit;h=553cb05b415c00234914d517… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Feb 14 15:57:15 2020 +0200 vbscript/tests: Add tests for named item script dispatches. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/vbscript.c | 286 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 275 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=553cb05b415c00234914…

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetLight() and d3d9_device_LightEnable().
by Alexandre Julliard Feb. 18, 2020

Feb. 18, 2020

Module: wine Branch: master Commit: e804df72a6686f9c9a4c743e60671d5bec636307 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e804df72a6686f9c9a4c743e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 17 17:19:53 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetLight() and d3d9_device_LightEnable(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 6f37dfddf2..3b4c9d5277 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2222,8 +2222,6 @@ static HRESULT WINAPI d3d9_device_SetLight(IDirect3DDevice9Ex *iface, DWORD inde /* Note: D3DLIGHT9 is compatible with struct wined3d_light. */ wined3d_mutex_lock(); hr = wined3d_stateblock_set_light(device->update_state, index, (const struct wined3d_light *)light); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_light(device->wined3d_device, index, (const struct wined3d_light *)light); wined3d_mutex_unlock(); return hr; @@ -2254,8 +2252,6 @@ static HRESULT WINAPI d3d9_device_LightEnable(IDirect3DDevice9Ex *iface, DWORD i wined3d_mutex_lock(); hr = wined3d_stateblock_set_light_enable(device->update_state, index, enable); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_light_enable(device->wined3d_device, index, enable); wined3d_mutex_unlock(); return hr;

1 0

Nikolay Sivov : mfplat: Fix media type compare logic regarding user data.
by Alexandre Julliard Feb. 18, 2020

Feb. 18, 2020

Module: wine Branch: master Commit: ad4c734c37c36a57a7a3d34fe55787b053a2f311 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad4c734c37c36a57a7a3d34f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 18 17:18:28 2020 +0300 mfplat: Fix media type compare logic regarding user data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 7 ++++--- dlls/mfplat/tests/mfplat.c | 13 +++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 893eb3e778..382f066327 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -514,13 +514,14 @@ static HRESULT WINAPI mediatype_IsEqual(IMFMediaType *iface, IMFMediaType *type, PropVariantInit(&right.value); right.hr = IMFAttributes_GetItem(right.type, &MF_MT_USER_DATA, &right.value); - if (SUCCEEDED(left.hr) && SUCCEEDED(left.hr)) + /* Compare user data if both types have it, otherwise simply check if both don't. */ + if (SUCCEEDED(left.hr) && SUCCEEDED(right.hr)) { result = FALSE; IMFAttributes_CompareItem(left.type, &MF_MT_USER_DATA, &left.value, &result); } - else if (FAILED(left.hr) && FAILED(left.hr)) - result = TRUE; + else + result = FAILED(left.hr) && FAILED(right.hr); PropVariantClear(&left.value); PropVariantClear(&right.value); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 6800441ba2..896cd93a46 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -762,6 +762,19 @@ if(0) ok(flags == (MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_DATA | MF_MEDIATYPE_EQUAL_FORMAT_USER_DATA), "Unexpected flags %#x.\n", flags); + /* Different user data. */ + hr = IMFMediaType_SetBlob(mediatype, &MF_MT_USER_DATA, (const UINT8 *)&flags, sizeof(flags)); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + flags = 0; + hr = IMFMediaType_IsEqual(mediatype, mediatype2, &flags); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + ok(flags == (MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_DATA), + "Unexpected flags %#x.\n", flags); + + hr = IMFMediaType_DeleteItem(mediatype, &MF_MT_USER_DATA); + ok(hr == S_OK, "Failed to delete item, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, &MFVideoFormat_RGB32); ok(hr == S_OK, "Failed to set subtype, hr %#x.\n", hr);

1 0

Michael Stefaniuc : msxml3/tests: Get rid of a2bstr().
by Alexandre Julliard Feb. 18, 2020

Feb. 18, 2020

Module: wine Branch: master Commit: 077224622db0ced84224bf84ea0b9365bf4c2486 URL: https://source.winehq.org/git/wine.git/?a=commit;h=077224622db0ced84224bf84… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 14 21:24:37 2020 +0100 msxml3/tests: Get rid of a2bstr(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/httpreq.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index ae0a95a2f1..33e6bd6581 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -130,21 +130,6 @@ static void free_bstrs(void) alloced_bstrs_count = 0; } -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - if(!str) - return NULL; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - /* test IHTMLElementCollection */ static HRESULT WINAPI htmlecoll_QueryInterface(IHTMLElementCollection *iface, REFIID riid, void **ppvObject) @@ -496,7 +481,7 @@ static HRESULT WINAPI htmldoc2_put_URL(IHTMLDocument2 *iface, BSTR v) static HRESULT WINAPI htmldoc2_get_URL(IHTMLDocument2 *iface, BSTR *p) { CHECK_EXPECT2(htmldoc2_get_url); - *p = a2bstr("http://test.winehq.org/"); + *p = SysAllocString(L"http://test.winehq.org/"); return S_OK; } @@ -1747,7 +1732,7 @@ static void test_XMLHTTP(void) set_xhr_site(xhr); test_open(xhr, "GET", "tests/referer.php", S_OK); - str1 = a2bstr("http://test.winehq.org/"); + str1 = SysAllocString(L"http://test.winehq.org/"); V_VT(&varbody) = VT_EMPTY; hr = IXMLHttpRequest_send(xhr, varbody);

1 0

Michael Stefaniuc : urlmon/tests: Get rid of strcmp_wa() in protocol.c.
by Alexandre Julliard Feb. 18, 2020

Feb. 18, 2020

Module: wine Branch: master Commit: 20f5410799dcfccbfa1338bda07c8257b639e804 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20f5410799dcfccbfa1338bd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 17 20:54:09 2020 +0100 urlmon/tests: Get rid of strcmp_wa() in protocol.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 84dd5345be..6fc864f777 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -223,13 +223,6 @@ static LONG obj_refcount(void *obj) return IUnknown_Release((IUnknown *)obj); } -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return lstrcmpA(stra, buf); -} - static const char *w2a(LPCWSTR str) { static char buf[INTERNET_MAX_URL_LENGTH]; @@ -859,7 +852,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, !memcmp(szStatusText, text_plain, lstrlenW(text_plain)*sizeof(WCHAR)), "szStatusText != text/plain\n"); else if(empty_file) - ok(!strcmp_wa(szStatusText, "application/javascript"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); + ok(!lstrcmpW(szStatusText, L"application/javascript"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); else if((pi & PI_MIMEVERIFICATION) && emulate_prot && !mimefilter_test && tested_protocol==HTTP_TEST && !short_read) ok(lstrlenW(gifW) <= lstrlenW(szStatusText) && @@ -915,7 +908,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, CHECK_EXPECT(ReportProgress_VERIFIEDMIMETYPEAVAILABLE); ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) - ok(!strcmp_wa(szStatusText, "text/html"), "szStatusText != text/html\n"); + ok(!lstrcmpW(szStatusText, L"text/html"), "szStatusText != text/html\n"); break; case BINDSTATUS_PROTOCOLCLASSID: CHECK_EXPECT(ReportProgress_PROTOCOLCLASSID); @@ -929,13 +922,13 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, case BINDSTATUS_REDIRECTING: CHECK_EXPECT(ReportProgress_REDIRECTING); if(test_redirect) - ok(!strcmp_wa(szStatusText, "http://test.winehq.org/tests/hello.html"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); + ok(!lstrcmpW(szStatusText, L"http://test.winehq.org/tests/hello.html"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); else ok(szStatusText == NULL, "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); break; case BINDSTATUS_ENCODING: CHECK_EXPECT(ReportProgress_ENCODING); - ok(!strcmp_wa(szStatusText, "gzip"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); + ok(!lstrcmpW(szStatusText, L"gzip"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); break; case BINDSTATUS_ACCEPTRANGES: CHECK_EXPECT(ReportProgress_ACCEPTRANGES); @@ -1200,7 +1193,7 @@ static HRESULT WINAPI ProtocolSink_ReportResult(IInternetProtocolSink *iface, HR "dwError == ERROR_SUCCESS\n"); if(hrResult == INET_E_REDIRECT_FAILED) - ok(!strcmp_wa(szResult, "http://test.winehq.org/tests/hello.html"), "szResult = %s\n", wine_dbgstr_w(szResult)); + ok(!lstrcmpW(szResult, L"http://test.winehq.org/tests/hello.html"), "szResult = %s\n", wine_dbgstr_w(szResult)); else ok(!szResult, "szResult = %s\n", wine_dbgstr_w(szResult));

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetMaterial().
by Alexandre Julliard Feb. 18, 2020

Feb. 18, 2020

Module: wine Branch: master Commit: 824e27090f3f3bdd1e09837c2c8b47c9946ca05f URL: https://source.winehq.org/git/wine.git/?a=commit;h=824e27090f3f3bdd1e09837c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 17 17:19:51 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetMaterial(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 802a974f34..ac03c7e241 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2193,8 +2193,6 @@ static HRESULT WINAPI d3d9_device_SetMaterial(IDirect3DDevice9Ex *iface, const D /* Note: D3DMATERIAL9 is compatible with struct wined3d_material. */ wined3d_mutex_lock(); wined3d_stateblock_set_material(device->update_state, (const struct wined3d_material *)material); - if (!device->recording) - wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d9: Retrieve the material from the primary stateblock.
by Alexandre Julliard Feb. 18, 2020

Feb. 18, 2020

Module: wine Branch: master Commit: 85b6123c81719b4cd3c9bd41016a059709a213f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85b6123c81719b4cd3c9bd41… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 17 17:19:50 2020 -0600 d3d9: Retrieve the material from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 447aa26844..802a974f34 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2208,7 +2208,7 @@ static HRESULT WINAPI d3d9_device_GetMaterial(IDirect3DDevice9Ex *iface, D3DMATE /* Note: D3DMATERIAL9 is compatible with struct wined3d_material. */ wined3d_mutex_lock(); - wined3d_device_get_material(device->wined3d_device, (struct wined3d_material *)material); + memcpy(material, &wined3d_stateblock_get_state(device->state)->material, sizeof(*material)); wined3d_mutex_unlock(); return D3D_OK;

1 0

Alexandre Julliard : kernel32/tests: Add more normalization tests.
by Alexandre Julliard Feb. 18, 2020

Feb. 18, 2020

Module: wine Branch: master Commit: 84b05383bb5f5253525e80183f9067cc90ff4469 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84b05383bb5f5253525e8018… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 18 19:59:16 2020 +0100 kernel32/tests: Add more normalization tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 67b1982395..097cd1fcb4 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -6104,6 +6104,14 @@ static void test_NormalizeString(void) ok( str_cmp == 0, "%s:%d: string incorrect got %s expect %s\n", wine_dbgstr_w(ptest->str), i, wine_dbgstr_w(dst), wine_dbgstr_w(ptest->expected[i]) ); ret = FALSE; + status = pRtlIsNormalizedString( norm_forms[i], ptest->str, -1, &ret ); + todo_wine ok( !status, "%s:%d: failed %x\n", wine_dbgstr_w(ptest->str), i, status ); + if (!wcscmp( ptest->str, dst )) + todo_wine + ok( ret, "%s:%d: not normalized\n", wine_dbgstr_w(ptest->str), i ); + else + ok( !ret, "%s:%d: normalized (dst %s)\n", wine_dbgstr_w(ptest->str), i, wine_dbgstr_w(dst) ); + ret = FALSE; status = pRtlIsNormalizedString( norm_forms[i], dst, dstlen, &ret ); todo_wine ok( !status, "%s:%d: failed %x\n", wine_dbgstr_w(ptest->str), i, status ); todo_wine ok( ret, "%s:%d: not normalized\n", wine_dbgstr_w(ptest->str), i ); @@ -6301,7 +6309,7 @@ static void test_NormalizeString(void) { char *p, buffer[1024]; WCHAR str[3], srcW[32], dstW[32], resW[4][32]; - int i, line = 0, part = 0, ch; + int line = 0, part = 0, ch; char tested[0x110000 / 8]; while (fgets( buffer, sizeof(buffer), f )) @@ -6334,6 +6342,28 @@ static void test_NormalizeString(void) ok( !wcscmp( dstW, resW[i] ), "line %u form %u: wrong result %s for %s expected %s\n", line, i, wine_dbgstr_w( dstW ), wine_dbgstr_w( srcW ), wine_dbgstr_w( resW[i] )); + + ret = FALSE; + status = pRtlIsNormalizedString( norm_forms[i], srcW, -1, &ret ); + ok( !status, "line %u form %u: RtlIsNormalizedString failed %x\n", line, i, status ); + if (!wcscmp( srcW, dstW )) + ok( ret, "line %u form %u: source not normalized %s\n", line, i, wine_dbgstr_w(srcW) ); + else + ok( !ret, "line %u form %u: source normalized %s\n", line, i, wine_dbgstr_w(srcW) ); + ret = FALSE; + status = pRtlIsNormalizedString( norm_forms[i], dstW, -1, &ret ); + ok( !status, "line %u form %u: RtlIsNormalizedString failed %x\n", line, i, status ); + ok( ret, "line %u form %u: dest not normalized %s\n", line, i, wine_dbgstr_w(dstW) ); + + for (j = 0; j < 4; j++) + { + int expect = i | (j & 2); + memset( dstW, 0xcc, sizeof(dstW) ); + dstlen = pNormalizeString( norm_forms[i], resW[j], -1, dstW, ARRAY_SIZE(dstW) ); + ok( !wcscmp( dstW, resW[expect] ), + "line %u form %u res %u: wrong result %s for %s expected %s\n", line, i, j, + wine_dbgstr_w( dstW ), wine_dbgstr_w( resW[j] ), wine_dbgstr_w( resW[expect] )); + } } } fclose( f );

1 0

Sven Baars : gdi32: Handle 0 count in GetCharacterPlacementW.
by Alexandre Julliard Feb. 18, 2020

Feb. 18, 2020

Module: wine Branch: master Commit: 3c49e3e4c7dd3c483d032cf2ac774abca75ec821 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c49e3e4c7dd3c483d032cf2… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Feb 17 16:28:52 2020 +0100 gdi32: Handle 0 count in GetCharacterPlacementW. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 3 +++ dlls/gdi32/tests/font.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d451f30c3e..8788426a2c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3313,6 +3313,9 @@ GetCharacterPlacementW( TRACE("%s, %d, %d, 0x%08x\n", debugstr_wn(lpString, uCount), uCount, nMaxExtent, dwFlags); + if (!uCount) + return 0; + if (!lpResults) return GetTextExtentPoint32W(hdc, lpString, uCount, &size) ? MAKELONG(size.cx, size.cy) : 0; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index c96d8b1b56..bc07f11b2c 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4951,9 +4951,9 @@ static void test_GetCharacterPlacement(void) result.nGlyphs = 20; size2 = GetCharacterPlacementA(hdc, "Wine Test", 0, 0, &result, 0); ok(!size2, "Expected GetCharacterPlacementA to fail\n"); - todo_wine ok(result.nGlyphs == 20, "Unexpected number of glyphs %u\n", result.nGlyphs); + ok(result.nGlyphs == 20, "Unexpected number of glyphs %u\n", result.nGlyphs); ok(glyphs[0] == '!', "Unexpected first glyph %s\n", wine_dbgstr_wn(glyphs, 1)); - todo_wine ok(pos[0] == -1, "Unexpected caret position %d\n", pos[0]); + ok(pos[0] == -1, "Unexpected caret position %d\n", pos[0]); size2 = GetCharacterPlacementA(hdc, "Wine Test", 9, 0, NULL, 0); ok(size2, "GetCharacterPlacementA failed!\n");

1 0

Zebediah Figura : include: Add dmodshow.idl and IDMOWrapperFilter.
by Alexandre Julliard Feb. 18, 2020

Feb. 18, 2020

Module: wine Branch: master Commit: d0a0505d38bb6f8860cc7bd4f7b7ea6501217996 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0a0505d38bb6f8860cc7bd4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 17 17:30:55 2020 -0600 include: Add dmodshow.idl and IDMOWrapperFilter. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmoguids/dmoguids.c | 1 + include/Makefile.in | 1 + include/dmodshow.idl | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/dlls/dmoguids/dmoguids.c b/dlls/dmoguids/dmoguids.c index b764c1f74f..15a0540170 100644 --- a/dlls/dmoguids/dmoguids.c +++ b/dlls/dmoguids/dmoguids.c @@ -25,3 +25,4 @@ #include "mediaobj.h" #include "dmoreg.h" +#include "dmodshow.h" diff --git a/include/Makefile.in b/include/Makefile.in index 0e5dd475e0..21b4233ecd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -212,6 +212,7 @@ SOURCES = \ dmerror.h \ dmksctrl.h \ dmo.h \ + dmodshow.idl \ dmoreg.h \ dmort.h \ dmplugin.h \ diff --git a/include/dmodshow.idl b/include/dmodshow.idl new file mode 100644 index 0000000000..986b6c1ec3 --- /dev/null +++ b/include/dmodshow.idl @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "objidl.idl"; +import "mediaobj.idl"; + +cpp_quote("DEFINE_GUID(CLSID_DMOWrapperFilter, 0x94297043,0xbd82,0x4dfd,0xb0,0xde,0x81,0x77,0x73,0x9c,0x6d,0x20);") +cpp_quote("DEFINE_GUID(CLSID_DMOFilterCategory,0xbcd5796c,0xbd52,0x4d30,0xab,0x76,0x70,0xf9,0x75,0xb8,0x91,0x99);") + +[ + object, + uuid(52d6f586-9f0f-4824-8fc8-e32ca04930c2), +] +interface IDMOWrapperFilter : IUnknown +{ + HRESULT Init(REFCLSID clsid, REFCLSID category); +}

1 0