- Wine-Commits - list.winehq.org

Davide Beatrici : winecoreaudio: Implement functions to lock and unlock sessions.
by Alexandre Julliard April 24, 2023

April 24, 2023

Module: wine Branch: master Commit: 4aeef7e6132474d418dcddabcc5c21df2ecb71b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/4aeef7e6132474d418dcddabcc5c21… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Apr 21 23:11:32 2023 +0200 winecoreaudio: Implement functions to lock and unlock sessions. --- dlls/winecoreaudio.drv/mmdevdrv.c | 66 ++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 28 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 21c2528cab1..0ec1fc63c60 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -75,6 +75,16 @@ static struct list g_sessions = LIST_INIT(g_sessions); static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); +static void sessions_lock(void) +{ + EnterCriticalSection(&g_sessions_lock); +} + +static void sessions_unlock(void) +{ + LeaveCriticalSection(&g_sessions_lock); +} + static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) { return CONTAINING_RECORD(iface, ACImpl, IAudioClient3_iface); @@ -452,9 +462,9 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) UNIX_CALL(release_stream, &params); This->stream = 0; - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); list_remove(&This->entry); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); } HeapFree(GetProcessHeap(), 0, This->vols); IMMDevice_Release(This->parent); @@ -641,10 +651,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } } - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); if(This->stream){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return AUDCLNT_E_ALREADY_INITIALIZED; } @@ -661,7 +671,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, UNIX_CALL(create_stream, &params); if(FAILED(params.result)){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return params.result; } @@ -692,7 +702,7 @@ end: set_stream_volumes(This, -1); } - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return params.result; } @@ -934,7 +944,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); if(IsEqualIID(riid, &IID_IAudioRenderClient)){ if(This->dataflow != eRender){ @@ -998,7 +1008,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, } end: - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return hr; } @@ -1492,7 +1502,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); ULONG ref; - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); ref = InterlockedDecrement(&This->ref); TRACE("(%p) Refcount now %lu\n", This, ref); @@ -1504,7 +1514,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) HeapFree(GetProcessHeap(), 0, This); } - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return ref; } @@ -1520,11 +1530,11 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, if(!state) return NULL_PTR_ERR; - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); if(list_empty(&This->session->clients)){ *state = AudioSessionStateExpired; - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -1533,12 +1543,12 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, UNIX_CALL(is_started, &params); if(params.result == S_OK){ *state = AudioSessionStateActive; - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } } - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); *state = AudioSessionStateInactive; @@ -1750,14 +1760,14 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); session->master_vol = level; LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) set_stream_volumes(client, -1); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -1790,14 +1800,14 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); session->mute = mute; LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) set_stream_volumes(client, -1); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -1890,14 +1900,14 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( if(index >= This->channel_count) return E_INVALIDARG; - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); This->vols[index] = level; WARN("CoreAudio doesn't support per-channel volume control\n"); set_stream_volumes(This, index); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -1934,14 +1944,14 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( if(count != This->channel_count) return E_INVALIDARG; - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); for(i = 0; i < count; ++i) This->vols[i] = levels[i]; set_stream_volumes(This, -1); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -1960,12 +1970,12 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if(count != This->channel_count) return E_INVALIDARG; - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); for(i = 0; i < count; ++i) levels[i] = This->vols[i]; - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -2051,7 +2061,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); session->channel_vols[index] = level; @@ -2059,7 +2069,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) set_stream_volumes(client, index); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -2104,7 +2114,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; @@ -2112,7 +2122,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) set_stream_volumes(client, -1); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; }

1 0

Davide Beatrici : winealsa: Implement functions to lock and unlock sessions.
by Alexandre Julliard April 24, 2023

April 24, 2023

