May 2014 - Wine-commits - list.winehq.org

Francois Gouget : testbot/web: Make sure Page::_initialize() is always called, with the right arguments.
by Alexandre Julliard 21 May '14

21 May '14

Module: tools Branch: master Commit: df51375c707cd94119417f68e55cfe9b610ce21a URL: http://source.winehq.org/git/tools.git/?a=commit;h=df51375c707cd94119417f68… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 21 17:44:40 2014 +0200 testbot/web: Make sure Page::_initialize() is always called, with the right arguments. Although Page::_initialize() is empty now, it is improper for subclasses to assume so and skip calling it or not pass it the right arguments. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 5 ++--- testbot/lib/ObjectModel/CGI/ItemPage.pm | 2 +- testbot/lib/ObjectModel/CGI/Page.pm | 5 +++-- testbot/lib/WineTestBot/CGI/PageBase.pm | 1 + testbot/web/Feedback.pl | 4 ++-- testbot/web/ForgotPassword.pl | 4 ++-- testbot/web/Login.pl | 4 ++-- testbot/web/Logout.pl | 4 +++- testbot/web/ResetPassword.pl | 4 ++-- testbot/web/Submit.pl | 4 ++-- testbot/web/index.pl | 4 ++-- 11 files changed, 22 insertions(+), 19 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index c9dfb04..0bf8694 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -36,10 +36,9 @@ require Exporter; sub _initialize { - my $self = shift; - my $PropertyDescriptors = shift; + my ($self, $Request, $RequiredRole, $PropertyDescriptors) = @_; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize($Request, $RequiredRole); $self->{PropertyDescriptors} = $PropertyDescriptors; $self->{HasRequired} = !1; diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 16736fe..46925f3 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -42,7 +42,7 @@ sub _initialize $self->{Collection} = $Collection; - $self->SUPER::_initialize($Collection->GetPropertyDescriptors(), @_); + $self->SUPER::_initialize($Request, $RequiredRole, $Collection->GetPropertyDescriptors()); if (defined($self->GetParam("Key"))) { diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 331243c..8bbd1ae 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -37,7 +37,7 @@ require Exporter; sub new { my $class = shift; - my $Request = $_[0]; + my ($Request, $RequiredRole) = @_; my $self = {Request => $Request, CGIObj => CGI->new($Request), @@ -45,12 +45,13 @@ sub new ErrField => undef}; $self = bless $self, $class; $self->{PageBase} = &$PageBaseCreator($self, @_); - $self->_initialize(@_); + $self->_initialize($Request, $RequiredRole); return $self; } sub _initialize { + #my ($self, $Request, $RequiredRole) = @_; } sub GetParam diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 7e12e80..7d75c5e 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -68,6 +68,7 @@ sub new sub _initialize { + #my ($self, $Page, $Request, $RequiredRole) = @_; } sub CheckSecurePage diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index c266ce4..b923c11 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -29,7 +29,7 @@ use WineTestBot::Config; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Name", "Name", !1, !1, "A", 40), @@ -37,7 +37,7 @@ sub _initialize CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, 1, "A", 1024), ); - $self->SUPER::_initialize(\@PropertyDescriptors); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); my $Session = $self->GetCurrentSession(); if (defined($Session)) diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index a22d441..dc35a2b 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -31,7 +31,7 @@ use WineTestBot::CGI::Sessions; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; $self->GetPageBase()->CheckSecurePage(); @@ -39,7 +39,7 @@ sub _initialize CreateBasicPropertyDescriptor("Name", "Username or EMail", 1, 1, "A", 40), ); - $self->SUPER::_initialize(\@PropertyDescriptors); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); } sub GetTitle diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index 4002948..e6a4945 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -32,7 +32,7 @@ use WineTestBot::CGI::Sessions; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; $self->GetPageBase()->CheckSecurePage(); @@ -42,7 +42,7 @@ sub _initialize CreateBasicPropertyDescriptor("AutoLogin", "Log me in automatically each visit", !1, !1, "B", 1), ); - $self->SUPER::_initialize(\@PropertyDescriptors); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); } sub GetTitle diff --git a/testbot/web/Logout.pl b/testbot/web/Logout.pl index 696bb95..24d3ac3 100644 --- a/testbot/web/Logout.pl +++ b/testbot/web/Logout.pl @@ -29,7 +29,9 @@ use CGI::Cookie; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; + + $self->SUPER::_initialize($Request, $RequiredRole); $self->{WasLoggedIn} = undef; diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index dff05cf..73a7258 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -31,7 +31,7 @@ use WineTestBot::CGI::Sessions; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; $self->GetPageBase()->CheckSecurePage(); @@ -42,7 +42,7 @@ sub _initialize CreateBasicPropertyDescriptor("Password2", "Password (repeat)", !1, 1, "A", 32), ); - $self->SUPER::_initialize(\@PropertyDescriptors); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); } sub GetTitle diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 695ba76..03b9af2 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -39,7 +39,7 @@ use WineTestBot::VMs; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; $self->{Page} = $self->GetParam("Page") || 1; @@ -62,7 +62,7 @@ sub _initialize $self->{ShowAll} = defined($self->GetParam("ShowAll")); } - $self->SUPER::_initialize(undef); + $self->SUPER::_initialize($Request, $RequiredRole, undef); } sub GetTitle diff --git a/testbot/web/index.pl b/testbot/web/index.pl index d0ba188..25f5e0e 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -194,9 +194,9 @@ use WineTestBot::VMs; sub _initialize { - my $self = shift; + my ($self, $Request, $RequiredRole) = @_; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize($Request, $RequiredRole); } sub OutputDot

