June 2014 - Wine-Commits - list.winehq.org

Nikolay Sivov : dsound/tests: Accept another error code.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: d7894955349faac8bdeab3bdf96770ac3ceecc86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7894955349faac8bdeab3bdf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 15 11:48:20 2014 +0400 dsound/tests: Accept another error code. --- dlls/dsound/tests/dsound8.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index b96cded..64b9f62 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -790,7 +790,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx) + 1; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */) && !secondary) + ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */ || rc==DSERR_INVALIDPARAM) && !secondary) || rc==DS_OK /* driver dependent? */, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); @@ -814,7 +814,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL || rc==E_INVALIDARG) && !secondary, + ok((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL || rc==DSERR_INVALIDPARAM) && !secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); if (secondary) @@ -836,7 +836,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) + 1; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */) && !secondary) + ok(((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL /* 2003 */ || rc==DSERR_INVALIDPARAM) && !secondary) || rc==DS_OK /* driver dependent? */, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary);

1 0

Nikolay Sivov : wmp: Implement get_versionInfo().
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 99449fc8d41c852aa60da710570e956578665783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99449fc8d41c852aa60da7105… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 14 09:11:29 2014 +0400 wmp: Implement get_versionInfo(). --- dlls/wmp/Makefile.in | 2 +- dlls/wmp/player.c | 13 ++++++++++--- dlls/wmp/rsrc.rc | 2 ++ dlls/wmp/tests/Makefile.in | 2 +- dlls/wmp/tests/oleobj.c | 14 ++++++++++++++ 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/wmp/Makefile.in b/dlls/wmp/Makefile.in index a82cc36..71ca0e5 100644 --- a/dlls/wmp/Makefile.in +++ b/dlls/wmp/Makefile.in @@ -1,5 +1,5 @@ MODULE = wmp.dll -IMPORTS = user32 gdi32 +IMPORTS = user32 gdi32 oleaut32 C_SRCS = \ oleobj.c \ diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index e8c349b..4c11c88 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -159,11 +159,18 @@ static HRESULT WINAPI WMPPlayer4_get_playlistCollection(IWMPPlayer4 *iface, IWMP return E_NOTIMPL; } -static HRESULT WINAPI WMPPlayer4_get_versionInfo(IWMPPlayer4 *iface, BSTR *pbstrVersionInfo) +static HRESULT WINAPI WMPPlayer4_get_versionInfo(IWMPPlayer4 *iface, BSTR *version) { + static const WCHAR versionW[] = {'1','2','.','0','.','7','6','0','1','.','1','6','9','8','2',0}; WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%p)\n", This, pbstrVersionInfo); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, version); + + if (!version) + return E_POINTER; + + *version = SysAllocString(versionW); + return *version ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI WMPPlayer4_launchURL(IWMPPlayer4 *iface, BSTR url) diff --git a/dlls/wmp/rsrc.rc b/dlls/wmp/rsrc.rc index ced1a64..3585d12 100644 --- a/dlls/wmp/rsrc.rc +++ b/dlls/wmp/rsrc.rc @@ -23,6 +23,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: wmp.rgs */ 2 WINE_REGISTRY wmp.rgs +/* NOTE: when changing version value, update a string returned by + get_versionInfo() as well */ #define WINE_FILEDESCRIPTION_STR "Wine Media Player" #define WINE_FILENAME_STR "wmp.dll" #define WINE_FILEVERSION 12,0,7601,16982 diff --git a/dlls/wmp/tests/Makefile.in b/dlls/wmp/tests/Makefile.in index 52da0d7..465b878 100644 --- a/dlls/wmp/tests/Makefile.in +++ b/dlls/wmp/tests/Makefile.in @@ -1,4 +1,4 @@ TESTDLL = wmp.dll -IMPORTS = ole32 user32 +IMPORTS = ole32 oleaut32 user32 C_SRCS = oleobj.c diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 31087f5..875fc77 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -864,12 +864,14 @@ static void test_wmp(void) IOleInPlaceObject *ipobj; IPersistStreamInit *psi; IOleObject *oleobj; + IWMPCore *wmpcore; DWORD misc_status; RECT pos = {0,0,100,100}; HWND hwnd; GUID guid; LONG ref; HRESULT hres; + BSTR str; hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); if(hres == REGDB_E_CLASSNOTREG) { @@ -878,6 +880,18 @@ static void test_wmp(void) } ok(hres == S_OK, "Coult not create CLSID_WindowsMediaPlayer instance: %08x\n", hres); + hres = IOleObject_QueryInterface(oleobj, &IID_IWMPCore, (void**)&wmpcore); + ok(hres == S_OK, "got 0x%08x\n", hres); + + hres = IWMPCore_get_versionInfo(wmpcore, NULL); + ok(hres == E_POINTER, "got 0x%08x\n", hres); + + hres = IWMPCore_get_versionInfo(wmpcore, &str); + ok(hres == S_OK, "got 0x%08x\n", hres); + SysFreeString(str); + + IWMPCore_Release(wmpcore); + hres = IOleObject_QueryInterface(oleobj, &IID_IProvideClassInfo2, (void**)&class_info); ok(hres == S_OK, "Could not get IProvideClassInfo2 iface: %08x\n", hres);