Module: wine Branch: master Commit: bebe0f7ee0c5b404fc625377e2b033962d893c6c URL: https://gitlab.winehq.org/wine/wine/-/commit/bebe0f7ee0c5b404fc625377e2b033… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Apr 21 23:11:12 2023 +0200 winealsa: Implement functions to lock and unlock sessions. --- dlls/winealsa.drv/mmdevdrv.c | 86 ++++++++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 38 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index c46ae41f48b..049abd53f41 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -81,6 +81,16 @@ static const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); +static void sessions_lock(void) +{ + EnterCriticalSection(&g_sessions_lock); +} + +static void sessions_unlock(void) +{ + LeaveCriticalSection(&g_sessions_lock); +} + static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) { return CONTAINING_RECORD(iface, ACImpl, IAudioClient3_iface); @@ -480,9 +490,9 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) IMMDevice_Release(This->parent); IUnknown_Release(This->marshal); if(This->session){ - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); list_remove(&This->entry); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); } HeapFree(GetProcessHeap(), 0, This->vols); if (This->stream) @@ -666,10 +676,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } } - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); if(This->stream){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return AUDCLNT_E_ALREADY_INITIALIZED; } @@ -688,7 +698,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, ALSA_CALL(create_stream, &params); if(FAILED(params.result)){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return params.result; } @@ -718,7 +728,7 @@ exit: set_stream_volumes(This); } - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return params.result; } @@ -876,10 +886,10 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) TRACE("(%p)\n", This); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); if(!This->stream){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return AUDCLNT_E_NOT_INITIALIZED; } @@ -892,7 +902,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); } - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return params.result; } @@ -964,23 +974,23 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, return E_POINTER; *ppv = NULL; - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); if(!This->stream){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return AUDCLNT_E_NOT_INITIALIZED; } if(IsEqualIID(riid, &IID_IAudioRenderClient)){ if(This->dataflow != eRender){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); *ppv = &This->IAudioRenderClient_iface; }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ if(This->dataflow != eCapture){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); @@ -995,7 +1005,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return E_OUTOFMEMORY; } }else @@ -1006,7 +1016,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return E_OUTOFMEMORY; } }else @@ -1017,7 +1027,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return E_OUTOFMEMORY; } }else @@ -1027,11 +1037,11 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, } if(*ppv){ - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); FIXME("stub %s\n", debugstr_guid(riid)); return E_NOINTERFACE; @@ -1545,9 +1555,9 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) TRACE("(%p) Refcount now %lu\n", This, ref); if(!ref){ if(This->client){ - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); This->client->session_wrapper = NULL; - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); AudioClient_Release(&This->client->IAudioClient3_iface); } HeapFree(GetProcessHeap(), 0, This); @@ -1567,11 +1577,11 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, if(!state) return NULL_PTR_ERR; - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); if(list_empty(&This->session->clients)){ *state = AudioSessionStateExpired; - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -1580,12 +1590,12 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, ALSA_CALL(is_started, &params); if(params.result == S_OK){ *state = AudioSessionStateActive; - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } } - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); *state = AudioSessionStateInactive; @@ -1799,14 +1809,14 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); session->master_vol = level; LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) set_stream_volumes(client); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -1839,13 +1849,13 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); session->mute = mute; LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) set_stream_volumes(client); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -1940,12 +1950,12 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); This->vols[index] = level; set_stream_volumes(This); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -1984,13 +1994,13 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); for(i = 0; i < count; ++i) This->vols[i] = levels[i]; set_stream_volumes(This); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -2009,12 +2019,12 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if(count != This->channel_count) return E_INVALIDARG; - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); for(i = 0; i < count; ++i) levels[i] = This->vols[i]; - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -2102,14 +2112,14 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); session->channel_vols[index] = level; LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) set_stream_volumes(client); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; } @@ -2156,7 +2166,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&g_sessions_lock); + sessions_lock(); for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; @@ -2164,7 +2174,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) set_stream_volumes(client); - LeaveCriticalSection(&g_sessions_lock); + sessions_unlock(); return S_OK; }

1 0

Piotr Caban : gdi32/tests: Add EMF palette tests.
by Alexandre Julliard April 24, 2023

April 24, 2023

