March 2021 - Wine-Commits - list.winehq.org

Jacek Caban : include: Add UAS_EXACTLEGACY define.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: 5d11104689c6e0b21a13e450b9a04c89e1ea47e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d11104689c6e0b21a13e450… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 26 16:33:40 2021 +0100 include: Add UAS_EXACTLEGACY define. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/session.c | 4 ++-- dlls/urlmon/tests/misc.c | 4 ++-- include/urlmon.idl | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 3a843cd6593..0596c1df75f 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -514,8 +514,8 @@ static size_t obtain_user_agent(unsigned int version, WCHAR *ret, size_t size) size_t len = 0; HKEY key; - if(version & 0x1000) { - version &= ~0x1000; + if(version & UAS_EXACTLEGACY) { + version &= ~UAS_EXACTLEGACY; if(version == 7) quirks = TRUE; else diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index d64dcc5965d..2b3df65d5fc 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1515,7 +1515,7 @@ static void test_user_agent(void) if (i != 7) { size = sizeof(ua); - hres = pObtainUserAgentString(i | 0x1000, ua, &size); + hres = pObtainUserAgentString(i | UAS_EXACTLEGACY, ua, &size); ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); ok(size == strlen(ua) + 1, "unexpected size %u, expected %u\n", size, strlen(ua) + 1); ok(!strcmp(ua, str2), "unexpected UA for version %u %s, expected %s\n", @@ -1523,7 +1523,7 @@ static void test_user_agent(void) } size = sizeof(ua); - hres = pObtainUserAgentString(i != 1 ? i : 0x1007, ua, &size); + hres = pObtainUserAgentString(i != 1 ? i : UAS_EXACTLEGACY | 7, ua, &size); ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); ok(size == strlen(ua) + 1, "unexpected size %u, expected %u\n", size, strlen(ua) + 1); if(i < 8 && i != 1) diff --git a/include/urlmon.idl b/include/urlmon.idl index fd8d6ce7bc8..867d3ebc959 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -2113,6 +2113,8 @@ struct CONFIRMSAFETY DWORD dwFlags; }; +cpp_quote("#define UAS_EXACTLEGACY 0x1000") + cpp_quote("EXTERN_C const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY;") cpp_quote("DEFINE_GUID(CLSID_InternetSecurityManager, 0x7b8a2d94, 0x0ac9, 0x11d1, 0x89, 0x6c, 0x00, 0xc0, 0x4f, 0xB6, 0xbf, 0xc4);")

1 0

Jacek Caban : urlmon: Fix user agent suffix separator handling.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: c034da78df60c81edc9b2f91c8e13b5744b5dadc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c034da78df60c81edc9b2f91… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 26 16:33:20 2021 +0100 urlmon: Fix user agent suffix separator handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/session.c | 19 +++++++++---------- dlls/urlmon/tests/misc.c | 3 +++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 0a1be0ba367..3a843cd6593 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -550,22 +550,22 @@ static size_t obtain_user_agent(unsigned int version, WCHAR *ret, size_t size) if(sizeof(void*) == 8) #ifdef __x86_64__ - os_type = L"Win64; x64; "; + os_type = L"; Win64; x64"; #else - os_type = L"Win64; "; + os_type = L"; Win64"; #endif else if(IsWow64Process(GetCurrentProcess(), &is_wow) && is_wow) - os_type = L"WOW64; "; + os_type = L"; WOW64"; else os_type = L""; - swprintf(ret + len, size - len, L"Windows %s%d.%d; %s", is_nt, info.dwMajorVersion, + swprintf(ret + len, size - len, L"Windows %s%d.%d%s", is_nt, info.dwMajorVersion, info.dwMinorVersion, os_type); len = lstrlenW(ret); if(!quirks) { - wcscpy(ret + len, L"Trident/7.0"); - len += ARRAY_SIZE(L"Trident/7.0") - 1; + wcscpy(ret + len, L"; Trident/7.0"); + len += ARRAY_SIZE(L"; Trident/7.0") - 1; } if(version < 9) { @@ -575,10 +575,9 @@ static size_t obtain_user_agent(unsigned int version, WCHAR *ret, size_t size) DWORD value_len, idx; for(idx = 0;; idx++) { - if(idx) { - ret[len++] = ';'; - ret[len++] = ' '; - } + ret[len++] = ';'; + ret[len++] = ' '; + value_len = size - len - 2; res = RegEnumValueW(key, idx, ret + len, &value_len, NULL, NULL, NULL, NULL); if(res != ERROR_SUCCESS) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 5f468b80286..d64dcc5965d 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1560,6 +1560,9 @@ static void test_user_agent(void) if(i == 11) { p += check_prefix(p, "; rv:11.0) like Gecko"); }else { + if(i != 1) + ok(*p == ';' || *p == ')', "unexpected suffix %s for version %u\n", + wine_dbgstr_a(p), i); if(i < 9) p = strchr(p, ')'); p += check_prefix(p, ")");

