Yes, cleaning it up. thanks.
Kai
2016-03-31 18:07 GMT+02:00 Hugo Beauzée-Luyssen <h...@beauzee.fr>:
> combaseapi already provides a __forceinline version
> ---
> mingw-w64-headers/include/combaseapi.h | 2 -
> mingw-w64-libraries/winstorecompat/Makefile.am | 1 -
> .../winstorecompat/src/CoCreateInstance.c | 67
> ----------------------
> 3 files changed, 70 deletions(-)
> delete mode 100644 mingw-w64-libraries/winstorecompat/src/CoCreateInstance.c
>
> diff --git a/mingw-w64-headers/include/combaseapi.h
> b/mingw-w64-headers/include/combaseapi.h
> index 9c32965..3536e25 100644
> --- a/mingw-w64-headers/include/combaseapi.h
> +++ b/mingw-w64-headers/include/combaseapi.h
> @@ -255,8 +255,6 @@ WINOLEAPI CoRevertToSelf (void);
> WINOLEAPI CoQueryAuthenticationServices (DWORD *pcAuthSvc,
> SOLE_AUTHENTICATION_SERVICE **asAuthSvc);
> WINOLEAPI CoCreateInstance (REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD
> dwClsContext, REFIID riid, LPVOID *ppv);
> WINOLEAPI CoCreateInstanceEx (REFCLSID Clsid, IUnknown *punkOuter, DWORD
> dwClsCtx, COSERVERINFO *pServerInfo, DWORD dwCount, MULTI_QI *pResults);
> -#elif defined(WINSTORECOMPAT)
> -WINOLEAPI CoCreateInstance (REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD
> dwClsContext, REFIID riid, LPVOID *ppv);
> #endif
>
> #if WINAPI_FAMILY == WINAPI_FAMILY_APP
> diff --git a/mingw-w64-libraries/winstorecompat/Makefile.am
> b/mingw-w64-libraries/winstorecompat/Makefile.am
> index db85c96..332d4bc 100644
> --- a/mingw-w64-libraries/winstorecompat/Makefile.am
> +++ b/mingw-w64-libraries/winstorecompat/Makefile.am
> @@ -32,7 +32,6 @@ libwinstorecompat_a_SOURCES = \
> src/SetFilePointer.c \
> src/GetFileSize.c \
> src/Tls.c \
> - src/CoCreateInstance.c \
> src/SHGetFolderPathW.c \
> src/QueueTimer.c \
> $(NULL)
> diff --git a/mingw-w64-libraries/winstorecompat/src/CoCreateInstance.c
> b/mingw-w64-libraries/winstorecompat/src/CoCreateInstance.c
> deleted file mode 100644
> index acb065f..0000000
> --- a/mingw-w64-libraries/winstorecompat/src/CoCreateInstance.c
> +++ /dev/null
> @@ -1,67 +0,0 @@
> -/*
> - Copyright (c) 2013 mingw-w64 project
> -
> - Contributing authors: Jean-Baptiste Kempf
> -
> - Permission is hereby granted, free of charge, to any person obtaining a
> - copy of this software and associated documentation files (the
> "Software"),
> - to deal in the Software without restriction, including without limitation
> - the rights to use, copy, modify, merge, publish, distribute, sublicense,
> - and/or sell copies of the Software, and to permit persons to whom the
> - Software is furnished to do so, subject to the following conditions:
> -
> - The above copyright notice and this permission notice shall be included
> in
> - all copies or substantial portions of the Software.
> -
> - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> OR
> - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> THE
> - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> - DEALINGS IN THE SOFTWARE.
> -*/
> -
> -#define _WIN32_WINNT 0x0602 /* CoCreateInstanceFromApp is 8+ */
> -
> -#define CoCreateInstance __CoCreateInstance
> -#include <windef.h>
> -#include <windows.h>
> -#include <combaseapi.h>
> -#undef CoCreateInstance
> -
> -HRESULT WINAPI CoCreateInstance(REFCLSID rclsid,
> - LPUNKNOWN pUnkOuter,
> - DWORD dwClsContext,
> - REFIID riid,
> - LPVOID *ppv);
> -
> -HRESULT WINAPI CoCreateInstance(REFCLSID rclsid,
> - LPUNKNOWN pUnkOuter,
> - DWORD dwClsContext,
> - REFIID riid,
> - LPVOID *ppv)
> -{
> - MULTI_QI result;
> - HRESULT res;
> -
> - result.pIID = riid;
> - result.pItf = NULL;
> - result.hr = 0;
> -
> - res = CoCreateInstanceFromApp(rclsid, pUnkOuter, dwClsContext, NULL, 1,
> &result);
> -
> - if( ppv == NULL)
> - return E_POINTER;
> - else {
> - *ppv = result.pItf;
> - return res;
> - }
> -}
> -
> -#ifndef _WIN64
> -HRESULT (WINAPI *__MINGW_IMP_SYMBOL(CoCreateInstance))(REFCLSID rclsid,
> LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID riid, LPVOID *ppv)
> asm("__imp__CoCreateInstance@20") = CoCreateInstance;
> -#else
> -HRESULT (WINAPI *__MINGW_IMP_SYMBOL(CoCreateInstance))(REFCLSID rclsid,
> LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID riid, LPVOID *ppv)
> asm("__imp_CoCreateInstance") = CoCreateInstance;
> -#endif
> -
> --
> 2.8.0.rc3
>
>
> ------------------------------------------------------------------------------
> Transform Data into Opportunity.
> Accelerate data analysis in your applications with
> Intel Data Analytics Acceleration Library.
> Click to learn more.
> http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140
> _______________________________________________
> Mingw-w64-public mailing list
> Mingw-w64-public@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