Module: wine Branch: master Commit: 28df39908a7091143e38dd5a474ccd6448aba586 URL: https://gitlab.winehq.org/wine/wine/-/commit/28df39908a7091143e38dd5a474ccd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 21 22:16:44 2023 +0200 gdi32/tests: Add EMF palette tests. --- dlls/gdi32/tests/metafile.c | 78 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 2b7e53b2529..0e5da463f7f 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -4802,6 +4802,83 @@ static void test_mf_palette(void) ok(ret, "DeleteMetaFile(%p) error %ld\n", hmf, GetLastError()); } +static void test_emf_palette(void) +{ + char logpalettebuf[sizeof(LOGPALETTE) + sizeof(logpalettedata)]; + LOGPALETTE *logpalette = (PLOGPALETTE)logpalettebuf; + HPALETTE hpal, old_pal, def_pal; + HENHMETAFILE emf; + HDC hdc; + BOOL ret; + + static const unsigned char palette_bits[] = + { + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe6, 0xff, 0xff, 0xff, 0xe6, 0xff, 0xff, 0xff, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0xf0, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xcd, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0x9f, 0xed, 0x03, 0x00, 0x31, 0x00, 0x00, 0x00, + 0x30, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x03, 0x08, 0x00, 0x10, 0x20, 0x30, 0x00, + 0x20, 0x30, 0x40, 0x00, 0x30, 0x40, 0x50, 0x00, + 0x40, 0x50, 0x60, 0x00, 0x50, 0x60, 0x70, 0x00, + 0x60, 0x70, 0x80, 0x00, 0x70, 0x80, 0x90, 0x00, + 0x80, 0x90, 0xa0, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x34, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x30, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, + 0x0f, 0x00, 0x00, 0x80, 0x0e, 0x00, 0x00, 0x00, + 0x34, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x10, 0x20, 0x30, 0x00, + 0x20, 0x30, 0x40, 0x00, 0x30, 0x40, 0x50, 0x00, + 0x40, 0x50, 0x60, 0x00, 0x50, 0x60, 0x70, 0x00, + 0x60, 0x70, 0x80, 0x00, 0x70, 0x80, 0x90, 0x00, + 0x80, 0x90, 0xa0, 0x00, 0x34, 0x00, 0x00, 0x00 + }; + + hdc = CreateEnhMetaFileA(NULL, NULL, NULL, NULL); + ok(hdc != 0, "CreateMetaFileA error %ld\n", GetLastError()); + + /* Initialize the logical palette with a few colours */ + logpalette->palVersion = 0x300; + logpalette->palNumEntries = ARRAY_SIZE(logpalettedata); + memcpy(logpalette->palPalEntry, logpalettedata, sizeof(logpalettedata)); + hpal = CreatePalette(logpalette); + old_pal = SelectPalette(hdc, hpal, FALSE); + def_pal = GetStockObject(DEFAULT_PALETTE); + ok(old_pal == def_pal, "old_pal=%p, expected %p\n", old_pal, def_pal); + + ret = RealizePalette(hdc); + ok(!ret, "RealizePalette returned %d\n", ret); + + old_pal = SelectPalette(hdc, GetStockObject(DEFAULT_PALETTE), FALSE); + ok(old_pal == hpal, "old_pal=%p, expected %p\n", old_pal, hpal); + + ret = RealizePalette(hdc); + ok(!ret, "RealizePalette returned %d\n", ret); + + emf = CloseEnhMetaFile(hdc); + ok(emf != 0, "CloseEnhMetaFile error %ld\n", GetLastError()); + + if (compare_emf_bits(emf, palette_bits, sizeof(palette_bits), "emf_palette", FALSE)) + { + dump_emf_bits(emf, "emf_palette"); + dump_emf_records(emf, "emf_palette"); + } + + ret = DeleteEnhMetaFile(emf); + ok(ret, "DeleteMetaFile error %ld\n", GetLastError()); +} + static void test_mf_blit(void) { BITMAPINFO bmi = {{ sizeof(bmi) }}; @@ -10670,6 +10747,7 @@ START_TEST(metafile) test_emf_mask_blit(); test_emf_StretchDIBits(); test_emf_SetDIBitsToDevice(); + test_emf_palette(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC();

1 0

Piotr Caban : gdi32: Store palette in EMR_EOF record.
by Alexandre Julliard April 24, 2023

April 24, 2023

