November 2016 - Wine-commits

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 : 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-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

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 +(a)todo_wine@--- +d1 +d2 +d3 +e1 +e2 +e3 +f1 +f2 +(a)todo_wine@--- +g1 +g2 +g3 +h1 +h2 +h3 +i1 +i2 +(a)todo_wine@--- +j1 +(a)todo_wine@j3 +(a)todo_wine@--- +k1 +(a)todo_wine@--- +l1 +(a)todo_wine@--- +--- chain failure +a1 +a2 +b1 +(a)todo_wine@--- +c1 +c2 +d1 +d2 +d3 +e1 +e2 +(a)todo_wine@--- +f1 +f2 +f3 +g1 +(a)todo_wine@g3 +(a)todo_wine@--- +h1 +(a)todo_wine@--- +i1 +(a)todo_wine@i3 +(a)todo_wine@--- +j1 +j2 +j3 +k1 +k2 +(a)todo_wine@--- +l1 +l2 +l3 +--- chain brackets +a1 +a2 +a3 +b1 +b2 +b3 +c1 +c2 +(a)todo_wine@--- +d1 +d2 +d3 +e1 +e2 +e3 +f1 +f2 +(a)todo_wine@--- +g1 +(a)todo_wine@--- +h1 +(a)todo_wine@--- +i1 +(a)todo_wine@--- +j1 +j2 +j3 +k1 +k2 +(a)todo_wine@--- +l1 +l2 +l3 +m1 +(a)todo_wine@--- +n1 +(a)todo_wine@--- +o1 +(a)todo_wine@--- +p1 +p2 +p3 +q1 +q2 +(a)todo_wine@--- +r1 +r2 +r3 ------------ Testing 'set' ------------ 1 0

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

