July 2008 - Wine-Commits - list.winehq.org

Andrew Talbot : shell32: Remove unneeded address-of operators from function names.
by Alexandre Julliard July 7, 2008

July 7, 2008

Module: wine Branch: master Commit: 93f656bf855f46ea490d4ac5173ea1b94e5e90e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f656bf855f46ea490d4ac51… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Jul 6 13:00:42 2008 +0100 shell32: Remove unneeded address-of operators from function names. --- dlls/shell32/shellole.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 19dba05..bec9996 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -60,19 +60,19 @@ static const struct { REFIID riid; LPFNCREATEINSTANCE lpfnCI; } InterfaceTable[] = { - {&CLSID_ShellFSFolder, &IFSFolder_Constructor}, - {&CLSID_MyComputer, &ISF_MyComputer_Constructor}, - {&CLSID_NetworkPlaces, &ISF_NetworkPlaces_Constructor}, - {&CLSID_ShellDesktop, &ISF_Desktop_Constructor}, - {&CLSID_ShellLink, &IShellLink_Constructor}, - {&CLSID_DragDropHelper, &IDropTargetHelper_Constructor}, - {&CLSID_ControlPanel, &IControlPanel_Constructor}, - {&CLSID_AutoComplete, &IAutoComplete_Constructor}, - {&CLSID_UnixFolder, &UnixFolder_Constructor}, - {&CLSID_UnixDosFolder, &UnixDosFolder_Constructor}, - {&CLSID_FolderShortcut, &FolderShortcut_Constructor}, - {&CLSID_MyDocuments, &MyDocuments_Constructor}, - {&CLSID_RecycleBin, &RecycleBin_Constructor}, + {&CLSID_ShellFSFolder, IFSFolder_Constructor}, + {&CLSID_MyComputer, ISF_MyComputer_Constructor}, + {&CLSID_NetworkPlaces, ISF_NetworkPlaces_Constructor}, + {&CLSID_ShellDesktop, ISF_Desktop_Constructor}, + {&CLSID_ShellLink, IShellLink_Constructor}, + {&CLSID_DragDropHelper, IDropTargetHelper_Constructor}, + {&CLSID_ControlPanel, IControlPanel_Constructor}, + {&CLSID_AutoComplete, IAutoComplete_Constructor}, + {&CLSID_UnixFolder, UnixFolder_Constructor}, + {&CLSID_UnixDosFolder, UnixDosFolder_Constructor}, + {&CLSID_FolderShortcut, FolderShortcut_Constructor}, + {&CLSID_MyDocuments, MyDocuments_Constructor}, + {&CLSID_RecycleBin, RecycleBin_Constructor}, {NULL,NULL} };

1 0

Andrew Talbot : quartz: Remove unneeded address-of operators from function names.
by Alexandre Julliard July 7, 2008

July 7, 2008

Module: wine Branch: master Commit: f0d7a2910e4d107932d35e11a3709a0d984ba59d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d7a2910e4d107932d35e11a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Jul 6 13:00:35 2008 +0100 quartz: Remove unneeded address-of operators from function names. --- dlls/quartz/main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index b26db74..daefdc5 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -75,9 +75,9 @@ static const struct object_creation_info object_creation[] = { &CLSID_DSoundRender, DSoundRender_create }, { &CLSID_AudioRender, DSoundRender_create }, { &CLSID_AVIDec, AVIDec_create }, - { &CLSID_SystemClock, &QUARTZ_CreateSystemClock }, - { &CLSID_ACMWrapper, &ACMWrapper_create }, - { &CLSID_WAVEParser, &WAVEParser_create } + { &CLSID_SystemClock, QUARTZ_CreateSystemClock }, + { &CLSID_ACMWrapper, ACMWrapper_create }, + { &CLSID_WAVEParser, WAVEParser_create } }; static HRESULT WINAPI

1 0

Andrew Talbot : ole32: Remove unneeded address-of operators from function name.
by Alexandre Julliard July 7, 2008

July 7, 2008

