April 2016 - Wine-Commits - list.winehq.org

Alexander Lakhin : user32: Send WM_CTLCOLOR* message only for visible buttons.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: bc3f40e21a4beaaabd2d865838bef99a3d12f908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc3f40e21a4beaaabd2d86583… Author: Alexander Lakhin <exclusion(a)gmail.com> Date: Tue Apr 19 22:15:24 2016 +0200 user32: Send WM_CTLCOLOR* message only for visible buttons. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 53 ++++++++++++++++++++++++++----------------------- dlls/user32/tests/msg.c | 4 ++-- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index efd74f9..13fc746 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -385,31 +385,34 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, case WM_SETTEXT: { /* Clear an old text here as Windows does */ - HDC hdc = GetDC(hWnd); - HBRUSH hbrush; - RECT client, rc; - HWND parent = GetParent(hWnd); - UINT message = (btn_type == BS_PUSHBUTTON || - btn_type == BS_DEFPUSHBUTTON || - btn_type == BS_USERBUTTON || - btn_type == BS_OWNERDRAW) ? - WM_CTLCOLORBTN : WM_CTLCOLORSTATIC; - - if (!parent) parent = hWnd; - hbrush = (HBRUSH)SendMessageW(parent, message, - (WPARAM)hdc, (LPARAM)hWnd); - if (!hbrush) /* did the app forget to call DefWindowProc ? */ - hbrush = (HBRUSH)DefWindowProcW(parent, message, - (WPARAM)hdc, (LPARAM)hWnd); - - GetClientRect(hWnd, &client); - rc = client; - BUTTON_CalcLabelRect(hWnd, hdc, &rc); - /* Clip by client rect bounds */ - if (rc.right > client.right) rc.right = client.right; - if (rc.bottom > client.bottom) rc.bottom = client.bottom; - FillRect(hdc, &rc, hbrush); - ReleaseDC(hWnd, hdc); + if (IsWindowVisible(hWnd)) + { + HDC hdc = GetDC(hWnd); + HBRUSH hbrush; + RECT client, rc; + HWND parent = GetParent(hWnd); + UINT message = (btn_type == BS_PUSHBUTTON || + btn_type == BS_DEFPUSHBUTTON || + btn_type == BS_USERBUTTON || + btn_type == BS_OWNERDRAW) ? + WM_CTLCOLORBTN : WM_CTLCOLORSTATIC; + + if (!parent) parent = hWnd; + hbrush = (HBRUSH)SendMessageW(parent, message, + (WPARAM)hdc, (LPARAM)hWnd); + if (!hbrush) /* did the app forget to call DefWindowProc ? */ + hbrush = (HBRUSH)DefWindowProcW(parent, message, + (WPARAM)hdc, (LPARAM)hWnd); + + GetClientRect(hWnd, &client); + rc = client; + BUTTON_CalcLabelRect(hWnd, hdc, &rc); + /* Clip by client rect bounds */ + if (rc.right > client.right) rc.right = client.right; + if (rc.bottom > client.bottom) rc.bottom = client.bottom; + FillRect(hdc, &rc, hbrush); + ReleaseDC(hWnd, hdc); + } if (unicode) DefWindowProcW( hWnd, WM_SETTEXT, wParam, lParam ); else DefWindowProcA( hWnd, WM_SETTEXT, wParam, lParam ); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 046cfae..8ab6e15 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5938,7 +5938,7 @@ static void test_button_messages(void) SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Text 2"); sprintf(desc, "button[%i]: WM_SETTEXT on an invisible button", i); - ok_sequence(WmSetTextInvisibleSeq, desc, TRUE); + ok_sequence(WmSetTextInvisibleSeq, desc, FALSE); ShowWindow(hwnd, SW_SHOW); ShowWindow(parent, SW_HIDE); @@ -5947,7 +5947,7 @@ static void test_button_messages(void) SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Text 3"); sprintf(desc, "button[%i]: WM_SETTEXT on an invisible button", i); - ok_sequence(WmSetTextInvisibleSeq, desc, TRUE); + ok_sequence(WmSetTextInvisibleSeq, desc, FALSE); ShowWindow(parent, SW_SHOW); flush_events();

