February 2009 - Wine-Commits

Rob Shearman : winejoystick.drv: Use CP_UNIXCP instead of CP_ACP when converting a string that comes from the OS .
by Alexandre Julliard Feb. 19, 2009

Feb. 19, 2009

Module: wine Branch: master Commit: 466b682dc6ebb51afe9b632efc964d0a7e158e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=466b682dc6ebb51afe9b632ef… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Feb 18 20:32:27 2009 +0000 winejoystick.drv: Use CP_UNIXCP instead of CP_ACP when converting a string that comes from the OS. --- dlls/winejoystick.drv/joystick.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winejoystick.drv/joystick.c b/dlls/winejoystick.drv/joystick.c index 2967a50..9a6902e 100644 --- a/dlls/winejoystick.drv/joystick.c +++ b/dlls/winejoystick.drv/joystick.c @@ -221,7 +221,7 @@ static const WCHAR ini[] = {'W','i','n','e',' ','J','o','y','s','t','i','c','k', driverVersion, identString, nrOfAxes, nrOfButtons); lpCaps->wMid = MM_MICROSOFT; lpCaps->wPid = MM_PC_JOYSTICK; - MultiByteToWideChar(CP_ACP, 0, identString, -1, lpCaps->szPname, MAXPNAMELEN); + MultiByteToWideChar(CP_UNIXCP, 0, identString, -1, lpCaps->szPname, MAXPNAMELEN); lpCaps->szPname[MAXPNAMELEN-1] = '\0'; lpCaps->wXmin = 0; lpCaps->wXmax = 0xFFFF;

1 0

Juan Lang : oleaut32: Constify input parameter to VarR8FromDec.
by Alexandre Julliard Feb. 19, 2009

Feb. 19, 2009

