wine-commits June 2021

wine-commits@winehq.org

1 participants
811 discussions

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

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

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

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

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

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

Rémi Bernon : include: Add HID vendor defined usage pages.
by Alexandre Julliard 02 Jun '21

02 Jun '21

Module: wine Branch: master Commit: 36f1860753339ca2312e13b1639abd803b7c8091 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36f1860753339ca2312e13b1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 31 10:52:10 2021 +0200 include: Add HID vendor defined usage pages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/hidusage.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/hidusage.h b/include/hidusage.h index 268ee4d05e8..fc77dff2c6b 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -198,6 +198,8 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_PAGE_DIGITIZER ((USAGE) 0x0D) #define HID_USAGE_PAGE_UNICODE ((USAGE) 0x10) #define HID_USAGE_PAGE_ALPHANUMERIC ((USAGE) 0x14) +#define HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN ((USAGE) 0xff00) +#define HID_USAGE_PAGE_VENDOR_DEFINED_END ((USAGE) 0xffff) #define HID_USAGE_SIMULATION_RUDDER ((USAGE) 0xBA) #define HID_USAGE_SIMULATION_THROTTLE ((USAGE) 0xBB)

1 0

Rémi Bernon : include: Add HID generic multi axis controller usage.
by Alexandre Julliard 02 Jun '21

02 Jun '21

Module: wine Branch: master Commit: edfa4293655876f9e3496844a976d3964ade997b URL: https://source.winehq.org/git/wine.git/?a=commit;h=edfa4293655876f9e3496844… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 31 10:52:09 2021 +0200 include: Add HID generic multi axis controller usage. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/hidusage.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/hidusage.h b/include/hidusage.h index d5f55bd2276..268ee4d05e8 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -45,6 +45,7 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_GENERIC_GAMEPAD ((USAGE) 0x05) #define HID_USAGE_GENERIC_KEYBOARD ((USAGE) 0x06) #define HID_USAGE_GENERIC_KEYPAD ((USAGE) 0x07) +#define HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER ((USAGE) 0x08) #define HID_USAGE_GENERIC_SYSTEM_CTL ((USAGE) 0x80) #define HID_USAGE_GENERIC_X ((USAGE) 0x30) #define HID_USAGE_GENERIC_Y ((USAGE) 0x31)

1 0

Zhiyi Zhang : appwiz.cpl: Canonicalize paths before passing them to GetFileAttributesW().
by Alexandre Julliard 02 Jun '21

02 Jun '21

Module: wine Branch: master Commit: d2882f96d6f0f166adaecdbc1ded047cec331b62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2882f96d6f0f166adaecdbc… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 2 10:54:13 2021 +0800 appwiz.cpl: Canonicalize paths before passing them to GetFileAttributesW(). Fix a regression that wine-mono installer packages in the parent folder of build trees can not be found since 405666b. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51209 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/Makefile.in | 2 +- dlls/appwiz.cpl/addons.c | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index e07149a30c9..44053de8ece 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -1,5 +1,5 @@ MODULE = appwiz.cpl -IMPORTS = uuid urlmon advpack comctl32 advapi32 shell32 ole32 user32 comdlg32 bcrypt +IMPORTS = uuid urlmon advpack comctl32 advapi32 shell32 ole32 user32 comdlg32 bcrypt kernelbase DELAYIMPORTS = msi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 28c30197ebb..3f094d37ef4 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -33,6 +33,7 @@ #include "commctrl.h" #include "advpub.h" #include "wininet.h" +#include "pathcch.h" #include "shellapi.h" #include "urlmon.h" #include "msi.h" @@ -197,10 +198,11 @@ static enum install_res install_file(const WCHAR *file_name) static enum install_res install_from_dos_file(const WCHAR *dir, const WCHAR *subdir, const WCHAR *file_name) { - WCHAR *path; + WCHAR *path, *canonical_path; enum install_res ret; int len = lstrlenW( dir ); int size = len + 1; + HRESULT hr; size += lstrlenW( subdir ) + lstrlenW( file_name ) + 2; if (!(path = heap_alloc( size * sizeof(WCHAR) ))) return INSTALL_FAILED; @@ -213,16 +215,25 @@ static enum install_res install_from_dos_file(const WCHAR *dir, const WCHAR *sub lstrcatW( path, L"\\" ); lstrcatW( path, file_name ); - if (GetFileAttributesW( path ) == INVALID_FILE_ATTRIBUTES) + hr = PathAllocCanonicalize( path, PATHCCH_ALLOW_LONG_PATHS, &canonical_path ); + if (FAILED( hr )) { - TRACE( "%s not found\n", debugstr_w(path) ); + ERR( "Failed to canonicalize %s, hr %#x\n", debugstr_w(path), hr ); heap_free( path ); return INSTALL_NEXT; } + heap_free( path ); + + if (GetFileAttributesW( canonical_path ) == INVALID_FILE_ATTRIBUTES) + { + TRACE( "%s not found\n", debugstr_w(canonical_path) ); + LocalFree( canonical_path ); + return INSTALL_NEXT; + } - ret = install_file( path ); + ret = install_file( canonical_path ); - heap_free( path ); + LocalFree( canonical_path ); return ret; }

