November 2015 - Wine-commits

Francois Gouget : cmd/tests: Fix the builtin tests when the current directory contains a space.
by Alexandre Julliard 23 Nov '15

23 Nov '15

Module: wine Branch: master Commit: 46e94c8d19284f4353e3f9592784c8870fb1b966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46e94c8d19284f4353e3f9592… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 22 19:34:18 2015 +0100 cmd/tests: Fix the builtin tests when the current directory contains a space. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 1bcd655..52c549e 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -952,11 +952,11 @@ goto :TestForR del temp.bat 2>nul call :WriteLine set WINE_found=N for /l %%i in (1,1,%WINE_expectedresults%) do ( - call :WriteLine if "%%%%WINE_expectedresults.%%i%%%%"=="%%%%1" set WINE_found=Y + call :WriteLine if "%%%%WINE_expectedresults.%%i%%%%"=="%%%%~1" set WINE_found=Y call :WriteLine if "%%%%WINE_found%%%%"=="Y" set WINE_expectedresults.%%i= call :WriteLine if "%%%%WINE_found%%%%"=="Y" goto :eof ) -call :WriteLine echo Got unexpected result: "%%%%1" +call :WriteLine echo Got unexpected result: "%%%%~1" goto :eof :WriteLine @@ -984,7 +984,7 @@ set WINE_expectedresults.2=%WINE_CURDIR%\bar\. set WINE_expectedresults.3=%WINE_CURDIR%\baz\. set WINE_expectedresults.4=%WINE_CURDIR%\foo\. call :SetExpected -for /R %%i in (.) do call temp.bat %%i +for /R %%i in (.) do call temp.bat "%%i" call :ValidateExpected echo Plain directory enumeration from provided root @@ -995,7 +995,7 @@ set WINE_expectedresults.3=%WINE_CURDIR%\baz\. set WINE_expectedresults.4=%WINE_CURDIR%\foo\. if "%CD%"=="" goto :SkipBrokenNT4 call :SetExpected -for /R "%WINE_CURDIR%" %%i in (.) do call temp.bat %%i +for /R "%WINE_CURDIR%" %%i in (.) do call temp.bat "%%i" call :ValidateExpected :SkipBrokenNT4 @@ -1004,7 +1004,7 @@ set WINE_expectedresults=2 set WINE_expectedresults.1=%WINE_CURDIR%\baz\bazbaz set WINE_expectedresults.2=%WINE_CURDIR%\bazbaz call :SetExpected -for /R %%i in (baz*) do call temp.bat %%i +for /R %%i in (baz*) do call temp.bat "%%i" call :ValidateExpected echo File enumeration from provided root @@ -1012,7 +1012,7 @@ set WINE_expectedresults=2 set WINE_expectedresults.1=%WINE_CURDIR%\baz\bazbaz set WINE_expectedresults.2=%WINE_CURDIR%\bazbaz call :SetExpected -for /R %%i in (baz*) do call temp.bat %%i +for /R %%i in (baz*) do call temp.bat "%%i" call :ValidateExpected echo Mixed enumeration @@ -1024,7 +1024,7 @@ set WINE_expectedresults.4=%WINE_CURDIR%\baz\bazbaz set WINE_expectedresults.5=%WINE_CURDIR%\bazbaz set WINE_expectedresults.6=%WINE_CURDIR%\foo\. call :SetExpected -for /R %%i in (. baz*) do call temp.bat %%i +for /R %%i in (. baz*) do call temp.bat "%%i" call :ValidateExpected echo Mixed enumeration from provided root @@ -1036,7 +1036,7 @@ set WINE_expectedresults.4=%WINE_CURDIR%\baz\bazbaz set WINE_expectedresults.5=%WINE_CURDIR%\bazbaz set WINE_expectedresults.6=%WINE_CURDIR%\foo\. call :SetExpected -for /R %%i in (. baz*) do call temp.bat %%i +for /R %%i in (. baz*) do call temp.bat "%%i" call :ValidateExpected echo With duplicates enumeration @@ -1054,7 +1054,7 @@ set WINE_expectedresults.10=%WINE_CURDIR%\foo\bazbaz set WINE_expectedresults.11=%WINE_CURDIR%\foo\fred set WINE_expectedresults.12=%WINE_CURDIR%\fred call :SetExpected -for /R %%i in (baz* bazbaz fred ba*) do call temp.bat %%i +for /R %%i in (baz* bazbaz fred ba*) do call temp.bat "%%i" call :ValidateExpected echo Strip missing wildcards, keep unwildcarded names @@ -1066,7 +1066,7 @@ set WINE_expectedresults.4=%WINE_CURDIR%\bazbaz set WINE_expectedresults.5=%WINE_CURDIR%\foo\jim set WINE_expectedresults.6=%WINE_CURDIR%\jim call :SetExpected -for /R %%i in (baz* fred* jim) do call temp.bat %%i +for /R %%i in (baz* fred* jim) do call temp.bat "%%i" call :ValidateExpected echo for /R passed @@ -2490,7 +2490,7 @@ cmd /e:oN /C tmp.cmd rem FIXME: creating file before setting envvar value to prevent parsing-time evaluation (due to EnableDelayedExpansion not being implemented/available yet) echo --- setlocal with corresponding endlocal -rem %CD% does not tork on NT4 so use the following workaround +rem %CD% does not work on NT4 so use the following workaround for /d %%i in (.) do set WINE_CURDIR=%%~dpnxi echo @echo off> test.cmd echo echo %%WINE_VAR%%>> test.cmd @@ -2520,7 +2520,7 @@ echo cd foobar2>> test.cmd echo echo %%WINE_VAR%%>> test.cmd echo for /d %%%%i in (.) do echo %%%%~dpnxi>> test.cmd set WINE_VAR=globalval -rem %CD% does not tork on NT4 so use the following workaround +rem %CD% does not work on NT4 so use the following workaround for /d %%i in (.) do set WINE_CURDIR=%%~dpnxi call test.cmd echo %WINE_VAR% @@ -2532,7 +2532,7 @@ echo --- setlocal within same batch program set WINE_var1=one set WINE_var2= set WINE_var3= -rem %CD% does not tork on NT4 so use the following workaround +rem %CD% does not work on NT4 so use the following workaround for /d %%i in (.) do set WINE_CURDIR=%%~dpnxi setlocal set WINE_var2=two @@ -2564,7 +2564,7 @@ echo --- Mismatched set and end locals mkdir foodir2 2>nul mkdir foodir3 2>nul mkdir foodir4 2>nul -rem %CD% does not tork on NT4 so use the following workaround +rem %CD% does not work on NT4 so use the following workaround for /d %%i in (.) do set WINE_curdir=%%~dpnxi echo @echo off> 2set1end.cmd @@ -2597,7 +2597,7 @@ rem -- setlocal1 == this batch, should never be used inside a called routine setlocal set WINE_var=value2 cd foodir2 -call %WINE_CURDIR%\2set1end.cmd +call "%WINE_CURDIR%\2set1end.cmd" echo Finished: echo %WINE_VAR% for /d %%i in (.) do echo %%~dpnxi @@ -2612,7 +2612,7 @@ rem -- setlocal1 == this batch, should never be used inside a called routine setlocal set WINE_var=value2 cd foodir2 -call %WINE_CURDIR%\1set2end.cmd +call "%WINE_CURDIR%\1set2end.cmd" echo Finished: echo %WINE_VAR% for /d %%i in (.) do echo %%~dpnxi

