April 2018 - Wine-Commits - list.winehq.org

Alexandre Julliard : winex11: Avoid left_side/top_side cursor names.
by Alexandre Julliard April 27, 2018

April 27, 2018

Module: wine Branch: master Commit: c102efbc3522f5954d6150296c14dedfc7fe5fb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c102efbc3522f5954d615029… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 27 10:34:16 2018 +0200 winex11: Avoid left_side/top_side cursor names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index fdca083..8b2966d 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -834,8 +834,8 @@ static const struct system_cursors user32_cursors[] = { OCR_ICON, { "icon" }}, { OCR_SIZENWSE, { "top_left_corner", "nw-resize" }}, { OCR_SIZENESW, { "top_right_corner", "ne-resize" }}, - { OCR_SIZEWE, { "left_side", "size_hor", "h_double_arrow", "ew-resize" }}, - { OCR_SIZENS, { "top_side", "size_ver", "v_double_arrow", "ns-resize" }}, + { OCR_SIZEWE, { "h_double_arrow", "size_hor", "ew-resize" }}, + { OCR_SIZENS, { "v_double_arrow", "size_ver", "ns-resize" }}, { OCR_NO, { "not-allowed", "forbidden", "no-drop" }}, { OCR_HAND, { "hand2", "pointer", "pointing-hand" }}, { OCR_APPSTARTING, { "left_ptr_watch" }}, @@ -924,6 +924,7 @@ static const struct cursor_font_fallback fallbacks[] = { "fleur", XC_fleur }, { "gobbler", XC_gobbler }, { "gumby", XC_gumby }, + { "h_double_arrow", XC_sb_h_double_arrow }, { "hand1", XC_hand1 }, { "hand2", XC_hand2 }, { "heart", XC_heart }, @@ -971,6 +972,7 @@ static const struct cursor_font_fallback fallbacks[] = { "ul_angle", XC_ul_angle }, { "umbrella", XC_umbrella }, { "ur_angle", XC_ur_angle }, + { "v_double_arrow", XC_sb_v_double_arrow }, { "watch", XC_watch }, { "xterm", XC_xterm } };

1 0

Francois Gouget : testbot: Fix a WineTestBot::PendingPatchSets import.
by Alexandre Julliard April 27, 2018

April 27, 2018

Module: tools Branch: master Commit: 3509bc176073db3f4781d15203ed1894f18e37a2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3509bc176073db3f4781d15… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 26 23:59:46 2018 +0200 testbot: Fix a WineTestBot::PendingPatchSets import. The import is useless if it is in the wrong package. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 955e336..5edeab0 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -40,7 +40,6 @@ use Encode qw/decode/; use File::Basename; use WineTestBot::Config; -use WineTestBot::PendingPatchSets; use WineTestBot::Jobs; use WineTestBot::Users; use WineTestBot::Utils; @@ -374,6 +373,7 @@ BEGIN use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Config; +use WineTestBot::PendingPatchSets; sub CreateItem($) @@ -510,7 +510,7 @@ sub NewPatch($$$) link($PatchBodies[0]->path, "$DataDir/patches/" . $Patch->Id); if (! defined($ErrMessage)) { - $ErrMessage = WineTestBot::PendingPatchSets::CreatePendingPatchSets()->NewSubmission($Patch); + $ErrMessage = CreatePendingPatchSets()->NewSubmission($Patch); } } else

1 0

Francois Gouget : testbot: Remove a couple of unneeded WineTestBot:: Patches imports.
by Alexandre Julliard April 27, 2018

April 27, 2018

Module: tools Branch: master Commit: 6936e9ca4e5bfd4d194525de268d1e7d44f101c1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6936e9ca4e5bfd4d194525d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 26 23:59:33 2018 +0200 testbot: Remove a couple of unneeded WineTestBot::Patches imports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PendingPatchSets.pm | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 26a5642..7a54499 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -42,7 +42,6 @@ use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); use WineTestBot::Config; -use WineTestBot::Patches; use WineTestBot::Utils; @@ -163,7 +162,6 @@ use ObjectModel::BasicPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use WineTestBot::Config; use WineTestBot::PendingPatches; -use WineTestBot::Patches; use WineTestBot::Utils;

1 0

Francois Gouget : testbot: Remove an unneeded WineTestBot:: PendingPatchSets prefix.
by Alexandre Julliard April 27, 2018

April 27, 2018

Module: tools Branch: master Commit: 0d9c5820f6c1a98d91014b2507b3e63871a4077b URL: https://source.winehq.org/git/tools.git/?a=commit;h=0d9c5820f6c1a98d91014b2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 26 23:59:18 2018 +0200 testbot: Remove an unneeded WineTestBot::PendingPatchSets prefix. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index f39ec5f..75e7995 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -625,7 +625,7 @@ sub SafetyNet() ScheduleJobs(); HandleWinePatchWebSubmission(); - my $Set = WineTestBot::PendingPatchSets::CreatePendingPatchSets(); + my $Set = CreatePendingPatchSets(); my $ErrMessage = $Set->CheckForCompleteSet(); if (defined($ErrMessage)) {

1 0

Francois Gouget : testbot: Remove an unneeded Item import in WineTestBotObjects.
by Alexandre Julliard April 27, 2018

April 27, 2018

