June 2017 - Wine-Commits - list.winehq.org

Francois Gouget : testbot: Add Page::GetParamNames() to retrieve a page' s parameter names.
by Alexandre Julliard June 19, 2017

June 19, 2017

Module: tools Branch: master Commit: 9cb4b0b9932bfe027529d367aa50e08b461ccf27 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9cb4b0b9932bfe027529d367… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 19 09:06:22 2017 +0200 testbot: Add Page::GetParamNames() to retrieve a page's parameter names. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 +- testbot/lib/ObjectModel/CGI/Page.pm | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index bc7eb0b..fb743a0 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -362,7 +362,7 @@ sub Save($) { my ($self) = @_; - my @ParamNames = $self->GetParam(); + my @ParamNames = $self->GetParamNames(); foreach my $ParameterName (@ParamNames) { my $PropertyDescriptor = $self->GetPropertyDescriptorByName($ParameterName); diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 046fd12..1fb2ca3 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -58,6 +58,23 @@ sub _initialize($$$) =pod =over 12 +=head1 C<GetParamNames()> + +Returns the list of parameter names. + +=back +=cut + +sub GetParamNames($) +{ + my $self = shift; + + return $self->{CGIObj}->param(); +} + +=pod +=over 12 + =head1 C<GetParam()> This thunks to CGI::param() and thus takes the same arguments list.

1 0

Francois Gouget : testbot: Force CGI::param() to scalar context for security.
by Alexandre Julliard June 19, 2017

June 19, 2017

Module: tools Branch: master Commit: e0e43d8cac1e3d64d1c104bc0b49f930b44df305 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e0e43d8cac1e3d64d1c104bc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 19 09:06:49 2017 +0200 testbot: Force CGI::param() to scalar context for security. Otherwise a call like foo($Page->GetParam("Name")) can end up passing extra arguments to foo() if the URL contains multiple instances of 'Name'. The situation is even worse if one uses named parameters. No code depended on being able to get multiple values and the only place that used CGI:param() to get the list of parameter names is already using Page::GetParameterNames(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Page.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 1fb2ca3..50598bf 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -77,7 +77,9 @@ sub GetParamNames($) =head1 C<GetParam()> -This thunks to CGI::param() and thus takes the same arguments list. +This thunks to CGI::param() and thus takes the same arguments list but forces +the result to scalar context to avoid security issues. +To get the list of parameter names use GetParamNames(). =back =cut @@ -86,7 +88,7 @@ sub GetParam($@) { my $self = shift; - return $self->{CGIObj}->param(@_); + return scalar($self->{CGIObj}->param(@_)); } sub CGI($)

1 0

Rosanne DiMesio : Update rating of old version when a test is moved
by Jeremy Newman June 19, 2017

June 19, 2017

Module: appdb Branch: master Commit: 46719d462cad4c6aa6d1ac1c24216d84c7dc8e11 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=46719d462cad4c6aa6d1ac1c… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri Jun 16 15:04:05 2017 -0500 Update rating of old version when a test is moved Fixes bug 42989. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/testData.php b/include/testData.php index bf5b727..051ef65 100644 --- a/include/testData.php +++ b/include/testData.php @@ -239,6 +239,8 @@ class testData{ { $oNewVersion = new version($this->iVersionId); $oNewVersion->updateRatingInfo(); + $oOldVersion = new version($oOldTest->iVersionId); + $oOldVersion->updateRatingInfo(); } $oVersion->updateRatingInfo(); }

1 0

Rosanne DiMesio : Allow users to see their queued screenshots
by Jeremy Newman June 19, 2017

June 19, 2017

Module: appdb Branch: master Commit: 9d0754392b73532dc8d5028b2d2ce4968fd8f49d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9d0754392b73532dc8d5028b… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri Jun 16 13:42:20 2017 -0500 Allow users to see their queued screenshots Fixes bug 28032. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/user.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/user.php b/include/user.php index 80cd9f4..2d62ea5 100644 --- a/include/user.php +++ b/include/user.php @@ -620,7 +620,8 @@ class User { if(!$oScreenshot->bQueued || ($oScreenshot->bQueued && ($this->hasPriv("admin") || $this->isMaintainer($oScreenshot->iVersionId) || - $this->isSuperMaintainer($oScreenshot->iAppId)))) + $this->isSuperMaintainer($oScreenshot->iAppId) || + $this->iUserId == $oScreenshot->iSubmitterId))) return true; return false;

