March 2014 - Wine-commits - list.winehq.org

Dmitry Timoshkov : schedsvc: Implement SchRpcRetrieveTask.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: c751ec6a65f6c1ba3a417b05c5df31945cf54143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c751ec6a65f6c1ba3a417b05c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 7 12:10:49 2014 +0900 schedsvc: Implement SchRpcRetrieveTask. --- dlls/schedsvc/schedsvc.c | 74 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index a527ab4..538a423 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -214,10 +214,80 @@ HRESULT __cdecl SchRpcRegisterTask(const WCHAR *path, const WCHAR *xml, DWORD fl return hr; } +static int detect_encoding(const void *buffer, DWORD size) +{ + static const char bom_utf8[] = { 0xef,0xbb,0xbf }; + + if (size >= sizeof(bom_utf8) && !memcmp(buffer, bom_utf8, sizeof(bom_utf8))) + return CP_UTF8; + else + { + int flags = IS_TEXT_UNICODE_SIGNATURE | + IS_TEXT_UNICODE_REVERSE_SIGNATURE | + IS_TEXT_UNICODE_ODD_LENGTH; + IsTextUnicode(buffer, size, &flags); + if (flags & IS_TEXT_UNICODE_SIGNATURE) + return -1; + if (flags & IS_TEXT_UNICODE_REVERSE_SIGNATURE) + return -2; + return CP_ACP; + } +} + +static HRESULT read_xml(const WCHAR *name, WCHAR **xml) +{ + HANDLE hfile; + DWORD size; + char *src; + int cp; + + hfile = CreateFileW(name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + if (hfile == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + + size = GetFileSize(hfile, NULL); + src = heap_alloc(size + 2); + if (!src) + { + CloseHandle(hfile); + return E_OUTOFMEMORY; + } + + src[size] = 0; + src[size + 1] = 0; + + ReadFile(hfile, src, size, &size, NULL); + CloseHandle(hfile); + + cp = detect_encoding(src, size); + if (cp < 0) + { + *xml = (WCHAR *)src; + return S_OK; + } + + size = MultiByteToWideChar(cp, 0, src, -1, NULL, 0); + *xml = heap_alloc(size * sizeof(WCHAR)); + if (!*xml) return E_OUTOFMEMORY; + MultiByteToWideChar(cp, 0, src, -1, *xml, size); + return S_OK; +} + HRESULT __cdecl SchRpcRetrieveTask(const WCHAR *path, const WCHAR *languages, ULONG *n_languages, WCHAR **xml) { - WINE_FIXME("%s,%s,%p,%p: stub\n", wine_dbgstr_w(path), wine_dbgstr_w(languages), n_languages, xml); - return E_NOTIMPL; + WCHAR *full_name; + HRESULT hr; + + WINE_TRACE("%s,%s,%p,%p\n", wine_dbgstr_w(path), wine_dbgstr_w(languages), n_languages, xml); + + full_name = get_full_name(path, NULL); + if (!full_name) return E_OUTOFMEMORY; + + hr = read_xml(full_name, xml); + if (hr != S_OK) *xml = NULL; + + heap_free(full_name); + return hr; } HRESULT __cdecl SchRpcCreateFolder(const WCHAR *path, const WCHAR *sddl, DWORD flags)

1 0

Dmitry Timoshkov : taskschd: Implement ITaskService::get_HighestVersion.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 38dcd677c8c8bcd1d1e00710fb3bd747d0c21b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38dcd677c8c8bcd1d1e00710f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 7 12:10:53 2014 +0900 taskschd: Implement ITaskService::get_HighestVersion. --- dlls/taskschd/Makefile.in | 6 ++- dlls/taskschd/schrpc.idl | 3 ++ dlls/taskschd/task.c | 101 ++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 106 insertions(+), 4 deletions(-) diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in index afbb2ad..c6df2a3 100644 --- a/dlls/taskschd/Makefile.in +++ b/dlls/taskschd/Makefile.in @@ -1,5 +1,5 @@ MODULE = taskschd.dll -IMPORTS = oleaut32 ole32 advapi32 xmllite +IMPORTS = oleaut32 ole32 advapi32 xmllite rpcrt4 C_SRCS = \ folder.c \ @@ -8,4 +8,6 @@ C_SRCS = \ task.c \ taskschd.c -IDL_SRCS = taskschd_tlb.idl +IDL_SRCS = \ + schrpc.idl \ + taskschd_tlb.idl diff --git a/dlls/taskschd/schrpc.idl b/dlls/taskschd/schrpc.idl new file mode 100644 index 0000000..d8bca06 --- /dev/null +++ b/dlls/taskschd/schrpc.idl @@ -0,0 +1,3 @@ +#pragma makedep client + +#include "wine/schrpc.idl" diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 41ff843..e6e61c7 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -26,6 +26,8 @@ #include "objbase.h" #include "xmllite.h" #include "taskschd.h" +#include "winsvc.h" +#include "schrpc.h" #include "taskschd_private.h" #include "wine/unicode.h" @@ -2257,6 +2259,7 @@ typedef struct ITaskService ITaskService_iface; LONG ref; BOOL connected; + DWORD version; WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; } TaskService; @@ -2370,11 +2373,70 @@ static inline BOOL is_variant_null(const VARIANT *var) (V_VT(var) == VT_BSTR && (V_BSTR(var) == NULL || !*V_BSTR(var))); } +static HRESULT start_schedsvc(void) +{ + static const WCHAR scheduleW[] = { 'S','c','h','e','d','u','l','e',0 }; + SC_HANDLE scm, service; + SERVICE_STATUS_PROCESS status; + ULONGLONG start_time; + HRESULT hr = SCHED_E_SERVICE_NOT_RUNNING; + + TRACE("Trying to start %s service\n", debugstr_w(scheduleW)); + + scm = OpenSCManagerW(NULL, NULL, 0); + if (!scm) return SCHED_E_SERVICE_NOT_INSTALLED; + + service = OpenServiceW(scm, scheduleW, SERVICE_START | SERVICE_QUERY_STATUS); + if (service) + { + if (StartServiceW(service, 0, NULL) || GetLastError() == ERROR_SERVICE_ALREADY_RUNNING) + { + start_time = GetTickCount64(); + do + { + DWORD dummy; + + if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, (BYTE *)&status, sizeof(status), &dummy)) + { + WARN("failed to query scheduler status (%u)\n", GetLastError()); + break; + } + + if (status.dwCurrentState == SERVICE_RUNNING) + { + hr = S_OK; + break; + } + + if (GetTickCount64() - start_time > 30000) break; + Sleep(1000); + + } while (status.dwCurrentState == SERVICE_START_PENDING); + + if (status.dwCurrentState != SERVICE_RUNNING) + WARN("scheduler failed to start %u\n", status.dwCurrentState); + } + else + WARN("failed to start scheduler service (%u)\n", GetLastError()); + + CloseServiceHandle(service); + } + else + WARN("failed to open scheduler service (%u)\n", GetLastError()); + + CloseServiceHandle(scm); + return hr; +} + static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, VARIANT user, VARIANT domain, VARIANT password) { + static WCHAR ncalrpc[] = { 'n','c','a','l','r','p','c',0 }; TaskService *task_svc = impl_from_ITaskService(iface); WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; DWORD len; + HRESULT hr; + RPC_WSTR binding_str; + extern handle_t rpc_handle; TRACE("%p,%s,%s,%s,%s\n", iface, debugstr_variant(&server), debugstr_variant(&user), debugstr_variant(&domain), debugstr_variant(&password)); @@ -2408,6 +2470,21 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V } } + hr = start_schedsvc(); + if (hr != S_OK) return hr; + + hr = RpcStringBindingComposeW(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); + if (hr != RPC_S_OK) return hr; + hr = RpcBindingFromStringBindingW(binding_str, &rpc_handle); + if (hr != RPC_S_OK) return hr; + RpcStringFreeW(&binding_str); + + /* Make sure that the connection works */ + hr = SchRpcHighestVersion(&task_svc->version); + if (hr != S_OK) return hr; + + TRACE("server version %#x\n", task_svc->version); + strcpyW(task_svc->comp_name, comp_name); task_svc->connected = TRUE; @@ -2458,8 +2535,18 @@ static HRESULT WINAPI TaskService_get_ConnectedDomain(ITaskService *iface, BSTR static HRESULT WINAPI TaskService_get_HighestVersion(ITaskService *iface, DWORD *version) { - FIXME("%p,%p: stub\n", iface, version); - return E_NOTIMPL; + TaskService *task_svc = impl_from_ITaskService(iface); + + TRACE("%p,%p\n", iface, version); + + if (!version) return E_POINTER; + + if (!task_svc->connected) + return HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED); + + *version = task_svc->version; + + return S_OK; } static const ITaskServiceVtbl TaskService_vtbl = @@ -2498,3 +2585,13 @@ HRESULT TaskService_create(void **obj) return S_OK; } + +void __RPC_FAR *__RPC_USER MIDL_user_allocate(SIZE_T n) +{ + return HeapAlloc(GetProcessHeap(), 0, n); +} + +void __RPC_USER MIDL_user_free(void __RPC_FAR *p) +{ + HeapFree(GetProcessHeap(), 0, p); +}

1 0

Michael Stefaniuc : dmloader: None of the COM classes support aggregation.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 917d5eabe64f34bb3dcae1c65c02a93829f2174a URL: http://source.winehq.org/git/wine.git/?a=commit;h=917d5eabe64f34bb3dcae1c65… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 12 22:58:17 2014 +0100 dmloader: None of the COM classes support aggregation. --- dlls/dmloader/container.c | 3 ++- dlls/dmloader/dmloader_main.c | 18 +++++++++++------- dlls/dmloader/dmloader_private.h | 4 ++-- dlls/dmloader/loader.c | 4 ++-- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index 68ee573..871c8b0 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -909,7 +909,8 @@ static const IPersistStreamVtbl DirectMusicContainer_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicContainerImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmcontainer(REFIID lpcGUID, void **ppobj) +{ IDirectMusicContainerImpl* obj; obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicContainerImpl)); diff --git a/dlls/dmloader/dmloader_main.c b/dlls/dmloader/dmloader_main.c index eaed633..38faa8e 100644 --- a/dlls/dmloader/dmloader_main.c +++ b/dlls/dmloader/dmloader_main.c @@ -27,7 +27,7 @@ LONG module_ref = 0; typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); + HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv); } IClassFactoryImpl; /****************************************************************** @@ -73,13 +73,18 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) } static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, - REFIID riid, void **ppv) + REFIID riid, void **ret_iface) { IClassFactoryImpl *This = impl_from_IClassFactory(iface); - TRACE ("(%p, %s, %p)\n", pUnkOuter, debugstr_dmguid(riid), ppv); + TRACE ("(%s, %p)\n", debugstr_dmguid(riid), ret_iface); - return This->fnCreateInstance(riid, ppv, pUnkOuter); + if (pUnkOuter) { + *ret_iface = NULL; + return CLASS_E_NOAGGREGATION; + } + + return This->fnCreateInstance(riid, ret_iface); } static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) @@ -102,9 +107,8 @@ static const IClassFactoryVtbl classfactory_vtbl = { ClassFactory_LockServer }; -static IClassFactoryImpl dm_loader_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicLoaderImpl}; -static IClassFactoryImpl dm_container_CF = {{&classfactory_vtbl}, - DMUSIC_CreateDirectMusicContainerImpl}; +static IClassFactoryImpl dm_loader_CF = {{&classfactory_vtbl}, create_dmloader}; +static IClassFactoryImpl dm_container_CF = {{&classfactory_vtbl}, create_dmcontainer}; /****************************************************************** * DllMain diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h index e393080..f01acfc 100644 --- a/dlls/dmloader/dmloader_private.h +++ b/dlls/dmloader/dmloader_private.h @@ -65,8 +65,8 @@ typedef struct IDirectMusicLoaderGenericStream IDirectMusicLoaderGenericStream; /***************************************************************************** * Creation helpers */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicContainerImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmloader(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmcontainer(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderFileStream (LPVOID *ppobj) DECLSPEC_HIDDEN; extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderResourceStream (LPVOID *ppobj) DECLSPEC_HIDDEN; extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderGenericStream (LPVOID *ppobj) DECLSPEC_HIDDEN; diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 39f00a0..967b093 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -888,14 +888,14 @@ static HRESULT DMUSIC_GetDefaultGMPath (WCHAR wszPath[MAX_PATH]) { } /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl(const GUID *lpcGUID, void **ppobj, IUnknown *pUnkOuter) +HRESULT WINAPI create_dmloader(REFIID lpcGUID, void **ppobj) { IDirectMusicLoaderImpl *obj; DMUS_OBJECTDESC Desc; LPWINE_LOADER_ENTRY pDefaultDLSEntry; struct list *pEntry; - TRACE("(%s, %p, %p)\n", debugstr_dmguid(lpcGUID), ppobj, pUnkOuter); + TRACE("(%s, %p)\n", debugstr_dmguid(lpcGUID), ppobj); obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicLoaderImpl)); if (NULL == obj) { *ppobj = NULL;

1 0

Michael Stefaniuc : dmloader/tests: Centralize the skip().
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 82f771e34768b4914bb5cbaeec7cde28be15689e URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f771e34768b4914bb5cbaee… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 12 23:00:53 2014 +0100 dmloader/tests: Centralize the skip(). --- dlls/dmloader/tests/loader.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 8759033..3d8dd80 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -27,17 +27,26 @@ static unsigned char rifffile[8+4+8+16+8+256] = "RIFF\x24\x01\x00\x00WAVE" /* he "fmt \x10\x00\x00\x00\x01\x00\x20\x00\xAC\x44\x00\x00\x10\xB1\x02\x00\x04\x00\x10\x00" /* format segment: PCM, 2 chan, 44100 Hz, 16 bits */ "data\x00\x01\x00\x00"; /* 256 byte data segment (silence) */ +static BOOL missing_dmloader(void) +{ + IDirectMusicLoader *dml; + HRESULT hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicLoader, (void**)&dml); + + if (hr == S_OK && dml) + { + IDirectMusicLoader_Release(dml); + return FALSE; + } + return TRUE; +} + static void test_release_object(void) { HRESULT hr; IDirectMusicLoader8* loader = NULL; hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, (void**)&loader); - if ( FAILED(hr) ) - { - skip("CoCreateInstance failed.\n"); - return; - } hr = IDirectMusicLoader_ReleaseObject(loader, NULL); ok(hr == E_POINTER, "Expected E_POINTER, received %#x\n", hr); @@ -128,6 +137,13 @@ static void test_simple_playing(void) START_TEST(loader) { CoInitialize(NULL); + + if (missing_dmloader()) + { + skip("dmloader not available\n"); + CoUninitialize(); + return; + } test_release_object(); test_simple_playing(); CoUninitialize();

1 0

Michael Stefaniuc : dmloader: Add COM tests for DirectMusicLoader.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 9cb38a4ad0b9943c8699e6c9795253ac53616f97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb38a4ad0b9943c8699e6c97… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 12 23:04:09 2014 +0100 dmloader: Add COM tests for DirectMusicLoader. --- dlls/dmloader/tests/loader.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 3d8dd80..1105afa 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -134,6 +134,41 @@ static void test_simple_playing(void) IDirectMusicLoader8_Release(loader); } +static void test_COM(void) +{ + IDirectMusicLoader8 *dml8 = (IDirectMusicLoader8*)0xdeadbeef; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicLoader, (IUnknown*)&dml8, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dml8); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicLoader create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dml8, "dml8 = %p\n", dml8); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dml8); + ok(hr == E_NOINTERFACE, "DirectMusicLoader create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicLoader interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicLoader8, (void**)&dml8); + ok(hr == S_OK, "DirectMusicLoader create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicLoader8_AddRef(dml8); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicLoader8_QueryInterface(dml8, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicLoader8_Release(dml8)); +} + START_TEST(loader) { CoInitialize(NULL); @@ -146,5 +181,6 @@ START_TEST(loader) } test_release_object(); test_simple_playing(); + test_COM(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmloader: Pass the object to the IDirectMusicContainer_Release helper.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: c600be1ff50cdcb1fbdf4757dac3a710a694ee8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c600be1ff50cdcb1fbdf4757d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 12 23:07:09 2014 +0100 dmloader: Pass the object to the IDirectMusicContainer_Release helper. --- dlls/dmloader/container.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index 871c8b0..f53a074 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -36,8 +36,8 @@ static ULONG WINAPI IDirectMusicContainerImpl_IPersistStream_AddRef (LPPERSISTST */ /* IUnknown/IDirectMusicContainer part: */ -static HRESULT DMUSIC_DestroyDirectMusicContainerImpl (LPDIRECTMUSICCONTAINER iface) { - ICOM_THIS_MULTI(IDirectMusicContainerImpl, ContainerVtbl, iface); +static HRESULT destroy_dmcontainer(IDirectMusicContainerImpl *This) +{ LPDIRECTMUSICLOADER pLoader; LPDIRECTMUSICGETLOADER pGetLoader; struct list *pEntry; @@ -108,7 +108,7 @@ static ULONG WINAPI IDirectMusicContainerImpl_IDirectMusicContainer_Release (LPD DWORD dwRef = InterlockedDecrement (&This->dwRef); TRACE("(%p): ReleaseRef to %d\n", This, dwRef); if (dwRef == 0) { - DMUSIC_DestroyDirectMusicContainerImpl (iface); + destroy_dmcontainer(This); HeapFree(GetProcessHeap(), 0, This); }

1 0

Michael Stefaniuc : dmloader: Don' t crash on container destruction if it was never loaded.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: e1676fc989471fd551f4e0654eefad783440ea1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1676fc989471fd551f4e0654… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 12 23:10:12 2014 +0100 dmloader: Don't crash on container destruction if it was never loaded. --- dlls/dmloader/container.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index f53a074..4fb5f97 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -68,7 +68,6 @@ static HRESULT destroy_dmcontainer(IDirectMusicContainerImpl *This) IStream_Release (This->pStream); /* FIXME: release allocated entries */ - unlock_module(); return S_OK; } @@ -108,8 +107,10 @@ static ULONG WINAPI IDirectMusicContainerImpl_IDirectMusicContainer_Release (LPD DWORD dwRef = InterlockedDecrement (&This->dwRef); TRACE("(%p): ReleaseRef to %d\n", This, dwRef); if (dwRef == 0) { - destroy_dmcontainer(This); + if (This->pStream) + destroy_dmcontainer(This); HeapFree(GetProcessHeap(), 0, This); + unlock_module(); } return dwRef;

1 0

Michael Stefaniuc : dmloader/tests: Add COM tests for DirectMusicContainer.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: a539e13f23e92eec195964ad6a5b49c030994185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a539e13f23e92eec195964ad6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 12 23:14:41 2014 +0100 dmloader/tests: Add COM tests for DirectMusicContainer. --- dlls/dmloader/tests/loader.c | 50 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 1105afa..273149d 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -169,6 +169,55 @@ static void test_COM(void) while (IDirectMusicLoader8_Release(dml8)); } +static void test_COM_container(void) +{ + IDirectMusicContainer *dmc = (IDirectMusicContainer*)0xdeadbeef; + IDirectMusicObject *dmo; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicContainer, (IUnknown*)&dmc, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmc); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicContainer create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmc, "dmc = %p\n", dmc); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicContainer, NULL, CLSCTX_INPROC_SERVER, + &IID_IClassFactory, (void**)&dmc); + ok(hr == E_NOINTERFACE, "DirectMusicContainer create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicContainer interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicContainer, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicContainer, (void**)&dmc); + ok(hr == S_OK, "DirectMusicContainer create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicContainer_AddRef(dmc); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicContainer_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 = IDirectMusicContainer_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 = IDirectMusicContainer_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); + + while (IDirectMusicContainer_Release(dmc)); +} + START_TEST(loader) { CoInitialize(NULL); @@ -182,5 +231,6 @@ START_TEST(loader) test_release_object(); test_simple_playing(); test_COM(); + test_COM_container(); CoUninitialize(); }

1 0

Frédéric Delanoy : krnl386.exe16: Use BOOL type where appropriate.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 03cec9d886938aafbc33b805e6197327f0709fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=03cec9d886938aafbc33b805e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Mar 13 08:58:47 2014 +0100 krnl386.exe16: Use BOOL type where appropriate. --- dlls/krnl386.exe16/int21.c | 4 ++-- dlls/krnl386.exe16/int31.c | 6 +++--- dlls/krnl386.exe16/soundblaster.c | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 53b6537..45a8149 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -2737,7 +2737,7 @@ static void INT21_IoctlHPScanHandler( CONTEXT *context ) static void INT21_Ioctl_Char( CONTEXT *context ) { int status; - int IsConsoleIOHandle = 0; + BOOL IsConsoleIOHandle = FALSE; IO_STATUS_BLOCK io; FILE_INTERNAL_INFORMATION info; HANDLE handle = DosFileHandleToWin32Handle(BX_reg(context)); @@ -2746,7 +2746,7 @@ static void INT21_Ioctl_Char( CONTEXT *context ) if (status) { if( VerifyConsoleIoHandle( handle)) - IsConsoleIOHandle = 1; + IsConsoleIOHandle = TRUE; else { SET_AX( context, RtlNtStatusToDosError(status) ); SET_CFLAG( context ); diff --git a/dlls/krnl386.exe16/int31.c b/dlls/krnl386.exe16/int31.c index e7413cc..2f01452 100644 --- a/dlls/krnl386.exe16/int31.c +++ b/dlls/krnl386.exe16/int31.c @@ -439,7 +439,7 @@ int DPMI_CallRMProc( CONTEXT *context, LPWORD stack, int args, int iret ) LPWORD stack16; LPVOID addr = NULL; /* avoid gcc warning */ RMCB *CurrRMCB; - int alloc = 0, already = 0; + BOOL alloc = FALSE, already = FALSE; BYTE *code; TRACE("EAX=%08x EBX=%08x ECX=%08x EDX=%08x\n", @@ -490,7 +490,7 @@ callrmproc_again: } if (!already) { if (!context->SegSs) { - alloc = 1; /* allocate default stack */ + alloc = TRUE; /* allocate default stack */ stack16 = addr = DOSMEM_AllocBlock( 64, (UINT16 *)&(context->SegSs) ); context->Esp = 64-2; stack16 += 32-1; @@ -514,7 +514,7 @@ callrmproc_again: *(--stack16) = 0; /* adjust stack */ context->Esp -= 2*sizeof(WORD); - already = 1; + already = TRUE; } if (CurrRMCB) { diff --git a/dlls/krnl386.exe16/soundblaster.c b/dlls/krnl386.exe16/soundblaster.c index ca62732..8939bb3 100644 --- a/dlls/krnl386.exe16/soundblaster.c +++ b/dlls/krnl386.exe16/soundblaster.c @@ -48,8 +48,8 @@ static int InSize; /* Nb of bytes in InBuffer */ static BYTE DSP_OutBuffer[10]; /* Store DSP information bytes to host */ static int OutSize; /* Nb of bytes in InBuffer */ static int command; /* Current command */ -static int end_sound_loop = 0; -static int dma_enable = 0; +static BOOL end_sound_loop = FALSE; +static BOOL dma_enable = FALSE; /* The maximum size of a dma transfer can be 65536 */ #define DMATRFSIZE 1024 @@ -112,7 +112,7 @@ static DWORD CALLBACK SB_Poll( void *dummy ) SamplesCount -= size; if (!SamplesCount) { DOSVM_QueueEvent(SB_IRQ,SB_IRQ_PRI,NULL,NULL); - dma_enable = 0; + dma_enable = FALSE; } } return 0; @@ -166,7 +166,7 @@ static BOOL SB_Init(void) } buf_off = 0; - end_sound_loop = 0; + end_sound_loop = FALSE; SB_Thread = CreateThread(NULL, 0, SB_Poll, NULL, 0, NULL); TRACE("thread\n"); if (!SB_Thread) { @@ -254,7 +254,7 @@ void SB_ioport_out( WORD port, BYTE val ) case 0x14: /* SB */ SamplesCount = DSP_InBuffer[1]+(val<<8)+1; TRACE("DMA DAC (8-bit) for %x samples\n",SamplesCount); - dma_enable = 1; + dma_enable = TRUE; break; case 0x20: FIXME("Direct ADC (8-bit) - Not Implemented\n"); @@ -274,7 +274,7 @@ void SB_ioport_out( WORD port, BYTE val ) /* case 0xBX/0xCX -> See below */ case 0xD0: /* SB */ TRACE("Halt DMA operation (8-bit)\n"); - dma_enable = 0; + dma_enable = FALSE; break; case 0xD1: /* SB */ FIXME("Enable Speaker - Not Implemented\n"); @@ -331,7 +331,7 @@ void SB_ioport_out( WORD port, BYTE val ) FIXME("Generic DAC/ADC stereo mode not supported\n"); SamplesCount = DSP_InBuffer[2]+(val<<8)+1; TRACE("Generic DMA for %x samples\n",SamplesCount); - dma_enable = 1; + dma_enable = TRUE; } else FIXME("DSP command %x not supported\n",val);

1 0

Zhenbo Li : mshtml: Added IHTMLTableRow::vAlign property implementation.
by Alexandre Julliard 13 Mar '14

13 Mar '14

Module: wine Branch: master Commit: 3679619909f9ce04d5deb8f4046e7dba80261972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3679619909f9ce04d5deb8f40… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Thu Mar 13 16:27:32 2014 +0800 mshtml: Added IHTMLTableRow::vAlign property implementation. --- dlls/mshtml/htmltablerow.c | 29 +++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 12 ++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index ef01763..832cb6c 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -135,15 +135,36 @@ static HRESULT WINAPI HTMLTableRow_get_align(IHTMLTableRow *iface, BSTR *p) static HRESULT WINAPI HTMLTableRow_put_vAlign(IHTMLTableRow *iface, BSTR v) { HTMLTableRow *This = impl_from_IHTMLTableRow(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString val; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&val, v); + + nsres = nsIDOMHTMLTableRowElement_SetVAlign(This->nsrow, &val); + nsAString_Finish(&val); + + if (NS_FAILED(nsres)){ + ERR("Set VAlign(%s) failed!\n", debugstr_w(v)); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLTableRow_get_vAlign(IHTMLTableRow *iface, BSTR *p) { HTMLTableRow *This = impl_from_IHTMLTableRow(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString val; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&val, NULL); + nsres = nsIDOMHTMLTableRowElement_GetVAlign(This->nsrow, &val); + + return return_nsstr(nsres, &val, p); } static HRESULT WINAPI HTMLTableRow_put_bgColor(IHTMLTableRow *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b485203..013a2a9 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5605,6 +5605,18 @@ static void test_tr_elem(IHTMLElement *elem) ok(!strcmp_wa(bstr, "left"), "get_align returned %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); + bstr = a2bstr("top"); + hres = IHTMLTableRow_put_vAlign(row, bstr); + ok(hres == S_OK, "set_valign failed: %08x\n", hres); + SysFreeString(bstr); + + bstr = NULL; + hres = IHTMLTableRow_get_vAlign(row, &bstr); + ok(hres == S_OK, "get_valign failed: %08x\n", hres); + ok(bstr != NULL, "get_valign returned NULL\n"); + ok(!strcmp_wa(bstr, "top"), "get_valign returned %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + IHTMLTableRow_Release(row); }

1 0