November 2022 - Wine-Commits

Alex Henrie : dmsynth: Don't force a calling convention on internal functions.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 0b004131e21b5e8d504f261a4a64c0802005a56a URL: https://gitlab.winehq.org/wine/wine/-/commit/0b004131e21b5e8d504f261a4a64c0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 20:54:30 2022 -0700 dmsynth: Don't force a calling convention on internal functions. --- dlls/dmsynth/dmsynth_main.c | 2 +- dlls/dmsynth/dmsynth_private.h | 4 ++-- dlls/dmsynth/synth.c | 2 +- dlls/dmsynth/synthsink.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index 014eb0eb6f1..a5e2e605419 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -29,7 +29,7 @@ LONG DMSYNTH_refCount = 0; typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv); + HRESULT (*fnCreateInstance)(REFIID riid, void **ppv); } IClassFactoryImpl; /****************************************************************** diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index 0058ce04d3a..b0e4c66f416 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -49,8 +49,8 @@ typedef struct IDirectMusicSynthSinkImpl IDirectMusicSynthSinkImpl; /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void **ppobj) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void **ppobj) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusicSynth8Impl implementation structure diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index d96ee943a5e..121d9aadf35 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -729,7 +729,7 @@ static const IKsControlVtbl DMSynthImpl_IKsControl_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) +HRESULT DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) { IDirectMusicSynth8Impl *obj; HRESULT hr; diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index d34bcf9df5e..a277a05bafb 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -298,7 +298,7 @@ static const IKsControlVtbl DMSynthSinkImpl_IKsControl_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void **ret_iface) +HRESULT DMUSIC_CreateDirectMusicSynthSinkImpl(REFIID riid, void **ret_iface) { IDirectMusicSynthSinkImpl *obj; HRESULT hr;

1 0

Alex Henrie : dmstyle: Don't force a calling convention on internal functions.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 6bf23c4ae91ed85ab8e08ae5ca53b712699568ed URL: https://gitlab.winehq.org/wine/wine/-/commit/6bf23c4ae91ed85ab8e08ae5ca53b7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 20:54:30 2022 -0700 dmstyle: Don't force a calling convention on internal functions. --- dlls/dmstyle/auditiontrack.c | 2 +- dlls/dmstyle/chordtrack.c | 2 +- dlls/dmstyle/commandtrack.c | 2 +- dlls/dmstyle/dmstyle_main.c | 4 ++-- dlls/dmstyle/dmstyle_private.h | 14 +++++++------- dlls/dmstyle/motiftrack.c | 2 +- dlls/dmstyle/mutetrack.c | 2 +- dlls/dmstyle/style.c | 2 +- dlls/dmstyle/styletrack.c | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index 29ad868f773..0bf1c818f6c 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -316,7 +316,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmauditiontrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmauditiontrack(REFIID lpcGUID, void **ppobj) { IDirectMusicAuditionTrack *track; HRESULT hr; diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index 98c9169d2ee..fdaecac1240 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -415,7 +415,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmchordtrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmchordtrack(REFIID lpcGUID, void **ppobj) { IDirectMusicChordTrack *track; HRESULT hr; diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index 417b7847403..32e0bbe8c0d 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -368,7 +368,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmcommandtrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmcommandtrack(REFIID lpcGUID, void **ppobj) { IDirectMusicCommandTrack *track; HRESULT hr; diff --git a/dlls/dmstyle/dmstyle_main.c b/dlls/dmstyle/dmstyle_main.c index cdee2fefc10..8f951ece5ae 100644 --- a/dlls/dmstyle/dmstyle_main.c +++ b/dlls/dmstyle/dmstyle_main.c @@ -41,10 +41,10 @@ LONG DMSTYLE_refCount = 0; typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ret_iface); + HRESULT (*fnCreateInstance)(REFIID riid, void **ret_iface); } IClassFactoryImpl; -static HRESULT WINAPI create_direct_music_section(REFIID riid, void **ret_iface) +static HRESULT create_direct_music_section(REFIID riid, void **ret_iface) { FIXME("(%s, %p) stub\n", debugstr_dmguid(riid), ret_iface); diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 2956dad1513..4c8dd091536 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -44,13 +44,13 @@ /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI create_dmstyle(REFIID lpcGUID, LPVOID* ppobj) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmauditiontrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmchordtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmcommandtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmmotiftrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmmutetrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmstyletrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmstyle(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmauditiontrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmchordtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmcommandtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmmotiftrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmmutetrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmstyletrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; /***************************************************************************** * Auxiliary definitions diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c index 0fa1a48bcc4..5efe90706e0 100644 --- a/dlls/dmstyle/motiftrack.c +++ b/dlls/dmstyle/motiftrack.c @@ -288,7 +288,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmmotiftrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmmotiftrack(REFIID lpcGUID, void **ppobj) { IDirectMusicMotifTrack *track; HRESULT hr; diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c index 08fed5d5f2a..2248d7151dd 100644 --- a/dlls/dmstyle/mutetrack.c +++ b/dlls/dmstyle/mutetrack.c @@ -297,7 +297,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmmutetrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmmutetrack(REFIID lpcGUID, void **ppobj) { IDirectMusicMuteTrack *track; HRESULT hr; diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 9048984adea..ae939f8b738 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -973,7 +973,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmstyle(REFIID lpcGUID, void **ppobj) +HRESULT create_dmstyle(REFIID lpcGUID, void **ppobj) { IDirectMusicStyle8Impl* obj; HRESULT hr; diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index a1e31bcd3b4..bdc665fe302 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -502,7 +502,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmstyletrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmstyletrack(REFIID lpcGUID, void **ppobj) { IDirectMusicStyleTrack *track; HRESULT hr;

1 0

Paul Gofman : winhttp: Cache script in download_script().
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 71fdd64bc6b0f8390e3a62fd814183ff3485ec1c URL: https://gitlab.winehq.org/wine/wine/-/commit/71fdd64bc6b0f8390e3a62fd814183… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 23 17:32:47 2022 -0600 winhttp: Cache script in download_script(). --- dlls/winhttp/session.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 3d99e9b0ac6..8aa99f0ece7 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1901,6 +1901,50 @@ static BOOL parse_script_result( const char *result, WINHTTP_PROXY_INFO *info ) return TRUE; } +static SRWLOCK cache_lock = SRWLOCK_INIT; +static DWORD cached_script_size; +static ULONGLONG cache_update_time; +static char *cached_script; +static WCHAR *cached_url; + +static BOOL get_cached_script( const WCHAR *url, char **buffer, DWORD *out_size ) +{ + BOOL ret = FALSE; + + *buffer = NULL; + *out_size = 0; + + AcquireSRWLockExclusive( &cache_lock ); + if (cached_url && !wcscmp( cached_url, url ) && GetTickCount64() - cache_update_time < 60000) + { + ret = TRUE; + if (cached_script && (*buffer = malloc( cached_script_size ))) + { + memcpy( *buffer, cached_script, cached_script_size ); + *out_size = cached_script_size; + } + } + ReleaseSRWLockExclusive( &cache_lock ); + return ret; +} + +static void cache_script( const WCHAR *url, char *buffer, DWORD size ) +{ + AcquireSRWLockExclusive( &cache_lock ); + free( cached_url ); + free( cached_script ); + cached_script_size = 0; + cached_script = NULL; + + if ((cached_url = wcsdup( url )) && buffer && (cached_script = malloc( size ))) + { + memcpy( cached_script, buffer, size ); + cached_script_size = size; + } + cache_update_time = GetTickCount64(); + ReleaseSRWLockExclusive( &cache_lock ); +} + static char *download_script( const WCHAR *url, DWORD *out_size ) { static const WCHAR *acceptW[] = {L"*/*", NULL}; @@ -1908,9 +1952,14 @@ static char *download_script( const WCHAR *url, DWORD *out_size ) WCHAR *hostname; URL_COMPONENTSW uc; DWORD status, size = sizeof(status), offset, to_read, bytes_read, flags = 0; - char *tmp, *buffer = NULL; + char *tmp, *buffer; - *out_size = 0; + if (get_cached_script( url, &buffer, out_size )) + { + TRACE( "Returning cached result.\n" ); + if (!buffer) SetLastError( ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT ); + return buffer; + } memset( &uc, 0, sizeof(uc) ); uc.dwStructSize = sizeof(uc); @@ -1957,6 +2006,7 @@ done: WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); free( hostname ); + cache_script( url, buffer, *out_size ); if (!buffer) SetLastError( ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT ); return buffer; }

