May 2019 - Wine-commits - list.winehq.org

Sven Baars : shell32: Fix an item identifier list leak (Valgrind).
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 0d0fa46553e17efd6f72b25aad3563e8c60b365d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d0fa46553e17efd6f72b25a… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri May 31 20:15:44 2019 +0200 shell32: Fix an item identifier list leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/brsfolder.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 37363a1..d71ec62 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -783,6 +783,8 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) browsefolder_callback( info->lpBrowseInfo, hWnd, BFFM_INITIALIZED, 0 ); + ILFree(computer_pidl); + return TRUE; }

1 0

Sven Baars : shell32/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 4aad5655f249594f7bb92427bdf1138031ba33d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aad5655f249594f7bb92427… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri May 31 20:39:43 2019 +0200 shell32/tests: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index beee31f..87e9141 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3856,6 +3856,8 @@ static void test_ShellItemArrayEnumItems(void) for(i = 0; i < done; i++) ILFree(apidl[i]); } + + IShellFolder_Release(psf); }

1 0

Sven Baars : propsys/tests: Fix the PropVariantToBuffer tests.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 818838b70786b2e81eaddc451873c5837b5ceeb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=818838b70786b2e81eaddc45… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu May 30 11:39:34 2019 +0200 propsys/tests: Fix the PropVariantToBuffer tests. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propsys.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 1be8817..22117b5 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -1525,13 +1525,14 @@ static void test_PropVariantToBuffer(void) hr = SafeArrayAccessData(sa, &pdata); ok(hr == S_OK, "SafeArrayAccessData failed: 0x%08x.\n", hr); memcpy(pdata, data, sizeof(data)); + hr = SafeArrayUnaccessData(sa); + ok(hr == S_OK, "SafeArrayUnaccessData failed: 0x%08x.\n", hr); U(propvar).parray = sa; buffer[0] = 99; hr = PropVariantToBuffer(&propvar, buffer, 11); todo_wine ok(hr == E_FAIL, "PropVariantToBuffer returned: 0x%08x.\n", hr); ok(buffer[0] == 99, "got wrong buffer.\n"); memset(buffer, 0, sizeof(buffer)); - SafeArrayDestroy(sa); PropVariantClear(&propvar); PropVariantInit(&propvar); @@ -1544,12 +1545,13 @@ static void test_PropVariantToBuffer(void) hr = SafeArrayAccessData(sa, &pdata); ok(hr == S_OK, "SafeArrayAccessData failed: 0x%08x.\n", hr); memcpy(pdata, data, sizeof(data)); + hr = SafeArrayUnaccessData(sa); + ok(hr == S_OK, "SafeArrayUnaccessData failed: 0x%08x.\n", hr); U(propvar).parray = sa; hr = PropVariantToBuffer(&propvar, buffer, sizeof(data)); todo_wine ok(hr == S_OK, "PropVariantToBuffer failed: 0x%08x.\n", hr); todo_wine ok(!memcmp(buffer, data, 10) && !buffer[10], "got wrong buffer.\n"); memset(buffer, 0, sizeof(buffer)); - SafeArrayDestroy(sa); PropVariantClear(&propvar); PropVariantInit(&propvar); @@ -1571,10 +1573,11 @@ static void test_PropVariantToBuffer(void) hr = SafeArrayAccessData(sa, &pdata); ok(hr == S_OK, "SafeArrayAccessData failed: 0x%08x.\n", hr); memcpy(pdata, data_int8, sizeof(data_int8)); + hr = SafeArrayUnaccessData(sa); + ok(hr == S_OK, "SafeArrayUnaccessData failed: 0x%08x.\n", hr); U(propvar).parray = sa; hr = PropVariantToBuffer(&propvar, buffer, sizeof(data_int8)); ok(hr == E_INVALIDARG, "PropVariantToBuffer failed: 0x%08x.\n", hr); - SafeArrayDestroy(sa); PropVariantClear(&propvar); }

1 0

