October 2012 - Wine-commits

Piotr Caban : wininet: Added basic cookie domain validation in set_cookie function.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: fc219b0ab37da8b80d023fa1aaa957ec01b61b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc219b0ab37da8b80d023fa1a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 14:22:57 2012 +0200 wininet: Added basic cookie domain validation in set_cookie function. --- dlls/wininet/cookie.c | 83 ++++++++++++++++++++++++++++------------- dlls/wininet/tests/internet.c | 20 ++++++++++ 2 files changed, 77 insertions(+), 26 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 46adf68..5253b2b 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -678,6 +678,43 @@ BOOL WINAPI InternetGetCookieA(LPCSTR lpszUrl, LPCSTR lpszCookieName, return r; } + +/*********************************************************************** + * IsDomainLegalCookieDomainW (WININET.@) + */ +BOOL WINAPI IsDomainLegalCookieDomainW( LPCWSTR s1, LPCWSTR s2 ) +{ + DWORD s1_len, s2_len; + + FIXME("(%s, %s) semi-stub\n", debugstr_w(s1), debugstr_w(s2)); + + if (!s1 || !s2) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (s1[0] == '.' || !s1[0] || s2[0] == '.' || !s2[0]) + { + SetLastError(ERROR_INVALID_NAME); + return FALSE; + } + if(!strchrW(s1, '.') || !strchrW(s2, '.')) + return FALSE; + + s1_len = strlenW(s1); + s2_len = strlenW(s2); + if (s1_len > s2_len) + return FALSE; + + if (strncmpiW(s1, s2+s2_len-s1_len, s1_len) || (s2_len>s1_len && s2[s2_len-s1_len-1]!='.')) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return TRUE; +} + BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cookie_data) { cookie_domain *thisCookieDomain = NULL; @@ -727,7 +764,26 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki if (strncmpiW(ptr, szDomain, 7) == 0) { - ptr+=strlenW(szDomain); + WCHAR *end_ptr; + + ptr += sizeof(szDomain)/sizeof(szDomain[0])-1; + if(*ptr == '.') + ptr++; + end_ptr = strchrW(ptr, ';'); + if(end_ptr) + *end_ptr = 0; + + if(!IsDomainLegalCookieDomainW(ptr, domain)) + { + if(value != data) + heap_free(value); + heap_free(data); + return FALSE; + } + + if(end_ptr) + *end_ptr = ';'; + domain = ptr; TRACE("Parsing new domain %s\n",debugstr_w(domain)); } @@ -1059,28 +1115,3 @@ BOOL WINAPI InternetSetPerSiteCookieDecisionW( LPCWSTR pchHostName, DWORD dwDeci FIXME("(%s, 0x%08x) stub\n", debugstr_w(pchHostName), dwDecision); return FALSE; } - -/*********************************************************************** - * IsDomainLegalCookieDomainW (WININET.@) - */ -BOOL WINAPI IsDomainLegalCookieDomainW( LPCWSTR s1, LPCWSTR s2 ) -{ - const WCHAR *p; - - FIXME("(%s, %s)\n", debugstr_w(s1), debugstr_w(s2)); - - if (!s1 || !s2) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if (s1[0] == '.' || !s1[0] || s2[0] == '.' || !s2[0]) - { - SetLastError(ERROR_INVALID_NAME); - return FALSE; - } - if (!(p = strchrW(s2, '.'))) return FALSE; - if (strchrW(p + 1, '.') && !strcmpW(p + 1, s1)) return TRUE; - else if (!strcmpW(s1, s2)) return TRUE; - return FALSE; -} diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 5a8ba99..cf1fc4e 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -496,6 +496,15 @@ static void test_complicated_cookie(void) ret = GetUrlCacheEntryInfo(buffer, NULL, &len); ok(!ret, "GetUrlCacheEntryInfo succeeded\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() = %d\n", GetLastError()); + + /* try setting cookie for different domain */ + ret = InternetSetCookie("http://www.aaa.example.com/bar",NULL,"E=F; domain=different.com"); + ok(!ret, "InternetSetCookie succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %d\n", GetLastError()); + ret = InternetSetCookie("http://www.aaa.example.com.pl/bar",NULL,"E=F; domain=example.com.pl"); + ok(ret, "InternetSetCookie failed with error: %d\n", GetLastError()); + ret = InternetSetCookie("http://www.aaa.example.com.pl/bar",NULL,"E=F; domain=com.pl"); + todo_wine ok(!ret, "InternetSetCookie succeeded\n"); } static void test_cookie_url(void) @@ -828,6 +837,8 @@ static void test_IsDomainLegalCookieDomainW(void) static const WCHAR dot_com[] = {'.','c','o','m',0}; static const WCHAR gmail_com[] = {'g','m','a','i','l','.','c','o','m',0}; static const WCHAR dot_gmail_com[] = {'.','g','m','a','i','l','.','c','o','m',0}; + static const WCHAR www_gmail_com[] = {'w','w','w','.','g','m','a','i','l','.','c','o','m',0}; + static const WCHAR www_mail_gmail_com[] = {'w','w','w','.','m','a','i','l','.','g','m','a','i','l','.','c','o','m',0}; static const WCHAR mail_gmail_com[] = {'m','a','i','l','.','g','m','a','i','l','.','c','o','m',0}; static const WCHAR gmail_co_uk[] = {'g','m','a','i','l','.','c','o','.','u','k',0}; static const WCHAR co_uk[] = {'c','o','.','u','k',0}; @@ -924,6 +935,12 @@ static void test_IsDomainLegalCookieDomainW(void) ret = pIsDomainLegalCookieDomainW(gmail_com, gmail_com); ok(ret, "IsDomainLegalCookieDomainW failed\n"); + ret = pIsDomainLegalCookieDomainW(gmail_com, www_gmail_com); + ok(ret, "IsDomainLegalCookieDomainW failed\n"); + + ret = pIsDomainLegalCookieDomainW(gmail_com, www_mail_gmail_com); + ok(ret, "IsDomainLegalCookieDomainW failed\n"); + SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(gmail_co_uk, co_uk); error = GetLastError(); @@ -940,6 +957,9 @@ static void test_IsDomainLegalCookieDomainW(void) ret = pIsDomainLegalCookieDomainW(gmail_co_uk, dot_co_uk); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ret = pIsDomainLegalCookieDomainW(co_uk, gmail_co_uk); + todo_wine ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); + ret = pIsDomainLegalCookieDomainW(gmail_co_uk, gmail_co_uk); ok(ret, "IsDomainLegalCookieDomainW failed\n");