Module: wine Branch: master Commit: f45baaa11e74a967fecebc6efbcbbbcf2821da01 URL: https://gitlab.winehq.org/wine/wine/-/commit/f45baaa11e74a967fecebc6efbcbbb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 21 22:16:16 2023 +0200 gdi32: Store palette in EMR_EOF record. --- dlls/gdi32/emfdc.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 60 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index cc8e78a3cb5..42330a22861 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -41,6 +41,9 @@ struct emf HBRUSH dc_brush; HPEN dc_pen; BOOL path; + DWORD palette_size; + DWORD palette_used; + PALETTEENTRY *palette; }; #define HANDLE_LIST_INC 20 @@ -394,6 +397,40 @@ static void emfdc_delete_object( HDC hdc, HGDIOBJ obj ) emf->cur_handles--; } +static BOOL emfdc_add_palette_entry( struct emf *emf, PALETTEENTRY *entry ) +{ + int i; + + for (i = 0; i < emf->palette_used; i++) + { + if (emf->palette[i].peRed == entry->peRed && + emf->palette[i].peGreen == entry->peGreen && + emf->palette[i].peBlue == entry->peBlue) return TRUE; + } + + if (emf->palette_size == emf->palette_used) + { + if (!emf->palette_size) + { + emf->palette = HeapAlloc( GetProcessHeap(), 0, + 8 * sizeof(*emf->palette) ); + if (!emf->palette) return FALSE; + emf->palette_size = 8; + } + else + { + void *new_palette = HeapReAlloc( GetProcessHeap(), 0, emf->palette, + 2 * emf->palette_size * sizeof(*emf->palette) ); + if (!new_palette) return FALSE; + emf->palette = new_palette; + emf->palette_size *= 2; + } + } + + emf->palette[emf->palette_used++] = *entry; + return TRUE; +} + static DWORD emfdc_create_brush( struct emf *emf, HBRUSH brush ) { DWORD index = 0; @@ -663,7 +700,10 @@ static DWORD emfdc_create_palette( struct emf *emf, HPALETTE hPal ) return 0; for (i = 0; i < hdr->lgpl.palNumEntries; i++) + { hdr->lgpl.palPalEntry[i].peFlags = 0; + emfdc_add_palette_entry( emf, hdr->lgpl.palPalEntry + i ); + } hdr->emr.iType = EMR_CREATEPALETTE; hdr->emr.nSize = offsetof( EMRCREATEPALETTE, lgpl.palPalEntry[hdr->lgpl.palNumEntries] ); @@ -2344,6 +2384,7 @@ void EMFDC_DeleteDC( DC_ATTR *dc_attr ) struct emf *emf = get_dc_emf( dc_attr ); UINT index; + HeapFree( GetProcessHeap(), 0, emf->palette ); HeapFree( GetProcessHeap(), 0, emf->emh ); for (index = 0; index < emf->handles_size; index++) if (emf->handles[index]) @@ -2465,6 +2506,9 @@ HDC WINAPI CreateEnhMetaFileW( HDC hdc, const WCHAR *filename, const RECT *rect, emf->dc_brush = 0; emf->dc_pen = 0; emf->path = FALSE; + emf->palette_size = 0; + emf->palette_used = 0; + emf->palette = NULL; emf->emh->iType = EMR_HEADER; emf->emh->nSize = size; @@ -2533,10 +2577,11 @@ HDC WINAPI CreateEnhMetaFileW( HDC hdc, const WCHAR *filename, const RECT *rect, */ HENHMETAFILE WINAPI CloseEnhMetaFile( HDC hdc ) { + UINT size, palette_size; HENHMETAFILE hmf; struct emf *emf; DC_ATTR *dc_attr; - EMREOF emr; + EMREOF *emr; HANDLE mapping = 0; TRACE("(%p)\n", hdc ); @@ -2544,18 +2589,26 @@ HENHMETAFILE WINAPI CloseEnhMetaFile( HDC hdc ) if (!(dc_attr = get_dc_attr( hdc )) || !get_dc_emf( dc_attr )) return 0; emf = get_dc_emf( dc_attr ); + palette_size = emf->palette_used * sizeof(*emf->palette); + size = sizeof(*emr) + palette_size; + if (!(emr = HeapAlloc( GetProcessHeap(), 0, size ))) return 0; + if (dc_attr->save_level) RestoreDC( hdc, 1 ); if (emf->dc_brush) DeleteObject( emf->dc_brush ); if (emf->dc_pen) DeleteObject( emf->dc_pen ); - emr.emr.iType = EMR_EOF; - emr.emr.nSize = sizeof(emr); - emr.nPalEntries = 0; - emr.offPalEntries = FIELD_OFFSET(EMREOF, nSizeLast); - emr.nSizeLast = emr.emr.nSize; - emfdc_record( emf, &emr.emr ); + + emr->emr.iType = EMR_EOF; + emr->emr.nSize = size; + emr->nPalEntries = emf->palette_used; + emr->offPalEntries = FIELD_OFFSET(EMREOF, nSizeLast); + memcpy( (BYTE *)emr + emr->offPalEntries, emf->palette, palette_size ); + /* Set nSizeLast */ + ((DWORD *)((BYTE *)emr + size))[-1] = size; + emfdc_record( emf, &emr->emr ); + HeapFree( GetProcessHeap(), 0, emr ); emf->emh->rclBounds = dc_attr->emf_bounds;

1 0

Piotr Caban : wineps: Handle EMR_SETPALETTEENTRIES record in spool files.
by Alexandre Julliard April 24, 2023

April 24, 2023

