October 2015 - Wine-commits

Alexandre Julliard : configure: Follow the variable naming convention for libpcap.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: ded44ed947bc8765abecb796e41dc4a2cd24e0b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded44ed947bc8765abecb796e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 19:33:27 2015 +0900 configure: Follow the variable naming convention for libpcap. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 5 +++-- configure.ac | 2 +- dlls/wpcap/Makefile.in | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure b/configure index f21a860..83b7c32 100755 --- a/configure +++ b/configure @@ -677,7 +677,7 @@ XSLT_LIBS XSLT_CFLAGS XML2_LIBS XML2_CFLAGS -LIBPCAP +PCAP_LIBS X_EXTRA_LIBS X_LIBS X_PRE_LIBS @@ -10941,7 +10941,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_create" >&5 $as_echo "$ac_cv_lib_pcap_pcap_create" >&6; } if test "x$ac_cv_lib_pcap_pcap_create" = xyes; then : - LIBPCAP="-lpcap" + PCAP_LIBS="-lpcap" fi @@ -17127,6 +17127,7 @@ X_CFLAGS = $X_CFLAGS X_PRE_LIBS = $X_PRE_LIBS X_LIBS = $X_LIBS X_EXTRA_LIBS = $X_EXTRA_LIBS +PCAP_LIBS = $PCAP_LIBS XML2_CFLAGS = $XML2_CFLAGS XML2_LIBS = $XML2_LIBS XSLT_CFLAGS = $XSLT_CFLAGS diff --git a/configure.ac b/configure.ac index a209fa1..a494266 100644 --- a/configure.ac +++ b/configure.ac @@ -1289,7 +1289,7 @@ test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes && enable_opencl=${enable_op dnl **** Check for libpcap **** if test "$ac_cv_header_pcap_pcap_h" = "yes" then - AC_CHECK_LIB(pcap,pcap_create,[AC_SUBST(LIBPCAP,["-lpcap"])]) + AC_CHECK_LIB(pcap,pcap_create,[AC_SUBST(PCAP_LIBS,["-lpcap"])]) fi WINE_NOTICE_WITH(pcap,[test "x$ac_cv_lib_pcap_pcap_create" != xyes], [pcap ${notice_platform}development files not found, wpcap won't be supported.]) diff --git a/dlls/wpcap/Makefile.in b/dlls/wpcap/Makefile.in index e44613f..91b4a95 100644 --- a/dlls/wpcap/Makefile.in +++ b/dlls/wpcap/Makefile.in @@ -1,6 +1,6 @@ MODULE = wpcap.dll DELAYIMPORTS = ws2_32 -EXTRALIBS = @LIBPCAP@ +EXTRALIBS = $(PCAP_LIBS) C_SRCS = \ wpcap.c

1 0

Alexandre Julliard : makefiles: Only define the dummy target in makefiles that need it.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 90d66cc874addb09b5acc321c64dd8c562807243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d66cc874addb09b5acc321c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 21:36:15 2015 +0900 makefiles: Only define the dummy target in makefiles that need it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Make.vars.in | 3 +-- Makefile.in | 3 ++- libs/wine/Makefile.in | 4 +++- programs/winetest/Makefile.in | 3 +++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index e825f4b..e2de171 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -72,7 +72,6 @@ conf_manext = 5 @SET_MAKE@ all: -dummy: -.PHONY: all dummy +.PHONY: all # End of common header diff --git a/Makefile.in b/Makefile.in index b600cf7..9c5158d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -50,8 +50,9 @@ uninstall:: __uninstall__ # dependencies needed to build any dll or program __tooldeps__: libs/port libs/wine libs/wpp __builddeps__: __tooldeps__ include -.PHONY: depend check test testclean crosstest __tooldeps__ __builddeps__ +.PHONY: depend dummy check test testclean crosstest __tooldeps__ __builddeps__ +dummy: loader: libs/port libs/wine tools server: libs/port libs/wine tools include fonts: tools/sfnt2fon diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index c961ba5..bc5f6fe 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -107,8 +107,10 @@ config_EXTRADEFS = \ version.c: dummy version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-(a)PACKAGE_VERSION@") | sed -n -e '$$s/$.*$/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1) +dummy: + # Make sure that make_makefiles sees the generated rules -.PHONY: install install-lib install-dev uninstall +.PHONY: dummy install install-lib install-dev uninstall install install-lib:: install install-dev:: clean:: diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 1c25e25..7bdfe2a 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -26,3 +26,6 @@ build.nfo: build.res: build.rc build.nfo $(WRC) -o $@ build.rc + +dummy: +.PHONY: dummy

