October 2017 - Wine-commits

Huw Davies : gdi32: Ignore the alpha channel for blits to DDBs too.
by Alexandre Julliard 06 Oct '17

06 Oct '17

Module: wine Branch: master Commit: de9d2249961bfede25611cf959ac961c513bc772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de9d2249961bfede25611cf95… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 6 13:08:47 2017 +0100 gdi32: Ignore the alpha channel for blits to DDBs too. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 1b057f7..0f21283 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -843,6 +843,7 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, COLORREF oldBackground; COLORREF oldForeground; int oldStretchMode; + DIBSECTION dib; if(widthDest < 0 || heightDest < 0 || widthSrc < 0 || heightSrc < 0) { TRACE("Cannot mirror\n"); @@ -857,9 +858,11 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, if(oldStretchMode == BLACKONWHITE || oldStretchMode == WHITEONBLACK) SetStretchBltMode(hdcSrc, COLORONCOLOR); hdcWork = CreateCompatibleDC(hdcDest); - if (GetObjectType( hdcDest ) != OBJ_MEMDC && GetDeviceCaps( hdcDest, BITSPIXEL ) == 32) + if ((GetObjectType( hdcDest ) != OBJ_MEMDC || + GetObjectW( GetCurrentObject( hdcDest, OBJ_BITMAP ), sizeof(dib), &dib ) == sizeof(BITMAP)) && + GetDeviceCaps( hdcDest, BITSPIXEL ) == 32) { - /* screen DCs are not supposed to have an alpha channel, so use a 24-bpp bitmap as copy */ + /* screen DCs or DDBs are not supposed to have an alpha channel, so use a 24-bpp bitmap as copy */ BITMAPINFO info; info.bmiHeader.biSize = sizeof(info.bmiHeader); info.bmiHeader.biWidth = widthDest;

1 0

Andrew Eikum : wineandroid: Check that Android supports the format in IsFormatSupported.
by Alexandre Julliard 06 Oct '17

06 Oct '17

Module: wine Branch: master Commit: d2f904e07f60c7acba890add4910c9650ad634cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2f904e07f60c7acba890add4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 6 11:20:35 2017 -0500 wineandroid: Check that Android supports the format in IsFormatSupported. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/mmdevdrv.c | 199 +++++++++++++++++++++++++--------------- 1 file changed, 126 insertions(+), 73 deletions(-) diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 84aafb7..c138fb8 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -683,17 +683,112 @@ static HRESULT waveformat_to_pcm(ACImpl *This, const WAVEFORMATEX *fmt, SLAndroi return S_OK; } +static HRESULT try_open_render_device(SLAndroidDataFormat_PCM_EX *pcm, unsigned int num_buffers, SLObjectItf *out) +{ + SLresult sr; + SLDataSource source; + SLDataSink sink; + SLDataLocator_OutputMix loc_outmix; + SLboolean required[2]; + SLInterfaceID iids[2]; + SLDataLocator_AndroidSimpleBufferQueue loc_bq; + SLObjectItf player; + + loc_bq.locatorType = SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE; + loc_bq.numBuffers = num_buffers; + source.pLocator = &loc_bq; + source.pFormat = pcm; + + loc_outmix.locatorType = SL_DATALOCATOR_OUTPUTMIX; + loc_outmix.outputMix = outputmix; + sink.pLocator = &loc_outmix; + sink.pFormat = NULL; + + required[0] = SL_BOOLEAN_TRUE; + iids[0] = *pSL_IID_ANDROIDSIMPLEBUFFERQUEUE; + required[1] = SL_BOOLEAN_TRUE; + iids[1] = *pSL_IID_PLAYBACKRATE; + + sr = SLCALL(engine, CreateAudioPlayer, &player, &source, &sink, + 2, iids, required); + if(sr != SL_RESULT_SUCCESS){ + WARN("CreateAudioPlayer failed: 0x%x\n", sr); + return E_FAIL; + } + + sr = SLCALL(player, Realize, SL_BOOLEAN_FALSE); + if(sr != SL_RESULT_SUCCESS){ + SLCALL_N(player, Destroy); + WARN("Player Realize failed: 0x%x\n", sr); + return E_FAIL; + } + + if(out) + *out = player; + else + SLCALL_N(player, Destroy); + + return S_OK; +} + +static HRESULT try_open_capture_device(SLAndroidDataFormat_PCM_EX *pcm, unsigned int num_buffers, SLObjectItf *out) +{ + SLresult sr; + SLDataSource source; + SLDataSink sink; + SLDataLocator_IODevice loc_mic; + SLboolean required[1]; + SLInterfaceID iids[1]; + SLDataLocator_AndroidSimpleBufferQueue loc_bq; + SLObjectItf recorder; + + loc_mic.locatorType = SL_DATALOCATOR_IODEVICE; + loc_mic.deviceType = SL_IODEVICE_AUDIOINPUT; + loc_mic.deviceID = SL_DEFAULTDEVICEID_AUDIOINPUT; + loc_mic.device = NULL; + source.pLocator = &loc_mic; + source.pFormat = NULL; + + loc_bq.locatorType = SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE; + loc_bq.numBuffers = num_buffers; + sink.pLocator = &loc_bq; + sink.pFormat = pcm; + + required[0] = SL_BOOLEAN_TRUE; + iids[0] = *pSL_IID_ANDROIDSIMPLEBUFFERQUEUE; + + sr = SLCALL(engine, CreateAudioRecorder, &recorder, &source, &sink, + 1, iids, required); + if(sr != SL_RESULT_SUCCESS){ + WARN("CreateAudioRecorder failed: 0x%x\n", sr); + return E_FAIL; + } + + sr = SLCALL(recorder, Realize, SL_BOOLEAN_FALSE); + if(sr != SL_RESULT_SUCCESS){ + SLCALL_N(recorder, Destroy); + WARN("Recorder Realize failed: 0x%x\n", sr); + return E_FAIL; + } + + if(out) + *out = recorder; + else + SLCALL_N(recorder, Destroy); + + return S_OK; +} + static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, REFERENCE_TIME period, const WAVEFORMATEX *fmt, const GUID *sessionguid) { ACImpl *This = impl_from_IAudioClient(iface); - int i; + int i, num_buffers; HRESULT hr; SLresult sr; SLAndroidDataFormat_PCM_EX pcm; - SLDataLocator_AndroidSimpleBufferQueue loc_bq; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); @@ -763,43 +858,13 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return hr; } - if(This->dataflow == eRender){ - SLDataSource source; - SLDataSink sink; - SLDataLocator_OutputMix loc_outmix; - SLboolean required[2]; - SLInterfaceID iids[2]; - - loc_bq.locatorType = SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE; - loc_bq.numBuffers = This->bufsize_frames / This->period_frames; - source.pLocator = &loc_bq; - source.pFormat = &pcm; - - loc_outmix.locatorType = SL_DATALOCATOR_OUTPUTMIX; - loc_outmix.outputMix = outputmix; - sink.pLocator = &loc_outmix; - sink.pFormat = NULL; - - required[0] = SL_BOOLEAN_TRUE; - iids[0] = *pSL_IID_ANDROIDSIMPLEBUFFERQUEUE; - required[1] = SL_BOOLEAN_TRUE; - iids[1] = *pSL_IID_PLAYBACKRATE; - - sr = SLCALL(engine, CreateAudioPlayer, &This->player, &source, &sink, - 2, iids, required); - if(sr != SL_RESULT_SUCCESS){ - WARN("CreateAudioPlayer failed: 0x%x\n", sr); - LeaveCriticalSection(&This->lock); - return E_FAIL; - } + num_buffers = This->bufsize_frames / This->period_frames; - sr = SLCALL(This->player, Realize, SL_BOOLEAN_FALSE); - if(sr != SL_RESULT_SUCCESS){ - SLCALL_N(This->player, Destroy); - This->player = NULL; - WARN("Player Realize failed: 0x%x\n", sr); + if(This->dataflow == eRender){ + hr = try_open_render_device(&pcm, num_buffers, &This->player); + if(FAILED(hr)){ LeaveCriticalSection(&This->lock); - return E_FAIL; + return hr; } sr = SLCALL(This->player, GetInterface, *pSL_IID_ANDROIDSIMPLEBUFFERQUEUE, &This->bufq); @@ -820,42 +885,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return E_FAIL; } }else{ - SLDataSource source; - SLDataSink sink; - SLDataLocator_IODevice loc_mic; - SLboolean required[1]; - SLInterfaceID iids[1]; - - loc_mic.locatorType = SL_DATALOCATOR_IODEVICE; - loc_mic.deviceType = SL_IODEVICE_AUDIOINPUT; - loc_mic.deviceID = SL_DEFAULTDEVICEID_AUDIOINPUT; - loc_mic.device = NULL; - source.pLocator = &loc_mic; - source.pFormat = NULL; - - loc_bq.locatorType = SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE; - loc_bq.numBuffers = This->bufsize_frames / This->period_frames; - sink.pLocator = &loc_bq; - sink.pFormat = &pcm; - - required[0] = SL_BOOLEAN_TRUE; - iids[0] = *pSL_IID_ANDROIDSIMPLEBUFFERQUEUE; - - sr = SLCALL(engine, CreateAudioRecorder, &This->recorder, &source, &sink, - 1, iids, required); - if(sr != SL_RESULT_SUCCESS){ - WARN("CreateAudioRecorder failed: 0x%x\n", sr); + hr = try_open_capture_device(&pcm, num_buffers, &This->recorder); + if(FAILED(hr)){ LeaveCriticalSection(&This->lock); - return E_FAIL; - } - - sr = SLCALL(This->recorder, Realize, SL_BOOLEAN_FALSE); - if(sr != SL_RESULT_SUCCESS){ - SLCALL_N(This->recorder, Destroy); - This->recorder = NULL; - WARN("Recorder Realize failed: 0x%x\n", sr); - LeaveCriticalSection(&This->lock); - return E_FAIL; + return hr; } sr = SLCALL(This->recorder, GetInterface, *pSL_IID_ANDROIDSIMPLEBUFFERQUEUE, &This->bufq); @@ -971,7 +1004,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->initted = TRUE; - TRACE("numBuffers: %u, bufsize: %u, period: %u\n", loc_bq.numBuffers, + TRACE("numBuffers: %u, bufsize: %u, period: %u\n", num_buffers, This->bufsize_frames, This->period_frames); LeaveCriticalSection(&This->lock); @@ -1083,7 +1116,27 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, *outpwfx = NULL; hr = waveformat_to_pcm(This, pwfx, &pcm); + if(SUCCEEDED(hr)){ + if(This->dataflow == eRender){ + hr = try_open_render_device(&pcm, 10, NULL); + }else{ + hr = try_open_capture_device(&pcm, 10, NULL); + } + } + + if(FAILED(hr)){ + if(outpwfx){ + hr = IAudioClient_GetMixFormat(iface, outpwfx); + if(FAILED(hr)) + return hr; + return S_FALSE; + } + + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; + } + TRACE("returning: %08x\n", hr); + return hr; }

1 0

Andrew Eikum : wineandroid: Support 32-bit float audio format.
by Alexandre Julliard 06 Oct '17

06 Oct '17

Module: wine Branch: master Commit: b4c0b77b03d6588efe6ad800e4659e3f017d81bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c0b77b03d6588efe6ad800e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 6 11:20:37 2017 -0500 wineandroid: Support 32-bit float audio format. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/build.gradle.in | 2 +- dlls/wineandroid.drv/mmdevdrv.c | 36 ++++++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/wineandroid.drv/build.gradle.in b/dlls/wineandroid.drv/build.gradle.in index 53633b7..4bd98b9 100644 --- a/dlls/wineandroid.drv/build.gradle.in +++ b/dlls/wineandroid.drv/build.gradle.in @@ -58,7 +58,7 @@ tasks.whenTaskAdded { t -> android { - compileSdkVersion 17 + compileSdkVersion 21 buildToolsVersion "25.0.3" defaultConfig diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index c138fb8..8f428a8 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -649,23 +649,36 @@ static HRESULT get_audio_session(const GUID *sessionguid, static HRESULT waveformat_to_pcm(ACImpl *This, const WAVEFORMATEX *fmt, SLAndroidDataFormat_PCM_EX *pcm) { - /* only support non-float PCM */ - if(fmt->wFormatTag != WAVE_FORMAT_PCM && - !(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&((WAVEFORMATEXTENSIBLE*)fmt)->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) - return AUDCLNT_E_UNSUPPORTED_FORMAT; - - /* TODO: does android only support 16-bit PCM? */ - if(fmt->nSamplesPerSec < 8000 || fmt->nSamplesPerSec > 48000) return AUDCLNT_E_UNSUPPORTED_FORMAT; pcm->formatType = SL_ANDROID_DATAFORMAT_PCM_EX; - pcm->numChannels = fmt->nChannels; + pcm->sampleRate = fmt->nSamplesPerSec * 1000; /* sampleRate is in milli-Hz */ pcm->bitsPerSample = fmt->wBitsPerSample; pcm->containerSize = fmt->wBitsPerSample; + + if(fmt->wFormatTag == WAVE_FORMAT_PCM || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&((WAVEFORMATEXTENSIBLE*)fmt)->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ + if(pcm->bitsPerSample == 8) + pcm->representation = SL_ANDROID_PCM_REPRESENTATION_UNSIGNED_INT; + else if(pcm->bitsPerSample == 16) + pcm->representation = SL_ANDROID_PCM_REPRESENTATION_SIGNED_INT; + else + return AUDCLNT_E_UNSUPPORTED_FORMAT; + }else if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&((WAVEFORMATEXTENSIBLE*)fmt)->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ + if(pcm->bitsPerSample == 32) + pcm->representation = SL_ANDROID_PCM_REPRESENTATION_FLOAT; + else + return AUDCLNT_E_UNSUPPORTED_FORMAT; + }else + return AUDCLNT_E_UNSUPPORTED_FORMAT; + /* only up to stereo */ + pcm->numChannels = fmt->nChannels; if(pcm->numChannels == 1) pcm->channelMask = SL_SPEAKER_FRONT_CENTER; else if(This->dataflow == eRender && pcm->numChannels == 2) @@ -675,11 +688,6 @@ static HRESULT waveformat_to_pcm(ACImpl *This, const WAVEFORMATEX *fmt, SLAndroi pcm->endianness = SL_BYTEORDER_LITTLEENDIAN; - if(pcm->bitsPerSample == 8) - pcm->representation = SL_ANDROID_PCM_REPRESENTATION_UNSIGNED_INT; - else - pcm->representation = SL_ANDROID_PCM_REPRESENTATION_SIGNED_INT; - return S_OK; }

1 0

Nikolay Sivov : dwrite: Implement IDWriteInMemoryFontFileLoader.
by Alexandre Julliard 06 Oct '17

06 Oct '17

Module: wine Branch: master Commit: fb8226f639093a3fef41f7273fa0089246d1dfa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb8226f639093a3fef41f7273… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 6 12:45:20 2017 +0300 dwrite: Implement IDWriteInMemoryFontFileLoader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 317 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 4 +- dlls/dwrite/tests/font.c | 116 ++++++++++++++-- 4 files changed, 421 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb8226f639093a3fef41f…

1 0

Nikolay Sivov : dwrite/tests: Some more tests for in-memory loader.
by Alexandre Julliard 05 Oct '17

05 Oct '17

Module: wine Branch: master Commit: 4236c47023d335e6cf001eeb4789f84347ee6186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4236c47023d335e6cf001eeb4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 5 13:00:00 2017 +0300 dwrite/tests: Some more tests for in-memory loader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 99 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 84 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 62d5884..a57806a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7591,12 +7591,60 @@ static void test_object_lifetime(void) ok(ref == 0, "factory not released, %u\n", ref); } +struct testowner_object +{ + IUnknown IUnknown_iface; + LONG ref; +}; + +static inline struct testowner_object *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct testowner_object, IUnknown_iface); +} + +static HRESULT WINAPI testowner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown)) { + *obj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI testowner_AddRef(IUnknown *iface) +{ + struct testowner_object *object = impl_from_IUnknown(iface); + return InterlockedIncrement(&object->ref); +} + +static ULONG WINAPI testowner_Release(IUnknown *iface) +{ + struct testowner_object *object = impl_from_IUnknown(iface); + return InterlockedDecrement(&object->ref); +} + +static const IUnknownVtbl testownervtbl = { + testowner_QueryInterface, + testowner_AddRef, + testowner_Release, +}; + +static void testowner_init(struct testowner_object *object) +{ + object->IUnknown_iface.lpVtbl = &testownervtbl; + object->ref = 1; +} + static void test_inmemory_file_loader(void) { + IDWriteFontFileStream *stream, *stream2, *stream3; IDWriteFontFileLoader *loader, *loader2; IDWriteInMemoryFontFileLoader *inmemory; + struct testowner_object ownerobject; IDWriteFontFile *file, *file2; - IDWriteFontFileStream *stream; IDWriteFontFace *fontface; IDWriteFactory5 *factory5; IDWriteFactory *factory; @@ -7616,15 +7664,18 @@ static void test_inmemory_file_loader(void) return; } + EXPECT_REF(factory5, 1); hr = IDWriteFactory5_CreateInMemoryFontFileLoader(factory5, &loader); todo_wine ok(hr == S_OK, "got %#x\n", hr); + EXPECT_REF(factory5, 1); if (FAILED(hr)) { IDWriteFactory5_Release(factory5); return; } + testowner_init(&ownerobject); fontface = create_fontface((IDWriteFactory *)factory5); hr = IDWriteFactory5_CreateInMemoryFontFileLoader(factory5, &loader2); @@ -7635,6 +7686,7 @@ todo_wine hr = IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteInMemoryFontFileLoader, (void **)&inmemory); ok(hr == S_OK, "got %#x\n", hr); IDWriteFontFileLoader_Release(loader); + EXPECT_REF(inmemory, 1); /* Use whole font blob to construct in-memory file. */ count = 1; @@ -7658,21 +7710,28 @@ todo_wine hr = IDWriteFontFileStream_ReadFileFragment(stream, &data, 0, file_size, &context); ok(hr == S_OK, "got %#x\n", hr); + /* Not registered yet. */ hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory5, data, file_size, NULL, &file); ok(hr == E_INVALIDARG, "got %#x\n", hr); hr = IDWriteFactory5_RegisterFontFileLoader(factory5, (IDWriteFontFileLoader *)inmemory); ok(hr == S_OK, "got %#x\n", hr); + EXPECT_REF(inmemory, 2); + EXPECT_REF(&ownerobject.IUnknown_iface, 1); hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory5, data, - file_size, NULL, &file); + file_size, &ownerobject.IUnknown_iface, &file); ok(hr == S_OK, "got %#x\n", hr); + EXPECT_REF(&ownerobject.IUnknown_iface, 2); + EXPECT_REF(inmemory, 3); hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory5, data, - file_size, NULL, &file2); + file_size, &ownerobject.IUnknown_iface, &file2); ok(hr == S_OK, "got %#x\n", hr); ok(file2 != file, "got unexpected file\n"); + EXPECT_REF(&ownerobject.IUnknown_iface, 3); + EXPECT_REF(inmemory, 4); /* Check in-memory reference key format. */ hr = IDWriteFontFile_GetReferenceKey(file, &key, &key_size); @@ -7687,32 +7746,42 @@ todo_wine ok(key && *(DWORD*)key == 2, "got wrong ref key\n"); ok(key_size == 4, "ref key size %u\n", key_size); - /* Release file and index 1, create new one to see if index is reused. */ - IDWriteFontFile_Release(file); + EXPECT_REF(inmemory, 4); + hr = IDWriteInMemoryFontFileLoader_CreateStreamFromKey(inmemory, key, key_size, &stream2); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + EXPECT_REF(stream2, 1); + EXPECT_REF(inmemory, 4); - hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory5, data, - file_size, NULL, &file); - ok(hr == S_OK, "got %#x\n", hr); - ok(file2 != file, "got unexpected file\n"); + hr = IDWriteInMemoryFontFileLoader_CreateStreamFromKey(inmemory, key, key_size, &stream3); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); - hr = IDWriteFontFile_GetReferenceKey(file, &key, &key_size); - ok(hr == S_OK, "got %#x\n", hr); + ok(stream2 != stream3, "Unexpected stream.\n"); - ok(key && *(DWORD*)key == 3, "got wrong ref key\n"); - ok(key_size == 4, "ref key size %u\n", key_size); + IDWriteFontFileStream_Release(stream2); + IDWriteFontFileStream_Release(stream3); + /* Release file at index 1, create new one to see if index is reused. */ + EXPECT_REF(&ownerobject.IUnknown_iface, 3); IDWriteFontFile_Release(file); + EXPECT_REF(&ownerobject.IUnknown_iface, 3); + + EXPECT_REF(&ownerobject.IUnknown_iface, 3); IDWriteFontFile_Release(file2); + EXPECT_REF(&ownerobject.IUnknown_iface, 3); hr = IDWriteFactory5_UnregisterFontFileLoader(factory5, (IDWriteFontFileLoader *)inmemory); ok(hr == S_OK, "got %#x\n", hr); + EXPECT_REF(&ownerobject.IUnknown_iface, 3); IDWriteFontFileStream_ReleaseFileFragment(stream, context); IDWriteFontFileStream_Release(stream); + IDWriteFontFace_Release(fontface); - IDWriteInMemoryFontFileLoader_Release(inmemory); + EXPECT_REF(&ownerobject.IUnknown_iface, 3); + ref = IDWriteInMemoryFontFileLoader_Release(inmemory); + ok(ref == 0, "loader not released, %u.\n", ref); + EXPECT_REF(&ownerobject.IUnknown_iface, 1); - IDWriteFontFace_Release(fontface); ref = IDWriteFactory5_Release(factory5); ok(ref == 0, "factory not released, %u\n", ref); }