1 0

Rosanne DiMesio : Do not show delete button or comment box on manage notes page
by Jeremy Newman June 19, 2017

June 19, 2017

Module: appdb Branch: master Commit: 912ec70350039163fda38e9656f212669746c87e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=912ec70350039163fda38e96… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri Jun 16 13:44:06 2017 -0500 Do not show delete button or comment box on manage notes page The sole purpose of the manage notes page is to enable maintainers to reorder the notes display for their version. The delete button and comment box don't actually do anything. Fixes bug 38509. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/objectManager.php | 20 +++++++++++--------- include/tagAssignmentMgr.php | 10 ++++++++++ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 10c52d3..331992b 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -409,17 +409,19 @@ class ObjectManager /* If it isn't implemented, that means there is no default text */ $sDefaultReply = $this->getOptionalSetting("getDefaultReply", ""); - if($this->getIsQueue()) - $sReplyFieldHeader = 'Reply Text'; - else - $sReplyFieldHeader = 'Comment'; + if(!$this->getOptionalSetting("objectHideReplyField", FALSE)) + { + if($this->getIsQueue()) + $sReplyFieldHeader = 'Reply Text'; + else + $sReplyFieldHeader = 'Comment'; - echo html_frame_start($sReplyFieldHeader, "90%", "", 0); - echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n"; - echo '<tr valign=top><td class="color0"><b>E-mail Text</b></td>',"\n"; - echo '<td><textarea name="sReplyText" style="width: 100%" cols="80" '. + echo html_frame_start($sReplyFieldHeader, "90%", "", 0); + echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n"; + echo '<tr valign=top><td class="color0"><b>E-mail Text</b></td>',"\n"; + echo '<td><textarea name="sReplyText" style="width: 100%" cols="80" '. 'rows="10">'.$sDefaultReply.'</textarea></td></tr>',"\n"; - + } if($this->getIsQueue()) { ///////////////////////////////////////////////// diff --git a/include/tagAssignmentMgr.php b/include/tagAssignmentMgr.php index 37ddb7f..255bba0 100644 --- a/include/tagAssignmentMgr.php +++ b/include/tagAssignmentMgr.php @@ -52,6 +52,16 @@ abstract class TagAssignmentMgr extends ObjectManagerBase return null; } + function objectHideDelete() + { + return true; + } + + function objectHideReplyField() + { + return true; + } + public function outputEditor() { if(sizeof($this->aTaggedEntries) == 0)

1 0

Paul Gofman : d3dx9: Add scalar and vector setting path to set_constants() .
by Alexandre Julliard June 16, 2017

June 16, 2017

Module: wine Branch: master Commit: 95a49bdce6cd5a35d5035456e576ab81239fb081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a49bdce6cd5a35d5035456e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 15 01:00:37 2017 +0300 d3dx9: Add scalar and vector setting path to set_constants(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index f10a3c6..2785ca3 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -372,11 +372,14 @@ static void regstore_set_modified(struct d3dx_regstore *rs, unsigned int table, static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, const void *data, unsigned int start_offset, unsigned int count) { + void *out; + if (!count) return; - memcpy((BYTE *)rs->tables[table] + start_offset * table_info[table].component_size, - data, count * table_info[table].component_size); + out = (BYTE *)rs->tables[table] + start_offset * table_info[table].component_size; + assert(data != out); + memcpy(out, data, count * table_info[table].component_size); regstore_set_modified(rs, table, start_offset, count); } @@ -1101,6 +1104,12 @@ static void regstore_set_data(struct d3dx_regstore *rs, unsigned int table, }; enum pres_value_type table_type = table_info[table].type; + if (param_type == table_type) + { + regstore_set_values(rs, table, in, offset, count); + return; + } + set_const_funcs[param_type][table_type]((unsigned int *)rs->tables[table] + offset, in, count); regstore_set_modified(rs, table, offset, count); } @@ -1132,6 +1141,23 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const continue; } param_type = table_type_from_param_type(param->type); + if (const_set->constant_class == D3DXPC_SCALAR || const_set->constant_class == D3DXPC_VECTOR) + { + unsigned int count = max(param->rows, param->columns); + + if (count >= get_reg_components(table)) + { + regstore_set_data(rs, table, start_offset, data, + count * const_set->element_count, param_type); + } + else + { + for (element = 0; element < const_set->element_count; ++element) + regstore_set_data(rs, table, start_offset + get_offset_reg(table, element), + &data[element * count], count, param_type); + } + continue; + } get_const_upload_info(const_set, &info); for (element = 0; element < const_set->element_count; ++element) {

1 0

Nils Kuhnhenn : oleaut32: Use variable with the correct type in LIST_FOR_EACH_ENTRY_SAFE macro.
by Alexandre Julliard June 16, 2017

June 16, 2017

Module: wine Branch: master Commit: 0dde88202a97578ffd346ae24d904a4f89cfb9b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dde88202a97578ffd346ae24… Author: Nils Kuhnhenn <kuhnhenn.nils(a)gmail.com> Date: Fri Jun 16 16:05:07 2017 +0200 oleaut32: Use variable with the correct type in LIST_FOR_EACH_ENTRY_SAFE macro. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b88e663..311cca3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4728,10 +4728,9 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) if (!ref) { TLBImpLib *pImpLib, *pImpLibNext; - TLBRefType *ref_type; + TLBRefType *ref_type, *ref_type_next; TLBString *tlbstr, *tlbstr_next; TLBGuid *tlbguid, *tlbguid_next; - void *cursor2; int i; /* remove cache entry */ @@ -4781,7 +4780,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) heap_free(pImpLib); } - LIST_FOR_EACH_ENTRY_SAFE(ref_type, cursor2, &This->ref_list, TLBRefType, entry) + LIST_FOR_EACH_ENTRY_SAFE(ref_type, ref_type_next, &This->ref_list, TLBRefType, entry) { list_remove(&ref_type->entry); heap_free(ref_type);

1 0

Hugh McMaster : regedit: Use a case insensitive comparison when parsing registry classes from registry file versions 4 and 5.
by Alexandre Julliard June 16, 2017

June 16, 2017

Module: wine Branch: master Commit: f535341d2ba9c18cdacb561a38152d3215af305f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f535341d2ba9c18cdacb561a3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:31 2017 +0000 regedit: Use a case insensitive comparison when parsing registry classes from registry file versions 4 and 5. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- programs/regedit/tests/regedit.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 416938d..2ce77c4 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -392,7 +392,7 @@ static HKEY parse_key_name(WCHAR *key_name, WCHAR **key_path) for (i = 0; i < ARRAY_SIZE(reg_class_keys); i++) { int len = lstrlenW(reg_class_namesW[i]); - if (!strncmpW(key_name, reg_class_namesW[i], len) && + if (!strncmpiW(key_name, reg_class_namesW[i], len) && (key_name[len] == 0 || key_name[len] == '\\')) { return reg_class_keys[i]; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 254073b..49e2396 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1231,20 +1231,20 @@ static void test_key_creation_and_deletion(void) exec_import_str("REGEDIT4\n\n" "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n"); - todo_wine verify_key_exist(hkey, "Subkey3a"); - todo_wine verify_key_exist(hkey, "Subkey3b"); + verify_key_exist(hkey, "Subkey3a"); + verify_key_exist(hkey, "Subkey3b"); exec_import_str("REGEDIT4\n\n" "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" "[-hKeY_cUrReNt_UsEr\\" KEY_BASE "\\sUbKeY3B]\n\n"); verify_key_nonexist(hkey, "Subkey3a"); - verify_key_nonexist(hkey, "Subkey3b"); + todo_wine verify_key_nonexist(hkey, "Subkey3b"); lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } static void test_value_deletion(void) @@ -1296,7 +1296,7 @@ static void test_value_deletion(void) ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } START_TEST(regedit)

1 0

Hugh McMaster : regedit: Export hex data types without warning about unsupported data types.
by Alexandre Julliard June 16, 2017

June 16, 2017

Module: wine Branch: master Commit: a1924ae2da1d86000f61eefed5e59150a74468ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1924ae2da1d86000f61eefed… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:11 2017 +0000 regedit: Export hex data types without warning about unsupported data types. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 49 ++-------------------------------------------- 1 file changed, 2 insertions(+), 47 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e977c1a..f7e8d2a 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -400,46 +400,6 @@ static HKEY parse_key_name(WCHAR *key_name, WCHAR **key_path) return 0; } -/* Registry data types */ -static const WCHAR type_none[] = {'R','E','G','_','N','O','N','E',0}; -static const WCHAR type_sz[] = {'R','E','G','_','S','Z',0}; -static const WCHAR type_expand_sz[] = {'R','E','G','_','E','X','P','A','N','D','_','S','Z',0}; -static const WCHAR type_binary[] = {'R','E','G','_','B','I','N','A','R','Y',0}; -static const WCHAR type_dword[] = {'R','E','G','_','D','W','O','R','D',0}; -static const WCHAR type_dword_le[] = {'R','E','G','_','D','W','O','R','D','_','L','I','T','T','L','E','_','E','N','D','I','A','N',0}; -static const WCHAR type_dword_be[] = {'R','E','G','_','D','W','O','R','D','_','B','I','G','_','E','N','D','I','A','N',0}; -static const WCHAR type_multi_sz[] = {'R','E','G','_','M','U','L','T','I','_','S','Z',0}; - -static const struct -{ - DWORD type; - const WCHAR *name; -} -type_rels[] = -{ - {REG_NONE, type_none}, - {REG_SZ, type_sz}, - {REG_EXPAND_SZ, type_expand_sz}, - {REG_BINARY, type_binary}, - {REG_DWORD, type_dword}, - {REG_DWORD_LITTLE_ENDIAN, type_dword_le}, - {REG_DWORD_BIG_ENDIAN, type_dword_be}, - {REG_MULTI_SZ, type_multi_sz}, -}; - -static const WCHAR *reg_type_to_wchar(DWORD type) -{ - int i, array_size = ARRAY_SIZE(type_rels); - - for (i = 0; i < array_size; i++) - { - if (type == type_rels[i].type) - return type_rels[i].name; - } - return NULL; -} - - static void close_key(struct parser *parser) { if (parser->hkey) @@ -1308,16 +1268,11 @@ static void export_hkey(FILE *file, HKEY key, break; } - default: - { - output_message(STRING_UNSUPPORTED_TYPE, reg_type_to_wchar(value_type), *reg_key_name_buf); - output_message(STRING_EXPORT_AS_BINARY, *val_name_buf); - } - /* falls through */ + case REG_NONE: case REG_EXPAND_SZ: case REG_MULTI_SZ: - /* falls through */ case REG_BINARY: + default: REGPROC_export_binary(line_buf, line_buf_size, &line_len, value_type, *val_buf, val_size1, unicode); } REGPROC_write_line(file, *line_buf, unicode);

1 0

Hugh McMaster : regedit: Remove an unused #define.
by Alexandre Julliard June 16, 2017

June 16, 2017

Module: wine Branch: master Commit: 300df08e703be914384b95b6adfcfba5ad2a466d URL: http://source.winehq.org/git/wine.git/?a=commit;h=300df08e703be914384b95b6a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:01 2017 +0000 regedit: Remove an unused #define. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 50564c8..e977c1a 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -277,8 +277,6 @@ static BYTE *convert_hex_csv_to_hex(WCHAR *str, DWORD *size) return data; } -#define REG_UNKNOWN_TYPE 99 - /****************************************************************************** * Parses the data type of the registry value being imported and modifies * the input parameter to skip the string representation of the data type.

1 0