1 0

Erich E. Hoover : mountmgr.sys: Move query_unix_drive to drive.c.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: 5a6c82e9e379ea301ec174dfc56fdfc844f9913d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a6c82e9e379ea301ec174df… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Sun Feb 28 11:15:30 2021 -0700 mountmgr.sys: Move query_unix_drive to drive.c. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 100 ++++++++++++++++++++++++++++++++++++++++--- dlls/mountmgr.sys/mountmgr.c | 91 --------------------------------------- dlls/mountmgr.sys/mountmgr.h | 7 +-- 3 files changed, 97 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5a6c82e9e379ea301ec1…

1 0

Huw Davies : riched20: Remove the windows from the editor structure.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: cc3a86d86b527d354b52e5645769cd94560577fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc3a86d86b527d354b52e564… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 26 09:08:05 2021 +0000 riched20: Remove the windows from the editor structure. This in turn allows removal of the editor from the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 2 -- dlls/riched20/editor.h | 2 +- dlls/riched20/editstr.h | 1 - dlls/riched20/txthost.c | 7 +------ dlls/riched20/txtsrv.c | 6 ++---- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4ac78f3d3cb..28b5cb1512d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2933,8 +2933,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) LONG selbarwidth; HRESULT hr; - ed->hWnd = NULL; - ed->hwndParent = NULL; ed->sizeWindow.cx = ed->sizeWindow.cy = 0; if (ITextHost_QueryInterface( texthost, &IID_ITextHost2, (void **)&ed->texthost ) == S_OK) { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e923f35ed94..7a79df83c99 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -395,7 +395,7 @@ BOOL ME_Redo(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_EmptyUndoStack(ME_TextEditor *editor) DECLSPEC_HIDDEN; /* txtsrv.c */ -HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown **unk, BOOL emulate_10, ME_TextEditor **editor ) DECLSPEC_HIDDEN; +HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown **unk, BOOL emulate_10 ) DECLSPEC_HIDDEN; #ifdef __ASM_USE_THISCALL_WRAPPER extern const struct ITextServicesVtbl text_services_stdcall_vtbl DECLSPEC_HIDDEN; #define TXTSERV_VTABLE(This) (&text_services_stdcall_vtbl) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index ffafa794015..86b3f0196c7 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -377,7 +377,6 @@ typedef struct tagME_InStream ME_InStream; typedef struct tagME_TextEditor { - HWND hWnd, hwndParent; ITextHost2 *texthost; IUnknown *reOle; unsigned int bEmulateVersion10 : 1; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index c220fe5ec57..a7b91716dab 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -36,7 +36,6 @@ struct host ITextHost2 ITextHost_iface; LONG ref; ITextServices *text_srv; - ME_TextEditor *editor; /* to be removed */ HWND window, parent; unsigned int emulate_10 : 1; unsigned int dialog_mode : 1; @@ -112,7 +111,6 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) texthost->para_fmt.wAlignment = PFA_RIGHT; if (cs->style & ES_CENTER) texthost->para_fmt.wAlignment = PFA_CENTER; - texthost->editor = NULL; host_init_props( texthost ); texthost->event_mask = 0; texthost->use_set_rect = 0; @@ -871,7 +869,7 @@ static BOOL create_windowed_editor( HWND hwnd, CREATESTRUCTW *create, BOOL emula if (!host) return FALSE; - hr = create_text_services( NULL, (ITextHost *)&host->ITextHost_iface, &unk, emulate_10, &host->editor ); + hr = create_text_services( NULL, (ITextHost *)&host->ITextHost_iface, &unk, emulate_10 ); if (FAILED( hr )) { ITextHost2_Release( &host->ITextHost_iface ); @@ -880,9 +878,6 @@ static BOOL create_windowed_editor( HWND hwnd, CREATESTRUCTW *create, BOOL emula IUnknown_QueryInterface( unk, &IID_ITextServices, (void **)&host->text_srv ); IUnknown_Release( unk ); - host->editor->hWnd = hwnd; /* FIXME: Remove editor's dependence on hWnd */ - host->editor->hwndParent = create->hwndParent; - SetWindowLongPtrW( hwnd, 0, (LONG_PTR)host ); return TRUE; diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 4cd19a0d24b..7a979971a0a 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -581,8 +581,7 @@ static const ITextServicesVtbl textservices_vtbl = THISCALL(fnTextSrv_TxGetCachedSize) }; -HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown **unk, BOOL emulate_10, - ME_TextEditor **editor ) +HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown **unk, BOOL emulate_10 ) { struct text_services *services; @@ -595,7 +594,6 @@ HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown ** services->IUnknown_inner.lpVtbl = &textservices_inner_vtbl; services->ITextServices_iface.lpVtbl = &textservices_vtbl; services->editor = ME_MakeEditor( text_host, emulate_10 ); - if (editor) *editor = services->editor; /* To be removed */ if (outer) services->outer_unk = outer; else services->outer_unk = &services->IUnknown_inner; @@ -609,5 +607,5 @@ HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown ** */ HRESULT WINAPI CreateTextServices( IUnknown *outer, ITextHost *text_host, IUnknown **unk ) { - return create_text_services( outer, text_host, unk, FALSE, NULL ); + return create_text_services( outer, text_host, unk, FALSE ); }

