July 2022 - Wine-commits - list.winehq.org

Rémi Bernon : mf: Implement topology_node_get_type_handler for all node types.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 901838504cef8c0bd494d27f191a4533b66dede3 URL: https://gitlab.winehq.org/wine/wine/-/commit/901838504cef8c0bd494d27f191a45… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 8 11:27:32 2022 +0200 mf: Implement topology_node_get_type_handler for all node types. With a helper type handler for transform and tee nodes. --- dlls/mf/tests/mf.c | 6 +- dlls/mf/topology.c | 235 +++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 202 insertions(+), 39 deletions(-)

1 0

Zebediah Figura : d3d9: Correctly check for sysmem index buffers in d3d9_stateblock_Apply().
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: c885524cf6cd0b8d9a1bd8ea5c7812bb2f710f25 URL: https://gitlab.winehq.org/wine/wine/-/commit/c885524cf6cd0b8d9a1bd8ea5c7812… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 18 14:48:52 2022 -0500 d3d9: Correctly check for sysmem index buffers in d3d9_stateblock_Apply(). This fixes a regression introduced by 66f37aae7e25740857aeb8ea9c2f0395781389f5. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53372 --- dlls/d3d9/stateblock.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index c797ce54b49..2a0731437e3 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -113,9 +113,10 @@ static HRESULT WINAPI d3d9_stateblock_Capture(IDirect3DStateBlock9 *iface) static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) { struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); + struct d3d9_vertexbuffer *vertex_buffer; struct wined3d_texture *wined3d_texture; + struct d3d9_indexbuffer *index_buffer; struct wined3d_buffer *wined3d_buffer; - struct d3d9_vertexbuffer *buffer; struct d3d9_texture *texture; struct d3d9_device *device; unsigned int i; @@ -136,13 +137,13 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) { if (!(wined3d_buffer = device->stateblock_state->streams[i].buffer)) continue; - if (!(buffer = wined3d_buffer_get_parent(wined3d_buffer))) + if (!(vertex_buffer = wined3d_buffer_get_parent(wined3d_buffer))) continue; - if (buffer->draw_buffer) + if (vertex_buffer->draw_buffer) device->sysmem_vb |= 1u << i; } device->sysmem_ib = (wined3d_buffer = device->stateblock_state->index_buffer) - && (buffer = wined3d_buffer_get_parent(wined3d_buffer)) && buffer->draw_buffer; + && (index_buffer = wined3d_buffer_get_parent(wined3d_buffer)) && index_buffer->sysmem; device->auto_mipmaps = 0; for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i) {

1 0