1 0

Alexandre Julliard : Wine release 1.8-rc1
by Alexandre Julliard 20 Nov '15

20 Nov '15

Module: website Branch: master Commit: 25fc91529ebdb22de987ab3d5b7e23d10f2c8086 URL: http://source.winehq.org/git/website.git/?a=commit;h=25fc91529ebdb22de987ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 20 22:48:56 2015 +0900 Wine release 1.8-rc1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2015112001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2015112001.xml b/news/en/2015112001.xml new file mode 100644 index 0000000..1c81839 --- /dev/null +++ b/news/en/2015112001.xml @@ -0,0 +1,13 @@ +<news> +<date>November 20, 2015</date> +<title>Wine 1.8-rc1 Released</title> +<body> + The Wine development release 1.8-rc1 is now available. + This is the first release candidate for the upcoming Wine 1.8. Please give this release a good testing to help us make 1.8 as good as possible. + <a href="{$root}/announce/1.8-rc1">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.8/wine-1.8-rc1.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : advapi32: Don't try to create the registry root.
by Alexandre Julliard 20 Nov '15

20 Nov '15

Module: wine Branch: master Commit: eafdbdd13b19d9f0ddfa3309eb38d7ec2a22986f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafdbdd13b19d9f0ddfa3309e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 20 19:56:40 2015 +0900 advapi32: Don't try to create the registry root. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 798f93d..4f33fe6 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -141,10 +141,16 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES if (status == STATUS_OBJECT_NAME_NOT_FOUND) { + static const WCHAR registry_root[] = {'\\','R','e','g','i','s','t','r','y','\\'}; WCHAR *buffer = attr->ObjectName->Buffer; DWORD attrs, pos = 0, i = 0, len = attr->ObjectName->Length / sizeof(WCHAR); UNICODE_STRING str; + /* don't try to create registry root */ + if (!attr->RootDirectory && len > sizeof(registry_root)/sizeof(WCHAR) && + !memicmpW( buffer, registry_root, sizeof(registry_root)/sizeof(WCHAR))) + i += sizeof(registry_root)/sizeof(WCHAR); + while (i < len && buffer[i] != '\\') i++; if (i == len && !force_wow32) return status;

