February 2019 - Wine-devel - list.winehq.org

Re: [PATCH] Replace W/A GetModuleHandle cross call
by Fabian Maurer 23 Feb '19

23 Feb '19

Hello Steven, wine-patches is retired, please send patches in future to wine- devel(a)winehq.org. Regarding your patch itself, what's the reason behind this change? Is the other version not shorter? Regards, Fabian Maurer

1 0

[PATCH] crypt32: Correct "Transaction Id" to "Transaction ID".
by Isira Seneviratne 23 Feb '19

23 Feb '19

2 2

[PATCH] po: Update Tamil translation.
by Isira Seneviratne 23 Feb '19

23 Feb '19

1 0

[PATCH 1/5] quartz/filesource: Correctly report short reads from IAsyncReader_SyncRead().
by Zebediah Figura 23 Feb '19

23 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filesource.c | 35 ++++++++++++++++++---------------- dlls/quartz/tests/filesource.c | 2 -- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 6b8bfa3353..11b9712c2c 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1309,34 +1309,37 @@ static HRESULT WINAPI FileAsyncReader_SyncReadAligned(IAsyncReader * iface, IMed return hr; } -static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader * iface, LONGLONG llPosition, LONG lLength, BYTE * pBuffer) +static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader *iface, + LONGLONG offset, LONG length, BYTE *buffer) { OVERLAPPED ovl; - HRESULT hr = S_OK; - FileAsyncReader *This = impl_from_IAsyncReader(iface); + FileAsyncReader *filter = impl_from_IAsyncReader(iface); + DWORD read_len; + HRESULT hr; + BOOL ret; - TRACE("%p->(%s, %d, %p)\n", This, wine_dbgstr_longlong(llPosition), lLength, pBuffer); + TRACE("filter %p, offset %s, length %d, buffer %p.\n", + filter, wine_dbgstr_longlong(offset), length, buffer); ZeroMemory(&ovl, sizeof(ovl)); ovl.hEvent = CreateEventW(NULL, 0, 0, NULL); /* NOTE: llPosition is the actual byte position to start reading from */ - ovl.u.s.Offset = (DWORD) llPosition; - ovl.u.s.OffsetHigh = (DWORD) (llPosition >> (sizeof(DWORD) * 8)); - - if (!ReadFile(This->hFile, pBuffer, lLength, NULL, &ovl)) - hr = HRESULT_FROM_WIN32(GetLastError()); - - if (hr == HRESULT_FROM_WIN32(ERROR_IO_PENDING)) - hr = S_OK; + ovl.u.s.Offset = (DWORD)offset; + ovl.u.s.OffsetHigh = (DWORD)(offset >> (sizeof(DWORD) * 8)); - if (SUCCEEDED(hr)) + ret = ReadFile(filter->hFile, buffer, length, NULL, &ovl); + if (ret || GetLastError() == ERROR_IO_PENDING) { - DWORD dwBytesRead; - - if (!GetOverlappedResult(This->hFile, &ovl, &dwBytesRead, TRUE)) + if (GetOverlappedResult(filter->hFile, &ovl, &read_len, TRUE)) + hr = (read_len == length) ? S_OK : S_FALSE; + else hr = HRESULT_FROM_WIN32(GetLastError()); } + else if (GetLastError() == ERROR_HANDLE_EOF) + hr = S_FALSE; + else + hr = HRESULT_FROM_WIN32(GetLastError()); CloseHandle(ovl.hEvent); diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 7f25596ae3..e13cb05a70 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -722,7 +722,6 @@ static void test_async_reader(void) ok(buffer[i] == (10 + i) % 111, "Got wrong byte %02x at %u.\n", buffer[i], i); hr = IAsyncReader_SyncRead(reader, 590, 20, buffer); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); for (i = 0; i < 10; i++) ok(buffer[i] == (590 + i) % 111, "Got wrong byte %02x at %u.\n", buffer[i], i); @@ -731,7 +730,6 @@ todo_wine memset(buffer, 0xcc, sizeof(buffer)); hr = IAsyncReader_SyncRead(reader, 600, 10, buffer); -todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); ok(buffer[0] == 0xcc, "Got wrong byte %02x.\n", buffer[0]); -- 2.20.1

1 4

[PATCH v2] po: Update Sinhala translation.
by Isira Seneviratne 23 Feb '19

23 Feb '19

1 0

crypt32: Correct "Transaction Id" to "Transaction ID".
by Isira Seneviratne 22 Feb '19

22 Feb '19

1 0

[PATCH v2] wined3d: Remove a redundant adapter_count check (Coverity).
by Sven Baars 22 Feb '19

22 Feb '19

It is already tested that adapter_idx < wined3d->adapter_count before calling device_init, so adapter_count can never be zero. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- v2: >= -> < dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d9d6cf2676..67680ac7f1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5336,7 +5336,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, device->ref = 1; device->wined3d = wined3d; wined3d_incref(device->wined3d); - device->adapter = wined3d->adapter_count ? adapter : NULL; + device->adapter = adapter; device->device_parent = device_parent; list_init(&device->resources); list_init(&device->shaders); -- 2.17.1

2 1

[PATCH] gdiplus: Add support for reading nested metafiles.
by Vincent Povirk 22 Feb '19

22 Feb '19

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/gdiplus/metafile.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 08dde2fec62..1e48d07703b 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1817,6 +1817,39 @@ static GpStatus metafile_deserialize_image(const BYTE *record_data, UINT data_si } break; } + case ImageDataTypeMetafile: + { + EmfPlusMetafile *metafiledata = &data->ImageData.metafile; + + if (data_size <= FIELD_OFFSET(EmfPlusMetafile, MetafileData)) + return InvalidParameter; + data_size -= FIELD_OFFSET(EmfPlusMetafile, MetafileData); + + switch (metafiledata->Type) { + case MetafileTypeEmf: + case MetafileTypeEmfPlusOnly: + case MetafileTypeEmfPlusDual: + { + HENHMETAFILE hemf; + + hemf = SetEnhMetaFileBits(data_size, metafiledata->MetafileData); + + if (!hemf) + return GenericError; + + status = GdipCreateMetafileFromEmf(hemf, TRUE, (GpMetafile**)image); + + if (status != Ok) + DeleteEnhMetaFile(hemf); + + break; + } + default: + FIXME("metafile type %d not supported.\n", metafiledata->Type); + return NotImplemented; + } + break; + } default: FIXME("image type %d not supported.\n", data->Type); return NotImplemented; -- 2.17.1

1 0

[PATCH] advapi32: Add a missing return value check (Coverity).
by Sven Baars 22 Feb '19

22 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/advapi32/security.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 70e2da40e7..07758eeed6 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4123,6 +4123,12 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries, } } + if (status != STATUS_SUCCESS) + { + ret = RtlNtStatusToDosError(status); + goto exit; + } + if (OldAcl) { for (i = 0; ; i++) -- 2.17.1

1 0

[PATCH 2/2] ntdll: Track copy-on-write memory state on i386 and x86_64 architectures.
by Piotr Caban 22 Feb '19

22 Feb '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 12 +++----- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_arm.c | 8 +++++ dlls/ntdll/signal_arm64.c | 8 +++++ dlls/ntdll/signal_i386.c | 51 +++++++++++++++++++++++++++++++ dlls/ntdll/signal_powerpc.c | 8 +++++ dlls/ntdll/signal_x86_64.c | 45 +++++++++++++++++++++++++++ dlls/ntdll/thread.c | 1 + dlls/ntdll/virtual.c | 57 +++++++++++++++++++++++++++-------- 9 files changed, 170 insertions(+), 21 deletions(-)

2 1