October 2017 - Wine-Devel - list.winehq.org

Re: [PATCH] wmvcore/tests: Access IWMDRMReader(|2|3) interfaces on Windows.
by Nikolay Sivov Oct. 31, 2017

Oct. 31, 2017

On 24.10.2017 8:36, Jefferson Carpenter wrote: > +#if defined(__MINGW32__) || defined(__MINGW64__) > +#ifdef _WIN64 > + flagPtrAddr = (unsigned long long)(reader) - 24; > + flagMem[556] = 1; > +#elif _WIN32 > + flagPtrAddr = (unsigned int)(reader) - 12; > + flagMem[288] = 1; > +#endif > + *(unsigned char **)flagPtrAddr = flagMem; > +#endif Why would you need something like that to match potential Wine's implementation? How do applications access this thing?

3 10

Re: [PATCH 4/4] dx8vb: Implement Direct3D8 methods
by Stefan Dösinger Oct. 31, 2017

Oct. 31, 2017

Hi Fabian, Why do you need a proxy IDirect3D8 implementation in dx8vb? Is there any difference between dx8vb and d3d8? Stefan > Am 31.10.2017 um 00:31 schrieb Fabian Maurer <dark.shadow4(a)web.de>: > > Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> > --- > dlls/dx8vb/Makefile.in | 2 +- > dlls/dx8vb/directx8.c | 112 ++++++++++++++++++++++++++++++++++++++----------- > 2 files changed, 89 insertions(+), 25 deletions(-) > > diff --git a/dlls/dx8vb/Makefile.in b/dlls/dx8vb/Makefile.in > index 8438d022f4..33fe651503 100644 > --- a/dlls/dx8vb/Makefile.in > +++ b/dlls/dx8vb/Makefile.in > @@ -1,5 +1,5 @@ > MODULE = dx8vb.dll > -IMPORTS = uuid ole32 > +IMPORTS = uuid ole32 d3d8 > > C_SRCS = \ > d3dx8.c \ > diff --git a/dlls/dx8vb/directx8.c b/dlls/dx8vb/directx8.c > index 338862a4ff..dd50c86008 100644 > --- a/dlls/dx8vb/directx8.c > +++ b/dlls/dx8vb/directx8.c > @@ -21,6 +21,9 @@ > #include "config.h" > > #include "dx8vb_private.h" > +#define __WINE_D3D8TYPES_H > +#define __WINE_D3D8CAPS_H > +#include "d3d8.h" > #include "ocidl.h" > > #include "wine/debug.h" > @@ -36,6 +39,7 @@ typedef struct > typedef struct > { > Direct3D8 Direct3D8_iface; > + IDirect3D8 *direct3d8; > LONG ref; > } direct3d8; > > @@ -95,7 +99,10 @@ static ULONG WINAPI direct3d8_Release(Direct3D8 *iface) > TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); > > if (!ref) > + { > + IDirect3D8_Release(This->direct3d8); > HeapFree(GetProcessHeap(), 0, This); > + } > > return ref; > } > @@ -104,91 +111,145 @@ static ULONG WINAPI direct3d8_Release(Direct3D8 *iface) > > static HRESULT WINAPI direct3d8_RegisterSoftwareDevice(Direct3D8 *iface, void *initializeFunction) > { > - FIXME("(%p): stub!\n", initializeFunction); > + direct3d8 *This = impl_from_Direct3D8(iface); > > - return E_NOTIMPL; > + HRESULT ret = IDirect3D8_RegisterSoftwareDevice(This->direct3d8, initializeFunction); > + > + FIXME("(%p) -> (%x)\n", initializeFunction, ret); > + > + return ret; > } > > static int WINAPI direct3d8_GetAdapterCount(Direct3D8 *iface) > { > - FIXME("(): stub!\n"); > + direct3d8 *This = impl_from_Direct3D8(iface); > + > + int ret = IDirect3D8_GetAdapterCount(This->direct3d8); > + > + FIXME("() -> (%i)\n", ret); > > - return 0; > + return ret; > } > > static HRESULT WINAPI direct3d8_GetAdapterIdentifier(Direct3D8 *iface, int adapter, > LONG flags, D3DADAPTER_IDENTIFIER8 *identifier) > { > - FIXME("(%i, %i, %p): stub!\n", adapter, flags, identifier); > + direct3d8 *This = impl_from_Direct3D8(iface); > > - return E_NOTIMPL; > + HRESULT ret = IDirect3D8_GetAdapterIdentifier(This->direct3d8, adapter, flags, identifier); > + > + FIXME("(%i, %i, %p) -> (%x)\n", adapter, flags, identifier, ret); > + > + return ret; > } > > static int WINAPI direct3d8_GetAdapterModeCount(Direct3D8 *iface, int adapter) > { > - FIXME("(%i): stub!\n", adapter); > + direct3d8 *This = impl_from_Direct3D8(iface); > > - return 0; > + int ret = IDirect3D8_GetAdapterModeCount(This->direct3d8, adapter); > + > + FIXME("(%i) -> (%i)\n", adapter, ret); > + > + return ret; > } > > static HRESULT WINAPI direct3d8_EnumAdapterModes(Direct3D8 *iface, int adapter, int mode, D3DDISPLAYMODE *displayMode) > { > - FIXME("(%i, %i, %p): stub!\n", adapter, mode, displayMode); > + direct3d8 *This = impl_from_Direct3D8(iface); > > - return E_NOTIMPL; > + HRESULT ret = IDirect3D8_EnumAdapterModes(This->direct3d8, adapter, mode, displayMode); > + > + FIXME("(%i, %i, %p) -> (%x)\n", adapter, mode, displayMode, ret); > + > + return ret; > } > > static HRESULT WINAPI direct3d8_GetAdapterDisplayMode(Direct3D8 *iface, int adapter, D3DDISPLAYMODE *displayMode) > { > - FIXME("(%i, %p): stub!\n", adapter, displayMode); > + direct3d8 *This = impl_from_Direct3D8(iface); > + HRESULT ret; > > - return E_NOTIMPL; > + ret = IDirect3D8_GetAdapterDisplayMode(This->direct3d8, adapter, displayMode); > + > + TRACE("(%i, %p) -> (%x)\n", adapter, displayMode, ret); > + > + return ret; > } > > static LONG WINAPI direct3d8_CheckDeviceType(Direct3D8 *iface, int adapter, D3DDEVTYPE checkType, > D3DFORMAT displayFormat, D3DFORMAT backBufferFormat, LONG bWindowed) > { > - FIXME("(%i, %u, %u, %u, %i): stub!\n", adapter, checkType, displayFormat, backBufferFormat, bWindowed); > + direct3d8 *This = impl_from_Direct3D8(iface); > > - return 0; > + LONG ret = IDirect3D8_CheckDeviceType(This->direct3d8, adapter, checkType, > + displayFormat, backBufferFormat, bWindowed); > + > + FIXME("(%i, %u, %u, %u, %i) -> (%i)\n", adapter, checkType, displayFormat, backBufferFormat, bWindowed, ret); > + > + return ret; > } > > static LONG WINAPI direct3d8_CheckDeviceFormat(Direct3D8 *iface, int adapter, D3DDEVTYPE deviceType, > D3DFORMAT adapterFormat, LONG usage, D3DRESOURCETYPE rType, D3DFORMAT checkFormat) > { > - FIXME("(%i, %u, %u, %i, %u, %u): stub!\n", adapter, deviceType, adapterFormat, usage, rType, checkFormat); > + direct3d8 *This = impl_from_Direct3D8(iface); > > - return 0; > + LONG ret = IDirect3D8_CheckDeviceFormat(This->direct3d8, adapter, deviceType, > + adapterFormat, usage, rType, checkFormat); > + > + FIXME("(%i, %u, %u, %i, %u, %u) -> (%i)\n", adapter, deviceType, adapterFormat, usage, rType, checkFormat, ret); > + > + return ret; > } > > static LONG WINAPI direct3d8_CheckDeviceMultiSampleType(Direct3D8 *iface, int adapter, D3DDEVTYPE deviceType, > D3DFORMAT renderTargetFormat, LONG windowed, D3DMULTISAMPLE_TYPE multiSampleType) > { > - FIXME("(%i, %u, %u, %i, %u): stub!\n", adapter, deviceType, renderTargetFormat, windowed, multiSampleType); > + direct3d8 *This = impl_from_Direct3D8(iface); > + > + LONG ret = IDirect3D8_CheckDeviceMultiSampleType(This->direct3d8, adapter, deviceType, > + renderTargetFormat, windowed, multiSampleType); > + > + FIXME("(%i, %u, %u, %i, %u) -> (%i)\n", adapter, deviceType, renderTargetFormat, windowed, multiSampleType, ret); > > - return 0; > + return ret; > } > > static LONG WINAPI direct3d8_CheckDepthStencilMatch(Direct3D8 *iface, int adapter, D3DDEVTYPE deviceType, > D3DFORMAT adapterFormat, D3DFORMAT renderTargetFormat, D3DFORMAT depthStencilFormat) > { > - FIXME("(%i, %u, %u, %u, %u): stub!\n", adapter, deviceType, adapterFormat, renderTargetFormat, depthStencilFormat); > + direct3d8 *This = impl_from_Direct3D8(iface); > + > + LONG ret = IDirect3D8_CheckDepthStencilMatch(This->direct3d8, adapter, deviceType, adapterFormat, > + renderTargetFormat, depthStencilFormat); > + > + TRACE("(%i, %u, %u, %u, %u) ->(%i)\n", adapter, deviceType, adapterFormat, > + renderTargetFormat, depthStencilFormat, ret); > > - return 0; > + return ret; > } > > static HRESULT WINAPI direct3d8_GetDeviceCaps(Direct3D8 *iface, int adapter, D3DDEVTYPE deviceType, D3DCAPS8 *caps) > { > - FIXME("(%i, %u, %p): stub!\n", adapter, deviceType, caps); > + direct3d8 *This = impl_from_Direct3D8(iface); > > - return E_NOTIMPL; > + HRESULT ret = IDirect3D8_GetDeviceCaps(This->direct3d8, adapter, deviceType, caps); > + > + TRACE("(%i, %u, %p) -> (%x)\n", adapter, deviceType, caps, ret); > + > + return ret; > } > > static LONG WINAPI direct3d8_GetAdapterMonitor(Direct3D8 *iface, int adapter) > { > - FIXME("(%i): stub!\n", adapter); > + direct3d8 *This = impl_from_Direct3D8(iface); > + > + LONG ret = (LONG)IDirect3D8_GetAdapterMonitor(This->direct3d8, adapter); > + > + TRACE("(%i) -> (%i)!\n", adapter, ret); > > - return 0; > + return ret; > } > > static HRESULT WINAPI direct3d8_CreateDevice(Direct3D8 *iface, int adapter, D3DDEVTYPE deviceType, HWND hFocusWindow, > @@ -235,6 +296,9 @@ HRESULT direct3d8_create(Direct3D8 **ppv) > > object->Direct3D8_iface.lpVtbl = &Direct3D8_Vtbl; > object->ref = 1; > + object->direct3d8 = Direct3DCreate8(D3D_SDK_VERSION); > + if(!object->direct3d8) > + ERR("Can't create D3D8 object\n"); > > *ppv = &object->Direct3D8_iface; > > -- > 2.15.0 > > >

