wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

Michael Müller : combase: Add stub for RoRegisterActivationFactories.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: e5608bd2aed190699181128991246802526c3ad9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5608bd2aed1906991811289… Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 4 06:13:16 2018 +0000 combase: Add stub for RoRegisterActivationFactories. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec index d27130c..32b9474 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec @@ -2,7 +2,7 @@ @ stdcall RoGetActivationFactory(ptr ptr ptr) combase.RoGetActivationFactory @ stdcall RoGetApartmentIdentifier(ptr) combase.RoGetApartmentIdentifier @ stdcall RoInitialize(long) combase.RoInitialize -@ stub RoRegisterActivationFactories +@ stdcall RoRegisterActivationFactories(ptr ptr long ptr) combase.RoRegisterActivationFactories @ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) combase.RoRegisterForApartmentShutdown @ stub RoRevokeActivationFactories @ stdcall RoUninitialize() combase.RoUninitialize diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index c721f43..72a7eb5 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -262,7 +262,7 @@ @ stub RoOriginateErrorW @ stub RoOriginateLanguageException @ stub RoParameterizedTypeExtraGetTypeSignature -@ stub RoRegisterActivationFactories +@ stdcall RoRegisterActivationFactories(ptr ptr long ptr) @ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) @ stub RoReportCapabilityCheckFailure @ stub RoReportFailedDelegate diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 96165e4..ee03bd3 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -263,3 +263,14 @@ HRESULT WINAPI RoGetServerActivatableClasses(HSTRING name, HSTRING **classes, DW *count = 0; return S_OK; } + +/*********************************************************************** + * RoRegisterActivationFactories (combase.@) + */ +HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONFACTORY *callbacks, + UINT32 count, RO_REGISTRATION_COOKIE *cookie) +{ + FIXME("(%p, %p, %d, %p): stub\n", classes, callbacks, count, cookie); + + return S_OK; +}

1 0

Michael Müller : combase: Add stub for RoGetServerActivatableClasses.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: 699003a459dce053fae0f2b62844c1b93e41728a URL: https://source.winehq.org/git/wine.git/?a=commit;h=699003a459dce053fae0f2b6… Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 4 06:13:15 2018 +0000 combase: Add stub for RoGetServerActivatableClasses. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-registration-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec b/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec index 350ac04..20c8d9c 100644 --- a/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec @@ -1,2 +1,2 @@ @ stub RoGetActivatableClassRegistration -@ stub RoGetServerActivatableClasses +@ stdcall RoGetServerActivatableClasses(ptr ptr ptr) combase.RoGetServerActivatableClasses diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index ec4a6cd..c721f43 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -254,7 +254,7 @@ @ stub RoGetErrorReportingFlags @ stub RoGetMatchingRestrictedErrorInfo @ stdcall RoGetParameterizedTypeInstanceIID(long ptr ptr ptr ptr) -@ stub RoGetServerActivatableClasses +@ stdcall RoGetServerActivatableClasses(ptr ptr ptr) @ stdcall RoInitialize(long) @ stub RoInspectCapturedStackBackTrace @ stub RoInspectThreadErrorInfo diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index ffcb0e9..96165e4 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -251,3 +251,15 @@ HRESULT WINAPI RoRegisterForApartmentShutdown(IApartmentShutdown *callback, *cookie = (void *)0xcafecafe; return S_OK; } + +/*********************************************************************** + * RoGetServerActivatableClasses (combase.@) + */ +HRESULT WINAPI RoGetServerActivatableClasses(HSTRING name, HSTRING **classes, DWORD *count) +{ + FIXME("(%p, %p, %p): stub\n", name, classes, count); + + if (count) + *count = 0; + return S_OK; +}

1 0

