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

Hans Leidekker : jsproxy: Don' t use the length parameters in InternetGetProxyInfo.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 6ea6b37096f06112d235269fd88d5d0772d6d1fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea6b37096f06112d235269fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 20 10:14:48 2016 +0200 jsproxy: Don't use the length parameters in InternetGetProxyInfo. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index e277a0b..d5c3e72 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -97,7 +97,7 @@ static inline BOOL heap_free( LPVOID mem ) return HeapFree( GetProcessHeap(), 0, mem ); } -static inline WCHAR *strdupAW( const char *src, DWORD len ) +static inline WCHAR *strdupAW( const char *src, int len ) { WCHAR *dst = NULL; if (src) @@ -628,8 +628,8 @@ BOOL WINAPI InternetGetProxyInfo( LPCSTR url, DWORD len_url, LPCSTR hostname, DW EnterCriticalSection( &cs_jsproxy ); if (!global_script->text) goto done; - if (!(urlW = strdupAW( url, len_url ))) goto done; - if (hostname && !(hostnameW = strdupAW( hostname, len_hostname ))) goto done; + if (!(urlW = strdupAW( url, -1 ))) goto done; + if (hostname && !(hostnameW = strdupAW( hostname, -1 ))) goto done; TRACE( "%s\n", debugstr_w(global_script->text) ); ret = run_script( global_script->text, urlW, hostnameW, proxy, len_proxy );

1 0

Hans Leidekker : jsproxy: Validate parameters in InternetInitializeAutoProxyDll and InternetGetProxyInfo.
by Alexandre Julliard 20 Apr '16

20 Apr '16

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

Hans Leidekker : jsproxy/tests: Add tests.
by Alexandre Julliard 20 Apr '16

20 Apr '16

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

Dmitry Timoshkov : user32: Change value of WM_MDICALCCHILDSCROLL to 0x003f.
by Alexandre Julliard 20 Apr '16

20 Apr '16

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

Henri Verbeet : winex11: Only warn when an RandR output has no modes.
by Alexandre Julliard 20 Apr '16

20 Apr '16

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

Stefan Dösinger : wined3d: Use wined3d_texture_prepare_location() in wined3d_volume_load_location().
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 0dc88185bca47dda1d8ddf4474da2f2fe6982237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc88185bca47dda1d8ddf447… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 19 18:34:09 2016 +0200 wined3d: Use wined3d_texture_prepare_location() in wined3d_volume_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 10 +--------- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 9798650..ce3809f 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -27,14 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); -/* Context activation is done by the caller. Context may be NULL in - * WINED3D_NO3D mode. */ -BOOL wined3d_volume_prepare_location(struct wined3d_volume *volume, - struct wined3d_context *context, DWORD location) -{ - return wined3d_texture_prepare_location(volume->container, volume->texture_level, context, location); -} - /* This call just uploads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ @@ -222,7 +214,7 @@ BOOL wined3d_volume_load_location(struct wined3d_volume *volume, return FALSE; } - if (!wined3d_volume_prepare_location(volume, context, location)) + if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) return FALSE; if (sub_resource->locations & WINED3D_LOCATION_DISCARDED) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1f04484..1b3e368 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2610,8 +2610,6 @@ HRESULT wined3d_volume_init(struct wined3d_volume *volume, struct wined3d_textur const struct wined3d_resource_desc *desc, UINT level) DECLSPEC_HIDDEN; BOOL wined3d_volume_load_location(struct wined3d_volume *volume, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; -BOOL wined3d_volume_prepare_location(struct wined3d_volume *volume, - struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN;

1 0

Kim Malmo : wined3d: Add Nvidia 9700M GT.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 5f4c496480d2b07711e37185de616b4d8304e4e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4c496480d2b07711e37185d… Author: Kim Malmo <berencamlost(a)msn.com> Date: Tue Apr 19 18:34:10 2016 +0200 wined3d: Add Nvidia 9700M GT. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a04e338..8f47b24 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1231,6 +1231,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", DRIVER_NVIDIA_GEFORCE8, 384 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9700MGT, "NVIDIA GeForce 9700M GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_210, "NVIDIA GeForce 210", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT220, "NVIDIA GeForce GT 220", DRIVER_NVIDIA_GEFORCE8, 512 }, @@ -1823,6 +1824,7 @@ cards_nvidia_binary[] = {"GTS 250", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"GTS 150", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ {"9800", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ + {"9700M GT", CARD_NVIDIA_GEFORCE_9700MGT}, /* Geforce 9 - midend */ {"GT 140", CARD_NVIDIA_GEFORCE_9600GT}, /* Geforce 9 - midend */ {"9600", CARD_NVIDIA_GEFORCE_9600GT}, /* Geforce 9 - midend */ {"GT 130", CARD_NVIDIA_GEFORCE_9500GT}, /* Geforce 9 - midend low / Geforce 200 - low */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1b3e368..50034a3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1739,6 +1739,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_9400GT = 0x042c, CARD_NVIDIA_GEFORCE_9500GT = 0x0640, CARD_NVIDIA_GEFORCE_9600GT = 0x0622, + CARD_NVIDIA_GEFORCE_9700MGT = 0x064a, CARD_NVIDIA_GEFORCE_9800GT = 0x0614, CARD_NVIDIA_GEFORCE_210 = 0x0a23, CARD_NVIDIA_GEFORCE_GT220 = 0x0a20,

1 0

Vincent Povirk : Revert "user32: Set capture earlier on popup menus.".
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 3cc6a1acc31161be0f14d81c588faeb0022e2e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cc6a1acc31161be0f14d81c5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 19 12:57:47 2016 -0500 Revert "user32: Set capture earlier on popup menus.". This reverts commit a9bff001a1e2c919b3f6e68d642abb8da957a2bf. We can't set capture this early because the popup menu isn't visible yet. To my knowledge, no applications depend on this, nor did the next patch in the series. It's only a theoretical issue revealed by a message test. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 7a49ac0..e42d8f7 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3003,6 +3003,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, INT executedMenuId = -1; MTRACKER mt; BOOL enterIdleSent = FALSE; + HWND capture_win; mt.trackFlags = 0; mt.hCurrentMenu = hmenu; @@ -3030,8 +3031,9 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, if (wFlags & TF_ENDMENU) fEndMenu = TRUE; - if (!(wFlags & TPM_POPUPMENU)) - set_capture_window( mt.hOwnerWnd, GUI_INMENUMODE, NULL ); + /* owner may not be visible when tracking a popup, so use the menu itself */ + capture_win = (wFlags & TPM_POPUPMENU) ? menu->hWnd : mt.hOwnerWnd; + set_capture_window( capture_win, GUI_INMENUMODE, NULL ); if ((wFlags & TPM_POPUPMENU) && menu->nItems == 0) return FALSE; @@ -3327,10 +3329,6 @@ static BOOL MENU_InitTracking(HWND hWnd, HMENU hMenu, BOOL bPopup, UINT wFlags) SendMessageW( hWnd, WM_SETCURSOR, (WPARAM)hWnd, HTCAPTION ); - if (bPopup) - /* owner may not be visible when tracking a popup, so use the menu itself */ - set_capture_window( menu->hWnd, GUI_INMENUMODE, NULL ); - if (!(wFlags & TPM_NONOTIFY)) { SendMessageW( hWnd, WM_INITMENU, (WPARAM)hMenu, 0 ); @@ -3484,9 +3482,6 @@ BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y, if (MENU_ShowPopup( hWnd, hMenu, 0, wFlags, x, y, 0, 0 )) ret = MENU_TrackMenu( hMenu, wFlags | TPM_POPUPMENU, 0, 0, hWnd, lpTpm ? &lpTpm->rcExclude : NULL ); - - set_capture_window( 0, GUI_INMENUMODE, NULL ); - MENU_ExitTracking(hWnd, TRUE); if (menu->hWnd)

1 0

Sebastian Lackner : taskschd/tests: Fix a use-after-free in scheduler tests.
by Alexandre Julliard 20 Apr '16

20 Apr '16

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

Sebastian Lackner : user32: Do not block sending/ posting WM_NOTIFY messages.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: b4ac51effaa19b3ddf64f89b23894254608b6294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ac51effaa19b3ddf64f89b2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 19 18:28:59 2016 +0200 user32: Do not block sending/posting WM_NOTIFY messages. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 3 +-- dlls/user32/tests/msg.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 94d7a84..fb4786b 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -310,8 +310,7 @@ static const unsigned int message_pointer_flags[] = SET(WM_GETMINMAXINFO) | SET(WM_DRAWITEM) | SET(WM_MEASUREITEM) | SET(WM_DELETEITEM) | SET(WM_COMPAREITEM), /* 0x40 - 0x5f */ - SET(WM_WINDOWPOSCHANGING) | SET(WM_WINDOWPOSCHANGED) | SET(WM_COPYDATA) | - SET(WM_NOTIFY) | SET(WM_HELP), + SET(WM_WINDOWPOSCHANGING) | SET(WM_WINDOWPOSCHANGED) | SET(WM_COPYDATA) | SET(WM_HELP), /* 0x60 - 0x7f */ SET(WM_STYLECHANGING) | SET(WM_STYLECHANGED), /* 0x80 - 0x9f */ diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d2059a8..b2630ce 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11188,6 +11188,70 @@ static void test_quit_message(void) ok_sequence(WmStopQuitSeq, "WmStopQuitSeq", FALSE); } +static const struct message WmNotifySeq[] = { + { WM_NOTIFY, sent|wparam|lparam, 0x1234, 0xdeadbeef }, + { 0 } +}; + +static void test_notify_message(void) +{ + HWND hwnd; + BOOL ret; + MSG msg; + + hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 300, 300, 0, NULL, NULL, 0); + ok(hwnd != 0, "Failed to create window\n"); + flush_events(); + flush_sequence(); + + ret = SendNotifyMessageA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "SendNotifyMessageA failed with error %u\n", GetLastError()); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = SendNotifyMessageW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "SendNotifyMessageW failed with error %u\n", GetLastError()); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = SendMessageCallbackA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef, NULL, 0); + ok(ret == TRUE, "SendMessageCallbackA failed with error %u\n", GetLastError()); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = SendMessageCallbackW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef, NULL, 0); + ok(ret == TRUE, "SendMessageCallbackW failed with error %u\n", GetLastError()); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = PostMessageA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "PostMessageA failed with error %u\n", GetLastError()); + flush_events(); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = PostMessageW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "PostMessageW failed with error %u\n", GetLastError()); + flush_events(); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = PostThreadMessageA(GetCurrentThreadId(), WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "PostThreadMessageA failed with error %u\n", GetLastError()); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + msg.hwnd = hwnd; + DispatchMessageA(&msg); + } + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = PostThreadMessageW(GetCurrentThreadId(), WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "PostThreadMessageW failed with error %u\n", GetLastError()); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + msg.hwnd = hwnd; + DispatchMessageA(&msg); + } + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + DestroyWindow(hwnd); +} + static const struct message WmMouseHoverSeq[] = { { WM_MOUSEACTIVATE, sent|optional }, /* we can get those when moving the mouse in focus-follow-mouse mode under X11 */ { WM_MOUSEACTIVATE, sent|optional }, @@ -15793,6 +15857,7 @@ START_TEST(msg) test_SendMessageTimeout(); test_edit_messages(); test_quit_message(); + test_notify_message(); test_SetActiveWindow(); if (!pTrackMouseEvent)

1 0