February 2007 - Wine-Commits

Paul Vriens : wininet: Remove unused function.
by Alexandre Julliard Feb. 6, 2007

Feb. 6, 2007

Module: wine Branch: master Commit: 46812a4bba5542a19a68e287560d52e92e5dc61c URL: http://source.winehq.org/git/wine.git/?a=commit;h=46812a4bba5542a19a68e2875… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Feb 5 20:04:05 2007 +0100 wininet: Remove unused function. --- dlls/wininet/internet.h | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 846e705..55e480b 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -71,13 +71,6 @@ typedef struct #endif } WININET_NETCONNECTION; -inline static LPSTR WININET_strdup( LPCSTR str ) -{ - LPSTR ret = HeapAlloc( GetProcessHeap(), 0, strlen(str) + 1 ); - if (ret) strcpy( ret, str ); - return ret; -} - inline static LPWSTR WININET_strdupW( LPCWSTR str ) { LPWSTR ret = HeapAlloc( GetProcessHeap(), 0, (strlenW(str) + 1)*sizeof(WCHAR) );

1 0

Vitaliy Margolen : dinput: Look for all available js* joystick devices.
by Alexandre Julliard Feb. 6, 2007

Feb. 6, 2007

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

Kai Blin : secur32: Fix ntlm_auth version number check when registering the NTLM SSP.
by Alexandre Julliard Feb. 6, 2007

Feb. 6, 2007