Michael Müller : combase: Add stub for RoRegisterForApartmentShutdown.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: ddbe3a70255185a628823d9d5dbd01b2f00cb529 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddbe3a70255185a628823d9d… Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 4 06:13:14 2018 +0000 combase: Add stub for RoRegisterForApartmentShutdown. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec index 88139fb..d27130c 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec @@ -3,7 +3,7 @@ @ stdcall RoGetApartmentIdentifier(ptr) combase.RoGetApartmentIdentifier @ stdcall RoInitialize(long) combase.RoInitialize @ stub RoRegisterActivationFactories -@ stub RoRegisterForApartmentShutdown +@ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) combase.RoRegisterForApartmentShutdown @ stub RoRevokeActivationFactories @ stdcall RoUninitialize() combase.RoUninitialize @ stub RoUnregisterForApartmentShutdown diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index ff89232..ec4a6cd 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -263,7 +263,7 @@ @ stub RoOriginateLanguageException @ stub RoParameterizedTypeExtraGetTypeSignature @ stub RoRegisterActivationFactories -@ stub RoRegisterForApartmentShutdown +@ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) @ stub RoReportCapabilityCheckFailure @ stub RoReportFailedDelegate @ stub RoReportUnhandledError diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 9cceb82..ffcb0e9 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -232,3 +232,22 @@ HRESULT WINAPI RoGetApartmentIdentifier(UINT64 *identifier) *identifier = 0xdeadbeef; return S_OK; } + +/*********************************************************************** + * RoRegisterForApartmentShutdown (combase.@) + */ +HRESULT WINAPI RoRegisterForApartmentShutdown(IApartmentShutdown *callback, + UINT64 *identifier, APARTMENT_SHUTDOWN_REGISTRATION_COOKIE *cookie) +{ + HRESULT hr; + + FIXME("(%p, %p, %p): stub\n", callback, identifier, cookie); + + hr = RoGetApartmentIdentifier(identifier); + if (FAILED(hr)) + return hr; + + if (cookie) + *cookie = (void *)0xcafecafe; + return S_OK; +}

1 0

Michael Müller : combase: Add stub for RoGetApartmentIdentifier.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: a422f0ef55f0dc2e4f23a68d6966586e06d7303d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a422f0ef55f0dc2e4f23a68d… Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 4 06:13:12 2018 +0000 combase: Add stub for RoGetApartmentIdentifier. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec index 978c3dc..88139fb 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec @@ -1,6 +1,6 @@ @ stdcall RoActivateInstance(ptr ptr) combase.RoActivateInstance @ stdcall RoGetActivationFactory(ptr ptr ptr) combase.RoGetActivationFactory -@ stub RoGetApartmentIdentifier +@ stdcall RoGetApartmentIdentifier(ptr) combase.RoGetApartmentIdentifier @ stdcall RoInitialize(long) combase.RoInitialize @ stub RoRegisterActivationFactories @ stub RoRegisterForApartmentShutdown diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index f42bdae..ff89232 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -250,7 +250,7 @@ @ stub RoGetActivatableClassRegistration @ stdcall RoGetActivationFactory(ptr ptr ptr) @ stub RoGetAgileReference -@ stub RoGetApartmentIdentifier +@ stdcall RoGetApartmentIdentifier(ptr) @ stub RoGetErrorReportingFlags @ stub RoGetMatchingRestrictedErrorInfo @ stdcall RoGetParameterizedTypeInstanceIID(long ptr ptr ptr ptr) diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index bfd07fb..9cceb82 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -218,3 +218,17 @@ HRESULT WINAPI RoActivateInstance(HSTRING classid, IInspectable **instance) return hr; } + +/*********************************************************************** + * RoGetApartmentIdentifier (combase.@) + */ +HRESULT WINAPI RoGetApartmentIdentifier(UINT64 *identifier) +{ + FIXME("(%p): stub\n", identifier); + + if (!identifier) + return E_INVALIDARG; + + *identifier = 0xdeadbeef; + return S_OK; +}

1 0

