March 2013 - Wine-commits - list.winehq.org

Alexandre Julliard : cmd: Add a 256x256 icon.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 64ea72b66797bc105e37e50b26b72b37b4dfbc7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ea72b66797bc105e37e50b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 14:44:19 2013 +0100 cmd: Add a 256x256 icon. --- programs/cmd/wcmd.ico | Bin 25214 -> 55841 bytes programs/cmd/wcmd.svg | 2680 +++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 2391 insertions(+), 289 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64ea72b66797bc105e37e…

1 0

Alexandre Julliard : iexplore: Add a 256x256 icon.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 2cf2741a3072bd8b19b1310408c6f932edab9194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cf2741a3072bd8b19b131040… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 14:47:12 2013 +0100 iexplore: Add a 256x256 icon. --- programs/iexplore/iexplore.ico | Bin 25214 -> 82992 bytes programs/iexplore/iexplore.svg | 2620 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 2358 insertions(+), 262 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2cf2741a3072bd8b19b13…

1 0

Alexandre Julliard : msiexec: Add a 256x256 icon.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: bed3e87d4e893b779e7e09280ac51b9eff4f097b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bed3e87d4e893b779e7e09280… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 14:49:40 2013 +0100 msiexec: Add a 256x256 icon. --- programs/msiexec/msiexec.ico | Bin 25214 -> 49609 bytes programs/msiexec/msiexec.svg | 2157 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 1903 insertions(+), 254 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bed3e87d4e893b779e7e0…

1 0

Alexandre Julliard : notepad: Add a 256x256 icon.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 3f053c91497843a2d6f4710d4b0fc9111f192163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f053c91497843a2d6f4710d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 14:39:06 2013 +0100 notepad: Add a 256x256 icon. --- programs/notepad/notepad.ico | Bin 25214 -> 53938 bytes programs/notepad/notepad.svg | 2508 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 2218 insertions(+), 290 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f053c91497843a2d6f47…

1 0

