December 2013 - Wine-commits

Jacek Caban : qcap: Added AVI compressor input pin stub implementation.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 792c53ad256d2e9aa52914a70635bbd86f69dd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=792c53ad256d2e9aa52914a70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 30 16:38:03 2013 +0100 qcap: Added AVI compressor input pin stub implementation. --- dlls/qcap/avico.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/qcap/tests/qcap.c | 21 +++++++- 2 files changed, 158 insertions(+), 5 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 6817bf6..a4bc02e 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); typedef struct { BaseFilter filter; IPersistPropertyBag IPersistPropertyBag_iface; + + BaseInputPin *in; } AVICompressor; static inline AVICompressor *impl_from_BaseFilter(BaseFilter *filter) @@ -46,6 +48,11 @@ static inline AVICompressor *impl_from_IBaseFilter(IBaseFilter *iface) return impl_from_BaseFilter(filter); } +static inline AVICompressor *impl_from_BasePin(BasePin *pin) +{ + return impl_from_IBaseFilter(pin->pinInfo.pFilter); +} + static HRESULT WINAPI AVICompressor_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) { AVICompressor *This = impl_from_IBaseFilter(iface); @@ -83,8 +90,11 @@ static ULONG WINAPI AVICompressor_Release(IBaseFilter *iface) TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + if(This->in) + BaseInputPinImpl_Release(&This->in->pin.IPin_iface); heap_free(This); + } return ref; } @@ -152,15 +162,31 @@ static const IBaseFilterVtbl AVICompressorVtbl = { static IPin* WINAPI AVICompressor_GetPin(BaseFilter *iface, int pos) { AVICompressor *This = impl_from_BaseFilter(iface); - FIXME("(%p)->(%d)\n", This, pos); - return NULL; + IPin *ret; + + TRACE("(%p)->(%d)\n", This, pos); + + switch(pos) { + case 0: + ret = &This->in->pin.IPin_iface; + break; + case 1: + FIXME("out pin not implemented\n"); + return NULL; + default: + TRACE("No pin %d\n", pos); + return NULL; + }; + + IPin_AddRef(ret); + return ret; } static LONG WINAPI AVICompressor_GetPinCount(BaseFilter *iface) { AVICompressor *This = impl_from_BaseFilter(iface); FIXME("(%p)\n", This); - return 0; + return 1; } static const BaseFilterFuncTable filter_func_table = { @@ -229,9 +255,107 @@ static const IPersistPropertyBagVtbl PersistPropertyBagVtbl = { AVICompressorPropertyBag_Save }; +static inline AVICompressor *impl_from_IPin(IPin *iface) +{ + BasePin *bp = CONTAINING_RECORD(iface, BasePin, IPin_iface); + return impl_from_IBaseFilter(bp->pinInfo.pFilter); +} + +static HRESULT WINAPI AVICompressorIn_QueryInterface(IPin *iface, REFIID riid, void **ppv) +{ + return BaseInputPinImpl_QueryInterface(iface, riid, ppv); +} + +static ULONG WINAPI AVICompressorIn_AddRef(IPin *iface) +{ + AVICompressor *This = impl_from_IPin(iface); + return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); +} + +static ULONG WINAPI AVICompressorIn_Release(IPin *iface) +{ + AVICompressor *This = impl_from_IPin(iface); + return IBaseFilter_Release(&This->filter.IBaseFilter_iface); +} + +static HRESULT WINAPI AVICompressorIn_ReceiveConnection(IPin *iface, + IPin *pConnector, const AM_MEDIA_TYPE *pmt) +{ + AVICompressor *This = impl_from_IPin(iface); + FIXME("(%p)->(%p AM_MEDIA_TYPE(%p))\n", This, pConnector, pmt); + dump_AM_MEDIA_TYPE(pmt); + return E_NOTIMPL; +} + +static HRESULT WINAPI AVICompressorIn_Disconnect(IPin *iface) +{ + AVICompressor *This = impl_from_IPin(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IPinVtbl AVICompressorInputPinVtbl = { + AVICompressorIn_QueryInterface, + AVICompressorIn_AddRef, + AVICompressorIn_Release, + BaseInputPinImpl_Connect, + AVICompressorIn_ReceiveConnection, + AVICompressorIn_Disconnect, + BasePinImpl_ConnectedTo, + BasePinImpl_ConnectionMediaType, + BasePinImpl_QueryPinInfo, + BasePinImpl_QueryDirection, + BasePinImpl_QueryId, + BasePinImpl_QueryAccept, + BasePinImpl_EnumMediaTypes, + BasePinImpl_QueryInternalConnections, + BaseInputPinImpl_EndOfStream, + BaseInputPinImpl_BeginFlush, + BaseInputPinImpl_EndFlush, + BaseInputPinImpl_NewSegment +}; + +static HRESULT WINAPI AVICompressorIn_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *pmt) +{ + FIXME("(%p)->(AM_MEDIA_TYPE(%p))\n", base, pmt); + dump_AM_MEDIA_TYPE(pmt); + return E_NOTIMPL; +} + +static LONG WINAPI AVICompressorIn_GetMediaTypeVersion(BasePin *base) +{ + return 0; +} + +static HRESULT WINAPI AVICompressorIn_GetMediaType(BasePin *base, int iPosition, AM_MEDIA_TYPE *amt) +{ + TRACE("(%p)->(%d %p)\n", base, iPosition, amt); + return S_FALSE; +} + +static const BasePinFuncTable AVICompressorInputBasePinVtbl = { + AVICompressorIn_CheckMediaType, + NULL, + AVICompressorIn_GetMediaTypeVersion, + AVICompressorIn_GetMediaType +}; + +static HRESULT WINAPI AVICompressorIn_Receive(BaseInputPin *base, IMediaSample *pSample) +{ + AVICompressor *This = impl_from_BasePin(&base->pin); + FIXME("(%p)->(%p)\n", This, pSample); + return E_NOTIMPL; +} + +static const BaseInputPinFuncTable AVICompressorBaseInputPinVtbl = { + AVICompressorIn_Receive +}; + IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) { + PIN_INFO in_pin_info = {NULL, PINDIR_INPUT, {'I','n','p','u','t',0}}; AVICompressor *compressor; + HRESULT hres; TRACE("\n"); @@ -246,6 +370,16 @@ IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) compressor->IPersistPropertyBag_iface.lpVtbl = &PersistPropertyBagVtbl; + in_pin_info.pFilter = &compressor->filter.IBaseFilter_iface; + hres = BaseInputPin_Construct(&AVICompressorInputPinVtbl, sizeof(BaseInputPin), &in_pin_info, + &AVICompressorInputBasePinVtbl, &AVICompressorBaseInputPinVtbl, + &compressor->filter.csFilter, NULL, (IPin**)&compressor->in); + if(FAILED(hres)) { + IBaseFilter_Release(&compressor->filter.IBaseFilter_iface); + *phr = hres; + return NULL; + } + *phr = S_OK; return (IUnknown*)&compressor->filter.IBaseFilter_iface; } diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 8081bce..942a120 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1336,10 +1336,14 @@ static void test_AviMux(void) static void test_AviCo(void) { IPersistPropertyBag *persist_bag; + IPin *pin, *in_pin; + IEnumPins *enum_pins; IBaseFilter *avico; - IPin *pin; + PIN_INFO pin_info; HRESULT hres; + static const WCHAR inputW[] = {'I','n','p','u','t',0}; + hres = CoCreateInstance(&CLSID_AVICo, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&avico); if(hres == REGDB_E_CLASSNOTREG) { win_skip("CLSID_AVICo not restered\n"); @@ -1354,6 +1358,21 @@ static void test_AviCo(void) ok(hres == S_OK, "QueryInterface(IID_IPersistPropertyBag) returned: %08x\n", hres); IPersistPropertyBag_Release(persist_bag); + + hres = IBaseFilter_EnumPins(avico, &enum_pins); + ok(hres == S_OK, "EnumPins failed: %08x\n", hres); + + hres = IEnumPins_Next(enum_pins, 1, &in_pin, NULL); + ok(hres == S_OK, "Next failed: %08x\n", hres); + + hres = IPin_QueryPinInfo(in_pin, &pin_info); + ok(hres == S_OK, "QueryPinInfo failed: %08x\n", hres); + ok(pin_info.pFilter == avico, "pin_info.pFilter != avico\n"); + ok(pin_info.dir == PINDIR_INPUT, "pin_info.dir = %d\n", pin_info.dir); + ok(!lstrcmpW(pin_info.achName, inputW), "pin_info.achName = %s\n", wine_dbgstr_w(pin_info.achName)); + + IEnumPins_Release(enum_pins); + IBaseFilter_Release(avico); }

1 0

Jacek Caban : qcap: Added AVI compressor output pin stub implementation.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 71687bef17e5ebc02cc0d2ba7d85c33b0958d7c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71687bef17e5ebc02cc0d2ba7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 30 16:38:18 2013 +0100 qcap: Added AVI compressor output pin stub implementation. --- dlls/qcap/avico.c | 105 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/qcap/tests/qcap.c | 14 ++++++- 2 files changed, 113 insertions(+), 6 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index a4bc02e..70c3283 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -35,6 +35,7 @@ typedef struct { IPersistPropertyBag IPersistPropertyBag_iface; BaseInputPin *in; + BaseOutputPin *out; } AVICompressor; static inline AVICompressor *impl_from_BaseFilter(BaseFilter *filter) @@ -93,6 +94,8 @@ static ULONG WINAPI AVICompressor_Release(IBaseFilter *iface) if(!ref) { if(This->in) BaseInputPinImpl_Release(&This->in->pin.IPin_iface); + if(This->out) + BaseOutputPinImpl_Release(&This->out->pin.IPin_iface); heap_free(This); } @@ -171,8 +174,8 @@ static IPin* WINAPI AVICompressor_GetPin(BaseFilter *iface, int pos) ret = &This->in->pin.IPin_iface; break; case 1: - FIXME("out pin not implemented\n"); - return NULL; + ret = &This->out->pin.IPin_iface; + break; default: TRACE("No pin %d\n", pos); return NULL; @@ -184,9 +187,7 @@ static IPin* WINAPI AVICompressor_GetPin(BaseFilter *iface, int pos) static LONG WINAPI AVICompressor_GetPinCount(BaseFilter *iface) { - AVICompressor *This = impl_from_BaseFilter(iface); - FIXME("(%p)\n", This); - return 1; + return 2; } static const BaseFilterFuncTable filter_func_table = { @@ -351,9 +352,93 @@ static const BaseInputPinFuncTable AVICompressorBaseInputPinVtbl = { AVICompressorIn_Receive }; +static HRESULT WINAPI AVICompressorOut_QueryInterface(IPin *iface, REFIID riid, void **ppv) +{ + return BaseInputPinImpl_QueryInterface(iface, riid, ppv); +} + +static ULONG WINAPI AVICompressorOut_AddRef(IPin *iface) +{ + AVICompressor *This = impl_from_IPin(iface); + return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); +} + +static ULONG WINAPI AVICompressorOut_Release(IPin *iface) +{ + AVICompressor *This = impl_from_IPin(iface); + return IBaseFilter_Release(&This->filter.IBaseFilter_iface); +} + +static const IPinVtbl AVICompressorOutputPinVtbl = { + AVICompressorOut_QueryInterface, + AVICompressorOut_AddRef, + AVICompressorOut_Release, + BaseOutputPinImpl_Connect, + BaseOutputPinImpl_ReceiveConnection, + BaseOutputPinImpl_Disconnect, + BasePinImpl_ConnectedTo, + BasePinImpl_ConnectionMediaType, + BasePinImpl_QueryPinInfo, + BasePinImpl_QueryDirection, + BasePinImpl_QueryId, + BasePinImpl_QueryAccept, + BasePinImpl_EnumMediaTypes, + BasePinImpl_QueryInternalConnections, + BaseOutputPinImpl_EndOfStream, + BaseOutputPinImpl_BeginFlush, + BaseOutputPinImpl_EndFlush, + BasePinImpl_NewSegment +}; + +static LONG WINAPI AVICompressorOut_GetMediaTypeVersion(BasePin *base) +{ + FIXME("(%p)\n", base); + return 0; +} + +static HRESULT WINAPI AVICompressorOut_GetMediaType(BasePin *base, int iPosition, AM_MEDIA_TYPE *amt) +{ + AVICompressor *This = impl_from_IBaseFilter(base->pinInfo.pFilter); + FIXME("(%p)->(%d %p)\n", This, iPosition, amt); + return E_NOTIMPL; +} + +static const BasePinFuncTable AVICompressorOutputBasePinVtbl = { + NULL, + BaseOutputPinImpl_AttemptConnection, + AVICompressorOut_GetMediaTypeVersion, + AVICompressorOut_GetMediaType +}; + +static HRESULT WINAPI AVICompressorOut_DecideBufferSize(BaseOutputPin *base, IMemAllocator *alloc, ALLOCATOR_PROPERTIES *ppropInputRequest) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI AVICompressorOut_DecideAllocator(BaseOutputPin *base, + IMemInputPin *pPin, IMemAllocator **pAlloc) +{ + TRACE("(%p)->(%p %p)\n", base, pPin, pAlloc); + return BaseOutputPinImpl_DecideAllocator(base, pPin, pAlloc); +} + +static HRESULT WINAPI AVICompressorOut_BreakConnect(BaseOutputPin *base) +{ + FIXME("(%p)\n", base); + return E_NOTIMPL; +} + +static const BaseOutputPinFuncTable AVICompressorBaseOutputPinVtbl = { + AVICompressorOut_DecideBufferSize, + AVICompressorOut_DecideAllocator, + AVICompressorOut_BreakConnect +}; + IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) { PIN_INFO in_pin_info = {NULL, PINDIR_INPUT, {'I','n','p','u','t',0}}; + PIN_INFO out_pin_info = {NULL, PINDIR_OUTPUT, {'O','u','t','p','u','t',0}}; AVICompressor *compressor; HRESULT hres; @@ -380,6 +465,16 @@ IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) return NULL; } + out_pin_info.pFilter = &compressor->filter.IBaseFilter_iface; + hres = BaseOutputPin_Construct(&AVICompressorOutputPinVtbl, sizeof(BaseOutputPin), &out_pin_info, + &AVICompressorOutputBasePinVtbl, &AVICompressorBaseOutputPinVtbl, + &compressor->filter.csFilter, (IPin**)&compressor->out); + if(FAILED(hres)) { + IBaseFilter_Release(&compressor->filter.IBaseFilter_iface); + *phr = hres; + return NULL; + } + *phr = S_OK; return (IUnknown*)&compressor->filter.IBaseFilter_iface; } diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 942a120..b053bbd 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1336,13 +1336,14 @@ static void test_AviMux(void) static void test_AviCo(void) { IPersistPropertyBag *persist_bag; - IPin *pin, *in_pin; + IPin *pin, *in_pin, *out_pin; IEnumPins *enum_pins; IBaseFilter *avico; PIN_INFO pin_info; HRESULT hres; static const WCHAR inputW[] = {'I','n','p','u','t',0}; + static const WCHAR outputW[] = {'O','u','t','p','u','t',0}; hres = CoCreateInstance(&CLSID_AVICo, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&avico); if(hres == REGDB_E_CLASSNOTREG) { @@ -1371,8 +1372,19 @@ static void test_AviCo(void) ok(pin_info.dir == PINDIR_INPUT, "pin_info.dir = %d\n", pin_info.dir); ok(!lstrcmpW(pin_info.achName, inputW), "pin_info.achName = %s\n", wine_dbgstr_w(pin_info.achName)); + hres = IEnumPins_Next(enum_pins, 1, &out_pin, NULL); + ok(hres == S_OK, "Next failed: %08x\n", hres); + + hres = IPin_QueryPinInfo(out_pin, &pin_info); + ok(hres == S_OK, "QueryPinInfo failed: %08x\n", hres); + ok(pin_info.pFilter == avico, "pin_info.pFilter != avico\n"); + ok(pin_info.dir == PINDIR_OUTPUT, "pin_info.dir = %d\n", pin_info.dir); + ok(!lstrcmpW(pin_info.achName, outputW), "pin_info.achName = %s\n", wine_dbgstr_w(pin_info.achName)); + IEnumPins_Release(enum_pins); + IPin_Release(in_pin); + IPin_Release(out_pin); IBaseFilter_Release(avico); }

1 0

Piotr Caban : msvcrt: Convert data to multibyte encoding in ungetwc if needed.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 6122c2ba37a8871c6118d0596e9576b17660f581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6122c2ba37a8871c6118d0596… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 30 16:55:42 2013 +0100 msvcrt: Convert data to multibyte encoding in ungetwc if needed. --- dlls/msvcrt/file.c | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 3796482..4665e6b 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4730,18 +4730,39 @@ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) MSVCRT_wint_t CDECL MSVCRT_ungetwc(MSVCRT_wint_t wc, MSVCRT_FILE * file) { MSVCRT_wchar_t mwc = wc; - unsigned char * pp = (unsigned char *)&mwc; - int i; if (wc == MSVCRT_WEOF) return MSVCRT_WEOF; MSVCRT__lock_file(file); - for(i=sizeof(MSVCRT_wchar_t)-1;i>=0;i--) { - if(pp[i] != MSVCRT_ungetc(pp[i],file)) { + + if((msvcrt_get_ioinfo(file->_file)->exflag & (EF_UTF8 | EF_UTF16)) + || !(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT)) { + unsigned char * pp = (unsigned char *)&mwc; + int i; + + for(i=sizeof(MSVCRT_wchar_t)-1;i>=0;i--) { + if(pp[i] != MSVCRT_ungetc(pp[i],file)) { + MSVCRT__unlock_file(file); + return MSVCRT_WEOF; + } + } + }else { + char mbs[MSVCRT_MB_LEN_MAX]; + int len; + + len = MSVCRT_wctomb(mbs, mwc); + if(len == -1) { MSVCRT__unlock_file(file); return MSVCRT_WEOF; } + + for(len--; len>=0; len--) { + if(mbs[len] != MSVCRT_ungetc(mbs[len], file)) { + MSVCRT__unlock_file(file); + return MSVCRT_WEOF; + } + } } MSVCRT__unlock_file(file);

1 0

Piotr Caban : msvcrt: Don' t write to buffer in ungetc if _IOSTRG flag is specified.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: ed2d53a36aa413e00c577e11772915bc5de4161e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed2d53a36aa413e00c577e117… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 30 16:55:59 2013 +0100 msvcrt: Don't write to buffer in ungetc if _IOSTRG flag is specified. --- dlls/msvcrt/file.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 4665e6b..04651fb 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4713,7 +4713,15 @@ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) file->_ptr++; if(file->_ptr>file->_base) { file->_ptr--; - *file->_ptr=c; + if(file->_flag & MSVCRT__IOSTRG) { + if(*file->_ptr != c) { + file->_ptr++; + MSVCRT__unlock_file(file); + return MSVCRT_EOF; + } + }else { + *file->_ptr = c; + } file->_cnt++; MSVCRT_clearerr(file); MSVCRT__unlock_file(file);

1 0

Nikolay Sivov : ntdll: Fix return value when failed to locate resource.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: aa4ebeb57c66c8a98cf50c9ce7f7e47cf88d1271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4ebeb57c66c8a98cf50c9ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 30 00:25:38 2013 +0400 ntdll: Fix return value when failed to locate resource. --- dlls/kernel32/tests/actctx.c | 1 - dlls/ntdll/actctx.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 9894568..ab655c0 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2146,7 +2146,6 @@ todo_wine SetLastError(0xdeadbeef); handle = pCreateActCtxA(&actctx); ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); -todo_wine ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, "got error %d\n", GetLastError()); } diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 68dd7ec..962a4e5 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2633,7 +2633,7 @@ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl, status = get_manifest_in_manifest_file( acl, ai, nameW.Buffer, directory, FALSE, file ); NtClose( file ); } - else status = STATUS_RESOURCE_DATA_NOT_FOUND; + else status = STATUS_RESOURCE_TYPE_NOT_FOUND; RtlFreeUnicodeString( &nameW ); return status; }

