July 2011 - Wine-commits - list.winehq.org

Huw Davies : gdi32: Don't use a dib-section' s bitfields unless its depth matches the requested depth.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: 74707e956e9c9a3060bbc31447d053820d385a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74707e956e9c9a3060bbc3144… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 12 16:10:49 2011 +0100 gdi32: Don't use a dib-section's bitfields unless its depth matches the requested depth. --- dlls/gdi32/dib.c | 32 ++++++++++---------------------- 1 files changed, 10 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 3268086..5103919 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -439,6 +439,10 @@ static const RGBQUAD DefLogPaletteQuads[20] = { /* Copy of Default Logical Palet { 0xff, 0xff, 0xff, 0x00 } }; +static const DWORD bit_fields_888[3] = {0xff0000, 0x00ff00, 0x0000ff}; +static const DWORD bit_fields_565[3] = {0xf800, 0x07e0, 0x001f}; +static const DWORD bit_fields_555[3] = {0x7c00, 0x03e0, 0x001f}; + /****************************************************************************** * GetDIBits [GDI32.@] * @@ -646,11 +650,7 @@ INT WINAPI GetDIBits( case 15: if (info->bmiHeader.biCompression == BI_BITFIELDS) - { - ((PDWORD)info->bmiColors)[0] = 0x7c00; - ((PDWORD)info->bmiColors)[1] = 0x03e0; - ((PDWORD)info->bmiColors)[2] = 0x001f; - } + memcpy( info->bmiColors, bit_fields_555, sizeof(bit_fields_555) ); break; case 16: @@ -658,21 +658,13 @@ INT WINAPI GetDIBits( { if (bmp->dib) { - if (bmp->dib->dsBmih.biCompression == BI_BITFIELDS) + if (bmp->dib->dsBmih.biCompression == BI_BITFIELDS && bmp->dib->dsBmih.biBitCount == bpp) memcpy( info->bmiColors, bmp->dib->dsBitfields, 3 * sizeof(DWORD) ); else - { - ((PDWORD)info->bmiColors)[0] = 0x7c00; - ((PDWORD)info->bmiColors)[1] = 0x03e0; - ((PDWORD)info->bmiColors)[2] = 0x001f; - } + memcpy( info->bmiColors, bit_fields_555, sizeof(bit_fields_555) ); } else - { - ((PDWORD)info->bmiColors)[0] = 0xf800; - ((PDWORD)info->bmiColors)[1] = 0x07e0; - ((PDWORD)info->bmiColors)[2] = 0x001f; - } + memcpy( info->bmiColors, bit_fields_565, sizeof(bit_fields_565) ); } break; @@ -680,14 +672,10 @@ INT WINAPI GetDIBits( case 32: if (info->bmiHeader.biCompression == BI_BITFIELDS) { - if (bmp->dib && bmp->dib->dsBmih.biCompression == BI_BITFIELDS) + if (bmp->dib && bmp->dib->dsBmih.biCompression == BI_BITFIELDS && bmp->dib->dsBmih.biBitCount == bpp) memcpy( info->bmiColors, bmp->dib->dsBitfields, 3 * sizeof(DWORD) ); else - { - ((PDWORD)info->bmiColors)[0] = 0xff0000; - ((PDWORD)info->bmiColors)[1] = 0x00ff00; - ((PDWORD)info->bmiColors)[2] = 0x0000ff; - } + memcpy( info->bmiColors, bit_fields_888, sizeof(bit_fields_888) ); } break; }

1 0

Huw Davies : gdi32: Use a local copy of the bitmap info structure to further simplify GetDIBits .
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: dd39da49e5de78e25fa237ca29ff5b13a3dfbe56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd39da49e5de78e25fa237ca2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 12 16:10:50 2011 +0100 gdi32: Use a local copy of the bitmap info structure to further simplify GetDIBits. --- dlls/gdi32/dib.c | 190 ++++++++++++++++++++++++++++++++---------------------- 1 files changed, 114 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd39da49e5de78e25fa23…

1 0

Jay Yang : shell32: Make IExplorerBrowser respond to CWM_GETISHELLBROWSER.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: 481dcb4b4bc8c8fbdb27cd0b1f482a60ee34d3c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=481dcb4b4bc8c8fbdb27cd0b1… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Mon Jul 11 17:35:31 2011 -0400 shell32: Make IExplorerBrowser respond to CWM_GETISHELLBROWSER. --- dlls/shell32/ebrowser.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index aee1804..f398228 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -743,6 +743,11 @@ static LRESULT main_on_wm_size(ExplorerBrowserImpl *This) return TRUE; } +static LRESULT main_on_cwm_getishellbrowser(ExplorerBrowserImpl *This) +{ + return (LRESULT)&This->IShellBrowser_iface; +} + static LRESULT CALLBACK main_wndproc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam) { ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)GetWindowLongPtrW(hWnd, GWLP_USERDATA); @@ -751,6 +756,7 @@ static LRESULT CALLBACK main_wndproc(HWND hWnd, UINT uMessage, WPARAM wParam, LP { case WM_CREATE: return main_on_wm_create(hWnd, (CREATESTRUCTW*)lParam); case WM_SIZE: return main_on_wm_size(This); + case CWM_GETISHELLBROWSER: return main_on_cwm_getishellbrowser(This); default: return DefWindowProcW(hWnd, uMessage, wParam, lParam); }

1 0

Jay Yang : shell32: Have the default shell view call SHChangeNotifyRegister with unixfs pidls.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: cde4993d625decec31d25485c7a588a3b772ef8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde4993d625decec31d25485c… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Mon Jul 11 17:35:35 2011 -0400 shell32: Have the default shell view call SHChangeNotifyRegister with unixfs pidls. --- dlls/shell32/shlview.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 1367afb..da613da 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -728,13 +728,28 @@ static LRESULT ShellView_OnCreate(IShellViewImpl *This) hr = IShellFolder_QueryInterface(This->pSFParent, &IID_IPersistFolder2, (LPVOID*)&ppf2); if (hr == S_OK) { + LPITEMIDLIST raw_pidl; SHChangeNotifyEntry ntreg; - hr = IPersistFolder2_GetCurFolder(ppf2, (LPITEMIDLIST*)&ntreg.pidl); - if (hr == S_OK) + hr = IPersistFolder2_GetCurFolder(ppf2, (LPITEMIDLIST*)&raw_pidl); + if(SUCCEEDED(hr)) { + LPITEMIDLIST computer_pidl; + SHGetFolderLocation(NULL,CSIDL_DRIVES,NULL,0,&computer_pidl); + if(ILIsParent(computer_pidl,raw_pidl,FALSE)) + { + /* Normalize the pidl to unixfs to workaround an issue with + * sending notifications on dos paths + */ + WCHAR path[MAX_PATH]; + SHGetPathFromIDListW(raw_pidl,path); + SHParseDisplayName(path,NULL,(LPITEMIDLIST*)&ntreg.pidl,0,NULL); + SHFree(raw_pidl); + } + else + ntreg.pidl = raw_pidl; ntreg.fRecursive = TRUE; - This->hNotify = SHChangeNotifyRegister(This->hWnd, SHCNF_IDLIST, SHCNE_ALLEVENTS, + This->hNotify = SHChangeNotifyRegister(This->hWnd, SHCNRF_InterruptLevel, SHCNE_ALLEVENTS, SHV_CHANGE_NOTIFY, 1, &ntreg); SHFree((LPITEMIDLIST)ntreg.pidl); }

