May 2018 - Wine-Commits - list.winehq.org

Michael Müller : combase: Add stub for RoRegisterForApartmentShutdown.
by Alexandre Julliard May 4, 2018

May 4, 2018

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

Zebediah Figura : strmbase: Check that the output pin supports the given media type before connecting.
by Alexandre Julliard May 4, 2018

May 4, 2018

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

Zebediah Figura : msi: Disable WoW redirection when installing a 64-bit package.
by Alexandre Julliard May 4, 2018

May 4, 2018

Module: wine Branch: master Commit: 540c48b91175b11c7b8646d0a036b20c46425080 URL: https://source.winehq.org/git/wine.git/?a=commit;h=540c48b91175b11c7b8646d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 4 00:17:39 2018 -0500 msi: Disable WoW redirection when installing a 64-bit package. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 8 ++++ dlls/msi/tests/install.c | 101 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 104 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 67dfbe4..7197bca 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7855,8 +7855,12 @@ StandardActions[] = static UINT ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action) { UINT rc = ERROR_FUNCTION_NOT_CALLED; + void *cookie; UINT i; + if (is_wow64 && package->platform == PLATFORM_X64) + Wow64DisableWow64FsRedirection(&cookie); + i = 0; while (StandardActions[i].action != NULL) { @@ -7891,6 +7895,10 @@ static UINT ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action) } i++; } + + if (is_wow64 && package->platform == PLATFORM_X64) + Wow64RevertWow64FsRedirection(cookie); + return rc; } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 5c83d30..ac2c837 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -48,6 +48,8 @@ static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); static BOOL (WINAPI *pOpenProcessToken)( HANDLE, DWORD, PHANDLE ); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); +static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(void *); static HMODULE hsrclient = 0; static BOOL (WINAPI *pSRRemoveRestorePoint)(DWORD); @@ -1334,6 +1336,18 @@ static const char da_install_exec_seq_dat[] = "immediate\t\t800\n" "InstallFinalize\t\t1100\n"; +static const CHAR x64_directory_dat[] = + "Directory\tDirectory_Parent\tDefaultDir\n" + "s72\tS72\tl255\n" + "Directory\tDirectory\n" + "CABOUTDIR\tMSITESTDIR\tcabout\n" + "CHANGEDDIR\tMSITESTDIR\tchanged:second\n" + "FIRSTDIR\tMSITESTDIR\tfirst\n" + "MSITESTDIR\tProgramFiles64Folder\tmsitest\n" + "NEWDIR\tCABOUTDIR\tnew\n" + "ProgramFiles64Folder\tTARGETDIR\t.\n" + "TARGETDIR\t\tSourceDir"; + typedef struct _msi_table { const CHAR *filename; @@ -2015,6 +2029,18 @@ static const msi_table da_tables[] = ADD_TABLE(da_custom_action), }; +static const msi_table x64_tables[] = +{ + ADD_TABLE(media), + ADD_TABLE(x64_directory), + ADD_TABLE(file), + ADD_TABLE(component), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(property), + ADD_TABLE(install_exec_seq), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -2145,6 +2171,8 @@ static void init_functionpointers(void) GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hkernel32, IsWow64Process) + GET_PROC(hkernel32, Wow64DisableWow64FsRedirection); + GET_PROC(hkernel32, Wow64RevertWow64FsRedirection); hsrclient = LoadLibraryA("srclient.dll"); GET_PROC(hsrclient, SRRemoveRestorePoint); @@ -2330,7 +2358,8 @@ static BOOL get_system_dirs(void) HKEY hkey; DWORD type, size; - if (RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &hkey)) + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", + 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &hkey)) return FALSE; size = MAX_PATH; @@ -5693,16 +5722,16 @@ static void test_package_validation(void) r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_INSTALL_PACKAGE_INVALID, "Expected ERROR_INSTALL_PACKAGE_INVALID, got %u\n", r); - ok(!delete_pf_native("msitest\\maximus", TRUE), "file exists\n"); - ok(!delete_pf_native("msitest", FALSE), "directory exists\n"); + ok(!delete_pf("msitest\\maximus", TRUE), "file exists\n"); + ok(!delete_pf("msitest", FALSE), "directory exists\n"); DeleteFileA(msifile); create_database_template(msifile, pv_tables, sizeof(pv_tables)/sizeof(msi_table), 200, "x64;0"); r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf_native("msitest\\maximus", TRUE), "file exists\n"); - ok(delete_pf_native("msitest", FALSE), "directory exists\n"); + ok(delete_pf("msitest\\maximus", TRUE), "file exists\n"); + ok(delete_pf("msitest", FALSE), "directory exists\n"); } else { @@ -6124,6 +6153,67 @@ error: DeleteFileA(msifile); } +static void test_wow64(void) +{ + void *cookie; + UINT r; + + if (!is_wow64) + { + skip("test must be run on WoW64\n"); + return; + } + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + + create_test_files(); + create_database_template(msifile, x64_tables, sizeof(x64_tables)/sizeof(msi_table), 200, "x64;0"); + r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } + + pWow64DisableWow64FsRedirection(&cookie); + + ok(!delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\cabout\\new", FALSE), "Directory created\n"); + ok(!delete_pf("msitest\\cabout\\four.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\cabout", FALSE), "Directory created\n"); + ok(!delete_pf("msitest\\changed\\three.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\changed", FALSE), "Directory created\n"); + ok(!delete_pf("msitest\\first\\two.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\first", FALSE), "Directory created\n"); + ok(!delete_pf("msitest\\one.txt", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\filename", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\service.exe", TRUE), "File installed\n"); + ok(!delete_pf("msitest", FALSE), "Directory created\n"); + + ok(delete_pf_native("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\cabout\\new", FALSE), "Directory not created\n"); + ok(delete_pf_native("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\cabout", FALSE), "Directory not created\n"); + ok(delete_pf_native("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\changed", FALSE), "Directory not created\n"); + ok(delete_pf_native("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\first", FALSE), "Directory not created\n"); + ok(delete_pf_native("msitest\\one.txt", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\filename", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf_native("msitest", FALSE), "Directory not created\n"); + + pWow64RevertWow64FsRedirection(cookie); + +error: + delete_test_files(); + DeleteFileA(msifile); +} + START_TEST(install) { DWORD len; @@ -6217,6 +6307,7 @@ START_TEST(install) test_remove_upgrade_code(); test_feature_tree(); test_deferred_action(); + test_wow64(); DeleteFileA(customdll);