1 0

Hugh McMaster : reg/tests: Test the importing of hex values with no data.
by Alexandre Julliard 05 Oct '17

05 Oct '17

Module: wine Branch: master Commit: 4a6fb941e5934e7f696b27962de7f446ac1df635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6fb941e5934e7f696b27962… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Oct 5 11:53:23 2017 +0000 reg/tests: Test the importing of hex values with no data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 7a70ebf..e93062b 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -78,8 +78,11 @@ static void verify_reg_(unsigned line, HKEY hkey, const char* value, lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type); todo_wine_if (todo & TODO_REG_SIZE) lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size); - todo_wine_if (todo & TODO_REG_DATA) - lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); + if (exp_data) + { + todo_wine_if (todo & TODO_REG_DATA) + lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); + } } #define verify_reg_nonexist(k,v) verify_reg_nonexist_(__LINE__,k,v) @@ -2343,6 +2346,24 @@ static void test_import(void) verify_reg(hkey, "Wine67c", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg(hkey, "Wine67d", REG_EXPAND_SZ, "%PATH%", 7, 0); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine68a\"=hex(1):\n" + "\"Wine68b\"=hex(2):\n" + "\"Wine68c\"=hex(3):\n" + "\"Wine68d\"=hex(4):\n" + "\"Wine68e\"=hex(7):\n" + "\"Wine68f\"=hex(100):\n" + "\"Wine68g\"=hex(abcd):\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine68a", REG_SZ, NULL, 0, 0); + verify_reg(hkey, "Wine68b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); + verify_reg(hkey, "Wine68c", REG_BINARY, NULL, 0, 0); + verify_reg(hkey, "Wine68d", REG_DWORD, NULL, 0, 0); + verify_reg(hkey, "Wine68e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); + verify_reg(hkey, "Wine68f", 0x100, NULL, 0, 0); + verify_reg(hkey, "Wine68g", 0xabcd, NULL, 0, 0); + err = RegCloseKey(hkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3823,6 +3844,24 @@ static void test_unicode_import(void) verify_reg(hkey, "Wine67c", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg(hkey, "Wine67d", REG_EXPAND_SZ, "%PATH%", 7, 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine68a\"=hex(1):\n" + "\"Wine68b\"=hex(2):\n" + "\"Wine68c\"=hex(3):\n" + "\"Wine68d\"=hex(4):\n" + "\"Wine68e\"=hex(7):\n" + "\"Wine68f\"=hex(100):\n" + "\"Wine68g\"=hex(abcd):\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine68a", REG_SZ, NULL, 0, 0); + verify_reg(hkey, "Wine68b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); + verify_reg(hkey, "Wine68c", REG_BINARY, NULL, 0, 0); + verify_reg(hkey, "Wine68d", REG_DWORD, NULL, 0, 0); + verify_reg(hkey, "Wine68e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); + verify_reg(hkey, "Wine68f", 0x100, NULL, 0, 0); + verify_reg(hkey, "Wine68g", 0xabcd, NULL, 0, 0); + err = RegCloseKey(hkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : regedit/tests: Test the importing of hex values with no data.
by Alexandre Julliard 05 Oct '17