1 0

Frédéric Delanoy : cmd/tests: Add basic "for" tests.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: 63a6a80d40a107f734b8a0c8617ba1302643cb7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=63a6a80d40a107f734b8a0c86… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 11 23:34:05 2011 +0200 cmd/tests: Add basic "for" tests. --- programs/cmd/tests/test_builtins.cmd | 23 +++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 16 ++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 11f6f10..3af488e 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -78,6 +78,29 @@ if /i not foo==FOO echo if /i seems to be broken if /I foo==FOO echo if /I seems to work if /I not foo==FOO echo if /I seems to be broken +echo -----------Testing for ----------- +for %%i in (A B C) do echo %%i +for %%i in (A B C) do call :forTestFun1 %%i +goto :endForTestFun1 +:forTestFun1 +echo %1 +goto :eof +:endForTestFun1 +for %%i in (X) do ( + for %%j in (Y) do ( + echo %%i %%j )) +for %%i in (A B) do ( + for %%j in (C D) do ( + echo %%i %%j )) +for %%i in (A B) do ( + for %%j in (C D) do ( + call :forTestFun2 %%i %%j )) +goto :endForTestFun2 +:forTestFun2 +echo %1 %2 +goto :eof +:endForTestFun2 + echo -----------Testing del /a----------- del /f/q *.test > nul echo r > r.test diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index efc1795..2f3e285 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -78,6 +78,22 @@ Testing case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work if /I seems to work +-----------Testing for ----------- +A +B +C +A +B +C +(a)todo_wine@X Y +(a)todo_wine@A C +(a)todo_wine@A D +(a)todo_wine@B C +(a)todo_wine@B D +(a)todo_wine@A C +(a)todo_wine@A D +(a)todo_wine@B C +(a)todo_wine@B D -----------Testing del /a----------- not-r.test not found after delete, good r.test found before delete, good