1 0

Alex Henrie : dmime: Don't force a calling convention on internal functions.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: e1e651c83c9c4bc97bfc332252dc1d80cc43f878 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1e651c83c9c4bc97bfc332252dc1d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 20:54:30 2022 -0700 dmime: Don't force a calling convention on internal functions. --- dlls/dmime/audiopath.c | 2 +- dlls/dmime/dmime_main.c | 2 +- dlls/dmime/dmime_private.h | 30 +++++++++++++++--------------- dlls/dmime/graph.c | 2 +- dlls/dmime/lyricstrack.c | 2 +- dlls/dmime/markertrack.c | 2 +- dlls/dmime/paramcontroltrack.c | 2 +- dlls/dmime/performance.c | 2 +- dlls/dmime/segment.c | 2 +- dlls/dmime/segmentstate.c | 2 +- dlls/dmime/segtriggertrack.c | 2 +- dlls/dmime/seqtrack.c | 2 +- dlls/dmime/sysextrack.c | 2 +- dlls/dmime/tempotrack.c | 2 +- dlls/dmime/timesigtrack.c | 2 +- dlls/dmime/wavetrack.c | 2 +- 16 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 5018be9d453..0857ed77c48 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -325,7 +325,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmaudiopath(REFIID riid, void **ppobj) +HRESULT create_dmaudiopath(REFIID riid, void **ppobj) { IDirectMusicAudioPathImpl* obj; HRESULT hr; diff --git a/dlls/dmime/dmime_main.c b/dlls/dmime/dmime_main.c index 0842517452c..c24cf944af5 100644 --- a/dlls/dmime/dmime_main.c +++ b/dlls/dmime/dmime_main.c @@ -42,7 +42,7 @@ LONG DMIME_refCount = 0; typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ret_iface); + HRESULT (*fnCreateInstance)(REFIID riid, void **ret_iface); } IClassFactoryImpl; /****************************************************************** diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index c2221a15fd2..4159abffa99 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -51,21 +51,21 @@ typedef struct IDirectMusicAudioPathImpl IDirectMusicAudioPathImpl; /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI create_dmperformance(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmsegment(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmsegmentstate(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmgraph(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmaudiopath(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; - -extern HRESULT WINAPI create_dmlyricstrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmmarkertrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmparamcontroltrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmsegtriggertrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmseqtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmsysextrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmtempotrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmtimesigtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmwavetrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmperformance(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmsegment(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmsegmentstate(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmgraph(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmaudiopath(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; + +extern HRESULT create_dmlyricstrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmmarkertrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmparamcontroltrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmsegtriggertrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmseqtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmsysextrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmtempotrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmtimesigtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmwavetrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; extern void set_audiopath_perf_pointer(IDirectMusicAudioPath*,IDirectMusicPerformance8*) DECLSPEC_HIDDEN; extern void set_audiopath_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*) DECLSPEC_HIDDEN; diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index 526163e5b54..6cb719025c1 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -251,7 +251,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmgraph(REFIID riid, void **ret_iface) +HRESULT create_dmgraph(REFIID riid, void **ret_iface) { IDirectMusicGraphImpl* obj; HRESULT hr; diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index 769713a6ba1..4983fe99a2d 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -343,7 +343,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmlyricstrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmlyricstrack(REFIID lpcGUID, void **ppobj) { IDirectMusicLyricsTrack *track; HRESULT hr; diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c index cfb788ccf50..7749d9abb08 100644 --- a/dlls/dmime/markertrack.c +++ b/dlls/dmime/markertrack.c @@ -221,7 +221,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmmarkertrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmmarkertrack(REFIID lpcGUID, void **ppobj) { IDirectMusicMarkerTrack *track; HRESULT hr; diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c index c0aed374101..641fd73baa3 100644 --- a/dlls/dmime/paramcontroltrack.c +++ b/dlls/dmime/paramcontroltrack.c @@ -257,7 +257,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmparamcontroltrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmparamcontroltrack(REFIID lpcGUID, void **ppobj) { IDirectMusicParamControlTrack *track; HRESULT hr; diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index f59be107c58..d69a27540d6 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1284,7 +1284,7 @@ static const IDirectMusicPerformance8Vtbl DirectMusicPerformance8_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmperformance(REFIID lpcGUID, void **ppobj) +HRESULT create_dmperformance(REFIID lpcGUID, void **ppobj) { IDirectMusicPerformance8Impl *obj; diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 8ec4059e8f9..b1dd21c1242 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -827,7 +827,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmsegment(REFIID lpcGUID, void **ppobj) +HRESULT create_dmsegment(REFIID lpcGUID, void **ppobj) { IDirectMusicSegment8Impl* obj; HRESULT hr; diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index 61347d8c1a2..21544fad773 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -144,7 +144,7 @@ static const IDirectMusicSegmentState8Vtbl DirectMusicSegmentState8Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmsegmentstate(REFIID riid, void **ret_iface) +HRESULT create_dmsegmentstate(REFIID riid, void **ret_iface) { IDirectMusicSegmentState8Impl* obj; HRESULT hr; diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 14e013c8e16..1b7fc6d951c 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -382,7 +382,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmsegtriggertrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmsegtriggertrack(REFIID lpcGUID, void **ppobj) { IDirectMusicSegTriggerTrack *track; HRESULT hr; diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index 3c4e2c22439..743be10e5c6 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -257,7 +257,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmseqtrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmseqtrack(REFIID lpcGUID, void **ppobj) { IDirectMusicSeqTrack *track; HRESULT hr; diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c index ded348aede9..d3ff9a051b8 100644 --- a/dlls/dmime/sysextrack.c +++ b/dlls/dmime/sysextrack.c @@ -256,7 +256,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmsysextrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmsysextrack(REFIID lpcGUID, void **ppobj) { IDirectMusicSysExTrack *track; HRESULT hr; diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 0e8d5bcab48..a3cbffc341a 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -370,7 +370,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmtempotrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmtempotrack(REFIID lpcGUID, void **ppobj) { IDirectMusicTempoTrack *track; HRESULT hr; diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index d6452e92e1b..1f4c0dbf187 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -285,7 +285,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmtimesigtrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmtimesigtrack(REFIID lpcGUID, void **ppobj) { IDirectMusicTimeSigTrack *track; HRESULT hr; diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 171c3e5c6b7..d87d16fcdab 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -471,7 +471,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmwavetrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmwavetrack(REFIID lpcGUID, void **ppobj) { IDirectMusicWaveTrack *track; HRESULT hr;

1 0

Alex Henrie : dmband: Don't force a calling convention on internal functions.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: d535c8ac161babf9405cf5ed84aadf028b5245c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/d535c8ac161babf9405cf5ed84aadf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 20:54:30 2022 -0700 dmband: Don't force a calling convention on internal functions. --- dlls/dmband/band.c | 2 +- dlls/dmband/bandtrack.c | 2 +- dlls/dmband/dmband_main.c | 2 +- dlls/dmband/dmband_private.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 1910e53d187..d71863a1f9d 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -510,7 +510,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmband(REFIID lpcGUID, void **ppobj) +HRESULT create_dmband(REFIID lpcGUID, void **ppobj) { IDirectMusicBandImpl* obj; HRESULT hr; diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 0864e91bd4b..0142b5b5188 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -633,7 +633,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmbandtrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmbandtrack(REFIID lpcGUID, void **ppobj) { IDirectMusicBandTrack *track; HRESULT hr; diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c index 93553c88ca1..c08f8b0a087 100644 --- a/dlls/dmband/dmband_main.c +++ b/dlls/dmband/dmband_main.c @@ -27,7 +27,7 @@ LONG DMBAND_refCount = 0; typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ret_iface); + HRESULT (*fnCreateInstance)(REFIID riid, void **ret_iface); } IClassFactoryImpl; /****************************************************************** diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index b618b9b3c0b..b0b26076285 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -44,8 +44,8 @@ /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI create_dmband(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmbandtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmband(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmbandtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; /*****************************************************************************

1 0

Alex Henrie : dmcompos: Don't force a calling convention on internal functions.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: c9fb12c19de14badb9dd5cb6629f95468a73908b URL: https://gitlab.winehq.org/wine/wine/-/commit/c9fb12c19de14badb9dd5cb6629f95… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 20:54:30 2022 -0700 dmcompos: Don't force a calling convention on internal functions. --- dlls/dmcompos/chordmap.c | 2 +- dlls/dmcompos/chordmaptrack.c | 2 +- dlls/dmcompos/composer.c | 2 +- dlls/dmcompos/dmcompos_main.c | 4 ++-- dlls/dmcompos/dmcompos_private.h | 8 ++++---- dlls/dmcompos/signposttrack.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index ef2fa036ccb..adc17402f39 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -309,7 +309,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmchordmap(REFIID lpcGUID, void **ppobj) +HRESULT create_dmchordmap(REFIID lpcGUID, void **ppobj) { IDirectMusicChordMapImpl* obj; HRESULT hr; diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index 27e7dd94887..66517340d70 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -285,7 +285,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmchordmaptrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmchordmaptrack(REFIID lpcGUID, void **ppobj) { IDirectMusicChordMapTrack* track; HRESULT hr; diff --git a/dlls/dmcompos/composer.c b/dlls/dmcompos/composer.c index 84ca90aaf42..a13a77bff94 100644 --- a/dlls/dmcompos/composer.c +++ b/dlls/dmcompos/composer.c @@ -144,7 +144,7 @@ static const IDirectMusicComposerVtbl dmcomposer_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmcomposer(REFIID riid, void **ret_iface) +HRESULT create_dmcomposer(REFIID riid, void **ret_iface) { IDirectMusicComposerImpl *obj; HRESULT hr; diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index eee94a20f48..dff77aa4d32 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -42,10 +42,10 @@ LONG DMCOMPOS_refCount = 0; typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ret_iface); + HRESULT (*fnCreateInstance)(REFIID riid, void **ret_iface); } IClassFactoryImpl; -static HRESULT WINAPI create_direct_music_template(REFIID riid, void **ret_iface) +static HRESULT create_direct_music_template(REFIID riid, void **ret_iface) { FIXME("(%s, %p) stub\n", debugstr_dmguid(riid), ret_iface); diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index bfee61e5bee..bd44607d00c 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -44,10 +44,10 @@ /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI create_dmchordmap(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmcomposer(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmchordmaptrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmsignposttrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmchordmap(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmcomposer(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmchordmaptrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmsignposttrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; /********************************************************************** * Dll lifetime tracking declaration for dmcompos.dll diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index 8da4ade961a..249f37b7711 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -273,7 +273,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmsignposttrack(REFIID lpcGUID, void **ppobj) +HRESULT create_dmsignposttrack(REFIID lpcGUID, void **ppobj) { IDirectMusicSignPostTrack *track; HRESULT hr;

1 0

Paul Gofman : winhttp: Set name resolution timeout in download_script().
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: cbfe940a1eaf5e158de3127b1265462bfbfb70af URL: https://gitlab.winehq.org/wine/wine/-/commit/cbfe940a1eaf5e158de3127b126546… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 23 15:36:19 2022 -0600 winhttp: Set name resolution timeout in download_script(). --- dlls/winhttp/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index fa8ccd7a9de..3d99e9b0ac6 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1922,6 +1922,7 @@ static char *download_script( const WCHAR *url, DWORD *out_size ) hostname[uc.dwHostNameLength] = 0; if (!(ses = WinHttpOpen( NULL, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0 ))) goto done; + WinHttpSetTimeouts( ses, 5000, 60000, 30000, 30000 ); if (!(con = WinHttpConnect( ses, hostname, uc.nPort, 0 ))) goto done; if (uc.nScheme == INTERNET_SCHEME_HTTPS) flags |= WINHTTP_FLAG_SECURE; if (!(req = WinHttpOpenRequest( con, NULL, uc.lpszUrlPath, NULL, NULL, acceptW, flags ))) goto done;

1 0

Alex Henrie : dmloader: Don't force a calling convention on internal functions.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: be666ef4228b156dec8946d4f5f3211783dcc153 URL: https://gitlab.winehq.org/wine/wine/-/commit/be666ef4228b156dec8946d4f5f321… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 21 20:54:30 2022 -0700 dmloader: Don't force a calling convention on internal functions. --- dlls/dmloader/container.c | 2 +- dlls/dmloader/dmloader_main.c | 2 +- dlls/dmloader/dmloader_private.h | 10 +++++----- dlls/dmloader/loader.c | 2 +- dlls/dmloader/loaderstream.c | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index 111c0db4760..f2b284e1cb3 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -647,7 +647,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI create_dmcontainer(REFIID lpcGUID, void **ppobj) +HRESULT create_dmcontainer(REFIID lpcGUID, void **ppobj) { IDirectMusicContainerImpl* obj; HRESULT hr; diff --git a/dlls/dmloader/dmloader_main.c b/dlls/dmloader/dmloader_main.c index 61aa092b5f8..512e6102d86 100644 --- a/dlls/dmloader/dmloader_main.c +++ b/dlls/dmloader/dmloader_main.c @@ -40,7 +40,7 @@ LONG module_ref = 0; typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv); + HRESULT (*fnCreateInstance)(REFIID riid, void **ppv); } IClassFactoryImpl; /****************************************************************** diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h index 94bb9ddf1bd..47994a48c4e 100644 --- a/dlls/dmloader/dmloader_private.h +++ b/dlls/dmloader/dmloader_private.h @@ -62,11 +62,11 @@ typedef struct IDirectMusicLoaderGenericStream IDirectMusicLoaderGenericStream; /***************************************************************************** * Creation helpers */ -extern HRESULT WINAPI create_dmloader(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI create_dmcontainer(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderFileStream (LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderResourceStream (LPVOID *ppobj) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderGenericStream (LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT create_dmloader(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT create_dmcontainer(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicLoaderFileStream(void **ppobj) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicLoaderResourceStream(void **ppobj) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicLoaderGenericStream(void **ppobj) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusicLoaderFileStream implementation structure diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 0bb22a406ab..6c4b29ab5ea 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -903,7 +903,7 @@ static HRESULT DMUSIC_GetDefaultGMPath (WCHAR wszPath[MAX_PATH]) { } /* for ClassFactory */ -HRESULT WINAPI create_dmloader(REFIID lpcGUID, void **ppobj) +HRESULT create_dmloader(REFIID lpcGUID, void **ppobj) { IDirectMusicLoaderImpl *obj; DMUS_OBJECTDESC Desc; diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c index 864c222e118..38862c0fec7 100644 --- a/dlls/dmloader/loaderstream.c +++ b/dlls/dmloader/loaderstream.c @@ -288,7 +288,7 @@ static const IDirectMusicGetLoaderVtbl DirectMusicLoaderFileStream_GetLoader_Vtb IDirectMusicLoaderFileStream_IDirectMusicGetLoader_GetLoader }; -HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderFileStream (LPVOID* ppobj) { +HRESULT DMUSIC_CreateDirectMusicLoaderFileStream (void** ppobj) { IDirectMusicLoaderFileStream *obj; TRACE("(%p)\n", ppobj); @@ -545,7 +545,7 @@ static const IDirectMusicGetLoaderVtbl DirectMusicLoaderResourceStream_GetLoader IDirectMusicLoaderResourceStream_IDirectMusicGetLoader_GetLoader }; -HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderResourceStream (LPVOID* ppobj) { +HRESULT DMUSIC_CreateDirectMusicLoaderResourceStream (void** ppobj) { IDirectMusicLoaderResourceStream *obj; TRACE("(%p)\n", ppobj); @@ -797,7 +797,7 @@ static const IDirectMusicGetLoaderVtbl DirectMusicLoaderGenericStream_GetLoader_ IDirectMusicLoaderGenericStream_IDirectMusicGetLoader_GetLoader }; -HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderGenericStream (LPVOID* ppobj) { +HRESULT DMUSIC_CreateDirectMusicLoaderGenericStream (void** ppobj) { IDirectMusicLoaderGenericStream *obj; TRACE("(%p)\n", ppobj);

1 0

Paul Gofman : winhttp: Move read buffer to websocket.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 50bea867d2ca6d657e3db8a8193204cf83311201 URL: https://gitlab.winehq.org/wine/wine/-/commit/50bea867d2ca6d657e3db8a8193204… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 15 18:48:55 2022 -0600 winhttp: Move read buffer to websocket. --- dlls/winhttp/request.c | 23 +++++++++++++++++++---- dlls/winhttp/winhttp_private.h | 2 ++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0af71b40fe9..9ff0c9202c5 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3192,6 +3192,7 @@ static void socket_destroy( struct object_header *hdr ) netconn_release( socket->netconn ); release_object( &socket->request->hdr ); + free( socket->read_buffer ); free( socket->send_frame_buffer ); free( socket ); } @@ -3266,6 +3267,19 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR socket->hdr.flags = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC; socket->keepalive_interval = 30000; socket->send_buffer_size = request->websocket_send_buffer_size; + if (request->read_size) + { + if (!(socket->read_buffer = malloc( request->read_size ))) + { + ERR( "No memory.\n" ); + free( socket ); + release_object( &request->hdr ); + return NULL; + } + socket->bytes_in_read_buffer = request->read_size; + memcpy( socket->read_buffer, request->read_buf + request->read_pos, request->read_size ); + request->read_pos = request->read_size = 0; + } InitializeSRWLock( &socket->send_lock ); init_queue( &socket->send_q ); init_queue( &socket->recv_q ); @@ -3674,11 +3688,12 @@ static DWORD receive_bytes( struct socket *socket, char *buf, DWORD len, DWORD * char *ptr = buf; int received; - if (socket->request->read_size) + if (socket->bytes_in_read_buffer) { - size = min( needed, socket->request->read_size ); - memcpy( ptr, socket->request->read_buf + socket->request->read_pos, size ); - remove_data( socket->request, size ); + size = min( needed, socket->bytes_in_read_buffer ); + memcpy( ptr, socket->read_buffer, size ); + memmove( socket->read_buffer, socket->read_buffer + size, socket->bytes_in_read_buffer - size ); + socket->bytes_in_read_buffer -= size; needed -= size; ptr += size; } diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 934c9fd4492..9b94ce98de4 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -277,6 +277,8 @@ struct socket unsigned int send_remaining_size; unsigned int bytes_in_send_frame_buffer; unsigned int client_buffer_offset; + char *read_buffer; + unsigned int bytes_in_read_buffer; SRWLOCK send_lock; volatile LONG pending_noncontrol_send; enum fragment_type sending_fragment_type;

1 0

Paul Gofman : winhttp: Do not reference request from socket.
by Alexandre Julliard Nov. 24, 2022

Nov. 24, 2022

Module: wine Branch: master Commit: 289d21a5d2207a03535d7b3539f0e243ab884e43 URL: https://gitlab.winehq.org/wine/wine/-/commit/289d21a5d2207a03535d7b3539f0e2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 15 15:26:10 2022 -0600 winhttp: Do not reference request from socket. --- dlls/winhttp/request.c | 4 ---- dlls/winhttp/tests/notification.c | 8 +++++--- dlls/winhttp/winhttp_private.h | 1 - 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 9ff0c9202c5..1a9b4e14ee8 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3191,7 +3191,6 @@ static void socket_destroy( struct object_header *hdr ) stop_queue( &socket->recv_q ); netconn_release( socket->netconn ); - release_object( &socket->request->hdr ); free( socket->read_buffer ); free( socket->send_frame_buffer ); free( socket ); @@ -3286,9 +3285,6 @@ HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR netconn_addref( request->netconn ); socket->netconn = request->netconn; - addref_object( &request->hdr ); - socket->request = request; - netconn_set_timeout( socket->netconn, FALSE, socket->keepalive_interval ); if ((hsocket = alloc_handle( &socket->hdr ))) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 181bd35856b..a9f782f5e3d 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -671,7 +671,8 @@ static const struct notification websocket_test[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE, NF_SIGNAL }, - { winhttp_websocket_complete_upgrade, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, NF_SIGNAL }, + { winhttp_websocket_complete_upgrade, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, + { winhttp_websocket_complete_upgrade, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL }, { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, @@ -680,7 +681,6 @@ static const struct notification websocket_test[] = { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SAVE_BUFFER | NF_SIGNAL }, { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SAVE_BUFFER | NF_SIGNAL }, { winhttp_websocket_close, WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE, NF_SIGNAL }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL }, }; @@ -911,6 +911,9 @@ static void test_websocket(BOOL secure) err = GetLastError(); ok( socket != NULL, "got %lu\n", err ); ok( err == ERROR_SUCCESS, "got %lu\n", err ); + + WinHttpCloseHandle( request ); + WaitForSingleObject( info.wait, INFINITE ); /* The send is executed synchronously (even if sending a reasonably big buffer exceeding SSL buffer size). @@ -1029,7 +1032,6 @@ static void test_websocket(BOOL secure) setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( socket ); - WinHttpCloseHandle( request ); WaitForSingleObject( info.wait, INFINITE ); end_test( &info, __LINE__ ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 9b94ce98de4..0326a8fc1e3 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -256,7 +256,6 @@ enum fragment_type struct socket { struct object_header hdr; - struct request *request; struct netconn *netconn; int keepalive_interval; unsigned int send_buffer_size;

1 0