05 Oct '17

Module: wine Branch: master Commit: 52f686e05478d22a3488efd755223ed8560feaa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52f686e05478d22a3488efd75… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Oct 5 11:53:23 2017 +0000 regedit/tests: Test the importing of hex values with no data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 41 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index f97134e..79640a5 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -126,8 +126,11 @@ static void verify_reg_(unsigned line, HKEY hkey, const char *value, lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type); todo_wine_if (todo & TODO_REG_SIZE) lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size); - todo_wine_if (todo & TODO_REG_DATA) - lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); + if (exp_data) + { + todo_wine_if (todo & TODO_REG_DATA) + lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); + } } #define verify_reg_nonexist(k,n) r_verify_reg_nonexist(__LINE__,k,n) @@ -641,6 +644,23 @@ static void test_basic_import(void) verify_reg(hkey, "Wine21c", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg(hkey, "Wine21d", REG_EXPAND_SZ, "%PATH%", 7, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine22a\"=hex(1):\n" + "\"Wine22b\"=hex(2):\n" + "\"Wine22c\"=hex(3):\n" + "\"Wine22d\"=hex(4):\n" + "\"Wine22e\"=hex(7):\n" + "\"Wine22f\"=hex(100):\n" + "\"Wine22g\"=hex(abcd):\n\n"); + verify_reg(hkey, "Wine22a", REG_SZ, NULL, 0, 0); + verify_reg(hkey, "Wine22b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); + verify_reg(hkey, "Wine22c", REG_BINARY, NULL, 0, 0); + verify_reg(hkey, "Wine22d", REG_DWORD, NULL, 0, 0); + verify_reg(hkey, "Wine22e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); + verify_reg(hkey, "Wine22f", 0x100, NULL, 0, 0); + verify_reg(hkey, "Wine22g", 0xabcd, NULL, 0, 0); + RegCloseKey(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -1038,6 +1058,23 @@ static void test_basic_import_unicode(void) verify_reg(hkey, "Wine21c", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg(hkey, "Wine21d", REG_EXPAND_SZ, "%PATH%", 7, 0); + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine22a\"=hex(1):\n" + "\"Wine22b\"=hex(2):\n" + "\"Wine22c\"=hex(3):\n" + "\"Wine22d\"=hex(4):\n" + "\"Wine22e\"=hex(7):\n" + "\"Wine22f\"=hex(100):\n" + "\"Wine22g\"=hex(abcd):\n\n"); + verify_reg(hkey, "Wine22a", REG_SZ, NULL, 0, 0); + verify_reg(hkey, "Wine22b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE); + verify_reg(hkey, "Wine22c", REG_BINARY, NULL, 0, 0); + verify_reg(hkey, "Wine22d", REG_DWORD, NULL, 0, 0); + verify_reg(hkey, "Wine22e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE); + verify_reg(hkey, "Wine22f", 0x100, NULL, 0, 0); + verify_reg(hkey, "Wine22g", 0xabcd, NULL, 0, 0); + RegCloseKey(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE);

