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

Jacek Caban : wintab32: Fix -Wabsolute-value warning.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: ca8de0e9f88b53858695179d2eb3b3917b097639 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca8de0e9f88b53858695179d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 23:55:58 2020 +0200 wintab32: Fix -Wabsolute-value warning. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/context.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index ff9a4ca677..2da0462193 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -223,7 +223,10 @@ LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd) if (ptr->context.lcOutExtY > 0) packet->pkY = ptr->context.lcOutExtY - packet->pkY; else if (ptr->context.lcOutExtY < 0) - packet->pkY = abs(ptr->context.lcOutExtY + packet->pkY); + { + int y = ptr->context.lcOutExtY + packet->pkY; + packet->pkY = abs(y); + } DUMPPACKET(*packet);

1 0

Jacek Caban : taskmgr: Introduce size_diff helper.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 032190ac918009a43384d79e666b10725130185c URL: https://source.winehq.org/git/wine.git/?a=commit;h=032190ac918009a43384d79e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 23:56:02 2020 +0200 taskmgr: Introduce size_diff helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/perfdata.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index f86d52159f..3b5997d759 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -51,6 +51,11 @@ static SYSTEM_CACHE_INFORMATION SystemCacheInfo; static SYSTEM_HANDLE_INFORMATION SystemHandleInfo; static PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION SystemProcessorTimeInfo = NULL; +static size_t size_diff(size_t x, size_t y) +{ + return x > y ? x - y : y - x; +} + BOOL PerfDataInitialize(void) { LONG status; @@ -266,12 +271,12 @@ void PerfDataRefresh(void) pPerfData[Idx].vmCounters.WorkingSetSize = pSPI->vmCounters.WorkingSetSize; pPerfData[Idx].vmCounters.PeakWorkingSetSize = pSPI->vmCounters.PeakWorkingSetSize; if (pPDOld) - pPerfData[Idx].WorkingSetSizeDelta = labs(pSPI->vmCounters.WorkingSetSize - pPDOld->vmCounters.WorkingSetSize); + pPerfData[Idx].WorkingSetSizeDelta = size_diff(pSPI->vmCounters.WorkingSetSize, pPDOld->vmCounters.WorkingSetSize); else pPerfData[Idx].WorkingSetSizeDelta = 0; pPerfData[Idx].vmCounters.PageFaultCount = pSPI->vmCounters.PageFaultCount; if (pPDOld) - pPerfData[Idx].PageFaultCountDelta = labs(pSPI->vmCounters.PageFaultCount - pPDOld->vmCounters.PageFaultCount); + pPerfData[Idx].PageFaultCountDelta = size_diff(pSPI->vmCounters.PageFaultCount, pPDOld->vmCounters.PageFaultCount); else pPerfData[Idx].PageFaultCountDelta = 0; pPerfData[Idx].vmCounters.VirtualSize = pSPI->vmCounters.VirtualSize;

1 0