2 3

Re: [PATCH 1/4] dx8vb: Add stubs for D3DX8 interface
by Nikolay Sivov Oct. 30, 2017

Oct. 30, 2017

On Tue, Oct 31, 2017 at 2:31 AM, Fabian Maurer <dark.shadow4(a)web.de> wrote: > > main.c > > IDL_SRCS = dx8vb.idl > diff --git a/dlls/dx8vb/d3dx8.c b/dlls/dx8vb/d3dx8.c > new file mode 100644 > index 0000000000..2959849547 > --- /dev/null > +++ b/dlls/dx8vb/d3dx8.c > @@ -0,0 +1,861 @@ > + /* > + * Copyright 2017 Fabian Maurer > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, > USA > + */ > + > +#define COBJMACROS > + > +#include "config.h" > + > +#include "dx8vb_private.h" > +#include "ocidl.h" > + > +#include "wine/debug.h" > + > +WINE_DEFAULT_DEBUG_CHANNEL(dx8vb); > + > +typedef struct > +{ > + ID3DX8 ID3DX8_iface; > + LONG ref; > +} d3dx8; > + > +static inline d3dx8 *impl_from_ID3DX8(ID3DX8 *iface) > +{ > + return CONTAINING_RECORD(iface, d3dx8, ID3DX8_iface); > +} > + > +/*** d3dx8 - IUnknown methods ***/ > + > Comment seems a bit useless, you're not going to use this file for anything else. > +static HRESULT WINAPI d3dx8_QueryInterface(ID3DX8 *iface, REFIID riid, > void **ppv) > +{ > + d3dx8 *This = impl_from_ID3DX8(iface); > + > + TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppv); > + > + *ppv = NULL; > + > + if (IsEqualGUID(riid, &IID_IUnknown)) > + *ppv = &This->ID3DX8_iface; > + else if(IsEqualGUID(riid, &IID_ID3DX8)) > + *ppv = &This->ID3DX8_iface; > + else if(IsEqualGUID(riid, &IID_IPersistPropertyBag)) > + FIXME("No interface for IID_IPersistPropertyBag\n"); > + else if(IsEqualGUID(riid, &IID_IPersistStreamInit)) > + FIXME("No interface for IID_IPersistStreamInit\n"); > + else > Where does this come from?