1 0

Giovanni Mascellani : winegstreamer: Implement a stub IMFGetService for the media source.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: 0a0bf3cf21c5d08d9aa1873cd20da71e224c6aba URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a0bf3cf21c5d08d9aa1873c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Mar 26 09:25:27 2021 +0100 winegstreamer: Implement a stub IMFGetService for the media source. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 2 +- dlls/winegstreamer/media_source.c | 44 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 103441be14c..6084d5131aa 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -757,8 +757,8 @@ static void test_source_resolver(void) ok(mediasource != NULL, "got %p\n", mediasource); ok(obj_type == MF_OBJECT_MEDIASOURCE, "got %d\n", obj_type); -todo_wine { check_interface(mediasource, &IID_IMFGetService, TRUE); +todo_wine { check_service_interface(mediasource, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); check_service_interface(mediasource, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, TRUE); } diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 589e894db2e..f795932e966 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -78,6 +78,7 @@ struct source_async_command struct media_source { IMFMediaSource IMFMediaSource_iface; + IMFGetService IMFGetService_iface; IMFAsyncCallback async_commands_callback; LONG ref; DWORD async_commands_queue; @@ -113,6 +114,11 @@ static inline struct media_source *impl_from_IMFMediaSource(IMFMediaSource *ifac return CONTAINING_RECORD(iface, struct media_source, IMFMediaSource_iface); } +static inline struct media_source *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct media_source, IMFGetService_iface); +} + static inline struct media_source *impl_from_async_commands_callback_IMFAsyncCallback(IMFAsyncCallback *iface) { return CONTAINING_RECORD(iface, struct media_source, async_commands_callback); @@ -823,6 +829,39 @@ done: return hr; } +static HRESULT WINAPI media_source_get_service_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct media_source *source = impl_from_IMFGetService(iface); + return IMFMediaSource_QueryInterface(&source->IMFMediaSource_iface, riid, obj); +} + +static ULONG WINAPI media_source_get_service_AddRef(IMFGetService *iface) +{ + struct media_source *source = impl_from_IMFGetService(iface); + return IMFMediaSource_AddRef(&source->IMFMediaSource_iface); +} + +static ULONG WINAPI media_source_get_service_Release(IMFGetService *iface) +{ + struct media_source *source = impl_from_IMFGetService(iface); + return IMFMediaSource_Release(&source->IMFMediaSource_iface); +} + +static HRESULT WINAPI media_source_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + FIXME("stub %p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + return E_NOINTERFACE; +} + +static const IMFGetServiceVtbl media_source_get_service_vtbl = +{ + media_source_get_service_QueryInterface, + media_source_get_service_AddRef, + media_source_get_service_Release, + media_source_get_service_GetService, +}; + static HRESULT WINAPI media_source_QueryInterface(IMFMediaSource *iface, REFIID riid, void **out) { struct media_source *source = impl_from_IMFMediaSource(iface); @@ -835,6 +874,10 @@ static HRESULT WINAPI media_source_QueryInterface(IMFMediaSource *iface, REFIID { *out = &source->IMFMediaSource_iface; } + else if (IsEqualIID(riid, &IID_IMFGetService)) + { + *out = &source->IMFGetService_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -1094,6 +1137,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ return E_OUTOFMEMORY; object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; + object->IMFGetService_iface.lpVtbl = &media_source_get_service_vtbl; object->async_commands_callback.lpVtbl = &source_async_commands_callback_vtbl; object->ref = 1; object->byte_stream = bytestream;

1 0

Alistair Leslie-Hughes : msado15: Implement _Recordset get/put Bookmark.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: db509cf4fe862ed13beccd0d281b854aa905a45e URL: https://source.winehq.org/git/wine.git/?a=commit;h=db509cf4fe862ed13beccd0d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 26 08:09:17 2021 +1100 msado15: Implement _Recordset get/put Bookmark. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 22 ++++++++++++++++++---- dlls/msado15/tests/msado15.c | 17 +++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index a86936eb037..68d4c22d802 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1029,14 +1029,28 @@ static HRESULT WINAPI recordset_get_BOF( _Recordset *iface, VARIANT_BOOL *bof ) static HRESULT WINAPI recordset_get_Bookmark( _Recordset *iface, VARIANT *bookmark ) { - FIXME( "%p, %p\n", iface, bookmark ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", iface, bookmark ); + + if (recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (recordset->index < 0) return MAKE_ADO_HRESULT( adErrNoCurrentRecord ); + + V_VT(bookmark) = VT_I4; + V_I4(bookmark) = recordset->index; + return S_OK; } static HRESULT WINAPI recordset_put_Bookmark( _Recordset *iface, VARIANT bookmark ) { - FIXME( "%p, %s\n", iface, debugstr_variant(&bookmark) ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %s\n", iface, debugstr_variant(&bookmark) ); + + if (recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + if (V_VT(&bookmark) != VT_I4) return MAKE_ADO_HRESULT( adErrInvalidArgument ); + + recordset->index = V_I4(&bookmark); + return S_OK; } static HRESULT WINAPI recordset_get_CacheSize( _Recordset *iface, LONG *size ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index bc9b4a24761..db606f21fab 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -74,6 +74,7 @@ static void test_Recordset(void) CursorTypeEnum cursor; BSTR name; HRESULT hr; + VARIANT bookmark; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08x\n", hr ); @@ -153,6 +154,14 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( cursor == adOpenForwardOnly, "got %d\n", cursor ); + VariantInit( &bookmark ); + hr = _Recordset_get_Bookmark( recordset, &bookmark ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + + VariantInit( &bookmark ); + hr = _Recordset_put_Bookmark( recordset, bookmark ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + VariantInit( &missing ); hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); @@ -188,6 +197,14 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( state == adStateOpen, "got %d\n", state ); + VariantInit( &bookmark ); + hr = _Recordset_get_Bookmark( recordset, &bookmark ); + ok( hr == MAKE_ADO_HRESULT( adErrNoCurrentRecord ), "got %08x\n", hr ); + + VariantInit( &bookmark ); + hr = _Recordset_put_Bookmark( recordset, bookmark ); + ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr ); + count = -1; hr = _Recordset_get_RecordCount( recordset, &count ); ok( hr == S_OK, "got %08x\n", hr );

1 0

Nikolay Sivov : mfreadwrite/reader: Use shared multi-threaded queue internally.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: 657a76ce2337e523c4f3c35e73aaf92c1f0969d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=657a76ce2337e523c4f3c35e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 26 11:23:21 2021 +0300 mfreadwrite/reader: Use shared multi-threaded queue internally. Using dedicated queue prevents potential lockups with event queue, specifically when waiting on event queue for seek to finish blocks events delivery. The issue was diagnosed by Giovanni. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index ab9f6c83674..d3df7abd9fc 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -195,6 +195,7 @@ struct source_reader unsigned int last_read_index; unsigned int stream_count; unsigned int flags; + unsigned int queue; enum media_source_state source_state; struct media_stream *streams; struct list responses; @@ -384,8 +385,7 @@ static void source_reader_response_ready(struct source_reader *reader, struct st if (SUCCEEDED(source_reader_create_async_op(SOURCE_READER_ASYNC_SAMPLE_READY, &command))) { command->u.sample.stream_index = stream->index; - if (FAILED(hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &reader->async_commands_callback, - &command->IUnknown_iface))) + if (FAILED(hr = MFPutWorkItem(reader->queue, &reader->async_commands_callback, &command->IUnknown_iface))) WARN("Failed to submit async result, hr %#x.\n", hr); IUnknown_Release(&command->IUnknown_iface); } @@ -1396,6 +1396,7 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) } source_reader_release_responses(reader, NULL); heap_free(reader->streams); + MFUnlockWorkQueue(reader->queue); DeleteCriticalSection(&reader->cs); heap_free(reader); } @@ -1873,8 +1874,7 @@ static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFG command->u.seek.format = *format; PropVariantCopy(&command->u.seek.position, position); - hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_MULTITHREADED, &reader->async_commands_callback, - &command->IUnknown_iface); + hr = MFPutWorkItem(reader->queue, &reader->async_commands_callback, &command->IUnknown_iface); IUnknown_Release(&command->IUnknown_iface); } } @@ -1976,7 +1976,7 @@ static HRESULT source_reader_read_sample_async(struct source_reader *reader, uns command->u.read.stream_index = index; command->u.read.flags = flags; - hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &reader->async_commands_callback, &command->IUnknown_iface); + hr = MFPutWorkItem(reader->queue, &reader->async_commands_callback, &command->IUnknown_iface); IUnknown_Release(&command->IUnknown_iface); } } @@ -2040,7 +2040,7 @@ static HRESULT source_reader_flush_async(struct source_reader *reader, unsigned command->u.flush.stream_index = stream_index; - hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &reader->async_commands_callback, &command->IUnknown_iface); + hr = MFPutWorkItem(reader->queue, &reader->async_commands_callback, &command->IUnknown_iface); IUnknown_Release(&command->IUnknown_iface); return hr; @@ -2265,7 +2265,7 @@ static HRESULT WINAPI stream_sample_allocator_cb_NotifyRelease(IMFVideoSampleAll if (SUCCEEDED(source_reader_create_async_op(SOURCE_READER_ASYNC_SA_READY, &command))) { command->u.sa.stream_index = stream->index; - MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &stream->reader->async_commands_callback, &command->IUnknown_iface); + MFPutWorkItem(stream->reader->queue, &stream->reader->async_commands_callback, &command->IUnknown_iface); IUnknown_Release(&command->IUnknown_iface); } @@ -2406,7 +2406,11 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri } } - hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out); + if (FAILED(hr = MFLockSharedWorkQueue(L"", 0, NULL, &object->queue))) + WARN("Failed to acquired shared queue, hr %#x.\n", hr); + + if (SUCCEEDED(hr)) + hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out); failed: IMFSourceReader_Release(&object->IMFSourceReader_iface);

