widl prefixes the names properly, otherwise we get the prefix twice.
---
 mingw-w64-headers/include/windows.storage.h   | 44 +++++++++----------
 mingw-w64-headers/include/windows.storage.idl | 44 +++++++++----------
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/mingw-w64-headers/include/windows.storage.h 
b/mingw-w64-headers/include/windows.storage.h
index 6c9725f0..6e475af0 100644
--- a/mingw-w64-headers/include/windows.storage.h
+++ b/mingw-w64-headers/include/windows.storage.h
@@ -453,40 +453,40 @@ enum __x_ABI_CWindows_CStorage_CCreationCollisionOption;
 #endif
 
 typedef enum NameCollisionoption {
-    NameCollisionoption_NameCollisionoption_GenerateUniqueName = 0,
-    NameCollisionoption_NameCollisionoption_ReplaceExisting = 1,
-    NameCollisionoption_NameCollisionoption_FailIfExists = 2
+    NameCollisionoption_GenerateUniqueName = 0,
+    NameCollisionoption_ReplaceExisting = 1,
+    NameCollisionoption_FailIfExists = 2
 } NameCollisionOption;
 typedef enum StorageDeleteOption {
-    StorageDeleteOption_StorageDeleteOption_Default = 0,
-    StorageDeleteOption_StorageDeleteOption_PermanentDelete = 1
+    StorageDeleteOption_Default = 0,
+    StorageDeleteOption_PermanentDelete = 1
 } StorageDeleteOption;
 typedef enum StorageItemTypes {
-    StorageItemTypes_StorageItemTypes_None = 0,
-    StorageItemTypes_StorageItemTypes_File = 1,
-    StorageItemTypes_StorageItemTypes_Folder = 2
+    StorageItemTypes_None = 0,
+    StorageItemTypes_File = 1,
+    StorageItemTypes_Folder = 2
 } StorageItemTypes;
 typedef enum ApplicationDataCreateDisposition {
-    ApplicationDataCreateDisposition_ApplicationDataCreateDisposition_Always = 
0,
-    ApplicationDataCreateDisposition_ApplicationDataCreateDisposition_Existing 
= 1
+    ApplicationDataCreateDisposition_Always = 0,
+    ApplicationDataCreateDisposition_Existing = 1
 } ApplicationDataCreateDisposition;
 typedef enum ApplicationDataLocality {
-    ApplicationDataLocality_ApplicationDataLocality_Local = 0,
-    ApplicationDataLocality_ApplicationDataLocality_Roaming = 1,
-    ApplicationDataLocality_ApplicationDataLocality_Temporary = 2
+    ApplicationDataLocality_Local = 0,
+    ApplicationDataLocality_Roaming = 1,
+    ApplicationDataLocality_Temporary = 2
 } ApplicationDataLocality;
 typedef enum FileAttributes {
-    FileAttributes_FileAttributes_Normal = 0,
-    FileAttributes_FileAttributes_ReadOnly = 1,
-    FileAttributes_FileAttributes_Directory = 2,
-    FileAttributes_FileAttributes_Archive = 3,
-    FileAttributes_FileAttributes_Temporary = 4
+    FileAttributes_Normal = 0,
+    FileAttributes_ReadOnly = 1,
+    FileAttributes_Directory = 2,
+    FileAttributes_Archive = 3,
+    FileAttributes_Temporary = 4
 } FileAttributes;
 typedef enum CreationCollisionOption {
-    CreationCollisionOption_CreationCollisionOption_GenerateUniqueName = 0,
-    CreationCollisionOption_CreationCollisionOption_ReplaceExisting = 1,
-    CreationCollisionOption_CreationCollisionOption_FailIfExists = 2,
-    CreationCollisionOption_CreationCollisionOption_OpenIfExists = 3
+    CreationCollisionOption_GenerateUniqueName = 0,
+    CreationCollisionOption_ReplaceExisting = 1,
+    CreationCollisionOption_FailIfExists = 2,
+    CreationCollisionOption_OpenIfExists = 3
 } CreationCollisionOption;
 /*****************************************************************************
  * IStorageItem interface
diff --git a/mingw-w64-headers/include/windows.storage.idl 
b/mingw-w64-headers/include/windows.storage.idl
index ddc292aa..e32d638a 100644
--- a/mingw-w64-headers/include/windows.storage.idl
+++ b/mingw-w64-headers/include/windows.storage.idl
@@ -46,46 +46,46 @@ namespace Windows {
 namespace Windows {
   namespace Storage {
     typedef enum NameCollisionoption {
-      NameCollisionoption_GenerateUniqueName,
-      NameCollisionoption_ReplaceExisting,
-      NameCollisionoption_FailIfExists
+      GenerateUniqueName,
+      ReplaceExisting,
+      FailIfExists
     } NameCollisionOption;
 
     typedef enum StorageDeleteOption {
-      StorageDeleteOption_Default,
-      StorageDeleteOption_PermanentDelete
+      Default,
+      PermanentDelete
     } StorageDeleteOption;
 
     typedef enum StorageItemTypes {
-      StorageItemTypes_None,
-      StorageItemTypes_File,
-      StorageItemTypes_Folder
+      None,
+      File,
+      Folder
     } StorageItemTypes;
 
     typedef enum ApplicationDataCreateDisposition {
-      ApplicationDataCreateDisposition_Always,
-      ApplicationDataCreateDisposition_Existing
+      Always,
+      Existing
     } ApplicationDataCreateDisposition;
 
     typedef enum ApplicationDataLocality {
-      ApplicationDataLocality_Local,
-      ApplicationDataLocality_Roaming,
-      ApplicationDataLocality_Temporary
+      Local,
+      Roaming,
+      Temporary
     } ApplicationDataLocality;
 
     typedef enum FileAttributes {
-      FileAttributes_Normal,
-      FileAttributes_ReadOnly,
-      FileAttributes_Directory,
-      FileAttributes_Archive,
-      FileAttributes_Temporary
+      Normal,
+      ReadOnly,
+      Directory,
+      Archive,
+      Temporary
     } FileAttributes;
 
     typedef enum CreationCollisionOption {
-      CreationCollisionOption_GenerateUniqueName,
-      CreationCollisionOption_ReplaceExisting,
-      CreationCollisionOption_FailIfExists,
-      CreationCollisionOption_OpenIfExists
+      GenerateUniqueName,
+      ReplaceExisting,
+      FailIfExists,
+      OpenIfExists
     } CreationCollisionOption;
 
     [uuid(4207A996-CA2F-42F7-BDE8-8B10457A7F30)]
-- 
2.29.2



_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to