February 2020 - Wine-commits

Zebediah Figura : ddraw: Stop setting the device state when setting sampler states.
by Alexandre Julliard 27 Feb '20

27 Feb '20

Module: wine Branch: master Commit: e1926af200ce0a338fa085d8cb70bcb99c9db8ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1926af200ce0a338fa085d8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 26 16:39:28 2020 -0600 ddraw: Stop setting the device state when setting sampler states. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 87 +++++++++++++++++++++-------------------------------- 1 file changed, 34 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e1926af200ce0a338fa0…

1 0

Matteo Bruni : d3d8: Fix texture stage index checks.
by Alexandre Julliard 27 Feb '20

27 Feb '20

Module: wine Branch: master Commit: 565f7b4494785b24efc60220c05b9c5e5b5c9930 URL: https://source.winehq.org/git/wine.git/?a=commit;h=565f7b4494785b24efc60220… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 27 13:31:09 2020 +0100 d3d8: Fix texture stage index checks. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 869a6a2dd0..9793eda0c3 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2159,10 +2159,7 @@ static HRESULT WINAPI d3d8_device_GetTexture(IDirect3DDevice8 *iface, DWORD stag if (!texture) return D3DERR_INVALIDCALL; - if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) - stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); - - if (stage >= WINED3D_MAX_COMBINED_SAMPLERS) + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) { WARN("Ignoring invalid stage %u.\n", stage); *texture = NULL; @@ -2253,10 +2250,7 @@ static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, state, value); - if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) - stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); - - if (stage >= WINED3D_MAX_COMBINED_SAMPLERS) + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) { WARN("Invalid stage %u.\n", stage); *value = 0;

1 0

Matteo Bruni : wined3d: Rename struct wined3d_map_range to struct wined3d_range.
by Alexandre Julliard 27 Feb '20

27 Feb '20

Module: wine Branch: master Commit: 8d87bce071f142399ceb8b9674f6fd7160f407c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d87bce071f142399ceb8b96… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 27 13:31:10 2020 +0100 wined3d: Rename struct wined3d_map_range to struct wined3d_range. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/adapter_vk.c | 4 ++-- dlls/wined3d/buffer.c | 20 ++++++++++---------- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/directx.c | 2 +- dlls/wined3d/surface.c | 6 +++--- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 14 +++++++------- 8 files changed, 28 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d87bce071f142399ceb…

1 0

Matteo Bruni : wined3d: Optimize scanning changed shader constants in wined3d_device_apply_stateblock().
by Alexandre Julliard 27 Feb '20

27 Feb '20

