You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against ae5d0b22291d866a49f293e782b43ba025ab77ec
This commit is contained in:
@@ -1,19 +1,20 @@
|
||||
From 730defc94816ecb8e67f79f4bbee7cf31bedfec1 Mon Sep 17 00:00:00 2001
|
||||
From 9fa84d2a82ae2444f6fbe995cf1dbbf2003e6ea1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sun, 17 Jan 2016 00:46:34 +0100
|
||||
Subject: include: Add IApplicationActivationManager interface declaration.
|
||||
Subject: [PATCH] include: Add IApplicationActivationManager interface
|
||||
declaration.
|
||||
|
||||
---
|
||||
include/shobjidl.idl | 36 ++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 36 insertions(+)
|
||||
|
||||
diff --git a/include/shobjidl.idl b/include/shobjidl.idl
|
||||
index 1cc6132..cf9b8b3 100644
|
||||
index e0fe01c..9d3b676 100644
|
||||
--- a/include/shobjidl.idl
|
||||
+++ b/include/shobjidl.idl
|
||||
@@ -3639,6 +3639,34 @@ typedef enum ASSOC_FILTER
|
||||
} ASSOC_FILTER;
|
||||
cpp_quote("HRESULT WINAPI SHAssocEnumHandlers(PCWSTR extra, ASSOC_FILTER filter, IEnumAssocHandlers **handlersenum);")
|
||||
@@ -3713,6 +3713,34 @@ interface IItemNameLimits : IUnknown
|
||||
[out] int *max_length);
|
||||
}
|
||||
|
||||
+typedef [v1_enum] enum ACTIVATEOPTIONS
|
||||
+{
|
||||
@@ -46,7 +47,7 @@ index 1cc6132..cf9b8b3 100644
|
||||
/*****************************************************************************
|
||||
* ShellObjects typelibrary
|
||||
*/
|
||||
@@ -3735,4 +3763,12 @@ library ShellObjects
|
||||
@@ -3817,4 +3845,12 @@ library ShellObjects
|
||||
{
|
||||
interface IQueryCancelAutoPlay;
|
||||
}
|
||||
@@ -60,5 +61,5 @@ index 1cc6132..cf9b8b3 100644
|
||||
+ }
|
||||
}
|
||||
--
|
||||
2.6.4
|
||||
1.9.1
|
||||
|
||||
|
Reference in New Issue
Block a user