June 2021 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : msado15/test: Remove Reference count tests.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: master Commit: 9c5bb97465a0e687444982b62986aa06c6f1afe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c5bb97465a0e687444982b6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 7 16:28:55 2021 +1000 msado15/test: Remove Reference count tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/tests/msado15.c | 80 +++----------------------------------------- 1 file changed, 4 insertions(+), 76 deletions(-) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index b5f1b70dedd..e097239910d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -43,24 +43,6 @@ static BOOL is_eof( _Recordset *recordset ) return eof == VARIANT_TRUE; } -static LONG get_refs_field( Field *field ) -{ - Field_AddRef( field ); - return Field_Release( field ); -} - -static LONG get_refs_fields( Fields *fields ) -{ - Fields_AddRef( fields ); - return Fields_Release( fields ); -} - -static LONG get_refs_recordset( _Recordset *recordset ) -{ - _Recordset_AddRef( recordset ); - return _Recordset_Release( recordset ); -} - static void test_Recordset(void) { _Recordset *recordset; @@ -70,7 +52,7 @@ static void test_Recordset(void) Field *field; Properties *props; Property *prop; - LONG refs, count, state; + LONG count, state; VARIANT missing, val, index; CursorLocationEnum location; CursorTypeEnum cursor; @@ -89,39 +71,15 @@ static void test_Recordset(void) errorinfo = NULL; hr = _Recordset_QueryInterface( recordset, &IID_ISupportErrorInfo, (void **)&errorinfo ); ok( hr == S_OK, "got %08x\n", hr ); - refs = get_refs_recordset( recordset ); - ok( refs == 2, "got %d\n", refs ); if (errorinfo) ISupportErrorInfo_Release( errorinfo ); - refs = get_refs_recordset( recordset ); - ok( refs == 1, "got %d\n", refs ); - /* handing out fields object increases recordset refcount */ - refs = get_refs_recordset( recordset ); - ok( refs == 1, "got %d\n", refs ); hr = _Recordset_get_Fields( recordset, &fields ); ok( hr == S_OK, "got %08x\n", hr ); - refs = get_refs_recordset( recordset ); - ok( refs == 2, "got %d\n", refs ); - refs = get_refs_fields( fields ); - ok( refs == 1, "got %d\n", refs ); - - /* releasing fields object decreases recordset refcount, but fields refcount doesn't drop to zero */ - Fields_Release( fields ); - refs = get_refs_recordset( recordset ); - ok( refs == 1, "got %d\n", refs ); - refs = get_refs_fields( fields ); - ok( refs == 1, "got %d\n", refs ); - /* calling get_Fields again returns the same object with the same refcount and increases recordset refcount */ + /* calling get_Fields again returns the same object */ hr = _Recordset_get_Fields( recordset, &fields2 ); ok( hr == S_OK, "got %08x\n", hr ); - refs = get_refs_recordset( recordset ); - ok( refs == 2, "got %d\n", refs ); - refs = get_refs_fields( fields2 ); - ok( refs == 1, "got %d\n", refs ); ok( fields2 == fields, "expected same object\n" ); - refs = Fields_Release( fields2 ); - ok( refs == 1, "got %d\n", refs ); count = -1; hr = Fields_get_Count( fields2, &count ); @@ -131,12 +89,7 @@ static void test_Recordset(void) hr = _Recordset_Close( recordset ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); - refs = _Recordset_Release( recordset ); - ok( !refs, "got %d\n", refs ); - - /* fields object still has a reference */ - refs = Fields_Release( fields2 ); - ok( refs == 1, "got %d\n", refs ); + Fields_Release( fields2 ); hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08x\n", hr ); @@ -678,7 +631,7 @@ static void test_Fields(void) Field *field, *field2; VARIANT val, index; BSTR name; - LONG refs, count, size; + LONG count, size; DataTypeEnum type; FieldAttributeEnum attrs; HRESULT hr; @@ -693,11 +646,7 @@ static void test_Fields(void) errorinfo = NULL; hr = Fields_QueryInterface( fields, &IID_ISupportErrorInfo, (void **)&errorinfo ); ok( hr == S_OK, "got %08x\n", hr ); - refs = get_refs_fields( fields ); - ok( refs == 2, "got %d\n", refs ); if (errorinfo) ISupportErrorInfo_Release( errorinfo ); - refs = get_refs_fields( fields ); - ok( refs == 1, "got %d\n", refs ); count = -1; hr = Fields_get_Count( fields, &count ); @@ -727,29 +676,12 @@ static void test_Fields(void) name = SysAllocString( L"field" ); V_VT( &index ) = VT_BSTR; V_BSTR( &index ) = name; - refs = get_refs_recordset( recordset ); - ok( refs == 2, "got %d\n", refs ); - refs = get_refs_fields( fields ); - ok( refs == 1, "got %d\n", refs ); hr = Fields_get_Item( fields, index, &field ); - ok( hr == S_OK, "got %08x\n", hr ); - refs = get_refs_field( field ); - ok( refs == 1, "got %d\n", refs ); - refs = get_refs_recordset( recordset ); - ok( refs == 2, "got %d\n", refs ); - refs = get_refs_fields( fields ); - ok( refs == 1, "got %d\n", refs ); /* calling get_Item again returns the same object and adds reference */ hr = Fields_get_Item( fields, index, &field2 ); ok( hr == S_OK, "got %08x\n", hr ); ok( field2 == field, "expected same object\n" ); - refs = get_refs_field( field2 ); - ok( refs == 2, "got %d\n", refs ); - refs = get_refs_recordset( recordset ); - ok( refs == 2, "got %d\n", refs ); - refs = get_refs_fields( fields ); - ok( refs == 1, "got %d\n", refs ); Field_Release( field2 ); SysFreeString( name ); @@ -757,11 +689,7 @@ static void test_Fields(void) errorinfo = NULL; hr = Field_QueryInterface( field, &IID_ISupportErrorInfo, (void **)&errorinfo ); ok( hr == S_OK, "got %08x\n", hr ); - refs = get_refs_field( field ); - ok( refs == 2, "got %d\n", refs ); if (errorinfo) ISupportErrorInfo_Release( errorinfo ); - refs = get_refs_field( field ); - ok( refs == 1, "got %d\n", refs ); /* verify values set with _Append */ hr = Field_get_Name( field, &name );

1 0

Akihiro Sagawa : quartz/tests: Test the close button of the video window.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: master Commit: b0458a318f20eb9fa2b187e28451a9579170d746 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0458a318f20eb9fa2b187e2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jun 2 23:07:56 2021 +0900 quartz/tests: Test the close button of the video window. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 98 +++++++++++++++++++++++++++++++++-- dlls/quartz/tests/vmr7.c | 105 ++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr9.c | 100 ++++++++++++++++++++++++++++++++++-- 3 files changed, 295 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0458a318f20eb9fa2b1…

1 0

Alexandre Julliard : Wine release 6.0.1
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: website Branch: master Commit: 6ccbd44d832874272fbdfb1bc4e0da6667c7fc9d URL: https://source.winehq.org/git/website.git/?a=commit;h=6ccbd44d832874272fbdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 7 22:02:16 2021 +0200 Wine release 6.0.1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021060701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2021060701.xml b/news/en/2021060701.xml new file mode 100644 index 00000000..2126e19d --- /dev/null +++ b/news/en/2021060701.xml @@ -0,0 +1,16 @@ +<news> +<date>June 7, 2021</date> +<title>Wine 6.0.1 Released</title> +<body> + The Wine maintenance release 6.0.1 is now available. + <a href="{$root}/announce/6.0.1">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> + <li>Add support for wine64 on Apple M1</li> + <li>Translation updates</li> + <li>Documentation updates</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.0/wine-6.0.1.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Martin Storsjo : msvcrt: Fix reading BOM-less files opened with ccs=unicode.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: be1c8a56a39e03e13446a26d12bdacafbd57ee37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be1c8a56a39e03e13446a26d… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 27 19:07:26 2021 +0100 msvcrt: Fix reading BOM-less files opened with ccs=unicode. This fixes a regression in running MSVC 2010 in wine, when reading .def files (regressed in b0ab1b76029eaface724a28483fe8b0ea36029dc). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fb0fa9aacf0d58b3fd5f26255858a744b29ee000) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/file.c | 6 ++++-- dlls/msvcrt/tests/file.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index ba534568119..73e1a82476f 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2329,6 +2329,7 @@ int CDECL _wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pm msvcrt_set_errno(GetLastError()); return *_errno(); } + oflags |= _O_U16TEXT; } } else if (access & GENERIC_READ) @@ -2346,8 +2347,9 @@ int CDECL _wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pm return *_errno(); if (oflags & _O_WTEXT) - get_ioinfo_nolock(*fd)->exflag |= EF_UTF16|EF_UNK_UNICODE; - else if (oflags & _O_U16TEXT) + get_ioinfo_nolock(*fd)->exflag |= EF_UNK_UNICODE; + + if (oflags & _O_U16TEXT) get_ioinfo_nolock(*fd)->exflag |= EF_UTF16; else if (oflags & _O_U8TEXT) get_ioinfo_nolock(*fd)->exflag |= EF_UTF8; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index ecf99e38b0e..0cf8bad124f 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1039,6 +1039,40 @@ static void test_fgetwc_unicode(void) ch = fgetwc(tempfh); ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); fclose(tempfh); + + tempfh = fopen(tempfile, "wb"); + ok(tempfh != NULL, "can't open tempfile\n"); + ret = WideCharToMultiByte(CP_UTF8, 0, wchar_text + 1, ARRAY_SIZE(wchar_text) - 1, + utf8_text, sizeof(utf8_text), NULL, NULL); + ok(ret > 0, "utf-8 conversion failed\n"); + utf8_text[ret] = 0; + fwrite(utf8_text, sizeof(char), ret, tempfh); + fclose(tempfh); + + tempfh = fopen(tempfile, "rt, ccs=UTF-8"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 1; i < ARRAY_SIZE(wchar_text); i++) + { + ch = fgetwc(tempfh); + ok(ch == wchar_text[i], + "got %04hx, expected %04x (utf8[%d])\n", ch, wchar_text[i], i-1); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (utf8)\n", ch); + fclose(tempfh); + + tempfh = fopen(tempfile, "rt, ccs=unicode"); + ok(tempfh != NULL, "can't open tempfile\n"); + for (i = 0; utf8_text[i]; i++) + { + ch = fgetwc(tempfh); + ok(ch == (unsigned char) utf8_text[i], + "got %04hx, expected %04x (unicode[%d])\n", ch, (unsigned char)utf8_text[i], i); + } + ch = fgetwc(tempfh); + ok(ch == WEOF, "got %04hx, expected WEOF (unicode)\n", ch); + fclose(tempfh); + unlink(temppath); }

1 0

Jan Sikorski : winemac.drv: Include depth32+stencil pixel formats in enumeration.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 52f5e431ede771696b505021138562ca0c5f28c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52f5e431ede771696b505021… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Jan 18 14:18:17 2021 +0100 winemac.drv: Include depth32+stencil pixel formats in enumeration. This is especially important for M1 GPUs as they don't support the 24/8 format. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 88220e0ee41640940e7686fe0cab7f1e0bfb42f1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/opengl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index b66af0f1c47..9f02e93d376 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -741,7 +741,8 @@ static void enum_renderer_pixel_formats(renderer_properties renderer, CFMutableA if (!(renderer.stencil_modes & depth_stencil_modes[stencil_mode].mode)) continue; - if (accelerated && depth_stencil_modes[depth_mode].bits != 24 && stencil_mode > 0) + if (accelerated && depth_stencil_modes[depth_mode].bits != 24 && + depth_stencil_modes[depth_mode].bits != 32 && stencil_mode > 0) continue; attribs[n++] = kCGLPFAStencilSize;

1 0

Tag wine-6.0.1 : Alexandre Julliard : Release 6.0.1
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: refs/tags/wine-6.0.1 Tag: 5e0f21ed92f3b1e0094dc8df60ba039105302f90 URL: https://source.winehq.org/git/wine.git/?a=tag;h=5e0f21ed92f3b1e0094dc8df60b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 7 22:00:25 2021 +0200 Release 6.0.1

1 0

Brendan Shanks : winemac.drv: Handle non-PCI GPUs correctly.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 5faad354d84bac04fac12a8730de2403353cb91c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5faad354d84bac04fac12a87… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Jan 27 11:16:47 2021 -0800 winemac.drv: Handle non-PCI GPUs correctly. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5fbd40520d9a1505764b9e7b86f01d663b3aa391) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index dfd70f10792..05f1c75d53b 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -183,7 +183,9 @@ done: /*********************************************************************** * macdrv_get_gpu_info_from_entry * - * Starting from entry, search upwards to find the PCI GPU. And get GPU information from the PCI GPU entry. + * Starting from entry (which must be the GPU or a child below the GPU), + * search upwards to find the IOPCIDevice and get information from it. + * In case the GPU is not a PCI device, get properties from 'entry'. * * Returns non-zero value on failure. */ @@ -193,18 +195,21 @@ static int macdrv_get_gpu_info_from_entry(struct macdrv_gpu* gpu, io_registry_en io_registry_entry_t gpu_entry; kern_return_t result; int ret = -1; - char buffer[64]; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; gpu_entry = entry; - while (![@"IOPCIDevice" isEqualToString:[(NSString*)IOObjectCopyClass(gpu_entry) autorelease]] - || get_entry_property_string(gpu_entry, CFSTR("IOName"), buffer, sizeof(buffer)) - || strcmp(buffer, "display")) + while (![@"IOPCIDevice" isEqualToString:[(NSString*)IOObjectCopyClass(gpu_entry) autorelease]]) { result = IORegistryEntryGetParentEntry(gpu_entry, kIOServicePlane, &parent_entry); if (gpu_entry != entry) IOObjectRelease(gpu_entry); - if (result != kIOReturnSuccess) + if (result == kIOReturnNoDevice) + { + /* If no IOPCIDevice node is found, get properties from the given entry. */ + gpu_entry = entry; + break; + } + else if (result != kIOReturnSuccess) { [pool release]; return ret; @@ -409,6 +414,7 @@ static int macdrv_get_gpus_from_iokit(struct macdrv_gpu** new_gpus, int* count) int integrated_index = -1; int primary_index = 0; int gpu_count = 0; + char buffer[64]; int ret = -1; int i; @@ -422,7 +428,9 @@ static int macdrv_get_gpus_from_iokit(struct macdrv_gpu** new_gpus, int* count) while ((entry = IOIteratorNext(iterator))) { - if (!macdrv_get_gpu_info_from_entry(&gpus[gpu_count], entry)) + if (!get_entry_property_string(entry, CFSTR("IOName"), buffer, sizeof(buffer)) && + !strcmp(buffer, "display") && + !macdrv_get_gpu_info_from_entry(&gpus[gpu_count], entry)) { gpu_count++; assert(gpu_count < MAX_GPUS);

1 0

Brendan Shanks : winemac.drv: Use Metal to get a display's GPU info if possible.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: aa83195f1a4ee5dfc1d8a50b5d5f85d2d5e9cc84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa83195f1a4ee5dfc1d8a50b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Jan 27 11:16:46 2021 -0800 winemac.drv: Use Metal to get a display's GPU info if possible. Fixes an Apple Silicon issue where CGDisplayIOServicePort() returns a fake AMD GPU "compatibility" node rather than the real GPU node. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ae319caa3bf97b0ab688b1f44418dfd9d522f115) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/cocoa_display.m | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index e769772feaa..2e50b67c7d1 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -330,6 +330,27 @@ done: return ret; } +/*********************************************************************** + * macdrv_get_gpu_info_from_display_id_using_metal + * + * Get GPU information for a CG display id using Metal. + * + * Returns non-zero value on failure. + */ +static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + id<MTLDevice> device; + int ret = -1; + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + + device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; + if (device && [device respondsToSelector:@selector(registryID)]) + ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); + + [pool release]; + return ret; +} + #else static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) @@ -337,20 +358,32 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) return -1; } +static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + return -1; +} + #endif /*********************************************************************** * macdrv_get_gpu_info_from_display_id * * Get GPU information from a display id. - * This is a fallback for 32bit build or older Mac OS version where Metal is unavailable. * * Returns non-zero value on failure. */ static int macdrv_get_gpu_info_from_display_id(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) { - io_registry_entry_t entry = CGDisplayIOServicePort(display_id); - return macdrv_get_gpu_info_from_entry(gpu, entry); + int ret; + io_registry_entry_t entry; + + ret = macdrv_get_gpu_info_from_display_id_using_metal(gpu, display_id); + if (ret) + { + entry = CGDisplayIOServicePort(display_id); + ret = macdrv_get_gpu_info_from_entry(gpu, entry); + } + return ret; } /***********************************************************************

1 0

Michael Stefaniuc : tools: Get the ANNOUNCE bug list from the stable-notes git notes.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 8d5c8f775ea625d9202eb0d17ad411ca0718592c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d5c8f775ea625d9202eb0d1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 26 21:05:28 2017 +0200 tools: Get the ANNOUNCE bug list from the stable-notes git notes. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/make_announce | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/make_announce b/tools/make_announce index 83d869ae69d..b38b7b0a70a 100755 --- a/tools/make_announce +++ b/tools/make_announce @@ -24,7 +24,6 @@ use strict; use locale; use POSIX; -use Text::CSV::Encoded; use open ':encoding(utf8)'; sub unescape($) @@ -69,18 +68,14 @@ sub get_current_version() # retrieve a list of bugs with the specified filter sub get_bugs($) { - my $filter = shift; - my $csv = Text::CSV::Encoded->new({ encoding_in => "utf-8", encoding_out => "utf-8" }); my %bugs; - open QUERY, "-|" or exec "wget", "-qO-", "https://bugs.winehq.org/buglist.cgi?columnlist=short_desc&query_format=adva…" + open QUERY, "-|" or exec "git", "log", "--notes=stable-notes", "--format=%N", "wine-" . get_current_version() . ".." or die "cannot query bug list"; - <QUERY>; # skip header line while (<QUERY>) { - next unless $csv->parse($_); - my ($id, $descr) = $csv->fields(); - $bugs{$id} = $descr; + next unless /^Fixes: \[(\d+)\] (.*)/; + $bugs{$1} = $2; } close QUERY; return %bugs;

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: af9312c574cf4d37ea0ffff7217d4ba80f0726c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af9312c574cf4d37ea0ffff7… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Sun Feb 28 23:29:23 2021 +0100 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 24e41be13619d6111e7d71da5b114cec4a541f16) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- po/nl.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/po/nl.po b/po/nl.po index d727b541ffa..a5eaf77f8e8 100644 --- a/po/nl.po +++ b/po/nl.po @@ -13112,11 +13112,11 @@ msgstr "Wine Verkenner" #: programs/explorer/explorer.rc:33 msgid "Start" -msgstr "Opstarten" +msgstr "Start" #: programs/explorer/explorer.rc:34 programs/winefile/winefile.rc:36 msgid "&Run..." -msgstr "&Starten..." +msgstr "&Uitvoeren..." #: programs/fsutil/fsutil.mc:28 msgid "" @@ -16145,10 +16145,10 @@ msgid "" "linked to the Libraries and Graphics tabs to allow you to change system-wide " "or per-application settings in those tabs as well." msgstr "" -"Wine geeft de mogelijkheid om per toepassing de Windows versie in te " -"stellen. Dit tabblad is gekoppeld aan de tabbladen 'Bibliotheken' en " -"'Grafisch' om zowel systeembreed als programmaspecifiek instellingen in deze " -"tabbladen mogelijk te maken." +"Voor elk programma kan Wine apart de Windows versie instellen. Dit tabblad " +"isgekoppeld aan de tabbladen 'Bibliotheken' en 'Grafisch'. Hierdoor kan per " +"programma de standaardinstellingen of programmaspecifieke instellingen " +"gebruikt worden." #: programs/winecfg/winecfg.rc:158 msgid "Add appli&cation..." @@ -16180,7 +16180,7 @@ msgstr "Laat de vensterbeheerder de vensters &beheren" #: programs/winecfg/winecfg.rc:172 msgid "&Emulate a virtual desktop" -msgstr "&Emuleer een virtueel bureaublad" +msgstr "Maak een &virtueel bureaublad" #: programs/winecfg/winecfg.rc:174 msgid "Desktop &size:" @@ -16514,7 +16514,7 @@ msgstr "Automatisch" #: programs/winecfg/winecfg.rc:69 msgid "Local hard disk" -msgstr "Hardeschijf" +msgstr "Harde schijf" #: programs/winecfg/winecfg.rc:70 msgid "Network share" @@ -16526,7 +16526,7 @@ msgstr "Diskettestation" #: programs/winecfg/winecfg.rc:72 msgid "CD-ROM" -msgstr "Cd-rom" +msgstr "CD-ROM" #: programs/winecfg/winecfg.rc:73 msgid "" @@ -16536,7 +16536,7 @@ msgid "" msgstr "" "U kunt geen schijven meer toevoegen.\n" "\n" -"Elke schijf moet een letter van A tot Z hebben dus het kunnen er niet meer " +"Elke schijf moet een letter van A tot Z hebben. Het kunnen er dus niet meer " "dan 26 zijn." #: programs/winecfg/winecfg.rc:74 @@ -16727,8 +16727,8 @@ msgid "" "Database</a> for tips about running this application." msgstr "" "Dit kan veroorzaakt worden door een probleem in het programma of een fout in " -"Wine. U kunt zoeken op <a href=\"https://appdb.winehq.org\">Application " -"Database</a> naar tips voor dit programma." +"Wine. Zoek in de <a href=\"https://appdb.winehq.org\">Programma Database</a> " +"naar tips voor dit programma." #: programs/winedbg/winedbg.rc:62 msgid "Show &Details" @@ -16745,9 +16745,9 @@ msgid "" "button, then <a href=\"https://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" -"Indien dit probleem zich niet voordoet onder Windows en het probleem is nog " -"niet gerapporteerd, dan kunt U gedetailleerde informatie in een bestand " -"opslaan met de \"Opslaan als\" knop. Dit bestand kunt U via <a href=" +"Indien dit probleem zich niet voordoet onder Windows en het probleem nog " +"niet is gerapporteerd, dan kunt u gedetailleerde informatie in een bestand " +"opslaan met de \"Opslaan als\" knop. Dit bestand kunt u via <a href=" "\"https://wiki.winehq.org/Bugs\">file a bug report</a> versturen." #: programs/winedbg/winedbg.rc:40

1 0