1 0

Nikolay Sivov : d3dx9: Trace out parameters as pointers (Valgrind).
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 9475dc58d169efc2a546d37226144b2dabc5a3ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=9475dc58d169efc2a546d3722… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 14 09:33:46 2014 +0400 d3dx9: Trace out parameters as pointers (Valgrind). --- dlls/d3dx9_36/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index d2bc4bc..014fa95 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -147,8 +147,8 @@ static HDC WINAPI ID3DXFontImpl_GetDC(ID3DXFont *iface) static HRESULT WINAPI ID3DXFontImpl_GetGlyphData(ID3DXFont *iface, UINT glyph, IDirect3DTexture9 **texture, RECT *blackbox, POINT *cellinc) { - FIXME("iface %p, glyph %#x, texture %p, blackbox %s, cellinc %s stub!\n", - iface, glyph, texture, wine_dbgstr_rect(blackbox), wine_dbgstr_point(cellinc)); + FIXME("iface %p, glyph %#x, texture %p, blackbox %p, cellinc %p stub!\n", + iface, glyph, texture, blackbox, cellinc); return E_NOTIMPL; }

1 0

Nikolay Sivov : dwrite: Recognize more Unicode ranges in script analyzer.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: b5184df5df0fb10e9fab94d747aac0815b81c8d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5184df5df0fb10e9fab94d74… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 15 22:38:14 2014 +0400 dwrite: Recognize more Unicode ranges in script analyzer. --- dlls/dwrite/analyzer.c | 43 ++++++++++++++++++++++++++++++++ dlls/dwrite/tests/analyzer.c | 56 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 97 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 5c692d1..2b7056e 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -41,6 +41,7 @@ enum scriptcode { Script_Devanagari = 18, Script_Ethiopic = 19, Script_Georgian = 20, + Script_Glagolitic = 22, Script_Greek = 23, Script_Gujarati = 24, Script_Gurmukhi = 25, @@ -70,6 +71,7 @@ enum scriptcode { Script_Thaana = 70, Script_Thai = 71, Script_Tibetan = 72, + Script_Tifinagh = 73, Script_Symbol = 77, Script_Unknown = (UINT16)-1 }; @@ -204,6 +206,47 @@ static const struct script_range script_ranges[] = { { Script_Devanagari, 0x1cd0, 0x1cff }, /* Phonetic Extensions: U+1D00–U+1DBF */ { Script_Latin, 0x1d00, 0x1dbf }, + /* Combining Diacritical Marks Supplement: U+1DC0–U+1DFF */ + { Script_Symbol, 0x1dc0, 0x1dff }, + /* Latin Extended Additional: U+1E00–U+1EFF */ + { Script_Latin, 0x1e00, 0x1eff }, + /* Greek Extended: U+1F00–U+1F00 */ + { Script_Greek, 0x1f00, 0x1fff }, + /* General Punctuation: U+2000–U+206f */ + /* Superscripts and Subscripts: U+2070–U+209f */ + /* Currency Symbols: U+20A0–U+20CF */ + /* Combining Diacritical Marks for Symbols: U+20D0–U+20FF */ + /* Letterlike Symbols: U+2100–U+214F */ + /* Number Forms: U+2150–U+218F */ + /* Arrows: U+2190–U+21FF */ + /* Mathematical Operators: U+2200–U+22FF */ + /* Miscellaneous Technical: U+2300–U+23FF */ + /* Control Pictures: U+2400–U+243F */ + /* Optical Character Recognition: U+2440–U+245F */ + /* Enclosed Alphanumerics: U+2460–U+24FF */ + /* Box Drawing: U+2500–U+25FF */ + /* Block Elements: U+2580–U+259F */ + /* Geometric Shapes: U+25A0–U+25FF */ + /* Miscellaneous Symbols: U+2600–U+26FF */ + /* Dingbats: U+2700–U+27BF */ + /* Miscellaneous Mathematical Symbols-A: U+27C0–U+27EF */ + /* Supplemental Arrows-A: U+27F0–U+27FF */ + /* Braille Patterns: U+2800–U+28FF */ + /* Supplemental Arrows-B: U+2900–U+297F */ + /* Miscellaneous Mathematical Symbols-B: U+2980–U+29FF */ + /* Supplemental Mathematical Operators: U+2A00–U+2AFF */ + /* Miscellaneous Symbols and Arrows: U+2B00–U+2BFF */ + { Script_Symbol, 0x2000, 0x2bff }, + /* Glagolitic: U+2C00–U+2C5F */ + { Script_Glagolitic, 0x2c00, 0x2c5f }, + /* Latin Extended-C: U+2C60–U+2C7F */ + { Script_Latin, 0x2c60, 0x2c7f }, + /* Coptic: U+2C80–U+2CFF */ + { Script_Coptic, 0x2c80, 0x2cff }, + /* Georgian Supplement: U+2D00–U+2D2F */ + { Script_Georgian, 0x2d00, 0x2d2f }, + /* Tifinagh: U+2D30–U+2D7F */ + { Script_Tifinagh, 0x2d30, 0x2d7f }, /* unsupported range */ { Script_Unknown } }; diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 7ff6e56..e504a22 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -621,8 +621,8 @@ static struct sa_test sa_tests[] = { }, { /* Georgian */ - {0x10a0,0x10d0,0x10da,0x10f1,0x10fb,'.',0}, 1, - { { 0, 6, DWRITE_SCRIPT_SHAPES_DEFAULT }} + {0x10a0,0x10d0,0x10da,0x10f1,0x10fb,0x2d00,'.',0}, 1, + { { 0, 7, DWRITE_SCRIPT_SHAPES_DEFAULT }} }, { /* Hangul */ @@ -724,6 +724,58 @@ static struct sa_test sa_tests[] = { {0x1d00,0x1d40,0x1d70,0}, 1, { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }} }, + { + /* Combining diacritical marks */ + {0x1dc0,0x300,0x1ddf,0}, 1, + { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Latin Extended Additional, Extended-C */ + {0x1e00,0x1d00,0x2c60,0}, 1, + { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Greek Extended */ + {0x3f0,0x1f00,0}, 1, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* General Punctuation */ + {0x1dc0,0x2000,0}, 1, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Superscripts and Subscripts */ + {0x2070,0x2086,0x2000,0}, 1, + { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Currency, Combining Diacritical Marks for Symbols. Letterlike Symbols.. */ + {0x20a0,0x20b8,0x2000,0x20d0,0x2100,0x2150,0x2190,0x2200,0x2300,0x2400,0x2440,0x2460,0x2500,0x2580,0x25a0,0x2600, + 0x2700,0x27c0,0x27f0,0x2900,0x2980,0x2a00,0x2b00,0}, 1, + { { 0, 23, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Braille */ + {0x2800,0x2070,0x2000,0}, 1, + { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Glagolitic */ + {0x2c00,0x2c12,0}, 1, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, + { + /* Coptic */ + {0x2c80,0x3e2,0x1f00,0}, 2, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }, + { 2, 1, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, + { + /* Tifinagh */ + {0x2d30,0x2d4a,0}, 1, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }} + }, /* keep this as end marker */ { {0} } };

1 0

Nikolay Sivov : msxml3/tests: Accept Stat() method called on test stream.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 45b90272589bb71e5bd1fce24a250886866c89ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b90272589bb71e5bd1fce24… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 15 12:35:37 2014 +0400 msxml3/tests: Accept Stat() method called on test stream. --- dlls/msxml3/tests/saxreader.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 6c6a1b8..882e855 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1989,7 +1989,6 @@ static HRESULT WINAPI istream_UnlockRegion(IStream *iface, ULARGE_INTEGER libOff static HRESULT WINAPI istream_Stat(IStream *iface, STATSTG *pstatstg, DWORD grfStatFlag) { - ok(0, "unexpected call\n"); return E_NOTIMPL; }

1 0

Nikolay Sivov : xmllite/writer: Maintain a stack of written elements to write end tags.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: af46bab5947e826816280e5f95e94e2faabf1147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af46bab5947e826816280e5f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 14 22:46:09 2014 +0400 xmllite/writer: Maintain a stack of written elements to write end tags. Xmllite helps in a way that user doesn't have to specify closing tag name (like it has to in case of MXWriter). So when closing current level element qname is used for a closing tag; later this stack will also hold namespace definitions that element is carrying to check if nested element uses defined prefix. --- dlls/xmllite/tests/writer.c | 50 ++++++++++++++-- dlls/xmllite/writer.c | 139 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 161 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af46bab5947e826816280…

1 0

Nikolay Sivov : msctf/tests: Fix crash when ITfInputProcessorProfileMgr is not supported.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: d3980cdcf26c040cd8feccb8931e8a699248919a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3980cdcf26c040cd8feccb89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 15 11:56:20 2014 +0400 msctf/tests: Fix crash when ITfInputProcessorProfileMgr is not supported. --- dlls/msctf/tests/inputprocessor.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 8a052b3..dfa8731 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2193,6 +2193,11 @@ static void test_profile_mgr(void) HRESULT hres; hres = ITfInputProcessorProfiles_QueryInterface(g_ipp, &IID_ITfInputProcessorProfileMgr, (void**)&ipp_mgr); + if (hres != S_OK) + { + win_skip("ITfInputProcessorProfileMgr is not supported.\n"); + return; + } ok(hres == S_OK, "Could not get ITfInputProcessorProfileMgr iface: %08x\n", hres); hres = ITfInputProcessorProfileMgr_EnumProfiles(ipp_mgr, 0, &enum_profiles);

1 0

Nikolay Sivov : shell32: Release cached desktop folder on process detach.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: d3a034e3482637ad28dc2d36eba27d2c94b8a6ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a034e3482637ad28dc2d36e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 14 23:56:45 2014 +0400 shell32: Release cached desktop folder on process detach. --- dlls/shell32/shell32_main.c | 1 + dlls/shell32/shell32_main.h | 1 + dlls/shell32/shfldr_desktop.c | 12 ++++++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 091c6e1..679ebec 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1281,6 +1281,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) if (fImpLoad) break; SIC_Destroy(); FreeChangeNotifications(); + release_desktop_folder(); release_typelib(); break; } diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index e7765eb..954f1e4 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -230,5 +230,6 @@ BOOL AddToEnumList(IEnumIDListImpl *list, LPITEMIDLIST pidl) DECLSPEC_HIDDEN; BOOL CreateFolderEnumList(IEnumIDListImpl *list, LPCWSTR lpszPath, DWORD dwFlags) DECLSPEC_HIDDEN; void release_typelib(void) DECLSPEC_HIDDEN; +void release_desktop_folder(void) DECLSPEC_HIDDEN; #endif diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 2910106..695e558 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -57,7 +57,6 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); /* Undocumented functions from shdocvw */ extern HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName, LPBC pbc, LPITEMIDLIST *ppidl); - /*********************************************************************** * Desktopfolder implementation */ @@ -75,6 +74,8 @@ typedef struct { BOOL fAcceptFmt; /* flag for pending Drop */ } IDesktopFolderImpl; +static IDesktopFolderImpl *cached_sf; + static inline IDesktopFolderImpl *impl_from_IShellFolder2(IShellFolder2 *iface) { return CONTAINING_RECORD(iface, IDesktopFolderImpl, IShellFolder2_iface); @@ -934,13 +935,20 @@ static const IPersistFolder2Vtbl vt_IPersistFolder2 = ISF_Desktop_IPersistFolder2_fnGetCurFolder }; +void release_desktop_folder(void) +{ + if (!cached_sf) return; + SHFree(cached_sf->pidlRoot); + SHFree(cached_sf->sPathTarget); + LocalFree(cached_sf); +} + /************************************************************************** * ISF_Desktop_Constructor */ HRESULT WINAPI ISF_Desktop_Constructor ( IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) { - static IDesktopFolderImpl *cached_sf; WCHAR szMyPath[MAX_PATH]; TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid));

1 0

Nikolay Sivov : quartz/tests: Fix couple of test failures running with limited user.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 1f92df77a83df58404dc93e6a25e9f382712ad7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f92df77a83df58404dc93e6a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 14 14:51:50 2014 +0400 quartz/tests: Fix couple of test failures running with limited user. --- dlls/quartz/tests/filtermapper.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index a67df1d..d21509d 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -87,7 +87,7 @@ static void test_fm2_enummatchingfilters(void) CLSID clsidFilter1; CLSID clsidFilter2; IEnumMoniker *pEnum = NULL; - BOOL found; + BOOL found, registered = TRUE; ZeroMemory(&rgf2, sizeof(rgf2)); @@ -121,7 +121,10 @@ static void test_fm2_enummatchingfilters(void) hr = IFilterMapper2_RegisterFilter(pMapper, &clsidFilter1, wszFilterName1, NULL, &CLSID_LegacyAmFilterCategory, NULL, &rgf2); if (hr == E_ACCESSDENIED) + { + registered = FALSE; skip("Not authorized to register filters\n"); + } else { ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); @@ -192,13 +195,16 @@ static void test_fm2_enummatchingfilters(void) ok(!found, "EnumMatchingFilters should not return the test filter 2\n"); } - hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, - &clsidFilter1); - ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + if (registered) + { + hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, + &clsidFilter1); + ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); - hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, - &clsidFilter2); - ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, + &clsidFilter2); + ok(SUCCEEDED(hr), "IFilterMapper2_UnregisterFilter failed with %x\n", hr); + } out:

1 0

Nikolay Sivov : d3drm/tests: Release frame instance (Valgrind).
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 023e885156d9c0e1e5da4b5aeef97e99de708b77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=023e885156d9c0e1e5da4b5ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 14 09:25:46 2014 +0400 d3drm/tests: Release frame instance (Valgrind). --- dlls/d3drm/tests/d3drm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 9990d2c..ee01b91 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1560,6 +1560,7 @@ static void test_frame_transform(void) ok(hr == D3DRM_OK, "IDirect3DRMFrame_GetTransform returned hr = %x\n", hr); ok(!memcmp(matrix, identity, sizeof(D3DRMMATRIX4D)), "Returned matrix is not identity\n"); + IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm); }

1 0