1 0

Francois Gouget : testbot/lib: Always call the parent _initialize() and InitializeNew() methods, with the right arguments.
by Alexandre Julliard 21 May '14

21 May '14

Module: tools Branch: master Commit: 261fcf10d4d16b2c85ec5bb225733ef1b3ece485 URL: http://source.winehq.org/git/tools.git/?a=commit;h=261fcf10d4d16b2c85ec5bb2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 21 17:44:59 2014 +0200 testbot/lib: Always call the parent _initialize() and InitializeNew() methods, with the right arguments. Although Item::_initialize() is empty now, it is improper for subclasses to assume so and skip calling it or not pass it the right arguments. Similarly, although Item::InitializeNew() does not currently use its Collection argument, subclasses should not assume so. --- testbot/lib/ObjectModel/Collection.pm | 3 ++- testbot/lib/ObjectModel/Item.pm | 3 ++- testbot/lib/WineTestBot/Branches.pm | 4 ++-- testbot/lib/WineTestBot/CGI/Sessions.pm | 4 ++-- testbot/lib/WineTestBot/Jobs.pm | 8 ++++---- testbot/lib/WineTestBot/Patches.pm | 4 ++-- testbot/lib/WineTestBot/Steps.pm | 2 +- testbot/lib/WineTestBot/StepsTasks.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/lib/WineTestBot/Users.pm | 4 ++-- testbot/lib/WineTestBot/VMs.pm | 6 ++++-- 11 files changed, 23 insertions(+), 19 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index a356990..7dbcf63 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -102,7 +102,8 @@ sub new sub _initialize { - my ($self) = @_; + # $MasterObject may be required for some Collections. + my ($self, $MasterObject) = @_; $self->{AllScopeItems}->{ref($self)} ||= {}; } diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 47aea03..0cc07ab 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -72,11 +72,12 @@ sub new sub _initialize { + #my ($self, $Collection) = @_; } sub InitializeNew { - my $self = shift; + my ($self, $_Collection) = @_; $self->{IsModified} = !1; } diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index 0b37e89..f434569 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -35,10 +35,10 @@ require Exporter; sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; $self->IsDefault(!1); - $self->SUPER::InitializeNew(); + $self->SUPER::InitializeNew($Collection); } package WineTestBot::Branches; diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index a053036..3fbef8a 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -36,9 +36,9 @@ use vars qw(@ISA @EXPORT); sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; - $self->SUPER::InitializeNew(@_); + $self->SUPER::InitializeNew($Collection); $self->Permanent(!1); } diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 4532d4e..60241e0 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -62,23 +62,23 @@ require Exporter; sub _initialize { - my $self = shift; + my ($self, $Collection) = @_; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize($Collection); $self->{OldStatus} = undef; } sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; $self->Archived(!1); $self->Branch(CreateBranches()->GetDefaultBranch()); $self->Status("queued"); $self->Submitted(time()); - $self->SUPER::InitializeNew(); + $self->SUPER::InitializeNew($Collection); } sub Status diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 70c47f7..bb7ea3f 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -49,11 +49,11 @@ require Exporter; sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; $self->Received(time()); - $self->SUPER::InitializeNew(); + $self->SUPER::InitializeNew($Collection); } =pod diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index e937866..2a7ee35 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -53,7 +53,7 @@ sub InitializeNew $self->DebugLevel(1); $self->ReportSuccessfulTests(!1); - $self->SUPER::InitializeNew(@_); + $self->SUPER::InitializeNew($Collection); } sub HandleStaging diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 8a29196..a5facda 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -120,7 +120,7 @@ sub _initialize my $self = shift; my $Job = $_[0]; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize($Job); foreach my $Step (@{$Job->Steps->GetItems()}) { diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index dd22749..02dd220 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -54,7 +54,7 @@ sub InitializeNew my $Keys = $Collection->GetKeys(); $self->No(scalar @$Keys + 1); - $self->SUPER::InitializeNew(@_); + $self->SUPER::InitializeNew($Collection); } =pod diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 46828a3..047e5d7 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -40,11 +40,11 @@ require Exporter; sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; $self->Status('active'); $self->Password("*"); - $self->SUPER::InitializeNew(); + $self->SUPER::InitializeNew($Collection); } sub GeneratePasswordHash diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 0aa06eb..e4a5a59 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -223,6 +223,8 @@ sub _initialize($$) { my ($self, $VMs) = @_; + $self->SUPER::_initialize($VMs); + $self->{Hypervisors} = $VMs->{Hypervisors}; $self->{Hypervisor} = undef; $self->{Domain} = undef; @@ -231,12 +233,12 @@ sub _initialize($$) sub InitializeNew { - my $self = shift; + my ($self, $Collection) = @_; $self->Status("idle"); $self->IdleSnapshot("wtb"); - $self->SUPER::InitializeNew(@_); + $self->SUPER::InitializeNew($Collection); } sub GetHost($)

