Ros-diffs September 2021

ros-diffs@reactos.org

25 participants
144 discussions

[reactos] 01/04: [ACPICA] Update to version 20210105. CORE-17760
by Thomas Faber 11 Sep '21

11 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=05926c7ac59b9c6c6cdbe… commit 05926c7ac59b9c6c6cdbeaa173d18ed116ef0162 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Sep 10 21:59:41 2021 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Sep 11 10:48:17 2021 -0400 [ACPICA] Update to version 20210105. CORE-17760 --- drivers/bus/acpi/acpica/dispatcher/dsargs.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dscontrol.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dsdebug.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dsfield.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dsinit.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dsmethod.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dsmthdat.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dsobject.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dsopcode.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dspkginit.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dsutils.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dswexec.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dswload.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dswload2.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dswscope.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dswstate.c | 2 +- drivers/bus/acpi/acpica/events/evevent.c | 2 +- drivers/bus/acpi/acpica/events/evglock.c | 2 +- drivers/bus/acpi/acpica/events/evgpe.c | 2 +- drivers/bus/acpi/acpica/events/evgpeblk.c | 2 +- drivers/bus/acpi/acpica/events/evgpeinit.c | 2 +- drivers/bus/acpi/acpica/events/evgpeutil.c | 2 +- drivers/bus/acpi/acpica/events/evhandler.c | 2 +- drivers/bus/acpi/acpica/events/evmisc.c | 2 +- drivers/bus/acpi/acpica/events/evregion.c | 2 +- drivers/bus/acpi/acpica/events/evrgnini.c | 2 +- drivers/bus/acpi/acpica/events/evsci.c | 2 +- drivers/bus/acpi/acpica/events/evxface.c | 2 +- drivers/bus/acpi/acpica/events/evxfevnt.c | 2 +- drivers/bus/acpi/acpica/events/evxfgpe.c | 2 +- drivers/bus/acpi/acpica/events/evxfregn.c | 2 +- drivers/bus/acpi/acpica/executer/exconcat.c | 2 +- drivers/bus/acpi/acpica/executer/exconfig.c | 2 +- drivers/bus/acpi/acpica/executer/exconvrt.c | 2 +- drivers/bus/acpi/acpica/executer/excreate.c | 2 +- drivers/bus/acpi/acpica/executer/exdebug.c | 2 +- drivers/bus/acpi/acpica/executer/exdump.c | 2 +- drivers/bus/acpi/acpica/executer/exfield.c | 2 +- drivers/bus/acpi/acpica/executer/exfldio.c | 2 +- drivers/bus/acpi/acpica/executer/exmisc.c | 2 +- drivers/bus/acpi/acpica/executer/exmutex.c | 2 +- drivers/bus/acpi/acpica/executer/exnames.c | 2 +- drivers/bus/acpi/acpica/executer/exoparg1.c | 2 +- drivers/bus/acpi/acpica/executer/exoparg2.c | 2 +- drivers/bus/acpi/acpica/executer/exoparg3.c | 2 +- drivers/bus/acpi/acpica/executer/exoparg6.c | 2 +- drivers/bus/acpi/acpica/executer/exprep.c | 2 +- drivers/bus/acpi/acpica/executer/exregion.c | 2 +- drivers/bus/acpi/acpica/executer/exresnte.c | 2 +- drivers/bus/acpi/acpica/executer/exresolv.c | 2 +- drivers/bus/acpi/acpica/executer/exresop.c | 2 +- drivers/bus/acpi/acpica/executer/exserial.c | 2 +- drivers/bus/acpi/acpica/executer/exstore.c | 2 +- drivers/bus/acpi/acpica/executer/exstoren.c | 2 +- drivers/bus/acpi/acpica/executer/exstorob.c | 2 +- drivers/bus/acpi/acpica/executer/exsystem.c | 2 +- drivers/bus/acpi/acpica/executer/extrace.c | 2 +- drivers/bus/acpi/acpica/executer/exutils.c | 2 +- drivers/bus/acpi/acpica/hardware/hwacpi.c | 2 +- drivers/bus/acpi/acpica/hardware/hwesleep.c | 2 +- drivers/bus/acpi/acpica/hardware/hwgpe.c | 2 +- drivers/bus/acpi/acpica/hardware/hwpci.c | 2 +- drivers/bus/acpi/acpica/hardware/hwregs.c | 2 +- drivers/bus/acpi/acpica/hardware/hwsleep.c | 2 +- drivers/bus/acpi/acpica/hardware/hwtimer.c | 2 +- drivers/bus/acpi/acpica/hardware/hwvalid.c | 2 +- drivers/bus/acpi/acpica/hardware/hwxface.c | 2 +- drivers/bus/acpi/acpica/hardware/hwxfsleep.c | 2 +- drivers/bus/acpi/acpica/include/acapps.h | 4 +-- drivers/bus/acpi/acpica/include/acbuffer.h | 2 +- drivers/bus/acpi/acpica/include/acclib.h | 2 +- drivers/bus/acpi/acpica/include/accommon.h | 2 +- drivers/bus/acpi/acpica/include/acconfig.h | 2 +- drivers/bus/acpi/acpica/include/acconvert.h | 2 +- drivers/bus/acpi/acpica/include/acdebug.h | 2 +- drivers/bus/acpi/acpica/include/acdisasm.h | 14 +--------- drivers/bus/acpi/acpica/include/acdispat.h | 2 +- drivers/bus/acpi/acpica/include/acevents.h | 2 +- drivers/bus/acpi/acpica/include/acexcep.h | 2 +- drivers/bus/acpi/acpica/include/acglobal.h | 2 +- drivers/bus/acpi/acpica/include/achware.h | 2 +- drivers/bus/acpi/acpica/include/acinterp.h | 2 +- drivers/bus/acpi/acpica/include/aclocal.h | 2 +- drivers/bus/acpi/acpica/include/acmacros.h | 2 +- drivers/bus/acpi/acpica/include/acnames.h | 2 +- drivers/bus/acpi/acpica/include/acnamesp.h | 2 +- drivers/bus/acpi/acpica/include/acobject.h | 2 +- drivers/bus/acpi/acpica/include/acopcode.h | 2 +- drivers/bus/acpi/acpica/include/acoutput.h | 2 +- drivers/bus/acpi/acpica/include/acparser.h | 2 +- drivers/bus/acpi/acpica/include/acpi.h | 2 +- drivers/bus/acpi/acpica/include/acpiosxf.h | 2 +- drivers/bus/acpi/acpica/include/acpixf.h | 4 +-- drivers/bus/acpi/acpica/include/acpredef.h | 2 +- drivers/bus/acpi/acpica/include/acresrc.h | 2 +- drivers/bus/acpi/acpica/include/acrestyp.h | 2 +- drivers/bus/acpi/acpica/include/acstruct.h | 2 +- drivers/bus/acpi/acpica/include/actables.h | 2 +- drivers/bus/acpi/acpica/include/actbinfo.h | 4 +-- drivers/bus/acpi/acpica/include/actbl.h | 2 +- drivers/bus/acpi/acpica/include/actbl1.h | 2 +- drivers/bus/acpi/acpica/include/actbl2.h | 31 +--------------------- drivers/bus/acpi/acpica/include/actbl3.h | 30 +-------------------- drivers/bus/acpi/acpica/include/actypes.h | 2 +- drivers/bus/acpi/acpica/include/acutils.h | 2 +- drivers/bus/acpi/acpica/include/acuuid.h | 2 +- drivers/bus/acpi/acpica/include/amlcode.h | 2 +- drivers/bus/acpi/acpica/include/amlresrc.h | 2 +- .../bus/acpi/acpica/include/platform/accygwin.h | 2 +- .../bus/acpi/acpica/include/platform/acdragonfly.h | 2 +- .../acpi/acpica/include/platform/acdragonflyex.h | 2 +- drivers/bus/acpi/acpica/include/platform/acefi.h | 2 +- drivers/bus/acpi/acpica/include/platform/acefiex.h | 2 +- drivers/bus/acpi/acpica/include/platform/acenv.h | 2 +- drivers/bus/acpi/acpica/include/platform/acenvex.h | 2 +- .../bus/acpi/acpica/include/platform/acfreebsd.h | 2 +- drivers/bus/acpi/acpica/include/platform/acgcc.h | 2 +- drivers/bus/acpi/acpica/include/platform/acgccex.h | 2 +- drivers/bus/acpi/acpica/include/platform/achaiku.h | 2 +- drivers/bus/acpi/acpica/include/platform/acintel.h | 2 +- drivers/bus/acpi/acpica/include/platform/aclinux.h | 2 +- .../bus/acpi/acpica/include/platform/aclinuxex.h | 2 +- .../bus/acpi/acpica/include/platform/acmacosx.h | 2 +- drivers/bus/acpi/acpica/include/platform/acmsvc.h | 2 +- .../bus/acpi/acpica/include/platform/acmsvcex.h | 2 +- .../bus/acpi/acpica/include/platform/acnetbsd.h | 2 +- drivers/bus/acpi/acpica/include/platform/acos2.h | 2 +- drivers/bus/acpi/acpica/include/platform/acqnx.h | 2 +- drivers/bus/acpi/acpica/include/platform/acwin.h | 2 +- drivers/bus/acpi/acpica/include/platform/acwin64.h | 2 +- drivers/bus/acpi/acpica/namespace/nsaccess.c | 2 +- drivers/bus/acpi/acpica/namespace/nsalloc.c | 2 +- drivers/bus/acpi/acpica/namespace/nsarguments.c | 2 +- drivers/bus/acpi/acpica/namespace/nsconvert.c | 2 +- drivers/bus/acpi/acpica/namespace/nsdump.c | 2 +- drivers/bus/acpi/acpica/namespace/nsdumpdv.c | 2 +- drivers/bus/acpi/acpica/namespace/nseval.c | 2 +- drivers/bus/acpi/acpica/namespace/nsinit.c | 2 +- drivers/bus/acpi/acpica/namespace/nsload.c | 2 +- drivers/bus/acpi/acpica/namespace/nsnames.c | 2 +- drivers/bus/acpi/acpica/namespace/nsobject.c | 2 +- drivers/bus/acpi/acpica/namespace/nsparse.c | 2 +- drivers/bus/acpi/acpica/namespace/nspredef.c | 2 +- drivers/bus/acpi/acpica/namespace/nsprepkg.c | 2 +- drivers/bus/acpi/acpica/namespace/nsrepair.c | 2 +- drivers/bus/acpi/acpica/namespace/nsrepair2.c | 2 +- drivers/bus/acpi/acpica/namespace/nssearch.c | 2 +- drivers/bus/acpi/acpica/namespace/nsutils.c | 2 +- drivers/bus/acpi/acpica/namespace/nswalk.c | 2 +- drivers/bus/acpi/acpica/namespace/nsxfeval.c | 2 +- drivers/bus/acpi/acpica/namespace/nsxfname.c | 2 +- drivers/bus/acpi/acpica/namespace/nsxfobj.c | 2 +- drivers/bus/acpi/acpica/parser/psargs.c | 2 +- drivers/bus/acpi/acpica/parser/psloop.c | 2 +- drivers/bus/acpi/acpica/parser/psobject.c | 2 +- drivers/bus/acpi/acpica/parser/psopcode.c | 2 +- drivers/bus/acpi/acpica/parser/psopinfo.c | 2 +- drivers/bus/acpi/acpica/parser/psparse.c | 2 +- drivers/bus/acpi/acpica/parser/psscope.c | 2 +- drivers/bus/acpi/acpica/parser/pstree.c | 2 +- drivers/bus/acpi/acpica/parser/psutils.c | 2 +- drivers/bus/acpi/acpica/parser/pswalk.c | 2 +- drivers/bus/acpi/acpica/parser/psxface.c | 2 +- drivers/bus/acpi/acpica/resources/rsaddr.c | 2 +- drivers/bus/acpi/acpica/resources/rscalc.c | 2 +- drivers/bus/acpi/acpica/resources/rscreate.c | 2 +- drivers/bus/acpi/acpica/resources/rsdump.c | 2 +- drivers/bus/acpi/acpica/resources/rsdumpinfo.c | 2 +- drivers/bus/acpi/acpica/resources/rsinfo.c | 2 +- drivers/bus/acpi/acpica/resources/rsio.c | 2 +- drivers/bus/acpi/acpica/resources/rsirq.c | 2 +- drivers/bus/acpi/acpica/resources/rslist.c | 2 +- drivers/bus/acpi/acpica/resources/rsmemory.c | 2 +- drivers/bus/acpi/acpica/resources/rsmisc.c | 2 +- drivers/bus/acpi/acpica/resources/rsserial.c | 2 +- drivers/bus/acpi/acpica/resources/rsutils.c | 2 +- drivers/bus/acpi/acpica/resources/rsxface.c | 2 +- drivers/bus/acpi/acpica/tables/tbdata.c | 2 +- drivers/bus/acpi/acpica/tables/tbfadt.c | 2 +- drivers/bus/acpi/acpica/tables/tbfind.c | 2 +- drivers/bus/acpi/acpica/tables/tbinstal.c | 2 +- drivers/bus/acpi/acpica/tables/tbprint.c | 2 +- drivers/bus/acpi/acpica/tables/tbutils.c | 2 +- drivers/bus/acpi/acpica/tables/tbxface.c | 2 +- drivers/bus/acpi/acpica/tables/tbxfload.c | 2 +- drivers/bus/acpi/acpica/tables/tbxfroot.c | 2 +- drivers/bus/acpi/acpica/utilities/utaddress.c | 2 +- drivers/bus/acpi/acpica/utilities/utalloc.c | 2 +- drivers/bus/acpi/acpica/utilities/utascii.c | 2 +- drivers/bus/acpi/acpica/utilities/utbuffer.c | 2 +- drivers/bus/acpi/acpica/utilities/utcache.c | 2 +- drivers/bus/acpi/acpica/utilities/utclib.c | 2 +- drivers/bus/acpi/acpica/utilities/utcopy.c | 2 +- drivers/bus/acpi/acpica/utilities/utdebug.c | 2 +- drivers/bus/acpi/acpica/utilities/utdecode.c | 2 +- drivers/bus/acpi/acpica/utilities/utdelete.c | 2 +- drivers/bus/acpi/acpica/utilities/uterror.c | 2 +- drivers/bus/acpi/acpica/utilities/uteval.c | 2 +- drivers/bus/acpi/acpica/utilities/utexcep.c | 2 +- drivers/bus/acpi/acpica/utilities/utglobal.c | 2 +- drivers/bus/acpi/acpica/utilities/uthex.c | 2 +- drivers/bus/acpi/acpica/utilities/utids.c | 2 +- drivers/bus/acpi/acpica/utilities/utinit.c | 2 +- drivers/bus/acpi/acpica/utilities/utlock.c | 2 +- drivers/bus/acpi/acpica/utilities/utmath.c | 2 +- drivers/bus/acpi/acpica/utilities/utmisc.c | 2 +- drivers/bus/acpi/acpica/utilities/utmutex.c | 2 +- drivers/bus/acpi/acpica/utilities/utnonansi.c | 2 +- drivers/bus/acpi/acpica/utilities/utobject.c | 2 +- drivers/bus/acpi/acpica/utilities/utosi.c | 2 +- drivers/bus/acpi/acpica/utilities/utownerid.c | 2 +- drivers/bus/acpi/acpica/utilities/utpredef.c | 2 +- drivers/bus/acpi/acpica/utilities/utprint.c | 2 +- drivers/bus/acpi/acpica/utilities/utresdecode.c | 2 +- drivers/bus/acpi/acpica/utilities/utresrc.c | 2 +- drivers/bus/acpi/acpica/utilities/utstate.c | 2 +- drivers/bus/acpi/acpica/utilities/utstring.c | 2 +- drivers/bus/acpi/acpica/utilities/utstrsuppt.c | 2 +- drivers/bus/acpi/acpica/utilities/utstrtoul64.c | 2 +- drivers/bus/acpi/acpica/utilities/uttrack.c | 2 +- drivers/bus/acpi/acpica/utilities/utuuid.c | 2 +- drivers/bus/acpi/acpica/utilities/utxface.c | 2 +- drivers/bus/acpi/acpica/utilities/utxferror.c | 2 +- drivers/bus/acpi/acpica/utilities/utxfinit.c | 2 +- drivers/bus/acpi/acpica/utilities/utxfmutex.c | 2 +- media/doc/3rd Party Files.txt | 2 +- 226 files changed, 228 insertions(+), 299 deletions(-) diff --git a/drivers/bus/acpi/acpica/dispatcher/dsargs.c b/drivers/bus/acpi/acpica/dispatcher/dsargs.c index 9925c7dc452..67e36bb7320 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsargs.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsargs.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dscontrol.c b/drivers/bus/acpi/acpica/dispatcher/dscontrol.c index 9c04f2b389e..91d4d7f448f 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dscontrol.c +++ b/drivers/bus/acpi/acpica/dispatcher/dscontrol.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dsdebug.c b/drivers/bus/acpi/acpica/dispatcher/dsdebug.c index 951346a12c4..2f882268450 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsdebug.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsdebug.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dsfield.c b/drivers/bus/acpi/acpica/dispatcher/dsfield.c index e2a08bb0a24..f07c8ad3c91 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsfield.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsfield.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dsinit.c b/drivers/bus/acpi/acpica/dispatcher/dsinit.c index 7001e955ddd..c5275e7857a 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsinit.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsinit.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dsmethod.c b/drivers/bus/acpi/acpica/dispatcher/dsmethod.c index 507b2bf1a40..925dc201662 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsmethod.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsmethod.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dsmthdat.c b/drivers/bus/acpi/acpica/dispatcher/dsmthdat.c index e613b813222..87d5e70764e 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsmthdat.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsmthdat.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dsobject.c b/drivers/bus/acpi/acpica/dispatcher/dsobject.c index d56a3e4d9bb..bc93a0f1311 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsobject.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsobject.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dsopcode.c b/drivers/bus/acpi/acpica/dispatcher/dsopcode.c index 011dba27314..a6a24df2f3c 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsopcode.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsopcode.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dspkginit.c b/drivers/bus/acpi/acpica/dispatcher/dspkginit.c index 860f3147c0a..8682cb4c510 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dspkginit.c +++ b/drivers/bus/acpi/acpica/dispatcher/dspkginit.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dsutils.c b/drivers/bus/acpi/acpica/dispatcher/dsutils.c index 72564446bad..3e36a488622 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsutils.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsutils.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dswexec.c b/drivers/bus/acpi/acpica/dispatcher/dswexec.c index 3057a9329d3..6706fddbfc1 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dswexec.c +++ b/drivers/bus/acpi/acpica/dispatcher/dswexec.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dswload.c b/drivers/bus/acpi/acpica/dispatcher/dswload.c index 62fd6e40481..cff42f72ee7 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dswload.c +++ b/drivers/bus/acpi/acpica/dispatcher/dswload.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dswload2.c b/drivers/bus/acpi/acpica/dispatcher/dswload2.c index 4e69244de27..c51682cf7ea 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dswload2.c +++ b/drivers/bus/acpi/acpica/dispatcher/dswload2.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dswscope.c b/drivers/bus/acpi/acpica/dispatcher/dswscope.c index b28e1bdd77b..bd9f14b95be 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dswscope.c +++ b/drivers/bus/acpi/acpica/dispatcher/dswscope.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/dispatcher/dswstate.c b/drivers/bus/acpi/acpica/dispatcher/dswstate.c index 2be503e9a42..418f0d6aee9 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dswstate.c +++ b/drivers/bus/acpi/acpica/dispatcher/dswstate.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evevent.c b/drivers/bus/acpi/acpica/events/evevent.c index f41eb36561f..1e2327e068e 100644 --- a/drivers/bus/acpi/acpica/events/evevent.c +++ b/drivers/bus/acpi/acpica/events/evevent.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evglock.c b/drivers/bus/acpi/acpica/events/evglock.c index 371522f75cf..9ff1f763e8a 100644 --- a/drivers/bus/acpi/acpica/events/evglock.c +++ b/drivers/bus/acpi/acpica/events/evglock.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evgpe.c b/drivers/bus/acpi/acpica/events/evgpe.c index bf894521194..5084a5fda97 100644 --- a/drivers/bus/acpi/acpica/events/evgpe.c +++ b/drivers/bus/acpi/acpica/events/evgpe.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evgpeblk.c b/drivers/bus/acpi/acpica/events/evgpeblk.c index 998a2c337f0..95c884b6cf9 100644 --- a/drivers/bus/acpi/acpica/events/evgpeblk.c +++ b/drivers/bus/acpi/acpica/events/evgpeblk.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evgpeinit.c b/drivers/bus/acpi/acpica/events/evgpeinit.c index c8298f80ee8..631fd2f4e53 100644 --- a/drivers/bus/acpi/acpica/events/evgpeinit.c +++ b/drivers/bus/acpi/acpica/events/evgpeinit.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evgpeutil.c b/drivers/bus/acpi/acpica/events/evgpeutil.c index 8a7ffc9c007..c3b97c77a1a 100644 --- a/drivers/bus/acpi/acpica/events/evgpeutil.c +++ b/drivers/bus/acpi/acpica/events/evgpeutil.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evhandler.c b/drivers/bus/acpi/acpica/events/evhandler.c index 43884a2932c..3d5285ee862 100644 --- a/drivers/bus/acpi/acpica/events/evhandler.c +++ b/drivers/bus/acpi/acpica/events/evhandler.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evmisc.c b/drivers/bus/acpi/acpica/events/evmisc.c index 4748c799274..150c66cba32 100644 --- a/drivers/bus/acpi/acpica/events/evmisc.c +++ b/drivers/bus/acpi/acpica/events/evmisc.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evregion.c b/drivers/bus/acpi/acpica/events/evregion.c index adb9c91601f..8778b453df1 100644 --- a/drivers/bus/acpi/acpica/events/evregion.c +++ b/drivers/bus/acpi/acpica/events/evregion.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evrgnini.c b/drivers/bus/acpi/acpica/events/evrgnini.c index 04b5fbe13ec..9e129a9f1d4 100644 --- a/drivers/bus/acpi/acpica/events/evrgnini.c +++ b/drivers/bus/acpi/acpica/events/evrgnini.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evsci.c b/drivers/bus/acpi/acpica/events/evsci.c index 0ab7e0601fc..1ba668f3b3c 100644 --- a/drivers/bus/acpi/acpica/events/evsci.c +++ b/drivers/bus/acpi/acpica/events/evsci.c @@ -6,7 +6,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evxface.c b/drivers/bus/acpi/acpica/events/evxface.c index 8cdc191e96a..fd7e1fcb043 100644 --- a/drivers/bus/acpi/acpica/events/evxface.c +++ b/drivers/bus/acpi/acpica/events/evxface.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evxfevnt.c b/drivers/bus/acpi/acpica/events/evxfevnt.c index c506db936c4..eb4211917ca 100644 --- a/drivers/bus/acpi/acpica/events/evxfevnt.c +++ b/drivers/bus/acpi/acpica/events/evxfevnt.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evxfgpe.c b/drivers/bus/acpi/acpica/events/evxfgpe.c index d4190f56126..4116b80b3bd 100644 --- a/drivers/bus/acpi/acpica/events/evxfgpe.c +++ b/drivers/bus/acpi/acpica/events/evxfgpe.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/events/evxfregn.c b/drivers/bus/acpi/acpica/events/evxfregn.c index 1f278d892bf..c1e24e6f56d 100644 --- a/drivers/bus/acpi/acpica/events/evxfregn.c +++ b/drivers/bus/acpi/acpica/events/evxfregn.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exconcat.c b/drivers/bus/acpi/acpica/executer/exconcat.c index 7abac465a13..cf5ca94ec4c 100644 --- a/drivers/bus/acpi/acpica/executer/exconcat.c +++ b/drivers/bus/acpi/acpica/executer/exconcat.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exconfig.c b/drivers/bus/acpi/acpica/executer/exconfig.c index 31179c8bb91..960f3257c0e 100644 --- a/drivers/bus/acpi/acpica/executer/exconfig.c +++ b/drivers/bus/acpi/acpica/executer/exconfig.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exconvrt.c b/drivers/bus/acpi/acpica/executer/exconvrt.c index bca6670c32b..7b9534040f7 100644 --- a/drivers/bus/acpi/acpica/executer/exconvrt.c +++ b/drivers/bus/acpi/acpica/executer/exconvrt.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/excreate.c b/drivers/bus/acpi/acpica/executer/excreate.c index 022a1251c47..6da0d70aab5 100644 --- a/drivers/bus/acpi/acpica/executer/excreate.c +++ b/drivers/bus/acpi/acpica/executer/excreate.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exdebug.c b/drivers/bus/acpi/acpica/executer/exdebug.c index e3fb1b28681..c71174027d6 100644 --- a/drivers/bus/acpi/acpica/executer/exdebug.c +++ b/drivers/bus/acpi/acpica/executer/exdebug.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exdump.c b/drivers/bus/acpi/acpica/executer/exdump.c index 8442e7126a7..4fe1b7650a1 100644 --- a/drivers/bus/acpi/acpica/executer/exdump.c +++ b/drivers/bus/acpi/acpica/executer/exdump.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exfield.c b/drivers/bus/acpi/acpica/executer/exfield.c index 3f7c560d286..fe0165f4891 100644 --- a/drivers/bus/acpi/acpica/executer/exfield.c +++ b/drivers/bus/acpi/acpica/executer/exfield.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exfldio.c b/drivers/bus/acpi/acpica/executer/exfldio.c index ece5c19ba57..112cfae1181 100644 --- a/drivers/bus/acpi/acpica/executer/exfldio.c +++ b/drivers/bus/acpi/acpica/executer/exfldio.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exmisc.c b/drivers/bus/acpi/acpica/executer/exmisc.c index d576bbdecfb..ea55a8da8e0 100644 --- a/drivers/bus/acpi/acpica/executer/exmisc.c +++ b/drivers/bus/acpi/acpica/executer/exmisc.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exmutex.c b/drivers/bus/acpi/acpica/executer/exmutex.c index 2f08646460b..c7d8635e30c 100644 --- a/drivers/bus/acpi/acpica/executer/exmutex.c +++ b/drivers/bus/acpi/acpica/executer/exmutex.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exnames.c b/drivers/bus/acpi/acpica/executer/exnames.c index d492bf466b9..faf4c444b5f 100644 --- a/drivers/bus/acpi/acpica/executer/exnames.c +++ b/drivers/bus/acpi/acpica/executer/exnames.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exoparg1.c b/drivers/bus/acpi/acpica/executer/exoparg1.c index dbec1d92f11..6a8c3a853af 100644 --- a/drivers/bus/acpi/acpica/executer/exoparg1.c +++ b/drivers/bus/acpi/acpica/executer/exoparg1.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exoparg2.c b/drivers/bus/acpi/acpica/executer/exoparg2.c index e2176422146..7f0d2e687bc 100644 --- a/drivers/bus/acpi/acpica/executer/exoparg2.c +++ b/drivers/bus/acpi/acpica/executer/exoparg2.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exoparg3.c b/drivers/bus/acpi/acpica/executer/exoparg3.c index b1743575da2..ca988a2a6d7 100644 --- a/drivers/bus/acpi/acpica/executer/exoparg3.c +++ b/drivers/bus/acpi/acpica/executer/exoparg3.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exoparg6.c b/drivers/bus/acpi/acpica/executer/exoparg6.c index d8a72246325..172a2f3f618 100644 --- a/drivers/bus/acpi/acpica/executer/exoparg6.c +++ b/drivers/bus/acpi/acpica/executer/exoparg6.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exprep.c b/drivers/bus/acpi/acpica/executer/exprep.c index b74f430bbd8..dfef7f9c8df 100644 --- a/drivers/bus/acpi/acpica/executer/exprep.c +++ b/drivers/bus/acpi/acpica/executer/exprep.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exregion.c b/drivers/bus/acpi/acpica/executer/exregion.c index 3a13c04a77e..92eebc34466 100644 --- a/drivers/bus/acpi/acpica/executer/exregion.c +++ b/drivers/bus/acpi/acpica/executer/exregion.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exresnte.c b/drivers/bus/acpi/acpica/executer/exresnte.c index 93bc8df4056..37a9ede858a 100644 --- a/drivers/bus/acpi/acpica/executer/exresnte.c +++ b/drivers/bus/acpi/acpica/executer/exresnte.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exresolv.c b/drivers/bus/acpi/acpica/executer/exresolv.c index 475532a08c1..82c02ab095d 100644 --- a/drivers/bus/acpi/acpica/executer/exresolv.c +++ b/drivers/bus/acpi/acpica/executer/exresolv.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exresop.c b/drivers/bus/acpi/acpica/executer/exresop.c index 35f0f3a63f1..808a52dbe1e 100644 --- a/drivers/bus/acpi/acpica/executer/exresop.c +++ b/drivers/bus/acpi/acpica/executer/exresop.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exserial.c b/drivers/bus/acpi/acpica/executer/exserial.c index 39fbac70387..3d22a4f001c 100644 --- a/drivers/bus/acpi/acpica/executer/exserial.c +++ b/drivers/bus/acpi/acpica/executer/exserial.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exstore.c b/drivers/bus/acpi/acpica/executer/exstore.c index cb791ff2f68..dea834d616d 100644 --- a/drivers/bus/acpi/acpica/executer/exstore.c +++ b/drivers/bus/acpi/acpica/executer/exstore.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exstoren.c b/drivers/bus/acpi/acpica/executer/exstoren.c index bd43edcbabf..ae1f3405df1 100644 --- a/drivers/bus/acpi/acpica/executer/exstoren.c +++ b/drivers/bus/acpi/acpica/executer/exstoren.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exstorob.c b/drivers/bus/acpi/acpica/executer/exstorob.c index 5de68238856..553ed17773b 100644 --- a/drivers/bus/acpi/acpica/executer/exstorob.c +++ b/drivers/bus/acpi/acpica/executer/exstorob.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exsystem.c b/drivers/bus/acpi/acpica/executer/exsystem.c index 7ee6d96ac1e..4a96db88e63 100644 --- a/drivers/bus/acpi/acpica/executer/exsystem.c +++ b/drivers/bus/acpi/acpica/executer/exsystem.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/extrace.c b/drivers/bus/acpi/acpica/executer/extrace.c index 247d6947cf2..8c1ea3d00ed 100644 --- a/drivers/bus/acpi/acpica/executer/extrace.c +++ b/drivers/bus/acpi/acpica/executer/extrace.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/executer/exutils.c b/drivers/bus/acpi/acpica/executer/exutils.c index da1e2abc18c..7ec93a289c8 100644 --- a/drivers/bus/acpi/acpica/executer/exutils.c +++ b/drivers/bus/acpi/acpica/executer/exutils.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/hardware/hwacpi.c b/drivers/bus/acpi/acpica/hardware/hwacpi.c index 8b3ac7fb867..11c6ce7019e 100644 --- a/drivers/bus/acpi/acpica/hardware/hwacpi.c +++ b/drivers/bus/acpi/acpica/hardware/hwacpi.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/hardware/hwesleep.c b/drivers/bus/acpi/acpica/hardware/hwesleep.c index f683ef9be14..e6becad00c3 100644 --- a/drivers/bus/acpi/acpica/hardware/hwesleep.c +++ b/drivers/bus/acpi/acpica/hardware/hwesleep.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/hardware/hwgpe.c b/drivers/bus/acpi/acpica/hardware/hwgpe.c index 63f1335e225..4bceabc8f9c 100644 --- a/drivers/bus/acpi/acpica/hardware/hwgpe.c +++ b/drivers/bus/acpi/acpica/hardware/hwgpe.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/hardware/hwpci.c b/drivers/bus/acpi/acpica/hardware/hwpci.c index 6d1dc936e32..50382b33cc4 100644 --- a/drivers/bus/acpi/acpica/hardware/hwpci.c +++ b/drivers/bus/acpi/acpica/hardware/hwpci.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/hardware/hwregs.c b/drivers/bus/acpi/acpica/hardware/hwregs.c index 36f3afed780..2cd0f5ac5f2 100644 --- a/drivers/bus/acpi/acpica/hardware/hwregs.c +++ b/drivers/bus/acpi/acpica/hardware/hwregs.c @@ -6,7 +6,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/hardware/hwsleep.c b/drivers/bus/acpi/acpica/hardware/hwsleep.c index 6963d4e6826..8a09b8f849e 100644 --- a/drivers/bus/acpi/acpica/hardware/hwsleep.c +++ b/drivers/bus/acpi/acpica/hardware/hwsleep.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/hardware/hwtimer.c b/drivers/bus/acpi/acpica/hardware/hwtimer.c index 9ad3b7dacb2..dcf9961c08b 100644 --- a/drivers/bus/acpi/acpica/hardware/hwtimer.c +++ b/drivers/bus/acpi/acpica/hardware/hwtimer.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/hardware/hwvalid.c b/drivers/bus/acpi/acpica/hardware/hwvalid.c index 22d597003d8..f80093b4d38 100644 --- a/drivers/bus/acpi/acpica/hardware/hwvalid.c +++ b/drivers/bus/acpi/acpica/hardware/hwvalid.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/hardware/hwxface.c b/drivers/bus/acpi/acpica/hardware/hwxface.c index 8dee7904827..28909c251e5 100644 --- a/drivers/bus/acpi/acpica/hardware/hwxface.c +++ b/drivers/bus/acpi/acpica/hardware/hwxface.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/hardware/hwxfsleep.c b/drivers/bus/acpi/acpica/hardware/hwxfsleep.c index f6e94571867..746b233e009 100644 --- a/drivers/bus/acpi/acpica/hardware/hwxfsleep.c +++ b/drivers/bus/acpi/acpica/hardware/hwxfsleep.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acapps.h b/drivers/bus/acpi/acpica/include/acapps.h index 34981d326dd..2d9274926c3 100644 --- a/drivers/bus/acpi/acpica/include/acapps.h +++ b/drivers/bus/acpi/acpica/include/acapps.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ /* Common info for tool signons */ #define ACPICA_NAME "Intel ACPI Component Architecture" -#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2020 Intel Corporation" +#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2021 Intel Corporation" #if ACPI_MACHINE_WIDTH == 64 #define ACPI_WIDTH " (64-bit version)" diff --git a/drivers/bus/acpi/acpica/include/acbuffer.h b/drivers/bus/acpi/acpica/include/acbuffer.h index a5ec24dc471..4c04e5a0a45 100644 --- a/drivers/bus/acpi/acpica/include/acbuffer.h +++ b/drivers/bus/acpi/acpica/include/acbuffer.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acclib.h b/drivers/bus/acpi/acpica/include/acclib.h index 2f00617aadc..22c932c40db 100644 --- a/drivers/bus/acpi/acpica/include/acclib.h +++ b/drivers/bus/acpi/acpica/include/acclib.h @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/accommon.h b/drivers/bus/acpi/acpica/include/accommon.h index d9ac406d136..de749b9039c 100644 --- a/drivers/bus/acpi/acpica/include/accommon.h +++ b/drivers/bus/acpi/acpica/include/accommon.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acconfig.h b/drivers/bus/acpi/acpica/include/acconfig.h index c764770a479..b5ff74d7d70 100644 --- a/drivers/bus/acpi/acpica/include/acconfig.h +++ b/drivers/bus/acpi/acpica/include/acconfig.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acconvert.h b/drivers/bus/acpi/acpica/include/acconvert.h index 071ff4a4c58..d980e0b56b4 100644 --- a/drivers/bus/acpi/acpica/include/acconvert.h +++ b/drivers/bus/acpi/acpica/include/acconvert.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acdebug.h b/drivers/bus/acpi/acpica/include/acdebug.h index 1fa90043471..221c2a7c249 100644 --- a/drivers/bus/acpi/acpica/include/acdebug.h +++ b/drivers/bus/acpi/acpica/include/acdebug.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acdisasm.h b/drivers/bus/acpi/acpica/include/acdisasm.h index c998022f469..455f33d3f4c 100644 --- a/drivers/bus/acpi/acpica/include/acdisasm.h +++ b/drivers/bus/acpi/acpica/include/acdisasm.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -385,8 +385,6 @@ extern ACPI_DMTABLE_INFO AcpiDmTableInfoMpst1[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoMpst2[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoMsct[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoMsct0[]; -extern ACPI_DMTABLE_INFO AcpiDmTableInfoMtmr[]; -extern ACPI_DMTABLE_INFO AcpiDmTableInfoMtmr0[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoNfit[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoNfitHdr[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoNfit0[]; @@ -459,8 +457,6 @@ extern ACPI_DMTABLE_INFO AcpiDmTableInfoTpm211[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoTpm23[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoTpm23a[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoUefi[]; -extern ACPI_DMTABLE_INFO AcpiDmTableInfoVrtc[]; -extern ACPI_DMTABLE_INFO AcpiDmTableInfoVrtc0[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoWaet[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoWdat[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoWdat0[]; @@ -612,10 +608,6 @@ void AcpiDmDumpMsct ( ACPI_TABLE_HEADER *Table); -void -AcpiDmDumpMtmr ( - ACPI_TABLE_HEADER *Table); - void AcpiDmDumpNfit ( ACPI_TABLE_HEADER *Table); @@ -676,10 +668,6 @@ void AcpiDmDumpTpm2 ( ACPI_TABLE_HEADER *Table); -void -AcpiDmDumpVrtc ( - ACPI_TABLE_HEADER *Table); - void AcpiDmDumpWdat ( ACPI_TABLE_HEADER *Table); diff --git a/drivers/bus/acpi/acpica/include/acdispat.h b/drivers/bus/acpi/acpica/include/acdispat.h index 54dceab2998..15e1bbdf425 100644 --- a/drivers/bus/acpi/acpica/include/acdispat.h +++ b/drivers/bus/acpi/acpica/include/acdispat.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acevents.h b/drivers/bus/acpi/acpica/include/acevents.h index cb5df119b8d..623d433a62f 100644 --- a/drivers/bus/acpi/acpica/include/acevents.h +++ b/drivers/bus/acpi/acpica/include/acevents.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acexcep.h b/drivers/bus/acpi/acpica/include/acexcep.h index e888ec9b2b4..43342ce7709 100644 --- a/drivers/bus/acpi/acpica/include/acexcep.h +++ b/drivers/bus/acpi/acpica/include/acexcep.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acglobal.h b/drivers/bus/acpi/acpica/include/acglobal.h index 806fa43d990..7ddac4e3b41 100644 --- a/drivers/bus/acpi/acpica/include/acglobal.h +++ b/drivers/bus/acpi/acpica/include/acglobal.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/achware.h b/drivers/bus/acpi/acpica/include/achware.h index 824bc4337d6..600f7135a47 100644 --- a/drivers/bus/acpi/acpica/include/achware.h +++ b/drivers/bus/acpi/acpica/include/achware.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acinterp.h b/drivers/bus/acpi/acpica/include/acinterp.h index c951d34e9b7..1f7593e967b 100644 --- a/drivers/bus/acpi/acpica/include/acinterp.h +++ b/drivers/bus/acpi/acpica/include/acinterp.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/aclocal.h b/drivers/bus/acpi/acpica/include/aclocal.h index 8fa5c0ad98d..5078292b785 100644 --- a/drivers/bus/acpi/acpica/include/aclocal.h +++ b/drivers/bus/acpi/acpica/include/aclocal.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acmacros.h b/drivers/bus/acpi/acpica/include/acmacros.h index 1806328a75c..a2de3de4d18 100644 --- a/drivers/bus/acpi/acpica/include/acmacros.h +++ b/drivers/bus/acpi/acpica/include/acmacros.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acnames.h b/drivers/bus/acpi/acpica/include/acnames.h index 3c7b579e4e6..9208c209ee3 100644 --- a/drivers/bus/acpi/acpica/include/acnames.h +++ b/drivers/bus/acpi/acpica/include/acnames.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acnamesp.h b/drivers/bus/acpi/acpica/include/acnamesp.h index 2a81d278f01..24758af6a3f 100644 --- a/drivers/bus/acpi/acpica/include/acnamesp.h +++ b/drivers/bus/acpi/acpica/include/acnamesp.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acobject.h b/drivers/bus/acpi/acpica/include/acobject.h index f4533d3e816..f15503131a5 100644 --- a/drivers/bus/acpi/acpica/include/acobject.h +++ b/drivers/bus/acpi/acpica/include/acobject.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acopcode.h b/drivers/bus/acpi/acpica/include/acopcode.h index 32f1c295e2d..5efa9f5f527 100644 --- a/drivers/bus/acpi/acpica/include/acopcode.h +++ b/drivers/bus/acpi/acpica/include/acopcode.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acoutput.h b/drivers/bus/acpi/acpica/include/acoutput.h index 37dd363ab30..06001d3da16 100644 --- a/drivers/bus/acpi/acpica/include/acoutput.h +++ b/drivers/bus/acpi/acpica/include/acoutput.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acparser.h b/drivers/bus/acpi/acpica/include/acparser.h index a10fff673f2..de5376162a2 100644 --- a/drivers/bus/acpi/acpica/include/acparser.h +++ b/drivers/bus/acpi/acpica/include/acparser.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acpi.h b/drivers/bus/acpi/acpica/include/acpi.h index afc92503d63..a73af359104 100644 --- a/drivers/bus/acpi/acpica/include/acpi.h +++ b/drivers/bus/acpi/acpica/include/acpi.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acpiosxf.h b/drivers/bus/acpi/acpica/include/acpiosxf.h index a9559b0b6d2..6a091b28fb1 100644 --- a/drivers/bus/acpi/acpica/include/acpiosxf.h +++ b/drivers/bus/acpi/acpica/include/acpiosxf.h @@ -7,7 +7,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acpixf.h b/drivers/bus/acpi/acpica/include/acpixf.h index a3d25ab4d0d..2d98883f86b 100644 --- a/drivers/bus/acpi/acpica/include/acpixf.h +++ b/drivers/bus/acpi/acpica/include/acpixf.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20201217 +#define ACPI_CA_VERSION 0x20210105 #include "acconfig.h" #include "actypes.h" diff --git a/drivers/bus/acpi/acpica/include/acpredef.h b/drivers/bus/acpi/acpica/include/acpredef.h index 188070bcde0..465456c4370 100644 --- a/drivers/bus/acpi/acpica/include/acpredef.h +++ b/drivers/bus/acpi/acpica/include/acpredef.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acresrc.h b/drivers/bus/acpi/acpica/include/acresrc.h index 954f52ac2e8..6465d92e647 100644 --- a/drivers/bus/acpi/acpica/include/acresrc.h +++ b/drivers/bus/acpi/acpica/include/acresrc.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acrestyp.h b/drivers/bus/acpi/acpica/include/acrestyp.h index 34fbc5a26af..aa31199c77a 100644 --- a/drivers/bus/acpi/acpica/include/acrestyp.h +++ b/drivers/bus/acpi/acpica/include/acrestyp.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acstruct.h b/drivers/bus/acpi/acpica/include/acstruct.h index df6b7497a3d..61fc539ecff 100644 --- a/drivers/bus/acpi/acpica/include/acstruct.h +++ b/drivers/bus/acpi/acpica/include/acstruct.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/actables.h b/drivers/bus/acpi/acpica/include/actables.h index 3e881679894..394a65e6cb4 100644 --- a/drivers/bus/acpi/acpica/include/actables.h +++ b/drivers/bus/acpi/acpica/include/actables.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/actbinfo.h b/drivers/bus/acpi/acpica/include/actbinfo.h index ee6c1f63034..64a308ccfce 100644 --- a/drivers/bus/acpi/acpica/include/actbinfo.h +++ b/drivers/bus/acpi/acpica/include/actbinfo.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -189,7 +189,6 @@ #define ACPI_MPST1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MPST_DATA_HDR,f) #define ACPI_MPST2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MPST_POWER_DATA,f) #define ACPI_MSCT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MSCT_PROXIMITY,f) -#define ACPI_MTMR0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MTMR_ENTRY,f) #define ACPI_NFITH_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NFIT_HEADER,f) #define ACPI_NFIT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NFIT_SYSTEM_ADDRESS,f) #define ACPI_NFIT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NFIT_MEMORY_MAP,f) @@ -234,7 +233,6 @@ #define ACPI_TPM2A_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TPM2_TRAILER,f) #define ACPI_TPM211_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TPM2_ARM_SMC,f) #define ACPI_TPM23A_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TPM23_TRAILER,f) -#define ACPI_VRTC0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_VRTC_ENTRY,f) #define ACPI_WDAT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_WDAT_ENTRY,f) /* diff --git a/drivers/bus/acpi/acpica/include/actbl.h b/drivers/bus/acpi/acpica/include/actbl.h index df90d9d3d98..ff2ca03e6f1 100644 --- a/drivers/bus/acpi/acpica/include/actbl.h +++ b/drivers/bus/acpi/acpica/include/actbl.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/actbl1.h b/drivers/bus/acpi/acpica/include/actbl1.h index b25b690a4c0..cd5ff0ceba1 100644 --- a/drivers/bus/acpi/acpica/include/actbl1.h +++ b/drivers/bus/acpi/acpica/include/actbl1.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/actbl2.h b/drivers/bus/acpi/acpica/include/actbl2.h index fff11574a89..fd6b6323bf4 100644 --- a/drivers/bus/acpi/acpica/include/actbl2.h +++ b/drivers/bus/acpi/acpica/include/actbl2.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -69,7 +69,6 @@ #define ACPI_SIG_MPST "MPST" /* Memory Power State Table */ #define ACPI_SIG_MSCT "MSCT" /* Maximum System Characteristics Table */ #define ACPI_SIG_MSDM "MSDM" /* Microsoft Data Management Table */ -#define ACPI_SIG_MTMR "MTMR" /* MID Timer table */ #define ACPI_SIG_NFIT "NFIT" /* NVDIMM Firmware Interface Table */ #define ACPI_SIG_PCCT "PCCT" /* Platform Communications Channel Table */ #define ACPI_SIG_PDTT "PDTT" /* Platform Debug Trigger Table */ @@ -1136,34 +1135,6 @@ typedef struct acpi_table_msdm } ACPI_TABLE_MSDM; -/******************************************************************************* - * - * MTMR - MID Timer Table - * Version 1 - * - * Conforms to "Simple Firmware Interface Specification", - * Draft 0.8.2, Oct 19, 2010 - * NOTE: The ACPI MTMR is equivalent to the SFI MTMR table. - * - ******************************************************************************/ - -typedef struct acpi_table_mtmr -{ - ACPI_TABLE_HEADER Header; /* Common ACPI table header */ - -} ACPI_TABLE_MTMR; - -/* MTMR entry */ - -typedef struct acpi_mtmr_entry -{ - ACPI_GENERIC_ADDRESS PhysicalAddress; - UINT32 Frequency; - UINT32 Irq; - -} ACPI_MTMR_ENTRY; - - /******************************************************************************* * * NFIT - NVDIMM Interface Table (ACPI 6.0+) diff --git a/drivers/bus/acpi/acpica/include/actbl3.h b/drivers/bus/acpi/acpica/include/actbl3.h index 7a9c90917f3..c9f355da573 100644 --- a/drivers/bus/acpi/acpica/include/actbl3.h +++ b/drivers/bus/acpi/acpica/include/actbl3.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -69,7 +69,6 @@ #define ACPI_SIG_TCPA "TCPA" /* Trusted Computing Platform Alliance table */ #define ACPI_SIG_TPM2 "TPM2" /* Trusted Platform Module 2.0 H/W interface table */ #define ACPI_SIG_UEFI "UEFI" /* Uefi Boot Optimization Table */ -#define ACPI_SIG_VRTC "VRTC" /* Virtual Real Time Clock Table */ #define ACPI_SIG_WAET "WAET" /* Windows ACPI Emulated devices Table */ #define ACPI_SIG_WDAT "WDAT" /* Watchdog Action Table */ #define ACPI_SIG_WDDT "WDDT" /* Watchdog Timer Description Table */ @@ -575,33 +574,6 @@ typedef struct acpi_table_uefi } ACPI_TABLE_UEFI; -/******************************************************************************* - * - * VRTC - Virtual Real Time Clock Table - * Version 1 - * - * Conforms to "Simple Firmware Interface Specification", - * Draft 0.8.2, Oct 19, 2010 - * NOTE: The ACPI VRTC is equivalent to The SFI MRTC table. - * - ******************************************************************************/ - -typedef struct acpi_table_vrtc -{ - ACPI_TABLE_HEADER Header; /* Common ACPI table header */ - -} ACPI_TABLE_VRTC; - -/* VRTC entry */ - -typedef struct acpi_vrtc_entry -{ - ACPI_GENERIC_ADDRESS PhysicalAddress; - UINT32 Irq; - -} ACPI_VRTC_ENTRY; - - /******************************************************************************* * * WAET - Windows ACPI Emulated devices Table diff --git a/drivers/bus/acpi/acpica/include/actypes.h b/drivers/bus/acpi/acpica/include/actypes.h index e4d7be2ba69..6f018d7092d 100644 --- a/drivers/bus/acpi/acpica/include/actypes.h +++ b/drivers/bus/acpi/acpica/include/actypes.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acutils.h b/drivers/bus/acpi/acpica/include/acutils.h index f253c5a3f85..37227a08c0c 100644 --- a/drivers/bus/acpi/acpica/include/acutils.h +++ b/drivers/bus/acpi/acpica/include/acutils.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/acuuid.h b/drivers/bus/acpi/acpica/include/acuuid.h index fe84ff4c56a..78d284d04d2 100644 --- a/drivers/bus/acpi/acpica/include/acuuid.h +++ b/drivers/bus/acpi/acpica/include/acuuid.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/amlcode.h b/drivers/bus/acpi/acpica/include/amlcode.h index 500413fc71a..21b0871e70f 100644 --- a/drivers/bus/acpi/acpica/include/amlcode.h +++ b/drivers/bus/acpi/acpica/include/amlcode.h @@ -7,7 +7,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/amlresrc.h b/drivers/bus/acpi/acpica/include/amlresrc.h index ec4d2b6a855..222fe876697 100644 --- a/drivers/bus/acpi/acpica/include/amlresrc.h +++ b/drivers/bus/acpi/acpica/include/amlresrc.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/accygwin.h b/drivers/bus/acpi/acpica/include/platform/accygwin.h index 780aae70dbf..6b52f667cd0 100644 --- a/drivers/bus/acpi/acpica/include/platform/accygwin.h +++ b/drivers/bus/acpi/acpica/include/platform/accygwin.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acdragonfly.h b/drivers/bus/acpi/acpica/include/platform/acdragonfly.h index e6f9abdd488..578fba79282 100644 --- a/drivers/bus/acpi/acpica/include/platform/acdragonfly.h +++ b/drivers/bus/acpi/acpica/include/platform/acdragonfly.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acdragonflyex.h b/drivers/bus/acpi/acpica/include/platform/acdragonflyex.h index 4eb1baad024..7adfaf1092e 100644 --- a/drivers/bus/acpi/acpica/include/platform/acdragonflyex.h +++ b/drivers/bus/acpi/acpica/include/platform/acdragonflyex.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acefi.h b/drivers/bus/acpi/acpica/include/platform/acefi.h index d14faa830d9..ec00bf63cb5 100644 --- a/drivers/bus/acpi/acpica/include/platform/acefi.h +++ b/drivers/bus/acpi/acpica/include/platform/acefi.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acefiex.h b/drivers/bus/acpi/acpica/include/platform/acefiex.h index ef129b02907..746d8e2daf1 100644 --- a/drivers/bus/acpi/acpica/include/platform/acefiex.h +++ b/drivers/bus/acpi/acpica/include/platform/acefiex.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acenv.h b/drivers/bus/acpi/acpica/include/platform/acenv.h index 94fdf62b75c..df57790d57d 100644 --- a/drivers/bus/acpi/acpica/include/platform/acenv.h +++ b/drivers/bus/acpi/acpica/include/platform/acenv.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acenvex.h b/drivers/bus/acpi/acpica/include/platform/acenvex.h index 5950d99a747..018c4384976 100644 --- a/drivers/bus/acpi/acpica/include/platform/acenvex.h +++ b/drivers/bus/acpi/acpica/include/platform/acenvex.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acfreebsd.h b/drivers/bus/acpi/acpica/include/platform/acfreebsd.h index 785f8531333..9468c86b0ed 100644 --- a/drivers/bus/acpi/acpica/include/platform/acfreebsd.h +++ b/drivers/bus/acpi/acpica/include/platform/acfreebsd.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acgcc.h b/drivers/bus/acpi/acpica/include/platform/acgcc.h index 9fa10fd6139..471039a4deb 100644 --- a/drivers/bus/acpi/acpica/include/platform/acgcc.h +++ b/drivers/bus/acpi/acpica/include/platform/acgcc.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acgccex.h b/drivers/bus/acpi/acpica/include/platform/acgccex.h index af7a9d05f94..6f65b14fa61 100644 --- a/drivers/bus/acpi/acpica/include/platform/acgccex.h +++ b/drivers/bus/acpi/acpica/include/platform/acgccex.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/achaiku.h b/drivers/bus/acpi/acpica/include/platform/achaiku.h index 3eda489411b..16618404d07 100644 --- a/drivers/bus/acpi/acpica/include/platform/achaiku.h +++ b/drivers/bus/acpi/acpica/include/platform/achaiku.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acintel.h b/drivers/bus/acpi/acpica/include/platform/acintel.h index f6088265ef0..561404b08a1 100644 --- a/drivers/bus/acpi/acpica/include/platform/acintel.h +++ b/drivers/bus/acpi/acpica/include/platform/acintel.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/aclinux.h b/drivers/bus/acpi/acpica/include/platform/aclinux.h index 011347c80e5..4efa40d005b 100644 --- a/drivers/bus/acpi/acpica/include/platform/aclinux.h +++ b/drivers/bus/acpi/acpica/include/platform/aclinux.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/aclinuxex.h b/drivers/bus/acpi/acpica/include/platform/aclinuxex.h index da2b3f22df5..13399795066 100644 --- a/drivers/bus/acpi/acpica/include/platform/aclinuxex.h +++ b/drivers/bus/acpi/acpica/include/platform/aclinuxex.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acmacosx.h b/drivers/bus/acpi/acpica/include/platform/acmacosx.h index 2d43e4bb48a..8d215e0f37b 100644 --- a/drivers/bus/acpi/acpica/include/platform/acmacosx.h +++ b/drivers/bus/acpi/acpica/include/platform/acmacosx.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acmsvc.h b/drivers/bus/acpi/acpica/include/platform/acmsvc.h index aa3492e087d..8b37cae996c 100644 --- a/drivers/bus/acpi/acpica/include/platform/acmsvc.h +++ b/drivers/bus/acpi/acpica/include/platform/acmsvc.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acmsvcex.h b/drivers/bus/acpi/acpica/include/platform/acmsvcex.h index 1154ee010b6..575ccb36935 100644 --- a/drivers/bus/acpi/acpica/include/platform/acmsvcex.h +++ b/drivers/bus/acpi/acpica/include/platform/acmsvcex.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acnetbsd.h b/drivers/bus/acpi/acpica/include/platform/acnetbsd.h index 7a8ca402e04..355114637a6 100644 --- a/drivers/bus/acpi/acpica/include/platform/acnetbsd.h +++ b/drivers/bus/acpi/acpica/include/platform/acnetbsd.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acos2.h b/drivers/bus/acpi/acpica/include/platform/acos2.h index f644545148a..0c1bf273bd5 100644 --- a/drivers/bus/acpi/acpica/include/platform/acos2.h +++ b/drivers/bus/acpi/acpica/include/platform/acos2.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acqnx.h b/drivers/bus/acpi/acpica/include/platform/acqnx.h index 16c6373ca24..28ddcf32e95 100644 --- a/drivers/bus/acpi/acpica/include/platform/acqnx.h +++ b/drivers/bus/acpi/acpica/include/platform/acqnx.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acwin.h b/drivers/bus/acpi/acpica/include/platform/acwin.h index 312b441a1cf..dbbf85d578d 100644 --- a/drivers/bus/acpi/acpica/include/platform/acwin.h +++ b/drivers/bus/acpi/acpica/include/platform/acwin.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/include/platform/acwin64.h b/drivers/bus/acpi/acpica/include/platform/acwin64.h index efa4915e8d6..6f545e92b5d 100644 --- a/drivers/bus/acpi/acpica/include/platform/acwin64.h +++ b/drivers/bus/acpi/acpica/include/platform/acwin64.h @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsaccess.c b/drivers/bus/acpi/acpica/namespace/nsaccess.c index ba976d37ef3..ae1470d37fe 100644 --- a/drivers/bus/acpi/acpica/namespace/nsaccess.c +++ b/drivers/bus/acpi/acpica/namespace/nsaccess.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsalloc.c b/drivers/bus/acpi/acpica/namespace/nsalloc.c index 8d94a7f0694..d156feb8afc 100644 --- a/drivers/bus/acpi/acpica/namespace/nsalloc.c +++ b/drivers/bus/acpi/acpica/namespace/nsalloc.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsarguments.c b/drivers/bus/acpi/acpica/namespace/nsarguments.c index 892e5f31d30..f6337eb3969 100644 --- a/drivers/bus/acpi/acpica/namespace/nsarguments.c +++ b/drivers/bus/acpi/acpica/namespace/nsarguments.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsconvert.c b/drivers/bus/acpi/acpica/namespace/nsconvert.c index e98f3e668ba..3bf108a2498 100644 --- a/drivers/bus/acpi/acpica/namespace/nsconvert.c +++ b/drivers/bus/acpi/acpica/namespace/nsconvert.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsdump.c b/drivers/bus/acpi/acpica/namespace/nsdump.c index 44d4615ee32..b950812412c 100644 --- a/drivers/bus/acpi/acpica/namespace/nsdump.c +++ b/drivers/bus/acpi/acpica/namespace/nsdump.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsdumpdv.c b/drivers/bus/acpi/acpica/namespace/nsdumpdv.c index d8bdb542c9b..817168df2bb 100644 --- a/drivers/bus/acpi/acpica/namespace/nsdumpdv.c +++ b/drivers/bus/acpi/acpica/namespace/nsdumpdv.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nseval.c b/drivers/bus/acpi/acpica/namespace/nseval.c index 3c125edae10..1ab4b4f7e8d 100644 --- a/drivers/bus/acpi/acpica/namespace/nseval.c +++ b/drivers/bus/acpi/acpica/namespace/nseval.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsinit.c b/drivers/bus/acpi/acpica/namespace/nsinit.c index ac28627c982..c24b7efce03 100644 --- a/drivers/bus/acpi/acpica/namespace/nsinit.c +++ b/drivers/bus/acpi/acpica/namespace/nsinit.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsload.c b/drivers/bus/acpi/acpica/namespace/nsload.c index 66511f19eed..2ab3a878682 100644 --- a/drivers/bus/acpi/acpica/namespace/nsload.c +++ b/drivers/bus/acpi/acpica/namespace/nsload.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsnames.c b/drivers/bus/acpi/acpica/namespace/nsnames.c index ef3108e328a..ec048ea3268 100644 --- a/drivers/bus/acpi/acpica/namespace/nsnames.c +++ b/drivers/bus/acpi/acpica/namespace/nsnames.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsobject.c b/drivers/bus/acpi/acpica/namespace/nsobject.c index 4f4aaf82496..2c50e90d64b 100644 --- a/drivers/bus/acpi/acpica/namespace/nsobject.c +++ b/drivers/bus/acpi/acpica/namespace/nsobject.c @@ -6,7 +6,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsparse.c b/drivers/bus/acpi/acpica/namespace/nsparse.c index cc7af59ed7f..808214bcbd7 100644 --- a/drivers/bus/acpi/acpica/namespace/nsparse.c +++ b/drivers/bus/acpi/acpica/namespace/nsparse.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nspredef.c b/drivers/bus/acpi/acpica/namespace/nspredef.c index cf0e8cb3e3b..398f5dc50e3 100644 --- a/drivers/bus/acpi/acpica/namespace/nspredef.c +++ b/drivers/bus/acpi/acpica/namespace/nspredef.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsprepkg.c b/drivers/bus/acpi/acpica/namespace/nsprepkg.c index ef86e59ee56..89973bce7a5 100644 --- a/drivers/bus/acpi/acpica/namespace/nsprepkg.c +++ b/drivers/bus/acpi/acpica/namespace/nsprepkg.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsrepair.c b/drivers/bus/acpi/acpica/namespace/nsrepair.c index 97168701a6a..9f9e53bec8b 100644 --- a/drivers/bus/acpi/acpica/namespace/nsrepair.c +++ b/drivers/bus/acpi/acpica/namespace/nsrepair.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsrepair2.c b/drivers/bus/acpi/acpica/namespace/nsrepair2.c index 833d2287c29..a8bd9ba046c 100644 --- a/drivers/bus/acpi/acpica/namespace/nsrepair2.c +++ b/drivers/bus/acpi/acpica/namespace/nsrepair2.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nssearch.c b/drivers/bus/acpi/acpica/namespace/nssearch.c index 8c4d974ef90..05a5a1681e3 100644 --- a/drivers/bus/acpi/acpica/namespace/nssearch.c +++ b/drivers/bus/acpi/acpica/namespace/nssearch.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsutils.c b/drivers/bus/acpi/acpica/namespace/nsutils.c index 53f8e4e8dbc..836db0a59b6 100644 --- a/drivers/bus/acpi/acpica/namespace/nsutils.c +++ b/drivers/bus/acpi/acpica/namespace/nsutils.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nswalk.c b/drivers/bus/acpi/acpica/namespace/nswalk.c index bf7b1ab6886..6ccfc33edef 100644 --- a/drivers/bus/acpi/acpica/namespace/nswalk.c +++ b/drivers/bus/acpi/acpica/namespace/nswalk.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsxfeval.c b/drivers/bus/acpi/acpica/namespace/nsxfeval.c index 37d2249676b..1ad4a171ffb 100644 --- a/drivers/bus/acpi/acpica/namespace/nsxfeval.c +++ b/drivers/bus/acpi/acpica/namespace/nsxfeval.c @@ -6,7 +6,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsxfname.c b/drivers/bus/acpi/acpica/namespace/nsxfname.c index 17c0aad7afe..7fe4945a2c5 100644 --- a/drivers/bus/acpi/acpica/namespace/nsxfname.c +++ b/drivers/bus/acpi/acpica/namespace/nsxfname.c @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/namespace/nsxfobj.c b/drivers/bus/acpi/acpica/namespace/nsxfobj.c index 5fe4f9bd2b6..c5c956fbc2d 100644 --- a/drivers/bus/acpi/acpica/namespace/nsxfobj.c +++ b/drivers/bus/acpi/acpica/namespace/nsxfobj.c @@ -6,7 +6,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/psargs.c b/drivers/bus/acpi/acpica/parser/psargs.c index 1cad0db40f3..6776450c25e 100644 --- a/drivers/bus/acpi/acpica/parser/psargs.c +++ b/drivers/bus/acpi/acpica/parser/psargs.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/psloop.c b/drivers/bus/acpi/acpica/parser/psloop.c index 305af2305e8..7b58334cbd5 100644 --- a/drivers/bus/acpi/acpica/parser/psloop.c +++ b/drivers/bus/acpi/acpica/parser/psloop.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/psobject.c b/drivers/bus/acpi/acpica/parser/psobject.c index ede5578edec..bfccd9062ad 100644 --- a/drivers/bus/acpi/acpica/parser/psobject.c +++ b/drivers/bus/acpi/acpica/parser/psobject.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/psopcode.c b/drivers/bus/acpi/acpica/parser/psopcode.c index 2426a3a767b..c1e79ae90c9 100644 --- a/drivers/bus/acpi/acpica/parser/psopcode.c +++ b/drivers/bus/acpi/acpica/parser/psopcode.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/psopinfo.c b/drivers/bus/acpi/acpica/parser/psopinfo.c index 3b2e3756590..e7a83c10a30 100644 --- a/drivers/bus/acpi/acpica/parser/psopinfo.c +++ b/drivers/bus/acpi/acpica/parser/psopinfo.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/psparse.c b/drivers/bus/acpi/acpica/parser/psparse.c index 9d934d35108..4e3a4df2c22 100644 --- a/drivers/bus/acpi/acpica/parser/psparse.c +++ b/drivers/bus/acpi/acpica/parser/psparse.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/psscope.c b/drivers/bus/acpi/acpica/parser/psscope.c index 90e6937fdc6..99a97fe7fec 100644 --- a/drivers/bus/acpi/acpica/parser/psscope.c +++ b/drivers/bus/acpi/acpica/parser/psscope.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/pstree.c b/drivers/bus/acpi/acpica/parser/pstree.c index 17b5d091417..e7e8ba5ee78 100644 --- a/drivers/bus/acpi/acpica/parser/pstree.c +++ b/drivers/bus/acpi/acpica/parser/pstree.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/psutils.c b/drivers/bus/acpi/acpica/parser/psutils.c index 430e571049a..e99c96d1d2f 100644 --- a/drivers/bus/acpi/acpica/parser/psutils.c +++ b/drivers/bus/acpi/acpica/parser/psutils.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/pswalk.c b/drivers/bus/acpi/acpica/parser/pswalk.c index b856e51bf10..ea0b5963cac 100644 --- a/drivers/bus/acpi/acpica/parser/pswalk.c +++ b/drivers/bus/acpi/acpica/parser/pswalk.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/parser/psxface.c b/drivers/bus/acpi/acpica/parser/psxface.c index 011b4d2585f..beba31cbb63 100644 --- a/drivers/bus/acpi/acpica/parser/psxface.c +++ b/drivers/bus/acpi/acpica/parser/psxface.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsaddr.c b/drivers/bus/acpi/acpica/resources/rsaddr.c index 9192b3fdae3..4ce9326f997 100644 --- a/drivers/bus/acpi/acpica/resources/rsaddr.c +++ b/drivers/bus/acpi/acpica/resources/rsaddr.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rscalc.c b/drivers/bus/acpi/acpica/resources/rscalc.c index 73a0c507fea..1ff28703474 100644 --- a/drivers/bus/acpi/acpica/resources/rscalc.c +++ b/drivers/bus/acpi/acpica/resources/rscalc.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rscreate.c b/drivers/bus/acpi/acpica/resources/rscreate.c index a2aa9bf8e7b..bd00d559098 100644 --- a/drivers/bus/acpi/acpica/resources/rscreate.c +++ b/drivers/bus/acpi/acpica/resources/rscreate.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsdump.c b/drivers/bus/acpi/acpica/resources/rsdump.c index ed94121ab45..275590231f2 100644 --- a/drivers/bus/acpi/acpica/resources/rsdump.c +++ b/drivers/bus/acpi/acpica/resources/rsdump.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsdumpinfo.c b/drivers/bus/acpi/acpica/resources/rsdumpinfo.c index e212e9b2356..cfaa2ae85b2 100644 --- a/drivers/bus/acpi/acpica/resources/rsdumpinfo.c +++ b/drivers/bus/acpi/acpica/resources/rsdumpinfo.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsinfo.c b/drivers/bus/acpi/acpica/resources/rsinfo.c index 9627ea69b6b..d46b7efebec 100644 --- a/drivers/bus/acpi/acpica/resources/rsinfo.c +++ b/drivers/bus/acpi/acpica/resources/rsinfo.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsio.c b/drivers/bus/acpi/acpica/resources/rsio.c index fa9e9e0f81d..9b789be898f 100644 --- a/drivers/bus/acpi/acpica/resources/rsio.c +++ b/drivers/bus/acpi/acpica/resources/rsio.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsirq.c b/drivers/bus/acpi/acpica/resources/rsirq.c index b32014321e7..d7524fd49ac 100644 --- a/drivers/bus/acpi/acpica/resources/rsirq.c +++ b/drivers/bus/acpi/acpica/resources/rsirq.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rslist.c b/drivers/bus/acpi/acpica/resources/rslist.c index 2815d21bab1..34583223718 100644 --- a/drivers/bus/acpi/acpica/resources/rslist.c +++ b/drivers/bus/acpi/acpica/resources/rslist.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsmemory.c b/drivers/bus/acpi/acpica/resources/rsmemory.c index a2a5036a6ec..56d974a8367 100644 --- a/drivers/bus/acpi/acpica/resources/rsmemory.c +++ b/drivers/bus/acpi/acpica/resources/rsmemory.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsmisc.c b/drivers/bus/acpi/acpica/resources/rsmisc.c index 8b62330f5ab..27c87a92090 100644 --- a/drivers/bus/acpi/acpica/resources/rsmisc.c +++ b/drivers/bus/acpi/acpica/resources/rsmisc.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsserial.c b/drivers/bus/acpi/acpica/resources/rsserial.c index a4f3d2d2b79..734a08979a2 100644 --- a/drivers/bus/acpi/acpica/resources/rsserial.c +++ b/drivers/bus/acpi/acpica/resources/rsserial.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsutils.c b/drivers/bus/acpi/acpica/resources/rsutils.c index 369379924e4..31fa472aa74 100644 --- a/drivers/bus/acpi/acpica/resources/rsutils.c +++ b/drivers/bus/acpi/acpica/resources/rsutils.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/resources/rsxface.c b/drivers/bus/acpi/acpica/resources/rsxface.c index bcfcbf98629..f4dd8214f58 100644 --- a/drivers/bus/acpi/acpica/resources/rsxface.c +++ b/drivers/bus/acpi/acpica/resources/rsxface.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/tables/tbdata.c b/drivers/bus/acpi/acpica/tables/tbdata.c index 12f117ff15c..262b47b7323 100644 --- a/drivers/bus/acpi/acpica/tables/tbdata.c +++ b/drivers/bus/acpi/acpica/tables/tbdata.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/tables/tbfadt.c b/drivers/bus/acpi/acpica/tables/tbfadt.c index 96638498597..b7daa3e3e0f 100644 --- a/drivers/bus/acpi/acpica/tables/tbfadt.c +++ b/drivers/bus/acpi/acpica/tables/tbfadt.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/tables/tbfind.c b/drivers/bus/acpi/acpica/tables/tbfind.c index c81be9997f3..86dd204dcff 100644 --- a/drivers/bus/acpi/acpica/tables/tbfind.c +++ b/drivers/bus/acpi/acpica/tables/tbfind.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/tables/tbinstal.c b/drivers/bus/acpi/acpica/tables/tbinstal.c index 0f36dad5fa4..88a0bba8923 100644 --- a/drivers/bus/acpi/acpica/tables/tbinstal.c +++ b/drivers/bus/acpi/acpica/tables/tbinstal.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/tables/tbprint.c b/drivers/bus/acpi/acpica/tables/tbprint.c index 3e93f308eaa..9e7a7251372 100644 --- a/drivers/bus/acpi/acpica/tables/tbprint.c +++ b/drivers/bus/acpi/acpica/tables/tbprint.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/tables/tbutils.c b/drivers/bus/acpi/acpica/tables/tbutils.c index 7959d53f41b..607c597a7f7 100644 --- a/drivers/bus/acpi/acpica/tables/tbutils.c +++ b/drivers/bus/acpi/acpica/tables/tbutils.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/tables/tbxface.c b/drivers/bus/acpi/acpica/tables/tbxface.c index 38908e4a7e7..258a657ebf9 100644 --- a/drivers/bus/acpi/acpica/tables/tbxface.c +++ b/drivers/bus/acpi/acpica/tables/tbxface.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/tables/tbxfload.c b/drivers/bus/acpi/acpica/tables/tbxfload.c index 41cdb72403e..cab52988d5c 100644 --- a/drivers/bus/acpi/acpica/tables/tbxfload.c +++ b/drivers/bus/acpi/acpica/tables/tbxfload.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/tables/tbxfroot.c b/drivers/bus/acpi/acpica/tables/tbxfroot.c index b6510f265ef..2e07129b741 100644 --- a/drivers/bus/acpi/acpica/tables/tbxfroot.c +++ b/drivers/bus/acpi/acpica/tables/tbxfroot.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utaddress.c b/drivers/bus/acpi/acpica/utilities/utaddress.c index d55d3c1c84a..05fbbeaaa00 100644 --- a/drivers/bus/acpi/acpica/utilities/utaddress.c +++ b/drivers/bus/acpi/acpica/utilities/utaddress.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utalloc.c b/drivers/bus/acpi/acpica/utilities/utalloc.c index 61c3dfa2066..1f470632a96 100644 --- a/drivers/bus/acpi/acpica/utilities/utalloc.c +++ b/drivers/bus/acpi/acpica/utilities/utalloc.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utascii.c b/drivers/bus/acpi/acpica/utilities/utascii.c index bff02c8fef1..6f5b2d7e7cb 100644 --- a/drivers/bus/acpi/acpica/utilities/utascii.c +++ b/drivers/bus/acpi/acpica/utilities/utascii.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utbuffer.c b/drivers/bus/acpi/acpica/utilities/utbuffer.c index 6e53d16ecb5..84ad19b3c70 100644 --- a/drivers/bus/acpi/acpica/utilities/utbuffer.c +++ b/drivers/bus/acpi/acpica/utilities/utbuffer.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utcache.c b/drivers/bus/acpi/acpica/utilities/utcache.c index 3881ca83150..e1b10e85a7b 100644 --- a/drivers/bus/acpi/acpica/utilities/utcache.c +++ b/drivers/bus/acpi/acpica/utilities/utcache.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utclib.c b/drivers/bus/acpi/acpica/utilities/utclib.c index a604bfac43d..d03d1433a78 100644 --- a/drivers/bus/acpi/acpica/utilities/utclib.c +++ b/drivers/bus/acpi/acpica/utilities/utclib.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utcopy.c b/drivers/bus/acpi/acpica/utilities/utcopy.c index c822d3f6257..ee51c47fa1c 100644 --- a/drivers/bus/acpi/acpica/utilities/utcopy.c +++ b/drivers/bus/acpi/acpica/utilities/utcopy.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utdebug.c b/drivers/bus/acpi/acpica/utilities/utdebug.c index 9966078d48e..afcb7d022be 100644 --- a/drivers/bus/acpi/acpica/utilities/utdebug.c +++ b/drivers/bus/acpi/acpica/utilities/utdebug.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utdecode.c b/drivers/bus/acpi/acpica/utilities/utdecode.c index 3c8550033a8..13ee2205310 100644 --- a/drivers/bus/acpi/acpica/utilities/utdecode.c +++ b/drivers/bus/acpi/acpica/utilities/utdecode.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utdelete.c b/drivers/bus/acpi/acpica/utilities/utdelete.c index d7bcaff00eb..8d1dc7689e3 100644 --- a/drivers/bus/acpi/acpica/utilities/utdelete.c +++ b/drivers/bus/acpi/acpica/utilities/utdelete.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/uterror.c b/drivers/bus/acpi/acpica/utilities/uterror.c index 7e25e73e125..1f038f24f95 100644 --- a/drivers/bus/acpi/acpica/utilities/uterror.c +++ b/drivers/bus/acpi/acpica/utilities/uterror.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/uteval.c b/drivers/bus/acpi/acpica/utilities/uteval.c index 0e1156b739e..f6a60263869 100644 --- a/drivers/bus/acpi/acpica/utilities/uteval.c +++ b/drivers/bus/acpi/acpica/utilities/uteval.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utexcep.c b/drivers/bus/acpi/acpica/utilities/utexcep.c index 116a5b8a9e5..9ccf29e6df0 100644 --- a/drivers/bus/acpi/acpica/utilities/utexcep.c +++ b/drivers/bus/acpi/acpica/utilities/utexcep.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utglobal.c b/drivers/bus/acpi/acpica/utilities/utglobal.c index 2adb023dc04..511e1213825 100644 --- a/drivers/bus/acpi/acpica/utilities/utglobal.c +++ b/drivers/bus/acpi/acpica/utilities/utglobal.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/uthex.c b/drivers/bus/acpi/acpica/utilities/uthex.c index 8774bdf6965..26a64dada23 100644 --- a/drivers/bus/acpi/acpica/utilities/uthex.c +++ b/drivers/bus/acpi/acpica/utilities/uthex.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utids.c b/drivers/bus/acpi/acpica/utilities/utids.c index c857f040b74..b9d84f92b4f 100644 --- a/drivers/bus/acpi/acpica/utilities/utids.c +++ b/drivers/bus/acpi/acpica/utilities/utids.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utinit.c b/drivers/bus/acpi/acpica/utilities/utinit.c index 9ce3766559c..ad0d1566a2b 100644 --- a/drivers/bus/acpi/acpica/utilities/utinit.c +++ b/drivers/bus/acpi/acpica/utilities/utinit.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utlock.c b/drivers/bus/acpi/acpica/utilities/utlock.c index 8bf6d4794b9..9b66678a167 100644 --- a/drivers/bus/acpi/acpica/utilities/utlock.c +++ b/drivers/bus/acpi/acpica/utilities/utlock.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utmath.c b/drivers/bus/acpi/acpica/utilities/utmath.c index 85acadd7069..20a9882708b 100644 --- a/drivers/bus/acpi/acpica/utilities/utmath.c +++ b/drivers/bus/acpi/acpica/utilities/utmath.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utmisc.c b/drivers/bus/acpi/acpica/utilities/utmisc.c index a25d274c91e..fc5d63252d8 100644 --- a/drivers/bus/acpi/acpica/utilities/utmisc.c +++ b/drivers/bus/acpi/acpica/utilities/utmisc.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utmutex.c b/drivers/bus/acpi/acpica/utilities/utmutex.c index 639efd687d8..81668c374f1 100644 --- a/drivers/bus/acpi/acpica/utilities/utmutex.c +++ b/drivers/bus/acpi/acpica/utilities/utmutex.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utnonansi.c b/drivers/bus/acpi/acpica/utilities/utnonansi.c index b5111a88087..340bdd71234 100644 --- a/drivers/bus/acpi/acpica/utilities/utnonansi.c +++ b/drivers/bus/acpi/acpica/utilities/utnonansi.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utobject.c b/drivers/bus/acpi/acpica/utilities/utobject.c index 775361fafab..a16de16daff 100644 --- a/drivers/bus/acpi/acpica/utilities/utobject.c +++ b/drivers/bus/acpi/acpica/utilities/utobject.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utosi.c b/drivers/bus/acpi/acpica/utilities/utosi.c index a00b7b94199..a4e349269f3 100644 --- a/drivers/bus/acpi/acpica/utilities/utosi.c +++ b/drivers/bus/acpi/acpica/utilities/utosi.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utownerid.c b/drivers/bus/acpi/acpica/utilities/utownerid.c index 9697a7e6b85..bc91e0a8ede 100644 --- a/drivers/bus/acpi/acpica/utilities/utownerid.c +++ b/drivers/bus/acpi/acpica/utilities/utownerid.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utpredef.c b/drivers/bus/acpi/acpica/utilities/utpredef.c index a5e57f01bc5..a380f4ed5d6 100644 --- a/drivers/bus/acpi/acpica/utilities/utpredef.c +++ b/drivers/bus/acpi/acpica/utilities/utpredef.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utprint.c b/drivers/bus/acpi/acpica/utilities/utprint.c index 89c1d3bda57..802e8052132 100644 --- a/drivers/bus/acpi/acpica/utilities/utprint.c +++ b/drivers/bus/acpi/acpica/utilities/utprint.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utresdecode.c b/drivers/bus/acpi/acpica/utilities/utresdecode.c index 1e07f08c523..bf387bf63d9 100644 --- a/drivers/bus/acpi/acpica/utilities/utresdecode.c +++ b/drivers/bus/acpi/acpica/utilities/utresdecode.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utresrc.c b/drivers/bus/acpi/acpica/utilities/utresrc.c index 0137e5df576..8e34312dde6 100644 --- a/drivers/bus/acpi/acpica/utilities/utresrc.c +++ b/drivers/bus/acpi/acpica/utilities/utresrc.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utstate.c b/drivers/bus/acpi/acpica/utilities/utstate.c index 4b97a564a9e..ccf5dff379a 100644 --- a/drivers/bus/acpi/acpica/utilities/utstate.c +++ b/drivers/bus/acpi/acpica/utilities/utstate.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utstring.c b/drivers/bus/acpi/acpica/utilities/utstring.c index a59723f35f6..b035fe770b8 100644 --- a/drivers/bus/acpi/acpica/utilities/utstring.c +++ b/drivers/bus/acpi/acpica/utilities/utstring.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utstrsuppt.c b/drivers/bus/acpi/acpica/utilities/utstrsuppt.c index 9f9ae123c0d..f38ec3570b3 100644 --- a/drivers/bus/acpi/acpica/utilities/utstrsuppt.c +++ b/drivers/bus/acpi/acpica/utilities/utstrsuppt.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utstrtoul64.c b/drivers/bus/acpi/acpica/utilities/utstrtoul64.c index 60cb80f792b..2e55b2c8e5f 100644 --- a/drivers/bus/acpi/acpica/utilities/utstrtoul64.c +++ b/drivers/bus/acpi/acpica/utilities/utstrtoul64.c @@ -6,7 +6,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/uttrack.c b/drivers/bus/acpi/acpica/utilities/uttrack.c index d79c1028dc1..aae2e0c6108 100644 --- a/drivers/bus/acpi/acpica/utilities/uttrack.c +++ b/drivers/bus/acpi/acpica/utilities/uttrack.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utuuid.c b/drivers/bus/acpi/acpica/utilities/utuuid.c index f3443acf7b1..be5f289992a 100644 --- a/drivers/bus/acpi/acpica/utilities/utuuid.c +++ b/drivers/bus/acpi/acpica/utilities/utuuid.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utxface.c b/drivers/bus/acpi/acpica/utilities/utxface.c index 2f9f7e24727..c870f17040f 100644 --- a/drivers/bus/acpi/acpica/utilities/utxface.c +++ b/drivers/bus/acpi/acpica/utilities/utxface.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utxferror.c b/drivers/bus/acpi/acpica/utilities/utxferror.c index 718c02fed7a..9b27ef857af 100644 --- a/drivers/bus/acpi/acpica/utilities/utxferror.c +++ b/drivers/bus/acpi/acpica/utilities/utxferror.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utxfinit.c b/drivers/bus/acpi/acpica/utilities/utxfinit.c index f8a44185bec..e66d596727a 100644 --- a/drivers/bus/acpi/acpica/utilities/utxfinit.c +++ b/drivers/bus/acpi/acpica/utilities/utxfinit.c @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/drivers/bus/acpi/acpica/utilities/utxfmutex.c b/drivers/bus/acpi/acpica/utilities/utxfmutex.c index 9929c081724..480f2ce4ddb 100644 --- a/drivers/bus/acpi/acpica/utilities/utxfmutex.c +++ b/drivers/bus/acpi/acpica/utilities/utxfmutex.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2020, Intel Corp. + * Copyright (C) 2000 - 2021, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 745f329f1bd..15ddc5b9461 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -69,7 +69,7 @@ URL: https://gitlab.freedesktop.org/mesa/glu, ftp://ftp.freedesktop.org/pub/mesa Title: ACPICA Path: drivers/bus/acpi/acpica -Used Version: 20201217 +Used Version: 20210105 License: GPL-2.0 (https://spdx.org/licenses/GPL-2.0.html) URL: https://acpica.org/

