wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Alexandre Julliard : mswsock: Build with msvcrt.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: a0b03348ee1606a7a9fe2080db0c958f67546601 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0b03348ee1606a7a9fe2080… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:20:15 2019 +0200 mswsock: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mswsock/Makefile.in | 2 ++ dlls/mswsock/mswsock.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mswsock/Makefile.in b/dlls/mswsock/Makefile.in index 98c738f..a0cf70f 100644 --- a/dlls/mswsock/Makefile.in +++ b/dlls/mswsock/Makefile.in @@ -2,6 +2,8 @@ MODULE = mswsock.dll IMPORTLIB = mswsock IMPORTS = ws2_32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mswsock.c diff --git a/dlls/mswsock/mswsock.c b/dlls/mswsock/mswsock.c index 7851e8a..c53ecab 100644 --- a/dlls/mswsock/mswsock.c +++ b/dlls/mswsock/mswsock.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : msvideo: Build with msvcrt.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: b1dd5b81911ece5a09afd3df7f7e0912d2c9495f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1dd5b81911ece5a09afd3df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:20:00 2019 +0200 msvideo: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvideo.dll16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvideo.dll16/Makefile.in b/dlls/msvideo.dll16/Makefile.in index 5f7a9a4..a657810 100644 --- a/dlls/msvideo.dll16/Makefile.in +++ b/dlls/msvideo.dll16/Makefile.in @@ -1,6 +1,6 @@ MODULE = msvideo.dll16 IMPORTS = msvfw32 version advapi32 user32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,msvfw32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,msvfw32.dll C_SRCS = msvideo16.c

1 0

Alexandre Julliard : msvidc32: Build with msvcrt.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: fb9fa275db79a257b32402b6960ce674e0fc8f31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb9fa275db79a257b32402b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:18:19 2019 +0200 msvidc32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvidc32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvidc32/Makefile.in b/dlls/msvidc32/Makefile.in index 2fc8f90..00180a0 100644 --- a/dlls/msvidc32/Makefile.in +++ b/dlls/msvidc32/Makefile.in @@ -1,6 +1,8 @@ MODULE = msvidc32.dll IMPORTS = user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ msvideo1.c

1 0

