October 2023 - Wine-commits

Mohamad Al-Jaf : windows.media.mediacontrol: Implement some ISystemMediaTransportControls properties.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: 84418169124606b1c8acdfead03595b83139b25a URL: https://gitlab.winehq.org/wine/wine/-/commit/84418169124606b1c8acdfead03595… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Sep 28 02:53:23 2023 -0400 windows.media.mediacontrol: Implement some ISystemMediaTransportControls properties. Called by Roon. --- dlls/windows.media.mediacontrol/main.c | 103 ++++++++++++++++----- .../tests/mediacontrol.c | 36 +++---- 2 files changed, 97 insertions(+), 42 deletions(-)

1 0

Alexandre Julliard : server: Set the dynamically relocated flag when relocations are present.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: 4847c1d8e4745ccd63e1db06fe1a693e8a591326 URL: https://gitlab.winehq.org/wine/wine/-/commit/4847c1d8e4745ccd63e1db06fe1a69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 5 11:45:15 2023 +0200 server: Set the dynamically relocated flag when relocations are present. --- dlls/kernel32/tests/loader.c | 8 ++++++++ server/mapping.c | 21 ++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 0e86a0577b1..c250fc5d52d 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2153,6 +2153,7 @@ static void test_import_resolution(void) } data, *ptr; IMAGE_NT_HEADERS nt, *pnt; IMAGE_SECTION_HEADER section; + SECTION_IMAGE_INFORMATION image; int test, tls_index_save, nb_rel; #if defined(__i386__) static const UCHAR tls_init_code[] = { @@ -2192,6 +2193,7 @@ static void test_import_resolution(void) #else #define ADD_RELOC(field) data.rel.type_off[nb_rel++] = (IMAGE_REL_BASED_HIGHLOW << 12) + offsetof( struct imports, field ) #endif + winetest_push_context( "%u", test ); nt = nt_header_template; nt.FileHeader.NumberOfSections = 1; nt.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); @@ -2363,6 +2365,11 @@ static void test_import_resolution(void) ok( GetLastError() == ERROR_BAD_EXE_FORMAT, "wrong error %lu\n", GetLastError() ); break; } + status = pNtQuerySection( mapping, SectionImageInformation, &image, sizeof(image), &size ); + ok( !status, "NtQuerySection failed %lx\n", status ); + ok( test == 6 ? !image.ImageDynamicallyRelocated : image.ImageDynamicallyRelocated, + "image flags %x\n", image.ImageFlags); + ok( !image.ImageContainsCode, "contains code %x\n", image.ImageContainsCode); ok( mapping != 0, "CreateFileMappingA failed err %lu\n", GetLastError() ); /* make sure that the address is not available */ tmp = VirtualAlloc( (void *)nt.OptionalHeader.ImageBase, 0x10000, @@ -2399,6 +2406,7 @@ static void test_import_resolution(void) break; } DeleteFileA( dll_name ); + winetest_pop_context(); #undef DATA_RVA } } diff --git a/server/mapping.c b/server/mapping.c index 2d0a0b783e2..a6adf4dfbe2 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -695,7 +695,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s } opt; } nt; off_t pos; - int size; + int size, has_relocs; size_t mz_size, clr_va = 0, clr_size = 0; unsigned int i; @@ -757,10 +757,15 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.header_size = nt.opt.hdr32.SizeOfHeaders; mapping->image.checksum = nt.opt.hdr32.CheckSum; mapping->image.image_flags = 0; + + has_relocs = (nt.opt.hdr32.NumberOfRvaAndSizes > IMAGE_DIRECTORY_ENTRY_BASERELOC && + nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress && + nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size && + !(nt.FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)); if (nt.opt.hdr32.SectionAlignment & page_mask) mapping->image.image_flags |= IMAGE_FLAGS_ImageMappedFlat; else if ((nt.opt.hdr32.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && - mapping->image.contains_code && !(clr_va && clr_size)) + (has_relocs || mapping->image.contains_code) && !(clr_va && clr_size)) mapping->image.image_flags |= IMAGE_FLAGS_ImageDynamicallyRelocated; break; @@ -800,10 +805,20 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.header_size = nt.opt.hdr64.SizeOfHeaders; mapping->image.checksum = nt.opt.hdr64.CheckSum; mapping->image.image_flags = 0; + + has_relocs = (nt.opt.hdr64.NumberOfRvaAndSizes > IMAGE_DIRECTORY_ENTRY_BASERELOC && + nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress && + nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size && + !(nt.FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)); if (nt.opt.hdr64.SectionAlignment & page_mask) mapping->image.image_flags |= IMAGE_FLAGS_ImageMappedFlat; + else if (nt.opt.hdr64.NumberOfRvaAndSizes > IMAGE_DIRECTORY_ENTRY_BASERELOC && + nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress && + nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size && + !(nt.FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)) + mapping->image.image_flags |= IMAGE_FLAGS_ImageDynamicallyRelocated; else if ((nt.opt.hdr64.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && - mapping->image.contains_code && !(clr_va && clr_size)) + (has_relocs || mapping->image.contains_code) && !(clr_va && clr_size)) mapping->image.image_flags |= IMAGE_FLAGS_ImageDynamicallyRelocated; break;

