February 2022 - Wine-commits

Zebediah Figura : wined3d: Protect wined3d_chunk_gl map fields with a mutex.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 4f54f4591af0bf8b060e716c3e622414338dd38b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f54f4591af0bf8b060e716c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 17 00:13:52 2022 -0600 wined3d: Protect wined3d_chunk_gl map fields with a mutex. Parallel to a5efc1d5e06bf1d88148b4800dc489a527e797c8. Unlike with the Vulkan backend, we cannot map chunks from the client thread, but we can access the mapped pointer and increase the map count of already mapped chunks. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 25 ++++++++++++++++++------- dlls/wined3d/device.c | 3 +-- dlls/wined3d/wined3d_private.h | 15 +++++++++++++++ 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 8217d04686c..b82849f8470 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2778,9 +2778,12 @@ static void *wined3d_allocator_chunk_gl_map(struct wined3d_allocator_chunk_gl *c struct wined3d_context_gl *context_gl) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; + void *map_ptr; TRACE("chunk %p, gl_buffer %u, map_ptr %p.\n", chunk_gl, chunk_gl->gl_buffer, chunk_gl->c.map_ptr); + wined3d_allocator_chunk_gl_lock(chunk_gl); + if (!chunk_gl->c.map_ptr) { unsigned int flags = wined3d_device_gl_get_memory_type_flags(chunk_gl->memory_type) & ~GL_CLIENT_STORAGE_BIT; @@ -2795,6 +2798,7 @@ static void *wined3d_allocator_chunk_gl_map(struct wined3d_allocator_chunk_gl *c 0, WINED3D_ALLOCATOR_CHUNK_SIZE, flags)); if (!chunk_gl->c.map_ptr) { + wined3d_allocator_chunk_gl_unlock(chunk_gl); ERR("Failed to map chunk memory.\n"); return NULL; } @@ -2803,8 +2807,11 @@ static void *wined3d_allocator_chunk_gl_map(struct wined3d_allocator_chunk_gl *c } ++chunk_gl->c.map_count; + map_ptr = chunk_gl->c.map_ptr; - return chunk_gl->c.map_ptr; + wined3d_allocator_chunk_gl_unlock(chunk_gl); + + return map_ptr; } static void wined3d_allocator_chunk_gl_unmap(struct wined3d_allocator_chunk_gl *chunk_gl, @@ -2814,14 +2821,18 @@ static void wined3d_allocator_chunk_gl_unmap(struct wined3d_allocator_chunk_gl * TRACE("chunk_gl %p, context_gl %p.\n", chunk_gl, context_gl); - if (--chunk_gl->c.map_count) - return; + wined3d_allocator_chunk_gl_lock(chunk_gl); - wined3d_context_gl_bind_bo(context_gl, GL_PIXEL_UNPACK_BUFFER, chunk_gl->gl_buffer); - GL_EXTCALL(glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)); - chunk_gl->c.map_ptr = NULL; + if (!--chunk_gl->c.map_count) + { + wined3d_context_gl_bind_bo(context_gl, GL_PIXEL_UNPACK_BUFFER, chunk_gl->gl_buffer); + GL_EXTCALL(glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)); + chunk_gl->c.map_ptr = NULL; + + adapter_adjust_mapped_memory(context_gl->c.device->adapter, -WINED3D_ALLOCATOR_CHUNK_SIZE); + } - adapter_adjust_mapped_memory(context_gl->c.device->adapter, -WINED3D_ALLOCATOR_CHUNK_SIZE); + wined3d_allocator_chunk_gl_unlock(chunk_gl); } static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, struct wined3d_context_gl *context_gl, uint32_t flags) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9488e8c642e..f163e77fcf1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -993,14 +993,13 @@ static struct wined3d_allocator_chunk *wined3d_allocator_gl_create_chunk(struct static void wined3d_allocator_gl_destroy_chunk(struct wined3d_allocator_chunk *chunk) { + struct wined3d_device_gl *device_gl = wined3d_device_gl_from_allocator(chunk->allocator); struct wined3d_allocator_chunk_gl *chunk_gl = wined3d_allocator_chunk_gl(chunk); const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; - struct wined3d_device_gl *device_gl; TRACE("chunk %p.\n", chunk); - device_gl = CONTAINING_RECORD(chunk_gl->c.allocator, struct wined3d_device_gl, allocator); context_gl = wined3d_context_gl(context_acquire(&device_gl->d, NULL, 0)); gl_info = context_gl->gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 96ce75fbb58..c8c9bb7c8c6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4213,6 +4213,11 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_gl, d); } +static inline struct wined3d_device_gl *wined3d_device_gl_from_allocator(struct wined3d_allocator *allocator) +{ + return CONTAINING_RECORD(allocator, struct wined3d_device_gl, allocator); +} + static inline void wined3d_device_gl_allocator_lock(struct wined3d_device_gl *device_gl) { EnterCriticalSection(&device_gl->allocator_cs); @@ -4223,6 +4228,16 @@ static inline void wined3d_device_gl_allocator_unlock(struct wined3d_device_gl * LeaveCriticalSection(&device_gl->allocator_cs); } +static inline void wined3d_allocator_chunk_gl_lock(struct wined3d_allocator_chunk_gl *chunk_gl) +{ + wined3d_device_gl_allocator_lock(wined3d_device_gl_from_allocator(chunk_gl->c.allocator)); +} + +static inline void wined3d_allocator_chunk_gl_unlock(struct wined3d_allocator_chunk_gl *chunk_gl) +{ + wined3d_device_gl_allocator_unlock(wined3d_device_gl_from_allocator(chunk_gl->c.allocator)); +} + bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct wined3d_context_gl *context_gl, GLsizeiptr size, GLenum binding, GLenum usage, bool coherent, GLbitfield flags, struct wined3d_bo_gl *bo) DECLSPEC_HIDDEN;