Module: wine Branch: master Commit: e32b8e81370200628d0d5d3570f3a09f99272b57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e32b8e81370200628d0d5d35… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 27 13:31:11 2020 +0100 wined3d: Optimize scanning changed shader constants in wined3d_device_apply_stateblock(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 105 +++++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 74 +++++++++++++++++++++++++---- 2 files changed, 101 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e32b8e81370200628d0d…

1 0

Matteo Bruni : wined3d: Optimize scanning changed transform states in wined3d_device_apply_stateblock().
by Alexandre Julliard 27 Feb '20

27 Feb '20

Module: wine Branch: master Commit: fd816f263ea246a963b9bf7aae86a096764b98d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd816f263ea246a963b9bf7a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 27 13:31:12 2020 +0100 wined3d: Optimize scanning changed transform states in wined3d_device_apply_stateblock(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fa675f5729..64cc80780d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3837,10 +3837,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, { const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; const struct wined3d_saved_states *changed = &stateblock->changed; + const unsigned int word_bit_count = sizeof(DWORD) * CHAR_BIT; struct wined3d_blend_state *blend_state; + unsigned int i, j, start, idx; struct wined3d_color colour; struct wined3d_range range; - unsigned int i, j, start; BOOL set_blend_state; DWORD map; @@ -3968,10 +3969,15 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, } } - for (i = 0; i < ARRAY_SIZE(state->transforms); ++i) + for (i = 0; i < ARRAY_SIZE(changed->transform); ++i) { - if (wined3d_bitmap_is_set(changed->transform, i)) - wined3d_device_set_transform(device, i, &state->transforms[i]); + map = changed->transform[i]; + while (map) + { + j = wined3d_bit_scan(&map); + idx = i * word_bit_count + j; + wined3d_device_set_transform(device, idx, &state->transforms[idx]); + } } if (changed->indices)

1 0

Matteo Bruni : wined3d: Optimize scanning changed render states in wined3d_device_apply_stateblock().
by Alexandre Julliard 27 Feb '20

27 Feb '20

Module: wine Branch: master Commit: 3b27222aa2c1c85324ca0e03b119635dc031b435 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b27222aa2c1c85324ca0e03… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 27 13:31:13 2020 +0100 wined3d: Optimize scanning changed render states in wined3d_device_apply_stateblock(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 64cc80780d..e706c830d3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3929,22 +3929,25 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, wined3d_device_set_blend_state(device, blend_state, &colour); } - for (i = 0; i < ARRAY_SIZE(state->rs); ++i) + for (i = 0; i < ARRAY_SIZE(changed->renderState); ++i) { - if (!wined3d_bitmap_is_set(changed->renderState, i)) - continue; - - if (i != WINED3D_RS_BLENDFACTOR) + map = changed->renderState[i]; + while (map) { - wined3d_device_set_render_state(device, i, state->rs[i]); - continue; - } + j = wined3d_bit_scan(&map); + idx = i * word_bit_count + j; + if (idx != WINED3D_RS_BLENDFACTOR) + { + wined3d_device_set_render_state(device, idx, state->rs[idx]); + continue; + } - if (!set_blend_state) - { - blend_state = wined3d_device_get_blend_state(device, &colour); - wined3d_color_from_d3dcolor(&colour, state->rs[i]); - wined3d_device_set_blend_state(device, blend_state, &colour); + if (!set_blend_state) + { + blend_state = wined3d_device_get_blend_state(device, &colour); + wined3d_color_from_d3dcolor(&colour, state->rs[idx]); + wined3d_device_set_blend_state(device, blend_state, &colour); + } } }

1 0

Gabriel Ivăncescu : hid: Implement HidP_GetUsageValueArray.
by Alexandre Julliard 27 Feb '20

27 Feb '20

Module: wine Branch: master Commit: ec88633912442e0e0c6e11cfdb395ff653e9e951 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec88633912442e0e0c6e11cf… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 26 15:03:46 2020 +0200 hid: Implement HidP_GetUsageValueArray. Games like Risk of Rain 2 need this with certain controllers. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/hid/tests/device.c | 37 ++++++++++++++++++++++++---- include/ddk/hidpi.h | 1 + 4 files changed, 99 insertions(+), 6 deletions(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index b8e29fef16..98508a456c 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -27,7 +27,7 @@ @ stdcall HidP_GetSpecificButtonCaps(long long long long ptr ptr ptr) @ stdcall HidP_GetSpecificValueCaps(long long long long ptr ptr ptr) @ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long) -@ stub HidP_GetUsageValueArray +@ stdcall HidP_GetUsageValueArray(long long long long ptr long ptr ptr long) @ stdcall HidP_GetUsages(long long long ptr ptr ptr ptr long) @ stdcall HidP_GetUsagesEx(long long ptr ptr ptr ptr long) @ stdcall HidP_GetValueCaps(long ptr ptr ptr) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 817e021fe4..c4d162695a 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -117,6 +117,46 @@ static NTSTATUS set_report_data(BYTE *report, INT reportLength, INT startBit, IN return HIDP_STATUS_SUCCESS; } +static NTSTATUS get_report_data_array(BYTE *report, UINT reportLength, UINT startBit, UINT elemSize, + UINT numElements, PCHAR values, UINT valuesSize) +{ + BYTE byte, *end, *p = report + startBit / 8; + ULONG size = elemSize * numElements; + ULONG m, bit_index = startBit % 8; + BYTE *data = (BYTE*)values; + + if ((startBit + size) / 8 > reportLength) + return HIDP_STATUS_INVALID_REPORT_LENGTH; + + if (valuesSize < (size + 7) / 8) + return HIDP_STATUS_BUFFER_TOO_SMALL; + + end = report + (startBit + size + 7) / 8; + + data--; + byte = *p++; + while (p != end) + { + *(++data) = byte >> bit_index; + byte = *p++; + *data |= byte << (8 - bit_index); + } + + /* Handle the end and mask out bits beyond */ + m = (startBit + size) % 8; + m = m ? m : 8; + + if (m > bit_index) + *(++data) = (byte >> bit_index) & ((1 << (m - bit_index)) - 1); + else + *data &= (1 << (m + 8 - bit_index)) - 1; + + if (++data < (BYTE*)values + valuesSize) + memset(data, 0, (BYTE*)values + valuesSize - data); + + return HIDP_STATUS_SUCCESS; +} + NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData) @@ -325,6 +365,31 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, } +NTSTATUS WINAPI HidP_GetUsageValueArray(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, + USAGE Usage, PCHAR UsageValue, USHORT UsageValueByteLength, + PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) +{ + WINE_HID_ELEMENT element; + NTSTATUS rc; + + TRACE("(%i, %x, %i, %i, %p, %u, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, + UsageValueByteLength, PreparsedData, Report, ReportLength); + + rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, ValueElement, &element); + + if (rc == HIDP_STATUS_SUCCESS) + { + if (element.caps.value.IsRange || element.caps.value.ReportCount <= 1 || !element.bitCount) + return HIDP_STATUS_NOT_VALUE_ARRAY; + + return get_report_data_array((BYTE*)Report, ReportLength, element.valueStartBit, element.bitCount, + element.caps.value.ReportCount, UsageValue, UsageValueByteLength); + } + + return rc; +} + + NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index 24c307704f..3dd22b7f06 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -253,11 +253,38 @@ static void process_data(HIDP_CAPS Caps, PHIDP_PREPARSED_DATA ppd, CHAR *data, D trace("\tValues:\n"); for (i = 0; i < length; i++) { - status = HidP_GetUsageValue(HidP_Input, values[i].UsagePage, 0, - values[i].Range.UsageMin, &value, ppd, data, data_length); - ok(status == HIDP_STATUS_SUCCESS, "Failed to get value [%i,%i] (%x)\n", - values[i].UsagePage, values[i].Range.UsageMin, status); - trace("[%02x, %02x]: %u\n",values[i].UsagePage, values[i].Range.UsageMin, value); + ok(values[i].ReportCount, "Zero ReportCount for [%i,%i]\n", values[i].UsagePage, values[i].NotRange.Usage); + if (values[i].IsRange || values[i].ReportCount <= 1) + { + status = HidP_GetUsageValue(HidP_Input, values[i].UsagePage, 0, + values[i].Range.UsageMin, &value, ppd, data, data_length); + ok(status == HIDP_STATUS_SUCCESS, "Failed to get value [%i,%i] (%x)\n", + values[i].UsagePage, values[i].Range.UsageMin, status); + trace("[%02x, %02x]: %u\n", values[i].UsagePage, values[i].Range.UsageMin, value); + } + else + { + USHORT k, array_size = (values[i].BitSize * values[i].ReportCount + 7) / 8; + PCHAR array = HeapAlloc(GetProcessHeap(), 0, array_size); + char *dump = HeapAlloc(GetProcessHeap(), 0, array_size * 3 + 1); + + status = HidP_GetUsageValueArray(HidP_Input, values[i].UsagePage, 0, + values[i].NotRange.Usage, array, array_size, ppd, data, data_length); + ok(status == HIDP_STATUS_SUCCESS, "Failed to get value array [%i,%i] (%x)\n", + values[i].UsagePage, values[i].NotRange.Usage, status); + dump[0] = 0; + for (k = 0; k < array_size; k++) + { + char bytestr[5]; + sprintf(bytestr, " %02x", (BYTE)array[k]); + strcat(dump, bytestr); + } + trace("[%02x, %02x] element bit size %u num elements %u:%s\n", values[i].UsagePage, + values[i].NotRange.Usage, values[i].BitSize, values[i].ReportCount, dump); + + HeapFree(GetProcessHeap(), 0, dump); + HeapFree(GetProcessHeap(), 0, array); + } } HeapFree(GetProcessHeap(), 0, values); diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 51d61ea854..fb497f3282 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -195,6 +195,7 @@ NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAP NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capabilities); NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); +NTSTATUS WINAPI HidP_GetUsageValueArray(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PCHAR UsageValue, USHORT UsageValueByteLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR ReportID, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData);

1 0

Sven Baars : d3dx9: Implement ID3DXFont_PreloadGlyphs.
by Alexandre Julliard 27 Feb '20

27 Feb '20

Module: wine Branch: master Commit: ac5687463700b070fc1eecca67c4a46ec15127fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac5687463700b070fc1eecca… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Thu Feb 27 13:01:39 2020 +0100 d3dx9: Implement ID3DXFont_PreloadGlyphs. Based on a patch by Tony Wasserka. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 289 +++++++++++++++++++++++++++++++++++++++------ dlls/d3dx9_36/tests/core.c | 5 +- 2 files changed, 254 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac5687463700b070fc1e…

1 0

Francois Gouget : testbot: Don't overwrite existing patch series parts.
by Alexandre Julliard 27 Feb '20

27 Feb '20

Module: tools Branch: master Commit: 8592ad779e2cd0a80895c90eefbf947085b39df7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8592ad779e2cd0a80895c90… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 26 10:37:33 2020 +0100 testbot: Don't overwrite existing patch series parts. Assume any new email bearing the same part number is either a reply, or a collision from another series and should thus be ignored. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47042 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PendingPatchSets.pm | 46 +++++++++++++++-------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index adabf2e..cfa6dc0 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -243,50 +243,52 @@ sub NewSubmission($$$) my $Parts = $Set->Parts; my $Part = $Parts->GetItem($SubjectInfo->{PartNo}); - if (! defined($Part)) + if ($Part) { - $Part = $Parts->Add(); - $Part->No($SubjectInfo->{PartNo}); + $Patch->Disposition("Existing part reply / collision"); + return undef; } + $Part = $Parts->Add(); + $Part->No($SubjectInfo->{PartNo}); $Part->Patch($Patch); my ($_ErrKey, $_ErrProperty, $ErrMessage) = $self->Save(); if (defined($ErrMessage)) { $Patch->Disposition("Error occurred during series processing"); + return undef; } if (! $Set->CheckSubsetComplete($SubjectInfo->{PartNo})) { $Patch->Disposition("Set not complete yet"); + return undef; } - else + + my $PartNo = $SubjectInfo->{PartNo}; + my $AllPartsAvailable = 1; + while ($PartNo <= $Set->TotalParts && $AllPartsAvailable && + !defined $ErrMessage) { - my $PartNo = $SubjectInfo->{PartNo}; - my $AllPartsAvailable = 1; - while ($PartNo <= $Set->TotalParts && $AllPartsAvailable && - ! defined($ErrMessage)) + my $Part = $Parts->GetItem($PartNo); + if (defined $Part) { - my $Part = $Parts->GetItem($PartNo); - if (defined($Part)) + $ErrMessage = $Set->SubmitSubset($PartNo, $Part->Patch); + if (!defined $ErrMessage) { - $ErrMessage = $Set->SubmitSubset($PartNo, $Part->Patch); - if (!defined $ErrMessage) - { - ($_ErrProperty, $ErrMessage) = $Part->Patch->Save(); - } + ($_ErrProperty, $ErrMessage) = $Part->Patch->Save(); } - else - { - $AllPartsAvailable = !1; - } - $PartNo++; } - if ($AllPartsAvailable && ! defined($ErrMessage)) + else { - $self->DeleteItem($Set); + $AllPartsAvailable = !1; } + $PartNo++; + } + if ($AllPartsAvailable && ! defined($ErrMessage)) + { + $self->DeleteItem($Set); } return $ErrMessage;

1 0

Francois Gouget : testbot/WineRunReconfig: Clarify the email in case of a failed build.
by Alexandre Julliard 27 Feb '20

27 Feb '20

Module: tools Branch: master Commit: c94f7a70fdfbf416a46f4ab053d0e12c554ffc78 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c94f7a70fdfbf416a46f4ab… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 26 10:37:41 2020 +0100 testbot/WineRunReconfig: Clarify the email in case of a failed build. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 897b675..644d546 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -436,9 +436,11 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/task.log")) { # We should not have badpatch errors and if the result line is missing we # probably already have an error message that explains why. + my $Status = $LogInfo->{Task} eq "missing" ? + "the log contains no status line." : + "the last log status line says $LogInfo->{Task}."; NotifyAdministrator("The ". $VM->Name ." build failed", - "The ". $VM->Name ." build failed:\n\n". - "$LogInfo->{Task}\n\n". + "The ". $VM->Name ." build failed and $Status\n\n". "See the link below for more details:\n". MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n"); $NewStatus = "badbuild";

1 0