February 2020 - Wine-Commits

Zebediah Figura : advapi32: Return the string SID if LookupAccountSid() fails.
by Alexandre Julliard Feb. 2, 2020

Feb. 2, 2020

Module: wine Branch: master Commit: ee012444340cc753485698059b474f6e2ad24ec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee012444340cc75348569805… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Feb 1 12:10:17 2020 -0600 advapi32: Return the string SID if LookupAccountSid() fails. Based on a patch by Qian Hong. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/lsa.c | 20 ++++++++++++++++++-- dlls/advapi32/tests/lsa.c | 1 + 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 793d791949..d63142f730 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "winreg.h" #include "winternl.h" +#include "sddl.h" #include "advapi32_misc.h" #include "wine/debug.h" @@ -486,6 +487,7 @@ NTSTATUS WINAPI LsaLookupSids( WCHAR *name_buffer; char *domain_data; SID_NAME_USE use; + WCHAR *strsid; TRACE("(%p, %u, %p, %p, %p)\n", PolicyHandle, Count, Sids, ReferencedDomains, Names); @@ -561,6 +563,14 @@ NTSTATUS WINAPI LsaLookupSids( domain.MaximumLength = sizeof(WCHAR); } } + else if (ConvertSidToStringSidW(Sids[i], &strsid)) + { + (*Names)[i].Name.Length = strlenW(strsid) * sizeof(WCHAR); + (*Names)[i].Name.MaximumLength = (strlenW(strsid) + 1) * sizeof(WCHAR); + name_fullsize += (strlenW(strsid) + 1) * sizeof(WCHAR); + + LocalFree(strsid); + } } /* now we have full length needed for both */ @@ -577,6 +587,8 @@ NTSTATUS WINAPI LsaLookupSids( { name_size = domain_size = 0; + (*Names)[i].Name.Buffer = name_buffer; + if (!LookupAccountSidW(NULL, Sids[i], NULL, &name_size, NULL, &domain_size, &use) && GetLastError() == ERROR_INSUFFICIENT_BUFFER) { @@ -596,15 +608,19 @@ NTSTATUS WINAPI LsaLookupSids( domain.Buffer = heap_alloc(domain.MaximumLength); - (*Names)[i].Name.Buffer = name_buffer; LookupAccountSidW(NULL, Sids[i], (*Names)[i].Name.Buffer, &name_size, domain.Buffer, &domain_size, &use); (*Names)[i].Use = use; (*Names)[i].DomainIndex = lsa_reflist_add_domain(*ReferencedDomains, &domain, &domain_data); heap_free(domain.Buffer); } + else if (ConvertSidToStringSidW(Sids[i], &strsid)) + { + strcpyW((*Names)[i].Name.Buffer, strsid); + LocalFree(strsid); + } - name_buffer += name_size; + name_buffer += strlenW(name_buffer) + 1; } TRACE("mapped %u out of %u\n", mapped, Count); diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 7b8f6b8e84..57ec8994eb 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -403,6 +403,7 @@ static void test_LsaLookupSids(void) ok(names[0].Use == SidTypeUnknown, "got type %u\n", names[0].Use); ok(names[0].DomainIndex == -1, "got index %u\n", names[0].DomainIndex); + check_unicode_string(&names[0].Name, L"S-1-1234-5678-1234-5678"); LsaFreeMemory(names); LsaFreeMemory(list);

1 0

Dmitry Timoshkov : gdiplus/tests: Add tests for FontFamily object management.
by Alexandre Julliard Feb. 2, 2020

Feb. 2, 2020

