June 2020 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : directmanipulation: Implement IDirectManipulationPrimaryContent stub interface.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: 302164c759dc42f25e1ed3501845ab86a899f714 URL: https://source.winehq.org/git/wine.git/?a=commit;h=302164c759dc42f25e1ed350… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 23 11:34:16 2019 +1000 directmanipulation: Implement IDirectManipulationPrimaryContent stub interface. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/directmanipulation.c | 155 ++++++++++++++++++++++++++- 1 file changed, 154 insertions(+), 1 deletion(-) diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index fac105a7cd..f901d58aa9 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -177,6 +177,142 @@ static HRESULT create_update_manager(IDirectManipulationUpdateManager **obj) return S_OK; } + +struct primarycontext +{ + IDirectManipulationPrimaryContent IDirectManipulationPrimaryContent_iface; + LONG ref; +}; + +static inline struct primarycontext *impl_from_IDirectManipulationPrimaryContent(IDirectManipulationPrimaryContent *iface) +{ + return CONTAINING_RECORD(iface, struct primarycontext, IDirectManipulationPrimaryContent_iface); +} + +static HRESULT WINAPI primary_QueryInterface(IDirectManipulationPrimaryContent *iface, REFIID riid, void **ppv) +{ + struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface); + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppv); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDirectManipulationPrimaryContent)) + { + IDirectManipulationPrimaryContent_AddRef(&This->IDirectManipulationPrimaryContent_iface); + *ppv = &This->IDirectManipulationPrimaryContent_iface; + return S_OK; + } + + FIXME("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI primary_AddRef(IDirectManipulationPrimaryContent *iface) +{ + struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI primary_Release(IDirectManipulationPrimaryContent *iface) +{ + struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI primary_SetSnapInterval(IDirectManipulationPrimaryContent *iface, DIRECTMANIPULATION_MOTION_TYPES motion, + float interval, float offset) +{ + struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface); + FIXME("%p, %d, %f, %f\n", This, motion, interval, offset); + return E_NOTIMPL; +} + +static HRESULT WINAPI primary_SetSnapPoints(IDirectManipulationPrimaryContent *iface, DIRECTMANIPULATION_MOTION_TYPES motion, + const float *points, DWORD count) +{ + struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface); + FIXME("%p, %d, %p, %d\n", This, motion, points, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI primary_SetSnapType(IDirectManipulationPrimaryContent *iface, DIRECTMANIPULATION_MOTION_TYPES motion, + DIRECTMANIPULATION_SNAPPOINT_TYPE type) +{ + struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface); + FIXME("%p, %d, %d\n", This, motion, type); + return E_NOTIMPL; +} + +static HRESULT WINAPI primary_SetSnapCoordinate(IDirectManipulationPrimaryContent *iface, DIRECTMANIPULATION_MOTION_TYPES motion, + DIRECTMANIPULATION_SNAPPOINT_COORDINATE coordinate, float origin) +{ + struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface); + FIXME("%p, %d, %d, %f\n", This, motion, coordinate, origin); + return E_NOTIMPL; +} + +static HRESULT WINAPI primary_SetZoomBoundaries(IDirectManipulationPrimaryContent *iface, float minimum, float maximum) +{ + struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface); + FIXME("%p, %f, %f\n", This, minimum, maximum); + return E_NOTIMPL; +} + +static HRESULT WINAPI primary_SetHorizontalAlignment(IDirectManipulationPrimaryContent *iface, DIRECTMANIPULATION_HORIZONTALALIGNMENT alignment) +{ + struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface); + FIXME("%p, %d\n", This, alignment); + return E_NOTIMPL; +} + +static HRESULT WINAPI primary_SetVerticalAlignment(IDirectManipulationPrimaryContent *iface, DIRECTMANIPULATION_VERTICALALIGNMENT alignment) +{ + struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface); + FIXME("%p, %d\n", This, alignment); + return E_NOTIMPL; +} + +static HRESULT WINAPI primary_GetInertiaEndTransform(IDirectManipulationPrimaryContent *iface, float *matrix, DWORD count) +{ + struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface); + FIXME("%p, %p, %d\n", This, matrix, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI primary_GetCenterPoint(IDirectManipulationPrimaryContent *iface, float *x, float *y) +{ + struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface); + FIXME("%p, %p, %p\n", This, x, y); + return E_NOTIMPL; +} + +static const IDirectManipulationPrimaryContentVtbl primaryVtbl = +{ + primary_QueryInterface, + primary_AddRef, + primary_Release, + primary_SetSnapInterval, + primary_SetSnapPoints, + primary_SetSnapType, + primary_SetSnapCoordinate, + primary_SetZoomBoundaries, + primary_SetHorizontalAlignment, + primary_SetVerticalAlignment, + primary_GetInertiaEndTransform, + primary_GetCenterPoint +}; + struct directviewport { IDirectManipulationViewport2 IDirectManipulationViewport2_iface; @@ -327,7 +463,24 @@ static HRESULT WINAPI viewport_SyncDisplayTransform(IDirectManipulationViewport2 static HRESULT WINAPI viewport_GetPrimaryContent(IDirectManipulationViewport2 *iface, REFIID riid, void **object) { struct directviewport *This = impl_from_IDirectManipulationViewport2(iface); - FIXME("%p, %s, %p\n", This, debugstr_guid(riid), object); + TRACE("%p, %s, %p\n", This, debugstr_guid(riid), object); + if(IsEqualGUID(riid, &IID_IDirectManipulationPrimaryContent)) + { + struct primarycontext *primary; + TRACE("IDirectManipulationPrimaryContent\n"); + primary = heap_alloc( sizeof(*primary)); + if(!primary) + return E_OUTOFMEMORY; + + primary->IDirectManipulationPrimaryContent_iface.lpVtbl = &primaryVtbl; + primary->ref = 1; + + *object = &primary->IDirectManipulationPrimaryContent_iface; + + return S_OK; + } + else + FIXME("Unsupported interface %s\n", debugstr_guid(riid)); return E_NOTIMPL; }

