September 2016 - Wine-Commits

Michael Stefaniuc : jscript: Use CONTAINING_RECORD() to get from a field to a struct.
by Alexandre Julliard Sept. 19, 2016

Sept. 19, 2016

Module: wine Branch: master Commit: fc1ae4fc9eb545ab353b6c16529f87b3661820b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc1ae4fc9eb545ab353b6c165… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 19 10:14:47 2016 +0200 jscript: Use CONTAINING_RECORD() to get from a field to a struct. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/vbarray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index 7b9993b..f374fb0 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -36,7 +36,7 @@ static const WCHAR uboundW[] = {'u','b','o','u','n','d',0}; static inline VBArrayInstance *vbarray_from_vdisp(vdisp_t *vdisp) { - return (VBArrayInstance*)vdisp->u.jsdisp; + return CONTAINING_RECORD(vdisp->u.jsdisp, VBArrayInstance, dispex); } static inline VBArrayInstance *vbarray_this(vdisp_t *jsthis)

1 0

Alexandre Julliard : winex11: Add a debug helper to trace atom names.
by Alexandre Julliard Sept. 19, 2016

Sept. 19, 2016

Module: wine Branch: master Commit: 49a65a3bd7d05b1102a34c51009fed9d1cd2a46e URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a65a3bd7d05b1102a34c510… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 19 23:07:04 2016 +0900 winex11: Add a debug helper to trace atom names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 66 +++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index aedcd69..ae49f4b 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -296,6 +296,18 @@ static const char *debugstr_format( UINT id ) } } +static const char *debugstr_xatom( Atom atom ) +{ + const char *ret; + char *name; + + if (!atom) return "(None)"; + name = XGetAtomName( thread_display(), atom ); + ret = debugstr_a( name ); + XFree( name ); + return ret; +} + /************************************************************************** * X11DRV_InitClipboard */ @@ -1967,8 +1979,8 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p */ while (lpFormat) { - TRACE( "atom #%d property(%ld) -> format %s\n", - i, lpFormat->atom, debugstr_format(lpFormat->id) ); + TRACE( "property %s -> format %s\n", + debugstr_xatom( lpFormat->atom ), debugstr_format( lpFormat->id )); X11DRV_CLIPBOARD_InsertClipboardData( lpFormat->id, 0, lpFormat, FALSE ); lpFormat = X11DRV_CLIPBOARD_LookupProperty(lpFormat, properties[i]); } @@ -2010,8 +2022,8 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p ERR("Failed to register %s property. Type will not be cached.\n", names[i]); continue; } - TRACE( "atom #%d property(%ld) -> format %s\n", - i, lpFormat->atom, debugstr_format(lpFormat->id) ); + TRACE( "property %s -> format %s\n", + debugstr_xatom( lpFormat->atom ), debugstr_format( lpFormat->id )); X11DRV_CLIPBOARD_InsertClipboardData( lpFormat->id, 0, lpFormat, FALSE ); } for (i = 0; i < nb_atoms; i++) XFree( names[i] ); @@ -2094,8 +2106,8 @@ static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display) 0, 0x3FFF, True, AnyPropertyType/*XA_ATOM*/, &atype, &aformat, &cSelectionTargets, &remain, (unsigned char**)&targetList)) { - TRACE("Type %lx,Format %d,nItems %ld, Remain %ld\n", - atype, aformat, cSelectionTargets, remain); + TRACE( "type %s format %d count %ld remain %ld\n", + debugstr_xatom( atype ), aformat, cSelectionTargets, remain); /* * The TARGETS property should have returned us a list of atoms * corresponding to each selection target format supported. @@ -2159,8 +2171,8 @@ static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA return FALSE; } - TRACE("Requesting conversion of %s property (%ld) from selection type %08x\n", - debugstr_format(lpData->lpFormat->id), lpData->lpFormat->atom, + TRACE("Requesting conversion of %s property %s from selection type %08x\n", + debugstr_format( lpData->lpFormat->id ), debugstr_xatom( lpData->lpFormat->atom ), (UINT)selectionCacheSrc); XConvertSelection(display, selectionCacheSrc, lpData->lpFormat->atom, @@ -2222,7 +2234,7 @@ static BOOL X11DRV_CLIPBOARD_GetProperty(Display *display, Window w, Atom prop, unsigned long pos = 0, nitems, remain, count; unsigned char *val = NULL, *buffer; - TRACE("Reading property %lu from X window %lx\n", prop, w); + TRACE( "Reading property %s from X window %lx\n", debugstr_xatom( prop ), w ); for (;;) { @@ -2763,18 +2775,11 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor, LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) if ((format->id == lpData->wFormatID) && format->lpDrvExportFunc && format->atom) + { + TRACE( "%d: %s -> %s\n", i, debugstr_format( format->id ), + debugstr_xatom( format->atom )); targets[i++] = format->atom; - - if (TRACE_ON(clipboard)) - { - unsigned int i; - for ( i = 0; i < cTargets; i++) - { - char *itemFmtName = XGetAtomName(display, targets[i]); - TRACE("\tAtom# %d: Property %ld Type %s\n", i, targets[i], itemFmtName); - XFree(itemFmtName); - } - } + } /* We may want to consider setting the type to xaTargets instead, * in case some apps expect this instead of XA_ATOM */ @@ -2826,13 +2831,8 @@ static Atom X11DRV_SelectionRequest_MULTIPLE( HWND hWnd, XSelectionRequestEvent &cTargetPropList, &remain, (unsigned char**)&targetPropList)) { - if (TRACE_ON(clipboard)) - { - char * const typeName = XGetAtomName(display, atype); - TRACE("\tType %s,Format %d,nItems %ld, Remain %ld\n", - typeName, aformat, cTargetPropList, remain); - XFree(typeName); - } + TRACE( "type %s format %d count %ld remain %ld\n", + debugstr_xatom( atype ), aformat, cTargetPropList, remain ); /* * Make sure we got what we expect. @@ -2853,16 +2853,8 @@ static Atom X11DRV_SelectionRequest_MULTIPLE( HWND hWnd, XSelectionRequestEvent { XSelectionRequestEvent event; - if (TRACE_ON(clipboard)) - { - char *targetName, *propName; - targetName = XGetAtomName(display, targetPropList[i]); - propName = XGetAtomName(display, targetPropList[i+1]); - TRACE("MULTIPLE(%d): Target='%s' Prop='%s'\n", - i/2, targetName, propName); - XFree(targetName); - XFree(propName); - } + TRACE( "MULTIPLE(%d): target %s property %s\n", + i/2, debugstr_xatom( targetPropList[i] ), debugstr_xatom( targetPropList[i + 1] )); /* We must have a non "None" property to service a MULTIPLE target atom */ if ( !targetPropList[i+1] )

1 0

Aric Stewart : ntoskrnl.exe: Implement DevicePropertyEnumeratorName for IoGetDeviceProperty.
by Alexandre Julliard Sept. 19, 2016

Sept. 19, 2016

Module: wine Branch: master Commit: 2abe5573526b8a05daea1136981cea844fc78c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2abe5573526b8a05daea11369… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 19 15:13:58 2016 +0200 ntoskrnl.exe: Implement DevicePropertyEnumeratorName for IoGetDeviceProperty. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index bc7ac86..93029a4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -94,6 +94,8 @@ struct wine_driver DRIVER_EXTENSION driver_extension; }; +static NTSTATUS get_device_id( DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCHAR **id ); + static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) { const struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, const struct wine_driver, entry ); @@ -1132,6 +1134,30 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP property_buffer, result_length ); switch (device_property) { + case DevicePropertyEnumeratorName: + { + WCHAR *id, *ptr; + + status = get_device_id( device, BusQueryInstanceID, &id ); + if (status != STATUS_SUCCESS) + { + ERR( "Failed to get device id\n" ); + break; + } + + struprW( id ); + ptr = strchrW( id, '\\' ); + if (ptr) *ptr = 0; + + *result_length = sizeof(WCHAR) * (strlenW(id) + 1); + if (buffer_length >= *result_length) + memcpy( property_buffer, id, *result_length ); + else + status = STATUS_BUFFER_TOO_SMALL; + + HeapFree( GetProcessHeap(), 0, id ); + break; + } case DevicePropertyPhysicalDeviceObjectName: { ULONG used_len, len = buffer_length + sizeof(OBJECT_NAME_INFORMATION);

1 0

Józef Kucia : d3d11: Sanitize buffer view flags.
by Alexandre Julliard Sept. 19, 2016

Sept. 19, 2016

Module: wine Branch: master Commit: 9c0212267fc587979d5e289667635b5e8a07043f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c0212267fc587979d5e28966… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 18 16:18:13 2016 +0200 d3d11: Sanitize buffer view flags. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 205513d..d670cb2 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -2061,6 +2061,16 @@ static const struct ID3D10ShaderResourceView1Vtbl d3d10_shader_resource_view_vtb d3d10_shader_resource_view_GetDesc1, }; +static unsigned int wined3d_view_flags_from_d3d11_bufferex_flags(unsigned int d3d11_flags) +{ + unsigned int wined3d_flags = d3d11_flags & WINED3D_VIEW_BUFFER_RAW; + + if (d3d11_flags != wined3d_flags) + FIXME("Unhandled flags %#x.\n", d3d11_flags & ~wined3d_flags); + + return wined3d_flags; +} + static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shader_resource_view_desc *wined3d_desc, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc) { @@ -2143,7 +2153,7 @@ static HRESULT wined3d_shader_resource_view_desc_from_d3d11(struct wined3d_shade break; case D3D11_SRV_DIMENSION_BUFFEREX: - wined3d_desc->flags = desc->u.BufferEx.Flags; + wined3d_desc->flags = wined3d_view_flags_from_d3d11_bufferex_flags(desc->u.BufferEx.Flags); wined3d_desc->u.buffer.start_idx = desc->u.BufferEx.FirstElement; wined3d_desc->u.buffer.count = desc->u.BufferEx.NumElements; break; @@ -2381,6 +2391,17 @@ static const struct ID3D11UnorderedAccessViewVtbl d3d11_unordered_access_view_vt d3d11_unordered_access_view_GetDesc, }; +static unsigned int wined3d_view_flags_from_d3d11_buffer_uav_flags(unsigned int d3d11_flags) +{ + unsigned int wined3d_flags = d3d11_flags & (WINED3D_VIEW_BUFFER_RAW + | WINED3D_VIEW_BUFFER_APPEND | WINED3D_VIEW_BUFFER_COUNTER); + + if (d3d11_flags != wined3d_flags) + FIXME("Unhandled flags %#x.\n", d3d11_flags & ~wined3d_flags); + + return wined3d_flags; +} + static HRESULT wined3d_unordered_access_view_desc_from_d3d11(struct wined3d_unordered_access_view_desc *wined3d_desc, const D3D11_UNORDERED_ACCESS_VIEW_DESC *desc) { @@ -2390,7 +2411,7 @@ static HRESULT wined3d_unordered_access_view_desc_from_d3d11(struct wined3d_unor switch (desc->ViewDimension) { case D3D11_UAV_DIMENSION_BUFFER: - wined3d_desc->flags = desc->u.Buffer.Flags; + wined3d_desc->flags = wined3d_view_flags_from_d3d11_buffer_uav_flags(desc->u.Buffer.Flags); wined3d_desc->u.buffer.start_idx = desc->u.Buffer.FirstElement; wined3d_desc->u.buffer.count = desc->u.Buffer.NumElements; break;

1 0

Hadrien Boizard : ole32: Use debugstr_guid() in TRACES.
by Alexandre Julliard Sept. 19, 2016

Sept. 19, 2016

Module: wine Branch: master Commit: 5a9f7ef06df15e26acf46b0210dd7697356da7ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a9f7ef06df15e26acf46b021… Author: Hadrien Boizard <h.boizard(a)gmail.com> Date: Thu Sep 15 23:15:59 2016 +0200 ole32: Use debugstr_guid() in TRACES. Signed-off-by: Hadrien Boizard <h.boizard(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/antimoniker.c | 8 ++++---- dlls/ole32/classmoniker.c | 2 +- dlls/ole32/compositemoniker.c | 10 +++++----- dlls/ole32/itemmoniker.c | 2 +- dlls/ole32/moniker.c | 4 ++-- dlls/ole32/pointermoniker.c | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 83eb71b..a99b1b7 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -61,7 +61,7 @@ AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { AntiMonikerImpl *This = impl_from_IMoniker(iface); - TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); /* Perform a sanity check on the parameters.*/ if ( ppvObject==0 ) @@ -229,7 +229,7 @@ static HRESULT WINAPI AntiMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, REFIID riid, VOID** ppvResult) { - TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); + TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvResult); return E_NOTIMPL; } @@ -240,7 +240,7 @@ static HRESULT WINAPI AntiMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, REFIID riid, VOID** ppvResult) { - TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); + TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvResult); return E_NOTIMPL; } @@ -495,7 +495,7 @@ AntiMonikerROTDataImpl_QueryInterface(IROTData *iface,REFIID riid,VOID** ppvObje { AntiMonikerImpl *This = impl_from_IROTData(iface); - TRACE("(%p,%p,%p)\n",iface,riid,ppvObject); + TRACE("(%p,%s,%p)\n",iface,debugstr_guid(riid),ppvObject); return AntiMonikerImpl_QueryInterface(&This->IMoniker_iface, riid, ppvObject); } diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 877c3ec..22c76bf 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -65,7 +65,7 @@ static HRESULT WINAPI ClassMoniker_QueryInterface(IMoniker* iface,REFIID riid,vo { ClassMoniker *This = impl_from_IMoniker(iface); - TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); /* Perform a sanity check on the parameters.*/ if (!ppvObject) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 6c92771..579fe4c 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -87,7 +87,7 @@ CompositeMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject { CompositeMonikerImpl *This = impl_from_IMoniker(iface); - TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); /* Perform a sanity check on the parameters.*/ if ( ppvObject==0 ) @@ -336,7 +336,7 @@ CompositeMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker *tempMk,*antiMk,*rightMostMk; IEnumMoniker *enumMoniker; - TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); + TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvResult); if (ppvResult==NULL) return E_POINTER; @@ -389,7 +389,7 @@ CompositeMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker *tempMk,*antiMk,*rightMostMk,*leftMk; IEnumMoniker *enumMoniker; - TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); + TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvResult); *ppvResult=0; @@ -1195,7 +1195,7 @@ CompositeMonikerROTDataImpl_QueryInterface(IROTData *iface,REFIID riid, { CompositeMonikerImpl *This = impl_from_IROTData(iface); - TRACE("(%p,%p,%p)\n",iface,riid,ppvObject); + TRACE("(%p,%s,%p)\n",iface,debugstr_guid(riid),ppvObject); return CompositeMonikerImpl_QueryInterface(&This->IMoniker_iface, riid, ppvObject); } @@ -1499,7 +1499,7 @@ EnumMonikerImpl_QueryInterface(IEnumMoniker* iface,REFIID riid,void** ppvObject) { EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); - TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); /* Perform a sanity check on the parameters.*/ if ( ppvObject==0 ) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index eaf76a3..67bef5f 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -775,7 +775,7 @@ static HRESULT WINAPI ItemMonikerROTDataImpl_QueryInterface(IROTData *iface,REFI ItemMonikerImpl *This = impl_from_IROTData(iface); - TRACE("(%p,%p,%p)\n",iface,riid,ppvObject); + TRACE("(%p,%s,%p)\n",iface,debugstr_guid(riid),ppvObject); return ItemMonikerImpl_QueryInterface(&This->IMoniker_iface, riid, ppvObject); } diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 320a561..ffbaa61 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -326,7 +326,7 @@ RunningObjectTableImpl_QueryInterface(IRunningObjectTable* iface, { RunningObjectTableImpl *This = impl_from_IRunningObjectTable(iface); - TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); /* validate arguments */ @@ -1314,7 +1314,7 @@ static HRESULT WINAPI EnumMonikerImpl_QueryInterface(IEnumMoniker* iface,REFIID { EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); - TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); /* validate arguments */ if (ppvObject == NULL) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index 3589685..3737600 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -56,7 +56,7 @@ PointerMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { PointerMonikerImpl *This = impl_from_IMoniker(iface); - TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); /* Perform a sanity check on the parameters.*/ if ( (This==0) || (ppvObject==0) ) @@ -200,7 +200,7 @@ PointerMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToL { PointerMonikerImpl *This = impl_from_IMoniker(iface); - TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); + TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvResult); if (!This->pObject) return E_UNEXPECTED; @@ -217,7 +217,7 @@ PointerMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkTo { PointerMonikerImpl *This = impl_from_IMoniker(iface); - TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); + TRACE("(%p,%p,%p,%s,%p)\n",iface,pbc,pmkToLeft,debugstr_guid(riid),ppvResult); if (!This->pObject) return E_UNEXPECTED;

