wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

Zebediah Figura : msi/tests: Test deferral of MsiPublishAssemblies and MsiUnpublishAssemblies.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: 6eb74409147751a69cbf7dff34d79bd7e3a5dc7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eb74409147751a69cbf7dff… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 24 19:14:10 2018 -0500 msi/tests: Test deferral of MsiPublishAssemblies and MsiUnpublishAssemblies. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 14 ++++++++++++ dlls/msi/tests/custom.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 71 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 1600fe3..bd1e2c0 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -1733,12 +1733,25 @@ static const char pa_install_exec_seq_dat[] = "InstallInitialize\t\t1500\n" "ProcessComponents\t\t1600\n" "MsiPublishAssemblies\t\t3000\n" + "pa_immediate\tNOT REMOVE AND NOT ALLUSERS\t3001\n" + "pa_deferred\tNOT REMOVE AND NOT ALLUSERS\t3002\n" "MsiUnpublishAssemblies\t\t4000\n" + "ua_immediate\tREMOVE AND NOT ALLUSERS\t4001\n" + "ua_deferred\tREMOVE AND NOT ALLUSERS\t4002\n" "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char pa_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "pa_immediate\t1\tcustom.dll\tpa_absent\n" + "pa_deferred\t1025\tcustom.dll\tpa_present\n" + "ua_immediate\t1\tcustom.dll\tpa_present\n" + "ua_deferred\t1025\tcustom.dll\tpa_absent\n"; + static const char rep_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -2191,6 +2204,7 @@ static const msi_table pa_tables[] = ADD_TABLE(pa_msi_assembly), ADD_TABLE(pa_msi_assembly_name), ADD_TABLE(pa_install_exec_seq), + ADD_TABLE(pa_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 0bf62d9..ee067db 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1379,3 +1379,58 @@ todo_wine { } return ERROR_SUCCESS; } + +static void check_reg_str(MSIHANDLE hinst, HKEY key, const char *name, const char *expect) +{ + char value[300]; + DWORD sz; + LONG res; + + sz = sizeof(value); + res = RegQueryValueExA(key, name, NULL, NULL, (BYTE *)value, &sz); + if (expect) + { + ok(hinst, !res, "failed to get value \"%s\": %d\n", name, res); + ok(hinst, !strcmp(value, expect), "\"%s\": expected \"%s\", got \"%s\"\n", + name, expect, value); + } + else + ok(hinst, res == ERROR_FILE_NOT_FOUND, "\"%s\": expected missing, got %u\n", + name, res); +} + +static const char path_dotnet[] = "Software\\Microsoft\\Installer\\Assemblies\\Global"; +static const char name_dotnet[] = "Wine.Dotnet.Assembly,processorArchitecture=\"MSIL\"," + "publicKeyToken=\"abcdef0123456789\",version=\"1.0.0.0\",culture=\"neutral\""; + +UINT WINAPI pa_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &key); + ok(hinst, !res, "got %d\n", res); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + check_reg_str(hinst, key, name_dotnet, "rcHQPHq?CA@Uv-XqMI1e>Z'q,T*76M@=YEg6My?~]"); +} + RegCloseKey(key); + + return ERROR_SUCCESS; +} + +UINT WINAPI pa_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &key); + ok(hinst, !res || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); + if (!res) + { +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + check_reg_str(hinst, key, name_dotnet, NULL); +} + RegCloseKey(key); + } + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 4b46dc3..e5caa76 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -13,6 +13,8 @@ @ stdcall mov_absent(long) @ stdcall odbc_present(long) @ stdcall odbc_absent(long) +@ stdcall pa_present(long) +@ stdcall pa_absent(long) @ stdcall rd_present(long) @ stdcall rd_absent(long) @ stdcall sds_present(long)

1 0