Module: wine Branch: master Commit: 2884da7ef75ea151c2752b7b4210b32a4d3959b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2884da7ef75ea151c2752b7b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 31 16:47:17 2020 +0800 gdiplus/tests: Add tests for FontFamily object management. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 33b75c5bc5..36079fa7ad 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -1282,6 +1282,110 @@ static void test_GdipGetFontCollectionFamilyCount(void) ok(status == InvalidParameter, "Unexpected status %d.\n", status); } +static BOOL is_family_in_collection(GpFontCollection *collection, GpFontFamily *family) +{ + GpStatus status; + GpFontFamily **list; + int count, i; + BOOL found = FALSE; + + status = GdipGetFontCollectionFamilyCount(collection, &count); + expect(Ok, status); + + list = GdipAlloc(count * sizeof(GpFontFamily *)); + status = GdipGetFontCollectionFamilyList(collection, count, list, &count); + expect(Ok, status); + + for (i = 0; i < count; i++) + { + if (list[i] == family) + { + found = TRUE; + break; + } + } + + GdipFree(list); + + return found; +} + +static void test_CloneFont(void) +{ + GpStatus status; + GpFontCollection *collection, *collection2; + GpFont *font, *font2; + GpFontFamily *family, *family2; + REAL height; + Unit unit; + int style; + BOOL ret; + + status = GdipNewInstalledFontCollection(&collection); + expect(Ok, status); + + status = GdipNewInstalledFontCollection(&collection2); + expect(Ok, status); + ok(collection == collection2, "got %p\n", collection2); + + status = GdipCreateFontFamilyFromName(nonexistent, NULL, &family); + expect(FontFamilyNotFound, status); + + status = GdipCreateFontFamilyFromName(nonexistent, collection, &family); + expect(FontFamilyNotFound, status); + + status = GdipCreateFontFamilyFromName(Tahoma, NULL, &family); + expect(Ok, status); + + ret = is_family_in_collection(collection, family); +todo_wine + ok(ret, "family is not in collection\n"); + + status = GdipCreateFont(family, 30.0f, FontStyleRegular, UnitPixel, &font); + expect(Ok, status); + + status = GdipGetFontUnit(font, &unit); + expect(Ok, status); + ok(unit == UnitPixel, "got %u\n", unit); + + status = GdipGetFontSize(font, &height); + expect(Ok, status); + ok(height == 30.0f, "got %f\n", height); + + status = GdipGetFontStyle(font, &style); + expect(Ok, status); + ok(style == FontStyleRegular, "got %d\n", style); + + status = GdipGetFamily(font, &family2); + expect(Ok, status); +todo_wine + ok(family == family2, "got %p\n", family2); + + status = GdipCloneFont(font, &font2); + expect(Ok, status); + + status = GdipGetFontUnit(font2, &unit); + expect(Ok, status); + ok(unit == UnitPixel, "got %u\n", unit); + + status = GdipGetFontSize(font2, &height); + expect(Ok, status); + ok(height == 30.0f, "got %f\n", height); + + status = GdipGetFontStyle(font2, &style); + expect(Ok, status); + ok(style == FontStyleRegular, "got %d\n", style); + + status = GdipGetFamily(font2, &family2); + expect(Ok, status); +todo_wine + ok(family == family2, "got %p\n", family2); + + GdipDeleteFont(font2); + GdipDeleteFont(font); + GdipDeleteFontFamily(family); +} + START_TEST(font) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1301,6 +1405,7 @@ START_TEST(font) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_CloneFont(); test_long_name(); test_font_transform(); test_font_substitution();

1 0

Brendan Shanks : user32: Pack messages sent with SendNotifyMessage().
by Alexandre Julliard Feb. 2, 2020

Feb. 2, 2020