2 1

Re: [PATCH 3/4] dx8vb: Add Direct3D8 interface with stubs
by Nikolay Sivov Oct. 30, 2017

Oct. 30, 2017

> > > static HRESULT WINAPI directx8_QueryInterface(IDirectX8 *iface, REFIID > riid, void **ppv) > @@ -237,9 +440,11 @@ static HRESULT WINAPI directx8_ > DirectPlayAddressCreate(IDirectX8 *iface, DirectP > > static HRESULT WINAPI directx8_Direct3DCreate(IDirectX8 *iface, > Direct3D8 **ret) > { > - FIXME("(%p): stub!\n", ret); > + HRESULT res = direct3d8_create(ret); > > - return E_NOTIMPL; > + TRACE("(%p) -> (%x)\n", ret, res); > + > + return res; > } > That's an unusual way to arrange things. Why don't you return as "return direct3d8_create();" ?

2 1

Wineconference keynote 2017
by Marcus Meissner Oct. 30, 2017

Oct. 30, 2017

Hi folks, I have uploaded Alexandres Wineconference 2017 Keynote to youtube: https://www.youtube.com/watch?v=AokFgDSLMWU&t=772s Ciao, Marcus

2 1

WineConf agenda
by Jacek Caban Oct. 29, 2017

Oct. 29, 2017

Hi all, It's getting close to WineConf and I think it's time to think about agenda. Does anyone have anything he'd like to talk about? Any ideas about conversations we should have? Feel free to add them to https://wiki.winehq.org/WineConf2017 Cheers, Jacek

4 4

Re: [v2] oleaut32: Add ARM support to DispCallFunc().
by Donna Whisnant Oct. 28, 2017

Oct. 28, 2017

V3 has been posted. Other comments are inlined below... > > Hi, > > thanks, but it seems I missed minor things last time: > > > + args = heap_alloc(sizeof(VARIANT) * cActuals + sizeof(DWORD) * 4 ); > > Try to be consistent with the spaces for each function call. > Sorry. That one came from a cut-and-paste of the i386 code and I missed fixing it. > > + case VT_R4: /* these must be 4-byte aligned, and put in 's' regs or stack, as they are single-floats */ > > + if (scount < 16) > > + regs.sd.s[scount++] = V_R4(arg); > > + else > > + args[argspos++] = V_UI4(arg); > > + break; > ... > > + case VT_VARIANT: > > + /* 8-byte align 'r' and/or stack: */ > > + if (rcount < 3) > > + { > > + rcount += (rcount % 2); > > + } > > + else > > + { > > + rcount = 4; > > + argspos += (argspos % 2); > > + } > ... > > + case VT_BOOL: /* VT_BOOL is 16-bit but BOOL is 32-bit, needs to be extended */ > > + if (rcount < 4) > > + regs.r[rcount++] = V_BOOL(arg); > > + else > > + args[argspos++] = V_BOOL(arg); > > + break; > > + default: > > + if (rcount < 4) > > + regs.r[rcount++] = V_UI4(arg); > > + else > > + args[argspos++] = V_UI4(arg); > > + break; > > + } > > Maybe one of those is not really conistent wrt curly brackets > That was actually intentional, as I made the 'if' in the VT_VARIANT case consistent with itself. All of the others cited needed no curly braces on either half of the 'if'. However, that one had to have curly braces on the 'else', so I made it consistent on the other side too and used curly braces throughout the 'if'. My usage of curly braces with respect to 'if' statements was to use them on both halves or neither half... But since you want them removed, I have removed the extra curly braces on that one in the v3 post. > > + case VT_CY: > > + V_UI8(pvargResult) = call_method(func, argspos, args, (DWORD*)&regs ); > > + break; > > + default: > > + V_UI4(pvargResult) = call_method( func, argspos, args, (DWORD*)&regs ); > > + break; > > space issue again, maybe somewhere else too? > Oops, I missed that one space. Fixed. I didn't spot any others. The rest appear correct or are at least consistent throughout.