1 0

Henri Verbeet : wined3d: Recognize the SM4 discard opcode.
by Alexandre Julliard 20 May '14

20 May '14

Module: wine Branch: master Commit: c81d3b7336e12e0f7031051097e972f5157c4972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c81d3b7336e12e0f703105109… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 20 07:38:45 2014 +0200 wined3d: Recognize the SM4 discard opcode. --- dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/shader_sm4.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d0f2b71..bce0097 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4073,6 +4073,8 @@ static void shader_glsl_texkill(const struct wined3d_shader_instruction *ins) shader_glsl_add_dst_param(ins, &ins->dst[0], &dst_param); if (ins->ctx->reg_maps->shader_version.major >= 2) { + if (ins->ctx->reg_maps->shader_version.major >= 4) + FIXME("SM4 discard not implemented.\n"); /* 2.0 shaders compare all 4 components in texkill */ shader_addline(ins->ctx->buffer, "if (any(lessThan(%s.xyzw, vec4(0.0)))) discard;\n", dst_param.reg_name); } else { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 9a6131f..b001aad 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -78,6 +78,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_CUT = 0x09, WINED3D_SM4_OP_DERIV_RTX = 0x0b, WINED3D_SM4_OP_DERIV_RTY = 0x0c, + WINED3D_SM4_OP_DISCARD = 0x0d, WINED3D_SM4_OP_DIV = 0x0e, WINED3D_SM4_OP_DP3 = 0x10, WINED3D_SM4_OP_DP4 = 0x11, @@ -212,6 +213,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_CUT, WINED3DSIH_CUT, "", ""}, {WINED3D_SM4_OP_DERIV_RTX, WINED3DSIH_DSX, "F", "F"}, {WINED3D_SM4_OP_DERIV_RTY, WINED3DSIH_DSY, "F", "F"}, + {WINED3D_SM4_OP_DISCARD, WINED3DSIH_TEXKILL, "", "U"}, {WINED3D_SM4_OP_DIV, WINED3DSIH_DIV, "F", "FF"}, {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, "F", "FF"}, {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, "F", "FF"},