Module: wine Branch: master Commit: 7325bbd12748d523a7cc63f537fb00fbc5b093a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7325bbd12748d523a7cc63f53… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Feb 5 23:51:06 2007 +0100 secur32: Fix ntlm_auth version number check when registering the NTLM SSP. --- dlls/secur32/ntlm.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index b632389..af5b3f0 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1760,8 +1760,10 @@ void SECUR32_initNTLMSP(void) check_version(helper); if( (helper->major > MIN_NTLM_AUTH_MAJOR_VERSION) || - (helper->major = MIN_NTLM_AUTH_MAJOR_VERSION && - helper->minor >= MIN_NTLM_AUTH_MINOR_VERSION && + (helper->major == MIN_NTLM_AUTH_MAJOR_VERSION && + helper->minor > MIN_NTLM_AUTH_MINOR_VERSION) || + (helper->major == MIN_NTLM_AUTH_MAJOR_VERSION && + helper->minor == MIN_NTLM_AUTH_MINOR_VERSION && helper->micro >= MIN_NTLM_AUTH_MICRO_VERSION) ) { SecureProvider *provider = SECUR32_addProvider(&ntlmTableA, &ntlmTableW, NULL);

1 0

Kai Blin : secur32: Bump minimal required samba version to 3.0.25, 3.0. 24 is a bugfix release.
by Alexandre Julliard Feb. 6, 2007

Feb. 6, 2007

Module: wine Branch: master Commit: 809e4124d7c3efa31e2adf974a6722fc3a878b9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=809e4124d7c3efa31e2adf974… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Feb 5 17:35:04 2007 +0100 secur32: Bump minimal required samba version to 3.0.25, 3.0.24 is a bugfix release. --- dlls/secur32/ntlm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 39c16c2..b632389 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); #define NTLM_MAX_BUF 1904 #define MIN_NTLM_AUTH_MAJOR_VERSION 3 #define MIN_NTLM_AUTH_MINOR_VERSION 0 -#define MIN_NTLM_AUTH_MICRO_VERSION 24 +#define MIN_NTLM_AUTH_MICRO_VERSION 25 static CHAR ntlm_auth[] = "ntlm_auth";

1 0

Alexandre Julliard : iphlpapi: Avoid printf format warnings.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: c41e09e9a0876b5710d1fbb6e2872b6c2c6dd214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41e09e9a0876b5710d1fbb6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 22:04:29 2007 +0100 iphlpapi: Avoid printf format warnings. --- dlls/iphlpapi/ipstats.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index f5b1149..b80cf61 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -604,11 +604,7 @@ DWORD getNumRoutes(void) } buf = HeapAlloc (GetProcessHeap (), 0, needed); - if (!buf) - { - ERR ("HeapAlloc of %ld failed!\n", needed); - return 0; - } + if (!buf) return 0; if (sysctl (mib, 6, buf, &needed, NULL, 0) < 0) { @@ -673,7 +669,6 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE buf = HeapAlloc (GetProcessHeap (), 0, needed); if (!buf) { - ERR ("HeapAlloc of %ld failed!\n", needed); HeapFree (GetProcessHeap (), 0, table); return ERROR_OUTOFMEMORY; }

1 0

Alexandre Julliard : libwine_port: Implemented interlocked_cmpxchg64 for x86_64.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: d1f7d2c68343338f6a84761708851076a45194c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f7d2c68343338f6a8476170… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 21:47:29 2007 +0100 libwine_port: Implemented interlocked_cmpxchg64 for x86_64. --- libs/port/interlocked.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index 6e49437..c2d85b6 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -141,11 +141,10 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg_pt "mov %rdx, %rax\n\t" "lock cmpxchgq %rsi,(%rdi)\n\t" "ret") -__int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare) -{ - /* FIXME: add code */ - assert(0); -} +__ASM_GLOBAL_FUNC(interlocked_cmpxchg64, + "mov %rdx, %rax\n\t" + "lock cmpxchgq %rsi,(%rdi)\n\t" + "ret") __ASM_GLOBAL_FUNC(interlocked_xchg, "mov %esi, %eax\n\t" "lock xchgl %eax, (%rdi)\n\t"

1 0

Damjan Jovanovic : ntdll: Slist support.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 07db8882c24281ca0acd8435d0e0b31a448ba59d URL: http://source.winehq.org/git/wine.git/?a=commit;h=07db8882c24281ca0acd8435d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Feb 2 16:41:15 2007 +0200 ntdll: Slist support. Implemented ntdll's RtlInitializeSListHead, RtlQueryDepthSList, RtlInterlockedFlushSList, RtlFirstEntrySList, RtlInterlockedPushEntrySList, RtlInterlockedPopEntrySList, their kernel32 equivalents, and tests. --- dlls/kernel32/kernel32.spec | 10 ++-- dlls/kernel32/tests/sync.c | 94 +++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 14 ++-- dlls/ntdll/rtl.c | 130 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 236 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07db8882c24281ca0acd8…

1 0

Damjan Jovanovic : libwine_port: Added interlocked_cmpxchg64.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 7e7ff4076956b41ae5d02c47373e7e3cbf673357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7ff4076956b41ae5d02c473… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Feb 2 16:35:15 2007 +0200 libwine_port: Added interlocked_cmpxchg64. --- include/wine/port.h | 10 ++++++++ libs/port/interlocked.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index c7a9e36..8861408 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -50,6 +50,14 @@ * Type definitions */ +#if !defined(_MSC_VER) && !defined(__int64) +# if defined(__x86_64__) || defined(_WIN64) +# define __int64 long +# else +# define __int64 long long +# endif +#endif + #ifndef HAVE_MODE_T typedef int mode_t; #endif @@ -359,6 +367,7 @@ extern int spawnvp(int mode, const char extern inline int interlocked_cmpxchg( int *dest, int xchg, int compare ); extern inline void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ); +extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ); extern inline int interlocked_xchg( int *dest, int val ); extern inline void *interlocked_xchg_ptr( void **dest, void *val ); extern inline int interlocked_xchg_add( int *dest, int incr ); @@ -407,6 +416,7 @@ extern inline int interlocked_xchg_add( extern int interlocked_cmpxchg( int *dest, int xchg, int compare ); extern void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ); +extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ); extern int interlocked_xchg( int *dest, int val ); extern void *interlocked_xchg_ptr( void **dest, void *val ); extern int interlocked_xchg_add( int *dest, int incr ); diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index ea32cef..6e49437 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -20,6 +20,7 @@ #include "config.h" #include "wine/port.h" +#include <assert.h> #ifdef __i386__ @@ -37,6 +38,18 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg_pt "movl 4(%esp),%edx\n\t" "lock; cmpxchgl %ecx,(%edx)\n\t" "ret") + __ASM_GLOBAL_FUNC(interlocked_cmpxchg64, + "push %ebx\n\t" + "push %esi\n\t" + "movl 12(%esp),%esi\n\t" + "movl 16(%esp),%ebx\n\t" + "movl 20(%esp),%ecx\n\t" + "movl 24(%esp),%eax\n\t" + "movl 28(%esp),%edx\n\t" + "lock; cmpxchg8b (%esi)\n\t" + "pop %esi\n\t" + "pop %ebx\n\t" + "ret"); __ASM_GLOBAL_FUNC(interlocked_xchg, "movl 8(%esp),%eax\n\t" "movl 4(%esp),%edx\n\t" @@ -73,6 +86,21 @@ __declspec(naked) void *interlocked_cmpx __asm ret; } +__declspec(naked) __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare) +{ + __asm push ebx; + __asm push esi; + __asm mov esi, 12[esp]; + __asm mov ebx, 16[esp]; + __asm mov ecx, 20[esp]; + __asm mov eax, 24[esp]; + __asm mov edx, 28[esp]; + __asm lock cmpxchg8b [esi]; + __asm pop esi; + __asm pop ebx; + __asm ret; +} + __declspec(naked) int interlocked_xchg( int *dest, int val ) { __asm mov eax, 8[esp]; @@ -113,6 +141,11 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg_pt "mov %rdx, %rax\n\t" "lock cmpxchgq %rsi,(%rdi)\n\t" "ret") +__int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare) +{ + /* FIXME: add code */ + assert(0); +} __ASM_GLOBAL_FUNC(interlocked_xchg, "mov %esi, %eax\n\t" "lock xchgl %eax, (%rdi)\n\t" @@ -149,6 +182,12 @@ void* interlocked_cmpxchg_ptr( void **de return ret; } +__int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare) +{ + /* FIXME: add code */ + assert(0); +} + int interlocked_cmpxchg( int *dest, int xchg, int compare) { int ret = 0; @@ -244,6 +283,15 @@ void *interlocked_cmpxchg_ptr( void **de return compare; } +__int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) +{ + _lwp_mutex_lock( &interlocked_mutex ); + if (*dest == compare) *dest = xchg; + else compare = *dest; + _lwp_mutex_unlock( &interlocked_mutex ); + return compare; +} + int interlocked_xchg( int *dest, int val ) { int retv; @@ -300,6 +348,12 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg_pt "L1cmpxchg_ptr:\n\t" "mb") +__int64 interlocked_cmpxchg64(__int64 *dest, __int64 xchg, __int64 compare) +{ + /* FIXME: add code */ + assert(0); +} + __ASM_GLOBAL_FUNC(interlocked_xchg, "L0xchg:\n\t" "ldl_l $0,0($16)\n\t"

1 0

Paul Vriens : wininet/tests: Add ftp tests.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 8e9a81ea0897ce0d1c0a6ce5e91b35703977d6fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9a81ea0897ce0d1c0a6ce5e… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jan 31 13:16:58 2007 +0100 wininet/tests: Add ftp tests. --- dlls/wininet/tests/Makefile.in | 1 + dlls/wininet/tests/ftp.c | 728 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 729 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e9a81ea0897ce0d1c0a6…

1 0

Dmitry Timoshkov : user32: Add the tests for minimize/ restore MDI child sequence, fix some failures.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 65681a0e18dcaa7e6b8dcef8ced08e4eda4e2a50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65681a0e18dcaa7e6b8dcef8c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jan 31 18:39:40 2007 +0800 user32: Add the tests for minimize/restore MDI child sequence, fix some failures. --- dlls/user32/mdi.c | 4 +- dlls/user32/tests/msg.c | 86 ++++++++++++++++++++++++++++++++++++++++---- dlls/winex11.drv/winpos.c | 3 ++ 3 files changed, 83 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65681a0e18dcaa7e6b8dc…

1 0