Hi,
In Fedora 20 we're using mingw-w64 v3.3.0. While trying to get the
latest wine-gecko built (2.34) we noticed that quite a lot of features
were missing from the mingw-w64 v3.x branch which are already part of
the master branch (this was also the trigger for the "RFE: New stable
release" thread which was started on this mailing list on December 15).
Without these features it isn't possible to build wine-gecko 2.34.
As it turns out a new stable release (based on the master branch) is not
expected soon we at Fedora decided to investigate the possibility to
backport all the required changes manually to the v3.x branch as the
updated wine-gecko is required by the latest wine which we want to make
available in Fedora 20.
Some days ago a list was generated with missing features in mingw-w64
v3.3.0 (thanks to Michael Cronenworth) and I searched for all the
relevant commits in the git history.
Here is the list of commits which need to be applied on top of mingw-w64
v3.3.0 to get wine-gecko 2.34 built:
mingw-w64-headers:
a77e5c - mfapi.h: Moved MFCreateAttributes to mfapi.h, where it belongs.
3418d7 - Update mfobjects interface for winapi-family and W8
262537 - Updated imported headers to current Wine version.
b50bef - Updated headers imported from Wine
e9951e - winerror.h: Added some missing error codes.
3f6863 - d2d1_1helper.h: Added some missing helpers.
d348ce - Updated imported headers to current Wine version.
0c890e - winsdkver.h: Added new header.
4ea90e - dwrite_1.h: Added new header file.
435391 - Added some missing WMF declarations.
81a63d - mstcpip.h: Declare RtlIpv6* functions only if ws2ipdef.h is...
77b2e1 - Added dxgi1_2.h missing in previous commit.
e08002 - Updated imported headers to current Wine version.
ea45fb - tsattrs.h: Added new header file.
b93317 - Add winapifamily-check, correct enumerator values, add...
8fff41 - Updated imported headers to current Wine version.
bf99de - Add comadmin.idl to Makefile.am and regenerate files.
017715 - Updated imported headers to current Wine version.
9c0a7a - Updated imported headers to current Wine version.
1c64f4 - Fixed some version guards.
6f7b01 - dwrite.h: Don't duplicate parent interface methods for C++...
ae2e05 - string_s.h/wchar_s.h: Added wcsnlen_s implementation.
a5d3ef - Use __forceinline for wcsnlen_s implementation.
2d16d4 - Updated imported headers to current Wine version.
mingw-w64-crt:
2bbc22 - Added 32-bit version of libwintrust.a.
3dc34b - uuid.c: Added missing urlmon CLSIDs and get rid of duplicated
IIDs
Almost all these commits can be directly cherry-picked to the v3.x
branch without conflicts. The only exceptions are the last one from
mingw-w64-headers (2d16d4) for which only the dxgi.h parts are necessary
and for the two mingw-w64-crt changes the Makefile.in changes don't
apply cleanly (these can be regenerated by automake). For these 3
commits I've attached updated .patch files to this mail.
Another thing I noticed is a possible typo which was introduced in
commit b35450 (Add winapi-family feature, added missing Windows 7 + 8
stuff, consolidate header). Before this commit the declarations for
RegisterPowerSettingNotification and UnregisterPowerSettingNotification
were guarded inside a "#if (_WIN32_WINNT >= 0x0600)" section, but this
got changed in this commit to "#if _WIN32_WINNT >= 0x0502". According to
http://msdn.microsoft.com/en-us/library/windows/desktop/aa373196%
28v=vs.85%29.aspx these symbols are only available as of Windows Vista
so the original code (0x0600) looks like the good one to me.
Apparently wine-gecko fails to build when these symbols are only
available with _WIN32_WINNT >= 0x0600. @Jacek: could this be a
wine-gecko bug? I've workaround'ed this issue in Fedora 20 using
attached 0021-Lower-_WIN32_WINNT-requirements-for-Un-RegisterPower.patch
but my guess is this is not the right fix as I think wine-gecko should
set _WIN32_WINNT to 0x0600 while compiling the file
hal/windows/WindowsBattery.cpp.
Would it be possible to backport all the commits mentioned in this mail
to the mingw-w64 v3.x branch and release a mingw-w64 v3.4.0 soon so
others can benefit from these changes as well?
Regards,
Erik van Pienbroek
Fedora MinGW SIG
From 8269507a53e48bd584db5fa6a8d174681800e893 Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <[email protected]>
Date: Wed, 31 Dec 2014 18:44:01 +0100
Subject: [PATCH 21/25] Lower _WIN32_WINNT requirements for
{Un,}RegisterPowerSettingNotification
This got changed in master in commit b354505ea8a1b93558c7941db2d94a949b922ecd
Perhaps this change was done by accident as the MSDN documentation at
http://msdn.microsoft.com/en-us/library/windows/desktop/aa373196%28v=vs.85%29.aspx
indicates that these functions are only available as of Windows Vista
---
mingw-w64-headers/include/winuser.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mingw-w64-headers/include/winuser.h b/mingw-w64-headers/include/winuser.h
index 975b00d..0f1f8cd 100644
--- a/mingw-w64-headers/include/winuser.h
+++ b/mingw-w64-headers/include/winuser.h
@@ -1877,7 +1877,7 @@ extern "C" {
WINUSERAPI HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hRecipient,LPVOID NotificationFilter,DWORD Flags);
WINUSERAPI HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE hRecipient,LPVOID NotificationFilter,DWORD Flags);
-#if (_WIN32_WINNT >= 0x0600)
+#if (_WIN32_WINNT >= 0x0502)
WINUSERAPI HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE hRecipient,LPCGUID PowerSettingGuid,DWORD Flags);
WINUSERAPI WINBOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY Handle);
#endif
--
2.1.0
From 2275894ebf68caa582825f119a5f5d24ef204532 Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <[email protected]>
Date: Wed, 31 Dec 2014 22:05:55 +0100
Subject: [PATCH 25/25] Implement IDXGIDevice1
This is a partial cherry-pick of 2d16d4790c9fa8d0320fdaa4bfe2206249bc8126
---
mingw-w64-headers/direct-x/include/dxgi.h | 198 ++++++++++++++++++++++++++++
mingw-w64-headers/direct-x/include/dxgi.idl | 12 ++
2 files changed, 210 insertions(+)
diff --git a/mingw-w64-headers/direct-x/include/dxgi.h b/mingw-w64-headers/direct-x/include/dxgi.h
index 733bf39..a8a99ed 100644
--- a/mingw-w64-headers/direct-x/include/dxgi.h
+++ b/mingw-w64-headers/direct-x/include/dxgi.h
@@ -72,6 +72,11 @@ typedef interface IDXGIDevice IDXGIDevice;
typedef interface IDXGIAdapter1 IDXGIAdapter1;
#endif
+#ifndef __IDXGIDevice1_FWD_DEFINED__
+#define __IDXGIDevice1_FWD_DEFINED__
+typedef interface IDXGIDevice1 IDXGIDevice1;
+#endif
+
#ifndef __IDXGIFactory1_FWD_DEFINED__
#define __IDXGIFactory1_FWD_DEFINED__
typedef interface IDXGIFactory1 IDXGIFactory1;
@@ -2487,6 +2492,199 @@ void __RPC_STUB IDXGIAdapter1_GetDesc1_Stub(
#endif /* __IDXGIAdapter1_INTERFACE_DEFINED__ */
/*****************************************************************************
+ * IDXGIDevice1 interface
+ */
+#ifndef __IDXGIDevice1_INTERFACE_DEFINED__
+#define __IDXGIDevice1_INTERFACE_DEFINED__
+
+DEFINE_GUID(IID_IDXGIDevice1, 0x77db970f, 0x6276, 0x48ba, 0xba,0x28, 0x07,0x01,0x43,0xb4,0x39,0x2c);
+#if defined(__cplusplus) && !defined(CINTERFACE)
+MIDL_INTERFACE("77db970f-6276-48ba-ba28-070143b4392c")
+IDXGIDevice1 : public IDXGIDevice
+{
+ virtual HRESULT STDMETHODCALLTYPE SetMaximumFrameLatency(
+ UINT MaxLatency) = 0;
+
+ virtual HRESULT STDMETHODCALLTYPE GetMaximumFrameLatency(
+ UINT *pMaxLatency) = 0;
+
+};
+#ifdef __CRT_UUID_DECL
+__CRT_UUID_DECL(IDXGIDevice1, 0x77db970f, 0x6276, 0x48ba, 0xba,0x28, 0x07,0x01,0x43,0xb4,0x39,0x2c)
+#endif
+#else
+typedef struct IDXGIDevice1Vtbl {
+ BEGIN_INTERFACE
+
+ /*** IUnknown methods ***/
+ HRESULT (STDMETHODCALLTYPE *QueryInterface)(
+ IDXGIDevice1* This,
+ REFIID riid,
+ void **ppvObject);
+
+ ULONG (STDMETHODCALLTYPE *AddRef)(
+ IDXGIDevice1* This);
+
+ ULONG (STDMETHODCALLTYPE *Release)(
+ IDXGIDevice1* This);
+
+ /*** IDXGIObject methods ***/
+ HRESULT (STDMETHODCALLTYPE *SetPrivateData)(
+ IDXGIDevice1* This,
+ REFGUID guid,
+ UINT data_size,
+ const void *data);
+
+ HRESULT (STDMETHODCALLTYPE *SetPrivateDataInterface)(
+ IDXGIDevice1* This,
+ REFGUID guid,
+ const IUnknown *object);
+
+ HRESULT (STDMETHODCALLTYPE *GetPrivateData)(
+ IDXGIDevice1* This,
+ REFGUID guid,
+ UINT *data_size,
+ void *data);
+
+ HRESULT (STDMETHODCALLTYPE *GetParent)(
+ IDXGIDevice1* This,
+ REFIID riid,
+ void **parent);
+
+ /*** IDXGIDevice methods ***/
+ HRESULT (STDMETHODCALLTYPE *GetAdapter)(
+ IDXGIDevice1* This,
+ IDXGIAdapter **adapter);
+
+ HRESULT (STDMETHODCALLTYPE *CreateSurface)(
+ IDXGIDevice1* This,
+ const DXGI_SURFACE_DESC *desc,
+ UINT surface_count,
+ DXGI_USAGE usage,
+ const DXGI_SHARED_RESOURCE *shared_resource,
+ IDXGISurface **surface);
+
+ HRESULT (STDMETHODCALLTYPE *QueryResourceResidency)(
+ IDXGIDevice1* This,
+ IUnknown *const *resources,
+ DXGI_RESIDENCY *residency,
+ UINT resource_count);
+
+ HRESULT (STDMETHODCALLTYPE *SetGPUThreadPriority)(
+ IDXGIDevice1* This,
+ INT priority);
+
+ HRESULT (STDMETHODCALLTYPE *GetGPUThreadPriority)(
+ IDXGIDevice1* This,
+ INT *priority);
+
+ /*** IDXGIDevice1 methods ***/
+ HRESULT (STDMETHODCALLTYPE *SetMaximumFrameLatency)(
+ IDXGIDevice1* This,
+ UINT MaxLatency);
+
+ HRESULT (STDMETHODCALLTYPE *GetMaximumFrameLatency)(
+ IDXGIDevice1* This,
+ UINT *pMaxLatency);
+
+ END_INTERFACE
+} IDXGIDevice1Vtbl;
+interface IDXGIDevice1 {
+ CONST_VTBL IDXGIDevice1Vtbl* lpVtbl;
+};
+
+#ifdef COBJMACROS
+#ifndef WIDL_C_INLINE_WRAPPERS
+/*** IUnknown methods ***/
+#define IDXGIDevice1_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
+#define IDXGIDevice1_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define IDXGIDevice1_Release(This) (This)->lpVtbl->Release(This)
+/*** IDXGIObject methods ***/
+#define IDXGIDevice1_SetPrivateData(This,guid,data_size,data) (This)->lpVtbl->SetPrivateData(This,guid,data_size,data)
+#define IDXGIDevice1_SetPrivateDataInterface(This,guid,object) (This)->lpVtbl->SetPrivateDataInterface(This,guid,object)
+#define IDXGIDevice1_GetPrivateData(This,guid,data_size,data) (This)->lpVtbl->GetPrivateData(This,guid,data_size,data)
+#define IDXGIDevice1_GetParent(This,riid,parent) (This)->lpVtbl->GetParent(This,riid,parent)
+/*** IDXGIDevice methods ***/
+#define IDXGIDevice1_GetAdapter(This,adapter) (This)->lpVtbl->GetAdapter(This,adapter)
+#define IDXGIDevice1_CreateSurface(This,desc,surface_count,usage,shared_resource,surface) (This)->lpVtbl->CreateSurface(This,desc,surface_count,usage,shared_resource,surface)
+#define IDXGIDevice1_QueryResourceResidency(This,resources,residency,resource_count) (This)->lpVtbl->QueryResourceResidency(This,resources,residency,resource_count)
+#define IDXGIDevice1_SetGPUThreadPriority(This,priority) (This)->lpVtbl->SetGPUThreadPriority(This,priority)
+#define IDXGIDevice1_GetGPUThreadPriority(This,priority) (This)->lpVtbl->GetGPUThreadPriority(This,priority)
+/*** IDXGIDevice1 methods ***/
+#define IDXGIDevice1_SetMaximumFrameLatency(This,MaxLatency) (This)->lpVtbl->SetMaximumFrameLatency(This,MaxLatency)
+#define IDXGIDevice1_GetMaximumFrameLatency(This,pMaxLatency) (This)->lpVtbl->GetMaximumFrameLatency(This,pMaxLatency)
+#else
+/*** IUnknown methods ***/
+static FORCEINLINE HRESULT IDXGIDevice1_QueryInterface(IDXGIDevice1* This,REFIID riid,void **ppvObject) {
+ return This->lpVtbl->QueryInterface(This,riid,ppvObject);
+}
+static FORCEINLINE ULONG IDXGIDevice1_AddRef(IDXGIDevice1* This) {
+ return This->lpVtbl->AddRef(This);
+}
+static FORCEINLINE ULONG IDXGIDevice1_Release(IDXGIDevice1* This) {
+ return This->lpVtbl->Release(This);
+}
+/*** IDXGIObject methods ***/
+static FORCEINLINE HRESULT IDXGIDevice1_SetPrivateData(IDXGIDevice1* This,REFGUID guid,UINT data_size,const void *data) {
+ return This->lpVtbl->SetPrivateData(This,guid,data_size,data);
+}
+static FORCEINLINE HRESULT IDXGIDevice1_SetPrivateDataInterface(IDXGIDevice1* This,REFGUID guid,const IUnknown *object) {
+ return This->lpVtbl->SetPrivateDataInterface(This,guid,object);
+}
+static FORCEINLINE HRESULT IDXGIDevice1_GetPrivateData(IDXGIDevice1* This,REFGUID guid,UINT *data_size,void *data) {
+ return This->lpVtbl->GetPrivateData(This,guid,data_size,data);
+}
+static FORCEINLINE HRESULT IDXGIDevice1_GetParent(IDXGIDevice1* This,REFIID riid,void **parent) {
+ return This->lpVtbl->GetParent(This,riid,parent);
+}
+/*** IDXGIDevice methods ***/
+static FORCEINLINE HRESULT IDXGIDevice1_GetAdapter(IDXGIDevice1* This,IDXGIAdapter **adapter) {
+ return This->lpVtbl->GetAdapter(This,adapter);
+}
+static FORCEINLINE HRESULT IDXGIDevice1_CreateSurface(IDXGIDevice1* This,const DXGI_SURFACE_DESC *desc,UINT surface_count,DXGI_USAGE usage,const DXGI_SHARED_RESOURCE *shared_resource,IDXGISurface **surface) {
+ return This->lpVtbl->CreateSurface(This,desc,surface_count,usage,shared_resource,surface);
+}
+static FORCEINLINE HRESULT IDXGIDevice1_QueryResourceResidency(IDXGIDevice1* This,IUnknown *const *resources,DXGI_RESIDENCY *residency,UINT resource_count) {
+ return This->lpVtbl->QueryResourceResidency(This,resources,residency,resource_count);
+}
+static FORCEINLINE HRESULT IDXGIDevice1_SetGPUThreadPriority(IDXGIDevice1* This,INT priority) {
+ return This->lpVtbl->SetGPUThreadPriority(This,priority);
+}
+static FORCEINLINE HRESULT IDXGIDevice1_GetGPUThreadPriority(IDXGIDevice1* This,INT *priority) {
+ return This->lpVtbl->GetGPUThreadPriority(This,priority);
+}
+/*** IDXGIDevice1 methods ***/
+static FORCEINLINE HRESULT IDXGIDevice1_SetMaximumFrameLatency(IDXGIDevice1* This,UINT MaxLatency) {
+ return This->lpVtbl->SetMaximumFrameLatency(This,MaxLatency);
+}
+static FORCEINLINE HRESULT IDXGIDevice1_GetMaximumFrameLatency(IDXGIDevice1* This,UINT *pMaxLatency) {
+ return This->lpVtbl->GetMaximumFrameLatency(This,pMaxLatency);
+}
+#endif
+#endif
+
+#endif
+
+HRESULT STDMETHODCALLTYPE IDXGIDevice1_SetMaximumFrameLatency_Proxy(
+ IDXGIDevice1* This,
+ UINT MaxLatency);
+void __RPC_STUB IDXGIDevice1_SetMaximumFrameLatency_Stub(
+ IRpcStubBuffer* This,
+ IRpcChannelBuffer* pRpcChannelBuffer,
+ PRPC_MESSAGE pRpcMessage,
+ DWORD* pdwStubPhase);
+HRESULT STDMETHODCALLTYPE IDXGIDevice1_GetMaximumFrameLatency_Proxy(
+ IDXGIDevice1* This,
+ UINT *pMaxLatency);
+void __RPC_STUB IDXGIDevice1_GetMaximumFrameLatency_Stub(
+ IRpcStubBuffer* This,
+ IRpcChannelBuffer* pRpcChannelBuffer,
+ PRPC_MESSAGE pRpcMessage,
+ DWORD* pdwStubPhase);
+
+#endif /* __IDXGIDevice1_INTERFACE_DEFINED__ */
+
+/*****************************************************************************
* IDXGIFactory1 interface
*/
#ifndef __IDXGIFactory1_INTERFACE_DEFINED__
diff --git a/mingw-w64-headers/direct-x/include/dxgi.idl b/mingw-w64-headers/direct-x/include/dxgi.idl
index bb12283..bc9538e 100644
--- a/mingw-w64-headers/direct-x/include/dxgi.idl
+++ b/mingw-w64-headers/direct-x/include/dxgi.idl
@@ -446,6 +446,18 @@ interface IDXGIAdapter1 : IDXGIAdapter
[
object,
+ uuid(77db970f-6276-48ba-ba28-070143b4392c),
+ local,
+ pointer_default(unique)
+]
+interface IDXGIDevice1 : IDXGIDevice
+{
+ HRESULT SetMaximumFrameLatency([in] UINT MaxLatency);
+ HRESULT GetMaximumFrameLatency([out] UINT *pMaxLatency);
+}
+
+[
+ object,
uuid(770aae78-f26f-4dba-a829-253c83d1b387),
local,
pointer_default(unique)
--
2.1.0
From 459e8d4f33254e39a59680bc06b3dca78c5c6b1f Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <[email protected]>
Date: Wed, 31 Dec 2014 22:59:14 +0100
Subject: [PATCH] Added 32-bit version of libwintrust.a
This is partial cherry-pick of commit 2bbc229056418ef6c7ae6e2530ee68fe4e518e15
---
mingw-w64-crt/Makefile.in | 34 +++++-----
mingw-w64-crt/lib32/Makefile.am | 1 +
mingw-w64-crt/lib32/wintrust.def | 137 +++++++++++++++++++++++++++++++++++++++
3 files changed, 155 insertions(+), 17 deletions(-)
create mode 100644 mingw-w64-crt/lib32/wintrust.def
diff --git a/mingw-w64-crt/lib32/Makefile.am b/mingw-w64-crt/lib32/Makefile.am
index cf300d7..b548f36 100644
--- a/mingw-w64-crt/lib32/Makefile.am
+++ b/mingw-w64-crt/lib32/Makefile.am
@@ -291,6 +291,7 @@ lib32_DATA += %reldir%/libwinmm.a
lib32_DATA += %reldir%/libwinscard.a
lib32_DATA += %reldir%/libwinspool.a
lib32_DATA += %reldir%/libwinstrm.a
+lib32_DATA += %reldir%/libwintrust.a
lib32_DATA += %reldir%/libwinusb.a
lib32_DATA += %reldir%/libwkscli.a
lib32_DATA += %reldir%/libwlanapi.a
diff --git a/mingw-w64-crt/lib32/wintrust.def b/mingw-w64-crt/lib32/wintrust.def
new file mode 100644
index 0000000..fbff4e7
--- /dev/null
+++ b/mingw-w64-crt/lib32/wintrust.def
@@ -0,0 +1,137 @@
+;
+; Definition file of WINTRUST.dll
+; Automatic generated by gendef
+; written by Kai Tietz 2008
+;
+LIBRARY "WINTRUST.dll"
+EXPORTS
+CryptCATVerifyMember@12
+CryptSIPGetInfo@4
+CryptSIPGetRegWorkingFlags@4
+GenericChainCertificateTrust@4
+GenericChainFinalProv@4
+HTTPSCertificateTrust@4
+SoftpubDefCertInit@4
+SoftpubFreeDefUsageCallData@8
+SoftpubLoadDefUsageCallData@8
+WTHelperCertFindIssuerCertificate@28
+AddPersonalTrustDBPages@12
+CatalogCompactHashDatabase@16
+CryptCATAdminAcquireContext@12
+CryptCATAdminAddCatalog@16
+CryptCATAdminCalcHashFromFileHandle@16
+CryptCATAdminEnumCatalogFromHash@20
+CryptCATAdminPauseServiceForBackup@8
+CryptCATAdminReleaseCatalogContext@12
+CryptCATAdminReleaseContext@8
+CryptCATAdminRemoveCatalog@12
+CryptCATAdminResolveCatalogPath@16
+CryptCATAllocSortedMemberInfo@8
+CryptCATCDFClose@4
+CryptCATCDFEnumAttributes@16
+CryptCATCDFEnumAttributesWithCDFTag@20
+CryptCATCDFEnumCatAttributes@12
+CryptCATCDFEnumMembers@12
+CryptCATCDFEnumMembersByCDFTag@16
+CryptCATCDFEnumMembersByCDFTagEx@24
+CryptCATCDFOpen@8
+CryptCATCatalogInfoFromContext@12
+CryptCATClose@4
+CryptCATEnumerateAttr@12
+CryptCATEnumerateCatAttr@8
+CryptCATEnumerateMember@8
+CryptCATFreeSortedMemberInfo@8
+CryptCATGetAttrInfo@12
+CryptCATGetCatAttrInfo@8
+CryptCATGetMemberInfo@8
+CryptCATHandleFromStore@4
+CryptCATOpen@20
+CryptCATPersistStore@4
+CryptCATPutAttrInfo@24
+CryptCATPutCatAttrInfo@20
+CryptCATPutMemberInfo@28
+CryptCATStoreFromHandle@4
+CryptSIPCreateIndirectData@12
+CryptSIPGetSignedDataMsg@20
+CryptSIPPutSignedDataMsg@20
+CryptSIPRemoveSignedDataMsg@8
+CryptSIPVerifyIndirectData@8
+DllRegisterServer
+DllUnregisterServer
+DriverCleanupPolicy@4
+DriverFinalPolicy@4
+DriverInitializePolicy@4
+FindCertsByIssuer@28
+HTTPSFinalProv@4
+IsCatalogFile@8
+MsCatConstructHashTag@12
+MsCatFreeHashTag@4
+OfficeCleanupPolicy@4
+OfficeInitializePolicy@4
+OpenPersonalTrustDBDialog@4
+OpenPersonalTrustDBDialogEx@12
+SoftpubAuthenticode@4
+SoftpubCheckCert@16
+SoftpubCleanup@4
+SoftpubDllRegisterServer
+SoftpubDllUnregisterServer
+SoftpubDumpStructure@4
+SoftpubInitialize@4
+SoftpubLoadMessage@4
+SoftpubLoadSignature@4
+TrustDecode@36
+TrustFindIssuerCertificate@32
+TrustFreeDecode@8
+TrustIsCertificateSelfSigned@12
+TrustOpenStores@16
+WTHelperCertCheckValidSignature@4
+WTHelperCertIsSelfSigned@8
+WTHelperCheckCertUsage@8
+WTHelperGetAgencyInfo@12
+WTHelperGetFileHandle@4
+WTHelperGetFileHash@24
+WTHelperGetFileName@4
+WTHelperGetKnownUsages@8
+WTHelperGetProvCertFromChain@8
+WTHelperGetProvPrivateDataFromChain@8
+WTHelperGetProvSignerFromChain@16
+WTHelperIsInRootStore@8
+WTHelperOpenKnownStores@4
+WTHelperProvDataFromStateData@4
+WVTAsn1CatMemberInfoDecode@28
+WVTAsn1CatMemberInfoEncode@20
+WVTAsn1CatNameValueDecode@28
+WVTAsn1CatNameValueEncode@20
+WVTAsn1SpcFinancialCriteriaInfoDecode@28
+WVTAsn1SpcFinancialCriteriaInfoEncode@20
+WVTAsn1SpcIndirectDataContentDecode@28
+WVTAsn1SpcIndirectDataContentEncode@20
+WVTAsn1SpcLinkDecode@28
+WVTAsn1SpcLinkEncode@20
+WVTAsn1SpcMinimalCriteriaInfoDecode@28
+WVTAsn1SpcMinimalCriteriaInfoEncode@20
+WVTAsn1SpcPeImageDataDecode@28
+WVTAsn1SpcPeImageDataEncode@20
+WVTAsn1SpcSigInfoDecode@28
+WVTAsn1SpcSigInfoEncode@20
+WVTAsn1SpcSpAgencyInfoDecode@28
+WVTAsn1SpcSpAgencyInfoEncode@20
+WVTAsn1SpcSpOpusInfoDecode@28
+WVTAsn1SpcSpOpusInfoEncode@20
+WVTAsn1SpcStatementTypeDecode@28
+WVTAsn1SpcStatementTypeEncode@20
+WinVerifyTrust@12
+WinVerifyTrustEx@12
+WintrustAddActionID@12
+WintrustAddDefaultForUsage@8
+WintrustCertificateTrust@4
+WintrustGetDefaultForUsage@12
+WintrustGetRegPolicyFlags@4
+WintrustLoadFunctionPointers@8
+WintrustRemoveActionID@4
+WintrustSetDefaultIncludePEPageHashes@4
+WintrustSetRegPolicyFlags@4
+mscat32DllRegisterServer
+mscat32DllUnregisterServer
+mssip32DllRegisterServer
+mssip32DllUnregisterServer
--
2.1.0
--- a/mingw-w64-crt/Makefile.in.orig 2015-01-01 13:58:54.494782913 +0100
+++ b/mingw-w64-crt/Makefile.in 2015-01-01 13:59:07.182986859 +0100
@@ -4235,23 +4235,24 @@
@LIB32_TRUE@ lib32/libwindowscodecs.a lib32/libwinhttp.a \
@LIB32_TRUE@ lib32/libwininet.a lib32/libwinmm.a \
@LIB32_TRUE@ lib32/libwinscard.a lib32/libwinspool.a \
-@LIB32_TRUE@ lib32/libwinstrm.a lib32/libwinusb.a \
-@LIB32_TRUE@ lib32/libwkscli.a lib32/libwlanapi.a \
-@LIB32_TRUE@ lib32/libwlanui.a lib32/libwlanutil.a \
-@LIB32_TRUE@ lib32/libwldap32.a lib32/libwow32.a \
-@LIB32_TRUE@ lib32/libwsdapi.a lib32/libwsnmp32.a \
-@LIB32_TRUE@ lib32/libwsock32.a lib32/libwst.a \
-@LIB32_TRUE@ lib32/libwtsapi32.a lib32/libx3daudio1_2.a \
-@LIB32_TRUE@ lib32/libx3daudio1_3.a lib32/libx3daudio1_4.a \
-@LIB32_TRUE@ lib32/libx3daudio1_5.a lib32/libx3daudio1_6.a \
-@LIB32_TRUE@ lib32/libx3daudio1_7.a lib32/libx3daudiod1_7.a \
-@LIB32_TRUE@ lib32/libxapofx1_0.a lib32/libxapofx1_1.a \
-@LIB32_TRUE@ lib32/libxapofx1_2.a lib32/libxapofx1_3.a \
-@LIB32_TRUE@ lib32/libxapofx1_4.a lib32/libxapofx1_5.a \
-@LIB32_TRUE@ lib32/libxapofxd1_5.a lib32/libxaudio2_8.a \
-@LIB32_TRUE@ lib32/libxinput1_1.a lib32/libxinput1_2.a \
-@LIB32_TRUE@ lib32/libxinput1_3.a lib32/libxinput1_4.a \
-@LIB32_TRUE@ lib32/libxinput9_1_0.a $(am__append_5)
+@LIB32_TRUE@ lib32/libwinstrm.a lib32/libwintrust.a \
+@LIB32_TRUE@ lib32/libwinusb.a lib32/libwkscli.a \
+@LIB32_TRUE@ lib32/libwlanapi.a lib32/libwlanui.a \
+@LIB32_TRUE@ lib32/libwlanutil.a lib32/libwldap32.a \
+@LIB32_TRUE@ lib32/libwow32.a lib32/libwsdapi.a \
+@LIB32_TRUE@ lib32/libwsnmp32.a lib32/libwsock32.a \
+@LIB32_TRUE@ lib32/libwst.a lib32/libwtsapi32.a \
+@LIB32_TRUE@ lib32/libx3daudio1_2.a lib32/libx3daudio1_3.a \
+@LIB32_TRUE@ lib32/libx3daudio1_4.a lib32/libx3daudio1_5.a \
+@LIB32_TRUE@ lib32/libx3daudio1_6.a lib32/libx3daudio1_7.a \
+@LIB32_TRUE@ lib32/libx3daudiod1_7.a lib32/libxapofx1_0.a \
+@LIB32_TRUE@ lib32/libxapofx1_1.a lib32/libxapofx1_2.a \
+@LIB32_TRUE@ lib32/libxapofx1_3.a lib32/libxapofx1_4.a \
+@LIB32_TRUE@ lib32/libxapofx1_5.a lib32/libxapofxd1_5.a \
+@LIB32_TRUE@ lib32/libxaudio2_8.a lib32/libxinput1_1.a \
+@LIB32_TRUE@ lib32/libxinput1_2.a lib32/libxinput1_3.a \
+@LIB32_TRUE@ lib32/libxinput1_4.a lib32/libxinput9_1_0.a \
+@LIB32_TRUE@ $(am__append_5)
@LIB32_TRUE@dx32_DATA = lib32/libxinput.a lib32/libxapofx.a \
@LIB32_TRUE@ lib32/libx3daudio.a lib32/libd3dx9.a \
@LIB32_TRUE@ lib32/libd3dx10.a lib32/libd3dx11.a \
From 922439973edc8d7289780d4232573b6e480bcd0b Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <[email protected]>
Date: Thu, 1 Jan 2015 02:02:35 +0100
Subject: [PATCH 2/2] uuid.c: Added missing urlmon CLSIDs and get rid of
duplicated IIDs.
This is a partial cherry-pick of 3dc34b66edf0bbe00a51b228d087a9b60e89ef50
---
mingw-w64-crt/Makefile.am | 2 +-
mingw-w64-crt/libsrc/uuid.c | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index d45645c..00458fc 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -96,7 +96,7 @@ src_libuuid=\
libsrc/ntddkbd-uuid.c libsrc/ntddmou-uuid.c libsrc/ntddpar-uuid.c libsrc/ntddscsi-uuid.c libsrc/ntddser-uuid.c \
libsrc/ntddstor-uuid.c libsrc/ntddvdeo-uuid.c libsrc/oaidl-uuid.c libsrc/objidl-uuid.c libsrc/objsafe-uuid.c \
libsrc/ocidl-uuid.c libsrc/oleacc-uuid.c libsrc/olectlid-uuid.c libsrc/oleidl-uuid.c libsrc/power-uuid.c \
- libsrc/powrprof-uuid.c libsrc/urlmon-uuid.c libsrc/usbcamdi-uuid.c libsrc/usbiodef-uuid.c libsrc/uuid.c \
+ libsrc/powrprof-uuid.c libsrc/usbcamdi-uuid.c libsrc/usbiodef-uuid.c libsrc/uuid.c \
libsrc/vds-uuid.c libsrc/virtdisk-uuid.c libsrc/wia-uuid.c
src_libws2_32=libsrc/ws2_32.c \
diff --git a/mingw-w64-crt/libsrc/uuid.c b/mingw-w64-crt/libsrc/uuid.c
index 4bfdee9..14edbea 100644
--- a/mingw-w64-crt/libsrc/uuid.c
+++ b/mingw-w64-crt/libsrc/uuid.c
@@ -26,6 +26,7 @@
#include <urlhist.h>
#include <oleacc.h>
#include <uiautomation.h>
+#include <urlmon.h>
DEFINE_GUID(ARRAYID_PathProperties,0x7ecbba04,0x2d97,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);
DEFINE_GUID(CATID_Control,0x40fc6ed4,0x2438,0x11cf,0xa3,0xdb,0x8,0,0x36,0xf1,0x25,0x2);
@@ -121,6 +122,8 @@ DEFINE_GUID(IID_IAsyncOperation,0x3d8b0590,0xf691,0x11d2,0x8e,0xa9,0x00,0x60,0x9
/*DEFINE_GUID(IID_IBindHost,0xfc4801a1,0x2ba9,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);
DEFINE_GUID(IID_IBindProtocol,0x79eac9cd,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);*/
DEFINE_GUID(IID_IBindStatusCallbackMsg,0x79eac9cb,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
+DEFINE_GUID(CLSID_InternetSecurityManager, 0x7b8a2d94,0x0ac9,0x11d1,0x89,0x6c,0x00,0xc0,0x4f,0xb6,0xbf,0xc4);
+DEFINE_GUID(CLSID_InternetZoneManager, 0x7B8A2D95,0x0AC9,0x11D1,0x89,0x6C,0x00,0xC0,0x4F,0xB6,0xBF,0xC4);
/*DEFINE_GUID(IID_IChannelHook,0x1008c4a0,0x7613,0x11cf,0x9a,0xf1,0,0x20,0xaf,0x6e,0x72,0xf4);
DEFINE_GUID(IID_IClassActivator,0x140,0,0,0xc0,0,0,0,0,0,0,0x46);
DEFINE_GUID(IID_IClassFactory2,0xb196b28f,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7);
--
2.1.0
--- mingw-w64-v3.3.0/mingw-w64-crt/Makefile.in.orig 2015-01-01 14:01:14.963040757 +0100
+++ mingw-w64-v3.3.0/mingw-w64-crt/Makefile.in 2015-01-01 14:01:27.491242131 +0100
@@ -1184,9 +1184,8 @@
libsrc/ocidl-uuid.c libsrc/oleacc-uuid.c \
libsrc/olectlid-uuid.c libsrc/oleidl-uuid.c \
libsrc/power-uuid.c libsrc/powrprof-uuid.c \
- libsrc/urlmon-uuid.c libsrc/usbcamdi-uuid.c \
- libsrc/usbiodef-uuid.c libsrc/uuid.c libsrc/vds-uuid.c \
- libsrc/virtdisk-uuid.c libsrc/wia-uuid.c
+ libsrc/usbcamdi-uuid.c libsrc/usbiodef-uuid.c libsrc/uuid.c \
+ libsrc/vds-uuid.c libsrc/virtdisk-uuid.c libsrc/wia-uuid.c
am__objects_27 = libsrc/lib32_libuuid_a-ativscp-uuid.$(OBJEXT) \
libsrc/lib32_libuuid_a-atsmedia-uuid.$(OBJEXT) \
libsrc/lib32_libuuid_a-bth-uuid.$(OBJEXT) \
@@ -1223,7 +1222,6 @@
libsrc/lib32_libuuid_a-oleidl-uuid.$(OBJEXT) \
libsrc/lib32_libuuid_a-power-uuid.$(OBJEXT) \
libsrc/lib32_libuuid_a-powrprof-uuid.$(OBJEXT) \
- libsrc/lib32_libuuid_a-urlmon-uuid.$(OBJEXT) \
libsrc/lib32_libuuid_a-usbcamdi-uuid.$(OBJEXT) \
libsrc/lib32_libuuid_a-usbiodef-uuid.$(OBJEXT) \
libsrc/lib32_libuuid_a-uuid.$(OBJEXT) \
@@ -2285,9 +2283,8 @@
libsrc/ocidl-uuid.c libsrc/oleacc-uuid.c \
libsrc/olectlid-uuid.c libsrc/oleidl-uuid.c \
libsrc/power-uuid.c libsrc/powrprof-uuid.c \
- libsrc/urlmon-uuid.c libsrc/usbcamdi-uuid.c \
- libsrc/usbiodef-uuid.c libsrc/uuid.c libsrc/vds-uuid.c \
- libsrc/virtdisk-uuid.c libsrc/wia-uuid.c
+ libsrc/usbcamdi-uuid.c libsrc/usbiodef-uuid.c libsrc/uuid.c \
+ libsrc/vds-uuid.c libsrc/virtdisk-uuid.c libsrc/wia-uuid.c
am__objects_56 = libsrc/lib64_libuuid_a-ativscp-uuid.$(OBJEXT) \
libsrc/lib64_libuuid_a-atsmedia-uuid.$(OBJEXT) \
libsrc/lib64_libuuid_a-bth-uuid.$(OBJEXT) \
@@ -2324,7 +2321,6 @@
libsrc/lib64_libuuid_a-oleidl-uuid.$(OBJEXT) \
libsrc/lib64_libuuid_a-power-uuid.$(OBJEXT) \
libsrc/lib64_libuuid_a-powrprof-uuid.$(OBJEXT) \
- libsrc/lib64_libuuid_a-urlmon-uuid.$(OBJEXT) \
libsrc/lib64_libuuid_a-usbcamdi-uuid.$(OBJEXT) \
libsrc/lib64_libuuid_a-usbiodef-uuid.$(OBJEXT) \
libsrc/lib64_libuuid_a-uuid.$(OBJEXT) \
@@ -3773,7 +3769,7 @@
libsrc/ntddkbd-uuid.c libsrc/ntddmou-uuid.c libsrc/ntddpar-uuid.c libsrc/ntddscsi-uuid.c libsrc/ntddser-uuid.c \
libsrc/ntddstor-uuid.c libsrc/ntddvdeo-uuid.c libsrc/oaidl-uuid.c libsrc/objidl-uuid.c libsrc/objsafe-uuid.c \
libsrc/ocidl-uuid.c libsrc/oleacc-uuid.c libsrc/olectlid-uuid.c libsrc/oleidl-uuid.c libsrc/power-uuid.c \
- libsrc/powrprof-uuid.c libsrc/urlmon-uuid.c libsrc/usbcamdi-uuid.c libsrc/usbiodef-uuid.c libsrc/uuid.c \
+ libsrc/powrprof-uuid.c libsrc/usbcamdi-uuid.c libsrc/usbiodef-uuid.c libsrc/uuid.c \
libsrc/vds-uuid.c libsrc/virtdisk-uuid.c libsrc/wia-uuid.c
src_libws2_32 = libsrc/ws2_32.c \
@@ -6879,8 +6875,6 @@
libsrc/$(DEPDIR)/$(am__dirstamp)
libsrc/lib32_libuuid_a-powrprof-uuid.$(OBJEXT): \
libsrc/$(am__dirstamp) libsrc/$(DEPDIR)/$(am__dirstamp)
-libsrc/lib32_libuuid_a-urlmon-uuid.$(OBJEXT): libsrc/$(am__dirstamp) \
- libsrc/$(DEPDIR)/$(am__dirstamp)
libsrc/lib32_libuuid_a-usbcamdi-uuid.$(OBJEXT): \
libsrc/$(am__dirstamp) libsrc/$(DEPDIR)/$(am__dirstamp)
libsrc/lib32_libuuid_a-usbiodef-uuid.$(OBJEXT): \
@@ -8455,8 +8449,6 @@
libsrc/$(DEPDIR)/$(am__dirstamp)
libsrc/lib64_libuuid_a-powrprof-uuid.$(OBJEXT): \
libsrc/$(am__dirstamp) libsrc/$(DEPDIR)/$(am__dirstamp)
-libsrc/lib64_libuuid_a-urlmon-uuid.$(OBJEXT): libsrc/$(am__dirstamp) \
- libsrc/$(DEPDIR)/$(am__dirstamp)
libsrc/lib64_libuuid_a-usbcamdi-uuid.$(OBJEXT): \
libsrc/$(am__dirstamp) libsrc/$(DEPDIR)/$(am__dirstamp)
libsrc/lib64_libuuid_a-usbiodef-uuid.$(OBJEXT): \
@@ -9965,7 +9957,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-oleidl-uuid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-power-uuid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-powrprof-uuid.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-urlmon-uuid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-usbcamdi-uuid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-usbiodef-uuid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib32_libuuid_a-uuid.Po@am__quote@
@@ -10040,7 +10031,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-oleidl-uuid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-power-uuid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-powrprof-uuid.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-urlmon-uuid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-usbcamdi-uuid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-usbiodef-uuid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libsrc/$(DEPDIR)/lib64_libuuid_a-uuid.Po@am__quote@
@@ -20542,20 +20532,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsrc/lib32_libuuid_a-powrprof-uuid.obj `if test -f 'libsrc/powrprof-uuid.c'; then $(CYGPATH_W) 'libsrc/powrprof-uuid.c'; else $(CYGPATH_W) '$(srcdir)/libsrc/powrprof-uuid.c'; fi`
-libsrc/lib32_libuuid_a-urlmon-uuid.o: libsrc/urlmon-uuid.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsrc/lib32_libuuid_a-urlmon-uuid.o -MD -MP -MF libsrc/$(DEPDIR)/lib32_libuuid_a-urlmon-uuid.Tpo -c -o libsrc/lib32_libuuid_a-urlmon-uuid.o `test -f 'libsrc/urlmon-uuid.c' || echo '$(srcdir)/'`libsrc/urlmon-uuid.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libsrc/$(DEPDIR)/lib32_libuuid_a-urlmon-uuid.Tpo libsrc/$(DEPDIR)/lib32_libuuid_a-urlmon-uuid.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libsrc/urlmon-uuid.c' object='libsrc/lib32_libuuid_a-urlmon-uuid.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsrc/lib32_libuuid_a-urlmon-uuid.o `test -f 'libsrc/urlmon-uuid.c' || echo '$(srcdir)/'`libsrc/urlmon-uuid.c
-
-libsrc/lib32_libuuid_a-urlmon-uuid.obj: libsrc/urlmon-uuid.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsrc/lib32_libuuid_a-urlmon-uuid.obj -MD -MP -MF libsrc/$(DEPDIR)/lib32_libuuid_a-urlmon-uuid.Tpo -c -o libsrc/lib32_libuuid_a-urlmon-uuid.obj `if test -f 'libsrc/urlmon-uuid.c'; then $(CYGPATH_W) 'libsrc/urlmon-uuid.c'; else $(CYGPATH_W) '$(srcdir)/libsrc/urlmon-uuid.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libsrc/$(DEPDIR)/lib32_libuuid_a-urlmon-uuid.Tpo libsrc/$(DEPDIR)/lib32_libuuid_a-urlmon-uuid.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libsrc/urlmon-uuid.c' object='libsrc/lib32_libuuid_a-urlmon-uuid.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsrc/lib32_libuuid_a-urlmon-uuid.obj `if test -f 'libsrc/urlmon-uuid.c'; then $(CYGPATH_W) 'libsrc/urlmon-uuid.c'; else $(CYGPATH_W) '$(srcdir)/libsrc/urlmon-uuid.c'; fi`
-
libsrc/lib32_libuuid_a-usbcamdi-uuid.o: libsrc/usbcamdi-uuid.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsrc/lib32_libuuid_a-usbcamdi-uuid.o -MD -MP -MF libsrc/$(DEPDIR)/lib32_libuuid_a-usbcamdi-uuid.Tpo -c -o libsrc/lib32_libuuid_a-usbcamdi-uuid.o `test -f 'libsrc/usbcamdi-uuid.c' || echo '$(srcdir)/'`libsrc/usbcamdi-uuid.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libsrc/$(DEPDIR)/lib32_libuuid_a-usbcamdi-uuid.Tpo libsrc/$(DEPDIR)/lib32_libuuid_a-usbcamdi-uuid.Po
@@ -29474,20 +29450,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsrc/lib64_libuuid_a-powrprof-uuid.obj `if test -f 'libsrc/powrprof-uuid.c'; then $(CYGPATH_W) 'libsrc/powrprof-uuid.c'; else $(CYGPATH_W) '$(srcdir)/libsrc/powrprof-uuid.c'; fi`
-libsrc/lib64_libuuid_a-urlmon-uuid.o: libsrc/urlmon-uuid.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsrc/lib64_libuuid_a-urlmon-uuid.o -MD -MP -MF libsrc/$(DEPDIR)/lib64_libuuid_a-urlmon-uuid.Tpo -c -o libsrc/lib64_libuuid_a-urlmon-uuid.o `test -f 'libsrc/urlmon-uuid.c' || echo '$(srcdir)/'`libsrc/urlmon-uuid.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libsrc/$(DEPDIR)/lib64_libuuid_a-urlmon-uuid.Tpo libsrc/$(DEPDIR)/lib64_libuuid_a-urlmon-uuid.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libsrc/urlmon-uuid.c' object='libsrc/lib64_libuuid_a-urlmon-uuid.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsrc/lib64_libuuid_a-urlmon-uuid.o `test -f 'libsrc/urlmon-uuid.c' || echo '$(srcdir)/'`libsrc/urlmon-uuid.c
-
-libsrc/lib64_libuuid_a-urlmon-uuid.obj: libsrc/urlmon-uuid.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsrc/lib64_libuuid_a-urlmon-uuid.obj -MD -MP -MF libsrc/$(DEPDIR)/lib64_libuuid_a-urlmon-uuid.Tpo -c -o libsrc/lib64_libuuid_a-urlmon-uuid.obj `if test -f 'libsrc/urlmon-uuid.c'; then $(CYGPATH_W) 'libsrc/urlmon-uuid.c'; else $(CYGPATH_W) '$(srcdir)/libsrc/urlmon-uuid.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libsrc/$(DEPDIR)/lib64_libuuid_a-urlmon-uuid.Tpo libsrc/$(DEPDIR)/lib64_libuuid_a-urlmon-uuid.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libsrc/urlmon-uuid.c' object='libsrc/lib64_libuuid_a-urlmon-uuid.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsrc/lib64_libuuid_a-urlmon-uuid.obj `if test -f 'libsrc/urlmon-uuid.c'; then $(CYGPATH_W) 'libsrc/urlmon-uuid.c'; else $(CYGPATH_W) '$(srcdir)/libsrc/urlmon-uuid.c'; fi`
-
libsrc/lib64_libuuid_a-usbcamdi-uuid.o: libsrc/usbcamdi-uuid.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libuuid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libsrc/lib64_libuuid_a-usbcamdi-uuid.o -MD -MP -MF libsrc/$(DEPDIR)/lib64_libuuid_a-usbcamdi-uuid.Tpo -c -o libsrc/lib64_libuuid_a-usbcamdi-uuid.o `test -f 'libsrc/usbcamdi-uuid.c' || echo '$(srcdir)/'`libsrc/usbcamdi-uuid.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libsrc/$(DEPDIR)/lib64_libuuid_a-usbcamdi-uuid.Tpo libsrc/$(DEPDIR)/lib64_libuuid_a-usbcamdi-uuid.Po
------------------------------------------------------------------------------
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