Jeremy Newman : remove more unused functions
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 61f8d5424d45216d83c63968cfab0ae33ed2ff0b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=61f8d5424d45216d83c63968… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 14:00:47 2016 -0600 remove more unused functions Based on a patch from: "Andre Hentschel" <nerv(a)dawncrow.de> --- include/html.php | 78 -------------------------------------------------------- 1 file changed, 78 deletions(-) diff --git a/include/html.php b/include/html.php index 20b359c..943e879 100644 --- a/include/html.php +++ b/include/html.php @@ -109,7 +109,6 @@ function html_frame_end($text = "") return "</div>\n"; } - function html_select($name, $values, $default = null, $descs = null) { $str = "<select name='$name'>\n"; @@ -138,51 +137,6 @@ function html_back_link($howmany = 1, $url = "") return ' <a href="'.htmlentities($url).'" class="btn btn-default"><i class="fa fa-arrow-left"></i> Back</a> '."\n"; } - -function p() -{ - return "\n<p> </p>\n"; -} - -function add_br($text = "") -{ - $text = str_replace("\n","<br>\n",$text); - return $text; -} - -function make_dll_option_list($varname, $dllid = -1) -{ - $db = new ApiDB(); - - echo "<select name='$varname'>\n"; - //echo "<option value='ALL'>ALL\n"; - $list = $db->get_dll_names(); - while(list($name, $id) = each($list)) - { - if($dllid == $id) - echo "<option value=$id selected>$name ($id)\n"; - else - echo "<option value=$id>$name ($id)\n"; - } - echo "</select>\n"; -} - - -function make_inx_option_list($varname, $inx = null) -{ - $list = array("yes", "no", "stub", "unknown"); - echo "<select name='$varname'>\n"; - while(list($idx, $value) = each($list)) - { - if($value == $inx) - echo "<option value=$value selected>$value\n"; - else - echo "<option value=$value>$value\n"; - } - echo "</select>\n"; - -} - /* Displays a note box using bootstrap panel */ /* mode: default, primary, success, info, warning, danger */ function html_note($heading = '', $body = '', $footer = '', $mode = 'default') @@ -214,36 +168,4 @@ function html_radiobuttons($aIds, $aOptions, $sName, $sDefault = '', $bLineBreak return $shRet; } -function html_checkbox($sName, $sValue, $shText, $bChecked) -{ - if($bChecked) - $sSelected = ' checked="checked"'; - else - $sSelected = ''; - - return "<input type=\"checkbox\" name=\"$sName\" value=\"$sValue\"$sSelected /> $shText\n"; -} - -function html_checkboxes($sName, $aValues, $aTexts, $aSelected) -{ - $shRet = ''; - - for($i = 0; $i < sizeof($aValues); $i++) - $shRet .= html_checkbox($sName.$i, $aValues[$i], $aTexts[$i], $aSelected[$i]).'<br />'; - - return $shRet; -} - -function html_read_input_series($sName, $aInput, $iCount) -{ - $aRet = array(); - - for($i = 0; $i < $iCount; $i++) - { - $aRet[] = getInput($sName.$i, $aInput); - } - - return $aRet; -} - ?>

1 0

Jeremy Newman : reformat screenshots
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: b0efea10f49b7da27d90c9e4b89168e6ef0bb634 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b0efea10f49b7da27d90c9e4… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 15:35:53 2016 -0600 reformat screenshots * do not use a popup window, use jquery dialog * remove .gif, use font awesome icon * write the beginnings of a screenshot viewer (needs work) --- images/xmag_32.png | Bin 1964 -> 0 bytes include/screenshot.php | 122 ++++++++++++++----------------------------------- screenshots.php | 2 +- styles.css | 24 +++++++++- utils.js | 16 ++++++- 5 files changed, 73 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=b0efea10f49b7da27d90…

1 0

Jeremy Newman : remove openWin, no longer used
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 4453a761313826324432953a655a3a40a57fb271 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4453a761313826324432953a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 18 15:38:31 2016 -0600 remove openWin, no longer used --- utils.js | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/utils.js b/utils.js index 61f0fb8..204428e 100644 --- a/utils.js +++ b/utils.js @@ -62,7 +62,6 @@ $(document).ready(function() $(this).addClass('cursor-pointer'); $(this).click(function(e) { - document.location = sURL; }); }); @@ -109,20 +108,4 @@ $.fn.toggleClick = function(){ }); }; -// open Window (FIXME: replace with an inline screenshot viewer) -function openWin(fileToOpen,nameOfWindow,width,height) { - myWindow = window.open("",nameOfWindow,"menubar=no,scrollbars=yes,status=no,width="+width+",height="+height); - myWindow.document.open(); - myWindow.document.write('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">'); - myWindow.document.write('<html><head><title>Screenshot Viewer</title>') - myWindow.document.write('<style type="text/css">'); - myWindow.document.write('body { margin: 0; padding: 0; background-color: lightgrey; }'); - myWindow.document.write('img { border: 0; }'); - myWindow.document.write('p { display: inline; }'); - myWindow.document.write('</style></head><body>'); - myWindow.document.write('<a onclick="self.close();" href=""><img src="'+ fileToOpen +'" alt="Screenshot"></a>'); - myWindow.document.write('</body></html>'); - myWindow.document.close(); -} - // done \ No newline at end of file

1 0

Jeremy Newman : html_note now is formatted with bootstrap panel
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 9cdeb34124e8ef6d30fc19b6a15c42bb02331b55 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9cdeb34124e8ef6d30fc19b6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 14:08:54 2016 -0600 html_note now is formatted with bootstrap panel --- include/html.php | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/include/html.php b/include/html.php index fe46455..3af125c 100644 --- a/include/html.php +++ b/include/html.php @@ -198,18 +198,15 @@ function make_inx_option_list($varname, $inx = null) } -/* Displays a note box */ -function html_note($shTitle, $shBody) +/* Displays a note box using bootstrap panel */ +/* mode: default, primary, success, info, warning, danger */ +function html_note($heading = '', $body = '', $footer = '', $mode = 'default') { - $shRet = '<div class="note_container">'; - $shRet .= '<div class="note_title">'; - $shRet .= $shTitle; - $shRet .= '</div>'; - $shRet .= '<div class="note_body">'; - $shRet .= $shBody; - $shRet .= '</div></div>'; - - return $shRet; + return "<div class=\"panel panel-{$mode}\">\n". + ($heading ? "<div class=\"panel-heading\">{$heading}</div>\n" : ''). + ($body ? "<div class=\"panel-body\">{$body}</div>\n" : ''). + ($footer ? "<div class=\"panel-heading\">{$footer}</div>\n" : ''). + "</div>\n"; } function html_radiobuttons($aIds, $aOptions, $sName, $sDefault = '', $bLineBreaks = true)