1 0

[reactos] 01/01: [DSOUND] Don't force status to failure by default in primarybuffer_SetFormat (#3911)
by Oleg Dubinskiy 10 Sep '21

10 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=183566ee584efbe6377c7… commit 183566ee584efbe6377c79e68bfe24b2d1f940ae Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Sun Aug 15 17:06:56 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Sep 11 01:58:03 2021 +0300 [DSOUND] Don't force status to failure by default in primarybuffer_SetFormat (#3911) Don't force HRESULT status to DSERR_BUFFERLOST by default in primarybuffer_SetFormat function. Assign to it S_OK instead, as done in current Wine: https://source.winehq.org/git/wine.git/blob/a8583acae9548e6340d8400ec771013… That variable is already set to failure in other appropriate place, when this is indeed needed: https://git.reactos.org/?p=reactos.git;a=blob;h=b04a526929e4e817ff63aa65253… The assigned failure status caused executing failure handling code even when the fail actually didn't happen. In particular, DSOUND_ReopenDevice failed on waveOutOpen call when calling this was not needed. After my changes, it's called only when needed, i. e., only when the actual failure happens Otherwise, if all goes good, that code is not called, so the data is transfered successfully and the function is working correctly. It fixes non-working playback in QMMP 0.11.1 (via DirectSound ouput plugin) and AIMP 3.10 and newer versions. Also it improves the DirectSound test results from MS DxDiag: now all 4 available tests are passing successfully, instead of only 2. Other dsound issues also might be fixed as well. CORE-10907 CORE-14783 --- dll/directx/wine/dsound/primary.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/directx/wine/dsound/primary.c b/dll/directx/wine/dsound/primary.c index b04a526929e..9f8ecf8e593 100644 --- a/dll/directx/wine/dsound/primary.c +++ b/dll/directx/wine/dsound/primary.c @@ -459,7 +459,7 @@ LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex) { - HRESULT err = DSERR_BUFFERLOST; + HRESULT err = S_OK; int i; DWORD nSamplesPerSec, bpp, chans; LPWAVEFORMATEX oldpwfx;