1 0

Piotr Caban : wininet: Make cookies functions thread-safe.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: b9c2a19591b64d78c53aeec5c22b91204412bb86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9c2a19591b64d78c53aeec5c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 14:23:10 2012 +0200 wininet: Make cookies functions thread-safe. --- dlls/wininet/cookie.c | 31 +++++++++++++++++++++++++++++-- dlls/wininet/internet.c | 1 + dlls/wininet/internet.h | 1 + 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 5253b2b..0a65e4c 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -49,7 +49,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); /* FIXME - * Cookies are NOT THREAD SAFE * Cookies could use A LOT OF MEMORY. We need some kind of memory management here! */ @@ -78,6 +77,14 @@ struct _cookie_domain struct list cookie_list; }; +static CRITICAL_SECTION cookie_cs; +static CRITICAL_SECTION_DEBUG cookie_cs_debug = +{ + 0, 0, &cookie_cs, + { &cookie_cs_debug.ProcessLocksList, &cookie_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cookie_cs") } +}; +static CRITICAL_SECTION cookie_cs = { &cookie_cs_debug, -1, 0, 0, 0, 0 }; static struct list domain_list = LIST_INIT(domain_list); static cookie *COOKIE_addCookie(cookie_domain *domain, LPCWSTR name, LPCWSTR data, @@ -529,6 +536,8 @@ BOOL get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD GetSystemTimeAsFileTime(&tm); + EnterCriticalSection(&cookie_cs); + load_persistent_cookie(host, path); LIST_FOR_EACH_ENTRY(domain, &domain_list, cookie_domain, entry) { @@ -577,6 +586,8 @@ BOOL get_cookie(const WCHAR *host, const WCHAR *path, WCHAR *cookie_data, DWORD } } + LeaveCriticalSection(&cookie_cs); + if (!domain_count) { TRACE("no cookies found for %s\n", debugstr_w(host)); SetLastError(ERROR_NO_MORE_ITEMS); @@ -825,6 +836,8 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki } } + EnterCriticalSection(&cookie_cs); + load_persistent_cookie(domain, path); LIST_FOR_EACH(cursor, &domain_list) @@ -843,6 +856,7 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki { heap_free(data); if (value != data) heap_free(value); + LeaveCriticalSection(&cookie_cs); return TRUE; } } @@ -866,11 +880,19 @@ BOOL set_cookie(LPCWSTR domain, LPCWSTR path, LPCWSTR cookie_name, LPCWSTR cooki { heap_free(data); if (value != data) heap_free(value); + LeaveCriticalSection(&cookie_cs); return FALSE; } heap_free(data); if (value != data) heap_free(value); - return !update_persistent || save_persistent_cookie(thisCookieDomain); + + if (!update_persistent || save_persistent_cookie(thisCookieDomain)) + { + LeaveCriticalSection(&cookie_cs); + return TRUE; + } + LeaveCriticalSection(&cookie_cs); + return FALSE; } /*********************************************************************** @@ -1115,3 +1137,8 @@ BOOL WINAPI InternetSetPerSiteCookieDecisionW( LPCWSTR pchHostName, DWORD dwDeci FIXME("(%s, 0x%08x) stub\n", debugstr_w(pchHostName), dwDecision); return FALSE; } + +void free_cookie(void) +{ + DeleteCriticalSection(&cookie_cs); +} diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a6dbaa1..0e83389 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -315,6 +315,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) collect_connections(COLLECT_CLEANUP); NETCON_unload(); free_urlcache(); + free_cookie(); if (g_dwTlsErrIndex != TLS_OUT_OF_INDEXES) { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index a4fcdaa..181ef4c 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -553,6 +553,7 @@ server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL); BOOL init_urlcache(void) DECLSPEC_HIDDEN; void free_urlcache(void) DECLSPEC_HIDDEN; +void free_cookie(void) DECLSPEC_HIDDEN; #define MAX_REPLY_LEN 0x5B4

1 0

Rico Schüller : d3dx9: Fix D3DXMatrixAffineTransformation() and add some tests.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: ec9db0a11f4030358f68e238a99c74314eb9c8d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec9db0a11f4030358f68e238a… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Oct 1 12:40:51 2012 +0200 d3dx9: Fix D3DXMatrixAffineTransformation() and add some tests. --- dlls/d3dx9_36/math.c | 15 +++++++++++---- dlls/d3dx9_36/tests/math.c | 35 +++++++++++++++++++++++++++++------ 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 53dddd4..b43c678 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -81,7 +81,7 @@ FLOAT WINAPI D3DXFresnelTerm(FLOAT costheta, FLOAT refractionindex) { FLOAT a, d, g, result; - TRACE("costheta %f, refractionindex %f)\n", costheta, refractionindex); + TRACE("costheta %f, refractionindex %f\n", costheta, refractionindex); g = sqrtf(refractionindex * refractionindex + costheta * costheta - 1.0f); a = g + costheta; @@ -102,6 +102,13 @@ D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *out, FLOAT scalin D3DXMatrixIdentity(out); + if (rotationcenter) + { + out->u.m[3][0] = -rotationcenter->x; + out->u.m[3][1] = -rotationcenter->y; + out->u.m[3][2] = -rotationcenter->z; + } + if (rotation) { FLOAT temp00, temp01, temp02, temp10, temp11, temp12, temp20, temp21, temp22; @@ -130,9 +137,9 @@ D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation(D3DXMATRIX *out, FLOAT scalin { FLOAT x, y, z; - x = -rotationcenter->x; - y = -rotationcenter->y; - z = -rotationcenter->z; + x = out->u.m[3][0]; + y = out->u.m[3][1]; + z = out->u.m[3][2]; out->u.m[3][0] = x * temp00 + y * temp10 + z * temp20; out->u.m[3][1] = x * temp01 + y * temp11 + z * temp21; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 9043ab3..9a5cbcc 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -275,14 +275,37 @@ static void D3DXMatrixTest(void) U(expectedmat).m[1][0] = 519.760010f; U(expectedmat).m[1][1] = -352.440002f; U(expectedmat).m[1][2] = -277.679993f; U(expectedmat).m[1][3] = 0.0f; U(expectedmat).m[2][0] = 363.119995f; U(expectedmat).m[2][1] = -121.040001f; U(expectedmat).m[2][2] = -117.479996f; U(expectedmat).m[2][3] = 0.0f; U(expectedmat).m[3][0] = -1239.0f; U(expectedmat).m[3][1] = 667.0f; U(expectedmat).m[3][2] = 567.0f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixAffineTransformation(&gotmat,3.56f,&at,&q,&axis); + D3DXMatrixAffineTransformation(&gotmat, 3.56f, &at, &q, &axis); expect_mat(&expectedmat, &gotmat); -/* Test the NULL case */ - U(expectedmat).m[0][0] = -459.239990f; U(expectedmat).m[0][1] = -576.719971f; U(expectedmat).m[0][2] = -263.440002f; U(expectedmat).m[0][3] = 0.0f; - U(expectedmat).m[1][0] = 519.760010f; U(expectedmat).m[1][1] = -352.440002f; U(expectedmat).m[1][2] = -277.679993f; U(expectedmat).m[1][3] = 0.0f; - U(expectedmat).m[2][0] = 363.119995f; U(expectedmat).m[2][1] = -121.040001f; U(expectedmat).m[2][2] = -117.479996f; U(expectedmat).m[2][3] = 0.0f; + + /* Test the NULL case */ + U(expectedmat).m[3][0] = 1.0f; U(expectedmat).m[3][1] = -3.0f; U(expectedmat).m[3][2] = 7.0f; U(expectedmat).m[3][3] = 1.0f; + D3DXMatrixAffineTransformation(&gotmat, 3.56f, NULL, &q, &axis); + expect_mat(&expectedmat, &gotmat); + + U(expectedmat).m[3][0] = -1240.0f; U(expectedmat).m[3][1] = 670.0f; U(expectedmat).m[3][2] = 560.0f; U(expectedmat).m[3][3] = 1.0f; + D3DXMatrixAffineTransformation(&gotmat, 3.56f, &at, &q, NULL); + expect_mat(&expectedmat, &gotmat); + + U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f; + D3DXMatrixAffineTransformation(&gotmat, 3.56f, NULL, &q, NULL); + expect_mat(&expectedmat, &gotmat); + + U(expectedmat).m[0][0] = 3.56f; U(expectedmat).m[0][1] = 0.0f; U(expectedmat).m[0][2] = 0.0f; U(expectedmat).m[0][3] = 0.0f; + U(expectedmat).m[1][0] = 0.0f; U(expectedmat).m[1][1] = 3.56f; U(expectedmat).m[1][2] = 0.0f; U(expectedmat).m[1][3] = 0.0f; + U(expectedmat).m[2][0] = 0.0f; U(expectedmat).m[2][1] = 0.0f; U(expectedmat).m[2][2] = 3.56f; U(expectedmat).m[2][3] = 0.0f; U(expectedmat).m[3][0] = 1.0f; U(expectedmat).m[3][1] = -3.0f; U(expectedmat).m[3][2] = 7.0f; U(expectedmat).m[3][3] = 1.0f; - D3DXMatrixAffineTransformation(&gotmat,3.56f,NULL,&q,&axis); + D3DXMatrixAffineTransformation(&gotmat, 3.56f, NULL, NULL, &axis); + expect_mat(&expectedmat, &gotmat); + + D3DXMatrixAffineTransformation(&gotmat, 3.56f, &at, NULL, &axis); + expect_mat(&expectedmat, &gotmat); + + U(expectedmat).m[3][0] = 0.0f; U(expectedmat).m[3][1] = 0.0f; U(expectedmat).m[3][2] = 0.0f; U(expectedmat).m[3][3] = 1.0f; + D3DXMatrixAffineTransformation(&gotmat, 3.56f, &at, NULL, NULL); + expect_mat(&expectedmat, &gotmat); + + D3DXMatrixAffineTransformation(&gotmat, 3.56f, NULL, NULL, NULL); expect_mat(&expectedmat, &gotmat); /*____________D3DXMatrixfDeterminant_____________*/

1 0

Alexandre Julliard : user32: Default to the dummy surface if the driver doesn't provide something else.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 91b0ee56cf3e6a16fa0cc82df642a77b204ea145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91b0ee56cf3e6a16fa0cc82df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 13:09:27 2012 +0200 user32: Default to the dummy surface if the driver doesn't provide something else. --- dlls/user32/winpos.c | 6 ++++++ dlls/winex11.drv/window.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index fa74567..0593140 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1949,11 +1949,17 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, const RECT *valid_rects ) { WND *win; + HWND parent = GetAncestor( hwnd, GA_PARENT ); BOOL ret; int old_width; RECT visible_rect, old_visible_rect, old_window_rect; struct window_surface *old_surface, *new_surface = NULL; + if (!parent || parent == GetDesktopWindow()) + { + new_surface = &dummy_surface; /* provide a default surface for top-level windows */ + window_surface_add_ref( new_surface ); + } visible_rect = *window_rect; USER_Driver->pWindowPosChanging( hwnd, insert_after, swp_flags, window_rect, client_rect, &visible_rect, &new_surface ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a2103da..dff4384 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2030,9 +2030,14 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag X11DRV_window_to_X_rect( data, visible_rect ); /* create the window surface if necessary */ + if (!data->whole_window) goto done; - if (data->embedded) goto done; if (swp_flags & SWP_HIDEWINDOW) goto done; + + if (*surface) window_surface_release( *surface ); + *surface = NULL; /* indicate that we want to draw directly to the window */ + + if (data->embedded) goto done; if (data->whole_window == root_window) goto done; if (has_gl_drawable( hwnd )) goto done; if (!client_side_graphics && !layered) goto done;

1 0

Alexandre Julliard : user32: Call the SetWindowStyle driver entry point before updating the window position .
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 1d78f43000037a0201242188cf73e19cc1161323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d78f43000037a0201242188c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 13:12:29 2012 +0200 user32: Call the SetWindowStyle driver entry point before updating the window position. --- dlls/user32/win.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 0faf02d..0dbe29e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -763,6 +763,7 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) if (!ok) return 0; + USER_Driver->pSetWindowStyle( hwnd, GWL_STYLE, &style ); if (needs_show) { RECT window_rect, client_rect; @@ -772,7 +773,6 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) &window_rect, &client_rect, NULL ); } - USER_Driver->pSetWindowStyle( hwnd, GWL_STYLE, &style ); return style.styleOld; } @@ -2481,19 +2481,19 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B if (!ok) return 0; - if (needs_show) - { - RECT window_rect, client_rect; - WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); - set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | - SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW, - &window_rect, &client_rect, NULL ); - } if (offset == GWL_STYLE || offset == GWL_EXSTYLE) { style.styleOld = retval; style.styleNew = newval; USER_Driver->pSetWindowStyle( hwnd, offset, &style ); + if (needs_show) + { + RECT window_rect, client_rect; + WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); + set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | + SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW, + &window_rect, &client_rect, NULL ); + } SendMessageW( hwnd, WM_STYLECHANGED, offset, (LPARAM)&style ); }