Serge Gautherie : advpack: RegQueryValueExW() wants bytes, not chars.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: a359e026662251b7c3367fe2815dcb6cb371af50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a359e026662251b7c3367fe2… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Thu May 28 04:30:19 2020 +0200 advpack: RegQueryValueExW() wants bytes, not chars. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/advpack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index f2de8a6b25..e3d4d50837 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -907,7 +907,7 @@ HRESULT WINAPI UserInstStubWrapperW(HWND hWnd, HINSTANCE hInstance, { HKEY setup, guid; WCHAR stub[MAX_PATH]; - DWORD size = MAX_PATH; + DWORD size = sizeof(stub); HRESULT hr = S_OK; BOOL res;

1 0

Serge Gautherie : shlwapi: RegQueryValueExW() wants bytes, not chars.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 0662da18b85634928905e72041961ffd3a6e8045 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0662da18b85634928905e720… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Thu May 28 04:30:53 2020 +0200 shlwapi: RegQueryValueExW() wants bytes, not chars. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 8c9e324ae0..e73ba6efa7 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -3372,7 +3372,7 @@ HRESULT WINAPI CLSIDFromStringWrap(LPCWSTR idstr, CLSID *id) */ HRESULT WINAPI SHLoadRegUIStringW(HKEY hkey, LPCWSTR value, LPWSTR buf, DWORD size) { - DWORD type, sz = size; + DWORD type, sz = size * sizeof(WCHAR); if(RegQueryValueExW(hkey, value, NULL, &type, (LPBYTE)buf, &sz) != ERROR_SUCCESS) return E_FAIL;

1 0

Zebediah Figura : quartz/vmr9: Don't expose IVMRSurfaceAllocatorEx9 from the default presenter.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: aa44879a09b29997e68f416c0c6e77d0a0ea82bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa44879a09b29997e68f416c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 27 11:47:35 2020 -0500 quartz/vmr9: Don't expose IVMRSurfaceAllocatorEx9 from the default presenter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 58 +++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index e02b642dbc..bc03326599 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -174,7 +174,7 @@ static inline struct quartz_vmr *impl_from_IVMRWindowlessControl9(IVMRWindowless struct default_presenter { IVMRImagePresenter9 IVMRImagePresenter9_iface; - IVMRSurfaceAllocatorEx9 IVMRSurfaceAllocatorEx9_iface; + IVMRSurfaceAllocator9 IVMRSurfaceAllocator9_iface; LONG refCount; @@ -195,9 +195,9 @@ static inline struct default_presenter *impl_from_IVMRImagePresenter9(IVMRImageP return CONTAINING_RECORD(iface, struct default_presenter, IVMRImagePresenter9_iface); } -static inline struct default_presenter *impl_from_IVMRSurfaceAllocatorEx9(IVMRSurfaceAllocatorEx9 *iface) +static inline struct default_presenter *impl_from_IVMRSurfaceAllocator9(IVMRSurfaceAllocator9 *iface) { - return CONTAINING_RECORD(iface, struct default_presenter, IVMRSurfaceAllocatorEx9_iface); + return CONTAINING_RECORD(iface, struct default_presenter, IVMRSurfaceAllocator9_iface); } static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *parent, LPVOID * ppv); @@ -1367,7 +1367,8 @@ static HRESULT WINAPI VMR9FilterConfig_SetRenderingMode(IVMRFilterConfig9 *iface hr = VMR9DefaultAllocatorPresenterImpl_create(This, (LPVOID*)&This->presenter); if (SUCCEEDED(hr)) - hr = IVMRImagePresenter9_QueryInterface(This->presenter, &IID_IVMRSurfaceAllocatorEx9, (LPVOID*)&This->allocator); + hr = IVMRImagePresenter9_QueryInterface(This->presenter, + &IID_IVMRSurfaceAllocator9, (void **)&This->allocator); if (FAILED(hr)) { ERR("Unable to find Presenter interface\n"); @@ -2530,8 +2531,8 @@ static HRESULT WINAPI VMR9_ImagePresenter_QueryInterface(IVMRImagePresenter9 *if if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IVMRImagePresenter9)) *ppv = &This->IVMRImagePresenter9_iface; - else if (IsEqualIID(riid, &IID_IVMRSurfaceAllocatorEx9)) - *ppv = &This->IVMRSurfaceAllocatorEx9_iface; + else if (IsEqualIID(riid, &IID_IVMRSurfaceAllocator9)) + *ppv = &This->IVMRSurfaceAllocator9_iface; if (*ppv) { @@ -2667,25 +2668,22 @@ static const IVMRImagePresenter9Vtbl VMR9_ImagePresenter = VMR9_ImagePresenter_PresentImage }; -static HRESULT WINAPI VMR9_SurfaceAllocator_QueryInterface(IVMRSurfaceAllocatorEx9 *iface, REFIID riid, LPVOID * ppv) +static HRESULT WINAPI VMR9_SurfaceAllocator_QueryInterface(IVMRSurfaceAllocator9 *iface, REFIID iid, void **out) { - struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); - - return VMR9_ImagePresenter_QueryInterface(&This->IVMRImagePresenter9_iface, riid, ppv); + struct default_presenter *presenter = impl_from_IVMRSurfaceAllocator9(iface); + return IVMRImagePresenter9_QueryInterface(&presenter->IVMRImagePresenter9_iface, iid, out); } -static ULONG WINAPI VMR9_SurfaceAllocator_AddRef(IVMRSurfaceAllocatorEx9 *iface) +static ULONG WINAPI VMR9_SurfaceAllocator_AddRef(IVMRSurfaceAllocator9 *iface) { - struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); - - return VMR9_ImagePresenter_AddRef(&This->IVMRImagePresenter9_iface); + struct default_presenter *presenter = impl_from_IVMRSurfaceAllocator9(iface); + return IVMRImagePresenter9_AddRef(&presenter->IVMRImagePresenter9_iface); } -static ULONG WINAPI VMR9_SurfaceAllocator_Release(IVMRSurfaceAllocatorEx9 *iface) +static ULONG WINAPI VMR9_SurfaceAllocator_Release(IVMRSurfaceAllocator9 *iface) { - struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); - - return VMR9_ImagePresenter_Release(&This->IVMRImagePresenter9_iface); + struct default_presenter *presenter = impl_from_IVMRSurfaceAllocator9(iface); + return IVMRImagePresenter9_Release(&presenter->IVMRImagePresenter9_iface); } static HRESULT VMR9_SurfaceAllocator_SetAllocationSettings(struct default_presenter *This, VMR9AllocationInfo *allocinfo) @@ -2827,9 +2825,10 @@ static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9Allocation return TRUE; } -static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocatorEx9 *iface, DWORD_PTR id, VMR9AllocationInfo *allocinfo, DWORD *numbuffers) +static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocator9 *iface, + DWORD_PTR cookie, VMR9AllocationInfo *allocinfo, DWORD *numbuffers) { - struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + struct default_presenter *This = impl_from_IVMRSurfaceAllocator9(iface); This->info = *allocinfo; @@ -2842,16 +2841,17 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocato return S_OK; } -static HRESULT WINAPI VMR9_SurfaceAllocator_TerminateDevice(IVMRSurfaceAllocatorEx9 *iface, DWORD_PTR id) +static HRESULT WINAPI VMR9_SurfaceAllocator_TerminateDevice(IVMRSurfaceAllocator9 *iface, DWORD_PTR cookie) { - TRACE("iface %p, id %#lx.\n", iface, id); + TRACE("iface %p, cookie %#lx.\n", iface, cookie); return S_OK; } -static HRESULT WINAPI VMR9_SurfaceAllocator_GetSurface(IVMRSurfaceAllocatorEx9 *iface, DWORD_PTR id, DWORD surfaceindex, DWORD flags, IDirect3DSurface9 **surface) +static HRESULT WINAPI VMR9_SurfaceAllocator_GetSurface(IVMRSurfaceAllocator9 *iface, + DWORD_PTR cookie, DWORD surfaceindex, DWORD flags, IDirect3DSurface9 **surface) { - struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + struct default_presenter *This = impl_from_IVMRSurfaceAllocator9(iface); /* Update everything first, this is needed because the surface might be destroyed in the reset */ if (!This->d3d9_dev) @@ -2871,9 +2871,10 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_GetSurface(IVMRSurfaceAllocatorEx9 * return S_OK; } -static HRESULT WINAPI VMR9_SurfaceAllocator_AdviseNotify(IVMRSurfaceAllocatorEx9 *iface, IVMRSurfaceAllocatorNotify9 *allocnotify) +static HRESULT WINAPI VMR9_SurfaceAllocator_AdviseNotify(IVMRSurfaceAllocator9 *iface, + IVMRSurfaceAllocatorNotify9 *allocnotify) { - struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); + struct default_presenter *This = impl_from_IVMRSurfaceAllocator9(iface); TRACE("(%p/%p)->(...)\n", iface, This); @@ -2882,7 +2883,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_AdviseNotify(IVMRSurfaceAllocatorEx9 return S_OK; } -static const IVMRSurfaceAllocatorEx9Vtbl VMR9_SurfaceAllocator = +static const IVMRSurfaceAllocator9Vtbl VMR9_SurfaceAllocator = { VMR9_SurfaceAllocator_QueryInterface, VMR9_SurfaceAllocator_AddRef, @@ -2891,7 +2892,6 @@ static const IVMRSurfaceAllocatorEx9Vtbl VMR9_SurfaceAllocator = VMR9_SurfaceAllocator_TerminateDevice, VMR9_SurfaceAllocator_GetSurface, VMR9_SurfaceAllocator_AdviseNotify, - NULL /* This isn't the SurfaceAllocatorEx type yet, working on it */ }; static IDirect3D9 *init_d3d9(HMODULE d3d9_handle) @@ -2940,7 +2940,7 @@ static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *paren } object->IVMRImagePresenter9_iface.lpVtbl = &VMR9_ImagePresenter; - object->IVMRSurfaceAllocatorEx9_iface.lpVtbl = &VMR9_SurfaceAllocator; + object->IVMRSurfaceAllocator9_iface.lpVtbl = &VMR9_SurfaceAllocator; object->refCount = 1; object->pVMR9 = parent;