Zebediah Figura : d3d9: Do not release the wined3d mutex in d3d9_device_upload_sysmem_index_buffer().
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: dd5c511c9fe4bef86f46d16aedb40ad65f2dd3e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd5c511c9fe4bef86f46d16aedb40a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 18 14:50:07 2022 -0500 d3d9: Do not release the wined3d mutex in d3d9_device_upload_sysmem_index_buffer(). Spotted by Henri Verbeet. This fixes a regression introduced by 66f37aae7e25740857aeb8ea9c2f0395781389f5. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53372 --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9f071d7a8d2..894659e9ff9 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2993,7 +2993,7 @@ static HRESULT d3d9_device_upload_sysmem_index_buffer(struct d3d9_device *device wined3d_box_set(&box, src_offset, 0, buffer_size, 1, 0, 1); if (FAILED(hr = wined3d_resource_map(index_buffer, 0, &map_desc, &box, WINED3D_MAP_READ))) { - wined3d_mutex_unlock(); + ERR("Failed to map index buffer, hr %#x.\n", hr); return hr; } wined3d_streaming_buffer_upload(device->wined3d_device, &device->index_buffer,

1 0

Zebediah Figura : d3d8: Correctly check for sysmem index buffers in d3d8_device_ApplyStateBlock().
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 764537c0c10c03e29089d21f6c36c29f0d821676 URL: https://gitlab.winehq.org/wine/wine/-/commit/764537c0c10c03e29089d21f6c36c2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 18 14:51:47 2022 -0500 d3d8: Correctly check for sysmem index buffers in d3d8_device_ApplyStateBlock(). This fixes a regression introduced by fc0f0090f6ba24cc68d2b04503977fbcebc1f96d. --- dlls/d3d8/device.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 068f53d8fdf..d6a5349367b 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2032,9 +2032,10 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); const struct wined3d_stateblock_state *state; + struct d3d8_vertexbuffer *vertex_buffer; struct wined3d_stateblock *stateblock; + struct d3d8_indexbuffer *index_buffer; struct wined3d_buffer *wined3d_buffer; - struct d3d8_vertexbuffer *buffer; unsigned int i; TRACE("iface %p, token %#x.\n", iface, token); @@ -2062,13 +2063,13 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD for (i = 0; i < D3D8_MAX_STREAMS; ++i) { wined3d_buffer = state->streams[i].buffer; - if (!wined3d_buffer || !(buffer = wined3d_buffer_get_parent(wined3d_buffer))) + if (!wined3d_buffer || !(vertex_buffer = wined3d_buffer_get_parent(wined3d_buffer))) continue; - if (buffer->draw_buffer) + if (vertex_buffer->draw_buffer) device->sysmem_vb |= 1u << i; } device->sysmem_ib = (wined3d_buffer = state->index_buffer) - && (buffer = wined3d_buffer_get_parent(wined3d_buffer)) && buffer->draw_buffer; + && (index_buffer = wined3d_buffer_get_parent(wined3d_buffer)) && index_buffer->sysmem; wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d8: Do not release the wined3d mutex in d3d8_device_upload_sysmem_index_buffer().
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 7341eb3037f15f6c53260acb39e96257f0d16cf9 URL: https://gitlab.winehq.org/wine/wine/-/commit/7341eb3037f15f6c53260acb39e962… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 18 14:52:44 2022 -0500 d3d8: Do not release the wined3d mutex in d3d8_device_upload_sysmem_index_buffer(). Spotted by Henri Verbeet. This fixes a regression introduced by fc0f0090f6ba24cc68d2b04503977fbcebc1f96d. --- dlls/d3d8/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d6a5349367b..b8193a83cbc 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2477,7 +2477,7 @@ static HRESULT d3d8_device_upload_sysmem_index_buffer(struct d3d8_device *device wined3d_box_set(&box, src_offset, 0, buffer_size, 1, 0, 1); if (FAILED(hr = wined3d_resource_map(index_buffer, 0, &map_desc, &box, WINED3D_MAP_READ))) { - wined3d_mutex_unlock(); + ERR("Failed to map index buffer, hr %#x.\n", hr); return hr; } wined3d_streaming_buffer_upload(device->wined3d_device, &device->index_buffer,

1 0

Paul Gofman : msxml3: Use node_get_text() in domelem_get_nodeTypedValue() if no type is present.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 89bbd1327e42e62f7ebd1a2efaeee6dfbdfe20a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/89bbd1327e42e62f7ebd1a2efaeee6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jul 25 15:02:08 2022 -0500 msxml3: Use node_get_text() in domelem_get_nodeTypedValue() if no type is present. --- dlls/msxml3/element.c | 8 ++++- dlls/msxml3/tests/domdoc.c | 75 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 77 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 7f5b91b0f39..302849aced6 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -454,7 +454,6 @@ static inline HRESULT variant_from_dt(XDR_DT dt, xmlChar* str, VARIANT* v) switch (dt) { - case DT_INVALID: case DT_STRING: case DT_NMTOKEN: case DT_NMTOKENS: @@ -736,6 +735,13 @@ static HRESULT WINAPI domelem_get_nodeTypedValue( V_VT(v) = VT_NULL; dt = element_get_dt(get_element(This)); + + if (dt == DT_INVALID) + { + if (SUCCEEDED(hr = node_get_text(&This->node, &V_BSTR(v)))) + V_VT(v) = VT_BSTR; + return hr; + } content = xmlNodeGetContent(get_element(This)); hr = variant_from_dt(dt, content, v); xmlFree(content); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0643ea5350f..cf9fb62a65e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -906,7 +906,11 @@ static const CHAR szTypeValueXML[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" "<root xmlns:dt=\"urn:schemas-microsoft-com:datatypes\">\n" " <string>Wine</string>\n" -" <string2 dt:dt=\"string\">String</string2>\n" +" <string2 dt:dt=\"string\">String </string2>\n" +" <string3> Wine Wine </string3>\n" +" <string4>\nWine Wine\t</string4>\n" +" <string5> </string5>\n" +" <nested><s1> s1 </s1><s2>\ns2 s2\t</s2></nested>\n" " <number dt:dt=\"number\">12.44</number>\n" " <number2 dt:dt=\"NUMbEr\">-3.71e3</number2>\n" " <int dt:dt=\"int\">-13</int>\n" @@ -6994,11 +6998,16 @@ typedef struct _nodetypedvalue_t { const char *name; VARTYPE type; const char *value; /* value in string format */ + BOOL no_type; } nodetypedvalue_t; static const nodetypedvalue_t get_nodetypedvalue[] = { - { "root/string", VT_BSTR, "Wine" }, - { "root/string2", VT_BSTR, "String" }, + { "root/string", VT_BSTR, "Wine", TRUE }, + { "root/string2", VT_BSTR, "String " }, + { "root/string3", VT_BSTR, " Wine Wine ", TRUE }, + { "root/string4", VT_BSTR, "\nWine Wine\t", TRUE }, + { "root/string5", VT_BSTR, "", TRUE }, + { "root/nested", VT_BSTR, " s1 \ns2 s2\t", TRUE }, { "root/number", VT_BSTR, "12.44" }, { "root/number2", VT_BSTR, "-3.71e3" }, { "root/int", VT_I4, "-13" }, @@ -7025,6 +7034,24 @@ static const nodetypedvalue_t get_nodetypedvalue[] = { { 0 } }; +static const char *strip_spaces(const char *str) +{ + static char buf[256]; + const char *p; + + while (isspace(*str)) + ++str; + + p = str + strlen(str); + while (p != str && isspace(p[-1])) + --p; + + memcpy(buf, str, p - str); + buf[p - str] = 0; + + return buf; +} + static void test_nodeTypedValue(void) { const nodetypedvalue_t *entry = get_nodetypedvalue; @@ -7220,8 +7247,46 @@ static void test_nodeTypedValue(void) "expected %s, got %s\n", entry->value, wine_dbgstr_w(V_BSTR(&value))); } else - ok(lstrcmpW( V_BSTR(&value), _bstr_(entry->value)) == 0, - "expected %s, got %s\n", entry->value, wine_dbgstr_w(V_BSTR(&value))); + { + BSTR bstr, expected; + + expected = entry->no_type ? _bstr_(strip_spaces(entry->value)) : _bstr_(entry->value); + ok(!wcscmp( V_BSTR(&value), expected ), "expected %s, got %s\n", + debugstr_w(expected), wine_dbgstr_w(V_BSTR(&value))); + if (entry->no_type) + { + VariantClear( &value ); + + hr = IXMLDOMDocument_get_preserveWhiteSpace(doc, &b); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr ); + ok(b == VARIANT_FALSE, "got %d\n", b); + + hr = IXMLDOMNode_get_text(node, &bstr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!wcscmp( bstr, expected ), "expected %s, got %s\n", + debugstr_w(expected), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = IXMLDOMDocument_put_preserveWhiteSpace(doc, VARIANT_TRUE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr ); + + expected = _bstr_(entry->value); + hr = IXMLDOMNode_get_text(node, &bstr); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!wcscmp( bstr, expected ), "expected %s, got %s\n", + debugstr_w(expected), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = IXMLDOMNode_get_nodeTypedValue(node, &value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr ); + ok(V_VT(&value) == entry->type, "incorrect type, expected %d, got %d\n", entry->type, V_VT(&value)); + ok(!wcscmp( V_BSTR(&value), expected ), "expected %s, got %s\n", + debugstr_w(expected), wine_dbgstr_w(V_BSTR(&value))); + + hr = IXMLDOMDocument_put_preserveWhiteSpace(doc, VARIANT_FALSE); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr ); + } + } VariantClear( &value ); IXMLDOMNode_Release(node);

1 0

Hugh McMaster : regedit: Use zero as a default for REG_DWORD and REG_QWORD values.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: 93199da8c3381eafc75bbebc5ea3a80d7ac426ef URL: https://gitlab.winehq.org/wine/wine/-/commit/93199da8c3381eafc75bbebc5ea3a8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 27 17:12:38 2022 +1000 regedit: Use zero as a default for REG_DWORD and REG_QWORD values. --- programs/regedit/edit.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 20a0c32adda..79151ee1af6 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -184,15 +184,26 @@ static INT_PTR CALLBACK modify_string_dlgproc(HWND hwndDlg, UINT msg, WPARAM wpa return FALSE; } -static BOOL change_dword_base(HWND hwndDlg, BOOL toHex) +static void change_dword_base(HWND hwndDlg, BOOL toHex) { - WCHAR buf[128]; + WCHAR buf[64]; + unsigned int len; UINT64 val; - if (!GetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, buf, ARRAY_SIZE(buf))) return FALSE; - if (!swscanf(buf, toHex ? L"%I64u" : L"%I64x", &val)) return FALSE; - wsprintfW(buf, toHex ? L"%I64x" : L"%I64u", val); - return SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, buf); + len = GetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, buf, ARRAY_SIZE(buf)); + if (!len) SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, L"0"); + + if ((isDecimal && !toHex) || (!isDecimal && toHex)) + return; + + if (len) + { + swscanf(buf, toHex ? L"%I64u" : L"%I64x", &val); + swprintf(buf, ARRAY_SIZE(buf), toHex ? L"%I64x" : L"%I64u", val); + SetDlgItemTextW(hwndDlg, IDC_VALUE_DATA, buf); + } + + isDecimal = !toHex; } static INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT msg, WPARAM wparam, LPARAM lparam) @@ -217,10 +228,10 @@ static INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT msg, WPARAM wpar switch (LOWORD(wparam)) { case IDC_DWORD_HEX: - if (isDecimal && change_dword_base(hwndDlg, TRUE)) isDecimal = FALSE; + change_dword_base(hwndDlg, TRUE); break; case IDC_DWORD_DEC: - if (!isDecimal && change_dword_base(hwndDlg, FALSE)) isDecimal = TRUE; + change_dword_base(hwndDlg, FALSE); break; case IDOK: params = (struct edit_params *)GetWindowLongPtrW(hwndDlg, DWLP_USER);

1 0

Philip Rebohle : winevulkan: Fill LUID info in VkPhysicalDeviceVulkan11Properties.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: wine Branch: master Commit: ccf0f911e3b298369fc549d67b24abb1ad87cac5 URL: https://gitlab.winehq.org/wine/wine/-/commit/ccf0f911e3b298369fc549d67b24ab… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Fri Jul 22 15:11:48 2022 +0200 winevulkan: Fill LUID info in VkPhysicalDeviceVulkan11Properties. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> --- dlls/winevulkan/loader.c | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 61c583d5c13..86e6718adbd 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -327,15 +327,22 @@ static void wait_graphics_driver_ready(void) static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2) { + VkPhysicalDeviceVulkan11Properties *vk11; + VkBool32 device_luid_valid = VK_FALSE; VkPhysicalDeviceIDProperties *id; + uint32_t device_node_mask = 0; SP_DEVINFO_DATA device_data; + const uint8_t* device_uuid; DWORD type, device_idx = 0; HDEVINFO devinfo; HANDLE mutex; GUID uuid; LUID luid; - if (!(id = wine_vk_find_struct(properties2, PHYSICAL_DEVICE_ID_PROPERTIES))) + vk11 = wine_vk_find_struct(properties2, PHYSICAL_DEVICE_VULKAN_1_1_PROPERTIES); + id = wine_vk_find_struct(properties2, PHYSICAL_DEVICE_ID_PROPERTIES); + + if (!vk11 && !id) return; wait_graphics_driver_ready(); @@ -348,15 +355,30 @@ static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2) &type, (BYTE *)&uuid, sizeof(uuid), NULL, 0)) continue; - if (!IsEqualGUID(&uuid, id->deviceUUID)) + device_uuid = id ? id->deviceUUID : vk11->deviceUUID; + + if (!IsEqualGUID(&uuid, device_uuid)) continue; if (SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, (BYTE *)&luid, sizeof(luid), NULL, 0)) { - memcpy(&id->deviceLUID, &luid, sizeof(id->deviceLUID)); - id->deviceLUIDValid = VK_TRUE; - id->deviceNodeMask = 1; + device_luid_valid = VK_TRUE; + device_node_mask = 1; + + if (id) + { + memcpy(&id->deviceLUID, &luid, sizeof(id->deviceLUID)); + id->deviceLUIDValid = device_luid_valid; + id->deviceNodeMask = device_node_mask; + } + + if (vk11) + { + memcpy(&vk11->deviceLUID, &luid, sizeof(vk11->deviceLUID)); + vk11->deviceLUIDValid = device_luid_valid; + vk11->deviceNodeMask = device_node_mask; + } break; } } @@ -364,8 +386,8 @@ static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2) release_display_device_init_mutex(mutex); TRACE("deviceName:%s deviceLUIDValid:%d LUID:%08lx:%08lx deviceNodeMask:%#x.\n", - properties2->properties.deviceName, id->deviceLUIDValid, luid.HighPart, luid.LowPart, - id->deviceNodeMask); + properties2->properties.deviceName, device_luid_valid, luid.HighPart, luid.LowPart, + device_node_mask); } void WINAPI vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev,

1 0

Alexandre Julliard : testbot: Don't cleanup the winetest-latest URL files.
by Alexandre Julliard 27 Jul '22

27 Jul '22

Module: tools Branch: master Commit: 8966e476e7cde192cc8e205962aa9cf46279e3b6 URL: https://gitlab.winehq.org/winehq/tools/-/commit/8966e476e7cde192cc8e205962a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 27 10:49:26 2022 +0200 testbot: Don't cleanup the winetest-latest URL files. --- testbot/bin/Janitor.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 839e1a94..069ffb76 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -296,7 +296,7 @@ if (opendir(my $dh, "$DataDir/staging")) # So just delete them silently after a day. $TTL = 1 - $Age; } - elsif ($Entry =~ /^[0-9a-f]{32}_(?:patch\.diff|patchset\.diff|email|winetest(?:64)?-latest\.exe|work)$/) + elsif ($Entry =~ /^[0-9a-f]{32}_(?:patch\.diff|patchset\.diff|email|winetest(?:64)?-latest\.(?:exe|url)|work)$/) { # Janitor can only see these files if it ran during the brief interval # between their creation and them being moved out of staging, or if @@ -339,7 +339,7 @@ if (opendir(my $dh, "$DataDir/latest")) next if ($Entry =~ /^TestAgentd(?:32|64)\.exe$/); # Needed to run the tests next if ($Entry =~ /^TestLauncher(?:32|64)\.exe$/); - next if ($Entry =~ /^winetest(?:64)?-latest\.exe$/); + next if ($Entry =~ /^winetest(?:64)?-latest\.(?:exe|url)$/); $Entry =~ m%^([^/]+)$%; # untaint my $FileName = "$DataDir/latest/$1";

1 0

Alexandre Julliard : patches: Also handle vkd3d merge requests.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: tools Branch: master Commit: 6baebd034fbd0ab5f79d6f845c6cb87fe1adfb8f URL: https://gitlab.winehq.org/winehq/tools/-/commit/6baebd034fbd0ab5f79d6f845c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 26 20:24:29 2022 +0200 patches: Also handle vkd3d merge requests. --- patches/update | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/update b/patches/update index 8f79da9c..7739f3b6 100755 --- a/patches/update +++ b/patches/update @@ -86,7 +86,7 @@ my @legend = my $dir = $ARGV[0] || "$ENV{HOME}/patches"; my $dest = "/home/winehq/opt/source/patches"; -my $gitlab = "https://gitlab.winehq.org/wine/wine"; +my $gitlab = "https://gitlab.winehq.org/wine"; my %patches; my %messages; my %subdirs; @@ -220,9 +220,9 @@ foreach my $file (readdir DIR) if (defined $patch{"msgid"}) { $messages{$patch{"msgid"}} = \%patch; - if ($patch{msgid} =~ /<wine-wine-mr(\d+)-v\d+.*\@gitlab-mail-bridge>/) + if ($patch{msgid} =~ /<wine-(wine|vkd3d)-mr(\d+)-v\d+.*\@gitlab-mail-bridge>/) { - $patch{mr} = "$gitlab/-/merge_requests/$1"; + $patch{mr} = "$gitlab/$1/-/merge_requests/$2"; $patch{status} = "mergereq" if $patch{status} eq "nil"; } }

1 0