Module: wine Branch: master Commit: 3fdff0b10651485715f02a799771f70966083a5f URL: https://gitlab.winehq.org/wine/wine/-/commit/3fdff0b10651485715f02a799771f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 21 21:27:23 2023 +0200 wineps: Handle EMR_SETPALETTEENTRIES record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index f72a1a08b5b..0169873ceaf 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2977,6 +2977,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_CREATEBRUSHINDIRECT: case EMR_SELECTPALETTE: case EMR_CREATEPALETTE: + case EMR_SETPALETTEENTRIES: case EMR_RESIZEPALETTE: case EMR_REALIZEPALETTE: case EMR_SETARCDIRECTION:

1 0

Piotr Caban : gdi32: Fix EMR_CREATEPALETTE recording.
by Alexandre Julliard April 24, 2023

April 24, 2023

Module: wine Branch: master Commit: b9b159e5a85a84fca2284c954fb7e7ba210a89c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9b159e5a85a84fca2284c954fb7e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 21 21:33:01 2023 +0200 gdi32: Fix EMR_CREATEPALETTE recording. --- dlls/gdi32/emfdc.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index f3ee0e3611c..cc8e78a3cb5 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -651,27 +651,27 @@ static BOOL emfdc_select_pen( DC_ATTR *dc_attr, HPEN pen ) static DWORD emfdc_create_palette( struct emf *emf, HPALETTE hPal ) { + BYTE data[offsetof( EMRCREATEPALETTE, lgpl.palPalEntry[256] )]; + EMRCREATEPALETTE *hdr = (EMRCREATEPALETTE *)data; WORD i; - struct { - EMRCREATEPALETTE hdr; - PALETTEENTRY entry[255]; - } pal; - memset( &pal, 0, sizeof(pal) ); + memset( data, 0, sizeof(data) ); - if (!GetObjectW( hPal, sizeof(pal.hdr.lgpl) + sizeof(pal.entry), &pal.hdr.lgpl )) + hdr->lgpl.palVersion = 0x300; + hdr->lgpl.palNumEntries = GetPaletteEntries( hPal, 0, 256, hdr->lgpl.palPalEntry ); + if (!hdr->lgpl.palNumEntries) return 0; - for (i = 0; i < pal.hdr.lgpl.palNumEntries; i++) - pal.hdr.lgpl.palPalEntry[i].peFlags = 0; + for (i = 0; i < hdr->lgpl.palNumEntries; i++) + hdr->lgpl.palPalEntry[i].peFlags = 0; - pal.hdr.emr.iType = EMR_CREATEPALETTE; - pal.hdr.emr.nSize = sizeof(pal.hdr) + pal.hdr.lgpl.palNumEntries * sizeof(PALETTEENTRY); - pal.hdr.ihPal = emfdc_add_handle( emf, hPal ); + hdr->emr.iType = EMR_CREATEPALETTE; + hdr->emr.nSize = offsetof( EMRCREATEPALETTE, lgpl.palPalEntry[hdr->lgpl.palNumEntries] ); + hdr->ihPal = emfdc_add_handle( emf, hPal ); - if (!emfdc_record( emf, &pal.hdr.emr )) - pal.hdr.ihPal = 0; - return pal.hdr.ihPal; + if (!emfdc_record( emf, &hdr->emr )) + hdr->ihPal = 0; + return hdr->ihPal; } BOOL EMFDC_SelectPalette( DC_ATTR *dc_attr, HPALETTE palette )

1 0

Piotr Caban : gdi32: Use EMR_REALIZEPALETTE to record RealizePalette.
by Alexandre Julliard April 24, 2023

April 24, 2023

