February 2007 - Wine-commits

Andrew Talbot : wineps.drv: Remove unused functions.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: eeea88e305aefabb0bbf15a939b17d8404f15436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeea88e305aefabb0bbf15a93… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Feb 5 21:23:34 2007 +0000 wineps.drv: Remove unused functions. --- dlls/wineps.drv/mkagl.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/wineps.drv/mkagl.c b/dlls/wineps.drv/mkagl.c index 30fbcf2..6c6e508 100644 --- a/dlls/wineps.drv/mkagl.c +++ b/dlls/wineps.drv/mkagl.c @@ -99,21 +99,10 @@ inline static void fcpto(FILE *f, int ne } } -inline static void cpto(int newpos, int curpos) -{ - fcpto(stdout, newpos, curpos); -} - - /* * Make main() look "purty" */ -inline static void double_space(FILE *f) -{ - fputc('\n', f); -} - inline static void triple_space(FILE *f) { fputc('\n', f); fputc('\n', f);

1 0

Andrew Talbot : winemp3.acm: Remove unused functions.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 8145f97efd529d9f5163a35e2ed2d00aaf75a41e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8145f97efd529d9f5163a35e2… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Feb 5 21:22:42 2007 +0000 winemp3.acm: Remove unused functions. --- dlls/winemp3.acm/mpegl3.c | 32 -------------------------------- 1 files changed, 0 insertions(+), 32 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index d9390ae..4c639e5 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -121,27 +121,6 @@ static DWORD MPEG3_GetFormatIndex(LPWAVE return 0xFFFFFFFF; } -/*********************************************************************** - * R16 - * - * Read a 16 bit sample (correctly handles endianess) - */ -static inline short R16(const unsigned char* src) -{ - return (short)((unsigned short)src[0] | ((unsigned short)src[1] << 8)); -} - -/*********************************************************************** - * W16 - * - * Write a 16 bit sample (correctly handles endianess) - */ -static inline void W16(unsigned char* dst, short s) -{ - dst[0] = LOBYTE(s); - dst[1] = HIBYTE(s); -} - static DWORD get_num_buffered_bytes(struct mpstr *mp) { DWORD numBuff = 0; @@ -461,17 +440,6 @@ static LRESULT MPEG3_StreamClose(PACMDRV } /*********************************************************************** - * MPEG3_round - * - */ -static inline DWORD MPEG3_round(DWORD a, DWORD b, DWORD c) -{ - assert(a && b && c); - /* to be sure, always return an entire number of c... */ - return ((double)a * (double)b + (double)c - 1) / (double)c; -} - -/*********************************************************************** * MPEG3_StreamSize * */

1 0

Andrew Talbot : user32: Remove unused function.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: b9b2fef0a19f69f90db189820a38a302f15f7071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b2fef0a19f69f90db189820… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Feb 5 21:20:51 2007 +0000 user32: Remove unused function. --- dlls/user32/message.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 89f7495..4a4f7c3 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -273,12 +273,6 @@ inline static void *get_buffer_space( vo return ret; } -/* retrieve a string pointer from packed data */ -inline static LPWSTR get_string( void **buffer ) -{ - return get_data( buffer, (strlenW( (LPWSTR)*buffer ) + 1) * sizeof(WCHAR) ); -} - /* check whether a combobox expects strings or ids in CB_ADDSTRING/CB_INSERTSTRING */ inline static BOOL combobox_has_strings( HWND hwnd ) {

1 0

Mikołaj Zalewski : browseui: Implement and test ACLMulti.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 7206e1067378230648f7168690d30088cdb80323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7206e1067378230648f716869… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Feb 5 17:53:42 2007 +0100 browseui: Implement and test ACLMulti. --- .gitignore | 4 + Makefile.in | 2 + configure | 3 +- configure.ac | 1 + dlls/Makefile.in | 1 + dlls/browseui/Makefile.in | 1 + dlls/browseui/aclmulti.c | 331 ++++++++++++++++++++++++++++++++++++ dlls/browseui/browseui.h | 28 +++ dlls/browseui/browseui_main.c | 5 + dlls/browseui/regsvr.c | 8 + dlls/browseui/tests/Makefile.in | 14 ++ dlls/browseui/tests/autocomplete.c | 321 ++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + programs/winetest/winetest.rc | 1 + 14 files changed, 722 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7206e1067378230648f71…

1 0

Andrew Talbot : user32: Remove unused variables.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 9bf24d6af777cb1653bf10dabdc2447afa52fd10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf24d6af777cb1653bf10dab… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Feb 5 21:21:27 2007 +0000 user32: Remove unused variables. --- dlls/user32/sysparams.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 4ef2782..f64c1bb 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -196,8 +196,6 @@ static const WCHAR SPI_SETPOWEROFFACTIVE static const WCHAR SPI_SETPOWEROFFACTIVE_VALNAME[]= {'P','o','w','e','r','O','f','f','A','c','t','i','v','e',0}; static const WCHAR SPI_USERPREFERENCEMASK_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; static const WCHAR SPI_USERPREFERENCEMASK_VALNAME[]= {'U','s','e','r','P','r','e','f','e','r','e','n','c','e','m','a','s','k',0}; -static const WCHAR SPI_SETLISTBOXSMOOTHSCROLLING_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; -static const WCHAR SPI_SETLISTBOXSMOOTHSCROLLING_VALNAME[]= {'S','m','o','o','t','h','S','c','r','o','l','l',0}; static const WCHAR SPI_SETMOUSEHOVERWIDTH_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','M','o','u','s','e',0}; static const WCHAR SPI_SETMOUSEHOVERWIDTH_VALNAME[]= {'M','o','u','s','e','H','o','v','e','r','W','i','d','t','h',0}; static const WCHAR SPI_SETMOUSEHOVERHEIGHT_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','M','o','u','s','e',0};

1 0

Andrew Talbot : shell32: Remove unused function.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 8246b6cd302505c8204e6e54d2524e35f4d71808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8246b6cd302505c8204e6e54d… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Feb 5 21:20:06 2007 +0000 shell32: Remove unused function. --- dlls/shell32/shlexec.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 88ee3e6..900cea6 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -295,25 +295,6 @@ static BOOL SHELL_ArgifyW(WCHAR* out, in return found_p1; } -HRESULT SHELL_GetPathFromIDListForExecuteA(LPCITEMIDLIST pidl, LPSTR pszPath, UINT uOutSize) -{ - STRRET strret; - IShellFolder* desktop; - - HRESULT hr = SHGetDesktopFolder(&desktop); - - if (SUCCEEDED(hr)) { - hr = IShellFolder_GetDisplayNameOf(desktop, pidl, SHGDN_FORPARSING, &strret); - - if (SUCCEEDED(hr)) - StrRetToStrNA(pszPath, uOutSize, &strret, pidl); - - IShellFolder_Release(desktop); - } - - return hr; -} - HRESULT SHELL_GetPathFromIDListForExecuteW(LPCITEMIDLIST pidl, LPWSTR pszPath, UINT uOutSize) { STRRET strret;

1 0

Mikołaj Zalewski : include: Add definitions for the multisource AutoComplete list (ACLMulti).
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: d34691e2c856f26ee9fae8acd4579f77ea871768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d34691e2c856f26ee9fae8acd… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Feb 5 17:51:45 2007 +0100 include: Add definitions for the multisource AutoComplete list (ACLMulti). --- include/shlguid.h | 5 +++++ include/shlobj.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/include/shlguid.h b/include/shlguid.h index e07c384..1214a2d 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -52,6 +52,10 @@ DEFINE_SHLGUID(IID_IShellCopyHookW, DEFINE_SHLGUID(IID_IRemoteComputer, 0x000214FEL, 0, 0); DEFINE_SHLGUID(IID_IQueryInfo, 0x00021500L, 0, 0); +DEFINE_GUID(IID_IACList, 0x77A130B0L,0x94FD,0x11D0,0xA5,0x44,0x00,0xC0,0x4F,0xD7,0xD0,0x62); +DEFINE_GUID(IID_IACList2, 0x470141A0L,0x5186,0x11D2,0xBB,0xB6,0x00,0x60,0x97,0x7B,0x46,0x4C); +DEFINE_GUID(IID_IObjMgr, 0x00BB2761L,0x6A77,0x11D0,0xA5,0x35,0x00,0xC0,0x4F,0xD7,0xD0,0x62); + /* avoid duplicate definitions with shobjidl.h (FIXME) */ /* DEFINE_SHLGUID(IID_IShellPropSheetExt, 0x000214E9L, 0, 0); */ /* DEFINE_SHLGUID(IID_IExtractIconA, 0x000214EBL, 0, 0); */ @@ -114,6 +118,7 @@ DEFINE_GUID(IID_IQueryAssociations, 0xc4 DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); DEFINE_GUID(CLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); +DEFINE_GUID(CLSID_ACLMulti, 0x00bb2765, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); #define PSGUID_SHELLDETAILS {0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0} DEFINE_GUID(FMTID_ShellDetails, 0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); diff --git a/include/shlobj.h b/include/shlobj.h index b5fee16..d92e4cb 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -300,6 +300,53 @@ DECLARE_INTERFACE_(IInputObjectSite,IUnk #define IInputObjectSite_OnFocusChangeIS(p,a,b) (p)->lpVtbl->OnFocusChangeIS(p,a,b) #endif +/* IObjMgr interface */ +#define INTERFACE IObjMgr +DECLARE_INTERFACE_(IObjMgr,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface) (THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + /*** IObjMgr methods ***/ + STDMETHOD(Append)(THIS_ LPUNKNOWN punk) PURE; + STDMETHOD(Remove)(THIS_ LPUNKNOWN punk) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IObjMgr_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IObjMgr_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IObjMgr_Release(p) (p)->lpVtbl->Release(p) +/*** IObjMgr methods ***/ +#define IObjMgr_Append(p,a) (p)->lpVtbl->Append(p,a) +#define IObjMgr_Remove(p,a) (p)->lpVtbl->Remove(p,a) +#endif + +/* IACList interface */ +#define INTERFACE IACList +DECLARE_INTERFACE_(IACList,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface) (THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + /*** IACList methods ***/ + STDMETHOD(Expand)(THIS_ LPCOLESTR str) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IACList_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IACList_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IACList_Release(p) (p)->lpVtbl->Release(p) +/*** IACList methods ***/ +#define IACList_Expand(p,a) (p)->lpVtbl->Expand(p,a) +#endif + + /**************************************************************************** * SHAddToRecentDocs API */

1 0

Mikołaj Zalewski : browseui: Add class factory.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 719088ca8501aa60c6663712b8028724f16ddff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=719088ca8501aa60c6663712b… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Feb 5 17:52:17 2007 +0100 browseui: Add class factory. --- dlls/browseui/browseui_main.c | 112 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 110 insertions(+), 2 deletions(-) diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index 54284c7..6c55943 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -24,6 +24,8 @@ #include <stdarg.h> #include <stdio.h> +#define COBJMACROS + #include "wine/debug.h" #include "windef.h" #include "winbase.h" @@ -38,6 +40,103 @@ LONG BROWSEUI_refCount = 0; HINSTANCE browseui_hinstance = 0; +typedef HRESULT (WINAPI *LPFNCONSTRUCTOR)(IUnknown *pUnkOuter, IUnknown **ppvOut); + +static const struct { + REFCLSID clsid; + LPFNCONSTRUCTOR ctor; +} ClassesTable[] = { + {NULL, NULL} +}; + +typedef struct tagClassFactory +{ + const IClassFactoryVtbl *vtbl; + LONG ref; + LPFNCONSTRUCTOR ctor; +} ClassFactory; +static const IClassFactoryVtbl ClassFactoryVtbl; + +static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) +{ + ClassFactory *This = CoTaskMemAlloc(sizeof(ClassFactory)); + This->vtbl = &ClassFactoryVtbl; + This->ref = 1; + This->ctor = ctor; + *ppvOut = (LPVOID)This; + TRACE("Created class factory %p\n", This); + BROWSEUI_refCount++; + return S_OK; +} + +static void ClassFactory_Destructor(ClassFactory *This) +{ + TRACE("Destroying class factory %p\n", This); + CoTaskMemFree(This); + BROWSEUI_refCount--; +} + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppvOut) +{ + *ppvOut = NULL; + if (IsEqualIID(riid, &IID_IClassFactory) || IsEqualIID(riid, &IID_IUnknown)) { + IClassFactory_AddRef(iface); + *ppvOut = iface; + return S_OK; + } + + WARN("Unknown interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + ClassFactory *This = (ClassFactory *)iface; + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + ClassFactory *This = (ClassFactory *)iface; + ULONG ret = InterlockedDecrement(&This->ref); + + if (ret == 0) + ClassFactory_Destructor(This); + return ret; +} + +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *punkOuter, REFIID iid, LPVOID *ppvOut) +{ + ClassFactory *This = (ClassFactory *)iface; + HRESULT ret; + IUnknown *obj; + + TRACE("(%p, %p, %s, %p)\n", iface, punkOuter, debugstr_guid(iid), ppvOut); + ret = This->ctor(punkOuter, &obj); + if (FAILED(ret)) + return ret; + ret = IUnknown_QueryInterface(obj, iid, ppvOut); + IUnknown_Release(obj); + return ret; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + FIXME("(%p, %s) - not implemented\n", iface, (fLock ? "TRUE" : "FALSE")); + return E_NOTIMPL; +} + +static const IClassFactoryVtbl ClassFactoryVtbl = { + /* IUnknown */ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + + /* IClassFactory*/ + ClassFactory_CreateInstance, + ClassFactory_LockServer +}; + /************************************************************************* * BROWSEUI DllMain */ @@ -83,8 +182,17 @@ HRESULT WINAPI DllGetVersion(DLLVERSIONI /*********************************************************************** * DllGetClassObject (BROWSEUI.@) */ -HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *ppvOut) { - *ppv = NULL; + int i; + + *ppvOut = NULL; + if (!IsEqualIID(iid, &IID_IUnknown) && !IsEqualIID(iid, &IID_IClassFactory)) + return E_NOINTERFACE; + + for (i = 0; ClassesTable[i].clsid != NULL; i++) + if (IsEqualCLSID(ClassesTable[i].clsid, clsid)) { + return ClassFactory_Constructor(ClassesTable[i].ctor, ppvOut); + } return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Vitaliy Margolen : dinput: Look for all available js* joystick devices.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 10fca47ba4790ba5d711a0291d2b63bb01cee9b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10fca47ba4790ba5d711a0291… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Feb 5 11:15:24 2007 -0700 dinput: Look for all available js* joystick devices. --- dlls/dinput/joystick_linux.c | 66 +++++++++++++++++++++++++++++------------ 1 files changed, 46 insertions(+), 20 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 4c542ad..71ac9c1 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -143,23 +143,44 @@ static void _dump_DIDEVCAPS(LPDIDEVCAPS } } -static int joydev_get_device(char *dev, int id) +#define MAX_JOYSTICKS 64 +static INT joystick_devices_count = -1; +static LPSTR joystick_devices[MAX_JOYSTICKS]; + +static INT find_joystick_devices(void) { - int ret; - sprintf(dev, "%s%d", JOYDEV_NEW, id); - if ((ret = open(dev, O_RDONLY)) < 0) { - sprintf(dev, "%s%d", JOYDEV_OLD, id); - if ((ret = open(dev, O_RDONLY)) < 0) { - return -1; + INT i; + + if (joystick_devices_count != -1) return joystick_devices_count; + + for (i = 0; i < MAX_JOYSTICKS; i++) + { + CHAR device_name[MAX_PATH], *str; + INT len; + int fd; + + len = sprintf(device_name, "%s%d", JOYDEV_NEW, i) + 1; + if ((fd = open(device_name, O_RDONLY)) < 0) + { + len = sprintf(device_name, "%s%d", JOYDEV_OLD, i) + 1; + if ((fd = open(device_name, O_RDONLY)) < 0) continue; } + + if (!(str = HeapAlloc(GetProcessHeap(), 0, len))) break; + memcpy(str, device_name, len); + + joystick_devices[++joystick_devices_count] = str; } - return ret; + + return joystick_devices_count; } +#undef MAX_JOYSTICKS static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { int fd = -1; - char dev[32]; + + if (id > find_joystick_devices()) return FALSE; if (dwFlags & DIEDFL_FORCEFEEDBACK) { WARN("force feedback not supported\n"); @@ -170,8 +191,9 @@ static BOOL joydev_enum_deviceA(DWORD dw ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { /* check whether we have a joystick */ - if ((fd = joydev_get_device(dev, id)) < 0) { - WARN("open(%s,O_RDONLY) failed: %s\n", dev, strerror(errno)); + if ((fd = open(joystick_devices[id], O_RDONLY)) < 0) + { + WARN("open(%s, O_RDONLY) failed: %s\n", joystick_devices[id], strerror(errno)); return FALSE; } @@ -187,7 +209,7 @@ static BOOL joydev_enum_deviceA(DWORD dw sprintf(lpddi->tszInstanceName, "Joystick %d", id); #if defined(JSIOCGNAME) if (ioctl(fd,JSIOCGNAME(sizeof(lpddi->tszProductName)),lpddi->tszProductName) < 0) { - WARN("ioctl(%s,JSIOCGNAME) failed: %s\n", dev, strerror(errno)); + WARN("ioctl(%s,JSIOCGNAME) failed: %s\n", joystick_devices[id], strerror(errno)); strcpy(lpddi->tszProductName, "Wine Joystick"); } #else @@ -196,7 +218,7 @@ static BOOL joydev_enum_deviceA(DWORD dw lpddi->guidFFDriver = GUID_NULL; close(fd); - TRACE("Enumerating the linux Joystick device: %s (%s)\n", dev, lpddi->tszProductName); + TRACE("Enumerating the linux Joystick device: %s (%s)\n", joystick_devices[id], lpddi->tszProductName); return TRUE; } @@ -207,9 +229,10 @@ static BOOL joydev_enum_deviceW(DWORD dw { int fd = -1; char name[MAX_PATH]; - char dev[32]; char friendly[32]; + if (id > find_joystick_devices()) return FALSE; + if (dwFlags & DIEDFL_FORCEFEEDBACK) { WARN("force feedback not supported\n"); return FALSE; @@ -219,8 +242,9 @@ static BOOL joydev_enum_deviceW(DWORD dw ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { /* check whether we have a joystick */ - if ((fd = joydev_get_device(dev, id)) < 0) { - WARN("open(%s,O_RDONLY) failed: %s\n", dev, strerror(errno)); + if ((fd = open(joystick_devices[id], O_RDONLY)) < 0) + { + WARN("open(%s,O_RDONLY) failed: %s\n", joystick_devices[id], strerror(errno)); return FALSE; } @@ -237,7 +261,7 @@ static BOOL joydev_enum_deviceW(DWORD dw MultiByteToWideChar(CP_ACP, 0, friendly, -1, lpddi->tszInstanceName, MAX_PATH); #if defined(JSIOCGNAME) if (ioctl(fd,JSIOCGNAME(sizeof(name)),name) < 0) { - WARN("ioctl(%s,JSIOCGNAME) failed: %s\n", dev, strerror(errno)); + WARN("ioctl(%s, JSIOCGNAME) failed: %s\n", joystick_devices[id], strerror(errno)); strcpy(name, "Wine Joystick"); } #else @@ -246,7 +270,7 @@ static BOOL joydev_enum_deviceW(DWORD dw MultiByteToWideChar(CP_ACP, 0, name, -1, lpddi->tszProductName, MAX_PATH); lpddi->guidFFDriver = GUID_NULL; close(fd); - TRACE("Enumerating the linux Joystick device: %s (%s)\n",dev,name); + TRACE("Enumerating the linux Joystick device: %s (%s)\n", joystick_devices[id], name); return TRUE; } @@ -407,8 +431,10 @@ static HRESULT alloc_device(REFGUID rgui return DIERR_OUTOFMEMORY; } - if ((newDevice->joyfd = joydev_get_device(newDevice->dev, rguid->Data3)) < 0) { - WARN("open(%s,O_RDONLY) failed: %s\n", newDevice->dev, strerror(errno)); + if (!lstrcpynA(newDevice->dev, joystick_devices[rguid->Data3], sizeof(newDevice->dev)) || + (newDevice->joyfd = open(newDevice->dev, O_RDONLY)) < 0) + { + WARN("open(%s, O_RDONLY) failed: %s\n", newDevice->dev, strerror(errno)); HeapFree(GetProcessHeap(), 0, newDevice); return DIERR_DEVICENOTREG; }

1 0

Vitaliy Margolen : dinput: Use correct flag for object instance.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 17839bab6ce95ec3d4660f3a57357e967fef0cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17839bab6ce95ec3d4660f3a5… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Feb 5 13:23:15 2007 -0700 dinput: Use correct flag for object instance. DIDFT_AXIS is a generic mask for absolute and relative axes. --- dlls/dinput/joystick_linux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 71ac9c1..3fa906d 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -829,7 +829,7 @@ static void joy_polldev(JoystickImpl *Th if (number < 12) { - inst_id = DIDFT_MAKEINSTANCE(jse.number) | (number < 8 ? DIDFT_AXIS : DIDFT_POV); + inst_id = DIDFT_MAKEINSTANCE(jse.number) | (number < 8 ? DIDFT_ABSAXIS : DIDFT_POV); value = map_axis(This, jse.value, number); /* FIXME do deadzone and saturation here */

1 0