1 0

Re: [v2] oleaut32: Add ARM support to DispCallFunc().
by André Hentschel Oct. 28, 2017

Oct. 28, 2017

Am 26.10.2017 um 06:39 schrieb Donna Whisnant: > Adds ARM ABI support to DispCallFunc() to allow IDispatch invoke calls > to succeed on ARM platforms. This change specifically targets only > 32-bit little-endian (ARMEL) platform CPUs. It's believed to likely be > compatible with big-endian (ARMEB) platforms, but testing for that > platform should be completed before enabling. > > Tested on Raspbian Stretch 2017-09-07 RPi image using a Qemu systemd > container to compile and run it on an x86-64 Host.. When running on > Raspberry Pi hardware, a 3G/1G split kernel needs to be used for Wine > to function. Hi, thanks, but it seems I missed minor things last time: > + args = heap_alloc(sizeof(VARIANT) * cActuals + sizeof(DWORD) * 4 ); Try to be consistent with the spaces for each function call. > + case VT_R4: /* these must be 4-byte aligned, and put in 's' regs or stack, as they are single-floats */ > + if (scount < 16) > + regs.sd.s[scount++] = V_R4(arg); > + else > + args[argspos++] = V_UI4(arg); > + break; ... > + case VT_VARIANT: > + /* 8-byte align 'r' and/or stack: */ > + if (rcount < 3) > + { > + rcount += (rcount % 2); > + } > + else > + { > + rcount = 4; > + argspos += (argspos % 2); > + } ... > + case VT_BOOL: /* VT_BOOL is 16-bit but BOOL is 32-bit, needs to be extended */ > + if (rcount < 4) > + regs.r[rcount++] = V_BOOL(arg); > + else > + args[argspos++] = V_BOOL(arg); > + break; > + default: > + if (rcount < 4) > + regs.r[rcount++] = V_UI4(arg); > + else > + args[argspos++] = V_UI4(arg); > + break; > + } Maybe one of those is not really conistent wrt curly brackets > + case VT_CY: > + V_UI8(pvargResult) = call_method(func, argspos, args, (DWORD*)&regs ); > + break; > + default: > + V_UI4(pvargResult) = call_method( func, argspos, args, (DWORD*)&regs ); > + break; space issue again, maybe somewhere else too? Otherwise I'm quite tempted to sign it off

