January 2020 - Wine-devel - list.winehq.org

[PATCH 1/5] quartz/filesource: Use a completion port to handle asynchronous requests.
by Zebediah Figura 29 Jan '20

29 Jan '20

Thus simplifying the code and allowing us to handle more than 63 at once. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filesource.c | 376 +++++++++++++-------------------- dlls/quartz/tests/filesource.c | 26 ++- 2 files changed, 173 insertions(+), 229 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 8b7a0fde925..7ea67ccc12f 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -46,12 +46,12 @@ static const AM_MEDIA_TYPE default_mt = NULL }; -typedef struct DATAREQUEST +struct request { - IMediaSample *pSample; - DWORD_PTR dwUserData; + IMediaSample *sample; + DWORD_PTR cookie; OVERLAPPED ovl; -} DATAREQUEST; +}; typedef struct AsyncReader { @@ -64,15 +64,12 @@ typedef struct AsyncReader LPOLESTR pszFileName; AM_MEDIA_TYPE *pmt; ALLOCATOR_PROPERTIES allocProps; - HANDLE file; - BOOL flushing; - unsigned int queued_number; - unsigned int samples; - unsigned int oldest_sample; + HANDLE file, port, io_thread; CRITICAL_SECTION sample_cs; - DATAREQUEST *sample_list; - /* Have a handle for every sample, and then one more as flushing handle */ - HANDLE *handle_list; + BOOL flushing; + struct request *requests; + unsigned int max_requests; + CONDITION_VARIABLE sample_cv; } AsyncReader; static const struct strmbase_source_ops source_ops; @@ -352,18 +349,23 @@ static void async_reader_destroy(struct strmbase_filter *iface) IPin_Disconnect(&filter->source.pin.IPin_iface); - CoTaskMemFree(filter->sample_list); - if (filter->handle_list) + if (filter->requests) { - for (i = 0; i <= filter->samples; ++i) - CloseHandle(filter->handle_list[i]); - CoTaskMemFree(filter->handle_list); + for (i = 0; i < filter->max_requests; ++i) + CloseHandle(filter->requests[i].ovl.hEvent); + CoTaskMemFree(filter->requests); } CloseHandle(filter->file); filter->sample_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&filter->sample_cs); strmbase_source_cleanup(&filter->source); } + + PostQueuedCompletionStatus(filter->port, 0, 1, NULL); + WaitForSingleObject(filter->io_thread, INFINITE); + CloseHandle(filter->io_thread); + CloseHandle(filter->port); + CoTaskMemFree(filter->pszFileName); if (filter->pmt) DeleteMediaType(filter->pmt); @@ -392,6 +394,42 @@ static const struct strmbase_filter_ops filter_ops = .filter_query_interface = async_reader_query_interface, }; +static DWORD CALLBACK io_thread(void *arg) +{ + AsyncReader *filter = arg; + struct request *req; + OVERLAPPED *ovl; + ULONG_PTR key; + DWORD size; + BOOL ret; + + for (;;) + { + ret = GetQueuedCompletionStatus(filter->port, &size, &key, &ovl, INFINITE); + + if (ret && key) + break; + + EnterCriticalSection(&filter->sample_cs); + + req = CONTAINING_RECORD(ovl, struct request, ovl); + TRACE("Got sample %u.\n", req - filter->requests); + assert(req >= filter->requests && req < filter->requests + filter->max_requests); + + if (ret) + WakeConditionVariable(&filter->sample_cv); + else + { + ERR("GetQueuedCompletionStatus() returned failure, error %u.\n", GetLastError()); + req->sample = NULL; + } + + LeaveCriticalSection(&filter->sample_cs); + } + + return 0; +} + HRESULT AsyncReader_create(IUnknown *outer, void **out) { AsyncReader *pAsyncRead; @@ -410,6 +448,12 @@ HRESULT AsyncReader_create(IUnknown *outer, void **out) pAsyncRead->pszFileName = NULL; pAsyncRead->pmt = NULL; + InitializeCriticalSection(&pAsyncRead->sample_cs); + pAsyncRead->sample_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FileAsyncReader.sample_cs"); + InitializeConditionVariable(&pAsyncRead->sample_cv); + pAsyncRead->port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); + pAsyncRead->io_thread = CreateThread(NULL, 0, io_thread, pAsyncRead, 0, NULL); + *out = &pAsyncRead->filter.IUnknown_inner; TRACE("-- created at %p\n", pAsyncRead); @@ -470,11 +514,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi This->file = hFile; This->flushing = FALSE; - This->sample_list = NULL; - This->handle_list = NULL; - This->queued_number = 0; - InitializeCriticalSection(&This->sample_cs); - This->sample_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FileAsyncReader.sample_cs"); + This->requests = NULL; if (This->pmt) DeleteMediaType(This->pmt); @@ -705,42 +745,33 @@ static HRESULT WINAPI FileAsyncReader_RequestAllocator(IAsyncReader * iface, IMe done: if (SUCCEEDED(hr)) { - CoTaskMemFree(This->sample_list); - if (This->handle_list) + if (This->requests) { - int x; - for (x = 0; x <= This->samples; ++x) - CloseHandle(This->handle_list[x]); - CoTaskMemFree(This->handle_list); + unsigned int i; + + for (i = 0; i < This->max_requests; ++i) + CloseHandle(This->requests[i].ovl.hEvent); + CoTaskMemFree(This->requests); } - This->samples = pProps->cBuffers; - This->oldest_sample = 0; - TRACE("Samples: %u\n", This->samples); - This->sample_list = CoTaskMemAlloc(sizeof(This->sample_list[0]) * pProps->cBuffers); - This->handle_list = CoTaskMemAlloc(sizeof(HANDLE) * pProps->cBuffers * 2); + This->max_requests = pProps->cBuffers; + TRACE("Maximum request count: %u.\n", This->max_requests); + This->requests = CoTaskMemAlloc(sizeof(This->requests[0]) * pProps->cBuffers); - if (This->sample_list && This->handle_list) + if (This->requests) { int x; - ZeroMemory(This->sample_list, sizeof(This->sample_list[0]) * pProps->cBuffers); - for (x = 0; x < This->samples; ++x) - { - This->sample_list[x].ovl.hEvent = This->handle_list[x] = CreateEventW(NULL, 0, 0, NULL); - if (x + 1 < This->samples) - This->handle_list[This->samples + 1 + x] = This->handle_list[x]; - } - This->handle_list[This->samples] = CreateEventW(NULL, 1, 0, NULL); + ZeroMemory(This->requests, sizeof(This->requests[0]) * pProps->cBuffers); + for (x = 0; x < This->max_requests; ++x) + This->requests[x].ovl.hEvent = CreateEventW(NULL, 0, 0, NULL); This->allocProps = *pProps; } else { hr = E_OUTOFMEMORY; - CoTaskMemFree(This->sample_list); - CoTaskMemFree(This->handle_list); - This->samples = 0; - This->sample_list = NULL; - This->handle_list = NULL; + CoTaskMemFree(This->requests); + This->max_requests = 0; + This->requests = NULL; } } @@ -755,215 +786,107 @@ done: return hr; } -/* we could improve the Request/WaitForNext mechanism by allowing out of order samples. - * however, this would be quite complicated to do and may be a bit error prone */ -static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader * iface, IMediaSample * pSample, DWORD_PTR dwUser) +static HRESULT WINAPI FileAsyncReader_Request(IAsyncReader *iface, IMediaSample *sample, DWORD_PTR cookie) { - AsyncReader *This = impl_from_IAsyncReader(iface); - HRESULT hr = S_OK; - REFERENCE_TIME Start; - REFERENCE_TIME Stop; - LPBYTE pBuffer = NULL; + AsyncReader *filter = impl_from_IAsyncReader(iface); + REFERENCE_TIME start, end; + struct request *req; + unsigned int i; + HRESULT hr; + BYTE *data; - TRACE("%p->(%p, %lx)\n", This, pSample, dwUser); + TRACE("filter %p, sample %p, cookie %#lx.\n", filter, sample, cookie); - if (!pSample) + if (!sample) return E_POINTER; - /* get start and stop positions in bytes */ - if (SUCCEEDED(hr)) - hr = IMediaSample_GetTime(pSample, &Start, &Stop); + if (FAILED(hr = IMediaSample_GetTime(sample, &start, &end))) + return hr; - if (SUCCEEDED(hr)) - hr = IMediaSample_GetPointer(pSample, &pBuffer); + if (FAILED(hr = IMediaSample_GetPointer(sample, &data))) + return hr; - EnterCriticalSection(&This->sample_cs); - if (This->flushing) + EnterCriticalSection(&filter->sample_cs); + if (filter->flushing) { - LeaveCriticalSection(&This->sample_cs); + LeaveCriticalSection(&filter->sample_cs); return VFW_E_WRONG_STATE; } - if (SUCCEEDED(hr)) + for (i = 0; i < filter->max_requests; ++i) { - DWORD dwLength = (DWORD) BYTES_FROM_MEDIATIME(Stop - Start); - DATAREQUEST *pDataRq; - int x; - - /* Try to insert above the waiting sample if possible */ - for (x = This->oldest_sample; x < This->samples; ++x) - { - if (!This->sample_list[x].pSample) - break; - } - - if (x >= This->samples) - for (x = 0; x < This->oldest_sample; ++x) - { - if (!This->sample_list[x].pSample) - break; - } - - /* There must be a sample we have found */ - assert(x < This->samples); - ++This->queued_number; - - pDataRq = This->sample_list + x; - - pDataRq->ovl.u.s.Offset = (DWORD) BYTES_FROM_MEDIATIME(Start); - pDataRq->ovl.u.s.OffsetHigh = (DWORD)(BYTES_FROM_MEDIATIME(Start) >> (sizeof(DWORD) * 8)); - pDataRq->dwUserData = dwUser; - - /* we violate traditional COM rules here by maintaining - * a reference to the sample, but not calling AddRef, but - * that's what MSDN says to do */ - pDataRq->pSample = pSample; + if (!filter->requests[i].sample) + break; + } + assert(i < filter->max_requests); + req = &filter->requests[i]; - /* this is definitely not how it is implemented on Win9x - * as they do not support async reads on files, but it is - * sooo much easier to use this than messing around with threads! - */ - if (!ReadFile(This->file, pBuffer, dwLength, NULL, &pDataRq->ovl)) - hr = HRESULT_FROM_WIN32(GetLastError()); + req->ovl.u.s.Offset = BYTES_FROM_MEDIATIME(start); + req->ovl.u.s.OffsetHigh = BYTES_FROM_MEDIATIME(start) >> 32; + /* No reference is taken. */ - /* ERROR_IO_PENDING is not actually an error since this is what we want! */ - if (hr == HRESULT_FROM_WIN32(ERROR_IO_PENDING)) - hr = S_OK; + if (ReadFile(filter->file, data, BYTES_FROM_MEDIATIME(end - start), NULL, &req->ovl) + || GetLastError() == ERROR_IO_PENDING) + { + hr = S_OK; + req->sample = sample; + req->cookie = cookie; } + else + hr = HRESULT_FROM_WIN32(GetLastError()); - LeaveCriticalSection(&This->sample_cs); - - TRACE("-- %x\n", hr); + LeaveCriticalSection(&filter->sample_cs); return hr; } -static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader * iface, DWORD dwTimeout, IMediaSample ** ppSample, DWORD_PTR * pdwUser) +static HRESULT WINAPI FileAsyncReader_WaitForNext(IAsyncReader *iface, + DWORD timeout, IMediaSample **sample, DWORD_PTR *cookie) { - AsyncReader *This = impl_from_IAsyncReader(iface); - HRESULT hr = S_OK; - DWORD buffer = ~0; - - TRACE("%p->(%u, %p, %p)\n", This, dwTimeout, ppSample, pdwUser); - - *ppSample = NULL; - *pdwUser = 0; + AsyncReader *filter = impl_from_IAsyncReader(iface); + unsigned int i; - EnterCriticalSection(&This->sample_cs); - if (!This->flushing) - { - LONG oldest = This->oldest_sample; + TRACE("filter %p, timeout %u, sample %p, cookie %p.\n", filter, timeout, sample, cookie); - if (!This->queued_number) - { - /* It could be that nothing is queued right now, but that can be fixed */ - WARN("Called without samples in queue and not flushing!!\n"); - } - LeaveCriticalSection(&This->sample_cs); + *sample = NULL; + *cookie = 0; - /* wait for an object to read, or time out */ - buffer = WaitForMultipleObjectsEx(This->samples+1, This->handle_list + oldest, FALSE, dwTimeout, TRUE); + EnterCriticalSection(&filter->sample_cs); - EnterCriticalSection(&This->sample_cs); - if (buffer <= This->samples) + do + { + if (filter->flushing) { - /* Re-scale the buffer back to normal */ - buffer += oldest; - - /* Uh oh, we overshot the flusher handle, renormalize it back to 0..Samples-1 */ - if (buffer > This->samples) - buffer -= This->samples + 1; - assert(buffer <= This->samples); + LeaveCriticalSection(&filter->sample_cs); + return VFW_E_WRONG_STATE; } - if (buffer >= This->samples) + for (i = 0; i < filter->max_requests; ++i) { - if (buffer != This->samples) - { - FIXME("Returned: %u (%08x)\n", buffer, GetLastError()); - hr = VFW_E_TIMEOUT; - } - else - hr = VFW_E_WRONG_STATE; - buffer = ~0; - } - else - --This->queued_number; - } + struct request *req = &filter->requests[i]; + DWORD size; - if (This->flushing && buffer == ~0) - { - for (buffer = 0; buffer < This->samples; ++buffer) - { - if (This->sample_list[buffer].pSample) + if (req->sample && GetOverlappedResult(filter->file, &req->ovl, &size, FALSE)) { - ResetEvent(This->handle_list[buffer]); - break; - } - } - if (buffer == This->samples) - { - assert(!This->queued_number); - hr = VFW_E_TIMEOUT; - } - else - { - --This->queued_number; - hr = S_OK; - } - } - - if (SUCCEEDED(hr)) - { - REFERENCE_TIME rtStart, rtStop; - DATAREQUEST *pDataRq = This->sample_list + buffer; - DWORD dwBytes = 0; - - /* get any errors */ - if (!This->flushing && !GetOverlappedResult(This->file, &pDataRq->ovl, &dwBytes, FALSE)) - hr = HRESULT_FROM_WIN32(GetLastError()); - - /* Return the sample no matter what so it can be destroyed */ - *ppSample = pDataRq->pSample; - *pdwUser = pDataRq->dwUserData; - - if (This->flushing) - hr = VFW_E_WRONG_STATE; - - if (FAILED(hr)) - dwBytes = 0; + REFERENCE_TIME start, end; - /* Set the time on the sample */ - IMediaSample_SetActualDataLength(pDataRq->pSample, dwBytes); + IMediaSample_SetActualDataLength(req->sample, size); + start = MEDIATIME_FROM_BYTES(((ULONGLONG)req->ovl.u.s.OffsetHigh << 32) + req->ovl.u.s.Offset); + end = start + MEDIATIME_FROM_BYTES(size); + IMediaSample_SetTime(req->sample, &start, &end); - rtStart = (DWORD64)pDataRq->ovl.u.s.Offset + ((DWORD64)pDataRq->ovl.u.s.OffsetHigh << 32); - rtStart = MEDIATIME_FROM_BYTES(rtStart); - rtStop = rtStart + MEDIATIME_FROM_BYTES(dwBytes); + *sample = req->sample; + *cookie = req->cookie; + req->sample = NULL; - IMediaSample_SetTime(pDataRq->pSample, &rtStart, &rtStop); - - This->sample_list[buffer].pSample = NULL; - assert(This->oldest_sample < This->samples); - - if (buffer == This->oldest_sample) - { - LONG x; - for (x = This->oldest_sample + 1; x < This->samples; ++x) - if (This->sample_list[x].pSample) - break; - if (x >= This->samples) - for (x = 0; x < This->oldest_sample; ++x) - if (This->sample_list[x].pSample) - break; - if (This->oldest_sample == x) - /* No samples found, reset to 0 */ - x = 0; - This->oldest_sample = x; + LeaveCriticalSection(&filter->sample_cs); + TRACE("Returning sample %u.\n", i); + return S_OK; + } } - } - LeaveCriticalSection(&This->sample_cs); + } while (SleepConditionVariableCS(&filter->sample_cv, &filter->sample_cs, timeout)); - TRACE("-- %x\n", hr); - return hr; + LeaveCriticalSection(&filter->sample_cs); + return VFW_E_TIMEOUT; } static BOOL sync_read(HANDLE file, LONGLONG offset, LONG length, BYTE *buffer, DWORD *read_len) @@ -971,7 +894,7 @@ static BOOL sync_read(HANDLE file, LONGLONG offset, LONG length, BYTE *buffer, D OVERLAPPED ovl = {0}; BOOL ret; - ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + ovl.hEvent = (HANDLE)((ULONG_PTR)CreateEventW(NULL, TRUE, FALSE, NULL) | 1); ovl.u.s.Offset = (DWORD)offset; ovl.u.s.OffsetHigh = offset >> 32; @@ -1062,14 +985,17 @@ static HRESULT WINAPI FileAsyncReader_Length(IAsyncReader *iface, LONGLONG *tota static HRESULT WINAPI FileAsyncReader_BeginFlush(IAsyncReader * iface) { AsyncReader *filter = impl_from_IAsyncReader(iface); + unsigned int i; TRACE("iface %p.\n", iface); EnterCriticalSection(&filter->sample_cs); filter->flushing = TRUE; + for (i = 0; i < filter->max_requests; ++i) + filter->requests[i].sample = NULL; CancelIoEx(filter->file, NULL); - SetEvent(filter->handle_list[filter->samples]); + WakeAllConditionVariable(&filter->sample_cv); LeaveCriticalSection(&filter->sample_cs); @@ -1079,16 +1005,12 @@ static HRESULT WINAPI FileAsyncReader_BeginFlush(IAsyncReader * iface) static HRESULT WINAPI FileAsyncReader_EndFlush(IAsyncReader * iface) { AsyncReader *filter = impl_from_IAsyncReader(iface); - int x; TRACE("iface %p.\n", iface); EnterCriticalSection(&filter->sample_cs); - ResetEvent(filter->handle_list[filter->samples]); filter->flushing = FALSE; - for (x = 0; x < filter->samples; ++x) - assert(!filter->sample_list[x].pSample); LeaveCriticalSection(&filter->sample_cs); diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 918605da6d4..df0db1b3b53 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -916,12 +916,23 @@ static void test_request(IAsyncReader *reader, IMemAllocator *allocator) IMediaSample_Release(sample2); } +static DWORD CALLBACK wait_thread(void *arg) +{ + IAsyncReader *reader = arg; + IMediaSample *sample; + DWORD_PTR cookie; + HRESULT hr = IAsyncReader_WaitForNext(reader, 2000, &sample, &cookie); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + return 0; +} + static void test_flush(IAsyncReader *reader, IMemAllocator *allocator) { REFERENCE_TIME start_time, end_time; IMediaSample *sample, *ret_sample; BYTE buffer[20], *data; DWORD_PTR cookie; + HANDLE thread; HRESULT hr; int i; @@ -973,12 +984,23 @@ static void test_flush(IAsyncReader *reader, IMemAllocator *allocator) for (i = 0; i < 512; i++) ok(data[i] == i % 111, "Got wrong byte %02x at %u.\n", data[i], i); + thread = CreateThread(NULL, 0, wait_thread, reader, 0, NULL); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Expected timeout.\n"); + + hr = IAsyncReader_BeginFlush(reader); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!WaitForSingleObject(thread, 1000), "Wait timed out.\n"); + CloseHandle(thread); + + hr = IAsyncReader_EndFlush(reader); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSample_Release(sample); } static void test_async_reader(void) { - ALLOCATOR_PROPERTIES req_props = {2, 1024, 512, 0}, ret_props; + ALLOCATOR_PROPERTIES req_props = {100, 1024, 512, 0}, ret_props; IBaseFilter *filter = create_file_source(); IFileSourceFilter *filesource; LONGLONG length, available; @@ -1048,7 +1070,7 @@ static void test_async_reader(void) ret_props = req_props; hr = IAsyncReader_RequestAllocator(reader, NULL, &ret_props, &allocator); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(ret_props.cBuffers == 2, "Got %d buffers.\n", ret_props.cBuffers); + ok(ret_props.cBuffers == 100, "Got %d buffers.\n", ret_props.cBuffers); ok(ret_props.cbBuffer == 1024, "Got size %d.\n", ret_props.cbBuffer); ok(ret_props.cbAlign == 512, "Got alignment %d.\n", ret_props.cbAlign); ok(ret_props.cbPrefix == 0, "Got prefix %d.\n", ret_props.cbPrefix); -- 2.25.0

2 5

[PATCH 3/9] jscript: Introduce disp_invoke helper.
by Jacek Caban 29 Jan '20

29 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 162 ++++++++++++++---------------------------- 1 file changed, 55 insertions(+), 107 deletions(-)

2 1

[PATCH] include: Add DBG_REPLY_LATER NTSTATUS code.
by Rémi Bernon 29 Jan '20

29 Jan '20

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/ntstatus.h | 1 + include/winnt.h | 1 + 2 files changed, 2 insertions(+) diff --git a/include/ntstatus.h b/include/ntstatus.h index 682db7a5660..1e46529262b 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -1408,6 +1408,7 @@ #define DBG_EXCEPTION_HANDLED ((NTSTATUS) 0x00010001) #define DBG_CONTINUE ((NTSTATUS) 0x00010002) +#define DBG_REPLY_LATER ((NTSTATUS) 0x40010001) #define DBG_TERMINATE_THREAD ((NTSTATUS) 0x40010003) #define DBG_TERMINATE_PROCESS ((NTSTATUS) 0x40010004) #define DBG_CONTROL_C ((NTSTATUS) 0x40010005) diff --git a/include/winnt.h b/include/winnt.h index 41fb6a82897..adc5d3d686c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -651,6 +651,7 @@ typedef DWORD FLONG; /* status values for ContinueDebugEvent */ #define DBG_EXCEPTION_HANDLED ((DWORD) 0x00010001) #define DBG_CONTINUE ((DWORD) 0x00010002) +#define DBG_REPLY_LATER ((DWORD) 0x40010001) #define DBG_TERMINATE_THREAD ((DWORD) 0x40010003) #define DBG_TERMINATE_PROCESS ((DWORD) 0x40010004) #define DBG_CONTROL_C ((DWORD) 0x40010005) -- 2.25.0

1 0

[PATCH 1/5] ole32: Implement custom marshalling for pointer monikers.
by Nikolay Sivov 29 Jan '20

29 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/pointermoniker.c | 129 ++++++++++++++++++++++++++++++++++-- dlls/ole32/tests/moniker.c | 38 ++++++++++- 2 files changed, 160 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index c1a0e2ae1c..2cb0600336 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -37,13 +37,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); /* PointerMoniker data structure */ -typedef struct PointerMonikerImpl{ - +typedef struct PointerMonikerImpl +{ IMoniker IMoniker_iface; + IMarshal IMarshal_iface; LONG ref; /* reference counter for this object */ - IUnknown *pObject; /* custom marshaler */ + IUnknown *pObject; } PointerMonikerImpl; static inline PointerMonikerImpl *impl_from_IMoniker(IMoniker *iface) @@ -51,6 +52,11 @@ static inline PointerMonikerImpl *impl_from_IMoniker(IMoniker *iface) return CONTAINING_RECORD(iface, PointerMonikerImpl, IMoniker_iface); } +static PointerMonikerImpl *impl_from_IMarshal(IMarshal *iface) +{ + return CONTAINING_RECORD(iface, PointerMonikerImpl, IMarshal_iface); +} + static PointerMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface); static HRESULT WINAPI PointerMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) @@ -70,7 +76,11 @@ PointerMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) IsEqualIID(&IID_IPersist, riid) || IsEqualIID(&IID_IPersistStream, riid) || IsEqualIID(&IID_IMoniker, riid)) + { *ppvObject = iface; + } + else if (IsEqualIID(&IID_IMarshal, riid)) + *ppvObject = &This->IMarshal_iface; /* Check that we obtained an interface.*/ if ((*ppvObject)==0) @@ -542,6 +552,117 @@ static PointerMonikerImpl *unsafe_impl_from_IMoniker(IMoniker *iface) return CONTAINING_RECORD(iface, PointerMonikerImpl, IMoniker_iface); } +static HRESULT WINAPI pointer_moniker_marshal_QueryInterface(IMarshal *iface, REFIID riid, LPVOID *ppv) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), ppv); + + return IMoniker_QueryInterface(&moniker->IMoniker_iface, riid, ppv); +} + +static ULONG WINAPI pointer_moniker_marshal_AddRef(IMarshal *iface) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + + TRACE("%p.\n",iface); + + return IMoniker_AddRef(&moniker->IMoniker_iface); +} + +static ULONG WINAPI pointer_moniker_marshal_Release(IMarshal *iface) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + + TRACE("%p.\n",iface); + + return IMoniker_Release(&moniker->IMoniker_iface); +} + +static HRESULT WINAPI pointer_moniker_marshal_GetUnmarshalClass(IMarshal *iface, REFIID riid, void *pv, + DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *clsid) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + + TRACE("%p, %s, %p, %x, %p, %x, %p.\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext, + mshlflags, clsid); + + return IMoniker_GetClassID(&moniker->IMoniker_iface, clsid); +} + +static HRESULT WINAPI pointer_moniker_marshal_GetMarshalSizeMax(IMarshal *iface, REFIID riid, void *pv, + DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, DWORD *size) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + + TRACE("%p, %s, %p, %d, %p, %#x, %p.\n", iface, debugstr_guid(riid), pv, dwDestContext, pvDestContext, + mshlflags, size); + + return CoGetMarshalSizeMax(size, &IID_IUnknown, moniker->pObject, dwDestContext, pvDestContext, mshlflags); +} + +static HRESULT WINAPI pointer_moniker_marshal_MarshalInterface(IMarshal *iface, IStream *stream, REFIID riid, + void *pv, DWORD dwDestContext, void *pvDestContext, DWORD mshlflags) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + + TRACE("%p, %s, %p, %x, %p, %x.\n", stream, debugstr_guid(riid), pv, + dwDestContext, pvDestContext, mshlflags); + + return CoMarshalInterface(stream, &IID_IUnknown, moniker->pObject, dwDestContext, + pvDestContext, mshlflags); +} + +static HRESULT WINAPI pointer_moniker_marshal_UnmarshalInterface(IMarshal *iface, IStream *stream, + REFIID riid, void **ppv) +{ + PointerMonikerImpl *moniker = impl_from_IMarshal(iface); + IUnknown *object; + HRESULT hr; + + TRACE("%p, %p, %s, %p.\n", iface, stream, debugstr_guid(riid), ppv); + + hr = CoUnmarshalInterface(stream, &IID_IUnknown, (void **)&object); + if (FAILED(hr)) + { + ERR("Couldn't unmarshal moniker, hr = %#x.\n", hr); + return hr; + } + + if (moniker->pObject) + IUnknown_Release(moniker->pObject); + moniker->pObject = object; + + return IMoniker_QueryInterface(&moniker->IMoniker_iface, riid, ppv); +} + +static HRESULT WINAPI pointer_moniker_marshal_ReleaseMarshalData(IMarshal *iface, IStream *stream) +{ + TRACE("%p, %p.\n", iface, stream); + + return S_OK; +} + +static HRESULT WINAPI pointer_moniker_marshal_DisconnectObject(IMarshal *iface, DWORD reserved) +{ + TRACE("%p, %#x.\n", iface, reserved); + + return S_OK; +} + +static const IMarshalVtbl pointer_moniker_marshal_vtbl = +{ + pointer_moniker_marshal_QueryInterface, + pointer_moniker_marshal_AddRef, + pointer_moniker_marshal_Release, + pointer_moniker_marshal_GetUnmarshalClass, + pointer_moniker_marshal_GetMarshalSizeMax, + pointer_moniker_marshal_MarshalInterface, + pointer_moniker_marshal_UnmarshalInterface, + pointer_moniker_marshal_ReleaseMarshalData, + pointer_moniker_marshal_DisconnectObject +}; + /****************************************************************************** * PointerMoniker_Construct (local function) *******************************************************************************/ @@ -549,8 +670,8 @@ static void PointerMonikerImpl_Construct(PointerMonikerImpl* This, IUnknown *pun { TRACE("(%p)\n",This); - /* Initialize the virtual function table. */ This->IMoniker_iface.lpVtbl = &VT_PointerMonikerImpl; + This->IMarshal_iface.lpVtbl = &pointer_moniker_marshal_vtbl; This->ref = 1; if (punk) IUnknown_AddRef(punk); diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 231551b244..0e6f2677c5 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2722,16 +2722,18 @@ todo_wine static void test_pointer_moniker(void) { IMoniker *moniker, *moniker2, *prefix, *inverse; + DWORD moniker_type, hash, size; IEnumMoniker *enummoniker; HRESULT hr; - DWORD moniker_type; - DWORD hash; IBindCtx *bindctx; FILETIME filetime; IUnknown *unknown; IStream *stream; IROTData *rotdata; LPOLESTR display_name; + IMarshal *marshal; + LARGE_INTEGER pos; + CLSID clsid; cLocks = 0; @@ -2750,6 +2752,35 @@ todo_wine IUnknown_Release(unknown); } + hr = IMoniker_QueryInterface(moniker, &IID_IMarshal, (void **)&marshal); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + hr = IMarshal_GetUnmarshalClass(marshal, NULL, NULL, 0, NULL, 0, &clsid); + ok(hr == S_OK, "Failed to get class, hr %#x.\n", hr); + ok(IsEqualGUID(&clsid, &CLSID_PointerMoniker), "Unexpected class.\n"); + + hr = IMarshal_GetMarshalSizeMax(marshal, &IID_IMoniker, NULL, CLSCTX_INPROC, NULL, 0, &size); + ok(hr == S_OK, "Failed to get marshal size, hr %#x.\n", hr); + ok(size > 0, "Unexpected size %d.\n", size); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + + hr = CoMarshalInterface(stream, &IID_IMoniker, (IUnknown *)moniker, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok(hr == S_OK, "Failed to marshal moniker, hr %#x.\n", hr); + + pos.QuadPart = 0; + IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(stream, &IID_IMoniker, (void **)&moniker2); + ok(hr == S_OK, "Failed to unmarshal, hr %#x.\n", hr); + hr = IMoniker_IsEqual(moniker, moniker2); + ok(hr == S_OK, "Expected equal moniker, hr %#x.\n", hr); + IMoniker_Release(moniker2); + + IStream_Release(stream); + + IMarshal_Release(marshal); + ok_more_than_one_lock(); /* Display Name */ @@ -2821,7 +2852,8 @@ todo_wine IMoniker_Release(moniker); - ok_no_locks(); +todo_wine + ok(cLocks == 0, "Number of locks should be 0, but actually is %d.\n", cLocks); hr = CreatePointerMoniker(NULL, &moniker); ok_ole_success(hr, CreatePointerMoniker); -- 2.24.1

2 5

[PATCH] msvcrt/tests: Be more explicit about unsupported sscanf("%hhd").
by Serge Gautherie 29 Jan '20

29 Jan '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/msvcrt/tests/scanf.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 57d9cc0..179eff7 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -207,9 +207,16 @@ static void test_sscanf( void ) result = 0xdeadbeef; strcpy(buffer,"12345678"); + ret = p_sscanf(buffer, "%d", &result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + /* int */ + ok(result == 0x00bc614e, "Wrong number read (%08x)\n", result); + + result = 0xdeadbeef; ret = p_sscanf(buffer, "%hd", &result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); - ok(result == 0xdead614e, "Wrong number read (%x)\n", result); + /* int, truncated to short */ + ok(result == 0xdead614e, "Wrong number read (%08x)\n", result); result = 0xdeadbeef; strcpy(buffer,"12345678"); @@ -238,7 +245,8 @@ static void test_sscanf( void ) result = 0xdeadbeef; ret = p_sscanf(buffer, "%hhd", &result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret); - ok(result == 0xbc614e, "Wrong number read (%x)\n", result); + /* int, NOT truncated to char: pseudo-overflow! msvcrt sscanf() does not support 'hh', so ignores it. */ + ok(result == 0x00bc614e, "Wrong number read (%08x)\n", result); strcpy(buffer,"12345678901234"); ret = p_sscanf(buffer, "%lld", &result64); -- 2.10.0.windows.1

2 1

[PATCH 1/2] msvcrt/tests: Avoid using msvcrt.h header.
by Jacek Caban 29 Jan '20

29 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/tests/misc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

2 1

[PATCH v2 1/5] d3dx9/tests: Use Tahoma in all font tests.
by Sven Baars 29 Jan '20

29 Jan '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/d3dx9_36/tests/core.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index fa874a5ef5..75146575be 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -330,13 +330,13 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* D3DXCreateFont */ ref = get_ref((IUnknown*)device); - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); ok(hr == D3D_OK, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3D_OK); check_ref((IUnknown*)device, ref + 1); check_release((IUnknown*)font, 0); check_ref((IUnknown*)device, ref); - hr = D3DXCreateFontA(device, 0, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 0, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); ok(hr == D3D_OK, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3D_OK); ID3DXFont_Release(font); @@ -348,13 +348,13 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(hr == D3D_OK, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3D_OK); ID3DXFont_Release(font); - hr = D3DXCreateFontA(NULL, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(NULL, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); ok(hr == D3DERR_INVALIDCALL, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", NULL); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - hr = D3DXCreateFontA(NULL, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", NULL); + hr = D3DXCreateFontA(NULL, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); @@ -368,7 +368,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) desc.OutputPrecision = OUT_DEFAULT_PRECIS; desc.Quality = DEFAULT_QUALITY; desc.PitchAndFamily = DEFAULT_PITCH; - strcpy(desc.FaceName, "Arial"); + strcpy(desc.FaceName, "Tahoma"); hr = D3DXCreateFontIndirectA(device, &desc, &font); ok(hr == D3D_OK, "D3DXCreateFontIndirect returned %#x, expected %#x\n", hr, D3D_OK); ID3DXFont_Release(font); @@ -384,7 +384,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* ID3DXFont_GetDevice */ - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); if(SUCCEEDED(hr)) { IDirect3DDevice9 *bufdev; @@ -401,7 +401,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* ID3DXFont_GetDesc */ - hr = D3DXCreateFontA(device, 12, 8, FW_BOLD, 2, TRUE, ANSI_CHARSET, OUT_RASTER_PRECIS, ANTIALIASED_QUALITY, VARIABLE_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 8, FW_BOLD, 2, TRUE, ANSI_CHARSET, OUT_RASTER_PRECIS, ANTIALIASED_QUALITY, VARIABLE_PITCH, "Tahoma", &font); if(SUCCEEDED(hr)) { hr = ID3DXFont_GetDescA(font, NULL); ok(hr == D3DERR_INVALIDCALL, "ID3DXFont_GetDevice returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); @@ -418,14 +418,14 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(desc.OutputPrecision == OUT_RASTER_PRECIS, "ID3DXFont_GetDesc returned an output precision of %d, expected %d\n", desc.OutputPrecision, OUT_RASTER_PRECIS); ok(desc.Quality == ANTIALIASED_QUALITY, "ID3DXFont_GetDesc returned font quality %d, expected %d\n", desc.Quality, ANTIALIASED_QUALITY); ok(desc.PitchAndFamily == VARIABLE_PITCH, "ID3DXFont_GetDesc returned pitch and family %d, expected %d\n", desc.PitchAndFamily, VARIABLE_PITCH); - ok(strcmp(desc.FaceName, "Arial") == 0, "ID3DXFont_GetDesc returned facename \"%s\", expected \"%s\"\n", desc.FaceName, "Arial"); + ok(strcmp(desc.FaceName, "Tahoma") == 0, "ID3DXFont_GetDesc returned facename \"%s\", expected \"%s\"\n", desc.FaceName, "Tahoma"); ID3DXFont_Release(font); } else skip("Failed to create a ID3DXFont object\n"); /* ID3DXFont_GetDC + ID3DXFont_GetTextMetrics */ - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); if(SUCCEEDED(hr)) { HDC hdc; @@ -466,7 +466,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* ID3DXFont_PreloadText */ - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); if(SUCCEEDED(hr)) { todo_wine { hr = ID3DXFont_PreloadTextA(font, NULL, -1); @@ -493,7 +493,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* ID3DXFont_GetGlyphData, ID3DXFont_PreloadGlyphs, ID3DXFont_PreloadCharacters */ - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); if(SUCCEEDED(hr)) { char c; HDC hdc; @@ -565,7 +565,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) IDirect3DTexture9 *texture; hr = D3DXCreateFontA(device, tests[i].font_height, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, - OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); if(FAILED(hr)) { skip("Failed to create a ID3DXFont object\n"); continue; -- 2.24.0

2 5

[PATCH v2 1/4] d3dx9/tests: Use Tahoma in all font tests.
by Matteo Bruni 29 Jan '20

29 Jan '20

From: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/tests/core.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index fa874a5ef51..75146575bee 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -330,13 +330,13 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* D3DXCreateFont */ ref = get_ref((IUnknown*)device); - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); ok(hr == D3D_OK, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3D_OK); check_ref((IUnknown*)device, ref + 1); check_release((IUnknown*)font, 0); check_ref((IUnknown*)device, ref); - hr = D3DXCreateFontA(device, 0, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 0, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); ok(hr == D3D_OK, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3D_OK); ID3DXFont_Release(font); @@ -348,13 +348,13 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(hr == D3D_OK, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3D_OK); ID3DXFont_Release(font); - hr = D3DXCreateFontA(NULL, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(NULL, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); ok(hr == D3DERR_INVALIDCALL, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", NULL); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); - hr = D3DXCreateFontA(NULL, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", NULL); + hr = D3DXCreateFontA(NULL, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); @@ -368,7 +368,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) desc.OutputPrecision = OUT_DEFAULT_PRECIS; desc.Quality = DEFAULT_QUALITY; desc.PitchAndFamily = DEFAULT_PITCH; - strcpy(desc.FaceName, "Arial"); + strcpy(desc.FaceName, "Tahoma"); hr = D3DXCreateFontIndirectA(device, &desc, &font); ok(hr == D3D_OK, "D3DXCreateFontIndirect returned %#x, expected %#x\n", hr, D3D_OK); ID3DXFont_Release(font); @@ -384,7 +384,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* ID3DXFont_GetDevice */ - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); if(SUCCEEDED(hr)) { IDirect3DDevice9 *bufdev; @@ -401,7 +401,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* ID3DXFont_GetDesc */ - hr = D3DXCreateFontA(device, 12, 8, FW_BOLD, 2, TRUE, ANSI_CHARSET, OUT_RASTER_PRECIS, ANTIALIASED_QUALITY, VARIABLE_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 8, FW_BOLD, 2, TRUE, ANSI_CHARSET, OUT_RASTER_PRECIS, ANTIALIASED_QUALITY, VARIABLE_PITCH, "Tahoma", &font); if(SUCCEEDED(hr)) { hr = ID3DXFont_GetDescA(font, NULL); ok(hr == D3DERR_INVALIDCALL, "ID3DXFont_GetDevice returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); @@ -418,14 +418,14 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(desc.OutputPrecision == OUT_RASTER_PRECIS, "ID3DXFont_GetDesc returned an output precision of %d, expected %d\n", desc.OutputPrecision, OUT_RASTER_PRECIS); ok(desc.Quality == ANTIALIASED_QUALITY, "ID3DXFont_GetDesc returned font quality %d, expected %d\n", desc.Quality, ANTIALIASED_QUALITY); ok(desc.PitchAndFamily == VARIABLE_PITCH, "ID3DXFont_GetDesc returned pitch and family %d, expected %d\n", desc.PitchAndFamily, VARIABLE_PITCH); - ok(strcmp(desc.FaceName, "Arial") == 0, "ID3DXFont_GetDesc returned facename \"%s\", expected \"%s\"\n", desc.FaceName, "Arial"); + ok(strcmp(desc.FaceName, "Tahoma") == 0, "ID3DXFont_GetDesc returned facename \"%s\", expected \"%s\"\n", desc.FaceName, "Tahoma"); ID3DXFont_Release(font); } else skip("Failed to create a ID3DXFont object\n"); /* ID3DXFont_GetDC + ID3DXFont_GetTextMetrics */ - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); if(SUCCEEDED(hr)) { HDC hdc; @@ -466,7 +466,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* ID3DXFont_PreloadText */ - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); if(SUCCEEDED(hr)) { todo_wine { hr = ID3DXFont_PreloadTextA(font, NULL, -1); @@ -493,7 +493,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) /* ID3DXFont_GetGlyphData, ID3DXFont_PreloadGlyphs, ID3DXFont_PreloadCharacters */ - hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); if(SUCCEEDED(hr)) { char c; HDC hdc; @@ -565,7 +565,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) IDirect3DTexture9 *texture; hr = D3DXCreateFontA(device, tests[i].font_height, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, - OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font); if(FAILED(hr)) { skip("Failed to create a ID3DXFont object\n"); continue; -- 2.24.1

1 3

[PATCH 3/3] msvcrt: Reimplement _set_new_mode function.
by Piotr Caban 29 Jan '20

29 Jan '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/heap.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)

1 0

[PATCH 2/3] msvcrt: Use _callnewh in operator new implementation.
by Piotr Caban 29 Jan '20

29 Jan '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/heap.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-)

1 0