Alexandre Julliard : msvfw32: Build with msvcrt.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 85faa431139da7ccf377eb4267d9ad97c8d660f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85faa431139da7ccf377eb42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:18:08 2019 +0200 msvfw32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/Makefile.in | 2 ++ dlls/msvfw32/mciwnd.c | 25 ++++++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in index 9247fb8..d62259f 100644 --- a/dlls/msvfw32/Makefile.in +++ b/dlls/msvfw32/Makefile.in @@ -2,6 +2,8 @@ MODULE = msvfw32.dll IMPORTLIB = msvfw32 IMPORTS = winmm version comctl32 user32 gdi32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ drawdib.c \ mciwnd.c \ diff --git a/dlls/msvfw32/mciwnd.c b/dlls/msvfw32/mciwnd.c index 50899e1..0b35bad 100644 --- a/dlls/msvfw32/mciwnd.c +++ b/dlls/msvfw32/mciwnd.c @@ -32,7 +32,6 @@ #include "vfw.h" #include "digitalv.h" #include "commctrl.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mci); @@ -200,7 +199,7 @@ static void MCIWND_UpdateState(MCIWndInfo *mwi) return; if ((mwi->dwStyle & MCIWNDF_SHOWNAME) && mwi->lpName) - strcpyW(buffer, mwi->lpName); + lstrcpyW(buffer, mwi->lpName); else *buffer = 0; @@ -209,8 +208,8 @@ static void MCIWND_UpdateState(MCIWndInfo *mwi) static const WCHAR spaceW[] = {' ',0}; static const WCHAR l_braceW[] = {'(',0}; - if (*buffer) strcatW(buffer, spaceW); - strcatW(buffer, l_braceW); + if (*buffer) lstrcatW(buffer, spaceW); + lstrcatW(buffer, l_braceW); } if (mwi->dwStyle & MCIWNDF_SHOWPOS) @@ -219,13 +218,13 @@ static void MCIWND_UpdateState(MCIWndInfo *mwi) posW[0] = 0; SendMessageW(mwi->hWnd, MCIWNDM_GETPOSITIONW, 64, (LPARAM)posW); - strcatW(buffer, posW); + lstrcatW(buffer, posW); } if ((mwi->dwStyle & (MCIWNDF_SHOWPOS|MCIWNDF_SHOWMODE)) == (MCIWNDF_SHOWPOS|MCIWNDF_SHOWMODE)) { static const WCHAR dashW[] = {' ','-',' ',0}; - strcatW(buffer, dashW); + lstrcatW(buffer, dashW); } if (mwi->dwStyle & MCIWNDF_SHOWMODE) @@ -234,13 +233,13 @@ static void MCIWND_UpdateState(MCIWndInfo *mwi) modeW[0] = 0; SendMessageW(mwi->hWnd, MCIWNDM_GETMODEW, 64, (LPARAM)modeW); - strcatW(buffer, modeW); + lstrcatW(buffer, modeW); } if (mwi->dwStyle & (MCIWNDF_SHOWPOS|MCIWNDF_SHOWMODE)) { static const WCHAR r_braceW[] = {')',0}; - strcatW(buffer, r_braceW); + lstrcatW(buffer, r_braceW); } TRACE("=> %s\n", debugstr_w(buffer)); @@ -590,8 +589,8 @@ static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lPa mwi->mci = mci_open.wDeviceID; mwi->alias = HandleToLong(hWnd) + 1; - mwi->lpName = HeapAlloc(GetProcessHeap(), 0, (strlenW((LPWSTR)lParam) + 1) * sizeof(WCHAR)); - strcpyW(mwi->lpName, (LPWSTR)lParam); + mwi->lpName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW((LPWSTR)lParam) + 1) * sizeof(WCHAR)); + lstrcpyW(mwi->lpName, (LPWSTR)lParam); MCIWND_UpdateState(mwi); @@ -987,7 +986,7 @@ end_of_mci_open: TRACE("MCIWNDM_SENDSTRINGW %s\n", debugstr_w((LPCWSTR)lParam)); - p = strchrW((LPCWSTR)lParam, ' '); + p = wcschr((LPCWSTR)lParam, ' '); if (p) { static const WCHAR formatW[] = {'%','d',' ',0}; @@ -1000,7 +999,7 @@ end_of_mci_open: memcpy(cmdW, (void *)lParam, pos * sizeof(WCHAR)); wsprintfW(cmdW + pos, formatW, mwi->alias); - strcatW(cmdW, (WCHAR *)lParam + pos); + lstrcatW(cmdW, (WCHAR *)lParam + pos); } else cmdW = (LPWSTR)lParam; @@ -1182,7 +1181,7 @@ end_of_mci_open: { cmdW = HeapAlloc(GetProcessHeap(), 0, (lstrlenW((LPCWSTR)lParam) + 64) * sizeof(WCHAR)); wsprintfW(cmdW, formatW, mwi->alias); - strcatW(cmdW, (WCHAR *)lParam); + lstrcatW(cmdW, (WCHAR *)lParam); mwi->lasterror = mciSendStringW(cmdW, NULL, 0, 0);

1 0

Alexandre Julliard : msvcm: Build with msvcrt.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 9665f1d2610654b11814c0185e21a824b73b4a3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9665f1d2610654b11814c018… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:17:13 2019 +0200 msvcm: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcm80/Makefile.in | 2 ++ dlls/msvcm90/Makefile.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/msvcm80/Makefile.in b/dlls/msvcm80/Makefile.in index c3bf20e..9527713 100644 --- a/dlls/msvcm80/Makefile.in +++ b/dlls/msvcm80/Makefile.in @@ -1,4 +1,6 @@ MODULE = msvcm80.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ msvcm_main.c diff --git a/dlls/msvcm90/Makefile.in b/dlls/msvcm90/Makefile.in index 6b03a53..86f5616 100644 --- a/dlls/msvcm90/Makefile.in +++ b/dlls/msvcm90/Makefile.in @@ -1,5 +1,7 @@ MODULE = msvcm90.dll PARENTSRC = ../msvcm80 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ msvcm_main.c

1 0

Alexandre Julliard : msvcp90: Avoid depending on config.h for the __builtin_clz check.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 031116cff7c697fbd1b3d3ea7fa9dcd2599ea378 URL: https://source.winehq.org/git/wine.git/?a=commit;h=031116cff7c697fbd1b3d3ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:27:33 2019 +0200 msvcp90: Avoid depending on config.h for the __builtin_clz check. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index fba1de8..810a0bf 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1893,7 +1893,7 @@ typedef struct compact_block /* Return the integer base-2 logarithm of (x|1). Result is 0 for x == 0. */ static inline unsigned int log2i(unsigned int x) { -#ifdef HAVE___BUILTIN_CLZ +#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) return __builtin_clz(x|1) ^ 0x1f; #else static const unsigned int l[] =