1 0

Alexandre Julliard : configure: Don' t create cross-compiled import libraries for 16-bit modules.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: e48720236a096db328b060da651f8108b1154375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48720236a096db328b060da6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 28 13:37:34 2013 +0100 configure: Don't create cross-compiled import libraries for 16-bit modules. --- aclocal.m4 | 6 +++--- configure | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 300196b..7760a20 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -471,7 +471,7 @@ $ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT" fi - if test -n "$CROSSTARGET" + if test -n "$CROSSTARGET" -a -z "$ac_implibflags" then wine_fn_append_rule \ "__builddeps__: $ac_file.cross.a @@ -494,7 +494,7 @@ $ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT install install-dev:: $ac_dir/install-dev __uninstall__: $ac_dir/uninstall" - if test -n "$CROSSTARGET" + if test -n "$CROSSTARGET" -a -z "$ac_implibflags" then wine_fn_append_rule \ "__builddeps__: $ac_file.cross.a @@ -511,7 +511,7 @@ dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT clean:: \$(RM) dlls/lib$ac_implib.$IMPLIBEXT" wine_fn_ignore_file "dlls/lib$ac_implib.$IMPLIBEXT" - if test -n "$CROSSTARGET" + if test -n "$CROSSTARGET" -a -z "$ac_implibflags" then wine_fn_append_rule \ "__builddeps__: dlls/lib$ac_implib.cross.a diff --git a/configure b/configure index 50d5966..f56f46a 100755 --- a/configure +++ b/configure @@ -7344,7 +7344,7 @@ $ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT" fi - if test -n "$CROSSTARGET" + if test -n "$CROSSTARGET" -a -z "$ac_implibflags" then wine_fn_append_rule \ "__builddeps__: $ac_file.cross.a @@ -7367,7 +7367,7 @@ $ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT install install-dev:: $ac_dir/install-dev __uninstall__: $ac_dir/uninstall" - if test -n "$CROSSTARGET" + if test -n "$CROSSTARGET" -a -z "$ac_implibflags" then wine_fn_append_rule \ "__builddeps__: $ac_file.cross.a @@ -7384,7 +7384,7 @@ dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT clean:: \$(RM) dlls/lib$ac_implib.$IMPLIBEXT" wine_fn_ignore_file "dlls/lib$ac_implib.$IMPLIBEXT" - if test -n "$CROSSTARGET" + if test -n "$CROSSTARGET" -a -z "$ac_implibflags" then wine_fn_append_rule \ "__builddeps__: dlls/lib$ac_implib.cross.a