Module: wine Branch: master Commit: 82e23af814defa3733a4d35cedaa21b53c0a124e URL: http://source.winehq.org/git/wine.git/?a=commit;h=82e23af814defa3733a4d35ce… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Jul 6 13:00:24 2008 +0100 ole32: Remove unneeded address-of operators from function name. --- dlls/ole32/storage32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index c3a36d8..a64e595 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2412,7 +2412,7 @@ static HRESULT StorageImpl_Construct( */ This->base.lpVtbl = &Storage32Impl_Vtbl; This->base.pssVtbl = &IPropertySetStorage_Vtbl; - This->base.v_destructor = &StorageImpl_Destroy; + This->base.v_destructor = StorageImpl_Destroy; This->base.openFlags = (openFlags & ~STGM_CREATE); /* @@ -4236,7 +4236,7 @@ static StorageInternalImpl* StorageInternalImpl_Construct( * Initialize the virtual function table. */ newStorage->base.lpVtbl = &Storage32InternalImpl_Vtbl; - newStorage->base.v_destructor = &StorageInternalImpl_Destroy; + newStorage->base.v_destructor = StorageInternalImpl_Destroy; newStorage->base.openFlags = (openFlags & ~STGM_CREATE); /*

1 0

Andrew Talbot : infosoft: Remove unneeded address-of operator from function name.
by Alexandre Julliard July 7, 2008

July 7, 2008

