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

Misha Koshelev : d3dx9_36: Use cross-platform versions of infinity and NaN.
by Alexandre Julliard July 12, 2011

July 12, 2011

Module: wine Branch: master Commit: 14e93e79d6b58a7c9e9630379a22acca31fc3759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e93e79d6b58a7c9e9630379… Author: Misha Koshelev <misha680(a)gmail.com> Date: Sat Jul 9 12:35:31 2011 -0500 d3dx9_36: Use cross-platform versions of infinity and NaN. --- dlls/d3dx9_36/tests/math.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index dd214c2..0ca6150 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2218,6 +2218,9 @@ static void test_D3DXVec_Array(void) static void test_D3DXFloat_Array(void) { + static const float z = 0.0f; + float nnan = 0.0f/z; + float nan = -nnan; unsigned int i; void *out = NULL; D3DXFLOAT16 half; @@ -2248,10 +2251,10 @@ static void test_D3DXFloat_Array(void) { -65534.0f, 0xfc00, 0xfc00, -65536.0f, -65536.0f }, { -65535.0f, 0xfc00, 0xfc00, -65535.0f, -65536.0f }, { -65536.0f, 0xfc00, 0xfc00, -65536.0f, -65536.0f }, - { INFINITY, 0x7c00, 0x7fff, 65536.0f, 131008.0f }, - { -INFINITY, 0xffff, 0xffff, -131008.0f, -131008.0f }, - { NAN, 0x7fff, 0x7fff, 131008.0f, 131008.0f }, - { -NAN, 0xffff, 0xffff, -131008.0f, -131008.0f }, + { 1.0f/z, 0x7c00, 0x7fff, 65536.0f, 131008.0f }, + { -1.0f/z, 0xffff, 0xffff, -131008.0f, -131008.0f }, + { nan, 0x7fff, 0x7fff, 131008.0f, 131008.0f }, + { nnan, 0xffff, 0xffff, -131008.0f, -131008.0f }, { 0.0f, 0x0, 0x0, 0.0f, 0.0f }, { -0.0f, 0x8000, 0x8000, 0.0f, 0.0f }, { 2.9809595e-08f, 0x0, 0x0, 0.0f, 0.0f },

1 0

Jacek Caban : d3d10effect.h: Added missing D3D10_EFFECT_* flags.
by Alexandre Julliard July 12, 2011

July 12, 2011

Module: wine Branch: master Commit: 7379f31e4b7e7b1d5249815ff4e4a8819ee9d1a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7379f31e4b7e7b1d5249815ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 12 14:15:08 2011 +0200 d3d10effect.h: Added missing D3D10_EFFECT_* flags. --- include/d3d10effect.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index e020583..772d424 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -127,6 +127,10 @@ typedef struct _D3D10_PASS_SHADER_DESC UINT ShaderIndex; } D3D10_PASS_SHADER_DESC; +#define D3D10_EFFECT_COMPILE_CHILD_EFFECT 0x0001 +#define D3D10_EFFECT_COMPILE_ALLOW_SLOW_OPS 0x0002 +#define D3D10_EFFECT_SINGLE_THREADED 0x0008 + DEFINE_GUID(IID_ID3D10EffectType, 0x4e9e1ddc, 0xcd9d, 0x4772, 0xa8, 0x37, 0x00, 0x18, 0x0b, 0x9b, 0x88, 0xfd); #define INTERFACE ID3D10EffectType

1 0

Jay Yang : shell32: Make IExplorerBrowser respond to CWM_GETISHELLBROWSER.
by Alexandre Julliard July 12, 2011

July 12, 2011

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

Frédéric Delanoy : cmd/tests: Add basic mkdir tests.
by Alexandre Julliard July 12, 2011

July 12, 2011

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

Andrew Eikum : winmm: Remove driver implementation of waveOut*.
by Alexandre Julliard July 12, 2011

July 12, 2011

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

André Hentschel : cmd/tests: Add test for parameter detection.
by Alexandre Julliard July 12, 2011

July 12, 2011

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

Frédéric Delanoy : cmd/tests: Add basic rmdir tests.
by Alexandre Julliard July 12, 2011

July 12, 2011

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

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard July 12, 2011

July 12, 2011

