June 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Use appropriate context constants where possible.
by Alexandre Julliard 03 Jun '21

03 Jun '21

Module: wine Branch: master Commit: 3f1f58f19a76681fc5de8bc268ab99a2e0805538 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f1f58f19a76681fc5de8bc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 3 12:39:24 2021 +0200 ntdll: Use appropriate context constants where possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 24 ++++++++++++++++-- dlls/ntdll/tests/exception.c | 60 +++++++++++++++++++++----------------------- 2 files changed, 51 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index d5b3042c491..9e98dcc49c6 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -736,8 +736,28 @@ static const struct context_parameters } arch_context_parameters[] = { - {0x00100000, 0xd810005f, 0x4d0, 0x4d0, 0x20, 7, 0xf, 0x30, copy_ranges_amd64}, - {0x00010000, 0xd801007f, 0x2cc, 0xcc, 0x18, 3, 0x3, 0, copy_ranges_x86}, + { + CONTEXT_AMD64, + 0xd8000000 | CONTEXT_AMD64_ALL | CONTEXT_AMD64_XSTATE, + sizeof(AMD64_CONTEXT), + sizeof(AMD64_CONTEXT), + 0x20, + 7, + TYPE_ALIGNMENT(AMD64_CONTEXT) - 1, + offsetof(AMD64_CONTEXT,ContextFlags), + copy_ranges_amd64 + }, + { + CONTEXT_i386, + 0xd8000000 | CONTEXT_I386_ALL | CONTEXT_I386_XSTATE, + sizeof(I386_CONTEXT), + offsetof(I386_CONTEXT,ExtendedRegisters), + 0x18, + 3, + TYPE_ALIGNMENT(I386_CONTEXT) - 1, + offsetof(I386_CONTEXT,ContextFlags), + copy_ranges_x86 + }, }; static const struct context_parameters *context_get_parameters( ULONG context_flags ) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 453e77f9063..1b0cfecef3e 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8042,32 +8042,28 @@ static void test_copy_context(void) {0x0, 0x1}, {0x1000, 0}, }; - static const struct - { - ULONG flags; - } - tests[] = + static const ULONG tests[] = { /* AMD64 */ - {0x100000 | 0x01}, /* CONTEXT_CONTROL */ - {0x100000 | 0x02}, /* CONTEXT_INTEGER */ - {0x100000 | 0x04}, /* CONTEXT_SEGMENTS */ - {0x100000 | 0x08}, /* CONTEXT_FLOATING_POINT */ - {0x100000 | 0x10}, /* CONTEXT_DEBUG_REGISTERS */ - {0x100000 | 0x0b}, /* CONTEXT_FULL */ - {0x100000 | 0x40}, /* CONTEXT_XSTATE */ - {0x100000 | 0x1f}, /* CONTEXT_ALL */ + CONTEXT_AMD64_CONTROL, + CONTEXT_AMD64_INTEGER, + CONTEXT_AMD64_SEGMENTS, + CONTEXT_AMD64_FLOATING_POINT, + CONTEXT_AMD64_DEBUG_REGISTERS, + CONTEXT_AMD64_FULL, + CONTEXT_AMD64_XSTATE, + CONTEXT_AMD64_ALL, /* X86 */ - { 0x10000 | 0x01}, /* CONTEXT_CONTROL */ - { 0x10000 | 0x02}, /* CONTEXT_INTEGER */ - { 0x10000 | 0x04}, /* CONTEXT_SEGMENTS */ - { 0x10000 | 0x08}, /* CONTEXT_FLOATING_POINT */ - { 0x10000 | 0x10}, /* CONTEXT_DEBUG_REGISTERS */ - { 0x10000 | 0x20}, /* CONTEXT_EXTENDED_REGISTERS */ - { 0x10000 | 0x40}, /* CONTEXT_XSTATE */ - { 0x10000 | 0x3f}, /* CONTEXT_ALL */ + CONTEXT_I386_CONTROL, + CONTEXT_I386_INTEGER, + CONTEXT_I386_SEGMENTS, + CONTEXT_I386_FLOATING_POINT, + CONTEXT_I386_DEBUG_REGISTERS, + CONTEXT_I386_EXTENDED_REGISTERS, + CONTEXT_I386_XSTATE, + CONTEXT_I386_ALL }; - static const ULONG arch_flags[] = {0x100000, 0x10000}; + static const ULONG arch_flags[] = {CONTEXT_AMD64, CONTEXT_i386}; DECLSPEC_ALIGN(64) BYTE src_context_buffer[4096]; DECLSPEC_ALIGN(64) BYTE dst_context_buffer[4096]; @@ -8097,8 +8093,9 @@ static void test_copy_context(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - flags = tests[i].flags; - flags_offset = (flags & 0x100000) ? 0x30 : 0; + flags = tests[i]; + flags_offset = (flags & CONTEXT_AMD64) ? offsetof(AMD64_CONTEXT,ContextFlags) + : offsetof(I386_CONTEXT,ContextFlags); memset(dst_context_buffer, 0xdd, sizeof(dst_context_buffer)); memset(src_context_buffer, 0xcc, sizeof(src_context_buffer)); @@ -8131,7 +8128,7 @@ static void test_copy_context(void) ok(!status, "Got unexpected status %#x, flags %#x.\n", status, flags); context_length = (BYTE *)dst_ex - (BYTE *)dst + dst_ex->All.Length; - check_changes_in_range((BYTE *)dst, flags & 0x100000 ? &ranges_amd64[0] : &ranges_x86[0], + check_changes_in_range((BYTE *)dst, flags & CONTEXT_AMD64 ? &ranges_amd64[0] : &ranges_x86[0], flags, context_length); ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", @@ -8150,10 +8147,10 @@ static void test_copy_context(void) bret, GetLastError(), flags); ok(*(DWORD *)((BYTE *)dst + flags_offset) == 0, "Got unexpected ContextFlags %#x, flags %#x.\n", *(DWORD *)((BYTE *)dst + flags_offset), flags); - check_changes_in_range((BYTE *)dst, flags & 0x100000 ? &ranges_amd64[0] : &ranges_x86[0], + check_changes_in_range((BYTE *)dst, flags & CONTEXT_AMD64 ? &ranges_amd64[0] : &ranges_x86[0], 0, context_length); - *(DWORD *)((BYTE *)dst + flags_offset) = flags & 0x110000; + *(DWORD *)((BYTE *)dst + flags_offset) = flags & (CONTEXT_AMD64 | CONTEXT_i386); *(DWORD *)((BYTE *)src + flags_offset) = flags; SetLastError(0xdeadbeef); bret = pCopyContext(dst, flags, src); @@ -8171,7 +8168,7 @@ static void test_copy_context(void) { ok(*(DWORD *)((BYTE *)dst + flags_offset) == flags, "Got unexpected ContextFlags %#x, flags %#x.\n", *(DWORD *)((BYTE *)dst + flags_offset), flags); - check_changes_in_range((BYTE *)dst, flags & 0x100000 ? &ranges_amd64[0] : &ranges_x86[0], + check_changes_in_range((BYTE *)dst, flags & CONTEXT_AMD64 ? &ranges_amd64[0] : &ranges_x86[0], flags, context_length); } else @@ -8179,7 +8176,7 @@ static void test_copy_context(void) ok(*(DWORD *)((BYTE *)dst + flags_offset) == (flags & 0x110000), "Got unexpected ContextFlags %#x, flags %#x.\n", *(DWORD *)((BYTE *)dst + flags_offset), flags); - check_changes_in_range((BYTE *)dst, flags & 0x100000 ? &ranges_amd64[0] : &ranges_x86[0], + check_changes_in_range((BYTE *)dst, flags & CONTEXT_AMD64 ? &ranges_amd64[0] : &ranges_x86[0], 0, context_length); } } @@ -8187,8 +8184,9 @@ static void test_copy_context(void) for (i = 0; i < ARRAY_SIZE(arch_flags); ++i) { flags = arch_flags[i] | 0x42; - flags_offset = (flags & 0x100000) ? 0x30 : 0; - context_length = (flags & 0x100000) ? 0x4d0 : 0x2cc; + flags_offset = (flags & CONTEXT_AMD64) ? offsetof(AMD64_CONTEXT,ContextFlags) + : offsetof(I386_CONTEXT,ContextFlags); + context_length = (flags & CONTEXT_AMD64) ? sizeof(AMD64_CONTEXT) : sizeof(I386_CONTEXT); memset(dst_context_buffer, 0xdd, sizeof(dst_context_buffer)); memset(src_context_buffer, 0xcc, sizeof(src_context_buffer));

1 0

Alexandre Julliard : kernelbase: Move CopyContext() implementation to ntdll.
by Alexandre Julliard 03 Jun '21

03 Jun '21

Module: wine Branch: master Commit: d08f42b68ceb896a47789bde9a70f65fd38bc680 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d08f42b68ceb896a47789bde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 3 13:03:47 2021 +0200 kernelbase: Move CopyContext() implementation to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/memory.c | 50 +------------------------------------------- dlls/ntdll/exception.c | 44 ++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/exception.c | 40 ++++++++++++++--------------------- include/winternl.h | 26 +++++++++++------------ 5 files changed, 74 insertions(+), 87 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d08f42b68ceb896a4778…

1 0

Francois Gouget : ole32: Fix the spelling of a comment.
by Alexandre Julliard 03 Jun '21

03 Jun '21

Module: wine Branch: master Commit: b52e16e0ff44fa3a88111ecb60c4542df50a2e58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b52e16e0ff44fa3a88111ecb… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 3 13:11:24 2021 +0200 ole32: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index e61b3076883..d15bf23217a 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -22,7 +22,7 @@ * This file contains the implementation for the OLE Clipboard and its * internal interfaces. The OLE clipboard interacts with an IDataObject * interface via the OleSetClipboard, OleGetClipboard and - * OleIsCurrentClipboard API's. An internal IDataObject delegates + * OleIsCurrentClipboard APIs. An internal IDataObject delegates * to a client supplied IDataObject or the WIN32 clipboard API depending * on whether OleSetClipboard has been invoked. * Here are some operating scenarios:

1 0

Rémi Bernon : winebus.sys: Use macros to define HID reports.
by Alexandre Julliard 02 Jun '21

02 Jun '21

Module: wine Branch: master Commit: 0baabde7168df24f7a7f1ea3b425ac16c07353fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0baabde7168df24f7a7f1ea3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 31 10:52:11 2021 +0200 winebus.sys: Use macros to define HID reports. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 112 ++++++++++++++++++++------------------ dlls/winebus.sys/bus_udev.c | 18 +++--- dlls/winebus.sys/controller.h | 76 ++++++++++++++------------ dlls/winebus.sys/pop_hid_macros.h | 83 ++++++++++++++++++++++++++++ dlls/winebus.sys/psh_hid_macros.h | 85 +++++++++++++++++++++++++++++ 5 files changed, 277 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0baabde7168df24f7a7f…

1 0

Esme Povirk : sppc: Add stub dll.
by Alexandre Julliard 02 Jun '21

02 Jun '21

Module: wine Branch: master Commit: 3dce18b2302e8a280559ffd90db4522aacb90ddf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dce18b2302e8a280559ffd9… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Jun 2 14:40:15 2021 -0500 sppc: Add stub dll. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/sppc/Makefile.in | 3 +++ dlls/sppc/sppc.spec | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+) diff --git a/configure b/configure index d74c155d8b6..512ced158fa 100755 --- a/configure +++ b/configure @@ -1607,6 +1607,7 @@ enable_slc enable_snmpapi enable_softpub enable_spoolss +enable_sppc enable_srclient enable_srvcli enable_sspicli @@ -20999,6 +21000,7 @@ wine_fn_config_makefile dlls/softpub enable_softpub wine_fn_config_makefile dlls/sound.drv16 enable_win16 wine_fn_config_makefile dlls/spoolss enable_spoolss wine_fn_config_makefile dlls/spoolss/tests enable_tests +wine_fn_config_makefile dlls/sppc enable_sppc wine_fn_config_makefile dlls/srclient enable_srclient wine_fn_config_makefile dlls/srvcli enable_srvcli wine_fn_config_makefile dlls/sspicli enable_sspicli diff --git a/configure.ac b/configure.ac index 2882e54bea5..23075b36a42 100644 --- a/configure.ac +++ b/configure.ac @@ -3660,6 +3660,7 @@ WINE_CONFIG_MAKEFILE(dlls/softpub) WINE_CONFIG_MAKEFILE(dlls/sound.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/spoolss) WINE_CONFIG_MAKEFILE(dlls/spoolss/tests) +WINE_CONFIG_MAKEFILE(dlls/sppc) WINE_CONFIG_MAKEFILE(dlls/srclient) WINE_CONFIG_MAKEFILE(dlls/srvcli) WINE_CONFIG_MAKEFILE(dlls/sspicli) diff --git a/dlls/sppc/Makefile.in b/dlls/sppc/Makefile.in new file mode 100644 index 00000000000..19c9e0a9b64 --- /dev/null +++ b/dlls/sppc/Makefile.in @@ -0,0 +1,3 @@ +MODULE = sppc.dll + +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/sppc/sppc.spec b/dlls/sppc/sppc.spec new file mode 100644 index 00000000000..5bc9fee19d1 --- /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 +@ stub SLGetLicensingStatusInformation +@ stub SLGetPKeyId +@ stub SLGetPKeyInformation +@ stub SLGetPolicyInformation +@ stub SLGetPolicyInformationDWORD +@ stub SLGetProductSkuInformation +@ stub SLGetSLIDList +@ stub SLGetServiceInformation +@ stub SLInstallLicense +@ stub SLInstallProofOfPurchase +@ stub SLInstallProofOfPurchaseEx +@ stub SLIsGenuineLocalEx +@ stub SLLoadApplicationPolicies +@ stub SLOpen +@ 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

1 0

Esme Povirk : slc: Move shared exports to sppc.
by Alexandre Julliard 02 Jun '21

02 Jun '21

Module: wine Branch: master Commit: 0807b09cfa7f2446f7a69f99ff1006e88c9de60b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0807b09cfa7f2446f7a69f99… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Jun 2 14:40:16 2021 -0500 slc: Move shared exports to sppc. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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;

1 0

Nikolay Sivov : mfmediaengine: Enable source type enumeration.
by Alexandre Julliard 02 Jun '21

02 Jun '21

Module: wine Branch: master Commit: 86cbfafe9280e3f264d74d7d91b0929a1f82a1a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86cbfafe9280e3f264d74d7d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 2 13:34:44 2021 +0300 mfmediaengine: Enable source type enumeration. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 510b1c5885f..e4263febe5e 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1161,6 +1161,8 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi IMFTopologyNode_Release(video_src); } + IMFTopology_SetUINT32(topology, &MF_TOPOLOGY_ENUMERATE_SOURCE_TYPES, TRUE); + if (SUCCEEDED(hr)) hr = IMFMediaSession_SetTopology(engine->session, MFSESSION_SETTOPOLOGY_IMMEDIATE, topology); }

