Esme Povirk : slc: Move shared exports to sppc.
Alexandre Julliard
julliard at winehq.org
Wed Jun 2 16:27:44 CDT 2021
Module: wine
Branch: master
Commit: 0807b09cfa7f2446f7a69f99ff1006e88c9de60b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0807b09cfa7f2446f7a69f99ff1006e88c9de60b
Author: Esme Povirk <esme at codeweavers.com>
Date: Wed Jun 2 14:40:16 2021 -0500
slc: Move shared exports to sppc.
Signed-off-by: Esme Povirk <esme at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/slc/slc.c | 20 --------------------
dlls/slc/slc.spec | 4 ++--
dlls/sppc/Makefile.in | 3 +++
dlls/sppc/sppc.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++
dlls/sppc/sppc.spec | 4 ++--
tools/make_specfiles | 4 ++++
6 files changed, 63 insertions(+), 24 deletions(-)
diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c
index d36ce88c4fd..545a7bd6fe9 100644
--- a/dlls/slc/slc.c
+++ b/dlls/slc/slc.c
@@ -31,14 +31,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(slc);
-HRESULT WINAPI SLGetLicensingStatusInformation(HSLC handle, const SLID *app, const SLID *product,
- LPCWSTR name, UINT *count, SL_LICENSING_STATUS **status)
-{
- FIXME("(%p %p %p %s %p %p) stub\n", handle, app, product, debugstr_w(name), count, status );
-
- return SL_E_RIGHT_NOT_CONSUMED;
-}
-
HRESULT WINAPI SLGetWindowsInformation(LPCWSTR name, SLDATATYPE *type, UINT *val, LPBYTE *size)
{
FIXME("(%s %p %p %p) stub\n", debugstr_w(name), type, val, size );
@@ -69,15 +61,3 @@ HRESULT WINAPI SLGetWindowsInformationDWORD(LPCWSTR lpszValueName, LPDWORD pdwVa
return status ? E_FAIL : S_OK;
}
-
-HRESULT WINAPI SLOpen(HSLC *handle)
-{
- FIXME("(%p) stub\n", handle );
-
- if (!handle)
- return E_INVALIDARG;
-
- *handle = (HSLC)0xdeadbeef;
-
- return S_OK;
-}
diff --git a/dlls/slc/slc.spec b/dlls/slc/slc.spec
index 57e55728c17..19895041a32 100644
--- a/dlls/slc/slc.spec
+++ b/dlls/slc/slc.spec
@@ -16,7 +16,7 @@
@ stub SLGetLicense
@ stub SLGetLicenseFileId
@ stub SLGetLicenseInformation
-@ stdcall SLGetLicensingStatusInformation(ptr ptr ptr wstr ptr ptr)
+@ stdcall SLGetLicensingStatusInformation(ptr ptr ptr wstr ptr ptr) sppc.SLGetLicensingStatusInformation
@ stub SLGetPKeyId
@ stub SLGetPKeyInformation
@ stub SLGetPolicyInformation
@@ -30,7 +30,7 @@
@ stub SLInstallLicense
@ stub SLInstallProofOfPurchase
@ stub SLInstallSAMLicense
-@ stdcall SLOpen(ptr)
+@ stdcall SLOpen(ptr) sppc.SLOpen
@ stub SLReArmWindows
@ stub SLRegisterEvent
@ stub SLRegisterWindowsEvent
diff --git a/dlls/sppc/Makefile.in b/dlls/sppc/Makefile.in
index 19c9e0a9b64..60f06e0c4c8 100644
--- a/dlls/sppc/Makefile.in
+++ b/dlls/sppc/Makefile.in
@@ -1,3 +1,6 @@
MODULE = sppc.dll
EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
+
+C_SRCS = \
+ sppc.c
diff --git a/dlls/sppc/sppc.c b/dlls/sppc/sppc.c
new file mode 100644
index 00000000000..cd78611558d
--- /dev/null
+++ b/dlls/sppc/sppc.c
@@ -0,0 +1,52 @@
+/*
+ *
+ * Copyright 2008 Alistair Leslie-Hughes
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
+#include "windef.h"
+#include "winbase.h"
+#include "winternl.h"
+#include "wine/debug.h"
+
+#include "slpublic.h"
+#include "slerror.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(slc);
+
+HRESULT WINAPI SLGetLicensingStatusInformation(HSLC handle, const SLID *app, const SLID *product,
+ LPCWSTR name, UINT *count, SL_LICENSING_STATUS **status)
+{
+ FIXME("(%p %p %p %s %p %p) stub\n", handle, app, product, debugstr_w(name), count, status );
+
+ return SL_E_RIGHT_NOT_CONSUMED;
+}
+
+HRESULT WINAPI SLOpen(HSLC *handle)
+{
+ FIXME("(%p) stub\n", handle );
+
+ if (!handle)
+ return E_INVALIDARG;
+
+ *handle = (HSLC)0xdeadbeef;
+
+ return S_OK;
+}
diff --git a/dlls/sppc/sppc.spec b/dlls/sppc/sppc.spec
index 5bc9fee19d1..af93e5619db 100644
--- a/dlls/sppc/sppc.spec
+++ b/dlls/sppc/sppc.spec
@@ -38,7 +38,7 @@
@ stub SLGetLicense
@ stub SLGetLicenseFileId
@ stub SLGetLicenseInformation
-@ stub SLGetLicensingStatusInformation
+@ stdcall SLGetLicensingStatusInformation(ptr ptr ptr wstr ptr ptr)
@ stub SLGetPKeyId
@ stub SLGetPKeyInformation
@ stub SLGetPolicyInformation
@@ -51,7 +51,7 @@
@ stub SLInstallProofOfPurchaseEx
@ stub SLIsGenuineLocalEx
@ stub SLLoadApplicationPolicies
-@ stub SLOpen
+@ stdcall SLOpen(ptr)
@ stub SLPersistApplicationPolicies
@ stub SLPersistRTSPayloadOverride
@ stub SLReArm
diff --git a/tools/make_specfiles b/tools/make_specfiles
index ef723fedd3a..e6a831025c6 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -508,6 +508,10 @@ my @dll_groups =
"mscoree",
"mscorwks",
],
+ [
+ "sppc",
+ "slc",
+ ],
);
my $update_flags = 0;
More information about the wine-cvs
mailing list