1 0

Frédéric Delanoy : cmd/tests: Add basic mkdir tests.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: 9114dc5c035a11d13932a08f0989d4d4341da1b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9114dc5c035a11d13932a08f0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 11 23:34:06 2011 +0200 cmd/tests: Add basic mkdir tests. --- programs/cmd/tests/test_builtins.cmd | 44 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 13 +++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3af488e..1a1e136 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -149,6 +149,50 @@ if exist "file with spaces.dat" del "file with spaces.dat" cd .. rmdir "foo bar" +echo ----------- Testing mkdir ----------- +call :setError 0 +rem md and mkdir are synonymous +mkdir foobar +echo %ErrorLevel% +rmdir foobar +md foobar +echo %ErrorLevel% +rmdir foobar +rem Creating an already existing directory/file must fail +mkdir foobar +md foobar +echo %ErrorLevel% +rmdir foobar +echo > foobar +mkdir foobar +echo %ErrorLevel% +del foobar +rem Multi-level path creation +mkdir foo +echo %ErrorLevel% +mkdir foo\bar\baz +echo %ErrorLevel% +cd foo +echo %ErrorLevel% +cd bar +echo %ErrorLevel% +cd baz +echo %ErrorLevel% +echo > ..\..\bar2 +mkdir ..\..\..\foo\bar2 +echo %ErrorLevel% +del ..\..\bar2 +mkdir ..\..\..\foo\bar2 +echo %ErrorLevel% +rmdir ..\..\..\foo\bar2 +cd .. +rmdir baz +cd .. +rmdir bar +cd .. +rmdir foo +echo %ErrorLevel% + echo -----------Testing Errorlevel----------- rem nt 4.0 doesn't really support a way of setting errorlevel, so this is weak rem See http://www.robvanderwoude.com/exit.php diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 2f3e285..a7116f7 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -102,6 +102,19 @@ r.test not found after delete, good del /q * succeeded on file1 del /q * succeeded on file2.dat ------------ Testing del /s -------------- +----------- Testing mkdir ----------- +0 +0 +(a)todo_wine@1 +(a)todo_wine@1 +0 +0 +0 +0 +0 +(a)todo_wine@1 +0 +0 -----------Testing Errorlevel----------- 1 errorlevel just right, good

1 0

Frédéric Delanoy : cmd/tests: Add mkdir tests for trailing backslashes and invalid chars handling.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: 3f173faf1b703e2300edeeb179cf18289b174501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f173faf1b703e2300edeeb17… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 11 23:34:07 2011 +0200 cmd/tests: Add mkdir tests for trailing backslashes and invalid chars handling. --- programs/cmd/tests/test_builtins.cmd | 32 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 9 ++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 1a1e136..f4cc35a 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -192,6 +192,38 @@ rmdir bar cd .. rmdir foo echo %ErrorLevel% +rem Trailing backslashes +mkdir foo\\\\ +echo %ErrorLevel% +if exist foo (rmdir foo && echo dir created +) else ( echo dir not created ) +echo %ErrorLevel% +rem Invalid chars +mkdir ? +echo %ErrorLevel% +call :setError 0 +mkdir ?\foo +echo %ErrorLevel% +call :setError 0 +mkdir foo\? +echo %ErrorLevel% +if exist foo (rmdir foo && echo ok, foo created +) else ( echo foo not created ) +call :setError 0 +mkdir foo\bar\? +echo %ErrorLevel% +call :setError 0 +if not exist foo ( + echo bad, foo not created +) else ( + cd foo + if exist bar ( + echo ok, foo\bar created + rmdir bar + ) + cd .. + rmdir foo +) echo -----------Testing Errorlevel----------- rem nt 4.0 doesn't really support a way of setting errorlevel, so this is weak diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index a7116f7..cfbc776 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -115,6 +115,15 @@ del /q * succeeded on file2.dat @todo_wine(a)1 0 0 +0 +dir created +0 +(a)todo_wine@1 +(a)todo_wine@1 +(a)todo_wine@1 +(a)todo_wine@ok, foo created +(a)todo_wine@1 +(a)todo_wine@ok, foo\bar created -----------Testing Errorlevel----------- 1 errorlevel just right, good

