December 2013 - Wine-Commits

Jacek Caban : msrle32/tests: Added tests.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 754e621613c3a9ff30916e59137656b226e95e30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=754e621613c3a9ff30916e591… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 30 11:53:18 2013 +0100 msrle32/tests: Added tests. --- configure | 1 + configure.ac | 1 + dlls/msrle32/tests/Makefile.in | 5 ++++ dlls/msrle32/tests/msrle.c | 48 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 10dea9a..a3c36ce 100755 --- a/configure +++ b/configure @@ -16976,6 +16976,7 @@ wine_fn_config_dll msls31 enable_msls31 wine_fn_config_dll msnet32 enable_msnet32 wine_fn_config_dll mspatcha enable_mspatcha wine_fn_config_dll msrle32 enable_msrle32 po +wine_fn_config_test dlls/msrle32/tests msrle32_test wine_fn_config_dll mssign32 enable_mssign32 wine_fn_config_dll mssip32 enable_mssip32 wine_fn_config_dll mstask enable_mstask clean diff --git a/configure.ac b/configure.ac index afec9bb..964c068 100644 --- a/configure.ac +++ b/configure.ac @@ -3019,6 +3019,7 @@ WINE_CONFIG_DLL(msls31) WINE_CONFIG_DLL(msnet32) WINE_CONFIG_DLL(mspatcha) WINE_CONFIG_DLL(msrle32,,[po]) +WINE_CONFIG_TEST(dlls/msrle32/tests) WINE_CONFIG_DLL(mssign32) WINE_CONFIG_DLL(mssip32) WINE_CONFIG_DLL(mstask,,[clean]) diff --git a/dlls/msrle32/tests/Makefile.in b/dlls/msrle32/tests/Makefile.in new file mode 100644 index 0000000..fafc2da --- /dev/null +++ b/dlls/msrle32/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = msrle32.dll +IMPORTS = msvfw32 +C_SRCS = msrle.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c new file mode 100644 index 0000000..04cf64f --- /dev/null +++ b/dlls/msrle32/tests/msrle.c @@ -0,0 +1,48 @@ +/* + * Copyright 2013 Jacek Caban for CodeWeavers + * + * 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 + */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#include <vfw.h> +#include <aviriff.h> + +#include "wine/test.h" + +static void test_encode(void) +{ + ICINFO info; + HIC hic; + LRESULT res; + + hic = ICOpen(FCC('V','I','D','C'), FCC('m','r','l','e'), ICMODE_COMPRESS); + ok(hic != NULL, "ICOpen failed\n"); + + res = ICGetInfo(hic, &info, sizeof(info)); + ok(res == sizeof(info), "res = %ld\n", res); + ok(info.dwSize == sizeof(info), "dwSize = %d\n", info.dwSize); + ok(info.fccHandler == FCC('M','R','L','E'), "fccHandler = %x\n", info.fccHandler); + todo_wine ok(info.dwFlags == (VIDCF_QUALITY|VIDCF_CRUNCH|VIDCF_TEMPORAL), "dwFlags = %x\n", info.dwFlags); + ok(info.dwVersionICM == ICVERSION, "dwVersionICM = %d\n", info.dwVersionICM); + + ICClose(hic); +} + +START_TEST(msrle) +{ + test_encode(); +}

1 0

Alexandre Julliard : scrrun: Add missing ITextStream id.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: e03bfb482f87a6a0ee24dfb7d4a5eb2d9037ae80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e03bfb482f87a6a0ee24dfb7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 30 17:49:31 2013 +0100 scrrun: Add missing ITextStream id. --- dlls/scrrun/scrrun.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index 82f494f..3739e30 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -105,6 +105,7 @@ static REFIID tid_ids[] = { &IID_IDictionary, &IID_IFileSystem3, &IID_IFolder, + &IID_ITextStream, &IID_IFile };

1 0