1 0

Huw Davies : ole32: In the non-aggregated case a request for IUnknown actually returns IOleCache2.
by Alexandre Julliard 05 Oct '17

05 Oct '17

Module: wine Branch: master Commit: 87ccecbfa24e88d80c292d165b3223683b409bfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=87ccecbfa24e88d80c292d165… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 5 13:11:06 2017 +0100 ole32: In the non-aggregated case a request for IUnknown actually returns IOleCache2. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 5 ++++- dlls/ole32/tests/ole2.c | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index a95d0fb..808c2dc 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1123,7 +1123,10 @@ static HRESULT WINAPI DataCache_NDIUnknown_QueryInterface( if (IsEqualIID(&IID_IUnknown, riid)) { - *ppvObject = iface; + if (this->outer_unk == iface) /* non-aggregated, return IUnknown from IOleCache2 */ + *ppvObject = &this->IOleCache2_iface; + else + *ppvObject = iface; } else if (IsEqualIID(&IID_IDataObject, riid)) { diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index b30f63b..1e5ca65 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1560,7 +1560,7 @@ static void test_data_cache(void) IOleCache2 *pOleCache; IOleCache *olecache; IStorage *pStorage; - IUnknown *unk; + IUnknown *unk, *unk2; IPersistStorage *pPS; IViewObject *pViewObject; IOleCacheControl *pOleCacheControl; @@ -1651,10 +1651,12 @@ static void test_data_cache(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IUnknown_QueryInterface(unk, &IID_IOleCache2, (void**)&pOleCache); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void**)&unk2); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(unk == (IUnknown*)olecache, "got %p, expected %p\n", olecache, unk); ok(unk == (IUnknown*)pOleCache, "got %p, expected %p\n", pOleCache, unk); -} + ok(unk == unk2, "got %p, expected %p\n", unk2, unk); + IUnknown_Release(unk2); IOleCache2_Release(pOleCache); IOleCache_Release(olecache); IUnknown_Release(unk);

