wine-commits November 2016

wine-commits@winehq.org

2 participants
465 discussions

Jeremy Newman : reformat and cleanup the user preferences form
by Jeremy Newman 22 Nov '16

22 Nov '16

Module: appdb Branch: master Commit: 95389edc24ceaf6d3ffa2bf99675a3071ceef244 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=95389edc24ceaf6d3ffa2bf9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 09:26:29 2016 -0600 reformat and cleanup the user preferences form * drop some unused prefs * remove unnessessary function and include calls * bootstrapify --- include/form_edit.php | 42 ---------- preferences.php | 213 +++++++++++++++++++++++--------------------------- tables/prefs_list.sql | 6 -- 3 files changed, 98 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=95389edc24ceaf6d3ffa…

1 0

Jeremy Newman : cleanup html_select and bootstrapify
by Jeremy Newman 22 Nov '16

22 Nov '16

Module: appdb Branch: master Commit: 41f501cbfdeebaba6bf49f084f1a58d141f0c0fd URL: http://source.winehq.org/git/appdb.git/?a=commit;h=41f501cbfdeebaba6bf49f08… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 09:25:23 2016 -0600 cleanup html_select and bootstrapify --- include/html.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/html.php b/include/html.php index 943e879..173b299 100644 --- a/include/html.php +++ b/include/html.php @@ -111,17 +111,17 @@ function html_frame_end($text = "") function html_select($name, $values, $default = null, $descs = null) { - $str = "<select name='$name'>\n"; + $str = "<select name=\"{$name}\" class=\"form-control form-control-inline\">\n"; while(list($idx, $value) = each($values)) { $desc = $value; if($descs) - $desc = $descs[$idx]; + $desc = $descs[$idx]; if($value == $default) - $str .= " <option selected value='$value'>$desc\n"; + $str .= " <option selected value=\"{$value}\">{$desc}</option>\n"; else - $str .= " <option value='$value'>$desc\n"; + $str .= " <option value=\"{$value}\">{$desc}</option>\n"; } $str .= "</select>\n";

1 0

Donat Enikeev : crypt32/tests: Fix chain tests failure with cs.standford.edu certificates.
by Alexandre Julliard 21 Nov '16

21 Nov '16

Module: wine Branch: master Commit: 8a4508cecc4a6e46da200c85aa7d62515041f6e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a4508cecc4a6e46da200c85a… Author: Donat Enikeev <donat(a)enikeev.net> Date: Sat Nov 19 21:12:30 2016 +0300 crypt32/tests: Fix chain tests failure with cs.standford.edu certificates. Signed-off-by: Donat Enikeev <donat(a)enikeev.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/chain.c | 658 ++++++++++++++++++++++++--------------------- 1 file changed, 352 insertions(+), 306 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a4508cecc4a6e46da200…

1 0

Flávio J. Saraiva : cmd/tests: Add test for chaining rules.
by Alexandre Julliard 21 Nov '16

21 Nov '16