1 0

Henri Verbeet : wined3d: Recognize the SM4 dp2 opcode.
by Alexandre Julliard 20 May '14

20 May '14

Module: wine Branch: master Commit: 3555eab8b9d18059ce0cb37b2595460164b4c1f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3555eab8b9d18059ce0cb37b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 20 07:38:46 2014 +0200 wined3d: Recognize the SM4 dp2 opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 195c3ae..ecbaec6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5191,6 +5191,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DEFB */ shader_hw_nop, /* WINED3DSIH_DEFI */ shader_hw_nop, /* WINED3DSIH_DIV */ NULL, + /* WINED3DSIH_DP2 */ NULL, /* WINED3DSIH_DP2ADD */ pshader_hw_dp2add, /* WINED3DSIH_DP3 */ shader_hw_map2gl, /* WINED3DSIH_DP4 */ shader_hw_map2gl, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bce0097..84b638e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6650,6 +6650,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DEFB */ shader_glsl_nop, /* WINED3DSIH_DEFI */ shader_glsl_nop, /* WINED3DSIH_DIV */ shader_glsl_binop, + /* WINED3DSIH_DP2 */ shader_glsl_dot, /* WINED3DSIH_DP2ADD */ shader_glsl_dp2add, /* WINED3DSIH_DP3 */ shader_glsl_dot, /* WINED3DSIH_DP4 */ shader_glsl_dot, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a9b3d9f..05e7168 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -62,6 +62,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DEFB */ "defb", /* WINED3DSIH_DEFI */ "defi", /* WINED3DSIH_DIV */ "div", + /* WINED3DSIH_DP2 */ "dp2", /* WINED3DSIH_DP2ADD */ "dp2add", /* WINED3DSIH_DP3 */ "dp3", /* WINED3DSIH_DP4 */ "dp4", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b001aad..f01463b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -80,6 +80,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DERIV_RTY = 0x0c, WINED3D_SM4_OP_DISCARD = 0x0d, WINED3D_SM4_OP_DIV = 0x0e, + WINED3D_SM4_OP_DP2 = 0x0f, WINED3D_SM4_OP_DP3 = 0x10, WINED3D_SM4_OP_DP4 = 0x11, WINED3D_SM4_OP_EMIT = 0x13, @@ -215,6 +216,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DERIV_RTY, WINED3DSIH_DSY, "F", "F"}, {WINED3D_SM4_OP_DISCARD, WINED3DSIH_TEXKILL, "", "U"}, {WINED3D_SM4_OP_DIV, WINED3DSIH_DIV, "F", "FF"}, + {WINED3D_SM4_OP_DP2, WINED3DSIH_DP2, "F", "FF"}, {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, "F", "FF"}, {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, "F", "FF"}, {WINED3D_SM4_OP_EMIT, WINED3DSIH_EMIT, "", ""}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9233148..6e6534f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -446,6 +446,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DEFB, WINED3DSIH_DEFI, WINED3DSIH_DIV, + WINED3DSIH_DP2, WINED3DSIH_DP2ADD, WINED3DSIH_DP3, WINED3DSIH_DP4,

1 0

Henri Verbeet : wined3d: Recognize the SM4 ishl opcode.
by Alexandre Julliard 20 May '14

20 May '14