1 0

Piotr Caban : winex11.drv: Send WM_DROPFILES if IDropTarget_Drop failed or DROPEFFECT_NONE was set.
by Alexandre Julliard 20 Nov '15

20 Nov '15

Module: wine Branch: master Commit: 5dad16510d384eccd9cd8b8d0575d02ea447c01b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dad16510d384eccd9cd8b8d0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 20 11:43:38 2015 +0100 winex11.drv: Send WM_DROPFILES if IDropTarget_Drop failed or DROPEFFECT_NONE was set. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 72758a0..4cbefc9 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -383,6 +383,7 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) IDropTarget *dropTarget; DWORD effect = XDNDDropEffect; int accept = 0; /* Assume we're not accepting */ + BOOL drop_file = TRUE; TRACE("\n"); @@ -397,26 +398,33 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) pointl.y = XDNDxy.y; hr = IDropTarget_Drop(dropTarget, &XDNDDataObject, MK_LBUTTON, pointl, &effect); - if (SUCCEEDED(hr)) + if (hr == S_OK) { if (effect != DROPEFFECT_NONE) { TRACE("drop succeeded\n"); accept = 1; + drop_file = FALSE; } else TRACE("the application refused the drop\n"); } - else + else if (FAILED(hr)) WARN("drop failed, error 0x%08X\n", hr); + else + { + WARN("drop returned 0x%08X\n", hr); + drop_file = FALSE; + } IDropTarget_Release(dropTarget); } - else + + if (drop_file) { - /* Only send WM_DROPFILES if there is no drop target. Doing both - * causes winamp to duplicate the dropped files (#29081) */ + /* Only send WM_DROPFILES if Drop didn't succeed or DROPEFFECT_NONE was set. + * Doing both causes winamp to duplicate the dropped files (#29081) */ if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - (effect & DROPEFFECT_COPY) && + (XDNDDropEffect & DROPEFFECT_COPY) && X11DRV_XDND_HasHDROP()) { HRESULT hr = X11DRV_XDND_SendDropFiles( hWnd );

1 0

Piotr Caban : winex11.drv: Inform x11 that we' re interested in drop if windows expects WM_DROPFILES message.
by Alexandre Julliard 20 Nov '15

20 Nov '15

Module: wine Branch: master Commit: 701bb45203e3e5b6924c43916b75416a94206d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=701bb45203e3e5b6924c43916… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 20 11:44:08 2015 +0100 winex11.drv: Inform x11 that we're interested in drop if windows expects WM_DROPFILES message. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 4cbefc9..59c1671 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -339,9 +339,8 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (XDNDAccepted) accept = 1; - else if (dropTarget == NULL && - (GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - (effect & DROPEFFECT_COPY) && + else if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && + (X11DRV_XDND_XdndActionToDROPEFFECT(event->data.l[4]) & DROPEFFECT_COPY) && X11DRV_XDND_HasHDROP()) { accept = 1;

1 0

Piotr Caban : winex11.drv: Don't call IDropTarget::{DragOver, DragLeave, Drop} functions if DragEnter fails.
by Alexandre Julliard 20 Nov '15

20 Nov '15

Module: wine Branch: master Commit: a19fe8d9c8547f803ac953e705d1a937e00719c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19fe8d9c8547f803ac953e70… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 20 11:44:26 2015 +0100 winex11.drv: Don't call IDropTarget::{DragOver,DragLeave,Drop} functions if DragEnter fails. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 66 +++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 59c1671..01af480 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -285,7 +285,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) /* Notify OLE of DragEnter. Result determines if we accept */ HWND dropTargetWindow; - if (XDNDLastDropTargetWnd) + if (XDNDAccepted && XDNDLastDropTargetWnd) { dropTarget = get_droptarget_pointer(XDNDLastDropTargetWnd); if (dropTarget) @@ -387,35 +387,38 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) TRACE("\n"); /* Notify OLE of Drop */ - dropTarget = get_droptarget_pointer(XDNDLastDropTargetWnd); - if (dropTarget) + if (XDNDAccepted) { - HRESULT hr; - POINTL pointl; - - pointl.x = XDNDxy.x; - pointl.y = XDNDxy.y; - hr = IDropTarget_Drop(dropTarget, &XDNDDataObject, MK_LBUTTON, - pointl, &effect); - if (hr == S_OK) + dropTarget = get_droptarget_pointer(XDNDLastDropTargetWnd); + if (dropTarget) { - if (effect != DROPEFFECT_NONE) + HRESULT hr; + POINTL pointl; + + pointl.x = XDNDxy.x; + pointl.y = XDNDxy.y; + hr = IDropTarget_Drop(dropTarget, &XDNDDataObject, MK_LBUTTON, + pointl, &effect); + if (hr == S_OK) { - TRACE("drop succeeded\n"); - accept = 1; - drop_file = FALSE; + if (effect != DROPEFFECT_NONE) + { + TRACE("drop succeeded\n"); + accept = 1; + drop_file = FALSE; + } + else + TRACE("the application refused the drop\n"); } + else if (FAILED(hr)) + WARN("drop failed, error 0x%08X\n", hr); else - TRACE("the application refused the drop\n"); - } - else if (FAILED(hr)) - WARN("drop failed, error 0x%08X\n", hr); - else - { - WARN("drop returned 0x%08X\n", hr); - drop_file = FALSE; + { + WARN("drop returned 0x%08X\n", hr); + drop_file = FALSE; + } + IDropTarget_Release(dropTarget); } - IDropTarget_Release(dropTarget); } if (drop_file) @@ -465,13 +468,16 @@ void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) TRACE("DND Operation canceled\n"); /* Notify OLE of DragLeave */ - dropTarget = get_droptarget_pointer(XDNDLastDropTargetWnd); - if (dropTarget) + if (XDNDAccepted) { - HRESULT hr = IDropTarget_DragLeave(dropTarget); - if (FAILED(hr)) - WARN("IDropTarget_DragLeave failed, error 0x%08X\n", hr); - IDropTarget_Release(dropTarget); + dropTarget = get_droptarget_pointer(XDNDLastDropTargetWnd); + if (dropTarget) + { + HRESULT hr = IDropTarget_DragLeave(dropTarget); + if (FAILED(hr)) + WARN("IDropTarget_DragLeave failed, error 0x%08X\n", hr); + IDropTarget_Release(dropTarget); + } } X11DRV_XDND_FreeDragDropOp();

1 0

Qian Hong : server: Remove out of date comment.
by Alexandre Julliard 20 Nov '15

20 Nov '15

Module: wine Branch: master Commit: 499f0454c9ac5aa60f2e5d3381b9d1c6fef4882f URL: http://source.winehq.org/git/wine.git/?a=commit;h=499f0454c9ac5aa60f2e5d338… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Nov 20 10:41:26 2015 +0800 server: Remove out of date comment. Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/queue.c b/server/queue.c index 5136f43..3099e12 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2076,7 +2076,7 @@ void queue_cleanup_window( struct thread *thread, user_handle_t win ) thread_input_cleanup_window( queue, win ); } -/* post a message to a window; used by socket handling */ +/* post a message to a window */ void post_message( user_handle_t win, unsigned int message, lparam_t wparam, lparam_t lparam ) { struct message *msg;

1 0

Aric Stewart : comctl32: ILC_COLORDDB imagelists can be created with 0 sizes.
by Alexandre Julliard 20 Nov '15

20 Nov '15

Module: wine Branch: master Commit: bcefe114e8fc49de5507fd01ebe08aab946533d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcefe114e8fc49de5507fd01e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Nov 19 07:53:04 2015 -0600 comctl32: ILC_COLORDDB imagelists can be created with 0 sizes. Negative values are still invalid. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 5 ++--- dlls/comctl32/tests/imagelist.c | 44 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 608ccc9..c34eb0a 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -776,7 +776,8 @@ ImageList_Create (INT cx, INT cy, UINT flags, TRACE("(%d %d 0x%x %d %d)\n", cx, cy, flags, cInitial, cGrow); - if (cx <= 0 || cy <= 0) return NULL; + if (cx < 0 || cy < 0) return NULL; + if (!((flags&ILC_COLORDDB) == ILC_COLORDDB) && (cx == 0 || cy == 0)) return NULL; /* Create the IImageList interface for the image list */ if (FAILED(ImageListImpl_CreateInstance(NULL, &IID_IImageList, (void **)&himl))) @@ -1831,8 +1832,6 @@ ImageList_GetIconSize (HIMAGELIST himl, INT *cx, INT *cy) { if (!is_valid(himl) || !cx || !cy) return FALSE; - if ((himl->cx <= 0) || (himl->cy <= 0)) - return FALSE; *cx = himl->cx; *cy = himl->cy; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 9941667..7e029e0 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1964,7 +1964,11 @@ static void test_iconsize(void) static void test_create_destroy(void) { HIMAGELIST himl; + IImageList *imgl; + INT cx, cy; BOOL rc; + HRESULT hr; + INT ret; /* list with zero or negative image dimensions */ himl = ImageList_Create(0, 0, ILC_COLOR16, 0, 3); @@ -1984,6 +1988,46 @@ static void test_create_destroy(void) rc = ImageList_Destroy((HIMAGELIST)0xdeadbeef); ok(rc == FALSE, "ImageList_Destroy(0xdeadbeef) should fail and not crash\n"); + + /* DDB image lists */ + himl = ImageList_Create(0, 14, ILC_COLORDDB, 4, 4); + ok(himl != NULL, "got %p\n", himl); + imgl = (IImageList*)himl; + IImageList_GetIconSize(imgl, &cx, &cy); + ok (cx == 0, "Wrong cx (%i)\n", cx); + ok (cy == 14, "Wrong cy (%i)\n", cy); + ImageList_Destroy(himl); + + himl = ImageList_Create(0, 0, ILC_COLORDDB, 4, 4); + ok(himl != NULL, "got %p\n", himl); + imgl = (IImageList*)himl; + IImageList_GetIconSize(imgl, &cx, &cy); + ok (cx == 0, "Wrong cx (%i)\n", cx); + ok (cy == 0, "Wrong cy (%i)\n", cy); + ImageList_Destroy(himl); + + himl = ImageList_Create(0, 0, ILC_COLORDDB, 0, 4); + ok(himl != NULL, "got %p\n", himl); + imgl = (IImageList*)himl; + IImageList_GetIconSize(imgl, &cx, &cy); + ok (cx == 0, "Wrong cx (%i)\n", cx); + ok (cy == 0, "Wrong cy (%i)\n", cy); + + hr = IImageList_SetImageCount(imgl, 3); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IImageList_GetImageCount(imgl, &ret); + ok(hr == S_OK && ret == 3, "invalid image count after increase\n"); + + /* Trying to actually add an image causes a crash on Windows */ + ImageList_Destroy(himl); + + /* Negative values fail */ + himl = ImageList_Create(-1, -1, ILC_COLORDDB, 4, 4); + ok(himl == NULL, "got %p\n", himl); + himl = ImageList_Create(-1, 1, ILC_COLORDDB, 4, 4); + ok(himl == NULL, "got %p\n", himl); + himl = ImageList_Create(1, -1, ILC_COLORDDB, 4, 4); + ok(himl == NULL, "got %p\n", himl); } static void test_IImageList_Clone(void)

1 0

Nikolay Sivov : winmm: Initialize reserved fields of data returned by waveOutGetDevCapsA and waveInGetDevCapsA (Coverity).
by Alexandre Julliard 20 Nov '15

20 Nov '15

Module: wine Branch: master Commit: 062bbb91a709a90b9eb980841e7a506ca0eebe8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=062bbb91a709a90b9eb980841… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 18 21:37:59 2015 +0300 winmm: Initialize reserved fields of data returned by waveOutGetDevCapsA and waveInGetDevCapsA (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/capture.c | 4 ++++ dlls/winmm/tests/wave.c | 4 ++++ dlls/winmm/waveform.c | 2 ++ 3 files changed, 10 insertions(+) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 54c3793..bc17ce3 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -316,6 +316,7 @@ static void wave_in_test_device(UINT_PTR device) GetSystemInfo(&sSysInfo); dwPageSize = sSysInfo.dwPageSize; + memset(&capsA, 0xff, sizeof(capsA)); rc=waveInGetDevCapsA(device,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER, @@ -323,11 +324,14 @@ static void wave_in_test_device(UINT_PTR device) dev_name(device),wave_in_error(rc)); if (rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER) return; + ok(capsA.wReserved1 != 0xffff, "got %u\n", capsA.wReserved1); + memset(&capsW, 0xcc, sizeof(capsW)); rc=waveInGetDevCapsW(device,&capsW,sizeof(capsW)); ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NOTSUPPORTED, "waveInGetDevCapsW(%s): MMSYSERR_NOERROR or MMSYSERR_NOTSUPPORTED " "expected, got %s\n",dev_name(device),wave_in_error(rc)); + ok(capsW.wReserved1 == 0, "got %u\n", capsW.wReserved1); rc=waveInGetDevCapsA(device,NULL,sizeof(capsA)); ok(rc==MMSYSERR_INVALPARAM, diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index a2fe8bb..896f332 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -893,6 +893,7 @@ static void wave_out_test_device(UINT_PTR device) GetSystemInfo(&sSysInfo); dwPageSize = sSysInfo.dwPageSize; + memset(&capsA, 0xcc, sizeof(capsA)); rc=waveOutGetDevCapsA(device,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER, @@ -900,11 +901,14 @@ static void wave_out_test_device(UINT_PTR device) dev_name(device),wave_out_error(rc)); if (rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER) return; + ok(capsA.wReserved1 == 0, "got %u\n", capsA.wReserved1); + memset(&capsW, 0xcc, sizeof(capsW)); rc=waveOutGetDevCapsW(device,&capsW,sizeof(capsW)); ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NOTSUPPORTED, "waveOutGetDevCapsW(%s): MMSYSERR_NOERROR or MMSYSERR_NOTSUPPORTED " "expected, got %s\n",dev_name(device),wave_out_error(rc)); + ok(capsW.wReserved1 == 0, "got %u\n", capsW.wReserved1); rc=waveOutGetDevCapsA(device,0,sizeof(capsA)); ok(rc==MMSYSERR_INVALPARAM, diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 1afef74..55f48a8 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2629,6 +2629,7 @@ UINT WINAPI waveOutGetDevCapsA(UINT_PTR uDeviceID, LPWAVEOUTCAPSA lpCaps, wocA.dwFormats = wocW.dwFormats; wocA.wChannels = wocW.wChannels; wocA.dwSupport = wocW.dwSupport; + wocA.wReserved1 = 0; memcpy(lpCaps, &wocA, min(uSize, sizeof(wocA))); } return ret; @@ -3354,6 +3355,7 @@ UINT WINAPI waveInGetDevCapsA(UINT_PTR uDeviceID, LPWAVEINCAPSA lpCaps, UINT uSi sizeof(wicA.szPname), NULL, NULL ); wicA.dwFormats = wicW.dwFormats; wicA.wChannels = wicW.wChannels; + wicA.wReserved1 = 0; memcpy(lpCaps, &wicA, min(uSize, sizeof(wicA))); } return ret;

1 0

Jacek Caban : mshtml: Make msec argument of setTimeout optional.
by Alexandre Julliard 20 Nov '15

20 Nov '15

Module: wine Branch: master Commit: fa43b8cac91b1399fa3216348734bcf064c784b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa43b8cac91b1399fa3216348… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 20 13:15:56 2015 +0100 mshtml: Make msec argument of setTimeout optional. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 27 ++++++++++++++++++++++++++- dlls/mshtml/tests/jstest.html | 5 +++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 280a5d7..5ed22c0 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2628,10 +2628,14 @@ static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); - if(id == DISPID_IHTMLWINDOW2_LOCATION && (wFlags & DISPATCH_PROPERTYPUT)) { + switch(id) { + case DISPID_IHTMLWINDOW2_LOCATION: { HTMLLocation *location; HRESULT hres; + if(!(wFlags & DISPATCH_PROPERTYPUT)) + break; + TRACE("forwarding to location.href\n"); hres = get_location(window, &location); @@ -2643,6 +2647,27 @@ static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID IHTMLLocation_Release(&location->IHTMLLocation_iface); return hres; } + case DISPID_IHTMLWINDOW2_SETTIMEOUT: + case DISPID_IHTMLWINDOW3_SETTIMEOUT: { + VARIANT args[2]; + DISPPARAMS dp = {args, NULL, 2, 0}; + + /* + * setTimeout calls shoud use default value 0 for the second argument if only one is provided, + * but IDL file does not reflect that. We fixup arguments here instead. + */ + if(!(wFlags & DISPATCH_METHOD) || pdp->cArgs != 1 || pdp->cNamedArgs) + break; + + TRACE("Fixing args\n"); + + V_VT(args) = VT_I4; + V_I4(args) = 0; + args[1] = *pdp->rgvarg; + return IDispatchEx_InvokeEx(&window->event_target.dispex.IDispatchEx_iface, id, lcid, + wFlags, &dp, pvarRes, pei, pspCaller); + } + } return IDispatchEx_InvokeEx(&window->event_target.dispex.IDispatchEx_iface, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); } diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 528c2e1..f0d3e3b 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -383,6 +383,9 @@ function runTests() { var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r); ok(globalVar === true, "globalVar = " + globalVar); + + /* Call setTimeout without specified time. */ + window.setTimeout(function() { external.reportSuccess(); }); } function runTest() { @@ -391,8 +394,6 @@ function runTest() { }catch(e) { ok(false, "got exception " + e.message); } - - external.reportSuccess(); } </script> <body onload="runTest();">

1 0