Dmitry Timoshkov : schedsvc: Also watch for job file modifications.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: f7d1e16183c03fb058c405a027e608296ea81a05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7d1e16183c03fb058c405a0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 4 11:39:26 2018 +0800 schedsvc: Also watch for job file modifications. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/atsvc.c | 74 ++++++++++++++++++++++++++++++---------- dlls/schedsvc/schedsvc_private.h | 1 + dlls/schedsvc/svc_main.c | 12 ++++++- 3 files changed, 68 insertions(+), 19 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index e7e59a4..53a18fd 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -269,15 +269,12 @@ static BOOL load_job_data(const char *data, DWORD size, AT_ENUM *info) return TRUE; } -void add_job(const WCHAR *name) +static BOOL load_job(const WCHAR *name, AT_ENUM *info) { HANDLE file, mapping; DWORD size, try; void *data; - struct job_t *job; - - job = heap_alloc_zero(sizeof(*job)); - if (!job) return; + BOOL ret = FALSE; try = 1; for (;;) @@ -304,14 +301,7 @@ void add_job(const WCHAR *name) data = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); if (data) { - if (load_job_data(data, size, &job->info)) - { - EnterCriticalSection(&at_job_list_section); - job->name = heap_strdupW(name); - job->info.JobId = current_jobid++; - list_add_tail(&at_job_list, &job->entry); - LeaveCriticalSection(&at_job_list_section); - } + ret = load_job_data(data, size, info); UnmapViewOfFile(data); } @@ -320,11 +310,39 @@ void add_job(const WCHAR *name) break; } - if (!job->info.JobId) + return ret; +} + +static void free_job_info(AT_ENUM *info) +{ + heap_free(info->Command); +} + +static void free_job(struct job_t *job) +{ + free_job_info(&job->info); + heap_free(job->name); + heap_free(job); +} + +void add_job(const WCHAR *name) +{ + struct job_t *job; + + job = heap_alloc_zero(sizeof(*job)); + if (!job) return; + + if (!load_job(name, &job->info)) { - heap_free(job->info.Command); - heap_free(job); + free_job(job); + return; } + + EnterCriticalSection(&at_job_list_section); + job->name = heap_strdupW(name); + job->info.JobId = current_jobid++; + list_add_tail(&at_job_list, &job->entry); + LeaveCriticalSection(&at_job_list_section); } static BOOL write_signature(HANDLE hfile) @@ -523,12 +541,32 @@ void remove_job(const WCHAR *name) if (job) { list_remove(&job->entry); - heap_free(job->name); - heap_free(job); + free_job(job); } LeaveCriticalSection(&at_job_list_section); } +void modify_job(const WCHAR *name) +{ + AT_ENUM info; + + if (load_job(name, &info)) + { + struct job_t *job; + + EnterCriticalSection(&at_job_list_section); + job = find_job(0, name); + if (job) + { + free_job_info(&job->info); + job->info = info; + } + else + free_job_info(&info); + LeaveCriticalSection(&at_job_list_section); + } +} + DWORD __cdecl NetrJobAdd(ATSVC_HANDLE server_name, AT_INFO *info, DWORD *jobid) { WCHAR windir[MAX_PATH]; diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 215bba0..c0aa188 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -25,6 +25,7 @@ void schedsvc_auto_start(void) DECLSPEC_HIDDEN; void add_job(const WCHAR *name) DECLSPEC_HIDDEN; void remove_job(const WCHAR *name) DECLSPEC_HIDDEN; +void modify_job(const WCHAR *name) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW(const WCHAR *src) { diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index fb7732c..ba8de04 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -78,7 +78,8 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) memset(&info, 0, sizeof(info)); ret = ReadDirectoryChangesW(htasks, &info, sizeof(info), FALSE, - FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, NULL); + FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE, + NULL, &ov, NULL); if (!ret) break; events[0] = done_event; @@ -106,6 +107,15 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) remove_job(path); break; + case FILE_ACTION_MODIFIED: + TRACE("FILE_ACTION_MODIFIED %s\n", debugstr_w(info.data.FileName)); + + GetWindowsDirectoryW(path, MAX_PATH); + lstrcatW(path, tasksW); + lstrcatW(path, info.data.FileName); + modify_job(path); + break; + default: FIXME("%s: action %#x not handled\n", debugstr_w(info.data.FileName), info.data.Action); break;

1 0