1 0

Giovanni Mascellani : mfreadwrite: Simplify iteration through streams.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: 06366bd16b82b79b21a698808c6cb3744fbba151 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06366bd16b82b79b21a69880… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Mar 26 09:07:37 2021 +0100 mfreadwrite: Simplify iteration through streams. This also fixes a bug happening when the reader has only one stream, in which case the iteration body was not even executed once. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 14 ++++++------ dlls/mfreadwrite/tests/mfplat.c | 50 +++++++++++++++++++++++++++++++++++------ 2 files changed, 50 insertions(+), 14 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 2819b800eb9..ab9f6c83674 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1087,13 +1087,10 @@ static BOOL source_reader_get_read_result(struct source_reader *reader, struct m static HRESULT source_reader_get_next_selected_stream(struct source_reader *reader, unsigned int *stream_index) { - unsigned int i, start_idx, stop_idx, first_selected = ~0u, requests = ~0u; + unsigned int i, first_selected = ~0u, requests = ~0u; BOOL selected, stream_drained; - start_idx = (reader->last_read_index + 1) % reader->stream_count; - stop_idx = reader->last_read_index == ~0u ? reader->stream_count : reader->last_read_index; - - for (i = start_idx; i < reader->stream_count && i != stop_idx; i = (i + 1) % (reader->stream_count + 1)) + for (i = (reader->last_read_index + 1) % reader->stream_count; ; i = (i + 1) % reader->stream_count) { stream_drained = reader->streams[i].state == STREAM_STATE_EOS && !reader->streams[i].responses; selected = SUCCEEDED(source_reader_get_stream_selection(reader, i, &selected)) && selected; @@ -1110,6 +1107,9 @@ static HRESULT source_reader_get_next_selected_stream(struct source_reader *read *stream_index = i; } } + + if (i == reader->last_read_index) + break; } /* If all selected streams reached EOS, use first selected. */ @@ -1477,7 +1477,7 @@ static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWOR } if (selection_changed) - reader->last_read_index = ~0u; + reader->last_read_index = reader->stream_count - 1; LeaveCriticalSection(&reader->cs); @@ -2360,7 +2360,7 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri /* At least one major type has to be set. */ object->first_audio_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Audio); object->first_video_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Video); - object->last_read_index = ~0u; + object->last_read_index = object->stream_count - 1; if (object->first_audio_stream_index == MF_SOURCE_READER_INVALID_STREAM_INDEX && object->first_video_stream_index == MF_SOURCE_READER_INVALID_STREAM_INDEX) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 25aa29ac272..c27806f699e 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -501,7 +501,7 @@ static struct test_media_stream *create_test_stream(DWORD stream_index, IMFMedia return stream; } -static IMFMediaSource *create_test_source(void) +static IMFMediaSource *create_test_source(int stream_num) { struct test_source *source; int i; @@ -511,7 +511,7 @@ static IMFMediaSource *create_test_source(void) source->refcount = 1; MFCreateEventQueue(&source->event_queue); InitializeCriticalSection(&source->cs); - for (i = 0; i < ARRAY_SIZE(source->streams); ++i) + for (i = 0; i < stream_num; ++i) source->streams[i] = create_test_stream(i, &source->IMFMediaSource_iface); return &source->IMFMediaSource_iface; @@ -904,7 +904,7 @@ static void test_source_reader_from_media_source(void) int i; PROPVARIANT pos; - source = create_test_source(); + source = create_test_source(3); ok(!!source, "Failed to create test source.\n"); hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); @@ -970,8 +970,44 @@ static void test_source_reader_from_media_source(void) IMFSourceReader_Release(reader); IMFMediaSource_Release(source); + source = create_test_source(1); + ok(!!source, "Failed to create test source.\n"); + + hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); + ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr); + + /* MF_SOURCE_READER_ANY_STREAM with a single stream */ + hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); + ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + + pos.vt = VT_I8; + pos.hVal.QuadPart = 0; + hr = IMFSourceReader_SetCurrentPosition(reader, &GUID_NULL, &pos); + ok(hr == S_OK, "Failed to seek to beginning of stream, hr %#x.\n", hr); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, + &timestamp, &sample); + ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); + ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(timestamp == 123, "Unexpected timestamp.\n"); + ok(!!sample, "Expected sample object.\n"); + IMFSample_Release(sample); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, + &timestamp, &sample); + ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); + ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + ok(timestamp == 123, "Unexpected timestamp.\n"); + ok(!!sample, "Expected sample object.\n"); + IMFSample_Release(sample); + + IMFSourceReader_Release(reader); + IMFMediaSource_Release(source); + /* Request from stream 0. */ - source = create_test_source(); + source = create_test_source(3); ok(!!source, "Failed to create test source.\n"); hr = MFCreateSourceReaderFromMediaSource(source, NULL, &reader); @@ -1005,7 +1041,7 @@ static void test_source_reader_from_media_source(void) IMFMediaSource_Release(source); /* Async mode. */ - source = create_test_source(); + source = create_test_source(3); ok(!!source, "Failed to create test source.\n"); callback = create_async_callback(); @@ -1050,7 +1086,7 @@ static void test_source_reader_from_media_source(void) IMFMediaSource_Release(source); /* RequestSample failure. */ - source = create_test_source(); + source = create_test_source(3); ok(!!source, "Failed to create test source.\n"); fail_request_sample = TRUE; @@ -1120,7 +1156,7 @@ static void test_reader_d3d9(void) hr = IDirect3DDeviceManager9_ResetDevice(d3d9_manager, d3d9_device, token); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - source = create_test_source(); + source = create_test_source(3); ok(!!source, "Failed to create test source.\n"); hr = MFCreateAttributes(&attributes, 1);