Module: wine Branch: master Commit: 16a044c34e651fe37543a3e4a6c389edc5307ccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=16a044c34e651fe37543a3e4a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 11 21:18:13 2011 +0200 po: Update French translation. --- po/fr.po | 41 +++++++++++++++++------------------------ 1 files changed, 17 insertions(+), 24 deletions(-) diff --git a/po/fr.po b/po/fr.po index 89aa430..8968ace 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6777,44 +6777,38 @@ msgstr "" "Aucun programme Windows n'est configuré pour ouvrir ce type de fichier." #: shell32.rc:255 -#, fuzzy msgid "Are you sure you wish to permanently delete '%1'?" -msgstr "Voulez-vous réellement supprimer « %1 » ?" +msgstr "Voulez-vous réellement supprimer définitivement « %1 » ?" #: shell32.rc:256 -#, fuzzy msgid "Are you sure you wish to permanently delete these %1 items?" -msgstr "Voulez-vous réellement supprimer ces %1 éléments ?" +msgstr "Voulez-vous réellement supprimer définitivement ces %1 éléments ?" #: shell32.rc:257 -#, fuzzy msgid "Confirm deletion" -msgstr "Confirmez la suppression du fichier" +msgstr "Confirmez la suppression" #: shell32.rc:258 -#, fuzzy msgid "" "A file already exists at the path %1.\n" "\n" "Do you want to replace it?" msgstr "" -"Ce fichier existe déjà.\n" +"Un fichier existe déjà dans le chemin %1.\n" "Voulez-vous le remplacer ?" #: shell32.rc:259 -#, fuzzy msgid "" "A folder already exists at the path %1.\n" "\n" "Do you want to replace it?" msgstr "" -"Ce fichier existe déjà.\n" +"Un dossier existe déjà dans le chemin %1.\n" "Voulez-vous le remplacer ?" #: shell32.rc:260 -#, fuzzy msgid "Confirm overwrite" -msgstr "Confirmez l'écrasement du fichier" +msgstr "Confirmez l'écrasement" #: shell32.rc:277 msgid "" @@ -8531,9 +8525,8 @@ msgid "Wine Explorer" msgstr "Explorateur de Wine" #: explorer.rc:29 -#, fuzzy msgid "Location:" -msgstr "Emplacement" +msgstr "Emplacement :" #: hostname.rc:27 msgid "Usage: hostname\n" @@ -9646,7 +9639,6 @@ msgid "Exports selected branch of the registry to a text file" msgstr "Exporte la branche du registre sélectionnée dans un fichier texte" #: start.rc:46 -#, fuzzy msgid "" "Start a program, or open a document in the program normally used for files " "with that suffix.\n" @@ -9670,22 +9662,23 @@ msgid "" "This is free software, and you are welcome to redistribute it\n" "under certain conditions; run 'start /L' for details.\n" msgstr "" -"Lance un programme, ou ouvre un document avec le programme normalement " +"Lancer un programme, ou ouvrir un document avec le programme normalement " "associé à cette extension.\n" "Usage :\n" "start [options] fichier_programme [...]\n" "start [options] fichier_document\n" "\n" "Options :\n" -"/M[inimized] Lance le programme minimisé.\n" -"/MAX[imized] Lance le programme maximisé.\n" -"/R[estored] Lance le programme normalement (ni minimisé ni " +"/M[inimized] Lancer le programme minimisé.\n" +"/MAX[imized] Lancer le programme maximisé.\n" +"/R[estored] Lancer le programme normalement (ni minimisé ni " "maximisé).\n" -"/W[ait] Attend que le programme lancé se termine, et renvoie " -"ensuite son code de sortie.\n" -"/ProgIDOpen progID Ouvre un document en utilisant le programme identifié par " -"progID.\n" -"/L Affiche la licence d'utilisation.\n" +"/W[ait] Attendre que le programme lancé se termine, puis renvoyer " +"son code de sortie.\n" +"/ProgIDOpen progID Ouvrir un document en utilisant le programme identifié " +"par progID.\n" +"/L Afficher la licence d'utilisation.\n" +"/? Afficher cette aide et se terminer.\n" "\n" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" "Start est fourni sans AUCUNE GARANTIE ; pour les détails lancez avec "

1 0

Andrew Eikum : winmm: Implement waveOut* on top of MMDevAPI.
by Alexandre Julliard July 12, 2011

July 12, 2011

Module: wine Branch: master Commit: be158e48ad8ee556941bd3f1ff94ca7116680d00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be158e48ad8ee556941bd3f1f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jul 11 08:28:30 2011 -0500 winmm: Implement waveOut* on top of MMDevAPI. --- dlls/winmm/Makefile.in | 2 +- dlls/winmm/waveform.c | 2142 +++++++++++++++++++++++++++++++++++++++++++++--- dlls/winmm/winemm.h | 2 + dlls/winmm/winmm.c | 2 +- 4 files changed, 2042 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be158e48ad8ee556941bd…

1 0

Frédéric Delanoy : cmd/tests: Add mkdir tests for trailing backslashes and invalid chars handling.
by Alexandre Julliard July 12, 2011

July 12, 2011

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