1 0

Hans Leidekker : jsproxy/tests: Add tests.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 1f144fae1ab9f35ceca6607e744ecc64e4c86767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f144fae1ab9f35ceca6607e7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 20 10:14:50 2016 +0200 jsproxy/tests: Add tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/jsproxy/tests/Makefile.in | 5 ++ dlls/jsproxy/tests/jsproxy.c | 155 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 162 insertions(+) diff --git a/configure b/configure index ffb1825..dcec63c 100755 --- a/configure +++ b/configure @@ -17749,6 +17749,7 @@ wine_fn_config_dll joy.cpl enable_joy_cpl clean wine_fn_config_dll jscript enable_jscript clean wine_fn_config_test dlls/jscript/tests jscript_test wine_fn_config_dll jsproxy enable_jsproxy implib +wine_fn_config_test dlls/jsproxy/tests jsproxy_test wine_fn_config_dll kernel32 enable_kernel32 clean,implib wine_fn_config_test dlls/kernel32/tests kernel32_test wine_fn_config_dll kernelbase enable_kernelbase diff --git a/configure.ac b/configure.ac index 201bc77..b0d94ce 100644 --- a/configure.ac +++ b/configure.ac @@ -2997,6 +2997,7 @@ WINE_CONFIG_DLL(joy.cpl,,[clean]) WINE_CONFIG_DLL(jscript,,[clean]) WINE_CONFIG_TEST(dlls/jscript/tests) WINE_CONFIG_DLL(jsproxy,,[implib]) +WINE_CONFIG_TEST(dlls/jsproxy/tests) WINE_CONFIG_DLL(kernel32,,[clean,implib]) WINE_CONFIG_TEST(dlls/kernel32/tests) WINE_CONFIG_DLL(kernelbase) diff --git a/dlls/jsproxy/tests/Makefile.in b/dlls/jsproxy/tests/Makefile.in new file mode 100644 index 0000000..3569476 --- /dev/null +++ b/dlls/jsproxy/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = jsproxy.dll +IMPORTS = jsproxy + +C_SRCS = \ + jsproxy.c diff --git a/dlls/jsproxy/tests/jsproxy.c b/dlls/jsproxy/tests/jsproxy.c new file mode 100644 index 0000000..d23867b --- /dev/null +++ b/dlls/jsproxy/tests/jsproxy.c @@ -0,0 +1,155 @@ +/* + * Copyright 2016 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdlib.h> +#include <windef.h> +#include <winbase.h> +#include <wininet.h> + +#include "wine/test.h" + +static BOOL (WINAPI *pInternetInitializeAutoProxyDll) + (DWORD, LPSTR, LPSTR, AutoProxyHelperFunctions *, AUTO_PROXY_SCRIPT_BUFFER *); +static BOOL (WINAPI *pInternetDeInitializeAutoProxyDll)(LPSTR, DWORD); +static BOOL (WINAPI *pInternetGetProxyInfo)(LPCSTR, DWORD, LPSTR, DWORD, LPSTR *, LPDWORD); + +static void test_InternetInitializeAutoProxyDll(void) +{ + const char url[] = "http://localhost"; + char script[] = "function FindProxyForURL(url, host) {return \"DIRECT\";}\0test"; + char script2[] = "function FindProxyForURL(url, host) {return \"PROXY 10.0.0.1:8080\";}\0test"; + char *proxy, host[] = "localhost"; + AUTO_PROXY_SCRIPT_BUFFER buf; + DWORD err, len; + BOOL ret; + + buf.dwStructSize = sizeof(buf); + buf.lpszScriptBuffer = script; + buf.dwScriptBufferSize = 0; + SetLastError( 0xdeadbeef ); + ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); + err = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + + buf.dwScriptBufferSize = strlen(script) + 1; + ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); + ok( ret, "got %u\n", GetLastError() ); + + ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len ); + ok( ret, "got %u\n", GetLastError() ); + ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy ); + GlobalFree( proxy ); + + buf.dwScriptBufferSize = strlen(script2) + 1; + buf.lpszScriptBuffer = script2; + ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); + ok( ret, "got %u\n", GetLastError() ); + + ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len ); + ok( ret, "got %u\n", GetLastError() ); + ok( !strcmp( proxy, "PROXY 10.0.0.1:8080" ), "got \"%s\"\n", proxy ); + GlobalFree( proxy ); + + buf.dwScriptBufferSize = strlen(script2) + 2; + ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); + ok( ret, "got %u\n", GetLastError() ); + + ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len ); + ok( ret, "got %u\n", GetLastError() ); + ok( !strcmp( proxy, "PROXY 10.0.0.1:8080" ), "got \"%s\"\n", proxy ); + GlobalFree( proxy ); + + ret = pInternetDeInitializeAutoProxyDll( NULL, 0 ); + ok( ret, "got %u\n", GetLastError() ); +} + +static void test_InternetGetProxyInfo(void) +{ + const char url[] = "http://localhost"; + char script[] = "function FindProxyForURL(url, host) { return \"DIRECT\"; }"; + char *proxy, host[] = "localhost"; + AUTO_PROXY_SCRIPT_BUFFER buf; + DWORD len, err; + BOOL ret; + + SetLastError( 0xdeadbeef ); + ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len ); + err = GetLastError(); + ok( !ret, "unexpected succes\n" ); + ok( err == ERROR_CAN_NOT_COMPLETE, "got %u\n", err ); + + buf.dwStructSize = sizeof(buf); + buf.lpszScriptBuffer = script; + buf.dwScriptBufferSize = strlen(script) + 1; + ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); + ok( ret, "got %u\n", GetLastError() ); + + len = 0; + proxy = NULL; + ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len ); + ok( ret, "got %u\n", GetLastError() ); + ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy ); + ok( len == strlen("DIRECT") + 1, "got %u\n", len ); + GlobalFree( proxy ); + + len = 0; + proxy = NULL; + ret = pInternetGetProxyInfo( url, strlen(url) + 1, host, strlen(host), &proxy, &len ); + ok( ret, "got %u\n", GetLastError() ); + ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy ); + ok( len == strlen("DIRECT") + 1, "got %u\n", len ); + GlobalFree( proxy ); + + len = 0; + proxy = NULL; + ret = pInternetGetProxyInfo( url, strlen(url) - 1, host, strlen(host), &proxy, &len ); + ok( ret, "got %u\n", GetLastError() ); + ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy ); + ok( len == strlen("DIRECT") + 1, "got %u\n", len ); + GlobalFree( proxy ); + + len = 0; + proxy = NULL; + ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host) + 1, &proxy, &len ); + ok( ret, "got %u\n", GetLastError() ); + ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy ); + ok( len == strlen("DIRECT") + 1, "got %u\n", len ); + GlobalFree( proxy ); + + ret = pInternetDeInitializeAutoProxyDll( NULL, 0 ); + ok( ret, "got %u\n", GetLastError() ); +} + +START_TEST(jsproxy) +{ + HMODULE module = LoadLibraryA( "jsproxy.dll" ); + pInternetInitializeAutoProxyDll = (void *)GetProcAddress( module, "InternetInitializeAutoProxyDll" ); + pInternetDeInitializeAutoProxyDll = (void *)GetProcAddress( module, "InternetDeInitializeAutoProxyDll" ); + pInternetGetProxyInfo = (void *)GetProcAddress( module, "InternetGetProxyInfo" ); + + if (!pInternetInitializeAutoProxyDll) + { + win_skip( "InternetInitializeAutoProxyDll not available\n" ); + return; + } + + test_InternetInitializeAutoProxyDll(); + test_InternetGetProxyInfo(); +}

1 0

Hans Leidekker : jsproxy: Validate parameters in InternetInitializeAutoProxyDll and InternetGetProxyInfo.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: ea8b261abe79d5a80f2be79a304995f3cc840c95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea8b261abe79d5a80f2be79a3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 20 10:14:49 2016 +0200 jsproxy: Validate parameters in InternetInitializeAutoProxyDll and InternetGetProxyInfo. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/main.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index d5c3e72..11a671a 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -188,8 +188,20 @@ BOOL WINAPI JSPROXY_InternetInitializeAutoProxyDll( DWORD version, LPSTR tmpfile if (buffer && buffer->dwStructSize == sizeof(*buffer) && buffer->lpszScriptBuffer) { + DWORD i, len = 0; + for (i = 0; i < buffer->dwScriptBufferSize; i++) + { + if (!buffer->lpszScriptBuffer[i]) break; + len++; + } + if (len == buffer->dwScriptBufferSize) + { + SetLastError( ERROR_INVALID_PARAMETER ); + LeaveCriticalSection( &cs_jsproxy ); + return FALSE; + } heap_free( global_script->text ); - if( (global_script->text = strdupAW( buffer->lpszScriptBuffer, buffer->dwScriptBufferSize ))) ret = TRUE; + if ((global_script->text = strdupAW( buffer->lpszScriptBuffer, len ))) ret = TRUE; } else { @@ -627,7 +639,16 @@ BOOL WINAPI InternetGetProxyInfo( LPCSTR url, DWORD len_url, LPCSTR hostname, DW EnterCriticalSection( &cs_jsproxy ); - if (!global_script->text) goto done; + if (!global_script->text) + { + SetLastError( ERROR_CAN_NOT_COMPLETE ); + goto done; + } + if (hostname && len_hostname < strlen( hostname )) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + goto done; + } if (!(urlW = strdupAW( url, -1 ))) goto done; if (hostname && !(hostnameW = strdupAW( hostname, -1 ))) goto done;

1 0

Dmitry Timoshkov : user32: Change value of WM_MDICALCCHILDSCROLL to 0x003f.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 00b68720bf32748422e6ccab8629acf04aec9d5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b68720bf32748422e6ccab8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 20 15:35:08 2016 +0200 user32: Change value of WM_MDICALCCHILDSCROLL to 0x003f. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/mdi.c | 2 +- dlls/user32/tests/win.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 3366185..665610d 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -103,7 +103,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mdi); #define MDI_MAXTITLELENGTH 0xa1 -#define WM_MDICALCCHILDSCROLL 0x10ac /* this is exactly what Windows uses */ +#define WM_MDICALCCHILDSCROLL 0x003f /* this is exactly what Windows uses */ /* "More Windows..." definitions */ #define MDI_MOREWINDOWSLIMIT 9 /* after this number of windows, a "More Windows..." diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 673b9b5..c931d02 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2194,11 +2194,9 @@ static void test_mdi(void) gotit = TRUE; } else -todo_wine ok(msg.hwnd != mdi_client, "message %04x should not be posted to mdiclient\n", msg.message); DispatchMessageA(&msg); } -todo_wine ok(gotit, "message 0x003f should appear after SetWindowPos\n"); si.cbSize = sizeof(si);