Zebediah Figura : strmbase: Consistently trace the BasePin object.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: c130ec5678fa325fdc00ca804f306860fd809a8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c130ec5678fa325fdc00ca80… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 3 23:47:14 2018 -0500 strmbase: Consistently trace the BasePin object. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 54 ++++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 59a80bd..ef22a57 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -199,7 +199,7 @@ HRESULT WINAPI BasePinImpl_Disconnect(IPin * iface) HRESULT hr; BasePin *This = impl_from_IPin(iface); - TRACE("()\n"); + TRACE("(%p)->()\n", This); EnterCriticalSection(This->pCritSec); { @@ -224,7 +224,7 @@ HRESULT WINAPI BasePinImpl_ConnectedTo(IPin * iface, IPin ** ppPin) HRESULT hr; BasePin *This = impl_from_IPin(iface); - TRACE("(%p)\n", ppPin); + TRACE("(%p)->(%p)\n", This, ppPin); EnterCriticalSection(This->pCritSec); { @@ -250,7 +250,7 @@ HRESULT WINAPI BasePinImpl_ConnectionMediaType(IPin * iface, AM_MEDIA_TYPE * pmt HRESULT hr; BasePin *This = impl_from_IPin(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, pmt); + TRACE("(%p)->(%p)\n", This, pmt); EnterCriticalSection(This->pCritSec); { @@ -274,7 +274,7 @@ HRESULT WINAPI BasePinImpl_QueryPinInfo(IPin * iface, PIN_INFO * pInfo) { BasePin *This = impl_from_IPin(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, pInfo); + TRACE("(%p)->(%p)\n", This, pInfo); Copy_PinInfo(pInfo, &This->pinInfo); IBaseFilter_AddRef(pInfo->pFilter); @@ -286,7 +286,7 @@ HRESULT WINAPI BasePinImpl_QueryDirection(IPin * iface, PIN_DIRECTION * pPinDir) { BasePin *This = impl_from_IPin(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, pPinDir); + TRACE("(%p)->(%p)\n", This, pPinDir); *pPinDir = This->pinInfo.dir; @@ -297,7 +297,7 @@ HRESULT WINAPI BasePinImpl_QueryId(IPin * iface, LPWSTR * Id) { BasePin *This = impl_from_IPin(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, Id); + TRACE("(%p)->(%p)\n", This, Id); *Id = CoTaskMemAlloc((strlenW(This->pinInfo.achName) + 1) * sizeof(WCHAR)); if (!*Id) @@ -321,7 +321,7 @@ HRESULT WINAPI BasePinImpl_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnu { BasePin *This = impl_from_IPin(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, ppEnum); + TRACE("(%p)->(%p)\n", This, ppEnum); /* override this method to allow enumeration of your types */ @@ -332,7 +332,7 @@ HRESULT WINAPI BasePinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, { BasePin *This = impl_from_IPin(iface); - TRACE("(%p/%p)->(%p, %p)\n", This, iface, apPin, cPin); + TRACE("(%p)->(%p, %p)\n", This, apPin, cPin); return E_NOTIMPL; /* to tell caller that all input pins connected to all output pins */ } @@ -341,7 +341,7 @@ HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFER { BasePin *This = impl_from_IPin(iface); - TRACE("(%s, %s, %e)\n", wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); + TRACE("(%p)->(%s, %s, %e)\n", This, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); This->tStart = tStart; This->tStop = tStop; @@ -366,7 +366,7 @@ HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOI { BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface); - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -409,7 +409,7 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const HRESULT hr; BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface); - TRACE("(%p/%p)->(%p, %p)\n", This, iface, pReceivePin, pmt); + TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); dump_AM_MEDIA_TYPE(pmt); if (!pReceivePin) @@ -489,10 +489,9 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const return hr; } -HRESULT WINAPI BaseOutputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) +HRESULT WINAPI BaseOutputPinImpl_ReceiveConnection(IPin *iface, IPin *pin, const AM_MEDIA_TYPE *pmt) { - ERR("Incoming connection on an output pin! (%p, %p)\n", pReceivePin, pmt); - + ERR("(%p)->(%p, %p) incoming connection on an output pin!\n", iface, pin, pmt); return E_UNEXPECTED; } @@ -501,7 +500,7 @@ HRESULT WINAPI BaseOutputPinImpl_Disconnect(IPin * iface) HRESULT hr; BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface); - TRACE("()\n"); + TRACE("(%p)->()\n", This); EnterCriticalSection(This->pin.pCritSec); { @@ -528,7 +527,7 @@ HRESULT WINAPI BaseOutputPinImpl_Disconnect(IPin * iface) HRESULT WINAPI BaseOutputPinImpl_EndOfStream(IPin * iface) { - TRACE("()\n"); + TRACE("(%p)->()\n", iface); /* not supposed to do anything in an output pin */ @@ -557,7 +556,7 @@ HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin *This, IMediaSa { HRESULT hr; - TRACE("(%p, %p, %p, %x)\n", ppSample, tStart, tStop, dwFlags); + TRACE("(%p)->(%p, %p, %p, %x)\n", This, ppSample, tStart, tStop, dwFlags); if (!This->pin.pConnectedTo) hr = VFW_E_NOT_CONNECTED; @@ -717,7 +716,7 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BasePin* iface, IPin * pRecei HRESULT hr; IMemAllocator * pMemAlloc = NULL; - TRACE("(%p, %p)\n", pReceivePin, pmt); + TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); dump_AM_MEDIA_TYPE(pmt); if ((hr = This->pFuncsTable->base.pfnCheckMediaType(&This->pin, pmt)) != S_OK) @@ -769,7 +768,7 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BasePin* iface, IPin * pRecei static HRESULT OutputPin_Init(const IPinVtbl *OutputPin_Vtbl, const PIN_INFO * pPinInfo, const BaseOutputPinFuncTable* vtbl, LPCRITICAL_SECTION pCritSec, BaseOutputPin * pPinImpl) { - TRACE("\n"); + TRACE("(%p)\n", pPinImpl); /* Common attributes */ pPinImpl->pin.IPin_iface.lpVtbl = OutputPin_Vtbl; @@ -881,10 +880,9 @@ ULONG WINAPI BaseInputPinImpl_Release(IPin * iface) return refCount; } -HRESULT WINAPI BaseInputPinImpl_Connect(IPin * iface, IPin * pConnector, const AM_MEDIA_TYPE * pmt) +HRESULT WINAPI BaseInputPinImpl_Connect(IPin *iface, IPin *pin, const AM_MEDIA_TYPE *pmt) { - ERR("Outgoing connection on an input pin! (%p, %p)\n", pConnector, pmt); - + ERR("(%p)->(%p, %p) outgoing connection on an input pin!\n", iface, pin, pmt); return E_UNEXPECTED; } @@ -895,7 +893,7 @@ HRESULT WINAPI BaseInputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceiveP PIN_DIRECTION pindirReceive; HRESULT hr = S_OK; - TRACE("(%p, %p)\n", pReceivePin, pmt); + TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); dump_AM_MEDIA_TYPE(pmt); EnterCriticalSection(This->pin.pCritSec); @@ -940,7 +938,7 @@ HRESULT WINAPI BaseInputPinImpl_EndOfStream(IPin * iface) HRESULT hr = S_OK; BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); - TRACE("(%p)\n", This); + TRACE("(%p)->()\n", This); EnterCriticalSection(This->pin.pCritSec); if (This->flushing) @@ -963,7 +961,7 @@ HRESULT WINAPI BaseInputPinImpl_BeginFlush(IPin * iface) { BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); HRESULT hr; - TRACE("() semi-stub\n"); + TRACE("(%p) semi-stub\n", This); EnterCriticalSection(This->pin.pCritSec); This->flushing = TRUE; @@ -983,7 +981,7 @@ HRESULT WINAPI BaseInputPinImpl_EndFlush(IPin * iface) { BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); HRESULT hr; - TRACE("(%p)\n", This); + TRACE("(%p)->()\n", This); EnterCriticalSection(This->pin.pCritSec); This->flushing = This->end_of_stream = FALSE; @@ -1011,7 +1009,7 @@ HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); newsegmentargs args; - TRACE("(%s, %s, %e)\n", wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); + TRACE("(%p)->(%s, %s, %e)\n", This, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); args.tStart = This->pin.tStart = tStart; args.tStop = This->pin.tStop = tStop; @@ -1155,7 +1153,7 @@ static HRESULT InputPin_Init(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPi const BaseInputPinFuncTable* vtbl, LPCRITICAL_SECTION pCritSec, IMemAllocator *allocator, BaseInputPin * pPinImpl) { - TRACE("\n"); + TRACE("(%p)\n", pPinImpl); /* Common attributes */ pPinImpl->pin.refCount = 1;

1 0

Zebediah Figura : strmbase: Implement QueryAccept() on top of CheckMediaType() for output pins too.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: 10ff8f3082794dcda042c42645b43fadf71138a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10ff8f3082794dcda042c426… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 3 23:47:13 2018 -0500 strmbase: Implement QueryAccept() on top of CheckMediaType() for output pins too. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastream.c | 4 ++-- dlls/qcap/avimux.c | 8 +++++++- dlls/qcap/smartteefilter.c | 16 ++++++++++++++-- dlls/qcap/vfwcapture.c | 8 +++++++- dlls/quartz/filesource.c | 11 +++++------ dlls/quartz/parser.c | 10 +++++----- dlls/strmbase/pin.c | 13 +++---------- dlls/strmbase/renderer.c | 2 +- dlls/strmbase/transform.c | 10 ++++------ dlls/winegstreamer/gstdemux.c | 17 ++++++++--------- dlls/wineqtdecoder/qtsplitter.c | 8 +++++++- 11 files changed, 63 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=10ff8f3082794dcda042…

1 0

Zebediah Figura : strmbase: Check that the output pin supports the given media type before connecting.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: af717f342ba714807cab1207de25b9e51891f0de URL: https://source.winehq.org/git/wine.git/?a=commit;h=af717f342ba714807cab1207… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 3 23:47:12 2018 -0500 strmbase: Check that the output pin supports the given media type before connecting. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 48f2497..a3117dd 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -718,7 +718,8 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BasePin* iface, IPin * pRecei TRACE("(%p, %p)\n", pReceivePin, pmt); dump_AM_MEDIA_TYPE(pmt); - /* FIXME: call queryacceptproc */ + if ((hr = This->pFuncsTable->base.pfnCheckMediaType(&This->pin, pmt)) != S_OK) + return hr; This->pin.pConnectedTo = pReceivePin; IPin_AddRef(pReceivePin);

1 0

André Hentschel : ntoskrnl.exe/tests: Don' t test functions directly when reporting GetLastError().
by Alexandre Julliard 03 May '18

03 May '18

Module: wine Branch: master Commit: e637a6f0bf1eeba3e6be62c4e1c5688bb8f6102e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e637a6f0bf1eeba3e6be62c4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 3 19:27:55 2018 +0200 ntoskrnl.exe/tests: Don't test functions directly when reporting GetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 5887d94..40de760 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -68,8 +68,10 @@ static void unload_driver(SC_HANDLE service) ControlService(service, SERVICE_CONTROL_STOP, &status); while (status.dwCurrentState == SERVICE_STOP_PENDING) { + BOOL ret; Sleep(100); - ok(QueryServiceStatus(service, &status), "QueryServiceStatus failed: %u\n", GetLastError()); + ret = QueryServiceStatus(service, &status); + ok(ret, "QueryServiceStatus failed: %u\n", GetLastError()); } ok(status.dwCurrentState == SERVICE_STOPPED, "expected SERVICE_STOPPED, got %d\n", status.dwCurrentState); @@ -121,11 +123,13 @@ static SC_HANDLE load_driver(char *filename) ok(ret, "StartService failed: %u\n", GetLastError()); /* wait for the service to start up properly */ - ok(QueryServiceStatus(service, &status), "QueryServiceStatus failed: %u\n", GetLastError()); + ret = QueryServiceStatus(service, &status); + ok(ret, "QueryServiceStatus failed: %u\n", GetLastError()); while (status.dwCurrentState == SERVICE_START_PENDING) { Sleep(100); - ok(QueryServiceStatus(service, &status), "QueryServiceStatus failed: %u\n", GetLastError()); + ret = QueryServiceStatus(service, &status); + ok(ret, "QueryServiceStatus failed: %u\n", GetLastError()); } ok(status.dwCurrentState == SERVICE_RUNNING, "expected SERVICE_RUNNING, got %d\n", status.dwCurrentState); @@ -194,6 +198,7 @@ START_TEST(ntoskrnl) { char filename[MAX_PATH]; SC_HANDLE service; + BOOL ret; HMODULE hntdll = GetModuleHandleA("ntdll.dll"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); @@ -205,5 +210,6 @@ START_TEST(ntoskrnl) main_test(); unload_driver(service); - ok(DeleteFileA(filename), "DeleteFile failed: %u\n", GetLastError()); + ret = DeleteFileA(filename); + ok(ret, "DeleteFile failed: %u\n", GetLastError()); }

1 0

Alex Henrie : include: Add llabs.
by Alexandre Julliard 03 May '18

03 May '18

Module: wine Branch: master Commit: 8a9812b767bb0c3fe0dc20b9d2d49a55cae8e9f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a9812b767bb0c3fe0dc20b9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed May 2 19:53:17 2018 -0600 include: Add llabs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdlib.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index ae6cc83..3c9c4a7 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -198,6 +198,7 @@ void __cdecl exit(int); void __cdecl free(void*); char* __cdecl getenv(const char*); __msvcrt_long __cdecl labs(__msvcrt_long); +__int64 __cdecl llabs(__int64); void* __cdecl malloc(size_t); int __cdecl mblen(const char*,size_t); void __cdecl perror(const char*);

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2018