1 0

Zebediah Figura : quartz/vmr9: Remove the unused "allocator_mon" field.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 6ccbc0579d7b3857687e2611ca586a4cbb9d99a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ccbc0579d7b3857687e2611… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 27 11:47:36 2020 -0500 quartz/vmr9: Remove the unused "allocator_mon" field. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index bc03326599..6f699ce70f 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -97,7 +97,6 @@ struct quartz_vmr /* Presentation related members */ IDirect3DDevice9 *allocator_d3d9_dev; - HMONITOR allocator_mon; IDirect3DSurface9 **surfaces; DWORD num_surfaces; DWORD cur_surface; @@ -1987,7 +1986,6 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_SetD3DDevice(IVMRSurfaceAllocat IDirect3DDevice9_Release(filter->allocator_d3d9_dev); filter->allocator_d3d9_dev = device; IDirect3DDevice9_AddRef(device); - filter->allocator_mon = monitor; return S_OK; } @@ -2001,7 +1999,6 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_ChangeD3DDevice(IVMRSurfaceAllo IDirect3DDevice9_Release(This->allocator_d3d9_dev); This->allocator_d3d9_dev = device; IDirect3DDevice9_AddRef(This->allocator_d3d9_dev); - This->allocator_mon = monitor; return S_OK; }