1 0

Bruno Jesus : msvidc32: Add missing compression messages to the list.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 665f308fd97264f4373f0754a10fc8338c4052fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=665f308fd97264f4373f0754a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 22 18:46:13 2015 +0800 msvidc32: Add missing compression messages to the list. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvidc32/msvideo1.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 61baa9e..b3faaf6 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -558,12 +558,15 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, break; case ICM_COMPRESS_QUERY: - FIXME("compression not implemented\n"); r = ICERR_BADFORMAT; + /* fall through */ + case ICM_COMPRESS_GET_FORMAT: + case ICM_COMPRESS_END: + case ICM_COMPRESS: + FIXME("compression not implemented\n"); break; case ICM_CONFIGURE: - r = ICERR_UNSUPPORTED; break; default:

1 0

Bruno Jesus : msvfw32/tests: Check if requesting the default codec works.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: acd79650fe93a54413e1e994c3ec5faab263cbdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=acd79650fe93a54413e1e994c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 22 20:15:45 2015 +0800 msvfw32/tests: Check if requesting the default codec works. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/tests/msvfw.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 0b18e47..a9c4053 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -28,6 +28,29 @@ static void test_OpenCase(void) { HIC h; + ICINFO info; + /* Check if default handler works */ + h = ICOpen(mmioFOURCC('v','i','d','c'),0,ICMODE_DECOMPRESS); +todo_wine + ok(0!=h,"ICOpen(vidc.0) failed\n"); + if (h) { + info.dwSize = sizeof(info); + info.szName[0] = 0; + ICGetInfo(h, &info, sizeof(info)); + trace("The default decompressor is %s\n", wine_dbgstr_w(info.szName)); + ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); + } + h = ICOpen(mmioFOURCC('v','i','d','c'),0,ICMODE_COMPRESS); +todo_wine + ok(0!=h || broken(h == 0),"ICOpen(vidc.0) failed\n"); /* Not present in Win8 */ + if (h) { + info.dwSize = sizeof(info); + info.szName[0] = 0; + ICGetInfo(h, &info, sizeof(info)); + trace("The default compressor is %s\n", wine_dbgstr_w(info.szName)); + ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); + } + /* Open a compressor with combinations of lowercase * and uppercase compressortype and handler. */

1 0

