wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Huw Davies : wineoss: Use the global lock to lock the session.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 13d69651f68eb6553725b6ab98707a2761413037 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13d69651f68eb6553725b6ab… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 6 07:55:53 2022 +0100 wineoss: Use the global lock to lock the session. Mainly for simplicity. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index eb0ab7b8fc7..af49c88e6cf 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -81,8 +81,6 @@ typedef struct _AudioSession { float *channel_vols; BOOL mute; - CRITICAL_SECTION lock; - struct list entry; } AudioSession; @@ -835,9 +833,6 @@ static AudioSession *create_session(const GUID *guid, IMMDevice *device, list_add_head(&g_sessions, &ret->entry); - InitializeCriticalSection(&ret->lock); - ret->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": AudioSession.lock"); - session_init_vols(ret, num_channels); ret->master_vol = 1.f; @@ -2565,13 +2560,13 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->master_vol = level; TRACE("OSS doesn't support setting volume\n"); - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -2600,11 +2595,11 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, TRACE("(%p)->(%u, %s)\n", session, mute, debugstr_guid(context)); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->mute = mute; - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -2856,13 +2851,13 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->channel_vols[index] = level; TRACE("OSS doesn't support setting volume\n"); - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -2906,14 +2901,14 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; TRACE("OSS doesn't support setting volume\n"); - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; }

1 0

Huw Davies : wineoss: Dynamically size the devnode array.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: aca219367190eb549fb6581914bc30bcad85d7ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=aca219367190eb549fb65819… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 6 07:55:52 2022 +0100 wineoss: Dynamically size the devnode array. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 5b6addef0f7..eb0ab7b8fc7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -121,7 +121,6 @@ struct ACImpl { int fd; oss_audioinfo ai; - char devnode[OSS_DEVNODE_SIZE]; BOOL initted, playing; UINT64 written_frames, last_pos_frames; @@ -138,6 +137,9 @@ struct ACImpl { AudioSessionWrapper *session_wrapper; struct list entry; + + /* Keep at end */ + char devnode[0]; }; typedef struct _SessionMgr { @@ -445,6 +447,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, ACImpl *This; const OSSDevice *oss_dev; HRESULT hr; + int len; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); @@ -453,8 +456,8 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, WARN("Unknown GUID: %s\n", debugstr_guid(guid)); return AUDCLNT_E_DEVICE_INVALIDATED; } - - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); + len = strlen(oss_dev->devnode); + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, offsetof(ACImpl, devnode[len + 1])); if(!This) return E_OUTOFMEMORY;

1 0

