Signed-off-by: Esme Povirk esme@codeweavers.com --- dlls/slc/slc.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c index b246a7dfc1a..d36ce88c4fd 100644 --- a/dlls/slc/slc.c +++ b/dlls/slc/slc.c @@ -74,5 +74,10 @@ HRESULT WINAPI SLOpen(HSLC *handle) { FIXME("(%p) stub\n", handle );
+ if (!handle) + return E_INVALIDARG; + + *handle = (HSLC)0xdeadbeef; + return S_OK; }
Signed-off-by: Esme Povirk esme@codeweavers.com --- dlls/sppc/Makefile.in | 7 +++++ dlls/sppc/sppc.spec | 67 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 dlls/sppc/Makefile.in create mode 100644 dlls/sppc/sppc.spec
diff --git a/dlls/sppc/Makefile.in b/dlls/sppc/Makefile.in new file mode 100644 index 00000000000..52d0cfe699c --- /dev/null +++ b/dlls/sppc/Makefile.in @@ -0,0 +1,7 @@ +MODULE = sppc.dll +PARENTSRC = ../slc + +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native + +C_SRCS = \ + slc.c diff --git a/dlls/sppc/sppc.spec b/dlls/sppc/sppc.spec new file mode 100644 index 00000000000..af93e5619db --- /dev/null +++ b/dlls/sppc/sppc.spec @@ -0,0 +1,67 @@ +@ stub SLCallServer +@ stub SLpAuthenticateGenuineTicketResponse +@ stub SLpBeginGenuineTicketTransaction +@ stub SLpClearActivationInProgress +@ stub SLpDepositDownlevelGenuineTicket +@ stub SLpDepositTokenActivationResponse +@ stub SLpGenerateTokenActivationChallenge +@ stub SLpGetGenuineBlob +@ stub SLpGetGenuineLocal +@ stub SLpGetLicenseAcquisitionInfo +@ stub SLpGetMSPidInformation +@ stub SLpGetMachineUGUID +@ stub SLpGetTokenActivationGrantInfo +@ stub SLpIAActivateProduct +@ stub SLpIsCurrentInstalledProductKeyDefaultKey +@ stub SLpProcessVMPipeMessage +@ stub SLpSetActivationInProgress +@ stub SLpTriggerServiceWorker +@ stub SLpVLActivateProduct +@ stub SLClose +@ stub SLConsumeRight +@ stub SLDepositMigrationBlob +@ stub SLDepositOfflineConfirmationId +@ stub SLDepositOfflineConfirmationIdEx +@ stub SLDepositStoreToken +@ stub SLFireEvent +@ stub SLGatherMigrationBlob +@ stub SLGatherMigrationBlobEx +@ stub SLGenerateOfflineInstallationId +@ stub SLGenerateOfflineInstallationIdEx +@ stub SLGetActiveLicenseInfo +@ stub SLGetApplicationInformation +@ stub SLGetApplicationPolicy +@ stub SLGetAuthenticationResult +@ stub SLGetEncryptedPIDEx +@ stub SLGetGenuineInformation +@ stub SLGetInstalledProductKeyIds +@ stub SLGetLicense +@ stub SLGetLicenseFileId +@ stub SLGetLicenseInformation +@ stdcall SLGetLicensingStatusInformation(ptr ptr ptr wstr ptr ptr) +@ stub SLGetPKeyId +@ stub SLGetPKeyInformation +@ stub SLGetPolicyInformation +@ stub SLGetPolicyInformationDWORD +@ stub SLGetProductSkuInformation +@ stub SLGetSLIDList +@ stub SLGetServiceInformation +@ stub SLInstallLicense +@ stub SLInstallProofOfPurchase +@ stub SLInstallProofOfPurchaseEx +@ stub SLIsGenuineLocalEx +@ stub SLLoadApplicationPolicies +@ stdcall SLOpen(ptr) +@ stub SLPersistApplicationPolicies +@ stub SLPersistRTSPayloadOverride +@ stub SLReArm +@ stub SLRegisterEvent +@ stub SLRegisterPlugin +@ stub SLSetAuthenticationData +@ stub SLSetCurrentProductKey +@ stub SLSetGenuineInformation +@ stub SLUninstallLicense +@ stub SLUninstallProofOfPurchase +@ stub SLUnloadApplicationPolicies +@ stub SLUnregisterEvent +@ stub SLUnregisterPlugin
Esme Povirk esme@codeweavers.com writes:
Signed-off-by: Esme Povirk esme@codeweavers.com
dlls/sppc/Makefile.in | 7 +++++ dlls/sppc/sppc.spec | 67 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 dlls/sppc/Makefile.in create mode 100644 dlls/sppc/sppc.spec
diff --git a/dlls/sppc/Makefile.in b/dlls/sppc/Makefile.in new file mode 100644 index 00000000000..52d0cfe699c --- /dev/null +++ b/dlls/sppc/Makefile.in @@ -0,0 +1,7 @@ +MODULE = sppc.dll +PARENTSRC = ../slc
Is there a reason for building it twice instead of simply forwarding?
They have different exports, and one is not a subset of the other. However, I don't know for sure that forwarding can't work.
"Esme Povirk (they/them)" esme@codeweavers.com writes:
They have different exports, and one is not a subset of the other. However, I don't know for sure that forwarding can't work.
They are forwarded on Windows, so it can work. Windows does it in the other direction though, slc.dll forwards to sppc.dll, so we should probably do it that way too.
Signed-off-by: Esme Povirk esme@codeweavers.com --- dlls/slc/slc.c | 7 +++++++ dlls/sppc/sppc.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c index d36ce88c4fd..5fdbd0fc97d 100644 --- a/dlls/slc/slc.c +++ b/dlls/slc/slc.c @@ -81,3 +81,10 @@ HRESULT WINAPI SLOpen(HSLC *handle)
return S_OK; } + +HRESULT WINAPI SLPersistApplicationPolicies(const SLID *app, const SLID *product, DWORD flags) +{ + FIXME("%s,%s,%x\n", wine_dbgstr_guid(app), wine_dbgstr_guid(product), flags); + + return S_OK; +} diff --git a/dlls/sppc/sppc.spec b/dlls/sppc/sppc.spec index af93e5619db..3ac40c23972 100644 --- a/dlls/sppc/sppc.spec +++ b/dlls/sppc/sppc.spec @@ -52,7 +52,7 @@ @ stub SLIsGenuineLocalEx @ stub SLLoadApplicationPolicies @ stdcall SLOpen(ptr) -@ stub SLPersistApplicationPolicies +@ stdcall SLPersistApplicationPolicies(ptr ptr long) @ stub SLPersistRTSPayloadOverride @ stub SLReArm @ stub SLRegisterEvent
Signed-off-by: Esme Povirk esme@codeweavers.com --- dlls/slc/slc.c | 10 ++++++++++ dlls/slc/slc.spec | 2 +- dlls/sppc/sppc.spec | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c index 5fdbd0fc97d..d23f25bb76e 100644 --- a/dlls/slc/slc.c +++ b/dlls/slc/slc.c @@ -88,3 +88,13 @@ HRESULT WINAPI SLPersistApplicationPolicies(const SLID *app, const SLID *product
return S_OK; } + +HRESULT WINAPI SLClose(HSLC handle) +{ + FIXME("(%p) stub\n", handle ); + + if (!handle) + return E_INVALIDARG; + + return S_OK; +} diff --git a/dlls/slc/slc.spec b/dlls/slc/slc.spec index 57e55728c17..e203affb819 100644 --- a/dlls/slc/slc.spec +++ b/dlls/slc/slc.spec @@ -6,7 +6,7 @@ @ stub SLpGetLicenseAcquisitionInfo @ stub SLpGetMachineUGUID @ stub SLpVLActivateProduct -@ stub SLClose +@ stdcall SLClose(ptr) @ stub SLConsumeRight @ stub SLConsumeWindowsRight @ stub SLDepositOfflineConfirmationId diff --git a/dlls/sppc/sppc.spec b/dlls/sppc/sppc.spec index 3ac40c23972..6926d4d8b6d 100644 --- a/dlls/sppc/sppc.spec +++ b/dlls/sppc/sppc.spec @@ -17,7 +17,7 @@ @ stub SLpSetActivationInProgress @ stub SLpTriggerServiceWorker @ stub SLpVLActivateProduct -@ stub SLClose +@ stdcall SLClose(ptr) @ stub SLConsumeRight @ stub SLDepositMigrationBlob @ stub SLDepositOfflineConfirmationId
-
Alexandre Julliard -
Esme Povirk -
Esme Povirk (they/them)