Rebase against c715127536a78166e58b165c390a57b704899d29.

This commit is contained in:
Sebastian Lackner
2015-11-03 17:45:43 +01:00
parent 1d24dc8141
commit 637b89cefa
8 changed files with 33 additions and 132 deletions

View File

@@ -1,55 +0,0 @@
From b8ea046850c5c8e6b0a40d1414ca2ec7623266b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 31 Oct 2015 16:41:46 +0100
Subject: sfc_os: Implement SfcGetNextProtectedFile.
---
dlls/sfc/sfc.spec | 2 +-
dlls/sfc_os/sfc_os.c | 11 +++++++++++
dlls/sfc_os/sfc_os.spec | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/dlls/sfc/sfc.spec b/dlls/sfc/sfc.spec
index 04307d2..bdd66db 100644
--- a/dlls/sfc/sfc.spec
+++ b/dlls/sfc/sfc.spec
@@ -7,7 +7,7 @@
7 stub @
8 stub @
9 stub @
-@ stub SfcGetNextProtectedFile
+@ stdcall SfcGetNextProtectedFile(long ptr) sfc_os.SfcGetNextProtectedFile
@ stdcall SfcIsFileProtected(ptr wstr) sfc_os.SfcIsFileProtected
@ stdcall SfcIsKeyProtected(long wstr long) sfc_os.SfcIsKeyProtected
@ stub SfcWLEventLogoff
diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c
index 5805342..fab4094 100644
--- a/dlls/sfc_os/sfc_os.c
+++ b/dlls/sfc_os/sfc_os.c
@@ -123,3 +123,14 @@ BOOL WINAPI SfcIsKeyProtected(HKEY hKey, LPCWSTR lpSubKey, REGSAM samDesired)
SetLastError(ERROR_FILE_NOT_FOUND);
return FALSE;
}
+
+/******************************************************************
+ * SfcGetNextProtectedFile [sfc_os.@]
+ */
+BOOL WINAPI SfcGetNextProtectedFile(HANDLE rpc, PROTECTED_FILE_DATA *data)
+{
+ FIXME("(%p, %p) stub\n", rpc, data);
+
+ SetLastError(ERROR_NO_MORE_FILES);
+ return FALSE;
+}
diff --git a/dlls/sfc_os/sfc_os.spec b/dlls/sfc_os/sfc_os.spec
index 1edcb83..6b216e0 100644
--- a/dlls/sfc_os/sfc_os.spec
+++ b/dlls/sfc_os/sfc_os.spec
@@ -1,3 +1,3 @@
-@ stub SfcGetNextProtectedFile
+@ stdcall SfcGetNextProtectedFile(long ptr)
@ stdcall SfcIsFileProtected(ptr wstr)
@ stdcall SfcIsKeyProtected(long wstr long)
--
2.6.1

View File

@@ -0,0 +1,25 @@
From 91bd7aea87eea74498a3ea39fbc095cbdbbd1a6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 3 Nov 2015 17:36:54 +0100
Subject: sfc_os: Set an error code in SfcGetNextProtectedFile stub.
---
dlls/sfc_os/sfc_os.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c
index 9df38f8..f76b3a2 100644
--- a/dlls/sfc_os/sfc_os.c
+++ b/dlls/sfc_os/sfc_os.c
@@ -54,6 +54,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
BOOL WINAPI SfcGetNextProtectedFile(HANDLE handle, PROTECTED_FILE_DATA *data)
{
FIXME("%p %p\n", handle, data);
+
+ SetLastError(ERROR_NO_MORE_FILES);
return FALSE;
}
--
2.6.2

View File

@@ -1 +0,0 @@
Fixes: [38097] Add stub for SfcGetNextProtectedFile