Michael Stefaniuc : include: Make ARRAY_SIZE() available in wine/test.h.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: 7b5668a6e7bccdaefb69e099345fc7c3855a5cec URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b5668a6e7bccdaefb69e099… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 24 23:46:27 2018 +0200 include: Make ARRAY_SIZE() available in wine/test.h. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/cred.c | 2 -- dlls/advapi32/tests/eventlog.c | 2 -- dlls/advapi32/tests/registry.c | 1 - dlls/advapi32/tests/security.c | 2 -- dlls/comctl32/tests/button.c | 1 - dlls/comdlg32/tests/filedlg.c | 2 -- dlls/d2d1/tests/d2d1.c | 4 ---- dlls/d3d10core/tests/device.c | 4 ---- dlls/d3d11/tests/d3d11.c | 4 ---- dlls/d3d8/tests/device.c | 2 -- dlls/d3d9/tests/d3d9ex.c | 2 -- dlls/d3d9/tests/device.c | 2 -- dlls/d3d9/tests/stateblock.c | 2 -- dlls/d3d9/tests/visual.c | 2 -- dlls/d3dx9_36/tests/effect.c | 2 -- dlls/d3dx9_36/tests/math.c | 2 -- dlls/d3dx9_36/tests/mesh.c | 2 -- dlls/ddraw/tests/ddraw1.c | 4 ---- dlls/ddraw/tests/ddraw2.c | 4 ---- dlls/ddraw/tests/ddraw4.c | 4 ---- dlls/ddraw/tests/ddraw7.c | 4 ---- dlls/dmcompos/tests/dmcompos.c | 2 -- dlls/dmime/tests/dmime.c | 2 -- dlls/dmloader/tests/loader.c | 2 -- dlls/dmstyle/tests/dmstyle.c | 2 -- dlls/dwrite/tests/analyzer.c | 2 -- dlls/dwrite/tests/font.c | 2 -- dlls/dwrite/tests/layout.c | 2 -- dlls/dxgi/tests/device.c | 4 ---- dlls/shell32/tests/shellpath.c | 4 ---- dlls/shell32/tests/shlfolder.c | 2 -- dlls/user32/tests/cursoricon.c | 2 -- dlls/usp10/tests/usp10.c | 4 ---- dlls/xmllite/tests/reader.c | 2 -- include/wine/test.h | 2 ++ 35 files changed, 2 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b5668a6e7bccdaefb69…

1 0