Sven Baars : propsys/tests: Fix some ok() messages.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 7117219b3d1aa192260632b529c3641e6ece454e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7117219b3d1aa192260632b5… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu May 30 11:39:35 2019 +0200 propsys/tests: Fix some ok() messages. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propsys.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 22117b5..77ffe05 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -1485,13 +1485,13 @@ static void test_PropVariantToBuffer(void) UINT8 buffer[256]; hr = InitPropVariantFromBuffer(data, 10, &propvar); - ok(hr == S_OK, "InitVariantFromBuffer failed 0x%08x.\n", hr); + ok(hr == S_OK, "InitPropVariantFromBuffer failed 0x%08x.\n", hr); hr = PropVariantToBuffer(&propvar, NULL, 0); /* crash when cb isn't zero */ ok(hr == S_OK, "PropVariantToBuffer failed: 0x%08x.\n", hr); PropVariantClear(&propvar); hr = InitPropVariantFromBuffer(data, 10, &propvar); - ok(hr == S_OK, "InitVariantFromBuffer failed 0x%08x.\n", hr); + ok(hr == S_OK, "InitPropVariantFromBuffer failed 0x%08x.\n", hr); hr = PropVariantToBuffer(&propvar, buffer, 10); ok(hr == S_OK, "PropVariantToBuffer failed: 0x%08x.\n", hr); ok(!memcmp(buffer, data, 10) && !buffer[10], "got wrong buffer.\n"); @@ -1499,7 +1499,7 @@ static void test_PropVariantToBuffer(void) PropVariantClear(&propvar); hr = InitPropVariantFromBuffer(data, 10, &propvar); - ok(hr == S_OK, "InitVariantFromBuffer failed 0x%08x.\n", hr); + ok(hr == S_OK, "InitPropVariantFromBuffer failed 0x%08x.\n", hr); buffer[0] = 99; hr = PropVariantToBuffer(&propvar, buffer, 11); ok(hr == E_FAIL, "PropVariantToBuffer returned: 0x%08x.\n", hr); @@ -1508,7 +1508,7 @@ static void test_PropVariantToBuffer(void) PropVariantClear(&propvar); hr = InitPropVariantFromBuffer(data, 10, &propvar); - ok(hr == S_OK, "InitVariantFromBuffer failed 0x%08x.\n", hr); + ok(hr == S_OK, "InitPropVariantFromBuffer failed 0x%08x.\n", hr); hr = PropVariantToBuffer(&propvar, buffer, 9); ok(hr == S_OK, "PropVariantToBuffer failed: 0x%08x.\n", hr); ok(!memcmp(buffer, data, 9) && !buffer[9], "got wrong buffer.\n");

1 0

Sven Baars : user32: Fix some leaks on error path (Coverity).
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 381c4e7b667555147ef24ee19fff2f766b7303c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=381c4e7b667555147ef24ee1… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri May 31 11:12:18 2019 +0200 user32: Fix some leaks on error path (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 2085fd3..56ea249 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -141,6 +141,8 @@ static void find_hid_devices(void) if (!hid_devices) { ERR("Failed to allocate memory.\n"); + CloseHandle(file); + heap_free(path); goto done; } }

1 0