1 0

Zebediah Figura : strmbase: Implement QueryAccept() on top of CheckMediaType() for output pins too.
by Alexandre Julliard May 4, 2018

May 4, 2018

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: Consistently trace the BasePin object.
by Alexandre Julliard May 4, 2018

May 4, 2018

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

Dmitry Timoshkov : schedsvc: Also watch for job file modifications.
by Alexandre Julliard May 4, 2018

May 4, 2018

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

Alex Henrie : include: Add lldiv and lldiv_t.
by Alexandre Julliard May 4, 2018

May 4, 2018

Module: wine Branch: master Commit: b8c27cca3719cff353acc4a52b9e4a9d3d8a4a6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8c27cca3719cff353acc4a5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu May 3 21:44:24 2018 -0600 include: Add lldiv and lldiv_t. 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 3c9c4a7..2db48c5 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -60,6 +60,11 @@ typedef struct _ldiv_t { __msvcrt_long rem; } ldiv_t; +typedef struct _lldiv_t { + __int64 quot; + __int64 rem; +} lldiv_t; + #define _countof(x) (sizeof(x)/sizeof((x)[0])) @@ -194,6 +199,7 @@ void* __cdecl calloc(size_t,size_t); div_t __cdecl div(int,int); ldiv_t __cdecl ldiv(__msvcrt_long,__msvcrt_long); #endif +lldiv_t __cdecl lldiv(__int64,__int64); void __cdecl exit(int); void __cdecl free(void*); char* __cdecl getenv(const char*);

1 0

Zebediah Figura : msi: Check return value of GetBinaryType().
by Alexandre Julliard May 4, 2018

May 4, 2018

