November 2018 - Wine-commits

Nikolay Sivov : shlwapi: Forward IUnknown_* helpers to shcore.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 24d5e853b20f8fa5b561357bfc6bc64dd182f0f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24d5e853b20f8fa5b561357b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 30 13:50:11 2018 +0300 shlwapi: Forward IUnknown_* helpers to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-downlevel-shlwapi-l2-1-0.spec | 2 +- dlls/shlwapi/ordinal.c | 146 ++------------------- dlls/shlwapi/shlwapi.spec | 10 +- 3 files changed, 15 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=24d5e853b20f8fa5b561…

1 0

Jactry Zeng : mshtml: Load xul with LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 8780a4fa6d1189ef08b761d921682767a17f59d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8780a4fa6d1189ef08b761d9… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Nov 30 15:07:05 2018 +0800 mshtml: Load xul with LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 9acb0d2..5f6c046 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -496,7 +496,7 @@ static BOOL load_xul(const PRUnichar *gre_path) set_environment(gre_path); - xul_handle = LoadLibraryExW(file_name, 0, LOAD_WITH_ALTERED_SEARCH_PATH); + xul_handle = LoadLibraryExW(file_name, 0, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR); if(!xul_handle) { WARN("Could not load XUL: %d\n", GetLastError()); return FALSE;

1 0

Jacek Caban : jscript: Support undefined separator in String.split implementation.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 1fc9b2e93435ec336ba1f921ed2614de224cdbe3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fc9b2e93435ec336ba1f921… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 16:20:35 2018 +0100 jscript: Support undefined separator in String.split implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/string.c | 25 +++++++++++++++++++----- dlls/jscript/tests/api.js | 22 ++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 48 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 89 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 7a6133d..79d7884 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1140,17 +1140,32 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi TRACE("\n"); - if(argc != 1 && argc != 2) { - FIXME("unsupported argc %u\n", argc); - return E_NOTIMPL; - } - hres = get_string_flat_val(ctx, jsthis, &jsstr, &str); if(FAILED(hres)) return hres; length = jsstr_length(jsstr); + if(!argc || (is_undefined(argv[0]) && ctx->version >= SCRIPTLANGUAGEVERSION_ES5)) { + if(!r) + return S_OK; + + hres = create_array(ctx, 0, &array); + if(FAILED(hres)) + return hres; + + /* NOTE: according to spec, we should respect limit argument here (if provided). + * We have a test showing that it's broken in native IE. */ + hres = jsdisp_propput_idx(array, 0, jsval_string(jsstr)); + if(FAILED(hres)) { + jsdisp_release(array); + return hres; + } + + *r = jsval_obj(array); + return S_OK; + } + if(argc > 1 && !is_undefined(argv[1])) { hres = to_uint32(ctx, argv[1], &limit); if(FAILED(hres)) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f9178a9..ff6a6b7 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -618,6 +618,28 @@ ok(r[0] === "1", "r[0] = " + r[0]); ok(r[1] === "2", "r[1] = " + r[1]); ok(r[2] === "3", "r[1] = " + r[1]); +r = "1,2,3".split(undefined); +ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); +ok(r.length === 1, "r.length = " + r.length); +ok(r[0] === "1,2,3", "r[0] = " + r[0]); + +r = "1,undefined2undefined,3".split(undefined); +ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); +ok(r.length === 3, "r.length = " + r.length); +ok(r[0] === "1,", "r[0] = " + r[0]); +ok(r[1] === "2", "r[1] = " + r[1]); +ok(r[2] === ",3", "r[2] = " + r[2]); + +r = "1,undefined2undefined,3".split(); +ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); +ok(r.length === 1, "r.length = " + r.length); +ok(r[0] === "1,undefined2undefined,3", "r[0] = " + r[0]); + +r = "".split(); +ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); +ok(r.length === 1, "r.length = " + r.length); +ok(r[0] === "", "r[0] = " + r[0]); + tmp = "abcd".indexOf("bc",0); ok(tmp === 1, "indexOf = " + tmp); tmp = "abcd".indexOf("bc",1); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index e4b9557..6097f4c 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -460,6 +460,51 @@ function test_global_properties() { next_test(); } +function test_string_split() { + var r; + + /* IE9 got this wrong*/ + if("1undefined2".split(undefined).length != 1) { + win_skip("detected broken String.prototype.split implementation"); + next_test(); + return; + } + + r = "1,2,3".split(undefined); + ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); + ok(r.length === 1, "r.length = " + r.length); + ok(r[0] === "1,2,3", "r[0] = " + r[0]); + + r = "1,undefined2undefined,3".split(undefined); + ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); + ok(r.length === 1, "r.length = " + r.length); + ok(r[0] === "1,undefined2undefined,3", "r[0] = " + r[0]); + + r = "1,undefined2undefined,3".split(); + ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); + ok(r.length === 1, "r.length = " + r.length); + ok(r[0] === "1,undefined2undefined,3", "r[0] = " + r[0]); + + /* note: spec violation, limit is ignored */ + r = "1,undefined2undefined,3".split(undefined, 0); + ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); + ok(r.length === 1, "r.length = " + r.length); + ok(r[0] === "1,undefined2undefined,3", "r[0] = " + r[0]); + + r = "1,undefined2null,3".split(null); + ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); + ok(r.length === 2, "r.length = " + r.length); + ok(r[0] === "1,undefined2", "r[0] = " + r[0]); + ok(r[1] === ",3", "r[1] = " + r[1]); + + r = "".split(); + ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); + ok(r.length === 1, "r.length = " + r.length); + ok(r[0] === "", "r[0] = " + r[0]); + + next_test(); +} + var tests = [ test_date_now, test_toISOString, @@ -469,5 +514,6 @@ var tests = [ test_getOwnPropertyDescriptor, test_defineProperty, test_string_trim, - test_global_properties + test_global_properties, + test_string_split ];

1 0

Alex Henrie : ieframe: Turn several variables into static constants.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 05cf118538fa94f23de1b9d2aa6c236407db9b69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05cf118538fa94f23de1b9d2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:06 2018 -0700 ieframe: Turn several variables into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/iexplore.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 1a83ee3..4f3df13 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -170,8 +170,8 @@ static void add_fav_to_menu(HMENU favmenu, HMENU menu, LPWSTR title, LPCWSTR url static void add_favs_to_menu(HMENU favmenu, HMENU menu, LPCWSTR dir) { + static const WCHAR search[] = {'*',0}; WCHAR path[MAX_PATH*2]; - const WCHAR search[] = {'*',0}; WCHAR* filename; HANDLE findhandle; WIN32_FIND_DATAW finddata; @@ -202,9 +202,9 @@ static void add_favs_to_menu(HMENU favmenu, HMENU menu, LPCWSTR dir) if(finddata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + static const WCHAR ignore1[] = {'.','.',0}; + static const WCHAR ignore2[] = {'.',0}; MENUITEMINFOW item; - const WCHAR ignore1[] = {'.','.',0}; - const WCHAR ignore2[] = {'.',0}; if(!lstrcmpW(filename, ignore1) || !lstrcmpW(filename, ignore2)) continue; @@ -217,9 +217,9 @@ static void add_favs_to_menu(HMENU favmenu, HMENU menu, LPCWSTR dir) add_favs_to_menu(favmenu, item.hSubMenu, path); } else { + static const WCHAR urlext[] = {'.','u','r','l',0}; WCHAR* fileext; WCHAR* url = NULL; - const WCHAR urlext[] = {'.','u','r','l',0}; if(lstrcmpiW(PathFindExtensionW(filename), urlext)) continue; @@ -250,18 +250,18 @@ static void add_favs_to_menu(HMENU favmenu, HMENU menu, LPCWSTR dir) static void add_tbs_to_menu(HMENU menu) { + static const WCHAR toolbar_key[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'I','n','t','e','r','n','e','t',' ', + 'E','x','p','l','o','r','e','r','\\', + 'T','o','o','l','b','a','r',0}; HUSKEY toolbar_handle; - WCHAR toolbar_key[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'I','n','t','e','r','n','e','t',' ', - 'E','x','p','l','o','r','e','r','\\', - 'T','o','o','l','b','a','r',0}; if(SHRegOpenUSKeyW(toolbar_key, KEY_READ, NULL, &toolbar_handle, TRUE) == ERROR_SUCCESS) { + static const WCHAR classes_key[] = {'S','o','f','t','w','a','r','e','\\', + 'C','l','a','s','s','e','s','\\','C','L','S','I','D',0}; HUSKEY classes_handle; - WCHAR classes_key[] = {'S','o','f','t','w','a','r','e','\\', - 'C','l','a','s','s','e','s','\\','C','L','S','I','D',0}; WCHAR guid[39]; DWORD value_len = ARRAY_SIZE(guid); int i;

1 0

Alex Henrie : jscript: Make several constants static.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 58da918e4dd0b659a1bcca6d881ef949c3a8c05c URL: https://source.winehq.org/git/wine.git/?a=commit;h=58da918e4dd0b659a1bcca6d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:07 2018 -0700 jscript: Make several constants static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 2 +- dlls/jscript/json.c | 2 +- dlls/jscript/jsutils.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 5e844ee..3f9db7a 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -693,7 +693,7 @@ static HRESULT compile_delete_expression(compiler_ctx_t *ctx, unary_expression_t case EXPR_IDENT: return push_instr_bstr(ctx, OP_delete_ident, ((identifier_expression_t*)expr->expression)->identifier); default: { - const WCHAR fixmeW[] = {'F','I','X','M','E',0}; + static const WCHAR fixmeW[] = {'F','I','X','M','E',0}; WARN("invalid delete, unimplemented exception message\n"); diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index 0267340..d440543 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -487,7 +487,7 @@ static HRESULT json_quote(stringify_ctx_t *ctx, const WCHAR *ptr, size_t len) break; default: if(*ptr < ' ') { - const WCHAR formatW[] = {'\\','u','%','0','4','x',0}; + static const WCHAR formatW[] = {'\\','u','%','0','4','x',0}; WCHAR buf[7]; sprintfW(buf, formatW, *ptr); if(!append_string(ctx, buf)) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 72dd4db..b612e65 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -718,7 +718,7 @@ static jsstr_t *int_to_string(int i) HRESULT double_to_string(double n, jsstr_t **str) { - const WCHAR InfinityW[] = {'-','I','n','f','i','n','i','t','y',0}; + static const WCHAR InfinityW[] = {'-','I','n','f','i','n','i','t','y',0}; if(isnan(n)) { *str = jsstr_nan(); @@ -748,9 +748,9 @@ HRESULT double_to_string(double n, jsstr_t **str) /* ECMA-262 3rd Edition 9.8 */ HRESULT to_string(script_ctx_t *ctx, jsval_t val, jsstr_t **str) { - const WCHAR nullW[] = {'n','u','l','l',0}; - const WCHAR trueW[] = {'t','r','u','e',0}; - const WCHAR falseW[] = {'f','a','l','s','e',0}; + static const WCHAR nullW[] = {'n','u','l','l',0}; + static const WCHAR trueW[] = {'t','r','u','e',0}; + static const WCHAR falseW[] = {'f','a','l','s','e',0}; switch(jsval_type(val)) { case JSV_UNDEFINED:

1 0

Alex Henrie : advapi32: Turn several string variables into static constants.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: bf413496cd402248b7c849efca739c4246b38f1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf413496cd402248b7c849ef… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:13:56 2018 -0700 advapi32: Turn several string variables into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 16512d0..70e2da4 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -440,10 +440,10 @@ static inline DWORD get_security_service( LPWSTR full_service_name, DWORD access /* helper function for SE_REGISTRY_KEY objects in [Get|Set]NamedSecurityInfo */ static inline DWORD get_security_regkey( LPWSTR full_key_name, DWORD access, HANDLE *key ) { - WCHAR classes_rootW[] = {'C','L','A','S','S','E','S','_','R','O','O','T',0}; - WCHAR current_userW[] = {'C','U','R','R','E','N','T','_','U','S','E','R',0}; - WCHAR machineW[] = {'M','A','C','H','I','N','E',0}; - WCHAR usersW[] = {'U','S','E','R','S',0}; + static const WCHAR classes_rootW[] = {'C','L','A','S','S','E','S','_','R','O','O','T',0}; + static const WCHAR current_userW[] = {'C','U','R','R','E','N','T','_','U','S','E','R',0}; + static const WCHAR machineW[] = {'M','A','C','H','I','N','E',0}; + static const WCHAR usersW[] = {'U','S','E','R','S',0}; LPWSTR p = strchrW(full_key_name, '\\'); int len = p-full_key_name; HKEY hParent; @@ -4997,9 +4997,9 @@ static void DumpString(LPCWSTR string, int cch, WCHAR **pwptr, ULONG *plen) static BOOL DumpSidNumeric(PSID psid, WCHAR **pwptr, ULONG *plen) { + static const WCHAR fmt[] = { 'S','-','%','u','-','%','d',0 }; + static const WCHAR subauthfmt[] = { '-','%','u',0 }; DWORD i; - WCHAR fmt[] = { 'S','-','%','u','-','%','d',0 }; - WCHAR subauthfmt[] = { '-','%','u',0 }; WCHAR buf[26]; SID *pisid = psid;

1 0

Alex Henrie : advpack: Turn variable 'prefix' into a static constant.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 07e1d6b081dce5a35f4743051ae87d98931d6f92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07e1d6b081dce5a35f474305… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:13:57 2018 -0700 advpack: Turn variable 'prefix' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index fd0a199..82c1d2b 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -41,8 +41,8 @@ static const WCHAR quote[] = {'\"',0}; static BOOL get_temp_ini_path(LPWSTR name) { + static const WCHAR prefix[] = {'a','v','p',0}; WCHAR tmp_dir[MAX_PATH]; - WCHAR prefix[] = {'a','v','p',0}; if(!GetTempPathW(ARRAY_SIZE(tmp_dir), tmp_dir)) return FALSE;

1 0

Alex Henrie : amstream: Make constants 'filternameW' and 'sourceW' static.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: wine Branch: master Commit: 3f2a2c05912923fcbe1ddfe23004bdf08343bd82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f2a2c05912923fcbe1ddfe2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:13:58 2018 -0700 amstream: Make constants 'filternameW' and 'sourceW' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/amstream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 3b2f71a..f9c9abf 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -235,9 +235,9 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetEndOfStream(IAMMultiMediaStream /*** IAMMultiMediaStream methods ***/ static HRESULT WINAPI IAMMultiMediaStreamImpl_Initialize(IAMMultiMediaStream* iface, STREAM_TYPE StreamType, DWORD dwFlags, IGraphBuilder* pFilterGraph) { + static const WCHAR filternameW[] = {'M','e','d','i','a','S','t','r','e','a','m','F','i','l','t','e','r',0}; IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); HRESULT hr = S_OK; - const WCHAR filternameW[] = {'M','e','d','i','a','S','t','r','e','a','m','F','i','l','t','e','r',0}; TRACE("(%p/%p)->(%x,%x,%p)\n", This, iface, (DWORD)StreamType, dwFlags, pFilterGraph); @@ -394,13 +394,13 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* iface, LPCWSTR filename, DWORD flags) { + static const WCHAR sourceW[] = {'S','o','u','r','c','e',0}; IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); HRESULT ret = S_OK; IBaseFilter *BaseFilter = NULL; IEnumPins *EnumPins = NULL; IPin *ipin; PIN_DIRECTION pin_direction; - const WCHAR sourceW[] = {'S','o','u','r','c','e',0}; TRACE("(%p/%p)->(%s,%x)\n", This, iface, debugstr_w(filename), flags);

1 0

Francois Gouget : testbot/web: Remove unnecessary LastPage checks in Submit.
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: tools Branch: master Commit: 0daa015e416346f1b4f5696e629178a2fcc81960 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0daa015e416346f1b4f5696… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 30 12:55:07 2018 +0100 testbot/web: Remove unnecessary LastPage checks in Submit. Only Submit.pl can decide when to call Validate() because only it knows whether this is appropriate for the current action. And this always happens as a check before moving on to the next page which means $self->{Page} is equal to $self->{LastPage}. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index a81a954..e0ccda3 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -456,7 +456,7 @@ sub Validate($) { my ($self) = @_; - if ($self->{Page} == 2 && $self->{LastPage} == 2) + if ($self->{Page} == 2) { my $VMSelected = !1; my $VMs = CreateVMs(); @@ -476,7 +476,7 @@ sub Validate($) return !1; } } - elsif ($self->{Page} == 3 && $self->{LastPage} == 3) + elsif ($self->{Page} == 3) { if (($self->GetParam("FileType") eq "patch" && $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) ||

1 0

Francois Gouget : testbot/web: Simplify FormPage::GetDisplayValue().
by Alexandre Julliard 30 Nov '18

30 Nov '18

Module: tools Branch: master Commit: 15657d233d70b3ff724910b41313a6631b9b6695 URL: https://source.winehq.org/git/tools.git/?a=commit;h=15657d233d70b3ff724910b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 30 12:55:15 2018 +0100 testbot/web: Simplify FormPage::GetDisplayValue(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 01f7894..735755f 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -189,12 +189,8 @@ sub GetDisplayValue($$) { my ($self, $PropertyDescriptor) = @_; - my $Value; - if (defined($self->GetParam($PropertyDescriptor->GetName()))) - { - $Value = $self->GetParam($PropertyDescriptor->GetName()); - } - else + my $Value = $self->GetParam($PropertyDescriptor->GetName()); + if (!defined $Value) { $Value = $self->GetPropertyValue($PropertyDescriptor); }

1 0