1 0

Zebediah Figura : qcap/smartteefilter: Store the preview source pin inline in the SmartTeeFilter structure.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 8cc83d7f5d406c84b25370ec76ba4dc21876d66f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cc83d7f5d406c84b25370ec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 13 18:09:23 2019 -0500 qcap/smartteefilter: Store the preview source pin inline in the SmartTeeFilter structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/smartteefilter.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 541d7a8..51efe17 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -38,8 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); typedef struct { BaseFilter filter; BaseInputPin sink; - BaseOutputPin capture; - BaseOutputPin *preview; + BaseOutputPin capture, preview; } SmartTeeFilter; static inline SmartTeeFilter *impl_from_BaseFilter(BaseFilter *filter) @@ -127,7 +126,7 @@ static IPin *smart_tee_get_pin(BaseFilter *iface, unsigned int index) else if (index == 1) return &filter->capture.pin.IPin_iface; else if (index == 2) - return &filter->preview->pin.IPin_iface; + return &filter->preview.pin.IPin_iface; return NULL; } @@ -137,8 +136,7 @@ static void smart_tee_destroy(BaseFilter *iface) strmbase_sink_cleanup(&filter->sink); strmbase_source_cleanup(&filter->capture); - if (filter->preview) - BaseOutputPinImpl_Release(&filter->preview->pin.IPin_iface); + strmbase_source_cleanup(&filter->preview); strmbase_filter_cleanup(&filter->filter); CoTaskMemFree(filter); } @@ -316,14 +314,14 @@ static HRESULT WINAPI SmartTeeFilterInput_Receive(BaseInputPin *base, IMediaSamp IMediaSample_Release(captureSample); EnterCriticalSection(&This->filter.csFilter); - if (This->preview->pin.pConnectedTo) - hrPreview = copy_sample(inputSample, This->preview->pAllocator, &previewSample); + if (This->preview.pin.pConnectedTo) + hrPreview = copy_sample(inputSample, This->preview.pAllocator, &previewSample); LeaveCriticalSection(&This->filter.csFilter); /* No timestamps on preview stream: */ if (SUCCEEDED(hrPreview)) hrPreview = IMediaSample_SetTime(previewSample, NULL, NULL); if (SUCCEEDED(hrPreview)) - hrPreview = BaseOutputPinImpl_Deliver(This->preview, previewSample); + hrPreview = BaseOutputPinImpl_Deliver(&This->preview, previewSample); if (previewSample) IMediaSample_Release(previewSample); @@ -531,22 +529,20 @@ IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (void**)&This->sink.pAllocator); if (FAILED(hr)) - goto end; + { + *phr = hr; + strmbase_filter_cleanup(&This->filter); + return NULL; + } capturePinInfo.pFilter = &This->filter.IBaseFilter_iface; strmbase_source_init(&This->capture, &SmartTeeFilterCaptureVtbl, &capturePinInfo, &SmartTeeFilterCaptureFuncs, &This->filter.csFilter); previewPinInfo.pFilter = &This->filter.IBaseFilter_iface; - hr = BaseOutputPin_Construct(&SmartTeeFilterPreviewVtbl, sizeof(BaseOutputPin), &previewPinInfo, - &SmartTeeFilterPreviewFuncs, &This->filter.csFilter, (IPin**)&This->preview); + strmbase_source_init(&This->preview, &SmartTeeFilterPreviewVtbl, &previewPinInfo, + &SmartTeeFilterPreviewFuncs, &This->filter.csFilter); -end: - *phr = hr; - if (SUCCEEDED(hr)) { - return &This->filter.IUnknown_inner; - } else { - strmbase_filter_cleanup(&This->filter); - return NULL; - } + *phr = S_OK; + return &This->filter.IUnknown_inner; }

1 0

