December 2012 - Wine-Commits

Jason Edmeades : cmd: Add more tests for set /a.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: 51c4411a158d44cfee56487a37fc066503f2c431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c4411a158d44cfee56487a3… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Dec 13 20:47:16 2012 +0000 cmd: Add more tests for set /a. --- programs/cmd/tests/test_builtins.cmd | 135 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 83 ++++++++++++++++++ 2 files changed, 218 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 6cf2ecb..508691e 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1131,6 +1131,141 @@ set /a WINE_foo=WINE_bar=5, WINE_bar ^|= 2 & call :checkenvvars WINE_foo 5 WINE_ set /a WINE_foo=WINE_bar=5, WINE_bar ^^= 2 & call :checkenvvars WINE_foo 5 WINE_bar 7 set WINE_baz=4 set /a WINE_foo=WINE_bar=19, WINE_bar %%= 4 + (WINE_baz %%= 7) & call :checkenvvars WINE_foo 19 WINE_bar 3 WINE_baz 4 +echo --- quotes +set /a WINE_foo=1 +call :checkenvvars WINE_foo 1 +set /a "WINE_foo=1" +call :checkenvvars WINE_foo 1 +set /a WINE_foo=1,WINE_bar=2 +call :checkenvvars WINE_foo 1 WINE_bar 2 +set /a "WINE_foo=1,WINE_bar=2" +call :checkenvvars WINE_foo 1 WINE_bar 2 +set /a "WINE_foo=1","WINE_bar=2" +call :checkenvvars WINE_foo 1 WINE_bar 2 +set /a ""WINE_foo=1","WINE_bar=2"" +call :checkenvvars WINE_foo 1 WINE_bar 2 +set /a WINE_foo=1,WINE_bar=2,WINE_baz=3 +call :checkenvvars WINE_foo 1 WINE_bar 2 WINE_baz 3 +set /a "WINE_foo=1,WINE_bar=2,WINE_baz=3" +call :checkenvvars WINE_foo 1 WINE_bar 2 WINE_baz 3 +set /a "WINE_foo=1","WINE_bar=2","WINE_baz=3" +call :checkenvvars WINE_foo 1 WINE_bar 2 WINE_baz 3 +set /a ""WINE_foo=1","WINE_bar=2","WINE_baz=3"" +call :checkenvvars WINE_foo 1 WINE_bar 2 WINE_baz 3 +set /a ""WINE_foo=1","WINE_bar=2"","WINE_baz=3" +call :checkenvvars WINE_foo 1 WINE_bar 2 WINE_baz 3 +set /a """"""WINE_foo=1"""""" +call :checkenvvars WINE_foo 1 +set /a """"""WINE_foo=1","WINE_bar=5""","WINE_baz=2"" +call :checkenvvars WINE_foo 1 WINE_bar 5 WINE_baz 2 +set /a WINE_foo="3"+"4"+"5+6" +call :checkenvvars WINE_foo 18 +set WINE_foo=3 +set /a WINE_bar="WINE_""foo"+4 +call :checkenvvars WINE_foo 3 WINE_bar 7 +echo --- whitespace are ignored between double char operators +set WINE_foo=4 +set WINE_bar=5 +set /a WINE_foo + = 6 +set /a WINE_bar * = WINE_foo +call :checkenvvars WINE_foo 10 WINE_bar 50 +set WINE_foo=4 +set WINE_bar=5 +set /a WINE_foo + = "6 < < 7" +set /a WINE_bar * = WINE_foo + WINE_foo +call :checkenvvars WINE_foo 772 WINE_bar 7720 +set /a WINE_foo=6 7 +set /a WINE_ var1=8 +set WINE_foo= +echo --- invalid operator sequence +set WINE_foo=4 +set /a =4 +set /a *=4 +set /a ^>=4" +set /a ^<=4" +set /a WINE_foo^>^<=4 +echo %WINE_foo% +set /a WINE_foo^>^>^>=4 +echo %WINE_foo% +echo ----- negative prefix +set /a WINE_foo=-1 +call :checkenvvars WINE_foo -1 +set /a WINE_foo=--1 +call :checkenvvars WINE_foo 1 +set /a WINE_foo=3--3 +call :checkenvvars WINE_foo 6 +set /a WINE_foo=3---3 +call :checkenvvars WINE_foo 0 +set /a WINE_foo=3----3 +call :checkenvvars WINE_foo 6 +set /a WINE_foo=-~1 +call :checkenvvars WINE_foo 2 +set /a WINE_foo=~-1 +call :checkenvvars WINE_foo 0 +set /a WINE_foo=3+-~1 +call :checkenvvars WINE_foo 5 +set /a WINE_foo=3+~-1 +call :checkenvvars WINE_foo 3 +echo ----- assignment tests involving the end destination +set WINE_foo=3 +set /a WINE_foo+=3+(WINE_foo=4) +call :checkenvvars WINE_foo 11 +set WINE_foo=2 +set /a WINE_bar=3+(WINE_foo=6) +call :checkenvvars WINE_foo 6 WINE_bar 9 +set WINE_foo=2 +set /a WINE_bar=3+(WINE_foo=6,WINE_baz=7) +call :checkenvvars WINE_foo 6 WINE_bar 10 WINE_baz 7 +set WINE_foo=2 +set /a WINE_bar=WINE_foo=7 +call :checkenvvars WINE_foo 7 WINE_bar 7 +echo ----- equal precedence on stack +rem Unary - dont reduce if precedence is equal +set /a WINE_foo=!!1 +call :checkenvvars WINE_foo 1 +set /a WINE_foo=!!0 +call :checkenvvars WINE_foo 0 +set /a WINE_foo=~~1 +call :checkenvvars WINE_foo 1 +set /a WINE_foo=~~0 +call :checkenvvars WINE_foo 0 +set /a WINE_foo=--1 +call :checkenvvars WINE_foo 1 +set /a WINE_foo=+-1 +call :checkenvvars WINE_foo -1 +set /a WINE_foo=-+1 +call :checkenvvars WINE_foo -1 +set /a WINE_foo=++1 +call :checkenvvars WINE_foo 1 +set /a WINE_foo=!~1 +call :checkenvvars WINE_foo 0 +set /a WINE_foo=~!1 +call :checkenvvars WINE_foo -1 +set /a WINE_foo=!-1 +call :checkenvvars WINE_foo 0 +set /a WINE_foo=-!1 +call :checkenvvars WINE_foo 0 +set /a WINE_foo=!-0 +call :checkenvvars WINE_foo 1 +set /a WINE_foo=-!0 +call :checkenvvars WINE_foo -1 +rem Aritmatic - Reduce if precedence is equal +set /a WINE_foo=10*5/2 +call :checkenvvars WINE_foo 25 +set /a WINE_foo=5/2*10 +call :checkenvvars WINE_foo 20 +set /a WINE_foo=10/5/2 +call :checkenvvars WINE_foo 1 +set /a WINE_foo=5%%2*4 +call :checkenvvars WINE_foo 4 +set /a WINE_foo=10-5+2 +call :checkenvvars WINE_foo 7 +set /a WINE_foo=1^<^<4^>^>1 +call :checkenvvars WINE_foo 8 +rem Assignment - dont reduce if precedence is equal +set /a WINE_foo=5 +set /a WINE_bar=WINE_foo=6 +call :checkenvvars WINE_foo 6 WINE_bar 6 echo --- for /F mkdir foobar & cd foobar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index fd59c31..9e7f30b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -800,6 +800,89 @@ WINE_bar correctly 4 @todo_wine(a)WINE_foo correctly 19(a)or_broken@ERROR: WINE_foo incorrectly 0 [19] @todo_wine(a)WINE_bar correctly 3(a)or_broken@ERROR: WINE_bar incorrectly [3] WINE_baz correctly 4 +--- quotes +(a)todo_wine@WINE_foo correctly 1 +(a)todo_wine@WINE_foo correctly 1 +(a)todo_wine@WINE_foo correctly 1 +(a)todo_wine@WINE_bar correctly 2 +(a)todo_wine@WINE_foo correctly 1 +(a)todo_wine@WINE_bar correctly 2 +(a)todo_wine@WINE_foo correctly 1 +(a)todo_wine@WINE_bar correctly 2 +(a)todo_wine@WINE_foo correctly 1 +(a)todo_wine@WINE_bar correctly 2 +(a)todo_wine@WINE_foo correctly 1 +(a)todo_wine@WINE_bar correctly 2 +(a)todo_wine@WINE_baz correctly 3 +(a)todo_wine@WINE_foo correctly 1 +(a)todo_wine@WINE_bar correctly 2 +(a)todo_wine@WINE_baz correctly 3 +(a)todo_wine@WINE_foo correctly 1 +(a)todo_wine@WINE_bar correctly 2 +(a)todo_wine@WINE_baz correctly 3 +(a)todo_wine@WINE_foo correctly 1 +(a)todo_wine@WINE_bar correctly 2 +(a)todo_wine@WINE_baz correctly 3 +(a)todo_wine@WINE_foo correctly 1 +(a)todo_wine@WINE_bar correctly 2 +(a)todo_wine@WINE_baz correctly 3 +(a)todo_wine@WINE_foo correctly 1 +(a)todo_wine@WINE_foo correctly 1 +(a)todo_wine@WINE_bar correctly 5 +(a)todo_wine@WINE_baz correctly 2 +(a)todo_wine@WINE_foo correctly 18 +WINE_foo correctly 3 +(a)todo_wine@WINE_bar correctly 7(a)or_broken@ERROR: WINE_bar incorrectly 4 [7] +--- whitespace are ignored between double char operators +(a)todo_wine@WINE_foo correctly 10(a)or_broken@ERROR: WINE_foo incorrectly 4 [10] +(a)todo_wine@WINE_bar correctly 50(a)or_broken@ERROR: WINE_bar incorrectly 5 [50] +(a)todo_wine@WINE_foo correctly 772(a)or_broken@ERROR: WINE_foo incorrectly 4 [772] +(a)todo_wine@WINE_bar correctly 7720(a)or_broken@ERROR: WINE_bar incorrectly 5 [7720] +--- invalid operator sequence +4 +4 +----- negative prefix +(a)todo_wine@WINE_foo correctly -1 +(a)todo_wine@WINE_foo correctly 1(a)or_broken@ERROR: WINE_foo incorrectly [1] +(a)todo_wine@WINE_foo correctly 6 +(a)todo_wine@WINE_foo correctly 0 +(a)todo_wine@WINE_foo correctly 6 +(a)todo_wine@WINE_foo correctly 2 +(a)todo_wine@WINE_foo correctly 0(a)or_broken@ERROR: WINE_foo incorrectly [0] +(a)todo_wine@WINE_foo correctly 5 +(a)todo_wine@WINE_foo correctly 3(a)or_broken@ERROR: WINE_foo incorrectly -5 [3] +----- assignment tests involving the end destination +(a)todo_wine@WINE_foo correctly 11(a)or_broken@ERROR: WINE_foo incorrectly 3 [11] +(a)todo_wine@WINE_foo correctly 6(a)or_broken@ERROR: WINE_foo incorrectly 2 [6] +(a)todo_wine@WINE_bar correctly 9(a)or_broken@ERROR: WINE_bar incorrectly [9] +(a)todo_wine@WINE_foo correctly 6(a)or_broken@ERROR: WINE_foo incorrectly 2 [6] +(a)todo_wine@WINE_bar correctly 10(a)or_broken@ERROR: WINE_bar incorrectly [10] +(a)todo_wine@WINE_baz correctly 7(a)or_broken@ERROR: WINE_baz incorrectly [7] +(a)todo_wine@WINE_foo correctly 7(a)or_broken@ERROR: WINE_foo incorrectly 2 [7] +(a)todo_wine@WINE_bar correctly 7(a)or_broken@ERROR: WINE_bar incorrectly 2 [7] +----- equal precedence on stack +(a)todo_wine@WINE_foo correctly 1(a)or_broken@ERROR: WINE_foo incorrectly 0 [1] +(a)todo_wine@WINE_foo correctly 0 +(a)todo_wine@WINE_foo correctly 1(a)or_broken@ERROR: WINE_foo incorrectly [1] +(a)todo_wine@WINE_foo correctly 0(a)or_broken@ERROR: WINE_foo incorrectly [0] +(a)todo_wine@WINE_foo correctly 1(a)or_broken@ERROR: WINE_foo incorrectly [1] +(a)todo_wine@WINE_foo correctly -1(a)or_broken@ERROR: WINE_foo incorrectly [-1] +(a)todo_wine@WINE_foo correctly -1(a)or_broken@ERROR: WINE_foo incorrectly [-1] +(a)todo_wine@WINE_foo correctly 1(a)or_broken@ERROR: WINE_foo incorrectly [1] +(a)todo_wine@WINE_foo correctly 0(a)or_broken@ERROR: WINE_foo incorrectly [0] +(a)todo_wine@WINE_foo correctly -1 +(a)todo_wine@WINE_foo correctly 0(a)or_broken@ERROR: WINE_foo incorrectly -1 [0] +(a)todo_wine@WINE_foo correctly 0 +(a)todo_wine@WINE_foo correctly 1(a)or_broken@ERROR: WINE_foo incorrectly 0 [1] +(a)todo_wine@WINE_foo correctly -1(a)or_broken@ERROR: WINE_foo incorrectly 0 [-1] +(a)todo_wine@WINE_foo correctly 25(a)or_broken@ERROR: WINE_foo incorrectly 20 [25] +(a)todo_wine@WINE_foo correctly 20 +(a)todo_wine@WINE_foo correctly 1 +(a)todo_wine@WINE_foo correctly 4 +(a)todo_wine@WINE_foo correctly 7 +(a)todo_wine@WINE_foo correctly 8(a)or_broken@ERROR: WINE_foo incorrectly 4 [8] +(a)todo_wine@WINE_foo correctly 6(a)or_broken@ERROR: WINE_foo incorrectly 5 [6] +(a)todo_wine@WINE_bar correctly 6(a)or_broken@ERROR: WINE_bar incorrectly 5 [6] --- for /F ------ string argument a

1 0

Detlef Riekenberg : api-ms-win-downlevel-shell32-l1-1-0: Add dll.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: 7d6e592b0bde71ff55afaefbe409e88e78267475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d6e592b0bde71ff55afaefbe… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Dec 21 00:27:18 2012 +0100 api-ms-win-downlevel-shell32-l1-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 +++ .../api-ms-win-downlevel-shell32-l1-1-0.spec | 3 +++ tools/make_specfiles | 4 ++++ 5 files changed, 12 insertions(+), 0 deletions(-) diff --git a/configure b/configure index fe74262..5808a49 100755 --- a/configure +++ b/configure @@ -15353,6 +15353,7 @@ wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-normaliz-l1-1-0 enable_api_ms_win_downlevel_normaliz_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-ole32-l1-1-0 enable_api_ms_win_downlevel_ole32_l1_1_0 +wine_fn_config_dll api-ms-win-downlevel-shell32-l1-1-0 enable_api_ms_win_downlevel_shell32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-shlwapi-l1-1-0 enable_api_ms_win_downlevel_shlwapi_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-shlwapi-l2-1-0 enable_api_ms_win_downlevel_shlwapi_l2_1_0 wine_fn_config_dll api-ms-win-downlevel-user32-l1-1-0 enable_api_ms_win_downlevel_user32_l1_1_0 diff --git a/configure.ac b/configure.ac index 8d4dfb1..970a393 100644 --- a/configure.ac +++ b/configure.ac @@ -2532,6 +2532,7 @@ WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-normaliz-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-ole32-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-downlevel-shell32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l2-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-user32-l1-1-0) diff --git a/dlls/api-ms-win-downlevel-shell32-l1-1-0/Makefile.in b/dlls/api-ms-win-downlevel-shell32-l1-1-0/Makefile.in new file mode 100644 index 0000000..a983199 --- /dev/null +++ b/dlls/api-ms-win-downlevel-shell32-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-downlevel-shell32-l1-1-0.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec b/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec new file mode 100644 index 0000000..9e51a4a --- /dev/null +++ b/dlls/api-ms-win-downlevel-shell32-l1-1-0/api-ms-win-downlevel-shell32-l1-1-0.spec @@ -0,0 +1,3 @@ +@ stdcall CommandLineToArgvW(wstr ptr) shell32.CommandLineToArgvW +@ stub GetCurrentProcessExplicitAppUserModelID +@ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) shell32.SetCurrentProcessExplicitAppUserModelID diff --git a/tools/make_specfiles b/tools/make_specfiles index 80c132d..8a697cc 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -129,6 +129,10 @@ my @dll_groups = "api-ms-win-downlevel-ole32-l1-1-0", ], [ + "shell32", + "api-ms-win-downlevel-shell32-l1-1-0", + ], + [ "shlwapi", "api-ms-win-downlevel-shlwapi-l1-1-0", "api-ms-win-downlevel-shlwapi-l2-1-0",

1 0

Detlef Riekenberg : api-ms-win-downlevel-advapi32-l2-1-0: Add dll.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: 71e11c0c1a04c58a3533c02602cbe3efa655f02b URL: http://source.winehq.org/git/wine.git/?a=commit;h=71e11c0c1a04c58a3533c0260… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Dec 21 00:27:19 2012 +0100 api-ms-win-downlevel-advapi32-l2-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 +++ .../api-ms-win-downlevel-advapi32-l2-1-0.spec | 14 ++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 20 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 5808a49..aeffaf0 100755 --- a/configure +++ b/configure @@ -15351,6 +15351,7 @@ wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 +wine_fn_config_dll api-ms-win-downlevel-advapi32-l2-1-0 enable_api_ms_win_downlevel_advapi32_l2_1_0 wine_fn_config_dll api-ms-win-downlevel-normaliz-l1-1-0 enable_api_ms_win_downlevel_normaliz_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-ole32-l1-1-0 enable_api_ms_win_downlevel_ole32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-shell32-l1-1-0 enable_api_ms_win_downlevel_shell32_l1_1_0 diff --git a/configure.ac b/configure.ac index 970a393..48bb522 100644 --- a/configure.ac +++ b/configure.ac @@ -2530,6 +2530,7 @@ WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l2-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-normaliz-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-ole32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-shell32-l1-1-0) diff --git a/dlls/api-ms-win-downlevel-advapi32-l2-1-0/Makefile.in b/dlls/api-ms-win-downlevel-advapi32-l2-1-0/Makefile.in new file mode 100644 index 0000000..0436d43 --- /dev/null +++ b/dlls/api-ms-win-downlevel-advapi32-l2-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-downlevel-advapi32-l2-1-0.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-downlevel-advapi32-l2-1-0/api-ms-win-downlevel-advapi32-l2-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l2-1-0/api-ms-win-downlevel-advapi32-l2-1-0.spec new file mode 100644 index 0000000..96e1a04 --- /dev/null +++ b/dlls/api-ms-win-downlevel-advapi32-l2-1-0/api-ms-win-downlevel-advapi32-l2-1-0.spec @@ -0,0 +1,14 @@ +@ stdcall CloseServiceHandle(long) advapi32.CloseServiceHandle +@ stdcall ConvertSidToStringSidW(ptr ptr) advapi32.ConvertSidToStringSidW +@ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) advapi32.ConvertStringSecurityDescriptorToSecurityDescriptorW +@ stdcall ConvertStringSidToSidW(ptr ptr) advapi32.ConvertStringSidToSidW +@ stdcall CredDeleteW(wstr long long) advapi32.CredDeleteW +@ stdcall CredEnumerateW(wstr long ptr ptr) advapi32.CredEnumerateW +@ stdcall CredFree(ptr) advapi32.CredFree +@ stdcall CredReadDomainCredentialsW(ptr long ptr ptr) advapi32.CredReadDomainCredentialsW +@ stdcall CredReadW(wstr long long ptr) advapi32.CredReadW +@ stub CredWriteDomainCredentialsW +@ stdcall CredWriteW(ptr long) advapi32.CredWriteW +@ stdcall OpenSCManagerW(wstr wstr long) advapi32.OpenSCManagerW +@ stdcall OpenServiceW(long wstr long) advapi32.OpenServiceW +@ stdcall QueryServiceConfigW(long ptr long ptr) advapi32.QueryServiceConfigW diff --git a/tools/make_specfiles b/tools/make_specfiles index 8a697cc..b87376b 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -119,6 +119,7 @@ my @dll_groups = [ "advapi32", "api-ms-win-downlevel-advapi32-l1-1-0", + "api-ms-win-downlevel-advapi32-l2-1-0", ], [ "kernel32",

1 0

Andrew Talbot : rsaenh: Indentation fix.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: d7d1e402403632a4b75b8056b88ef7b6573be926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7d1e402403632a4b75b8056b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 20 19:41:46 2012 +0000 rsaenh: Indentation fix. --- dlls/rsaenh/mpi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index 055da3d..6662527 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -3519,8 +3519,8 @@ mp_read_unsigned_bin (mp_int * a, const unsigned char *b, int c) return res; } - a->dp[0] |= *b++; - a->used += 1; + a->dp[0] |= *b++; + a->used += 1; } mp_clamp (a); return MP_OKAY;

1 0

Andrew Talbot : shell32: Indentation fix.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: 1d7a407f6d2b90f661ca1da3e544930d3c913e70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d7a407f6d2b90f661ca1da3e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 20 21:55:34 2012 +0000 shell32: Indentation fix. --- dlls/shell32/classes.c | 14 ++++++------ dlls/shell32/control.c | 2 +- dlls/shell32/debughlp.c | 48 ++++++++++++++++++++++---------------------- dlls/shell32/enumidlist.c | 4 +- dlls/shell32/shlview.c | 26 ++++++++++++------------ 5 files changed, 47 insertions(+), 47 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index a56af62..10ff970 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -56,9 +56,9 @@ BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, LONG len, BOOL TRACE("%s %p\n", debugstr_w(szExtension), szFileType); - /* added because we do not want to have double dots */ - if (szExtension[0] == '.') - bPrependDot = 0; + /* added because we do not want to have double dots */ + if (szExtension[0] == '.') + bPrependDot = 0; if (bPrependDot) szTemp[0] = '.'; @@ -90,9 +90,9 @@ BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, LONG len, BOOL bP TRACE("%s %p\n", szExtension, szFileType); - /* added because we do not want to have double dots */ - if (szExtension[0] == '.') - bPrependDot = 0; + /* added because we do not want to have double dots */ + if (szExtension[0] == '.') + bPrependDot = 0; if (bPrependDot) szTemp[0] = '.'; @@ -252,7 +252,7 @@ static BOOL HCR_RegGetDefaultIconA(HKEY hkey, LPSTR szDest, DWORD len, int* pico if (!RegQueryValueExA(hkey, NULL, 0, &dwType, (LPBYTE)szDest, &len)) { - if (dwType == REG_EXPAND_SZ) + if (dwType == REG_EXPAND_SZ) { ExpandEnvironmentStringsA(szDest, sTemp, MAX_PATH); lstrcpynA(szDest, sTemp, len); diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 505aff5..659a871 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -759,7 +759,7 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) } } if (ch == '\0') break; - beg = end + 1; + beg = end + 1; if (ch == ' ') while (end[1] == ' ') end++; } end++; diff --git a/dlls/shell32/debughlp.c b/dlls/shell32/debughlp.c index f5d64c3..3d417f8 100644 --- a/dlls/shell32/debughlp.c +++ b/dlls/shell32/debughlp.c @@ -259,21 +259,21 @@ void _dbg_ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize) void pdump (LPCITEMIDLIST pidl) { - LPCITEMIDLIST pidltemp = pidl; + LPCITEMIDLIST pidltemp = pidl; - if (!TRACE_ON(pidl)) return; + if (!TRACE_ON(pidl)) return; - if (! pidltemp) - { - MESSAGE ("-------- pidl=NULL (Desktop)\n"); - } - else - { - MESSAGE ("-------- pidl=%p\n", pidl); - if (pidltemp->mkid.cb) - { - do - { + if (! pidltemp) + { + MESSAGE ("-------- pidl=NULL (Desktop)\n"); + } + else + { + MESSAGE ("-------- pidl=%p\n", pidl); + if (pidltemp->mkid.cb) + { + do + { if (_ILIsUnicode(pidltemp)) { DWORD dwAttrib = 0; @@ -309,16 +309,16 @@ void pdump (LPCITEMIDLIST pidl) debugstr_a(szName), debugstr_a(szLongName), debugstr_a(szShortName)); } - pidltemp = _dbg_ILGetNext(pidltemp); + pidltemp = _dbg_ILGetNext(pidltemp); - } while (pidltemp && pidltemp->mkid.cb); - } - else - { - MESSAGE ("empty pidl (Desktop)\n"); - } - pcheck(pidl); - } + } while (pidltemp && pidltemp->mkid.cb); + } + else + { + MESSAGE ("empty pidl (Desktop)\n"); + } + pcheck(pidl); + } } static void dump_pidl_hex( LPCITEMIDLIST pidl ) diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index 8ee789b..6c705af 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -45,8 +45,8 @@ BOOL AddToEnumList(IEnumIDListImpl *This, LPITEMIDLIST pidl) TRACE("(%p)->(pidl=%p)\n",This,pidl); - if (!This || !pidl) - return FALSE; + if (!This || !pidl) + return FALSE; pNew = SHAlloc(sizeof(*pNew)); if(pNew) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 4f488ca..7738694 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -380,19 +380,19 @@ static BOOL ShellView_CreateList (IShellViewImpl * This) This->ListViewSortInfo.nHeaderID = -1; This->ListViewSortInfo.nLastHeaderID = -1; - if (This->FolderSettings.fFlags & FWF_DESKTOP) { - /* - * FIXME: look at the registry value - * HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ListviewShadow - * and activate drop shadows if necessary - */ - if (0) - SendMessageW(This->hWndList, LVM_SETTEXTBKCOLOR, 0, CLR_NONE); - else - SendMessageW(This->hWndList, LVM_SETTEXTBKCOLOR, 0, GetSysColor(COLOR_DESKTOP)); - - SendMessageW(This->hWndList, LVM_SETTEXTCOLOR, 0, RGB(255,255,255)); - } + if (This->FolderSettings.fFlags & FWF_DESKTOP) { + /* + * FIXME: look at the registry value + * HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ListviewShadow + * and activate drop shadows if necessary + */ + if (0) + SendMessageW(This->hWndList, LVM_SETTEXTBKCOLOR, 0, CLR_NONE); + else + SendMessageW(This->hWndList, LVM_SETTEXTBKCOLOR, 0, GetSysColor(COLOR_DESKTOP)); + + SendMessageW(This->hWndList, LVM_SETTEXTCOLOR, 0, RGB(255,255,255)); + } /* UpdateShellSettings(); */ return TRUE;

1 0

Andrew Talbot : oleaut32: Indentation fix.
by Alexandre Julliard Dec. 21, 2012

Dec. 21, 2012

Module: wine Branch: master Commit: b2b4bb9a1279e16e1a87f6f78dc9496583838ca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2b4bb9a1279e16e1a87f6f78… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 20 19:35:35 2012 +0000 oleaut32: Indentation fix. --- dlls/oleaut32/tmarshal.c | 4 ++-- dlls/oleaut32/variant.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 8b47eed..2324fbb 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -1208,7 +1208,7 @@ deserialize_param( ); return S_OK; } - case VT_SAFEARRAY: { + case VT_SAFEARRAY: { if (readit) { ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); @@ -1630,7 +1630,7 @@ static ULONG WINAPI TMarshalDispatchChannel_Release(LPRPCCHANNELBUFFER iface) if (ref) return ref; - IRpcChannelBuffer_Release(This->pDelegateChannel); + IRpcChannelBuffer_Release(This->pDelegateChannel); HeapFree(GetProcessHeap(), 0, This); return 0; } diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 21a2758..c343578 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -3131,9 +3131,9 @@ HRESULT WINAPI VarAnd(LPVARIANT left, LPVARIANT right, LPVARIANT result) LOCALE_USER_DEFAULT, 0, &d))) hres = VariantChangeType(&varLeft,&varLeft, VARIANT_LOCALBOOL, VT_BOOL); - if (SUCCEEDED(hres) && V_VT(&varLeft) != resvt) - hres = VariantChangeType(&varLeft,&varLeft,0,resvt); - if (FAILED(hres)) goto VarAnd_Exit; + if (SUCCEEDED(hres) && V_VT(&varLeft) != resvt) + hres = VariantChangeType(&varLeft,&varLeft,0,resvt); + if (FAILED(hres)) goto VarAnd_Exit; } if (resvt == VT_I4 && V_VT(&varRight) == VT_UI4)

1 0

Christian Costa : dmloader: Use dump_DMUS_OBJECTDESC to dump data to avoid truncation in TRACE.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: cdf727ebd10e15f92f3578410b43498fbd0b8118 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf727ebd10e15f92f3578410… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Dec 19 09:57:38 2012 +0100 dmloader: Use dump_DMUS_OBJECTDESC to dump data to avoid truncation in TRACE. --- dlls/dmloader/container.c | 6 ++++-- dlls/dmloader/debug.c | 40 ++++++++++++++++++---------------------- dlls/dmloader/debug.h | 2 +- dlls/dmloader/loader.c | 25 +++++++++++++++++++------ 4 files changed, 42 insertions(+), 31 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index 1c8bf31..68ee573 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -420,8 +420,10 @@ static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicObject_ParseDescript } } - TRACE(": returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC(pDesc)); - return S_OK; + TRACE(": returning descriptor:\n"); + if (TRACE_ON(dmloader)) + dump_DMUS_OBJECTDESC(pDesc); + return S_OK; } static const IDirectMusicObjectVtbl DirectMusicContainer_Object_Vtbl = { diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 95c5df2..9e5c576 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -22,6 +22,8 @@ #include "dmloader_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(dmloader); + /* figures out whether given FOURCC is valid DirectMusic form ID */ BOOL IS_VALID_DMFORM (FOURCC chunkID) { if ((chunkID == DMUS_FOURCC_AUDIOPATH_FORM) || (chunkID == DMUS_FOURCC_BAND_FORM) || (chunkID == DMUS_FOURCC_CHORDMAP_FORM) @@ -479,28 +481,22 @@ static const char *debugstr_DMUS_CONTAINED_OBJF_FLAGS (DWORD flagmask) { return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0])); } -const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { - if (pDesc) { - char buffer[1024], *ptr = buffer; - - ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):", pDesc); - ptr += sprintf(ptr, "\n - dwSize = 0x%08X", pDesc->dwSize); - ptr += sprintf(ptr, "\n - dwValidData = 0x%08X (%s)", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); - if (pDesc->dwValidData & DMUS_OBJ_CLASS) ptr += sprintf(ptr, "\n - guidClass = %s", debugstr_dmguid(&pDesc->guidClass)); - if (pDesc->dwValidData & DMUS_OBJ_OBJECT) ptr += sprintf(ptr, "\n - guidObject = %s", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) ptr += sprintf(ptr, "\n - ftDate = %s", debugstr_filetime (&pDesc->ftDate)); - if (pDesc->dwValidData & DMUS_OBJ_VERSION) ptr += sprintf(ptr, " - vVersion = %s", debugstr_dmversion(&pDesc->vVersion)); - if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, "\n - wszName = %s", debugstr_w(pDesc->wszName)); - if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, "\n - wszCategory = %s", debugstr_w(pDesc->wszCategory)); - if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, "\n - wszFileName = %s", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, "\n - llMemLength = 0x%s\n - pbMemData = %p", - wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); - if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, "\n - pStream = %p", pDesc->pStream); - - return wine_dbg_sprintf("%s", buffer); - } else { - return wine_dbg_sprintf("(NULL)"); - } +/* Dump whole DMUS_OBJECTDESC struct */ +void dump_DMUS_OBJECTDESC(LPDMUS_OBJECTDESC desc) +{ + TRACE("DMUS_OBJECTDESC (%p):\n", desc); + TRACE(" - dwSize = %d\n", desc->dwSize); + TRACE(" - dwValidData = %s\n", debugstr_DMUS_OBJ_FLAGS (desc->dwValidData)); + if (desc->dwValidData & DMUS_OBJ_CLASS) TRACE(" - guidClass = %s\n", debugstr_dmguid(&desc->guidClass)); + if (desc->dwValidData & DMUS_OBJ_OBJECT) TRACE(" - guidObject = %s\n", debugstr_guid(&desc->guidObject)); + if (desc->dwValidData & DMUS_OBJ_DATE) TRACE(" - ftDate = %s\n", debugstr_filetime (&desc->ftDate)); + if (desc->dwValidData & DMUS_OBJ_VERSION) TRACE(" - vVersion = %s\n", debugstr_dmversion(&desc->vVersion)); + if (desc->dwValidData & DMUS_OBJ_NAME) TRACE(" - wszName = %s\n", debugstr_w(desc->wszName)); + if (desc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); + if (desc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); + if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s\n - pbMemData = %p\n", + wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); + if (desc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", desc->pStream); } const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader) { diff --git a/dlls/dmloader/debug.h b/dlls/dmloader/debug.h index 546d643..40af340 100644 --- a/dlls/dmloader/debug.h +++ b/dlls/dmloader/debug.h @@ -57,7 +57,7 @@ extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; extern const char *debugstr_dmreturn (DWORD code) DECLSPEC_HIDDEN; /* dump whole DMUS_OBJECTDESC struct */ -extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; +extern void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) DECLSPEC_HIDDEN; extern const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader) DECLSPEC_HIDDEN; extern const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT_HEADER pHeader) DECLSPEC_HIDDEN; diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index ffffd6a..9a4bddc 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -1,4 +1,5 @@ -/* IDirectMusicLoaderImpl +/* + * IDirectMusicLoaderImpl * * Copyright (C) 2003-2004 Rok Mandeljc * @@ -32,7 +33,9 @@ static HRESULT DMUSIC_SetLoaderSettings(IDirectMusicLoader8 *iface, REFGUID clas static HRESULT DMUSIC_CopyDescriptor(DMUS_OBJECTDESC *pDst, DMUS_OBJECTDESC *pSrc) { - TRACE(": copy\n%s\n", debugstr_DMUS_OBJECTDESC(pSrc)); + if (TRACE_ON(dmloader)) + dump_DMUS_OBJECTDESC(pSrc); + /* copy field by field */ if (pSrc->dwValidData & DMUS_OBJ_CLASS) pDst->guidClass = pSrc->guidClass; if (pSrc->dwValidData & DMUS_OBJ_OBJECT) pDst->guidObject = pSrc->guidObject; @@ -135,7 +138,10 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_GetObject(IDirectMusicLoader8 *ifac DMUS_OBJECTDESC GotDesc; BOOL bCache; - TRACE("(%p, %p, %s, %p): pDesc:\n%s\n", This, pDesc, debugstr_dmguid(riid), ppv, debugstr_DMUS_OBJECTDESC(pDesc)); + TRACE("(%p)->(%p, %s, %p)\n", This, pDesc, debugstr_dmguid(riid), ppv); + + if (TRACE_ON(dmloader)) + dump_DMUS_OBJECTDESC(pDesc); /* sometimes it happens that guidClass is missing... which is a BadThingTM */ if (!(pDesc->dwValidData & DMUS_OBJ_CLASS)) { @@ -385,7 +391,10 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac LPWINE_LOADER_ENTRY pObjectEntry, pNewEntry; HRESULT hr; - TRACE("(%p, %p): pDesc:\n%s\n", This, pDesc, debugstr_DMUS_OBJECTDESC(pDesc)); + TRACE("(%p)->(%p)\n", This, pDesc); + + if (TRACE_ON(dmloader)) + dump_DMUS_OBJECTDESC(pDesc); /* create stream and load additional info from it */ if (pDesc->dwValidData & DMUS_OBJ_FILENAME) { @@ -488,7 +497,9 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac } /* add new entry */ - TRACE(": adding alias entry with following info:\n%s\n", debugstr_DMUS_OBJECTDESC(pDesc)); + TRACE(": adding alias entry with following info:\n"); + if (TRACE_ON(dmloader)) + dump_DMUS_OBJECTDESC(pDesc); pNewEntry = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(WINE_LOADER_ENTRY)); /* use this function instead of pure memcpy due to streams (memcpy just copies pointer), which is basically used further by app that called SetDescriptor... better safety than exception */ @@ -671,7 +682,9 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ReleaseObject(IDirectMusicLoader8 * if ((Desc.dwValidData & DMUS_OBJ_OBJECT) && (pObjectEntry->Desc.dwValidData & (DMUS_OBJ_OBJECT | DMUS_OBJ_LOADED)) && IsEqualGUID (&Desc.guidObject, &pObjectEntry->Desc.guidObject)) { - TRACE(": found it by object GUID\n%s\n", debugstr_DMUS_OBJECTDESC(&pObjectEntry->Desc)); + TRACE(": found it by object GUID\n"); + if (TRACE_ON(dmloader)) + dump_DMUS_OBJECTDESC(&pObjectEntry->Desc); result = S_OK; break; }

1 0

Christian Costa : dmusic: Set instrument stream position where the instrument begins, not at the beginning of the instruments list. Simplify CustomLoad accordingly.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: f30c18f3d245f40a0aca8708b30431f9949ed6ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f30c18f3d245f40a0aca8708b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Dec 19 09:58:03 2012 +0100 dmusic: Set instrument stream position where the instrument begins, not at the beginning of the instruments list. Simplify CustomLoad accordingly. --- dlls/dmusic/collection.c | 7 +- dlls/dmusic/dmusic_private.h | 3 +- dlls/dmusic/instrument.c | 158 +++++++++++------------------------------ 3 files changed, 49 insertions(+), 119 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index e4ac798..5002c9e 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -118,7 +118,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_GetInstr if (patch == inst_patch) { *instrument = inst_entry->pInstrument; IDirectMusicInstrument_AddRef(inst_entry->pInstrument); - IDirectMusicInstrumentImpl_Custom_Load(inst_entry->pInstrument, This->pStm); + IDirectMusicInstrumentImpl_CustomLoad(inst_entry->pInstrument, This->pStm); TRACE(": returning instrument %p\n", *instrument); return S_OK; } @@ -665,10 +665,11 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST DMUSIC_CreateDirectMusicInstrumentImpl(&IID_IDirectMusicInstrument, (LPVOID*)&new_instrument->pInstrument, NULL); { IDirectMusicInstrumentImpl *instrument = impl_from_IDirectMusicInstrument(new_instrument->pInstrument); + /* Store offset and length, they will be needed when loading the instrument */ liMove.QuadPart = 0; IStream_Seek(stream, liMove, STREAM_SEEK_CUR, &dlibInstrumentPosition); - /* Store offset, it'll be needed later */ - instrument->liInstrumentPosition.QuadPart = dlibInstrumentPosition.QuadPart - (2 * sizeof(FOURCC) + sizeof(DWORD)); + instrument->liInstrumentPosition.QuadPart = dlibInstrumentPosition.QuadPart; + instrument->length = ListSize[1]; do { IStream_Read(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD), NULL); ListCount[1] += sizeof(FOURCC) + sizeof(DWORD) + chunk.dwSize; diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 3e625d6..3c05ceb 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -230,6 +230,7 @@ struct IDirectMusicInstrumentImpl { /* IDirectMusicInstrumentImpl fields */ LARGE_INTEGER liInstrumentPosition; /* offset in a stream where instrument chunk can be found */ + ULONG length; /* Length of the instrument in the stream */ LPGUID pInstrumentID; LPINSTHEADER pHeader; WCHAR wszName[DMUS_MAX_NAME]; @@ -242,7 +243,7 @@ static inline IDirectMusicInstrumentImpl *impl_from_IDirectMusicInstrument(IDire } /* custom :) */ -extern HRESULT IDirectMusicInstrumentImpl_Custom_Load (LPDIRECTMUSICINSTRUMENT iface, LPSTREAM pStm) DECLSPEC_HIDDEN; +extern HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, IStream *stream) DECLSPEC_HIDDEN; /********************************************************************** * Dll lifetime tracking declaration for dmusic.dll diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index 9c3d3d6..cc57313 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -156,140 +156,68 @@ static inline DWORD subtract_bytes(DWORD len, DWORD bytes) return len - bytes; } -static HRESULT load_instrument(IDirectMusicInstrumentImpl *This, IStream *stream, DWORD length) +static inline HRESULT advance_stream(IStream *stream, ULONG bytes) { - HRESULT hr; - FOURCC fourcc; - DWORD bytes; LARGE_INTEGER move; + HRESULT ret; - while(length){ - hr = read_from_stream(stream, &fourcc, sizeof(fourcc)); - if(FAILED(hr)) - return hr; - - hr = read_from_stream(stream, &bytes, sizeof(bytes)); - if(FAILED(hr)) - return hr; - - length = subtract_bytes(length, sizeof(fourcc) + sizeof(bytes)); - - switch(fourcc){ - case FOURCC_INSH: - TRACE("INSH chunk: %u bytes\n", bytes); - hr = read_from_stream(stream, This->pHeader, sizeof(*This->pHeader)); - if(FAILED(hr)) - return hr; - - move.QuadPart = bytes - sizeof(*This->pHeader); - hr = IStream_Seek(stream, move, STREAM_SEEK_CUR, NULL); - if(FAILED(hr)){ - WARN("IStream_Seek failed: %08x\n", hr); - return hr; - } - - length = subtract_bytes(length, bytes); - break; - - case FOURCC_DLID: - TRACE("DLID chunk: %u bytes\n", bytes); - hr = read_from_stream(stream, This->pInstrumentID, sizeof(*This->pInstrumentID)); - if(FAILED(hr)) - return hr; - - move.QuadPart = bytes - sizeof(*This->pInstrumentID); - hr = IStream_Seek(stream, move, STREAM_SEEK_CUR, NULL); - if(FAILED(hr)){ - WARN("IStream_Seek failed: %08x\n", hr); - return hr; - } - - length = subtract_bytes(length, bytes); - break; - - default: - TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(fourcc), bytes); - - move.QuadPart = bytes; - hr = IStream_Seek(stream, move, STREAM_SEEK_CUR, NULL); - if(FAILED(hr)){ - WARN("IStream_Seek failed: %08x\n", hr); - return hr; - } - - length = subtract_bytes(length, bytes); - break; - } - } + move.QuadPart = bytes; - return S_OK; + ret = IStream_Seek(stream, move, STREAM_SEEK_CUR, NULL); + if (FAILED(ret)) + WARN("IStream_Seek failed: %08x\n", ret); + + return ret; } -/* aux. function that completely loads instrument; my tests indicate that it's - called somewhere around IDirectMusicCollection_GetInstrument */ -HRESULT IDirectMusicInstrumentImpl_Custom_Load(LPDIRECTMUSICINSTRUMENT iface, LPSTREAM stream) +/* Function that loads all instrument data and which is called from IDirectMusicCollection_GetInstrument as in native */ +HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, IStream *stream) { IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface); - LARGE_INTEGER move; - FOURCC fourcc; - DWORD bytes; HRESULT hr; + DMUS_PRIVATE_CHUNK chunk; + ULONG length = This->length; - TRACE("(%p, %p, offset = %s)\n", This, stream, wine_dbgstr_longlong(This->liInstrumentPosition.QuadPart)); + TRACE("(%p, %p): offset = 0x%s, length = %u)\n", This, stream, wine_dbgstr_longlong(This->liInstrumentPosition.QuadPart), This->length); hr = IStream_Seek(stream, This->liInstrumentPosition, STREAM_SEEK_SET, NULL); - if(FAILED(hr)){ + if (FAILED(hr)) + { WARN("IStream_Seek failed: %08x\n", hr); - goto load_failure; + return DMUS_E_UNSUPPORTED_STREAM; } - hr = read_from_stream(stream, &fourcc, sizeof(fourcc)); - if(FAILED(hr)) - goto load_failure; + while (length) + { + hr = read_from_stream(stream, &chunk, sizeof(chunk)); + if (FAILED(hr)) + return DMUS_E_UNSUPPORTED_STREAM; - if(fourcc != FOURCC_LIST){ - WARN("Loading failed: Expected LIST chunk, got: %s\n", debugstr_fourcc(fourcc)); - goto load_failure; - } + length = subtract_bytes(length, sizeof(chunk) + chunk.dwSize); + + switch (chunk.fccID) + { + case FOURCC_INSH: + case FOURCC_DLID: + TRACE("Chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); + + /* Instrument header and id are already set so just skip */ + hr = advance_stream(stream, chunk.dwSize); + if (FAILED(hr)) + return DMUS_E_UNSUPPORTED_STREAM; - hr = read_from_stream(stream, &bytes, sizeof(bytes)); - if(FAILED(hr)) - goto load_failure; - - TRACE("LIST chunk: %u bytes\n", bytes); - while(1){ - hr = read_from_stream(stream, &fourcc, sizeof(fourcc)); - if(FAILED(hr)) - goto load_failure; - - switch(fourcc){ - case FOURCC_INS: - TRACE("INS chunk: (no byte count)\n"); - hr = load_instrument(This, stream, bytes - sizeof(FOURCC)); - if(FAILED(hr)) - goto load_failure; - break; - - default: - hr = read_from_stream(stream, &bytes, sizeof(bytes)); - if(FAILED(hr)) - goto load_failure; - - TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(fourcc), bytes); - - move.QuadPart = bytes; - hr = IStream_Seek(stream, move, STREAM_SEEK_CUR, NULL); - if(FAILED(hr)){ - WARN("IStream_Seek failed: %08x\n", hr); - return hr; - } - - break; + break; + + default: + TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); + + hr = advance_stream(stream, chunk.dwSize); + if (FAILED(hr)) + return DMUS_E_UNSUPPORTED_STREAM; + + break; } } return S_OK; - -load_failure: - return DMUS_E_UNSUPPORTED_STREAM; }

1 0

Jörg Höhle : mmdevapi: Avoid lock contention after SetEvent.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: a39e423f6f6d2d61eb4bdc052d2ea2ab219325e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a39e423f6f6d2d61eb4bdc052… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Dec 9 22:56:40 2012 +0100 mmdevapi: Avoid lock contention after SetEvent. --- dlls/winealsa.drv/mmdevdrv.c | 6 +++--- dlls/wineoss.drv/mmdevdrv.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 3e8ad8d..8c905e9 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2137,12 +2137,12 @@ static void CALLBACK alsa_push_buffer_data(void *user, BOOLEAN timer) alsa_write_data(This); else if(This->dataflow == eCapture) alsa_read_data(This); - - if(This->event) - SetEvent(This->event); } LeaveCriticalSection(&This->lock); + + if(This->event) + SetEvent(This->event); } static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 4de5ae6..ea6d452 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1481,12 +1481,12 @@ static void CALLBACK oss_period_callback(void *user, BOOLEAN timer) oss_write_data(This); else if(This->dataflow == eCapture) oss_read_data(This); - - if(This->event) - SetEvent(This->event); } LeaveCriticalSection(&This->lock); + + if(This->event) + SetEvent(This->event); } static HRESULT WINAPI AudioClient_Start(IAudioClient *iface)

1 0

Alexandre Julliard : oleaut32: Use a saner calling convention for the marshaller asm thunks.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: 2915e47979e31a8911a4f95d2d90264e6d6a0f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2915e47979e31a8911a4f95d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 12:48:27 2012 +0100 oleaut32: Use a saner calling convention for the marshaller asm thunks. --- dlls/oleaut32/tmarshal.c | 70 +++++++++++++++------------------------------- 1 files changed, 23 insertions(+), 47 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index a6108ad..dd19fa1 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -409,15 +409,15 @@ static HRESULT num_of_funcs(ITypeInfo *tinfo, unsigned int *num, #include "pshpack1.h" typedef struct _TMAsmProxy { - BYTE popleax; + DWORD lealeax; + BYTE pushleax; BYTE pushlval; DWORD nr; - BYTE pushleax; BYTE lcall; DWORD xcall; BYTE lret; WORD bytestopop; - BYTE nop; + WORD nop; } TMAsmProxy; #include "poppack.h" @@ -1330,10 +1330,10 @@ static inline BOOL is_out_elem(const ELEMDESC *elem) return (elem->u.paramdesc.wParamFlags & PARAMFLAG_FOUT || !elem->u.paramdesc.wParamFlags); } -static DWORD -xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) +static DWORD WINAPI xCall(int method, void **args) { - DWORD *args = ((DWORD*)&tpinfo)+1, *xargs; + TMProxyImpl *tpinfo = args[0]; + DWORD *xargs; const FUNCDESC *fdesc; HRESULT hres; int i, relaydeb = TRACE_ON(olerelay); @@ -1393,7 +1393,7 @@ xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) if (nrofnames > sizeof(names)/sizeof(names[0])) ERR("Need more names!\n"); - xargs = args; + xargs = (DWORD *)(args + 1); for (i=0;i<fdesc->cParams;i++) { ELEMDESC *elem = fdesc->lprgelemdescParam+i; if (relaydeb) { @@ -1460,7 +1460,7 @@ xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) buf.curoff = 0; /* generic deserializer using typelib description */ - xargs = args; + xargs = (DWORD *)(args + 1); status = S_OK; for (i=0;i<fdesc->cParams;i++) { ELEMDESC *elem = fdesc->lprgelemdescParam+i; @@ -1719,8 +1719,8 @@ static inline HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf) static HRESULT init_proxy_entry_point(TMProxyImpl *proxy, unsigned int num) { int j; - /* nrofargs without This */ - int nrofargs; + /* nrofargs including This */ + int nrofargs = 1; ITypeInfo *tinfo2; TMAsmProxy *xasm = proxy->asmstubs + num; HRESULT hres; @@ -1733,7 +1733,6 @@ static HRESULT init_proxy_entry_point(TMProxyImpl *proxy, unsigned int num) } ITypeInfo_Release(tinfo2); /* some args take more than 4 byte on the stack */ - nrofargs = 0; for (j=0;j<fdesc->cParams;j++) nrofargs += _argsize(&fdesc->lprgelemdescParam[j].tdesc, proxy->tinfo); @@ -1742,25 +1741,21 @@ static HRESULT init_proxy_entry_point(TMProxyImpl *proxy, unsigned int num) ERR("calling convention is not stdcall????\n"); return E_FAIL; } -/* popl %eax - return ptr - * pushl <nr> +/* leal 4(%esp),%eax * pushl %eax + * pushl <nr> * call xCall - * lret <nr> (+4) - * - * - * arg3 arg2 arg1 <method> <returnptr> + * lret <nr> */ - xasm->popleax = 0x58; + xasm->lealeax = 0x0424448d; + xasm->pushleax = 0x50; xasm->pushlval = 0x68; xasm->nr = num; - xasm->pushleax = 0x50; - xasm->lcall = 0xe8; /* relative jump */ - xasm->xcall = (DWORD)xCall; - xasm->xcall -= (DWORD)&(xasm->lret); + xasm->lcall = 0xe8; + xasm->xcall = (char *)xCall - (char *)&xasm->lret; xasm->lret = 0xc2; - xasm->bytestopop = (nrofargs+2)*4; /* pop args, This, iMethod */ - xasm->nop = 0x90; + xasm->bytestopop = nrofargs * 4; + xasm->nop = 0x9090; proxy->lpvtbl[fdesc->oVft / sizeof(void *)] = xasm; #else FIXME("not implemented on non i386\n"); @@ -1800,8 +1795,6 @@ PSFacBuf_CreateProxy( proxy = CoTaskMemAlloc(sizeof(TMProxyImpl)); if (!proxy) return E_OUTOFMEMORY; - assert(sizeof(TMAsmProxy) == 16); - proxy->dispatch = NULL; proxy->dispatch_proxy = NULL; proxy->outerunknown = pUnkOuter; @@ -1863,40 +1856,23 @@ PSFacBuf_CreateProxy( proxy->lpvtbl[i] = ProxyIUnknown_Release; break; case 3: - if(!defer_to_dispatch) - { - hres = init_proxy_entry_point(proxy, i); - if(FAILED(hres)) return hres; - } + if(!defer_to_dispatch) hres = init_proxy_entry_point(proxy, i); else proxy->lpvtbl[3] = ProxyIDispatch_GetTypeInfoCount; break; case 4: - if(!defer_to_dispatch) - { - hres = init_proxy_entry_point(proxy, i); - if(FAILED(hres)) return hres; - } + if(!defer_to_dispatch) hres = init_proxy_entry_point(proxy, i); else proxy->lpvtbl[4] = ProxyIDispatch_GetTypeInfo; break; case 5: - if(!defer_to_dispatch) - { - hres = init_proxy_entry_point(proxy, i); - if(FAILED(hres)) return hres; - } + if(!defer_to_dispatch) hres = init_proxy_entry_point(proxy, i); else proxy->lpvtbl[5] = ProxyIDispatch_GetIDsOfNames; break; case 6: - if(!defer_to_dispatch) - { - hres = init_proxy_entry_point(proxy, i); - if(FAILED(hres)) return hres; - } + if(!defer_to_dispatch) hres = init_proxy_entry_point(proxy, i); else proxy->lpvtbl[6] = ProxyIDispatch_Invoke; break; default: hres = init_proxy_entry_point(proxy, i); - if(FAILED(hres)) return hres; } }

1 0