1 0

Zebediah Figura : quartz/vmr9: Get rid of CreateRenderingWindow().
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: c6abb3b241b67934b1bebebac70293ea3e0cdf3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6abb3b241b67934b1bebeba… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 27 11:47:37 2020 -0500 quartz/vmr9: Get rid of CreateRenderingWindow(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 6f699ce70f..8ba82e8259 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2751,8 +2751,10 @@ static UINT d3d9_adapter_from_hwnd(IDirect3D9 *d3d9, HWND hwnd, HMONITOR *mon_ou return d3d9_adapter; } -static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9AllocationInfo *info, DWORD *numbuffers) +static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocator9 *iface, + DWORD_PTR cookie, VMR9AllocationInfo *info, DWORD *numbuffers) { + struct default_presenter *This = impl_from_IVMRSurfaceAllocator9(iface); D3DPRESENT_PARAMETERS d3dpp; IDirect3DDevice9 *device; DWORD d3d9_adapter; @@ -2760,7 +2762,9 @@ static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9Allocation HWND window; HRESULT hr; - TRACE("(%p)->()\n", This); + TRACE("presenter %p, cookie %#Ix, info %p, numbuffers %p.\n", This, cookie, info, numbuffers); + + This->info = *info; if (This->pVMR9->mode == VMR9Mode_Windowed) window = This->pVMR9->window.hwnd; @@ -2783,7 +2787,7 @@ static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9Allocation if (FAILED(hr)) { ERR("Could not create device: %08x\n", hr); - return FALSE; + return hr; } IDirect3DDevice9_GetDeviceCaps(device, &caps); @@ -2791,14 +2795,14 @@ static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9Allocation { WARN("Device does not support blitting from textures.\n"); IDirect3DDevice9_Release(device); - return FALSE; + return VFW_E_DDRAW_CAPS_NOT_SUITABLE; } This->d3d9_dev = device; IVMRSurfaceAllocatorNotify9_SetD3DDevice(This->SurfaceAllocatorNotify, This->d3d9_dev, This->hMon); if (!(This->d3d9_surfaces = calloc(*numbuffers, sizeof(IDirect3DSurface9 *)))) - return FALSE; + return E_OUTOFMEMORY; hr = VMR9_SurfaceAllocator_SetAllocationSettings(This, info); if (FAILED(hr)) @@ -2814,27 +2818,11 @@ static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9Allocation if (FAILED(hr)) { IVMRSurfaceAllocator9_TerminateDevice(This->pVMR9->allocator, This->pVMR9->cookie); - return FALSE; + return hr; } This->num_surfaces = *numbuffers; - return TRUE; -} - -static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocator9 *iface, - DWORD_PTR cookie, VMR9AllocationInfo *allocinfo, DWORD *numbuffers) -{ - struct default_presenter *This = impl_from_IVMRSurfaceAllocator9(iface); - - This->info = *allocinfo; - - if (!CreateRenderingWindow(This, allocinfo, numbuffers)) - { - ERR("Failed to create rendering window, expect no output!\n"); - return VFW_E_WRONG_STATE; - } - return S_OK; }