1 0

Alexandre Julliard : user32: Also call set_window_pos when the WS_EX_LAYERED bit is changed.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 61f9789c3127a2a3ac3bf2d679caac94523bfce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f9789c3127a2a3ac3bf2d67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 13:17:40 2012 +0200 user32: Also call set_window_pos when the WS_EX_LAYERED bit is changed. --- dlls/user32/win.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 0dbe29e..6845369 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2472,9 +2472,10 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B } SERVER_END_REQ; - if (offset == GWL_STYLE && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) + if ((offset == GWL_STYLE && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) || + (offset == GWL_EXSTYLE && ((style.styleOld ^ style.styleNew) & WS_EX_LAYERED))) { - needs_show = !(wndPtr->flags & WIN_HIDDEN) && (style.styleNew & WS_VISIBLE); + needs_show = !(wndPtr->flags & WIN_HIDDEN) && (wndPtr->dwStyle & WS_VISIBLE); invalidate_dce( wndPtr, NULL ); } WIN_ReleasePtr( wndPtr );

1 0

Alexandre Julliard : user32: Invalid DCEs when the window surface changes.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: ddf41276e145896664834828389d1ff6f1567f8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf41276e1458966648348283… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 13:17:53 2012 +0200 user32: Invalid DCEs when the window surface changes. --- dlls/user32/winpos.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 0593140..c866a5d 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2017,9 +2017,13 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, } SERVER_END_REQ; - if (ret && (((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) || - (swp_flags & (SWP_HIDEWINDOW | SWP_SHOWWINDOW | SWP_STATECHANGED | SWP_FRAMECHANGED)))) - invalidate_dce( win, &old_window_rect ); + if (ret) + { + if (old_surface != new_surface || + ((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) || + (swp_flags & (SWP_HIDEWINDOW | SWP_SHOWWINDOW | SWP_STATECHANGED | SWP_FRAMECHANGED))) + invalidate_dce( win, &old_window_rect ); + } WIN_ReleasePtr( win );

1 0

Alexandre Julliard : user32: Add a driver entry point for UpdateLayeredWindow.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 24eee97d21e0e8034dd9b567d8feec131526a220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24eee97d21e0e8034dd9b567d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 27 18:13:01 2012 +0200 user32: Add a driver entry point for UpdateLayeredWindow. --- dlls/user32/driver.c | 16 +++++++++++++ dlls/user32/exticon.c | 1 + dlls/user32/focus.c | 1 + dlls/user32/hook.c | 1 + dlls/user32/user_private.h | 1 + dlls/user32/win.c | 34 +--------------------------- dlls/user32/winproc.c | 1 + dlls/winex11.drv/window.c | 43 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/winex11.drv.spec | 1 + 9 files changed, 67 insertions(+), 32 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 1d3d96a..20837d0 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -22,6 +22,7 @@ #include <stdio.h> #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "wine/debug.h" @@ -122,6 +123,7 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(SetWindowText); GET_USER_FUNC(ShowWindow); GET_USER_FUNC(SysCommand); + GET_USER_FUNC(UpdateLayeredWindow); GET_USER_FUNC(WindowMessage); GET_USER_FUNC(WindowPosChanging); GET_USER_FUNC(WindowPosChanged); @@ -413,6 +415,12 @@ static LRESULT CDECL nulldrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam return -1; } +static BOOL CDECL nulldrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, + const RECT *window_rect ) +{ + return TRUE; +} + static LRESULT CDECL nulldrv_WindowMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { return 0; @@ -489,6 +497,7 @@ static USER_DRIVER null_driver = nulldrv_SetWindowText, nulldrv_ShowWindow, nulldrv_SysCommand, + nulldrv_UpdateLayeredWindow, nulldrv_WindowMessage, nulldrv_WindowPosChanging, nulldrv_WindowPosChanged @@ -757,6 +766,12 @@ static LRESULT CDECL loaderdrv_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lpar return load_driver()->pSysCommand( hwnd, wparam, lparam ); } +static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, + const RECT *window_rect ) +{ + return load_driver()->pUpdateLayeredWindow( hwnd, info, window_rect ); +} + static LRESULT CDECL loaderdrv_WindowMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { return load_driver()->pWindowMessage( hwnd, msg, wparam, lparam ); @@ -837,6 +852,7 @@ static USER_DRIVER lazy_load_driver = loaderdrv_SetWindowText, loaderdrv_ShowWindow, loaderdrv_SysCommand, + loaderdrv_UpdateLayeredWindow, loaderdrv_WindowMessage, loaderdrv_WindowPosChanging, loaderdrv_WindowPosChanged diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index fb9ff03..840483c 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -36,6 +36,7 @@ #define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "winnls.h" #include "user_private.h" diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index 6b5312f..bd2e572 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -27,6 +27,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "win.h" #include "user_private.h" diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 1ba5dda..c9e9e20 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -70,6 +70,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "winerror.h" #include "win.h" diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 505b2bf..6e337ca 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -111,6 +111,7 @@ typedef struct tagUSER_DRIVER { void (CDECL *pSetWindowText)(HWND,LPCWSTR); UINT (CDECL *pShowWindow)(HWND,INT,RECT*,UINT); LRESULT (CDECL *pSysCommand)(HWND,WPARAM,LPARAM); + BOOL (CDECL *pUpdateLayeredWindow)(HWND,const UPDATELAYEREDWINDOWINFO *,const RECT *); LRESULT (CDECL *pWindowMessage)(HWND,UINT,WPARAM,LPARAM); void (CDECL *pWindowPosChanging)(HWND,HWND,UINT,const RECT *,const RECT *,RECT *,struct window_surface**); void (CDECL *pWindowPosChanged)(HWND,HWND,UINT,const RECT *,const RECT *,const RECT *,const RECT *,struct window_surface*); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 6845369..023af02 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3648,7 +3648,6 @@ BOOL WINAPI UpdateLayeredWindowIndirect( HWND hwnd, const UPDATELAYEREDWINDOWINF DWORD flags = SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW; RECT window_rect, client_rect; SIZE offset; - BYTE alpha = 0xff; if (!info || info->cbSize != sizeof(*info) || @@ -3693,39 +3692,10 @@ BOOL WINAPI UpdateLayeredWindowIndirect( HWND hwnd, const UPDATELAYEREDWINDOWINF TRACE( "window %p win %s client %s\n", hwnd, wine_dbgstr_rect(&window_rect), wine_dbgstr_rect(&client_rect) ); - set_window_pos( hwnd, 0, flags, &window_rect, &client_rect, NULL ); - - if (info->hdcSrc) - { - HDC hdc = GetWindowDC( hwnd ); - if (hdc) - { - int x = 0, y = 0; - RECT rect; - - GetWindowRect( hwnd, &rect ); - OffsetRect( &rect, -rect.left, -rect.top); - if (info->pptSrc) - { - x = info->pptSrc->x; - y = info->pptSrc->y; - } + if (!USER_Driver->pUpdateLayeredWindow( hwnd, info, &window_rect )) return FALSE; - if (!info->prcDirty || (info->prcDirty && IntersectRect(&rect, &rect, info->prcDirty))) - { - TRACE( "copying window %p pos %d,%d\n", hwnd, x, y ); - BitBlt( hdc, rect.left, rect.top, rect.right, rect.bottom, - info->hdcSrc, rect.left + x, rect.top + y, SRCCOPY ); - } - ReleaseDC( hwnd, hdc ); - } - } - - if (info->pblend && !(info->dwFlags & ULW_OPAQUE)) alpha = info->pblend->SourceConstantAlpha; - TRACE( "setting window %p alpha %u\n", hwnd, alpha ); - USER_Driver->pSetLayeredWindowAttributes( hwnd, info->crKey, alpha, - info->dwFlags & (LWA_ALPHA | LWA_COLORKEY) ); + set_window_pos( hwnd, 0, flags, &window_rect, &client_rect, NULL ); return TRUE; } diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index de7de6f..33afbdd 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -28,6 +28,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "controls.h" #include "win.h" #include "user_private.h" diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index dff4384..45c3a36 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2324,6 +2324,49 @@ void CDECL X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alph } +/***************************************************************************** + * UpdateLayeredWindow (X11DRV.@) + */ +BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, + const RECT *window_rect ) +{ + BYTE alpha = 0xff; + + if (info->hdcSrc) + { + HDC hdc = GetWindowDC( hwnd ); + + if (hdc) + { + int x = 0, y = 0; + RECT rect; + + GetWindowRect( hwnd, &rect ); + OffsetRect( &rect, -rect.left, -rect.top); + if (info->pptSrc) + { + x = info->pptSrc->x; + y = info->pptSrc->y; + } + + if (!info->prcDirty || (info->prcDirty && IntersectRect(&rect, &rect, info->prcDirty))) + { + TRACE( "copying window %p pos %d,%d\n", hwnd, x, y ); + BitBlt( hdc, rect.left, rect.top, rect.right, rect.bottom, + info->hdcSrc, rect.left + x, rect.top + y, SRCCOPY ); + } + ReleaseDC( hwnd, hdc ); + } + } + + if (info->pblend && !(info->dwFlags & ULW_OPAQUE)) alpha = info->pblend->SourceConstantAlpha; + TRACE( "setting window %p alpha %u\n", hwnd, alpha ); + X11DRV_SetLayeredWindowAttributes( hwnd, info->crKey, alpha, + info->dwFlags & (LWA_ALPHA | LWA_COLORKEY) ); + return TRUE; +} + + /********************************************************************** * X11DRV_WindowMessage (X11DRV.@) */ diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 1e8d4d9..8f68a47 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -51,6 +51,7 @@ @ cdecl SetWindowText(long wstr) X11DRV_SetWindowText @ cdecl ShowWindow(long long ptr long) X11DRV_ShowWindow @ cdecl SysCommand(long long long) X11DRV_SysCommand +@ cdecl UpdateLayeredWindow(long ptr ptr) X11DRV_UpdateLayeredWindow @ cdecl WindowMessage(long long long long) X11DRV_WindowMessage @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) X11DRV_WindowPosChanging @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) X11DRV_WindowPosChanged

1 0

Jacek Caban : vbscript: Added Left() implementation.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 3e45fbcb6b210ebf32118b6bace4baf0dd8b9f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e45fbcb6b210ebf32118b6ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 1 12:59:56 2012 +0200 vbscript: Added Left() implementation. --- dlls/vbscript/global.c | 38 +++++++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 10 ++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 3f88207..98eb047 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -632,10 +632,42 @@ static HRESULT Global_LenB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI return E_NOTIMPL; } -static HRESULT Global_Left(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Left(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, ret, conv_str = NULL; + int len, str_len; + HRESULT hres; + + TRACE("(%s %s)\n", debugstr_variant(args+1), debugstr_variant(args)); + + if(V_VT(args+1) == VT_BSTR) { + str = V_BSTR(args+1); + }else { + hres = to_string(args+1, &conv_str); + if(FAILED(hres)) + return hres; + str = conv_str; + } + + hres = to_int(args, &len); + if(FAILED(hres)) + return hres; + + if(len < 0) { + FIXME("len = %d\n", len); + return E_FAIL; + } + + str_len = SysStringLen(str); + if(len > str_len) + len = str_len; + + ret = SysAllocStringLen(str, len); + SysFreeString(conv_str); + if(!ret) + return E_OUTOFMEMORY; + + return return_bstr(res, ret); } static HRESULT Global_LeftB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 9e39a0f..c6f8536 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -205,6 +205,16 @@ TestStrReverse "", "" TestStrReverse 123, "321" if isEnglishLang then TestStrReverse true, "eurT" +Sub TestLeft(str, len, ex) + Call ok(Left(str, len) = ex, "Left(" & str & ", " & len & ") = " & Left(str, len)) +End Sub + +TestLeft "test", 2, "te" +TestLeft "test", 5, "test" +TestLeft "test", 0, "" +TestLeft 123, 2, "12" +if isEnglishLang then TestLeft true, 2, "Tr" + Sub TestRound(val, exval, vt) Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val)))