Jacek Caban : ole32: Use queried interface destination context for marshaling RemQueryInterface result.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: df6b7324dfee383643b5913edb5bc8d544737292 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df6b7324dfee383643b5913e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 24 13:23:29 2018 +0200 ole32: Use queried interface destination context for marshaling RemQueryInterface result. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stubmanager.c | 12 +++++++++--- dlls/ole32/tests/marshal.c | 3 --- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 451a58a..5f604d4 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -73,7 +73,8 @@ struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *s struct ifstub *stub; HRESULT hr; - TRACE("oid=%s, stubbuffer=%p, iid=%s\n", wine_dbgstr_longlong(m->oid), sb, debugstr_guid(iid)); + TRACE("oid=%s, stubbuffer=%p, iid=%s, dest_context=%x\n", wine_dbgstr_longlong(m->oid), sb, + debugstr_guid(iid), dest_context); stub = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct ifstub)); if (!stub) return NULL; @@ -704,18 +705,23 @@ static HRESULT WINAPI RemUnknown_RemQueryInterface(IRemUnknown *iface, USHORT successful_qis = 0; APARTMENT *apt; struct stub_manager *stubmgr; + struct ifstub *ifstub; + DWORD dest_context; + void *dest_context_data; TRACE("(%p)->(%s, %d, %d, %p, %p)\n", iface, debugstr_guid(ripid), cRefs, cIids, iids, ppQIResults); - hr = ipid_to_stub_manager(ripid, &apt, &stubmgr); + hr = ipid_to_ifstub(ripid, &apt, &stubmgr, &ifstub); if (hr != S_OK) return hr; + IRpcChannelBuffer_GetDestCtx(ifstub->chan, &dest_context, &dest_context_data); + *ppQIResults = CoTaskMemAlloc(sizeof(REMQIRESULT) * cIids); for (i = 0; i < cIids; i++) { HRESULT hrobj = marshal_object(apt, &(*ppQIResults)[i].std, &iids[i], - stubmgr->object, MSHCTX_DIFFERENTMACHINE, NULL, MSHLFLAGS_NORMAL); + stubmgr->object, dest_context, dest_context_data, MSHLFLAGS_NORMAL); if (hrobj == S_OK) successful_qis++; (*ppQIResults)[i].hResult = hrobj; diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 41d8717..e71cbdb 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -449,7 +449,6 @@ static HRESULT WINAPI RpcStubBuffer_Invoke(IRpcStubBuffer *iface, RPCOLEMESSAGE hr = IRpcChannelBuffer_GetDestCtx(_pRpcChannelBuffer, &dest_context, &dest_context_data); ok(hr == S_OK, "GetDestCtx failed: %08x\n", hr); -todo_wine ok(dest_context == MSHCTX_INPROC, "desc_context = %x\n", dest_context); ok(!dest_context_data, "desc_context_data = %p\n", dest_context_data); @@ -1295,9 +1294,7 @@ static void test_marshal_channel_buffer(void) SET_EXPECT(Invoke); SET_EXPECT(GetWindow); hr = IOleWindow_GetWindow(ole_window, &hwnd); -todo_wine ok(hr == S_OK, "GetWindow failed: %08x\n", hr); -todo_wine ok(hwnd == (HWND)0xdeadbeef, "hwnd = %p\n", hwnd); CHECK_CALLED(Invoke); CHECK_CALLED(GetWindow);

1 0

Jacek Caban : ole32: Introduce new ipid_to_ifstub helper and use it in ipid_get_dispatch_params.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: d1a480a2c9d0c135c77be8bfb194f02d1b7f4ccf URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1a480a2c9d0c135c77be8bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 24 13:23:21 2018 +0200 ole32: Introduce new ipid_to_ifstub helper and use it in ipid_get_dispatch_params. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stubmanager.c | 49 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 75c4b04..451a58a 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -470,7 +470,7 @@ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tablewea /* gets the stub manager associated with an ipid - caller must have * a reference to the apartment while a reference to the stub manager is held. * it must also call release on the stub manager when it is no longer needed */ -static struct stub_manager *get_stub_manager_from_ipid(APARTMENT *apt, const IPID *ipid) +static struct stub_manager *get_stub_manager_from_ipid(APARTMENT *apt, const IPID *ipid, struct ifstub **ifstub) { struct stub_manager *result = NULL; struct list *cursor; @@ -480,7 +480,7 @@ static struct stub_manager *get_stub_manager_from_ipid(APARTMENT *apt, const IPI { struct stub_manager *m = LIST_ENTRY( cursor, struct stub_manager, entry ); - if (stub_manager_ipid_to_ifstub(m, ipid)) + if ((*ifstub = stub_manager_ipid_to_ifstub(m, ipid))) { result = m; stub_manager_int_addref(result); @@ -497,7 +497,8 @@ static struct stub_manager *get_stub_manager_from_ipid(APARTMENT *apt, const IPI return result; } -static HRESULT ipid_to_stub_manager(const IPID *ipid, APARTMENT **stub_apt, struct stub_manager **stubmgr_ret) +static HRESULT ipid_to_ifstub(const IPID *ipid, APARTMENT **stub_apt, + struct stub_manager **stubmgr_ret, struct ifstub **ifstub) { /* FIXME: hack for IRemUnknown */ if (ipid->Data2 == 0xffff) @@ -509,7 +510,7 @@ static HRESULT ipid_to_stub_manager(const IPID *ipid, APARTMENT **stub_apt, stru TRACE("Couldn't find apartment corresponding to TID 0x%04x\n", ipid->Data2); return RPC_E_INVALID_OBJECT; } - *stubmgr_ret = get_stub_manager_from_ipid(*stub_apt, ipid); + *stubmgr_ret = get_stub_manager_from_ipid(*stub_apt, ipid, ifstub); if (!*stubmgr_ret) { apartment_release(*stub_apt); @@ -519,6 +520,12 @@ static HRESULT ipid_to_stub_manager(const IPID *ipid, APARTMENT **stub_apt, stru return S_OK; } +static HRESULT ipid_to_stub_manager(const IPID *ipid, APARTMENT **stub_apt, struct stub_manager **stub) +{ + struct ifstub *ifstub; + return ipid_to_ifstub(ipid, stub_apt, stub, &ifstub); +} + /* gets the apartment, stub and channel of an object. the caller must * release the references to all objects (except iface) if the function * returned success, otherwise no references are returned. */ @@ -532,32 +539,22 @@ HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, APARTMENT *apt; HRESULT hr; - hr = ipid_to_stub_manager(ipid, &apt, &stubmgr); + hr = ipid_to_ifstub(ipid, &apt, &stubmgr, &ifstub); if (hr != S_OK) return RPC_E_DISCONNECTED; - ifstub = stub_manager_ipid_to_ifstub(stubmgr, ipid); - if (ifstub) - { - *stub = ifstub->stubbuffer; - IRpcStubBuffer_AddRef(*stub); - *chan = ifstub->chan; - IRpcChannelBuffer_AddRef(*chan); - *stub_apt = apt; - *iid = ifstub->iid; - *iface = ifstub->iface; - - if (manager) - *manager = stubmgr; - else - stub_manager_int_release(stubmgr); - return S_OK; - } + *stub = ifstub->stubbuffer; + IRpcStubBuffer_AddRef(*stub); + *chan = ifstub->chan; + IRpcChannelBuffer_AddRef(*chan); + *stub_apt = apt; + *iid = ifstub->iid; + *iface = ifstub->iface; + + if (manager) + *manager = stubmgr; else - { stub_manager_int_release(stubmgr); - apartment_release(apt); - return RPC_E_DISCONNECTED; - } + return S_OK; } /* returns TRUE if it is possible to unmarshal, FALSE otherwise. */

1 0

Jacek Caban : ole32/tests: Add IRpcChannelBuffer and IRpcStubBuffer tests.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: 7f83dd11a468e95da22ead771098cfbd147094de URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f83dd11a468e95da22ead77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 24 13:23:09 2018 +0200 ole32/tests: Add IRpcChannelBuffer and IRpcStubBuffer tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 358 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 358 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f83dd11a468e95da22e…

1 0

Jacek Caban : ole32/tests: Pass host_object_data struct as an argument to start_host_object2.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: 3834a6e3825827bfe4327ff114e4816050e3d752 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3834a6e3825827bfe4327ff1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 24 13:22:30 2018 +0200 ole32/tests: Pass host_object_data struct as an argument to start_host_object2. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 52 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index e8558dd..fbe1451 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -289,8 +289,8 @@ struct host_object_data IID iid; IUnknown *object; MSHLFLAGS marshal_flags; - HANDLE marshal_event; IMessageFilter *filter; + HANDLE marshal_event; }; static DWORD CALLBACK host_object_proc(LPVOID p) @@ -335,31 +335,27 @@ static DWORD CALLBACK host_object_proc(LPVOID p) return hr; } -static DWORD start_host_object2(IStream *stream, REFIID riid, IUnknown *object, MSHLFLAGS marshal_flags, IMessageFilter *filter, HANDLE *thread) +static DWORD start_host_object2(struct host_object_data *object_data, HANDLE *thread) { DWORD tid = 0; - HANDLE marshal_event = CreateEventA(NULL, FALSE, FALSE, NULL); - struct host_object_data *data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data)); - - data->stream = stream; - data->iid = *riid; - data->object = object; - data->marshal_flags = marshal_flags; - data->marshal_event = marshal_event; - data->filter = filter; + struct host_object_data *data; + data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data)); + *data = *object_data; + data->marshal_event = CreateEventA(NULL, FALSE, FALSE, NULL); *thread = CreateThread(NULL, 0, host_object_proc, data, 0, &tid); /* wait for marshaling to complete before returning */ - ok( !WaitForSingleObject(marshal_event, 10000), "wait timed out\n" ); - CloseHandle(marshal_event); + ok( !WaitForSingleObject(data->marshal_event, 10000), "wait timed out\n" ); + CloseHandle(data->marshal_event); return tid; } static DWORD start_host_object(IStream *stream, REFIID riid, IUnknown *object, MSHLFLAGS marshal_flags, HANDLE *thread) { - return start_host_object2(stream, riid, object, marshal_flags, NULL, thread); + struct host_object_data object_data = { stream, *riid, object, marshal_flags }; + return start_host_object2(&object_data, thread); } /* asks thread to release the marshal data because it has to be done by the @@ -1965,25 +1961,27 @@ static IMessageFilter MessageFilter = { &MessageFilter_Vtbl }; static void test_message_filter(void) { HRESULT hr; - IStream *pStream = NULL; IClassFactory *cf = NULL; DWORD tid; IUnknown *proxy = NULL; IMessageFilter *prev_filter = NULL; HANDLE thread; + struct host_object_data object_data = { NULL, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, + MSHLFLAGS_NORMAL, &MessageFilter }; + cLocks = 0; - hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + hr = CreateStreamOnHGlobal(NULL, TRUE, &object_data.stream); ok_ole_success(hr, CreateStreamOnHGlobal); - tid = start_host_object2(pStream, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter, &thread); + tid = start_host_object2(&object_data, &thread); ok_more_than_one_lock(); - IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); - hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&cf); + IStream_Seek(object_data.stream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(object_data.stream, &IID_IClassFactory, (void **)&cf); ok_ole_success(hr, CoUnmarshalInterface); - IStream_Release(pStream); + IStream_Release(object_data.stream); ok_more_than_one_lock(); @@ -3855,13 +3853,15 @@ static IChannelHook TestChannelHook = { &TestChannelHookVtbl }; static void test_channel_hook(void) { - IStream *pStream = NULL; IClassFactory *cf = NULL; DWORD tid; IUnknown *proxy = NULL; HANDLE thread; HRESULT hr; + struct host_object_data object_data = { NULL, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, + MSHLFLAGS_NORMAL, &MessageFilter }; + hr = CoRegisterChannelHook(&EXTENTID_WineTest, &TestChannelHook); ok_ole_success(hr, CoRegisterChannelHook); @@ -3870,17 +3870,17 @@ static void test_channel_hook(void) cLocks = 0; - hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + hr = CreateStreamOnHGlobal(NULL, TRUE, &object_data.stream); ok_ole_success(hr, CreateStreamOnHGlobal); - tid = start_host_object2(pStream, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter, &thread); + tid = start_host_object2(&object_data, &thread); server_tid = tid; ok_more_than_one_lock(); - IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); - hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&cf); + IStream_Seek(object_data.stream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(object_data.stream, &IID_IClassFactory, (void **)&cf); ok_ole_success(hr, CoUnmarshalInterface); - IStream_Release(pStream); + IStream_Release(object_data.stream); ok_more_than_one_lock();

1 0

Akihiro Sagawa : winmm: Add playing status to MIDI stream structure and use it.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: b70f0d723a768b9fdc89cd835b23718f6cd61f31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b70f0d723a768b9fdc89cd83… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon May 21 21:36:12 2018 +0900 winmm: Add playing status to MIDI stream structure and use it. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/winmm.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 0933f03..da87be2 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -919,6 +919,7 @@ typedef struct WINE_MIDIStream { DWORD dwPulses; DWORD dwStartTicks; WORD wFlags; + WORD status; HANDLE hEvent; LPMIDIHDR lpMidiHdr; } WINE_MIDIStream; @@ -928,6 +929,10 @@ typedef struct WINE_MIDIStream { #define WINE_MSM_PAUSE (WM_USER+2) #define WINE_MSM_RESUME (WM_USER+3) +#define MSM_STATUS_STOPPED WINE_MSM_STOP +#define MSM_STATUS_PAUSED WINE_MSM_PAUSE +#define MSM_STATUS_PLAYING WINE_MSM_RESUME + /************************************************************************** * MMSYSTEM_GetMidiStream [internal] */ @@ -976,7 +981,6 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI LPMIDIHDR lpMidiHdr; LPMIDIHDR* lpmh; LPBYTE lpData; - BOOL paused = FALSE; for (;;) { switch (msg->message) { @@ -984,6 +988,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI return FALSE; case WINE_MSM_STOP: TRACE("STOP\n"); + lpMidiStrm->status = MSM_STATUS_STOPPED; /* this is not quite what MS doc says... */ midiOutReset(lpMidiStrm->hDevice); /* empty list of already submitted buffers */ @@ -1003,10 +1008,11 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI case WINE_MSM_RESUME: /* FIXME: send out cc64 0 (turn off sustain pedal) on every channel */ lpMidiStrm->dwStartTicks = GetTickCount() - lpMidiStrm->dwPositionMS; + lpMidiStrm->status = MSM_STATUS_PLAYING; return TRUE; case WINE_MSM_PAUSE: /* FIXME: send out cc64 0 (turn off sustain pedal) on every channel */ - paused = TRUE; + lpMidiStrm->status = MSM_STATUS_PAUSED; break; /* FIXME(EPP): "I don't understand the content of the first MIDIHDR sent * by native mcimidi, it doesn't look like a correct one". @@ -1087,7 +1093,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI FIXME("Unknown message %d\n", msg->message); break; } - if (!paused) + if (lpMidiStrm->status != MSM_STATUS_PAUSED) return TRUE; GetMessageA(msg, 0, 0, 0); } @@ -1292,6 +1298,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, lpMidiStrm->dwTempo = 500000; /* micro seconds per quarter note, i.e. 120 BPM */ lpMidiStrm->dwTimeDiv = 24; /* ticks per quarter note */ lpMidiStrm->dwPositionMS = 0; + lpMidiStrm->status = MSM_STATUS_PAUSED; mosm.dwStreamID = (DWORD)lpMidiStrm; /* FIXME: the correct value is not allocated yet for MAPPER */ @@ -1332,8 +1339,6 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, /* wait for thread to have started, and for its queue to be created */ WaitForSingleObject(lpMidiStrm->hEvent, INFINITE); - PostThreadMessageA(lpMidiStrm->dwThreadID, WINE_MSM_PAUSE, 0, 0); - TRACE("=> (%u/%d) hMidi=%p ret=%d lpMidiStrm=%p\n", *lpuDeviceID, lpwm->mld.uDeviceID, *lphMidiStrm, ret, lpMidiStrm);

1 0

Akihiro Sagawa : winmm: Protect MIDI stream info with critical section.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: 169d657d78206304005d6d02dbd45b3f73493f90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=169d657d78206304005d6d02… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon May 21 21:36:10 2018 +0900 winmm: Protect MIDI stream info with critical section. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/winmm.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index e0a2360..0933f03 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -912,6 +912,7 @@ typedef struct WINE_MIDIStream { HMIDIOUT hDevice; HANDLE hThread; DWORD dwThreadID; + CRITICAL_SECTION lock; DWORD dwTempo; DWORD dwTimeDiv; DWORD dwPositionMS; @@ -1140,8 +1141,10 @@ start_header: /* do we have to wait ? */ if (me->dwDeltaTime) { + EnterCriticalSection(&lpMidiStrm->lock); lpMidiStrm->dwPositionMS += MMSYSTEM_MidiStream_Convert(lpMidiStrm, me->dwDeltaTime); lpMidiStrm->dwPulses += me->dwDeltaTime; + LeaveCriticalSection(&lpMidiStrm->lock); dwToGo = lpMidiStrm->dwStartTicks + lpMidiStrm->dwPositionMS; @@ -1185,7 +1188,9 @@ start_header: midiOutShortMsg(lpMidiStrm->hDevice, MEVT_EVENTPARM(me->dwEvent)); break; case MEVT_TEMPO: + EnterCriticalSection(&lpMidiStrm->lock); lpMidiStrm->dwTempo = MEVT_EVENTPARM(me->dwEvent); + LeaveCriticalSection(&lpMidiStrm->lock); break; case MEVT_VERSION: break; @@ -1248,8 +1253,11 @@ MMRESULT WINAPI midiStreamClose(HMIDISTRM hMidiStrm) DriverCallback(lpwm->mod.dwCallback, lpMidiStrm->wFlags, (HDRVR)lpMidiStrm->hDevice, MM_MOM_CLOSE, lpwm->mod.dwInstance, 0, 0); - if(!ret) + if(!ret) { + lpMidiStrm->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&lpMidiStrm->lock); HeapFree(GetProcessHeap(), 0, lpMidiStrm); + } return midiOutClose((HMIDIOUT)hMidiStrm); } @@ -1306,6 +1314,9 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, return ret; } + InitializeCriticalSection(&lpMidiStrm->lock); + lpMidiStrm->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINMM_MidiStream.lock"); + lpMidiStrm->hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); lpMidiStrm->wFlags = HIWORD(fdwOpen); @@ -1402,6 +1413,7 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm } else if (lpMMT == NULL || cbmmt != sizeof(MMTIME)) { ret = MMSYSERR_INVALPARAM; } else { + EnterCriticalSection(&lpMidiStrm->lock); switch (lpMMT->wType) { default: FIXME("Unsupported time type %x\n", lpMMT->wType); @@ -1419,6 +1431,7 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm TRACE("=> %d ticks\n", lpMMT->u.ticks); break; } + LeaveCriticalSection(&lpMidiStrm->lock); } return ret; } @@ -1440,6 +1453,7 @@ MMRESULT WINAPI midiStreamProperty(HMIDISTRM hMidiStrm, LPBYTE lpPropData, DWORD } else if (dwProperty & MIDIPROP_TEMPO) { MIDIPROPTEMPO* mpt = (MIDIPROPTEMPO*)lpPropData; + EnterCriticalSection(&lpMidiStrm->lock); if (sizeof(MIDIPROPTEMPO) != mpt->cbStruct) { ret = MMSYSERR_INVALPARAM; } else if (dwProperty & MIDIPROP_SET) { @@ -1449,13 +1463,16 @@ MMRESULT WINAPI midiStreamProperty(HMIDISTRM hMidiStrm, LPBYTE lpPropData, DWORD mpt->dwTempo = lpMidiStrm->dwTempo; TRACE("Getting tempo <= %d\n", mpt->dwTempo); } + LeaveCriticalSection(&lpMidiStrm->lock); } else if (dwProperty & MIDIPROP_TIMEDIV) { MIDIPROPTIMEDIV* mptd = (MIDIPROPTIMEDIV*)lpPropData; if (sizeof(MIDIPROPTIMEDIV) != mptd->cbStruct) { ret = MMSYSERR_INVALPARAM; } else if (dwProperty & MIDIPROP_SET) { + EnterCriticalSection(&lpMidiStrm->lock); lpMidiStrm->dwTimeDiv = mptd->dwTimeDiv; + LeaveCriticalSection(&lpMidiStrm->lock); TRACE("Setting time div to %d\n", mptd->dwTimeDiv); } else if (dwProperty & MIDIPROP_GET) { mptd->dwTimeDiv = lpMidiStrm->dwTimeDiv;

1 0

Akihiro Sagawa : winmm/tests: Add tests regarding MIDI stream player clocks and positions.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: 70e541a693f538a952a287470b54070df6cef273 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70e541a693f538a952a28747… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon May 21 21:36:09 2018 +0900 winmm/tests: Add tests regarding MIDI stream player clocks and positions. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/midi.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index b62b461..c78e465 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -19,6 +19,8 @@ */ #include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <stddef.h> #include "windows.h" #include "mmsystem.h" @@ -531,6 +533,51 @@ static MIDISHORTEVENT strmNops[] = { /* Test callback + dwOffset */ { 0, 0, (MEVT_NOP <<24)| MEVT_F_CALLBACK }, }; +static MIDISHORTEVENT strmNopsWithDelta[] = { + { 0, 0, (MEVT_NOP <<24)| MEVT_F_CALLBACK }, + { 12, 0, (MEVT_NOP <<24)| MEVT_F_CALLBACK }, +}; + +struct time_stamp_records { + UINT count; + DWORD time_stamp[2]; + HANDLE done; +}; + +static void CALLBACK time_stamp_callback(HMIDIOUT hmo, UINT msg, DWORD_PTR instance, DWORD_PTR p1, DWORD_PTR p2) +{ + struct time_stamp_records *records = (struct time_stamp_records *)instance; + switch (msg) { + case MM_MOM_POSITIONCB: + if (records->count < sizeof(records->time_stamp)/sizeof(records->time_stamp[0])) + records->time_stamp[records->count] = GetTickCount(); + records->count++; + break; + case MM_MOM_DONE: + SetEvent(records->done); + break; + } +} + +static DWORD get_position(HMIDISTRM hm, UINT type) +{ + MMRESULT rc; + MMTIME mmtime; + mmtime.wType = type; + rc = midiStreamPosition(hm, &mmtime, sizeof(mmtime)); + if (rc != MMSYSERR_NOERROR || mmtime.wType != type) + return MAXDWORD; + + switch (mmtime.wType) { + case TIME_MS: + return mmtime.u.ms; + case TIME_TICKS: + return mmtime.u.ticks; + default: + return MAXDWORD; + } +} + static MMRESULT playStream(HMIDISTRM hm, LPMIDIHDR lpMidiHdr) { MMRESULT rc = midiStreamOut(hm, lpMidiHdr, sizeof(MIDIHDR)); @@ -549,6 +596,9 @@ static void test_midiStream(UINT udev, HWND hwnd) MIDIPROPTEMPO tempo; MIDIPROPTIMEDIV tdiv; } midiprop; + DWORD diff, expected, ret; + const DWORD MARGIN = 50; + struct time_stamp_records records; MIDIOUTCAPSA capsA; if (hwnd) @@ -786,6 +836,100 @@ static void test_midiStream(UINT udev, HWND hwnd) ok(!rc, "midiStreamClose rc=%s\n", mmsys_error(rc)); } + /* Test the player time clock and positions */ + memset(&records, 0, sizeof(records)); + records.done = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(records.done != NULL, "CreateEvent failed (dev=%d)\n", udev); + + rc = midiStreamOpen(&hm, &udev, 1, (DWORD_PTR)time_stamp_callback, (DWORD_PTR)&records, CALLBACK_FUNCTION); + ok(!rc, "midiStreamOpen(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + expected = 0; + ret = get_position(hm, TIME_MS); + ok(ret == expected, "expected %u, got %u\n", expected, ret); + + memset(&mhdr, 0, sizeof(mhdr)); + mhdr.lpData = (LPSTR)strmNopsWithDelta; + mhdr.dwBytesRecorded = mhdr.dwBufferLength = sizeof(strmNopsWithDelta); + rc = midiOutPrepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutPrepareHeader(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + rc = midiStreamOut(hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiStreamOut(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + ret = get_position(hm, TIME_MS); + ok(ret == expected, "expected %u, got %u\n", expected, ret); + + rc = midiStreamRestart(hm); + ok(!rc, "midiStreamRestart(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + Sleep(50); + + rc = midiStreamPause(hm); + ok(!rc, "midiStreamPause(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + expected = 50; + ret = get_position(hm, TIME_MS); + todo_wine ok(ret >= expected && ret < expected + MARGIN, "expected %ums or greater, got %ums\n", expected, ret); + expected = ret; + + Sleep(100); + + ret = get_position(hm, TIME_MS); + ok(ret == expected, "expected %ums, got %ums\n", expected, ret); + + rc = midiStreamRestart(hm); + ok(!rc, "midiStreamRestart(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + Sleep(1); + ret = get_position(hm, TIME_MS); + todo_wine ok(ret > expected && ret < expected + MARGIN, "expected greater than %ums, got %ums\n", expected, ret); + expected = ret; + + ret = WaitForSingleObject(records.done, INFINITE); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed, got %d\n", ret); + + rc = midiStreamPause(hm); + ok(!rc, "midiStreamPause(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + expected = 250; /* = 12 ticks in 120 BPM */ + ret = get_position(hm, TIME_MS); + ok(ret >= expected - MARGIN && ret <= expected + MARGIN, + "expected greater than %ums, got %ums\n", expected, ret); + trace("after playing, got %ums\n", ret); + + /* set tempo to 240 BPM */ + midiprop.tempo.cbStruct = sizeof(midiprop.tempo); + midiprop.tempo.dwTempo = 250000; + rc = midiStreamProperty(hm, (void*)&midiprop, MIDIPROP_SET | MIDIPROP_TEMPO); + ok(!rc, "midiStreamProperty(SET|TEMPO, dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + /* a tempo change doesn't affect elapsed ticks */ + ret = get_position(hm, TIME_TICKS); + ok(ret >= strmNopsWithDelta[1].dwDeltaTime && ret < strmNopsWithDelta[1].dwDeltaTime + 3, + "expected %u ticks, got %u\n", strmNopsWithDelta[1].dwDeltaTime, ret); + + ok(records.count == 2, "expected 2 MM_MOM_DONE messages, got %d\n", records.count); + + /* Time between midiStreamPause and midiStreamRestart isn't counted. + So, the second event happens at dwDeltaTime(250ms) + 100ms after the first event. */ + expected = 250 + 100; + diff = records.time_stamp[1] - records.time_stamp[0]; + todo_wine ok(diff >= expected - MARGIN && diff <= expected + MARGIN, + "expected %u ~ %ums, got %ums (dev=%d)\n", expected - MARGIN, expected + MARGIN, diff, udev); + + rc = midiOutUnprepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); + ok(!rc, "midiOutUnprepareHeader(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + rc = midiStreamStop(hm); + ok(!rc, "midiStreamStop(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + ret = get_position(hm, TIME_MS); + todo_wine ok(ret == 0, "expected 0ms, got %ums\n", ret); + + rc = midiStreamClose(hm); + ok(!rc, "midiStreamClose(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + CloseHandle(records.done); + rc = midiOutGetDevCapsA((UINT_PTR)udev, &capsA, sizeof(capsA)); ok(!rc, "midiOutGetDevCaps(dev=%d) rc=%s\n", udev, mmsys_error(rc)); if (!strncmp(capsA.szPname, fluidsynth_prefix, strlen(fluidsynth_prefix)) ||

1 0

Nikolay Sivov : include: Update with latest DirectWrite API additions.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: da705e5e53f2c3f87b47e786ce4a797c8d6f132e URL: https://source.winehq.org/git/wine.git/?a=commit;h=da705e5e53f2c3f87b47e786… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 24 16:58:50 2018 +0300 include: Update with latest DirectWrite API additions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite_3.idl | 376 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 360 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da705e5e53f2c3f87b47…

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2018