Re: dinput: Support IUnknown in the IDirectInputEffect COM object. (2nd try)

[Huw Davies]

On Tue, Mar 15, 2016 at 11:43:58AM +0100, Michael Stefaniuc wrote:
> Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de>
> ---
> v2: Use IsEqualIID consistently. Thanks Huw!
>
> And of course again not even compile tested as I don't have a Mac. Yes,
> I need to set me up with a cross compile for that.

gcc -m32 -c -o joystick_osx.o joystick_osx.c -I. -I../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe \
  -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wstrict-prototypes \
  -Wwrite-strings -Wpointer-arith -gdwarf-2 -fno-omit-frame-pointer -g -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
joystick_osx.c: In function ‘effect_QueryInterface’:
joystick_osx.c:1477: error: ‘riid’ undeclared (first use in this function)
joystick_osx.c:1477: error: (Each undeclared identifier is reported only once
joystick_osx.c:1477: error: for each function it appears in.)
make: *** [joystick_osx.o] Error 1
> dlls/dinput/joystick_osx.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c
> index 6a8926d..19ca070 100644
> --- a/dlls/dinput/joystick_osx.c
> +++ b/dlls/dinput/joystick_osx.c
> @@ -1474,7 +1474,7 @@ static HRESULT WINAPI effect_QueryInterface(IDirectInputEffect *iface,
>
> TRACE("%p %s %p\n", This, debugstr_guid(guid), out);
>
> -    if(IsEqualIID(guid, &IID_IDirectInputEffect)){
> +    if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(guid, &IID_IDirectInputEffect)){
>          *out = iface;
>          IDirectInputEffect_AddRef(iface);
>          return S_OK;
> -- 
> 2.4.3