1 0

Alexandre Julliard : makedep: Generate a list of phony targets.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 3b7cc5ec92ea6bbbee2bb8ea91e131e93f014812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b7cc5ec92ea6bbbee2bb8ea9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 28 11:41:45 2013 +0100 makedep: Generate a list of phony targets. --- Make.rules.in | 2 -- configure | 3 +-- configure.ac | 3 +-- tools/makedep.c | 13 +++++++++++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 7e50787..08b790d 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -85,8 +85,6 @@ $(WINETEST_RES): $(TESTMODULE_STRIPPED) all: $(MANPAGES:.man.in=.man) -.PHONY: install-man-pages - # Rules for cleaning clean:: diff --git a/configure b/configure index f56f46a..10dea9a 100755 --- a/configure +++ b/configure @@ -16602,8 +16602,6 @@ EXTRA_OBJS = testlist.o all: \$(TESTMODULE)$DLLEXT \$(WINETEST_RES) \$(C_SRCS:.c=.ok): \$(TESTMODULE)$DLLEXT \$(TESTDLL:%=../%$DLLEXT) - -.PHONY: check test testclean crosstest " if test -n "$CROSSTARGET" @@ -16613,6 +16611,7 @@ MAKEDEPFLAGS = -xo -xcross.o CROSSTESTMODULE = \$(TESTDLL:%.dll=%)_crosstest.exe crosstest: \$(CROSSTESTMODULE) +.PHONY: crosstest " fi diff --git a/configure.ac b/configure.ac index b4fc0b1..afec9bb 100644 --- a/configure.ac +++ b/configure.ac @@ -2658,8 +2658,6 @@ EXTRA_OBJS = testlist.o all: \$(TESTMODULE)$DLLEXT \$(WINETEST_RES) \$(C_SRCS:.c=.ok): \$(TESTMODULE)$DLLEXT \$(TESTDLL:%=../%$DLLEXT) - -.PHONY: check test testclean crosstest ") if test -n "$CROSSTARGET" then @@ -2668,6 +2666,7 @@ MAKEDEPFLAGS = -xo -xcross.o CROSSTESTMODULE = \$(TESTDLL:%.dll=%)_crosstest.exe crosstest: \$(CROSSTESTMODULE) +.PHONY: crosstest ") fi diff --git a/tools/makedep.c b/tools/makedep.c index 041ef2e..4eab2a8 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1350,6 +1350,7 @@ static struct strarray output_sources(void) struct strarray dlldata_files = empty_strarray; struct strarray includes = empty_strarray; struct strarray subdirs = empty_strarray; + struct strarray phony_targets = empty_strarray; strarray_add( &includes, "-I." ); if (src_dir) strarray_add( &includes, strmake( "-I%s", src_dir )); @@ -1492,6 +1493,7 @@ static struct strarray output_sources(void) dir, dest, source->sourcename ); free( dest ); free( dir ); + strarray_add_uniq( &phony_targets, "install-man-pages" ); } strarray_add( &clean_files, xstrdup(obj) ); output( "%s: %s\n", obj, sourcedep ); @@ -1631,6 +1633,9 @@ static struct strarray output_sources(void) output_filenames( &ok_files, &column ); output( "\n" ); strarray_addall( &clean_files, &ok_files ); + strarray_add( &phony_targets, "check" ); + strarray_add( &phony_targets, "test" ); + strarray_add( &phony_targets, "testclean" ); } if (clean_files.count) @@ -1648,6 +1653,14 @@ static struct strarray output_sources(void) output( ":\n" ); output( "\t$(MKDIR_P) -m 755 $@\n" ); } + + if (phony_targets.count) + { + column = output( ".PHONY:" ); + output_filenames( &phony_targets, &column ); + output( "\n" ); + } + return clean_files; }