Module: wine Branch: master Commit: d693dfda8c1a96c109929cc39f550fc8cefe4f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d693dfda8c1a96c109929cc39… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 18 09:05:01 2009 -0800 oleaut32: Constify input parameter to VarR8FromDec. With thanks to Dmitry for spotting this. --- dlls/oleaut32/vartype.c | 2 +- include/oleauto.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 77c2d14..3e435ab 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -3265,7 +3265,7 @@ HRESULT WINAPI VarR8FromUI4(ULONG ulIn, double *pDblOut) * Success: S_OK. * Failure: E_INVALIDARG, if the source value is invalid. */ -HRESULT WINAPI VarR8FromDec(DECIMAL* pDecIn, double *pDblOut) +HRESULT WINAPI VarR8FromDec(const DECIMAL* pDecIn, double *pDblOut) { BYTE scale = DEC_SCALE(pDecIn); double divisor = 1.0, highPart; diff --git a/include/oleauto.h b/include/oleauto.h index 4492d04..98e8dbf 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -316,7 +316,7 @@ HRESULT WINAPI VarR8FromUI4(ULONG,double*); HRESULT WINAPI VarR8FromUI8(ULONG64,double*); HRESULT WINAPI VarR8FromStr(OLECHAR*,LCID,ULONG,double*); HRESULT WINAPI VarR8FromCy(CY,double*); -HRESULT WINAPI VarR8FromDec(DECIMAL*,double*); +HRESULT WINAPI VarR8FromDec(const DECIMAL*,double*); HRESULT WINAPI VarR8FromDisp(IDispatch*,LCID,double*); HRESULT WINAPI VarDateFromUI1(BYTE,DATE*);

1 0

Alexandre Julliard : user32/tests: Ignore SPI_ICONVERTICALSPACING notifications. Don' t reset mouse buttons if setting failed.
by Alexandre Julliard Feb. 18, 2009

Feb. 18, 2009

Module: wine Branch: master Commit: efdf8f9878721ced11301b6a43326380d2ad29df URL: http://source.winehq.org/git/wine.git/?a=commit;h=efdf8f9878721ced11301b6a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 18 16:45:44 2009 +0100 user32/tests: Ignore SPI_ICONVERTICALSPACING notifications. Don't reset mouse buttons if setting failed. --- dlls/user32/tests/sysparams.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index ed420f9..194217f 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -176,8 +176,13 @@ static LRESULT CALLBACK SysParamsTestWndProc( HWND hWnd, UINT msg, WPARAM wParam case WM_SETTINGCHANGE: if (change_counter>0) { /* ignore these messages caused by resizing of toolbars */ - if( wParam == SPI_SETWORKAREA || displaychange_test_active) break; - if( change_last_param == SPI_SETWORKAREA) { + if( wParam == SPI_SETWORKAREA || + wParam == SPI_ICONVERTICALSPACING || + displaychange_test_active) + break; + if( change_last_param == SPI_SETWORKAREA || + change_last_param == SPI_ICONVERTICALSPACING) + { change_last_param = wParam; break; } @@ -1244,9 +1249,8 @@ static void test_SPI_SETMOUSEBUTTONSWAP( void ) /* 33 */ SetLastError(0xdeadbeef); rc=SystemParametersInfoA( SPI_SETMOUSEBUTTONSWAP, vals[i], 0, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); - if (!test_error_msg(rc,"SPI_{GET,SET}MOUSEBUTTONSWAP")) - break; - + if (!test_error_msg(rc,"SPI_SETMOUSEBUTTONSWAP")) return; + test_change_message( SPI_SETMOUSEBUTTONSWAP, 0 ); test_reg_key( SPI_SETMOUSEBUTTONSWAP_REGKEY, SPI_SETMOUSEBUTTONSWAP_VALNAME,

1 0

Juan M. Navarro : msvcrt/tests: Avoid size_t in printf format.
by Alexandre Julliard Feb. 18, 2009

Feb. 18, 2009

Module: wine Branch: master Commit: c9b40bff322faeff4e1291f75b9676300571d3a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b40bff322faeff4e1291f75… Author: Juan M. Navarro <juan.m.navarro(a)gmail.com> Date: Tue Feb 17 12:07:00 2009 -0800 msvcrt/tests: Avoid size_t in printf format. --- dlls/msvcrt/tests/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 22a5141..edc0799 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -553,7 +553,7 @@ static void test_fgetwc( void ) ok(l==BUFSIZ-2, "ftell expected %d got %ld\n", BUFSIZ-2, l); fgetws(wtextW,LLEN,tempfh); l=ftell(tempfh); - ok(l==BUFSIZ-2+strlen(mytext), "ftell expected %d got %ld\n", BUFSIZ-2+strlen(mytext), l); + ok(l==BUFSIZ-2+strlen(mytext), "ftell expected %d got %ld\n", BUFSIZ-2+lstrlen(mytext), l); mytextW = AtoW (mytext); aptr = mytextW; wptr = wtextW;

1 0

Aric Stewart : wininet: Handle cookie expiration.
by Alexandre Julliard Feb. 18, 2009

Feb. 18, 2009

Module: wine Branch: master Commit: e968f099f3d5c995c62af8252d9d38ccd7d8937c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e968f099f3d5c995c62af8252… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 18 08:32:26 2009 -0600 wininet: Handle cookie expiration. --- dlls/wininet/cookie.c | 52 ++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 45 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 690cbe9..de2cb50 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -52,7 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); * Cookies are currently memory only. * Cookies are NOT THREAD SAFE * Cookies could use A LOT OF MEMORY. We need some kind of memory management here! - * Cookies should care about the expiry time */ typedef struct _cookie_domain cookie_domain; @@ -66,7 +65,7 @@ struct _cookie LPWSTR lpCookieName; LPWSTR lpCookieData; - time_t expiry; /* FIXME: not used */ + FILETIME expiry; }; struct _cookie_domain @@ -80,7 +79,7 @@ struct _cookie_domain static struct list domain_list = LIST_INIT(domain_list); -static cookie *COOKIE_addCookie(cookie_domain *domain, LPCWSTR name, LPCWSTR data); +static cookie *COOKIE_addCookie(cookie_domain *domain, LPCWSTR name, LPCWSTR data, FILETIME expiry); static cookie *COOKIE_findCookie(cookie_domain *domain, LPCWSTR lpszCookieName); static void COOKIE_deleteCookie(cookie *deadCookie, BOOL deleteDomain); static cookie_domain *COOKIE_addDomain(LPCWSTR domain, LPCWSTR path); @@ -88,13 +87,14 @@ static void COOKIE_deleteDomain(cookie_domain *deadDomain); /* adds a cookie to the domain */ -static cookie *COOKIE_addCookie(cookie_domain *domain, LPCWSTR name, LPCWSTR data) +static cookie *COOKIE_addCookie(cookie_domain *domain, LPCWSTR name, LPCWSTR data, FILETIME expiry) { cookie *newCookie = HeapAlloc(GetProcessHeap(), 0, sizeof(cookie)); list_init(&newCookie->entry); newCookie->lpCookieName = NULL; newCookie->lpCookieData = NULL; + newCookie->expiry = expiry; if (name) { @@ -293,6 +293,7 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, struct list * cursor; unsigned int cnt = 0, domain_count = 0, cookie_count = 0; WCHAR hostName[2048], path[2048]; + FILETIME tm; TRACE("(%s, %s, %p, %p)\n", debugstr_w(lpszUrl),debugstr_w(lpszCookieName), lpCookieData, lpdwSize); @@ -307,6 +308,8 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, ret = COOKIE_crackUrlSimple(lpszUrl, hostName, sizeof(hostName)/sizeof(hostName[0]), path, sizeof(path)/sizeof(path[0])); if (!ret || !hostName[0]) return FALSE; + GetSystemTimeAsFileTime(&tm); + LIST_FOR_EACH(cursor, &domain_list) { cookie_domain *cookiesDomain = LIST_ENTRY(cursor, cookie_domain, entry); @@ -319,6 +322,14 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, LIST_FOR_EACH(cursor, &cookiesDomain->cookie_list) { cookie *thisCookie = LIST_ENTRY(cursor, cookie, entry); + /* check for expiry */ + if ((thisCookie->expiry.dwLowDateTime != 0 || thisCookie->expiry.dwHighDateTime != 0) && CompareFileTime(&tm,&thisCookie->expiry) > 0) + { + TRACE("Found expired cookie. deleting\n"); + COOKIE_deleteCookie(thisCookie, FALSE); + continue; + } + if (lpCookieData == NULL) /* return the size of the buffer required to lpdwSize */ { unsigned int len; @@ -438,9 +449,12 @@ static BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWST struct list *cursor; LPWSTR data; WCHAR *ptr; + FILETIME expiry; + BOOL expired = FALSE; data = HeapAlloc(GetProcessHeap(),0,(lstrlenW(cookie_data)+1) * sizeof(WCHAR)); strcpyW(data,cookie_data); + memset(&expiry,0,sizeof(expiry)); /* lots of informations can be parsed out of the cookie value */ @@ -470,7 +484,23 @@ static BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWST TRACE("Parsing new path %s\n",debugstr_w(path)); } else if (strncmpiW(ptr, szExpires, 8) == 0) - FIXME("expires not handled (%s)\n",debugstr_w(ptr)); + { + FILETIME ft; + SYSTEMTIME st; + FIXME("persistent cookies not handled (%s)\n",debugstr_w(ptr)); + ptr+=strlenW(szExpires); + if (InternetTimeToSystemTimeW(ptr, &st, 0)) + { + SystemTimeToFileTime(&st, &expiry); + GetSystemTimeAsFileTime(&ft); + + if (CompareFileTime(&ft,&expiry) > 0) + { + TRACE("Cookie already expired.\n"); + expired = TRUE; + } + } + } else if (strncmpiW(ptr, szSecure, 6) == 0) FIXME("secure not handled (%s)\n",debugstr_w(ptr)); else if (strncmpiW(ptr, szHttpOnly, 8) == 0) @@ -488,7 +518,15 @@ static BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWST } if (!thisCookieDomain) - thisCookieDomain = COOKIE_addDomain(domain, path); + { + if (!expired) + thisCookieDomain = COOKIE_addDomain(domain, path); + else + { + HeapFree(GetProcessHeap(),0,data); + return TRUE; + } + } if ((thisCookie = COOKIE_findCookie(thisCookieDomain, cookie_name))) COOKIE_deleteCookie(thisCookie, FALSE); @@ -496,7 +534,7 @@ static BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWST TRACE("setting cookie %s=%s for domain %s path %s\n", debugstr_w(cookie_name), debugstr_w(data), debugstr_w(thisCookieDomain->lpCookieDomain),debugstr_w(thisCookieDomain->lpCookiePath)); - if (!COOKIE_addCookie(thisCookieDomain, cookie_name,data)) + if (!expired && !COOKIE_addCookie(thisCookieDomain, cookie_name,data, expiry)) { HeapFree(GetProcessHeap(),0,data); return FALSE;

1 0

Nikolay Sivov : cmd: Reserve a place in buffer for NULL terminator.
by Alexandre Julliard Feb. 18, 2009

Feb. 18, 2009

Module: wine Branch: master Commit: 2dd1b3b6366e64cff1976a46f900e650cee56f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd1b3b6366e64cff1976a46f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Feb 17 22:45:21 2009 +0300 cmd: Reserve a place in buffer for NULL terminator. --- programs/cmd/builtins.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 6679b86..bcdf840 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2290,7 +2290,7 @@ void WCMD_type (WCHAR *command) { static const WCHAR fmt[] = {'\n','%','s','\n','\n','\0'}; WCMD_output(fmt, thisArg); } - while (WCMD_ReadFile (h, buffer, sizeof(buffer)/sizeof(WCHAR), &count, NULL)) { + while (WCMD_ReadFile (h, buffer, sizeof(buffer)/sizeof(WCHAR) - 1, &count, NULL)) { if (count == 0) break; /* ReadFile reports success on EOF! */ buffer[count] = 0; WCMD_output_asis (buffer);

1 0

Huw Davies : gdi32/tests: From Vista onwards TabbedTextOut ignores justification, so remove that bit of the test.
by Alexandre Julliard Feb. 18, 2009

Feb. 18, 2009

Module: wine Branch: master Commit: f4e3e18b42486917affa3743fe7693196a812bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e3e18b42486917affa3743f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 18 12:17:55 2009 +0000 gdi32/tests: From Vista onwards TabbedTextOut ignores justification, so remove that bit of the test. --- dlls/gdi32/tests/font.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bc9d64c..b10aebe 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1292,7 +1292,6 @@ static void testJustification(HDC hdc, PSTR str, RECT *clientArea) { INT x, y, breakCount, - outputWidth = 0, /* to test TabbedTextOut() */ justifiedWidth = 0, /* to test GetTextExtentExPointW() */ areaWidth = clientArea->right - clientArea->left, nErrors = 0, e; @@ -1304,7 +1303,6 @@ static void testJustification(HDC hdc, PSTR str, RECT *clientArea) { char extent[100]; int GetTextExtentExPointWWidth; - int TabbedTextOutWidth; } error[10]; GetTextMetricsA(hdc, &tm); @@ -1350,15 +1348,11 @@ static void testJustification(HDC hdc, PSTR str, RECT *clientArea) x = clientArea->left; - outputWidth = LOWORD(TabbedTextOut( - hdc, x, y, pFirstChar, pLastChar - pFirstChar, - 0, NULL, 0)); /* catch errors and report them */ - if (!lastExtent && ((outputWidth != areaWidth) || (justifiedWidth != areaWidth))) + if (!lastExtent && (justifiedWidth != areaWidth)) { memset(error[nErrors].extent, 0, 100); memcpy(error[nErrors].extent, pFirstChar, pLastChar - pFirstChar); - error[nErrors].TabbedTextOutWidth = outputWidth; error[nErrors].GetTextExtentExPointWWidth = justifiedWidth; nErrors++; } @@ -1369,9 +1363,6 @@ static void testJustification(HDC hdc, PSTR str, RECT *clientArea) for (e = 0; e < nErrors; e++) { - ok(near_match(error[e].TabbedTextOutWidth, areaWidth), - "The output text (\"%s\") width should be %d, not %d.\n", - error[e].extent, areaWidth, error[e].TabbedTextOutWidth); /* The width returned by GetTextExtentPoint32() is exactly the same returned by GetTextExtentExPointW() - see dlls/gdi32/font.c */ ok(error[e].GetTextExtentExPointWWidth == areaWidth,

1 0

Michael Karcher : kernel32: Free profile before reloading.
by Alexandre Julliard Feb. 18, 2009

Feb. 18, 2009

Module: wine Branch: master Commit: abf9cd09938b4ed70b9928984eefa92f1bbdc9f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf9cd09938b4ed70b9928984… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Wed Feb 18 14:36:28 2009 +0100 kernel32: Free profile before reloading. --- dlls/kernel32/profile.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index e0b709c..1a25031 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -807,6 +807,7 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) { TRACE("(%s): already opened, needs refreshing (mru=%d)\n", debugstr_w(buffer), i); + PROFILE_Free(CurProfile->section); CurProfile->section = PROFILE_Load(hFile, &CurProfile->encoding); CurProfile->LastWriteTime = LastWriteTime; }

1 0

Huw Davies : comdlg32/tests: Skip remaining tests if StartDoc fails.
by Alexandre Julliard Feb. 18, 2009

Feb. 18, 2009

Module: wine Branch: master Commit: ecffb8038a1cfd23a070b0f2044176ee9f7cbe7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecffb8038a1cfd23a070b0f20… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 18 12:42:50 2009 +0000 comdlg32/tests: Skip remaining tests if StartDoc fails. --- dlls/comdlg32/tests/printdlg.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index cb86d62..6f70621 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -298,6 +298,7 @@ static void test_abort_proc(void) DOCINFOA doc_info = {0}; PRINTDLGA pd = {0}; char filename[MAX_PATH]; + int job_id; if (!GetTempFileNameA(".", "prn", 0, filename)) { @@ -333,7 +334,14 @@ static void test_abort_proc(void) doc_info.lpszDocName = "Some document"; doc_info.lpszOutput = filename; - ok(StartDocA(print_dc, &doc_info) > 0, "StartDocA failed\n"); + job_id = StartDocA(print_dc, &doc_info); + ok(job_id > 0, "StartDocA failed ret %d gle %d\n", job_id, GetLastError()); + if(job_id <= 0) + { + skip("StartDoc failed\n"); + goto end; + } + ok(abort_proc_called, "AbortProc didn't get called by StartDoc.\n"); abort_proc_called = FALSE; @@ -357,6 +365,7 @@ static void test_abort_proc(void) ok(!abort_proc_called, "AbortProc got called unexpectedly by DeleteDC.\n"); abort_proc_called = FALSE; +end: ok(DeleteFileA(filename), "Failed to delete temporary file\n"); }

1 0

Nikolay Sivov : cmd: Always add a new line in 'type' output on single file mode.
by Alexandre Julliard Feb. 18, 2009

Feb. 18, 2009

Module: wine Branch: master Commit: 78f38a742fb48a723392687615669f7f5f5b74d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78f38a742fb48a72339268761… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Feb 17 22:39:42 2009 +0300 cmd: Always add a new line in 'type' output on single file mode. --- programs/cmd/builtins.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index db8b02f..6679b86 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2296,6 +2296,8 @@ void WCMD_type (WCHAR *command) { WCMD_output_asis (buffer); } CloseHandle (h); + if (!writeHeaders) + WCMD_output_asis (newline); } } }

1 0