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 7f955f22d317cad1e7d5323179e9a0ee635c9768.
This commit is contained in:
@@ -1,43 +0,0 @@
|
||||
From cd1986bee6af083bfcb46eebdc3c40d040f35b43 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:48:11 +0100
|
||||
Subject: ntdll: Add stub for RtlQueryPackageIdentity.
|
||||
|
||||
---
|
||||
dlls/ntdll/ntdll.spec | 1 +
|
||||
dlls/ntdll/rtl.c | 10 ++++++++++
|
||||
2 files changed, 11 insertions(+)
|
||||
|
||||
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
|
||||
index 50f4acf5926..c6f15c53ded 100644
|
||||
--- a/dlls/ntdll/ntdll.spec
|
||||
+++ b/dlls/ntdll/ntdll.spec
|
||||
@@ -810,6 +810,7 @@
|
||||
@ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr)
|
||||
@ stub RtlQueryInformationActiveActivationContext
|
||||
@ stub RtlQueryInterfaceMemoryStream
|
||||
+@ stdcall RtlQueryPackageIdentity(long ptr ptr ptr ptr ptr)
|
||||
@ stub RtlQueryProcessBackTraceInformation
|
||||
@ stdcall RtlQueryProcessDebugInformation(long long ptr)
|
||||
@ stub RtlQueryProcessHeapInformation
|
||||
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
|
||||
index 09a9c921bb5..8ade7525f0e 100644
|
||||
--- a/dlls/ntdll/rtl.c
|
||||
+++ b/dlls/ntdll/rtl.c
|
||||
@@ -1672,3 +1672,13 @@ RTL_UNLOAD_EVENT_TRACE * WINAPI RtlGetUnloadEventTrace(void)
|
||||
FIXME("stub!\n");
|
||||
return NULL;
|
||||
}
|
||||
+
|
||||
+/*********************************************************************
|
||||
+ * RtlQueryPackageIdentity [NTDLL.@]
|
||||
+ */
|
||||
+NTSTATUS WINAPI RtlQueryPackageIdentity(HANDLE token, WCHAR *fullname, SIZE_T *fullname_size,
|
||||
+ WCHAR *appid, SIZE_T *appid_size, BOOLEAN *packaged)
|
||||
+{
|
||||
+ FIXME("(%p, %p, %p, %p, %p, %p): stub\n", token, fullname, fullname_size, appid, appid_size, packaged);
|
||||
+ return STATUS_NOT_FOUND;
|
||||
+}
|
||||
--
|
||||
2.14.1
|
||||
|
@@ -1,66 +0,0 @@
|
||||
From 3148c0a69b1dd084541d0e2b09ddd8f47ec732fc 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: [PATCH] include: Add IApplicationActivationManager interface
|
||||
declaration.
|
||||
|
||||
---
|
||||
include/shobjidl.idl | 37 +++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 37 insertions(+)
|
||||
|
||||
diff --git a/include/shobjidl.idl b/include/shobjidl.idl
|
||||
index e0fe01c..73278e4 100644
|
||||
--- a/include/shobjidl.idl
|
||||
+++ b/include/shobjidl.idl
|
||||
@@ -3713,6 +3713,35 @@ interface IItemNameLimits : IUnknown
|
||||
[out] int *max_length);
|
||||
}
|
||||
|
||||
+typedef [v1_enum] enum ACTIVATEOPTIONS
|
||||
+{
|
||||
+ AO_NONE = 0x00000000,
|
||||
+ AO_DESIGNMODE = 0x00000001,
|
||||
+ AO_NOERRORUI = 0x00000002,
|
||||
+ AO_NOSPLASHSCREEN = 0x00000004,
|
||||
+ AO_PRELAUNCH = 0x02000000
|
||||
+} ACTIVATEOPTIONS;
|
||||
+
|
||||
+[
|
||||
+ uuid(2e941141-7f97-4756-ba1d-9decde894a3d),
|
||||
+ object,
|
||||
+ pointer_default(unique)
|
||||
+]
|
||||
+interface IApplicationActivationManager : IUnknown
|
||||
+{
|
||||
+ HRESULT ActivateApplication([in] LPCWSTR appusermodelid,
|
||||
+ [in, unique] LPCWSTR arguments,
|
||||
+ [in] ACTIVATEOPTIONS options,
|
||||
+ [out] DWORD *processid);
|
||||
+ HRESULT ActivateForFile([in] LPCWSTR appusermodelid,
|
||||
+ [in] IShellItemArray *itemarray,
|
||||
+ [in, unique] LPCWSTR verb,
|
||||
+ [out] DWORD *processid);
|
||||
+ HRESULT ActivateForProtocol([in] LPCWSTR appusermodelid,
|
||||
+ [in] IShellItemArray *itemarray,
|
||||
+ [out] DWORD *processid);
|
||||
+}
|
||||
+
|
||||
/*****************************************************************************
|
||||
* ShellObjects typelibrary
|
||||
*/
|
||||
@@ -3817,4 +3846,12 @@ library ShellObjects
|
||||
{
|
||||
interface IQueryCancelAutoPlay;
|
||||
}
|
||||
+
|
||||
+ [
|
||||
+ uuid(45ba127d-10a8-46ea-8ab7-56ea9078943c)
|
||||
+ ]
|
||||
+ coclass ApplicationActivationManager
|
||||
+ {
|
||||
+ interface IApplicationActivationManager;
|
||||
+ }
|
||||
}
|
||||
--
|
||||
1.9.1
|
||||
|
Reference in New Issue
Block a user