RepositoryExternal.mk | 2 +- extensions/source/activex/SOActiveX.cxx | 4 ++-- extensions/source/activex/SODispatchInterceptor.cxx | 1 - extensions/source/ole/oleobjw.cxx | 17 +++++++++-------- extensions/source/ole/unoconversionutilities.hxx | 12 ++++++------ extensions/source/ole/unoobjw.cxx | 8 ++++---- solenv/gbuild/platform/com_MSC_class.mk | 3 ++- 7 files changed, 24 insertions(+), 23 deletions(-)
New commits: commit 120586bb305f7bd763753a3f5a8d60e25ad3db8f Author: David Ostrovsky <da...@ostrovsky.org> Date: Sat Feb 20 16:47:26 2016 +0100 Ole: Fix WaE Change-Id: Ia6ccdc21608abcbd715bd9ff4aa2057f9f306e58 Reviewed-on: https://gerrit.libreoffice.org/22686 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: David Ostrovsky <da...@ostrovsky.org> (cherry picked from commit 43cdf4b6284ba5f73f290027b9374353f7f47e1f) Signed-off-by: Michael Stahl <mst...@redhat.com> diff --git a/extensions/source/activex/SOActiveX.cxx b/extensions/source/activex/SOActiveX.cxx index 09e3f26..bf93407 100644 --- a/extensions/source/activex/SOActiveX.cxx +++ b/extensions/source/activex/SOActiveX.cxx @@ -980,8 +980,8 @@ HRESULT CSOActiveX::OnDrawAdvanced( ATL_DRAWINFO& di ) CComVariant dummyResult; CComVariant aPropVar; aPropVar.vt = VT_BOOL; aPropVar.boolVal = VARIANT_FALSE; - HRESULT hr = ExecuteFunc( mpDispFrame, L"close", &aPropVar, 1, &dummyResult ); - (void)hr; + HRESULT hres = ExecuteFunc( mpDispFrame, L"close", &aPropVar, 1, &dummyResult ); + (void)hres; mpDispFrame = CComPtr<IDispatch>(); } diff --git a/extensions/source/activex/SODispatchInterceptor.cxx b/extensions/source/activex/SODispatchInterceptor.cxx index ef15148..fe398a5 100644 --- a/extensions/source/activex/SODispatchInterceptor.cxx +++ b/extensions/source/activex/SODispatchInterceptor.cxx @@ -184,7 +184,6 @@ STDMETHODIMP SODispatchInterceptor::dispatch( IDispatch FAR* aURL, SAFEARRAY FAR if( pValues[0].vt == VT_BSTR && pValues[1].vt == VT_BSTR ) { - USES_CONVERSION; if( !strncmp( OLE2T( pValues[0].bstrVal ), "URL", 3 ) ) { EnterCriticalSection( &mMutex ); diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index ee81b48..40365b6 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -1019,7 +1019,8 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName, CComVariant varResult; ExcepInfo excepinfo; unsigned int uArgErr; - DISPPARAMS dispparams= { pVarParams, NULL, parameterCount, 0}; + DISPPARAMS dispparams= { pVarParams, NULL, static_cast<UINT>(parameterCount), 0}; + // Get the DISPID FuncDesc aDesc(getTypeInfo()); getFuncDesc(sFunctionName, & aDesc); @@ -1586,9 +1587,9 @@ TypeDescription IUnknownWrapper_Impl::getInterfaceMemberDescOfCurrentCall(const { typelib_InterfaceMemberTypeDescription* pMember= NULL; //find the member description of the current call - for( int i=0; i < pInterface->nAllMembers; i++) + for( int j=0; j < pInterface->nAllMembers; j++) { - typelib_TypeDescriptionReference* pTypeRefMember = pInterface->ppAllMembers[i]; + typelib_TypeDescriptionReference* pTypeRefMember = pInterface->ppAllMembers[j]; typelib_TypeDescription* pDescMember= NULL; TYPELIB_DANGER_GET( &pDescMember, pTypeRefMember); @@ -2008,9 +2009,9 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc& aFuncDesc, // allocate space for the out param Sequence and indices Sequence int outParamsCount= 0; // includes in/out parameter - for (int i = 0; i < aFuncDesc->cParams; i++) + for (int j = 0; j < aFuncDesc->cParams; j++) { - if (aFuncDesc->lprgelemdescParam[i].paramdesc.wParamFlags & + if (aFuncDesc->lprgelemdescParam[j].paramdesc.wParamFlags & PARAMFLAG_FOUT) outParamsCount++; } @@ -2176,9 +2177,9 @@ void IUnknownWrapper_Impl::getFuncDescForInvoke(const OUString & sFuncName, { // Fallback: DISPATCH_PROPERTYGET can mostly be called as // DISPATCH_METHOD - ITypeInfo * pInfo = getTypeInfo(); - FuncDesc aDescPut(pInfo); - VarDesc aVarDesc(pInfo); + ITypeInfo * pTypeInfo = getTypeInfo(); + FuncDesc aDescPut(pTypeInfo); + VarDesc aVarDesc(pTypeInfo); getPropDesc(sFuncName, & aFuncDesc, & aDescPut, & aVarDesc); if ( ! aFuncDesc ) { diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index be18ec9..9906d54 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -1412,8 +1412,8 @@ void UnoConversionUtilities<T>::createUnoObjectWrapper(const Any & rObj, VARIANT { Sequence<Any> params(1); params.getArray()[0] = rObj; - Reference<XInterface> xInt = xInvFactory->createInstanceWithArguments(params); - xInv.set(xInt, UNO_QUERY); + Reference<XInterface> xInt2 = xInvFactory->createInstanceWithArguments(params); + xInv.set(xInt2, UNO_QUERY); } } @@ -1678,12 +1678,12 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type& } else if (pVar->vt == VT_DISPATCH && pVar->pdispVal != NULL) { - CComPtr<IDispatch> spDispatch(pVar->pdispVal); - if (spDispatch) + CComPtr<IDispatch> spDispatch2(pVar->pdispVal); + if (spDispatch2) #ifdef __MINGW32__ - spDispatch->QueryInterface( IID_IUnknown, reinterpret_cast<LPVOID*>( & spUnknown.p)); + spDispatch2->QueryInterface( IID_IUnknown, reinterpret_cast<LPVOID*>( & spUnknown.p)); #else - spDispatch.QueryInterface( & spUnknown.p); + spDispatch2.QueryInterface( & spUnknown.p); #endif } diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index 0f897ba..8ce0405 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -374,10 +374,10 @@ void InterfaceOleWrapper_Impl::convertDispparamsArgs(DISPID id, IDispatch* pdisp= pdispparams->rgvarg[i].pdispVal; OLECHAR const * sindex= L"0"; - DISPID id; + DISPID id2; DISPPARAMS noParams= {0,0,0,0}; - if(SUCCEEDED( hr= pdisp->GetIDsOfNames( IID_NULL, const_cast<OLECHAR **>(&sindex), 1, LOCALE_USER_DEFAULT, &id))) - hr= pdisp->Invoke( id, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET, + if(SUCCEEDED( hr= pdisp->GetIDsOfNames( IID_NULL, const_cast<OLECHAR **>(&sindex), 1, LOCALE_USER_DEFAULT, &id2))) + hr= pdisp->Invoke( id2, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET, & noParams, & varParam, NULL, NULL); if( FAILED( hr)) { @@ -488,7 +488,7 @@ Any SAL_CALL InterfaceOleWrapper_Impl::createBridge(const Any& modelDepObject, pVar->pdispVal= static_cast<IDispatch*>( this); AddRef(); - retAny<<= reinterpret_cast< sal_uInt32 >( pVar); + retAny<<= reinterpret_cast< sal_uIntPtr >( pVar); } } } commit 5faa9f0d3b93a19f7c05879bad86121437cf781c Author: David Ostrovsky <da...@ostrovsky.org> Date: Sat Feb 27 15:28:20 2016 +0100 MSVC 14.0: Fix building 64bit libraries in 32bit mode Change-Id: I006d21b6240898cbaed2b382276654d3ad8076a2 Reviewed-on: https://gerrit.libreoffice.org/22732 Reviewed-by: David Ostrovsky <da...@ostrovsky.org> Tested-by: David Ostrovsky <da...@ostrovsky.org> (cherry picked from commit 271bfb59382e1d23e0f2c90ea8e8e31fd757e3b5) Signed-off-by: Michael Stahl <mst...@redhat.com> diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 4dbdb90..93645a1 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -171,7 +171,8 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter YES,$(LIBRARY_X64)), \ -LIBPATH:$(COMPATH)/lib/amd64 \ -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64 \ - $(if $(filter 80 81,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/$(WINDOWS_SDK_LIB_SUBDIR)/um/x64)) \ + $(if $(filter 80 81 10,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/$(WINDOWS_SDK_LIB_SUBDIR)/um/x64) \ + $(if $(filter-out 120,$(VCVER)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/$(WINDOWS_SDK_LIB_SUBDIR)/ucrt/x64)) \ $(T_LDFLAGS) \ @$${RESPONSEFILE} \ $(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_ilibfilename,$(lib))) \ commit acdae154610a10b49d2d122946693967c9ca43bc Author: David Ostrovsky <da...@ostrovsky.org> Date: Sat Feb 27 14:14:12 2016 +0100 MSVC 14.0: Second attempt to fix Python in 32bit build mode Change-Id: I709fda2e6df5048bdbf9157518d6b7b98ff45515 Reviewed-on: https://gerrit.libreoffice.org/22730 Reviewed-by: David Ostrovsky <da...@ostrovsky.org> Tested-by: David Ostrovsky <da...@ostrovsky.org> (cherry picked from commit e04c734f56d7e4a16a2dd1b64a51cecbdf6796cf) Signed-off-by: Michael Stahl <mst...@redhat.com> diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index f25c464..8a3ae21 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3098,7 +3098,7 @@ endif ifeq ($(OS),WNT) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,python3)/PCbuild$(if $(filter X86_64,$(CPUNAME)),/amd64)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \ + $(call gb_UnpackedTarball_get_dir,python3)/PCbuild$(if $(filter X86_64,$(CPUNAME)),/amd64)$(if $(filter 140-INTEL,$(VCVER)-$(CPUNAME)),/win32)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \ ) else ifeq ($(OS),MACOSX) $(call gb_LinkTarget_add_libs,$(1),\ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits