[PATCH 1/2] msctf/tests: Set requestedExecutionLevel to asInvoker to prevent virtualization.
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/msctf/tests/Makefile.in | 3 +++ dlls/msctf/tests/msctf.manifest | 16 ++++++++++++++++ dlls/msctf/tests/msctf.rc | 4 ++++ 3 files changed, 23 insertions(+) create mode 100644 dlls/msctf/tests/msctf.manifest create mode 100644 dlls/msctf/tests/msctf.rc
diff --git a/dlls/msctf/tests/Makefile.in b/dlls/msctf/tests/Makefile.in index b3df05c..2cb119a 100644 --- a/dlls/msctf/tests/Makefile.in +++ b/dlls/msctf/tests/Makefile.in @@ -3,3 +3,6 @@ IMPORTS = ole32 user32
C_SRCS = \ inputprocessor.c + +RC_SRCS = \ + msctf.rc diff --git a/dlls/msctf/tests/msctf.manifest b/dlls/msctf/tests/msctf.manifest new file mode 100644 index 0000000..fc23c29 --- /dev/null +++ b/dlls/msctf/tests/msctf.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + type="win32" + name="Wine.msctf.Test" + version="1.0.0.0" + processorArchitecture="*" + /> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> + <security> + <requestedPrivileges> + <requestedExecutionLevel level="asInvoker" /> + </requestedPrivileges> + </security> + </trustInfo> +</assembly> diff --git a/dlls/msctf/tests/msctf.rc b/dlls/msctf/tests/msctf.rc new file mode 100644 index 0000000..51b4021 --- /dev/null +++ b/dlls/msctf/tests/msctf.rc @@ -0,0 +1,4 @@ +#include "winuser.h" + +/* @makedep: msctf.manifest */ +1 RT_MANIFEST msctf.manifest
Fixes https://bugs.winehq.org/show_bug.cgi?id=39238
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/msctf/tests/Makefile.in | 2 +- dlls/msctf/tests/inputprocessor.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/dlls/msctf/tests/Makefile.in b/dlls/msctf/tests/Makefile.in index 2cb119a..4f699af 100644 --- a/dlls/msctf/tests/Makefile.in +++ b/dlls/msctf/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = msctf.dll -IMPORTS = ole32 user32 +IMPORTS = ole32 user32 advapi32
C_SRCS = \ inputprocessor.c diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 4a52432..0d03ce3 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -943,7 +943,18 @@ DEFINE_GUID(GUID_COMPARTMENT_TIPUISTATUS, 0x148ca3ec,0x0366,0x401c,0x8 static HRESULT initialize(void) { HRESULT hr; + HKEY hkey; + CoInitialize(NULL); + + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\Microsoft\CTF\TIP", 0, + KEY_READ|KEY_WRITE, &hkey) != ERROR_SUCCESS) + { + skip("Not enough permission to register input processor\n"); + return E_FAIL; + } + RegCloseKey(hkey); + hr = CoCreateInstance (&CLSID_TF_InputProcessorProfiles, NULL, CLSCTX_INPROC_SERVER, &IID_ITfInputProcessorProfiles, (void**)&g_ipp); if (SUCCEEDED(hr))
Hi,
While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=39437
Your paranoid android.
=== w8adm (32 bit inputprocessor) === inputprocessor.c:983: Test failed: Unable to register text service(80004005) inputprocessor.c:986: Test failed: Unable to add Language Profile (80004005) inputprocessor.c:1048: Test failed: ITfCategoryMgr_RegisterCategory failed inputprocessor.c:1050: Test failed: ITfCategoryMgr_RegisterCategory failed inputprocessor.c:1041: Test failed: Registered text service not found inputprocessor.c:1013: Test failed: Did not find registered text service inputprocessor.c:1371: Test failed: Failed to Activate text service inputprocessor.c:1799: Test failed: ITfCategoryMgr_IsEqualTfGuidAtom failed inputprocessor.c:1800: Test failed: Equal value invalid inputprocessor.c:1826: Test failed: Id for CLSID_FakeService not matching tid inputprocessor.c:1327: Test failed: ITfKeystrokeMgr_AdviseKeyEventSink failed inputprocessor.c:1328: Test failed: KeyEventSink_OnSetFocus not fired as expected, in state 1 inputprocessor.c:1330: Test failed: Wrong return, expected CONNECT_E_ADVISELIMIT inputprocessor.c:1338: Test failed: ITfKeystrokeMgr_PreserveKey failed inputprocessor.c:1341: Test failed: ITfKeystrokeMgr_PreserveKey improperly succeeded inputprocessor.c:1345: Test failed: ITfKeystrokeMgr_IsPreservedKey failed inputprocessor.c:1349: Test failed: ITfKeystrokeMgr_UnpreserveKey failed inputprocessor.c:1359: Test failed: ITfKeystrokeMgr_UnadviseKeyEventSink failed inputprocessor.c:544: Test failed: Unexpected ThreadMgrEventSink_OnSetFocus sink inputprocessor.c:555: Test failed: Sink reports wrong previous focus inputprocessor.c:1070: Test failed: Wrong GUID inputprocessor.c:1078: Test failed: Wrong GUID inputprocessor.c:1057: Test failed: ITfCategoryMgr_UnregisterCategory failed inputprocessor.c:1059: Test failed: ITfCategoryMgr_UnregisterCategory failed inputprocessor.c:993: Test failed: Unable to unregister text service(80004005)
-
Marvin -
Zebediah Figura