Module: wine Branch: master Commit: 7b8aa8606cd4af99dbeae57584febf8559efb6a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8aa8606cd4af99dbeae5758… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 20 07:38:47 2014 +0200 wined3d: Recognize the SM4 ishl opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 7 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ecbaec6..5d23eed 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5215,6 +5215,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IFC */ shader_hw_ifc, /* WINED3DSIH_IGE */ NULL, /* WINED3DSIH_IMUL */ NULL, + /* WINED3DSIH_ISHL */ NULL, /* WINED3DSIH_ITOF */ NULL, /* WINED3DSIH_LABEL */ shader_hw_label, /* WINED3DSIH_LD */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 84b638e..e5eb685 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2335,6 +2335,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_AND: op = "&"; break; case WINED3DSIH_DIV: op = "/"; break; case WINED3DSIH_IADD: op = "+"; break; + case WINED3DSIH_ISHL: op = "<<"; break; case WINED3DSIH_MUL: op = "*"; break; case WINED3DSIH_SUB: op = "-"; break; case WINED3DSIH_USHR: op = ">>"; break; @@ -6674,6 +6675,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ shader_glsl_relop, /* WINED3DSIH_IMUL */ shader_glsl_imul, + /* WINED3DSIH_ISHL */ shader_glsl_binop, /* WINED3DSIH_ITOF */ shader_glsl_to_float, /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 05e7168..06ed09a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -86,6 +86,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IFC */ "ifc", /* WINED3DSIH_IGE */ "ige", /* WINED3DSIH_IMUL */ "imul", + /* WINED3DSIH_ISHL */ "ishl", /* WINED3DSIH_ITOF */ "itof", /* WINED3DSIH_LABEL */ "label", /* WINED3DSIH_LD */ "ld", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f01463b..f10969b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -96,6 +96,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_IEQ = 0x20, WINED3D_SM4_OP_IGE = 0x21, WINED3D_SM4_OP_IMUL = 0x26, + WINED3D_SM4_OP_ISHL = 0x29, WINED3D_SM4_OP_ITOF = 0x2b, WINED3D_SM4_OP_LD = 0x2d, WINED3D_SM4_OP_LOG = 0x2f, @@ -232,6 +233,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_IEQ, WINED3DSIH_IEQ, "U", "II"}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, "U", "II"}, {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, "II", "II"}, + {WINED3D_SM4_OP_ISHL, WINED3DSIH_ISHL, "I", "II"}, {WINED3D_SM4_OP_ITOF, WINED3DSIH_ITOF, "F", "I"}, {WINED3D_SM4_OP_LD, WINED3DSIH_LD, "U", "FR"}, {WINED3D_SM4_OP_LOG, WINED3DSIH_LOG, "F", "F"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6e6534f..b3cb884 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -470,6 +470,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IFC, WINED3DSIH_IGE, WINED3DSIH_IMUL, + WINED3DSIH_ISHL, WINED3DSIH_ITOF, WINED3DSIH_LABEL, WINED3DSIH_LD,

1 0

Marcus Meissner : jsproxy: Avoid potential NULL dereference (Coverity).
by Alexandre Julliard 20 May '14

20 May '14

Module: wine Branch: master Commit: 0dda8a14db8d83505670f1375966d35ed3c05ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dda8a14db8d83505670f1375… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue May 20 08:47:38 2014 +0200 jsproxy: Avoid potential NULL dereference (Coverity). --- dlls/jsproxy/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index 4d02b07..0399173 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -103,8 +103,11 @@ static inline WCHAR *strdupAW( const char *src, DWORD len ) if (src) { int dst_len = MultiByteToWideChar( CP_ACP, 0, src, len, NULL, 0 ); - if ((dst = heap_alloc( (dst_len + 1) * sizeof(WCHAR) ))) len = MultiByteToWideChar( CP_ACP, 0, src, len, dst, dst_len ); - dst[dst_len] = 0; + if ((dst = heap_alloc( (dst_len + 1) * sizeof(WCHAR) ))) + { + len = MultiByteToWideChar( CP_ACP, 0, src, len, dst, dst_len ); + dst[dst_len] = 0; + } } return dst; }