Module: tools Branch: master Commit: dce0dc6084a5964dfa611d1b8008f4009a487155 URL: https://source.winehq.org/git/tools.git/?a=commit;h=dce0dc6084a5964dfa611d1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 26 23:57:51 2018 +0200 testbot: Remove an unneeded Item import in WineTestBotObjects. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/WineTestBotObjects.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/WineTestBotObjects.pm b/testbot/lib/WineTestBot/WineTestBotObjects.pm index ba84805..d559a76 100644 --- a/testbot/lib/WineTestBot/WineTestBotObjects.pm +++ b/testbot/lib/WineTestBot/WineTestBotObjects.pm @@ -51,7 +51,6 @@ use ObjectModel::Collection; our @ISA = qw(ObjectModel::Collection); use ObjectModel::BackEnd; -use ObjectModel::Item; use WineTestBot::Config; sub GetBackEnd($)

1 0

Francois Gouget : bthprops.cpl: Remove an unused NONAMELESSUNION directive.
by Alexandre Julliard April 26, 2018

April 26, 2018

Module: wine Branch: master Commit: d6654dbf2b38d02f3c6e0ede706a0388cd7cd4a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6654dbf2b38d02f3c6e0ede… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 18 03:24:11 2018 +0200 bthprops.cpl: Remove an unused NONAMELESSUNION directive. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bthprops.cpl/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/bthprops.cpl/main.c b/dlls/bthprops.cpl/main.c index 02ee371..d670f2e 100644 --- a/dlls/bthprops.cpl/main.c +++ b/dlls/bthprops.cpl/main.c @@ -19,8 +19,6 @@ * */ -#define NONAMELESSUNION - #include <stdarg.h> #include <windef.h> #include <winbase.h>

1 0

Józef Kucia : dxgi: Remove useless FIXME() messages about adapter type.
by Alexandre Julliard April 26, 2018

April 26, 2018

Module: wine Branch: master Commit: 0d90a7ba893347b843e596baf751dd541b31186c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d90a7ba893347b843e596ba… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 26 14:53:23 2018 +0200 dxgi: Remove useless FIXME() messages about adapter type. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 2 -- dlls/dxgi/utils.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index c266cae..5a810fa 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -422,8 +422,6 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l return E_FAIL; } - FIXME("Ignoring adapter type.\n"); - hr = wined3d_device_create(dxgi_factory->wined3d, dxgi_adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, NULL, 0, 4, wined3d_device_parent, &device->wined3d_device); if (FAILED(hr)) diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 74f0ae05..063ec5a 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -645,8 +645,6 @@ D3D_FEATURE_LEVEL dxgi_check_feature_level_support(struct dxgi_factory *factory, WINED3DCAPS caps; HRESULT hr; - FIXME("Ignoring adapter type.\n"); - wined3d_mutex_lock(); hr = wined3d_get_device_caps(factory->wined3d, adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, &caps); wined3d_mutex_unlock();

1 0

Józef Kucia : d3d11: Use WARN() instead of FIXME() in d3d11_device_GetDeviceRemovedReason().
by Alexandre Julliard April 26, 2018

April 26, 2018

Module: wine Branch: master Commit: ee641ef8e749d6ed7b3d20d753cc7c90e5547c5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee641ef8e749d6ed7b3d20d7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 26 14:53:25 2018 +0200 d3d11: Use WARN() instead of FIXME() in d3d11_device_GetDeviceRemovedReason(). It's harmless. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 538f4af..d3155d5 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3517,7 +3517,7 @@ static UINT STDMETHODCALLTYPE d3d11_device_GetCreationFlags(ID3D11Device *iface) static HRESULT STDMETHODCALLTYPE d3d11_device_GetDeviceRemovedReason(ID3D11Device *iface) { - FIXME("iface %p stub!\n", iface); + WARN("iface %p stub!\n", iface); return S_OK; }

1 0

Francois Gouget : amstream: Remove an unused NONAMELESSSTRUCT directive.
by Alexandre Julliard April 26, 2018

April 26, 2018

Module: wine Branch: master Commit: 31deaa5baa15d962a78de6127e3504ee64574a74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31deaa5baa15d962a78de612… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 18 03:24:02 2018 +0200 amstream: Remove an unused NONAMELESSSTRUCT directive. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastream.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 58f9f20..787690d 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -19,7 +19,6 @@ */ #define NONAMELESSUNION -#define NONAMELESSSTRUCT #define COBJMACROS #include <stdarg.h>

1 0

Zhiyi Zhang : comctl32: Fix checkbox wrong box alignment with BS_VCENTER.
by Alexandre Julliard April 26, 2018

April 26, 2018

Module: wine Branch: master Commit: 84ce2922179591e3aa6b2667d8945ec6f024a874 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84ce2922179591e3aa6b2667… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Apr 25 21:17:22 2018 +0800 comctl32: Fix checkbox wrong box alignment with BS_VCENTER. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 1feb07a..507820c 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1150,14 +1150,14 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) /* rbox must have the correct height */ delta = rbox.bottom - rbox.top - checkBoxHeight; - if (style & BS_TOP) { + if ((style & BS_VCENTER) == BS_TOP) { if (delta > 0) { rbox.bottom = rbox.top + checkBoxHeight; } else { rbox.top -= -delta/2 + 1; rbox.bottom = rbox.top + checkBoxHeight; } - } else if (style & BS_BOTTOM) { + } else if ((style & BS_VCENTER) == BS_BOTTOM) { if (delta > 0) { rbox.top = rbox.bottom - checkBoxHeight; } else {

1 0