Huw Davies : wineoss: Explicitly store the channel count in the client.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 9ff920cdd9b4bb07eb0c7f5f8f33c21a3a644eac URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ff920cdd9b4bb07eb0c7f5f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 6 07:55:51 2022 +0100 wineoss: Explicitly store the channel count in the client. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index fd35a439c5a..5b6addef0f7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -117,6 +117,7 @@ struct ACImpl { AUDCLNT_SHAREMODE share; HANDLE event; float *vols; + UINT32 channel_count; int fd; oss_audioinfo ai; @@ -970,7 +971,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return E_OUTOFMEMORY; } - This->vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); + This->channel_count = fmt->nChannels; + This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float)); if(!This->vols){ CoTaskMemFree(This->fmt); This->fmt = NULL; @@ -979,14 +981,14 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return E_OUTOFMEMORY; } - for(i = 0; i < fmt->nChannels; ++i) + for(i = 0; i < This->channel_count; ++i) This->vols[i] = 1.f; This->share = mode; This->flags = flags; This->oss_bufsize_bytes = 0; - hr = get_audio_session(sessionguid, This->parent, fmt->nChannels, + hr = get_audio_session(sessionguid, This->parent, This->channel_count, &This->session); if(FAILED(hr)){ HeapFree(GetProcessHeap(), 0, This->vols); @@ -2674,7 +2676,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelCount( if(!out) return E_POINTER; - *out = This->fmt->nChannels; + *out = This->channel_count; return S_OK; } @@ -2689,7 +2691,7 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( if(level < 0.f || level > 1.f) return E_INVALIDARG; - if(index >= This->fmt->nChannels) + if(index >= This->channel_count) return E_INVALIDARG; EnterCriticalSection(&This->lock); @@ -2713,7 +2715,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( if(!level) return E_POINTER; - if(index >= This->fmt->nChannels) + if(index >= This->channel_count) return E_INVALIDARG; *level = This->vols[index]; @@ -2732,7 +2734,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( if(!levels) return E_POINTER; - if(count != This->fmt->nChannels) + if(count != This->channel_count) return E_INVALIDARG; EnterCriticalSection(&This->lock); @@ -2758,7 +2760,7 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if(!levels) return E_POINTER; - if(count != This->fmt->nChannels) + if(count != This->channel_count) return E_INVALIDARG; EnterCriticalSection(&This->lock);

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 5fc32a204d6e2590619e194d412d81d559eec1d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fc32a204d6e2590619e194d… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Apr 11 16:52:31 2022 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 54 +++++++++++++++--------------------------------------- 1 file changed, 15 insertions(+), 39 deletions(-) diff --git a/po/de.po b/po/de.po index 596eb9974c9..ad81f08de43 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-01-10 13:49+0200\n" +"PO-Revision-Date: 2022-04-11 16:51+0200\n" "Last-Translator: Julian Rüger <jr98(a)gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -3981,13 +3981,11 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cyclic __proto__ value" -msgstr "" +msgstr "Zyklischer __proto__-Wert" #: dlls/jscript/jscript.rc:75 -#, fuzzy -#| msgid "Cannot define property '|': object is not extensible" msgid "Cannot create property for a non-extensible object" -msgstr "Eigenschaft '|' kann nicht definiert werden: Objekt nicht erweiterbar" +msgstr "Eigenschaft für nicht-erweiterbares Objekt kann nicht angelegt werden" #: dlls/jscript/jscript.rc:76 msgid "Cannot define property '|': object is not extensible" @@ -7014,54 +7012,40 @@ msgid "This network connection does not exist.\n" msgstr "Diese Netzwerkverbindung existiert nicht.\n" #: dlls/kernelbase/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "Ungültig während eines Interrupts.\n" +msgstr "Aufruf unterbrochen.\n" #: dlls/kernelbase/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "Ungültiges Handle.\n" +msgstr "Ungültiges Dateihandle.\n" #: dlls/kernelbase/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "Ungültige Netzwerkadresse.\n" +msgstr "Ungültige Zeigeradresse.\n" #: dlls/kernelbase/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "Ungültiger Name.\n" +msgstr "Ungültiges Argument.\n" #: dlls/kernelbase/winerror.mc:3778 msgid "Connection reset by peer.\n" msgstr "Verbindung von Gegenstelle zurückgesetzt.\n" #: dlls/kernelbase/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "Punkt nicht gefunden.\n" +msgstr "Host nicht gefunden.\n" #: dlls/kernelbase/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "Attribut nicht gefunden.\n" +msgstr "Nicht-authoritativer Host nicht gefunden.\n" #: dlls/kernelbase/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "Nicht ausgleichbarer Fehler aufgetreten.\n" +msgstr "Unausgleichbarer Fehler.\n" #: dlls/kernelbase/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "Name gültig, kein Datensatz.\n" #: dlls/kernelbase/winerror.mc:3817 msgid "Not implemented.\n" @@ -11042,18 +11026,14 @@ msgid "(UTC-03:00) City of Buenos Aires" msgstr "(UTC-03:00) Stadt Buenos Aires" #: dlls/tzres/tzres.rc:378 -#, fuzzy -#| msgid "Turks And Caicos Standard Time" msgctxt "maximum 31 characters" msgid "Turks And Caicos Standard Time" -msgstr "Turks- und Caicosinseln Normalzeit" +msgstr "Turks-, Caicosinseln Normalzeit" #: dlls/tzres/tzres.rc:379 -#, fuzzy -#| msgid "Turks And Caicos Daylight Time" msgctxt "maximum 31 characters" msgid "Turks And Caicos Daylight Time" -msgstr "Turks- und Caicosinseln Sommerzeit" +msgstr "Turks-, Caicosinseln Sommerzeit" #: dlls/tzres/tzres.rc:380 msgid "(UTC-05:00) Turks and Caicos" @@ -11647,18 +11627,14 @@ msgid "(UTC+03:00) Moscow, St. Petersburg" msgstr "(UTC+03:00) Moskau, St. Petersburg" #: dlls/tzres/tzres.rc:63 -#, fuzzy -#| msgid "Aus Central W. Standard Time" msgctxt "maximum 31 characters" msgid "Aus Central W. Standard Time" -msgstr "West-Zentralaustralische Normalzeit" +msgstr "West-Zentralaustr. Normalzeit" #: dlls/tzres/tzres.rc:64 -#, fuzzy -#| msgid "Aus Central W. Daylight Time" msgctxt "maximum 31 characters" msgid "Aus Central W. Daylight Time" -msgstr "West-Zentralaustralische Sommerzeit" +msgstr "West-Zentralaustr. Sommerzeit" #: dlls/tzres/tzres.rc:65 msgid "(UTC+08:45) Eucla"

1 0

Alexandros Frantzis : win32u: Avoid iterating over a NULL window list when broadcasting.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 4f705f6f62185de6fa78b88b0aaec554a0fbf0de URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f705f6f62185de6fa78b88b… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Apr 11 12:53:50 2022 +0300 win32u: Avoid iterating over a NULL window list when broadcasting. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/message.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 46c42188d70..9479595ae53 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2508,9 +2508,11 @@ static BOOL is_message_broadcastable( UINT msg ) */ static BOOL broadcast_message( struct send_message_info *info, DWORD_PTR *res_ptr ) { - if (is_message_broadcastable( info->msg )) + HWND *list; + + if (is_message_broadcastable( info->msg ) && + (list = list_window_children( 0, get_desktop_window(), NULL, 0 ))) { - HWND *list = list_window_children( 0, get_desktop_window(), NULL, 0 ); int i; for (i = 0; list[i]; i++)

1 0

Nikolay Sivov : mfplat: Fix alignment used by audio buffers created with MFCreateMediaBufferFromMediaType().
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: b159edc6793a2be16028ae28e41d47951c443a4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b159edc6793a2be16028ae28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 11 11:44:35 2022 +0300 mfplat: Fix alignment used by audio buffers created with MFCreateMediaBufferFromMediaType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 6 +++--- dlls/mfplat/tests/mfplat.c | 54 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 8ea2283e24b..eada3df18ad 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1596,6 +1596,8 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO if (FAILED(IMFMediaType_GetUINT32(media_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &block_alignment))) WARN("Block alignment was not specified.\n"); + alignment = max(16, alignment); + if (block_alignment) { avg_length = 0; @@ -1610,8 +1612,6 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO } } - alignment = max(16, alignment); - length = buffer_get_aligned_length(avg_length + 1, alignment); length = buffer_get_aligned_length(length, block_alignment); } @@ -1620,7 +1620,7 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO length = max(length, min_length); - return create_1d_buffer(length, MF_1_BYTE_ALIGNMENT, buffer); + return create_1d_buffer(length, alignment - 1, buffer); } else FIXME("Major type %s is not supported.\n", debugstr_guid(&major)); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 16d24bbff51..8d21f2ed60e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6057,18 +6057,21 @@ static void test_MFCreateMediaBufferFromMediaType(void) unsigned int buffer_length; } audio_tests[] = { - { 0, 0, 0, 4, 0, 20 }, - { 0, 16, 0, 4, 0, 20 }, - { 0, 0, 32, 4, 0, 36 }, - { 0, 64, 32, 4, 0, 64 }, - { 1, 0, 0, 4, 16, 36 }, - { 2, 0, 0, 4, 16, 52 }, + { 0, 0, 0, 4, 0, 20 }, + { 0, 16, 0, 4, 0, 20 }, + { 0, 0, 32, 4, 0, 36 }, + { 0, 64, 32, 4, 0, 64 }, + { 1, 0, 0, 4, 16, 36 }, + { 2, 0, 0, 4, 16, 52 }, + { 2, 0, 64, 4, 16, 68 }, + { 2, 0, 128, 4, 16,132 }, }; + IMFMediaType *media_type, *media_type2; + unsigned int i, alignment; IMFMediaBuffer *buffer; - DWORD length; + DWORD length, max; + BYTE *data; HRESULT hr; - IMFMediaType *media_type; - unsigned int i; if (!pMFCreateMediaBufferFromMediaType) { @@ -6082,9 +6085,15 @@ static void test_MFCreateMediaBufferFromMediaType(void) hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Failed to create media type, hr %#lx.\n", hr); + hr = MFCreateMediaType(&media_type2); + ok(hr == S_OK, "Failed to create media type, hr %#lx.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); ok(hr == S_OK, "Failed to set attribute, hr %#lx.\n", hr); + hr = IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)media_type2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + for (i = 0; i < ARRAY_SIZE(audio_tests); ++i) { const struct audio_buffer_test *ptr = &audio_tests[i]; @@ -6107,10 +6116,37 @@ static void test_MFCreateMediaBufferFromMediaType(void) ok(hr == S_OK, "Failed to get length, hr %#lx.\n", hr); ok(ptr->buffer_length == length, "%d: unexpected buffer length %lu, expected %u.\n", i, length, ptr->buffer_length); + alignment = ptr->min_alignment ? ptr->min_alignment - 1 : MF_16_BYTE_ALIGNMENT; + hr = IMFMediaBuffer_Lock(buffer, &data, &max, &length); + ok(hr == S_OK, "Failed to lock, hr %#lx.\n", hr); + ok(ptr->buffer_length == max && !length, "Unexpected length.\n"); + ok(!((uintptr_t)data & alignment), "%u: data at %p is misaligned.\n", i, data); + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Failed to unlock, hr %#lx.\n", hr); + + IMFMediaBuffer_Release(buffer); + + /* Only major type is set. */ + hr = pMFCreateMediaBufferFromMediaType(media_type2, ptr->duration * 10000000, ptr->min_length, + ptr->min_alignment, &buffer); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + ok(hr == S_OK, "Failed to get length, hr %#lx.\n", hr); + ok(ptr->min_length == length, "%u: unexpected buffer length %lu, expected %u.\n", i, length, ptr->min_length); + + hr = IMFMediaBuffer_Lock(buffer, &data, &max, &length); + ok(hr == S_OK, "Failed to lock, hr %#lx.\n", hr); + ok(ptr->min_length == max && !length, "Unexpected length.\n"); + ok(!((uintptr_t)data & alignment), "%u: data at %p is misaligned.\n", i, data); + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Failed to unlock, hr %#lx.\n", hr); + IMFMediaBuffer_Release(buffer); } IMFMediaType_Release(media_type); + IMFMediaType_Release(media_type2); } static void validate_media_type(IMFMediaType *mediatype, const WAVEFORMATEX *format)

1 0

Nikolay Sivov : hlink: Return requested interface from HlinkCreateFromString().
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: a08be2a2f8fc22d245b80222bd0643a56a44d25a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a08be2a2f8fc22d245b80222… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 11 11:40:33 2022 +0300 hlink: Return requested interface from HlinkCreateFromString(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/hlink_main.c | 14 +++++++------- dlls/hlink/tests/hlink.c | 11 +++++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 3f7a3fcd62e..8e269f5f375 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -80,7 +80,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, IUnknown* piunkOuter, REFIID riid, void** ppvObj) { IHlink *hl = NULL; - HRESULT r; + HRESULT hr; WCHAR *hash, *tgt; const WCHAR *loc; @@ -88,9 +88,9 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), pihlsite, dwSiteData, piunkOuter, debugstr_guid(riid), ppvObj); - r = CoCreateInstance(&CLSID_StdHlink, piunkOuter, CLSCTX_INPROC_SERVER, riid, (LPVOID*)&hl); - if (FAILED(r)) - return r; + hr = CoCreateInstance(&CLSID_StdHlink, piunkOuter, CLSCTX_INPROC_SERVER, &IID_IHlink, (void **)&hl); + if (FAILED(hr)) + return hr; if (pwzTarget) { @@ -137,10 +137,10 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, if (pihlsite) IHlink_SetHlinkSite(hl, pihlsite, dwSiteData); - TRACE("Returning %lx\n",r); - *ppvObj = hl; + hr = IHlink_QueryInterface(hl, riid, ppvObj); + IHlink_Release(hl); - return r; + return hr; } diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index c5c8cd9c81b..3c2e8ebf455 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -2623,6 +2623,16 @@ static void test_HlinkCreateFromMoniker(void) IMoniker_Release(moniker); } +static void test_HlinkCreateFromString(void) +{ + IPersistStream *stream; + HRESULT hr; + + hr = HlinkCreateFromString(L"http://winehq.org", NULL, NULL, NULL, 0, NULL, &IID_IPersistStream, (void **)&stream); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IPersistStream_Release(stream); +} + START_TEST(hlink) { CoInitialize(NULL); @@ -2644,6 +2654,7 @@ START_TEST(hlink) test_Hlink_Navigate(); test_HlinkUpdateStackItem(); test_HlinkCreateFromMoniker(); + test_HlinkCreateFromString(); CoUninitialize(); }

1 0

Nikolay Sivov : hlink: Return correct requested interface from HlinkCreateFromMoniker().
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 19f802c091344ba87cd6d5c84e8f235418c79a74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19f802c091344ba87cd6d5c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 11 11:40:32 2022 +0300 hlink: Return correct requested interface from HlinkCreateFromMoniker(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/hlink_main.c | 15 +++++++-------- dlls/hlink/tests/hlink.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index e70a066bb05..3f7a3fcd62e 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -49,15 +49,15 @@ HRESULT WINAPI HlinkCreateFromMoniker( IMoniker *pimkTrgt, LPCWSTR pwzLocation, IUnknown* piunkOuter, REFIID riid, void** ppvObj) { IHlink *hl = NULL; - HRESULT r; + HRESULT hr; TRACE("%p %s %s %p %li %p %s %p\n", pimkTrgt, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), pihlsite, dwSiteData, piunkOuter, debugstr_guid(riid), ppvObj); - r = CoCreateInstance(&CLSID_StdHlink, piunkOuter, CLSCTX_INPROC_SERVER, riid, (LPVOID*)&hl); - if (FAILED(r)) - return r; + hr = CoCreateInstance(&CLSID_StdHlink, piunkOuter, CLSCTX_INPROC_SERVER, &IID_IHlink, (LPVOID*)&hl); + if (FAILED(hr)) + return hr; IHlink_SetMonikerReference(hl, HLINKSETF_LOCATION | HLINKSETF_TARGET, pimkTrgt, pwzLocation); @@ -66,11 +66,10 @@ HRESULT WINAPI HlinkCreateFromMoniker( IMoniker *pimkTrgt, LPCWSTR pwzLocation, if (pihlsite) IHlink_SetHlinkSite(hl, pihlsite, dwSiteData); - *ppvObj = hl; - - TRACE("Returning %lx\n",r); + hr = IHlink_QueryInterface(hl, riid, ppvObj); + IHlink_Release(hl); - return r; + return hr; } /*********************************************************************** diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 984f952c158..c5c8cd9c81b 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -2607,6 +2607,22 @@ static void test_HlinkUpdateStackItem(void) CHECK_CALLED(HLF_UpdateHlink); } +static void test_HlinkCreateFromMoniker(void) +{ + IPersistStream *stream; + IMoniker *moniker; + HRESULT hr; + + hr = CreateItemMoniker(L"1", L"1", &moniker); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = HlinkCreateFromMoniker(moniker, L"1", L"a", NULL, 0, NULL, &IID_IPersistStream, (void **)&stream); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IPersistStream_Release(stream); + + IMoniker_Release(moniker); +} + START_TEST(hlink) { CoInitialize(NULL); @@ -2627,6 +2643,7 @@ START_TEST(hlink) test_StdHlink(); test_Hlink_Navigate(); test_HlinkUpdateStackItem(); + test_HlinkCreateFromMoniker(); CoUninitialize(); }

1 0

Nikolay Sivov : hlink: Return requested interface when creating IHlink instance.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: bbb9c273d2063de94a1f75ffae2e249b2e7b3770 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbb9c273d2063de94a1f75ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 11 11:40:31 2022 +0300 hlink: Return requested interface when creating IHlink instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/link.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 305f7136a44..8c7b06f6f2a 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -1130,6 +1130,7 @@ static const IBindStatusCallbackVtbl bind_callback_vtbl = HRESULT HLink_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) { HlinkImpl * hl; + HRESULT hr; TRACE("unkOut=%p riid=%s\n", pUnkOuter, debugstr_guid(riid)); *ppv = NULL; @@ -1146,6 +1147,8 @@ HRESULT HLink_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) hl->IDataObject_iface.lpVtbl = &dovt; hl->IBindStatusCallback_iface.lpVtbl = &bind_callback_vtbl; - *ppv = hl; - return S_OK; + hr = IHlink_QueryInterface(&hl->IHlink_iface, riid, ppv); + IHlink_Release(&hl->IHlink_iface); + + return hr; }

1 0

Nikolay Sivov : hlink: Return requested interface when creating IHlinkBrowseContext instance.
by Alexandre Julliard 11 Apr '22

11 Apr '22

Module: wine Branch: master Commit: 759e2eff8bada2d62d7001bb119917ee31c071c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=759e2eff8bada2d62d7001bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 11 11:40:30 2022 +0300 hlink: Return requested interface when creating IHlinkBrowseContext instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/browse_ctx.c | 22 ++++++++++++++-------- dlls/hlink/tests/browse_ctx.c | 10 ++++++++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 44db1a1fc0c..88ee3ea29af 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -53,14 +53,17 @@ static HRESULT WINAPI IHlinkBC_fnQueryInterface( IHlinkBrowseContext *iface, if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IHlinkBrowseContext)) - *ppvObj = This; - - if (*ppvObj) { - IUnknown_AddRef((IUnknown*)(*ppvObj)); - return S_OK; + *ppvObj = &This->IHlinkBrowseContext_iface; } - return E_NOINTERFACE; + else + { + *ppvObj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*ppvObj); + return S_OK; } static ULONG WINAPI IHlinkBC_fnAddRef (IHlinkBrowseContext* iface) @@ -368,6 +371,7 @@ static const IHlinkBrowseContextVtbl hlvt = HRESULT HLinkBrowseContext_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) { HlinkBCImpl * hl; + HRESULT hr; TRACE("unkOut=%p riid=%s\n", pUnkOuter, debugstr_guid(riid)); *ppv = NULL; @@ -383,6 +387,8 @@ HRESULT HLinkBrowseContext_Constructor(IUnknown *pUnkOuter, REFIID riid, void ** hl->IHlinkBrowseContext_iface.lpVtbl = &hlvt; list_init(&hl->links); - *ppv = hl; - return S_OK; + hr = IHlinkBrowseContext_QueryInterface(&hl->IHlinkBrowseContext_iface, riid, ppv); + IHlinkBrowseContext_Release(&hl->IHlinkBrowseContext_iface); + + return hr; } diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index c0a731bb334..4bd7af9d42f 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -197,10 +197,20 @@ static void test_GetObject(void) IMoniker_Release(dummy); } +static void test_interfaces(void) +{ + IHlinkBrowseContext *bc; + HRESULT hr; + + hr = HlinkCreateBrowseContext(NULL, &IID_IMoniker, (void **)&bc); + ok(hr == E_NOINTERFACE, "Unexpected hr %#lx.\n", hr); +} + START_TEST(browse_ctx) { CoInitialize(NULL); + test_interfaces(); test_SetInitialHlink(); test_BrowseWindowInfo(); test_GetObject();

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2022