Module: wine Branch: master Commit: fa07687034fc958448b737b4c1c8b4318dfe5788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa07687034fc958448b737b4c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Jul 6 13:00:04 2008 +0100 infosoft: Remove unneeded address-of operator from function name. --- dlls/infosoft/infosoft_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c index 16fbb73..e095ab4 100644 --- a/dlls/infosoft/infosoft_main.c +++ b/dlls/infosoft/infosoft_main.c @@ -121,7 +121,7 @@ static const IClassFactoryVtbl infosoft_cfvt = infosoftcf_fnLockServer }; -static CFImpl wb_cf = { &infosoft_cfvt, &wb_Constructor }; +static CFImpl wb_cf = { &infosoft_cfvt, wb_Constructor }; /*********************************************************************** * DllGetClassObject (INFOSOFT.@)

1 0

Alexandre Julliard : widl: Fix a couple of uninitialized variable compiler warnings.
by Alexandre Julliard July 7, 2008

July 7, 2008

Module: wine Branch: master Commit: c0ebae42f143d7cdbe8fcd40e248cc7ec139072b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0ebae42f143d7cdbe8fcd40e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 7 12:10:06 2008 +0200 widl: Fix a couple of uninitialized variable compiler warnings. --- tools/widl/typegen.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5db970e..4540468 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -984,7 +984,7 @@ static void write_user_tfs(FILE *file, type_t *type, unsigned int *tfsoff) { unsigned int start, absoff, flags; unsigned int align = 0, ualign = 0; - const char *name; + const char *name = NULL; type_t *utype = get_user_type(type, &name); size_t usize = user_type_has_variable_size(utype) ? 0 : type_memsize(utype, &ualign); size_t size = type_memsize(type, &align); @@ -2457,11 +2457,12 @@ void write_typeformatstring(FILE *file, const statement_list_t *stmts, type_pred static unsigned int get_required_buffer_size_type( const type_t *type, const char *name, unsigned int *alignment) { + const char *uname; + const type_t *utype; + *alignment = 0; - if (is_user_type(type)) + if ((utype = get_user_type(type, &uname))) { - const char *uname; - const type_t *utype = get_user_type(type, &uname); return get_required_buffer_size_type(utype, uname, alignment); } else

1 0

Alexandre Julliard : Makefile: Use 'git ls-files' instead of the deprecated 'git-ls-files' form.
by Alexandre Julliard July 7, 2008

July 7, 2008

Module: wine Branch: master Commit: e43004ac40e466a8f1e062557abd7b28548a9f88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e43004ac40e466a8f1e062557… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 7 12:17:00 2008 +0200 Makefile: Use 'git ls-files' instead of the deprecated 'git-ls-files' form. --- Makefile.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index f2dbcfc..7ad6faa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -141,11 +141,11 @@ $(TESTSUBDIRS:%=%/__crosstest__): tools include TAGS etags: $(RM) TAGS - (test -d .git && git-ls-files '*.[chly]' '*.idl' || find -L $(TOPSRCDIR) -name '*.[ch]' -print) | xargs etags -a + (test -d .git && git ls-files '*.[chly]' '*.idl' || find -L $(TOPSRCDIR) -name '*.[ch]' -print) | xargs etags -a tags ctags: $(RM) tags - (test -d .git && git-ls-files '*.[chly]' '*.idl' || find -L $(TOPSRCDIR) -name '*.[ch]' -print) | xargs ctags -a + (test -d .git && git ls-files '*.[chly]' '*.idl' || find -L $(TOPSRCDIR) -name '*.[ch]' -print) | xargs ctags -a manpages htmlpages sgmlpages: dummy @cd documentation && $(MAKE) $@

1 0

Alexandre Julliard : Add noinput directive to all lex files to avoid a compiler warning.
by Alexandre Julliard July 7, 2008

July 7, 2008

Module: wine Branch: master Commit: 28a2179dd60a32a7bdca0bcf0393ec2604525299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28a2179dd60a32a7bdca0bcf0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 7 12:31:33 2008 +0200 Add noinput directive to all lex files to avoid a compiler warning. --- libs/wpp/ppl.l | 2 +- programs/winedbg/debug.l | 2 +- programs/winhlp32/macro.lex.l | 2 +- tools/widl/parser.l | 2 +- tools/wrc/parser.l | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 4bb928c..3e84a2e 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -126,7 +126,7 @@ */ %option stack %option 8bit never-interactive -%option nounput +%option noinput nounput %option prefix="ppy_" %x pp_pp diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index a0512c1..66fe70d 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -%option nounput interactive 8bit prefix="dbg_" +%option noinput nounput interactive 8bit prefix="dbg_" %{ #include "config.h" diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l index 17e70ed..b8d6ac2 100644 --- a/programs/winhlp32/macro.lex.l +++ b/programs/winhlp32/macro.lex.l @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ %} -%option nounput interactive 8bit +%option noinput nounput interactive 8bit %x quote %{ #include "config.h" diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 799f94f..6a02f50 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -19,7 +19,7 @@ */ %option stack -%option nounput noyy_top_state +%option noinput nounput noyy_top_state %option 8bit never-interactive prefix="parser_" nl \r?\n diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 21aa0d6..0ef1b0a 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -84,7 +84,7 @@ %x pp_code_page %option stack -%option nounput noyy_top_state noyywrap +%option noinput nounput noyy_top_state noyywrap %option 8bit never-interactive %option prefix="parser_"

1 0

Alexandre Julliard : rpcrt4: Use interlocked functions to increment/ decrement ref counts.
by Alexandre Julliard July 7, 2008

July 7, 2008

Module: wine Branch: master Commit: 6f8749b7bcf60cf72d43742367d930229dd54890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8749b7bcf60cf72d4374236… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 7 12:09:45 2008 +0200 rpcrt4: Use interlocked functions to increment/decrement ref counts. --- dlls/rpcrt4/cpsf.c | 6 +++--- dlls/rpcrt4/ndr_ole.c | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index 23c4aeb..373c97a 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -65,7 +65,7 @@ static HRESULT WINAPI CStdPSFactory_QueryInterface(LPPSFACTORYBUFFER iface, if (IsEqualGUID(&IID_IUnknown,riid) || IsEqualGUID(&IID_IPSFactoryBuffer,riid)) { *obj = This; - This->RefCount++; + InterlockedIncrement( &This->RefCount ); return S_OK; } return E_NOINTERFACE; @@ -75,14 +75,14 @@ static ULONG WINAPI CStdPSFactory_AddRef(LPPSFACTORYBUFFER iface) { CStdPSFactoryBuffer *This = (CStdPSFactoryBuffer *)iface; TRACE("(%p)->AddRef()\n",iface); - return ++(This->RefCount); + return InterlockedIncrement( &This->RefCount ); } static ULONG WINAPI CStdPSFactory_Release(LPPSFACTORYBUFFER iface) { CStdPSFactoryBuffer *This = (CStdPSFactoryBuffer *)iface; TRACE("(%p)->Release()\n",iface); - return --(This->RefCount); + return InterlockedDecrement( &This->RefCount ); } static HRESULT WINAPI CStdPSFactory_CreateProxy(LPPSFACTORYBUFFER iface, diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index edfc78c..9bfab95 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -79,7 +79,7 @@ static HMODULE LoadCOM(void) typedef struct RpcStreamImpl { const IStreamVtbl *lpVtbl; - DWORD RefCount; + LONG RefCount; PMIDL_STUB_MESSAGE pMsg; LPDWORD size; unsigned char *data; @@ -95,7 +95,7 @@ static HRESULT WINAPI RpcStream_QueryInterface(LPSTREAM iface, IsEqualGUID(&IID_ISequentialStream, riid) || IsEqualGUID(&IID_IStream, riid)) { *obj = This; - This->RefCount++; + InterlockedIncrement( &This->RefCount ); return S_OK; } return E_NOINTERFACE; @@ -104,19 +104,20 @@ static HRESULT WINAPI RpcStream_QueryInterface(LPSTREAM iface, static ULONG WINAPI RpcStream_AddRef(LPSTREAM iface) { RpcStreamImpl *This = (RpcStreamImpl *)iface; - return ++(This->RefCount); + return InterlockedIncrement( &This->RefCount ); } static ULONG WINAPI RpcStream_Release(LPSTREAM iface) { RpcStreamImpl *This = (RpcStreamImpl *)iface; - if (!--(This->RefCount)) { + ULONG ref = InterlockedDecrement( &This->RefCount ); + if (!ref) { TRACE("size=%d\n", *This->size); This->pMsg->Buffer = This->data + *This->size; HeapFree(GetProcessHeap(),0,This); return 0; } - return This->RefCount; + return ref; } static HRESULT WINAPI RpcStream_Read(LPSTREAM iface,

1 0

Vitaliy Margolen : dinput: Set force feedback actuator flag for X and Y axes.
by Alexandre Julliard July 7, 2008

July 7, 2008

Module: wine Branch: master Commit: ba1a7ba62a55d2b7e205256fbaba5494c11ea25e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba1a7ba62a55d2b7e205256fb… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Jul 5 22:25:37 2008 -0600 dinput: Set force feedback actuator flag for X and Y axes. Programs looking for this flag to verify if FF is present. And on which axes. --- dlls/dinput/joystick_linuxinput.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 0ef90a1..aad25a4 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -472,6 +472,10 @@ static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputIm newDevice->props[idx].lSaturation = 0; newDevice->props[idx].lDeadZone = def_deadzone; + /* Linux supports force-feedback on X & Y axes only */ + if (newDevice->joydev->has_ff && (i == 0 || i == 1)) + df->rgodf[idx].dwFlags |= DIDOI_FFACTUATOR; + df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(newDevice->numAxes++) | DIDFT_ABSAXIS; }

1 0

Vitaliy Margolen : dinput: Freed effect should remove itself from the parent's list of effects. Add tests.
by Alexandre Julliard July 7, 2008

July 7, 2008

Module: wine Branch: master Commit: a478c4fe251daba7080f9e6dc934be5168eec1c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a478c4fe251daba7080f9e6dc… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Jul 5 22:24:57 2008 -0600 dinput: Freed effect should remove itself from the parent's list of effects. Add tests. --- dlls/dinput/effect_linuxinput.c | 13 ++++++---- dlls/dinput/joystick_linuxinput.c | 4 +- dlls/dinput/tests/joystick.c | 46 +++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index ab72d2c..1fef4cd 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -53,11 +53,9 @@ struct LinuxInputEffectImpl LONG ref; GUID guid; - /* Effect data */ - struct ff_effect effect; - - /* Parent device */ - int* fd; + struct ff_effect effect; /* Effect data */ + int* fd; /* Parent device */ + struct list *entry; /* Entry into the parent's list of effects */ }; @@ -766,6 +764,8 @@ static ULONG WINAPI LinuxInputEffectImpl_Release(LPDIRECTINPUTEFFECT iface) { LinuxInputEffectImpl_Stop(iface); LinuxInputEffectImpl_Unload(iface); + list_remove(This->entry); + HeapFree(GetProcessHeap(), 0, LIST_ENTRY(This->entry, effect_list_item, entry)); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -778,6 +778,7 @@ static ULONG WINAPI LinuxInputEffectImpl_Release(LPDIRECTINPUTEFFECT iface) HRESULT linuxinput_create_effect( int* fd, REFGUID rguid, + struct list *parent_list_entry, LPDIRECTINPUTEFFECT* peff) { LinuxInputEffectImpl* newEffect = HeapAlloc(GetProcessHeap(), @@ -835,6 +836,8 @@ HRESULT linuxinput_create_effect( /* mark as non-uploaded */ newEffect->effect.id = -1; + newEffect->entry = parent_list_entry; + *peff = (LPDIRECTINPUTEFFECT)newEffect; TRACE("Creating linux input system effect (%p) with guid %s\n", diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index d3185d3..0ef90a1 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -141,7 +141,7 @@ struct wine_input_absinfo { }; /* implemented in effect_linuxinput.c */ -HRESULT linuxinput_create_effect(int* fd, REFGUID rguid, LPDIRECTINPUTEFFECT* peff); +HRESULT linuxinput_create_effect(int* fd, REFGUID rguid, struct list *parent_list_entry, LPDIRECTINPUTEFFECT* peff); HRESULT linuxinput_get_info_A(int fd, REFGUID rguid, LPDIEFFECTINFOA info); HRESULT linuxinput_get_info_W(int fd, REFGUID rguid, LPDIEFFECTINFOW info); @@ -1053,7 +1053,7 @@ static HRESULT WINAPI JoystickAImpl_CreateEffect(LPDIRECTINPUTDEVICE8A iface, if (!(new_effect = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_effect)))) return DIERR_OUTOFMEMORY; - retval = linuxinput_create_effect(&This->joyfd, rguid, &new_effect->ref); + retval = linuxinput_create_effect(&This->joyfd, rguid, &new_effect->entry, &new_effect->ref); if (retval != DI_OK) { HeapFree(GetProcessHeap(), 0, new_effect); diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 4727a5a..567dad0 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -18,6 +18,7 @@ #define DIRECTINPUT_VERSION 0x0700 +#define COBJMACROS #include <windows.h> #include <math.h> @@ -85,6 +86,12 @@ typedef struct tagJoystickInfo DWORD dZone; } JoystickInfo; +static int get_refcount(IUnknown *object) +{ + IUnknown_AddRef( object ); + return IUnknown_Release( object ); +} + static BOOL CALLBACK EnumAxes( const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pContext) @@ -331,6 +338,45 @@ static BOOL CALLBACK EnumJoysticks( ok(js.rgdwPOV[3] == -1, "Default for unassigned POV should be -1 not: %d\n", js.rgdwPOV[3]); } + if (caps.dwFlags & DIDC_FORCEFEEDBACK) + { + DWORD axes[2] = {DIJOFS_X, DIJOFS_Y}; + LONG direction[2] = {0, 0}; + DICONSTANTFORCE force = {0}; + DIEFFECT eff; + LPDIRECTINPUTEFFECT effect = NULL; + LONG cnt1, cnt2; + + trace("Testing force-feedback\n"); + memset(&eff, 0, sizeof(eff)); + eff.dwSize = sizeof(eff); + eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS; + eff.dwDuration = INFINITE; + eff.dwGain = DI_FFNOMINALMAX; + eff.dwTriggerButton = DIEB_NOTRIGGER; + eff.cAxes = sizeof(axes) / sizeof(axes[0]); + eff.rgdwAxes = axes; + eff.rglDirection = direction; + eff.cbTypeSpecificParams = sizeof(force); + eff.lpvTypeSpecificParams = &force; + + cnt1 = get_refcount((IUnknown*)pJoystick); + + hr = IDirectInputDevice2_CreateEffect((LPDIRECTINPUTDEVICE2)pJoystick, &GUID_ConstantForce, + &eff, &effect, NULL); + ok(hr == DI_OK, "IDirectInputDevice_CreateEffect() failed: %s\n", DXGetErrorString8(hr)); + cnt2 = get_refcount((IUnknown*)pJoystick); + ok(cnt1 == cnt2, "Ref count is wrong %d != %d\n", cnt1, cnt2); + + if (effect) + { + ref = IUnknown_Release(effect); + ok(ref == 0, "IDirectInputDevice_Release() reference count = %d\n", ref); + } + cnt1 = get_refcount((IUnknown*)pJoystick); + ok(cnt1 == cnt2, "Ref count is wrong %d != %d\n", cnt1, cnt2); + } + if (winetest_interactive) { trace("You have 30 seconds to test all axes, sliders, POVs and buttons\n"); count = 300;

1 0