1 0

Nikolay Sivov : msctf: Maintain context reference in ranges.
by Alexandre Julliard 02 Jun '21

02 Jun '21

Module: wine Branch: master Commit: fa4c386e06fcaceb7538e2f438f32085a37b9297 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa4c386e06fcaceb7538e2f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 2 17:08:48 2021 +0300 msctf: Maintain context reference in ranges. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/range.c | 19 +++++++++++++------ dlls/msctf/tests/inputprocessor.c | 26 +++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/msctf/range.c b/dlls/msctf/range.c index c4eee2501fb..85922791bad 100644 --- a/dlls/msctf/range.c +++ b/dlls/msctf/range.c @@ -42,7 +42,7 @@ typedef struct tagRange { LONG refCount; ITextStoreACP *pITextStoreACP; - ITfContext *pITfContext; + ITfContext *context; DWORD lockType; TfGravity gravityStart, gravityEnd; @@ -58,6 +58,7 @@ static inline Range *impl_from_ITfRange(ITfRange *iface) static void Range_Destructor(Range *This) { TRACE("destroying %p\n", This); + ITfContext_Release(This->context); HeapFree(GetProcessHeap(),0,This); } @@ -282,13 +283,18 @@ static HRESULT WINAPI Range_Clone(ITfRange *iface, ITfRange **ppClone) return E_NOTIMPL; } -static HRESULT WINAPI Range_GetContext(ITfRange *iface, ITfContext **ppContext) +static HRESULT WINAPI Range_GetContext(ITfRange *iface, ITfContext **context) { Range *This = impl_from_ITfRange(iface); - TRACE("(%p)\n",This); - if (!ppContext) + + TRACE("(%p, %p)\n", This, context); + + if (!context) return E_INVALIDARG; - *ppContext = This->pITfContext; + + *context = This->context; + ITfContext_AddRef(*context); + return S_OK; } @@ -334,7 +340,8 @@ HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD l This->ITfRange_iface.lpVtbl = &Range_RangeVtbl; This->refCount = 1; - This->pITfContext = context; + This->context = context; + ITfContext_AddRef(This->context); This->pITextStoreACP = textstore; This->lockType = lockType; This->anchorStart = anchorStart; diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 55a6ab6c34c..fd03059e545 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -228,6 +228,8 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, REFIID riid, IUnknown *punk, DWORD dwMask) { ITextStoreACPServices *services; + ITfRangeACP *range; + ITfContext *context; HRESULT hr; if (winetest_debug > 1) trace("ITextStoreACP::AdviseSink(iid %s, mask %#x)\n", @@ -243,6 +245,18 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, hr = ITextStoreACPSink_QueryInterface(ACPSink, &IID_ITextStoreACPServices, (void**)&services); ok(hr == S_OK, "got 0x%08x\n", hr); + + range = NULL; + hr = ITextStoreACPServices_CreateRange(services, 0, 1, &range); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (range) + { + hr = ITfRangeACP_GetContext(range, &context); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ITfContext_Release(context); + ITfRangeACP_Release(range); + } + ITextStoreACPServices_Release(services); return S_OK; @@ -2084,10 +2098,11 @@ static void test_InsertAtSelection(TfEditCookie ec, ITfContext *cxt) static HRESULT WINAPI EditSession_DoEditSession(ITfEditSession *iface, TfEditCookie ec) { - ITfContext *cxt; + ITfContext *cxt, *context2; ITfDocumentMgr *dm; ITfRange *range; TF_SELECTION selection; + IUnknown *unk; ULONG fetched; HRESULT hr; @@ -2109,6 +2124,15 @@ TfEditCookie ec) ok(SUCCEEDED(hr),"Unexpected return code %x\n",hr); ok(range != NULL,"Range set to NULL\n"); + hr = ITfRange_GetContext(range, &context2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(context2 == cxt, "Unexpected context pointer.\n"); + ITfContext_Release(context2); + + hr = ITfRange_QueryInterface(range, &IID_ITfRangeACP, (void **)&unk); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ITfRange_Release(range); hr = ITfContext_GetEnd(cxt,ec,NULL);

1 0

Nikolay Sivov : msctf/range: Remove unused argument from range creation helper.
by Alexandre Julliard 02 Jun '21

02 Jun '21

Module: wine Branch: master Commit: c41ccf892cff593d56b18eedabb551b6e5bdd862 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c41ccf892cff593d56b18eed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 2 17:08:49 2021 +0300 msctf/range: Remove unused argument from range creation helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/context.c | 16 +++++----------- dlls/msctf/msctf_internal.h | 2 +- dlls/msctf/range.c | 8 ++------ 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 63f2bf5455d..9eb61efa411 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -267,7 +267,6 @@ static HRESULT WINAPI Context_GetSelection (ITfContext *iface, TF_SELECTION *pSelection, ULONG *pcFetched) { Context *This = impl_from_ITfContext(iface); - EditCookie *cookie; ULONG count, i; ULONG totalFetched = 0; HRESULT hr = S_OK; @@ -289,8 +288,6 @@ static HRESULT WINAPI Context_GetSelection (ITfContext *iface, return E_NOTIMPL; } - cookie = get_Cookie_data(ec); - if (ulIndex == TF_DEFAULT_SELECTION) count = 1; else @@ -310,7 +307,7 @@ static HRESULT WINAPI Context_GetSelection (ITfContext *iface, { pSelection[totalFetched].style.ase = acps.style.ase; pSelection[totalFetched].style.fInterimChar = acps.style.fInterimChar; - Range_Constructor(iface, This->pITextStoreACP, cookie->lockType, acps.acpStart, acps.acpEnd, &pSelection[totalFetched].range); + Range_Constructor(iface, acps.acpStart, acps.acpEnd, &pSelection[totalFetched].range); totalFetched ++; } else @@ -364,7 +361,7 @@ static HRESULT WINAPI Context_GetStart (ITfContext *iface, TfEditCookie ec, ITfRange **ppStart) { Context *This = impl_from_ITfContext(iface); - EditCookie *cookie; + TRACE("(%p) %i %p\n",This,ec,ppStart); if (!ppStart) @@ -378,15 +375,13 @@ static HRESULT WINAPI Context_GetStart (ITfContext *iface, if (get_Cookie_magic(ec)!=COOKIE_MAGIC_EDITCOOKIE) return TF_E_NOLOCK; - cookie = get_Cookie_data(ec); - return Range_Constructor(iface, This->pITextStoreACP, cookie->lockType, 0, 0, ppStart); + return Range_Constructor(iface, 0, 0, ppStart); } static HRESULT WINAPI Context_GetEnd (ITfContext *iface, TfEditCookie ec, ITfRange **ppEnd) { Context *This = impl_from_ITfContext(iface); - EditCookie *cookie; LONG end; TRACE("(%p) %i %p\n",This,ec,ppEnd); @@ -407,10 +402,9 @@ static HRESULT WINAPI Context_GetEnd (ITfContext *iface, return E_NOTIMPL; } - cookie = get_Cookie_data(ec); ITextStoreACP_GetEndACP(This->pITextStoreACP,&end); - return Range_Constructor(iface, This->pITextStoreACP, cookie->lockType, end, end, ppEnd); + return Range_Constructor(iface, end, end, ppEnd); } static HRESULT WINAPI Context_GetActiveView (ITfContext *iface, @@ -720,7 +714,7 @@ static HRESULT WINAPI InsertAtSelection_InsertTextAtSelection( hr = ITextStoreACP_InsertTextAtSelection(This->pITextStoreACP, dwFlags, pchText, cch, &acpStart, &acpEnd, &change); if (SUCCEEDED(hr)) - Range_Constructor(&This->ITfContext_iface, This->pITextStoreACP, cookie->lockType, change.acpStart, change.acpNewEnd, ppRange); + Range_Constructor(&This->ITfContext_iface, change.acpStart, change.acpNewEnd, ppRange); return hr; } diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 9d60e18e6f3..45a39806c22 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -45,7 +45,7 @@ extern HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink*, ITfDocumentMgr ** extern HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr *mgr, ITfContext **ppOut, TfEditCookie *pecTextStore) DECLSPEC_HIDDEN; extern HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; extern HRESULT CategoryMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; -extern HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD lockType, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut) DECLSPEC_HIDDEN; +extern HRESULT Range_Constructor(ITfContext *context, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut) DECLSPEC_HIDDEN; extern HRESULT CompartmentMgr_Constructor(IUnknown *pUnkOuter, REFIID riid, IUnknown **ppOut) DECLSPEC_HIDDEN; extern HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *This) DECLSPEC_HIDDEN; extern HRESULT LangBarMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) DECLSPEC_HIDDEN; diff --git a/dlls/msctf/range.c b/dlls/msctf/range.c index 85922791bad..ac2540b2b11 100644 --- a/dlls/msctf/range.c +++ b/dlls/msctf/range.c @@ -41,10 +41,8 @@ typedef struct tagRange { /* const ITfRangeACPVtb *RangeACPVtbl; */ LONG refCount; - ITextStoreACP *pITextStoreACP; ITfContext *context; - DWORD lockType; TfGravity gravityStart, gravityEnd; DWORD anchorStart, anchorEnd; @@ -328,7 +326,7 @@ static const ITfRangeVtbl Range_RangeVtbl = Range_GetContext }; -HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD lockType, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut) +HRESULT Range_Constructor(ITfContext *context, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut) { Range *This; @@ -336,14 +334,12 @@ HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD l if (This == NULL) return E_OUTOFMEMORY; - TRACE("(%p) %p %p\n",This, context, textstore); + TRACE("(%p) %p\n", This, context); This->ITfRange_iface.lpVtbl = &Range_RangeVtbl; This->refCount = 1; This->context = context; ITfContext_AddRef(This->context); - This->pITextStoreACP = textstore; - This->lockType = lockType; This->anchorStart = anchorStart; This->anchorEnd = anchorEnd;

1 0

Nikolay Sivov : msctf/range: Update to ITfRangeACP.
by Alexandre Julliard 02 Jun '21

02 Jun '21

Module: wine Branch: master Commit: 2952219e835730923747c2a6949eb9779299876a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2952219e835730923747c2a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 2 17:08:50 2021 +0300 msctf/range: Update to ITfRangeACP. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/range.c | 190 +++++++++++++++++++------------------- dlls/msctf/tests/inputprocessor.c | 2 +- 2 files changed, 96 insertions(+), 96 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2952219e835730923747…

1 0