1 0

Huw Davies : winealsa: Explicitly store the name and channel count in the audio client.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 8e13b4bd0c21e7fca51c033c384e6b2d7a8bc41c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e13b4bd0c21e7fca51c033c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 16 09:34:47 2022 +0000 winealsa: Explicitly store the name and channel count in the audio 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/winealsa.drv/mmdevdrv.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 516bba1e5fc..abec9dc969a 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -119,6 +119,7 @@ struct ACImpl { AUDCLNT_SHAREMODE share; HANDLE event; float *vols; + UINT32 channel_count; BOOL need_remapping; int alsa_channels; @@ -145,6 +146,9 @@ struct ACImpl { AudioSessionWrapper *session_wrapper; struct list entry; + + /* Keep at end */ + char alsa_name[1]; }; typedef struct _SessionMgr { @@ -472,6 +476,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient char alsa_name[256]; EDataFlow dataflow; HRESULT hr; + int len; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); @@ -481,7 +486,8 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient if(dataflow != eRender && dataflow != eCapture) return E_UNEXPECTED; - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); + len = strlen(alsa_name); + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, offsetof(ACImpl, alsa_name[len + 1])); if(!This) return E_OUTOFMEMORY; @@ -499,6 +505,8 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient } This->dataflow = dataflow; + memcpy(This->alsa_name, alsa_name, len + 1); + err = snd_pcm_open(&This->pcm_handle, alsa_name, alsa_get_direction(dataflow), SND_PCM_NONBLOCK); if(err < 0){ HeapFree(GetProcessHeap(), 0, This); @@ -1159,19 +1167,20 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } silence_buffer(This, This->silence_buf, This->alsa_period_frames); - 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){ hr = E_OUTOFMEMORY; goto exit; } - 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; - hr = get_audio_session(sessionguid, This->parent, fmt->nChannels, + hr = get_audio_session(sessionguid, This->parent, This->channel_count, &This->session); if(FAILED(hr)) goto exit; @@ -3385,7 +3394,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelCount( if(!out) return E_POINTER; - *out = This->fmt->nChannels; + *out = This->channel_count; return S_OK; } @@ -3400,7 +3409,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; TRACE("ALSA does not support volume control\n"); @@ -3424,7 +3433,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]; @@ -3443,7 +3452,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( if(!levels) return E_POINTER; - if(count != This->fmt->nChannels) + if(count != This->channel_count) return E_INVALIDARG; TRACE("ALSA does not support volume control\n"); @@ -3469,7 +3478,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

Huw Davies : winealsa: Use the global lock to lock the session.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 10d44c9a8a402dd6bcd9853d3b566a2401cea6a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10d44c9a8a402dd6bcd9853d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 16 09:34:48 2022 +0000 winealsa: Use the global lock to lock the session. Mainly just 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/winealsa.drv/mmdevdrv.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index abec9dc969a..0549752dc3f 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -77,8 +77,6 @@ typedef struct _AudioSession { float *channel_vols; BOOL mute; - CRITICAL_SECTION lock; - struct list entry; } AudioSession; @@ -748,9 +746,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; @@ -3283,11 +3278,11 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->master_vol = level; - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -3573,11 +3568,11 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->channel_vols[index] = level; - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -3623,12 +3618,12 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( TRACE("ALSA does not support volume control\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; }

1 0

Rémi Bernon : winegstreamer: Remove unnecessary DECLSPEC_HIDDEN qualifier.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 664621d328b642d2bf6b2424833fc95a22a8b62b URL: https://source.winehq.org/git/wine.git/?a=commit;h=664621d328b642d2bf6b2424… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 16 12:19:05 2022 +0100 winegstreamer: Remove unnecessary DECLSPEC_HIDDEN qualifier. On PE internal functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 64 ++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 222bce3b2c7..3584f465218 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -39,7 +39,7 @@ #include "unixlib.h" -bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size) DECLSPEC_HIDDEN; +bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size); static inline const char *debugstr_time(REFERENCE_TIME time) { @@ -64,60 +64,60 @@ static inline const char *debugstr_time(REFERENCE_TIME time) #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) -struct wg_parser *wg_parser_create(enum wg_parser_type type, bool unlimited_buffering) DECLSPEC_HIDDEN; -void wg_parser_destroy(struct wg_parser *parser) DECLSPEC_HIDDEN; +struct wg_parser *wg_parser_create(enum wg_parser_type type, bool unlimited_buffering); +void wg_parser_destroy(struct wg_parser *parser); -HRESULT wg_parser_connect(struct wg_parser *parser, uint64_t file_size) DECLSPEC_HIDDEN; -void wg_parser_disconnect(struct wg_parser *parser) DECLSPEC_HIDDEN; +HRESULT wg_parser_connect(struct wg_parser *parser, uint64_t file_size); +void wg_parser_disconnect(struct wg_parser *parser); -void wg_parser_begin_flush(struct wg_parser *parser) DECLSPEC_HIDDEN; -void wg_parser_end_flush(struct wg_parser *parser) DECLSPEC_HIDDEN; +void wg_parser_begin_flush(struct wg_parser *parser); +void wg_parser_end_flush(struct wg_parser *parser); -bool wg_parser_get_next_read_offset(struct wg_parser *parser, uint64_t *offset, uint32_t *size) DECLSPEC_HIDDEN; -void wg_parser_push_data(struct wg_parser *parser, const void *data, uint32_t size) DECLSPEC_HIDDEN; +bool wg_parser_get_next_read_offset(struct wg_parser *parser, uint64_t *offset, uint32_t *size); +void wg_parser_push_data(struct wg_parser *parser, const void *data, uint32_t size); -uint32_t wg_parser_get_stream_count(struct wg_parser *parser) DECLSPEC_HIDDEN; -struct wg_parser_stream *wg_parser_get_stream(struct wg_parser *parser, uint32_t index) DECLSPEC_HIDDEN; +uint32_t wg_parser_get_stream_count(struct wg_parser *parser); +struct wg_parser_stream *wg_parser_get_stream(struct wg_parser *parser, uint32_t index); -void wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format) DECLSPEC_HIDDEN; -void wg_parser_stream_enable(struct wg_parser_stream *stream, const struct wg_format *format) DECLSPEC_HIDDEN; -void wg_parser_stream_disable(struct wg_parser_stream *stream) DECLSPEC_HIDDEN; +void wg_parser_stream_get_preferred_format(struct wg_parser_stream *stream, struct wg_format *format); +void wg_parser_stream_enable(struct wg_parser_stream *stream, const struct wg_format *format); +void wg_parser_stream_disable(struct wg_parser_stream *stream); -bool wg_parser_stream_get_event(struct wg_parser_stream *stream, struct wg_parser_event *event) DECLSPEC_HIDDEN; +bool wg_parser_stream_get_event(struct wg_parser_stream *stream, struct wg_parser_event *event); bool wg_parser_stream_copy_buffer(struct wg_parser_stream *stream, - void *data, uint32_t offset, uint32_t size) DECLSPEC_HIDDEN; -void wg_parser_stream_release_buffer(struct wg_parser_stream *stream) DECLSPEC_HIDDEN; + void *data, uint32_t offset, uint32_t size); +void wg_parser_stream_release_buffer(struct wg_parser_stream *stream); void wg_parser_stream_notify_qos(struct wg_parser_stream *stream, - bool underflow, double proportion, int64_t diff, uint64_t timestamp) DECLSPEC_HIDDEN; + bool underflow, double proportion, int64_t diff, uint64_t timestamp); /* Returns the duration in 100-nanosecond units. */ -uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream) DECLSPEC_HIDDEN; +uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream); /* start_pos and stop_pos are in 100-nanosecond units. */ void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, - uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags) DECLSPEC_HIDDEN; + uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags); unsigned int wg_format_get_max_size(const struct wg_format *format); -HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; -HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; +HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out); +HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out); +HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out); +HRESULT wave_parser_create(IUnknown *outer, IUnknown **out); +HRESULT wma_decoder_create(IUnknown *outer, IUnknown **out); bool amt_from_wg_format(AM_MEDIA_TYPE *mt, const struct wg_format *format, bool wm); bool amt_to_wg_format(const AM_MEDIA_TYPE *mt, struct wg_format *format); -BOOL init_gstreamer(void) DECLSPEC_HIDDEN; +BOOL init_gstreamer(void); -extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) DECLSPEC_HIDDEN; -extern HRESULT mfplat_DllRegisterServer(void) DECLSPEC_HIDDEN; +extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj); +extern HRESULT mfplat_DllRegisterServer(void); -IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format) DECLSPEC_HIDDEN; -void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format) DECLSPEC_HIDDEN; +IMFMediaType *mf_media_type_from_wg_format(const struct wg_format *format); +void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format); -HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN; +HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj); -HRESULT audio_converter_create(REFIID riid, void **ret) DECLSPEC_HIDDEN; +HRESULT audio_converter_create(REFIID riid, void **ret); struct wm_stream {

1 0

Rémi Bernon : winegstreamer: Move format helpers to a dedicated source.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: a288b94831bcd9ef65c23475d8499e53fea69c18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a288b94831bcd9ef65c23475… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 16 12:19:06 2022 +0100 winegstreamer: Move format helpers to a dedicated source. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/unix_private.h | 32 +++ dlls/winegstreamer/wg_format.c | 436 ++++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/wg_parser.c | 397 +--------------------------------- 4 files changed, 471 insertions(+), 395 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a288b94831bcd9ef65c2…

1 0

Rémi Bernon : winegstreamer: Introduce new WG_MAJOR_TYPE_WMA major type.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 76e2883c4ace29279dce8ea58787871046227b1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=76e2883c4ace29279dce8ea5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 16 12:19:07 2022 +0100 winegstreamer: Introduce new WG_MAJOR_TYPE_WMA major type. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/mfplat.c | 109 ++++++++++++++++++++++++++++++------- dlls/winegstreamer/quartz_parser.c | 8 +++ dlls/winegstreamer/unixlib.h | 12 ++++ dlls/winegstreamer/wg_format.c | 7 +++ dlls/winegstreamer/wm_reader.c | 8 +++ dlls/winegstreamer/wma_decoder.c | 18 ++++++ 6 files changed, 141 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=76e2883c4ace29279dce…

1 0

Rémi Bernon : winegstreamer: Introduce new wg_transform struct.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 51a262d368afca3ec1edf50a850dbd5339194280 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51a262d368afca3ec1edf50a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 16 12:19:08 2022 +0100 winegstreamer: Introduce new wg_transform struct. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/gst_private.h | 3 ++ dlls/winegstreamer/main.c | 14 +++++++ dlls/winegstreamer/unix_private.h | 5 +++ dlls/winegstreamer/unixlib.h | 8 ++++ dlls/winegstreamer/wg_parser.c | 13 +++++- dlls/winegstreamer/wg_transform.c | 88 +++++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/wma_decoder.c | 11 +++++ 8 files changed, 141 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index d9805e3d797..0bcdb3eec65 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ quartz_parser.c \ wg_format.c \ wg_parser.c \ + wg_transform.c \ wm_asyncreader.c \ wm_reader.c \ wm_syncreader.c \ diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 3584f465218..8bc9f838d29 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -96,6 +96,9 @@ uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream); void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags); +struct wg_transform *wg_transform_create(void); +void wg_transform_destroy(struct wg_transform *transform); + unsigned int wg_format_get_max_size(const struct wg_format *format); HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 260dd208e2f..f23fa3abcdf 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -254,6 +254,20 @@ void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, __wine_unix_call(unix_handle, unix_wg_parser_stream_seek, &params); } +struct wg_transform *wg_transform_create(void) +{ + struct wg_transform_create_params params = {0}; + + if (__wine_unix_call(unix_handle, unix_wg_transform_create, &params)) + return NULL; + return params.transform; +} + +void wg_transform_destroy(struct wg_transform *transform) +{ + __wine_unix_call(unix_handle, unix_wg_transform_destroy, transform); +} + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { if (reason == DLL_PROCESS_ATTACH) diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h index b483638403d..f9c4da2f6ea 100644 --- a/dlls/winegstreamer/unix_private.h +++ b/dlls/winegstreamer/unix_private.h @@ -25,8 +25,13 @@ #include <gst/gst.h> +extern bool init_gstreamer(void) DECLSPEC_HIDDEN; + extern void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) DECLSPEC_HIDDEN; extern bool wg_format_compare(const struct wg_format *a, const struct wg_format *b) DECLSPEC_HIDDEN; extern GstCaps *wg_format_to_caps(const struct wg_format *format) DECLSPEC_HIDDEN; +extern NTSTATUS wg_transform_create(void *args) DECLSPEC_HIDDEN; +extern NTSTATUS wg_transform_destroy(void *args) DECLSPEC_HIDDEN; + #endif /* __WINE_WINEGSTREAMER_UNIX_PRIVATE_H */ diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 45ec606fc6a..8e3f5e84bfb 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -229,6 +229,11 @@ struct wg_parser_stream_seek_params DWORD start_flags, stop_flags; }; +struct wg_transform_create_params +{ + struct wg_transform *transform; +}; + enum unix_funcs { unix_wg_parser_create, @@ -257,6 +262,9 @@ enum unix_funcs unix_wg_parser_stream_get_duration, unix_wg_parser_stream_seek, + + unix_wg_transform_create, + unix_wg_transform_destroy, }; #endif /* __WINE_WINEGSTREAMER_UNIXLIB_H */ diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index a73685a2e69..5a2e970a4dd 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1570,6 +1570,13 @@ static void init_gstreamer_once(void) gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); } +bool init_gstreamer(void) +{ + static pthread_once_t init_once = PTHREAD_ONCE_INIT; + + return !pthread_once(&init_once, init_gstreamer_once); +} + static NTSTATUS wg_parser_create(void *args) { static const init_gst_cb init_funcs[] = @@ -1580,11 +1587,10 @@ static NTSTATUS wg_parser_create(void *args) [WG_PARSER_WAVPARSE] = wave_parser_init_gst, }; - static pthread_once_t once = PTHREAD_ONCE_INIT; struct wg_parser_create_params *params = args; struct wg_parser *parser; - if (pthread_once(&once, init_gstreamer_once)) + if (!init_gstreamer()) return E_FAIL; if (!(parser = calloc(1, sizeof(*parser)))) @@ -1651,4 +1657,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = X(wg_parser_stream_get_duration), X(wg_parser_stream_seek), + + X(wg_transform_create), + X(wg_transform_destroy), }; diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c new file mode 100644 index 00000000000..2f225e5bc55 --- /dev/null +++ b/dlls/winegstreamer/wg_transform.c @@ -0,0 +1,88 @@ +/* + * GStreamer transform backend + * + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include "config.h" + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> + +#include <gst/gst.h> +#include <gst/video/video.h> +#include <gst/audio/audio.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "winternl.h" +#include "dshow.h" + +#include "unix_private.h" + +GST_DEBUG_CATEGORY_EXTERN(wine); +#define GST_CAT_DEFAULT wine + +struct wg_transform +{ + int dummy; +}; + +NTSTATUS wg_transform_destroy(void *args) +{ + struct wg_transform *transform = args; + + free(transform); + return STATUS_SUCCESS; +} + +NTSTATUS wg_transform_create(void *args) +{ + struct wg_transform_create_params *params = args; + struct wg_transform *transform; + NTSTATUS status; + + if (!init_gstreamer()) + return STATUS_UNSUCCESSFUL; + + status = STATUS_NO_MEMORY; + + if (!(transform = calloc(1, sizeof(*transform)))) + goto done; + + status = STATUS_SUCCESS; + +done: + if (status) + { + GST_ERROR("Failed to create winegstreamer transform."); + if (transform) + wg_transform_destroy(transform); + } + else + { + GST_INFO("Created winegstreamer transform %p.", transform); + params->transform = transform; + } + + return status; +} diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 31f735a5b1d..b14261706a7 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -53,6 +53,8 @@ struct wma_decoder LONG refcount; IMFMediaType *input_type; IMFMediaType *output_type; + + struct wg_transform *wg_transform; }; static inline struct wma_decoder *impl_from_IUnknown(IUnknown *iface) @@ -64,6 +66,10 @@ static HRESULT try_create_wg_transform(struct wma_decoder *decoder) { struct wg_format input_format, output_format; + if (decoder->wg_transform) + wg_transform_destroy(decoder->wg_transform); + decoder->wg_transform = NULL; + mf_media_type_to_wg_format(decoder->input_type, &input_format); if (input_format.major_type == WG_MAJOR_TYPE_UNKNOWN) return MF_E_INVALIDMEDIATYPE; @@ -72,6 +78,9 @@ static HRESULT try_create_wg_transform(struct wma_decoder *decoder) if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN) return MF_E_INVALIDMEDIATYPE; + if (!(decoder->wg_transform = wg_transform_create())) + return E_FAIL; + return S_OK; } @@ -119,6 +128,8 @@ static ULONG WINAPI unknown_Release(IUnknown *iface) if (!refcount) { + if (decoder->wg_transform) + wg_transform_destroy(decoder->wg_transform); if (decoder->input_type) IMFMediaType_Release(decoder->input_type); if (decoder->output_type)

1 0

Rémi Bernon : winegstreamer: Create static pads on wg_transform struct.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 71bf5b24d7efabfcacfa707198efc4be0da3e446 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71bf5b24d7efabfcacfa7071… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 16 12:19:09 2022 +0100 winegstreamer: Create static pads on wg_transform struct. With caps created from the input / output formats. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 3 ++- dlls/winegstreamer/main.c | 9 +++++-- dlls/winegstreamer/unixlib.h | 2 ++ dlls/winegstreamer/wg_format.c | 40 ++++++++++++++++++++++++++++-- dlls/winegstreamer/wg_transform.c | 51 ++++++++++++++++++++++++++++++++++++++- dlls/winegstreamer/wma_decoder.c | 2 +- 6 files changed, 100 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 8bc9f838d29..a63daaf04b9 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -96,7 +96,8 @@ uint64_t wg_parser_stream_get_duration(struct wg_parser_stream *stream); void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags); -struct wg_transform *wg_transform_create(void); +struct wg_transform *wg_transform_create(const struct wg_format *input_format, + const struct wg_format *output_format); void wg_transform_destroy(struct wg_transform *transform); unsigned int wg_format_get_max_size(const struct wg_format *format); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index f23fa3abcdf..f85e9995525 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -254,9 +254,14 @@ void wg_parser_stream_seek(struct wg_parser_stream *stream, double rate, __wine_unix_call(unix_handle, unix_wg_parser_stream_seek, &params); } -struct wg_transform *wg_transform_create(void) +struct wg_transform *wg_transform_create(const struct wg_format *input_format, + const struct wg_format *output_format) { - struct wg_transform_create_params params = {0}; + struct wg_transform_create_params params = + { + .input_format = input_format, + .output_format = output_format, + }; if (__wine_unix_call(unix_handle, unix_wg_transform_create, &params)) return NULL; diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 8e3f5e84bfb..4adbb694766 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -232,6 +232,8 @@ struct wg_parser_stream_seek_params struct wg_transform_create_params { struct wg_transform *transform; + const struct wg_format *input_format; + const struct wg_format *output_format; }; enum unix_funcs diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 8f771bb8abd..40b9acfefff 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -394,6 +394,43 @@ static GstCaps *wg_format_to_caps_video(const struct wg_format *format) return caps; } +static GstCaps *wg_format_to_caps_wma(const struct wg_format *format) +{ + GstBuffer *buffer; + GstCaps *caps; + + if (!(caps = gst_caps_new_empty_simple("audio/x-wma"))) + return NULL; + if (format->u.wma.version) + gst_caps_set_simple(caps, "wmaversion", G_TYPE_INT, format->u.wma.version, NULL); + + if (format->u.wma.bitrate) + gst_caps_set_simple(caps, "bitrate", G_TYPE_INT, format->u.wma.bitrate, NULL); + if (format->u.wma.rate) + gst_caps_set_simple(caps, "rate", G_TYPE_INT, format->u.wma.rate, NULL); + if (format->u.wma.depth) + gst_caps_set_simple(caps, "depth", G_TYPE_INT, format->u.wma.depth, NULL); + if (format->u.wma.channels) + gst_caps_set_simple(caps, "channels", G_TYPE_INT, format->u.wma.channels, NULL); + if (format->u.wma.block_align) + gst_caps_set_simple(caps, "block_align", G_TYPE_INT, format->u.wma.block_align, NULL); + + if (format->u.wma.codec_data_len) + { + if (!(buffer = gst_buffer_new_and_alloc(format->u.wma.codec_data_len))) + { + gst_caps_unref(caps); + return NULL; + } + + gst_buffer_fill(buffer, 0, format->u.wma.codec_data, format->u.wma.codec_data_len); + gst_caps_set_simple(caps, "codec_data", GST_TYPE_BUFFER, buffer, NULL); + gst_buffer_unref(buffer); + } + + return caps; +} + GstCaps *wg_format_to_caps(const struct wg_format *format) { switch (format->major_type) @@ -401,8 +438,7 @@ GstCaps *wg_format_to_caps(const struct wg_format *format) case WG_MAJOR_TYPE_UNKNOWN: return NULL; case WG_MAJOR_TYPE_WMA: - GST_FIXME("WMA format not implemented!\n"); - return NULL; + return wg_format_to_caps_wma(format); case WG_MAJOR_TYPE_AUDIO: return wg_format_to_caps_audio(format); case WG_MAJOR_TYPE_VIDEO: diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 2f225e5bc55..e4545774428 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -44,13 +44,29 @@ GST_DEBUG_CATEGORY_EXTERN(wine); struct wg_transform { - int dummy; + GstPad *my_src, *my_sink; }; +static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) +{ + struct wg_transform *transform = gst_pad_get_element_private(pad); + + GST_INFO("transform %p, buffer %p.", transform, buffer); + + gst_buffer_unref(buffer); + + return GST_FLOW_OK; +} + NTSTATUS wg_transform_destroy(void *args) { struct wg_transform *transform = args; + if (transform->my_sink) + g_object_unref(transform->my_sink); + if (transform->my_src) + g_object_unref(transform->my_src); + free(transform); return STATUS_SUCCESS; } @@ -58,6 +74,10 @@ NTSTATUS wg_transform_destroy(void *args) NTSTATUS wg_transform_create(void *args) { struct wg_transform_create_params *params = args; + struct wg_format output_format = *params->output_format; + struct wg_format input_format = *params->input_format; + GstCaps *src_caps = NULL, *sink_caps = NULL; + GstPadTemplate *template = NULL; struct wg_transform *transform; NTSTATUS status; @@ -69,9 +89,38 @@ NTSTATUS wg_transform_create(void *args) if (!(transform = calloc(1, sizeof(*transform)))) goto done; + if (!(src_caps = wg_format_to_caps(&input_format))) + goto done; + if (!(sink_caps = wg_format_to_caps(&output_format))) + goto done; + + if (!(template = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, src_caps))) + goto done; + if (!(transform->my_src = gst_pad_new_from_template(template, "src"))) + goto done; + g_object_unref(template); + template = NULL; + + if (!(template = gst_pad_template_new("sink", GST_PAD_SINK, GST_PAD_ALWAYS, sink_caps))) + goto done; + if (!(transform->my_sink = gst_pad_new_from_template(template, "sink"))) + goto done; + g_object_unref(template); + template = NULL; + + gst_pad_set_element_private(transform->my_sink, transform); + gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb); + status = STATUS_SUCCESS; done: + if (template) + g_object_unref(template); + if (sink_caps) + gst_caps_unref(sink_caps); + if (src_caps) + gst_caps_unref(src_caps); + if (status) { GST_ERROR("Failed to create winegstreamer transform."); diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index b14261706a7..6c198706944 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -78,7 +78,7 @@ static HRESULT try_create_wg_transform(struct wma_decoder *decoder) if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN) return MF_E_INVALIDMEDIATYPE; - if (!(decoder->wg_transform = wg_transform_create())) + if (!(decoder->wg_transform = wg_transform_create(&input_format, &output_format))) return E_FAIL; return S_OK;