1 0

Alistair Leslie-Hughes : directmanipulation: Implement IDirectManipulationContent stub interface.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: 7171a63f06c39b1ec5f5c2933290b8c78dd11745 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7171a63f06c39b1ec5f5c293… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Dec 22 19:35:25 2019 +1100 directmanipulation: Implement IDirectManipulationContent stub interface. Based on patch by Gijs Vermeulen. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/directmanipulation.c | 110 ++++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 1 deletion(-) diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index f901d58aa9..dd2fdda69a 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -177,10 +177,10 @@ static HRESULT create_update_manager(IDirectManipulationUpdateManager **obj) return S_OK; } - struct primarycontext { IDirectManipulationPrimaryContent IDirectManipulationPrimaryContent_iface; + IDirectManipulationContent IDirectManipulationContent_iface; LONG ref; }; @@ -189,6 +189,11 @@ static inline struct primarycontext *impl_from_IDirectManipulationPrimaryContent return CONTAINING_RECORD(iface, struct primarycontext, IDirectManipulationPrimaryContent_iface); } +static inline struct primarycontext *impl_from_IDirectManipulationContent(IDirectManipulationContent *iface) +{ + return CONTAINING_RECORD(iface, struct primarycontext, IDirectManipulationContent_iface); +} + static HRESULT WINAPI primary_QueryInterface(IDirectManipulationPrimaryContent *iface, REFIID riid, void **ppv) { struct primarycontext *This = impl_from_IDirectManipulationPrimaryContent(iface); @@ -201,6 +206,12 @@ static HRESULT WINAPI primary_QueryInterface(IDirectManipulationPrimaryContent * *ppv = &This->IDirectManipulationPrimaryContent_iface; return S_OK; } + else if(IsEqualGUID(riid, &IID_IDirectManipulationContent)) + { + IUnknown_AddRef(iface); + *ppv = &This->IDirectManipulationContent_iface; + return S_OK; + } FIXME("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppv); return E_NOINTERFACE; @@ -313,6 +324,102 @@ static const IDirectManipulationPrimaryContentVtbl primaryVtbl = primary_GetCenterPoint }; + +static HRESULT WINAPI content_QueryInterface(IDirectManipulationContent *iface, REFIID riid, void **ppv) +{ + struct primarycontext *This = impl_from_IDirectManipulationContent(iface); + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppv); + + return IDirectManipulationPrimaryContent_QueryInterface(&This->IDirectManipulationPrimaryContent_iface, + riid, ppv); +} + +static ULONG WINAPI content_AddRef(IDirectManipulationContent *iface) +{ + struct primarycontext *This = impl_from_IDirectManipulationContent(iface); + return IDirectManipulationPrimaryContent_AddRef(&This->IDirectManipulationPrimaryContent_iface); +} + +static ULONG WINAPI content_Release(IDirectManipulationContent *iface) +{ + struct primarycontext *This = impl_from_IDirectManipulationContent(iface); + return IDirectManipulationPrimaryContent_Release(&This->IDirectManipulationPrimaryContent_iface); +} + +static HRESULT WINAPI content_GetContentRect(IDirectManipulationContent *iface, RECT *size) +{ + struct primarycontext *This = impl_from_IDirectManipulationContent(iface); + FIXME("%p, %p\n", This, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI content_SetContentRect(IDirectManipulationContent *iface, const RECT *size) +{ + struct primarycontext *This = impl_from_IDirectManipulationContent(iface); + FIXME("%p, %p\n", This, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI content_GetViewport(IDirectManipulationContent *iface, REFIID riid, void **object) +{ + struct primarycontext *This = impl_from_IDirectManipulationContent(iface); + FIXME("%p, %p, %p\n", This, debugstr_guid(riid), object); + return E_NOTIMPL; +} + +static HRESULT WINAPI content_GetTag(IDirectManipulationContent *iface, REFIID riid, void **object, UINT32 *id) +{ + struct primarycontext *This = impl_from_IDirectManipulationContent(iface); + FIXME("%p, %p, %p, %p\n", This, debugstr_guid(riid), object, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI content_SetTag(IDirectManipulationContent *iface, IUnknown *object, UINT32 id) +{ + struct primarycontext *This = impl_from_IDirectManipulationContent(iface); + FIXME("%p, %p, %d\n", This, object, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI content_GetOutputTransform(IDirectManipulationContent *iface, + float *matrix, DWORD count) +{ + struct primarycontext *This = impl_from_IDirectManipulationContent(iface); + FIXME("%p, %p, %d\n", This, matrix, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI content_GetContentTransform(IDirectManipulationContent *iface, + float *matrix, DWORD count) +{ + struct primarycontext *This = impl_from_IDirectManipulationContent(iface); + FIXME("%p, %p, %d\n", This, matrix, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI content_SyncContentTransform(IDirectManipulationContent *iface, + const float *matrix, DWORD count) +{ + struct primarycontext *This = impl_from_IDirectManipulationContent(iface); + FIXME("%p, %p, %d\n", This, matrix, count); + return E_NOTIMPL; +} + +static const IDirectManipulationContentVtbl contentVtbl = +{ + content_QueryInterface, + content_AddRef, + content_Release, + content_GetContentRect, + content_SetContentRect, + content_GetViewport, + content_GetTag, + content_SetTag, + content_GetOutputTransform, + content_GetContentTransform, + content_SyncContentTransform +}; + struct directviewport { IDirectManipulationViewport2 IDirectManipulationViewport2_iface; @@ -473,6 +580,7 @@ static HRESULT WINAPI viewport_GetPrimaryContent(IDirectManipulationViewport2 *i return E_OUTOFMEMORY; primary->IDirectManipulationPrimaryContent_iface.lpVtbl = &primaryVtbl; + primary->IDirectManipulationContent_iface.lpVtbl = &contentVtbl; primary->ref = 1; *object = &primary->IDirectManipulationPrimaryContent_iface;

1 0

Nikolay Sivov : mfplat: Implement GetVideoFormat().
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: cb43efe901ab03bc90895b9559f501e8f035fce1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb43efe901ab03bc90895b95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 23 14:29:05 2020 +0300 mfplat: Implement GetVideoFormat(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 66722a84b6..843c09c5e0 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -38,6 +38,7 @@ struct media_type struct attributes attributes; IMFMediaType IMFMediaType_iface; IMFVideoMediaType IMFVideoMediaType_iface; + MFVIDEOFORMAT *video_format; }; struct stream_desc @@ -648,6 +649,7 @@ static ULONG WINAPI video_mediatype_Release(IMFVideoMediaType *iface) if (!refcount) { clear_attributes_object(&media_type->attributes); + CoTaskMemFree(media_type->video_format); heap_free(media_type); } @@ -971,9 +973,17 @@ static HRESULT WINAPI video_mediatype_FreeRepresentation(IMFVideoMediaType *ifac static const MFVIDEOFORMAT * WINAPI video_mediatype_GetVideoFormat(IMFVideoMediaType *iface) { - FIXME("%p.\n", iface); + struct media_type *media_type = impl_from_IMFVideoMediaType(iface); + unsigned int size; + HRESULT hr; + + TRACE("%p.\n", iface); + + CoTaskMemFree(media_type->video_format); + if (FAILED(hr = MFCreateMFVideoFormatFromMFMediaType((IMFMediaType *)iface, &media_type->video_format, &size))) + WARN("Failed to create format description, hr %#x.\n", hr); - return NULL; + return media_type->video_format; } static HRESULT WINAPI video_mediatype_GetVideoRepresentation(IMFVideoMediaType *iface, GUID representation,

1 0

Nikolay Sivov : dxva2: Implement DXVA2CreateVideoService().
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: e0b5edf8964ed320fb628cd97bd1bf9b0aa90b0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0b5edf8964ed320fb628cd9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 23 14:31:17 2020 +0300 dxva2: Implement DXVA2CreateVideoService(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 38 ++++++++++++++++++++++++++------------ dlls/dxva2/tests/dxva2.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 13 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 7ba8d9806b..bbee697674 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -101,6 +101,7 @@ static HRESULT WINAPI device_manager_processor_service_QueryInterface(IDirectXVi REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IDirectXVideoProcessorService) || + IsEqualIID(riid, &IID_IDirectXVideoAccelerationService) || IsEqualIID(riid, &IID_IUnknown)) { *obj = iface; @@ -401,16 +402,9 @@ static HRESULT WINAPI device_manager_GetVideoService(IDirect3DDeviceManager9 *if hr = DXVA2_E_NEW_VIDEO_DEVICE; else if (!(flags & HANDLE_FLAG_OPEN)) hr = E_HANDLE; - else if (IsEqualIID(riid, &IID_IDirectXVideoProcessorService)) - { - *obj = &manager->IDirectXVideoProcessorService_iface; - IUnknown_AddRef((IUnknown *)*obj); - } else - { - WARN("Unsupported service %s.\n", debugstr_guid(riid)); - hr = E_UNEXPECTED; - } + hr = IDirectXVideoProcessorService_QueryInterface(&manager->IDirectXVideoProcessorService_iface, + riid, obj); } LeaveCriticalSection(&manager->cs); @@ -462,11 +456,31 @@ HRESULT WINAPI DXVA2CreateDirect3DDeviceManager9(UINT *token, IDirect3DDeviceMan return S_OK; } -HRESULT WINAPI DXVA2CreateVideoService( IDirect3DDevice9 *device, REFIID riid, void **ppv ) +HRESULT WINAPI DXVA2CreateVideoService(IDirect3DDevice9 *device, REFIID riid, void **obj) { - FIXME("(%p, %s, %p): stub\n", device, debugstr_guid(riid), ppv); + IDirect3DDeviceManager9 *manager; + HANDLE handle; + HRESULT hr; + UINT token; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", device, debugstr_guid(riid), obj); + + if (FAILED(hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager))) + return hr; + + if (FAILED(hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token))) + goto done; + + if (FAILED(hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle))) + goto done; + + hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, riid, obj); + IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); + +done: + IDirect3DDeviceManager9_Release(manager); + + return hr; } BOOL WINAPI DegaussMonitor( HMONITOR monitor ) diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 65771fb587..e3e8dd2e66 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -62,8 +62,10 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window) static void test_device_manager(void) { IDirectXVideoProcessorService *processor_service; - IDirect3DDevice9 *device, *device2; + IDirectXVideoAccelerationService *accel_service; + IDirect3DDevice9 *device, *device2, *device3; IDirect3DDeviceManager9 *manager; + IDirect3DSurface9 *surface; int refcount, refcount2; HANDLE handle, handle1; IDirect3D9 *d3d; @@ -148,6 +150,46 @@ static void test_device_manager(void) hr = IDirect3DDeviceManager9_TestDevice(manager, handle); ok(hr == DXVA2_E_NEW_VIDEO_DEVICE, "Unexpected hr %#x.\n", hr); + /* Acceleration service. */ + hr = DXVA2CreateVideoService(device, &IID_IDirectXVideoAccelerationService, (void **)&accel_service); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 1, D3DFMT_X8R8G8B8, + D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL); +todo_wine + ok(hr == S_OK, "Failed to create a surface, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IDirect3DSurface9_Release(surface); + + IDirectXVideoAccelerationService_Release(accel_service); + + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoAccelerationService, + (void **)&accel_service); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirectXVideoAccelerationService_CreateSurface(accel_service, 64, 64, 1, D3DFMT_X8R8G8B8, + D3DPOOL_DEFAULT, 0, DXVA2_VideoProcessorRenderTarget, &surface, NULL); +todo_wine + ok(hr == S_OK, "Failed to create a surface, hr %#x.\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IDirect3DSurface9_GetDevice(surface, &device3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(device2 == device3, "Unexpected device.\n"); + IDirect3DDevice9_Release(device3); + + IDirect3DSurface9_Release(surface); + } + + IDirectXVideoAccelerationService_Release(accel_service); + IDirect3DDevice9_Release(device); IDirect3DDevice9_Release(device2);

1 0

Huw Davies : user32: Use a default name for winstations created or opened with no name.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: 6e69e512d8bdca853adb6f58411ac7261dd7aaef URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e69e512d8bdca853adb6f58… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 23 12:56:39 2020 +0100 user32: Use a default name for winstations created or opened with no name. The default is of the form "Service-0x<luid high>-<luid low>$" where the luid in question is the logon session luid. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/winstation.c | 24 +++++++++++++++++++----- dlls/user32/winstation.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 4aa5565b96..d239ead6e9 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -118,9 +118,10 @@ static void test_handles(void) HANDLE hthread; DWORD id, flags, le; ATOM atom; - char buffer[20]; + char buffer[29], default_name[29] = ""; DWORD size; BOOL ret; + TOKEN_STATISTICS token_stats; /* win stations */ @@ -215,7 +216,6 @@ static void test_handles(void) SetLastError( 0xdeadbeef ); w2 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS ); ok( !w2, "open station succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); @@ -225,16 +225,30 @@ static void test_handles(void) memset( buffer, 0, sizeof(buffer) ); ret = GetUserObjectInformationA( w2, UOI_NAME, buffer, sizeof(buffer), &size ); ok( ret, "GetUserObjectInformationA failed with error %u\n", GetLastError() ); - todo_wine ok( !memcmp(buffer, "Service-0x0-", 12), "unexpected window station name '%s'\n", buffer ); - todo_wine ok( buffer[strlen(buffer) - 1] == '$', "unexpected window station name '%s'\n", buffer ); + /* Get the logon session LUID */ + ret = GetTokenInformation( GetCurrentProcessToken(), TokenStatistics, &token_stats, sizeof(token_stats), NULL ); + if (ret) + sprintf( default_name, "Service-0x%x-%x$", token_stats.AuthenticationId.HighPart, + token_stats.AuthenticationId.LowPart ); + if (*default_name) + ok( !strcmp( buffer, default_name ), "unexpected window station name '%s' expected '%s'\n", buffer, default_name ); SetLastError( 0xdeadbeef ); w3 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS ); - todo_wine ok( w3 != 0, "open station failed err %u\n", GetLastError() ); CloseWindowStation( w3 ); CloseWindowStation( w2 ); + w2 = CreateWindowStationA( NULL, 0, WINSTA_ALL_ACCESS, NULL ); + ok( w2 != 0, "create station failed err %u\n", GetLastError() ); + + memset( buffer, 0, sizeof(buffer) ); + ret = GetUserObjectInformationA( w2, UOI_NAME, buffer, sizeof(buffer), &size ); + ok( ret, "GetUserObjectInformationA failed with error %u\n", GetLastError() ); + if (*default_name) + ok( !strcmp( buffer, default_name ), "unexpected window station name '%s' expected '%s'\n", buffer, default_name ); + CloseWindowStation( w2 ); + SetLastError( 0xdeadbeef ); w2 = CreateWindowStationA( "foo\\bar", 0, WINSTA_ALL_ACCESS, NULL ); ok( !w2, "create station succeeded\n" ); diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 4f53b43bd6..b5d5a372fa 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -80,6 +80,30 @@ static HANDLE get_winstations_dir_handle(void) return handle; } +static BOOL WINAPI winstation_default_name_once( INIT_ONCE *once, void *param, void **context ) +{ + static const WCHAR fmt[] = {'S','e','r','v','i','c','e','-','0','x','%','x','-','%','x','$',0}; + WCHAR *name = (WCHAR *)param; + TOKEN_STATISTICS stats; + BOOL ret; + + ret = GetTokenInformation( GetCurrentProcessToken(), TokenStatistics, &stats, sizeof(stats), NULL ); + if (ret) + sprintfW( name, fmt, stats.AuthenticationId.HighPart, stats.AuthenticationId.LowPart ); + + return ret; +} + +static const WCHAR *get_winstation_default_name( void ) +{ + static INIT_ONCE once = INIT_ONCE_STATIC_INIT; + static WCHAR name[29]; + BOOL ret; + + ret = InitOnceExecuteOnce( &once, winstation_default_name_once, name, NULL ); + return ret ? name : NULL; +} + /*********************************************************************** * CreateWindowStationA (USER32.@) */ @@ -113,6 +137,11 @@ HWINSTA WINAPI CreateWindowStationW( LPCWSTR name, DWORD flags, ACCESS_MASK acce SetLastError( ERROR_FILENAME_EXCED_RANGE ); return 0; } + if (!len) + { + name = get_winstation_default_name(); + len = strlenW( name ); + } SERVER_START_REQ( create_winstation ) { req->flags = 0; @@ -160,6 +189,11 @@ HWINSTA WINAPI OpenWindowStationW( LPCWSTR name, BOOL inherit, ACCESS_MASK acces SetLastError( ERROR_FILENAME_EXCED_RANGE ); return 0; } + if (!len) + { + name = get_winstation_default_name(); + len = strlenW( name ); + } SERVER_START_REQ( open_winstation ) { req->access = access;

1 0

Paul Gofman : shell32: Only consider copy operation multidest if the number of dst files is greater than one.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: e2f456cfe57de42259cca8155a56854a0f170844 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2f456cfe57de42259cca815… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 23 15:09:01 2020 +0300 shell32: Only consider copy operation multidest if the number of dst files is greater than one. Fixes crash on start in Worms World Party Remastered. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlfileop.c | 2 +- dlls/shell32/tests/shlfileop.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index b941db3914..38c582be09 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1207,7 +1207,7 @@ static int copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST *fl fileDest = &flTo->feFiles[0]; } - if (op->req->fFlags & FOF_MULTIDESTFILES) + if (op->req->fFlags & FOF_MULTIDESTFILES && flTo->dwNumFiles > 1) { if (flFrom->bAnyFromWildcard) return ERROR_CANCELLED; diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 27c7244042..36602f335d 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1816,6 +1816,15 @@ static void test_copy(void) CreateDirectoryA("one", NULL); CreateDirectoryA("two", NULL); + /* Test with FOF_MULTIDESTFILES with a wildcard in pFrom and single output directory. */ + shfo.pFrom = "a*.txt\0"; + shfo.pTo = "one\0"; + shfo.fFlags |= FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI | FOF_MULTIDESTFILES; + retval = SHFileOperationA(&shfo); + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(DeleteFileA("one\\aa.txt"), "Expected file to exist\n"); + ok(DeleteFileA("one\\ab.txt"), "Expected file to exist\n"); + /* pFrom has a glob, pTo has more than one dest */ shfo.pFrom = "a*.txt\0"; shfo.pTo = "one\0two\0";

1 0

Alexandre Julliard : ntdll: Add a common helper for building a modref.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: 99649d78927bb911b8a9022c8f362e0a7d9c7ea9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99649d78927bb911b8a9022c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 23 12:29:19 2020 +0200 ntdll: Add a common helper for building a modref. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 296 ++++++++++++++++++++++------------------------------ 1 file changed, 127 insertions(+), 169 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=99649d78927bb911b8a9…

1 0

Alexandre Julliard : ntdll: Move the loading of .so dlls to the Unix library.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: 31538a79a90653afb8bc7744506989c8811a800d URL: https://source.winehq.org/git/wine.git/?a=commit;h=31538a79a90653afb8bc7744… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 23 19:39:12 2020 +0200 ntdll: Move the loading of .so dlls to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 300 ++++++----------------------------------- dlls/ntdll/ntdll_misc.h | 7 - dlls/ntdll/unix/env.c | 19 +-- dlls/ntdll/unix/loader.c | 277 +++++++++++++++++++++++++++++++++---- dlls/ntdll/unix/thread.c | 1 + dlls/ntdll/unix/unix_private.h | 7 +- dlls/ntdll/unix/virtual.c | 9 +- dlls/ntdll/unixlib.h | 11 +- dlls/ntdll/virtual.c | 33 ----- 9 files changed, 314 insertions(+), 350 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=31538a79a90653afb8bc…

1 0

Alexandre Julliard : ntdll: Move searching for builtin dlls to the Unix library.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: 577b3924408cd1ffa7d2559999751a9ced597882 URL: https://source.winehq.org/git/wine.git/?a=commit;h=577b3924408cd1ffa7d25599… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 23 12:32:43 2020 +0200 ntdll: Move searching for builtin dlls to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 182 +-------------------------------- dlls/ntdll/unix/loader.c | 256 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/unixlib.h | 5 +- 3 files changed, 259 insertions(+), 184 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=577b3924408cd1ffa7d2…

1 0

Alexandre Julliard : ntdll: Move the system information functions to the Unix library.
by Alexandre Julliard 23 Jun '20

23 Jun '20

Module: wine Branch: master Commit: 9b9845e43e08e357588bb6a2ca6bfc15ce2dcd73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b9845e43e08e357588bb6a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 23 14:29:31 2020 +0200 ntdll: Move the system information functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/loader.c | 3 +- dlls/ntdll/nt.c | 2799 ++-------------------------------------- dlls/ntdll/ntdll_misc.h | 7 +- dlls/ntdll/server.c | 3 - dlls/ntdll/signal_i386.c | 10 - dlls/ntdll/thread.c | 9 +- dlls/ntdll/unix/loader.c | 4 +- dlls/ntdll/unix/system.c | 2575 ++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 10 +- dlls/ntdll/unix/unix_private.h | 15 +- dlls/ntdll/unix/virtual.c | 2 +- dlls/ntdll/unixlib.h | 13 +- 13 files changed, 2717 insertions(+), 2734 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9b9845e43e08e357588b…

1 0