1 0

Jacek Caban : mmdevapi: Use nameless unions.
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: e636c2a22aee33c19dbe5d5cb3426f5abf7dab5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e636c2a22aee33c19dbe5d5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 21:39:53 2021 +0100 mmdevapi: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/Makefile.in | 1 - dlls/mmdevapi/devenum.c | 52 ++++++++++++++++++++++---------------------- dlls/mmdevapi/spatialaudio.c | 4 ++-- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in index 6ac491f980d..903b14335a9 100644 --- a/dlls/mmdevapi/Makefile.in +++ b/dlls/mmdevapi/Makefile.in @@ -1,6 +1,5 @@ MODULE = mmdevapi.dll IMPORTS = uuid ole32 oleaut32 user32 advapi32 -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 07b4dca028b..fc33cac17ec 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -160,28 +160,28 @@ static HRESULT MMDevice_GetPropValue(const GUID *devguid, DWORD flow, REFPROPERT case REG_SZ: { pv->vt = VT_LPWSTR; - pv->u.pwszVal = CoTaskMemAlloc(size); - if (!pv->u.pwszVal) + pv->pwszVal = CoTaskMemAlloc(size); + if (!pv->pwszVal) hr = E_OUTOFMEMORY; else - RegGetValueW(regkey, NULL, buffer, RRF_RT_REG_SZ, NULL, (BYTE*)pv->u.pwszVal, &size); + RegGetValueW(regkey, NULL, buffer, RRF_RT_REG_SZ, NULL, (BYTE*)pv->pwszVal, &size); break; } case REG_DWORD: { pv->vt = VT_UI4; - RegGetValueW(regkey, NULL, buffer, RRF_RT_REG_DWORD, NULL, (BYTE*)&pv->u.ulVal, &size); + RegGetValueW(regkey, NULL, buffer, RRF_RT_REG_DWORD, NULL, (BYTE*)&pv->ulVal, &size); break; } case REG_BINARY: { pv->vt = VT_BLOB; - pv->u.blob.cbSize = size; - pv->u.blob.pBlobData = CoTaskMemAlloc(size); - if (!pv->u.blob.pBlobData) + pv->blob.cbSize = size; + pv->blob.pBlobData = CoTaskMemAlloc(size); + if (!pv->blob.pBlobData) hr = E_OUTOFMEMORY; else - RegGetValueW(regkey, NULL, buffer, RRF_RT_REG_BINARY, NULL, (BYTE*)pv->u.blob.pBlobData, &size); + RegGetValueW(regkey, NULL, buffer, RRF_RT_REG_BINARY, NULL, (BYTE*)pv->blob.pBlobData, &size); break; } default: @@ -211,19 +211,19 @@ static HRESULT MMDevice_SetPropValue(const GUID *devguid, DWORD flow, REFPROPERT { case VT_UI4: { - ret = RegSetValueExW(regkey, buffer, 0, REG_DWORD, (const BYTE*)&pv->u.ulVal, sizeof(DWORD)); + ret = RegSetValueExW(regkey, buffer, 0, REG_DWORD, (const BYTE*)&pv->ulVal, sizeof(DWORD)); break; } case VT_BLOB: { - ret = RegSetValueExW(regkey, buffer, 0, REG_BINARY, pv->u.blob.pBlobData, pv->u.blob.cbSize); - TRACE("Blob %p %u\n", pv->u.blob.pBlobData, pv->u.blob.cbSize); + ret = RegSetValueExW(regkey, buffer, 0, REG_BINARY, pv->blob.pBlobData, pv->blob.cbSize); + TRACE("Blob %p %u\n", pv->blob.pBlobData, pv->blob.cbSize); break; } case VT_LPWSTR: { - ret = RegSetValueExW(regkey, buffer, 0, REG_SZ, (const BYTE*)pv->u.pwszVal, sizeof(WCHAR)*(1+lstrlenW(pv->u.pwszVal))); + ret = RegSetValueExW(regkey, buffer, 0, REG_SZ, (const BYTE*)pv->pwszVal, sizeof(WCHAR)*(1+lstrlenW(pv->pwszVal))); break; } default: @@ -327,12 +327,12 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st PROPVARIANT pv; pv.vt = VT_LPWSTR; - pv.u.pwszVal = name; + pv.pwszVal = name; MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv); MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_DeviceDesc, &pv); - pv.u.pwszVal = guidstr; + pv.pwszVal = guidstr; MMDevice_SetPropValue(id, flow, &deviceinterface_key, &pv); set_driver_prop_value(id, flow, &devicepath_key); @@ -340,7 +340,7 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st if (FAILED(set_driver_prop_value(id, flow, &PKEY_AudioEndpoint_FormFactor))) { pv.vt = VT_UI4; - pv.u.ulVal = (flow == eCapture) ? Microphone : Speakers; + pv.ulVal = (flow == eCapture) ? Microphone : Speakers; MMDevice_SetPropValue(id, flow, &PKEY_AudioEndpoint_FormFactor, &pv); } @@ -423,12 +423,12 @@ static HRESULT load_devices_from_reg(void) && SUCCEEDED(MMDevice_GetPropValue(&guid, curflow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv)) && pv.vt == VT_LPWSTR) { - DWORD size_bytes = (lstrlenW(pv.u.pwszVal) + 1) * sizeof(WCHAR); + DWORD size_bytes = (lstrlenW(pv.pwszVal) + 1) * sizeof(WCHAR); WCHAR *name = HeapAlloc(GetProcessHeap(), 0, size_bytes); - memcpy(name, pv.u.pwszVal, size_bytes); + memcpy(name, pv.pwszVal, size_bytes); MMDevice_Create(name, &guid, curflow, DEVICE_STATE_NOTPRESENT, FALSE); - CoTaskMemFree(pv.u.pwszVal); + CoTaskMemFree(pv.pwszVal); } } while (1); @@ -455,8 +455,8 @@ static HRESULT set_format(MMDevice *dev) IAudioClient_Release(client); pv.vt = VT_BLOB; - pv.u.blob.cbSize = sizeof(WAVEFORMATEX) + fmt->cbSize; - pv.u.blob.pBlobData = (BYTE*)fmt; + pv.blob.cbSize = sizeof(WAVEFORMATEX) + fmt->cbSize; + pv.blob.pBlobData = (BYTE*)fmt; MMDevice_SetPropValue(&dev->devguid, dev->flow, &PKEY_AudioEngine_DeviceFormat, &pv); MMDevice_SetPropValue(&dev->devguid, dev->flow, @@ -1420,10 +1420,10 @@ static HRESULT WINAPI MMDevPropStore_GetValue(IPropertyStore *iface, REFPROPERTY if (IsEqualPropertyKey(*key, PKEY_AudioEndpoint_GUID)) { pv->vt = VT_LPWSTR; - pv->u.pwszVal = CoTaskMemAlloc(39 * sizeof(WCHAR)); - if (!pv->u.pwszVal) + pv->pwszVal = CoTaskMemAlloc(39 * sizeof(WCHAR)); + if (!pv->pwszVal) return E_OUTOFMEMORY; - StringFromGUID2(&This->parent->devguid, pv->u.pwszVal, 39); + StringFromGUID2(&This->parent->devguid, pv->pwszVal, 39); return S_OK; } @@ -1545,10 +1545,10 @@ static HRESULT WINAPI info_device_ps_GetValue(IPropertyStore *iface, { INT size = (lstrlenW(drvs.module_name) + 1) * sizeof(WCHAR); pv->vt = VT_LPWSTR; - pv->u.pwszVal = CoTaskMemAlloc(size); - if (!pv->u.pwszVal) + pv->pwszVal = CoTaskMemAlloc(size); + if (!pv->pwszVal) return E_OUTOFMEMORY; - memcpy(pv->u.pwszVal, drvs.module_name, size); + memcpy(pv->pwszVal, drvs.module_name, size); return S_OK; } diff --git a/dlls/mmdevapi/spatialaudio.c b/dlls/mmdevapi/spatialaudio.c index 7ec09b663aa..597c2d29933 100644 --- a/dlls/mmdevapi/spatialaudio.c +++ b/dlls/mmdevapi/spatialaudio.c @@ -757,13 +757,13 @@ static HRESULT WINAPI SAC_ActivateSpatialAudioStream(ISpatialAudioClient *iface, if(prop && (prop->vt != VT_BLOB || - prop->u.blob.cbSize != sizeof(SpatialAudioObjectRenderStreamActivationParams))){ + prop->blob.cbSize != sizeof(SpatialAudioObjectRenderStreamActivationParams))){ WARN("Got invalid params\n"); *stream = NULL; return E_INVALIDARG; } - params = (SpatialAudioObjectRenderStreamActivationParams*) prop->u.blob.pBlobData; + params = (SpatialAudioObjectRenderStreamActivationParams*) prop->blob.pBlobData; if(params->StaticObjectTypeMask & AudioObjectType_Dynamic){ *stream = NULL;

1 0

Alexandre Julliard : ntdll: Don't pass the application name to get_load_order().
by Alexandre Julliard March 26, 2021

March 26, 2021

Module: wine Branch: master Commit: e8ec7a8cec819ec40341fdc8b58a759c909979ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8ec7a8cec819ec40341fdc8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 26 16:04:22 2021 +0100 ntdll: Don't pass the application name to get_load_order(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 4 +--- dlls/ntdll/unix/loader.c | 6 +----- dlls/ntdll/unix/loadorder.c | 6 +++++- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unixlib.h | 4 ++-- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 01644df7763..1e89edf3bec 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2691,7 +2691,6 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC DWORD flags, WINE_MODREF** pwm ) { enum loadorder loadorder; - WINE_MODREF *main_exe; UNICODE_STRING nt_name; struct file_id id; HANDLE mapping = 0; @@ -2716,8 +2715,7 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, const WC if (nts && nts != STATUS_DLL_NOT_FOUND && nts != STATUS_INVALID_IMAGE_NOT_MZ) goto done; - main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); - loadorder = unix_funcs->get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, &nt_name ); + loadorder = unix_funcs->get_load_order( &nt_name ); prev = NtCurrentTeb()->Tib.ArbitraryUserPointer; NtCurrentTeb()->Tib.ArbitraryUserPointer = nt_name.Buffer + 4; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index dd966729763..d9db518ee76 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1395,13 +1395,9 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, const WCHAR *filename, UNICODE_STRING nt_name; SECTION_IMAGE_INFORMATION info; enum loadorder loadorder; - const WCHAR *app_name = NULL; - - if (NtCurrentTeb()->Peb->ImageBaseAddress) - app_name = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; init_unicode_string( &nt_name, filename ); - loadorder = get_load_order( app_name, &nt_name ); + loadorder = get_load_order( &nt_name ); if (image_info->image_flags & IMAGE_FLAGS_WineBuiltin) { diff --git a/dlls/ntdll/unix/loadorder.c b/dlls/ntdll/unix/loadorder.c index f7360bdf7e1..67a7473dc7f 100644 --- a/dlls/ntdll/unix/loadorder.c +++ b/dlls/ntdll/unix/loadorder.c @@ -378,15 +378,19 @@ static enum loadorder get_load_order_value( HANDLE std_key, HANDLE app_key, WCHA * Return the loadorder of a module. * The system directory and '.dll' extension is stripped from the path. */ -enum loadorder CDECL get_load_order( const WCHAR *app_name, const UNICODE_STRING *nt_name ) +enum loadorder CDECL get_load_order( const UNICODE_STRING *nt_name ) { static const WCHAR prefixW[] = {'\\','?','?','\\'}; enum loadorder ret = LO_INVALID; HANDLE std_key, app_key = 0; const WCHAR *path = nt_name->Buffer; + const WCHAR *app_name = NULL; WCHAR *module, *basename; int len; + if (NtCurrentTeb()->Peb->ImageBaseAddress) + app_name = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; + if (!init_done) init_load_order(); std_key = get_standard_key(); if (app_name) app_key = get_app_key( app_name ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index c51aee2d8e4..1557aa2371a 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -400,7 +400,7 @@ static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) } #endif -extern enum loadorder CDECL get_load_order( const WCHAR *app_name, const UNICODE_STRING *nt_name ) DECLSPEC_HIDDEN; +extern enum loadorder CDECL get_load_order( const UNICODE_STRING *nt_name ) DECLSPEC_HIDDEN; static inline size_t ntdll_wcslen( const WCHAR *str ) { diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 71cc4177c06..80e4eaefc75 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -37,7 +37,7 @@ enum loadorder }; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 118 +#define NTDLL_UNIXLIB_VERSION 119 struct unix_funcs { @@ -91,7 +91,7 @@ struct unix_funcs NTSTATUS (CDECL *init_unix_lib)( void *module, DWORD reason, const void *ptr_in, void *ptr_out ); NTSTATUS (CDECL *unwind_builtin_dll)( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ); - enum loadorder (CDECL *get_load_order)( const WCHAR *app_name, const UNICODE_STRING *nt_name ); + enum loadorder (CDECL *get_load_order)( const UNICODE_STRING *nt_name ); /* debugging functions */ unsigned char (CDECL *dbg_get_channel_flags)( struct __wine_debug_channel *channel );

1 0