1 0

Alexandre Julliard : server: Assign a system-wide mapping address for dynamic base modules.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: efd03f40e6e315d89cd1d09c48180aae82033f9f URL: https://gitlab.winehq.org/wine/wine/-/commit/efd03f40e6e315d89cd1d09c48180a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 5 10:41:47 2023 +0200 server: Assign a system-wide mapping address for dynamic base modules. --- dlls/ntdll/unix/virtual.c | 27 +++++++++-- include/wine/server_protocol.h | 19 +++++++- server/fd.c | 21 +++++++++ server/file.h | 4 ++ server/main.c | 1 + server/mapping.c | 105 +++++++++++++++++++++++++++++++++++++++-- server/protocol.def | 9 ++++ server/request.h | 8 +++- server/trace.c | 13 +++++ tools/make_requests | 2 +- 10 files changed, 200 insertions(+), 9 deletions(-)

1 0

Alexandre Julliard : ntdll: Relocate dynamic base modules when mapping them.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: ec3de128257a8ceb0637fae9d9fd2b067bb0e0d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec3de128257a8ceb0637fae9d9fd2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 5 10:43:02 2023 +0200 ntdll: Relocate dynamic base modules when mapping them. --- dlls/kernel32/tests/loader.c | 4 ++-- dlls/ntdll/unix/virtual.c | 25 ++++++++++++++++++++++++- server/mapping.c | 3 ++- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index c250fc5d52d..ec6f2d5c6a7 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2379,7 +2379,7 @@ static void test_import_resolution(void) offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, GetCurrentProcess(), (void **)&mod, 0, 0, &offset, &size, 1 /* ViewShare */, 0, PAGE_READONLY ); - todo_wine_if (test < 6) + todo_wine_if (test == 5) ok( status == (test == 6 ? STATUS_IMAGE_NOT_AT_BASE : STATUS_SUCCESS), "NtMapViewOfSection failed %lx\n", status ); ok( mod != (void *)nt.OptionalHeader.ImageBase, "loaded at image base %p\n", mod ); @@ -2392,7 +2392,7 @@ static void test_import_resolution(void) "tls relocated %p / %p\n", (void *)ptr->tls.StartAddressOfRawData, (char *)nt.OptionalHeader.ImageBase + DATA_RVA( data.tls_data )); } - else todo_wine + else todo_wine_if (test == 5) { ok( (void *)pnt->OptionalHeader.ImageBase == mod, "not at base %p / %p\n", (void *)pnt->OptionalHeader.ImageBase, mod ); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index c017b45fc1e..855aa9cd1eb 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2687,7 +2687,7 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena IMAGE_NT_HEADERS *nt; IMAGE_SECTION_HEADER sections[96]; IMAGE_SECTION_HEADER *sec; - IMAGE_DATA_DIRECTORY *imports; + IMAGE_DATA_DIRECTORY *imports, *relocs; NTSTATUS status = STATUS_CONFLICTING_ADDRESSES; int i; off_t pos; @@ -2695,6 +2695,7 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena char *header_end; char *ptr = view->base; SIZE_T header_size, total_size = view->size; + INT_PTR delta; TRACE_(module)( "mapping PE file %s at %p-%p\n", debugstr_w(filename), ptr, ptr + total_size ); @@ -2848,6 +2849,28 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena #endif if (machine && machine != nt->FileHeader.Machine) return STATUS_NOT_SUPPORTED; + /* relocate to dynamic base */ + + if (image_info->map_addr && (delta = image_info->map_addr - image_info->base)) + { + TRACE_(module)( "relocating %s dynamic base %lx -> %lx mapped at %p\n", debugstr_w(filename), + (ULONG_PTR)image_info->base, (ULONG_PTR)image_info->map_addr, ptr ); + + if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + ((IMAGE_NT_HEADERS64 *)nt)->OptionalHeader.ImageBase = image_info->map_addr; + else + ((IMAGE_NT_HEADERS32 *)nt)->OptionalHeader.ImageBase = image_info->map_addr; + + if ((relocs = get_data_dir( nt, total_size, IMAGE_DIRECTORY_ENTRY_BASERELOC ))) + { + IMAGE_BASE_RELOCATION *rel = (IMAGE_BASE_RELOCATION *)(ptr + relocs->VirtualAddress); + IMAGE_BASE_RELOCATION *end = (IMAGE_BASE_RELOCATION *)((char *)rel + relocs->Size); + + while (rel && rel < end - 1 && rel->SizeOfBlock && rel->VirtualAddress < total_size) + rel = process_relocation_block( ptr + rel->VirtualAddress, rel, delta ); + } + } + /* set the image protections */ set_vprot( view, ptr, ROUND_SIZE( 0, header_size ), VPROT_COMMITTED | VPROT_READ ); diff --git a/server/mapping.c b/server/mapping.c index 41585b35924..c570bcf8f94 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -1407,7 +1407,8 @@ DECL_HANDLER(map_image_view) view->image.entry_point = req->entry; add_process_view( current, view ); - if (view->base != mapping->image.base) set_error( STATUS_IMAGE_NOT_AT_BASE ); + if (view->base != (mapping->image.map_addr ? mapping->image.map_addr : mapping->image.base)) + set_error( STATUS_IMAGE_NOT_AT_BASE ); if (view->image.machine != current->process->machine) { /* on 32-bit, the native 64-bit machine is allowed */

1 0

Alexandre Julliard : winegcc: Enable dynamic base by default.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: 0d3ff192aaad8b65eb25ea426442760ebc4e35d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d3ff192aaad8b65eb25ea42644276… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 27 13:32:49 2023 +0200 winegcc: Enable dynamic base by default. --- tools/winegcc/winegcc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 968e472227e..b8eb5e4fc79 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -409,6 +409,8 @@ static struct strarray get_link_args( struct options *opts, const char *output_n strarray_add( &flags, "-Wl,--exclude-all-symbols" ); strarray_add( &flags, "-Wl,--nxcompat" ); + strarray_add( &flags, "-Wl,--dynamicbase" ); + strarray_add( &flags, "-Wl,--disable-auto-image-base" ); if (opts->image_base) strarray_add( &flags, strmake("-Wl,--image-base,%s", opts->image_base ));

1 0

Alistair Leslie-Hughes : msado15: Move to newly created row in Recordset::AddNew.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: 8a4e235efca17dbd46ba382e1787203e8247b2d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8a4e235efca17dbd46ba382e178720… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 4 16:55:11 2023 +1100 msado15: Move to newly created row in Recordset::AddNew. It's valid to have a recordset with existing rows. AddNew needs to move to newly created row, so existing won't be used. --- dlls/msado15/recordset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 99779f99dfa..d0ee85e0f59 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1587,7 +1587,7 @@ static HRESULT WINAPI recordset_AddNew( _Recordset *iface, VARIANT field_list, V if (recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); if (!resize_recordset( recordset, recordset->count + 1 )) return E_OUTOFMEMORY; - recordset->index++; + recordset->index = recordset->count - 1; recordset->editmode = adEditAdd; return S_OK; }

1 0

Alistair Leslie-Hughes : msado15: Show fixme only if field_list needs to be used in Recordset::AddNew.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: 77b506709adaede075740b33e81dd356d449b6fa URL: https://gitlab.winehq.org/wine/wine/-/commit/77b506709adaede075740b33e81dd3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 4 16:55:11 2023 +1100 msado15: Show fixme only if field_list needs to be used in Recordset::AddNew. --- dlls/msado15/recordset.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index d0ee85e0f59..2b936f5c096 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1582,7 +1582,8 @@ static HRESULT WINAPI recordset_AddNew( _Recordset *iface, VARIANT field_list, V struct recordset *recordset = impl_from_Recordset( iface ); TRACE( "%p, %s, %s\n", recordset, debugstr_variant(&field_list), debugstr_variant(&values) ); - FIXME( "ignoring field list and values\n" ); + if (V_VT(&field_list) != VT_ERROR) + FIXME( "ignoring field list and values\n" ); if (recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed );

1 0

Daniel Lehman : advapi32/tests: Add ReadEventLogW tests for EventLogStarted.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: 428a1219fd94919fb93527f2ef582bd28176c03f URL: https://gitlab.winehq.org/wine/wine/-/commit/428a1219fd94919fb93527f2ef582b… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Oct 2 23:39:16 2023 -0700 advapi32/tests: Add ReadEventLogW tests for EventLogStarted. --- dlls/advapi32/tests/eventlog.c | 80 ++++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/netevent.h | 24 +++++++++++++ 3 files changed, 105 insertions(+) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 793addf3d29..57ead1078f5 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -30,6 +30,7 @@ #include "wmistr.h" #include "evntprov.h" #include "evntrace.h" +#include "netevent.h" #include "wine/test.h" @@ -1316,6 +1317,83 @@ done: DeleteFileA(filepath); } +static void test_eventlog_start(void) +{ + BOOL ret, found; + HANDLE handle, handle2; + EVENTLOGRECORD *record; + DWORD size, read, needed; + WCHAR *sourcename, *computername, *localcomputer; + + size = MAX_COMPUTERNAME_LENGTH + 1; + localcomputer = malloc(size * sizeof(WCHAR)); + GetComputerNameW(localcomputer, &size); + + handle = OpenEventLogW(0, L"System"); + handle2 = OpenEventLogW(0, L"System"); + todo_wine ok(handle != handle2, "Expected different handle\n"); + CloseEventLog(handle2); + + handle2 = OpenEventLogW(0, L"SYSTEM"); + ok(!!handle2, "Expected valid handle\n"); + CloseEventLog(handle2); + + ret = TRUE; + found = FALSE; + while (!found && ret) + { + read = needed = 0; + record = malloc(sizeof(EVENTLOGRECORD)); + if (!(ret = ReadEventLogW(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_BACKWARDS_READ, + 0, record, sizeof(EVENTLOGRECORD), &read, &needed)) && + GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + record = realloc(record, needed); + ret = ReadEventLogW(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_BACKWARDS_READ, + 0, record, needed, &read, &needed); + ok(needed == 0, "Expected 0, got %ld\n", needed); + } + if (ret && record->EventID == EVENT_EventlogStarted) + { + ok(record->Length == read, "Expected %ld, got %ld\n", read, record->Length); + ok(record->Reserved == 0x654c664c, "Expected 0x654c664c, got %ld\n", record->Reserved); + ok(record->RecordNumber > 0, "Expected 1 or higher, got %ld\n", record->RecordNumber); + ok(record->TimeGenerated == record->TimeWritten, "Expected time values to be the same\n"); + ok(record->EventType == EVENTLOG_INFORMATION_TYPE, + "Expected %d, got %d\n", EVENTLOG_INFORMATION_TYPE, record->EventType); + ok(record->NumStrings == 0, "Expected 0, got %d\n", record->NumStrings); + ok(record->EventCategory == 0, "Expected 0, got %d\n", record->EventCategory); + ok(record->ReservedFlags == 0, "Expected 0, got %d\n", record->ReservedFlags); + ok(record->ClosingRecordNumber == 0, "Expected 0, got %ld\n", record->ClosingRecordNumber); + ok(record->StringOffset == record->UserSidOffset, "Expected offsets to be the same\n"); + ok(record->UserSidLength == 0, "Expected 0, got %ld\n", record->UserSidLength); + ok(record->DataLength == 24, "Expected 24, got %ld\n", record->DataLength); + ok(record->DataOffset == record->UserSidOffset, "Expected offsets to be the same\n"); + + sourcename = (WCHAR *)(record + 1); + ok(!lstrcmpW(sourcename, L"EventLog"), + "Expected 'EventLog', got '%ls'\n", sourcename); + + computername = sourcename + sizeof("EventLog"); + ok(!lstrcmpiW(computername, localcomputer), "Expected '%ls', got '%ls'\n", + localcomputer, computername); + + size = sizeof(EVENTLOGRECORD) + sizeof(L"EventLog") + + (lstrlenW(computername) + 1) * sizeof(WCHAR); + size = (size + 7) & ~7; + ok(record->DataOffset == size || + broken(record->DataOffset == size - sizeof(WCHAR)), /* win8 */ + "Expected %ld, got %ld\n", size, record->DataOffset); + + found = TRUE; + } + free(record); + } + todo_wine ok(found, "EventlogStarted event not found\n"); + CloseEventLog(handle); + free(localcomputer); +} + START_TEST(eventlog) { SetLastError(0xdeadbeef); @@ -1349,4 +1427,6 @@ START_TEST(eventlog) /* Trace tests */ test_start_trace(); + + test_eventlog_start(); } diff --git a/include/Makefile.in b/include/Makefile.in index 987e45dffa9..5f61344324d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -561,6 +561,7 @@ SOURCES = \ ndrtypes.h \ netcfgx.idl \ netcon.idl \ + netevent.h \ netfw.idl \ netioapi.h \ netiodef.h \ diff --git a/include/netevent.h b/include/netevent.h new file mode 100644 index 00000000000..d338a9321bb --- /dev/null +++ b/include/netevent.h @@ -0,0 +1,24 @@ +/* + * Copyright 2023 Daniel Lehman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _NETEVENT_ +#define _NETEVENT_ + +#define EVENT_EventlogStarted 0x80001775 + +#endif

1 0

Piotr Caban : gdi32: Add partial support for creating EMREXTCREATEPEN records.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: 59f72abfcf974dd9ad0a87c8c68474f5e47b6c75 URL: https://gitlab.winehq.org/wine/wine/-/commit/59f72abfcf974dd9ad0a87c8c68474… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 5 13:34:28 2023 +0200 gdi32: Add partial support for creating EMREXTCREATEPEN records. --- dlls/gdi32/emfdc.c | 51 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 45938172a37..645592fea0a 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -647,30 +647,45 @@ static BOOL emfdc_select_font( DC_ATTR *dc_attr, HFONT font ) return emfdc_record( emf, &emr.emr ); } -static DWORD emfdc_create_pen( struct emf *emf, HPEN hPen ) +static DWORD emfdc_ext_create_pen( struct emf *emf, HPEN pen ) { - EMRCREATEPEN emr; - DWORD index = 0; + EMREXTCREATEPEN *emr; + int size, emr_size; + DWORD ret = 0; - if (!GetObjectW( hPen, sizeof(emr.lopn), &emr.lopn )) - { - /* must be an extended pen */ - EXTLOGPEN *elp; - INT size = GetObjectW( hPen, 0, NULL ); + if (!(size = GetObjectW( pen, 0, NULL ))) + return 0; + emr_size = sizeof(*emr) - sizeof(emr->elp) + size; + emr = HeapAlloc( GetProcessHeap(), 0, emr_size ); + if (!emr) + return 0; + GetObjectW( pen, size, &emr->elp ); - if (!size) return 0; + if (emr->elp.elpBrushStyle == BS_DIBPATTERN || + emr->elp.elpBrushStyle == BS_DIBPATTERNPT || + emr->elp.elpBrushStyle == BS_PATTERN) + { + FIXME( "elpBrushStyle = %d\n", emr->elp.elpBrushStyle ); + HeapFree( GetProcessHeap(), 0, emr ); + return 0; + } + emr->offBmi = emr->cbBmi = emr->offBits = emr->cbBits = 0; - elp = HeapAlloc( GetProcessHeap(), 0, size ); + emr->emr.iType = EMR_EXTCREATEPEN; + emr->emr.nSize = emr_size; + emr->ihPen = ret = emfdc_add_handle( emf, pen ); + ret = emfdc_record( emf, &emr->emr ) ? ret : 0; + HeapFree( GetProcessHeap(), 0, emr ); + return ret; +} - GetObjectW( hPen, size, elp ); - /* FIXME: add support for user style pens */ - emr.lopn.lopnStyle = elp->elpPenStyle; - emr.lopn.lopnWidth.x = elp->elpWidth; - emr.lopn.lopnWidth.y = 0; - emr.lopn.lopnColor = elp->elpColor; +static DWORD emfdc_create_pen( struct emf *emf, HPEN hPen ) +{ + EMRCREATEPEN emr; + DWORD index = 0; - HeapFree( GetProcessHeap(), 0, elp ); - } + if (!GetObjectW( hPen, sizeof(emr.lopn), &emr.lopn )) + return emfdc_ext_create_pen( emf, hPen ); emr.emr.iType = EMR_CREATEPEN; emr.emr.nSize = sizeof(emr);

1 0

Paul Gofman : ntdll: Map EDESTADDRREQ to STATUS_INVALID_CONNECTION.
by Alexandre Julliard 05 Oct '23

05 Oct '23

Module: wine Branch: master Commit: 4b9a095e841ddb6387797e0fa474a9a6184c1ed5 URL: https://gitlab.winehq.org/wine/wine/-/commit/4b9a095e841ddb6387797e0fa474a9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 27 20:17:13 2023 -0600 ntdll: Map EDESTADDRREQ to STATUS_INVALID_CONNECTION. --- dlls/ntdll/unix/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index e09bf34b07d..3f0ac8cb84e 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -169,7 +169,7 @@ static NTSTATUS sock_errno_to_status( int err ) case EWOULDBLOCK: return STATUS_DEVICE_NOT_READY; case EALREADY: return STATUS_NETWORK_BUSY; case ENOTSOCK: return STATUS_OBJECT_TYPE_MISMATCH; - case EDESTADDRREQ: return STATUS_INVALID_PARAMETER; + case EDESTADDRREQ: return STATUS_INVALID_CONNECTION; case EMSGSIZE: return STATUS_BUFFER_OVERFLOW; case EPROTONOSUPPORT: case ESOCKTNOSUPPORT: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index eddef24048c..fcf4da3851e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -13901,7 +13901,7 @@ static void test_connect_udp(void) SetLastError(0xdeadbeef); ret = send(client, "data", 4, 0); ok(ret == -1, "got %d\n", ret); - todo_wine ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); + ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); SetLastError(0xdeadbeef); ret = recv(server, buffer, sizeof(buffer), 0); @@ -13949,7 +13949,7 @@ static void test_connect_udp(void) SetLastError(0xdeadbeef); ret = send(server, "data", 4, 0); ok(ret == -1, "got %d\n", ret); - todo_wine ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); + ok(GetLastError() == WSAENOTCONN, "got error %lu\n", GetLastError()); ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); ok(!ret, "got error %lu\n", GetLastError());

1 0