1 0

Alexandre Julliard : makedep: Clean up output files on failure.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 8aa529417d190bed00579d8e7a4d5f5a1e1ee018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aa529417d190bed00579d8e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 28 11:47:15 2013 +0100 makedep: Clean up output files on failure. --- tools/makedep.c | 78 +++++++++++++++++++++++++++++++++--------------------- 1 files changed, 48 insertions(+), 30 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 4eab2a8..9a1a978 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -28,6 +28,7 @@ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> +#include <signal.h> #include <string.h> #ifdef HAVE_UNISTD_H # include <unistd.h> @@ -104,6 +105,8 @@ static const char *parent_dir; static const char *makefile_name = "Makefile"; static const char *Separator = "### Dependencies"; static const char *input_file_name; +static const char *output_file_name; +static const char *temp_file_name; static int parse_makefile_mode; static int relative_dir_mode; static int input_line; @@ -174,6 +177,25 @@ static void fatal_perror( const char *msg, ... ) /******************************************************************* + * cleanup_files + */ +static void cleanup_files(void) +{ + if (temp_file_name) unlink( temp_file_name ); + if (output_file_name) unlink( output_file_name ); +} + + +/******************************************************************* + * exit_on_signal + */ +static void exit_on_signal( int sig ) +{ + exit( 1 ); /* this will call the atexit functions */ +} + + +/******************************************************************* * xmalloc */ static void *xmalloc( size_t size ) @@ -1668,7 +1690,7 @@ static struct strarray output_sources(void) /******************************************************************* * create_temp_file */ -static FILE *create_temp_file( const char *orig, char **tmp_name ) +static FILE *create_temp_file( const char *orig ) { char *name = xmalloc( strlen(orig) + 13 ); unsigned int i, id = getpid(); @@ -1687,7 +1709,7 @@ static FILE *create_temp_file( const char *orig, char **tmp_name ) id += 7777; } if (!ret) fatal_error( "failed to create output file for '%s'\n", orig ); - *tmp_name = name; + temp_file_name = name; return ret; } @@ -1695,20 +1717,17 @@ static FILE *create_temp_file( const char *orig, char **tmp_name ) /******************************************************************* * rename_temp_file */ -static void rename_temp_file( const char *tmp_name, const char *dest ) +static void rename_temp_file( const char *dest ) { - int ret = rename( tmp_name, dest ); + int ret = rename( temp_file_name, dest ); if (ret == -1 && errno == EEXIST) { /* rename doesn't overwrite on windows */ unlink( dest ); - ret = rename( tmp_name, dest ); - } - if (ret == -1) - { - unlink( tmp_name ); - fatal_error( "failed to rename output file to '%s'\n", dest ); + ret = rename( temp_file_name, dest ); } + if (ret == -1) fatal_error( "failed to rename output file to '%s'\n", dest ); + temp_file_name = NULL; } @@ -1717,10 +1736,9 @@ static void rename_temp_file( const char *tmp_name, const char *dest ) */ static void output_gitignore( const char *dest, const struct strarray *files ) { - char *tmp_name; int i; - output_file = create_temp_file( dest, &tmp_name ); + output_file = create_temp_file( dest ); output( "# Automatically generated by make depend; DO NOT EDIT!!\n" ); output( "/.gitignore\n" ); @@ -1731,35 +1749,31 @@ static void output_gitignore( const char *dest, const struct strarray *files ) output( "%s\n", files->str[i] ); } - fclose( output_file ); + if (fclose( output_file )) fatal_perror( "write" ); output_file = NULL; - rename_temp_file( tmp_name, dest ); - free( tmp_name ); + rename_temp_file( dest ); } /******************************************************************* * output_dependencies */ -static void output_dependencies(void) +static void output_dependencies( const char *path ) { - char *tmp_name = NULL; - char *path = strmake( "%s/%s", base_dir, makefile_name ); struct strarray targets = empty_strarray; if (Separator && ((output_file = fopen( path, "r" )))) { char buffer[1024]; - FILE *tmp_file = create_temp_file( path, &tmp_name ); + FILE *tmp_file = create_temp_file( path ); int found = 0; while (fgets( buffer, sizeof(buffer), output_file ) && !found) { - if (fwrite( buffer, 1, strlen(buffer), tmp_file ) != strlen(buffer)) - fatal_error( "failed to write to %s\n", tmp_name ); + if (fwrite( buffer, 1, strlen(buffer), tmp_file ) != strlen(buffer)) fatal_perror( "write" ); found = !strncmp( buffer, Separator, strlen(Separator) ); } - fclose( output_file ); + if (fclose( output_file )) fatal_perror( "write" ); output_file = tmp_file; if (!found && !list_empty(&sources)) output( "\n%s\n", Separator ); } @@ -1773,12 +1787,7 @@ static void output_dependencies(void) fclose( output_file ); output_file = NULL; - if (tmp_name) - { - rename_temp_file( tmp_name, path ); - free( tmp_name ); - } - free( path ); + if (temp_file_name) rename_temp_file( path ); if (!src_dir) output_gitignore( strmake( "%s/.gitignore", base_dir ), &targets ); } @@ -1817,6 +1826,7 @@ static void update_makefile( const char *path ) struct incl_file *file; base_dir = path; + output_file_name = strmake( "%s/%s", base_dir, makefile_name ); parse_makefile(); src_dir = get_expanded_make_variable( "srcdir" ); @@ -1860,7 +1870,8 @@ static void update_makefile( const char *path ) } LIST_FOR_EACH_ENTRY( file, &includes, struct incl_file, entry ) parse_file( file, 0 ); - output_dependencies(); + output_dependencies( output_file_name ); + output_file_name = NULL; } @@ -1974,6 +1985,13 @@ int main( int argc, char *argv[] ) exit( 0 ); } + atexit( cleanup_files ); + signal( SIGTERM, exit_on_signal ); + signal( SIGINT, exit_on_signal ); +#ifdef SIGHUP + signal( SIGHUP, exit_on_signal ); +#endif + if (parse_makefile_mode) { for (i = 1; i < argc; i++) update_makefile( argv[i] ); @@ -1985,6 +2003,6 @@ int main( int argc, char *argv[] ) add_generated_sources(); LIST_FOR_EACH_ENTRY( pFile, &includes, struct incl_file, entry ) parse_file( pFile, 0 ); - output_dependencies(); + output_dependencies( makefile_name ); return 0; }