1 0

Zebediah Figura : quartz/vmr9: Trace argument values instead of omitting them.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: e48fabff525061c8eea9558084a97308cebe6b7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e48fabff525061c8eea95580… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 27 11:47:38 2020 -0500 quartz/vmr9: Trace argument values instead of omitting them. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 8ba82e8259..4ea3b483a7 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2583,19 +2583,21 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) return refCount; } -static HRESULT WINAPI VMR9_ImagePresenter_StartPresenting(IVMRImagePresenter9 *iface, DWORD_PTR id) +static HRESULT WINAPI VMR9_ImagePresenter_StartPresenting(IVMRImagePresenter9 *iface, DWORD_PTR cookie) { - struct default_presenter *This = impl_from_IVMRImagePresenter9(iface); + struct default_presenter *presenter = impl_from_IVMRImagePresenter9(iface); + + TRACE("presenter %p, cookie %#Ix.\n", presenter, cookie); - TRACE("(%p/%p/%p)->(...) stub\n", iface, This,This->pVMR9); return S_OK; } -static HRESULT WINAPI VMR9_ImagePresenter_StopPresenting(IVMRImagePresenter9 *iface, DWORD_PTR id) +static HRESULT WINAPI VMR9_ImagePresenter_StopPresenting(IVMRImagePresenter9 *iface, DWORD_PTR cookie) { - struct default_presenter *This = impl_from_IVMRImagePresenter9(iface); + struct default_presenter *presenter = impl_from_IVMRImagePresenter9(iface); + + TRACE("presenter %p, cookie %#Ix.\n", presenter, cookie); - TRACE("(%p/%p/%p)->(...) stub\n", iface, This,This->pVMR9); return S_OK; } @@ -2619,13 +2621,14 @@ static HRESULT VMR9_ImagePresenter_PresentOffscreenSurface(struct default_presen return hr; } -static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *iface, DWORD_PTR id, VMR9PresentationInfo *info) +static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *iface, + DWORD_PTR cookie, VMR9PresentationInfo *info) { struct default_presenter *This = impl_from_IVMRImagePresenter9(iface); HRESULT hr; BOOL render = FALSE; - TRACE("(%p/%p/%p)->(...) stub\n", iface, This, This->pVMR9); + TRACE("presenter %p, cookie %#Ix, info %p.\n", This, cookie, info); /* This might happen if we don't have active focus (eg on a different virtual desktop) */ if (!This->d3d9_dev) @@ -2857,14 +2860,14 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_GetSurface(IVMRSurfaceAllocator9 *if } static HRESULT WINAPI VMR9_SurfaceAllocator_AdviseNotify(IVMRSurfaceAllocator9 *iface, - IVMRSurfaceAllocatorNotify9 *allocnotify) + IVMRSurfaceAllocatorNotify9 *notify) { - struct default_presenter *This = impl_from_IVMRSurfaceAllocator9(iface); + struct default_presenter *presenter = impl_from_IVMRSurfaceAllocator9(iface); - TRACE("(%p/%p)->(...)\n", iface, This); + TRACE("presenter %p, notify %p.\n", presenter, notify); /* No AddRef taken here or the base VMR9 filter would never be destroyed */ - This->SurfaceAllocatorNotify = allocnotify; + presenter->SurfaceAllocatorNotify = notify; return S_OK; }

1 0

Alex Henrie : ws2_32/tests: Put WSAAddressToString tests in tables.
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 73ef942c6537b9faaf6401387b91d408e972beb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73ef942c6537b9faaf640138… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue May 26 23:33:32 2020 -0600 ws2_32/tests: Put WSAAddressToString tests in tables. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 431 +++++++++++++---------------------------------- 1 file changed, 115 insertions(+), 316 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=73ef942c6537b9faaf64…

1 0

Zhiyi Zhang : user32: Handle NULL device and mode parameters in ChangeDisplaySettingsExW().
by Alexandre Julliard 27 May '20

27 May '20

