[PATCH v2 0/1] MR8416: windows.storage: Split ApplicationData
Windows registry keys such as `HKEY_LOCAL_MACHINE\\Software\\Microsoft\\WindowsRuntime\\ActivatableClassId\\Windows.Storage.ApplicationData` indicate that `Windows.Storage.ApplicationData` related classes should be in `windows.storage.applicationdata.dll`, and the remaining classes together with `Windows.Storage.StorageFile` should be in `windows.storage.dll`. This allows future implementions of class `Windows.Storage.StorageFile` to be correctly put in the `windows.storage.dll`, instead of `windows.storage.applicationdata.dll`, see https://gitlab.winehq.org/wine/wine/-/merge_requests/8394 -- v2: windows.storage: Split ApplicationData https://gitlab.winehq.org/wine/wine/-/merge_requests/8416
From: Ignacy Kuchciński <ignacykuchcinski(a)gmail.com> Split Windows.Storage.ApplicationData definitions in windows.storage.idl by conditionally declaring the runtimeclass based on #ifndef to better reflect Windows implementation, which has those definitions in windows.storage.applicationdata.dll and the rest of non related in windows.storage.dll. --- .../classes.idl | 1 + dlls/windows.storage/classes.idl | 15 +++++++++++++ include/windows.storage.fileproperties.idl | 2 ++ include/windows.storage.idl | 22 ++++++++++++++----- include/windows.storage.search.idl | 2 ++ 5 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/windows.storage.applicationdata/classes.idl b/dlls/windows.storage.applicationdata/classes.idl index b24def16f0f..8b926c63e10 100644 --- a/dlls/windows.storage.applicationdata/classes.idl +++ b/dlls/windows.storage.applicationdata/classes.idl @@ -20,4 +20,5 @@ #pragma makedep register +#define _WINDOWS_APPLICATIONDATA #include "windows.storage.idl" diff --git a/dlls/windows.storage/classes.idl b/dlls/windows.storage/classes.idl index 8a7be135572..c77d7ec9ebb 100644 --- a/dlls/windows.storage/classes.idl +++ b/dlls/windows.storage/classes.idl @@ -20,5 +20,20 @@ #pragma makedep register +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windows.foundation.idl"; +import "windowscontracts.idl"; +import "windows.system.idl"; + #define _WINDOWS_STORAGE +#define DO_NO_IMPORTS +#include "windows.storage.fileproperties.idl" +#include "windows.storage.search.idl" #include "windows.storage.streams.idl" +#include "windows.storage.idl" diff --git a/include/windows.storage.fileproperties.idl b/include/windows.storage.fileproperties.idl index 9426d02fefb..8469e6c12aa 100644 --- a/include/windows.storage.fileproperties.idl +++ b/include/windows.storage.fileproperties.idl @@ -20,6 +20,7 @@ #pragma winrt ns_prefix #endif +#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -28,6 +29,7 @@ import "windows.foundation.idl"; import "windows.devices.geolocation.idl"; /* import "windows.storage.idl"; */ import "windows.storage.streams.idl"; +#endif namespace Windows.Storage.FileProperties { interface IBasicProperties; diff --git a/include/windows.storage.idl b/include/windows.storage.idl index 483fc5a957e..b5344fdb95c 100644 --- a/include/windows.storage.idl +++ b/include/windows.storage.idl @@ -20,6 +20,7 @@ #pragma winrt ns_prefix #endif +#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -30,6 +31,7 @@ import "windows.storage.fileproperties.idl"; import "windows.storage.search.idl"; import "windows.storage.streams.idl"; import "windows.system.idl"; +#endif namespace Windows.Storage { typedef enum ApplicationDataCreateDisposition ApplicationDataCreateDisposition; @@ -77,17 +79,20 @@ namespace Windows.Storage { declare { interface Windows.Foundation.Collections.IKeyValuePair<HSTRING, Windows.Storage.ApplicationDataContainer *>; interface Windows.Foundation.Collections.IIterable<Windows.Foundation.Collections.IKeyValuePair<HSTRING, Windows.Storage.ApplicationDataContainer *> *>; - interface Windows.Foundation.Collections.IIterable<Windows.Storage.IStorageItem *>; interface Windows.Foundation.Collections.IIterator<Windows.Foundation.Collections.IKeyValuePair<HSTRING, Windows.Storage.ApplicationDataContainer *> *>; - interface Windows.Foundation.Collections.IIterator<Windows.Storage.IStorageItem *>; interface Windows.Foundation.Collections.IMapView<HSTRING, Windows.Storage.ApplicationDataContainer *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.ApplicationData *>; + interface Windows.Foundation.IAsyncOperation<Windows.Storage.ApplicationData *>; + interface Windows.Foundation.TypedEventHandler<Windows.Storage.ApplicationData *, IInspectable *>; +#ifndef _WINDOWS_APPLICATIONDATA + interface Windows.Foundation.Collections.IIterable<Windows.Storage.IStorageItem *>; + interface Windows.Foundation.Collections.IIterator<Windows.Storage.IStorageItem *>; interface Windows.Foundation.Collections.IVectorView<Windows.Storage.IStorageItem *>; interface Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFile *>; interface Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFolder *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Foundation.Collections.IVectorView<Windows.Storage.IStorageItem *> *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFile *> *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFolder *> *>; - interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.ApplicationData *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.KnownFoldersAccessStatus>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.IStorageItem *>; interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Storage.StorageFile *>; @@ -96,13 +101,12 @@ namespace Windows.Storage { interface Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.Storage.IStorageItem *> *>; interface Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFile *> *>; interface Windows.Foundation.IAsyncOperation<Windows.Foundation.Collections.IVectorView<Windows.Storage.StorageFolder *> *>; - interface Windows.Foundation.IAsyncOperation<Windows.Storage.ApplicationData *>; interface Windows.Foundation.IAsyncOperation<Windows.Storage.KnownFoldersAccessStatus>; interface Windows.Foundation.IAsyncOperation<Windows.Storage.IStorageItem *>; interface Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFile *>; interface Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFolder *>; interface Windows.Foundation.IAsyncOperation<Windows.Storage.StorageStreamTransaction *>; - interface Windows.Foundation.TypedEventHandler<Windows.Storage.ApplicationData *, IInspectable *>; +#endif } [ @@ -127,6 +131,7 @@ namespace Windows.Storage { SharedLocal = 4, }; +#ifndef _WINDOWS_APPLICATIONDATA [ contract(Windows.Foundation.UniversalApiContract, 1.0) ] @@ -232,6 +237,7 @@ namespace Windows.Storage { File = 0x1, Folder = 0x2, }; +#endif [ contract(Windows.Foundation.UniversalApiContract, 1.0), @@ -345,6 +351,7 @@ namespace Windows.Storage { ); } +#ifndef _WINDOWS_APPLICATIONDATA [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Storage.KnownFolders), @@ -438,6 +445,7 @@ namespace Windows.Storage { [out, retval] Windows.Foundation.IAsyncOperation<Windows.Storage.StorageFolder *> **operation ); } +#endif [ contract(Windows.Foundation.UniversalApiContract, 1.0), @@ -461,6 +469,7 @@ namespace Windows.Storage { HRESULT GetDeferral([out, retval] Windows.Storage.SetVersionDeferral **deferral); } +#ifndef _WINDOWS_APPLICATIONDATA [ contract(Windows.Foundation.UniversalApiContract, 1.0), uuid(fa3f6186-4214-428c-a64c-14c9ac7315ea) @@ -591,6 +600,7 @@ namespace Windows.Storage { [propget] HRESULT Stream([out, retval] Windows.Storage.Streams.IRandomAccessStream **value); HRESULT CommitAsync([out, retval] Windows.Foundation.IAsyncAction **operation); } +#endif [ contract(Windows.Foundation.UniversalApiContract, 1.0), @@ -617,6 +627,7 @@ namespace Windows.Storage { [contract(Windows.Foundation.UniversalApiContract, 12.0)] interface Windows.Foundation.IClosable; } +#ifndef _WINDOWS_APPLICATIONDATA [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -695,4 +706,5 @@ namespace Windows.Storage { [default] interface Windows.Storage.IStorageStreamTransaction; interface Windows.Foundation.IClosable; } +#endif } diff --git a/include/windows.storage.search.idl b/include/windows.storage.search.idl index 093b0837afb..217889c3c89 100644 --- a/include/windows.storage.search.idl +++ b/include/windows.storage.search.idl @@ -20,6 +20,7 @@ #pragma winrt ns_prefix #endif +#ifndef DO_NO_IMPORTS import "inspectable.idl"; import "asyncinfo.idl"; import "eventtoken.idl"; @@ -29,6 +30,7 @@ import "windows.foundation.idl"; /* import "windows.storage.idl"; */ import "windows.storage.fileproperties.idl"; import "windows.storage.streams.idl"; +#endif namespace Windows.Storage.Search { interface IStorageFolderQueryOperations; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8416
participants (1)
-
Ignacy Kuchciński