1 0

Alexandre Julliard : makedep: Manage current output column with a global variable.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 2af368b88cb24be028dfb46cd6dc040dbd5e7507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2af368b88cb24be028dfb46cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 28 11:48:03 2013 +0100 makedep: Manage current output column with a global variable. --- tools/makedep.c | 143 +++++++++++++++++++++++++++---------------------------- 1 files changed, 70 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2af368b88cb24be028dfb…

1 0

Alexandre Julliard : makedep: Pass string arrays by value in some places.
by Alexandre Julliard 30 Dec '13

30 Dec '13

Module: wine Branch: master Commit: 5706cdaa5bda259615055a558ffae0da7e447e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5706cdaa5bda259615055a558… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 28 19:52:33 2013 +0100 makedep: Pass string arrays by value in some places. --- tools/makedep.c | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 4141756..3c35a8a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -301,11 +301,11 @@ static void strarray_add( struct strarray *array, const char *str ) /******************************************************************* * strarray_addall */ -static void strarray_addall( struct strarray *array, const struct strarray *added ) +static void strarray_addall( struct strarray *array, struct strarray added ) { unsigned int i; - for (i = 0; i < added->count; i++) strarray_add( array, added->str[i] ); + for (i = 0; i < added.count; i++) strarray_add( array, added.str[i] ); } @@ -352,11 +352,11 @@ static void output_filename( const char *name ) /******************************************************************* * output_filenames */ -static void output_filenames( struct strarray *array ) +static void output_filenames( struct strarray array ) { unsigned int i; - for (i = 0; i < array->count; i++) output_filename( array->str[i] ); + for (i = 0; i < array.count; i++) output_filename( array.str[i] ); } @@ -1384,7 +1384,7 @@ static struct strarray output_sources(void) else strarray_add( &includes, strmake( "-I%s", parent_dir )); } if (top_src_dir && top_obj_dir) strarray_add( &includes, strmake( "-I%s/include", top_obj_dir )); - strarray_addall( &includes, &include_args ); + strarray_addall( &includes, include_args ); LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) { @@ -1442,7 +1442,7 @@ static struct strarray output_sources(void) { output( "%s.res: $(WRC) $(ALL_MO_FILES) %s\n", obj, sourcedep ); output( "\t$(WRC) -o $@ %s", source->filename ); - output_filenames( &includes ); + output_filenames( includes ); output_filename( "$(RCFLAGS)" ); output( "\n" ); output( "%s.res rsrc.pot:", obj ); @@ -1452,7 +1452,7 @@ static struct strarray output_sources(void) { output( "%s.res: $(WRC) %s\n", obj, sourcedep ); output( "\t$(WRC) -o $@ %s", source->filename ); - output_filenames( &includes ); + output_filenames( includes ); output_filename( "$(RCFLAGS)" ); output( "\n" ); output( "%s.res:", obj ); @@ -1484,14 +1484,14 @@ static struct strarray output_sources(void) strarray_add( &targets, dest ); } if (source->flags & FLAG_IDL_PROXY) strarray_add( &dlldata_files, source->name ); - output_filenames( &targets ); + output_filenames( targets ); output( ": $(WIDL)\n" ); output( "\t$(WIDL) -o $@ %s", source->filename ); - output_filenames( &includes ); + output_filenames( includes ); output_filename( "$(TARGETFLAGS)" ); output_filename( "$(IDLFLAGS)" ); output( "\n" ); - output_filenames( &targets ); + output_filenames( targets ); output( ": %s", sourcedep ); } else if (!strcmp( ext, "in" )) /* .in file or man page */ @@ -1564,14 +1564,14 @@ static struct strarray output_sources(void) if (strstr( object_extensions.str[i], "cross" )) { output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); - output_filenames( &includes ); + output_filenames( includes ); output_filename( "$(ALLCROSSCFLAGS)" ); output( "\n" ); } else { output( "\t$(CC) -c -o $@ %s", source->filename ); - output_filenames( &includes ); + output_filenames( includes ); output_filename( "$(ALLCFLAGS)" ); output( "\n" ); } @@ -1581,7 +1581,7 @@ static struct strarray output_sources(void) strarray_add( &clean_files, strmake( "%s.cross.o", obj )); output( "%s.cross.o: %s\n", obj, sourcedep ); output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); - output_filenames( &includes ); + output_filenames( includes ); output_filename( "$(ALLCROSSCFLAGS)" ); output( "\n" ); } @@ -1609,12 +1609,12 @@ static struct strarray output_sources(void) if (po_files.count) { output( "rsrc.pot: $(WRC)" ); - output_filenames( &po_files ); + output_filenames( po_files ); output( "\n" ); output( "\t$(WRC) -O pot -o $@" ); - output_filenames( &includes ); + output_filenames( includes ); output_filename( "$(RCFLAGS)" ); - output_filenames( &po_files ); + output_filenames( po_files ); output( "\n" ); strarray_add( &clean_files, "rsrc.pot" ); } @@ -1622,10 +1622,10 @@ static struct strarray output_sources(void) if (mc_files.count) { output( "msg.pot: $(WMC)" ); - output_filenames( &mc_files ); + output_filenames( mc_files ); output( "\n" ); output( "\t$(WMC) -O pot -o $@" ); - output_filenames( &mc_files ); + output_filenames( mc_files ); output( "\n" ); strarray_add( &clean_files, "msg.pot" ); } @@ -1634,7 +1634,7 @@ static struct strarray output_sources(void) { output( "dlldata.c: $(WIDL) %s\n", src_dir ? strmake("%s/Makefile.in", src_dir ) : "Makefile.in" ); output( "\t$(WIDL) --dlldata-only -o $@" ); - output_filenames( &dlldata_files ); + output_filenames( dlldata_files ); output( "\n" ); } @@ -1643,16 +1643,16 @@ static struct strarray output_sources(void) struct strarray ok_files = strarray_replace_extension( &test_files, ".c", ".ok" ); output( "testlist.c: $(MAKECTESTS) %s\n", src_dir ? strmake("%s/Makefile.in", src_dir ) : "Makefile.in" ); output( "\t$(MAKECTESTS) -o $@" ); - output_filenames( &test_files ); + output_filenames( test_files ); output( "\n" ); output( "check test:" ); - output_filenames( &ok_files ); + output_filenames( ok_files ); output( "\n" ); output( "testclean::\n" ); output( "\t$(RM)" ); - output_filenames( &ok_files ); + output_filenames( ok_files ); output( "\n" ); - strarray_addall( &clean_files, &ok_files ); + strarray_addall( &clean_files, ok_files ); strarray_add( &phony_targets, "check" ); strarray_add( &phony_targets, "test" ); strarray_add( &phony_targets, "testclean" ); @@ -1662,13 +1662,13 @@ static struct strarray output_sources(void) { output( "clean::\n" ); output( "\t$(RM)" ); - output_filenames( &clean_files ); + output_filenames( clean_files ); output( "\n" ); } if (subdirs.count) { - output_filenames( &subdirs ); + output_filenames( subdirs ); output( ":\n" ); output( "\t$(MKDIR_P) -m 755 $@\n" ); } @@ -1676,7 +1676,7 @@ static struct strarray output_sources(void) if (phony_targets.count) { output( ".PHONY:" ); - output_filenames( &phony_targets ); + output_filenames( phony_targets ); output( "\n" ); }

1 0