1 0

Zebediah Figura : kernelbase: Allow the two initial slashes to be backslashes in UrlGetPart().
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: b72f7afc8bd603179b1eb66ae67423e4fee8f6d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b72f7afc8bd603179b1eb66a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 16 20:31:40 2022 -0600 kernelbase: Allow the two initial slashes to be backslashes in UrlGetPart(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 8 +++++++- dlls/shlwapi/tests/url.c | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index e29ee585123..befdf237c5e 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -4191,6 +4191,11 @@ static const WCHAR *parse_url_element( const WCHAR *url, const WCHAR *separators return url + wcslen( url ); } +static BOOL is_slash( char c ) +{ + return c == '/' || c == '\\'; +} + static void parse_url( const WCHAR *url, struct parsed_url *pl ) { const WCHAR *work; @@ -4200,7 +4205,8 @@ static void parse_url( const WCHAR *url, struct parsed_url *pl ) work = scan_url(pl->scheme, &pl->scheme_len, SCHEME); if (!*work || (*work != ':')) return; work++; - if ((*work != '/') || (*(work+1) != '/')) return; + if (!is_slash( work[0] ) || !is_slash( work[1] )) + return; pl->username = work + 2; work = parse_url_element( pl->username, L":@/\\?#" ); diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 18af0906e08..ae0d0738195 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -661,12 +661,12 @@ static void test_UrlGetPart(void) {"http:/localhost/index.html", URL_PART_HOSTNAME, 0, E_FAIL, .todo_hr = TRUE}, {"http://localhost\\index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, - {"http:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, - {"http:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, + {"http:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, + {"http:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"ftp://localhost\\index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, - {"ftp:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, - {"ftp:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost", .todo_hr = TRUE}, + {"ftp:/\\localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, + {"ftp:\\/localhost/index.html", URL_PART_HOSTNAME, 0, S_OK, "localhost"}, {"http://host?a:b(a)c:d", URL_PART_HOSTNAME, 0, S_OK, "host"}, {"http://host?a:b(a)c:d", URL_PART_QUERY, 0, S_OK, "a:b(a)c:d"},

1 0

Zebediah Figura : kernelbase: Get rid of the "size" and "type" arguments to scan_url().
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 6cb12645851108e2488675501f4ab90b8a35570e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cb12645851108e248867550… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 16 20:31:41 2022 -0600 kernelbase: Get rid of the "size" and "type" arguments to scan_url(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index befdf237c5e..3fdc752938c 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -74,11 +74,6 @@ struct parsed_url DWORD query_len; /* [out] size of Query (until eos) */ }; -enum url_scan_type -{ - SCHEME, -}; - static WCHAR *heap_strdupAtoW(const char *str) { WCHAR *ret = NULL; @@ -4158,28 +4153,11 @@ HRESULT WINAPI UrlGetPartA(const char *url, char *out, DWORD *out_len, DWORD par return hr; } -static const WCHAR * scan_url(const WCHAR *start, DWORD *size, enum url_scan_type type) +static const WCHAR *parse_scheme( const WCHAR *p ) { - *size = 0; - - switch (type) - { - case SCHEME: - while ((isalnum( *start ) && !isupper( *start )) || *start == '+' || *start == '-' || *start == '.') - { - start++; - (*size)++; - } - if (*start != ':') - *size = 0; - break; - - default: - FIXME("unknown type %d\n", type); - return L""; - } - - return start; + while ((*p >= 'a' && *p <= 'z') || (*p >= '0' && *p <= '9') || *p == '+' || *p == '-' || *p == '.') + ++p; + return p; } static const WCHAR *parse_url_element( const WCHAR *url, const WCHAR *separators ) @@ -4202,8 +4180,9 @@ static void parse_url( const WCHAR *url, struct parsed_url *pl ) memset(pl, 0, sizeof(*pl)); pl->scheme = url; - work = scan_url(pl->scheme, &pl->scheme_len, SCHEME); - if (!*work || (*work != ':')) return; + work = parse_scheme( pl->scheme ); + if (*work != ':') return; + pl->scheme_len = work - pl->scheme; work++; if (!is_slash( work[0] ) || !is_slash( work[1] )) return;

1 0