Frédéric Delanoy : wined3d: Add NVIDIA GeForce 410M.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 8e9af2869cd571a2d9eea35a7503b4fbb785e962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9af2869cd571a2d9eea35a7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Mar 27 01:06:11 2013 +0100 wined3d: Add NVIDIA GeForce 410M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 60a4b2d..6b6bc8e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1099,6 +1099,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_315M, "NVIDIA GeForce 315M", DRIVER_NVIDIA_GEFORCE6, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_320M, "NVIDIA GeForce 320M", DRIVER_NVIDIA_GEFORCE6, 256}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_410M, "NVIDIA GeForce 410M", DRIVER_NVIDIA_GEFORCE6, 512}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT320M, "NVIDIA GeForce GT 320M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT330, "NVIDIA GeForce GT 330", DRIVER_NVIDIA_GEFORCE6, 1024}, @@ -1553,6 +1554,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GT 440", CARD_NVIDIA_GEFORCE_GT440}, /* Geforce 400 - lowend */ {"GT 430", CARD_NVIDIA_GEFORCE_GT430}, /* Geforce 400 - lowend */ {"GT 420", CARD_NVIDIA_GEFORCE_GT420}, /* Geforce 400 - lowend */ + {"410M", CARD_NVIDIA_GEFORCE_410M}, /* Geforce 400 - lowend mobile */ {"GT 330", CARD_NVIDIA_GEFORCE_GT330}, /* Geforce 300 - highend */ {"GTS 360M", CARD_NVIDIA_GEFORCE_GTS350M}, /* Geforce 300 - highend mobile */ {"GTS 350M", CARD_NVIDIA_GEFORCE_GTS350M}, /* Geforce 300 - highend mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e9a593d..2a11286 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1398,6 +1398,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GT325M = 0x0a35, CARD_NVIDIA_GEFORCE_GT330 = 0x0ca0, CARD_NVIDIA_GEFORCE_GTS350M = 0x0cb0, + CARD_NVIDIA_GEFORCE_410M = 0x1055, CARD_NVIDIA_GEFORCE_GT420 = 0x0de2, CARD_NVIDIA_GEFORCE_GT430 = 0x0de1, CARD_NVIDIA_GEFORCE_GT440 = 0x0de0,

1 0

Nikolay Sivov : hlink: Implement IHlinkBrowseContext_SetCurrentHlink().
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 29d37bd71468f5d10abe6e1bceb1eab1e17f8132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d37bd71468f5d10abe6e1bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 27 10:41:07 2013 +0400 hlink: Implement IHlinkBrowseContext_SetCurrentHlink(). --- dlls/hlink/browse_ctx.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index d09d59d..d90aad9 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -295,11 +295,19 @@ static HRESULT WINAPI IHlinkBC_GetHlink(IHlinkBrowseContext* iface, ULONG hlid, return S_OK; } -static HRESULT WINAPI IHlinkBC_SetCurrentHlink( IHlinkBrowseContext* iface, - ULONG uHLID) +static HRESULT WINAPI IHlinkBC_SetCurrentHlink(IHlinkBrowseContext* iface, ULONG hlid) { - FIXME("\n"); - return E_NOTIMPL; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); + struct link_entry *link; + + TRACE("(%p)->(0x%08x)\n", This, hlid); + + link = context_get_entry(This, hlid); + if (!link) + return E_FAIL; + + This->current = link; + return S_OK; } static HRESULT WINAPI IHlinkBC_Clone( IHlinkBrowseContext* iface,

1 0

Piotr Caban : d3dx10: Match parameters list with function we' re forwarding to.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 9f855ae4bb61ff5fed518397b8cebac36fa3e32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f855ae4bb61ff5fed518397b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 09:51:01 2013 +0100 d3dx10: Match parameters list with function we're forwarding to. --- dlls/d3dx10_33/d3dx10_33.spec | 8 ++++---- dlls/d3dx10_34/d3dx10_34.spec | 8 ++++---- dlls/d3dx10_35/d3dx10_35.spec | 8 ++++---- dlls/d3dx10_36/d3dx10_36.spec | 8 ++++---- dlls/d3dx10_37/d3dx10_37.spec | 8 ++++---- dlls/d3dx10_38/d3dx10_38.spec | 8 ++++---- dlls/d3dx10_39/d3dx10_39.spec | 8 ++++---- dlls/d3dx10_40/d3dx10_40.spec | 8 ++++---- dlls/d3dx10_41/d3dx10_41.spec | 8 ++++---- dlls/d3dx10_42/d3dx10_42.spec | 8 ++++---- dlls/d3dx10_43/d3dx10_43.spec | 8 ++++---- 11 files changed, 44 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f855ae4bb61ff5fed518…

1 0

Francois Gouget : testbot/web: Don't report 'offline VMs' if it' s only retired and deleted VMs.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: tools Branch: master Commit: 1aecad4c688e74ab404cfb895d692f71829d7372 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1aecad4c688e74ab404cfb89… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 11:13:21 2013 +0100 testbot/web: Don't report 'offline VMs' if it's only retired and deleted VMs. The Status is irrelevant for retired and deleted VMs. --- testbot/web/index.pl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 59bf16a..94d8254 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -236,6 +236,7 @@ sub GenerateBody print "<div class='GeneralStatusItem'>"; my $VMs = CreateVMs(); + $VMs->FilterEnabledRole(); $VMs->AddFilter("Status", ["offline"]); if ($VMs->IsEmpty()) {

1 0

Francois Gouget : testbot/VMs: Schedule jobs on offline VMs.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: tools Branch: master Commit: e7ea34bd527a38065ddf63f6e3036f1bd09b0cf8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e7ea34bd527a38065ddf63f6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 11:13:30 2013 +0100 testbot/VMs: Schedule jobs on offline VMs. Being 'offline' is supposed to be temporary so jobs can still be scheduled on these VMs (especially the WineTest ones). These jobs will just be run later, once an administrator has fixed the VM. --- testbot/bin/CheckForWinetestUpdate.pl | 1 - testbot/lib/WineTestBot/Jobs.pm | 1 - testbot/lib/WineTestBot/Patches.pm | 1 - testbot/lib/WineTestBot/VMs.pm | 8 ++++---- testbot/web/Submit.pl | 11 ++++++----- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index c8909e6..8cbcc9c 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -92,7 +92,6 @@ sub AddJob $VMs->AddFilter("Type", ["win32", "win64"]); $VMs->AddFilter("Role", ["winetest"]); } - $VMs->FilterEnabledStatus(); foreach my $VMKey (@{$VMs->SortKeysBySortOrder($VMs->GetKeys())}) { my $Task = $Tasks->Add(); diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 4b7d425..c6421e9 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -542,7 +542,6 @@ sub ScheduleJobs() my %Hosts; my $VMs = CreateVMs(); $VMs->FilterEnabledRole(); - $VMs->FilterEnabledStatus(); foreach my $VM (@{$VMs->GetItems()}) { my $Host = $VM->GetHost(); diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index e8143ca..186398d 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -236,7 +236,6 @@ sub Submit $VMs = CreateVMs(); $VMs->AddFilter("Type", $Bits eq "32" ? ["win32", "win64"] : ["win64"]); $VMs->AddFilter("Role", ["base"]); - $VMs->FilterEnabledStatus(); if (@{$VMs->GetKeys()}) { # Create the corresponding Step diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index eea9e78..826b0f6 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -180,10 +180,10 @@ next step will be to revert it to the idle snapshot so it can be used again. =item offline -This VM should not be used. The WineTestBot automatically puts VMs into this -state if errors happen when manipulating them, such as if they fail to revert, -etc. The main web status page has a warning indicator on when some VMs are -offline. +An error occurred with this VM (typically it failed to revert or is not +responding anymore), making it temporarily unusable. New jobs can still be +added for this VM but they won't be run until an administrator fixes it. +The main web status page has a warning indicator on when some VMs are offline. =back diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 56e542d..88a27dc 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -84,10 +84,9 @@ sub GetHeaderText my $HeaderText = "Select the VMs on which you want to run your test."; my $VMs = CreateVMs(); $VMs->AddFilter("Status", ["offline"]); - if (! $VMs->IsEmpty()) + if (!$VMs->IsEmpty()) { - $HeaderText .= "<br>NOTE: Some VMs are currently offline and are not " . - "shown here."; + $HeaderText .= "<br>NOTE: Offline VMs will not be able to run your tests right away."; } return $HeaderText; } @@ -237,8 +236,6 @@ sub GenerateFields { $VMs->AddFilter("Type", ["win32", "win64"]); } - # Scheduling jobs on offline VMs is not allowed - $VMs->FilterNotOffline(); if ($self->{ShowAll}) { # All but the retired and deleted ones @@ -259,6 +256,10 @@ sub GenerateFields { print " (", $self->CGI->escapeHTML($VM->Description), ")"; } + if ($VM->Status eq 'offline') + { + print " [offline]"; + } print "</label><div class='ItemValue'><input type='checkbox' name='$FieldName'"; if ($self->GetParam("Page") == 1 || $self->GetParam($FieldName)) {

1 0

Francois Gouget : testbot/VMs: Add a maintenance status for VMs.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: tools Branch: master Commit: 89ec21a5445fde7d66000371d3b725d0bee8ee42 URL: http://source.winehq.org/git/tools.git/?a=commit;h=89ec21a5445fde7d66000371… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 11:13:35 2013 +0100 testbot/VMs: Add a maintenance status for VMs. This makes it possible to distinguish between broken (offline) VMs, and VMs the administrator is reconfiguring. --- testbot/ddl/update22.sql | 4 ++++ testbot/ddl/winetestbot.sql | 2 +- testbot/lib/WineTestBot/VMs.pm | 10 ++++++++-- testbot/web/Submit.pl | 8 ++++++-- testbot/web/index.pl | 31 +++++++++++++++++++++++-------- 5 files changed, 42 insertions(+), 13 deletions(-) diff --git a/testbot/ddl/update22.sql b/testbot/ddl/update22.sql new file mode 100644 index 0000000..cd4f5a2 --- /dev/null +++ b/testbot/ddl/update22.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE VMs + MODIFY Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline', 'maintenance') NOT NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 4763d86..4912a59 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -48,7 +48,7 @@ CREATE TABLE VMs SortOrder INT(3) NOT NULL, Type ENUM('win32', 'win64', 'build') NOT NULL, Role ENUM('extra', 'base', 'winetest', 'retired', 'deleted') NOT NULL, - Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline') NOT NULL, + Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline', 'maintenance') NOT NULL, ChildPid INT(5) NULL, VirtURI VARCHAR(64) NOT NULL, VirtDomain VARCHAR(32) NOT NULL, diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 826b0f6..04aeb3c 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -185,6 +185,12 @@ responding anymore), making it temporarily unusable. New jobs can still be added for this VM but they won't be run until an administrator fixes it. The main web status page has a warning indicator on when some VMs are offline. +=item maintenance + +A WineTestBot administrator is working on the VM so that it cannot be used for +the tests. The main web status page has a warning indicator on when some VMs +are undergoing maintenance. + =back =cut @@ -572,7 +578,7 @@ BEGIN CreateBasicPropertyDescriptor("SortOrder", "Display order", !1, 1, "N", 3), CreateEnumPropertyDescriptor("Type", "Type of VM", !1, 1, ['win32', 'win64', 'build']), CreateEnumPropertyDescriptor("Role", "VM Role", !1, 1, ['extra', 'base', 'winetest', 'retired', 'deleted']), - CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline']), + CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'offline', 'maintenance']), # Note: ChildPid is only valid when Status == 'reverting' or 'sleeping'. CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), CreateBasicPropertyDescriptor("VirtURI", "LibVirt URI of the VM", !1, 1, "A", 64), @@ -668,7 +674,7 @@ sub FilterEnabledRole($) sub FilterEnabledStatus($) { my ($self) = @_; - # Filter out the disabled VMs, that is the offline ones + # Filter out the disabled VMs, that is the offline and maintenance ones $self->AddFilter("Status", ["dirty", "reverting", "sleeping", "idle", "running"]); } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 88a27dc..1288bf0 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -83,10 +83,10 @@ sub GetHeaderText { my $HeaderText = "Select the VMs on which you want to run your test."; my $VMs = CreateVMs(); - $VMs->AddFilter("Status", ["offline"]); + $VMs->AddFilter("Status", ["offline", "maintenance"]); if (!$VMs->IsEmpty()) { - $HeaderText .= "<br>NOTE: Offline VMs will not be able to run your tests right away."; + $HeaderText .= "<br>NOTE: Offline VMs and those undergoing maintenance will not be able to run your tests right away."; } return $HeaderText; } @@ -260,6 +260,10 @@ sub GenerateFields { print " [offline]"; } + elsif ($VM->Status eq 'maintenance') + { + print " [maintenance]"; + } print "</label><div class='ItemValue'><input type='checkbox' name='$FieldName'"; if ($self->GetParam("Page") == 1 || $self->GetParam($FieldName)) { diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 94d8254..1dffaf7 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -234,22 +234,37 @@ sub GenerateBody } print "</div>\n"; - print "<div class='GeneralStatusItem'>"; - my $VMs = CreateVMs(); - $VMs->FilterEnabledRole(); - $VMs->AddFilter("Status", ["offline"]); - if ($VMs->IsEmpty()) + my $OfflineVMs = CreateVMs(); + $OfflineVMs->FilterEnabledRole(); + $OfflineVMs->AddFilter("Status", ["offline"]); + my $MaintenanceVMs = CreateVMs(); + $MaintenanceVMs->FilterEnabledRole(); + $MaintenanceVMs->AddFilter("Status", ["maintenance"]); + if ($OfflineVMs->IsEmpty() and $MaintenanceVMs->IsEmpty()) { + print "<div class='GeneralStatusItem'>"; $self->OutputDot("green"); print "<div class='GeneralStatusItemText'><a href='#vms'>All VMs are online</a></div>"; + print "</div>\n"; } else { - $self->OutputDot("red"); - print "<div class='GeneralStatusItemText'><a href='#vms'>One or more VMs are offline</a></div>"; + if (!$OfflineVMs->IsEmpty()) + { + print "<div class='GeneralStatusItem'>"; + $self->OutputDot("red"); + print "<div class='GeneralStatusItemText'><a href='#vms'>One or more VMs are offline</a></div>"; + print "</div>\n"; + } + if (!$MaintenanceVMs->IsEmpty()) + { + print "<div class='GeneralStatusItem'>"; + $self->OutputDot("red"); + print "<div class='GeneralStatusItemText'><a href='#vms'>One or more VMs are undergoing maintenance</a></div>"; + print "</div>\n"; + } } print "</div>\n"; - print "</div>\n"; print "<h2><a name='jobs'></a>Jobs</h2>\n"; my $Jobs = CreateJobs();

1 0