September 2007 - Wine-Commits

Misha Koshelev : wininet: When sending INTERNET_STATUS_HANDLE_CLOSING make sure the freed handle is not yet available .
by Alexandre Julliard Sept. 25, 2007

Sept. 25, 2007

Module: wine Branch: master Commit: 705b01c05479cb931e0e2a3bc5984425ff602721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=705b01c05479cb931e0e2a3bc… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri Sep 21 21:27:48 2007 -0500 wininet: When sending INTERNET_STATUS_HANDLE_CLOSING make sure the freed handle is not yet available. --- dlls/wininet/internet.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5e95a12..0edca74 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -208,13 +208,14 @@ BOOL WININET_FreeHandle( HINTERNET hinternet ) TRACE( "destroying handle %d for object %p\n", handle+1, info); WININET_Handles[handle] = NULL; ret = TRUE; - if( WININET_dwNextHandle > handle ) - WININET_dwNextHandle = handle; } } LeaveCriticalSection( &WININET_cs ); + /* As on native when the equivalent of WININET_Release is called, the handle + * is already invalid, but if a new handle is created at this time it does + * not yet get assigned the freed handle number */ if( info ) { /* Free all children as native does */ @@ -227,6 +228,13 @@ BOOL WININET_FreeHandle( HINTERNET hinternet ) WININET_Release( info ); } + EnterCriticalSection( &WININET_cs ); + + if( WININET_dwNextHandle > handle && !WININET_Handles[handle] ) + WININET_dwNextHandle = handle; + + LeaveCriticalSection( &WININET_cs ); + return ret; } @@ -1006,8 +1014,8 @@ BOOL WINAPI InternetCloseHandle(HINTERNET hInternet) return FALSE; } - WININET_FreeHandle( hInternet ); WININET_Release( lpwh ); + WININET_FreeHandle( hInternet ); return TRUE; }

1 0

Christian Gmeiner : advapi32: fix some compiler warnings when using -Wsign-compare.
by Alexandre Julliard Sept. 25, 2007

Sept. 25, 2007