Module: wine Branch: master Commit: deb4f970009d6fd85a61d3183877e67e1ccf66fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=deb4f970009d6fd85a61d318… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 4 00:32:57 2018 -0500 msi: Check return value of GetBinaryType(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index ca0362b..956b3e9 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -585,6 +585,7 @@ static DWORD WINAPI DllThread( LPVOID arg ) void *cookie; BOOL wow64; DWORD arch; + BOOL ret; DWORD rc; TRACE("custom action (%x) started\n", GetCurrentThreadId() ); @@ -607,9 +608,9 @@ static DWORD WINAPI DllThread( LPVOID arg ) } info = find_action_by_guid(guid); - GetBinaryTypeW(info->source, &arch); + ret = GetBinaryTypeW(info->source, &arch); - if (sizeof(void *) == 8 && arch == SCS_32BIT_BINARY) + if (sizeof(void *) == 8 && ret && arch == SCS_32BIT_BINARY) GetSystemWow64DirectoryW(buffer, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); else GetSystemDirectoryW(buffer, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR));

1 0

Alex Henrie : include: Add strtoll, strtoll_l, strtoull, and strtoull_l.
by Alexandre Julliard May 3, 2018

May 3, 2018

Module: wine Branch: master Commit: 7ad8608ffbce7976b90ff3e9b4f89cb4094418e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ad8608ffbce7976b90ff3e9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed May 2 19:53:16 2018 -0600 include: Add strtoll, strtoll_l, strtoull, and strtoull_l. 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index 745f214..ae6cc83 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -210,6 +210,10 @@ double __cdecl strtod(const char*,char**); double __cdecl strtold(const char*,char**); __msvcrt_long __cdecl strtol(const char*,char**,int); __msvcrt_ulong __cdecl strtoul(const char*,char**,int); +__int64 __cdecl strtoll(const char*,char**,int); +__int64 __cdecl strtoll_l(const char*,char**,int,_locale_t); +unsigned __int64 __cdecl strtoull(const char*,char**,int); +unsigned __int64 __cdecl strtoull_l(const char*,char**,int,_locale_t); __int64 __cdecl _strtoi64(const char*,char**,int); __int64 __cdecl _strtoi64_l(const char*,char**,int,_locale_t); unsigned __int64 __cdecl _strtoui64(const char*,char**,int);

1 0

Hans Leidekker : winhttp: Fix invalid option error returned from WinHttpSetOption.
by Alexandre Julliard May 3, 2018

May 3, 2018

Module: wine Branch: master Commit: 0b61334b9d6392e8c8a9772d762efaf0c2eb0835 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b61334b9d6392e8c8a9772d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 3 13:30:21 2018 +0200 winhttp: Fix invalid option error returned from WinHttpSetOption. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 6 +++--- dlls/winhttp/tests/winhttp.c | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index b54e77b..c878d68 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -225,7 +225,7 @@ static BOOL session_set_option( object_header_t *hdr, DWORD option, LPVOID buffe return TRUE; default: FIXME("unimplemented option %u\n", option); - set_last_error( ERROR_INVALID_PARAMETER ); + set_last_error( ERROR_WINHTTP_INVALID_OPTION ); return FALSE; } } @@ -1024,8 +1024,8 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe return TRUE; default: FIXME("unimplemented option %u\n", option); - set_last_error( ERROR_INVALID_PARAMETER ); - return TRUE; + set_last_error( ERROR_WINHTTP_INVALID_OPTION ); + return FALSE; } } diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 4399cf6..302974c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2267,12 +2267,36 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(ses, 0, buffer, sizeof(buffer)); + ok(!ret && GetLastError() == ERROR_WINHTTP_INVALID_OPTION, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(ses, 0, buffer, &size); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + con = WinHttpConnect(ses, localhostW, port, 0); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(con, 0, buffer, sizeof(buffer)); + todo_wine ok(!ret && GetLastError() == ERROR_WINHTTP_INVALID_OPTION, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(con, 0, buffer, &size); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + req = WinHttpOpenRequest(con, verb, path, NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(req, 0, buffer, sizeof(buffer)); + ok(!ret && GetLastError() == ERROR_WINHTTP_INVALID_OPTION, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(req, 0, buffer, &size); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %u\n", GetLastError()); + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); ok(ret, "failed to send request %u\n", GetLastError());

1 0