From 4c14e2e62e112b84bcb10ce68f93d17128b47755 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 14 Jan 2016 23:55:24 +0100 Subject: [PATCH] shell32-SHCreateSessionKey: Mark failing tests with todo_wine. --- patches/patchinstall.sh | 2 +- ...shell32-Implement-SHCreateSessionKey.patch | 28 +++++++++++++++---- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 77348ab0..88d6b487 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -5495,7 +5495,7 @@ fi # | * [#35630] Support for SHCreateSessionKey # | # | Modified files: -# | * dlls/shell32/shell32.spec, dlls/shell32/shellreg.c +# | * dlls/shell32/shell32.spec, dlls/shell32/shellreg.c, dlls/shell32/tests/shellole.c # | if test "$enable_shell32_SHCreateSessionKey" -eq 1; then patch_apply shell32-SHCreateSessionKey/0001-shell32-Implement-SHCreateSessionKey.patch diff --git a/patches/shell32-SHCreateSessionKey/0001-shell32-Implement-SHCreateSessionKey.patch b/patches/shell32-SHCreateSessionKey/0001-shell32-Implement-SHCreateSessionKey.patch index b0ac04fd..692c1dd8 100644 --- a/patches/shell32-SHCreateSessionKey/0001-shell32-Implement-SHCreateSessionKey.patch +++ b/patches/shell32-SHCreateSessionKey/0001-shell32-Implement-SHCreateSessionKey.patch @@ -1,4 +1,4 @@ -From ea888427e5b49e9e3a08bdec8a35261f8e220542 Mon Sep 17 00:00:00 2001 +From d23845620d8b2a4d9b4a8683d764b03ee2683068 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Mon, 17 Feb 2014 11:52:46 +0900 Subject: shell32: Implement SHCreateSessionKey. @@ -6,12 +6,13 @@ Subject: shell32: Implement SHCreateSessionKey. This implementation is based on the Geoff Chappell description, and it seems to be enough for the application I have here. --- - dlls/shell32/shell32.spec | 1 + - dlls/shell32/shellreg.c | 41 +++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 42 insertions(+) + dlls/shell32/shell32.spec | 1 + + dlls/shell32/shellreg.c | 41 +++++++++++++++++++++++++++++++++++++++++ + dlls/shell32/tests/shellole.c | 4 ++-- + 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec -index d73dcbb..ff1b522 100644 +index 93fd449..abbe6d2 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -261,6 +261,7 @@ @@ -71,6 +72,21 @@ index 37f3d9e..96a450e 100644 + TRACE("using session key %s\n", debugstr_w(session_reg_str)); + return RegOpenKeyExW(HKEY_CURRENT_USER, session_reg_str, 0, access, hkey); +} +diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c +index e8cf744..91125c0 100644 +--- a/dlls/shell32/tests/shellole.c ++++ b/dlls/shell32/tests/shellole.c +@@ -876,8 +876,8 @@ if (0) /* crashes on native */ + + hkey = (HKEY)0xdeadbeef; + hr = pSHCreateSessionKey(0, &hkey); +- ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr); +- ok(hkey == NULL, "got %p\n", hkey); ++ todo_wine ok(hr == E_ACCESSDENIED, "got 0x%08x\n", hr); ++ todo_wine ok(hkey == NULL, "got %p\n", hkey); + + hr = pSHCreateSessionKey(KEY_READ, &hkey); + ok(hr == S_OK, "got 0x%08x\n", hr); -- -1.7.9.5 +2.6.4