1 0

Zhiyi Zhang : kernel32/tests: Test GetFileAttributesExW() with a NT path not in canonical form.
by Alexandre Julliard 02 Jun '21

02 Jun '21

Module: wine Branch: master Commit: f77d42471e43b3120f8e5a72afdc0d2cf5d20f86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f77d42471e43b3120f8e5a72… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 2 10:54:06 2021 +0800 kernel32/tests: Test GetFileAttributesExW() with a NT path not in canonical form. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 8560524683d..138f1e6c2d3 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5417,26 +5417,35 @@ todo_wine static void test_GetFileAttributesExW(void) { - static const WCHAR path1[] = {'\\','\\','?','\\',0}; - static const WCHAR path2[] = {'\\','?','?','\\',0}; - static const WCHAR path3[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\',0}; + static const struct + { + const WCHAR *path; + DWORD expected_error; + } + tests[] = + { + {L"\\\\?\\", ERROR_INVALID_NAME}, + {L"\\??\\", ERROR_INVALID_NAME}, + {L"\\DosDevices\\", ERROR_FILE_NOT_FOUND}, + {L"\\\\?\\C:\\windows\\system32\\..\\system32\\kernel32.dll", ERROR_INVALID_NAME}, + }; WIN32_FILE_ATTRIBUTE_DATA info; + DWORD error, test_idx; BOOL ret; - SetLastError(0xdeadbeef); - ret = GetFileAttributesExW(path1, GetFileExInfoStandard, &info); - ok(!ret, "GetFileAttributesExW succeeded\n"); - ok(GetLastError() == ERROR_INVALID_NAME, "Expected error ERROR_INVALID_NAME, got %u\n", GetLastError()); + for (test_idx = 0; test_idx < ARRAY_SIZE(tests); ++test_idx) + { + winetest_push_context("Test %u", test_idx); - SetLastError(0xdeadbeef); - ret = GetFileAttributesExW(path2, GetFileExInfoStandard, &info); - ok(!ret, "GetFileAttributesExW succeeded\n"); - ok(GetLastError() == ERROR_INVALID_NAME, "Expected error ERROR_INVALID_NAME, got %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = GetFileAttributesExW(tests[test_idx].path, GetFileExInfoStandard, &info); + error = GetLastError(); + ok(!ret, "GetFileAttributesExW succeeded\n"); + ok(error == tests[test_idx].expected_error, "Expected error %u, got %u\n", + tests[test_idx].expected_error, error); - SetLastError(0xdeadbeef); - ret = GetFileAttributesExW(path3, GetFileExInfoStandard, &info); - ok(!ret, "GetFileAttributesExW succeeded\n"); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Expected error ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + winetest_pop_context(); + } } static void test_post_completion(void)

1 0

← Newer
1
...
73
74
75
76
77
78
79
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2021