Module: wine Branch: master Commit: bb3a968d30b84995fbd347cbf825b61e2a865696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb3a968d30b84995fbd347cbf… Author: Christian Gmeiner <christian.gmeiner(a)gmail.com> Date: Fri Sep 21 20:17:23 2007 +0000 advapi32: fix some compiler warnings when using -Wsign-compare. --- dlls/advapi32/crypt.c | 2 +- dlls/advapi32/crypt_lmhash.c | 4 ++-- dlls/advapi32/security.c | 12 ++++++------ dlls/advapi32/service.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 63f89f6..c6ea940 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -146,7 +146,7 @@ static inline BOOL CRYPT_UnicodeToANSI(LPCWSTR wstr, LPSTR* str, int strsize) */ static inline BOOL CRYPT_ANSIToUnicode(LPCSTR str, LPWSTR* wstr, int wstrsize) { - int wcount; + unsigned int wcount; if (!str) { diff --git a/dlls/advapi32/crypt_lmhash.c b/dlls/advapi32/crypt_lmhash.c index 2f57842..345c89d 100644 --- a/dlls/advapi32/crypt_lmhash.c +++ b/dlls/advapi32/crypt_lmhash.c @@ -194,7 +194,7 @@ NTSTATUS WINAPI SystemFunction004(const struct ustring *in, unsigned int ui[2]; } data; unsigned char deskey[7]; - int crypt_len, ofs; + unsigned int crypt_len, ofs; if (key->Length<=0) return STATUS_INVALID_PARAMETER_2; @@ -253,7 +253,7 @@ NTSTATUS WINAPI SystemFunction005(const struct ustring *in, unsigned int ui[2]; } data; unsigned char deskey[7]; - int ofs, crypt_len; + unsigned int ofs, crypt_len; if (key->Length<=0) return STATUS_INVALID_PARAMETER_2; diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 89e3d90..bfe7edf 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -772,7 +772,7 @@ CreateWellKnownSid( WELL_KNOWN_SID_TYPE WellKnownSidType, PSID pSid, DWORD* cbSid) { - int i; + unsigned int i; TRACE("(%d, %s, %p, %p)\n", WellKnownSidType, debugstr_sid(DomainSid), pSid, cbSid); if (DomainSid != NULL) { @@ -811,7 +811,7 @@ CreateWellKnownSid( WELL_KNOWN_SID_TYPE WellKnownSidType, BOOL WINAPI IsWellKnownSid( PSID pSid, WELL_KNOWN_SID_TYPE WellKnownSidType ) { - int i; + unsigned int i; TRACE("(%s, %d)\n", debugstr_sid(pSid), WellKnownSidType); for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) @@ -1627,7 +1627,7 @@ LookupPrivilegeNameA( LPCSTR lpSystemName, PLUID lpLuid, LPSTR lpName, if (ret) { /* Windows crashes if cchName is NULL, so will I */ - int len = WideCharToMultiByte(CP_ACP, 0, lpNameW, -1, lpName, + unsigned int len = WideCharToMultiByte(CP_ACP, 0, lpNameW, -1, lpName, *cchName, NULL, NULL); if (len == 0) @@ -1870,7 +1870,7 @@ LookupAccountSidW( IN OUT LPDWORD domainSize, OUT PSID_NAME_USE name_use ) { - int i, j; + unsigned int i, j; const WCHAR * ac = NULL; const WCHAR * dm = NULL; SID_NAME_USE use = 0; @@ -3821,7 +3821,7 @@ static DWORD ComputeStringSidSize(LPCWSTR StringSid) } else /* String constant format - Only available in winxp and above */ { - int i; + unsigned int i; for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2)) @@ -3915,7 +3915,7 @@ static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes) } else /* String constant format - Only available in winxp and above */ { - int i; + unsigned int i; pisid->Revision = SDDL_REVISION; for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index ce031ab..82bd7ed 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2319,7 +2319,7 @@ BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, if (!RegOpenKeyW(hscm->hkey, lpServiceName, &hkey)) { - INT len = lstrlenW(lpServiceName); + UINT len = lstrlenW(lpServiceName); BOOL r = FALSE; if ((*lpcchBuffer <= len) || (!lpDisplayName && *lpcchBuffer))

1 0

Chris Robinson : winex11.drv: Load the XComposite extension when available.
by Alexandre Julliard Sept. 25, 2007

Sept. 25, 2007

Module: wine Branch: master Commit: 4258465868663e5bcfd2c16e513927e425bb81e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4258465868663e5bcfd2c16e5… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Sep 22 18:19:08 2007 -0700 winex11.drv: Load the XComposite extension when available. --- configure | 89 ++++++++++++++++++++++++++++++++++++++++ configure.ac | 9 ++++ dlls/winex11.drv/x11drv_main.c | 71 ++++++++++++++++++++++++++++++++ dlls/winex11.drv/xcomposite.h | 45 ++++++++++++++++++++ include/config.h.in | 6 +++ 5 files changed, 220 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4258465868663e5bcfd2c…

1 0

Karl Relton : msvcrt: New implementation of fcvt.
by Alexandre Julliard Sept. 25, 2007

Sept. 25, 2007

Module: wine Branch: master Commit: 260fd8a4a965a8097934558bc4a63eb17ede579b URL: http://source.winehq.org/git/wine.git/?a=commit;h=260fd8a4a965a8097934558bc… Author: Karl Relton <karllinuxtest.relton(a)ntlworld.com> Date: Mon Sep 24 20:10:36 2007 +0100 msvcrt: New implementation of fcvt. --- dlls/msvcrt/math.c | 77 +++++++++++++++++++++++++++++--- dlls/msvcrt/tests/printf.c | 107 ++++++++++++++++++++++++++++++++------------ 2 files changed, 149 insertions(+), 35 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f06166b..b449af5 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -873,16 +873,81 @@ char * CDECL _ecvt( double number, int ndigits, int *decpt, int *sign ) char * CDECL _fcvt( double number, int ndigits, int *decpt, int *sign ) { thread_data_t *data = msvcrt_get_thread_data(); - char *dec; + int stop, dec1, dec2; + char *ptr1, *ptr2, *first; + char buf[80]; /* ought to be enough */ if (!data->efcvt_buffer) data->efcvt_buffer = MSVCRT_malloc( 80 ); /* ought to be enough */ - snprintf(data->efcvt_buffer, 80, "%.*e", ndigits, number); - *sign = (number < 0); - dec = strchr(data->efcvt_buffer, '.'); - *decpt = (dec) ? dec - data->efcvt_buffer : -1; - return data->efcvt_buffer; + if (number < 0) + { + *sign = 1; + number = -number; + } else *sign = 0; + + snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); + ptr1 = buf; + ptr2 = data->efcvt_buffer; + first = NULL; + dec1 = 0; + dec2 = 0; + + /* For numbers below the requested resolution, work out where + the decimal point will be rather than finding it in the string */ + if (number < 1.0 && number > 0.0) { + dec2 = log10(number + 1e-10); + if (-dec2 <= ndigits) dec2 = 0; + } + + /* If requested digits is zero or less, we will need to truncate + * the returned string */ + if (ndigits < 1) { + stop = strlen(buf) + ndigits; + } else { + stop = strlen(buf); + } + + while (*ptr1 == '0') ptr1++; /* Skip leading zeroes */ + while (*ptr1 != '\0' && *ptr1 != '.') { + if (!first) first = ptr2; + if ((ptr1 - buf) < stop) { + *ptr2++ = *ptr1++; + } else { + ptr1++; + } + dec1++; + } + + if (ndigits > 0) { + ptr1++; + if (!first) { + while (*ptr1 == '0') { /* Process leading zeroes */ + *ptr2++ = *ptr1++; + dec1--; + } + } + while (*ptr1 != '\0') { + if (!first) first = ptr2; + *ptr2++ = *ptr1++; + } + } + + *ptr2 = '\0'; + + /* We never found a non-zero digit, then our number is either + * smaller than the requested precision, or 0.0 */ + if (!first) { + if (number > 0.0) { + first = ptr2; + } else { + first = data->efcvt_buffer; + dec1 = 0; + } + } + + *decpt = dec2 ? dec2 : dec1; + return first; } /*********************************************************************** diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 61672f9..7e07241 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -552,47 +552,96 @@ static void test_fcvt(void) char *str; int dec=100, sign=100; + /* Numbers less than 1.0 with different precisions */ str = _fcvt(0.0001, 1, &dec, &sign ); - todo_wine { - ok( 0 == strcmp(str,""), "bad return\n"); - ok( -3 == dec, "dec wrong\n"); - } - ok( 0 == sign, "dec wrong\n"); + ok( 0 == strcmp(str,""), "bad return '%s'\n", str); + ok( -3 == dec, "dec wrong %d\n", dec); + ok( 0 == sign, "sign wrong\n"); str = _fcvt(0.0001, -10, &dec, &sign ); - todo_wine { - ok( 0 == strcmp(str,""), "bad return\n"); - ok( -3 == dec, "dec wrong\n"); - } - ok( 0 == sign, "dec wrong\n"); + ok( 0 == strcmp(str,""), "bad return '%s'\n", str); + ok( -3 == dec, "dec wrong %d\n", dec); + ok( 0 == sign, "sign wrong\n"); str = _fcvt(0.0001, 10, &dec, &sign ); - todo_wine { - ok( 0 == strcmp(str,"1000000"), "bad return\n"); - ok( -3 == dec, "dec wrong\n"); - } - ok( 0 == sign, "dec wrong\n"); + ok( 0 == strcmp(str,"1000000"), "bad return '%s'\n", str); + ok( -3 == dec, "dec wrong %d\n", dec); + ok( 0 == sign, "sign wrong\n"); + /* Basic sign test */ str = _fcvt(-111.0001, 5, &dec, &sign ); - todo_wine { - ok( 0 == strcmp(str,"11100010"), "bad return\n"); - ok( 3 == dec, "dec wrong\n"); - } - ok( 1 == sign, "dec wrong\n"); + ok( 0 == strcmp(str,"11100010"), "bad return '%s'\n", str); + ok( 3 == dec, "dec wrong %d\n", dec); + ok( 1 == sign, "sign wrong\n"); str = _fcvt(111.0001, 5, &dec, &sign ); - todo_wine { - ok( 0 == strcmp(str,"11100010"), "bad return\n"); + ok( 0 == strcmp(str,"11100010"), "bad return '%s'\n", str); ok( 3 == dec, "dec wrong\n"); - } - ok( 0 == sign, "dec wrong\n"); + ok( 0 == sign, "sign wrong\n"); + /* 0.0 with different precisions */ str = _fcvt(0.0, 5, &dec, &sign ); - todo_wine { - ok( 0 == strcmp(str,"00000"), "bad return\n"); - ok( 0 == dec, "dec wrong\n"); - } - ok( 0 == sign, "dec wrong\n"); + ok( 0 == strcmp(str,"00000"), "bad return '%s'\n", str); + ok( 0 == dec, "dec wrong %d\n", dec); + ok( 0 == sign, "sign wrong\n"); + + str = _fcvt(0.0, 0, &dec, &sign ); + ok( 0 == strcmp(str,""), "bad return '%s'\n", str); + ok( 0 == dec, "dec wrong %d\n", dec); + ok( 0 == sign, "sign wrong\n"); + + str = _fcvt(0.0, -1, &dec, &sign ); + ok( 0 == strcmp(str,""), "bad return '%s'\n", str); + ok( 0 == dec, "dec wrong %d\n", dec); + ok( 0 == sign, "sign wrong\n"); + + /* Numbers > 1.0 with 0 or -ve precision */ + str = _fcvt(-123.0001, 0, &dec, &sign ); + ok( 0 == strcmp(str,"123"), "bad return '%s'\n", str); + ok( 3 == dec, "dec wrong %d\n", dec); + ok( 1 == sign, "sign wrong\n"); + + str = _fcvt(-123.0001, -1, &dec, &sign ); + ok( 0 == strcmp(str,"12"), "bad return '%s'\n", str); + ok( 3 == dec, "dec wrong %d\n", dec); + ok( 1 == sign, "sign wrong\n"); + + str = _fcvt(-123.0001, -2, &dec, &sign ); + ok( 0 == strcmp(str,"1"), "bad return '%s'\n", str); + ok( 3 == dec, "dec wrong %d\n", dec); + ok( 1 == sign, "sign wrong\n"); + + str = _fcvt(-123.0001, -3, &dec, &sign ); + ok( 0 == strcmp(str,""), "bad return '%s'\n", str); + ok( 3 == dec, "dec wrong %d\n", dec); + ok( 1 == sign, "sign wrong\n"); + + /* Numbers > 1.0, but with rounding at the point of precision */ + str = _fcvt(99.99, 1, &dec, &sign ); + ok( 0 == strcmp(str,"1000"), "bad return '%s'\n", str); + ok( 3 == dec, "dec wrong %d\n", dec); + ok( 0 == sign, "sign wrong\n"); + + /* Numbers < 1.0 where rounding occurs at the point of precision */ + str = _fcvt(0.00636, 2, &dec, &sign ); + ok( 0 == strcmp(str,"1"), "bad return '%s'\n", str); + ok( -1 == dec, "dec wrong %d\n", dec); + ok( 0 == sign, "sign wrong\n"); + + str = _fcvt(0.00636, 3, &dec, &sign ); + ok( 0 == strcmp(str,"6"), "bad return '%s'\n", str); + ok( -2 == dec, "dec wrong %d\n", dec); + ok( 0 == sign, "sign wrong\n"); + + str = _fcvt(0.09999999996, 2, &dec, &sign ); + ok( 0 == strcmp(str,"10"), "bad return '%s'\n", str); + ok( 0 == dec, "dec wrong %d\n", dec); + ok( 0 == sign, "sign wrong\n"); + + str = _fcvt(0.6, 0, &dec, &sign ); + ok( 0 == strcmp(str,"1"), "bad return '%s'\n", str); + ok( 1 == dec, "dec wrong %d\n", dec); + ok( 0 == sign, "sign wrong\n"); } START_TEST(printf)

1 0

Detlef Riekenberg : comdlg32/tests: Remove debug code and the tabs.
by Alexandre Julliard Sept. 25, 2007

Sept. 25, 2007

Module: wine Branch: master Commit: ffe54a884c9bd6f0d23392a74c77b91a59ceab81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffe54a884c9bd6f0d23392a74… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Sep 24 21:18:10 2007 +0200 comdlg32/tests: Remove debug code and the tabs. --- dlls/comdlg32/tests/printdlg.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 98c5cd0..6827cb0 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -77,16 +77,16 @@ static void test_PageSetupDlgA(void) pDlg->Flags = PSD_RETURNDEFAULT; SetLastError(0xdeadbeef); res = PageSetupDlgA(pDlg); - trace("after pagesetupdlga res = %d, le %d, ext error 0x%x\n", - res, GetLastError(), CommDlgExtendedError()); ok( res || (CommDlgExtendedError() == PDERR_NODEFAULTPRN), "returned %u with %u and 0x%x (expected '!= 0' or '0' and " "PDERR_NODEFAULTPRN)\n", res, GetLastError(), CommDlgExtendedError()); + if (!res && (CommDlgExtendedError() == PDERR_NODEFAULTPRN)) { - skip("No printer configured.\n"); - HeapFree(GetProcessHeap(), 0, pDlg); - return; + skip("No printer configured.\n"); + HeapFree(GetProcessHeap(), 0, pDlg); + return; } + ok( pDlg->hDevMode && pDlg->hDevNames, "got %p and %p (expected '!= NULL' for both)\n", pDlg->hDevMode, pDlg->hDevNames);

1 0

Detlef Riekenberg : comdlg32/tests: Add tests for PRINTDLG->hDevNames.
by Alexandre Julliard Sept. 25, 2007

Sept. 25, 2007

Module: wine Branch: master Commit: b5e45b0b77279c75c60292f73cc0725aa53cb463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5e45b0b77279c75c60292f73… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Sep 24 15:41:09 2007 +0200 comdlg32/tests: Add tests for PRINTDLG->hDevNames. --- dlls/comdlg32/tests/printdlg.c | 68 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 67 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 7e39dad..98c5cd0 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -1,7 +1,7 @@ /* * Unit test suite for comdlg32 API functions: printer dialogs * - * Copyright 2006 Detlef Riekenberg + * Copyright 2006-2007 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,6 +33,10 @@ #include "wine/test.h" +/* ######## */ + +static const CHAR emptyA[] = ""; +static const CHAR PrinterPortsA[] = "PrinterPorts"; /* ######## */ @@ -100,6 +104,12 @@ static void test_PrintDlgA(void) { DWORD res; LPPRINTDLGA pDlg; + DEVNAMES *pDevNames; + LPCSTR driver; + LPCSTR device; + LPCSTR port; + CHAR buffer[MAX_PATH]; + LPSTR ptr; pDlg = HeapAlloc(GetProcessHeap(), 0, (sizeof(PRINTDLGA)) * 2); @@ -140,6 +150,62 @@ static void test_PrintDlgA(void) "returned %d with 0x%x and 0x%x (expected '!= 0' or '0' and " "PDERR_NODEFAULTPRN)\n", res, GetLastError(), CommDlgExtendedError()); + if (!res && (CommDlgExtendedError() == PDERR_NODEFAULTPRN)) { + skip("No printer configured.\n"); + HeapFree(GetProcessHeap(), 0, pDlg); + return; + } + + ok(pDlg->hDevNames != NULL, "(expected '!= NULL')\n"); + pDevNames = GlobalLock(pDlg->hDevNames); + ok(pDevNames != NULL, "(expected '!= NULL')\n"); + + if (pDevNames) { + ok(pDevNames->wDriverOffset, "(expected '!= 0' for wDriverOffset)\n"); + ok(pDevNames->wDeviceOffset, "(expected '!= 0' for wDeviceOffset)\n"); + ok(pDevNames->wOutputOffset, "(expected '!= 0' for wOutputOffset)\n"); + ok(pDevNames->wDefault == DN_DEFAULTPRN, "got 0x%x (expected DN_DEFAULTPRN)\n", pDevNames->wDefault); + + driver = (LPCSTR)pDevNames + pDevNames->wDriverOffset; + device = (LPCSTR)pDevNames + pDevNames->wDeviceOffset; + port = (LPCSTR)pDevNames + pDevNames->wOutputOffset; + trace("driver '%s' device '%s' port '%s'\n", driver, device, port); + + /* The Driver Entry does not include a Path */ + ptr = strrchr(driver, '\\'); + todo_wine { + ok( ptr == NULL, "got %p for '%s' (expected NULL for a simple name)\n", ptr, driver); + } + + /* The Driver Entry does not have an extension (fixed to ".drv") */ + ptr = strrchr(driver, '.'); + todo_wine { + ok( ptr == NULL, "got %p for '%s' (expected NULL for no extension)\n", ptr, driver); + } + + + buffer[0] = '\0'; + SetLastError(0xdeadbeef); + res = GetProfileStringA(PrinterPortsA, device, emptyA, buffer, sizeof(buffer)); + ptr = strchr(buffer, ','); + todo_wine { + ok( (res > 1) && (ptr != NULL), + "got %u with %u and %p for '%s' (expected '>1' and '!= NULL')\n", + res, GetLastError(), ptr, buffer); + } + + if (ptr) ptr[0] = '\0'; + todo_wine { + ok( lstrcmpiA(driver, buffer) == 0, + "got driver '%s' (expected '%s')\n", driver, buffer); + } + + } + + GlobalUnlock(pDlg->hDevNames); + + GlobalFree(pDlg->hDevMode); + GlobalFree(pDlg->hDevNames); HeapFree(GetProcessHeap(), 0, pDlg); }

1 0

Vitaliy Margolen : dinput: Make default dead zone configurable.
by Alexandre Julliard Sept. 25, 2007

Sept. 25, 2007

Module: wine Branch: master Commit: ac3668a0575d92bb8d1c47d4518e99e7d65b987e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac3668a0575d92bb8d1c47d45… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Sep 24 19:34:38 2007 -0600 dinput: Make default dead zone configurable. --- dlls/dinput/joystick_linuxinput.c | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 37ae4a7..4b7b003 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -58,6 +58,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winreg.h" #include "dinput.h" #include "dinput_private.h" @@ -391,21 +392,35 @@ static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputIm JoystickImpl* newDevice; LPDIDATAFORMAT df = NULL; int i, idx = 0; + char buffer[MAX_PATH+16]; + HKEY hkey, appkey; + LONG def_deadzone = -1; newDevice = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(JoystickImpl)); if (!newDevice) return NULL; - newDevice->base.lpVtbl = jvt; - newDevice->base.ref = 1; - memcpy(&newDevice->base.guid, rguid, sizeof(*rguid)); - InitializeCriticalSection(&newDevice->base.crit); - newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->base.crit"); - newDevice->joyfd = -1; - newDevice->base.dinput = dinput; - newDevice->joydev = &joydevs[index]; + newDevice->base.lpVtbl = jvt; + newDevice->base.ref = 1; + newDevice->base.guid = *rguid; + newDevice->base.dinput = dinput; + newDevice->joyfd = -1; + newDevice->joydev = &joydevs[index]; #ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION - newDevice->ff_state = FF_STATUS_STOPPED; + newDevice->ff_state = FF_STATUS_STOPPED; #endif + InitializeCriticalSection(&newDevice->base.crit); + newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->base.crit"); + + /* get options */ + get_app_key(&hkey, &appkey); + + if (!get_config_key(hkey, appkey, "DefaultDeadZone", buffer, MAX_PATH)) + { + def_deadzone = atoi(buffer); + TRACE("setting default deadzone to: %d\n", def_deadzone); + } + if (appkey) RegCloseKey(appkey); + if (hkey) RegCloseKey(hkey); /* Create copy of default data format */ if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIJoystick2.dwSize))) goto failed; @@ -427,7 +442,8 @@ static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputIm newDevice->props[idx].lMin = 0; newDevice->props[idx].lMax = 0xffff; newDevice->props[idx].lSaturation = 0; - newDevice->props[idx].lDeadZone = MulDiv(newDevice->joydev->axes[i].flat, 0xffff, + newDevice->props[idx].lDeadZone = def_deadzone >= 0 ? def_deadzone : + MulDiv(newDevice->joydev->axes[i].flat, 0xffff, newDevice->props[idx].lDevMax - newDevice->props[idx].lDevMin); df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(newDevice->numAxes++) | DIDFT_ABSAXIS;

1 0

Louis Lenders : wtsapi32: Add stub for WTSRegisterSessionNotification.
by Alexandre Julliard Sept. 25, 2007

Sept. 25, 2007

Module: wine Branch: master Commit: 6b8c3688a87cbd0029736973a8762e6a49db56d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8c3688a87cbd0029736973a… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Sep 17 19:11:23 2007 +0100 wtsapi32: Add stub for WTSRegisterSessionNotification. --- dlls/wtsapi32/wtsapi32.c | 9 +++++++++ dlls/wtsapi32/wtsapi32.spec | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index cec23ee..c17741c 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -204,3 +204,12 @@ BOOL WINAPI WTSWaitSystemEvent(HANDLE hServer, DWORD Mask, DWORD* Flags) FIXME("Stub %p 0x%08x %p\n", hServer, Mask, Flags); return FALSE; } + +/************************************************************ + * WTSRegisterSessionNotification (WTSAPI32.@) + */ +BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags) +{ + FIXME("Stub %p 0x%08x\n", hWnd, dwFlags); + return FALSE; +} diff --git a/dlls/wtsapi32/wtsapi32.spec b/dlls/wtsapi32/wtsapi32.spec index 0cfa7e3..12e647d 100644 --- a/dlls/wtsapi32/wtsapi32.spec +++ b/dlls/wtsapi32/wtsapi32.spec @@ -14,6 +14,7 @@ @ stdcall WTSQuerySessionInformationW(long long long ptr ptr) @ stub WTSQueryUserConfigA @ stub WTSQueryUserConfigW +@ stdcall WTSRegisterSessionNotification(long long) @ stub WTSSendMessageA @ stub WTSSendMessageW @ stub WTSSetSessionInformationA

1 0

Vitaliy Margolen : dinput: Implement GetDeviceInfo for evdev joystick.
by Alexandre Julliard Sept. 25, 2007

Sept. 25, 2007

Module: wine Branch: master Commit: 7123d5a0a31863c480c8cedb128f12cc24de8d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7123d5a0a31863c480c8cedb1… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Sep 24 19:34:44 2007 -0600 dinput: Implement GetDeviceInfo for evdev joystick. --- dlls/dinput/joystick_linuxinput.c | 107 ++++++++++++++++++++++++++++-------- 1 files changed, 83 insertions(+), 24 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 4b7b003..dba1418 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -317,6 +317,48 @@ static void find_joydevs(void) } } +static void fill_joystick_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) +{ + DWORD dwSize = lpddi->dwSize; + + TRACE("%d %p\n", dwSize, lpddi); + memset(lpddi, 0, dwSize); + + lpddi->dwSize = dwSize; + lpddi->guidInstance = joydevs[id].guid; + lpddi->guidProduct = DInput_Wine_Joystick_Base_GUID; + lpddi->guidFFDriver = GUID_NULL; + + if (version >= 0x0800) + lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); + else + lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + + strcpy(lpddi->tszInstanceName, joydevs[id].name); + strcpy(lpddi->tszProductName, joydevs[id].device); +} + +static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) +{ + DWORD dwSize = lpddi->dwSize; + + TRACE("%d %p\n", dwSize, lpddi); + memset(lpddi, 0, dwSize); + + lpddi->dwSize = dwSize; + lpddi->guidInstance = joydevs[id].guid; + lpddi->guidProduct = DInput_Wine_Joystick_Base_GUID; + lpddi->guidFFDriver = GUID_NULL; + + if (version >= 0x0800) + lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); + else + lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + + MultiByteToWideChar(CP_ACP, 0, joydevs[id].name, -1, lpddi->tszInstanceName, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, joydevs[id].device, -1, lpddi->tszProductName, MAX_PATH); +} + static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { find_joydevs(); @@ -336,17 +378,7 @@ static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTAN #endif if (!(dwFlags & DIEDFL_FORCEFEEDBACK) || joydevs[id].has_ff) { - lpddi->guidInstance = joydevs[id].guid; - lpddi->guidProduct = DInput_Wine_Joystick_Base_GUID; - - lpddi->guidFFDriver = GUID_NULL; - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); - - strcpy(lpddi->tszInstanceName, joydevs[id].name); - strcpy(lpddi->tszProductName, joydevs[id].device); + fill_joystick_dideviceinstanceA(lpddi, version, id); return TRUE; } return FALSE; @@ -371,17 +403,7 @@ static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTAN #endif if (!(dwFlags & DIEDFL_FORCEFEEDBACK) || joydevs[id].has_ff) { - lpddi->guidInstance = joydevs[id].guid; - lpddi->guidProduct = DInput_Wine_Joystick_Base_GUID; - - lpddi->guidFFDriver = GUID_NULL; - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); - - MultiByteToWideChar(CP_ACP, 0, joydevs[id].name, -1, lpddi->tszInstanceName, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, joydevs[id].device, -1, lpddi->tszProductName, MAX_PATH); + fill_joystick_dideviceinstanceW(lpddi, version, id); return TRUE; } return FALSE; @@ -1325,6 +1347,43 @@ static HRESULT WINAPI JoystickAImpl_EnumCreatedEffectObjects( return DI_OK; } +/****************************************************************************** + * GetDeviceInfo : get information about a device's identity + */ +static HRESULT WINAPI JoystickAImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8A iface, + LPDIDEVICEINSTANCEA pdidi) +{ + JoystickImpl *This = (JoystickImpl *)iface; + + TRACE("(%p) %p\n", This, pdidi); + + if (pdidi == NULL) return E_POINTER; + if ((pdidi->dwSize != sizeof(DIDEVICEINSTANCE_DX3A)) && + (pdidi->dwSize != sizeof(DIDEVICEINSTANCEA))) + return DIERR_INVALIDPARAM; + + fill_joystick_dideviceinstanceA(pdidi, This->base.dinput->dwVersion, + get_joystick_index(&This->base.guid)); + return DI_OK; +} + +static HRESULT WINAPI JoystickWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface, + LPDIDEVICEINSTANCEW pdidi) +{ + JoystickImpl *This = (JoystickImpl *)iface; + + TRACE("(%p) %p\n", This, pdidi); + + if (pdidi == NULL) return E_POINTER; + if ((pdidi->dwSize != sizeof(DIDEVICEINSTANCE_DX3W)) && + (pdidi->dwSize != sizeof(DIDEVICEINSTANCEW))) + return DIERR_INVALIDPARAM; + + fill_joystick_dideviceinstanceW(pdidi, This->base.dinput->dwVersion, + get_joystick_index(&This->base.guid)); + return DI_OK; +} + static const IDirectInputDevice8AVtbl JoystickAvt = { IDirectInputDevice2AImpl_QueryInterface, @@ -1342,7 +1401,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_SetEventNotification, IDirectInputDevice2AImpl_SetCooperativeLevel, JoystickAImpl_GetObjectInfo, - IDirectInputDevice2AImpl_GetDeviceInfo, + JoystickAImpl_GetDeviceInfo, IDirectInputDevice2AImpl_RunControlPanel, IDirectInputDevice2AImpl_Initialize, JoystickAImpl_CreateEffect, @@ -1384,7 +1443,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification, XCAST(SetCooperativeLevel)IDirectInputDevice2AImpl_SetCooperativeLevel, JoystickWImpl_GetObjectInfo, - IDirectInputDevice2WImpl_GetDeviceInfo, + JoystickWImpl_GetDeviceInfo, XCAST(RunControlPanel)IDirectInputDevice2AImpl_RunControlPanel, XCAST(Initialize)IDirectInputDevice2AImpl_Initialize, XCAST(CreateEffect)JoystickAImpl_CreateEffect,

1 0

Louis Lenders : wtsapi32: Add stub for WTSUnRegisterSessionNotification.
by Alexandre Julliard Sept. 25, 2007

Sept. 25, 2007

Module: wine Branch: master Commit: 6f9bcd59be11f32d4f22eebd6835aca353b6ea15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9bcd59be11f32d4f22eebd6… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Sep 17 19:27:09 2007 +0100 wtsapi32: Add stub for WTSUnRegisterSessionNotification. --- dlls/wtsapi32/wtsapi32.c | 9 +++++++++ dlls/wtsapi32/wtsapi32.spec | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index c17741c..9935d36 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -213,3 +213,12 @@ BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags) FIXME("Stub %p 0x%08x\n", hWnd, dwFlags); return FALSE; } + +/************************************************************ + * WTSUnRegisterSessionNotification (WTSAPI32.@) + */ +BOOL WINAPI WTSUnRegisterSessionNotification(HWND hWnd) +{ + FIXME("Stub %p\n", hWnd); + return FALSE; +} diff --git a/dlls/wtsapi32/wtsapi32.spec b/dlls/wtsapi32/wtsapi32.spec index 12e647d..059b6da 100644 --- a/dlls/wtsapi32/wtsapi32.spec +++ b/dlls/wtsapi32/wtsapi32.spec @@ -23,6 +23,7 @@ @ stub WTSSetUserConfigW @ stub WTSShutdownSystem @ stub WTSTerminateProcess +@ stdcall WTSUnRegisterSessionNotification(long) @ stub WTSVirtualChannelClose @ stub WTSVirtualChannelOpen @ stub WTSVirtualChannelPurgeInput

1 0