June 2015 - Wine-commits - list.winehq.org

Nikolay Sivov : gdi32: Clarify offsets and sizes in vdmx table lookup code.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: d5c9a8a57adcba58b3418156f267e64bc6ffbc5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c9a8a57adcba58b3418156f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 29 21:32:07 2015 +0300 gdi32: Clarify offsets and sizes in vdmx table lookup code. --- dlls/gdi32/freetype.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 07d80a2..73824ea 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4463,6 +4463,12 @@ static DWORD get_font_data( GdiFont *font, DWORD table, DWORD offset, LPVOID buf #define MS_VDMX_TAG MS_MAKE_TAG('V', 'D', 'M', 'X') typedef struct { + WORD version; + WORD numRecs; + WORD numRatios; +} VDMX_Header; + +typedef struct { BYTE bCharSet; BYTE xRatio; BYTE yStartRatio; @@ -4475,9 +4481,15 @@ typedef struct { BYTE endsz; } VDMX_group; +typedef struct { + WORD yPelHeight; + WORD yMax; + WORD yMin; +} VDMX_vTable; + static LONG load_VDMX(GdiFont *font, LONG height) { - WORD hdr[3]; + VDMX_Header hdr; VDMX_group group; BYTE devXRatio, devYRatio; USHORT numRecs, numRatios; @@ -4485,7 +4497,7 @@ static LONG load_VDMX(GdiFont *font, LONG height) LONG ppem = 0; int i; - result = get_font_data(font, MS_VDMX_TAG, 0, hdr, sizeof(hdr)); + result = get_font_data(font, MS_VDMX_TAG, 0, &hdr, sizeof(hdr)); if(result == GDI_ERROR) /* no vdmx table present, use linear scaling */ return ppem; @@ -4494,14 +4506,14 @@ static LONG load_VDMX(GdiFont *font, LONG height) devXRatio = 1; devYRatio = 1; - numRecs = GET_BE_WORD(hdr[1]); - numRatios = GET_BE_WORD(hdr[2]); + numRecs = GET_BE_WORD(hdr.numRecs); + numRatios = GET_BE_WORD(hdr.numRatios); - TRACE("numRecs = %d numRatios = %d\n", numRecs, numRatios); + TRACE("version = %d numRecs = %d numRatios = %d\n", GET_BE_WORD(hdr.version), numRecs, numRatios); for(i = 0; i < numRatios; i++) { Ratios ratio; - offset = (3 * 2) + (i * sizeof(Ratios)); + offset = sizeof(hdr) + (i * sizeof(Ratios)); get_font_data(font, MS_VDMX_TAG, offset, &ratio, sizeof(Ratios)); offset = -1; @@ -4516,11 +4528,11 @@ static LONG load_VDMX(GdiFont *font, LONG height) devYRatio >= ratio.yStartRatio && devYRatio <= ratio.yEndRatio)) { - WORD tmp; + WORD group_offset; - offset = (3 * 2) + (numRatios * 4) + (i * 2); - get_font_data(font, MS_VDMX_TAG, offset, &tmp, sizeof(tmp)); - offset = GET_BE_WORD(tmp); + offset = sizeof(hdr) + numRatios * sizeof(ratio) + i * sizeof(group_offset); + get_font_data(font, MS_VDMX_TAG, offset, &group_offset, sizeof(group_offset)); + offset = GET_BE_WORD(group_offset); break; } } @@ -4538,8 +4550,8 @@ static LONG load_VDMX(GdiFont *font, LONG height) TRACE("recs=%d startsz=%d endsz=%d\n", recs, startsz, endsz); - vTable = HeapAlloc(GetProcessHeap(), 0, recs * 6); - result = get_font_data(font, MS_VDMX_TAG, offset + 4, vTable, recs * 6); + vTable = HeapAlloc(GetProcessHeap(), 0, recs * sizeof(VDMX_vTable)); + result = get_font_data(font, MS_VDMX_TAG, offset + sizeof(group), vTable, recs * sizeof(VDMX_vTable)); if(result == GDI_ERROR) { FIXME("Failed to retrieve vTable\n"); goto end;

1 0

Thomas Faber : shell32: Add missing parameter check in ISF_Desktop_fnQueryInterface.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: c0cd954f98545ff21e68abdfd7b4fdaf17c17005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0cd954f98545ff21e68abdfd… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jun 27 06:40:11 2015 -0400 shell32: Add missing parameter check in ISF_Desktop_fnQueryInterface. --- dlls/shell32/shfldr_desktop.c | 2 ++ dlls/shell32/tests/shfldr_special.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 4aa1dcf..40cd752 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -106,6 +106,8 @@ static HRESULT WINAPI ISF_Desktop_fnQueryInterface( TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); + if (!ppvObj) return E_POINTER; + *ppvObj = NULL; if (IsEqualIID (riid, &IID_IUnknown) || diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index 8f97347..6d61220 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -224,9 +224,24 @@ if (0) CoUninitialize(); } +static void test_desktop_folder(void) +{ + IShellFolder *psf; + HRESULT hr; + + hr = SHGetDesktopFolder(&psf); + ok(hr == S_OK, "Got %x\n", hr); + + hr = IShellFolder_QueryInterface(psf, &IID_IShellFolder, NULL); + ok(hr == E_POINTER, "Got %x\n", hr); + + IShellFolder_Release(psf); +} + START_TEST(shfldr_special) { test_parse_for_entire_network(); test_parse_for_control_panel(); test_printers_folder(); + test_desktop_folder(); }

1 0

Thomas Faber : shell32: Use QueryInterface in FolderView_GetFolder.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: e582495927c253ddb5b6e5b01d3cf845207bdc10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e582495927c253ddb5b6e5b01… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Jun 29 15:39:25 2015 -0400 shell32: Use QueryInterface in FolderView_GetFolder. test_IFolderView has a test that shows that the shell folder's reference count before and after the call to IFolderView_GetFolder is the same. However this is misleading because it is not a property of the IFolderView_GetFolder method, but of the desktop shell folder object that's used in the folder view. Windows <=2003 uses a cached object and its AddRef/Release methods return constants. --- dlls/shell32/pidl.c | 1 + dlls/shell32/shlview.c | 10 +--------- dlls/shell32/tests/ebrowser.c | 2 +- dlls/shell32/tests/shlview.c | 6 ++++++ 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index d16ca57..1856c12 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1477,6 +1477,7 @@ HRESULT WINAPI SHGetIDListFromObject(IUnknown *punk, PIDLIST_ABSOLUTE *ppidl) { /* We might be able to get IPersistFolder2 from a shellfolder. */ ret = SHGetIDListFromObject((IUnknown*)psf, ppidl); + IShellFolder_Release(psf); } IFolderView_Release(pfv); return ret; diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index e6691f8..b763468 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2713,15 +2713,7 @@ static HRESULT WINAPI FolderView_GetFolder(IFolderView2 *iface, REFIID riid, voi TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); - if (!ppv) return E_POINTER; - - if (IsEqualIID(riid, &IID_IShellFolder)) - { - *ppv = This->pSFParent; - return S_OK; - } - - return E_NOINTERFACE; + return IShellFolder_QueryInterface(This->pSFParent, riid, ppv); } static HRESULT WINAPI FolderView_Item(IFolderView2 *iface, int index, PITEMID_CHILD *ppidl) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 4c255a1..c9d81a4 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -1469,7 +1469,7 @@ static void test_navigation(void) test_browse_pidl_sb(peb2, &ebev, pidl_relative, SBSP_RELATIVE, S_OK, 1, 1, 0, 1); ILFree(pidl_relative); - /* IShellFolder_Release(psf); */ + IShellFolder_Release(psf); IFolderView_Release(pfv); } diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 6525dd2..af57e60 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -688,6 +688,7 @@ static void test_IFolderView(void) IShellBrowser *browser; IFolderView2 *fv2; IFolderView *fv; + IUnknown *unk; HWND hwnd_view, hwnd_list; PITEMID_CHILD pidl; HRESULT hr; @@ -830,6 +831,11 @@ if (0) ok(ref1 == ref2 || ref1 + 1 == ref2, /* >= vista */ "expected same refcount, got %d\n", ref2); ok(desktop == folder, "\n"); + if (folder) IShellFolder_Release(folder); + + hr = IFolderView_GetFolder(fv, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got (0x%08x)\n", hr); + if (unk) IUnknown_Release(unk); hr = IFolderView_QueryInterface(fv, &IID_IFolderView2, (void**)&fv2); if (hr != S_OK)

1 0

Thomas Faber : shell32/tests: Remove a misleading test.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: 9551179c0b94a8eb4b33d36e5aaf42a998b4b085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9551179c0b94a8eb4b33d36e5… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Jun 29 16:09:09 2015 -0400 shell32/tests: Remove a misleading test. --- dlls/shell32/tests/shlview.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index af57e60..eafaec5 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -694,7 +694,6 @@ static void test_IFolderView(void) HRESULT hr; INT ret, count; POINT pt; - LONG ref1, ref2; RECT r; hr = SHGetDesktopFolder(&desktop); @@ -822,14 +821,8 @@ if (0) hr = IFolderView_GetFolder(fv, &IID_IShellFolder, NULL); ok(hr == E_POINTER, "got (0x%08x)\n", hr); - ref1 = IShellFolder_AddRef(desktop); - IShellFolder_Release(desktop); hr = IFolderView_GetFolder(fv, &IID_IShellFolder, (void**)&folder); ok(hr == S_OK, "got (0x%08x)\n", hr); - ref2 = IShellFolder_AddRef(desktop); - IShellFolder_Release(desktop); - ok(ref1 == ref2 || ref1 + 1 == ref2, /* >= vista */ - "expected same refcount, got %d\n", ref2); ok(desktop == folder, "\n"); if (folder) IShellFolder_Release(folder);

1 0

André Hentschel : ntdll: Silence warning about TAPE_GetStatus when sys/mtio.h is not available.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: d37f4076458a758d69613cefdabd72d0b3bbd5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37f4076458a758d69613cefd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 29 19:56:23 2015 +0200 ntdll: Silence warning about TAPE_GetStatus when sys/mtio.h is not available. --- dlls/ntdll/tape.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c index fef31cb..09803d4 100644 --- a/dlls/ntdll/tape.c +++ b/dlls/ntdll/tape.c @@ -87,11 +87,13 @@ static const char *io2str( DWORD io ) /****************************************************************** * TAPE_GetStatus */ +#ifdef HAVE_SYS_MTIO_H static inline NTSTATUS TAPE_GetStatus( int error ) { if (!error) return STATUS_SUCCESS; return FILE_GetNtStatus(); } +#endif /****************************************************************** * TAPE_CreatePartition

1 0

Sebastian Lackner : windowscodecs: Distinguish interface and implementation pointer for IcnsEncoder.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: 863f432a7d73b8b480a742fcbaf01de33964cc21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=863f432a7d73b8b480a742fcb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 29 12:18:12 2015 +0200 windowscodecs: Distinguish interface and implementation pointer for IcnsEncoder. --- dlls/windowscodecs/icnsformat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index 5ce44a2..54c7707 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -179,7 +179,7 @@ static ULONG WINAPI IcnsFrameEncode_Release(IWICBitmapFrameEncode *iface) if (This->icns_image != NULL) HeapFree(GetProcessHeap(), 0, This->icns_image); - IUnknown_Release((IUnknown*)This->encoder); + IWICBitmapFrameEncode_Release(&This->encoder->IWICBitmapFrameEncode_iface); HeapFree(GetProcessHeap(), 0, This); } @@ -489,7 +489,7 @@ static HRESULT WINAPI IcnsEncoder_QueryInterface(IWICBitmapEncoder *iface, REFII if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapEncoder, iid)) { - *ppv = This; + *ppv = &This->IWICBitmapEncoder_iface; } else { @@ -639,7 +639,7 @@ static HRESULT WINAPI IcnsEncoder_CreateNewFrame(IWICBitmapEncoder *iface, frameEncode->committed = FALSE; *ppIFrameEncode = &frameEncode->IWICBitmapFrameEncode_iface; This->outstanding_commits++; - IUnknown_AddRef((IUnknown*)This); + IWICBitmapEncoder_AddRef(&This->IWICBitmapEncoder_iface); end: LeaveCriticalSection(&This->lock); @@ -725,8 +725,8 @@ HRESULT IcnsEncoder_CreateInstance(REFIID iid, void** ppv) InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IcnsEncoder.lock"); - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); - IUnknown_Release((IUnknown*)This); + ret = IWICBitmapEncoder_QueryInterface(&This->IWICBitmapEncoder_iface, iid, ppv); + IWICBitmapEncoder_Release(&This->IWICBitmapEncoder_iface); return ret; }

1 0

Gerald Pfeifer : widl: Fix indentation in the EXPR_ADDRESSOF case in resolve_expression.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: 3a64eb2c4ad1e874229a2e6c0968754787a86a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a64eb2c4ad1e874229a2e6c0… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jun 30 00:21:08 2015 +0200 widl: Fix indentation in the EXPR_ADDRESSOF case in resolve_expression. --- tools/widl/expr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/expr.c b/tools/widl/expr.c index 7012382..0ada012 100644 --- a/tools/widl/expr.c +++ b/tools/widl/expr.c @@ -571,7 +571,7 @@ static struct expression_type resolve_expression(const struct expr_loc *expr_loc error_loc_info(&expr_loc->v->loc_info, "address-of operator applied to non-variable type in expression%s%s\n", expr_loc->attr ? " for attribute " : "", expr_loc->attr ? expr_loc->attr : ""); - result.is_variable = FALSE; + result.is_variable = FALSE; result.is_temporary = TRUE; result.type = type_new_pointer(RPC_FC_UP, result.type, NULL); break;

1 0

Michael Stefaniuc : dmstyle: Implement the E_NOTIMPL methods of IDirectMusicTrack8.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: 02412469fb44deb0a0309323a7ba4b61d1119e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=02412469fb44deb0a0309323a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:20:11 2015 +0200 dmstyle: Implement the E_NOTIMPL methods of IDirectMusicTrack8. --- dlls/dmstyle/auditiontrack.c | 32 ++++++++++++++++-------- dlls/dmstyle/chordtrack.c | 18 ++++++++++---- dlls/dmstyle/commandtrack.c | 18 ++++++++++---- dlls/dmstyle/motiftrack.c | 32 ++++++++++++++++-------- dlls/dmstyle/mutetrack.c | 58 +++++++++++++++++++++++++++++--------------- dlls/dmstyle/styletrack.c | 18 ++++++++++---- 6 files changed, 121 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02412469fb44deb0a0309…

1 0

Michael Stefaniuc : dmstyle/tests: Add some basic DirectMusicTrack8 tests.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: b2ff03ed0350ba7e3892943cf5664099524b5a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2ff03ed0350ba7e3892943cf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:21:16 2015 +0200 dmstyle/tests: Add some basic DirectMusicTrack8 tests. --- dlls/dmstyle/tests/dmstyle.c | 60 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 54 insertions(+), 6 deletions(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 58c229c..0c585fe 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -251,14 +251,15 @@ static void test_track(void) REFCLSID clsid; const char *name; BOOL has_save; + BOOL has_join; BOOL todo; } class[] = { - { X(DirectMusicAuditionTrack), TRUE, TRUE }, - { X(DirectMusicChordTrack), TRUE, FALSE }, - { X(DirectMusicCommandTrack), TRUE, TRUE }, - { X(DirectMusicMotifTrack), FALSE, TRUE }, - { X(DirectMusicMuteTrack), TRUE, TRUE }, - { X(DirectMusicStyleTrack), FALSE, FALSE }, + { X(DirectMusicAuditionTrack), TRUE, FALSE, TRUE }, + { X(DirectMusicChordTrack), TRUE, TRUE, FALSE }, + { X(DirectMusicCommandTrack), TRUE, TRUE, TRUE }, + { X(DirectMusicMotifTrack), FALSE, FALSE, TRUE }, + { X(DirectMusicMuteTrack), TRUE, FALSE, TRUE }, + { X(DirectMusicStyleTrack), FALSE, TRUE, FALSE }, }; #undef X unsigned int i; @@ -274,8 +275,55 @@ static void test_track(void) ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); /* IDirectMusicTrack8 */ + hr = IDirectMusicTrack8_Init(dmt8, NULL); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %08x\n", hr); + if (class[i].clsid != &CLSID_DirectMusicChordTrack && + class[i].clsid != &CLSID_DirectMusicCommandTrack) { + /* Crashes on native */ + hr = IDirectMusicTrack8_InitPlay(dmt8, NULL, NULL, NULL, 0, 0); + if (class[i].clsid == &CLSID_DirectMusicMuteTrack) + ok(hr == S_OK, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + else + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + } + todo_wine { + hr = IDirectMusicTrack8_GetParam(dmt8, NULL, 0, NULL, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParam(dmt8, NULL, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParam failed: %08x\n", hr); + } hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + if (class[i].clsid == &CLSID_DirectMusicMuteTrack) { + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + } else todo_wine { + hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_RemoveNotificationType(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + } + todo_wine { + hr = IDirectMusicTrack8_Clone(dmt8, 0, 0, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + if (class[i].has_join) { + hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + } else { + hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %08x\n", hr); + } /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps);

1 0

Michael Stefaniuc : dmstyle: COM cleanup for IDirectMusicTrack8 of DMMuteTrack.
by Alexandre Julliard 30 Jun '15

30 Jun '15

Module: wine Branch: master Commit: c0b7fe80272caa8eab5d2bf1d2721ae11cf42d9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0b7fe80272caa8eab5d2bf1d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 09:22:12 2015 +0200 dmstyle: COM cleanup for IDirectMusicTrack8 of DMMuteTrack. --- dlls/dmstyle/mutetrack.c | 122 ++++++++++++++++++++++++++++------------------- 1 file changed, 73 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0b7fe80272caa8eab5d2…

1 0