Module: wine Branch: master Commit: 8a4ec0addba76bf3b34a9782556364ab4161dc22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a4ec0addba76bf3b34a9782… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 26 16:35:09 2020 +0800 user32: Handle NULL device and mode parameters in ChangeDisplaySettingsExW(). NULL device and mode parameters mean to restore all adapters to their registry settings. Since all user graphics drivers only support a primary adapter now, it's okay to restore only the primary adapter. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 3 +++ dlls/winemac.drv/display.c | 35 +++++++++++++++++++++++++++++++++++ dlls/winex11.drv/settings.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 4 files changed, 75 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 10f17bb4c3..e6f33006db 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3300,6 +3300,9 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND TRACE("%s %p %p %#x %p\n", debugstr_w(devname), devmode, hwnd, flags, lparam); TRACE("flags=%s\n", _CDS_flags(flags)); + if (!devname && !devmode) + return USER_Driver->pChangeDisplaySettingsEx(NULL, NULL, hwnd, flags, lparam); + if (!devname && devmode) { if (!get_primary_adapter(primary_adapter)) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 851d549d5f..968b9277bb 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -747,6 +747,23 @@ void check_retina_status(void) } } +static BOOL get_primary_adapter(WCHAR *name) +{ + DISPLAY_DEVICEW dd; + DWORD i; + + dd.cb = sizeof(dd); + for (i = 0; EnumDisplayDevicesW(NULL, i, &dd, 0); ++i) + { + if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + lstrcpyW(name, dd.DeviceName); + return TRUE; + } + } + + return FALSE; +} /*********************************************************************** * ChangeDisplaySettingsEx (MACDRV.@) @@ -755,7 +772,9 @@ void check_retina_status(void) LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lpvoid) { + WCHAR primary_adapter[CCHDEVICENAME]; LONG ret = DISP_CHANGE_BADMODE; + DEVMODEW default_mode; int bpp; struct macdrv_display *displays; int num_displays; @@ -770,6 +789,22 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, init_original_display_mode(); + if (!get_primary_adapter(primary_adapter)) + return DISP_CHANGE_FAILED; + + if (!devname && !devmode) + { + default_mode.dmSize = sizeof(default_mode); + if (!EnumDisplaySettingsExW(primary_adapter, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) + { + ERR("Default mode not found for %s!\n", wine_dbgstr_w(primary_adapter)); + return DISP_CHANGE_BADMODE; + } + + devname = primary_adapter; + devmode = &default_mode; + } + if (macdrv_get_displays(&displays, &num_displays)) return DISP_CHANGE_FAILED; diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 24644db620..3e7a5960f0 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -252,6 +252,24 @@ static BOOL write_registry_settings(const DEVMODEW *dm) return ret; } +BOOL get_primary_adapter(WCHAR *name) +{ + DISPLAY_DEVICEW dd; + DWORD i; + + dd.cb = sizeof(dd); + for (i = 0; EnumDisplayDevicesW(NULL, i, &dd, 0); ++i) + { + if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + lstrcpyW(name, dd.DeviceName); + return TRUE; + } + } + + return FALSE; +} + /*********************************************************************** * EnumDisplaySettingsEx (X11DRV.@) * @@ -318,9 +336,27 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lpvoid ) { + WCHAR primary_adapter[CCHDEVICENAME]; char bpp_buffer[16], freq_buffer[18]; + DEVMODEW default_mode; DWORD i; + if (!get_primary_adapter(primary_adapter)) + return DISP_CHANGE_FAILED; + + if (!devname && !devmode) + { + default_mode.dmSize = sizeof(default_mode); + if (!EnumDisplaySettingsExW(primary_adapter, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) + { + ERR("Default mode not found for %s!\n", wine_dbgstr_w(primary_adapter)); + return DISP_CHANGE_BADMODE; + } + + devname = primary_adapter; + devmode = &default_mode; + } + for (i = 0; i < dd_mode_count; i++) { if (devmode->dmFields & DM_BITSPERPEL) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ff0aeb7dab..52057e875d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -661,6 +661,7 @@ extern void X11DRV_resize_desktop(BOOL) DECLSPEC_HIDDEN; extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; extern BOOL create_desktop_win_data( Window win ) DECLSPEC_HIDDEN; +extern BOOL get_primary_adapter(WCHAR *) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigned int bpp, unsigned int freq) DECLSPEC_HIDDEN; unsigned int X11DRV_Settings_GetModeCount(void) DECLSPEC_HIDDEN;

1 0