1 0

Jeremy Newman : cleanup embedded bugs table
by Jeremy Newman 21 Nov '16

21 Nov '16

Module: appdb Branch: master Commit: 8f95f82c88bfe71a21f08b26c0403dfc6d85524c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8f95f82c88bfe71a21f08b26… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Nov 17 14:19:05 2016 -0600 cleanup embedded bugs table --- include/bugs.php | 81 ++++++++++++++++++++++---------------------------------- 1 file changed, 32 insertions(+), 49 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index bc30ab8..b93b077 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -722,99 +722,82 @@ function view_version_bugs($iVersionId = null, $aBuglinkIds) } //start format table - if($_SESSION['current']->isLoggedIn()) - { - echo "<form method=post action='".APPDB_ROOT."objectManager.php'>\n"; - } - echo html_frame_start("Known bugs","98%",'',0); - echo "<table width=\"100%\" border=\"0\" cellpadding=\"3\" cellspacing=\"1\">\n\n"; - echo "<tr class=color4>\n"; - echo " <td align=center width=\"80\">Bug #</td>\n"; + echo "<table class=\"whq-table whq-table-full\">\n\n"; + echo "<thead><tr>\n"; + echo " <td class=\"text-center\" width=\"80\">Bug #</td>\n"; echo " <td>Description</td>\n"; - echo " <td align=center width=\"80\">Status</td>\n"; - echo " <td align=center width=\"80\">Resolution</td>\n"; - echo " <td align=center width=\"80\">Other apps affected</td>\n"; + echo " <td class=\"text-center\" width=\"80\">Status</td>\n"; + echo " <td class=\"text-center\" width=\"80\">Resolution</td>\n"; + echo " <td class=\"text-center\" width=\"80\">Other apps affected</td>\n"; if($bCanEdit == true) { - echo " <td align=center width=\"80\">Delete</td>\n"; - echo " <td align=center width=\"80\">Checked</td>\n"; + echo " <td class=\"text-center\"width=\"80\">Delete</td>\n"; + echo " <td class=\"text-center\"width=\"80\">Checked</td>\n"; } - echo "</tr>\n\n"; + echo "</tr></thead><tbody>\n\n"; - $c = 0; foreach($aBuglinkIds as $iBuglinkId) { $oBuglink = new Bug($iBuglinkId); - if ( - (!isset($aClean['sAllBugs']) && $oBuglink->isOpen() ) - || - isset($aClean['sAllBugs']) - ) + if ((!isset($aClean['sAllBugs']) && $oBuglink->isOpen() ) || isset($aClean['sAllBugs'])) { - // set row color - $bgcolor = ($c % 2 == 0) ? "color0" : "color1"; - //display row - echo "<tr class=$bgcolor>\n"; - echo "<td align=center><a href='".BUGZILLA_ROOT."show_bug.cgi?id=".$oBuglink->iBug_id."'>".$oBuglink->iBug_id."</a></td>\n"; + echo "<tr>\n"; + echo "<td class=\"text-center\"><a href='".BUGZILLA_ROOT."show_bug.cgi?id={$oBuglink->iBug_id}><i class=\"fa fa-bug\"></i> {$oBuglink->iBug_id}</a></td>\n"; echo "<td>".$oBuglink->sShort_desc."</td>\n"; - echo "<td align=center>".$oBuglink->sBug_status."</td>","\n"; - echo "<td align=center>".$oBuglink->sResolution."</td>","\n"; - echo "<td align=center><a href='viewbugs.php?bug_id=".$oBuglink->iBug_id."'>View</a></td>\n"; - - + echo "<td class=\"text-center\">".$oBuglink->sBug_status."</td>","\n"; + echo "<td class=\"text-center\">".$oBuglink->sResolution."</td>","\n"; + echo "<td class=\"text-center\"><a href=\"viewbugs.php?bug_id={$oBuglink->iBug_id}\" class=\"btn btn-default\">View</a></td>\n"; + if($bCanEdit == true) { $oM = new objectManager("bug"); $oM->setReturnTo($oVersion->objectMakeUrl()); - echo "<td align=center>[<a href='".$oM->makeUrl("delete", $oBuglink->iLinkId)."&sSubmit=delete'>delete</a>]</td>\n"; + echo "<td class=\"text-center\"><a href=\"".$oM->makeUrl("delete", $oBuglink->iLinkId)."&sSubmit=delete\" class=\"btn btn-default btn-skinny\"><i class=\"fa fa-trash-o\"></i></a></td>\n"; if ($oBuglink->bQueued) { - echo "<td align=center>[<a href='".$oM->makeUrl("edit", $oBuglink->iLinkId)."&sSubmit=Submit&bIsQueue=true'>OK</a>]</td>\n"; - } else + echo "<td class=\"text-center\"><a href=\"".$oM->makeUrl("edit", $oBuglink->iLinkId)."&sSubmit=Submit&bIsQueue=true\" class=\"btn btn-default btn-skinny\"><i class=\"fa fa-check\"></i></a></td>\n"; + } + else { - echo "<td align=center>Yes</td>\n"; + echo "<td class=\"text-center\">Yes</td>\n"; } } echo "</tr>\n\n"; - - - $c++; } } + echo '</tbody></table>',"\n"; + if($_SESSION['current']->isLoggedIn()) { + echo "<form method=post action='".APPDB_ROOT."objectManager.php'>\n"; echo '<input type="hidden" name="iVersionId" value="'.$iVersionId.'">',"\n"; - echo '<tr class=color3><td align=center>',"\n"; $sBuglinkId = isset($aClean['buglinkId']) ? $aClean['buglinkId'] : ''; - echo '<input type="text" name="iBuglinkId" value="'.$sBuglinkId.'" size="8"></td>',"\n"; + echo '<input type="text" name="iBuglinkId" value="'.$sBuglinkId.'" size="8">',"\n"; echo '<input type="hidden" name="sSubmit" value="Submit">',"\n"; echo '<input type="hidden" name="sClass" value="bug">',"\n"; echo '<input type="hidden" name="sReturnTo" value="'.$oVersion->objectMakeUrl().'">',"\n"; - echo '<td><input type="submit" name="sSub" value="Submit a new bug link."></td>',"\n"; - echo '<td colspan=6></td></tr></form>',"\n"; + echo '<button type="submit" name="sSub" class="btn btn-default"><i class=\"fa fa-bug\"></i> Submit a new bug link</button>',"\n"; + echo '</form>',"\n"; } - echo '</table>',"\n"; // show only open link if ( isset( $aClean['sAllBugs'] ) ) { - $sURL = str_replace( '&sAllBugs', '', $_SERVER['REQUEST_URI'] ); - $sLink = '<a href="' . htmlentities($sURL) . '">Show open bugs</a>'; + $sURL = htmlentities(str_replace( '&sAllBugs', '', $_SERVER['REQUEST_URI'])); + $sLink = "<a href=\"{$sURL}\" class=\"btn btn-default\"><i class=\"fa fa-bug\"></i> Show <b>open</b> bugs</a>"; } // show all link else { - $sURL = $_SERVER['REQUEST_URI'] . '&sAllBugs'; - $sLink = '<a href="' . htmlentities($sURL) . '">Show all bugs</a>'; + $sURL = htmlentities($_SERVER['REQUEST_URI'] . '&sAllBugs'); + $sLink = "<a href=\"{$sURL}\" class=\"btn btn-default\"><i class=\"fa fa-bug\"></i> Show <b>all</b> bugs</a>"; } - - echo '<div style="text-align:right;">' . $sLink .'</div>'; - echo html_frame_end(); + echo "<p>{$sLink}</p>\n"; } ?>

1 0