1 0

Jacek Caban : server: Get rid of no longer used support for queuing client side asyncs on named pipes.
by Alexandre Julliard 05 Oct '17

05 Oct '17

Module: wine Branch: master Commit: 2659a796f77d17d8026bb60890c1b48c0120c16a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2659a796f77d17d8026bb6089… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 5 14:29:54 2017 +0200 server: Get rid of no longer used support for queuing client side asyncs on named pipes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 6f5b3b0..a6a0318 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -146,7 +146,6 @@ static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ); static int pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t pos ); static int pipe_end_flush( struct fd *fd, struct async *async ); static void pipe_end_get_volume_info( struct fd *fd, unsigned int info_class ); -static void pipe_end_queue_async( struct fd *fd, struct async *async, int type, int count ); static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); /* server end functions */ @@ -187,7 +186,7 @@ static const struct fd_ops pipe_server_fd_ops = pipe_end_flush, /* flush */ pipe_end_get_volume_info, /* get_volume_info */ pipe_server_ioctl, /* ioctl */ - pipe_end_queue_async, /* queue_async */ + no_fd_queue_async, /* queue_async */ pipe_end_reselect_async /* reselect_async */ }; @@ -230,7 +229,7 @@ static const struct fd_ops pipe_client_fd_ops = pipe_end_flush, /* flush */ pipe_end_get_volume_info, /* get_volume_info */ pipe_client_ioctl, /* ioctl */ - pipe_end_queue_async, /* queue_async */ + no_fd_queue_async, /* queue_async */ pipe_end_reselect_async /* reselect_async */ }; @@ -787,13 +786,6 @@ static int pipe_end_write( struct fd *fd, struct async *async, file_pos_t pos ) return 1; } -static void pipe_end_queue_async( struct fd *fd, struct async *async, int type, int count ) -{ - struct pipe_end *pipe_end = get_fd_user( fd ); - if (use_server_io( pipe_end )) no_fd_queue_async( fd, async, type, count ); - else default_fd_queue_async( fd, async, type, count ); -} - static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ) { struct pipe_end *pipe_end = get_fd_user( fd );

1 0

Jacek Caban : server: Get rid of no longer needed use_server_io.
by Alexandre Julliard 05 Oct '17

05 Oct '17

Module: wine Branch: master Commit: d520f30b4deacf62ad5aac8563f550311c520f90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d520f30b4deacf62ad5aac856… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 5 14:30:12 2017 +0200 server: Get rid of no longer needed use_server_io. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 52 +++++++++++++--------------------------------------- 1 file changed, 13 insertions(+), 39 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index a6a0318..b5738ad 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -280,13 +280,6 @@ static const struct fd_ops named_pipe_device_fd_ops = default_fd_reselect_async /* reselect_async */ }; -/* Returns if we handle I/O via server calls. - * FIXME: no longer needed. */ -static int use_server_io( struct pipe_end *pipe_end ) -{ - return 1; -} - static void named_pipe_dump( struct object *obj, int verbose ) { fputs( "Named pipe\n", stderr ); @@ -394,25 +387,23 @@ static void free_message( struct pipe_message *message ) static void pipe_end_disconnect( struct pipe_end *pipe_end, unsigned int status ) { struct pipe_end *connection = pipe_end->connection; + struct pipe_message *message, *next; + struct async *async; pipe_end->connection = NULL; - if (use_server_io( pipe_end )) + if (pipe_end->fd) fd_async_wake_up( pipe_end->fd, ASYNC_TYPE_WAIT, status ); + async_wake_up( &pipe_end->read_q, status ); + LIST_FOR_EACH_ENTRY_SAFE( message, next, &pipe_end->message_queue, struct pipe_message, entry ) { - struct pipe_message *message, *next; - struct async *async; - if (pipe_end->fd) fd_async_wake_up( pipe_end->fd, ASYNC_TYPE_WAIT, status ); - async_wake_up( &pipe_end->read_q, status ); - LIST_FOR_EACH_ENTRY_SAFE( message, next, &pipe_end->message_queue, struct pipe_message, entry ) - { - async = message->async; - if (async || status == STATUS_PIPE_DISCONNECTED) free_message( message ); - if (!async) continue; - async_terminate( async, status ); - release_object( async ); - } - if (status == STATUS_PIPE_DISCONNECTED) set_fd_signaled( pipe_end->fd, 0 ); + async = message->async; + if (async || status == STATUS_PIPE_DISCONNECTED) free_message( message ); + if (!async) continue; + async_terminate( async, status ); + release_object( async ); } + if (status == STATUS_PIPE_DISCONNECTED) set_fd_signaled( pipe_end->fd, 0 ); + if (connection) { connection->connection = NULL; @@ -427,11 +418,6 @@ static void do_disconnect( struct pipe_server *server ) { assert( server->client->server == server ); assert( server->client->pipe_end.fd ); - if (!use_server_io( &server->pipe_end )) - { - release_object( server->client->pipe_end.fd ); - server->client->pipe_end.fd = NULL; - } } assert( server->pipe_end.fd ); release_object( server->pipe_end.fd ); @@ -744,8 +730,6 @@ static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ) { struct pipe_end *pipe_end = get_fd_user( fd ); - if (!use_server_io( pipe_end )) return no_fd_read( fd, async, pos ); - if (!pipe_end->connection && list_empty( &pipe_end->message_queue )) { set_error( STATUS_PIPE_BROKEN ); @@ -764,8 +748,6 @@ static int pipe_end_write( struct fd *fd, struct async *async, file_pos_t pos ) struct pipe_end *read_end = write_end->connection; struct pipe_message *message; - if (!use_server_io( write_end )) return no_fd_write( fd, async, pos ); - if (!read_end) { set_error( STATUS_PIPE_DISCONNECTED ); @@ -792,9 +774,7 @@ static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ) if (ignore_reselect) return; - if (!use_server_io( pipe_end )) - default_fd_reselect_async( fd, queue ); - else if (&pipe_end->write_q == queue) + if (&pipe_end->write_q == queue) reselect_write_queue( pipe_end ); else if (&pipe_end->read_q == queue) reselect_read_queue( pipe_end ); @@ -813,12 +793,6 @@ static int pipe_end_peek( struct pipe_end *pipe_end ) data_size_t avail = 0; data_size_t message_length = 0; - if (!use_server_io( pipe_end )) - { - set_error( STATUS_NOT_SUPPORTED ); - return 0; - } - if (reply_size < offsetof( FILE_PIPE_PEEK_BUFFER, Data )) { set_error( STATUS_INFO_LENGTH_MISMATCH );

1 0