winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
June 2017
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
595 discussions
Start a n
N
ew thread
Francois Gouget : testbot: Add Page::GetParamNames() to retrieve a page' s parameter names.
by Alexandre Julliard
19 Jun '17
19 Jun '17
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
0
0
Francois Gouget : testbot/TestLauncher: Trace the time it takes to run each test.
by Alexandre Julliard
19 Jun '17
19 Jun '17
Module: tools Branch: master Commit: baf733def7e39a18d020dd50f060c870a60be1ac URL:
http://source.winehq.org/git/tools.git/?a=commit;h=baf733def7e39a18d020dd50…
Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 18 13:48:42 2017 +0200 testbot/TestLauncher: Trace the time it takes to run each test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 2e9a62f..1d0abac 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -283,7 +283,7 @@ static BOOL AllImportedDllsPresent(const char *TestExeName) int main(int argc, char *argv[]) { int Arg; - DWORD TimeOut; + DWORD Start, TimeOut; BOOL UsageError; char TestExeFullName[_MAX_PATH]; char *TestExeFileName; @@ -375,12 +375,14 @@ int main(int argc, char *argv[]) exit(1); } + Start = GetTickCount(); printf("%s:%s start - -\n", TestName, Subtest); if (! AllImportedDllsPresent(TestExeFullName)) { printf("%s: %u tests executed (0 marked as todo, %u failures), %u skipped.\n", TestName, Failures, Failures, Skips); - printf("%s:%s done (%u)\n", TestName, Subtest, Failures); + printf("%s:%s done (%u) in %lds\n", TestName, Subtest, Failures, + (GetTickCount() - Start) / 1000); exit(0); } @@ -449,7 +451,8 @@ int main(int argc, char *argv[]) } CloseHandle(ProcessInformation.hProcess); - printf("%s:%s done (%lu)\n", TestName, Subtest, ExitCode); + printf("%s:%s done (%lu) in %lds\n", TestName, Subtest, ExitCode, + (GetTickCount() - Start) / 1000); return 0; }
1
0
0
0
Rosanne DiMesio : Update rating of old version when a test is moved
by Jeremy Newman
19 Jun '17
19 Jun '17
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
0
0
Rosanne DiMesio : Do not show delete button or comment box on manage notes page
by Jeremy Newman
19 Jun '17
19 Jun '17
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
0
0
Rosanne DiMesio : Allow users to see their queued screenshots
by Jeremy Newman
19 Jun '17
19 Jun '17
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
0
0
Paul Gofman : d3dx9: Add scalar and vector setting path to set_constants() .
by Alexandre Julliard
16 Jun '17
16 Jun '17
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
0
0
Paul Gofman : d3dx9: Avoid casting each value separately in set_constants( ).
by Alexandre Julliard
16 Jun '17
16 Jun '17
Module: wine Branch: master Commit: f48d38e5ac72ff0d5cb5951a40072e92a77b4b38 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f48d38e5ac72ff0d5cb5951a4…
Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 15 01:00:36 2017 +0300 d3dx9: Avoid casting each value separately in 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 | 101 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 84 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index e9c8387..f10a3c6 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -22,6 +22,7 @@ #include "d3dx9_private.h" #include <float.h> +#include <assert.h> WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -1037,6 +1038,73 @@ static void get_const_upload_info(struct d3dx_const_param_eval_output *const_set info->count = info->major_count * info->minor; } +static void pres_int_from_float(void *out, const void *in, unsigned int count) +{ + unsigned int i; + const float *in_float = in; + int *out_int = out; + + for (i = 0; i < count; ++i) + out_int[i] = in_float[i]; +} + +static void pres_bool_from_value(void *out, const void *in, unsigned int count) +{ + unsigned int i; + const DWORD *in_dword = in; + BOOL *out_bool = out; + + for (i = 0; i < count; ++i) + out_bool[i] = !!in_dword[i]; +} + +static void pres_float_from_int(void *out, const void *in, unsigned int count) +{ + unsigned int i; + const int *in_int = in; + float *out_float = out; + + for (i = 0; i < count; ++i) + out_float[i] = in_int[i]; +} + +static void pres_float_from_bool(void *out, const void *in, unsigned int count) +{ + unsigned int i; + const BOOL *in_bool = in; + float *out_float = out; + + for (i = 0; i < count; ++i) + out_float[i] = !!in_bool[i]; +} + +static void pres_int_from_bool(void *out, const void *in, unsigned int count) +{ + unsigned int i; + const float *in_bool = in; + int *out_int = out; + + for (i = 0; i < count; ++i) + out_int[i] = !!in_bool[i]; +} + +static void regstore_set_data(struct d3dx_regstore *rs, unsigned int table, + unsigned int offset, const unsigned int *in, unsigned int count, enum pres_value_type param_type) +{ + typedef void (*conv_func)(void *out, const void *in, unsigned int count); + static const conv_func set_const_funcs[PRES_VT_COUNT][PRES_VT_COUNT] = + { + {NULL, NULL, pres_int_from_float, pres_bool_from_value}, + {NULL, NULL, NULL, NULL}, + {pres_float_from_int, NULL, NULL, pres_bool_from_value}, + {pres_float_from_bool, NULL, pres_int_from_bool, NULL} + }; + enum pres_value_type table_type = table_info[table].type; + + set_const_funcs[param_type][table_type]((unsigned int *)rs->tables[table] + offset, in, count); + regstore_set_modified(rs, table, offset, count); +} + static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const_tab, ULONG64 new_update_version) { @@ -1047,11 +1115,11 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const struct d3dx_const_param_eval_output *const_set = &const_tab->const_set[const_idx]; unsigned int table = const_set->table; struct d3dx_parameter *param = const_set->param; - enum pres_value_type table_type = table_info[table].type; unsigned int element, i, j, start_offset; unsigned int param_offset; struct const_upload_info info; unsigned int *data = param->data; + enum pres_value_type param_type; if (!is_param_dirty(param, const_tab->update_version)) continue; @@ -1063,22 +1131,23 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const get_offset_reg(table, const_set->register_count)); continue; } + param_type = table_type_from_param_type(param->type); get_const_upload_info(const_set, &info); - for (element = 0; element < const_set->element_count; ++element) { + unsigned int *out = (unsigned int *)rs->tables[table] + start_offset; + + /* Store reshaped but (possibly) not converted yet data temporarily in the same constants buffer. + * All the supported types of parameters and table values have the same size. */ for (i = 0; i < info.major_count; ++i) { for (j = 0; j < info.minor; ++j) { - unsigned int out; - unsigned int *in; unsigned int offset; offset = i * info.major_stride + j; if (get_reg_offset(table, offset) >= const_set->register_count) break; - offset += start_offset; if (info.transpose) param_offset = i + j * info.major; else @@ -1088,23 +1157,19 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const WARN("Parameter data is too short, name %s, component %u.\n", debugstr_a(param->name), i); break; } - - in = (unsigned int *)data + param_offset; - switch (table_type) - { - case PRES_VT_FLOAT: set_number(&out, D3DXPT_FLOAT, in, param->type); break; - case PRES_VT_INT: set_number(&out, D3DXPT_INT, in, param->type); break; - case PRES_VT_BOOL: set_number(&out, D3DXPT_BOOL, in, param->type); break; - default: - FIXME("Unexpected type %#x.\n", table_info[table].type); - break; - } - regstore_set_values(rs, table, &out, offset, 1); + out[offset] = data[param_offset]; } } start_offset += get_offset_reg(table, const_set->register_count); data += param->rows * param->columns; } + start_offset = get_offset_reg(table, const_set->register_index); + if (table_info[table].type == param_type) + regstore_set_modified(rs, table, start_offset, + get_offset_reg(table, const_set->register_count) * const_set->element_count); + else + regstore_set_data(rs, table, start_offset, (unsigned int *)rs->tables[table] + start_offset, + get_offset_reg(table, const_set->register_count) * const_set->element_count, param_type); } const_tab->update_version = new_update_version; } @@ -1310,6 +1375,8 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC ERR("Unexpected register set %u.\n", desc.RegisterSet); return D3DERR_INVALIDCALL; } + assert(table_info[const_set.table].component_size == sizeof(unsigned int)); + assert(param->bytes / (param->rows * param->columns) == sizeof(unsigned int)); const_set.register_count = desc.RegisterCount; table_type = table_info[const_set.table].type; get_const_upload_info(&const_set, &info);
1
0
0
0
Nils Kuhnhenn : oleaut32: Use variable with the correct type in LIST_FOR_EACH_ENTRY_SAFE macro.
by Alexandre Julliard
16 Jun '17
16 Jun '17
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
0
0
Jacek Caban : widl: Try to find imported typelib using .tlb extension if it wasn't specified.
by Alexandre Julliard
16 Jun '17
16 Jun '17
Module: wine Branch: master Commit: fbdf119e2c8ac4233c4323835ff82fe3ad3de3d7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=fbdf119e2c8ac4233c4323835…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 16 15:25:48 2017 +0200 widl: Try to find imported typelib using .tlb extension if it wasn't specified. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typelib.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 6ac748f..e8dfcb1 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -326,22 +326,42 @@ static void read_msft_importlib(importlib_t *importlib, int fd) free(typeinfo_offs); } +static int open_typelib(const char *name) +{ + char *file_name; + int fd; + + file_name = wpp_find_include(name, NULL); + if(!file_name) + return open(name, O_RDONLY | O_BINARY ); + + fd = open(file_name, O_RDONLY | O_BINARY ); + free(file_name); + return fd; +} + static void read_importlib(importlib_t *importlib) { int fd; INT magic; - char *file_name; - file_name = wpp_find_include(importlib->name, NULL); - if(file_name) { - fd = open(file_name, O_RDONLY | O_BINARY ); - free(file_name); - }else { - fd = open(importlib->name, O_RDONLY | O_BINARY ); + fd = open_typelib(importlib->name); + + /* widl extension: if importlib name has no .tlb extension, try using .tlb */ + if(fd < 0) { + const char *p = strrchr(importlib->name, '.'); + size_t len = p ? p - importlib->name : strlen(importlib->name); + if(strcmp(importlib->name + len, ".tlb")) { + char *tlb_name = xmalloc(len + 5); + memcpy(tlb_name, importlib->name, len); + strcpy(tlb_name + len, ".tlb"); + fd = open_typelib(tlb_name); + free(tlb_name); + } } if(fd < 0) - error("Could not open importlib %s.\n", importlib->name); + error("Could not find importlib %s.\n", importlib->name); tlb_read(fd, &magic, sizeof(magic));
1
0
0
0
Hugh McMaster : regedit: Re-insert the default value item after deleting its data.
by Alexandre Julliard
16 Jun '17
16 Jun '17
Module: wine Branch: master Commit: cb563dbac61c320032ee14bdb2b6def1960393ed URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cb563dbac61c320032ee14bdb…
Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:59 2017 +0000 regedit: Re-insert the default value item after deleting its data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 3 ++- programs/regedit/framewnd.c | 15 ++++++++++++++- programs/regedit/listview.c | 8 ++++---- programs/regedit/main.h | 2 +- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index d88061c..403def4 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -483,7 +483,8 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW } /* Add the new item to the listview */ - index = AddEntryToList(g_pChildWnd->hListWnd, valueName, valueType, (BYTE *)&valueDword, sizeof(DWORD)); + index = AddEntryToList(g_pChildWnd->hListWnd, valueName, valueType, + (BYTE *)&valueDword, sizeof(DWORD), -1); item.state = LVIS_FOCUSED | LVIS_SELECTED; item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; SendMessageW(g_pChildWnd->hListWnd, LVM_SETITEMSTATE, index, (LPARAM)&item); diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 539be96..361da7e 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -806,7 +806,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } HeapFree(GetProcessHeap(), 0, keyPath); } else if (hWndDelete == g_pChildWnd->hListWnd) { - unsigned int num_selected, index; + unsigned int num_selected, index, focus_idx; WCHAR *keyPath; if (!(num_selected = SendMessageW(g_pChildWnd->hListWnd, LVM_GETSELECTEDCOUNT, 0, 0L))) @@ -821,7 +821,9 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + focus_idx = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED, 0)); index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_SELECTED, 0)); + while (index != -1) { WCHAR *valueName = GetItemText(g_pChildWnd->hListWnd, index); @@ -832,6 +834,17 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } HeapFree(GetProcessHeap(), 0, valueName); SendMessageW(g_pChildWnd->hListWnd, LVM_DELETEITEM, index, 0L); + /* the default value item is always visible, so add it back in */ + if (!index) + { + AddEntryToList(g_pChildWnd->hListWnd, NULL, REG_SZ, NULL, 0, 0); + if (!focus_idx) + { + LVITEMW item; + item.state = item.stateMask = LVIS_FOCUSED; + SendMessageW(g_pChildWnd->hListWnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + } + } index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_SELECTED, 0)); } HeapFree(GetProcessHeap(), 0, keyPath); diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index caa9a23..1365259 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -157,7 +157,7 @@ void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD siz } } -int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount) +int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos) { LINE_INFO* linfo; LVITEMW item; @@ -178,7 +178,7 @@ int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWOR } item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; - item.iItem = SendMessageW(hwndLV, LVM_GETITEMCOUNT, 0, 0); + item.iItem = (pos == -1) ? SendMessageW(hwndLV, LVM_GETITEMCOUNT, 0, 0) : pos; item.iSubItem = 0; item.state = 0; item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; @@ -557,7 +557,7 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli valSize = max_val_size; if (RegQueryValueExW(hKey, NULL, NULL, &valType, valBuf, &valSize) == ERROR_FILE_NOT_FOUND) { - AddEntryToList(hwndLV, NULL, REG_SZ, NULL, 0); + AddEntryToList(hwndLV, NULL, REG_SZ, NULL, 0, -1); } for(index = 0; index < val_count; index++) { valNameLen = max_val_name_len; @@ -566,7 +566,7 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli errCode = RegEnumValueW(hKey, index, valName, &valNameLen, NULL, &valType, valBuf, &valSize); if (errCode != ERROR_SUCCESS) goto done; valBuf[valSize] = 0; - AddEntryToList(hwndLV, valName[0] ? valName : NULL, valType, valBuf, valSize); + AddEntryToList(hwndLV, valName[0] ? valName : NULL, valType, valBuf, valSize, -1); } memset(&item, 0, sizeof(item)); diff --git a/programs/regedit/main.h b/programs/regedit/main.h index f09de34..5331189 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -118,7 +118,7 @@ extern void UpdateStatusBar(void); /* listview.c */ extern void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD size); -extern int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount); +extern int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos); extern HWND CreateListView(HWND hwndParent, UINT id); extern BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highlightValue); extern HWND StartValueRename(HWND hwndLV);
1
0
0
0
← Newer
1
...
22
23
24
25
26
27
28
...
60
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
Results per page:
10
25
50
100
200