1 0

Frédéric Delanoy : cmd/tests: Add basic rmdir tests.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: b37d39e35176cea7d9413e8195ca3069ce52d663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b37d39e35176cea7d9413e819… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 11 23:34:08 2011 +0200 cmd/tests: Add basic rmdir tests. --- programs/cmd/tests/test_builtins.cmd | 33 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 12 ++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index f4cc35a..347786d 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -225,6 +225,39 @@ if not exist foo ( rmdir foo ) +echo ----------- Testing rmdir ----------- +call :setError 0 +rem rd and rmdir are synonymous +mkdir foobar +rmdir foobar +echo %ErrorLevel% +if not exist foobar echo dir removed +mkdir foobar +rd foobar +echo %ErrorLevel% +if not exist foobar echo dir removed +rem Removing non-existent directory +rmdir foobar +echo %ErrorLevel% +rem Removing single-level directories +echo > foo +rmdir foo +echo %ErrorLevel% +if exist foo echo file not removed +del foo +mkdir foo +echo > foo\bar +rmdir foo +echo %ErrorLevel% +if exist foo echo non-empty dir not removed +del foo\bar +mkdir foo\bar +rmdir foo +echo %ErrorLevel% +if exist foo echo non-empty dir not removed +rmdir foo\bar +rmdir foo + echo -----------Testing Errorlevel----------- rem nt 4.0 doesn't really support a way of setting errorlevel, so this is weak rem See http://www.robvanderwoude.com/exit.php diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index cfbc776..2e2bf84 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -124,6 +124,18 @@ dir created @todo_wine(a)ok, foo created @todo_wine(a)1 @todo_wine(a)ok, foo\bar created +----------- Testing rmdir ----------- +0 +dir removed +0 +dir removed +0 +0 +file not removed +0 +non-empty dir not removed +0 +non-empty dir not removed -----------Testing Errorlevel----------- 1 errorlevel just right, good

1 0

André Hentschel : cmd/tests: Add test for parameter detection.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: a9504e276c8f12923d63d716f10fb9cf9060c790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9504e276c8f12923d63d716f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 11 23:07:03 2011 +0200 cmd/tests: Add test for parameter detection. --- programs/cmd/tests/test_builtins.cmd | 5 +++++ programs/cmd/tests/test_builtins.cmd.exp | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 347786d..3011e4d 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -70,6 +70,11 @@ if 1 == 0 ( ) else ( echo else seems to work ) +if /c==/c ( + echo if seems not to detect /c as parameter +) else ( + echo parameter detection seems to be broken +) echo Testing case sensitivity with and without /i option if bar==BAR echo if does not default to case sensitivity if not bar==BAR echo if seems to default to case sensitivity diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 2e2bf84..229adc4 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -74,6 +74,7 @@ P0S if/else should work with blocks if seems to work else seems to work +(a)todo_wine@if seems not to detect /c as parameter Testing case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work

1 0

Andrew Eikum : winmm: Remove driver implementation of waveOut*.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: 901af51ea32f2d192a598808abab2d1b6a940773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=901af51ea32f2d192a598808a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jul 11 08:28:24 2011 -0500 winmm: Remove driver implementation of waveOut*. --- dlls/winmm/waveform.c | 213 ++++++++++--------------------------------------- 1 files changed, 43 insertions(+), 170 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=901af51ea32f2d192a598…

1 0