1 0

Re: Fwd: Re: oleaut32: Add ARM support to DispCallFunc().
by Donna Whisnant Oct. 25, 2017

Oct. 25, 2017

Thanks. I did miss it, as I had subscribed to the patches list, but forgot to subscribe the devel list. And thanks for your feedback. One additional comment regarding the tests, as I didn't see mention of that in this thread. My code passes the tests for this DispCallFunc() function (I did verify that) except for the specialized case that tests for win64 functionality in DispCallFunc(). That test was designed to verify stdcall vs. cdecl on 32-bit x86 platforms. However, like the 64-bit x86, ARM (both 32 and 64) doesn't use stdcall in the traditional sense of stack cleaning. Thus, that test needs to be #ifdef'd out on ARM as it isn't valid. But I didn't like how that looked and it wasn't consistent with the existing 64-bit version. I thought a better solution would be to change it to only be there for "__i386__" instead, as I think that's the only mode that will ever need it. So if you are wondering why my patch set didn't touch the test code and why that particular test technically fails, that's why. I figured you guys can decide which way you want to tweak that... My other replies are inlined below... On Tue, Oct 24, 2017, at 13:37, André Hentschel wrote: > hi, just in case you missed it > > > -------- Weitergeleitete Nachricht -------- > Betreff: Re: oleaut32: Add ARM support to DispCallFunc(). > Datum: Mon, 23 Oct 2017 23:07:43 +0200 > Von: André Hentschel <nerv(a)dawncrow.de> > An: wine-devel(a)winehq.org > > Hi Donna and Welcome to the Wine Project! > > Whats your motivation for this patch? > You did a very good job for a firsttimer! > Thanks! While new to this project, I've been programming for over 37 years. My motivation on this patch was porting some ActiveX components over to ARM to run on a Raspberry Pi Zero W for a data logging device I'm designing for the CAN bus. Those components use IDispatch for invocation rather than the vtable, as they were designed to be extensible without requiring users to recompile their code, and this was the last piece of the puzzle to make them fully work on ARM. > Some more notes below: > > Am 22.10.2017 um 03:04 schrieb Donna Whisnant: > > Adds ARM ABI support to DispCallFunc() to allow IDispatch invoke calls > > to succeed on ARM platforms. This change specifically targets only > > 32-bit little-endian (ARMEL) platform CPUs. It's believed to likely be > > compatible with 64-bit and/or big-endian (ARMEB) platforms, but testing > > for those other platforms should be completed before enabling. > > > > Tested on Raspbian Stretch 2017-09-07 RPi image using a Qemu systemd > > container to compile and run it on an x86-64 Host.. When running on > > Raspberry Pi hardware, a 3G/1G split kernel needs to be used for Wine > > to function. > > > > Signed-off-by: Donna Whisnant <dewhisna(a)dewtronics.com> > > --- > > dlls/oleaut32/typelib.c | 221 +++++++++++++++++++++++++++++++++++++++++++++++- > > 1 file changed, 219 insertions(+), 2 deletions(-) > > > > diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c > > index ebf6d85..d7ef212 100644 > > --- a/dlls/oleaut32/typelib.c > > +++ b/dlls/oleaut32/typelib.c > > @@ -6302,8 +6302,48 @@ static HRESULT WINAPI ITypeInfo_fnGetIDsOfNames( ITypeInfo2 *iface, > > return DISP_E_UNKNOWNNAME; > > } > > > > +#if defined(__arm__) && defined(__ARM_32BIT_STATE) && !defined(__ARMEB__) > > +/* Note: this may work OK on 64-bit and/or ARMEB, but has currently only been tested for 32-bit ARMEL */ > > While i doubt there is something risky here regarding endianess you can > keep the ARMEB check, but get rid of the 32bit check, it might be about > Thunk(16bit) vs. ARM(32bit) but I'm not sure. > Anyway, this won't work on 64bit, because the instruction set is totally > different, but it inspires me to do the 64bit version as soon this lands > upstream ;) > Interesting. Between the ARMEB/ARMEL modes and the 32/64 bit check, I would have left the 32-bit check and tossed the !ARMEB check, which is the opposite of your instructions. I'm fairly certain there isn't anything endian-specific. But as you pointed out, the instruction set on the 64-bit is different. So I'm confused why you say to get rid of the 32-bit check. Are you talking about removing the 'define' check for 32-bit or just the comment? Can you please clarify? > > > > -#ifdef __i386__ > > +extern LONGLONG call_method( void *func, int nb_stk_args, const DWORD *stk_args, const DWORD *reg_args ); > > +__ASM_GLOBAL_FUNC( call_method, > > + /* r0 = *func > > + * r1 = nb_stk_args > > + * r2 = *stk_args (pointer to 'nb_stk_args' DWORD values to push on stack) > > + * r3 = *reg_args (pointer to 8, 64-bit d0-d7 (double) values OR as 16, 32-bit s0-s15 (float) values, followed by 4, 32-bit (DWORD) r0-r3 values) > > + */ > > + > > + "push {fp, lr}\n\t" /* Save frame pointer and return address (stack still aligned to 8 bytes) */ > > + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") > > + __ASM_CFI(".cfi_rel_offset %fp,0\n\t") > > + "add fp, sp, #4\n\t" /* Setup frame pointer */ > > Is this adjusted FP used somewhere? (I forgot a lot of things regarding > arm32...) > In my first version of the code, I was using r4 and r5 (which had to be saved/restored) and originally had slightly different arguments coming into the function (more than was fitting in the registers) and so I was setting up the frame for easier debugging. But then I remembered I have the 'ip' register to my disposal, and that was sufficient and allowed me to toss the saving of those other registers. And, my original function signature was passing both the floating point registers and the core registers in separate structures using separate pointers to them, but then I realized that could be a single structure with both, so I tossed the extra argument and everything would then fit into the registers alone for the call, meaning the stack frame itself isn't really needed anymore. However, it's still necessary to set 'fp', though, as it's needed for cleaning the stack on the return from the callee, but I could toss the +4 adjustment of it or use "#0" for the adjustment like the compiler probably would (as I think it maps to the same instruction binary). If I do that, the ASM_CFI macro usage could be dropped too as there would be nothing for them to report. > > + __ASM_CFI(".cfi_def_cfa_register %fp\n\t") > > + > > + "lsls r1, r1, #2\n\t" /* r1 = nb_stk_args * sizeof(DWORD) */ > > + "beq 1f\n\t" /* Skip allocation if no stack args */ > > + "add r2, r2, r1\n" /* Calculate ending address of incoming stack data */ > > + "2:\tldr ip, [r2, #-4]!\n\t" /* Get next value */ > > + "str ip, [sp, #-4]!\n\t" /* Push it on the stack */ > > + "subs r1, r1, #4\n\t" /* Decrement count */ > > + "bgt 2b\n\t" /* Loop till done */ > > + > > + "1:\tvldm r3!, {s0-s15}\n\t" /* Load the s0-s15/d0-d7 arguments */ > > + "mov ip, r0\n\t" /* Save the function call address to ip before we nuke r0 with arguments to pass */ > > + "ldm r3, {r0-r3}\n\t" /* Load the r0-r3 arguments */ > > + > > + "blx ip\n\t" /* Call the target function */ > > + > > + "sub sp, fp, #4\n\t" /* Clean the stack using 'fp' to allow for either stdcall or cdecl calls */ > > + __ASM_CFI(".cfi_def_cfa %sp,4\n\t") > > + "pop {fp, pc}\n\t" /* Restore FP and return */ > > + __ASM_CFI(".cfi_same_value %fp\n\t") /* Here for completeness and symmetry with other cpus, but won't be reached */ > > + ) > > + > > +/* same function but returning single/double floating point */ > > +static float (* const call_float_method)(void *, int, const DWORD *, const DWORD *) = (void *)call_method; > > +static double (* const call_double_method)(void *, int, const DWORD *, const DWORD *) = (void *)call_method; > > + > > +#elif defined(__i386__) > > > > extern LONGLONG call_method( void *func, int nb_args, const DWORD *args, int *stack_offset ); > > __ASM_GLOBAL_FUNC( call_method, > > @@ -6637,7 +6677,184 @@ DispCallFunc( > > void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VARTYPE vtReturn, UINT cActuals, > > VARTYPE* prgvt, VARIANTARG** prgpvarg, VARIANT* pvargResult) > > { > > -#ifdef __i386__ > > +#if defined(__arm__) && defined(__ARM_32BIT_STATE) && !defined(__ARMEB__) > > +/* Note: this may work OK on 64-bit and/or ARMEB, but has currently only been tested for 32-bit ARMEL */ > > Same as above > > > + int argspos; > > + void *func; > > + UINT i; > > + DWORD *args; > > + struct { > > + union { > > + float s[16]; > > + double d[8]; > > + } sd; > > + DWORD r[4]; > > + } regs; > > + int rcount; /* 32-bit register index count */ > > + int scount; /* single-precision float register index count (will be incremented twice for doubles, plus alignment) */ > > + > > + TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n", > > + pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, > > + pvargResult, V_VT(pvargResult)); > > You can go up to 100 chars per line, so be free to rearrange this > I could, but the trace line was a cut-and-paste from the i386 path that was already there and I figured consistency in the code was good. > > + > > + if (cc != CC_STDCALL && cc != CC_CDECL) > > + { > > + FIXME("unsupported calling convention %d\n",cc); > > + return E_INVALIDARG; > > + } > > + > > + argspos = 0; > > + rcount = 0; > > + scount = 0; > > + > > + /* Determine if we need to pass a pointer for the return value as arg 0. If so, do that */ > > + /* first as it will need to be in the 'r' registers: */ > > + switch (vtReturn) > > + { > > + case VT_DECIMAL: > > + case VT_VARIANT: > > + regs.r[rcount++] = (DWORD)pvargResult; /* arg 0 is a pointer to the result */ > > + break; > > + case VT_HRESULT: > > + WARN("invalid return type %u\n", vtReturn); > > + return E_INVALIDARG; > > + default: /* And all others are in 'r', 's', or 'd' registers or have no return value */ > > + break; > > + } > > + > > + if (pvInstance) > > + { > > + const FARPROC *vtable = *(FARPROC **)pvInstance; > > + func = vtable[oVft/sizeof(void *)]; > > + regs.r[rcount++] = (DWORD)pvInstance; /* the This pointer is always the first parameter */ > > + } > > + else func = (void *)oVft; > > + > > + /* maximum size for an argument is sizeof(VARIANT). Also allow for return pointer and stack alignment. */ > > + args = heap_alloc(sizeof(VARIANT) * cActuals + sizeof(DWORD) * 4 ); > > + > > + for (i = 0; i < cActuals; i++) > > + { > > + VARIANT *arg = prgpvarg[i]; > > + DWORD *pdwarg = (DWORD *)(arg); /* a reinterpret_cast of the variant, used for copying structures when they are split between registers and stack */ > > + int ntemp; /* Used for counting words split between registers and stack */ > > + > > + switch (prgvt[i]) > > + { > > + case VT_EMPTY: > > + break; > > + case VT_R4: /* these must be 4-byte aligned, and put in 's' regs or stack, as they are single-floats */ > > + if (scount < 16) > > + { > > + regs.sd.s[scount++] = V_R4(arg); > > + } else { > > + args[argspos++] = V_UI4(arg); > > + } > > I think no curly brackets are necessary here at all, but we usually don't > open them in the same line as the if/else statement for new code > Oh sorry. I thought I was being consistent with the rest of the code-base. I have the curly brace on the next line after the 'if', but didn't think about the 'else'. I will fix that and resubmit it. I personally like the curly braces even for single-line statements, though, as it keeps from either misreading it or accidentally adding something for the conditional and forgetting to add them. But I will fix the formatting. > > + break; > > + case VT_R8: /* these must be 8-byte aligned, and put in 'd' regs or stack, as they are double-floats */ > > + case VT_DATE: > > + if (scount < 15) > > + { > > + scount += (scount % 2); /* align scount to next whole double */ > > + regs.sd.d[scount/2] = V_R8(arg); > > + scount += 2; > > + } else { > > + scount = 16; /* Make sure we flag that all 's' regs are full */ > > + argspos += (argspos % 2); /* align argspos to 8-bytes */ > > + memcpy( &args[argspos], &V_R8(arg), sizeof(V_R8(arg)) ); > > + argspos += sizeof(V_R8(arg)) / sizeof(DWORD); > > + } > > + break; > > + case VT_I8: /* these must be 8-byte aligned, and put in 'r' regs or stack, as they are long-longs */ > > + case VT_UI8: > > + case VT_CY: > > + if (rcount < 3) > > + { > > + rcount += (rcount % 2); /* align rcount to 8-byte register pair */ > > + memcpy( &regs.r[rcount], &V_UI8(arg), sizeof(V_UI8(arg)) ); > > + rcount += sizeof(V_UI8(arg)) / sizeof(DWORD); > > + } else { > > + rcount = 4; /* Make sure we flag that all 'r' regs are full */ > > + argspos += (argspos % 2); /* align argspos to 8-bytes */ > > + memcpy( &args[argspos], &V_UI8(arg), sizeof(V_UI8(arg)) ); > > + argspos += sizeof(V_UI8(arg)) / sizeof(DWORD); > > + } > > + break; > > + case VT_DECIMAL: /* these structures are 8-byte aligned, and put in 'r' regs or stack, can be split between the two */ > > + case VT_VARIANT: > > + /* 8-byte align 'r' and/or stack: */ > > + if (rcount < 3) > > + { > > + rcount += (rcount % 2); > > + } else { > > + rcount = 4; > > + argspos += (argspos % 2); > > + } > > + ntemp = sizeof(*arg) / sizeof(DWORD); > > + while (ntemp > 0) > > + { > > + if (rcount < 4) > > + { > > + regs.r[rcount++] = *pdwarg++; > > + } else { > > + args[argspos++] = *pdwarg++; > > + } > > + --ntemp; > > + } > > + break; > > + case VT_BOOL: /* VT_BOOL is 16-bit but BOOL is 32-bit, needs to be extended */ > > + if (rcount < 4) > > + { > > + regs.r[rcount++] = V_BOOL(arg); > > + } else { > > + args[argspos++] = V_BOOL(arg); > > + } > > + break; > > + default: > > + if (rcount < 4) > > + { > > + regs.r[rcount++] = V_UI4(arg); > > + } else { > > + args[argspos++] = V_UI4(arg); > > + } > > + break; > > + } > > + TRACE("arg %u: type %s %s\n", i, debugstr_vt(prgvt[i]), debugstr_variant(arg)); > > + } > > + > > + argspos += (argspos % 2); /* Make sure stack function alignment is 8-byte */ > > + > > + TRACE("rcount: %d, scount: %d, argspos: %d\n", rcount, scount, argspos); > > + > > + switch (vtReturn) > > + { > > + case VT_EMPTY: /* EMPTY = no return value */ > > + case VT_DECIMAL: /* DECIMAL and VARIANT already have a pointer argument passed (see above) */ > > + case VT_VARIANT: > > + call_method( func, argspos, args, (DWORD*)&regs ); > > + break; > > + case VT_R4: > > + V_R4(pvargResult) = call_float_method( func, argspos, args, (DWORD*)&regs ); > > + break; > > + case VT_R8: > > + case VT_DATE: > > + V_R8(pvargResult) = call_double_method( func, argspos, args, (DWORD*)&regs ); > > + break; > > + case VT_I8: > > + case VT_UI8: > > + case VT_CY: > > + V_UI8(pvargResult) = call_method(func, argspos, args, (DWORD*)&regs ); > > + break; > > + default: > > + V_UI4(pvargResult) = call_method( func, argspos, args, (DWORD*)&regs ); > > + break; > > + } > > + heap_free( args ); > > + if (vtReturn != VT_VARIANT) V_VT(pvargResult) = vtReturn; > > + TRACE("retval: %s\n", debugstr_variant(pvargResult)); > > + return S_OK; > > + > > +#elif defined(__i386__) > > int argspos, stack_offset; > > void *func; > > UINT i; > > > > >

2 2

Re: [PATCH 4/4] d3d9/tests: Windows 10 15.07 doesn't detect external mode changes.
by Henri Verbeet Oct. 25, 2017

Oct. 25, 2017

On 19 October 2017 at 10:09, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > This fixes this test failure: > http://test.winehq.org/data/9787af34b1c23deb67902fc7dbf2c8421b987048/win10_… > > What I have tried to debug or try to work around this issue: > *) Checked that the resolution is actually changed. It is changed from > 640x480 to 800x600. > *) IDirect3DSwapchain9Ex::GetDisplayModeEx sees the new mode. Calling > this method does not make Present see it though. > *) Replace Present with PresentEx. > *) Call flush_events before calling Present. > > I'm happy to try more ideas, but I think this is just broken in this > Windows build. It is working OK in my 17.03 VM, and I believe it was > working on 16.07 too, but I don't have 16.07 around anymore because it > auto updated to 17.03... Should we update the Windows 10 VMs at some point? Do we want to keep the old versions around?

3 2