Module: wine Branch: master Commit: b7121813bc215a92db71ea46b52e78149721c356 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7121813bc215a92db71ea46… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jan 28 14:56:11 2020 -0800 user32: Pack messages sent with SendNotifyMessage(). Allows Wine internal messages with pointer arguments to be sent asynchronously. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 1336865112..2717d91dbb 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2829,6 +2829,9 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, break; case MSG_NOTIFY: info.flags = ISMEX_NOTIFY; + if (!unpack_message( info.msg.hwnd, info.msg.message, &info.msg.wParam, + &info.msg.lParam, &buffer, size )) + continue; break; case MSG_CALLBACK: info.flags = ISMEX_CALLBACK; @@ -3128,7 +3131,7 @@ static BOOL put_message_in_queue( const struct send_message_info *info, size_t * } memset( &data, 0, sizeof(data) ); - if (info->type == MSG_OTHER_PROCESS) + if (info->type == MSG_OTHER_PROCESS || info->type == MSG_NOTIFY) { *reply_size = pack_message( info->hwnd, info->msg, info->wparam, info->lparam, &data ); if (data.count == -1)

1 0

Zebediah Figura : strmbase: Store the filter name and graph directly in the strmbase_filter structure.
by Alexandre Julliard Feb. 2, 2020

Feb. 2, 2020

Module: wine Branch: master Commit: 6f71e2c48dcfdc5d2c5087b2d685d7fea85a44e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f71e2c48dcfdc5d2c5087b2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 19:05:18 2020 -0600 strmbase: Store the filter name and graph directly in the strmbase_filter structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 5 ++--- dlls/qcap/vfwcapture.c | 4 ++-- dlls/qedit/samplegrabber.c | 2 -- dlls/strmbase/filter.c | 40 +++++++++++++++++++++------------------- dlls/strmbase/renderer.c | 2 +- include/wine/strmbase.h | 3 ++- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index e402479fb1..91a0b17f8e 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -772,8 +772,7 @@ static HRESULT WINAPI ConfigInterleaving_put_Mode( if(This->mode != mode) { if(This->source.pin.peer) { - HRESULT hr = IFilterGraph_Reconnect(This->filter.filterInfo.pGraph, - &This->source.pin.IPin_iface); + HRESULT hr = IFilterGraph_Reconnect(This->filter.graph, &This->source.pin.IPin_iface); if(FAILED(hr)) return hr; } @@ -1152,7 +1151,7 @@ static HRESULT WINAPI AviMuxOut_AttemptConnection(struct strmbase_source *iface, if (!filter->in[i]->pin.pin.peer) continue; - hr = IFilterGraph_Reconnect(filter->filter.filterInfo.pGraph, &filter->in[i]->pin.pin.IPin_iface); + hr = IFilterGraph_Reconnect(filter->filter.graph, &filter->in[i]->pin.pin.IPin_iface); if (FAILED(hr)) { IPin_Disconnect(&iface->pin.IPin_iface); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index b4716bf192..30869ede13 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -216,9 +216,9 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt) } hr = qcap_driver_set_format(This->driver_info, pmt); - if (SUCCEEDED(hr) && This->filter.filterInfo.pGraph && This->source.pin.peer) + if (SUCCEEDED(hr) && This->filter.graph && This->source.pin.peer) { - hr = IFilterGraph_Reconnect(This->filter.filterInfo.pGraph, &This->source.pin.IPin_iface); + hr = IFilterGraph_Reconnect(This->filter.graph, &This->source.pin.IPin_iface); if (SUCCEEDED(hr)) TRACE("Reconnection completed, with new media format..\n"); } diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index edb814468a..7652f70d95 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -80,8 +80,6 @@ static inline SG_Impl *impl_from_IMemInputPin(IMemInputPin *iface) static void SampleGrabber_cleanup(SG_Impl *This) { TRACE("(%p)\n", This); - if (This->filter.filterInfo.pGraph) - WARN("(%p) still joined to filter graph %p\n", This, This->filter.filterInfo.pGraph); if (This->allocator) IMemAllocator_Release(This->allocator); if (This->grabberIface) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 43da4b3fb9..84521b8099 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -443,35 +443,37 @@ static HRESULT WINAPI filter_FindPin(IBaseFilter *iface, const WCHAR *id, IPin * return VFW_E_NOT_FOUND; } -static HRESULT WINAPI filter_QueryFilterInfo(IBaseFilter *iface, FILTER_INFO *pInfo) +static HRESULT WINAPI filter_QueryFilterInfo(IBaseFilter *iface, FILTER_INFO *info) { - struct strmbase_filter *This = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%p)\n", This, pInfo); + struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - lstrcpyW(pInfo->achName, This->filterInfo.achName); - pInfo->pGraph = This->filterInfo.pGraph; + TRACE("filter %p, info %p.\n", filter, info); - if (pInfo->pGraph) - IFilterGraph_AddRef(pInfo->pGraph); + lstrcpyW(info->achName, filter->name); + info->pGraph = filter->graph; + + if (info->pGraph) + IFilterGraph_AddRef(info->pGraph); return S_OK; } -static HRESULT WINAPI filter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *pGraph, const WCHAR *pName) +static HRESULT WINAPI filter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *graph, const WCHAR *name) { - struct strmbase_filter *This = impl_from_IBaseFilter(iface); + struct strmbase_filter *filter = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%p, %s)\n", This, pGraph, debugstr_w(pName)); + TRACE("filter %p, graph %p, name %s.\n", filter, graph, debugstr_w(name)); - EnterCriticalSection(&This->csFilter); - { - if (pName) - lstrcpynW(This->filterInfo.achName, pName, MAX_FILTER_NAME); - else - *This->filterInfo.achName = '\0'; - This->filterInfo.pGraph = pGraph; /* NOTE: do NOT increase ref. count */ - } - LeaveCriticalSection(&This->csFilter); + EnterCriticalSection(&filter->csFilter); + + if (name) + lstrcpynW(filter->name, name, ARRAY_SIZE(filter->name)); + else + filter->name[0] = 0; + /* The graph references us, so we cannot also reference the graph. */ + filter->graph = graph; + + LeaveCriticalSection(&filter->csFilter); return S_OK; } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 1bc581963c..974823b046 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -199,7 +199,7 @@ static void sink_disconnect(struct strmbase_sink *iface) static HRESULT sink_eos(struct strmbase_sink *iface) { struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface); - IFilterGraph *graph = filter->filter.filterInfo.pGraph; + IFilterGraph *graph = filter->filter.graph; IMediaEventSink *event_sink; HRESULT hr = S_OK; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index abb04a8384..ae0fadb391 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -130,7 +130,8 @@ struct strmbase_filter FILTER_STATE state; IReferenceClock * pClock; - FILTER_INFO filterInfo; + WCHAR name[128]; + IFilterGraph *graph; CLSID clsid; LONG pin_version;

1 0

Zebediah Figura : quartz: Introduce a helper to trace reference time.
by Alexandre Julliard Feb. 2, 2020

Feb. 2, 2020

Module: wine Branch: master Commit: eea01d8e8bd1a73369f64f9cec19eb6900a31ef3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eea01d8e8bd1a73369f64f9c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 19:05:17 2020 -0600 quartz: Introduce a helper to trace reference time. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 4 ++-- dlls/quartz/dsoundrender.c | 7 ++++--- dlls/quartz/filtergraph.c | 12 ++++++++++-- dlls/quartz/memallocator.c | 6 ++++-- dlls/quartz/quartz_private.h | 20 ++++++++++++++++++++ dlls/quartz/systemclock.c | 7 +++---- 6 files changed, 43 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 33d9debe5c..aa34f3ae26 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -163,7 +163,7 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam goto error; } - TRACE("Sample start time: %u.%03u\n", (DWORD)(tStart/10000000), (DWORD)((tStart/10000)%1000)); + TRACE("Sample start time: %s.\n", debugstr_time(tStart)); if (ash.cbSrcLengthUsed == cbSrcStream) { IMediaSample_SetTime(pOutSample, &tStart, &tStop); @@ -196,7 +196,7 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam IMediaSample_SetMediaTime(pOutSample, NULL, NULL); } - TRACE("Sample stop time: %u.%03u\n", (DWORD)(tStart/10000000), (DWORD)((tStart/10000)%1000)); + TRACE("Sample stop time: %s\n", debugstr_time(tStart)); hr = IMemInputPin_Receive(This->tf.source.pMemInputPin, pOutSample); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) { diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 6fd49dac9b..4a0f5c4d10 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -171,7 +171,7 @@ static HRESULT DSoundRender_GetWritePos(DSoundRenderImpl *This, DWORD *ret_write *ret_writepos = writepos; } else if (delta_t < 0) { REFERENCE_TIME past, min_writepos_t; - WARN("Delta too big %i/%i, overwriting old data or even skipping\n", (int)delta_t / 10000, (int)max_lag / 10000); + WARN("Delta too big %s/%s, overwriting old data or even skipping\n", debugstr_time(delta_t), debugstr_time(max_lag)); if (min_writepos >= playpos) min_writepos_t = cur + time_from_pos(This, min_writepos - playpos); else @@ -189,7 +189,7 @@ static HRESULT DSoundRender_GetWritePos(DSoundRenderImpl *This, DWORD *ret_write } } else /* delta_t > 0 */ { DWORD aheadbytes; - WARN("Delta too big %i/%i, too far ahead\n", (int)delta_t / 10000, (int)max_lag / 10000); + WARN("Delta too big %s/%s, too far ahead\n", debugstr_time(delta_t), debugstr_time(max_lag)); aheadbytes = pos_from_time(This, delta_t); WARN("Advancing %u bytes\n", aheadbytes); if (delta_t >= DSoundRenderer_Max_Fill) @@ -204,7 +204,8 @@ end: else *pfree = This->buf_size + playpos - *ret_writepos; if (time_from_pos(This, This->buf_size - *pfree) >= DSoundRenderer_Max_Fill) { - TRACE("Blocked: too full %i / %i\n", (int)(time_from_pos(This, This->buf_size - *pfree)/10000), (int)(DSoundRenderer_Max_Fill / 10000)); + TRACE("Blocked: too full %s / %s\n", debugstr_time(time_from_pos(This, This->buf_size - *pfree)), + debugstr_time(DSoundRenderer_Max_Fill)); return S_FALSE; } return S_OK; diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index e30dae0a59..cd4e7f40e0 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2500,6 +2500,8 @@ static HRESULT WINAPI MediaSeeking_GetStopPosition(IMediaSeeking *iface, LONGLON } LeaveCriticalSection(&graph->cs); + + TRACE("Returning %s (%s seconds).\n", wine_dbgstr_longlong(*stop), debugstr_time(*stop)); return hr; } @@ -2525,7 +2527,7 @@ static HRESULT WINAPI MediaSeeking_GetCurrentPosition(IMediaSeeking *iface, LONG LeaveCriticalSection(&graph->cs); - TRACE("Returning %s.\n", wine_dbgstr_longlong(ret)); + TRACE("Returning %s (%s seconds).\n", wine_dbgstr_longlong(ret), debugstr_time(ret)); *current = ret; return S_OK; @@ -2565,6 +2567,12 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, LONGLONG * TRACE("graph %p, current %s, current_flags %#x, stop %s, stop_flags %#x.\n", graph, current_ptr ? wine_dbgstr_longlong(*current_ptr) : "<null>", current_flags, stop_ptr ? wine_dbgstr_longlong(*stop_ptr): "<null>", stop_flags); + if (current_ptr) + TRACE("Setting current position to %s (%s seconds).\n", + wine_dbgstr_longlong(*current_ptr), debugstr_time(*current_ptr)); + if (stop_ptr) + TRACE("Setting stop position to %s (%s seconds).\n", + wine_dbgstr_longlong(*stop_ptr), debugstr_time(*stop_ptr)); if ((current_flags & 0x7) != AM_SEEKING_AbsolutePositioning && (current_flags & 0x7) != AM_SEEKING_NoPositioning) @@ -5249,7 +5257,7 @@ static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME start) IFilterGraphImpl *graph = impl_from_IMediaFilter(iface); REFERENCE_TIME stream_start = start; - TRACE("graph %p, start %s.\n", graph, wine_dbgstr_longlong(start)); + TRACE("graph %p, start %s.\n", graph, debugstr_time(start)); EnterCriticalSection(&graph->cs); diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 2f5855e95b..fab0f2d1c4 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -564,7 +564,8 @@ static HRESULT WINAPI StdMediaSample2_SetTime(IMediaSample2 *iface, REFERENCE_TI { StdMediaSample2 *sample = impl_from_IMediaSample2(iface); - TRACE("iface %p, start %p, end %p.\n", iface, start, end); + TRACE("sample %p, start %s, end %s.\n", sample, start ? debugstr_time(*start) : "(null)", + end ? debugstr_time(*end) : "(null)"); if (start) { @@ -745,7 +746,8 @@ static HRESULT WINAPI StdMediaSample2_SetMediaTime(IMediaSample2 *iface, LONGLON { StdMediaSample2 *sample = impl_from_IMediaSample2(iface); - TRACE("sample %p, start %p, end %p.\n", iface, start, end); + TRACE("sample %p, start %s, end %s.\n", sample, start ? debugstr_time(*start) : "(null)", + end ? debugstr_time(*end) : "(null)"); if (start) { diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 791bec7db6..3431a5836f 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -36,6 +36,26 @@ #include "wine/strmbase.h" #include "wine/list.h" +static inline const char *debugstr_time(REFERENCE_TIME time) +{ + ULONGLONG abstime = time >= 0 ? time : -time; + unsigned int i = 0, j = 0; + char buffer[23], rev[23]; + + while (abstime || i <= 8) + { + buffer[i++] = '0' + (abstime % 10); + abstime /= 10; + if (i == 7) buffer[i++] = '.'; + } + if (time < 0) buffer[i++] = '-'; + + while (i--) rev[j++] = buffer[i]; + rev[j] = 0; + + return wine_dbg_sprintf("%s", rev); +} + /* see IAsyncReader::Request on MSDN for the explanation of this */ #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) #define BYTES_FROM_MEDIATIME(time) ((time) / 10000000) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 8122cc5b0b..51e96c82e6 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -202,8 +202,6 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_ REFERENCE_TIME ret; HRESULT hr; - TRACE("clock %p, time %p.\n", clock, time); - if (!time) { return E_POINTER; } @@ -217,6 +215,7 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_ LeaveCriticalSection(&clock->cs); + TRACE("clock %p, time %p, returning %s.\n", clock, time, debugstr_time(ret)); return hr; } @@ -227,7 +226,7 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, struct advise_sink *sink; TRACE("clock %p, base %s, offset %s, event %#lx, cookie %p.\n", - clock, wine_dbgstr_longlong(base), wine_dbgstr_longlong(offset), event, cookie); + clock, debugstr_time(base), debugstr_time(offset), event, cookie); if (!event) return E_INVALIDARG; @@ -263,7 +262,7 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, struct advise_sink *sink; TRACE("clock %p, start %s, period %s, semaphore %#lx, cookie %p.\n", - clock, wine_dbgstr_longlong(start), wine_dbgstr_longlong(period), semaphore, cookie); + clock, debugstr_time(start), debugstr_time(period), semaphore, cookie); if (!semaphore) return E_INVALIDARG;

1 0

Zebediah Figura : strmbase: Fix printing negative values in debugstr_time().
by Alexandre Julliard Feb. 2, 2020

Feb. 2, 2020

Module: wine Branch: master Commit: f8a63ffda47974fc0a8d8e8080d39bf9e1173922 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8a63ffda47974fc0a8d8e80… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 19:05:16 2020 -0600 strmbase: Fix printing negative values in debugstr_time(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/strmbase_private.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index b03258bc41..f9ddcad9a6 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -34,15 +34,17 @@ static inline const char *debugstr_time(REFERENCE_TIME time) { + ULONGLONG abstime = time >= 0 ? time : -time; unsigned int i = 0, j = 0; - char buffer[22], rev[22]; + char buffer[23], rev[23]; - while (time || i <= 8) + while (abstime || i <= 8) { - buffer[i++] = '0' + (time % 10); - time /= 10; + buffer[i++] = '0' + (abstime % 10); + abstime /= 10; if (i == 7) buffer[i++] = '.'; } + if (time < 0) buffer[i++] = '-'; while (i--) rev[j++] = buffer[i]; rev[j] = 0;

1 0

Louis Lenders : ntoskrnl.exe: Add stub for RtlIsNtDdiVersionAvailable.
by Alexandre Julliard Feb. 2, 2020

Feb. 2, 2020

Module: wine Branch: master Commit: ba8360be4e32357173b48822ad39da56a2bc6fdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba8360be4e32357173b48822… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Jan 30 12:52:57 2020 +0100 ntoskrnl.exe: Add stub for RtlIsNtDdiVersionAvailable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48122 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 2 ++ 3 files changed, 12 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 36637331c1..c85dbb7a7d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3951,3 +3951,12 @@ PEPROCESS WINAPI IoGetRequestorProcess(IRP *irp) TRACE("irp %p.\n", irp); return irp->Tail.Overlay.Thread->kthread.process; } + +/*********************************************************************** + * RtlIsNtDdiVersionAvailable (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI RtlIsNtDdiVersionAvailable(ULONG version) +{ + FIXME("stub: %d\n", version); + return FALSE; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a39247811e..6b5b127a62 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1117,6 +1117,7 @@ @ stub RtlIsGenericTableEmpty @ stub RtlIsGenericTableEmptyAvl @ stdcall RtlIsNameLegalDOS8Dot3(ptr ptr ptr) +@ stdcall RtlIsNtDdiVersionAvailable(long) @ stub RtlIsRangeAvailable @ stub RtlIsValidOemCharacter @ stdcall -arch=win32 -ret64 RtlLargeIntegerAdd(int64 int64) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5152a89842..53ea9e17cf 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1694,6 +1694,8 @@ HANDLE WINAPI PsGetProcessInheritedFromUniqueProcessId(PEPROCESS); BOOLEAN WINAPI PsGetVersion(ULONG*,ULONG*,ULONG*,UNICODE_STRING*); NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS); +BOOLEAN WINAPI RtlIsNtDdiVersionAvailable(ULONG); + NTSTATUS WINAPI ZwAddBootEntry(PUNICODE_STRING,PUNICODE_STRING); NTSTATUS WINAPI ZwAccessCheckAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,ACCESS_MASK,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,PBOOLEAN,PBOOLEAN); NTSTATUS WINAPI ZwAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD);

1 0

Zebediah Figura : kernelbase: Use the %I length modifier to print pointer-size integers.
by Alexandre Julliard Feb. 2, 2020

Feb. 2, 2020

Module: wine Branch: master Commit: 69996b61307fe7e2764cf06abbdf85639b16f7a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69996b61307fe7e2764cf06a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 21:36:16 2020 -0600 kernelbase: Use the %I length modifier to print pointer-size integers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index a07dddb1fc..b125f100f6 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -514,7 +514,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR } break; default: - FIXME("Unsupported attribute %#lx.\n", attrs->attrs[i].attr); + FIXME("Unsupported attribute %#Ix.\n", attrs->attrs[i].attr); break; } }

1 0

Zebediah Figura : ntdll/tests: Add more tests for printf format specifiers.
by Alexandre Julliard Feb. 2, 2020

Feb. 2, 2020

Module: wine Branch: master Commit: 9c3dcdfb6c36e8301a09f5e13fbec8c37571899d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c3dcdfb6c36e8301a09f5e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 21:36:14 2020 -0600 ntdll/tests: Add more tests for printf format specifiers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/string.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 12027e8899..72428fca91 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1349,7 +1349,28 @@ static void test__snprintf(void) memset(buffer, 0x7c, sizeof(buffer)); res = p__snprintf(buffer, 3, "test"); ok(res == -1, "res = %d\n", res); - } + + res = p__snprintf(buffer, sizeof(buffer), "%I64x %d", (ULONGLONG)0x1234567890, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "1234567890 1"), "got %s\n", debugstr_a(buffer)); + + res = p__snprintf(buffer, sizeof(buffer), "%I32x %d", 0x123456, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "123456 1"), "got %s\n", debugstr_a(buffer)); + + if (sizeof(void *) == 8) + { + res = p__snprintf(buffer, sizeof(buffer), "%Ix %d", (ULONG_PTR)0x1234567890, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + todo_wine ok(!strcmp(buffer, "1234567890 1"), "got %s\n", debugstr_a(buffer)); + } + else + { + res = p__snprintf(buffer, sizeof(buffer), "%Ix %d", (ULONG_PTR)0x123456, 1); + ok(res == strlen(buffer), "wrong size %d\n", res); + ok(!strcmp(buffer, "123456 1"), "got %s\n", debugstr_a(buffer)); + } +} static void test__snprintf_s(void) {

1 0

Zebediah Figura : strmbase: Trace the pin and filter names in IPin and IMemInputPin methods.
by Alexandre Julliard Feb. 2, 2020

Feb. 2, 2020

Module: wine Branch: master Commit: 6656933d783ed360237962cfe1179c8414df60a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6656933d783ed360237962cf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 30 19:05:21 2020 -0600 strmbase: Trace the pin and filter names in IPin and IMemInputPin methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 118 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 70 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6656933d783ed3602379…

1 0