1 0

Alexandre Julliard : winex11: Use the correct data type for property atoms.
by Alexandre Julliard Sept. 19, 2016

Sept. 19, 2016

Module: wine Branch: master Commit: 13ff291905941444cc0b3cffd0b57bca9981dff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13ff291905941444cc0b3cffd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 19 22:55:56 2016 +0900 winex11: Use the correct data type for property atoms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 72 ++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index ed304ac..aedcd69 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -108,8 +108,8 @@ typedef HANDLE (*DRVIMPORTFUNC)(Display *d, Window w, Atom prop); typedef struct clipboard_format { struct list entry; - UINT wFormatID; - UINT drvData; + UINT id; + Atom atom; DRVIMPORTFUNC lpDrvImportFunc; DRVEXPORTFUNC lpDrvExportFunc; } WINE_CLIPFORMAT, *LPWINE_CLIPFORMAT; @@ -310,11 +310,11 @@ void X11DRV_InitClipboard(void) for (i = 0; i < count; i++) { if (builtin_formats[i].name) - formats[i].wFormatID = RegisterClipboardFormatW( builtin_formats[i].name ); + formats[i].id = RegisterClipboardFormatW( builtin_formats[i].name ); else - formats[i].wFormatID = builtin_formats[i].id; + formats[i].id = builtin_formats[i].id; - formats[i].drvData = GET_ATOM(builtin_formats[i].data); + formats[i].atom = GET_ATOM(builtin_formats[i].data); formats[i].lpDrvImportFunc = builtin_formats[i].import; formats[i].lpDrvExportFunc = builtin_formats[i].export; list_add_tail( &format_list, &formats[i].entry ); @@ -338,7 +338,7 @@ static void intern_atoms(void) count = 0; LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) - if (!format->drvData) count++; + if (!format->atom) count++; if (!count) return; display = thread_init_display(); @@ -348,8 +348,8 @@ static void intern_atoms(void) i = 0; LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) - if (!format->drvData) { - if (GetClipboardFormatNameW(format->wFormatID, buffer, 256) > 0) + if (!format->atom) { + if (GetClipboardFormatNameW( format->id, buffer, 256 ) > 0) { /* use defined format name */ len = WideCharToMultiByte(CP_UNIXCP, 0, buffer, -1, NULL, 0, NULL, NULL); @@ -360,7 +360,7 @@ static void intern_atoms(void) * which is normally used by GetClipboardFormatNameW */ static const WCHAR fmt[] = {'#','%','u',0}; - len = sprintfW(buffer, fmt, format->wFormatID) + 1; + len = sprintfW(buffer, fmt, format->id) + 1; } names[i] = HeapAlloc(GetProcessHeap(), 0, len); WideCharToMultiByte(CP_UNIXCP, 0, buffer, -1, names[i++], len, NULL, NULL); @@ -370,9 +370,9 @@ static void intern_atoms(void) i = 0; LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) - if (!format->drvData) { + if (!format->atom) { HeapFree(GetProcessHeap(), 0, names[i]); - format->drvData = atoms[i++]; + format->atom = atoms[i++]; } HeapFree( GetProcessHeap(), 0, names ); @@ -391,16 +391,16 @@ static struct clipboard_format *register_format( UINT id, Atom prop ) /* walk format chain to see if it's already registered */ LIST_FOR_EACH_ENTRY( format, &format_list, struct clipboard_format, entry ) - if (format->wFormatID == id) return format; + if (format->id == id) return format; if (!(format = HeapAlloc( GetProcessHeap(), 0, sizeof(*format) ))) return NULL; - format->wFormatID = id; - format->drvData = prop; + format->id = id; + format->atom = prop; format->lpDrvImportFunc = import_data; format->lpDrvExportFunc = export_data; list_add_tail( &format_list, &format->entry ); - TRACE( "Registering format %s atom %lx\n", debugstr_format(id), prop ); + TRACE( "Registering format %s atom %ld\n", debugstr_format(id), prop ); return format; } @@ -408,7 +408,7 @@ static struct clipboard_format *register_format( UINT id, Atom prop ) /************************************************************************** * X11DRV_CLIPBOARD_LookupProperty */ -static LPWINE_CLIPFORMAT X11DRV_CLIPBOARD_LookupProperty(LPWINE_CLIPFORMAT current, UINT drvData) +static struct clipboard_format *X11DRV_CLIPBOARD_LookupProperty( struct clipboard_format *current, Atom prop ) { for (;;) { @@ -417,9 +417,9 @@ static LPWINE_CLIPFORMAT X11DRV_CLIPBOARD_LookupProperty(LPWINE_CLIPFORMAT curre while ((ptr = list_next( &format_list, ptr ))) { - LPWINE_CLIPFORMAT lpFormat = LIST_ENTRY( ptr, WINE_CLIPFORMAT, entry ); - if (lpFormat->drvData == drvData) return lpFormat; - if (!lpFormat->drvData) need_intern = TRUE; + struct clipboard_format *format = LIST_ENTRY( ptr, struct clipboard_format, entry ); + if (format->atom == prop) return format; + if (!format->atom) need_intern = TRUE; } if (!need_intern) return NULL; intern_atoms(); @@ -1319,7 +1319,7 @@ HANDLE X11DRV_CLIPBOARD_ImportSelection(Display *d, Atom target, Window w, Atom clipFormat = X11DRV_CLIPBOARD_LookupProperty(NULL, target); if (clipFormat) { - *windowsFormat = clipFormat->wFormatID; + *windowsFormat = clipFormat->id; return clipFormat->lpDrvImportFunc(d, w, prop); } return NULL; @@ -1967,9 +1967,9 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p */ while (lpFormat) { - TRACE("Atom#%d Property(%d): --> Format %s\n", - i, lpFormat->drvData, debugstr_format(lpFormat->wFormatID)); - X11DRV_CLIPBOARD_InsertClipboardData(lpFormat->wFormatID, 0, lpFormat, FALSE); + TRACE( "atom #%d property(%ld) -> format %s\n", + i, lpFormat->atom, debugstr_format(lpFormat->id) ); + X11DRV_CLIPBOARD_InsertClipboardData( lpFormat->id, 0, lpFormat, FALSE ); lpFormat = X11DRV_CLIPBOARD_LookupProperty(lpFormat, properties[i]); } } @@ -2010,9 +2010,9 @@ static VOID X11DRV_CLIPBOARD_InsertSelectionProperties(Display *display, Atom* p ERR("Failed to register %s property. Type will not be cached.\n", names[i]); continue; } - TRACE("Atom#%d Property(%d): --> Format %s\n", - i, lpFormat->drvData, debugstr_format(lpFormat->wFormatID)); - X11DRV_CLIPBOARD_InsertClipboardData(lpFormat->wFormatID, 0, lpFormat, FALSE); + TRACE( "atom #%d property(%ld) -> format %s\n", + i, lpFormat->atom, debugstr_format(lpFormat->id) ); + X11DRV_CLIPBOARD_InsertClipboardData( lpFormat->id, 0, lpFormat, FALSE ); } for (i = 0; i < nb_atoms; i++) XFree( names[i] ); HeapFree( GetProcessHeap(), 0, names ); @@ -2159,11 +2159,11 @@ static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA return FALSE; } - TRACE("Requesting conversion of %s property (%d) from selection type %08x\n", - debugstr_format(lpData->lpFormat->wFormatID), lpData->lpFormat->drvData, + TRACE("Requesting conversion of %s property (%ld) from selection type %08x\n", + debugstr_format(lpData->lpFormat->id), lpData->lpFormat->atom, (UINT)selectionCacheSrc); - XConvertSelection(display, selectionCacheSrc, lpData->lpFormat->drvData, + XConvertSelection(display, selectionCacheSrc, lpData->lpFormat->atom, x11drv_atom(SELECTION_DATA), w, CurrentTime); /* wait until SelectionNotify is received */ @@ -2745,8 +2745,8 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor, LIST_FOR_EACH_ENTRY( lpData, &data_list, WINE_CLIPDATA, entry ) LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) - if ((format->wFormatID == lpData->wFormatID) && - format->lpDrvExportFunc && format->drvData) + if ((format->id == lpData->wFormatID) && + format->lpDrvExportFunc && format->atom) cTargets++; TRACE(" found %d formats\n", cTargets); @@ -2761,9 +2761,9 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor, LIST_FOR_EACH_ENTRY( lpData, &data_list, WINE_CLIPDATA, entry ) LIST_FOR_EACH_ENTRY( format, &format_list, WINE_CLIPFORMAT, entry ) - if ((format->wFormatID == lpData->wFormatID) && - format->lpDrvExportFunc && format->drvData) - targets[i++] = format->drvData; + if ((format->id == lpData->wFormatID) && + format->lpDrvExportFunc && format->atom) + targets[i++] = format->atom; if (TRACE_ON(clipboard)) { @@ -2947,7 +2947,7 @@ static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *ev if (lpFormat && lpFormat->lpDrvExportFunc) { - LPWINE_CLIPDATA lpData = X11DRV_CLIPBOARD_LookupData(lpFormat->wFormatID); + LPWINE_CLIPDATA lpData = X11DRV_CLIPBOARD_LookupData(lpFormat->id); if (lpData) { @@ -2961,7 +2961,7 @@ static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *ev int mode = PropModeReplace; TRACE("\tUpdating property %s, %d bytes\n", - debugstr_format(lpFormat->wFormatID), cBytes); + debugstr_format(lpFormat->id), cBytes); do { int nelements = min(cBytes, 65536);

1 0

Vincent Povirk : gdiplus: Implement GdipBeginContainer.
by Alexandre Julliard Sept. 19, 2016

Sept. 19, 2016

Module: wine Branch: master Commit: f5b14a7ab6695c7046cb01233f0abc0294d8b75a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5b14a7ab6695c7046cb01233… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 16 14:37:27 2016 -0500 gdiplus: Implement GdipBeginContainer. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 62 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 14b9db9..06a0c95 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5200,14 +5200,68 @@ GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics *graphics, GpStatus WINGDIPAPI GdipBeginContainer(GpGraphics *graphics, GDIPCONST GpRectF *dstrect, GDIPCONST GpRectF *srcrect, GpUnit unit, GraphicsContainer *state) { - FIXME("(%p, %p, %p, %d, %p): stub\n", graphics, dstrect, srcrect, unit, state); - return NotImplemented; + GraphicsContainerItem *container; + GpMatrix transform; + GpStatus stat; + GpRectF scaled_srcrect; + REAL scale_x, scale_y; + + TRACE("(%p, %s, %s, %d, %p)\n", graphics, debugstr_rectf(dstrect), debugstr_rectf(srcrect), unit, state); + + if(!graphics || !dstrect || !srcrect || unit < UnitPixel || unit > UnitMillimeter || !state) + return InvalidParameter; + + stat = init_container(&container, graphics, BEGIN_CONTAINER); + if(stat != Ok) + return stat; + + list_add_head(&graphics->containers, &container->entry); + *state = graphics->contid = container->contid; + + scale_x = units_to_pixels(1.0, unit, graphics->xres); + scale_y = units_to_pixels(1.0, unit, graphics->yres); + + scaled_srcrect.X = scale_x * srcrect->X; + scaled_srcrect.Y = scale_y * srcrect->Y; + scaled_srcrect.Width = scale_x * srcrect->Width; + scaled_srcrect.Height = scale_y * srcrect->Height; + + transform.matrix[0] = dstrect->Width / scaled_srcrect.Width; + transform.matrix[1] = 0.0; + transform.matrix[2] = 0.0; + transform.matrix[3] = dstrect->Height / scaled_srcrect.Height; + transform.matrix[4] = dstrect->X - scaled_srcrect.X; + transform.matrix[5] = dstrect->Y - scaled_srcrect.Y; + + GdipMultiplyMatrix(&graphics->worldtrans, &transform, MatrixOrderPrepend); + + if (graphics->image && graphics->image->type == ImageTypeMetafile) { + FIXME("Write to metafile\n"); + } + + return Ok; } GpStatus WINGDIPAPI GdipBeginContainerI(GpGraphics *graphics, GDIPCONST GpRect *dstrect, GDIPCONST GpRect *srcrect, GpUnit unit, GraphicsContainer *state) { - FIXME("(%p, %p, %p, %d, %p): stub\n", graphics, dstrect, srcrect, unit, state); - return NotImplemented; + GpRectF dstrectf, srcrectf; + + TRACE("(%p, %p, %p, %d, %p)\n", graphics, dstrect, srcrect, unit, state); + + if (!dstrect || !srcrect) + return InvalidParameter; + + dstrectf.X = dstrect->X; + dstrectf.Y = dstrect->Y; + dstrectf.Width = dstrect->Width; + dstrectf.Height = dstrect->Height; + + srcrectf.X = srcrect->X; + srcrectf.Y = srcrect->Y; + srcrectf.Width = srcrect->Width; + srcrectf.Height = srcrect->Height; + + return GdipBeginContainer(graphics, &dstrectf, &srcrectf, unit, state); } GpStatus WINGDIPAPI GdipComment(GpGraphics *graphics, UINT sizeData, GDIPCONST BYTE *data)

1 0

Alexandre Julliard : winex11: Add separate export functions for the various string types.
by Alexandre Julliard Sept. 19, 2016

Sept. 19, 2016

Module: wine Branch: master Commit: 63201471abd732cc7461d11e954cf6eae87a0b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63201471abd732cc7461d11e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 17 11:10:31 2016 +0900 winex11: Add separate export functions for the various string types. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 60 ++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 39 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 190935c..ed304ac 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -140,6 +140,10 @@ static HANDLE export_data(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpData, LPDWORD lpBytes); static HANDLE export_string(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpData, LPDWORD lpBytes); +static HANDLE export_utf8_string(Display *display, Window requestor, Atom aTarget, + Atom rprop, LPWINE_CLIPDATA lpData, LPDWORD lpBytes); +static HANDLE export_compound_text(Display *display, Window requestor, Atom aTarget, + Atom rprop, LPWINE_CLIPDATA lpData, LPDWORD lpBytes); static HANDLE export_pixmap(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes); static HANDLE export_image_bmp(Display *display, Window requestor, Atom aTarget, @@ -192,8 +196,8 @@ static const struct { 0, CF_PENDATA, XATOM_WCF_PENDATA, import_data, export_data }, { 0, CF_RIFF, XATOM_WCF_RIFF, import_data, export_data }, { 0, CF_WAVE, XATOM_WCF_WAVE, import_data, export_data }, - { 0, CF_UNICODETEXT, XATOM_UTF8_STRING, import_utf8_string, export_string }, - { 0, CF_UNICODETEXT, XATOM_COMPOUND_TEXT, import_compound_text, export_string }, + { 0, CF_UNICODETEXT, XATOM_UTF8_STRING, import_utf8_string, export_utf8_string }, + { 0, CF_UNICODETEXT, XATOM_COMPOUND_TEXT, import_compound_text, export_compound_text }, { 0, CF_ENHMETAFILE, XATOM_WCF_ENHMETAFILE, import_enhmetafile, export_enhmetafile }, { 0, CF_HDROP, XATOM_text_uri_list, import_text_uri_list, export_hdrop }, { 0, CF_LOCALE, XATOM_WCF_LOCALE, import_data, export_data }, @@ -1365,17 +1369,19 @@ static HANDLE export_data(Display *display, Window requestor, Atom aTarget, /************************************************************************** - * X11DRV_CLIPBOARD_ExportXAString + * export_string * * Export CF_TEXT converting the string to XA_STRING. - * Helper function for export_string. */ -static HANDLE X11DRV_CLIPBOARD_ExportXAString(LPWINE_CLIPDATA lpData, LPDWORD lpBytes) +static HANDLE export_string(Display *display, Window requestor, Atom aTarget, Atom rprop, + LPWINE_CLIPDATA lpData, LPDWORD lpBytes) { UINT i, j; UINT size; LPSTR text, lpstr = NULL; + if (!X11DRV_CLIPBOARD_RenderFormat(display, lpData)) return 0; + *lpBytes = 0; /* Assume return has zero bytes */ text = GlobalLock(lpData->hData); @@ -1404,18 +1410,20 @@ done: /************************************************************************** - * X11DRV_CLIPBOARD_ExportUTF8String + * export_utf8_string * * Export CF_UNICODE converting the string to UTF8. - * Helper function for export_string. */ -static HANDLE X11DRV_CLIPBOARD_ExportUTF8String(LPWINE_CLIPDATA lpData, LPDWORD lpBytes) +static HANDLE export_utf8_string(Display *display, Window requestor, Atom aTarget, Atom rprop, + LPWINE_CLIPDATA lpData, LPDWORD lpBytes) { UINT i, j; UINT size; LPWSTR uni_text; LPSTR text, lpstr = NULL; + if (!X11DRV_CLIPBOARD_RenderFormat(display, lpData)) return 0; + *lpBytes = 0; /* Assume return has zero bytes */ uni_text = GlobalLock(lpData->hData); @@ -1452,13 +1460,12 @@ done: /************************************************************************** - * X11DRV_CLIPBOARD_ExportCompoundText + * export_compound_text * * Export CF_UNICODE to COMPOUND_TEXT - * Helper function for export_string. */ -static HANDLE X11DRV_CLIPBOARD_ExportCompoundText(Display *display, Window requestor, Atom aTarget, Atom rprop, - LPWINE_CLIPDATA lpData, LPDWORD lpBytes) +static HANDLE export_compound_text(Display *display, Window requestor, Atom aTarget, Atom rprop, + LPWINE_CLIPDATA lpData, LPDWORD lpBytes) { char* lpstr = 0; XTextProperty prop; @@ -1467,6 +1474,8 @@ static HANDLE X11DRV_CLIPBOARD_ExportCompoundText(Display *display, Window reque UINT size; LPWSTR uni_text; + if (!X11DRV_CLIPBOARD_RenderFormat(display, lpData)) return 0; + uni_text = GlobalLock(lpData->hData); size = WideCharToMultiByte(CP_UNIXCP, 0, uni_text, -1, NULL, 0, NULL, NULL); @@ -1504,33 +1513,6 @@ static HANDLE X11DRV_CLIPBOARD_ExportCompoundText(Display *display, Window reque return 0; } -/************************************************************************** - * export_string - * - * Export string - */ -static HANDLE export_string(Display *display, Window requestor, Atom aTarget, Atom rprop, - LPWINE_CLIPDATA lpData, LPDWORD lpBytes) -{ - if (X11DRV_CLIPBOARD_RenderFormat(display, lpData)) - { - if (aTarget == XA_STRING) - return X11DRV_CLIPBOARD_ExportXAString(lpData, lpBytes); - else if (aTarget == x11drv_atom(COMPOUND_TEXT) || aTarget == x11drv_atom(TEXT)) - return X11DRV_CLIPBOARD_ExportCompoundText(display, requestor, aTarget, - rprop, lpData, lpBytes); - else - { - TRACE("Exporting target %ld to default UTF8_STRING\n", aTarget); - return X11DRV_CLIPBOARD_ExportUTF8String(lpData, lpBytes); - } - } - else - ERR("Failed to render %04x format\n", lpData->wFormatID); - - return 0; -} - /************************************************************************** * export_pixmap

1 0

Vincent Povirk : gdiplus/tests: Add tests for GdipBeginContainer.
by Alexandre Julliard Sept. 19, 2016

Sept. 19, 2016

Module: wine Branch: master Commit: 18964c9665164c958b7f63012408f519f7010a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=18964c9665164c958b7f63012… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 16 14:37:28 2016 -0500 gdiplus/tests: Add tests for GdipBeginContainer. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 173 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index f747a2d..d86f49d 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -5897,6 +5897,178 @@ static void test_GdipGetVisibleClipBounds_memoryDC(void) ReleaseDC(hwnd, dc); } +static void test_container_rects(void) +{ + GpStatus status; + GpGraphics *graphics; + HDC hdc = GetDC( hwnd ); + GpRectF dstrect, srcrect; + GraphicsContainer state; + static const GpPointF test_points[3] = {{0.0,0.0}, {1.0,0.0}, {0.0,1.0}}; + GpPointF points[3]; + REAL dpix, dpiy; + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + dstrect.X = 0.0; + dstrect.Y = 0.0; + dstrect.Width = 1.0; + dstrect.Height = 1.0; + srcrect = dstrect; + + status = GdipGetDpiX(graphics, &dpix); + expect(Ok, status); + + status = GdipGetDpiY(graphics, &dpiy); + expect(Ok, status); + + status = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitWorld, &state); + expect(InvalidParameter, status); + + status = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitDisplay, &state); + expect(InvalidParameter, status); + + status = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitMillimeter+1, &state); + expect(InvalidParameter, status); + + status = GdipBeginContainer(NULL, &dstrect, &srcrect, UnitPixel, &state); + expect(InvalidParameter, status); + + status = GdipBeginContainer(graphics, NULL, &srcrect, UnitPixel, &state); + expect(InvalidParameter, status); + + status = GdipBeginContainer(graphics, &dstrect, NULL, UnitPixel, &state); + expect(InvalidParameter, status); + + status = GdipBeginContainer(graphics, &dstrect, &srcrect, -1, &state); + expect(InvalidParameter, status); + + status = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitPixel, NULL); + expect(InvalidParameter, status); + + status = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitPixel, &state); + expect(Ok, status); + + memcpy(points, test_points, sizeof(points)); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, points, 3); + expect(Ok, status); + expectf(0.0, points[0].X); + expectf(0.0, points[0].Y); + expectf(1.0, points[1].X); + expectf(0.0, points[1].Y); + expectf(0.0, points[2].X); + expectf(1.0, points[2].Y); + + status = GdipEndContainer(graphics, state); + expect(Ok, status); + + status = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitInch, &state); + expect(Ok, status); + + memcpy(points, test_points, sizeof(points)); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, points, 3); + expect(Ok, status); + expectf(0.0, points[0].X); + expectf(0.0, points[0].Y); + expectf(1.0/dpix, points[1].X); + expectf(0.0, points[1].Y); + expectf(0.0, points[2].X); + expectf(1.0/dpiy, points[2].Y); + + status = GdipEndContainer(graphics, state); + expect(Ok, status); + + status = GdipScaleWorldTransform(graphics, 2.0, 2.0, MatrixOrderPrepend); + expect(Ok, status); + + dstrect.X = 1.0; + dstrect.Height = 3.0; + status = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitPixel, &state); + expect(Ok, status); + + memcpy(points, test_points, sizeof(points)); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, points, 3); + expect(Ok, status); + expectf(2.0, points[0].X); + expectf(0.0, points[0].Y); + expectf(4.0, points[1].X); + expectf(0.0, points[1].Y); + expectf(2.0, points[2].X); + expectf(6.0, points[2].Y); + + status = GdipEndContainer(graphics, state); + expect(Ok, status); + + memcpy(points, test_points, sizeof(points)); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, points, 3); + expect(Ok, status); + expectf(0.0, points[0].X); + expectf(0.0, points[0].Y); + expectf(2.0, points[1].X); + expectf(0.0, points[1].Y); + expectf(0.0, points[2].X); + expectf(2.0, points[2].Y); + + status = GdipResetWorldTransform(graphics); + expect(Ok, status); + + status = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitInch, &state); + expect(Ok, status); + + memcpy(points, test_points, sizeof(points)); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, points, 3); + expect(Ok, status); + expectf(1.0, points[0].X); + expectf(0.0, points[0].Y); + expectf((dpix+1.0)/dpix, points[1].X); + expectf(0.0, points[1].Y); + expectf(1.0, points[2].X); + expectf(3.0/dpiy, points[2].Y); + + status = GdipEndContainer(graphics, state); + expect(Ok, status); + + status = GdipSetPageUnit(graphics, UnitInch); + expect(Ok, status); + + status = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitPixel, &state); + expect(Ok, status); + + memcpy(points, test_points, sizeof(points)); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, points, 3); + expect(Ok, status); + expectf(dpix, points[0].X); + expectf(0.0, points[0].Y); + expectf(dpix*2, points[1].X); + expectf(0.0, points[1].Y); + expectf(dpix, points[2].X); + expectf(dpiy*3, points[2].Y); + + status = GdipEndContainer(graphics, state); + expect(Ok, status); + + status = GdipBeginContainer(graphics, &dstrect, &srcrect, UnitInch, &state); + expect(Ok, status); + + memcpy(points, test_points, sizeof(points)); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, points, 3); + expect(Ok, status); + expectf(dpix, points[0].X); + expectf(0.0, points[0].Y); + expectf(dpix+1.0, points[1].X); + expectf(0.0, points[1].Y); + expectf(dpix, points[2].X); + expectf(3.0, points[2].Y); + + status = GdipEndContainer(graphics, state); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + + ReleaseDC(hwnd, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -5970,6 +6142,7 @@ START_TEST(graphics) test_bitmapfromgraphics(); test_GdipFillRectangles(); test_GdipGetVisibleClipBounds_memoryDC(); + test_container_rects(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Vincent Povirk : gdiplus/tests: Check record types in playback tests.
by Alexandre Julliard Sept. 19, 2016

Sept. 19, 2016

Module: wine Branch: master Commit: 8b7520ce6d7cae18c2c24920992e0d199e933660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b7520ce6d7cae18c2c249209… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 16 14:37:30 2016 -0500 gdiplus/tests: Check record types in playback tests. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 60890d9..7251ff3 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -211,12 +211,16 @@ static BOOL CALLBACK play_metafile_proc(EmfPlusRecordType record_type, unsigned { todo_wine_if (state->expected[state->count].playback_todo) ok(stat == Ok, "%s.%i: GdipPlayMetafileRecord failed with stat %i\n", state->desc, state->count, stat); + todo_wine_if (state->expected[state->count].todo) + ok(state->expected[state->count].record_type == record_type, + "%s.%i: expected record type 0x%x, got 0x%x\n", state->desc, state->count, + state->expected[state->count].record_type, record_type); state->count++; } else { todo_wine_if (state->expected[state->count].playback_todo) - ok(0, "%s: too many records\n", state->desc); + ok(0, "%s: unexpected record 0x%x\n", state->desc, record_type); return FALSE; }

1 0