Module: wine Branch: master Commit: df500b3a370c24da695a9bbd32097d3be1a8fcd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df500b3a370c24da695a9bbd3… Author: Flávio J. Saraiva <flaviojs2005(a)gmail.com> Date: Sat Nov 19 05:14:05 2016 +0000 cmd/tests: Add test for chaining rules. brackets precede '&&', '||' and '&' '&&' precedes '||' and '&' '||' precedes '&' 'a && b || c & d' is equivalent to '(((a && b) || c) & d)' Signed-off-by: Flávio J. Saraiva <flaviojs2005(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 79 +++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 115 +++++++++++++++++++++++++++++++ 2 files changed, 194 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 9728e57..cf32481 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -251,6 +251,85 @@ echo %WINE_FOO% echo %ErrorLevel% set WINE_FOO= +echo ------------ Testing chains ------------ +rem brackets precede '&&', '||' and '&' +rem '&&' precedes '||' and '&' +rem '||' precedes '&' +rem 'a && b || c & d' is equivalent to '(((a && b) || c) & d)' +goto :cfailend +:cfail +echo %1 +call :setError 1 +goto :eof +:cfailend +echo --- chain success +echo a1&echo a2 +echo b1&&echo b2 +echo c1||echo c2 +echo --- +echo d1&echo d2&echo d3 +echo e1&echo e2&&echo e3 +echo f1&echo f2||echo f3 +echo --- +echo g1&&echo g2&echo g3 +echo h1&&echo h2&&echo h3 +echo i1&&echo i2||echo i3 +echo --- +echo j1||echo j2&echo j3 +echo --- +echo k1||echo k2&&echo k3 +echo --- +echo l1||echo l2||echo l3 +echo --- +echo --- chain failure +call :cfail a1&call :cfail a2 +call :cfail b1&&call :cfail b2 +echo --- +call :cfail c1||call :cfail c2 +call :cfail d1&call :cfail d2&call :cfail d3 +call :cfail e1&call :cfail e2&&call :cfail e3 +echo --- +call :cfail f1&call :cfail f2||call :cfail f3 +call :cfail g1&&call :cfail g2&call :cfail g3 +echo --- +call :cfail h1&&call :cfail h2&&call :cfail h3 +echo --- +call :cfail i1&&call :cfail i2||call :cfail i3 +echo --- +call :cfail j1||call :cfail j2&call :cfail j3 +call :cfail k1||call :cfail k2&&call :cfail k3 +echo --- +call :cfail l1||call :cfail l2||call :cfail l3 +echo --- chain brackets +echo a1&(echo a2&echo a3) +echo b1&(echo b2&&echo b3) +echo c1&(echo c2||echo c3) +echo --- +echo d1&&(echo d2&echo d3) +echo e1&&(echo e2&&echo e3) +echo f1&&(echo f2||echo f3) +echo --- +echo g1||(echo g2&echo g3) +echo --- +echo h1||(echo h2&&echo h3) +echo --- +echo i1||(echo i2||echo i3) +echo --- +call :cfail j1&(call :cfail j2&call :cfail j3) +call :cfail k1&(call :cfail k2&&call :cfail k3) +echo --- +call :cfail l1&(call :cfail l2||call :cfail l3) +call :cfail m1&&(call :cfail m2&call :cfail m3) +echo --- +call :cfail n1&&(call :cfail n2&&call :cfail n3) +echo --- +call :cfail o1&&(call :cfail o2||call :cfail o3) +echo --- +call :cfail p1||(call :cfail p2&call :cfail p3) +call :cfail q1||(call :cfail q2&&call :cfail q3) +echo --- +call :cfail r1||(call :cfail r2||call :cfail r3) + echo ------------ Testing 'set' ------------ call :setError 0 rem Remove any WINE_FOO* WINE_BA* environment variables from shell before proceeding diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c1f0d5f..58f6fae 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -248,6 +248,121 @@ WINE_FOO=bar | baz WINE_FOO=bar ^| baz bar | baz 0 +------------ Testing chains ------------ +--- chain success +a1 +a2 +b1 +b2 +c1 +@todo_wine@--- +d1 +d2 +d3 +e1 +e2 +e3 +f1 +f2 +@todo_wine@--- +g1 +g2 +g3 +h1 +h2 +h3 +i1 +i2 +@todo_wine@--- +j1 +@todo_wine@j3 +@todo_wine@--- +k1 +@todo_wine@--- +l1 +@todo_wine@--- +--- chain failure +a1 +a2 +b1 +@todo_wine@--- +c1 +c2 +d1 +d2 +d3 +e1 +e2 +@todo_wine@--- +f1 +f2 +f3 +g1 +@todo_wine@g3 +@todo_wine@--- +h1 +@todo_wine@--- +i1 +@todo_wine@i3 +@todo_wine@--- +j1 +j2 +j3 +k1 +k2 +@todo_wine@--- +l1 +l2 +l3 +--- chain brackets +a1 +a2 +a3 +b1 +b2 +b3 +c1 +c2 +@todo_wine@--- +d1 +d2 +d3 +e1 +e2 +e3 +f1 +f2 +@todo_wine@--- +g1 +@todo_wine@--- +h1 +@todo_wine@--- +i1 +@todo_wine@--- +j1 +j2 +j3 +k1 +k2 +@todo_wine@--- +l1 +l2 +l3 +m1 +@todo_wine@--- +n1 +@todo_wine@--- +o1 +@todo_wine@--- +p1 +p2 +p3 +q1 +q2 +@todo_wine@--- +r1 +r2 +r3 ------------ Testing 'set' ------------ 1 0

1 0

Andrey Gusev : api-ms-win-appmodel-identity-l1-1-0: Add dll.
by Alexandre Julliard 21 Nov '16

21 Nov '16

Module: wine Branch: master Commit: 3b76e244540214844d8e32f537afe1831d269749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b76e244540214844d8e32f53… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Nov 19 20:05:57 2016 +0200 api-ms-win-appmodel-identity-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-appmodel-identity-l1-1-0/Makefile.in | 1 + .../api-ms-win-appmodel-identity-l1-1-0.spec | 17 +++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 22 insertions(+) diff --git a/configure b/configure index fffb920..3feca3f 100755 --- a/configure +++ b/configure @@ -874,6 +874,7 @@ enable_actxprxy enable_advapi32 enable_advpack enable_amstream +enable_api_ms_win_appmodel_identity_l1_1_0 enable_api_ms_win_appmodel_runtime_l1_1_1 enable_api_ms_win_core_apiquery_l1_1_0 enable_api_ms_win_core_appcompat_l1_1_1 @@ -17589,6 +17590,7 @@ wine_fn_config_dll advpack enable_advpack implib wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test +wine_fn_config_dll api-ms-win-appmodel-identity-l1-1-0 enable_api_ms_win_appmodel_identity_l1_1_0 wine_fn_config_dll api-ms-win-appmodel-runtime-l1-1-1 enable_api_ms_win_appmodel_runtime_l1_1_1 wine_fn_config_dll api-ms-win-core-apiquery-l1-1-0 enable_api_ms_win_core_apiquery_l1_1_0 wine_fn_config_dll api-ms-win-core-appcompat-l1-1-1 enable_api_ms_win_core_appcompat_l1_1_1 diff --git a/configure.ac b/configure.ac index 38435d2..1c42e2d 100644 --- a/configure.ac +++ b/configure.ac @@ -2651,6 +2651,7 @@ WINE_CONFIG_DLL(advpack,,[implib]) WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) +WINE_CONFIG_DLL(api-ms-win-appmodel-identity-l1-1-0) WINE_CONFIG_DLL(api-ms-win-appmodel-runtime-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-apiquery-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-appcompat-l1-1-1) diff --git a/dlls/api-ms-win-appmodel-identity-l1-1-0/Makefile.in b/dlls/api-ms-win-appmodel-identity-l1-1-0/Makefile.in new file mode 100644 index 0000000..a30bea5 --- /dev/null +++ b/dlls/api-ms-win-appmodel-identity-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-appmodel-identity-l1-1-0.dll diff --git a/dlls/api-ms-win-appmodel-identity-l1-1-0/api-ms-win-appmodel-identity-l1-1-0.spec b/dlls/api-ms-win-appmodel-identity-l1-1-0/api-ms-win-appmodel-identity-l1-1-0.spec new file mode 100644 index 0000000..edb4e9f --- /dev/null +++ b/dlls/api-ms-win-appmodel-identity-l1-1-0/api-ms-win-appmodel-identity-l1-1-0.spec @@ -0,0 +1,17 @@ +@ stub AppContainerDeriveSidFromMoniker +@ stub AppContainerFreeMemory +@ stub AppContainerLookupDisplayNameMrtReference +@ stub AppContainerLookupMoniker +@ stub AppContainerRegisterSid +@ stub AppContainerUnregisterSid +@ stub AppXFreeMemory +@ stub AppXGetApplicationData +@ stub AppXGetDevelopmentMode +@ stub AppXGetOSMaxVersionTested +@ stub AppXGetOSMinVersion +@ stub AppXGetPackageCapabilities +@ stub AppXGetPackageSid +@ stub AppXGetPackageState +@ stub AppXLookupDisplayName +@ stub AppXLookupMoniker +@ stub AppXSetPackageState diff --git a/tools/make_specfiles b/tools/make_specfiles index adfce06..1e2400e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -152,6 +152,7 @@ my @dll_groups = ], [ "kernel32", + "api-ms-win-appmodel-identity-l1-1-0", "api-ms-win-appmodel-runtime-l1-1-1", "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-core-processthreads-l1-1-0",

1 0

Andrey Gusev : api-ms-win-power-setting-l1-1-0: Add dll.
by Alexandre Julliard 21 Nov '16

21 Nov '16

Module: wine Branch: master Commit: 6e42a76a9a6ce8b71b5fc8a0eee5095c6ddc38a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e42a76a9a6ce8b71b5fc8a0e… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Nov 19 13:50:50 2016 +0200 api-ms-win-power-setting-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-power-setting-l1-1-0/Makefile.in | 1 + .../api-ms-win-power-setting-l1-1-0.spec | 8 ++++++++ tools/make_specfiles | 1 + 5 files changed, 13 insertions(+) diff --git a/configure b/configure index 7bec1d1..fffb920 100755 --- a/configure +++ b/configure @@ -1015,6 +1015,7 @@ enable_api_ms_win_eventing_provider_l1_1_0 enable_api_ms_win_eventlog_legacy_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_power_base_l1_1_0 +enable_api_ms_win_power_setting_l1_1_0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 enable_api_ms_win_security_audit_l1_1_1 enable_api_ms_win_security_base_l1_1_0 @@ -17729,6 +17730,7 @@ wine_fn_config_dll api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventin wine_fn_config_dll api-ms-win-eventlog-legacy-l1-1-0 enable_api_ms_win_eventlog_legacy_l1_1_0 wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 wine_fn_config_dll api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 +wine_fn_config_dll api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 wine_fn_config_dll api-ms-win-rtcore-ntuser-private-l1-1-0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 wine_fn_config_dll api-ms-win-security-audit-l1-1-1 enable_api_ms_win_security_audit_l1_1_1 wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 diff --git a/configure.ac b/configure.ac index 853acd4..38435d2 100644 --- a/configure.ac +++ b/configure.ac @@ -2792,6 +2792,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventlog-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-base-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-power-setting-l1-1-0) WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-private-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-audit-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) diff --git a/dlls/api-ms-win-power-setting-l1-1-0/Makefile.in b/dlls/api-ms-win-power-setting-l1-1-0/Makefile.in new file mode 100644 index 0000000..c02a4be --- /dev/null +++ b/dlls/api-ms-win-power-setting-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-power-setting-l1-1-0.dll diff --git a/dlls/api-ms-win-power-setting-l1-1-0/api-ms-win-power-setting-l1-1-0.spec b/dlls/api-ms-win-power-setting-l1-1-0/api-ms-win-power-setting-l1-1-0.spec new file mode 100644 index 0000000..4aa924f --- /dev/null +++ b/dlls/api-ms-win-power-setting-l1-1-0/api-ms-win-power-setting-l1-1-0.spec @@ -0,0 +1,8 @@ +@ stdcall PowerGetActiveScheme(ptr ptr) powrprof.PowerGetActiveScheme +@ stub PowerReadACValue +@ stdcall PowerReadDCValue(ptr ptr ptr ptr ptr ptr ptr) powrprof.PowerReadDCValue +@ stdcall PowerSetActiveScheme(ptr ptr) powrprof.PowerSetActiveScheme +@ stub PowerSettingRegisterNotification +@ stub PowerSettingUnregisterNotification +@ stub PowerWriteACValueIndex +@ stub PowerWriteDCValueIndex diff --git a/tools/make_specfiles b/tools/make_specfiles index 04265be..adfce06 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -148,6 +148,7 @@ my @dll_groups = "ntdll", "powrprof", "api-ms-win-power-base-l1-1-0", + "api-ms-win-power-setting-l1-1-0", ], [ "kernel32",

1 0

Andrey Gusev : api-ms-win-power-base-l1-1-0: Add dll.
by Alexandre Julliard 21 Nov '16

21 Nov '16

Module: wine Branch: master Commit: a8df19f40c778ed520d177e934bd526242fb12de URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8df19f40c778ed520d177e93… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Nov 19 13:35:02 2016 +0200 api-ms-win-power-base-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-power-base-l1-1-0/Makefile.in | 1 + dlls/api-ms-win-power-base-l1-1-0/api-ms-win-power-base-l1-1-0.spec | 5 +++++ tools/make_specfiles | 5 +++++ 5 files changed, 14 insertions(+) diff --git a/configure b/configure index 35343e1..7bec1d1 100755 --- a/configure +++ b/configure @@ -1014,6 +1014,7 @@ enable_api_ms_win_eventing_controller_l1_1_0 enable_api_ms_win_eventing_provider_l1_1_0 enable_api_ms_win_eventlog_legacy_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 +enable_api_ms_win_power_base_l1_1_0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 enable_api_ms_win_security_audit_l1_1_1 enable_api_ms_win_security_base_l1_1_0 @@ -17727,6 +17728,7 @@ wine_fn_config_dll api-ms-win-eventing-controller-l1-1-0 enable_api_ms_win_event wine_fn_config_dll api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventing_provider_l1_1_0 wine_fn_config_dll api-ms-win-eventlog-legacy-l1-1-0 enable_api_ms_win_eventlog_legacy_l1_1_0 wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 +wine_fn_config_dll api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 wine_fn_config_dll api-ms-win-rtcore-ntuser-private-l1-1-0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 wine_fn_config_dll api-ms-win-security-audit-l1-1-1 enable_api_ms_win_security_audit_l1_1_1 wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 diff --git a/configure.ac b/configure.ac index 256dcee..853acd4 100644 --- a/configure.ac +++ b/configure.ac @@ -2791,6 +2791,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-controller-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventlog-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-power-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-private-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-audit-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) diff --git a/dlls/api-ms-win-power-base-l1-1-0/Makefile.in b/dlls/api-ms-win-power-base-l1-1-0/Makefile.in new file mode 100644 index 0000000..8b26d4b --- /dev/null +++ b/dlls/api-ms-win-power-base-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-power-base-l1-1-0.dll diff --git a/dlls/api-ms-win-power-base-l1-1-0/api-ms-win-power-base-l1-1-0.spec b/dlls/api-ms-win-power-base-l1-1-0/api-ms-win-power-base-l1-1-0.spec new file mode 100644 index 0000000..6591096 --- /dev/null +++ b/dlls/api-ms-win-power-base-l1-1-0/api-ms-win-power-base-l1-1-0.spec @@ -0,0 +1,5 @@ +@ stdcall CallNtPowerInformation(long ptr long ptr long) powrprof.CallNtPowerInformation +@ stdcall GetPwrCapabilities(ptr) powrprof.GetPwrCapabilities +@ stub PowerDeterminePlatformRoleEx +@ stub PowerRegisterSuspendResumeNotification +@ stub PowerUnregisterSuspendResumeNotification diff --git a/tools/make_specfiles b/tools/make_specfiles index 629c838..04265be 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -145,6 +145,11 @@ my @dll_groups = "api-ms-win-core-xstate-l1-1-0", ], [ + "ntdll", + "powrprof", + "api-ms-win-power-base-l1-1-0", + ], + [ "kernel32", "api-ms-win-appmodel-runtime-l1-1-1", "api-ms-win-downlevel-normaliz-l1-1-0",

1 0

Andrey Gusev : ext-ms-win-domainjoin-netjoin-l1-1-0: Add dll.
by Alexandre Julliard 21 Nov '16

21 Nov '16

Module: wine Branch: master Commit: c0c806854f893222a67306acb0b2947ca5b69c47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c806854f893222a67306acb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Nov 19 12:56:38 2016 +0200 ext-ms-win-domainjoin-netjoin-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + .../Makefile.in | 1 + .../ext-ms-win-domainjoin-netjoin-l1-1-0.spec | 25 ++++++++++++++++++++++ tools/make_specfiles | 4 ++++ 5 files changed, 33 insertions(+) diff --git a/configure b/configure index 1d8f3c6..35343e1 100755 --- a/configure +++ b/configure @@ -1169,6 +1169,7 @@ enable_dxva2 enable_esent enable_evr enable_explorerframe +enable_ext_ms_win_domainjoin_netjoin_l1_1_0 enable_ext_ms_win_gdi_dc_create_l1_1_1 enable_ext_ms_win_gdi_dc_l1_2_0 enable_ext_ms_win_gdi_devcaps_l1_1_0 @@ -17947,6 +17948,7 @@ wine_fn_config_dll esent enable_esent wine_fn_config_dll evr enable_evr wine_fn_config_dll explorerframe enable_explorerframe clean wine_fn_config_test dlls/explorerframe/tests explorerframe_test +wine_fn_config_dll ext-ms-win-domainjoin-netjoin-l1-1-0 enable_ext_ms_win_domainjoin_netjoin_l1_1_0 wine_fn_config_dll ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_create_l1_1_1 wine_fn_config_dll ext-ms-win-gdi-dc-l1-2-0 enable_ext_ms_win_gdi_dc_l1_2_0 wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 diff --git a/configure.ac b/configure.ac index 43f8a24..256dcee 100644 --- a/configure.ac +++ b/configure.ac @@ -3012,6 +3012,7 @@ WINE_CONFIG_DLL(esent) WINE_CONFIG_DLL(evr) WINE_CONFIG_DLL(explorerframe,,[clean]) WINE_CONFIG_TEST(dlls/explorerframe/tests) +WINE_CONFIG_DLL(ext-ms-win-domainjoin-netjoin-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-gdi-dc-l1-2-0) WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) diff --git a/dlls/ext-ms-win-domainjoin-netjoin-l1-1-0/Makefile.in b/dlls/ext-ms-win-domainjoin-netjoin-l1-1-0/Makefile.in new file mode 100644 index 0000000..3011558 --- /dev/null +++ b/dlls/ext-ms-win-domainjoin-netjoin-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-domainjoin-netjoin-l1-1-0.dll diff --git a/dlls/ext-ms-win-domainjoin-netjoin-l1-1-0/ext-ms-win-domainjoin-netjoin-l1-1-0.spec b/dlls/ext-ms-win-domainjoin-netjoin-l1-1-0/ext-ms-win-domainjoin-netjoin-l1-1-0.spec new file mode 100644 index 0000000..0abeffe --- /dev/null +++ b/dlls/ext-ms-win-domainjoin-netjoin-l1-1-0/ext-ms-win-domainjoin-netjoin-l1-1-0.spec @@ -0,0 +1,25 @@ +@ stub NetpAvoidNetlogonSpnSet +@ stub NetpChangeMachineName +@ stub NetpCheckOfflineLsaPolicyUpdate +@ stub NetpCompleteOfflineDomainJoin +@ stub NetpContinueProvisioningPackageInstall +@ stub NetpControlServices +@ stub NetpCrackNamesStatus2Win32Error +@ stub NetpDoDomainJoin +@ stub NetpDomainJoinLicensingCheck +@ stub NetpFreeLdapLsaDomainInfo +@ stub NetpGetJoinInformation +@ stub NetpGetListOfJoinableOUs +@ stub NetpGetLsaPrimaryDomain +@ stub NetpGetMachineAccountName +@ stub NetpGetNewMachineName +@ stub NetpIsSetupInProgress +@ stub NetpLogPrintHelper +@ stub NetpMachineValidToJoin +@ stub NetpManageIPCConnect +@ stub NetpQueryService +@ stub NetpSeparateUserAndDomain +@ stub NetpUnJoinDomain +@ stub NetpValidateName +@ stub NetSetuppCloseLog +@ stub NetSetuppOpenLog diff --git a/tools/make_specfiles b/tools/make_specfiles index 60e5b16..629c838 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -137,6 +137,10 @@ my @dll_groups = "api-ms-win-service-winsvc-l1-2-0", ], [ + "netapi32", + "ext-ms-win-domainjoin-netjoin-l1-1-0", + ], + [ "ntdll", "api-ms-win-core-xstate-l1-1-0", ],