Dmitry Timoshkov : advapi32/tests: Test generic access mapping for a file.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 2d05a633905175afc341fad52c6a1349e7fa2493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d05a633905175afc341fad52… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 26 16:34:22 2013 +0900 advapi32/tests: Test generic access mapping for a file. --- dlls/advapi32/tests/security.c | 45 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index cce1339..9f1e611 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4756,6 +4756,50 @@ todo_wine CloseHandle(file); } +static void test_file_security(HANDLE token) +{ + DWORD ret, i, access; + HANDLE file, dup; + static const struct + { + int generic, mapped; + } map[] = + { + { GENERIC_READ, FILE_GENERIC_READ }, + { GENERIC_WRITE, FILE_GENERIC_WRITE }, + { GENERIC_EXECUTE, FILE_GENERIC_EXECUTE }, + { GENERIC_ALL, STANDARD_RIGHTS_ALL | FILE_ALL_ACCESS } + }; + char temp_path[MAX_PATH]; + char file_name[MAX_PATH]; + + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "tmp", 0, file_name); + + SetLastError(0xdeadbeef); + file = CreateFileA(file_name, GENERIC_ALL, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + access = get_obj_access(file); + ok(access == FILE_ALL_ACCESS, "expected FILE_ALL_ACCESS, got %#x\n", access); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), file, GetCurrentProcess(), &dup, + map[i].generic, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + + access = get_obj_access(dup); + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + + CloseHandle(dup); + } + + CloseHandle(file); + DeleteFileA(file_name); +} + static BOOL validate_impersonation_token(HANDLE token, DWORD *token_type) { DWORD ret, needed; @@ -4830,6 +4874,7 @@ static void test_kernel_objects_security(void) test_event_security(token); test_named_pipe_security(token); test_semaphore_security(token); + test_file_security(token); /* FIXME: test other kernel object types */ CloseHandle(process_token);

1 0

Jacek Caban : qcap: Added IPersistPropertyBag stub implementation to AVI compressor.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: cd90d8fdd84d5199fa15baf8f115816871cd904b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd90d8fdd84d5199fa15baf8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 30 16:37:47 2013 +0100 qcap: Added IPersistPropertyBag stub implementation to AVI compressor. --- dlls/qcap/avico.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/qcap/tests/qcap.c | 9 ++++++ 2 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index a24a1c3..6817bf6 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); typedef struct { BaseFilter filter; + IPersistPropertyBag IPersistPropertyBag_iface; } AVICompressor; static inline AVICompressor *impl_from_BaseFilter(BaseFilter *filter) @@ -61,6 +62,9 @@ static HRESULT WINAPI AVICompressor_QueryInterface(IBaseFilter *iface, REFIID ri }else if(IsEqualIID(riid, &IID_IBaseFilter)) { TRACE("(%p)->(IID_IBaseFilter %p)\n", This, ppv); *ppv = &This->filter.IBaseFilter_iface; + }else if(IsEqualIID(riid, &IID_IPersistPropertyBag)) { + TRACE("(%p)->(IID_IPersistPropertyBag %p)\n", This, ppv); + *ppv = &This->IPersistPropertyBag_iface; }else { FIXME("no interface for %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -164,6 +168,67 @@ static const BaseFilterFuncTable filter_func_table = { AVICompressor_GetPinCount }; +static AVICompressor *impl_from_IPersistPropertyBag(IPersistPropertyBag *iface) +{ + return CONTAINING_RECORD(iface, AVICompressor, IPersistPropertyBag_iface); +} + +static HRESULT WINAPI AVICompressorPropertyBag_QueryInterface(IPersistPropertyBag *iface, REFIID riid, void **ppv) +{ + AVICompressor *This = impl_from_IPersistPropertyBag(iface); + return IBaseFilter_QueryInterface(&This->filter.IBaseFilter_iface, riid, ppv); +} + +static ULONG WINAPI AVICompressorPropertyBag_AddRef(IPersistPropertyBag *iface) +{ + AVICompressor *This = impl_from_IPersistPropertyBag(iface); + return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); +} + +static ULONG WINAPI AVICompressorPropertyBag_Release(IPersistPropertyBag *iface) +{ + AVICompressor *This = impl_from_IPersistPropertyBag(iface); + return IBaseFilter_Release(&This->filter.IBaseFilter_iface); +} + +static HRESULT WINAPI AVICompressorPropertyBag_GetClassID(IPersistPropertyBag *iface, CLSID *pClassID) +{ + AVICompressor *This = impl_from_IPersistPropertyBag(iface); + return IBaseFilter_GetClassID(&This->filter.IBaseFilter_iface, pClassID); +} + +static HRESULT WINAPI AVICompressorPropertyBag_InitNew(IPersistPropertyBag *iface) +{ + AVICompressor *This = impl_from_IPersistPropertyBag(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI AVICompressorPropertyBag_Load(IPersistPropertyBag *iface, IPropertyBag *pPropBag, IErrorLog *pErrorLog) +{ + AVICompressor *This = impl_from_IPersistPropertyBag(iface); + FIXME("(%p)->(%p %p)\n", This, pPropBag, pErrorLog); + return E_NOTIMPL; +} + +static HRESULT WINAPI AVICompressorPropertyBag_Save(IPersistPropertyBag *iface, IPropertyBag *pPropBag, + BOOL fClearDirty, BOOL fSaveAllProperties) +{ + AVICompressor *This = impl_from_IPersistPropertyBag(iface); + FIXME("(%p)->(%p %x %x)\n", This, pPropBag, fClearDirty, fSaveAllProperties); + return E_NOTIMPL; +} + +static const IPersistPropertyBagVtbl PersistPropertyBagVtbl = { + AVICompressorPropertyBag_QueryInterface, + AVICompressorPropertyBag_AddRef, + AVICompressorPropertyBag_Release, + AVICompressorPropertyBag_GetClassID, + AVICompressorPropertyBag_InitNew, + AVICompressorPropertyBag_Load, + AVICompressorPropertyBag_Save +}; + IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) { AVICompressor *compressor; @@ -179,6 +244,8 @@ IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) BaseFilter_Init(&compressor->filter, &AVICompressorVtbl, &CLSID_AVICo, (DWORD_PTR)(__FILE__ ": AVICompressor.csFilter"), &filter_func_table); + compressor->IPersistPropertyBag_iface.lpVtbl = &PersistPropertyBagVtbl; + *phr = S_OK; return (IUnknown*)&compressor->filter.IBaseFilter_iface; } diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 014a763..8081bce 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1335,7 +1335,9 @@ static void test_AviMux(void) static void test_AviCo(void) { + IPersistPropertyBag *persist_bag; IBaseFilter *avico; + IPin *pin; HRESULT hres; hres = CoCreateInstance(&CLSID_AVICo, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&avico); @@ -1345,6 +1347,13 @@ static void test_AviCo(void) } ok(hres == S_OK, "Could not create CLSID_AVICo class: %08x\n", hres); + hres = IBaseFilter_QueryInterface(avico, &IID_IPin, (void**)&pin); + ok(hres == E_NOINTERFACE, "QueryInterface(IID_IPin) returned: %08x\n", hres); + + hres = IBaseFilter_QueryInterface(avico, &IID_IPersistPropertyBag, (void**)&persist_bag); + ok(hres == S_OK, "QueryInterface(IID_IPersistPropertyBag) returned: %08x\n", hres); + + IPersistPropertyBag_Release(persist_bag); IBaseFilter_Release(avico); }

1 0

Ken Thomases : winemac: Don' t check the state of the SC_MINIMIZE item of the window menu when asked to minimize .
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 2c6ad1829d4fe77278dc6f8cc2f496a59fb62849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6ad1829d4fe77278dc6f8cc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 29 21:33:07 2013 -0600 winemac: Don't check the state of the SC_MINIMIZE item of the window menu when asked to minimize. The window menu items are not updated as the window state changes; they only update when the menu is shown. So the item state is not a reliable indicator of whether minimization is allowed. --- dlls/winemac.drv/window.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index a4e730d..91a1d4d 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2037,7 +2037,6 @@ void macdrv_app_deactivated(void) void macdrv_window_minimize_requested(HWND hwnd) { DWORD style; - HMENU hSysMenu; style = GetWindowLongW(hwnd, GWL_STYLE); if (!(style & WS_MINIMIZEBOX) || (style & (WS_DISABLED | WS_MINIMIZE))) @@ -2046,17 +2045,6 @@ void macdrv_window_minimize_requested(HWND hwnd) return; } - hSysMenu = GetSystemMenu(hwnd, FALSE); - if (hSysMenu) - { - UINT state = GetMenuState(hSysMenu, SC_MINIMIZE, MF_BYCOMMAND); - if (state == 0xFFFFFFFF || (state & (MF_DISABLED | MF_GRAYED))) - { - TRACE("not minimizing win %p menu state 0x%08x\n", hwnd, state); - return; - } - } - if (GetActiveWindow() != hwnd) { LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor(hwnd, GA_ROOT),

1 0

Michael Stefaniuc : dmusic/tests: Add some COM tests for IDirectMusic/ IDirectMusicCollection.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 0c4b3514a548e1f0b87834ce97b30b6b3929bafb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c4b3514a548e1f0b87834ce9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 29 22:38:06 2013 +0100 dmusic/tests: Add some COM tests for IDirectMusic/IDirectMusicCollection. --- dlls/dmusic/tests/dmusic.c | 95 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 9cc9023..c425840 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -222,6 +222,99 @@ static void test_dmbuffer(void) IDirectMusic_Release(dmusic); } +static void test_COM(void) +{ + IDirectMusic8 *dm8 = (IDirectMusic8*)0xdeadbeef; + IDirectMusic *dm; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusic, (IUnknown*)&dm8, CLSCTX_INPROC_SERVER, &IID_IUnknown, + (void**)&dm8); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusic8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dm8, "dm8 = %p\n", dm8); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, + (void**)&dm8); + ok(hr == E_NOINTERFACE, "DirectMusic8 create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for DirectMusic and DirectMusic8 */ + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, + (void**)&dm8); + ok(hr == S_OK, "DirectMusic8 create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusic8_AddRef(dm8); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusic8_QueryInterface(dm8, &IID_IDirectMusic, (void**)&dm); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusic failed: %08x\n", hr); + refcount = IDirectMusic_AddRef(dm); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IDirectMusic_Release(dm); + + hr = IDirectMusic8_QueryInterface(dm8, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IUnknown_Release(unk); + + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + while (IDirectMusic8_Release(dm8)); +} + +static void test_COM_dmcoll(void) +{ + IDirectMusicCollection *dmc = (IDirectMusicCollection*)0xdeadbeef; + IDirectMusicObject *dmo; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicCollection, (IUnknown*)&dmc, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmc); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicCollection create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmc, "dmc = %p\n", dmc); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicCollection, NULL, CLSCTX_INPROC_SERVER, + &IID_IClassFactory, (void**)&dmc); + ok(hr == E_NOINTERFACE, "DirectMusicCollection create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicCollection interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicCollection, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicCollection, (void**)&dmc); + ok(hr == S_OK, "DirectMusicCollection create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicCollection_AddRef(dmc); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicCollection_QueryInterface(dmc, &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + refcount = IDirectMusicObject_AddRef(dmo); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IDirectMusicObject_Release(dmo); + + hr = IDirectMusicCollection_QueryInterface(dmc, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicCollection_QueryInterface(dmc, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IUnknown_Release(unk); + + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + while (IDirectMusicCollection_Release(dmc)); +} + static BOOL missing_dmusic(void) { IDirectMusic8 *dm; @@ -241,6 +334,8 @@ START_TEST(dmusic) CoUninitialize(); return; } + test_COM(); + test_COM_dmcoll(); test_dmusic(); test_dmbuffer();

1 0

Michael Stefaniuc : dmusic/tests: Centralize the skip().
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 645ca7504ee60fe029bb4df7e749deb23975d5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=645ca7504ee60fe029bb4df7e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 29 22:36:28 2013 +0100 dmusic/tests: Centralize the skip(). --- dlls/dmusic/tests/dmusic.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 3174685..9cc9023 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -62,11 +62,7 @@ static void test_dmusic(void) IReferenceClock *clock = NULL; hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (LPVOID*)&dmusic); - if (hr != S_OK) - { - skip("Cannot create DirectMusic object (%x)\n", hr); - return; - } + ok(hr == S_OK, "Cannot create DirectMusic object (%x)\n", hr); hr = IDirectMusic_GetMasterClock(dmusic, &guid_clock, &clock); ok(hr == S_OK, "IDirectMusic_GetMasterClock returned: %x\n", hr); @@ -149,11 +145,7 @@ static void test_dmbuffer(void) LPBYTE data; hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (LPVOID*)&dmusic); - if (hr != S_OK) - { - skip("Cannot create DirectMusic object (%x)\n", hr); - return; - } + ok(hr == S_OK, "Cannot create DirectMusic object (%x)\n", hr); desc.dwSize = sizeof(DMUS_BUFFERDESC); desc.dwFlags = 0; @@ -230,10 +222,25 @@ static void test_dmbuffer(void) IDirectMusic_Release(dmusic); } +static BOOL missing_dmusic(void) +{ + IDirectMusic8 *dm; + HRESULT hr = CoCreateInstance(&CLSID_DirectMusic, (IUnknown*)&dm, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dm); + + return (hr == REGDB_E_CLASSNOTREG || hr == CLASS_E_CLASSNOTAVAILABLE); +} + START_TEST(dmusic) { CoInitializeEx(NULL, COINIT_MULTITHREADED); + if (missing_dmusic()) + { + skip("DirectMusic not available\n"); + CoUninitialize(); + return; + } test_dmusic(); test_dmbuffer();

1 0

Frédéric Delanoy : shlwapi/tests: Constify some character strings.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 36e80042915e98fef1f4fae063a2cfbe968be5e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36e80042915e98fef1f4fae06… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 28 14:14:58 2013 +0100 shlwapi/tests: Constify some character strings. --- dlls/shlwapi/tests/shreg.c | 4 ++-- dlls/shlwapi/tests/string.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/tests/shreg.c b/dlls/shlwapi/tests/shreg.c index 2b6cb1c..dfc8c3e 100644 --- a/dlls/shlwapi/tests/shreg.c +++ b/dlls/shlwapi/tests/shreg.c @@ -39,8 +39,8 @@ static DWORD (WINAPI *pSHRegGetPathA)(HKEY,LPCSTR,LPCSTR,LPSTR,DWORD); static LSTATUS (WINAPI *pSHRegGetValueA)(HKEY,LPCSTR,LPCSTR,SRRF,LPDWORD,LPVOID,LPDWORD); static LSTATUS (WINAPI *pSHRegCreateUSKeyW)(LPCWSTR,REGSAM,HUSKEY,PHUSKEY,DWORD); -static char sTestpath1[] = "%LONGSYSTEMVAR%\\subdir1"; -static char sTestpath2[] = "%FOO%\\subdir1"; +static const char sTestpath1[] = "%LONGSYSTEMVAR%\\subdir1"; +static const char sTestpath2[] = "%FOO%\\subdir1"; static const char * sEnvvar1 = "bar"; static const char * sEnvvar2 = "ImARatherLongButIndeedNeededString"; diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 12f8bfc..e5f0283 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -433,7 +433,7 @@ static void test_StrCpyW(void) static void test_StrChrNW(void) { - static WCHAR string[] = {'T','e','s','t','i','n','g',' ','S','t','r','i','n','g',0}; + static const WCHAR string[] = {'T','e','s','t','i','n','g',' ','S','t','r','i','n','g',0}; LPWSTR p; if (!pStrChrNW)

1 0

Frédéric Delanoy : shell32/tests: Constify some character strings.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 7b9058c87a3538dd0cc2d227b401905ba81c3edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b9058c87a3538dd0cc2d227b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 28 14:10:48 2013 +0100 shell32/tests: Constify some character strings. --- dlls/shell32/tests/shlfolder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 0992924..f692837 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1970,8 +1970,8 @@ static void test_SHGetFolderPathAndSubDirA(void) BOOL delret; DWORD dwret; int i; - static char wine[] = "wine"; - static char winetemp[] = "wine\\temp"; + static const char wine[] = "wine"; + static const char winetemp[] = "wine\\temp"; static char appdata[MAX_PATH]; static char testpath[MAX_PATH]; static char toolongpath[MAX_PATH+1];

1 0

Frédéric Delanoy : secur32/tests: Constify a character string.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 9ad67a9a8ea185942f7962008d906adc0d0871cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ad67a9a8ea185942f7962008… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 28 14:10:46 2013 +0100 secur32/tests: Constify a character string. --- dlls/secur32/tests/ntlm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index f01fa12..1e865ad 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -113,7 +113,7 @@ static BYTE message_binary[] = {0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x2c, 0x20, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x21}; -static char message[] = "Hello, world!"; +static const char message[] = "Hello, world!"; static char message_header[] = "Header Test";

1 0