1 0

Marcus Meissner : msxml3: Removed unused allocation (Coverity).
by Alexandre Julliard 20 May '14

20 May '14

Module: wine Branch: master Commit: 2c984fc8e2400d6cbe01f720fdf9df9d284669c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c984fc8e2400d6cbe01f720f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue May 20 08:47:41 2014 +0200 msxml3: Removed unused allocation (Coverity). --- dlls/msxml3/tests/domdoc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 2b877a7..881679e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3046,8 +3046,6 @@ static void test_getElementsByTagName(void) ok( r == S_OK, "loadXML failed\n"); ok( b == VARIANT_TRUE, "failed to load XML string\n"); - str = SysAllocString( szstar ); - /* null arguments cases */ r = IXMLDOMDocument_getElementsByTagName(doc, NULL, &node_list); ok( r == E_INVALIDARG, "ret %08x\n", r );

1 0

Vincent Povirk : server: Clear the queue' s QS_SMRESULT bit when sending a new message.
by Alexandre Julliard 20 May '14

20 May '14

Module: wine Branch: master Commit: 417585661c26af26bc3251cff8e628e04adbec80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=417585661c26af26bc3251cff… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 13 15:35:20 2014 -0500 server: Clear the queue's QS_SMRESULT bit when sending a new message. --- dlls/user32/tests/win.c | 2 +- server/queue.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a858f6b..cffceb3 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7580,7 +7580,7 @@ static LRESULT WINAPI smresult_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARA /* Send another message while we have a reply queued for the current one. */ res = SendMessageA(data->thread_hwnd, WM_APP+2, 0, lparam); - todo_wine ok(res == 0x449b0190, "unexpected result %lx\n", res); + ok(res == 0x449b0190, "unexpected result %lx\n", res); return 0; } diff --git a/server/queue.c b/server/queue.c index 1954886..57603e1 100644 --- a/server/queue.c +++ b/server/queue.c @@ -681,7 +681,11 @@ static struct message_result *alloc_message_result( struct msg_queue *send_queue result->callback_msg = callback_msg; list_add_head( &send_queue->callback_result, &result->sender_entry ); } - else if (send_queue) list_add_head( &send_queue->send_result, &result->sender_entry ); + else if (send_queue) + { + list_add_head( &send_queue->send_result, &result->sender_entry ); + clear_queue_bits( send_queue, QS_SMRESULT ); + } if (timeout != TIMEOUT_INFINITE) result->timeout = add_timeout_user( timeout, result_timeout, result ); @@ -2502,7 +2506,8 @@ DECL_HANDLER(get_message_reply) else { result = LIST_ENTRY( entry, struct message_result, sender_entry ); - if (!result->replied) clear_queue_bits( queue, QS_SMRESULT ); + if (result->replied) set_queue_bits( queue, QS_SMRESULT ); + else clear_queue_bits( queue, QS_SMRESULT ); } } }

1 0

Piotr Caban : msvcp100: Export basic_istream::gcount function.
by Alexandre Julliard 20 May '14

20 May '14