1 0

[reactos] 01/01: [IMM32] Restructure! (Retry) (#3952)
by Katayama Hirofumi MZ 10 Sep '21

10 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b4557a60a98b4d188c058… commit b4557a60a98b4d188c058388395177b36994572e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 10 23:39:15 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 10 23:39:15 2021 +0900 [IMM32] Restructure! (Retry) (#3952) The imm.c file became big and bloated, so we split the source file. CORE-11700 - Split the IMM32 code and do formatting. --- dll/win32/imm32/CMakeLists.txt | 15 +- dll/win32/imm32/candidate.c | 406 ++++ dll/win32/imm32/guideline.c | 198 ++ dll/win32/imm32/ime.c | 1201 +++++++++++ dll/win32/imm32/imm.c | 4507 +++++----------------------------------- dll/win32/imm32/keymsg.c | 688 ++++++ dll/win32/imm32/nt3.c | 205 ++ dll/win32/imm32/precomp.h | 103 + dll/win32/imm32/regword.c | 520 +++++ dll/win32/imm32/utils.c | 276 +++ 10 files changed, 4103 insertions(+), 4016 deletions(-) diff --git a/dll/win32/imm32/CMakeLists.txt b/dll/win32/imm32/CMakeLists.txt index 9ccdcd26f20..bb50a71ab63 100644 --- a/dll/win32/imm32/CMakeLists.txt +++ b/dll/win32/imm32/CMakeLists.txt @@ -1,14 +1,21 @@ -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) -add_definitions(-D__WINESRC__) +include_directories( + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine + ${REACTOS_SOURCE_DIR}/win32ss/include) -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D__WINESRC__) spec2def(imm32.dll imm32.spec ADD_IMPORTLIB) list(APPEND SOURCE + candidate.c + guideline.c + ime.c imm.c + keymsg.c + nt3.c + regword.c + utils.c ${CMAKE_CURRENT_BINARY_DIR}/imm32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/imm32.def) diff --git a/dll/win32/imm32/candidate.c b/dll/win32/imm32/candidate.c new file mode 100644 index 00000000000..43f4e8d03c1 --- /dev/null +++ b/dll/win32/imm32/candidate.c @@ -0,0 +1,406 @@ +/* + * PROJECT: ReactOS IMM32 + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Implementing IMM32 candidate lists + * COPYRIGHT: Copyright 2020-2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(imm); + +DWORD APIENTRY +CandidateListWideToAnsi(const CANDIDATELIST *pWideCL, LPCANDIDATELIST pAnsiCL, DWORD dwBufLen, + UINT uCodePage) +{ + BOOL bUsedDefault; + DWORD dwSize, dwIndex, cbGot, cbLeft; + const BYTE *pbWide; + LPBYTE pbAnsi; + LPDWORD pibOffsets; + + /* calculate total ansi size */ + if (pWideCL->dwCount > 0) + { + dwSize = sizeof(CANDIDATELIST) + ((pWideCL->dwCount - 1) * sizeof(DWORD)); + for (dwIndex = 0; dwIndex < pWideCL->dwCount; ++dwIndex) + { + pbWide = (const BYTE *)pWideCL + pWideCL->dwOffset[dwIndex]; + cbGot = WideCharToMultiByte(uCodePage, 0, (LPCWSTR)pbWide, -1, NULL, 0, + NULL, &bUsedDefault); + dwSize += cbGot; + } + } + else + { + dwSize = sizeof(CANDIDATELIST); + } + + dwSize = ROUNDUP4(dwSize); + if (dwBufLen == 0) + return dwSize; + if (dwBufLen < dwSize) + return 0; + + /* store to ansi */ + pAnsiCL->dwSize = dwBufLen; + pAnsiCL->dwStyle = pWideCL->dwStyle; + pAnsiCL->dwCount = pWideCL->dwCount; + pAnsiCL->dwSelection = pWideCL->dwSelection; + pAnsiCL->dwPageStart = pWideCL->dwPageStart; + pAnsiCL->dwPageSize = pWideCL->dwPageSize; + + pibOffsets = pAnsiCL->dwOffset; + if (pWideCL->dwCount > 0) + { + pibOffsets[0] = sizeof(CANDIDATELIST) + ((pWideCL->dwCount - 1) * sizeof(DWORD)); + cbLeft = dwBufLen - pibOffsets[0]; + + for (dwIndex = 0; dwIndex < pWideCL->dwCount; ++dwIndex) + { + pbWide = (const BYTE *)pWideCL + pWideCL->dwOffset[dwIndex]; + pbAnsi = (LPBYTE)pAnsiCL + pibOffsets[dwIndex]; + + /* convert to ansi */ + cbGot = WideCharToMultiByte(uCodePage, 0, (LPCWSTR)pbWide, -1, + (LPSTR)pbAnsi, cbLeft, NULL, &bUsedDefault); + cbLeft -= cbGot; + + if (dwIndex < pWideCL->dwCount - 1) + pibOffsets[dwIndex + 1] = pibOffsets[dwIndex] + cbGot; + } + } + else + { + pibOffsets[0] = sizeof(CANDIDATELIST); + } + + return dwBufLen; +} + +DWORD APIENTRY +CandidateListAnsiToWide(const CANDIDATELIST *pAnsiCL, LPCANDIDATELIST pWideCL, DWORD dwBufLen, + UINT uCodePage) +{ + DWORD dwSize, dwIndex, cchGot, cbGot, cbLeft; + const BYTE *pbAnsi; + LPBYTE pbWide; + LPDWORD pibOffsets; + + /* calculate total wide size */ + if (pAnsiCL->dwCount > 0) + { + dwSize = sizeof(CANDIDATELIST) + ((pAnsiCL->dwCount - 1) * sizeof(DWORD)); + for (dwIndex = 0; dwIndex < pAnsiCL->dwCount; ++dwIndex) + { + pbAnsi = (const BYTE *)pAnsiCL + pAnsiCL->dwOffset[dwIndex]; + cchGot = MultiByteToWideChar(uCodePage, MB_PRECOMPOSED, (LPCSTR)pbAnsi, -1, NULL, 0); + dwSize += cchGot * sizeof(WCHAR); + } + } + else + { + dwSize = sizeof(CANDIDATELIST); + } + + dwSize = ROUNDUP4(dwSize); + if (dwBufLen == 0) + return dwSize; + if (dwBufLen < dwSize) + return 0; + + /* store to wide */ + pWideCL->dwSize = dwBufLen; + pWideCL->dwStyle = pAnsiCL->dwStyle; + pWideCL->dwCount = pAnsiCL->dwCount; + pWideCL->dwSelection = pAnsiCL->dwSelection; + pWideCL->dwPageStart = pAnsiCL->dwPageStart; + pWideCL->dwPageSize = pAnsiCL->dwPageSize; + + pibOffsets = pWideCL->dwOffset; + if (pAnsiCL->dwCount > 0) + { + pibOffsets[0] = sizeof(CANDIDATELIST) + ((pWideCL->dwCount - 1) * sizeof(DWORD)); + cbLeft = dwBufLen - pibOffsets[0]; + + for (dwIndex = 0; dwIndex < pAnsiCL->dwCount; ++dwIndex) + { + pbAnsi = (const BYTE *)pAnsiCL + pAnsiCL->dwOffset[dwIndex]; + pbWide = (LPBYTE)pWideCL + pibOffsets[dwIndex]; + + /* convert to wide */ + cchGot = MultiByteToWideChar(uCodePage, MB_PRECOMPOSED, (LPCSTR)pbAnsi, -1, + (LPWSTR)pbWide, cbLeft / sizeof(WCHAR)); + cbGot = cchGot * sizeof(WCHAR); + cbLeft -= cbGot; + + if (dwIndex + 1 < pAnsiCL->dwCount) + pibOffsets[dwIndex + 1] = pibOffsets[dwIndex] + cbGot; + } + } + else + { + pibOffsets[0] = sizeof(CANDIDATELIST); + } + + return dwBufLen; +} + +static DWORD APIENTRY +ImmGetCandidateListAW(HIMC hIMC, DWORD dwIndex, LPCANDIDATELIST lpCandList, DWORD dwBufLen, + BOOL bAnsi) +{ + DWORD ret = 0; + LPINPUTCONTEXT pIC; + PCLIENTIMC pClientImc; + LPCANDIDATEINFO pCI; + LPCANDIDATELIST pCL; + DWORD dwSize; + + pClientImc = ImmLockClientImc(hIMC); + if (!pClientImc) + return 0; + + pIC = ImmLockIMC(hIMC); + if (pIC == NULL) + { + ImmUnlockClientImc(pClientImc); + return 0; + } + + pCI = ImmLockIMCC(pIC->hCandInfo); + if (pCI == NULL) + { + ImmUnlockIMC(hIMC); + ImmUnlockClientImc(pClientImc); + return 0; + } + + if (pCI->dwSize < sizeof(CANDIDATEINFO) || pCI->dwCount <= dwIndex) + goto Quit; + + /* get required size */ + pCL = (LPCANDIDATELIST)((LPBYTE)pCI + pCI->dwOffset[dwIndex]); + if (bAnsi) + { + if (pClientImc->dwFlags & CLIENTIMC_WIDE) + dwSize = CandidateListAnsiToWide(pCL, NULL, 0, CP_ACP); + else + dwSize = pCL->dwSize; + } + else + { + if (pClientImc->dwFlags & CLIENTIMC_WIDE) + dwSize = pCL->dwSize; + else + dwSize = CandidateListWideToAnsi(pCL, NULL, 0, CP_ACP); + } + + if (dwBufLen != 0 && dwSize != 0) + { + if (lpCandList == NULL || dwBufLen < dwSize) + goto Quit; + + /* store */ + if (bAnsi) + { + if (pClientImc->dwFlags & CLIENTIMC_WIDE) + CandidateListAnsiToWide(pCL, lpCandList, dwSize, CP_ACP); + else + RtlCopyMemory(lpCandList, pCL, dwSize); + } + else + { + if (pClientImc->dwFlags & CLIENTIMC_WIDE) + RtlCopyMemory(lpCandList, pCL, dwSize); + else + CandidateListWideToAnsi(pCL, lpCandList, dwSize, CP_ACP); + } + } + + ret = dwSize; + +Quit: + ImmUnlockIMCC(pIC->hCandInfo); + ImmUnlockIMC(hIMC); + ImmUnlockClientImc(pClientImc); + return ret; +} + +DWORD APIENTRY +ImmGetCandidateListCountAW(HIMC hIMC, LPDWORD lpdwListCount, BOOL bAnsi) +{ + DWORD ret = 0, cbGot, dwIndex; + PCLIENTIMC pClientImc; + LPINPUTCONTEXT pIC; + const CANDIDATEINFO *pCI; + const BYTE *pb; + const CANDIDATELIST *pCL; + const DWORD *pdwOffsets; + + if (lpdwListCount == NULL) + return 0; + + *lpdwListCount = 0; + + pClientImc = ImmLockClientImc(hIMC); + if (pClientImc == NULL) + return 0; + + pIC = ImmLockIMC(hIMC); + if (pIC == NULL) + { + ImmUnlockClientImc(pClientImc); + return 0; + } + + pCI = ImmLockIMCC(pIC->hCandInfo); + if (pCI == NULL) + { + ImmUnlockIMC(hIMC); + ImmUnlockClientImc(pClientImc); + return 0; + } + + if (pCI->dwSize < sizeof(CANDIDATEINFO)) + goto Quit; + + *lpdwListCount = pCI->dwCount; /* the number of candidate lists */ + + /* calculate total size of candidate lists */ + if (bAnsi) + { + if (pClientImc->dwFlags & CLIENTIMC_WIDE) + { + ret = ROUNDUP4(pCI->dwPrivateSize); + pdwOffsets = pCI->dwOffset; + for (dwIndex = 0; dwIndex < pCI->dwCount; ++dwIndex) + { + pb = (const BYTE *)pCI + pdwOffsets[dwIndex]; + pCL = (const CANDIDATELIST *)pb; + cbGot = CandidateListWideToAnsi(pCL, NULL, 0, CP_ACP); + ret += cbGot; + } + } + else + { + ret = pCI->dwSize; + } + } + else + { + if (pClientImc->dwFlags & CLIENTIMC_WIDE) + { + ret = pCI->dwSize; + } + else + { + ret = ROUNDUP4(pCI->dwPrivateSize); + pdwOffsets = pCI->dwOffset; + for (dwIndex = 0; dwIndex < pCI->dwCount; ++dwIndex) + { + pb = (const BYTE *)pCI + pdwOffsets[dwIndex]; + pCL = (const CANDIDATELIST *)pb; + cbGot = CandidateListAnsiToWide(pCL, NULL, 0, CP_ACP); + ret += cbGot; + } + } + } + +Quit: + ImmUnlockIMCC(pIC->hCandInfo); + ImmUnlockIMC(hIMC); + ImmUnlockClientImc(pClientImc); + return ret; +} + +/*********************************************************************** + * ImmGetCandidateListA (IMM32.@) + */ +DWORD WINAPI +ImmGetCandidateListA(HIMC hIMC, DWORD dwIndex, LPCANDIDATELIST lpCandList, DWORD dwBufLen) +{ + return ImmGetCandidateListAW(hIMC, dwIndex, lpCandList, dwBufLen, TRUE); +} + +/*********************************************************************** + * ImmGetCandidateListCountA (IMM32.@) + */ +DWORD WINAPI ImmGetCandidateListCountA(HIMC hIMC, LPDWORD lpdwListCount) +{ + return ImmGetCandidateListCountAW(hIMC, lpdwListCount, TRUE); +} + +/*********************************************************************** + * ImmGetCandidateListCountW (IMM32.@) + */ +DWORD WINAPI ImmGetCandidateListCountW(HIMC hIMC, LPDWORD lpdwListCount) +{ + return ImmGetCandidateListCountAW(hIMC, lpdwListCount, FALSE); +} + +/*********************************************************************** + * ImmGetCandidateListW (IMM32.@) + */ +DWORD WINAPI +ImmGetCandidateListW(HIMC hIMC, DWORD dwIndex, LPCANDIDATELIST lpCandList, DWORD dwBufLen) +{ + return ImmGetCandidateListAW(hIMC, dwIndex, lpCandList, dwBufLen, FALSE); +} + +/*********************************************************************** + * ImmGetCandidateWindow (IMM32.@) + */ +BOOL WINAPI +ImmGetCandidateWindow(HIMC hIMC, DWORD dwIndex, LPCANDIDATEFORM lpCandidate) +{ + BOOL ret = FALSE; + LPINPUTCONTEXT pIC; + LPCANDIDATEFORM pCF; + + TRACE("(%p, %lu, %p)\n", hIMC, dwIndex, lpCandidate); + + pIC = ImmLockIMC(hIMC); + if (pIC == NULL) + return FALSE; + + pCF = &pIC->cfCandForm[dwIndex]; + if (pCF->dwIndex != IMM_INVALID_CANDFORM) + { + *lpCandidate = *pCF; + ret = TRUE; + } + + ImmUnlockIMC(hIMC); + return ret; +} + +/*********************************************************************** + * ImmSetCandidateWindow (IMM32.@) + */ +BOOL WINAPI ImmSetCandidateWindow(HIMC hIMC, LPCANDIDATEFORM lpCandidate) +{ + HWND hWnd; + LPINPUTCONTEXT pIC; + + TRACE("(%p, %p)\n", hIMC, lpCandidate); + + if (lpCandidate->dwIndex >= MAX_CANDIDATEFORM) + return FALSE; + + if (Imm32IsCrossThreadAccess(hIMC)) + return FALSE; + + pIC = ImmLockIMC(hIMC); + if (pIC == NULL) + return FALSE; + + hWnd = pIC->hWnd; + pIC->cfCandForm[lpCandidate->dwIndex] = *lpCandidate; + + ImmUnlockIMC(hIMC); + + Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, 0, IMC_SETCANDIDATEPOS, + IMN_SETCANDIDATEPOS, (1 << (BYTE)lpCandidate->dwIndex)); + return TRUE; +} diff --git a/dll/win32/imm32/guideline.c b/dll/win32/imm32/guideline.c new file mode 100644 index 00000000000..3a9a3c6bae1 --- /dev/null +++ b/dll/win32/imm32/guideline.c @@ -0,0 +1,198 @@ +/* + * PROJECT: ReactOS IMM32 + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Implementing IMM32 guidelines + * COPYRIGHT: Copyright 2020-2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(imm); + +DWORD APIENTRY +ImmGetGuideLineAW(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen, BOOL bAnsi) +{ + PCLIENTIMC pClientImc; + LPINPUTCONTEXT pIC; + LPGUIDELINE pGuideLine; + DWORD cb, ret = 0; + LPVOID pvStr, pvPrivate; + BOOL bUsedDefault; + + pClientImc = ImmLockClientImc(hIMC); + if (!pClientImc) + return 0; + + pIC = ImmLockIMC(hIMC); + if (!pIC) + { + ImmUnlockClientImc(pClientImc); + return 0; + } + + pGuideLine = ImmLockIMCC(pIC->hGuideLine); + if (!pGuideLine) + { + ImmUnlockIMC(hIMC); + ImmUnlockClientImc(pClientImc); + return 0; + } + + if (dwIndex == GGL_LEVEL) + { + ret = pGuideLine->dwLevel; + goto Quit; + } + + if (dwIndex == GGL_INDEX) + { + ret = pGuideLine->dwIndex; + goto Quit; + } + + if (dwIndex == GGL_STRING) + { + pvStr = (LPBYTE)pGuideLine + pGuideLine->dwStrOffset; + + /* get size */ + if (bAnsi) + { + if (pClientImc->dwFlags & CLIENTIMC_WIDE) + { + cb = WideCharToMultiByte(CP_ACP, 0, pvStr, pGuideLine->dwStrLen, + NULL, 0, NULL, &bUsedDefault); + } + else + { + cb = pGuideLine->dwStrLen * sizeof(CHAR); + } + } + else + { + if (pClientImc->dwFlags & CLIENTIMC_WIDE) + { + cb = pGuideLine->dwStrLen * sizeof(WCHAR); + } + else + { + cb = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, pvStr, pGuideLine->dwStrLen, + NULL, 0) * sizeof(WCHAR); + } + } + + if (dwBufLen == 0 || cb == 0 || lpBuf == NULL || dwBufLen < cb) + { + ret = cb; + goto Quit; + } + + /* store to buffer */ + if (bAnsi) + { + if (pClientImc->dwFlags & CLIENTIMC_WIDE) + { + ret = WideCharToMultiByte(CP_ACP, 0, pvStr, pGuideLine->dwStrLen, + lpBuf, dwBufLen, NULL, &bUsedDefault); + goto Quit; + } + } + else + { + if (!(pClientImc->dwFlags & CLIENTIMC_WIDE)) + { + ret = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, pvStr, pGuideLine->dwStrLen, + lpBuf, dwBufLen) * sizeof(WCHAR); + goto Quit; + } + } + + RtlCopyMemory(lpBuf, pvStr, cb); + ret = cb; + goto Quit; + } + + if (dwIndex == GGL_PRIVATE) + { + pvPrivate = (LPBYTE)pGuideLine + pGuideLine->dwPrivateOffset; + + /* get size */ + if (bAnsi) + { + if ((pClientImc->dwFlags & CLIENTIMC_WIDE) && + pGuideLine->dwIndex == GL_ID_REVERSECONVERSION) + { + cb = CandidateListWideToAnsi(pvPrivate, NULL, 0, CP_ACP); + } + else + { + cb = pGuideLine->dwPrivateSize; + } + } + else + { + if (!(pClientImc->dwFlags & CLIENTIMC_WIDE) && + pGuideLine->dwIndex == GL_ID_REVERSECONVERSION) + { + cb = CandidateListAnsiToWide(pvPrivate, NULL, 0, CP_ACP); + } + else + { + cb = pGuideLine->dwPrivateSize; + } + } + + if (dwBufLen == 0 || cb == 0 || lpBuf == NULL || dwBufLen < cb) + { + ret = cb; + goto Quit; + } + + /* store to buffer */ + if (bAnsi) + { + if ((pClientImc->dwFlags & CLIENTIMC_WIDE) && + pGuideLine->dwIndex == GL_ID_REVERSECONVERSION) + { + ret = CandidateListWideToAnsi(pvPrivate, lpBuf, cb, CP_ACP); + goto Quit; + } + } + else + { + if (!(pClientImc->dwFlags & CLIENTIMC_WIDE) && + pGuideLine->dwIndex == GL_ID_REVERSECONVERSION) + { + ret = CandidateListAnsiToWide(pvPrivate, lpBuf, cb, CP_ACP); + goto Quit; + } + } + + RtlCopyMemory(lpBuf, pvPrivate, cb); + ret = cb; + goto Quit; + } + +Quit: + ImmUnlockIMCC(pIC->hGuideLine); + ImmUnlockIMC(hIMC); + ImmUnlockClientImc(pClientImc); + return ret; +} + +/*********************************************************************** + * ImmGetGuideLineA (IMM32.@) + */ +DWORD WINAPI ImmGetGuideLineA(HIMC hIMC, DWORD dwIndex, LPSTR lpBuf, DWORD dwBufLen) +{ + TRACE("(%p, %lu, %p, %lu)\n", hIMC, dwIndex, lpBuf, dwBufLen); + return ImmGetGuideLineAW(hIMC, dwIndex, lpBuf, dwBufLen, TRUE); +} + +/*********************************************************************** + * ImmGetGuideLineW (IMM32.@) + */ +DWORD WINAPI ImmGetGuideLineW(HIMC hIMC, DWORD dwIndex, LPWSTR lpBuf, DWORD dwBufLen) +{ + TRACE("(%p, %lu, %p, %lu)\n", hIMC, dwIndex, lpBuf, dwBufLen); + return ImmGetGuideLineAW(hIMC, dwIndex, lpBuf, dwBufLen, FALSE); +} diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c new file mode 100644 index 00000000000..ba68a9ab3d1 --- /dev/null +++ b/dll/win32/imm32/ime.c @@ -0,0 +1,1201 @@ +/* + * PROJECT: ReactOS IMM32 + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Implementing IME manipulation of IMM32 + * COPYRIGHT: Copyright 1998 Patrik Stridvall + * Copyright 2002, 2003, 2007 CodeWeavers, Aric Stewart + * Copyright 2017 James Tabor <james.tabor(a)reactos.org> + * Copyright 2018 Amine Khaldi <amine.khaldi(a)reactos.org> + * Copyright 2020 Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> + * Copyright 2020-2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(imm); + +RTL_CRITICAL_SECTION g_csImeDpi; +PIMEDPI g_pImeDpiList = NULL; + +PIMEDPI APIENTRY Imm32FindImeDpi(HKL hKL) +{ + PIMEDPI pImeDpi; + + RtlEnterCriticalSection(&g_csImeDpi); + for (pImeDpi = g_pImeDpiList; pImeDpi != NULL; pImeDpi = pImeDpi->pNext) + { + if (pImeDpi->hKL == hKL) + break; + } + RtlLeaveCriticalSection(&g_csImeDpi); + + return pImeDpi; +} + +VOID APIENTRY Imm32FreeImeDpi(PIMEDPI pImeDpi, BOOL bDestroy) +{ + if (pImeDpi->hInst == NULL) + return; + if (bDestroy) + pImeDpi->ImeDestroy(0); + FreeLibrary(pImeDpi->hInst); + pImeDpi->hInst = NULL; +} + +BOOL APIENTRY Imm32InquireIme(PIMEDPI pImeDpi) +{ + WCHAR szUIClass[64]; + WNDCLASSW wcW; + DWORD dwSysInfoFlags = 0; // TODO: ??? + LPIMEINFO pImeInfo = &pImeDpi->ImeInfo; + + // TODO: NtUserGetThreadState(16); + + if (!IS_IME_HKL(pImeDpi->hKL)) + { + if (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED) && + pImeDpi->CtfImeInquireExW) + { + // TODO: + return FALSE; + } + } + + if (!pImeDpi->ImeInquire(pImeInfo, szUIClass, dwSysInfoFlags)) + return FALSE; + + szUIClass[_countof(szUIClass) - 1] = 0; + + if (pImeInfo->dwPrivateDataSize == 0) + pImeInfo->dwPrivateDataSize = 4; + +#define VALID_IME_PROP (IME_PROP_AT_CARET | \ + IME_PROP_SPECIAL_UI | \ + IME_PROP_CANDLIST_START_FROM_1 | \ + IME_PROP_UNICODE | \ + IME_PROP_COMPLETE_ON_UNSELECT | \ + IME_PROP_END_UNLOAD | \ + IME_PROP_KBD_CHAR_FIRST | \ + IME_PROP_IGNORE_UPKEYS | \ + IME_PROP_NEED_ALTKEY | \ + IME_PROP_NO_KEYS_ON_CLOSE | \ + IME_PROP_ACCEPT_WIDE_VKEY) +#define VALID_CMODE_CAPS (IME_CMODE_ALPHANUMERIC | \ + IME_CMODE_NATIVE | \ + IME_CMODE_KATAKANA | \ + IME_CMODE_LANGUAGE | \ + IME_CMODE_FULLSHAPE | \ + IME_CMODE_ROMAN | \ + IME_CMODE_CHARCODE | \ + IME_CMODE_HANJACONVERT | \ + IME_CMODE_SOFTKBD | \ + IME_CMODE_NOCONVERSION | \ + IME_CMODE_EUDC | \ + IME_CMODE_SYMBOL | \ + IME_CMODE_FIXED) +#define VALID_SMODE_CAPS (IME_SMODE_NONE | \ + IME_SMODE_PLAURALCLAUSE | \ + IME_SMODE_SINGLECONVERT | \ + IME_SMODE_AUTOMATIC | \ + IME_SMODE_PHRASEPREDICT | \ + IME_SMODE_CONVERSATION) +#define VALID_UI_CAPS (UI_CAP_2700 | \ + UI_CAP_ROT90 | \ + UI_CAP_ROTANY | \ + UI_CAP_SOFTKBD) +#define VALID_SCS_CAPS (SCS_CAP_COMPSTR | \ + SCS_CAP_MAKEREAD | \ + SCS_CAP_SETRECONVERTSTRING) +#define VALID_SELECT_CAPS (SELECT_CAP_CONVERSION | SELECT_CAP_SENTENCE) + + if (pImeInfo->fdwProperty & ~VALID_IME_PROP) + return FALSE; + if (pImeInfo->fdwConversionCaps & ~VALID_CMODE_CAPS) + return FALSE; + if (pImeInfo->fdwSentenceCaps & ~VALID_SMODE_CAPS) + return FALSE; + if (pImeInfo->fdwUICaps & ~VALID_UI_CAPS) + return FALSE; + if (pImeInfo->fdwSCSCaps & ~VALID_SCS_CAPS) + return FALSE; + if (pImeInfo->fdwSelectCaps & ~VALID_SELECT_CAPS) + return FALSE; + +#undef VALID_IME_PROP +#undef VALID_CMODE_CAPS +#undef VALID_SMODE_CAPS +#undef VALID_UI_CAPS +#undef VALID_SCS_CAPS +#undef VALID_SELECT_CAPS + + if (pImeInfo->fdwProperty & IME_PROP_UNICODE) + { + StringCchCopyW(pImeDpi->szUIClass, _countof(pImeDpi->szUIClass), szUIClass); + } + else + { + if (pImeDpi->uCodePage != GetACP() && pImeDpi->uCodePage) + return FALSE; + + MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (LPSTR)szUIClass, -1, + pImeDpi->szUIClass, _countof(pImeDpi->szUIClass)); + } + + return GetClassInfoW(pImeDpi->hInst, pImeDpi->szUIClass, &wcW); +} + +BOOL APIENTRY Imm32LoadImeInfo(PIMEINFOEX pImeInfoEx, PIMEDPI pImeDpi) +{ + WCHAR szPath[MAX_PATH]; + HINSTANCE hIME; + FARPROC fn; + + if (!Imm32GetSystemLibraryPath(szPath, _countof(szPath), pImeInfoEx->wszImeFile)) + return FALSE; + + hIME = GetModuleHandleW(szPath); + if (hIME == NULL) + { + hIME = LoadLibraryW(szPath); + if (hIME == NULL) + { + ERR("Imm32LoadImeInfo: LoadLibraryW(%S) failed\n", szPath); + return FALSE; + } + } + pImeDpi->hInst = hIME; + +#define DEFINE_IME_ENTRY(type, name, params, extended) \ + do { \ + fn = GetProcAddress(hIME, #name); \ + if (fn) pImeDpi->name = (FN_##name)fn; \ + else if (!extended) goto Failed; \ + } while (0); +#include "../../../win32ss/include/imetable.h" +#undef DEFINE_IME_ENTRY + + if (!Imm32InquireIme(pImeDpi)) + { + ERR("Imm32LoadImeInfo: Imm32InquireIme failed\n"); + goto Failed; + } + + if (pImeInfoEx->fLoadFlag) + return TRUE; + + NtUserSetImeOwnerWindow(pImeInfoEx, TRUE); + return TRUE; + +Failed: + FreeLibrary(pImeDpi->hInst); + pImeDpi->hInst = NULL; + return FALSE; +} + +PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock) +{ + IMEINFOEX ImeInfoEx; + CHARSETINFO ci; + PIMEDPI pImeDpiNew, pImeDpiFound; + UINT uCodePage; + LCID lcid; + + if (!ImmGetImeInfoEx(&ImeInfoEx, ImeInfoExKeyboardLayout, &hKL) || + ImeInfoEx.fLoadFlag == 1) + { + return NULL; + } + + pImeDpiNew = Imm32HeapAlloc(HEAP_ZERO_MEMORY, sizeof(IMEDPI)); + if (pImeDpiNew == NULL) + return NULL; + + pImeDpiNew->hKL = hKL; + + lcid = LOWORD(hKL); + if (TranslateCharsetInfo((LPDWORD)(DWORD_PTR)lcid, &ci, TCI_SRCLOCALE)) + uCodePage = ci.ciACP; + else + uCodePage = CP_ACP; + pImeDpiNew->uCodePage = uCodePage; + + if (!Imm32LoadImeInfo(&ImeInfoEx, pImeDpiNew)) + { + HeapFree(g_hImm32Heap, 0, pImeDpiNew); + return FALSE; + } + + RtlEnterCriticalSection(&g_csImeDpi); + + pImeDpiFound = Imm32FindImeDpi(hKL); + if (pImeDpiFound) + { + if (!bLock) + pImeDpiFound->dwFlags &= ~IMEDPI_FLAG_LOCKED; + + RtlLeaveCriticalSection(&g_csImeDpi); + + Imm32FreeImeDpi(pImeDpiNew, FALSE); + HeapFree(g_hImm32Heap, 0, pImeDpiNew); + return pImeDpiFound; + } + else + { + if (bLock) + { + pImeDpiNew->dwFlags |= IMEDPI_FLAG_LOCKED; + pImeDpiNew->cLockObj = 1; + } + + pImeDpiNew->pNext = g_pImeDpiList; + g_pImeDpiList = pImeDpiNew; + + RtlLeaveCriticalSection(&g_csImeDpi); + return pImeDpiNew; + } +} + +PIMEDPI APIENTRY ImmLockOrLoadImeDpi(HKL hKL) +{ + PW32CLIENTINFO pInfo; + PIMEDPI pImeDpi; + + if (!IS_IME_HKL(hKL)) + { + if (!g_psi || !(g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) + return NULL; + + pInfo = (PW32CLIENTINFO)(NtCurrentTeb()->Win32ClientInfo); + if ((pInfo->W32ClientInfo[0] & 2)) + return NULL; + } + + pImeDpi = ImmLockImeDpi(hKL); + if (pImeDpi == NULL) + pImeDpi = Ime32LoadImeDpi(hKL, TRUE); + return pImeDpi; +} + +/*********************************************************************** + * ImmIsIME (IMM32.@) + */ +BOOL WINAPI ImmIsIME(HKL hKL) +{ + IMEINFOEX info; + TRACE("(%p)\n", hKL); + return !!ImmGetImeInfoEx(&info, ImeInfoExImeWindow, &hKL); +} + +/*********************************************************************** + * ImmGetDefaultIMEWnd (IMM32.@) + */ +HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) +{ + if (!g_psi || !(g_psi->dwSRVIFlags & SRVINFO_IMM32)) + return NULL; + + // FIXME: NtUserGetThreadState and enum ThreadStateRoutines are broken. + if (hWnd == NULL) + return (HWND)NtUserGetThreadState(3); + + return (HWND)NtUserQueryWindow(hWnd, QUERY_WINDOW_DEFAULT_IME); +} + +/*********************************************************************** + * ImmNotifyIME (IMM32.@) + */ +BOOL WINAPI ImmNotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) +{ + HKL hKL; + PIMEDPI pImeDpi; + BOOL ret; + + TRACE("(%p, %lu, %lu, %lu)\n", hIMC, dwAction, dwIndex, dwValue); + + if (hIMC && Imm32IsCrossThreadAccess(hIMC)) + return FALSE; + + hKL = GetKeyboardLayout(0); + pImeDpi = ImmLockImeDpi(hKL); + if (pImeDpi == NULL) + return FALSE; + + ret = pImeDpi->NotifyIME(hIMC, dwAction, dwIndex, dwValue); + ImmUnlockImeDpi(pImeDpi); + return ret; +} + +/*********************************************************************** + * ImmDisableLegacyIME(IMM32.@) + */ +BOOL WINAPI ImmDisableLegacyIME(void) +{ + FIXME("stub\n"); + return TRUE; +} + +/*********************************************************************** + * CtfImmIsTextFrameServiceDisabled(IMM32.@) + */ +BOOL WINAPI CtfImmIsTextFrameServiceDisabled(VOID) +{ + PTEB pTeb = NtCurrentTeb(); + if (((PW32CLIENTINFO)pTeb->Win32ClientInfo)->CI_flags & CI_TFSDISABLED) + return TRUE; + return FALSE; +} + +/*********************************************************************** + * ImmGetImeInfoEx (IMM32.@) + */ +BOOL WINAPI +ImmGetImeInfoEx(PIMEINFOEX pImeInfoEx, IMEINFOEXCLASS SearchType, PVOID pvSearchKey) +{ + BOOL bDisabled = FALSE; + HKL hKL; + PTEB pTeb; + + switch (SearchType) + { + case ImeInfoExKeyboardLayout: + break; + + case ImeInfoExImeWindow: + bDisabled = CtfImmIsTextFrameServiceDisabled(); + SearchType = ImeInfoExKeyboardLayout; + break; + + case ImeInfoExImeFileName: + StringCchCopyW(pImeInfoEx->wszImeFile, _countof(pImeInfoEx->wszImeFile), + pvSearchKey); + goto Quit; + } + + hKL = *(HKL*)pvSearchKey; + pImeInfoEx->hkl = hKL; + + if (!IS_IME_HKL(hKL)) + { + if (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) + { + pTeb = NtCurrentTeb(); + if (((PW32CLIENTINFO)pTeb->Win32ClientInfo)->W32ClientInfo[0] & 2) + return FALSE; + if (!bDisabled) + goto Quit; + } + return FALSE; + } + +Quit: + return NtUserGetImeInfoEx(pImeInfoEx, SearchType); +} + +/*********************************************************************** + * ImmLockImeDpi (IMM32.@) + */ +PIMEDPI WINAPI ImmLockImeDpi(HKL hKL) +{ + PIMEDPI pImeDpi = NULL; + + TRACE("(%p)\n", hKL); + + RtlEnterCriticalSection(&g_csImeDpi); + + /* Find by hKL */ + for (pImeDpi = g_pImeDpiList; pImeDpi; pImeDpi = pImeDpi->pNext) + { + if (pImeDpi->hKL == hKL) /* found */ + { + /* lock if possible */ + if (pImeDpi->dwFlags & IMEDPI_FLAG_UNKNOWN) + pImeDpi = NULL; + else + ++(pImeDpi->cLockObj); + break; + } + } + + RtlLeaveCriticalSection(&g_csImeDpi); + return pImeDpi; +} + +/*********************************************************************** + * ImmUnlockImeDpi (IMM32.@) + */ +VOID WINAPI ImmUnlockImeDpi(PIMEDPI pImeDpi) +{ + PIMEDPI *ppEntry; + + TRACE("(%p)\n", pImeDpi); + + if (pImeDpi == NULL) + return; + + RtlEnterCriticalSection(&g_csImeDpi); + + /* unlock */ + --(pImeDpi->cLockObj); + if (pImeDpi->cLockObj != 0) + { + RtlLeaveCriticalSection(&g_csImeDpi); + return; + } + + if ((pImeDpi->dwFlags & IMEDPI_FLAG_UNKNOWN) == 0) + { + if ((pImeDpi->dwFlags & IMEDPI_FLAG_LOCKED) == 0 || + (pImeDpi->ImeInfo.fdwProperty & IME_PROP_END_UNLOAD) == 0) + { + RtlLeaveCriticalSection(&g_csImeDpi); + return; + } + } + + /* Remove from list */ + for (ppEntry = &g_pImeDpiList; *ppEntry; ppEntry = &((*ppEntry)->pNext)) + { + if (*ppEntry == pImeDpi) /* found */ + { + *ppEntry = pImeDpi->pNext; + break; + } + } + + Imm32FreeImeDpi(pImeDpi, TRUE); + HeapFree(g_hImm32Heap, 0, pImeDpi); + + RtlLeaveCriticalSection(&g_csImeDpi); +} + +/*********************************************************************** + * ImmLoadIME (IMM32.@) + */ +BOOL WINAPI ImmLoadIME(HKL hKL) +{ + PW32CLIENTINFO pInfo; + PIMEDPI pImeDpi; + + if (!IS_IME_HKL(hKL)) + { + if (!g_psi || !(g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) + return FALSE; + + pInfo = (PW32CLIENTINFO)(NtCurrentTeb()->Win32ClientInfo); + if ((pInfo->W32ClientInfo[0] & 2)) + return FALSE; + } + + pImeDpi = Imm32FindImeDpi(hKL); + if (pImeDpi == NULL) + pImeDpi = Ime32LoadImeDpi(hKL, FALSE); + return (pImeDpi != NULL); +} + +/*********************************************************************** + * ImmDisableIME (IMM32.@) + */ +BOOL WINAPI ImmDisableIME(DWORD dwThreadId) +{ + return NtUserDisableThreadIme(dwThreadId); +} + +/*********************************************************************** + * ImmGetDescriptionA (IMM32.@) + */ +UINT WINAPI ImmGetDescriptionA(HKL hKL, LPSTR lpszDescription, UINT uBufLen) +{ + IMEINFOEX info; + size_t cch; + + TRACE("(%p,%p,%d)\n", hKL, lpszDescription, uBufLen); + + if (!ImmGetImeInfoEx(&info, ImeInfoExKeyboardLayout, &hKL) || !IS_IME_HKL(hKL)) + return 0; + + StringCchLengthW(info.wszImeDescription, _countof(info.wszImeDescription), &cch); + cch = WideCharToMultiByte(CP_ACP, 0, info.wszImeDescription, (INT)cch, + lpszDescription, uBufLen, NULL, NULL); + if (uBufLen) + lpszDescription[cch] = 0; + return (UINT)cch; +} + +/*********************************************************************** + * ImmGetDescriptionW (IMM32.@) + */ +UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen) +{ + IMEINFOEX info; + size_t cch; + + TRACE("(%p, %p, %d)\n", hKL, lpszDescription, uBufLen); + + if (!ImmGetImeInfoEx(&info, ImeInfoExKeyboardLayout, &hKL) || !IS_IME_HKL(hKL)) + return 0; + + if (uBufLen != 0) + StringCchCopyW(lpszDescription, uBufLen, info.wszImeDescription); + + StringCchLengthW(info.wszImeDescription, _countof(info.wszImeDescription), &cch); + return (UINT)cch; +} + +/*********************************************************************** + * ImmGetIMEFileNameA (IMM32.@) + */ +UINT WINAPI ImmGetIMEFileNameA( HKL hKL, LPSTR lpszFileName, UINT uBufLen) +{ + BOOL bDefUsed; + IMEINFOEX info; + size_t cch; + + TRACE("(%p, %p, %u)\n", hKL, lpszFileName, uBufLen); + + if (!ImmGetImeInfoEx(&info, ImeInfoExKeyboardLayout, &hKL) || !IS_IME_HKL(hKL)) + { + if (uBufLen > 0) + lpszFileName[0] = 0; + return 0; + } + + StringCchLengthW(info.wszImeFile, _countof(info.wszImeFile), &cch); + + cch = WideCharToMultiByte(CP_ACP, 0, info.wszImeFile, (INT)cch, + lpszFileName, uBufLen, NULL, &bDefUsed); + if (uBufLen == 0) + return (UINT)cch; + + if (cch > uBufLen - 1) + cch = uBufLen - 1; + + lpszFileName[cch] = 0; + return (UINT)cch; +} + +/*********************************************************************** + * ImmGetIMEFileNameW (IMM32.@) + */ +UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) +{ + IMEINFOEX info; + size_t cch; + + TRACE("(%p, %p, %u)\n", hKL, lpszFileName, uBufLen); + + if (!ImmGetImeInfoEx(&info, ImeInfoExKeyboardLayout, &hKL) || !IS_IME_HKL(hKL)) + { + if (uBufLen > 0) + lpszFileName[0] = 0; + return 0; + } + + StringCchLengthW(info.wszImeFile, _countof(info.wszImeFile), &cch); + if (uBufLen == 0) + return (UINT)cch; + + StringCchCopyNW(lpszFileName, uBufLen, info.wszImeFile, cch); + + if (cch > uBufLen - 1) + cch = uBufLen - 1; + + lpszFileName[cch] = 0; + return (UINT)cch; +} + +/*********************************************************************** + * ImmGetProperty (IMM32.@) + */ +DWORD WINAPI ImmGetProperty(HKL hKL, DWORD fdwIndex) +{ + IMEINFOEX ImeInfoEx; + LPIMEINFO pImeInfo; + DWORD dwValue; + PIMEDPI pImeDpi = NULL; + + TRACE("(%p, %lu)\n", hKL, fdwIndex); + + if (!ImmGetImeInfoEx(&ImeInfoEx, ImeInfoExKeyboardLayout, &hKL)) + return FALSE; + + if (fdwIndex == IGP_GETIMEVERSION) + return ImeInfoEx.dwImeWinVersion; + + if (ImeInfoEx.fLoadFlag != 2) + { + pImeDpi = ImmLockOrLoadImeDpi(hKL); + if (pImeDpi == NULL) + return FALSE; + + pImeInfo = &pImeDpi->ImeInfo; + } + else + { + pImeInfo = &ImeInfoEx.ImeInfo; + } + + switch (fdwIndex) + { + case IGP_PROPERTY: dwValue = pImeInfo->fdwProperty; break; + case IGP_CONVERSION: dwValue = pImeInfo->fdwConversionCaps; break; + case IGP_SENTENCE: dwValue = pImeInfo->fdwSentenceCaps; break; + case IGP_UI: dwValue = pImeInfo->fdwUICaps; break; + case IGP_SETCOMPSTR: dwValue = pImeInfo->fdwSCSCaps; break; + case IGP_SELECT: dwValue = pImeInfo->fdwSelectCaps; break; + default: dwValue = 0; break; + } + + if (pImeDpi) + ImmUnlockImeDpi(pImeDpi); + return dwValue; +} + +/*********************************************************************** + * ImmGetOpenStatus (IMM32.@) + */ +BOOL WINAPI ImmGetOpenStatus(HIMC hIMC) +{ + BOOL ret; + LPINPUTCONTEXT pIC; + + TRACE("(%p)\n", hIMC); + + if (!hIMC) + return FALSE; + + pIC = ImmLockIMC(hIMC); + if (!pIC) + return FALSE; + + ret = pIC->fOpen; + + ImmUnlockIMC(hIMC); + return ret; +} + +/*********************************************************************** + * ImmSetOpenStatus (IMM32.@) + */ +BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) +{ + DWORD dwConversion; + LPINPUTCONTEXT pIC; + HWND hWnd; + BOOL bHasChange = FALSE; + + TRACE("(%p, %d)\n", hIMC, fOpen); + + if (Imm32IsCrossThreadAccess(hIMC)) + return FALSE; + + pIC = ImmLockIMC(hIMC); + if (pIC == NULL) + return FALSE; + + if (pIC->fOpen != fOpen) + { + pIC->fOpen = fOpen; + hWnd = pIC->hWnd; + dwConversion = pIC->fdwConversion; + bHasChange = TRUE; + } + + ImmUnlockIMC(hIMC); + + if (bHasChange) + { + Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, 0, + IMC_SETOPENSTATUS, IMN_SETOPENSTATUS, 0); + NtUserNotifyIMEStatus(hWnd, hIMC, dwConversion); + } + + return TRUE; +} + +/*********************************************************************** + * ImmGetStatusWindowPos (IMM32.@) + */ +BOOL WINAPI ImmGetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) +{ + LPINPUTCONTEXT pIC; + BOOL ret; + + TRACE("(%p, %p)\n", hIMC, lpptPos); + + pIC = ImmLockIMC(hIMC); + if (pIC == NULL) + return FALSE; + + ret = !!(pIC->fdwInit & INIT_STATUSWNDPOS); + if (ret) + *lpptPos = pIC->ptStatusWndPos; + + ImmUnlockIMC(hIMC); + return ret; +} + +/*********************************************************************** + * ImmSetStatusWindowPos (IMM32.@) + */ +BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) +{ + LPINPUTCONTEXT pIC; + HWND hWnd; + + TRACE("(%p, {%ld, %ld})\n", hIMC, lpptPos->x, lpptPos->y); + + if (Imm32IsCrossThreadAccess(hIMC)) + return FALSE; + + pIC = ImmLockIMC(hIMC); + if (!pIC) + return FALSE; + + hWnd = pIC->hWnd; + pIC->ptStatusWndPos = *lpptPos; + pIC->fdwInit |= INIT_STATUSWNDPOS; + + ImmUnlockIMC(hIMC); + + Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, 0, + IMC_SETSTATUSWINDOWPOS, IMN_SETSTATUSWINDOWPOS, 0); + return TRUE; +} + +/*********************************************************************** + * ImmGetCompositionWindow (IMM32.@) + */ +BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) +{ + LPINPUTCONTEXT pIC; + BOOL ret = FALSE; + + TRACE("(%p, %p)\n", hIMC, lpCompForm); + + pIC = ImmLockIMC(hIMC); + if (!pIC) + return FALSE; + + if (pIC->fdwInit & INIT_COMPFORM) + { + *lpCompForm = pIC->cfCompForm; + ret = TRUE; + } + + ImmUnlockIMC(hIMC); + return ret; +} + +/*********************************************************************** + * ImmSetCompositionWindow (IMM32.@) + */ +BOOL WINAPI ImmSetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) +{ + LPINPUTCONTEXT pIC; + HWND hWnd; + + if (Imm32IsCrossThreadAccess(hIMC)) + return FALSE; + + pIC = ImmLockIMC(hIMC); + if (pIC == NULL) + return FALSE; + + pIC->cfCompForm = *lpCompForm; + pIC->fdwInit |= INIT_COMPFORM; + + hWnd = pIC->hWnd; + + ImmUnlockIMC(hIMC); + + Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, 0, + IMC_SETCOMPOSITIONWINDOW, IMN_SETCOMPOSITIONWINDOW, 0); + return TRUE; +} + +/*********************************************************************** + * ImmGetCompositionFontA (IMM32.@) + */ +BOOL WINAPI ImmGetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) +{ + PCLIENTIMC pClientImc; + BOOL ret = FALSE, bWide; + LPINPUTCONTEXT pIC; + + TRACE("(%p, %p)\n", hIMC, lplf); + + pClientImc = ImmLockClientImc(hIMC); + if (pClientImc == NULL) + return FALSE; + + bWide = (pClientImc->dwFlags & CLIENTIMC_WIDE); + ImmUnlockClientImc(pClientImc); + + pIC = ImmLockIMC(hIMC); + if (pIC == NULL) + return FALSE; + + if (pIC->fdwInit & INIT_LOGFONT) + { + if (bWide) + LogFontWideToAnsi(&pIC->lfFont.W, lplf); + else + *lplf = pIC->lfFont.A; + + ret = TRUE; + } + + ImmUnlockIMC(hIMC); + return ret; +} + +/*********************************************************************** + * ImmGetCompositionFontW (IMM32.@) + */ +BOOL WINAPI ImmGetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) +{ + PCLIENTIMC pClientImc; + BOOL bWide; + LPINPUTCONTEXT pIC; + BOOL ret = FALSE; + + TRACE("(%p, %p)\n", hIMC, lplf); + + pClientImc = ImmLockClientImc(hIMC); + if (pClientImc == NULL) + return FALSE; + + bWide = (pClientImc->dwFlags & CLIENTIMC_WIDE); + ImmUnlockClientImc(pClientImc); + + pIC = ImmLockIMC(hIMC); + if (pIC == NULL) + return FALSE; + + if (pIC->fdwInit & INIT_LOGFONT) + { + if (bWide) + *lplf = pIC->lfFont.W; + else + LogFontAnsiToWide(&pIC->lfFont.A, lplf); + + ret = TRUE; + } + + ImmUnlockIMC(hIMC); + return ret; +} + +/*********************************************************************** + * ImmSetCompositionFontA (IMM32.@) + */ +BOOL WINAPI ImmSetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) +{ + LOGFONTW lfW; + PCLIENTIMC pClientImc; + BOOL bWide; + LPINPUTCONTEXTDX pIC; + LCID lcid; + HWND hWnd; + PTEB pTeb; + + TRACE("(%p, %p)\n", hIMC, lplf); + + if (Imm32IsCrossThreadAccess(hIMC)) + return FALSE; + + pClientImc = ImmLockClientImc(hIMC); + if (pClientImc == NULL) + return FALSE; + + bWide = (pClientImc->dwFlags & CLIENTIMC_WIDE); + ImmUnlockClientImc(pClientImc); + + if (bWide) + { + LogFontAnsiToWide(lplf, &lfW); + return ImmSetCompositionFontW(hIMC, &lfW); + } + + pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); + if (pIC == NULL) + return FALSE; + + pTeb = NtCurrentTeb(); + if (pTeb->Win32ClientInfo[2] < 0x400) + { + lcid = GetSystemDefaultLCID(); + if (PRIMARYLANGID(lcid) == LANG_JAPANESE && !(pIC->dwUIFlags & 2) && + pIC->cfCompForm.dwStyle != CFS_DEFAULT) + { + PostMessageA(pIC->hWnd, WM_IME_REPORT, IR_CHANGECONVERT, 0); + } + } + + pIC->lfFont.A = *lplf; + pIC->fdwInit |= INIT_LOGFONT; + hWnd = pIC->hWnd; + + ImmUnlockIMC(hIMC); + + Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, 0, IMC_SETCOMPOSITIONFONT, + IMN_SETCOMPOSITIONFONT, 0); + return TRUE; +} + +/*********************************************************************** + * ImmSetCompositionFontW (IMM32.@) + */ +BOOL WINAPI ImmSetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) +{ + LOGFONTA lfA; + PCLIENTIMC pClientImc; + BOOL bWide; + HWND hWnd; + LPINPUTCONTEXTDX pIC; + PTEB pTeb; + LCID lcid; + + TRACE("(%p, %p)\n", hIMC, lplf); + + if (Imm32IsCrossThreadAccess(hIMC)) + return FALSE; + + pClientImc = ImmLockClientImc(hIMC); + if (pClientImc == NULL) + return FALSE; + + bWide = (pClientImc->dwFlags & CLIENTIMC_WIDE); + ImmUnlockClientImc(pClientImc); + + if (!bWide) + { + LogFontWideToAnsi(lplf, &lfA); + return ImmSetCompositionFontA(hIMC, &lfA); + } + + pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); + if (pIC == NULL) + return FALSE; + + pTeb = NtCurrentTeb(); + if (pTeb->Win32ClientInfo[2] < 0x400) + { + lcid = GetSystemDefaultLCID(); + if (PRIMARYLANGID(lcid) == LANG_JAPANESE && + !(pIC->dwUIFlags & 2) && + pIC->cfCompForm.dwStyle != CFS_DEFAULT) + { + PostMessageW(pIC->hWnd, WM_IME_REPORT, IR_CHANGECONVERT, 0); + } + } + + pIC->lfFont.W = *lplf; + pIC->fdwInit |= INIT_LOGFONT; + hWnd = pIC->hWnd; + + ImmUnlockIMC(hIMC); + + Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, 0, IMC_SETCOMPOSITIONFONT, + IMN_SETCOMPOSITIONFONT, 0); + return TRUE; +} + +/*********************************************************************** + * ImmGetConversionListA (IMM32.@) + */ +DWORD WINAPI +ImmGetConversionListA(HKL hKL, HIMC hIMC, LPCSTR pSrc, LPCANDIDATELIST lpDst, + DWORD dwBufLen, UINT uFlag) +{ + DWORD ret = 0; + UINT cb; + LPWSTR pszSrcW = NULL; + LPCANDIDATELIST pCL = NULL; + PIMEDPI pImeDpi; + + TRACE("(%p, %p, %s, %p, %lu, 0x%lX)\n", hKL, hIMC, debugstr_a(pSrc), + lpDst, dwBufLen, uFlag); + + pImeDpi = ImmLockOrLoadImeDpi(hKL); + if (pImeDpi == NULL) + return 0; + + if (!(pImeDpi->ImeInfo.fdwProperty & IME_PROP_UNICODE)) + { + ret = pImeDpi->ImeConversionList(hIMC, pSrc, lpDst, dwBufLen, uFlag); + ImmUnlockImeDpi(pImeDpi); + return ret; + } + + if (pSrc) + { + pszSrcW = Imm32WideFromAnsi(pSrc); + if (pszSrcW == NULL) + goto Quit; + } + + cb = pImeDpi->ImeConversionList(hIMC, pszSrcW, NULL, 0, uFlag); + if (cb == 0) + goto Quit; + + pCL = Imm32HeapAlloc(0, cb); + if (pCL == NULL) + goto Quit; + + cb = pImeDpi->ImeConversionList(hIMC, pszSrcW, pCL, cb, uFlag); + if (cb == 0) + goto Quit; + + ret = CandidateListWideToAnsi(pCL, lpDst, dwBufLen, CP_ACP); + +Quit: + if (pszSrcW) + HeapFree(g_hImm32Heap, 0, pszSrcW); + if (pCL) + HeapFree(g_hImm32Heap, 0, pCL); + ImmUnlockImeDpi(pImeDpi); + return ret; +} + +/*********************************************************************** + * ImmGetConversionListW (IMM32.@) + */ +DWORD WINAPI +ImmGetConversionListW(HKL hKL, HIMC hIMC, LPCWSTR pSrc, LPCANDIDATELIST lpDst, + DWORD dwBufLen, UINT uFlag) +{ + DWORD ret = 0; + INT cb; + PIMEDPI pImeDpi; + LPCANDIDATELIST pCL = NULL; + LPSTR pszSrcA = NULL; + + TRACE("(%p, %p, %s, %p, %lu, 0x%lX)\n", hKL, hIMC, debugstr_w(pSrc), + lpDst, dwBufLen, uFlag); + + pImeDpi = ImmLockOrLoadImeDpi(hKL); + if (!pImeDpi) + return 0; + + if (pImeDpi->ImeInfo.fdwProperty & IME_PROP_UNICODE) + { + ret = pImeDpi->ImeConversionList(hIMC, pSrc, lpDst, dwBufLen, uFlag); + ImmUnlockImeDpi(pImeDpi); + return ret; + } + + if (pSrc) + { + pszSrcA = Imm32AnsiFromWide(pSrc); + if (pszSrcA == NULL) + goto Quit; + } + + cb = pImeDpi->ImeConversionList(hIMC, pszSrcA, NULL, 0, uFlag); + if (cb == 0) + goto Quit; + + pCL = Imm32HeapAlloc(0, cb); + if (!pCL) + goto Quit; + + cb = pImeDpi->ImeConversionList(hIMC, pszSrcA, pCL, cb, uFlag); + if (!cb) + goto Quit; + + ret = CandidateListAnsiToWide(pCL, lpDst, dwBufLen, CP_ACP); + +Quit: + if (pszSrcA) + HeapFree(g_hImm32Heap, 0, pszSrcA); + if (pCL) + HeapFree(g_hImm32Heap, 0, pCL); + ImmUnlockImeDpi(pImeDpi); + return ret; +} + +/*********************************************************************** + * ImmGetConversionStatus (IMM32.@) + */ +BOOL WINAPI ImmGetConversionStatus(HIMC hIMC, LPDWORD lpfdwConversion, LPDWORD lpfdwSentence) +{ + LPINPUTCONTEXT pIC; + + TRACE("(%p %p %p)\n", hIMC, lpfdwConversion, lpfdwSentence); + + pIC = ImmLockIMC(hIMC); + if (!pIC) + return FALSE; + + if (lpfdwConversion) + *lpfdwConversion = pIC->fdwConversion; + if (lpfdwSentence) + *lpfdwSentence = pIC->fdwSentence; + + ImmUnlockIMC(hIMC); + return TRUE; +} + +/*********************************************************************** + * ImmSetConversionStatus (IMM32.@) + */ +BOOL WINAPI ImmSetConversionStatus(HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence) +{ + HKL hKL; + LPINPUTCONTEXT pIC; + DWORD dwOldConversion, dwOldSentence; + BOOL fConversionChange = FALSE, fSentenceChange = FALSE; + HWND hWnd; + + TRACE("(%p, 0x%lX, 0x%lX)\n", hIMC, fdwConversion, fdwSentence); + + hKL = GetKeyboardLayout(0); + if (!IS_IME_HKL(hKL)) + { + if (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) + { + FIXME("Cicero\n"); + return FALSE; + } + } + + if (Imm32IsCrossThreadAccess(hIMC)) + return FALSE; + + pIC = ImmLockIMC(hIMC); + if (pIC == NULL) + return FALSE; + + if (pIC->fdwConversion != fdwConversion) + { + dwOldConversion = pIC->fdwConversion; + pIC->fdwConversion = fdwConversion; + fConversionChange = TRUE; + } + + if (pIC->fdwSentence != fdwSentence) + { + dwOldSentence = pIC->fdwSentence; + pIC->fdwSentence = fdwSentence; + fSentenceChange = TRUE; + } + + hWnd = pIC->hWnd; + ImmUnlockIMC(hIMC); + + if (fConversionChange) + { + Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, dwOldConversion, + IMC_SETCONVERSIONMODE, IMN_SETCONVERSIONMODE, 0); + NtUserNotifyIMEStatus(hWnd, hIMC, fdwConversion); + } + + if (fSentenceChange) + { + Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, dwOldSentence, + IMC_SETSENTENCEMODE, IMN_SETSENTENCEMODE, 0); + } + + return TRUE; +} diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 1dc41f8e362..38dd4b55b57 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -10,88 +10,14 @@ * Copyright 2020-2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ -#include <stdarg.h> -#include <stdio.h> - -#define WIN32_NO_STATUS -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <winerror.h> -#include <wine/debug.h> -#include <imm.h> -#include <ddk/imm.h> -#include <winnls.h> -#include <winreg.h> -#include <wine/list.h> -#include <stdlib.h> -#include <ndk/umtypes.h> -#include <ndk/pstypes.h> -#include <ndk/rtlfuncs.h> -#include "../../../win32ss/include/ntuser.h" -#include "../../../win32ss/include/ntwin32.h" -#include <undocuser.h> -#include <imm32_undoc.h> -#include <strsafe.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); -#define IMM_INIT_MAGIC 0x19650412 -#define IMM_INVALID_CANDFORM ULONG_MAX -#define INVALID_HOTKEY_ID 0xFFFFFFFF -#define MAX_CANDIDATEFORM 4 - -#define LANGID_CHINESE_SIMPLIFIED MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED) -#define LANGID_CHINESE_TRADITIONAL MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL) -#define LANGID_JAPANESE MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT) - -#define REGKEY_KEYBOARD_LAYOUTS \ - L"System\\CurrentControlSet\\Control\\Keyboard Layouts" -#define REGKEY_IMM \ - L"Software\\Microsoft\\Windows NT\\CurrentVersion\\IMM" - -#define ROUNDUP4(n) (((n) + 3) & ~3) /* DWORD alignment */ - HMODULE g_hImm32Inst = NULL; -RTL_CRITICAL_SECTION g_csImeDpi; -PIMEDPI g_pImeDpiList = NULL; PSERVERINFO g_psi = NULL; SHAREDINFO g_SharedInfo = { NULL }; BYTE g_bClientRegd = FALSE; -HANDLE g_hImm32Heap = NULL; - -static PWND FASTCALL ValidateHwndNoErr(HWND hwnd) -{ - PCLIENTINFO ClientInfo = GetWin32ClientInfo(); - INT index; - PUSER_HANDLE_TABLE ht; - PUSER_HANDLE_ENTRY he; - WORD generation; - - /* See if the window is cached */ - if (hwnd == ClientInfo->CallbackWnd.hWnd) - return ClientInfo->CallbackWnd.pWnd; - - if (!NtUserValidateHandleSecure(hwnd)) - return NULL; - - ht = g_SharedInfo.aheList; /* handle table */ - ASSERT(ht); - /* ReactOS-Specific! */ - ASSERT(g_SharedInfo.ulSharedDelta != 0); - he = (PUSER_HANDLE_ENTRY)((ULONG_PTR)ht->handles - g_SharedInfo.ulSharedDelta); - - index = (LOWORD(hwnd) - FIRST_USER_HANDLE) >> 1; - if (index < 0 || index >= ht->nb_handles || he[index].type != TYPE_WINDOW) - return NULL; - - generation = HIWORD(hwnd); - if (generation != he[index].generation && generation && generation != 0xFFFF) - return NULL; - - return (PWND)&he[index]; -} static BOOL APIENTRY Imm32InitInstance(HMODULE hMod) { @@ -111,568 +37,15 @@ static BOOL APIENTRY Imm32InitInstance(HMODULE hMod) return TRUE; } -LPVOID APIENTRY Imm32HeapAlloc(DWORD dwFlags, DWORD dwBytes) -{ - if (!g_hImm32Heap) - { - g_hImm32Heap = RtlGetProcessHeap(); - if (g_hImm32Heap == NULL) - return NULL; - } - return HeapAlloc(g_hImm32Heap, dwFlags, dwBytes); -} - -static LPWSTR APIENTRY Imm32WideFromAnsi(LPCSTR pszA) -{ - INT cch = lstrlenA(pszA); - LPWSTR pszW = Imm32HeapAlloc(0, (cch + 1) * sizeof(WCHAR)); - if (pszW == NULL) - return NULL; - cch = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, pszA, cch, pszW, cch + 1); - pszW[cch] = 0; - return pszW; -} - -static LPSTR APIENTRY Imm32AnsiFromWide(LPCWSTR pszW) -{ - INT cchW = lstrlenW(pszW); - INT cchA = (cchW + 1) * sizeof(WCHAR); - LPSTR pszA = Imm32HeapAlloc(0, cchA); - if (!pszA) - return NULL; - cchA = WideCharToMultiByte(CP_ACP, 0, pszW, cchW, pszA, cchA, NULL, NULL); - pszA[cchA] = 0; - return pszA; -} - -static inline BOOL Imm32IsCrossThreadAccess(HIMC hIMC) -{ - DWORD dwImeThreadId = NtUserQueryInputContext(hIMC, 1); - DWORD dwThreadId = GetCurrentThreadId(); - return (dwImeThreadId != dwThreadId); -} - -static BOOL Imm32IsCrossProcessAccess(HWND hWnd) -{ - return (NtUserQueryWindow(hWnd, QUERY_WINDOW_UNIQUE_PROCESS_ID) != - (DWORD_PTR)NtCurrentTeb()->ClientId.UniqueProcess); -} - -static VOID APIENTRY Imm32FreeImeDpi(PIMEDPI pImeDpi, BOOL bDestroy) -{ - if (pImeDpi->hInst == NULL) - return; - if (bDestroy) - pImeDpi->ImeDestroy(0); - FreeLibrary(pImeDpi->hInst); - pImeDpi->hInst = NULL; -} - -static BOOL APIENTRY -Imm32NotifyAction(HIMC hIMC, HWND hwnd, DWORD dwAction, DWORD_PTR dwIndex, DWORD_PTR dwValue, - DWORD_PTR dwCommand, DWORD_PTR dwData) -{ - DWORD dwLayout; - HKL hKL; - PIMEDPI pImeDpi; - - if (dwAction) - { - dwLayout = NtUserQueryInputContext(hIMC, 1); - if (dwLayout) - { - /* find keyboard layout and lock it */ - hKL = GetKeyboardLayout(dwLayout); - pImeDpi = ImmLockImeDpi(hKL); - if (pImeDpi) - { - /* do notify */ - pImeDpi->NotifyIME(hIMC, dwAction, dwIndex, dwValue); - - ImmUnlockImeDpi(pImeDpi); /* unlock */ - } - } - } - - if (hwnd && dwCommand) - SendMessageW(hwnd, WM_IME_NOTIFY, dwCommand, dwData); - - return TRUE; -} - -static PIMEDPI APIENTRY Imm32FindImeDpi(HKL hKL) -{ - PIMEDPI pImeDpi; - - RtlEnterCriticalSection(&g_csImeDpi); - for (pImeDpi = g_pImeDpiList; pImeDpi != NULL; pImeDpi = pImeDpi->pNext) - { - if (pImeDpi->hKL == hKL) - break; - } - RtlLeaveCriticalSection(&g_csImeDpi); - - return pImeDpi; -} - -static BOOL Imm32GetSystemLibraryPath(LPWSTR pszPath, DWORD cchPath, LPCWSTR pszFileName) -{ - if (!pszFileName[0] || !GetSystemDirectoryW(pszPath, cchPath)) - return FALSE; - StringCchCatW(pszPath, cchPath, L"\\"); - StringCchCatW(pszPath, cchPath, pszFileName); - return TRUE; -} - -static BOOL APIENTRY Imm32InquireIme(PIMEDPI pImeDpi) -{ - WCHAR szUIClass[64]; - WNDCLASSW wcW; - DWORD dwSysInfoFlags = 0; // TODO: ??? - LPIMEINFO pImeInfo = &pImeDpi->ImeInfo; - - // TODO: NtUserGetThreadState(16); - - if (!IS_IME_HKL(pImeDpi->hKL)) - { - if (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED) && - pImeDpi->CtfImeInquireExW) - { - // TODO: - return FALSE; - } - } - - if (!pImeDpi->ImeInquire(pImeInfo, szUIClass, dwSysInfoFlags)) - return FALSE; - - szUIClass[_countof(szUIClass) - 1] = 0; - - if (pImeInfo->dwPrivateDataSize == 0) - pImeInfo->dwPrivateDataSize = 4; - -#define VALID_IME_PROP (IME_PROP_AT_CARET | \ - IME_PROP_SPECIAL_UI | \ - IME_PROP_CANDLIST_START_FROM_1 | \ - IME_PROP_UNICODE | \ - IME_PROP_COMPLETE_ON_UNSELECT | \ - IME_PROP_END_UNLOAD | \ - IME_PROP_KBD_CHAR_FIRST | \ - IME_PROP_IGNORE_UPKEYS | \ - IME_PROP_NEED_ALTKEY | \ - IME_PROP_NO_KEYS_ON_CLOSE | \ - IME_PROP_ACCEPT_WIDE_VKEY) -#define VALID_CMODE_CAPS (IME_CMODE_ALPHANUMERIC | \ - IME_CMODE_NATIVE | \ - IME_CMODE_KATAKANA | \ - IME_CMODE_LANGUAGE | \ - IME_CMODE_FULLSHAPE | \ - IME_CMODE_ROMAN | \ - IME_CMODE_CHARCODE | \ - IME_CMODE_HANJACONVERT | \ - IME_CMODE_SOFTKBD | \ - IME_CMODE_NOCONVERSION | \ - IME_CMODE_EUDC | \ - IME_CMODE_SYMBOL | \ - IME_CMODE_FIXED) -#define VALID_SMODE_CAPS (IME_SMODE_NONE | \ - IME_SMODE_PLAURALCLAUSE | \ - IME_SMODE_SINGLECONVERT | \ - IME_SMODE_AUTOMATIC | \ - IME_SMODE_PHRASEPREDICT | \ - IME_SMODE_CONVERSATION) -#define VALID_UI_CAPS (UI_CAP_2700 | \ - UI_CAP_ROT90 | \ - UI_CAP_ROTANY | \ - UI_CAP_SOFTKBD) -#define VALID_SCS_CAPS (SCS_CAP_COMPSTR | \ - SCS_CAP_MAKEREAD | \ - SCS_CAP_SETRECONVERTSTRING) -#define VALID_SELECT_CAPS (SELECT_CAP_CONVERSION | SELECT_CAP_SENTENCE) - - if (pImeInfo->fdwProperty & ~VALID_IME_PROP) - return FALSE; - if (pImeInfo->fdwConversionCaps & ~VALID_CMODE_CAPS) - return FALSE; - if (pImeInfo->fdwSentenceCaps & ~VALID_SMODE_CAPS) - return FALSE; - if (pImeInfo->fdwUICaps & ~VALID_UI_CAPS) - return FALSE; - if (pImeInfo->fdwSCSCaps & ~VALID_SCS_CAPS) - return FALSE; - if (pImeInfo->fdwSelectCaps & ~VALID_SELECT_CAPS) - return FALSE; - -#undef VALID_IME_PROP -#undef VALID_CMODE_CAPS -#undef VALID_SMODE_CAPS -#undef VALID_UI_CAPS -#undef VALID_SCS_CAPS -#undef VALID_SELECT_CAPS - - if (pImeInfo->fdwProperty & IME_PROP_UNICODE) - { - StringCchCopyW(pImeDpi->szUIClass, _countof(pImeDpi->szUIClass), szUIClass); - } - else - { - if (pImeDpi->uCodePage != GetACP() && pImeDpi->uCodePage) - return FALSE; - - MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (LPSTR)szUIClass, -1, - pImeDpi->szUIClass, _countof(pImeDpi->szUIClass)); - } - - return GetClassInfoW(pImeDpi->hInst, pImeDpi->szUIClass, &wcW); -} - -static BOOL APIENTRY Imm32LoadImeInfo(PIMEINFOEX pImeInfoEx, PIMEDPI pImeDpi) -{ - WCHAR szPath[MAX_PATH]; - HINSTANCE hIME; - FARPROC fn; - - if (!Imm32GetSystemLibraryPath(szPath, _countof(szPath), pImeInfoEx->wszImeFile)) - return FALSE; - - hIME = GetModuleHandleW(szPath); - if (hIME == NULL) - { - hIME = LoadLibraryW(szPath); - if (hIME == NULL) - { - ERR("Imm32LoadImeInfo: LoadLibraryW(%S) failed\n", szPath); - return FALSE; - } - } - pImeDpi->hInst = hIME; - -#define DEFINE_IME_ENTRY(type, name, params, extended) \ - do { \ - fn = GetProcAddress(hIME, #name); \ - if (fn) pImeDpi->name = (FN_##name)fn; \ - else if (!extended) goto Failed; \ - } while (0); -#include "../../../win32ss/include/imetable.h" -#undef DEFINE_IME_ENTRY - - if (!Imm32InquireIme(pImeDpi)) - { - ERR("Imm32LoadImeInfo: Imm32InquireIme failed\n"); - goto Failed; - } - - if (pImeInfoEx->fLoadFlag) - return TRUE; - - NtUserSetImeOwnerWindow(pImeInfoEx, TRUE); - return TRUE; - -Failed: - FreeLibrary(pImeDpi->hInst); - pImeDpi->hInst = NULL; - return FALSE; -} - -#ifdef IMP_SUPPORT /* 3.x support */ -static DWORD APIENTRY -ImpJTransCompA(LPINPUTCONTEXTDX pIC, LPCOMPOSITIONSTRING pCS, - const TRANSMSG *pSrc, LPTRANSMSG pDest) -{ - // FIXME - *pDest = *pSrc; - return 1; -} - -static DWORD APIENTRY -ImpJTransCompW(LPINPUTCONTEXTDX pIC, LPCOMPOSITIONSTRING pCS, - const TRANSMSG *pSrc, LPTRANSMSG pDest) -{ - // FIXME - *pDest = *pSrc; - return 1; -} - -typedef LRESULT (WINAPI *FN_SendMessage)(HWND, UINT, WPARAM, LPARAM); - -static DWORD APIENTRY -ImpJTrans(DWORD dwCount, LPTRANSMSG pTrans, LPINPUTCONTEXTDX pIC, - LPCOMPOSITIONSTRING pCS, BOOL bAnsi) -{ - DWORD ret = 0; - HWND hWnd, hwndDefIME; - LPTRANSMSG pTempList, pEntry, pNext; - DWORD dwIndex, iCandForm, dwNumber, cbTempList; - HGLOBAL hGlobal; - CANDIDATEFORM CandForm; - FN_SendMessage pSendMessage; - - hWnd = pIC->hWnd; - hwndDefIME = ImmGetDefaultIMEWnd(hWnd); - pSendMessage = (IsWindowUnicode(hWnd) ? SendMessageW : SendMessageA); - - // clone the message list - cbTempList = (dwCount + 1) * sizeof(TRANSMSG); - pTempList = Imm32HeapAlloc(HEAP_ZERO_MEMORY, cbTempList); - if (pTempList == NULL) - return 0; - RtlCopyMemory(pTempList, pTrans, dwCount * sizeof(TRANSMSG)); - - if (pIC->dwUIFlags & 0x2) - { - // find WM_IME_ENDCOMPOSITION - pEntry = pTempList; - for (dwIndex = 0; dwIndex < dwCount; ++dwIndex, ++pEntry) - { - if (pEntry->message == WM_IME_ENDCOMPOSITION) - break; - } - - if (pEntry->message == WM_IME_ENDCOMPOSITION) // if found - { - // move WM_IME_ENDCOMPOSITION to the end of the list - for (pNext = pEntry + 1; pNext->message != 0; ++pEntry, ++pNext) - *pEntry = *pNext; - - pEntry->message = WM_IME_ENDCOMPOSITION; - pEntry->wParam = 0; - pEntry->lParam = 0; - } - } - - for (pEntry = pTempList; pEntry->message != 0; ++pEntry) - { - switch (pEntry->message) - { - case WM_IME_STARTCOMPOSITION: - if (!(pIC->dwUIFlags & 0x2)) - { - // send IR_OPENCONVERT - if (pIC->cfCompForm.dwStyle != CFS_DEFAULT) - pSendMessage(hWnd, WM_IME_REPORT, IR_OPENCONVERT, 0); - - goto DoDefault; - } - break; - - case WM_IME_ENDCOMPOSITION: - if (pIC->dwUIFlags & 0x2) - { - // send IR_UNDETERMINE - hGlobal = GlobalAlloc(GHND | GMEM_SHARE, sizeof(UNDETERMINESTRUCT)); - if (hGlobal) - { - pSendMessage(hWnd, WM_IME_REPORT, IR_UNDETERMINE, (LPARAM)hGlobal); - GlobalFree(hGlobal); - } - } - else - { - // send IR_CLOSECONVERT - if (pIC->cfCompForm.dwStyle != CFS_DEFAULT) - pSendMessage(hWnd, WM_IME_REPORT, IR_CLOSECONVERT, 0); - - goto DoDefault; - } - break; - - case WM_IME_COMPOSITION: - if (bAnsi) - dwNumber = ImpJTransCompA(pIC, pCS, pEntry, pTrans); - else - dwNumber = ImpJTransCompW(pIC, pCS, pEntry, pTrans); - - ret += dwNumber; - pTrans += dwNumber; - - // send IR_CHANGECONVERT - if (!(pIC->dwUIFlags & 0x2)) - { - if (pIC->cfCompForm.dwStyle != CFS_DEFAULT) - pSendMessage(hWnd, WM_IME_REPORT, IR_CHANGECONVERT, 0); - } - break; - - case WM_IME_NOTIFY: - if (pEntry->wParam == IMN_OPENCANDIDATE) - { - if (IsWindow(hWnd) && (pIC->dwUIFlags & 0x2)) - { - // send IMC_SETCANDIDATEPOS - for (iCandForm = 0; iCandForm < MAX_CANDIDATEFORM; ++iCandForm) - { - if (!(pEntry->lParam & (1 << iCandForm))) - continue; - - CandForm.dwIndex = iCandForm; - CandForm.dwStyle = CFS_EXCLUDE; - CandForm.ptCurrentPos = pIC->cfCompForm.ptCurrentPos; - CandForm.rcArea = pIC->cfCompForm.rcArea; - pSendMessage(hwndDefIME, WM_IME_CONTROL, IMC_SETCANDIDATEPOS, - (LPARAM)&CandForm); - } - } - } - - if (!(pIC->dwUIFlags & 0x2)) - goto DoDefault; - - // send a WM_IME_NOTIFY notification to the default ime window - pSendMessage(hwndDefIME, pEntry->message, pEntry->wParam, pEntry->lParam); - break; - -DoDefault: - default: - // default processing - *pTrans++ = *pEntry; - ++ret; - break; - } - } - - HeapFree(g_hImm32Heap, 0, pTempList); - return ret; -} - -static DWORD APIENTRY -ImpKTrans(DWORD dwCount, LPTRANSMSG pEntries, LPINPUTCONTEXTDX pIC, - LPCOMPOSITIONSTRING pCS, BOOL bAnsi) -{ - return dwCount; // FIXME -} - -static DWORD APIENTRY -ImpTrans(DWORD dwCount, LPTRANSMSG pEntries, HIMC hIMC, BOOL bAnsi, WORD wLang) -{ - BOOL ret = FALSE; - LPINPUTCONTEXTDX pIC; - LPCOMPOSITIONSTRING pCS; - - pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); - if (pIC == NULL) - return 0; - - pCS = ImmLockIMCC(pIC->hCompStr); - if (pCS) - { - if (wLang == LANG_JAPANESE) - ret = ImpJTrans(dwCount, pEntries, pIC, pCS, bAnsi); - else if (wLang == LANG_KOREAN) - ret = ImpKTrans(dwCount, pEntries, pIC, pCS, bAnsi); - ImmUnlockIMCC(pIC->hCompStr); - } - - ImmUnlockIMC(hIMC); - return ret; -} -#endif /* def IMP_SUPPORT */ - -static PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock) -{ - IMEINFOEX ImeInfoEx; - CHARSETINFO ci; - PIMEDPI pImeDpiNew, pImeDpiFound; - UINT uCodePage; - LCID lcid; - - if (!ImmGetImeInfoEx(&ImeInfoEx, ImeInfoExKeyboardLayout, &hKL) || - ImeInfoEx.fLoadFlag == 1) - { - return NULL; - } - - pImeDpiNew = Imm32HeapAlloc(HEAP_ZERO_MEMORY, sizeof(IMEDPI)); - if (pImeDpiNew == NULL) - return NULL; - - pImeDpiNew->hKL = hKL; - - lcid = LOWORD(hKL); - if (TranslateCharsetInfo((LPDWORD)(DWORD_PTR)lcid, &ci, TCI_SRCLOCALE)) - uCodePage = ci.ciACP; - else - uCodePage = CP_ACP; - pImeDpiNew->uCodePage = uCodePage; - - if (!Imm32LoadImeInfo(&ImeInfoEx, pImeDpiNew)) - { - HeapFree(g_hImm32Heap, 0, pImeDpiNew); - return FALSE; - } - - RtlEnterCriticalSection(&g_csImeDpi); - - pImeDpiFound = Imm32FindImeDpi(hKL); - if (pImeDpiFound) - { - if (!bLock) - pImeDpiFound->dwFlags &= ~IMEDPI_FLAG_LOCKED; - - RtlLeaveCriticalSection(&g_csImeDpi); - - Imm32FreeImeDpi(pImeDpiNew, FALSE); - HeapFree(g_hImm32Heap, 0, pImeDpiNew); - return pImeDpiFound; - } - else - { - if (bLock) - { - pImeDpiNew->dwFlags |= IMEDPI_FLAG_LOCKED; - pImeDpiNew->cLockObj = 1; - } - - pImeDpiNew->pNext = g_pImeDpiList; - g_pImeDpiList = pImeDpiNew; - - RtlLeaveCriticalSection(&g_csImeDpi); - return pImeDpiNew; - } -} - /*********************************************************************** - * ImmLoadIME (IMM32.@) + * ImmRegisterClient(IMM32.@) + * ( Undocumented, called from user32.dll ) */ -BOOL WINAPI ImmLoadIME(HKL hKL) -{ - PW32CLIENTINFO pInfo; - PIMEDPI pImeDpi; - - if (!IS_IME_HKL(hKL)) - { - if (!g_psi || !(g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) - return FALSE; - - pInfo = (PW32CLIENTINFO)(NtCurrentTeb()->Win32ClientInfo); - if ((pInfo->W32ClientInfo[0] & 2)) - return FALSE; - } - - pImeDpi = Imm32FindImeDpi(hKL); - if (pImeDpi == NULL) - pImeDpi = Ime32LoadImeDpi(hKL, FALSE); - return (pImeDpi != NULL); -} - -PIMEDPI APIENTRY ImmLockOrLoadImeDpi(HKL hKL) +BOOL WINAPI ImmRegisterClient(PSHAREDINFO ptr, HINSTANCE hMod) { - PW32CLIENTINFO pInfo; - PIMEDPI pImeDpi; - - if (!IS_IME_HKL(hKL)) - { - if (!g_psi || !(g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) - return NULL; - - pInfo = (PW32CLIENTINFO)(NtCurrentTeb()->Win32ClientInfo); - if ((pInfo->W32ClientInfo[0] & 2)) - return NULL; - } - - pImeDpi = ImmLockImeDpi(hKL); - if (pImeDpi == NULL) - pImeDpi = Ime32LoadImeDpi(hKL, TRUE); - return pImeDpi; + g_SharedInfo = *ptr; + g_psi = g_SharedInfo.psi; + return Imm32InitInstance(hMod); } /*********************************************************************** @@ -730,7 +103,8 @@ HKL WINAPI ImmLoadLayout(HKL hKL, PIMEINFOEX pImeInfoEx) return hKL; } -typedef struct _tagImmHkl{ +typedef struct _tagImmHkl +{ struct list entry; HKL hkl; HMODULE hIME; @@ -760,19 +134,20 @@ typedef struct _tagImmHkl{ typedef struct tagInputContextData { - DWORD dwLock; - INPUTCONTEXT IMC; - DWORD threadID; - - ImmHkl *immKbd; - UINT lastVK; - BOOL threadDefault; - DWORD magic; + DWORD dwLock; + INPUTCONTEXT IMC; + DWORD threadID; + + ImmHkl *immKbd; + UINT lastVK; + BOOL threadDefault; + DWORD magic; } InputContextData; #define WINE_IMC_VALID_MAGIC 0x56434D49 -typedef struct _tagIMMThreadData { +typedef struct _tagIMMThreadData +{ struct list entry; DWORD threadID; HIMC defaultContext; @@ -790,18 +165,6 @@ static const WCHAR szImeFileW[] = {'I','m','e',' ','F','i','l','e',0}; static const WCHAR szLayoutTextW[] = {'L','a','y','o','u','t',' ','T','e','x','t',0}; static const WCHAR szImeRegFmt[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','l','x',0}; -static const WCHAR szwIME[] = {'I','M','E',0}; -static const WCHAR szwDefaultIME[] = {'D','e','f','a','u','l','t',' ','I','M','E',0}; - -static CRITICAL_SECTION threaddata_cs; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &threaddata_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": threaddata_cs") } -}; -static CRITICAL_SECTION threaddata_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; - static inline BOOL is_himc_ime_unicode(const InputContextData *data) { return !!(data->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE); @@ -1038,7 +401,6 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) return old; } - /* * Helper function for ImmAssociateContextEx */ @@ -1087,8 +449,7 @@ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) /*********************************************************************** * ImmConfigureIMEA (IMM32.@) */ -BOOL WINAPI ImmConfigureIMEA( - HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) +BOOL WINAPI ImmConfigureIMEA(HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) { ImmHkl *immHkl = IMM_GetImmHkl(hKL); @@ -1122,8 +483,7 @@ BOOL WINAPI ImmConfigureIMEA( /*********************************************************************** * ImmConfigureIMEW (IMM32.@) */ -BOOL WINAPI ImmConfigureIMEW( - HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) +BOOL WINAPI ImmConfigureIMEW(HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) { ImmHkl *immHkl = IMM_GetImmHkl(hKL); @@ -1285,232 +645,25 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC) return Imm32CleanupContext(hIMC, hKL, FALSE); } -/*********************************************************************** - * ImmDisableIME (IMM32.@) - */ -BOOL WINAPI ImmDisableIME(DWORD dwThreadId) +static inline BOOL EscapeRequiresWA(UINT uEscape) { - return NtUserDisableThreadIme(dwThreadId); + if (uEscape == IME_ESC_GET_EUDC_DICTIONARY || + uEscape == IME_ESC_SET_EUDC_DICTIONARY || + uEscape == IME_ESC_IME_NAME || + uEscape == IME_ESC_GETHELPFILENAME) + return TRUE; + return FALSE; } -/* - * These functions absorb the difference between Ansi and Wide. +/*********************************************************************** + * ImmEscapeA (IMM32.@) */ -typedef struct ENUM_WORD_A2W -{ - REGISTERWORDENUMPROCW lpfnEnumProc; - LPVOID lpData; - UINT ret; -} ENUM_WORD_A2W, *LPENUM_WORD_A2W; - -typedef struct ENUM_WORD_W2A -{ - REGISTERWORDENUMPROCA lpfnEnumProc; - LPVOID lpData; - UINT ret; -} ENUM_WORD_W2A, *LPENUM_WORD_W2A; - -static INT CALLBACK -Imm32EnumWordProcA2W(LPCSTR pszReadingA, DWORD dwStyle, LPCSTR pszRegisterA, LPVOID lpData) +LRESULT WINAPI ImmEscapeA(HKL hKL, HIMC hIMC, UINT uEscape, LPVOID lpData) { - INT ret = 0; - LPENUM_WORD_A2W lpEnumData = lpData; - LPWSTR pszReadingW = NULL, pszRegisterW = NULL; - - if (pszReadingA) - { - pszReadingW = Imm32WideFromAnsi(pszReadingA); - if (pszReadingW == NULL) - goto Quit; - } + ImmHkl *immHkl = IMM_GetImmHkl(hKL); + TRACE("(%p, %p, %d, %p):\n", hKL, hIMC, uEscape, lpData); - if (pszRegisterA) - { - pszRegisterW = Imm32WideFromAnsi(pszRegisterA); - if (pszRegisterW == NULL) - goto Quit; - } - - ret = lpEnumData->lpfnEnumProc(pszReadingW, dwStyle, pszRegisterW, lpEnumData->lpData); - lpEnumData->ret = ret; - -Quit: - if (pszReadingW) - HeapFree(g_hImm32Heap, 0, pszReadingW); - if (pszRegisterW) - HeapFree(g_hImm32Heap, 0, pszRegisterW); - return ret; -} - -static INT CALLBACK -Imm32EnumWordProcW2A(LPCWSTR pszReadingW, DWORD dwStyle, LPCWSTR pszRegisterW, LPVOID lpData) -{ - INT ret = 0; - LPENUM_WORD_W2A lpEnumData = lpData; - LPSTR pszReadingA = NULL, pszRegisterA = NULL; - - if (pszReadingW) - { - pszReadingA = Imm32AnsiFromWide(pszReadingW); - if (pszReadingW == NULL) - goto Quit; - } - - if (pszRegisterW) - { - pszRegisterA = Imm32AnsiFromWide(pszRegisterW); - if (pszRegisterA == NULL) - goto Quit; - } - - ret = lpEnumData->lpfnEnumProc(pszReadingA, dwStyle, pszRegisterA, lpEnumData->lpData); - lpEnumData->ret = ret; - -Quit: - if (pszReadingA) - HeapFree(g_hImm32Heap, 0, pszReadingA); - if (pszRegisterA) - HeapFree(g_hImm32Heap, 0, pszRegisterA); - return ret; -} - -/*********************************************************************** - * ImmEnumRegisterWordA (IMM32.@) - */ -UINT WINAPI ImmEnumRegisterWordA( - HKL hKL, REGISTERWORDENUMPROCA lpfnEnumProc, - LPCSTR lpszReading, DWORD dwStyle, - LPCSTR lpszRegister, LPVOID lpData) -{ - UINT ret = 0; - LPWSTR pszReadingW = NULL, pszRegisterW = NULL; - ENUM_WORD_W2A EnumDataW2A; - PIMEDPI pImeDpi; - - TRACE("(%p, %p, %s, 0x%lX, %s, %p)", hKL, lpfnEnumProc, debugstr_a(lpszReading), - dwStyle, debugstr_a(lpszRegister), lpData); - - pImeDpi = ImmLockOrLoadImeDpi(hKL); - if (!pImeDpi) - return 0; - - if (!(pImeDpi->ImeInfo.fdwProperty & IME_PROP_UNICODE)) - { - ret = pImeDpi->ImeEnumRegisterWord(lpfnEnumProc, lpszReading, dwStyle, - lpszRegister, lpData); - ImmUnlockImeDpi(pImeDpi); - return ret; - } - - if (lpszReading) - { - pszReadingW = Imm32WideFromAnsi(lpszReading); - if (pszReadingW == NULL) - goto Quit; - } - - if (lpszRegister) - { - pszRegisterW = Imm32WideFromAnsi(lpszRegister); - if (pszRegisterW == NULL) - goto Quit; - } - - EnumDataW2A.lpfnEnumProc = lpfnEnumProc; - EnumDataW2A.lpData = lpData; - EnumDataW2A.ret = 0; - pImeDpi->ImeEnumRegisterWord(Imm32EnumWordProcW2A, pszReadingW, dwStyle, - pszRegisterW, &EnumDataW2A); - ret = EnumDataW2A.ret; - -Quit: - if (pszReadingW) - HeapFree(g_hImm32Heap, 0, pszReadingW); - if (pszRegisterW) - HeapFree(g_hImm32Heap, 0, pszRegisterW); - ImmUnlockImeDpi(pImeDpi); - return ret; -} - -/*********************************************************************** - * ImmEnumRegisterWordW (IMM32.@) - */ -UINT WINAPI ImmEnumRegisterWordW( - HKL hKL, REGISTERWORDENUMPROCW lpfnEnumProc, - LPCWSTR lpszReading, DWORD dwStyle, - LPCWSTR lpszRegister, LPVOID lpData) -{ - UINT ret = 0; - LPSTR pszReadingA = NULL, pszRegisterA = NULL; - ENUM_WORD_A2W EnumDataA2W; - PIMEDPI pImeDpi; - - TRACE("(%p, %p, %s, 0x%lX, %s, %p)", hKL, lpfnEnumProc, debugstr_w(lpszReading), - dwStyle, debugstr_w(lpszRegister), lpData); - - pImeDpi = ImmLockOrLoadImeDpi(hKL); - if (!pImeDpi) - return 0; - - if (pImeDpi->ImeInfo.fdwProperty & IME_PROP_UNICODE) - { - ret = pImeDpi->ImeEnumRegisterWord(lpfnEnumProc, lpszReading, dwStyle, - lpszRegister, lpData); - ImmUnlockImeDpi(pImeDpi); - return ret; - } - - if (lpszReading) - { - pszReadingA = Imm32AnsiFromWide(lpszReading); - if (pszReadingA == NULL) - goto Quit; - } - - if (lpszRegister) - { - pszRegisterA = Imm32AnsiFromWide(lpszRegister); - if (pszRegisterA == NULL) - goto Quit; - } - - EnumDataA2W.lpfnEnumProc = lpfnEnumProc; - EnumDataA2W.lpData = lpData; - EnumDataA2W.ret = 0; - pImeDpi->ImeEnumRegisterWord(Imm32EnumWordProcA2W, pszReadingA, dwStyle, - pszRegisterA, &EnumDataA2W); - ret = EnumDataA2W.ret; - -Quit: - if (pszReadingA) - HeapFree(g_hImm32Heap, 0, pszReadingA); - if (pszRegisterA) - HeapFree(g_hImm32Heap, 0, pszRegisterA); - ImmUnlockImeDpi(pImeDpi); - return ret; -} - -static inline BOOL EscapeRequiresWA(UINT uEscape) -{ - if (uEscape == IME_ESC_GET_EUDC_DICTIONARY || - uEscape == IME_ESC_SET_EUDC_DICTIONARY || - uEscape == IME_ESC_IME_NAME || - uEscape == IME_ESC_GETHELPFILENAME) - return TRUE; - return FALSE; -} - -/*********************************************************************** - * ImmEscapeA (IMM32.@) - */ -LRESULT WINAPI ImmEscapeA( - HKL hKL, HIMC hIMC, - UINT uEscape, LPVOID lpData) -{ - ImmHkl *immHkl = IMM_GetImmHkl(hKL); - TRACE("(%p, %p, %d, %p):\n", hKL, hIMC, uEscape, lpData); - - if (immHkl->hIME && immHkl->pImeEscape) + if (immHkl->hIME && immHkl->pImeEscape) { if (!EscapeRequiresWA(uEscape) || !is_kbd_ime_unicode(immHkl)) return immHkl->pImeEscape(hIMC,uEscape,lpData); @@ -1538,9 +691,7 @@ LRESULT WINAPI ImmEscapeA( /*********************************************************************** * ImmEscapeW (IMM32.@) */ -LRESULT WINAPI ImmEscapeW( - HKL hKL, HIMC hIMC, - UINT uEscape, LPVOID lpData) +LRESULT WINAPI ImmEscapeW(HKL hKL, HIMC hIMC, UINT uEscape, LPVOID lpData) { ImmHkl *immHkl = IMM_GetImmHkl(hKL); TRACE("(%p, %p, %d, %p):\n", hKL, hIMC, uEscape, lpData); @@ -1576,266 +727,6 @@ static PCLIENTIMC APIENTRY Imm32GetClientImcCache(void) return NULL; } -static DWORD APIENTRY Imm32AllocAndBuildHimcList(DWORD dwThreadId, HIMC **pphList) -{ -#define INITIAL_COUNT 0x40 -#define MAX_RETRY 10 - NTSTATUS Status; - DWORD dwCount = INITIAL_COUNT, cRetry = 0; - HIMC *phNewList; - - phNewList = Imm32HeapAlloc(0, dwCount * sizeof(HIMC)); - if (phNewList == NULL) - return 0; - - Status = NtUserBuildHimcList(dwThreadId, dwCount, phNewList, &dwCount); - while (Status == STATUS_BUFFER_TOO_SMALL) - { - HeapFree(g_hImm32Heap, 0, phNewList); - if (cRetry++ >= MAX_RETRY) - return 0; - - phNewList = Imm32HeapAlloc(0, dwCount * sizeof(HIMC)); - if (phNewList == NULL) - return 0; - - Status = NtUserBuildHimcList(dwThreadId, dwCount, phNewList, &dwCount); - } - - if (NT_ERROR(Status) || !dwCount) - { - HeapFree(g_hImm32Heap, 0, phNewList); - return 0; - } - - *pphList = phNewList; - return dwCount; -#undef INITIAL_COUNT -#undef MAX_RETRY -} - -static BOOL APIENTRY Imm32ImeNonImeToggle(HIMC hIMC, HKL hKL, HWND hWnd, LANGID LangID) -{ - LPINPUTCONTEXT pIC; - BOOL fOpen; - - if (hWnd != NULL) - return FALSE; - - if (!IS_IME_HKL(hKL) || LOWORD(hKL) != LangID) - { - FIXME("We have to do something here\n"); - return TRUE; - } - - pIC = ImmLockIMC(hIMC); - if (pIC == NULL) - return TRUE; - - fOpen = pIC->fOpen; - ImmUnlockIMC(hIMC); - - if (!fOpen) - { - ImmSetOpenStatus(hIMC, TRUE); - return TRUE; - } - - FIXME("We have to do something here\n"); - return TRUE; -} - -static BOOL APIENTRY Imm32CShapeToggle(HIMC hIMC, HKL hKL, HWND hWnd) -{ - LPINPUTCONTEXT pIC; - BOOL fOpen; - DWORD dwConversion, dwSentence; - - if (hWnd == NULL || !IS_IME_HKL(hKL)) - return FALSE; - - pIC = ImmLockIMC(hIMC); - if (pIC == NULL) - return TRUE; - - fOpen = pIC->fOpen; - if (fOpen) - { - dwConversion = (pIC->fdwConversion ^ IME_CMODE_FULLSHAPE); - dwSentence = pIC->fdwSentence; - } - - ImmUnlockIMC(hIMC); - - if (fOpen) - ImmSetConversionStatus(hIMC, dwConversion, dwSentence); - else - ImmSetOpenStatus(hIMC, TRUE); - - return TRUE; -} - -static BOOL APIENTRY Imm32CSymbolToggle(HIMC hIMC, HKL hKL, HWND hWnd) -{ - LPINPUTCONTEXT pIC; - BOOL fOpen; - DWORD dwConversion, dwSentence; - - if (hWnd == NULL || !IS_IME_HKL(hKL)) - return FALSE; - - pIC = ImmLockIMC(hIMC); - if (pIC == NULL) - return TRUE; - - fOpen = pIC->fOpen; - if (fOpen) - { - dwConversion = (pIC->fdwConversion ^ IME_CMODE_SYMBOL); - dwSentence = pIC->fdwSentence; - } - - ImmUnlockIMC(hIMC); - - if (fOpen) - ImmSetConversionStatus(hIMC, dwConversion, dwSentence); - else - ImmSetOpenStatus(hIMC, TRUE); - - return TRUE; -} - -static BOOL APIENTRY Imm32JCloseOpen(HIMC hIMC, HKL hKL, HWND hWnd) -{ - BOOL fOpen; - - if (ImmIsIME(hKL) && LOWORD(hKL) == LANGID_JAPANESE) - { - fOpen = ImmGetOpenStatus(hIMC); - ImmSetOpenStatus(hIMC, !fOpen); - return TRUE; - } - - FIXME("We have to do something here\n"); - return TRUE; -} - -static BOOL APIENTRY Imm32KShapeToggle(HIMC hIMC) -{ - LPINPUTCONTEXT pIC; - DWORD dwConversion, dwSentence; - - pIC = ImmLockIMC(hIMC); - if (pIC == NULL) - return FALSE; - - dwConversion = (pIC->fdwConversion ^ IME_CMODE_FULLSHAPE); - dwSentence = pIC->fdwSentence; - ImmSetConversionStatus(hIMC, dwConversion, dwSentence); - - if (pIC->fdwConversion & (IME_CMODE_FULLSHAPE | IME_CMODE_NATIVE)) - ImmSetOpenStatus(hIMC, TRUE); - else - ImmSetOpenStatus(hIMC, FALSE); - - ImmUnlockIMC(hIMC); - return TRUE; -} - -static BOOL APIENTRY Imm32KHanjaConvert(HIMC hIMC) -{ - LPINPUTCONTEXT pIC; - DWORD dwConversion, dwSentence; - - pIC = ImmLockIMC(hIMC); - if (!pIC) - return FALSE; - - dwConversion = (pIC->fdwConversion ^ IME_CMODE_HANJACONVERT); - dwSentence = pIC->fdwSentence; - ImmUnlockIMC(hIMC); - - ImmSetConversionStatus(hIMC, dwConversion, dwSentence); - return TRUE; -} - -static BOOL APIENTRY Imm32KEnglish(HIMC hIMC) -{ - LPINPUTCONTEXT pIC; - DWORD dwConversion, dwSentence; - BOOL fOpen; - - pIC = ImmLockIMC(hIMC); - if (pIC == NULL) - return FALSE; - - dwConversion = (pIC->fdwConversion ^ IME_CMODE_NATIVE); - dwSentence = pIC->fdwSentence; - ImmSetConversionStatus(hIMC, dwConversion, dwSentence); - - fOpen = ((pIC->fdwConversion & (IME_CMODE_FULLSHAPE | IME_CMODE_NATIVE)) != 0); - ImmSetOpenStatus(hIMC, fOpen); - - ImmUnlockIMC(hIMC); - return TRUE; -} - -static BOOL APIENTRY Imm32ProcessHotKey(HWND hWnd, HIMC hIMC, HKL hKL, DWORD dwHotKeyID) -{ - PIMEDPI pImeDpi; - BOOL ret; - - if (hIMC && Imm32IsCrossThreadAccess(hIMC)) - return FALSE; - - switch (dwHotKeyID) - { - case IME_CHOTKEY_IME_NONIME_TOGGLE: - return Imm32ImeNonImeToggle(hIMC, hKL, hWnd, LANGID_CHINESE_SIMPLIFIED); - - case IME_CHOTKEY_SHAPE_TOGGLE: - return Imm32CShapeToggle(hIMC, hKL, hWnd); - - case IME_CHOTKEY_SYMBOL_TOGGLE: - return Imm32CSymbolToggle(hIMC, hKL, hWnd); - - case IME_JHOTKEY_CLOSE_OPEN: - return Imm32JCloseOpen(hIMC, hKL, hWnd); - - case IME_KHOTKEY_SHAPE_TOGGLE: - return Imm32KShapeToggle(hIMC); - - case IME_KHOTKEY_HANJACONVERT: - return Imm32KHanjaConvert(hIMC); - - case IME_KHOTKEY_ENGLISH: - return Imm32KEnglish(hIMC); - - case IME_THOTKEY_IME_NONIME_TOGGLE: - return Imm32ImeNonImeToggle(hIMC, hKL, hWnd, LANGID_CHINESE_TRADITIONAL); - - case IME_THOTKEY_SHAPE_TOGGLE: - return Imm32CShapeToggle(hIMC, hKL, hWnd); - - case IME_THOTKEY_SYMBOL_TOGGLE: - return Imm32CSymbolToggle(hIMC, hKL, hWnd); - - default: - break; - } - - if (dwHotKeyID < IME_HOTKEY_PRIVATE_FIRST || IME_HOTKEY_PRIVATE_LAST < dwHotKeyID) - return FALSE; - - pImeDpi = ImmLockImeDpi(hKL); - if (pImeDpi == NULL) - return FALSE; - - ret = (BOOL)pImeDpi->ImeEscape(hIMC, IME_ESC_PRIVATE_HOTKEY, &dwHotKeyID); - ImmUnlockImeDpi(pImeDpi); - return ret; -} - /*********************************************************************** * ImmLockClientImc (IMM32.@) */ @@ -1934,671 +825,210 @@ Quit: return hIMC; } -static DWORD APIENTRY -CandidateListWideToAnsi(const CANDIDATELIST *pWideCL, LPCANDIDATELIST pAnsiCL, DWORD dwBufLen, - UINT uCodePage) + +/* Helpers for the GetCompositionString functions */ + +/* Source encoding is defined by context, source length is always given in respective characters. Destination buffer + length is always in bytes. */ +static INT +CopyCompStringIMEtoClient(const InputContextData *data, const void *src, INT src_len, void *dst, + INT dst_len, BOOL unicode) { - BOOL bUsedDefault; - DWORD dwSize, dwIndex, cbGot, cbLeft; - const BYTE *pbWide; - LPBYTE pbAnsi; - LPDWORD pibOffsets; - - /* calculate total ansi size */ - if (pWideCL->dwCount > 0) + int char_size = unicode ? sizeof(WCHAR) : sizeof(char); + INT ret; + + if (is_himc_ime_unicode(data) ^ unicode) { - dwSize = sizeof(CANDIDATELIST) + ((pWideCL->dwCount - 1) * sizeof(DWORD)); - for (dwIndex = 0; dwIndex < pWideCL->dwCount; ++dwIndex) - { - pbWide = (const BYTE *)pWideCL + pWideCL->dwOffset[dwIndex]; - cbGot = WideCharToMultiByte(uCodePage, 0, (LPCWSTR)pbWide, -1, NULL, 0, - NULL, &bUsedDefault); - dwSize += cbGot; - } + if (unicode) + ret = MultiByteToWideChar(CP_ACP, 0, src, src_len, dst, dst_len / sizeof(WCHAR)); + else + ret = WideCharToMultiByte(CP_ACP, 0, src, src_len, dst, dst_len, NULL, NULL); + ret *= char_size; } else { - dwSize = sizeof(CANDIDATELIST); + if (dst_len) + { + ret = min(src_len * char_size, dst_len); + memcpy(dst, src, ret); + } + else + ret = src_len * char_size; } - dwSize = ROUNDUP4(dwSize); - if (dwBufLen == 0) - return dwSize; - if (dwBufLen < dwSize) - return 0; - - /* store to ansi */ - pAnsiCL->dwSize = dwBufLen; - pAnsiCL->dwStyle = pWideCL->dwStyle; - pAnsiCL->dwCount = pWideCL->dwCount; - pAnsiCL->dwSelection = pWideCL->dwSelection; - pAnsiCL->dwPageStart = pWideCL->dwPageStart; - pAnsiCL->dwPageSize = pWideCL->dwPageSize; + return ret; +} - pibOffsets = pAnsiCL->dwOffset; - if (pWideCL->dwCount > 0) +/* Composition string encoding is defined by context, returned attributes correspond to string, converted according to + passed mode. String length is in characters, attributes are in byte arrays. */ +static INT +CopyCompAttrIMEtoClient(const InputContextData *data, const BYTE *src, INT src_len, const void *comp_string, + INT str_len, BYTE *dst, INT dst_len, BOOL unicode) +{ + union { - pibOffsets[0] = sizeof(CANDIDATELIST) + ((pWideCL->dwCount - 1) * sizeof(DWORD)); - cbLeft = dwBufLen - pibOffsets[0]; - - for (dwIndex = 0; dwIndex < pWideCL->dwCount; ++dwIndex) - { - pbWide = (const BYTE *)pWideCL + pWideCL->dwOffset[dwIndex]; - pbAnsi = (LPBYTE)pAnsiCL + pibOffsets[dwIndex]; + const void *str; + const WCHAR *strW; + const char *strA; + } string; + INT rc; - /* convert to ansi */ - cbGot = WideCharToMultiByte(uCodePage, 0, (LPCWSTR)pbWide, -1, - (LPSTR)pbAnsi, cbLeft, NULL, &bUsedDefault); - cbLeft -= cbGot; + string.str = comp_string; - if (dwIndex < pWideCL->dwCount - 1) - pibOffsets[dwIndex + 1] = pibOffsets[dwIndex] + cbGot; - } - } - else + if (is_himc_ime_unicode(data) && !unicode) { - pibOffsets[0] = sizeof(CANDIDATELIST); - } + rc = WideCharToMultiByte(CP_ACP, 0, string.strW, str_len, NULL, 0, NULL, NULL); + if (dst_len) + { + int i, j = 0, k = 0; - return dwBufLen; -} + if (rc < dst_len) + dst_len = rc; + for (i = 0; i < str_len; ++i) + { + int len; -static DWORD APIENTRY -CandidateListAnsiToWide(const CANDIDATELIST *pAnsiCL, LPCANDIDATELIST pWideCL, DWORD dwBufLen, - UINT uCodePage) -{ - DWORD dwSize, dwIndex, cchGot, cbGot, cbLeft; - const BYTE *pbAnsi; - LPBYTE pbWide; - LPDWORD pibOffsets; + len = WideCharToMultiByte(CP_ACP, 0, string.strW + i, 1, NULL, 0, NULL, NULL); + for (; len > 0; --len) + { + dst[j++] = src[k]; - /* calculate total wide size */ - if (pAnsiCL->dwCount > 0) - { - dwSize = sizeof(CANDIDATELIST) + ((pAnsiCL->dwCount - 1) * sizeof(DWORD)); - for (dwIndex = 0; dwIndex < pAnsiCL->dwCount; ++dwIndex) - { - pbAnsi = (const BYTE *)pAnsiCL + pAnsiCL->dwOffset[dwIndex]; - cchGot = MultiByteToWideChar(uCodePage, MB_PRECOMPOSED, (LPCSTR)pbAnsi, -1, NULL, 0); - dwSize += cchGot * sizeof(WCHAR); + if (j >= dst_len) + goto end; + } + ++k; + } + end: + rc = j; } } - else - { - dwSize = sizeof(CANDIDATELIST); - } - - dwSize = ROUNDUP4(dwSize); - if (dwBufLen == 0) - return dwSize; - if (dwBufLen < dwSize) - return 0; - - /* store to wide */ - pWideCL->dwSize = dwBufLen; - pWideCL->dwStyle = pAnsiCL->dwStyle; - pWideCL->dwCount = pAnsiCL->dwCount; - pWideCL->dwSelection = pAnsiCL->dwSelection; - pWideCL->dwPageStart = pAnsiCL->dwPageStart; - pWideCL->dwPageSize = pAnsiCL->dwPageSize; - - pibOffsets = pWideCL->dwOffset; - if (pAnsiCL->dwCount > 0) + else if (!is_himc_ime_unicode(data) && unicode) { - pibOffsets[0] = sizeof(CANDIDATELIST) + ((pWideCL->dwCount - 1) * sizeof(DWORD)); - cbLeft = dwBufLen - pibOffsets[0]; - - for (dwIndex = 0; dwIndex < pAnsiCL->dwCount; ++dwIndex) + rc = MultiByteToWideChar(CP_ACP, 0, string.strA, str_len, NULL, 0); + if (dst_len) { - pbAnsi = (const BYTE *)pAnsiCL + pAnsiCL->dwOffset[dwIndex]; - pbWide = (LPBYTE)pWideCL + pibOffsets[dwIndex]; + int i, j = 0; + + if (rc < dst_len) + dst_len = rc; + for (i = 0; i < str_len; ++i) + { + if (IsDBCSLeadByte(string.strA[i])) + continue; - /* convert to wide */ - cchGot = MultiByteToWideChar(uCodePage, MB_PRECOMPOSED, (LPCSTR)pbAnsi, -1, - (LPWSTR)pbWide, cbLeft / sizeof(WCHAR)); - cbGot = cchGot * sizeof(WCHAR); - cbLeft -= cbGot; + dst[j++] = src[i]; - if (dwIndex + 1 < pAnsiCL->dwCount) - pibOffsets[dwIndex + 1] = pibOffsets[dwIndex] + cbGot; + if (j >= dst_len) + break; + } + rc = j; } } else { - pibOffsets[0] = sizeof(CANDIDATELIST); + memcpy(dst, src, min(src_len, dst_len)); + rc = src_len; } - return dwBufLen; + return rc; } -static DWORD APIENTRY -ImmGetCandidateListAW(HIMC hIMC, DWORD dwIndex, LPCANDIDATELIST lpCandList, DWORD dwBufLen, - BOOL bAnsi) +static INT +CopyCompClauseIMEtoClient(InputContextData *data, LPBYTE source, INT slen, LPBYTE ssource, + LPBYTE target, INT tlen, BOOL unicode ) { - DWORD ret = 0; - LPINPUTCONTEXT pIC; - PCLIENTIMC pClientImc; - LPCANDIDATEINFO pCI; - LPCANDIDATELIST pCL; - DWORD dwSize; - - pClientImc = ImmLockClientImc(hIMC); - if (!pClientImc) - return 0; - - pIC = ImmLockIMC(hIMC); - if (pIC == NULL) - { - ImmUnlockClientImc(pClientImc); - return 0; - } - - pCI = ImmLockIMCC(pIC->hCandInfo); - if (pCI == NULL) - { - ImmUnlockIMC(hIMC); - ImmUnlockClientImc(pClientImc); - return 0; - } - - if (pCI->dwSize < sizeof(CANDIDATEINFO) || pCI->dwCount <= dwIndex) - goto Quit; - - /* get required size */ - pCL = (LPCANDIDATELIST)((LPBYTE)pCI + pCI->dwOffset[dwIndex]); - if (bAnsi) - { - if (pClientImc->dwFlags & CLIENTIMC_WIDE) - dwSize = CandidateListAnsiToWide(pCL, NULL, 0, CP_ACP); - else - dwSize = pCL->dwSize; - } - else - { - if (pClientImc->dwFlags & CLIENTIMC_WIDE) - dwSize = pCL->dwSize; - else - dwSize = CandidateListWideToAnsi(pCL, NULL, 0, CP_ACP); - } + INT rc; - if (dwBufLen != 0 && dwSize != 0) + if (is_himc_ime_unicode(data) && !unicode) { - if (lpCandList == NULL || dwBufLen < dwSize) - goto Quit; - - /* store */ - if (bAnsi) + if (tlen) { - if (pClientImc->dwFlags & CLIENTIMC_WIDE) - CandidateListAnsiToWide(pCL, lpCandList, dwSize, CP_ACP); - else - RtlCopyMemory(lpCandList, pCL, dwSize); + int i; + + if (slen < tlen) + tlen = slen; + tlen /= sizeof (DWORD); + for (i = 0; i < tlen; ++i) + { + ((DWORD *)target)[i] = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)ssource, + ((DWORD *)source)[i], + NULL, 0, + NULL, NULL); + } + rc = sizeof (DWORD) * i; } else - { - if (pClientImc->dwFlags & CLIENTIMC_WIDE) - RtlCopyMemory(lpCandList, pCL, dwSize); - else - CandidateListWideToAnsi(pCL, lpCandList, dwSize, CP_ACP); - } - } - - ret = dwSize; - -Quit: - ImmUnlockIMCC(pIC->hCandInfo); - ImmUnlockIMC(hIMC); - ImmUnlockClientImc(pClientImc); - return ret; -} - -DWORD APIENTRY ImmGetCandidateListCountAW(HIMC hIMC, LPDWORD lpdwListCount, BOOL bAnsi) -{ - DWORD ret = 0, cbGot, dwIndex; - PCLIENTIMC pClientImc; - LPINPUTCONTEXT pIC; - const CANDIDATEINFO *pCI; - const BYTE *pb; - const CANDIDATELIST *pCL; - const DWORD *pdwOffsets; - - if (lpdwListCount == NULL) - return 0; - - *lpdwListCount = 0; - - pClientImc = ImmLockClientImc(hIMC); - if (pClientImc == NULL) - return 0; - - pIC = ImmLockIMC(hIMC); - if (pIC == NULL) - { - ImmUnlockClientImc(pClientImc); - return 0; - } - - pCI = ImmLockIMCC(pIC->hCandInfo); - if (pCI == NULL) - { - ImmUnlockIMC(hIMC); - ImmUnlockClientImc(pClientImc); - return 0; + rc = slen; } - - if (pCI->dwSize < sizeof(CANDIDATEINFO)) - goto Quit; - - *lpdwListCount = pCI->dwCount; /* the number of candidate lists */ - - /* calculate total size of candidate lists */ - if (bAnsi) + else if (!is_himc_ime_unicode(data) && unicode) { - if (pClientImc->dwFlags & CLIENTIMC_WIDE) + if (tlen) { - ret = ROUNDUP4(pCI->dwPrivateSize); - pdwOffsets = pCI->dwOffset; - for (dwIndex = 0; dwIndex < pCI->dwCount; ++dwIndex) + int i; + + if (slen < tlen) + tlen = slen; + tlen /= sizeof (DWORD); + for (i = 0; i < tlen; ++i) { - pb = (const BYTE *)pCI + pdwOffsets[dwIndex]; - pCL = (const CANDIDATELIST *)pb; - cbGot = CandidateListWideToAnsi(pCL, NULL, 0, CP_ACP); - ret += cbGot; + ((DWORD *)target)[i] = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ssource, + ((DWORD *)source)[i], + NULL, 0); } + rc = sizeof (DWORD) * i; } else - { - ret = pCI->dwSize; - } + rc = slen; } else { - if (pClientImc->dwFlags & CLIENTIMC_WIDE) - { - ret = pCI->dwSize; - } - else - { - ret = ROUNDUP4(pCI->dwPrivateSize); - pdwOffsets = pCI->dwOffset; - for (dwIndex = 0; dwIndex < pCI->dwCount; ++dwIndex) - { - pb = (const BYTE *)pCI + pdwOffsets[dwIndex]; - pCL = (const CANDIDATELIST *)pb; - cbGot = CandidateListAnsiToWide(pCL, NULL, 0, CP_ACP); - ret += cbGot; - } - } + memcpy( target, source, min(slen,tlen)); + rc = slen; } -Quit: - ImmUnlockIMCC(pIC->hCandInfo); - ImmUnlockIMC(hIMC); - ImmUnlockClientImc(pClientImc); - return ret; -} - -/*********************************************************************** - * ImmGetCandidateListA (IMM32.@) - */ -DWORD WINAPI ImmGetCandidateListA( - HIMC hIMC, DWORD dwIndex, - LPCANDIDATELIST lpCandList, DWORD dwBufLen) -{ - return ImmGetCandidateListAW(hIMC, dwIndex, lpCandList, dwBufLen, TRUE); -} - -/*********************************************************************** - * ImmGetCandidateListCountA (IMM32.@) - */ -DWORD WINAPI ImmGetCandidateListCountA( - HIMC hIMC, LPDWORD lpdwListCount) -{ - return ImmGetCandidateListCountAW(hIMC, lpdwListCount, TRUE); -} - -/*********************************************************************** - * ImmGetCandidateListCountW (IMM32.@) - */ -DWORD WINAPI ImmGetCandidateListCountW( - HIMC hIMC, LPDWORD lpdwListCount) -{ - return ImmGetCandidateListCountAW(hIMC, lpdwListCount, FALSE); -} - -/*********************************************************************** - * ImmGetCandidateListW (IMM32.@) - */ -DWORD WINAPI ImmGetCandidateListW( - HIMC hIMC, DWORD dwIndex, - LPCANDIDATELIST lpCandList, DWORD dwBufLen) -{ - return ImmGetCandidateListAW(hIMC, dwIndex, lpCandList, dwBufLen, FALSE); + return rc; } -/*********************************************************************** - * ImmGetCandidateWindow (IMM32.@) - */ -BOOL WINAPI ImmGetCandidateWindow( - HIMC hIMC, DWORD dwIndex, LPCANDIDATEFORM lpCandidate) +static INT +CopyCompOffsetIMEtoClient(InputContextData *data, DWORD offset, LPBYTE ssource, BOOL unicode) { - BOOL ret = FALSE; - LPINPUTCONTEXT pIC; - LPCANDIDATEFORM pCF; - - TRACE("(%p, %lu, %p)\n", hIMC, dwIndex, lpCandidate); - - pIC = ImmLockIMC(hIMC); - if (pIC == NULL) - return FALSE; + int rc; - pCF = &pIC->cfCandForm[dwIndex]; - if (pCF->dwIndex != IMM_INVALID_CANDFORM) + if (is_himc_ime_unicode(data) && !unicode) { - *lpCandidate = *pCF; - ret = TRUE; + rc = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)ssource, offset, NULL, 0, NULL, NULL); } + else if (!is_himc_ime_unicode(data) && unicode) + { + rc = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ssource, offset, NULL, 0); + } + else + rc = offset; - ImmUnlockIMC(hIMC); - return ret; -} - -static VOID APIENTRY LogFontAnsiToWide(const LOGFONTA *plfA, LPLOGFONTW plfW) -{ - size_t cch; - RtlCopyMemory(plfW, plfA, offsetof(LOGFONTA, lfFaceName)); - StringCchLengthA(plfA->lfFaceName, _countof(plfA->lfFaceName), &cch); - cch = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, plfA->lfFaceName, (INT)cch, - plfW->lfFaceName, _countof(plfW->lfFaceName)); - if (cch > _countof(plfW->lfFaceName) - 1) - cch = _countof(plfW->lfFaceName) - 1; - plfW->lfFaceName[cch] = 0; -} - -static VOID APIENTRY LogFontWideToAnsi(const LOGFONTW *plfW, LPLOGFONTA plfA) -{ - size_t cch; - RtlCopyMemory(plfA, plfW, offsetof(LOGFONTW, lfFaceName)); - StringCchLengthW(plfW->lfFaceName, _countof(plfW->lfFaceName), &cch); - cch = WideCharToMultiByte(CP_ACP, 0, plfW->lfFaceName, (INT)cch, - plfA->lfFaceName, _countof(plfA->lfFaceName), NULL, NULL); - if (cch > _countof(plfA->lfFaceName) - 1) - cch = _countof(plfA->lfFaceName) - 1; - plfA->lfFaceName[cch] = 0; + return rc; } -/*********************************************************************** - * ImmGetCompositionFontA (IMM32.@) - */ -BOOL WINAPI ImmGetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) +static LONG +ImmGetCompositionStringT(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, + DWORD dwBufLen, BOOL unicode) { - PCLIENTIMC pClientImc; - BOOL ret = FALSE, bWide; - LPINPUTCONTEXT pIC; + LONG rc = 0; + InputContextData *data = get_imc_data(hIMC); + LPCOMPOSITIONSTRING compstr; + LPBYTE compdata; - TRACE("(%p, %p)\n", hIMC, lplf); + TRACE("(%p, 0x%x, %p, %d)\n", hIMC, dwIndex, lpBuf, dwBufLen); - pClientImc = ImmLockClientImc(hIMC); - if (pClientImc == NULL) - return FALSE; + if (!data) + return FALSE; - bWide = (pClientImc->dwFlags & CLIENTIMC_WIDE); - ImmUnlockClientImc(pClientImc); + if (!data->IMC.hCompStr) + return FALSE; - pIC = ImmLockIMC(hIMC); - if (pIC == NULL) - return FALSE; + compdata = ImmLockIMCC(data->IMC.hCompStr); + compstr = (LPCOMPOSITIONSTRING)compdata; - if (pIC->fdwInit & INIT_LOGFONT) - { - if (bWide) - LogFontWideToAnsi(&pIC->lfFont.W, lplf); - else - *lplf = pIC->lfFont.A; - - ret = TRUE; - } - - ImmUnlockIMC(hIMC); - return ret; -} - -/*********************************************************************** - * ImmGetCompositionFontW (IMM32.@) - */ -BOOL WINAPI ImmGetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) -{ - PCLIENTIMC pClientImc; - BOOL bWide; - LPINPUTCONTEXT pIC; - BOOL ret = FALSE; - - TRACE("(%p, %p)\n", hIMC, lplf); - - pClientImc = ImmLockClientImc(hIMC); - if (pClientImc == NULL) - return FALSE; - - bWide = (pClientImc->dwFlags & CLIENTIMC_WIDE); - ImmUnlockClientImc(pClientImc); - - pIC = ImmLockIMC(hIMC); - if (pIC == NULL) - return FALSE; - - if (pIC->fdwInit & INIT_LOGFONT) - { - if (bWide) - *lplf = pIC->lfFont.W; - else - LogFontAnsiToWide(&pIC->lfFont.A, lplf); - - ret = TRUE; - } - - ImmUnlockIMC(hIMC); - return ret; -} - - -/* Helpers for the GetCompositionString functions */ - -/* Source encoding is defined by context, source length is always given in respective characters. Destination buffer - length is always in bytes. */ -static INT CopyCompStringIMEtoClient(const InputContextData *data, const void *src, INT src_len, void *dst, - INT dst_len, BOOL unicode) -{ - int char_size = unicode ? sizeof(WCHAR) : sizeof(char); - INT ret; - - if (is_himc_ime_unicode(data) ^ unicode) - { - if (unicode) - ret = MultiByteToWideChar(CP_ACP, 0, src, src_len, dst, dst_len / sizeof(WCHAR)); - else - ret = WideCharToMultiByte(CP_ACP, 0, src, src_len, dst, dst_len, NULL, NULL); - ret *= char_size; - } - else - { - if (dst_len) - { - ret = min(src_len * char_size, dst_len); - memcpy(dst, src, ret); - } - else - ret = src_len * char_size; - } - - return ret; -} - -/* Composition string encoding is defined by context, returned attributes correspond to string, converted according to - passed mode. String length is in characters, attributes are in byte arrays. */ -static INT CopyCompAttrIMEtoClient(const InputContextData *data, const BYTE *src, INT src_len, const void *comp_string, - INT str_len, BYTE *dst, INT dst_len, BOOL unicode) -{ - union - { - const void *str; - const WCHAR *strW; - const char *strA; - } string; - INT rc; - - string.str = comp_string; - - if (is_himc_ime_unicode(data) && !unicode) - { - rc = WideCharToMultiByte(CP_ACP, 0, string.strW, str_len, NULL, 0, NULL, NULL); - if (dst_len) - { - int i, j = 0, k = 0; - - if (rc < dst_len) - dst_len = rc; - for (i = 0; i < str_len; ++i) - { - int len; - - len = WideCharToMultiByte(CP_ACP, 0, string.strW + i, 1, NULL, 0, NULL, NULL); - for (; len > 0; --len) - { - dst[j++] = src[k]; - - if (j >= dst_len) - goto end; - } - ++k; - } - end: - rc = j; - } - } - else if (!is_himc_ime_unicode(data) && unicode) - { - rc = MultiByteToWideChar(CP_ACP, 0, string.strA, str_len, NULL, 0); - if (dst_len) - { - int i, j = 0; - - if (rc < dst_len) - dst_len = rc; - for (i = 0; i < str_len; ++i) - { - if (IsDBCSLeadByte(string.strA[i])) - continue; - - dst[j++] = src[i]; - - if (j >= dst_len) - break; - } - rc = j; - } - } - else - { - memcpy(dst, src, min(src_len, dst_len)); - rc = src_len; - } - - return rc; -} - -static INT CopyCompClauseIMEtoClient(InputContextData *data, LPBYTE source, INT slen, LPBYTE ssource, - LPBYTE target, INT tlen, BOOL unicode ) -{ - INT rc; - - if (is_himc_ime_unicode(data) && !unicode) - { - if (tlen) - { - int i; - - if (slen < tlen) - tlen = slen; - tlen /= sizeof (DWORD); - for (i = 0; i < tlen; ++i) - { - ((DWORD *)target)[i] = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)ssource, - ((DWORD *)source)[i], - NULL, 0, - NULL, NULL); - } - rc = sizeof (DWORD) * i; - } - else - rc = slen; - } - else if (!is_himc_ime_unicode(data) && unicode) - { - if (tlen) - { - int i; - - if (slen < tlen) - tlen = slen; - tlen /= sizeof (DWORD); - for (i = 0; i < tlen; ++i) - { - ((DWORD *)target)[i] = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ssource, - ((DWORD *)source)[i], - NULL, 0); - } - rc = sizeof (DWORD) * i; - } - else - rc = slen; - } - else - { - memcpy( target, source, min(slen,tlen)); - rc = slen; - } - - return rc; -} - -static INT CopyCompOffsetIMEtoClient(InputContextData *data, DWORD offset, LPBYTE ssource, BOOL unicode) -{ - int rc; - - if (is_himc_ime_unicode(data) && !unicode) - { - rc = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)ssource, offset, NULL, 0, NULL, NULL); - } - else if (!is_himc_ime_unicode(data) && unicode) - { - rc = MultiByteToWideChar(CP_ACP, 0, (LPSTR)ssource, offset, NULL, 0); - } - else - rc = offset; - - return rc; -} - -static LONG ImmGetCompositionStringT( HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, - DWORD dwBufLen, BOOL unicode) -{ - LONG rc = 0; - InputContextData *data = get_imc_data(hIMC); - LPCOMPOSITIONSTRING compstr; - LPBYTE compdata; - - TRACE("(%p, 0x%x, %p, %d)\n", hIMC, dwIndex, lpBuf, dwBufLen); - - if (!data) - return FALSE; - - if (!data->IMC.hCompStr) - return FALSE; - - compdata = ImmLockIMCC(data->IMC.hCompStr); - compstr = (LPCOMPOSITIONSTRING)compdata; - - switch (dwIndex) + switch (dwIndex) { case GCS_RESULTSTR: TRACE("GCS_RESULTSTR\n"); @@ -2673,47 +1103,19 @@ static LONG ImmGetCompositionStringT( HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, /*********************************************************************** * ImmGetCompositionStringA (IMM32.@) */ -LONG WINAPI ImmGetCompositionStringA( - HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen) +LONG WINAPI ImmGetCompositionStringA(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen) { return ImmGetCompositionStringT(hIMC, dwIndex, lpBuf, dwBufLen, FALSE); } - /*********************************************************************** * ImmGetCompositionStringW (IMM32.@) */ -LONG WINAPI ImmGetCompositionStringW( - HIMC hIMC, DWORD dwIndex, - LPVOID lpBuf, DWORD dwBufLen) +LONG WINAPI ImmGetCompositionStringW(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen) { return ImmGetCompositionStringT(hIMC, dwIndex, lpBuf, dwBufLen, TRUE); } -/*********************************************************************** - * ImmGetCompositionWindow (IMM32.@) - */ -BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) -{ - LPINPUTCONTEXT pIC; - BOOL ret = FALSE; - - TRACE("(%p, %p)\n", hIMC, lpCompForm); - - pIC = ImmLockIMC(hIMC); - if (!pIC) - return FALSE; - - if (pIC->fdwInit & INIT_COMPFORM) - { - *lpCompForm = pIC->cfCompForm; - ret = TRUE; - } - - ImmUnlockIMC(hIMC); - return ret; -} - /*********************************************************************** * ImmGetContext (IMM32.@) */ @@ -2726,1806 +1128,96 @@ HIMC WINAPI ImmGetContext(HWND hWnd) } /*********************************************************************** - * ImmGetConversionListA (IMM32.@) + * CtfImmIsCiceroEnabled (IMM32.@) */ -DWORD WINAPI ImmGetConversionListA( - HKL hKL, HIMC hIMC, - LPCSTR pSrc, LPCANDIDATELIST lpDst, - DWORD dwBufLen, UINT uFlag) +BOOL WINAPI CtfImmIsCiceroEnabled(VOID) { - DWORD ret = 0; - UINT cb; - LPWSTR pszSrcW = NULL; - LPCANDIDATELIST pCL = NULL; - PIMEDPI pImeDpi; - - TRACE("(%p, %p, %s, %p, %lu, 0x%lX)\n", hKL, hIMC, debugstr_a(pSrc), - lpDst, dwBufLen, uFlag); - - pImeDpi = ImmLockOrLoadImeDpi(hKL); - if (pImeDpi == NULL) - return 0; + return (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)); +} - if (!(pImeDpi->ImeInfo.fdwProperty & IME_PROP_UNICODE)) - { - ret = pImeDpi->ImeConversionList(hIMC, pSrc, lpDst, dwBufLen, uFlag); - ImmUnlockImeDpi(pImeDpi); - return ret; - } +/*********************************************************************** + * ImmInstallIMEA (IMM32.@) + */ +HKL WINAPI ImmInstallIMEA(LPCSTR lpszIMEFileName, LPCSTR lpszLayoutText) +{ + HKL hKL = NULL; + LPWSTR pszFileNameW = NULL, pszLayoutTextW = NULL; - if (pSrc) - { - pszSrcW = Imm32WideFromAnsi(pSrc); - if (pszSrcW == NULL) - goto Quit; - } + TRACE("(%s, %s)\n", debugstr_a(lpszIMEFileName), debugstr_a(lpszLayoutText)); - cb = pImeDpi->ImeConversionList(hIMC, pszSrcW, NULL, 0, uFlag); - if (cb == 0) + pszFileNameW = Imm32WideFromAnsi(lpszIMEFileName); + if (pszFileNameW == NULL) goto Quit; - pCL = Imm32HeapAlloc(0, cb); - if (pCL == NULL) + pszLayoutTextW = Imm32WideFromAnsi(lpszLayoutText); + if (pszLayoutTextW == NULL) goto Quit; - cb = pImeDpi->ImeConversionList(hIMC, pszSrcW, pCL, cb, uFlag); - if (cb == 0) - goto Quit; - - ret = CandidateListWideToAnsi(pCL, lpDst, dwBufLen, CP_ACP); - -Quit: - if (pszSrcW) - HeapFree(g_hImm32Heap, 0, pszSrcW); - if (pCL) - HeapFree(g_hImm32Heap, 0, pCL); - ImmUnlockImeDpi(pImeDpi); - return ret; -} - -/*********************************************************************** - * ImmGetConversionListW (IMM32.@) - */ -DWORD WINAPI ImmGetConversionListW( - HKL hKL, HIMC hIMC, - LPCWSTR pSrc, LPCANDIDATELIST lpDst, - DWORD dwBufLen, UINT uFlag) -{ - DWORD ret = 0; - INT cb; - PIMEDPI pImeDpi; - LPCANDIDATELIST pCL = NULL; - LPSTR pszSrcA = NULL; - - TRACE("(%p, %p, %s, %p, %lu, 0x%lX)\n", hKL, hIMC, debugstr_w(pSrc), - lpDst, dwBufLen, uFlag); - - pImeDpi = ImmLockOrLoadImeDpi(hKL); - if (!pImeDpi) - return 0; - - if (pImeDpi->ImeInfo.fdwProperty & IME_PROP_UNICODE) - { - ret = pImeDpi->ImeConversionList(hIMC, pSrc, lpDst, dwBufLen, uFlag); - ImmUnlockImeDpi(pImeDpi); - return ret; - } - - if (pSrc) - { - pszSrcA = Imm32AnsiFromWide(pSrc); - if (pszSrcA == NULL) - goto Quit; - } - - cb = pImeDpi->ImeConversionList(hIMC, pszSrcA, NULL, 0, uFlag); - if (cb == 0) - goto Quit; - - pCL = Imm32HeapAlloc(0, cb); - if (!pCL) - goto Quit; - - cb = pImeDpi->ImeConversionList(hIMC, pszSrcA, pCL, cb, uFlag); - if (!cb) - goto Quit; - - ret = CandidateListAnsiToWide(pCL, lpDst, dwBufLen, CP_ACP); - -Quit: - if (pszSrcA) - HeapFree(g_hImm32Heap, 0, pszSrcA); - if (pCL) - HeapFree(g_hImm32Heap, 0, pCL); - ImmUnlockImeDpi(pImeDpi); - return ret; -} - -/*********************************************************************** - * ImmGetConversionStatus (IMM32.@) - */ -BOOL WINAPI ImmGetConversionStatus( - HIMC hIMC, LPDWORD lpfdwConversion, LPDWORD lpfdwSentence) -{ - LPINPUTCONTEXT pIC; - - TRACE("(%p %p %p)\n", hIMC, lpfdwConversion, lpfdwSentence); - - pIC = ImmLockIMC(hIMC); - if (!pIC) - return FALSE; - - if (lpfdwConversion) - *lpfdwConversion = pIC->fdwConversion; - if (lpfdwSentence) - *lpfdwSentence = pIC->fdwSentence; - - ImmUnlockIMC(hIMC); - return TRUE; -} - -/*********************************************************************** - * ImmGetDefaultIMEWnd (IMM32.@) - */ -HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) -{ - if (!g_psi || !(g_psi->dwSRVIFlags & SRVINFO_IMM32)) - return NULL; - - // FIXME: NtUserGetThreadState and enum ThreadStateRoutines are broken. - if (hWnd == NULL) - return (HWND)NtUserGetThreadState(3); - - return (HWND)NtUserQueryWindow(hWnd, QUERY_WINDOW_DEFAULT_IME); -} - -/*********************************************************************** - * CtfImmIsCiceroEnabled (IMM32.@) - */ -BOOL WINAPI CtfImmIsCiceroEnabled(VOID) -{ - return (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)); -} - -/*********************************************************************** - * ImmGetDescriptionA (IMM32.@) - */ -UINT WINAPI ImmGetDescriptionA( - HKL hKL, LPSTR lpszDescription, UINT uBufLen) -{ - IMEINFOEX info; - size_t cch; - - TRACE("(%p,%p,%d)\n", hKL, lpszDescription, uBufLen); - - if (!ImmGetImeInfoEx(&info, ImeInfoExKeyboardLayout, &hKL) || !IS_IME_HKL(hKL)) - return 0; - - StringCchLengthW(info.wszImeDescription, _countof(info.wszImeDescription), &cch); - cch = WideCharToMultiByte(CP_ACP, 0, info.wszImeDescription, (INT)cch, - lpszDescription, uBufLen, NULL, NULL); - if (uBufLen) - lpszDescription[cch] = 0; - return (UINT)cch; -} - -/*********************************************************************** - * ImmGetDescriptionW (IMM32.@) - */ -UINT WINAPI ImmGetDescriptionW(HKL hKL, LPWSTR lpszDescription, UINT uBufLen) -{ - IMEINFOEX info; - size_t cch; - - TRACE("(%p, %p, %d)\n", hKL, lpszDescription, uBufLen); - - if (!ImmGetImeInfoEx(&info, ImeInfoExKeyboardLayout, &hKL) || !IS_IME_HKL(hKL)) - return 0; - - if (uBufLen != 0) - StringCchCopyW(lpszDescription, uBufLen, info.wszImeDescription); - - StringCchLengthW(info.wszImeDescription, _countof(info.wszImeDescription), &cch); - return (UINT)cch; -} - -static DWORD APIENTRY -ImmGetGuideLineAW(HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen, BOOL bAnsi) -{ - PCLIENTIMC pClientImc; - LPINPUTCONTEXT pIC; - LPGUIDELINE pGuideLine; - DWORD cb, ret = 0; - LPVOID pvStr, pvPrivate; - BOOL bUsedDefault; - - pClientImc = ImmLockClientImc(hIMC); - if (!pClientImc) - return 0; - - pIC = ImmLockIMC(hIMC); - if (!pIC) - { - ImmUnlockClientImc(pClientImc); - return 0; - } - - pGuideLine = ImmLockIMCC(pIC->hGuideLine); - if (!pGuideLine) - { - ImmUnlockIMC(hIMC); - ImmUnlockClientImc(pClientImc); - return 0; - } - - if (dwIndex == GGL_LEVEL) - { - ret = pGuideLine->dwLevel; - goto Quit; - } - - if (dwIndex == GGL_INDEX) - { - ret = pGuideLine->dwIndex; - goto Quit; - } - - if (dwIndex == GGL_STRING) - { - pvStr = (LPBYTE)pGuideLine + pGuideLine->dwStrOffset; - - /* get size */ - if (bAnsi) - { - if (pClientImc->dwFlags & CLIENTIMC_WIDE) - { - cb = WideCharToMultiByte(CP_ACP, 0, pvStr, pGuideLine->dwStrLen, - NULL, 0, NULL, &bUsedDefault); - } - else - { - cb = pGuideLine->dwStrLen * sizeof(CHAR); - } - } - else - { - if (pClientImc->dwFlags & CLIENTIMC_WIDE) - { - cb = pGuideLine->dwStrLen * sizeof(WCHAR); - } - else - { - cb = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, pvStr, pGuideLine->dwStrLen, - NULL, 0) * sizeof(WCHAR); - } - } - - if (dwBufLen == 0 || cb == 0 || lpBuf == NULL || dwBufLen < cb) - { - ret = cb; - goto Quit; - } - - /* store to buffer */ - if (bAnsi) - { - if (pClientImc->dwFlags & CLIENTIMC_WIDE) - { - ret = WideCharToMultiByte(CP_ACP, 0, pvStr, pGuideLine->dwStrLen, - lpBuf, dwBufLen, NULL, &bUsedDefault); - goto Quit; - } - } - else - { - if (!(pClientImc->dwFlags & CLIENTIMC_WIDE)) - { - ret = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, pvStr, pGuideLine->dwStrLen, - lpBuf, dwBufLen) * sizeof(WCHAR); - goto Quit; - } - } - - RtlCopyMemory(lpBuf, pvStr, cb); - ret = cb; - goto Quit; - } - - if (dwIndex == GGL_PRIVATE) - { - pvPrivate = (LPBYTE)pGuideLine + pGuideLine->dwPrivateOffset; - - /* get size */ - if (bAnsi) - { - if ((pClientImc->dwFlags & CLIENTIMC_WIDE) && - pGuideLine->dwIndex == GL_ID_REVERSECONVERSION) - { - cb = CandidateListWideToAnsi(pvPrivate, NULL, 0, CP_ACP); - } - else - { - cb = pGuideLine->dwPrivateSize; - } - } - else - { - if (!(pClientImc->dwFlags & CLIENTIMC_WIDE) && - pGuideLine->dwIndex == GL_ID_REVERSECONVERSION) - { - cb = CandidateListAnsiToWide(pvPrivate, NULL, 0, CP_ACP); - } - else - { - cb = pGuideLine->dwPrivateSize; - } - } - - if (dwBufLen == 0 || cb == 0 || lpBuf == NULL || dwBufLen < cb) - { - ret = cb; - goto Quit; - } - - /* store to buffer */ - if (bAnsi) - { - if ((pClientImc->dwFlags & CLIENTIMC_WIDE) && - pGuideLine->dwIndex == GL_ID_REVERSECONVERSION) - { - ret = CandidateListWideToAnsi(pvPrivate, lpBuf, cb, CP_ACP); - goto Quit; - } - } - else - { - if (!(pClientImc->dwFlags & CLIENTIMC_WIDE) && - pGuideLine->dwIndex == GL_ID_REVERSECONVERSION) - { - ret = CandidateListAnsiToWide(pvPrivate, lpBuf, cb, CP_ACP); - goto Quit; - } - } - - RtlCopyMemory(lpBuf, pvPrivate, cb); - ret = cb; - goto Quit; - } - -Quit: - ImmUnlockIMCC(pIC->hGuideLine); - ImmUnlockIMC(hIMC); - ImmUnlockClientImc(pClientImc); - return ret; -} - -/*********************************************************************** - * ImmGetGuideLineA (IMM32.@) - */ -DWORD WINAPI ImmGetGuideLineA( - HIMC hIMC, DWORD dwIndex, LPSTR lpBuf, DWORD dwBufLen) -{ - TRACE("(%p, %lu, %p, %lu)\n", hIMC, dwIndex, lpBuf, dwBufLen); - return ImmGetGuideLineAW(hIMC, dwIndex, lpBuf, dwBufLen, TRUE); -} - -/*********************************************************************** - * ImmGetGuideLineW (IMM32.@) - */ -DWORD WINAPI ImmGetGuideLineW(HIMC hIMC, DWORD dwIndex, LPWSTR lpBuf, DWORD dwBufLen) -{ - TRACE("(%p, %lu, %p, %lu)\n", hIMC, dwIndex, lpBuf, dwBufLen); - return ImmGetGuideLineAW(hIMC, dwIndex, lpBuf, dwBufLen, FALSE); -} - -/*********************************************************************** - * ImmGetIMEFileNameA (IMM32.@) - */ -UINT WINAPI ImmGetIMEFileNameA( HKL hKL, LPSTR lpszFileName, UINT uBufLen) -{ - BOOL bDefUsed; - IMEINFOEX info; - size_t cch; - - TRACE("(%p, %p, %u)\n", hKL, lpszFileName, uBufLen); - - if (!ImmGetImeInfoEx(&info, ImeInfoExKeyboardLayout, &hKL) || !IS_IME_HKL(hKL)) - { - if (uBufLen > 0) - lpszFileName[0] = 0; - return 0; - } - - StringCchLengthW(info.wszImeFile, _countof(info.wszImeFile), &cch); - - cch = WideCharToMultiByte(CP_ACP, 0, info.wszImeFile, (INT)cch, - lpszFileName, uBufLen, NULL, &bDefUsed); - if (uBufLen == 0) - return (UINT)cch; - - if (cch > uBufLen - 1) - cch = uBufLen - 1; - - lpszFileName[cch] = 0; - return (UINT)cch; -} - -/*********************************************************************** - * ImmGetIMEFileNameW (IMM32.@) - */ -UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) -{ - IMEINFOEX info; - size_t cch; - - TRACE("(%p, %p, %u)\n", hKL, lpszFileName, uBufLen); - - if (!ImmGetImeInfoEx(&info, ImeInfoExKeyboardLayout, &hKL) || !IS_IME_HKL(hKL)) - { - if (uBufLen > 0) - lpszFileName[0] = 0; - return 0; - } - - StringCchLengthW(info.wszImeFile, _countof(info.wszImeFile), &cch); - if (uBufLen == 0) - return (UINT)cch; - - StringCchCopyNW(lpszFileName, uBufLen, info.wszImeFile, cch); - - if (cch > uBufLen - 1) - cch = uBufLen - 1; - - lpszFileName[cch] = 0; - return (UINT)cch; -} - -/*********************************************************************** - * ImmGetOpenStatus (IMM32.@) - */ -BOOL WINAPI ImmGetOpenStatus(HIMC hIMC) -{ - BOOL ret; - LPINPUTCONTEXT pIC; - - TRACE("(%p)\n", hIMC); - - if (!hIMC) - return FALSE; - - pIC = ImmLockIMC(hIMC); - if (!pIC) - return FALSE; - - ret = pIC->fOpen; - - ImmUnlockIMC(hIMC); - return ret; -} - -/*********************************************************************** - * ImmGetProperty (IMM32.@) - */ -DWORD WINAPI ImmGetProperty(HKL hKL, DWORD fdwIndex) -{ - IMEINFOEX ImeInfoEx; - LPIMEINFO pImeInfo; - DWORD dwValue; - PIMEDPI pImeDpi = NULL; - - TRACE("(%p, %lu)\n", hKL, fdwIndex); - - if (!ImmGetImeInfoEx(&ImeInfoEx, ImeInfoExKeyboardLayout, &hKL)) - return FALSE; - - if (fdwIndex == IGP_GETIMEVERSION) - return ImeInfoEx.dwImeWinVersion; - - if (ImeInfoEx.fLoadFlag != 2) - { - pImeDpi = ImmLockOrLoadImeDpi(hKL); - if (pImeDpi == NULL) - return FALSE; - - pImeInfo = &pImeDpi->ImeInfo; - } - else - { - pImeInfo = &ImeInfoEx.ImeInfo; - } - - switch (fdwIndex) - { - case IGP_PROPERTY: dwValue = pImeInfo->fdwProperty; break; - case IGP_CONVERSION: dwValue = pImeInfo->fdwConversionCaps; break; - case IGP_SENTENCE: dwValue = pImeInfo->fdwSentenceCaps; break; - case IGP_UI: dwValue = pImeInfo->fdwUICaps; break; - case IGP_SETCOMPSTR: dwValue = pImeInfo->fdwSCSCaps; break; - case IGP_SELECT: dwValue = pImeInfo->fdwSelectCaps; break; - default: dwValue = 0; break; - } - - if (pImeDpi) - ImmUnlockImeDpi(pImeDpi); - return dwValue; -} - -/*********************************************************************** - * ImmGetRegisterWordStyleA (IMM32.@) - */ -UINT WINAPI ImmGetRegisterWordStyleA( - HKL hKL, UINT nItem, LPSTYLEBUFA lpStyleBuf) -{ - UINT iItem, ret = 0; - PIMEDPI pImeDpi; - LPSTYLEBUFA pDestA; - LPSTYLEBUFW pSrcW, pNewStylesW = NULL; - size_t cchW; - INT cchA; - - TRACE("(%p, %u, %p)\n", hKL, nItem, lpStyleBuf); - - pImeDpi = ImmLockOrLoadImeDpi(hKL); - if (!pImeDpi) - return 0; - - if (!(pImeDpi->ImeInfo.fdwProperty & IME_PROP_UNICODE)) - { - ret = pImeDpi->ImeGetRegisterWordStyle(nItem, lpStyleBuf); - goto Quit; - } - - if (nItem > 0) - { - pNewStylesW = Imm32HeapAlloc(0, nItem * sizeof(STYLEBUFW)); - if (!pNewStylesW) - goto Quit; - } - - ret = pImeDpi->ImeGetRegisterWordStyle(nItem, pNewStylesW); - - if (nItem > 0) - { - /* lpStyleBuf <-- pNewStylesW */ - for (iItem = 0; iItem < ret; ++iItem) - { - pSrcW = &pNewStylesW[iItem]; - pDestA = &lpStyleBuf[iItem]; - pDestA->dwStyle = pSrcW->dwStyle; - StringCchLengthW(pSrcW->szDescription, _countof(pSrcW->szDescription), &cchW); - cchA = WideCharToMultiByte(CP_ACP, MB_PRECOMPOSED, - pSrcW->szDescription, (INT)cchW, - pDestA->szDescription, _countof(pDestA->szDescription), - NULL, NULL); - if (cchA > _countof(pDestA->szDescription) - 1) - cchA = _countof(pDestA->szDescription) - 1; - pDestA->szDescription[cchA] = 0; - } - } - -Quit: - if (pNewStylesW) - HeapFree(g_hImm32Heap, 0, pNewStylesW); - ImmUnlockImeDpi(pImeDpi); - return ret; -} - -/*********************************************************************** - * ImmGetRegisterWordStyleW (IMM32.@) - */ -UINT WINAPI ImmGetRegisterWordStyleW( - HKL hKL, UINT nItem, LPSTYLEBUFW lpStyleBuf) -{ - UINT iItem, ret = 0; - PIMEDPI pImeDpi; - LPSTYLEBUFA pSrcA, pNewStylesA = NULL; - LPSTYLEBUFW pDestW; - size_t cchA; - INT cchW; - - TRACE("(%p, %u, %p)\n", hKL, nItem, lpStyleBuf); - - pImeDpi = ImmLockOrLoadImeDpi(hKL); - if (!pImeDpi) - return 0; - - if (pImeDpi->ImeInfo.fdwProperty & IME_PROP_UNICODE) - { - ret = pImeDpi->ImeGetRegisterWordStyle(nItem, lpStyleBuf); - goto Quit; - } - - if (nItem > 0) - { - pNewStylesA = Imm32HeapAlloc(0, nItem * sizeof(STYLEBUFA)); - if (!pNewStylesA) - goto Quit; - } - - ret = pImeDpi->ImeGetRegisterWordStyle(nItem, pNewStylesA); - - if (nItem > 0) - { - /* lpStyleBuf <-- pNewStylesA */ - for (iItem = 0; iItem < ret; ++iItem) - { - pSrcA = &pNewStylesA[iItem]; - pDestW = &lpStyleBuf[iItem]; - pDestW->dwStyle = pSrcA->dwStyle; - StringCchLengthA(pSrcA->szDescription, _countof(pSrcA->szDescription), &cchA); - cchW = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, - pSrcA->szDescription, (INT)cchA, - pDestW->szDescription, _countof(pDestW->szDescription)); - if (cchW > _countof(pDestW->szDescription) - 1) - cchW = _countof(pDestW->szDescription) - 1; - pDestW->szDescription[cchW] = 0; - } - } - -Quit: - if (pNewStylesA) - HeapFree(g_hImm32Heap, 0, pNewStylesA); - ImmUnlockImeDpi(pImeDpi); - return ret; -} - -/*********************************************************************** - * ImmGetStatusWindowPos (IMM32.@) - */ -BOOL WINAPI ImmGetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) -{ - LPINPUTCONTEXT pIC; - BOOL ret; - - TRACE("(%p, %p)\n", hIMC, lpptPos); - - pIC = ImmLockIMC(hIMC); - if (pIC == NULL) - return FALSE; - - ret = !!(pIC->fdwInit & INIT_STATUSWNDPOS); - if (ret) - *lpptPos = pIC->ptStatusWndPos; - - ImmUnlockIMC(hIMC); - return ret; -} - -/*********************************************************************** - * ImmGetVirtualKey (IMM32.@) - */ -UINT WINAPI ImmGetVirtualKey(HWND hWnd) -{ - HIMC hIMC; - LPINPUTCONTEXTDX pIC; - UINT ret = VK_PROCESSKEY; - - TRACE("(%p)\n", hWnd); - - hIMC = ImmGetContext(hWnd); - pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); - if (!pIC) - return ret; - - if (pIC->bNeedsTrans) - ret = pIC->nVKey; - - ImmUnlockIMC(hIMC); - return ret; -} - -/*********************************************************************** - * ImmInstallIMEA (IMM32.@) - */ -HKL WINAPI ImmInstallIMEA( - LPCSTR lpszIMEFileName, LPCSTR lpszLayoutText) -{ - HKL hKL = NULL; - LPWSTR pszFileNameW = NULL, pszLayoutTextW = NULL; - - TRACE("(%s, %s)\n", debugstr_a(lpszIMEFileName), debugstr_a(lpszLayoutText)); - - pszFileNameW = Imm32WideFromAnsi(lpszIMEFileName); - if (pszFileNameW == NULL) - goto Quit; - - pszLayoutTextW = Imm32WideFromAnsi(lpszLayoutText); - if (pszLayoutTextW == NULL) - goto Quit; - - hKL = ImmInstallIMEW(pszFileNameW, pszLayoutTextW); - -Quit: - if (pszFileNameW) - HeapFree(g_hImm32Heap, 0, pszFileNameW); - if (pszLayoutTextW) - HeapFree(g_hImm32Heap, 0, pszLayoutTextW); - return hKL; -} - -/*********************************************************************** - * ImmInstallIMEW (IMM32.@) - */ -HKL WINAPI ImmInstallIMEW( - LPCWSTR lpszIMEFileName, LPCWSTR lpszLayoutText) -{ - INT lcid = GetUserDefaultLCID(); - INT count; - HKL hkl; - DWORD rc; - HKEY hkey; - WCHAR regKey[ARRAY_SIZE(szImeRegFmt)+8]; - - TRACE ("(%s, %s):\n", debugstr_w(lpszIMEFileName), - debugstr_w(lpszLayoutText)); - - /* Start with 2. e001 will be blank and so default to the wine internal IME */ - count = 2; - - while (count < 0xfff) - { - DWORD disposition = 0; - - hkl = (HKL)MAKELPARAM( lcid, 0xe000 | count ); - wsprintfW( regKey, szImeRegFmt, (ULONG_PTR)hkl); - - rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, regKey, 0, NULL, 0, KEY_WRITE, NULL, &hkey, &disposition); - if (rc == ERROR_SUCCESS && disposition == REG_CREATED_NEW_KEY) - break; - else if (rc == ERROR_SUCCESS) - RegCloseKey(hkey); - - count++; - } - - if (count == 0xfff) - { - WARN("Unable to find slot to install IME\n"); - return 0; - } - - if (rc == ERROR_SUCCESS) - { - rc = RegSetValueExW(hkey, szImeFileW, 0, REG_SZ, (const BYTE*)lpszIMEFileName, - (lstrlenW(lpszIMEFileName) + 1) * sizeof(WCHAR)); - if (rc == ERROR_SUCCESS) - rc = RegSetValueExW(hkey, szLayoutTextW, 0, REG_SZ, (const BYTE*)lpszLayoutText, - (lstrlenW(lpszLayoutText) + 1) * sizeof(WCHAR)); - RegCloseKey(hkey); - return hkl; - } - else - { - WARN("Unable to set IME registry values\n"); - return 0; - } -} - -/*********************************************************************** - * ImmIsIME (IMM32.@) - */ -BOOL WINAPI ImmIsIME(HKL hKL) -{ - IMEINFOEX info; - TRACE("(%p)\n", hKL); - return !!ImmGetImeInfoEx(&info, ImeInfoExImeWindow, &hKL); -} - -static BOOL APIENTRY -ImmIsUIMessageAW(HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam, BOOL bAnsi) -{ - switch (msg) - { - case WM_IME_STARTCOMPOSITION: case WM_IME_ENDCOMPOSITION: - case WM_IME_COMPOSITION: case WM_IME_SETCONTEXT: case WM_IME_NOTIFY: - case WM_IME_COMPOSITIONFULL: case WM_IME_SELECT: case WM_IME_SYSTEM: - break; - default: - return FALSE; - } - - if (!hWndIME) - return TRUE; - - if (bAnsi) - SendMessageA(hWndIME, msg, wParam, lParam); - else - SendMessageW(hWndIME, msg, wParam, lParam); - - return TRUE; -} - -/*********************************************************************** - * ImmIsUIMessageA (IMM32.@) - */ -BOOL WINAPI ImmIsUIMessageA( - HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam) -{ - TRACE("(%p, 0x%X, %p, %p)\n", hWndIME, msg, wParam, lParam); - return ImmIsUIMessageAW(hWndIME, msg, wParam, lParam, TRUE); -} - -/*********************************************************************** - * ImmIsUIMessageW (IMM32.@) - */ -BOOL WINAPI ImmIsUIMessageW( - HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam) -{ - TRACE("(%p, 0x%X, %p, %p)\n", hWndIME, msg, wParam, lParam); - return ImmIsUIMessageAW(hWndIME, msg, wParam, lParam, FALSE); -} - -/*********************************************************************** - * ImmNotifyIME (IMM32.@) - */ -BOOL WINAPI ImmNotifyIME( - HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) -{ - HKL hKL; - PIMEDPI pImeDpi; - BOOL ret; - - TRACE("(%p, %lu, %lu, %lu)\n", hIMC, dwAction, dwIndex, dwValue); - - if (hIMC && Imm32IsCrossThreadAccess(hIMC)) - return FALSE; - - hKL = GetKeyboardLayout(0); - pImeDpi = ImmLockImeDpi(hKL); - if (pImeDpi == NULL) - return FALSE; - - ret = pImeDpi->NotifyIME(hIMC, dwAction, dwIndex, dwValue); - ImmUnlockImeDpi(pImeDpi); - return ret; -} - -/*********************************************************************** - * ImmRegisterWordA (IMM32.@) - */ -BOOL WINAPI ImmRegisterWordA( - HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister) -{ - BOOL ret = FALSE; - PIMEDPI pImeDpi; - LPWSTR pszReadingW = NULL, pszRegisterW = NULL; - - TRACE("(%p, %s, 0x%lX, %s)\n", hKL, debugstr_a(lpszReading), dwStyle, - debugstr_a(lpszRegister)); - - pImeDpi = ImmLockOrLoadImeDpi(hKL); - if (!pImeDpi) - return FALSE; - - if (!(pImeDpi->ImeInfo.fdwProperty & IME_PROP_UNICODE)) - { - ret = pImeDpi->ImeRegisterWord(lpszReading, dwStyle, lpszRegister); - ImmUnlockImeDpi(pImeDpi); - return ret; - } - - if (lpszReading) - { - pszReadingW = Imm32WideFromAnsi(lpszReading); - if (pszReadingW == NULL) - goto Quit; - } - - if (lpszRegister) - { - pszRegisterW = Imm32WideFromAnsi(lpszRegister); - if (pszRegisterW == NULL) - goto Quit; - } - - ret = pImeDpi->ImeRegisterWord(pszReadingW, dwStyle, pszRegisterW); - -Quit: - if (pszReadingW) - HeapFree(g_hImm32Heap, 0, pszReadingW); - if (pszRegisterW) - HeapFree(g_hImm32Heap, 0, pszRegisterW); - ImmUnlockImeDpi(pImeDpi); - return ret; -} - -/*********************************************************************** - * ImmRegisterWordW (IMM32.@) - */ -BOOL WINAPI ImmRegisterWordW( - HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister) -{ - BOOL ret = FALSE; - PIMEDPI pImeDpi; - LPSTR pszReadingA = NULL, pszRegisterA = NULL; - - TRACE("(%p, %s, 0x%lX, %s)\n", hKL, debugstr_w(lpszReading), dwStyle, - debugstr_w(lpszRegister)); - - pImeDpi = ImmLockOrLoadImeDpi(hKL); - if (!pImeDpi) - return FALSE; - - if (pImeDpi->ImeInfo.fdwProperty & IME_PROP_UNICODE) - { - ret = pImeDpi->ImeRegisterWord(lpszReading, dwStyle, lpszRegister); - ImmUnlockImeDpi(pImeDpi); - return ret; - } - - if (lpszReading) - { - pszReadingA = Imm32AnsiFromWide(lpszReading); - if (!pszReadingA) - goto Quit; - } - - if (lpszRegister) - { - pszRegisterA = Imm32AnsiFromWide(lpszRegister); - if (!pszRegisterA) - goto Quit; - } - - ret = pImeDpi->ImeRegisterWord(pszReadingA, dwStyle, pszRegisterA); - -Quit: - if (pszReadingA) - HeapFree(g_hImm32Heap, 0, pszReadingA); - if (pszRegisterA) - HeapFree(g_hImm32Heap, 0, pszRegisterA); - ImmUnlockImeDpi(pImeDpi); - return ret; -} - -/*********************************************************************** - * ImmReleaseContext (IMM32.@) - */ -BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC) -{ - TRACE("(%p, %p)\n", hWnd, hIMC); - UNREFERENCED_PARAMETER(hWnd); - UNREFERENCED_PARAMETER(hIMC); ... 3516 lines suppressed ...

1 0

[reactos] 01/01: [SYSSETUP] Fix en-US translation. Add en-GB translation (#3950)
by PopuriAO29 10 Sep '21

10 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce7ac73f89ec136c44a7c… commit ce7ac73f89ec136c44a7c0d8c732b8a3aeae9356 Author: PopuriAO29 <36154203+PopuriAO29(a)users.noreply.github.com> AuthorDate: Fri Sep 10 18:10:25 2021 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 10 14:10:25 2021 +0300 [SYSSETUP] Fix en-US translation. Add en-GB translation (#3950) The British language wasn't included here, so I have corrected some texts that were in American English. Also fixed one string that uses British English language. --- dll/win32/syssetup/lang/bg-BG.rc | 2 +- dll/win32/syssetup/lang/cs-CZ.rc | 2 +- dll/win32/syssetup/lang/da-DK.rc | 2 +- dll/win32/syssetup/lang/el-GR.rc | 2 +- dll/win32/syssetup/lang/{fi-FI.rc => en-GB.rc} | 46 ++++++++------------------ dll/win32/syssetup/lang/en-US.rc | 2 +- dll/win32/syssetup/lang/et-EE.rc | 2 +- dll/win32/syssetup/lang/fi-FI.rc | 2 +- dll/win32/syssetup/lang/he-IL.rc | 2 +- dll/win32/syssetup/lang/hi-IN.rc | 2 +- dll/win32/syssetup/lang/it-IT.rc | 2 +- dll/win32/syssetup/lang/lt-LT.rc | 2 +- dll/win32/syssetup/lang/nl-NL.rc | 2 +- dll/win32/syssetup/lang/no-NO.rc | 2 +- dll/win32/syssetup/lang/pt-BR.rc | 2 +- dll/win32/syssetup/lang/ro-RO.rc | 2 +- dll/win32/syssetup/lang/sk-SK.rc | 2 +- dll/win32/syssetup/lang/sq-AL.rc | 2 +- dll/win32/syssetup/lang/sv-SE.rc | 2 +- dll/win32/syssetup/lang/th-TH.rc | 2 +- dll/win32/syssetup/lang/zh-CN.rc | 2 +- dll/win32/syssetup/lang/zh-TW.rc | 2 +- dll/win32/syssetup/syssetup.rc | 3 ++ 23 files changed, 38 insertions(+), 53 deletions(-) diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index 19cfc38c22e..80095dae23c 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -244,7 +244,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index c088501a01e..cfa8de1ba10 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -250,7 +250,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index 7159b92d21b..e28cb72f45a 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -263,7 +263,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index 170abdeaf9e..3c3a7fdf9f5 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -244,7 +244,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/en-GB.rc similarity index 88% copy from dll/win32/syssetup/lang/fi-FI.rc copy to dll/win32/syssetup/lang/en-GB.rc index ff3861bb9e2..6eb39517643 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/en-GB.rc @@ -1,23 +1,4 @@ -/* - * Copyright (C) 2004 Filip Navara - * Copyright (C) 2004 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK IDD_WELCOMEPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU @@ -61,10 +42,10 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 - LTEXT "Type your full name and the name of your company or organization.", IDC_STATIC, 54, 7, 242, 21 + LTEXT "Type your full name and the name of your company or organisation.", IDC_STATIC, 54, 7, 242, 21 LTEXT "Na&me:", IDC_STATIC, 54, 37, 44, 8 EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Organization:", IDC_STATIC, 54, 57, 44, 8 + LTEXT "&Organisation:", IDC_STATIC, 54, 57, 44, 8 EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL END @@ -94,12 +75,12 @@ BEGIN ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 LTEXT "The system locale should match the language of the applications you want to use. The user locale controls how numbers, currencies, and dates appear.", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 - LTEXT "To change system or user locale settings, click Customize.", IDC_STATIC, 53, 60, 196, 8 - PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 + LTEXT "To change system or user locale settings, click Customise.", IDC_STATIC, 53, 60, 196, 8 + PUSHBUTTON "&Customise...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 LTEXT "The keyboard layout controls the characters that appear when you type.", IDC_STATIC, 53, 86, 253, 8 LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 - LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53, 126, 184, 8 - PUSHBUTTON "C&ustomize...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14 + LTEXT "To change the keyboard layout, click Customise.", IDC_STATIC, 53, 126, 184, 8 + PUSHBUTTON "C&ustomise...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14 END IDD_DATETIMEPAGE DIALOGEX 0, 0, 317, 143 @@ -179,7 +160,7 @@ BEGIN LTEXT "packets", -1, 169, 75, 26, 8 EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 - AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + AUTOCHECKBOX "&Fast Initialisation", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 END @@ -187,18 +168,19 @@ STRINGTABLE BEGIN IDS_ACKTITLE "Acknowledgements" IDS_ACKSUBTITLE "The shoulders ReactOS stands on and license information" - IDS_OWNERTITLE "Personalize your Software" - IDS_OWNERSUBTITLE "Setup uses this information about yourself to personalize ReactOS." + IDS_OWNERTITLE "Personalise your Software" + IDS_OWNERSUBTITLE "Setup uses this information about yourself to personalise ReactOS." IDS_COMPUTERTITLE "Computer Name and Administrator Password" IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for your computer." IDS_LOCALETITLE "Regional settings" - IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and languages." + IDS_LOCALESUBTITLE "You can customise ReactOS for different regions and languages." IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." IDS_PROCESSTITLE "Registering Components" IDS_PROCESSSUBTITLE "Please wait..." IDS_THEMESELECTIONTITLE "Appearance" IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." + END STRINGTABLE @@ -266,7 +248,7 @@ BEGIN IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" - IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." - IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_PRODUCTSERVERINFO "The system will be recognised as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." + IDS_PRODUCTWORKSTATIONINFO "The system will be recognised as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index 0660c4c41c4..c13f9fb9a8e 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -264,7 +264,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index 78e709380ae..ba0990719c1 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -244,7 +244,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index ff3861bb9e2..5012886106f 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -263,7 +263,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index 07ebe207ed9..908c2f0019b 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -244,7 +244,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc index d84f00b7b24..149cb0752db 100644 --- a/dll/win32/syssetup/lang/hi-IN.rc +++ b/dll/win32/syssetup/lang/hi-IN.rc @@ -252,7 +252,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index e7eab20fbf4..85d6b2ce29a 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -244,7 +244,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index 86823b22672..9a7723ea847 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -263,7 +263,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index f636b1d9b5c..9d0fb04e0dd 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -244,7 +244,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index 292971ee1a5..ac48f213528 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -244,7 +244,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index 38ebaefcf07..c518171efac 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -244,7 +244,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index 9bdeac2c74d..53eec42c5e4 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -253,7 +253,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index a6e03a142b2..d301830e352 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -250,7 +250,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index a62635f8b5a..328684089b5 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -263,7 +263,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index acbbd0cd301..45f0ae6d611 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -263,7 +263,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 211ecb24712..2a81ce914b2 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -263,7 +263,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index 513adaefc56..1c2c5e36d12 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -249,7 +249,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index bd8311b1796..5859023605b 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -274,7 +274,7 @@ END STRINGTABLE BEGIN IDS_PRODUCTTITLE "產品選擇" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behavior of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." diff --git a/dll/win32/syssetup/syssetup.rc b/dll/win32/syssetup/syssetup.rc index ce7f4a460a9..1b15003d918 100644 --- a/dll/win32/syssetup/syssetup.rc +++ b/dll/win32/syssetup/syssetup.rc @@ -62,6 +62,9 @@ IDR_GPL RT_TEXT "COPYING" #ifdef LANGUAGE_EL_GR #include "lang/el-GR.rc" #endif +#ifdef LANGUAGE_EN_GB + #include "lang/en-GB.rc" +#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif

1 0

[reactos] 01/01: [DESK] Correction for English (United Kingdom) translation (#3949)
by PopuriAO29 09 Sep '21

09 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=647ba1cb45b87bb229280… commit 647ba1cb45b87bb229280843ff48a1f90e806eed Author: PopuriAO29 <36154203+PopuriAO29(a)users.noreply.github.com> AuthorDate: Fri Sep 10 05:48:41 2021 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 10 01:48:41 2021 +0300 [DESK] Correction for English (United Kingdom) translation (#3949) The word "personalize" should be "personalise" in British English. --- dll/cpl/desk/lang/en-GB.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/desk/lang/en-GB.rc b/dll/cpl/desk/lang/en-GB.rc index 9ac99cd9eb9..7c373470442 100644 --- a/dll/cpl/desk/lang/en-GB.rc +++ b/dll/cpl/desk/lang/en-GB.rc @@ -5,7 +5,7 @@ CAPTION "Themes" STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalize your computer with one click.", IDC_STATIC, 5, 5, 235, 30 + LTEXT "A theme is a background plus a set of sounds, icons, and other elements to help you personalise your computer with one click.", IDC_STATIC, 5, 5, 235, 30 LTEXT "Theme:", IDC_STATIC, 5, 42, 55, 10 COMBOBOX IDC_THEMES_COMBOBOX, 5, 52, 160, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Save &As...", IDC_THEMES_SAVE_AS, 170, 52, 70, 14

1 0

[reactos] 02/02: [NTOS:SE] Explicitly check the auto inherit flags right away
by George Bișoc 09 Sep '21

09 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7255f1584909d1cfbd22… commit d7255f1584909d1cfbd22c1b20fcc958dccf5c90 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Wed Sep 8 18:25:50 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Thu Sep 9 19:29:53 2021 +0200 [NTOS:SE] Explicitly check the auto inherit flags right away As we now have the SEF_* flags declared within the SDK we can simply check for such flags directly wihout having to check for the hard-coded flag values. --- ntoskrnl/se/sd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/se/sd.c b/ntoskrnl/se/sd.c index c3be55a677c..98de8842619 100644 --- a/ntoskrnl/se/sd.c +++ b/ntoskrnl/se/sd.c @@ -1285,7 +1285,7 @@ SeAssignSecurityEx( } if (!Owner) { - if (AutoInheritFlags & 0x20 /* FIXME: SEF_DEFAULT_OWNER_FROM_PARENT */) + if (AutoInheritFlags & SEF_DEFAULT_OWNER_FROM_PARENT) { DPRINT("Use parent owner sid!\n"); if (!ARGUMENT_PRESENT(ParentDescriptor)) @@ -1317,7 +1317,7 @@ SeAssignSecurityEx( } if (!Group) { - if (AutoInheritFlags & 0x40 /* FIXME: SEF_DEFAULT_GROUP_FROM_PARENT */) + if (AutoInheritFlags & SEF_DEFAULT_GROUP_FROM_PARENT) { DPRINT("Use parent group sid!\n"); if (!ARGUMENT_PRESENT(ParentDescriptor))

1 0

[reactos] 01/02: [XDK][KMTESTS:SE] Move the auto inherit ACE flags in the right place
by George Bișoc 09 Sep '21

09 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58c42afec2c9cdebf4af7… commit 58c42afec2c9cdebf4af7ada3ab93088610fb57e Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Wed Sep 8 18:17:41 2021 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Thu Sep 9 19:29:50 2021 +0200 [XDK][KMTESTS:SE] Move the auto inherit ACE flags in the right place These bit flags are documented in CreatePrivateObjectSecurityEx API routine call in MSDN and their reasonable location should be XDK (NTIFS section more or less) and not Kernel tests suite (KMTESTs). Also assign these flags the right values. https://docs.microsoft.com/en-us/windows/win32/api/securitybaseapi/nf-secur… --- modules/rostests/kmtests/ntos_se/se.h | 15 --------------- sdk/include/xdk/setypes.h | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/rostests/kmtests/ntos_se/se.h b/modules/rostests/kmtests/ntos_se/se.h index e4e83e792ac..e4ece1c8caf 100644 --- a/modules/rostests/kmtests/ntos_se/se.h +++ b/modules/rostests/kmtests/ntos_se/se.h @@ -8,21 +8,6 @@ #ifndef _KMTEST_SE_H_ #define _KMTEST_SE_H_ -/* FIXME: belongs in ntifs.h or something */ -#define SEF_DACL_AUTO_INHERIT 1 -#define SEF_SACL_AUTO_INHERIT 2 -#define SEF_DEFAULT_DESCRIPTOR_FOR_OBJECT 4 -#define SEF_AVOID_PRIVILEGE_CHECK 8 -#define SEF_AVOID_OWNER_CHECK 16 -#define SEF_DEFAULT_OWNER_FROM_PARENT 32 -#define SEF_DEFAULT_GROUP_FROM_PARENT 64 -#define SEF_MACL_NO_WRITE_UP 256 -#define SEF_MACL_NO_READ_UP 512 -#define SEF_MACL_NO_EXECUTE_UP 1024 -#define SEF_AI_USE_EXTRA_PARAMS 2048 -#define SEF_AVOID_OWNER_RESTRICTION 4096 -#define SEF_MACL_VALID_FLAGS (SEF_MACL_NO_WRITE_UP | SEF_MACL_NO_READ_UP | SEF_MACL_NO_EXECUTE_UP) - NTSTATUS RtlxAddAuditAccessAceEx( _Inout_ PACL Acl, diff --git a/sdk/include/xdk/setypes.h b/sdk/include/xdk/setypes.h index c71488ed6a5..5037c1e3513 100644 --- a/sdk/include/xdk/setypes.h +++ b/sdk/include/xdk/setypes.h @@ -131,6 +131,21 @@ typedef struct _SE_IMPERSONATION_STATE { #define UNPROTECTED_DACL_SECURITY_INFORMATION (0x20000000L) #define UNPROTECTED_SACL_SECURITY_INFORMATION (0x10000000L) +/* Auto inherit ACE flags */ +#define SEF_DACL_AUTO_INHERIT 0x01 +#define SEF_SACL_AUTO_INHERIT 0x02 +#define SEF_DEFAULT_DESCRIPTOR_FOR_OBJECT 0x04 +#define SEF_AVOID_PRIVILEGE_CHECK 0x08 +#define SEF_AVOID_OWNER_CHECK 0x10 +#define SEF_DEFAULT_OWNER_FROM_PARENT 0x20 +#define SEF_DEFAULT_GROUP_FROM_PARENT 0x40 +#define SEF_MACL_NO_WRITE_UP 0x100 +#define SEF_MACL_NO_READ_UP 0x200 +#define SEF_MACL_NO_EXECUTE_UP 0x400 +#define SEF_AI_USE_EXTRA_PARAMS 0x800 +#define SEF_AVOID_OWNER_RESTRICTION 0x1000 +#define SEF_MACL_VALID_FLAGS (SEF_MACL_NO_WRITE_UP | SEF_MACL_NO_READ_UP | SEF_MACL_NO_EXECUTE_UP) + $endif (_WDMDDK_ || _WINNT_) $if (_WDMDDK_)

1 0

[reactos] 01/01: [ARM] Fix some compilation errors for ARM
by Stanislav Motylkov 09 Sep '21

09 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f4c98a425fb42f346ec0… commit 3f4c98a425fb42f346ec01007860133e849330ca Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Sep 9 18:56:32 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Sep 9 19:40:20 2021 +0300 [ARM] Fix some compilation errors for ARM CORE-17634 CORE-17604 --- dll/ntdll/def/ntdll.spec | 10 +++++----- dll/win32/msvcrt/msvcrt.spec | 4 ++-- dll/win32/rpcrt4/CMakeLists.txt | 2 +- dll/win32/rpcrt4/msvc.S | 26 +++++++++++++++++++++++++- ntoskrnl/ntoskrnl.spec | 2 +- sdk/lib/crt/except/arm/chkstk_ms.s | 27 --------------------------- 6 files changed, 34 insertions(+), 37 deletions(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index 63fd851dc8d..3db2bf08b82 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -611,7 +611,7 @@ @ stdcall -stub -version=0x600+ RtlAcquireSRWLockShared(ptr) @ stdcall RtlActivateActivationContext(long ptr ptr) @ stdcall RtlActivateActivationContextEx(long ptr ptr ptr) -@ stdcall -arch=x86_64 RtlActivateActivationContextUnsafeFast(ptr ptr) +@ stdcall -arch=x86_64,arm RtlActivateActivationContextUnsafeFast(ptr ptr) @ stdcall RtlAddAccessAllowedAce(ptr long long ptr) @ stdcall RtlAddAccessAllowedAceEx(ptr long long long ptr) @ stdcall RtlAddAccessAllowedObjectAce(ptr long long long ptr ptr ptr) @@ -743,7 +743,7 @@ @ stub -version=0x600+ RtlDeCommitDebugInfo @ stdcall RtlDeNormalizeProcessParams(ptr) @ stdcall RtlDeactivateActivationContext(long long) -@ stdcall -arch=x86_64 RtlDeactivateActivationContextUnsafeFast(ptr) +@ stdcall -arch=x86_64,arm RtlDeactivateActivationContextUnsafeFast(ptr) @ stdcall -stub RtlDebugPrintTimes() @ stdcall RtlDecodePointer(ptr) @ stdcall RtlDecodeSystemPointer(ptr) @@ -1757,7 +1757,7 @@ @ cdecl -arch=i386 _CIsin() @ cdecl -arch=i386 _CIsqrt() @ cdecl -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) -@ cdecl -arch=x86_64 __chkstk() +@ cdecl -arch=x86_64,arm __chkstk() @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) @@ -1791,8 +1791,8 @@ @ cdecl _ltow(long ptr long) @ cdecl _memccpy(ptr ptr long long) @ cdecl _memicmp(str str long) -@ cdecl -arch=x86_64 _setjmp(ptr ptr) -@ cdecl -arch=x86_64 _setjmpex(ptr ptr) +@ cdecl -arch=x86_64,arm _setjmp(ptr ptr) +@ cdecl -arch=x86_64,arm _setjmpex(ptr ptr) @ varargs _snprintf(ptr long str) @ varargs _snwprintf(ptr long wstr) @ cdecl _splitpath(str ptr ptr ptr ptr) diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index 62295ac46a3..adff7f8bf98 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -164,7 +164,7 @@ ;@ cdecl -arch=arm __ExceptionPtrRethrow() ;@ cdecl -arch=arm __ExceptionPtrSwap() ;@ cdecl -arch=arm __ExceptionPtrToBool() -@ cdecl -arch=arm __uncaught_exception() +@ cdecl -arch=arm __uncaught_exception(ptr) MSVCRT___uncaught_exception @ cdecl -arch=arm ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler # int (__cdecl*__cdecl _query_new_handler(void))(unsigned int) @ cdecl -arch=arm ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z() MSVCRT__set_new_handler # int (__cdecl*__cdecl _set_new_handler(int (__cdecl*)(unsigned int)))(unsigned int) @ cdecl -arch=arm ?_set_new_mode@@YAHH@Z() MSVCRT__set_new_mode # int __cdecl _set_new_mode(int) @@ -947,7 +947,7 @@ @ cdecl _seterrormode(long) @ cdecl -norelay _setjmp(ptr) @ cdecl -arch=i386 -norelay _setjmp3(ptr long) -@ cdecl -arch=x86_64 -norelay _setjmpex(ptr ptr) +@ cdecl -arch=x86_64,arm -norelay _setjmpex(ptr ptr) @ cdecl _setmaxstdio(long) @ cdecl _setmbcp(long) @ cdecl _setmode(long long) diff --git a/dll/win32/rpcrt4/CMakeLists.txt b/dll/win32/rpcrt4/CMakeLists.txt index 90c9225847a..d2a7e0f2702 100644 --- a/dll/win32/rpcrt4/CMakeLists.txt +++ b/dll/win32/rpcrt4/CMakeLists.txt @@ -41,7 +41,7 @@ list(APPEND SOURCE unix_func.c ${CMAKE_CURRENT_BINARY_DIR}/epm_c.c) -if(MSVC AND NOT ARCH STREQUAL "arm") +if(MSVC) add_asm_files(rpcrt4_asm msvc.S) endif() diff --git a/dll/win32/rpcrt4/msvc.S b/dll/win32/rpcrt4/msvc.S index c45ccc68853..ca7d77430aa 100644 --- a/dll/win32/rpcrt4/msvc.S +++ b/dll/win32/rpcrt4/msvc.S @@ -1,5 +1,9 @@ +#if defined(_M_IX86) || defined(_M_AMD64) #include <asm.inc> +#elif defined(_M_ARM) +#include <kxarm.h> +#endif #ifdef _M_IX86 .code32 @@ -29,7 +33,8 @@ _call_stubless_func: mov ecx, [esp] /* return address */ add esp, edx jmp ecx -#else + +#elif _M_AMD64 .code64 EXTERN ndr_client_call:PROC @@ -141,6 +146,25 @@ FUNC NdrAsyncClientCall ret ENDFUNC +#elif _M_ARM +TEXTAREA + + LEAF_ENTRY call_stubless_func + + /* Unimplemented */ + __assertfail + bx lr + + LEAF_END call_stubless_func + + LEAF_ENTRY call_server_func + + /* Unimplemented */ + __assertfail + bx lr + + LEAF_END call_server_func + #endif END diff --git a/ntoskrnl/ntoskrnl.spec b/ntoskrnl/ntoskrnl.spec index 8d2dc6f4b23..ced05f9a8bd 100644 --- a/ntoskrnl/ntoskrnl.spec +++ b/ntoskrnl/ntoskrnl.spec @@ -1559,7 +1559,7 @@ @ cdecl -arch=x86_64 _local_unwind() @ cdecl _purecall() @ cdecl -arch=x86_64,arm _setjmp(ptr ptr) -@ cdecl -arch=x86_64 _setjmpex(ptr ptr) +@ cdecl -arch=x86_64,arm _setjmpex(ptr ptr) @ cdecl _snprintf() @ cdecl _snwprintf() @ cdecl _stricmp() diff --git a/sdk/lib/crt/except/arm/chkstk_ms.s b/sdk/lib/crt/except/arm/chkstk_ms.s deleted file mode 100644 index dcad0ca87e1..00000000000 --- a/sdk/lib/crt/except/arm/chkstk_ms.s +++ /dev/null @@ -1,27 +0,0 @@ -/* - * COPYRIGHT: BSD - See COPYING.ARM in the top level directory - * PROJECT: ReactOS CRT librariy - * PURPOSE: Implementation of _chkstk and _alloca_probe - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - * Yuntian Zhang (yuntian.zh(a)gmail.com) - */ - -/* INCLUDES ******************************************************************/ - -#include <kxarm.h> - -/* CODE **********************************************************************/ - TEXTAREA - - LEAF_ENTRY ___chkstk_ms - __assertfail - bx lr - LEAF_END __chkstk_ms - - LEAF_ENTRY __alloca_probe - __assertfail - bx lr - LEAF_END __alloca_probe - - END -/* EOF */

1 0

[reactos] 04/04: [IMM32] ValidateHwndNoErr(): Apply ReactOS-specific handle table array fixup. (#3937) CORE-17741
by Hermès Bélusca-Maïto 09 Sep '21

09 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0233bb72b30c12ed7ebb0… commit 0233bb72b30c12ed7ebb02c4a1a4f45164d309e8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Sep 7 22:05:54 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 9 16:15:13 2021 +0200 [IMM32] ValidateHwndNoErr(): Apply ReactOS-specific handle table array fixup. (#3937) CORE-17741 This function (which should belong to the user32 helpers) depends on the internal format of the USER handles table, that is ReactOS-specific. Its pointer value is stored in the win32k/user32 shared info section, and thus cannot be converted to user-space and stored back into that section. Therefore it needs to be retrieved and manually converted when the function is called. --- dll/win32/imm32/imm.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 9f32bcc5d5d..1dc41f8e362 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -66,6 +66,7 @@ static PWND FASTCALL ValidateHwndNoErr(HWND hwnd) PCLIENTINFO ClientInfo = GetWin32ClientInfo(); INT index; PUSER_HANDLE_TABLE ht; + PUSER_HANDLE_ENTRY he; WORD generation; /* See if the window is cached */ @@ -76,15 +77,20 @@ static PWND FASTCALL ValidateHwndNoErr(HWND hwnd) return NULL; ht = g_SharedInfo.aheList; /* handle table */ + ASSERT(ht); + /* ReactOS-Specific! */ + ASSERT(g_SharedInfo.ulSharedDelta != 0); + he = (PUSER_HANDLE_ENTRY)((ULONG_PTR)ht->handles - g_SharedInfo.ulSharedDelta); + index = (LOWORD(hwnd) - FIRST_USER_HANDLE) >> 1; - if (index < 0 || index >= ht->nb_handles || ht->handles[index].type != TYPE_WINDOW) + if (index < 0 || index >= ht->nb_handles || he[index].type != TYPE_WINDOW) return NULL; generation = HIWORD(hwnd); - if (generation != ht->handles[index].generation && generation && generation != 0xFFFF) + if (generation != he[index].generation && generation && generation != 0xFFFF) return NULL; - return (PWND)&ht->handles[index]; + return (PWND)&he[index]; } static BOOL APIENTRY Imm32InitInstance(HMODULE hMod)

1 0

[reactos] 03/04: [WIN32SS:NTUSER][USER32] NtUserProcessConnect() should return pointers in user client-space. (#3937)
by Hermès Bélusca-Maïto 09 Sep '21

09 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4cbc61fd0264fb805fbd7… commit 4cbc61fd0264fb805fbd7c367c3136e9a95d70f5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Sep 2 01:11:19 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Sep 9 16:15:12 2021 +0200 [WIN32SS:NTUSER][USER32] NtUserProcessConnect() should return pointers in user client-space. (#3937) - Do the kernel/server --> user/client-space pointers conversion within NtUserProcessConnect(), instead of having the callers of this function doing this job. This makes the behaviour Windows-compatible. NOTE: the gHandleEntries pointer is ReactOS-specific! - Drop the g_ulSharedDelta global, just use instead gSharedInfo.ulSharedDelta. - Add extra documentation aspects for NtUserProcessConnect() that are not yet implemented in ReactOS. --- win32ss/user/ntuser/ntstubs.c | 45 +++++++++++++++++++++++++++++++---- win32ss/user/user32/include/user32p.h | 7 +++--- win32ss/user/user32/include/user_x.h | 4 ++-- win32ss/user/user32/misc/dllmain.c | 25 ++++++++++--------- 4 files changed, 58 insertions(+), 23 deletions(-) diff --git a/win32ss/user/ntuser/ntstubs.c b/win32ss/user/ntuser/ntstubs.c index c770f883e25..4de9ea36a58 100644 --- a/win32ss/user/ntuser/ntstubs.c +++ b/win32ss/user/ntuser/ntstubs.c @@ -531,8 +531,8 @@ NtUserProcessConnect( TRACE("NtUserProcessConnect\n"); - if ( pUserConnect == NULL || - Size != sizeof(*pUserConnect) ) + if (pUserConnect == NULL || + Size != sizeof(*pUserConnect)) { return STATUS_UNSUCCESSFUL; } @@ -553,14 +553,51 @@ NtUserProcessConnect( _SEH2_TRY { + UINT i; + // FIXME: Check that pUserConnect->ulVersion == USER_VERSION; + // FIXME: Check the value of pUserConnect->dwDispatchCount. ProbeForWrite(pUserConnect, sizeof(*pUserConnect), sizeof(PVOID)); - pUserConnect->siClient.psi = gpsi; - pUserConnect->siClient.aheList = gHandleTable; + + // FIXME: Instead of assuming that the mapping of the heap desktop + // also holds there, we **MUST** create and map instead the shared + // section! Its client base must be stored in W32Process->pClientBase. + // What is currently done (ReactOS-specific only), is that within the + // IntUserHeapCommitRoutine()/MapGlobalUserHeap() routines we assume + // it's going to be also called early, so that we manually add a very + // first memory mapping that corresponds to the "global user heap", + // and that we use instead of a actual win32 "shared USER section" + // (see slide 29 of https://paper.bobylive.com/Meeting_Papers/BlackHat/USA-2011/BH_US_11_Mandt_… ) + pUserConnect->siClient.ulSharedDelta = (ULONG_PTR)W32Process->HeapMappings.KernelMapping - (ULONG_PTR)W32Process->HeapMappings.UserMapping; + +#define SERVER_TO_CLIENT(ptr) \ + ((PVOID)((ULONG_PTR)ptr - pUserConnect->siClient.ulSharedDelta)) + + ASSERT(gpsi); + ASSERT(gHandleTable); + + pUserConnect->siClient.psi = SERVER_TO_CLIENT(gpsi); + pUserConnect->siClient.aheList = SERVER_TO_CLIENT(gHandleTable); + pUserConnect->siClient.pDispInfo = NULL; + + // NOTE: kernel server should also have a SHAREDINFO gSharedInfo; + // FIXME: These USER window-proc data should be used somehow! + + pUserConnect->siClient.DefWindowMsgs.maxMsgs = 0; + pUserConnect->siClient.DefWindowMsgs.abMsgs = NULL; + pUserConnect->siClient.DefWindowSpecMsgs.maxMsgs = 0; + pUserConnect->siClient.DefWindowSpecMsgs.abMsgs = NULL; + + for (i = 0; i < ARRAYSIZE(pUserConnect->siClient.awmControl); ++i) + { + pUserConnect->siClient.awmControl[i].maxMsgs = 0; + pUserConnect->siClient.awmControl[i].abMsgs = NULL; + } +#undef SERVER_TO_CLIENT } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { diff --git a/win32ss/user/user32/include/user32p.h b/win32ss/user/user32/include/user32p.h index f2616ff8f95..deb57148f78 100644 --- a/win32ss/user/user32/include/user32p.h +++ b/win32ss/user/user32/include/user32p.h @@ -39,13 +39,12 @@ typedef struct extern HINSTANCE User32Instance; #define user32_module User32Instance extern PPROCESSINFO g_ppi; -extern ULONG_PTR g_ulSharedDelta; -extern PSERVERINFO gpsi; extern SHAREDINFO gSharedInfo; -extern BOOLEAN gfLogonProcess; -extern BOOLEAN gfServerProcess; +extern PSERVERINFO gpsi; extern PUSER_HANDLE_TABLE gHandleTable; extern PUSER_HANDLE_ENTRY gHandleEntries; +extern BOOLEAN gfLogonProcess; +extern BOOLEAN gfServerProcess; extern CRITICAL_SECTION U32AccelCacheLock; extern HINSTANCE ghImm32; extern RTL_CRITICAL_SECTION gcsUserApiHook; diff --git a/win32ss/user/user32/include/user_x.h b/win32ss/user/user32/include/user_x.h index c040afefb9c..e7774e4e2f7 100644 --- a/win32ss/user/user32/include/user_x.h +++ b/win32ss/user/user32/include/user_x.h @@ -4,8 +4,8 @@ static __inline PVOID SharedPtrToUser(PVOID Ptr) { ASSERT(Ptr != NULL); - ASSERT(g_ulSharedDelta != 0); - return (PVOID)((ULONG_PTR)Ptr - g_ulSharedDelta); + ASSERT(gSharedInfo.ulSharedDelta != 0); + return (PVOID)((ULONG_PTR)Ptr - gSharedInfo.ulSharedDelta); } static __inline PVOID diff --git a/win32ss/user/user32/misc/dllmain.c b/win32ss/user/user32/misc/dllmain.c index b757ea22e9d..72f82aa1b43 100644 --- a/win32ss/user/user32/misc/dllmain.c +++ b/win32ss/user/user32/misc/dllmain.c @@ -27,11 +27,10 @@ static ULONG User32TlsIndex; HINSTANCE User32Instance; PPROCESSINFO g_ppi = NULL; +SHAREDINFO gSharedInfo = {0}; +PSERVERINFO gpsi = NULL; PUSER_HANDLE_TABLE gHandleTable = NULL; PUSER_HANDLE_ENTRY gHandleEntries = NULL; -PSERVERINFO gpsi = NULL; -SHAREDINFO gSharedInfo = {0}; -ULONG_PTR g_ulSharedDelta; BOOLEAN gfLogonProcess = FALSE; BOOLEAN gfServerProcess = FALSE; BOOLEAN gfFirstThread = TRUE; @@ -271,6 +270,7 @@ ClientThreadSetupHelper(BOOL IsCallback) /* Minimal setup of the connect info structure */ UserCon.ulVersion = USER_VERSION; + // UserCon.dwDispatchCount; /* Connect to win32k */ Status = NtUserProcessConnect(NtCurrentProcess(), @@ -280,13 +280,13 @@ ClientThreadSetupHelper(BOOL IsCallback) /* Retrieve data */ g_ppi = ClientInfo->ppi; // Snapshot PI, used as pointer only! - g_ulSharedDelta = UserCon.siClient.ulSharedDelta; - gpsi = SharedPtrToUser(UserCon.siClient.psi); - gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); - gHandleEntries = SharedPtrToUser(gHandleTable->handles); gSharedInfo = UserCon.siClient; + gpsi = gSharedInfo.psi; + gHandleTable = gSharedInfo.aheList; + /* ReactOS-Specific! */ gHandleEntries = SharedPtrToUser(gHandleTable->handles); - // ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta); + // ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", + // gSharedInfo.psi, gSharedInfo.aheList, gSharedInfo.ulSharedDelta); } TRACE("Checkpoint (register PFN)\n"); @@ -418,6 +418,7 @@ Init(PUSERCONNECT UserCon /*PUSERSRV_API_CONNECTINFO*/) /* Minimal setup of the connect info structure */ UserCon->ulVersion = USER_VERSION; + // UserCon->dwDispatchCount; TRACE("HACK: Hackish NtUserProcessConnect call!!\n"); /* Connect to win32k */ @@ -433,12 +434,10 @@ Init(PUSERCONNECT UserCon /*PUSERSRV_API_CONNECTINFO*/) /* Retrieve data */ g_ppi = GetWin32ClientInfo()->ppi; // Snapshot PI, used as pointer only! - g_ulSharedDelta = UserCon->siClient.ulSharedDelta; - gpsi = SharedPtrToUser(UserCon->siClient.psi); - gHandleTable = SharedPtrToUser(UserCon->siClient.aheList); - gHandleEntries = SharedPtrToUser(gHandleTable->handles); gSharedInfo = UserCon->siClient; - gSharedInfo.psi = gpsi; + gpsi = gSharedInfo.psi; + gHandleTable = gSharedInfo.aheList; + /* ReactOS-Specific! */ gHandleEntries = SharedPtrToUser(gHandleTable->handles); } // FIXME: Yet another hack... This call should normally not be done here, but

1 0

← Newer
1
...
8
9
10
11
12
13
14
15
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2021