[PATCH v2 0/10] MR8864: misc: Register runtimeclasses explicitly (2/3).
-- v2: windows.gaming.input: Register runtimeclasses explicitly. windows.devices.usb: Register runtimeclasses explicitly. windows.devices.enumeration: Register runtimeclasses explicitly. windows.devices.bluetooth: Register runtimeclasses explicitly. threadpoolwinrt: Register runtimeclasses explicitly. iertutil: Register runtimeclasses explicitly. hvsimanagementapi: Register runtimeclasses explicitly. graphicscapture: Register runtimeclasses explicitly. geolocation: Register runtimeclasses explicitly. dataexchange: Register runtimeclasses explicitly. https://gitlab.winehq.org/wine/wine/-/merge_requests/8864
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dataexchange/classes.idl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dataexchange/classes.idl b/dlls/dataexchange/classes.idl index 06f6dd3e545..8f7757d228e 100644 --- a/dlls/dataexchange/classes.idl +++ b/dlls/dataexchange/classes.idl @@ -19,5 +19,10 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#include "windows.applicationmodel.datatransfer.dragdrop.core.idl" +import "windows.applicationmodel.datatransfer.dragdrop.core.idl"; + +namespace Windows.ApplicationModel.DataTransfer.DragDrop.Core { + runtimeclass CoreDragDropManager; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8864
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/geolocation/classes.idl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/geolocation/classes.idl b/dlls/geolocation/classes.idl index 9a21dba5edc..60281519f6a 100644 --- a/dlls/geolocation/classes.idl +++ b/dlls/geolocation/classes.idl @@ -18,9 +18,10 @@ */ #pragma makedep register - -#ifdef __WIDL__ #pragma winrt ns_prefix -#endif -#include "windows.devices.geolocation.idl" +import "windows.devices.geolocation.idl"; + +namespace Windows.Devices.Geolocation { + runtimeclass Geolocator; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8864
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/graphicscapture/classes.idl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/graphicscapture/classes.idl b/dlls/graphicscapture/classes.idl index a2e9798be81..73c05124843 100644 --- a/dlls/graphicscapture/classes.idl +++ b/dlls/graphicscapture/classes.idl @@ -19,5 +19,10 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#include "windows.graphics.capture.idl" +import "windows.graphics.capture.idl"; + +namespace Windows.Graphics.Capture { + runtimeclass GraphicsCaptureSession; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8864
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hvsimanagementapi/classes.idl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/hvsimanagementapi/classes.idl b/dlls/hvsimanagementapi/classes.idl index d4f582812b6..3100790c556 100644 --- a/dlls/hvsimanagementapi/classes.idl +++ b/dlls/hvsimanagementapi/classes.idl @@ -19,5 +19,10 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#include "windows.security.isolation.idl" +import "windows.security.isolation.idl"; + +namespace Windows.Security.Isolation { + runtimeclass IsolatedWindowsEnvironmentHost; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8864
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/iertutil/classes.idl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/iertutil/classes.idl b/dlls/iertutil/classes.idl index 7124283e229..bbfce01a655 100644 --- a/dlls/iertutil/classes.idl +++ b/dlls/iertutil/classes.idl @@ -19,10 +19,10 @@ */ #pragma makedep register - -#ifdef __WIDL__ #pragma winrt ns_prefix -#endif -#define DO_NO_IMPORTS -#include "windows.foundation.idl" +import "windows.foundation.idl"; + +namespace Windows.Foundation { + runtimeclass Uri; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8864
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/threadpoolwinrt/classes.idl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/threadpoolwinrt/classes.idl b/dlls/threadpoolwinrt/classes.idl index 1b4a653a106..114580a7fe0 100644 --- a/dlls/threadpoolwinrt/classes.idl +++ b/dlls/threadpoolwinrt/classes.idl @@ -17,5 +17,10 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#include "windows.system.threading.idl" +import "windows.system.threading.idl"; + +namespace Windows.System.Threading { + runtimeclass ThreadPool; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8864
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.devices.bluetooth/classes.idl | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/windows.devices.bluetooth/classes.idl b/dlls/windows.devices.bluetooth/classes.idl index a2874370e52..85711635362 100644 --- a/dlls/windows.devices.bluetooth/classes.idl +++ b/dlls/windows.devices.bluetooth/classes.idl @@ -19,10 +19,7 @@ */ #pragma makedep register - -#ifdef __WIDL__ #pragma winrt ns_prefix -#endif import "inspectable.idl"; import "asyncinfo.idl"; @@ -34,9 +31,14 @@ import "windows.devices.radios.idl"; import "windows.networking.idl"; import "windows.networking.sockets.idl"; import "windows.storage.streams.idl"; +import "windows.devices.bluetooth.idl"; +import "windows.devices.bluetooth.advertisement.idl"; -#define DO_NO_IMPORTS -#include "windows.devices.bluetooth.advertisement.idl" -#include "windows.devices.bluetooth.genericattributeprofile.idl" -#include "windows.devices.bluetooth.rfcomm.idl" -#include "windows.devices.bluetooth.idl" +namespace Windows.Devices.Bluetooth { + runtimeclass BluetoothAdapter; + runtimeclass BluetoothDevice; + runtimeclass BluetoothLEDevice; +} +namespace Windows.Devices.Bluetooth.Advertisement { + runtimeclass BluetoothLEAdvertisementWatcher; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8864
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.devices.enumeration/classes.idl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/windows.devices.enumeration/classes.idl b/dlls/windows.devices.enumeration/classes.idl index 8d13d9bbef7..5e36e5fc356 100644 --- a/dlls/windows.devices.enumeration/classes.idl +++ b/dlls/windows.devices.enumeration/classes.idl @@ -19,5 +19,11 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#include "windows.devices.enumeration.idl" +import "windows.devices.enumeration.idl"; + +namespace Windows.Devices.Enumeration { + runtimeclass DeviceInformation; + runtimeclass DeviceAccessInformation; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8864
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.devices.usb/classes.idl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/windows.devices.usb/classes.idl b/dlls/windows.devices.usb/classes.idl index 2f614c5b8d2..93219981a98 100644 --- a/dlls/windows.devices.usb/classes.idl +++ b/dlls/windows.devices.usb/classes.idl @@ -19,5 +19,10 @@ */ #pragma makedep register +#pragma winrt ns_prefix -#include "windows.devices.usb.idl" +import "windows.devices.usb.idl"; + +namespace Windows.Devices.Usb { + runtimeclass UsbDevice; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8864
From: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.gaming.input/classes.idl | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/windows.gaming.input/classes.idl b/dlls/windows.gaming.input/classes.idl index 2adf43cdbb0..4ad7b5016c0 100644 --- a/dlls/windows.gaming.input/classes.idl +++ b/dlls/windows.gaming.input/classes.idl @@ -19,10 +19,7 @@ */ #pragma makedep register - -#ifdef __WIDL__ #pragma winrt ns_prefix -#endif import "inspectable.idl"; import "asyncinfo.idl"; @@ -33,8 +30,21 @@ import "windows.foundation.numerics.idl"; import "windows.devices.haptics.idl"; import "windows.system.idl"; import "windows.devices.power.idl"; +import "windows.gaming.input.idl"; +import "windows.gaming.input.custom.idl"; +import "windows.gaming.input.forcefeedback.idl"; -#define DO_NO_IMPORTS -#include "windows.gaming.input.forcefeedback.idl" -#include "windows.gaming.input.idl" -#include "windows.gaming.input.custom.idl" +namespace Windows.Gaming.Input { + runtimeclass RawGameController; + runtimeclass Gamepad; + runtimeclass RacingWheel; +} +namespace Windows.Gaming.Input.Custom { + runtimeclass GameControllerFactoryManager; +} +namespace Windows.Gaming.Input.ForceFeedback { + runtimeclass ConstantForceEffect; + runtimeclass RampForceEffect; + runtimeclass PeriodicForceEffect; + runtimeclass ConditionForceEffect; +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8864
v2: Add missing windows.devices.bluetooth.advertisement.idl import. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8864#note_114372
participants (1)
-
Rémi Bernon