Module: wine Branch: master Commit: 48c9a90a81b44a7c158b2857488eea9870332cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c9a90a81b44a7c158b28574… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 20 10:46:51 2014 +0200 msvcp100: Export basic_istream::gcount function. --- dlls/msvcp100/msvcp100.spec | 6 +++--- dlls/msvcp110/msvcp110.spec | 12 ++++++------ dlls/msvcp90/ios.c | 10 ++++++++-- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 1dcbded..ab0b1d0 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1736,11 +1736,11 @@ @ cdecl -arch=win64 ?gbump@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IEAAXH(a)Z(ptr long) basic_streambuf_wchar_gbump @ thiscall -arch=win32 ?gbump@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXH(a)Z(ptr long) basic_streambuf_wchar_gbump @ cdecl -arch=win64 ?gbump@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXH(a)Z(ptr long) basic_streambuf_wchar_gbump -@ stub -arch=win32 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBE_JXZ +@ thiscall -ret64 -arch=win32 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBE_JXZ(ptr) basic_istream_char_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEBA_JXZ(ptr) basic_istream_char_gcount -@ stub -arch=win32 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBE_JXZ +@ thiscall -ret64 -arch=win32 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount -@ stub -arch=win32 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ +@ thiscall -ret64 -arch=win32 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount @ stub -arch=win32 ?generic_category(a)std@@YAABVerror_category(a)1@XZ @ stub -arch=win64 ?generic_category(a)std@@YAAEBVerror_category(a)1@XZ diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 0527936..40f5577 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -2433,14 +2433,14 @@ @ cdecl -arch=arm ?gbump@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAAXH(a)Z(ptr long) basic_streambuf_wchar_gbump @ thiscall -arch=i386 ?gbump@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXH(a)Z(ptr long) basic_streambuf_wchar_gbump @ cdecl -arch=win64 ?gbump@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXH(a)Z(ptr long) basic_streambuf_wchar_gbump -@ stub -arch=arm ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBA_JXZ -@ stub -arch=i386 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBE_JXZ +@ cdecl -ret64 -arch=arm ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBA_JXZ(ptr) basic_istream_char_gcount +@ thiscall -ret64 -arch=i386 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBE_JXZ(ptr) basic_istream_char_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEBA_JXZ(ptr) basic_istream_char_gcount -@ stub -arch=arm ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBA_JXZ -@ stub -arch=i386 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBE_JXZ +@ cdecl -ret64 -arch=arm ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBA_JXZ(ptr) basic_istream_wchar_gcount +@ thiscall -ret64 -arch=i386 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount -@ stub -arch=arm ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBA_JXZ -@ stub -arch=i386 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ +@ cdecl -ret64 -arch=arm ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBA_JXZ(ptr) basic_istream_wchar_gcount +@ thiscall -ret64 -arch=i386 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=arm ?get@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAAAV12(a)AAD@Z(ptr ptr) basic_istream_char_get_ch @ thiscall -arch=i386 ?get@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)AAD@Z(ptr ptr) basic_istream_char_get_ch diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index e8d4b06..d8f1e1c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -7785,8 +7785,10 @@ static void basic_istream_char_sentry_destroy(basic_istream_char *istr) /* ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBEHXZ */ /* ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEBA_JXZ */ +/* ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBA_JXZ */ +/* ?gcount@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QBE_JXZ */ DEFINE_THISCALL_WRAPPER(basic_istream_char_gcount, 4) -int __thiscall basic_istream_char_gcount(const basic_istream_char *this) +streamsize __thiscall basic_istream_char_gcount(const basic_istream_char *this) { TRACE("(%p)\n", this); return this->count; @@ -9066,8 +9068,12 @@ static void basic_istream_wchar_sentry_destroy(basic_istream_wchar *istr) /* ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEBA_JXZ */ /* ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBEHXZ */ /* ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEBA_JXZ */ +/* ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBA_JXZ */ +/* ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QBE_JXZ */ +/* ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBA_JXZ */ +/* ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ */ DEFINE_THISCALL_WRAPPER(basic_istream_wchar_gcount, 4) -int __thiscall basic_istream_wchar_gcount(const basic_istream_wchar *this) +streamsize __thiscall basic_istream_wchar_gcount(const basic_istream_wchar *this) { TRACE("(%p)\n", this); return this->count;

1 0

Nikolay Sivov : netprofm: Added IConnectionPointContainer stub for INetworkListManager.
by Alexandre Julliard 20 May '14

20 May '14

Module: wine Branch: master Commit: e0e0af801eca60690aeb280de4fe53287822e18e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e0af801eca60690aeb280de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 19 18:51:15 2014 +0400 netprofm: Added IConnectionPointContainer stub for INetworkListManager. --- dlls/netprofm/list.c | 59 +++++++++++++++++++++++++++++++++++++++++++- dlls/netprofm/tests/list.c | 6 +++++ 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index d5940f4..b9ab1cc 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -16,13 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include "config.h" #include <stdarg.h> #include "windef.h" #include "winbase.h" -#define COBJMACROS #include "initguid.h" #include "objbase.h" +#include "ocidl.h" #include "netlistmgr.h" #include "wine/debug.h" @@ -34,9 +36,15 @@ struct list_manager { INetworkListManager INetworkListManager_iface; INetworkCostManager INetworkCostManager_iface; + IConnectionPointContainer IConnectionPointContainer_iface; LONG refs; }; +static inline struct list_manager *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) +{ + return CONTAINING_RECORD(iface, struct list_manager, IConnectionPointContainer_iface); +} + static inline struct list_manager *impl_from_INetworkCostManager( INetworkCostManager *iface ) { @@ -147,6 +155,10 @@ static HRESULT WINAPI list_manager_QueryInterface( { *obj = &mgr->INetworkCostManager_iface; } + else if (IsEqualGUID( riid, &IID_IConnectionPointContainer )) + { + *obj = &mgr->IConnectionPointContainer_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -285,6 +297,50 @@ static const INetworkListManagerVtbl list_manager_vtbl = list_manager_GetConnectivity }; +static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, + REFIID riid, void **ppv) +{ + struct list_manager *This = impl_from_IConnectionPointContainer( iface ); + return INetworkListManager_QueryInterface(&This->INetworkListManager_iface, riid, ppv); +} + +static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface) +{ + struct list_manager *This = impl_from_IConnectionPointContainer( iface ); + return INetworkListManager_AddRef(&This->INetworkListManager_iface); +} + +static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface) +{ + struct list_manager *This = impl_from_IConnectionPointContainer( iface ); + return INetworkListManager_Release(&This->INetworkListManager_iface); +} + +static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface, + IEnumConnectionPoints **ppEnum) +{ + struct list_manager *This = impl_from_IConnectionPointContainer( iface ); + FIXME("(%p)->(%p): stub\n", This, ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, + REFIID riid, IConnectionPoint **cp) +{ + struct list_manager *This = impl_from_IConnectionPointContainer( iface ); + FIXME("(%p)->(%s %p): stub\n", This, debugstr_guid(riid), cp); + return E_NOTIMPL; +} + +static const struct IConnectionPointContainerVtbl cpc_vtbl = +{ + ConnectionPointContainer_QueryInterface, + ConnectionPointContainer_AddRef, + ConnectionPointContainer_Release, + ConnectionPointContainer_EnumConnectionPoints, + ConnectionPointContainer_FindConnectionPoint +}; + HRESULT list_manager_create( void **obj ) { struct list_manager *mgr; @@ -294,6 +350,7 @@ HRESULT list_manager_create( void **obj ) if (!(mgr = HeapAlloc( GetProcessHeap(), 0, sizeof(*mgr) ))) return E_OUTOFMEMORY; mgr->INetworkListManager_iface.lpVtbl = &list_manager_vtbl; mgr->INetworkCostManager_iface.lpVtbl = &cost_manager_vtbl; + mgr->IConnectionPointContainer_iface.lpVtbl = &cpc_vtbl; mgr->refs = 1; *obj = &mgr->INetworkListManager_iface; diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index 1619d06..ce4891a 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -21,11 +21,13 @@ #define COBJMACROS #include "initguid.h" #include "objbase.h" +#include "ocidl.h" #include "netlistmgr.h" #include "wine/test.h" static void test_INetworkListManager( void ) { + IConnectionPointContainer *cpc; INetworkListManager *mgr; INetworkCostManager *cost_mgr; NLM_CONNECTIVITY connectivity; @@ -74,6 +76,10 @@ static void test_INetworkListManager( void ) INetworkCostManager_Release( cost_mgr ); } + hr = INetworkListManager_QueryInterface( mgr, &IID_IConnectionPointContainer, (void**)&cpc ); + ok( hr == S_OK, "got %08x\n", hr ); + IConnectionPointContainer_Release( cpc ); + INetworkListManager_Release( mgr ); }

1 0