1 0

Jacek Caban : vbscript: Added Right() implementation.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 50985fa2d3f0f59e9f55eac4d2f722dfb6444efd URL: http://source.winehq.org/git/wine.git/?a=commit;h=50985fa2d3f0f59e9f55eac4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 1 13:00:09 2012 +0200 vbscript: Added Right() implementation. --- dlls/vbscript/global.c | 38 +++++++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 10 ++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 98eb047..fa600ee 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -676,10 +676,42 @@ static HRESULT Global_LeftB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR return E_NOTIMPL; } -static HRESULT Global_Right(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Right(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, ret, conv_str = NULL; + int len, str_len; + HRESULT hres; + + TRACE("(%s %s)\n", debugstr_variant(args+1), debugstr_variant(args)); + + if(V_VT(args+1) == VT_BSTR) { + str = V_BSTR(args+1); + }else { + hres = to_string(args+1, &conv_str); + if(FAILED(hres)) + return hres; + str = conv_str; + } + + hres = to_int(args, &len); + if(FAILED(hres)) + return hres; + + if(len < 0) { + FIXME("len = %d\n", len); + return E_FAIL; + } + + str_len = SysStringLen(str); + if(len > str_len) + len = str_len; + + ret = SysAllocStringLen(str+str_len-len, len); + SysFreeString(conv_str); + if(!ret) + return E_OUTOFMEMORY; + + return return_bstr(res, ret); } static HRESULT Global_RightB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index c6f8536..06122ef 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -215,6 +215,16 @@ TestLeft "test", 0, "" TestLeft 123, 2, "12" if isEnglishLang then TestLeft true, 2, "Tr" +Sub TestRight(str, len, ex) + Call ok(Right(str, len) = ex, "Right(" & str & ", " & len & ") = " & Right(str, len)) +End Sub + +TestRight "test", 2, "st" +TestRight "test", 5, "test" +TestRight "test", 0, "" +TestRight 123, 2, "23" +if isEnglishLang then TestRight true, 2, "ue" + Sub TestRound(val, exval, vt) Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val)))

1 0