1 0

Daniel Lehman : opengl32: Set last error on invalid share in wglCreateContextAttribsARB.
by Alexandre Julliard 21 Nov '16

21 Nov '16

Module: wine Branch: master Commit: 37ee3870a2f94d3960d989dd0cc454b8e1ec7aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37ee3870a2f94d3960d989dd0… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sat Nov 19 08:07:14 2016 -0800 opengl32: Set last error on invalid share in wglCreateContextAttribsARB. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 5 +++-- dlls/opengl32/wgl.c | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 5a0e786..7552d44 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -898,12 +898,13 @@ static void test_opengl3(HDC hdc) { HGLRC gl3Ctx; DWORD error; + SetLastError(0xdeadbeef); gl3Ctx = pwglCreateContextAttribsARB(hdc, (HGLRC)0xdeadbeef, 0); ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid shareList passed\n"); error = GetLastError(); /* The Nvidia implementation seems to return hresults instead of win32 error codes */ - todo_wine ok(error == ERROR_INVALID_OPERATION || - error == NVIDIA_HRESULT_FROM_WIN32(ERROR_INVALID_OPERATION), "Expected ERROR_INVALID_OPERATION, got error=%x\n", error); + ok(error == ERROR_INVALID_OPERATION || + error == NVIDIA_HRESULT_FROM_WIN32(ERROR_INVALID_OPERATION), "Expected ERROR_INVALID_OPERATION, got error=%x\n", error); wglDeleteContext(gl3Ctx); } diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 8e61348..863dea2 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -280,7 +280,11 @@ HGLRC WINAPI wglCreateContextAttribsARB( HDC hdc, HGLRC share, const int *attrib return 0; } if (!funcs->ext.p_wglCreateContextAttribsARB) return 0; - if (share && !(share_ptr = get_handle_ptr( share, HANDLE_CONTEXT ))) return 0; + if (share && !(share_ptr = get_handle_ptr( share, HANDLE_CONTEXT ))) + { + SetLastError( ERROR_INVALID_OPERATION ); + return 0; + } if ((drv_ctx = funcs->ext.p_wglCreateContextAttribsARB( hdc, share_ptr ? share_ptr->u.context->drv_ctx : NULL, attribs ))) {

1 0

Daniel Lehman : opengl32: Set last error on invalid hdc to wglCreateContextAttribsARB.
by Alexandre Julliard 21 Nov '16

21 Nov '16

Module: wine Branch: master Commit: ed4271fae953732d262357aa99a7dd8d673aede0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4271fae953732d262357aa9… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sat Nov 19 08:07:13 2016 -0800 opengl32: Set last error on invalid hdc to wglCreateContextAttribsARB. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 7 ++++--- dlls/opengl32/wgl.c | 7 ++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 3f203ab..5a0e786 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -884,12 +884,13 @@ static void test_opengl3(HDC hdc) { HGLRC gl3Ctx; DWORD error; + SetLastError(0xdeadbeef); gl3Ctx = pwglCreateContextAttribsARB((HDC)0xdeadbeef, 0, 0); ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid HDC passed\n"); error = GetLastError(); - todo_wine ok(error == ERROR_DC_NOT_FOUND || - broken(error == NVIDIA_HRESULT_FROM_WIN32(ERROR_INVALID_DATA)), /* Nvidia Vista + Win7 */ - "Expected ERROR_DC_NOT_FOUND, got error=%x\n", error); + ok(error == ERROR_DC_NOT_FOUND || + broken(error == NVIDIA_HRESULT_FROM_WIN32(ERROR_INVALID_DATA)), /* Nvidia Vista + Win7 */ + "Expected ERROR_DC_NOT_FOUND, got error=%x\n", error); wglDeleteContext(gl3Ctx); } diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 932b217..8e61348 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -274,7 +274,12 @@ HGLRC WINAPI wglCreateContextAttribsARB( HDC hdc, HGLRC share, const int *attrib struct opengl_context *context; struct opengl_funcs *funcs = get_dc_funcs( hdc ); - if (!funcs || !funcs->ext.p_wglCreateContextAttribsARB) return 0; + if (!funcs) + { + SetLastError( ERROR_DC_NOT_FOUND ); + return 0; + } + if (!funcs->ext.p_wglCreateContextAttribsARB) return 0; if (share && !(share_ptr = get_handle_ptr( share, HANDLE_CONTEXT ))) return 0; if ((drv_ctx = funcs->ext.p_wglCreateContextAttribsARB( hdc, share_ptr ? share_ptr->u.context->drv_ctx : NULL, attribs )))

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2016