Module: wine Branch: master Commit: c752e84543e6c96a06eb8bd61aaad9891200addf URL: https://gitlab.winehq.org/wine/wine/-/commit/c752e84543e6c96a06eb8bd61aaad9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 21 21:31:41 2023 +0200 gdi32: Use EMR_REALIZEPALETTE to record RealizePalette. --- dlls/gdi32/dc.c | 4 ++++ dlls/gdi32/emfdc.c | 14 ++++++++++++++ dlls/gdi32/gdi_private.h | 1 + 3 files changed, 19 insertions(+) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 44dd9b9373d..8fa30884baf 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2153,7 +2153,11 @@ HPALETTE WINAPI SelectPalette( HDC hdc, HPALETTE palette, BOOL force_background */ UINT WINAPI RealizePalette( HDC hdc ) { + DC_ATTR *dc_attr; + if (is_meta_dc( hdc )) return METADC_RealizePalette( hdc ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_RealizePalette( dc_attr )) return 0; return pfnRealizePalette( hdc ); } diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index bf35450cfb3..f3ee0e3611c 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -696,6 +696,20 @@ BOOL EMFDC_SelectPalette( DC_ATTR *dc_attr, HPALETTE palette ) return emfdc_record( emf, &emr.emr ); } +BOOL EMFDC_RealizePalette( DC_ATTR *dc_attr ) +{ + HPALETTE palette = GetCurrentObject( dc_attr_handle( dc_attr ), OBJ_PAL ); + struct emf *emf = get_dc_emf( dc_attr ); + EMRREALIZEPALETTE emr; + + if (palette == GetStockObject( DEFAULT_PALETTE )) + return TRUE; + + emr.emr.iType = EMR_REALIZEPALETTE; + emr.emr.nSize = sizeof(emr); + return emfdc_record( emf, &emr.emr ); +} + BOOL EMFDC_SelectObject( DC_ATTR *dc_attr, HGDIOBJ obj ) { switch (gdi_handle_type( obj )) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index da4c951eb00..4a9c70dcbc3 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -225,6 +225,7 @@ extern BOOL EMFDC_PolyPolygon( DC_ATTR *dc_attr, const POINT *points, const INT extern BOOL EMFDC_Polygon( DC_ATTR *dc_attr, const POINT *points, INT count ) DECLSPEC_HIDDEN; extern BOOL EMFDC_Polyline( DC_ATTR *dc_attr, const POINT *points, INT count) DECLSPEC_HIDDEN; extern BOOL EMFDC_PolylineTo( DC_ATTR *dc_attr, const POINT *points, INT count ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_RealizePalette( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_Rectangle( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern BOOL EMFDC_RestoreDC( DC_ATTR *dc_attr, INT level ) DECLSPEC_HIDDEN;

1 0

Piotr Caban : wineps: Handle EMR_RESIZEPALETTE record in spool files.
by Alexandre Julliard April 24, 2023

April 24, 2023

Module: wine Branch: master Commit: d1d7f1a5dce276d1b159cc835909ae51cd66d424 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1d7f1a5dce276d1b159cc835909ae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 21 21:26:58 2023 +0200 wineps: Handle EMR_RESIZEPALETTE record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 37053e8061f..f72a1a08b5b 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2977,6 +2977,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_CREATEBRUSHINDIRECT: case EMR_SELECTPALETTE: case EMR_CREATEPALETTE: + case EMR_RESIZEPALETTE: case EMR_REALIZEPALETTE: case EMR_SETARCDIRECTION: case EMR_CLOSEFIGURE:

1 0

Piotr Caban : wineps: Handle EMR_REALIZEPALETTE record in spool files.
by Alexandre Julliard April 24, 2023

April 24, 2023

Module: wine Branch: master Commit: d200b0fcf23b1d14e6eb866e0fdfec12ec172ba5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d200b0fcf23b1d14e6eb866e0fdfec… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 21 21:26:31 2023 +0200 wineps: Handle EMR_REALIZEPALETTE record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 48f584e1a7e..37053e8061f 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2977,6 +2977,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_CREATEBRUSHINDIRECT: case EMR_SELECTPALETTE: case EMR_CREATEPALETTE: + case EMR_REALIZEPALETTE: case EMR_SETARCDIRECTION: case EMR_CLOSEFIGURE: case EMR_FLATTENPATH:

1 0

Ziqing Hui : mfreadwrite: Fix an address of operator typo.
by Alexandre Julliard April 21, 2023

April 21, 2023

Module: wine Branch: master Commit: d1c317720ab6a92811c013408844ffd9e581b2a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1c317720ab6a92811c013408844ff… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Apr 19 16:23:32 2023 +0800 mfreadwrite: Fix an address of operator typo. --- dlls/mfreadwrite/writer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/writer.c b/dlls/mfreadwrite/writer.c index aaf972734c4..83b0442b20e 100644 --- a/dlls/mfreadwrite/writer.c +++ b/dlls/mfreadwrite/writer.c @@ -1070,7 +1070,7 @@ static HRESULT sink_writer_get_sink_factory_class(const WCHAR *url, IMFAttribute for (i = 0; i < ARRAY_SIZE(class_map); ++i) { - if (IsEqualGUID(&container, &class_map[i].container)) + if (IsEqualGUID(&container, class_map[i].container)) { *clsid = *class_map[i].clsid; return S_OK;

1 0