Zebediah Figura : winegstreamer/gstdemux: Use BaseFilterImpl_QueryInterface().
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: c15b457379d35fb891a6b07306ffc5852ca7d2f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c15b457379d35fb891a6b073… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 30 22:59:35 2019 -0500 winegstreamer/gstdemux: Use BaseFilterImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 64b8dcf..81c6168 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1307,34 +1307,6 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) return obj; } -static HRESULT WINAPI GST_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID *ppv) -{ - GSTImpl *This = impl_from_IBaseFilter(iface); - - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IPersist) || - IsEqualIID(riid, &IID_IMediaFilter) || - IsEqualIID(riid, &IID_IBaseFilter)) - { - *ppv = &This->filter.IBaseFilter_iface; - } - - if (*ppv) { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow) && - !IsEqualIID(riid, &IID_IAMFilterMiscFlags)) - FIXME("No interface for %s!\n", debugstr_guid(riid)); - - return E_NOINTERFACE; -} - static HRESULT WINAPI GST_Stop(IBaseFilter *iface) { GSTImpl *This = impl_from_IBaseFilter(iface); @@ -1456,7 +1428,7 @@ static HRESULT WINAPI GST_GetState(IBaseFilter *iface, DWORD dwMilliSecsTimeout, } static const IBaseFilterVtbl GST_Vtbl = { - GST_QueryInterface, + BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID,

1 0

Zebediah Figura : strmbase/renderer: Add a QueryInterface() callback.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: d930dff4a860455fef775409586e4406df5d1efa URL: https://source.winehq.org/git/wine.git/?a=commit;h=d930dff4a860455fef775409… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 30 22:59:36 2019 -0500 strmbase/renderer: Add a QueryInterface() callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 24 +++++++++++++++++++++++- include/wine/strmbase.h | 1 + 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 7a69d98..5308cd3 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -200,10 +200,32 @@ static void renderer_destroy(BaseFilter *iface) filter->pFuncsTable->renderer_destroy(filter); } -static const BaseFilterFuncTable RendererBaseFilterFuncTable = +static HRESULT renderer_query_interface(BaseFilter *iface, REFIID iid, void **out) { + BaseRenderer *filter = impl_from_BaseFilter(iface); + HRESULT hr; + + if (filter->pFuncsTable->renderer_query_interface + && SUCCEEDED(hr = filter->pFuncsTable->renderer_query_interface(filter, iid, out))) + { + return hr; + } + + if (IsEqualIID(iid, &IID_IMediaSeeking) || IsEqualIID(iid, &IID_IMediaPosition)) + return IUnknown_QueryInterface(filter->pPosition, iid, out); + else if (IsEqualIID(iid, &IID_IQualityControl)) + { + *out = &filter->qcimpl->IQualityControl_iface; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; + } + return E_NOINTERFACE; +} + +static const BaseFilterFuncTable RendererBaseFilterFuncTable = { .filter_get_pin = renderer_get_pin, .filter_destroy = renderer_destroy, + .filter_query_interface = renderer_query_interface, }; static HRESULT WINAPI BaseRenderer_Input_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE * pmt) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 1d36f13..e192e98 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -606,6 +606,7 @@ typedef struct BaseRendererFuncTable { BaseRenderer_BeginFlush pfnBeginFlush; BaseRenderer_EndFlush pfnEndFlush; void (*renderer_destroy)(BaseRenderer *iface); + HRESULT (*renderer_query_interface)(BaseRenderer *iface, REFIID iid, void **out); } BaseRendererFuncTable; HRESULT WINAPI BaseRendererImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv);

1 0

Zebediah Figura : quartz/dsoundrender: Use BaseFilterImpl_QueryInterface() .
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: fd3c80b873aa675d7221ebec19e25a44b8cbff72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd3c80b873aa675d7221ebec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 30 22:59:37 2019 -0500 quartz/dsoundrender: Use BaseFilterImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 59 +++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 37 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 2b50eae..4c339f8 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -611,6 +611,23 @@ static void dsound_render_destroy(BaseRenderer *iface) CoTaskMemFree(filter); } +static HRESULT dsound_render_query_interface(BaseRenderer *iface, REFIID iid, void **out) +{ + DSoundRenderImpl *filter = impl_from_BaseRenderer(iface); + + if (IsEqualGUID(iid, &IID_IBasicAudio)) + *out = &filter->basicAudio.IBasicAudio_iface; + else if (IsEqualGUID(iid, &IID_IReferenceClock)) + *out = &filter->IReferenceClock_iface; + else if (IsEqualGUID(iid, &IID_IAMDirectSound)) + *out = &filter->IAMDirectSound_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static const BaseRendererFuncTable BaseFuncTable = { DSoundRender_CheckMediaType, DSoundRender_DoRenderSample, @@ -632,6 +649,7 @@ static const BaseRendererFuncTable BaseFuncTable = { DSoundRender_BeginFlush, DSoundRender_EndFlush, dsound_render_destroy, + dsound_render_query_interface, }; HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) @@ -705,39 +723,6 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) return hr; } -static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) -{ - DSoundRenderImpl *This = impl_from_IBaseFilter(iface); - TRACE("(%p, %p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IBasicAudio)) - *ppv = &This->basicAudio.IBasicAudio_iface; - else if (IsEqualIID(riid, &IID_IReferenceClock)) - *ppv = &This->IReferenceClock_iface; - else if (IsEqualIID(riid, &IID_IAMDirectSound)) - *ppv = &This->IAMDirectSound_iface; - else - { - HRESULT hr; - hr = BaseRendererImpl_QueryInterface(iface, riid, ppv); - if (SUCCEEDED(hr)) - return hr; - } - - if (*ppv) - { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) - FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); - - return E_NOINTERFACE; -} - static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) { DSoundRenderImpl *This = impl_from_IBaseFilter(iface); @@ -770,7 +755,7 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) static const IBaseFilterVtbl DSoundRender_Vtbl = { - DSoundRender_QueryInterface, + BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, @@ -795,7 +780,7 @@ static HRESULT WINAPI Basicaudio_QueryInterface(IBasicAudio *iface, TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - return DSoundRender_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppvObj); + return BaseFilterImpl_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppvObj); } static ULONG WINAPI Basicaudio_AddRef(IBasicAudio *iface) { @@ -989,7 +974,7 @@ static HRESULT WINAPI ReferenceClock_QueryInterface(IReferenceClock *iface, TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - return DSoundRender_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppvObj); + return BaseFilterImpl_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppvObj); } static ULONG WINAPI ReferenceClock_AddRef(IReferenceClock *iface) @@ -1157,7 +1142,7 @@ static HRESULT WINAPI AMDirectSound_QueryInterface(IAMDirectSound *iface, TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - return DSoundRender_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppvObj); + return BaseFilterImpl_QueryInterface(&This->renderer.filter.IBaseFilter_iface, riid, ppvObj); } static ULONG WINAPI AMDirectSound_AddRef(IAMDirectSound *iface)

1 0

Andrey Gusev : advapi32: Implement LookupAccountSidLocalA/W.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: 7b8554b3b861563b7d23c8bc1881c162b666e79a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b8554b3b861563b7d23c8bc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 30 13:52:36 2019 +0300 advapi32: Implement LookupAccountSidLocalA/W. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47286 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 ++ dlls/advapi32/security.c | 30 ++++++++++++++++++++++ .../api-ms-win-security-lsalookup-l1-1-0.spec | 4 +-- .../api-ms-win-security-lsalookup-l1-1-1.spec | 4 +-- include/winbase.h | 3 +++ 5 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index a97161f..06c4f8f 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -430,6 +430,8 @@ @ stdcall LookupAccountNameA(str str ptr ptr ptr ptr ptr) @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidA(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LookupPrivilegeDisplayNameA(str str str ptr ptr) @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 8027434..2030ebf 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2316,6 +2316,21 @@ LookupAccountSidA( } /****************************************************************************** + * LookupAccountSidLocalA [ADVAPI32.@] + */ +BOOL WINAPI +LookupAccountSidLocalA( + PSID sid, + LPSTR account, + LPDWORD accountSize, + LPSTR domain, + LPDWORD domainSize, + PSID_NAME_USE name_use ) +{ + return LookupAccountSidA(NULL, sid, account, accountSize, domain, domainSize, name_use); +} + +/****************************************************************************** * LookupAccountSidW [ADVAPI32.@] * * PARAMS @@ -2492,6 +2507,21 @@ LookupAccountSidW( } /****************************************************************************** + * LookupAccountSidLocalW [ADVAPI32.@] + */ +BOOL WINAPI +LookupAccountSidLocalW( + PSID sid, + LPWSTR account, + LPDWORD accountSize, + LPWSTR domain, + LPDWORD domainSize, + PSID_NAME_USE name_use ) +{ + return LookupAccountSidW(NULL, sid, account, accountSize, domain, domainSize, name_use); +} + +/****************************************************************************** * SetFileSecurityA [ADVAPI32.@] * * See SetFileSecurityW. diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec b/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec index 9b45265..6e9e6ed 100644 --- a/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec +++ b/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec @@ -1,7 +1,7 @@ @ stub LookupAccountNameLocalA @ stub LookupAccountNameLocalW -@ stub LookupAccountSidLocalA -@ stub LookupAccountSidLocalW +@ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidLocalA +@ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidLocalW @ stub LsaLookupClose @ stub LsaLookupFreeMemory @ stub LsaLookupGetDomainInfo diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec b/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec index 215c7b7..35a79f1 100644 --- a/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec +++ b/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec @@ -4,8 +4,8 @@ @ stub GetIdentityProviderInfoByName @ stub LookupAccountNameLocalA @ stub LookupAccountNameLocalW -@ stub LookupAccountSidLocalA -@ stub LookupAccountSidLocalW +@ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidLocalA +@ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidLocalW @ stub LsaLookupClose @ stub LsaLookupFreeMemory @ stub LsaLookupGetDomainInfo diff --git a/include/winbase.h b/include/winbase.h index 8b2eb2c..44bfe98 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2430,6 +2430,9 @@ WINADVAPI BOOL WINAPI LookupAccountNameW(LPCWSTR,LPCWSTR,PSID,LPDWORD,LP WINADVAPI BOOL WINAPI LookupAccountSidA(LPCSTR,PSID,LPSTR,LPDWORD,LPSTR,LPDWORD,PSID_NAME_USE); WINADVAPI BOOL WINAPI LookupAccountSidW(LPCWSTR,PSID,LPWSTR,LPDWORD,LPWSTR,LPDWORD,PSID_NAME_USE); #define LookupAccountSid WINELIB_NAME_AW(LookupAccountSid) +WINADVAPI BOOL WINAPI LookupAccountSidLocalA(PSID,LPSTR,LPDWORD,LPSTR,LPDWORD,PSID_NAME_USE); +WINADVAPI BOOL WINAPI LookupAccountSidLocalW(PSID,LPWSTR,LPDWORD,LPWSTR,LPDWORD,PSID_NAME_USE); +#define LookupAccountSidLocal WINELIB_NAME_AW(LookupAccountSidLocal) WINBASEAPI BOOL WINAPI LocalFileTimeToFileTime(const FILETIME*,LPFILETIME); WINBASEAPI BOOL WINAPI LockFile(HANDLE,DWORD,DWORD,DWORD,DWORD); WINBASEAPI BOOL WINAPI LockFileEx(HANDLE, DWORD, DWORD, DWORD, DWORD, LPOVERLAPPED);

1 0

Akihiro Sagawa : quartz: Ensure error text is terminated with NUL character.
by Alexandre Julliard 31 May '19

31 May '19

Module: wine Branch: master Commit: fc4ef8692e82b3e480b76daf088f099897a790e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc4ef8692e82b3e480b76daf… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 30 22:58:09 2019 +0900 quartz: Ensure error text is terminated with NUL character. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 08287a7..282104e 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -313,7 +313,13 @@ DWORD WINAPI AMGetErrorTextA(HRESULT hr, LPSTR buffer, DWORD maxlen) return 0; res = AMGetErrorTextW(hr, errorW, ARRAY_SIZE(errorW)); - return WideCharToMultiByte(CP_ACP, 0, errorW, res, buffer, maxlen, 0, 0); + if (!res) + return 0; + + res = WideCharToMultiByte(CP_ACP, 0, errorW, -1, NULL, 0, 0, 0); + if (res > maxlen || !res) + return 0; + return WideCharToMultiByte(CP_ACP, 0, errorW, -1, buffer, maxlen, 0, 0) - 1; } /***********************************************************************

1 0