Zebediah Figura : qcap/smartteefilter: Store the capture source pin inline in the SmartTeeFilter structure.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 2d7b374ed89c0823a21c1328c59ad9da10462ce1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d7b374ed89c0823a21c1328… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 13 18:09:22 2019 -0500 qcap/smartteefilter: Store the capture source pin inline in the SmartTeeFilter structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/smartteefilter.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 69341af..541d7a8 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); typedef struct { BaseFilter filter; BaseInputPin sink; - BaseOutputPin *capture; + BaseOutputPin capture; BaseOutputPin *preview; } SmartTeeFilter; @@ -125,7 +125,7 @@ static IPin *smart_tee_get_pin(BaseFilter *iface, unsigned int index) if (index == 0) return &filter->sink.pin.IPin_iface; else if (index == 1) - return &filter->capture->pin.IPin_iface; + return &filter->capture.pin.IPin_iface; else if (index == 2) return &filter->preview->pin.IPin_iface; return NULL; @@ -136,8 +136,7 @@ static void smart_tee_destroy(BaseFilter *iface) SmartTeeFilter *filter = impl_from_BaseFilter(iface); strmbase_sink_cleanup(&filter->sink); - if (filter->capture) - BaseOutputPinImpl_Release(&filter->capture->pin.IPin_iface); + strmbase_source_cleanup(&filter->capture); if (filter->preview) BaseOutputPinImpl_Release(&filter->preview->pin.IPin_iface); strmbase_filter_cleanup(&filter->filter); @@ -308,11 +307,11 @@ static HRESULT WINAPI SmartTeeFilterInput_Receive(BaseInputPin *base, IMediaSamp /* FIXME: we should ideally do each of these in a separate thread */ EnterCriticalSection(&This->filter.csFilter); - if (This->capture->pin.pConnectedTo) - hrCapture = copy_sample(inputSample, This->capture->pAllocator, &captureSample); + if (This->capture.pin.pConnectedTo) + hrCapture = copy_sample(inputSample, This->capture.pAllocator, &captureSample); LeaveCriticalSection(&This->filter.csFilter); if (SUCCEEDED(hrCapture)) - hrCapture = BaseOutputPinImpl_Deliver(This->capture, captureSample); + hrCapture = BaseOutputPinImpl_Deliver(&This->capture, captureSample); if (captureSample) IMediaSample_Release(captureSample); @@ -535,10 +534,8 @@ IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) goto end; capturePinInfo.pFilter = &This->filter.IBaseFilter_iface; - hr = BaseOutputPin_Construct(&SmartTeeFilterCaptureVtbl, sizeof(BaseOutputPin), &capturePinInfo, - &SmartTeeFilterCaptureFuncs, &This->filter.csFilter, (IPin**)&This->capture); - if (FAILED(hr)) - goto end; + strmbase_source_init(&This->capture, &SmartTeeFilterCaptureVtbl, &capturePinInfo, + &SmartTeeFilterCaptureFuncs, &This->filter.csFilter); previewPinInfo.pFilter = &This->filter.IBaseFilter_iface; hr = BaseOutputPin_Construct(&SmartTeeFilterPreviewVtbl, sizeof(BaseOutputPin), &previewPinInfo,

1 0

Zebediah Figura : qcap/avico: Store the source pin inline in the AviCompressor structure.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 17b118a09f19c5413ad3269edcd175127d4c844f URL: https://source.winehq.org/git/wine.git/?a=commit;h=17b118a09f19c5413ad3269e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 13 18:09:21 2019 -0500 qcap/avico: Store the source pin inline in the AviCompressor structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 23 ++++++++--------------- dlls/strmbase/pin.c | 4 ++-- include/wine/strmbase.h | 3 +++ 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 841db70..399fe09 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -38,7 +38,7 @@ typedef struct { IPersistPropertyBag IPersistPropertyBag_iface; BaseInputPin sink; - BaseOutputPin *out; + BaseOutputPin source; DWORD fcc_handler; HIC hic; @@ -148,7 +148,7 @@ static HRESULT WINAPI AVICompressor_Run(IBaseFilter *iface, REFERENCE_TIME tStar if(This->filter.state == State_Running) return S_OK; - hres = IMemAllocator_Commit(This->out->pAllocator); + hres = IMemAllocator_Commit(This->source.pAllocator); if(FAILED(hres)) { FIXME("Commit failed: %08x\n", hres); return hres; @@ -185,7 +185,7 @@ static IPin *avi_compressor_get_pin(BaseFilter *iface, unsigned int index) if (index == 0) return &filter->sink.pin.IPin_iface; else if (index == 1) - return &filter->out->pin.IPin_iface; + return &filter->source.pin.IPin_iface; return NULL; } @@ -197,8 +197,7 @@ static void avi_compressor_destroy(BaseFilter *iface) ICClose(filter->hic); heap_free(filter->videoinfo); strmbase_sink_cleanup(&filter->sink); - if (filter->out) - BaseOutputPinImpl_Release(&filter->out->pin.IPin_iface); + strmbase_source_cleanup(&filter->source); strmbase_filter_cleanup(&filter->filter); heap_free(filter); } @@ -472,7 +471,7 @@ static HRESULT WINAPI AVICompressorIn_Receive(BaseInputPin *base, IMediaSample * return hres; } - hres = BaseOutputPinImpl_GetDeliveryBuffer(This->out, &out_sample, &start, &stop, 0); + hres = BaseOutputPinImpl_GetDeliveryBuffer(&This->source, &out_sample, &start, &stop, 0); if(FAILED(hres)) return hres; @@ -503,7 +502,7 @@ static HRESULT WINAPI AVICompressorIn_Receive(BaseInputPin *base, IMediaSample * else IMediaSample_SetMediaTime(out_sample, NULL, NULL); - hres = BaseOutputPinImpl_Deliver(This->out, out_sample); + hres = BaseOutputPinImpl_Deliver(&This->source, out_sample); if(FAILED(hres)) WARN("Deliver failed: %08x\n", hres); @@ -618,7 +617,6 @@ IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) PIN_INFO in_pin_info = {NULL, PINDIR_INPUT, {'I','n',0}}; PIN_INFO out_pin_info = {NULL, PINDIR_OUTPUT, {'O','u','t',0}}; AVICompressor *compressor; - HRESULT hres; compressor = heap_alloc_zero(sizeof(*compressor)); if(!compressor) { @@ -636,13 +634,8 @@ IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) &AVICompressorBaseInputPinVtbl, &compressor->filter.csFilter, NULL); out_pin_info.pFilter = &compressor->filter.IBaseFilter_iface; - hres = BaseOutputPin_Construct(&AVICompressorOutputPinVtbl, sizeof(BaseOutputPin), &out_pin_info, - &AVICompressorBaseOutputPinVtbl, &compressor->filter.csFilter, (IPin**)&compressor->out); - if(FAILED(hres)) { - strmbase_filter_cleanup(&compressor->filter); - *phr = hres; - return NULL; - } + strmbase_source_init(&compressor->source, &AVICompressorOutputPinVtbl, &out_pin_info, + &AVICompressorBaseOutputPinVtbl, &compressor->filter.csFilter); *phr = S_OK; return &compressor->filter.IUnknown_inner; diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index f1b24c3..f578751 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -740,7 +740,7 @@ static void strmbase_pin_init(BasePin *pin, const IPinVtbl *vtbl, pin->pFuncsTable = func_table; } -static void strmbase_source_init(BaseOutputPin *pin, const IPinVtbl *vtbl, +void strmbase_source_init(BaseOutputPin *pin, const IPinVtbl *vtbl, const PIN_INFO *info, const BaseOutputPinFuncTable *func_table, CRITICAL_SECTION *cs) { memset(pin, 0, sizeof(*pin)); @@ -773,7 +773,7 @@ HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outp return S_OK; } -static void strmbase_source_cleanup(BaseOutputPin *pin) +void strmbase_source_cleanup(BaseOutputPin *pin) { FreeMediaType(&pin->pin.mtCurrent); if (pin->pAllocator) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 8c6123c..1a8b8aa 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -135,6 +135,9 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BaseOutputPin *pin, IPin *pee HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, const BaseOutputPinFuncTable* pBaseOutputFuncsTable, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); HRESULT WINAPI BaseOutputPin_Destroy(BaseOutputPin *This); +void strmbase_source_cleanup(BaseOutputPin *pin); +void strmbase_source_init(BaseOutputPin *pin, const IPinVtbl *vtbl, const PIN_INFO *info, + const BaseOutputPinFuncTable *func_table, CRITICAL_SECTION *cs); /* Base Input Pin */ HRESULT WINAPI BaseInputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv);

1 0

Zebediah Figura : strmbase: Factor out strmbase_source_cleanup().
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 79ed388e70e16d9d273481d089ce2cbf1df45a1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=79ed388e70e16d9d273481d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 13 18:09:20 2019 -0500 strmbase: Factor out strmbase_source_cleanup(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index eb0f469..f1b24c3 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -773,12 +773,17 @@ HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outp return S_OK; } +static void strmbase_source_cleanup(BaseOutputPin *pin) +{ + FreeMediaType(&pin->pin.mtCurrent); + if (pin->pAllocator) + IMemAllocator_Release(pin->pAllocator); + pin->pAllocator = NULL; +} + HRESULT WINAPI BaseOutputPin_Destroy(BaseOutputPin *This) { - FreeMediaType(&This->pin.mtCurrent); - if (This->pAllocator) - IMemAllocator_Release(This->pAllocator); - This->pAllocator = NULL; + strmbase_source_cleanup(This); CoTaskMemFree(This); return S_OK; }

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
87
Older →

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 June 2019