1 0

Sebastian Lackner : user32/tests: Add tests for button WM_CTLCOLOR* messages.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 2c180741e154a73a502c3aff1a15f9e990c2aac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c180741e154a73a502c3aff1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 19 22:15:05 2016 +0200 user32/tests: Add tests for button WM_CTLCOLOR* messages. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 87 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 76 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b2630ce..046cfae 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5540,6 +5540,35 @@ static const struct message WmSetFontStaticSeq[] = { WM_CTLCOLORSTATIC, sent|defwinproc }, { 0 } }; +static const struct message WmSetTextButtonSeq[] = +{ + { WM_SETTEXT, sent }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_CTLCOLORBTN, sent|parent }, + { WM_COMMAND, sent|parent|optional }, + { WM_DRAWITEM, sent|parent|optional }, + { 0 } +}; +static const struct message WmSetTextStaticSeq[] = +{ + { WM_SETTEXT, sent }, + { WM_CTLCOLORSTATIC, sent|parent }, + { WM_CTLCOLORSTATIC, sent|parent }, + { 0 } +}; +static const struct message WmSetTextGroupSeq[] = +{ + { WM_SETTEXT, sent }, + { WM_CTLCOLORSTATIC, sent|parent }, + { WM_CTLCOLORSTATIC, sent|parent|optional }, /* FIXME: Missing in Wine */ + { WM_CTLCOLORSTATIC, sent|parent|optional }, /* FIXME: Missing in Wine */ + { 0 } +}; +static const struct message WmSetTextInvisibleSeq[] = +{ + { WM_SETTEXT, sent }, + { 0 } +}; static const struct message WmSetStyleButtonSeq[] = { { BM_SETSTYLE, sent }, @@ -5709,51 +5738,63 @@ static void test_button_messages(void) const struct message *lbuttondown; const struct message *lbuttonup; const struct message *setfont; + const struct message *settext; } button[] = { { BS_PUSHBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleButtonSeq, WmSetStateButtonSeq, WmSetStateButtonSeq, WmSetCheckIgnoredSeq, - WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq, + WmSetTextButtonSeq }, { BS_DEFPUSHBUTTON, DLGC_BUTTON | DLGC_DEFPUSHBUTTON, WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleButtonSeq, WmSetStateButtonSeq, WmSetStateButtonSeq, WmSetCheckIgnoredSeq, - WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq, + WmSetTextButtonSeq }, { BS_CHECKBOX, DLGC_BUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_AUTOCHECKBOX, DLGC_BUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - WmLButtonDownStaticSeq, WmLButtonUpAutoSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpAutoSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_RADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_3STATE, DLGC_BUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_AUTO3STATE, DLGC_BUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - WmLButtonDownStaticSeq, WmLButtonUpAutoSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpAutoSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_GROUPBOX, DLGC_STATIC, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckIgnoredSeq, - WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq }, + WmLButtonDownStaticSeq, WmLButtonUpStaticSeq, WmSetFontStaticSeq, + WmSetTextGroupSeq }, { BS_USERBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, WmSetFocusButtonSeq, WmKillFocusButtonSeq, WmSetStyleUserSeq, WmSetStateUserSeq, WmClearStateButtonSeq, WmSetCheckIgnoredSeq, - WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq, + WmSetTextButtonSeq }, { BS_AUTORADIOBUTTON, DLGC_BUTTON | DLGC_RADIOBUTTON, WmSetFocusStaticSeq, WmKillFocusStaticSeq, WmSetStyleStaticSeq, WmSetStateStaticSeq, WmSetStateStaticSeq, WmSetCheckStaticSeq, - NULL /* avoid infinite loop */, WmLButtonUpBrokenSeq, WmSetFontStaticSeq }, + NULL /* avoid infinite loop */, WmLButtonUpBrokenSeq, WmSetFontStaticSeq, + WmSetTextStaticSeq }, { BS_OWNERDRAW, DLGC_BUTTON, WmSetFocusOwnerdrawSeq, WmKillFocusOwnerdrawSeq, WmSetStyleOwnerdrawSeq, WmSetStateOwnerdrawSeq, WmClearStateOwnerdrawSeq, WmSetCheckIgnoredSeq, - WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq }, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq, + WmSetTextButtonSeq }, }; unsigned int i; HWND hwnd, parent; @@ -5887,6 +5928,30 @@ static void test_button_messages(void) while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); ok_sequence(button[i].setcheck, "BM_SETCHECK on a button", FALSE); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Text 1"); + sprintf(desc, "button[%i]: WM_SETTEXT on a visible button", i); + ok_sequence(button[i].settext, desc, FALSE); + + ShowWindow(hwnd, SW_HIDE); + flush_events(); + flush_sequence(); + + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Text 2"); + sprintf(desc, "button[%i]: WM_SETTEXT on an invisible button", i); + ok_sequence(WmSetTextInvisibleSeq, desc, TRUE); + + ShowWindow(hwnd, SW_SHOW); + ShowWindow(parent, SW_HIDE); + flush_events(); + flush_sequence(); + + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"Text 3"); + sprintf(desc, "button[%i]: WM_SETTEXT on an invisible button", i); + ok_sequence(WmSetTextInvisibleSeq, desc, TRUE); + + ShowWindow(parent, SW_SHOW); + flush_events(); + state = SendMessageA(hwnd, BM_GETCHECK, 0, 0); if (button[i].style == BS_PUSHBUTTON || button[i].style == BS_DEFPUSHBUTTON ||

1 0

Sebastian Lackner : taskschd/tests: Fix a use-after-free in scheduler tests.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 9b09472d4f8a5fbd9e9201ee351eeeb005d37547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b09472d4f8a5fbd9e9201ee3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 19 23:33:45 2016 +0200 taskschd/tests: Fix a use-after-free in scheduler tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/tests/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 60a6c94..94d9b29 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -947,12 +947,12 @@ todo_wine ok(hr == S_OK, "get_Name error %#x\n", hr); hr = IIDFromString(bstr, &iid); ok(hr == S_OK, "IIDFromString error %#x\n", hr); - SysFreeString(bstr); IRegisteredTask_Release(task1); hr = ITaskFolder_DeleteTask(root, bstr, 0); ok(hr == S_OK, "DeleteTask error %#x\n", hr); + SysFreeString(bstr); hr = ITaskFolder_RegisterTask(folder, NULL, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr);

1 0

Henri Verbeet : winex11: Only warn when an RandR output has no modes.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 8a348a4b99515ed9095c49df513ed5a2fa77d4c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a348a4b99515ed9095c49df5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 18:34:08 2016 +0200 winex11: Only warn when an RandR output has no modes. This can legitimately happen when the output is disconnected. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 58e66d6..2fee851 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -431,7 +431,7 @@ static int xrandr12_init_modes(void) if (!output_info->nmode) { - ERR("Output has no modes.\n"); + WARN("Output has no modes.\n"); goto done; }

1 0

Nikolay Sivov : dwrite/tests: Added GetFontSignature() test.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: e48879b13f8f6588c4b880f3b6acac221f7c0667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48879b13f8f6588c4b880f3b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 10:50:57 2016 +0300 dwrite/tests: Added GetFontSignature() test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3c1f332..e8ceca2 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -43,8 +43,10 @@ #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) +#define GET_BE_DWORD(x) (x) #else #define GET_BE_WORD(x) RtlUshortByteSwap(x) +#define GET_BE_DWORD(x) RtlUlongByteSwap(x) #endif #define EXPECT_HR(hr,hr_exp) \ @@ -5840,6 +5842,127 @@ if (hr == S_OK) DELETE_FONTFILE(path); } +static void get_expected_fontsig(IDWriteFont *font, FONTSIGNATURE *fontsig) +{ + void *os2_context; + IDWriteFontFace *fontface; + const TT_OS2_V2 *tt_os2; + UINT32 size; + BOOL exists; + HRESULT hr; + + memset(fontsig, 0, sizeof(*fontsig)); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void**)&tt_os2, &size, &os2_context, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if (tt_os2) { + fontsig->fsUsb[0] = GET_BE_DWORD(tt_os2->ulUnicodeRange1); + fontsig->fsUsb[1] = GET_BE_DWORD(tt_os2->ulUnicodeRange2); + fontsig->fsUsb[2] = GET_BE_DWORD(tt_os2->ulUnicodeRange3); + fontsig->fsUsb[3] = GET_BE_DWORD(tt_os2->ulUnicodeRange4); + + fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); + fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); + + IDWriteFontFace_ReleaseFontTable(fontface, os2_context); + } + + IDWriteFontFace_Release(fontface); +} + +static void test_GetFontSignature(void) +{ + IDWriteFontCollection *syscollection; + IDWriteGdiInterop1 *interop1; + IDWriteGdiInterop *interop; + IDWriteFactory *factory; + FONTSIGNATURE fontsig; + UINT count, i; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteGdiInterop_QueryInterface(interop, &IID_IDWriteGdiInterop1, (void**)&interop1); + IDWriteGdiInterop_Release(interop); + if (FAILED(hr)) { + win_skip("GetFontSignature() is not supported.\n"); + IDWriteGdiInterop_Release(interop); + IDWriteFactory_Release(factory); + return; + }; + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteGdiInterop1_GetFontSignature(interop1, NULL, &fontsig); +todo_wine + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_GetSystemFontCollection(factory, &syscollection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + count = IDWriteFontCollection_GetFontFamilyCount(syscollection); + + for (i = 0; i < count; i++) { + FONTSIGNATURE expected_signature; + IDWriteLocalizedStrings *names; + IDWriteFontFace *fontface; + IDWriteFontFamily *family; + IDWriteFont *font; + WCHAR nameW[256]; + + hr = IDWriteFontCollection_GetFontFamily(syscollection, i, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STRETCH_NORMAL, + DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "got 0x%08x\n", hr); + + get_enus_string(names, nameW, sizeof(nameW)/sizeof(nameW[0])); + + IDWriteLocalizedStrings_Release(names); + + hr = IDWriteGdiInterop1_GetFontSignature(interop1, font, &fontsig); + todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (hr == S_OK) { + get_expected_fontsig(font, &expected_signature); + + ok(fontsig.fsUsb[0] == expected_signature.fsUsb[0], "%s: fsUsb[0] %#x, expected %#x\n", wine_dbgstr_w(nameW), + fontsig.fsUsb[0], expected_signature.fsUsb[0]); + ok(fontsig.fsUsb[1] == expected_signature.fsUsb[1], "%s: fsUsb[1] %#x, expected %#x\n", wine_dbgstr_w(nameW), + fontsig.fsUsb[1], expected_signature.fsUsb[1]); + ok(fontsig.fsUsb[2] == expected_signature.fsUsb[2], "%s: fsUsb[2] %#x, expected %#x\n", wine_dbgstr_w(nameW), + fontsig.fsUsb[2], expected_signature.fsUsb[2]); + ok(fontsig.fsUsb[3] == expected_signature.fsUsb[3], "%s: fsUsb[3] %#x, expected %#x\n", wine_dbgstr_w(nameW), + fontsig.fsUsb[3], expected_signature.fsUsb[3]); + + ok(fontsig.fsCsb[0] == expected_signature.fsCsb[0], "%s: fsCsb[0] %#x, expected %#x\n", wine_dbgstr_w(nameW), + fontsig.fsCsb[0], expected_signature.fsCsb[0]); + ok(fontsig.fsCsb[1] == expected_signature.fsCsb[1], "%s: fsCsb[1] %#x, expected %#x\n", wine_dbgstr_w(nameW), + fontsig.fsCsb[1], expected_signature.fsCsb[1]); +} + IDWriteFont_Release(font); + IDWriteFontFace_Release(fontface); + IDWriteFontFamily_Release(family); + } + + IDWriteGdiInterop1_Release(interop1); + IDWriteFontCollection_Release(syscollection); + IDWriteFactory_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -5895,6 +6018,7 @@ START_TEST(font) test_TranslateColorGlyphRun(); test_HasCharacter(); test_CreateFontFaceReference(); + test_GetFontSignature(); IDWriteFactory_Release(factory); }

1 0

Michael Stefaniuc : oleaut32: Use wine_dbgstr_rect() to trace a RECT.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 21db79044e866f2ef9bac7511e1e5087921267cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=21db79044e866f2ef9bac7511… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 20 10:35:14 2016 +0200 oleaut32: Use wine_dbgstr_rect() to trace a RECT. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepicture.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index b67563d..96c109a 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -636,8 +636,7 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, TRACE("(%p)->(%p, (%d,%d), (%d,%d) <- (%d,%d), (%d,%d), %p)\n", This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, prcWBounds); if(prcWBounds) - TRACE("prcWBounds (%d,%d) - (%d,%d)\n", prcWBounds->left, prcWBounds->top, - prcWBounds->right, prcWBounds->bottom); + TRACE("prcWBounds %s\n", wine_dbgstr_rect(prcWBounds)); if(cx == 0 || cy == 0 || cxSrc == 0 || cySrc == 0){ return CTL_E_INVALIDPROPERTYVALUE;

1 0

Francois Gouget : msvcp120/tests: CreateSymbolicLinkA() may be missing so dynamically load it.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 556f384ad95efdb8641a0c47e78c99261c5ab7cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=556f384ad95efdb8641a0c47e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 20 10:33:45 2016 +0200 msvcp120/tests: CreateSymbolicLinkA() may be missing so dynamically load it. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 86162bc..7c94906 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -276,12 +276,14 @@ static _Pad* (__thiscall *p__Pad_op_assign)(_Pad*, const _Pad*); static void (__thiscall *p__Pad__Launch)(_Pad*, _Thrd_t*); static void (__thiscall *p__Pad__Release)(_Pad*); +static BOOLEAN (WINAPI *pCreateSymbolicLinkA)(LPCSTR,LPCSTR,DWORD); + static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static BOOL init(void) { - HANDLE msvcr; + HANDLE hdll; msvcp = LoadLibraryA("msvcp120.dll"); if(!msvcp) @@ -512,10 +514,13 @@ static BOOL init(void) SET(p__Cnd_signal, "_Cnd_signal"); - msvcr = GetModuleHandleA("msvcr120.dll"); - p_setlocale = (void*)GetProcAddress(msvcr, "setlocale"); - p__setmbcp = (void*)GetProcAddress(msvcr, "_setmbcp"); - p_isleadbyte = (void*)GetProcAddress(msvcr, "isleadbyte"); + hdll = GetModuleHandleA("msvcr120.dll"); + p_setlocale = (void*)GetProcAddress(hdll, "setlocale"); + p__setmbcp = (void*)GetProcAddress(hdll, "_setmbcp"); + p_isleadbyte = (void*)GetProcAddress(hdll, "isleadbyte"); + + hdll = GetModuleHandleA("kernel32.dll"); + pCreateSymbolicLinkA = (void*)GetProcAddress(hdll, "CreateSymbolicLinkA"); init_thiscall_thunk(); return TRUE; @@ -1277,13 +1282,13 @@ static void test_tr2_sys__Stat(void) ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); ok(CloseHandle(file), "CloseHandle\n"); SetLastError(0xdeadbeef); - ret = CreateSymbolicLinkA("tr2_test_dir/f1_link", "tr2_test_dir/f1", 0); - if(!ret && (GetLastError()==ERROR_PRIVILEGE_NOT_HELD||GetLastError()==ERROR_INVALID_FUNCTION)) { + ret = pCreateSymbolicLinkA ? pCreateSymbolicLinkA("tr2_test_dir/f1_link", "tr2_test_dir/f1", 0) : FALSE; + if(!ret && (!pCreateSymbolicLinkA || GetLastError()==ERROR_PRIVILEGE_NOT_HELD||GetLastError()==ERROR_INVALID_FUNCTION)) { tests[5].ret = tests[6].ret = file_not_found; win_skip("Privilege not held or symbolic link not supported, skipping symbolic link tests.\n"); }else { ok(ret, "CreateSymbolicLinkA failed\n"); - ok(CreateSymbolicLinkA("tr2_test_dir/dir_link", "tr2_test_dir", 1), "CreateSymbolicLinkA failed\n"); + ok(pCreateSymbolicLinkA("tr2_test_dir/dir_link", "tr2_test_dir", 1), "CreateSymbolicLinkA failed\n"); } file = CreateNamedPipeA("\\\\.\\PiPe\\tests_pipe.c",

1 0