Michael Stefaniuc : d3d9/tests: Test the return value of CreateDepthStencilSurface().
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 4fb840b614691a787c76659f02c163d922f88fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fb840b614691a787c76659f0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 21 15:38:06 2015 +0200 d3d9/tests: Test the return value of CreateDepthStencilSurface(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f110905..be276ee 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -16219,6 +16219,7 @@ static void resz_test(void) IDirect3DSurface9_Release(ds); hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 640, 480, D3DFMT_D24S8, D3DMULTISAMPLE_NONE, 0, TRUE, &ds, NULL); + ok(SUCCEEDED(hr), "Failed to create depth stencil surface, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderTarget(device, 0, readback); ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); @@ -19777,6 +19778,7 @@ static void test_depthbias(void) hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 640, 480, formats[i], D3DMULTISAMPLE_NONE, 0, FALSE, &ds, NULL); + ok(SUCCEEDED(hr), "Failed to create depth stencil surface, hr %#x.\n", hr); hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); ok(SUCCEEDED(hr), "Failed to set depth stencil surface, hr %#x.\n", hr); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00000000, 0.5f, 0);

1 0

Jacek Caban : ole32: Pass requested interface IID to CreateInstance in CoCreateInstanceEx.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: dedcd30cb899adb69b7994ee32b2e775057e3902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dedcd30cb899adb69b7994ee3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 21 16:22:37 2015 +0200 ole32: Pass requested interface IID to CreateInstance in CoCreateInstanceEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 24 ++++++++++++++++-------- dlls/ole32/tests/compobj.c | 27 +++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 82904a8..c04d2f0 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3271,18 +3271,26 @@ static void init_multi_qi(DWORD count, MULTI_QI *mqi) } } -static HRESULT return_multi_qi(IUnknown *unk, DWORD count, MULTI_QI *mqi) +static HRESULT return_multi_qi(IUnknown *unk, DWORD count, MULTI_QI *mqi, BOOL include_unk) { - ULONG index, fetched = 0; + ULONG index = 0, fetched = 0; - for (index = 0; index < count; index++) + if (include_unk) + { + mqi[0].hr = S_OK; + mqi[0].pItf = unk; + index = fetched = 1; + } + + for (; index < count; index++) { mqi[index].hr = IUnknown_QueryInterface(unk, mqi[index].pIID, (void**)&mqi[index].pItf); if (mqi[index].hr == S_OK) fetched++; } - IUnknown_Release(unk); + if (!include_unk) + IUnknown_Release(unk); if (fetched == 0) return E_NOINTERFACE; @@ -3321,13 +3329,13 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( hr = CoCreateInstance(rclsid, pUnkOuter, dwClsContext, - &IID_IUnknown, + pResults[0].pIID, (VOID**)&pUnk); if (hr != S_OK) return hr; - return return_multi_qi(pUnk, cmq, pResults); + return return_multi_qi(pUnk, cmq, pResults, TRUE); } /*********************************************************************** @@ -3390,7 +3398,7 @@ HRESULT WINAPI CoGetInstanceFromFile( IPersistFile_Release(pf); } - return return_multi_qi(unk, count, results); + return return_multi_qi(unk, count, results, FALSE); } /*********************************************************************** @@ -3453,7 +3461,7 @@ HRESULT WINAPI CoGetInstanceFromIStorage( IPersistStorage_Release(ps); } - return return_multi_qi(unk, count, results); + return return_multi_qi(unk, count, results, FALSE); } /*********************************************************************** diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index e7116bc..b03e861 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -152,6 +152,7 @@ static ULONG WINAPI Test_IClassFactory_Release(LPCLASSFACTORY iface) return 1; /* non-heap-based object */ } +static IID create_instance_iid; static HRESULT WINAPI Test_IClassFactory_CreateInstance( LPCLASSFACTORY iface, IUnknown *pUnkOuter, @@ -159,6 +160,7 @@ static HRESULT WINAPI Test_IClassFactory_CreateInstance( LPVOID *ppvObj) { *ppvObj = NULL; + create_instance_iid = *riid; if (pUnkOuter) return CLASS_E_NOAGGREGATION; return E_NOINTERFACE; } @@ -789,6 +791,30 @@ static void test_CoGetClassObject(void) CoUninitialize(); } +static void test_CoCreateInstanceEx(void) +{ + MULTI_QI qi_res = { &IID_IMoniker }; + DWORD cookie; + HRESULT hr; + + CoInitialize(NULL); + + hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&Test_ClassFactory, + CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie); + ok_ole_success(hr, "CoRegisterClassObject"); + + create_instance_iid = IID_NULL; + hr = CoCreateInstanceEx(&CLSID_WineOOPTest, NULL, CLSCTX_INPROC_SERVER, NULL, 1, &qi_res); + ok(hr == E_NOINTERFACE, "CoCreateInstanceEx failed: %08x\n", hr); + ok(IsEqualGUID(&create_instance_iid, qi_res.pIID), "Unexpected CreateInstance iid %s\n", + wine_dbgstr_guid(&create_instance_iid)); + + hr = CoRevokeClassObject(cookie); + ok_ole_success(hr, "CoRevokeClassObject"); + + CoUninitialize(); +} + static ATOM register_dummy_class(void) { WNDCLASSA wc = @@ -2636,6 +2662,7 @@ START_TEST(compobj) test_CoCreateInstance(); test_ole_menu(); test_CoGetClassObject(); + test_CoCreateInstanceEx(); test_CoRegisterMessageFilter(); test_CoRegisterPSClsid(); test_CoGetPSClsid();

1 0

Jacek Caban : ole32: Call CoCreateInstanceEx from CoCreateInstance instead of the other way around.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: c5b54b34e97cd23a04c34b8518c8ac934e6e2dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5b54b34e97cd23a04c34b851… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 21 16:24:48 2015 +0200 ole32: Call CoCreateInstanceEx from CoCreateInstance instead of the other way around. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 151 +++++++++++++++++++++++---------------------------- 1 file changed, 68 insertions(+), 83 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index c04d2f0..b3c49d3 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3187,10 +3187,8 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance( REFIID iid, LPVOID *ppv) { + MULTI_QI multi_qi = { iid }; HRESULT hres; - LPCLASSFACTORY lpclf = 0; - APARTMENT *apt; - CLSID clsid; TRACE("(rclsid=%s, pUnkOuter=%p, dwClsContext=%08x, riid=%s, ppv=%p)\n", debugstr_guid(rclsid), pUnkOuter, dwClsContext, debugstr_guid(iid), ppv); @@ -3198,65 +3196,8 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance( if (ppv==0) return E_POINTER; - hres = CoGetTreatAsClass(rclsid, &clsid); - if(FAILED(hres)) - clsid = *rclsid; - - *ppv = 0; - - if (!(apt = COM_CurrentApt())) - { - if (!(apt = apartment_find_multi_threaded())) - { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; - } - apartment_release(apt); - } - - /* - * The Standard Global Interface Table (GIT) object is a process-wide singleton. - */ - if (IsEqualIID(&clsid, &CLSID_StdGlobalInterfaceTable)) - { - IGlobalInterfaceTable *git = get_std_git(); - hres = IGlobalInterfaceTable_QueryInterface(git, iid, ppv); - if (hres != S_OK) return hres; - - TRACE("Retrieved GIT (%p)\n", *ppv); - return S_OK; - } - - if (IsEqualCLSID(&clsid, &CLSID_ManualResetEvent)) - return ManualResetEvent_Construct(pUnkOuter, iid, ppv); - - /* - * Get a class factory to construct the object we want. - */ - hres = CoGetClassObject(&clsid, - dwClsContext, - NULL, - &IID_IClassFactory, - (LPVOID)&lpclf); - - if (FAILED(hres)) - return hres; - - /* - * Create the object and don't forget to release the factory - */ - hres = IClassFactory_CreateInstance(lpclf, pUnkOuter, iid, ppv); - IClassFactory_Release(lpclf); - if (FAILED(hres)) - { - if (hres == CLASS_E_NOAGGREGATION && pUnkOuter) - FIXME("Class %s does not support aggregation\n", debugstr_guid(&clsid)); - else - FIXME("no instance created for interface %s of class %s, hres is 0x%08x\n", - debugstr_guid(iid), - debugstr_guid(&clsid),hres); - } - + hres = CoCreateInstanceEx(rclsid, pUnkOuter, dwClsContext, NULL, 1, &multi_qi); + *ppv = multi_qi.pItf; return hres; } @@ -3309,33 +3250,77 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( ULONG cmq, MULTI_QI* pResults) { - IUnknown* pUnk = NULL; - HRESULT hr; + IUnknown *unk = NULL; + IClassFactory *cf; + APARTMENT *apt; + CLSID clsid; + HRESULT hres; - /* - * Sanity check - */ - if ( (cmq==0) || (pResults==NULL)) - return E_INVALIDARG; + TRACE("(%s %p %x %p %u %p)\n", debugstr_guid(rclsid), pUnkOuter, dwClsContext, pServerInfo, cmq, pResults); - if (pServerInfo!=NULL) - FIXME("() non-NULL pServerInfo not supported!\n"); + if (!cmq || !pResults) + return E_INVALIDARG; - init_multi_qi(cmq, pResults); + if (pServerInfo) + FIXME("() non-NULL pServerInfo not supported!\n"); - /* - * Get the object and get its IUnknown pointer. - */ - hr = CoCreateInstance(rclsid, - pUnkOuter, - dwClsContext, - pResults[0].pIID, - (VOID**)&pUnk); + init_multi_qi(cmq, pResults); - if (hr != S_OK) - return hr; + hres = CoGetTreatAsClass(rclsid, &clsid); + if(FAILED(hres)) + clsid = *rclsid; + + if (!(apt = COM_CurrentApt())) + { + if (!(apt = apartment_find_multi_threaded())) + { + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; + } + apartment_release(apt); + } + + /* + * The Standard Global Interface Table (GIT) object is a process-wide singleton. + */ + if (IsEqualIID(&clsid, &CLSID_StdGlobalInterfaceTable)) + { + IGlobalInterfaceTable *git = get_std_git(); + TRACE("Retrieving GIT\n"); + return return_multi_qi((IUnknown*)git, cmq, pResults, FALSE); + } + + if (IsEqualCLSID(&clsid, &CLSID_ManualResetEvent)) { + hres = ManualResetEvent_Construct(pUnkOuter, pResults[0].pIID, (void**)&unk); + if (FAILED(hres)) + return hres; + return return_multi_qi(unk, cmq, pResults, TRUE); + } + + /* + * Get a class factory to construct the object we want. + */ + hres = CoGetClassObject(&clsid, dwClsContext, NULL, &IID_IClassFactory, (void**)&cf); + if (FAILED(hres)) + return hres; + + /* + * Create the object and don't forget to release the factory + */ + hres = IClassFactory_CreateInstance(cf, pUnkOuter, pResults[0].pIID, (void**)&unk); + IClassFactory_Release(cf); + if (FAILED(hres)) + { + if (hres == CLASS_E_NOAGGREGATION && pUnkOuter) + FIXME("Class %s does not support aggregation\n", debugstr_guid(&clsid)); + else + FIXME("no instance created for interface %s of class %s, hres is 0x%08x\n", + debugstr_guid(pResults[0].pIID), + debugstr_guid(&clsid),hres); + return hres; + } - return return_multi_qi(pUnk, cmq, pResults, TRUE); + return return_multi_qi(unk, cmq, pResults, TRUE); } /***********************************************************************

1 0

Andrew Eikum : xaudio2: Don't render less than a period of audio.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 998e5a0432b10fe88452baebba249efb1471d968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=998e5a0432b10fe88452baebb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 21 10:01:22 2015 -0500 xaudio2: Don't render less than a period of audio. Sometimes the ALSA driver will report a very small amount of frames available after a period signal. There is a bug in OpenAL 1.15 which will crash the application if alcRenderSamplesSOFT is called with less than 4 frames. And anyway, we shouldn't incur all of this overhead just to render a couple of frames. So, just skip the rendering step if we have less than a period of space available in the driver. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 76b4c13..a4a9399 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2723,7 +2723,11 @@ static void do_engine_tick(IXAudio2Impl *This) } nframes = This->period_frames * 3 - pad; - TRACE("going to render %u frames\n", nframes); + + TRACE("frames available: %u\n", nframes); + + if(nframes < This->period_frames) + return; if(!nframes) return;

1 0

Michael Cronenworth : winegcc: Check for linker relocation support before relying on prelink.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: a35f9a13a80fa93c251e12402a73a38a89ec397f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a35f9a13a80fa93c251e12402… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Wed Oct 21 20:54:38 2015 -0500 winegcc: Check for linker relocation support before relying on prelink. Prelink was used to rewrite binares and set their text segment, but modern linkers support setting the value at link time. Prelink is being retired by upstream. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 36 +++++++++++++++++++++++++++++++----- configure.ac | 11 ++++++----- tools/winegcc/winegcc.c | 13 ++++++++++--- 3 files changed, 47 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 6689b65..f21a860 100755 --- a/configure +++ b/configure @@ -8678,7 +8678,32 @@ if test "x$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" = xyes; then : esac fi - # Extract the first word of "prelink", so it can be a program name with args. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000" >&5 +$as_echo_n "checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000... " >&6; } +if ${ac_cv_cflags__Wl__Ttext_segment_0x7bc00000+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wl,-Ttext-segment=0x7bc00000" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wl__Ttext_segment_0x7bc00000=yes +else + ac_cv_cflags__Wl__Ttext_segment_0x7bc00000=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&5 +$as_echo "$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&6; } +if test "x$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" = xyes; then : + : +else + # Extract the first word of "prelink", so it can be a program name with args. set dummy prelink; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -8719,10 +8744,11 @@ $as_echo "no" >&6; } fi - if test "x$PRELINK" = xfalse - then - as_fn_append wine_warnings "|prelink not found, base address of core dlls won't be set correctly." - fi + if test "x$PRELINK" = xfalse + then + as_fn_append wine_warnings "|prelink not found and linker does not support relocation, base address of core dlls won't be set correctly." + fi +fi ;; esac diff --git a/configure.ac b/configure.ac index 030aa32..a209fa1 100644 --- a/configure.ac +++ b/configure.ac @@ -988,11 +988,12 @@ wine-installed: main.o *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;; esac ]) - AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH]) - if test "x$PRELINK" = xfalse - then - WINE_WARNING([prelink not found, base address of core dlls won't be set correctly.]) - fi + WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000],[:], + [AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH]) + if test "x$PRELINK" = xfalse + then + WINE_WARNING([prelink not found and linker does not support relocation, base address of core dlls won't be set correctly.]) + fi]) ;; esac diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 3b2794e..ad139f5 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -776,6 +776,7 @@ static void build(struct options* opts) char *output_file; const char *spec_o_name; const char *output_name, *spec_file, *lang; + const char *prelink = NULL; int generate_app_loader = 1; int fake_module = 0; unsigned int j; @@ -1134,6 +1135,13 @@ static void build(struct options* opts) } break; default: + if (opts->image_base) + { + if (!try_link(opts->prefix, link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base))) + strarray_add(link_args, strmake("-Wl,-Ttext-segment=%s", opts->image_base)); + else + prelink = PRELINK; + } break; } @@ -1167,10 +1175,9 @@ static void build(struct options* opts) spawn(opts->prefix, link_args, 0); strarray_free (link_args); - /* set the base address */ - if (opts->image_base && !opts->target) + /* set the base address with prelink if linker support is not present */ + if (prelink && !opts->target) { - const char *prelink = PRELINK; if (prelink[0] && strcmp(prelink,"false")) { strarray *prelink_args = strarray_alloc();

1 0

Alex Henrie : maintainers: Add myself as a volunteer maintainer.
by Alexandre Julliard 22 Oct '15

22 Oct '15

Module: wine Branch: master Commit: 06fca4488c9e66ea71bf96f5f34de32ffdf06f87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06fca4488c9e66ea71bf96f5f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Oct 21 20:13:49 2015 -0600 maintainers: Add myself as a volunteer maintainer. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index ff102f0..b425b52 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -167,5 +167,6 @@ F: dlls/msxml*/ THE REST M: Alexandre Julliard <julliard(a)winehq.org> P: Sebastian Lackner <sebastian(a)fds-team.de> +P: Alex Henrie <alexhenrie24(a)gmail.com> F: * F: */

1 0