Ros-diffs March 2018

ros-diffs@reactos.org

25 participants
436 discussions

01/01: [PSDK] Import taskschd.idl from Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=457c843251c60c3d8dbae… commit 457c843251c60c3d8dbaee43f05405a58af292de Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 25 12:52:36 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 25 12:52:36 2018 +0100 [PSDK] Import taskschd.idl from Wine Staging 3.3. CORE-14434 --- sdk/include/psdk/CMakeLists.txt | 1 + sdk/include/psdk/taskschd.idl | 542 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 543 insertions(+) diff --git a/sdk/include/psdk/CMakeLists.txt b/sdk/include/psdk/CMakeLists.txt index 884734a1cd..845873fca6 100644 --- a/sdk/include/psdk/CMakeLists.txt +++ b/sdk/include/psdk/CMakeLists.txt @@ -112,6 +112,7 @@ list(APPEND SOURCE # stdole2.idl strmif.idl structuredquerycondition.idl + taskschd.idl textstor.idl tlogstg.idl tom.idl diff --git a/sdk/include/psdk/taskschd.idl b/sdk/include/psdk/taskschd.idl new file mode 100644 index 0000000000..d5577555e5 --- /dev/null +++ b/sdk/include/psdk/taskschd.idl @@ -0,0 +1,542 @@ +/* + * Task Scheduler definitions + * + * Copyright 2013 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +[ + uuid(e34cb9f1-c7f7-424c-be29-027dcc09363a), + version(1.0) +] +library TaskScheduler +{ +importlib("stdole2.tlb"); + +typedef enum _TASK_STATE +{ + TASK_STATE_UNKNOWN, + TASK_STATE_DISABLED, + TASK_STATE_QUEUED, + TASK_STATE_READY, + TASK_STATE_RUNNING +} TASK_STATE; + +typedef enum _TASK_ENUM_FLAGS +{ + TASK_ENUM_HIDDEN = 0x0001 +} TASK_ENUM_FLAGS; + +typedef enum _TASK_LOGON_TYPE +{ + TASK_LOGON_NONE, + TASK_LOGON_PASSWORD, + TASK_LOGON_S4U, + TASK_LOGON_INTERACTIVE_TOKEN, + TASK_LOGON_GROUP, + TASK_LOGON_SERVICE_ACCOUNT, + TASK_LOGON_INTERACTIVE_TOKEN_OR_PASSWORD +} TASK_LOGON_TYPE; + +typedef enum _TASK_RUNLEVEL +{ + TASK_RUNLEVEL_LUA, + TASK_RUNLEVEL_HIGHEST +} TASK_RUNLEVEL_TYPE; + +typedef enum _TASK_TRIGGER_TYPE2 +{ + TASK_TRIGGER_EVENT, + TASK_TRIGGER_TIME, + TASK_TRIGGER_DAILY, + TASK_TRIGGER_WEEKLY, + TASK_TRIGGER_MONTHLY, + TASK_TRIGGER_MONTHLYDOW, + TASK_TRIGGER_IDLE, + TASK_TRIGGER_REGISTRATION, + TASK_TRIGGER_BOOT, + TASK_TRIGGER_LOGON, + TASK_TRIGGER_SESSION_STATE_CHANGE = 11 +} TASK_TRIGGER_TYPE2; + +typedef enum _TASK_ACTION_TYPE +{ + TASK_ACTION_EXEC = 0, + TASK_ACTION_COM_HANDLER = 5, + TASK_ACTION_SEND_EMAIL = 6, + TASK_ACTION_SHOW_MESSAGE = 7 +} TASK_ACTION_TYPE; + +typedef enum _TASK_INSTANCES_POLICY +{ + TASK_INSTANCES_PARALLEL, + TASK_INSTANCES_QUEUE, + TASK_INSTANCES_IGNORE_NEW, + TASK_INSTANCES_STOP_EXISTING +} TASK_INSTANCES_POLICY; + +typedef enum _TASK_COMPATIBILITY +{ + TASK_COMPATIBILITY_AT, + TASK_COMPATIBILITY_V1, + TASK_COMPATIBILITY_V2, + TASK_COMPATIBILITY_V2_1 +} TASK_COMPATIBILITY; + +typedef enum _TASK_CREATION +{ + TASK_VALIDATE_ONLY = 1, + TASK_CREATE = 2, + TASK_UPDATE = 4, + TASK_CREATE_OR_UPDATE = 6, + TASK_DISABLE = 8, + TASK_DONT_ADD_PRINCIPAL_ACE = 16, + TASK_IGNORE_REGISTRATION_TRIGGERS = 32 +} TASK_CREATION; + +interface ITaskService; +interface IRegisteredTask; +interface IRegisteredTaskCollection; +interface IRegistrationInfo; +interface ITaskFolder; +interface ITaskFolderCollection; +interface ITaskDefinition; +interface ITaskSettings; +interface IIdleSettings; +interface IRunningTask; +interface IRunningTaskCollection; +interface ITrigger; +interface ITriggerCollection; +interface ITimeTrigger; +interface IRepetitionPattern; +interface IAction; +interface IActionCollection; +interface IExecAction; +interface INetworkSettings; +interface IPrincipal; + +[ + object, + oleautomation, + uuid(2faba4c7-4da9-4013-9697-20cc3fd40f85) +] +interface ITaskService : IDispatch +{ + HRESULT GetFolder([in] BSTR path, [out, retval] ITaskFolder **folder ); + HRESULT GetRunningTasks([in] LONG flags, [out, retval] IRunningTaskCollection **tasks ); + HRESULT NewTask([in] DWORD flags, [out, retval] ITaskDefinition **definition ); + HRESULT Connect([in, optional] VARIANT server, [in, optional] VARIANT user, [in, optional] VARIANT domain, [in, optional] VARIANT password); + [propget] HRESULT Connected([out, retval] VARIANT_BOOL *connected); + [propget] HRESULT TargetServer([out, retval] BSTR *server); + [propget] HRESULT ConnectedUser([out, retval] BSTR *user); + [propget] HRESULT ConnectedDomain([out, retval] BSTR *domain); + [propget] HRESULT HighestVersion([out, retval] DWORD *version); +} + +[ + object, + oleautomation, + uuid(9c86f320-dee3-4dd1-b972-a303f26b061e) +] +interface IRegisteredTask : IDispatch +{ + [propget] HRESULT Name([out, retval] BSTR *name); + [propget] HRESULT Path([out, retval] BSTR *path); + [propget] HRESULT State([out, retval] TASK_STATE *state); + [propget] HRESULT Enabled([out, retval] VARIANT_BOOL *enabled); + [propput] HRESULT Enabled(VARIANT_BOOL enabled); + HRESULT Run([in] VARIANT params, [out, retval] IRunningTask **task); + HRESULT RunEx([in] VARIANT params, [in] LONG flags, [in] LONG sessionID, [in] BSTR user, [out, retval] IRunningTask **task); + HRESULT GetInstances([in] LONG flags, [out, retval] IRunningTaskCollection **tasks); + [propget] HRESULT LastRunTime([out, retval] DATE *date); + [propget] HRESULT LastTaskResult([out, retval] LONG *result); + [propget] HRESULT NumberOfMissedRuns([out, retval] LONG *runs); + [propget] HRESULT NextRunTime([out, retval] DATE *date); + [propget] HRESULT Definition([out, retval] ITaskDefinition **task); + [propget] HRESULT Xml([out, retval] BSTR *xml); + HRESULT GetSecurityDescriptor([in] LONG info, [out, retval] BSTR *sddl); + HRESULT SetSecurityDescriptor([in] BSTR sddl, [in] LONG flags); + HRESULT Stop([in] LONG flags); + HRESULT GetRunTimes([in] const LPSYSTEMTIME start, [in] const LPSYSTEMTIME end, [in, out] DWORD *count, [out] LPSYSTEMTIME *time); +} + +[ + object, + oleautomation, + uuid(86627eb4-42a7-41e4-a4d9-ac33a72f2d52) +] +interface IRegisteredTaskCollection : IDispatch +{ + [propget] HRESULT Count([out, retval] LONG *count); + [propget] HRESULT Item([in] VARIANT index, [out, retval] IRegisteredTask **task); + [propget] HRESULT _NewEnum([out, retval] IUnknown **penum); +} + +[ + object, + oleautomation, + uuid(416d8b73-cb41-4ea1-805c-9be9a5ac4a74) +] +interface IRegistrationInfo : IDispatch +{ + [propget] HRESULT Description([out, retval] BSTR *description); + [propput] HRESULT Description([in] BSTR description); + [propget] HRESULT Author([out, retval] BSTR *author); + [propput] HRESULT Author([in] BSTR author); + [propget] HRESULT Version([out, retval] BSTR *version); + [propput] HRESULT Version([in] BSTR version); + [propget] HRESULT Date([out, retval] BSTR *date); + [propput] HRESULT Date([in] BSTR date); + [propget] HRESULT Documentation([out, retval] BSTR *doc); + [propput] HRESULT Documentation([in] BSTR doc); + [propget] HRESULT XmlText([out, retval] BSTR *xml); + [propput] HRESULT XmlText([in] BSTR xml); + [propget] HRESULT URI([out, retval] BSTR *uri); + [propput] HRESULT URI([in] BSTR uri); + [propget] HRESULT SecurityDescriptor([out, retval] VARIANT *sddl); + [propput] HRESULT SecurityDescriptor([in] VARIANT sddl); + [propget] HRESULT Source([out, retval] BSTR *source); + [propput] HRESULT Source([in] BSTR source); +} + +[ + object, + oleautomation, + uuid(8cfac062-a080-4c15-9a88-aa7c2af80dfc) +] +interface ITaskFolder : IDispatch +{ + [propget] HRESULT Name([out, retval] BSTR *name); + [propget] HRESULT Path([out, retval] BSTR *path); + HRESULT GetFolder([in] BSTR path, [out, retval] ITaskFolder **folder); + HRESULT GetFolders([in] LONG flags, [out, retval] ITaskFolderCollection **folders); + HRESULT CreateFolder([in] BSTR name, [in] VARIANT sddl, [out, retval] ITaskFolder **folder); + HRESULT DeleteFolder([in] BSTR name, [in] LONG flags); + HRESULT GetTask([in] BSTR path, [out, retval] IRegisteredTask **task); + HRESULT GetTasks([in] LONG flags, [out, retval] IRegisteredTaskCollection **tasks); + HRESULT DeleteTask([in] BSTR name, [in] LONG flags); + HRESULT RegisterTask([in] BSTR path, [in] BSTR xml, [in] LONG flags, [in] VARIANT user, [in] VARIANT password, + [in] TASK_LOGON_TYPE logonType, [in] VARIANT sddl, [out, retval] IRegisteredTask **task); + HRESULT RegisterTaskDefinition([in] BSTR path, [in] ITaskDefinition *definition, [in] LONG flags, + [in] VARIANT user, [in] VARIANT password, [in] TASK_LOGON_TYPE logon, + [in] VARIANT sddl, [out, retval] IRegisteredTask **task); + HRESULT GetSecurityDescriptor(LONG info, [out, retval] BSTR *sddl); + HRESULT SetSecurityDescriptor([in] BSTR sddl, [in] LONG flags); +} + +[ + object, + oleautomation, + uuid(79184a66-8664-423f-97f1-637356a5d812) +] +interface ITaskFolderCollection : IDispatch +{ + [propget] HRESULT Count([out, retval] LONG *count); + [propget] HRESULT Item([in] VARIANT index, [out, retval] ITaskFolder **folder); + [propget] HRESULT _NewEnum([out, retval] IUnknown **penum); +} + +[ + object, + oleautomation, + uuid(f5bc8fc5-536d-4f77-b852-fbc1356fdeb6) +] +interface ITaskDefinition : IDispatch +{ + [propget] HRESULT RegistrationInfo([out, retval] IRegistrationInfo **info); + [propput] HRESULT RegistrationInfo([in] IRegistrationInfo *info); + [propget] HRESULT Triggers([out, retval] ITriggerCollection **triggers); + [propput] HRESULT Triggers([in] ITriggerCollection *triggers); + [propget] HRESULT Settings([out, retval] ITaskSettings **settings); + [propput] HRESULT Settings([in] ITaskSettings *settings); + [propget] HRESULT Data([out, retval] BSTR *data); + [propput] HRESULT Data([in] BSTR data); + [propget] HRESULT Principal([out, retval] IPrincipal **principal); + [propput] HRESULT Principal([in] IPrincipal *principal); + [propget] HRESULT Actions([out, retval] IActionCollection **actions); + [propput] HRESULT Actions([in] IActionCollection *actions); + [propget] HRESULT XmlText([out, retval] BSTR *xml); + [propput] HRESULT XmlText([in] BSTR xml); +} + +[ + object, + oleautomation, + uuid(8fd4711d-2d02-4c8c-87e3-eff699de127e) +] +interface ITaskSettings : IDispatch +{ + [propget] HRESULT AllowDemandStart([out, retval] VARIANT_BOOL *allow); + [propput] HRESULT AllowDemandStart([in] VARIANT_BOOL allow); + [propget] HRESULT RestartInterval([out, retval] BSTR *interval); + [propput] HRESULT RestartInterval([in] BSTR interval); + [propget] HRESULT RestartCount([out, retval] INT *count); + [propput] HRESULT RestartCount([in] INT count); + [propget] HRESULT MultipleInstances([out, retval] TASK_INSTANCES_POLICY *policy); + [propput] HRESULT MultipleInstances([in] TASK_INSTANCES_POLICY policy); + [propget] HRESULT StopIfGoingOnBatteries([out, retval] VARIANT_BOOL *stop); + [propput] HRESULT StopIfGoingOnBatteries([in] VARIANT_BOOL stop); + [propget] HRESULT DisallowStartIfOnBatteries([out, retval] VARIANT_BOOL *disallow); + [propput] HRESULT DisallowStartIfOnBatteries([in] VARIANT_BOOL disallow); + [propget] HRESULT AllowHardTerminate([out, retval] VARIANT_BOOL *allow); + [propput] HRESULT AllowHardTerminate([in] VARIANT_BOOL allow); + [propget] HRESULT StartWhenAvailable([out, retval] VARIANT_BOOL *start); + [propput] HRESULT StartWhenAvailable([in] VARIANT_BOOL start); + [propget] HRESULT XmlText([out, retval] BSTR *xml); + [propput] HRESULT XmlText([in] BSTR xml); + [propget] HRESULT RunOnlyIfNetworkAvailable([out, retval] VARIANT_BOOL *run); + [propput] HRESULT RunOnlyIfNetworkAvailable([in] VARIANT_BOOL run); + [propget] HRESULT ExecutionTimeLimit([out, retval] BSTR *limit); + [propput] HRESULT ExecutionTimeLimit([in] BSTR limit); + [propget] HRESULT Enabled([out, retval] VARIANT_BOOL *enabled); + [propput] HRESULT Enabled([in] VARIANT_BOOL enabled); + [propget] HRESULT DeleteExpiredTaskAfter([out, retval] BSTR *delay); + [propput] HRESULT DeleteExpiredTaskAfter([in] BSTR delay); + [propget] HRESULT Priority([out, retval] INT *priority); + [propput] HRESULT Priority([in] INT priority); + [propget] HRESULT Compatibility([out, retval] TASK_COMPATIBILITY *level); + [propput] HRESULT Compatibility([in] TASK_COMPATIBILITY level); + [propget] HRESULT Hidden([out, retval] VARIANT_BOOL *hidden); + [propput] HRESULT Hidden([in] VARIANT_BOOL hidden); + [propget] HRESULT IdleSettings([out, retval] IIdleSettings **settings); + [propput] HRESULT IdleSettings([in] IIdleSettings *settings); + [propget] HRESULT RunOnlyIfIdle([out, retval] VARIANT_BOOL *run); + [propput] HRESULT RunOnlyIfIdle([in] VARIANT_BOOL run); + [propget] HRESULT WakeToRun([out, retval] VARIANT_BOOL *wake); + [propput] HRESULT WakeToRun([in] VARIANT_BOOL wake); + [propget] HRESULT NetworkSettings([out, retval] INetworkSettings **settings); + [propput] HRESULT NetworkSettings([in] INetworkSettings *settings); +} + +[ + object, + oleautomation, + uuid(84594461-0053-4342-a8fd-088fabf11f32) +] +interface IIdleSettings : IDispatch +{ + [propget] HRESULT IdleDuration([out, retval] BSTR *delay); + [propput] HRESULT IdleDuration([in] BSTR delay); + [propget] HRESULT WaitTimeout([out, retval] BSTR *timeout); + [propput] HRESULT WaitTimeout([in] BSTR timeout); + [propget] HRESULT StopOnIdleEnd([out, retval] VARIANT_BOOL *stop); + [propput] HRESULT StopOnIdleEnd([in] VARIANT_BOOL stop); + [propget] HRESULT RestartOnIdle([out, retval] VARIANT_BOOL *restart); + [propput] HRESULT RestartOnIdle([in] VARIANT_BOOL restart); +} + +[ + object, + oleautomation, + uuid(653758fb-7b9a-4f1e-a471-beeb8e9b834e) +] +interface IRunningTask : IDispatch +{ + [propget] HRESULT Name([out, retval] BSTR *name); + [propget] HRESULT InstanceGuid([out, retval] BSTR *guid); + [propget] HRESULT Path([out, retval] BSTR *path); + [propget] HRESULT State([out, retval] TASK_STATE *state); + [propget] HRESULT CurrentAction([out, retval] BSTR *name); + HRESULT Stop(void ); + HRESULT Refresh(void ); + [propget] HRESULT EnginePID([out, retval] DWORD *pid); +} + +[ + object, + oleautomation, + uuid(6a67614b-6828-4fec-aa54-6d52e8f1f2db) +] +interface IRunningTaskCollection : IDispatch +{ + [propget] HRESULT Count([out, retval] LONG *count); + [propget] HRESULT Item([in] VARIANT index, [out, retval] IRunningTask **task); + [propget] HRESULT _NewEnum([out, retval] IUnknown **penum); +} + +[ + object, + oleautomation, + uuid(09941815-ea89-4b5b-89e0-2a773801fac3) +] +interface ITrigger : IDispatch +{ + [propget] HRESULT Type([out, retval] TASK_TRIGGER_TYPE2 *type); + [propget] HRESULT Id([out, retval] BSTR *id); + [propput] HRESULT Id([in] BSTR id); + [propget] HRESULT Repetition([out, retval] IRepetitionPattern **repeat); + [propput] HRESULT Repetition([in] IRepetitionPattern *repeat); + [propget] HRESULT ExecutionTimeLimit([out, retval] BSTR *limit); + [propput] HRESULT ExecutionTimeLimit([in] BSTR limit); + [propget] HRESULT StartBoundary([out, retval] BSTR *start); + [propput] HRESULT StartBoundary([in] BSTR start); + [propget] HRESULT EndBoundary([out, retval] BSTR *end); + [propput] HRESULT EndBoundary([in] BSTR end); + [propget] HRESULT Enabled([out, retval] VARIANT_BOOL *enabled); + [propput] HRESULT Enabled([in] VARIANT_BOOL enabled); +} + +[ + odl, + uuid(126c5cd8-b288-41d5-8dbf-e491446adc5c), + oleautomation, + dual, + nonextensible +] +interface IDailyTrigger : ITrigger +{ + [propget] HRESULT DaysInterval([out, retval] short *pDays); + [propput] HRESULT DaysInterval([in] short days); + [propget] HRESULT RandomDelay([out, retval] BSTR *pRandomDelay); + [propput] HRESULT RandomDelay([in] BSTR randomDelay); +} + +[ + object, + oleautomation, + uuid(85df5081-1b24-4f32-878a-d9d14df4cb77) +] +interface ITriggerCollection : IDispatch +{ + [propget] HRESULT Count([out, retval] LONG *count); + [propget] HRESULT Item([in] LONG index, [out, retval] ITrigger **trigger); + [propget] HRESULT _NewEnum([out, retval] IUnknown **penum); + HRESULT Create([in] TASK_TRIGGER_TYPE2 type, [out, retval] ITrigger **trigger); + HRESULT Remove([in] VARIANT index); + HRESULT Clear(); +} + +[ + object, + oleautomation, + uuid(b45747e0-eba7-4276-9f29-85c5bb300006) +] +interface ITimeTrigger : ITrigger +{ + [propget] HRESULT RandomDelay([out, retval] BSTR *delay); + [propput] HRESULT RandomDelay([in] BSTR delay); +} + +[ + object, + oleautomation, + uuid(7fb9acf1-26be-400e-85b5-294b9c75dfd6) +] +interface IRepetitionPattern : IDispatch +{ + [propget] HRESULT Interval([out, retval] BSTR *interval); + [propput] HRESULT Interval([in] BSTR interval); + [propget] HRESULT Duration([out, retval] BSTR *duration); + [propput] HRESULT Duration([in] BSTR duration); + [propget] HRESULT StopAtDurationEnd([out, retval] VARIANT_BOOL *stop); + [propput] HRESULT StopAtDurationEnd([in] VARIANT_BOOL sop); +} + +[ + object, + oleautomation, + uuid(bae54997-48b1-4cbe-9965-d6be263ebea4) +] +interface IAction : IDispatch +{ + [propget] HRESULT Id([out, retval] BSTR *id); + [propput] HRESULT Id([in] BSTR id); + [propget] HRESULT Type([out, retval] TASK_ACTION_TYPE *type); +} + +[ + object, + oleautomation, + uuid(02820e19-7b98-4ed2-b2e8-fdccceff619b) +] +interface IActionCollection : IDispatch +{ + [propget] HRESULT Count([out, retval] LONG *count); + [propget] HRESULT Item([in] LONG index, [out, retval] IAction **action); + [propget] HRESULT _NewEnum([out, retval] IUnknown **penum); + [propget] HRESULT XmlText([out, retval] BSTR *xml); + [propput] HRESULT XmlText([in] BSTR xml); + HRESULT Create([in] TASK_ACTION_TYPE Type, [out, retval] IAction **action); + HRESULT Remove([in] VARIANT index); + HRESULT Clear(); + [propget] HRESULT Context([out, retval] BSTR *ctx); + [propput] HRESULT Context([in] BSTR ctx); +} + +[ + object, + oleautomation, + uuid(4c3d624d-fd6b-49a3-b9b7-09cb3cd3f047) +] +interface IExecAction : IAction +{ + [propget] HRESULT Path([out, retval] BSTR *path); + [propput] HRESULT Path([in] BSTR path); + [propget] HRESULT Arguments([out, retval] BSTR *argument); + [propput] HRESULT Arguments([in] BSTR argument); + [propget] HRESULT WorkingDirectory([out, retval] BSTR *directory); + [propput] HRESULT WorkingDirectory([in] BSTR directory); +} + +[ + object, + oleautomation, + uuid(9f7dea84-c30b-4245-80b6-00e9f646f1b4) +] +interface INetworkSettings : IDispatch +{ + [propget] HRESULT Name([out, retval] BSTR *name); + [propput] HRESULT Name([in] BSTR name); + [propget] HRESULT Id([out, retval] BSTR *id); + [propput] HRESULT Id([in] BSTR id); +} + +[ + object, + oleautomation, + uuid(d98d51e5-c9b4-496a-a9c1-18980261cf0f) +] +interface IPrincipal : IDispatch +{ + [propget] HRESULT Id([out, retval] BSTR *id); + [propput] HRESULT Id([in] BSTR id); + [propget] HRESULT DisplayName([out, retval] BSTR *name); + [propput] HRESULT DisplayName([in] BSTR name); + [propget] HRESULT UserId([out, retval] BSTR *user); + [propput] HRESULT UserId([in] BSTR user); + [propget] HRESULT LogonType([out, retval] TASK_LOGON_TYPE *logon); + [propput] HRESULT LogonType([in] TASK_LOGON_TYPE logon); + [propget] HRESULT GroupId([out, retval] BSTR *group); + [propput] HRESULT GroupId([in] BSTR group); + [propget] HRESULT RunLevel([out, retval] TASK_RUNLEVEL_TYPE *level); + [propput] HRESULT RunLevel([in] TASK_RUNLEVEL_TYPE level); +} + +[ + threading(both), + progid("Schedule.Service.1"), + vi_progid("Schedule.Service"), + uuid(0f87369f-a4e5-4cfc-bd3e-73e6154572dd) +] +coclass TaskScheduler +{ + interface ITaskService; +} + +} /* library TaskScheduler */

6 years, 5 months

01/01: [REG_WINETEST] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0b579bd148d7e98e7fd7… commit f0b579bd148d7e98e7fd7eeb3fa48ad06210920f Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 25 12:51:30 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 25 12:51:30 2018 +0100 [REG_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/reg/reg.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/rostests/winetests/reg/reg.c b/modules/rostests/winetests/reg/reg.c index 7d842c493d..b64defb48d 100644 --- a/modules/rostests/winetests/reg/reg.c +++ b/modules/rostests/winetests/reg/reg.c @@ -17,10 +17,8 @@ */ #include <stdio.h> - -#include <wine/test.h> -#include <winnls.h> -#include <winreg.h> +#include <windows.h> +#include "wine/test.h" #define lok ok_(__FILE__,line) #define KEY_BASE "Software\\Wine\\reg_test"

6 years, 5 months

01/01: [REG] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=80c45b1f0692500976b5c… commit 80c45b1f0692500976b5cb96df20ee05f8c2bec1 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 25 12:50:15 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 25 12:50:15 2018 +0100 [REG] Sync with Wine Staging 3.3. CORE-14434 --- base/applications/cmdutils/reg/export.c | 5 ++--- base/applications/cmdutils/reg/import.c | 7 ++++--- base/applications/cmdutils/reg/lang/bg-BG.rc | 2 +- base/applications/cmdutils/reg/lang/cs-CZ.rc | 2 +- base/applications/cmdutils/reg/lang/da-DK.rc | 2 +- base/applications/cmdutils/reg/lang/de-DE.rc | 2 +- base/applications/cmdutils/reg/lang/en-US.rc | 2 +- base/applications/cmdutils/reg/lang/es-ES.rc | 2 +- base/applications/cmdutils/reg/lang/fr-FR.rc | 2 +- base/applications/cmdutils/reg/lang/it-IT.rc | 2 +- base/applications/cmdutils/reg/lang/ja-JP.rc | 2 +- base/applications/cmdutils/reg/lang/ko-KR.rc | 2 +- base/applications/cmdutils/reg/lang/lt-LT.rc | 2 +- base/applications/cmdutils/reg/lang/nl-NL.rc | 2 +- base/applications/cmdutils/reg/lang/no-NO.rc | 2 +- base/applications/cmdutils/reg/lang/pl-PL.rc | 2 +- base/applications/cmdutils/reg/lang/pt-PT.rc | 2 +- base/applications/cmdutils/reg/lang/ro-RO.rc | 2 +- base/applications/cmdutils/reg/lang/ru-RU.rc | 2 +- base/applications/cmdutils/reg/lang/sl-SI.rc | 2 +- base/applications/cmdutils/reg/lang/sq-AL.rc | 2 +- base/applications/cmdutils/reg/lang/sv-SE.rc | 2 +- base/applications/cmdutils/reg/lang/tr-TR.rc | 2 +- base/applications/cmdutils/reg/lang/uk-UA.rc | 2 +- base/applications/cmdutils/reg/lang/zh-CN.rc | 2 +- base/applications/cmdutils/reg/lang/zh-TW.rc | 2 +- base/applications/cmdutils/reg/reg.c | 25 ++++++------------------- base/applications/cmdutils/reg/reg.h | 1 - base/applications/cmdutils/reg/resource.h | 2 +- media/doc/README.WINE | 2 +- 30 files changed, 38 insertions(+), 52 deletions(-) diff --git a/base/applications/cmdutils/reg/export.c b/base/applications/cmdutils/reg/export.c index 24b9dc8374..622e7ca8d9 100644 --- a/base/applications/cmdutils/reg/export.c +++ b/base/applications/cmdutils/reg/export.c @@ -16,12 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winbase.h> -#include <winreg.h> +#include <windows.h> #include <stdlib.h> #include <wine/unicode.h> +#include <wine/heap.h> #include "reg.h" diff --git a/base/applications/cmdutils/reg/import.c b/base/applications/cmdutils/reg/import.c index c4c988d7d1..f2ce80e7cb 100644 --- a/base/applications/cmdutils/reg/import.c +++ b/base/applications/cmdutils/reg/import.c @@ -16,13 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> -#include <winbase.h> -#include <winreg.h> +#include <windows.h> +#include <errno.h> #include <stdio.h> +#include <stdlib.h> #include <wine/unicode.h> #include <wine/debug.h> +#include <wine/heap.h> #include "reg.h" diff --git a/base/applications/cmdutils/reg/lang/bg-BG.rc b/base/applications/cmdutils/reg/lang/bg-BG.rc index 23fbfb0255..51303d004c 100644 --- a/base/applications/cmdutils/reg/lang/bg-BG.rc +++ b/base/applications/cmdutils/reg/lang/bg-BG.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "Синтаксисът на командата е:\n\nREG [ ADD | DELETE | QUERY ]\nREG команда /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD ключ_име [/v стойност_име | /ve] [/t вид] [/s разделител] [/d данни] [/f]\n" STRING_DELETE_USAGE, "REG DELETE ключ_име [/v стойност_име | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY ключ_име [/v стойност_име | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/cs-CZ.rc b/base/applications/cmdutils/reg/lang/cs-CZ.rc index ab9bfde01e..3b5e7a1754 100644 --- a/base/applications/cmdutils/reg/lang/cs-CZ.rc +++ b/base/applications/cmdutils/reg/lang/cs-CZ.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "Syntaxe tohoto příkazu:\n\nREG [ ADD | DELETE | QUERY ]\nREG operace /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD název_klíče [/v název_hodnoty | /ve] [/t type] [/s oddělovač] [/d data] [/f]\n" STRING_DELETE_USAGE, "REG DELETE název_klíče [/v název_hodnoty | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY název_klíče [/v název_hodnoty | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/da-DK.rc b/base/applications/cmdutils/reg/lang/da-DK.rc index 6c8338ca0f..b4c3468684 100644 --- a/base/applications/cmdutils/reg/lang/da-DK.rc +++ b/base/applications/cmdutils/reg/lang/da-DK.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "Syntaksen for dette kommando er:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD nøgle_navn [/v værdi | /ve] [/t type] [/s separator] [/d data] [/f]\n" STRING_DELETE_USAGE, "REG DELETE nøgle_navn [/v værdi | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY nøgle_navn [/v værdi | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/de-DE.rc b/base/applications/cmdutils/reg/lang/de-DE.rc index ec0cd460ed..927e7ba48c 100644 --- a/base/applications/cmdutils/reg/lang/de-DE.rc +++ b/base/applications/cmdutils/reg/lang/de-DE.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE { - STRING_USAGE, "Syntax:\n\nREG [ ADD | DELETE | QUERY ]\nREG Befehl /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD Schlüssel [/v Wert | /ve] [/t Typ] [/s Trenner] [/d Daten] [/f]\n" STRING_DELETE_USAGE, "REG DELETE Schlüssel [/v Wert | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY Schlüssel [/v Wert | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/en-US.rc b/base/applications/cmdutils/reg/lang/en-US.rc index 9c9bef54ed..26ce1697f0 100644 --- a/base/applications/cmdutils/reg/lang/en-US.rc +++ b/base/applications/cmdutils/reg/lang/en-US.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "The syntax of this command is:\n\nREG [ ADD | DELETE | QUERY ]\nREG command /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" STRING_DELETE_USAGE, "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY key_name [/v value_name | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/es-ES.rc b/base/applications/cmdutils/reg/lang/es-ES.rc index 60bb78af8e..ad2b984e41 100644 --- a/base/applications/cmdutils/reg/lang/es-ES.rc +++ b/base/applications/cmdutils/reg/lang/es-ES.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE { - STRING_USAGE, "La sintaxis de este comando es:\n\nREG [ ADD | DELETE | QUERY ]\nREG comando /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD nombre_clave [/v nombre_valor | /ve] [/t tipo] [/s separador] [/d datos] [/f]\n" STRING_DELETE_USAGE, "REG DELETE nombre_clave [/v nombre_valor | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY nombre_clave [/v nombre_valor | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/fr-FR.rc b/base/applications/cmdutils/reg/lang/fr-FR.rc index 89aceb9079..757169f163 100644 --- a/base/applications/cmdutils/reg/lang/fr-FR.rc +++ b/base/applications/cmdutils/reg/lang/fr-FR.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE { - STRING_USAGE, "La syntaxe de cette commande est :\n\nREG [ ADD | DELETE | QUERY ]\nREG commande /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD nom_de_clé [/v nom_de_valeur | /ve] [/t type] [/s séparateur] [/d données] [/f]\n" STRING_DELETE_USAGE, "REG DELETE nom_de_clé [/v nom_de_valeur | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY nom_de_clé [/v nom_de_valeur | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/it-IT.rc b/base/applications/cmdutils/reg/lang/it-IT.rc index c2ad7f34e5..ed268d3698 100644 --- a/base/applications/cmdutils/reg/lang/it-IT.rc +++ b/base/applications/cmdutils/reg/lang/it-IT.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE { - STRING_USAGE, "La sintassi di questo comando è:\n\nREG [ ADD | DELETE | QUERY ]\nREG comando /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD nome_della_chiave [/v nome_del_valore | /ve] [/t tipo] [/s separatore] [/d dati] [/f]\n" STRING_DELETE_USAGE, "REG DELETE nome_della_chiave [/v nome_del_valore | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY nome_della_chiave [/v nome_del_valore | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/ja-JP.rc b/base/applications/cmdutils/reg/lang/ja-JP.rc index 07e7fd73bf..3dc044cf0d 100644 --- a/base/applications/cmdutils/reg/lang/ja-JP.rc +++ b/base/applications/cmdutils/reg/lang/ja-JP.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "このコマンドの構文は次のとおりです:\n\nREG [ ADD | DELETE | QUERY ]\nREG コマンド /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD キー名 [/v 値名 | /ve] [/t type] [/s セパレータ] [/d データ] [/f]\n" STRING_DELETE_USAGE, "REG DELETE キー名 [/v 値名 | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY キー名 [/v 値名 | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/ko-KR.rc b/base/applications/cmdutils/reg/lang/ko-KR.rc index ba9af4b55a..552a031c9c 100644 --- a/base/applications/cmdutils/reg/lang/ko-KR.rc +++ b/base/applications/cmdutils/reg/lang/ko-KR.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "명령어 형식:\n\nREG [ ADD | DELETE | QUERY ]\nREG 명령어 /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD 값 [/v 값 | /ve] [/t 형식] [/s 분리기호] [/d 데이타] [/f]\n" STRING_DELETE_USAGE, "REG DELETE 키 이름 [/v 값 | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY 키 이름 [/v 값| /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/lt-LT.rc b/base/applications/cmdutils/reg/lang/lt-LT.rc index c8feef0d97..70f2786b67 100644 --- a/base/applications/cmdutils/reg/lang/lt-LT.rc +++ b/base/applications/cmdutils/reg/lang/lt-LT.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL STRINGTABLE { - STRING_USAGE, "Šios komandos sintaksė yra:\n\nREG [ ADD | DELETE | QUERY ]\nREG komanda /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD rakto_vardas [/v reikšmės_vardas | /ve] [/t tipas] [/s skirtukas] [/d duomenys] [/f]\n" STRING_DELETE_USAGE, "REG DELETE rakto_vardas [/v reikšmės_vardas | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY rakto_vardas [/v reikšmės_vardas | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/nl-NL.rc b/base/applications/cmdutils/reg/lang/nl-NL.rc index a62f1780fa..a24806ef3e 100644 --- a/base/applications/cmdutils/reg/lang/nl-NL.rc +++ b/base/applications/cmdutils/reg/lang/nl-NL.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE { - STRING_USAGE, "Gebruik van dit commando is:\n\nREG [ ADD | DELETE | QUERY ]\nREG commando /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD sleutel_naam [/v waarde_naam | /ve] [/t type] [/s scheidingsteken] [/d data] [/f]\n" STRING_DELETE_USAGE, "REG DELETE sleutel_naam [/v waarde_naam | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY sleutel_naam [/v waarde_naam | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/no-NO.rc b/base/applications/cmdutils/reg/lang/no-NO.rc index b9c269e1c3..cfef4d4323 100644 --- a/base/applications/cmdutils/reg/lang/no-NO.rc +++ b/base/applications/cmdutils/reg/lang/no-NO.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE { - STRING_USAGE, "Programmer kjøres som følger:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD nøkkelnavn [/v verdi | /ve] [/t type] [/s separator] [/d data] [/f]\n" STRING_DELETE_USAGE, "REG DELETE nøkkelnavn [/v verdi | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY nøkkelnavn [/v verdi | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/pl-PL.rc b/base/applications/cmdutils/reg/lang/pl-PL.rc index 92f98dccae..117d50ce4b 100644 --- a/base/applications/cmdutils/reg/lang/pl-PL.rc +++ b/base/applications/cmdutils/reg/lang/pl-PL.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "Składnia tego polecenia:\n\nREG [ ADD | DELETE | QUERY ]\nREG polecenie /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD nazwa_klucza [/v nazwa_wartości | /ve] [/t typ] [/s separator] [/d dane] [/f]\n" STRING_DELETE_USAGE, "REG DELETE nazwa_klucza [/v nazwa_wartości | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY nazwa_klucza [/v nazwa_wartości | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/pt-PT.rc b/base/applications/cmdutils/reg/lang/pt-PT.rc index dd39615452..5e3d477e33 100644 --- a/base/applications/cmdutils/reg/lang/pt-PT.rc +++ b/base/applications/cmdutils/reg/lang/pt-PT.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE { - STRING_USAGE, "A sintaxe deste comando é:\n\nREG [ ADD | DELETE | QUERY ]\nREG comando /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD nome_chave [/v nome_valor | /ve] [/t tipo] [/s separador] [/d dados] [/f]\n" STRING_DELETE_USAGE, "REG DELETE nome_chave [/v nome_valor | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY nome_chave [/v nome_valor | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/ro-RO.rc b/base/applications/cmdutils/reg/lang/ro-RO.rc index 5c613624d9..7b4691c31e 100644 --- a/base/applications/cmdutils/reg/lang/ro-RO.rc +++ b/base/applications/cmdutils/reg/lang/ro-RO.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE { - STRING_USAGE, "Sintaxa acestei comenzi este:\n\nREG [ ADD | DELETE | QUERY ]\nREG comandă /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD nume_cheie [/v nume_valoare | /ve] [/t tip] [/s separator] [/d date] [/f]\n" STRING_DELETE_USAGE, "REG DELETE nume_cheie [/v nume_valoare | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY nume_cheie [/v nume_valoare | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/ru-RU.rc b/base/applications/cmdutils/reg/lang/ru-RU.rc index f8d3d8afbe..e75ad5c0a7 100644 --- a/base/applications/cmdutils/reg/lang/ru-RU.rc +++ b/base/applications/cmdutils/reg/lang/ru-RU.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "Использование:\n\nREG [ ADD | DELETE | QUERY ]\nREG <команда> /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD <имя_раздела> [/v <имя_параметра> | /ve] [/t <тип>] [/s <разделитель>] [/d <данные>] [/f]\n" STRING_DELETE_USAGE, "REG DELETE <имя_раздела> [/v <имя_параметра> | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY <имя_раздела> [/v [имя_параметра] | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/sl-SI.rc b/base/applications/cmdutils/reg/lang/sl-SI.rc index cd22ffe74c..134a398ec0 100644 --- a/base/applications/cmdutils/reg/lang/sl-SI.rc +++ b/base/applications/cmdutils/reg/lang/sl-SI.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "Sintaksa ukaza:\n\nREG [ ADD | DELETE | QUERY ]\nREG ukaz /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD ime_ključa [/v ime_vrednosti | /ve] [/t vrsta] [/s ločilo] [/d podatki] [/f]\n" STRING_DELETE_USAGE, "REG DELETE ime_ključa [/v ime_vrednosti | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY ime_ključa [/v ime_vrednosti | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/sq-AL.rc b/base/applications/cmdutils/reg/lang/sq-AL.rc index 2c4d2f5f4c..ed63303e4c 100644 --- a/base/applications/cmdutils/reg/lang/sq-AL.rc +++ b/base/applications/cmdutils/reg/lang/sq-AL.rc @@ -6,7 +6,7 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL STRINGTABLE { - STRING_USAGE, "Sintaksa e kësaj komande është:\n\nREG [ ADD | DELETE | QUERY ]\nREG Komandë /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD emri_çelsit [/v value_name | /ve] [/t tipi] [/s ndares] [/d data] [/f]\n" STRING_DELETE_USAGE, "REG DELETE emri_çelsit [/v value_name | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY emri_çelsit [/v value_name | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/sv-SE.rc b/base/applications/cmdutils/reg/lang/sv-SE.rc index 978e704c6a..70b59a2775 100644 --- a/base/applications/cmdutils/reg/lang/sv-SE.rc +++ b/base/applications/cmdutils/reg/lang/sv-SE.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE { - STRING_USAGE, "Syntax för detta kommando är:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD nyckelnamn [/v värdenamn | /ve] [/t typ] [/s separator] [/d data] [/f]\n" STRING_DELETE_USAGE, "REG DELETE nyckelnamn [/v värdenamn | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY nyckelnamn [/v värdenamn | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/tr-TR.rc b/base/applications/cmdutils/reg/lang/tr-TR.rc index e46733002c..742923183b 100644 --- a/base/applications/cmdutils/reg/lang/tr-TR.rc +++ b/base/applications/cmdutils/reg/lang/tr-TR.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_NEUTRAL STRINGTABLE { - STRING_USAGE, "Bu komutun yazımı:\n\nREG [ ADD | DELETE | QUERY ]\nREG komut /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD dizin adı [/v değer adı | /ve] [/t tür] [/s ayırıcı] [/d veri] [/f]\n" STRING_DELETE_USAGE, "REG DELETE dizin adı [/v değer adı | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY dizin adı [/v değer adı | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/uk-UA.rc b/base/applications/cmdutils/reg/lang/uk-UA.rc index 7ca1cff6a5..a2c2b6a373 100644 --- a/base/applications/cmdutils/reg/lang/uk-UA.rc +++ b/base/applications/cmdutils/reg/lang/uk-UA.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "Синтаксис цієї команди наступний:\n\nREG [ ADD | DELETE | QUERY ]\nREG <команда> /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD <ключ> [/v <параметр> | /ve] [/t <тип>] [/s <розділювач>] [/d дані] [/f]\n" STRING_DELETE_USAGE, "REG DELETE <ключ> [/v <параметр> | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY <ключ> [/v <параметр> | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/zh-CN.rc b/base/applications/cmdutils/reg/lang/zh-CN.rc index 617bed503a..4c65c03424 100644 --- a/base/applications/cmdutils/reg/lang/zh-CN.rc +++ b/base/applications/cmdutils/reg/lang/zh-CN.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE { - STRING_USAGE, "本命令的语法是:\n\nREG [ ADD | DELETE | QUERY ]\nREG command /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" STRING_DELETE_USAGE, "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY key_name [/v value_name | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/lang/zh-TW.rc b/base/applications/cmdutils/reg/lang/zh-TW.rc index b9cff9a283..1ff58c1a08 100644 --- a/base/applications/cmdutils/reg/lang/zh-TW.rc +++ b/base/applications/cmdutils/reg/lang/zh-TW.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE { - STRING_USAGE, "此命令的語法是:\n\nREG [ ADD | DELETE | QUERY ]\nREG 命令 /?\n" + STRING_USAGE, "Usage:\n REG [operation] [parameters]\n\nSupported operations:\n ADD | DELETE | IMPORT | EXPORT | QUERY\n\nFor help on a specific operation, type:\n REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD 金鑰名稱 [/v 值名稱 | /ve] [/t 類型] [/s 分隔符] [/d 資料] [/f]\n" STRING_DELETE_USAGE, "REG DELETE 金鑰名稱 [/v 值名稱 | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY 金鑰名稱 [/v 值名稱 | /ve] [/s]\n" diff --git a/base/applications/cmdutils/reg/reg.c b/base/applications/cmdutils/reg/reg.c index b9db08e787..455d3dd96a 100644 --- a/base/applications/cmdutils/reg/reg.c +++ b/base/applications/cmdutils/reg/reg.c @@ -16,15 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <winreg.h> -#include <wincon.h> -#include <shlwapi.h> +#include <windows.h> +#include <errno.h> +#include <stdlib.h> #include <wine/unicode.h> #include <wine/debug.h> +#include <wine/heap.h> #include "reg.h" WINE_DEFAULT_DEBUG_CHANNEL(reg); @@ -85,7 +82,7 @@ static const WCHAR newlineW[] = {'\n',0}; void *heap_xalloc(size_t size) { - void *buf = HeapAlloc(GetProcessHeap(), 0, size); + void *buf = heap_alloc(size); if (!buf) { ERR("Out of memory!\n"); @@ -96,12 +93,7 @@ void *heap_xalloc(size_t size) void *heap_xrealloc(void *buf, size_t size) { - void *new_buf; - - if (buf) - new_buf = HeapReAlloc(GetProcessHeap(), 0, buf, size); - else - new_buf = HeapAlloc(GetProcessHeap(), 0, size); + void *new_buf = heap_realloc(buf, size); if (!new_buf) { @@ -112,11 +104,6 @@ void *heap_xrealloc(void *buf, size_t size) return new_buf; } -BOOL heap_free(void *buf) -{ - return HeapFree(GetProcessHeap(), 0, buf); -} - void output_writeconsole(const WCHAR *str, DWORD wlen) { DWORD count, ret; diff --git a/base/applications/cmdutils/reg/reg.h b/base/applications/cmdutils/reg/reg.h index eb792bbf88..dbce738ecd 100644 --- a/base/applications/cmdutils/reg/reg.h +++ b/base/applications/cmdutils/reg/reg.h @@ -27,7 +27,6 @@ /* reg.c */ void *heap_xalloc(size_t size); void *heap_xrealloc(void *buf, size_t size); -BOOL heap_free(void *buf); void output_writeconsole(const WCHAR *str, DWORD wlen); void WINAPIV output_message(unsigned int id, ...); BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info); diff --git a/base/applications/cmdutils/reg/resource.h b/base/applications/cmdutils/reg/resource.h index 84cbe906b9..3658adc155 100644 --- a/base/applications/cmdutils/reg/resource.h +++ b/base/applications/cmdutils/reg/resource.h @@ -20,7 +20,7 @@ #pragma once -//#include <windef.h> +#include <windef.h> /* Translation IDs. */ #define STRING_USAGE 101 diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 533d838867..b032812382 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -227,7 +227,7 @@ reactos/win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-3.3 (kno ReactOS shares the following programs with Winehq. reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.3 -reactos/base/applications/cmdutils/reg # Synced to Wine-3.0 +reactos/base/applications/cmdutils/reg # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-2.9 reactos/base/applications/cmdutils/taskkill # Synced to Wine-3.0 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-2.9

6 years, 5 months

01/01: [CSCRIPT][WSCRIPT] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eae3333c2f729993b5f1f… commit eae3333c2f729993b5f1f1f5833f0040dfc3e422 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 25 12:48:58 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 25 12:48:58 2018 +0100 [CSCRIPT][WSCRIPT] Sync with Wine Staging 3.3. CORE-14434 --- base/applications/cmdutils/cscript/CMakeLists.txt | 4 +-- base/applications/cmdutils/wscript/CMakeLists.txt | 4 +-- base/applications/cmdutils/wscript/arguments.c | 13 ++++++++ base/applications/cmdutils/wscript/host.c | 19 ++++++++++++ base/applications/cmdutils/wscript/main.c | 19 +++++++++++- base/applications/cmdutils/wscript/precomp.h | 21 +++++++++++++ base/applications/cmdutils/wscript/wscript.h | 37 ++--------------------- media/doc/README.WINE | 4 +-- 8 files changed, 79 insertions(+), 42 deletions(-) diff --git a/base/applications/cmdutils/cscript/CMakeLists.txt b/base/applications/cmdutils/cscript/CMakeLists.txt index ab8d104426..472f94b622 100644 --- a/base/applications/cmdutils/cscript/CMakeLists.txt +++ b/base/applications/cmdutils/cscript/CMakeLists.txt @@ -7,7 +7,7 @@ list(APPEND SOURCE ${wscript_folder}/arguments.c ${wscript_folder}/host.c ${wscript_folder}/main.c - ${wscript_folder}/wscript.h) + ${wscript_folder}/precomp.h) add_executable(cscript ${SOURCE} rsrc.rc) add_idl_headers(cscript_idlheader ihost.idl) @@ -17,5 +17,5 @@ target_link_libraries(cscript uuid wine) set_module_type(cscript win32cui UNICODE) add_importlibs(cscript shell32 oleaut32 ole32 advapi32 user32 msvcrt kernel32 ntdll) add_dependencies(cscript stdole2 cscript_idlheader) -add_pch(cscript ${wscript_folder}/wscript.h SOURCE) +add_pch(cscript ${wscript_folder}/precomp.h SOURCE) add_cd_file(TARGET cscript DESTINATION reactos/system32 FOR all) diff --git a/base/applications/cmdutils/wscript/CMakeLists.txt b/base/applications/cmdutils/wscript/CMakeLists.txt index a38899b0e3..ef489fd10a 100644 --- a/base/applications/cmdutils/wscript/CMakeLists.txt +++ b/base/applications/cmdutils/wscript/CMakeLists.txt @@ -3,7 +3,7 @@ list(APPEND SOURCE arguments.c host.c main.c - wscript.h) + precomp.h) add_executable(wscript ${SOURCE} rsrc.rc) add_idl_headers(wscript_idlheader ihost.idl) @@ -13,5 +13,5 @@ target_link_libraries(wscript uuid wine) set_module_type(wscript win32gui UNICODE) add_importlibs(wscript shell32 oleaut32 ole32 user32 advapi32 msvcrt kernel32 ntdll) add_dependencies(wscript stdole2 wscript_idlheader) -add_pch(wscript wscript.h SOURCE) +add_pch(wscript precomp.h SOURCE) add_cd_file(TARGET wscript DESTINATION reactos/system32 FOR all) diff --git a/base/applications/cmdutils/wscript/arguments.c b/base/applications/cmdutils/wscript/arguments.c index f36b56e08c..7961948b6a 100644 --- a/base/applications/cmdutils/wscript/arguments.c +++ b/base/applications/cmdutils/wscript/arguments.c @@ -16,8 +16,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#define COBJMACROS +#define CONST_VTABLE + +#include <windef.h> +#include <winbase.h> +#include <ole2.h> + #include "wscript.h" +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(wscript); + WCHAR **argums; int numOfArgs; diff --git a/base/applications/cmdutils/wscript/host.c b/base/applications/cmdutils/wscript/host.c index b867fae65c..68013f8017 100644 --- a/base/applications/cmdutils/wscript/host.c +++ b/base/applications/cmdutils/wscript/host.c @@ -16,8 +16,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#define COBJMACROS +#define CONST_VTABLE + +#include <windef.h> +#include <winbase.h> +#include <ole2.h> + #include "wscript.h" +#include <wine/debug.h> +#include <wine/heap.h> +#include <wine/unicode.h> + +WINE_DEFAULT_DEBUG_CHANNEL(wscript); + #define BUILDVERSION 16535 static const WCHAR wshNameW[] = {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0}; @@ -307,7 +322,11 @@ static HRESULT WINAPI Host_Echo(IHost *iface, SAFEARRAY *args) { WCHAR *output = NULL, *ptr; unsigned argc, i, len; +#ifdef __REACTOS__ LONG ubound, lbound; +#else + int ubound, lbound; +#endif VARIANT *argv; BSTR *strs; HRESULT hres; diff --git a/base/applications/cmdutils/wscript/main.c b/base/applications/cmdutils/wscript/main.c index 568d090ebc..0191b5ac28 100644 --- a/base/applications/cmdutils/wscript/main.c +++ b/base/applications/cmdutils/wscript/main.c @@ -16,10 +16,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wscript.h" +#include <stdarg.h> + +#define COBJMACROS +#ifdef __REACTOS__ +#define CONST_VTABLE +#endif +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <ole2.h> #include <shellapi.h> #include <activscp.h> +#include <initguid.h> + +#include "wscript.h" + +#include <wine/debug.h> +#include <wine/unicode.h> #ifdef _WIN64 @@ -35,6 +50,8 @@ #endif +WINE_DEFAULT_DEBUG_CHANNEL(wscript); + static const WCHAR wscriptW[] = {'W','S','c','r','i','p','t',0}; static const WCHAR wshW[] = {'W','S','H',0}; WCHAR scriptFullName[MAX_PATH]; diff --git a/base/applications/cmdutils/wscript/precomp.h b/base/applications/cmdutils/wscript/precomp.h new file mode 100644 index 0000000000..1b7afda49e --- /dev/null +++ b/base/applications/cmdutils/wscript/precomp.h @@ -0,0 +1,21 @@ + +#ifndef _WSCRIPT_PRECOMP_H_ +#define _WSCRIPT_PRECOMP_H_ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COBJMACROS +#define CONST_VTABLE + +#include <windef.h> +#include <winbase.h> +#include <initguid.h> +#include <ole2.h> +#include <wine/debug.h> +#include <wine/unicode.h> + +#include "wscript.h" + +#endif /* !_WSCRIPT_PRECOMP_H_ */ diff --git a/base/applications/cmdutils/wscript/wscript.h b/base/applications/cmdutils/wscript/wscript.h index 905a8ea6fd..ca18363233 100644 --- a/base/applications/cmdutils/wscript/wscript.h +++ b/base/applications/cmdutils/wscript/wscript.h @@ -16,25 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _WSCRIPT_H_ -#define _WSCRIPT_H_ +#pragma once -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COBJMACROS -#define CONST_VTABLE - -#include <windef.h> -#include <winbase.h> -#include <initguid.h> -#include <ole2.h> -#include <ihost.h> -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wscript); +#include "ihost.h" extern IHost host_obj; @@ -51,20 +35,3 @@ extern WCHAR **argums; extern int numOfArgs; extern VARIANT_BOOL wshInteractive; - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - -#endif /* _WSCRIPT_H_ */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 1fdf3089a8..533d838867 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -226,12 +226,12 @@ reactos/win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-3.3 (kno ReactOS shares the following programs with Winehq. -reactos/base/applications/cmdutils/cscript # Synced to WineStaging-2.9 +reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/reg # Synced to Wine-3.0 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-2.9 reactos/base/applications/cmdutils/taskkill # Synced to Wine-3.0 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-2.9 -reactos/base/applications/cmdutils/wscript # Synced to WineStaging-2.9 +reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/xcopy # Synced to Wine-3.0 reactos/base/applications/games/winmine # Synced to WineStaging-2.16 with our own resources. reactos/base/applications/extrac32 # Synced to WineStaging-2.9

6 years, 5 months

01/01: [LOCALUI] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=407c54bae3b8e9c03144e… commit 407c54bae3b8e9c03144e44f7d127467e9375fd3 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 25 12:47:19 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 25 12:47:19 2018 +0100 [LOCALUI] Sync with Wine Staging 3.3. CORE-14434 --- media/doc/README.WINE | 2 +- win32ss/printing/monitors/localmon/ui/localui.c | 22 +++++++++------------- win32ss/printing/monitors/localmon/ui/localui.h | 4 ++-- win32ss/printing/monitors/localmon/ui/localui.rc | 3 --- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/media/doc/README.WINE b/media/doc/README.WINE index c8603c6a80..1fdf3089a8 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -222,7 +222,7 @@ reactos/dll/win32/xmllite # Synced to WineStaging-3.3 reactos/dll/cpl/inetcpl # Synced to WineStaging-3.3 -reactos/win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-2.9 (known there as /dll/win32/localui) +reactos/win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-3.3 (known there as /dll/win32/localui) ReactOS shares the following programs with Winehq. diff --git a/win32ss/printing/monitors/localmon/ui/localui.c b/win32ss/printing/monitors/localmon/ui/localui.c index 3f16ddbbbd..9fb975cd85 100644 --- a/win32ss/printing/monitors/localmon/ui/localui.c +++ b/win32ss/printing/monitors/localmon/ui/localui.c @@ -18,23 +18,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - #include <stdarg.h> -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winreg.h> -#include <winuser.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winreg.h" +#include "winuser.h" -#include <winspool.h> -#include <ddk/winsplp.h> +#include "winspool.h" +#include "ddk/winsplp.h" -#include <wine/debug.h> -#include <wine/unicode.h> +#include "wine/debug.h" +#include "wine/unicode.h" #include "localui.h" WINE_DEFAULT_DEBUG_CHANNEL(localui); diff --git a/win32ss/printing/monitors/localmon/ui/localui.h b/win32ss/printing/monitors/localmon/ui/localui.h index 7b59a26210..25424da568 100644 --- a/win32ss/printing/monitors/localmon/ui/localui.h +++ b/win32ss/printing/monitors/localmon/ui/localui.h @@ -21,8 +21,8 @@ #ifndef __WINE_LOCALUI__ #define __WINE_LOCALUI__ -//#include <windef.h> -//#include <winuser.h> +#include <windef.h> +#include <winuser.h> /* ## Resource-ID ## */ #define ADDPORT_DIALOG 100 diff --git a/win32ss/printing/monitors/localmon/ui/localui.rc b/win32ss/printing/monitors/localmon/ui/localui.rc index e1da134f7a..9fa42f60f7 100644 --- a/win32ss/printing/monitors/localmon/ui/localui.rc +++ b/win32ss/printing/monitors/localmon/ui/localui.rc @@ -19,9 +19,6 @@ * */ -#include <windef.h> -#include <winuser.h> - #include "localui.h" #define WINE_FILENAME_STR "localui.dll"

6 years, 5 months

01/01: [INETCPL] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88d3620955dd110687cc0… commit 88d3620955dd110687cc0e718ba164e2e6f86c29 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 25 12:46:20 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 25 12:46:20 2018 +0100 [INETCPL] Sync with Wine Staging 3.3. CORE-14434 --- dll/cpl/inetcpl/CMakeLists.txt | 4 +- dll/cpl/inetcpl/content.c | 9 ++++- dll/cpl/inetcpl/general.c | 14 ++++++- dll/cpl/inetcpl/inetcpl.c | 18 ++++++++- dll/cpl/inetcpl/inetcpl.h | 86 +++++++++++++++++++++++++----------------- dll/cpl/inetcpl/inetcpl.rc | 7 +--- dll/cpl/inetcpl/precomp.h | 27 +++++++++++++ dll/cpl/inetcpl/resource.h | 57 ---------------------------- dll/cpl/inetcpl/security.c | 20 ++++++++++ media/doc/README.WINE | 2 +- 10 files changed, 141 insertions(+), 103 deletions(-) diff --git a/dll/cpl/inetcpl/CMakeLists.txt b/dll/cpl/inetcpl/CMakeLists.txt index dc7de0aaaa..dfdd6b8638 100644 --- a/dll/cpl/inetcpl/CMakeLists.txt +++ b/dll/cpl/inetcpl/CMakeLists.txt @@ -7,7 +7,7 @@ list(APPEND SOURCE content.c general.c security.c - inetcpl.h) + precomp.h) file(GLOB inetcpl_rc_deps resources/*.*) add_rc_deps(inetcpl.rc ${inetcpl_rc_deps}) @@ -22,5 +22,5 @@ set_module_type(inetcpl cpl UNICODE) target_link_libraries(inetcpl wine) add_delay_importlibs(inetcpl cryptui wininet ole32 urlmon shell32) add_importlibs(inetcpl advapi32 comctl32 user32 shlwapi msvcrt kernel32 ntdll) -add_pch(inetcpl inetcpl.h SOURCE) +add_pch(inetcpl precomp.h SOURCE) add_cd_file(TARGET inetcpl DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/inetcpl/content.c b/dll/cpl/inetcpl/content.c index f4588e759e..d71c8b2326 100644 --- a/dll/cpl/inetcpl/content.c +++ b/dll/cpl/inetcpl/content.c @@ -19,9 +19,16 @@ * */ +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <cryptuiapi.h> + #include "inetcpl.h" +#include "wine/debug.h" -#include <cryptuiapi.h> +WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); /********************************************************************* * display_cert_manager (internal) diff --git a/dll/cpl/inetcpl/general.c b/dll/cpl/inetcpl/general.c index 66e614e7de..e0f473caf7 100644 --- a/dll/cpl/inetcpl/general.c +++ b/dll/cpl/inetcpl/general.c @@ -19,11 +19,21 @@ * */ -#include "inetcpl.h" - +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> #include <wininet.h> +#include <winreg.h> +#include <shlwapi.h> +#include <prsht.h> #include <shlobj.h> +#include "inetcpl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); + static const WCHAR about_blank[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; static const WCHAR start_page[] = {'S','t','a','r','t',' ','P','a','g','e',0}; static const WCHAR default_page[] = {'D','e','f','a','u','l','t','_','P','a','g','e','_','U','R','L',0}; diff --git a/dll/cpl/inetcpl/inetcpl.c b/dll/cpl/inetcpl/inetcpl.c index 0410e3f177..578867a892 100644 --- a/dll/cpl/inetcpl/inetcpl.c +++ b/dll/cpl/inetcpl/inetcpl.c @@ -19,9 +19,25 @@ * */ +#define NONAMELESSUNION +#define COBJMACROS +#define CONST_VTABLE + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winuser.h> +#include <commctrl.h> +#include <cpl.h> +#include "ole2.h" + +#include "wine/debug.h" + #include "inetcpl.h" -#include <cpl.h> + +WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); DECLSPEC_HIDDEN HMODULE hcpl; diff --git a/dll/cpl/inetcpl/inetcpl.h b/dll/cpl/inetcpl/inetcpl.h index dabadef5e7..b01362bdc6 100644 --- a/dll/cpl/inetcpl/inetcpl.h +++ b/dll/cpl/inetcpl/inetcpl.h @@ -22,53 +22,71 @@ #ifndef __WINE_INETCPL__ #define __WINE_INETCPL__ -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS -#define CONST_VTABLE -#define NONAMELESSUNION - #include <windef.h> -#include <winbase.h> #include <winuser.h> -#include <winreg.h> -#include <ole2.h> #include <commctrl.h> -#include <shlwapi.h> - -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); extern HMODULE hcpl; INT_PTR CALLBACK content_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; INT_PTR CALLBACK general_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; INT_PTR CALLBACK security_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; -/* ## Memory allocation functions ## */ +#define NUM_PROPERTY_PAGES 8 -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), 0, len ); -} +/* icons */ +#define ICO_MAIN 100 +#define ICO_INTERNET 1313 +#ifdef __REACTOS__ +#define ICO_CERTIFICATES 1314 +#define ICO_HISTORY 1315 +#define ICO_HOME 1316 +#endif -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); -} +/* strings */ +#define IDS_CPL_NAME 1 +#define IDS_CPL_INFO 2 +#define IDS_SEC_SETTINGS 0x10 +#define IDS_SEC_LEVEL0 0x100 +#define IDS_SEC_LEVEL1 0x101 +#define IDS_SEC_LEVEL2 0x102 +#define IDS_SEC_LEVEL3 0x103 +#define IDS_SEC_LEVEL4 0x104 +#define IDS_SEC_LEVEL5 0x105 +#define IDS_SEC_LEVEL0_INFO 0x200 +#define IDS_SEC_LEVEL1_INFO 0x210 +#define IDS_SEC_LEVEL2_INFO 0x220 +#define IDS_SEC_LEVEL3_INFO 0x230 +#define IDS_SEC_LEVEL4_INFO 0x240 +#define IDS_SEC_LEVEL5_INFO 0x250 -static inline BOOL heap_free( void *mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} +/* dialogs */ +#define IDC_STATIC -1 -/* ######### */ +#define IDD_GENERAL 1000 +#define IDC_HOME_EDIT 1000 +#define IDC_HOME_CURRENT 1001 +#define IDC_HOME_DEFAULT 1002 +#define IDC_HOME_BLANK 1003 +#define IDC_HISTORY_DELETE 1004 +#define IDC_HISTORY_SETTINGS 1005 -#define NUM_PROPERTY_PAGES 8 +#define IDD_DELETE_HISTORY 1010 +#define IDC_DELETE_TEMP_FILES 1011 +#define IDC_DELETE_COOKIES 1012 +#define IDC_DELETE_HISTORY 1013 +#define IDC_DELETE_FORM_DATA 1014 +#define IDC_DELETE_PASSWORDS 1015 + +#define IDD_SECURITY 2000 +#define IDC_SEC_LISTVIEW 2001 +#define IDC_SEC_ZONE_INFO 2002 +#define IDC_SEC_GROUP 2003 +#define IDC_SEC_TRACKBAR 2004 +#define IDC_SEC_LEVEL 2005 +#define IDC_SEC_LEVEL_INFO 2006 -#include "resource.h" +#define IDD_CONTENT 4000 +#define IDC_CERT 4100 +#define IDC_CERT_PUBLISHER 4101 -#endif /* __WINE_INETCPL__ */ +#endif diff --git a/dll/cpl/inetcpl/inetcpl.rc b/dll/cpl/inetcpl/inetcpl.rc index 687b15cce2..aeeb9fbcae 100644 --- a/dll/cpl/inetcpl/inetcpl.rc +++ b/dll/cpl/inetcpl/inetcpl.rc @@ -19,11 +19,8 @@ * */ -#include <windef.h> -#include <winuser.h> -#include <commctrl.h> +#include "inetcpl.h" -#include "resource.h" #include <reactos/manifest_hosted.rc> @@ -108,7 +105,7 @@ #define WINE_PRODUCTVERSION_STR "8.00.6001.18939" #include "wine/wine_common_ver.rc" - + /* @makedep: inetcpl.ico */ ICO_MAIN ICON "resources/inetcpl.ico" ICO_INTERNET ICON "resources/inetcpl.ico" diff --git a/dll/cpl/inetcpl/precomp.h b/dll/cpl/inetcpl/precomp.h new file mode 100644 index 0000000000..8faa56fac9 --- /dev/null +++ b/dll/cpl/inetcpl/precomp.h @@ -0,0 +1,27 @@ + +#ifndef _INETCPL_PRECOMP_H_ +#define _INETCPL_PRECOMP_H_ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define CONST_VTABLE +#define NONAMELESSUNION + +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <winreg.h> +#include <ole2.h> +#include <commctrl.h> +#include <shlwapi.h> + +#include <wine/debug.h> + +#include "inetcpl.h" + +#endif /* !_INETCPL_PRECOMP_H_ */ diff --git a/dll/cpl/inetcpl/resource.h b/dll/cpl/inetcpl/resource.h deleted file mode 100644 index 7b0b45f8c7..0000000000 --- a/dll/cpl/inetcpl/resource.h +++ /dev/null @@ -1,57 +0,0 @@ -#pragma once - -/* icons */ -#define ICO_MAIN 100 -#define ICO_RESTRICTED 4481 -#define ICO_TRUSTED 4480 -#define ICO_INTERNET 1313 -#define ICO_CERTIFICATES 1314 -#define ICO_HISTORY 1315 -#define ICO_HOME 1316 - -/* strings */ -#define IDS_CPL_NAME 1 -#define IDS_CPL_INFO 2 -#define IDS_SEC_SETTINGS 0x10 -#define IDS_SEC_LEVEL0 0x100 -#define IDS_SEC_LEVEL1 0x101 -#define IDS_SEC_LEVEL2 0x102 -#define IDS_SEC_LEVEL3 0x103 -#define IDS_SEC_LEVEL4 0x104 -#define IDS_SEC_LEVEL5 0x105 -#define IDS_SEC_LEVEL0_INFO 0x200 -#define IDS_SEC_LEVEL1_INFO 0x210 -#define IDS_SEC_LEVEL2_INFO 0x220 -#define IDS_SEC_LEVEL3_INFO 0x230 -#define IDS_SEC_LEVEL4_INFO 0x240 -#define IDS_SEC_LEVEL5_INFO 0x250 - -/* dialogs */ -#define IDC_STATIC -1 - -#define IDD_GENERAL 1000 -#define IDC_HOME_EDIT 1000 -#define IDC_HOME_CURRENT 1001 -#define IDC_HOME_DEFAULT 1002 -#define IDC_HOME_BLANK 1003 -#define IDC_HISTORY_DELETE 1004 -#define IDC_HISTORY_SETTINGS 1005 - -#define IDD_DELETE_HISTORY 1010 -#define IDC_DELETE_TEMP_FILES 1011 -#define IDC_DELETE_COOKIES 1012 -#define IDC_DELETE_HISTORY 1013 -#define IDC_DELETE_FORM_DATA 1014 -#define IDC_DELETE_PASSWORDS 1015 - -#define IDD_SECURITY 2000 -#define IDC_SEC_LISTVIEW 2001 -#define IDC_SEC_ZONE_INFO 2002 -#define IDC_SEC_GROUP 2003 -#define IDC_SEC_TRACKBAR 2004 -#define IDC_SEC_LEVEL 2005 -#define IDC_SEC_LEVEL_INFO 2006 - -#define IDD_CONTENT 4000 -#define IDC_CERT 4100 -#define IDC_CERT_PUBLISHER 4101 diff --git a/dll/cpl/inetcpl/security.c b/dll/cpl/inetcpl/security.c index 20f5a1955c..543ada433d 100644 --- a/dll/cpl/inetcpl/security.c +++ b/dll/cpl/inetcpl/security.c @@ -19,7 +19,27 @@ * */ +#define COBJMACROS +#define CONST_VTABLE + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <prsht.h> +#include "commctrl.h" + +#include "ole2.h" +#include "urlmon.h" +#include "initguid.h" +#include "winreg.h" +#include "shlwapi.h" + #include "inetcpl.h" +#include "wine/debug.h" +#include "wine/heap.h" + +WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); typedef struct secdlg_data_s { HWND hsec; /* security propsheet */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 62f294ee1f..c8603c6a80 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -220,7 +220,7 @@ reactos/dll/win32/xinput1_3 # Synced to WineStaging-2.9 reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-2.9 reactos/dll/win32/xmllite # Synced to WineStaging-3.3 -reactos/dll/cpl/inetcpl # Synced to WineStaging-2.9 +reactos/dll/cpl/inetcpl # Synced to WineStaging-3.3 reactos/win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-2.9 (known there as /dll/win32/localui)

6 years, 5 months

01/01: [XMLLITE_WINETEST] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=79a9b9f8741986f4da995… commit 79a9b9f8741986f4da99537aed3000b59f9b9028 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 25 12:44:51 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 25 12:44:51 2018 +0100 [XMLLITE_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/xmllite/reader.c | 48 +++++++++++++---------------- modules/rostests/winetests/xmllite/writer.c | 23 ++++++-------- 2 files changed, 32 insertions(+), 39 deletions(-) diff --git a/modules/rostests/winetests/xmllite/reader.c b/modules/rostests/winetests/xmllite/reader.c index 302de66acc..975724ab18 100644 --- a/modules/rostests/winetests/xmllite/reader.c +++ b/modules/rostests/winetests/xmllite/reader.c @@ -18,37 +18,35 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - #define COBJMACROS #define CONST_VTABLE -//#include <stdarg.h> +#include <stdarg.h> #include <stdio.h> -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -#include <initguid.h> -#include <ole2.h> -#include <xmllite.h> -#include <wine/test.h> +#include "windef.h" +#include "winbase.h" +#include "initguid.h" +#include "ole2.h" +#include "xmllite.h" +#include "wine/test.h" +#include "wine/heap.h" + +#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); static WCHAR *a2w(const char *str) { int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - WCHAR *ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + WCHAR *ret = heap_alloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); return ret; } static void free_str(WCHAR *str) { - HeapFree(GetProcessHeap(), 0, str); + heap_free(str); } static int strcmp_wa(const WCHAR *str1, const char *stra) @@ -278,7 +276,7 @@ static void test_read_state(IXmlReader *reader, XmlReadState expected, state = -1; /* invalid state value */ IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, &state); - if (exp_broken == -1) + if (exp_broken == expected) broken_state = FALSE; else broken_state = broken(exp_broken == state); @@ -287,7 +285,7 @@ static void test_read_state(IXmlReader *reader, XmlReadState expected, state_to_str(expected), state_to_str(state)); } -#define TEST_READER_STATE(reader, state) test_read_state(reader, state, -1, __LINE__) +#define TEST_READER_STATE(reader, state) test_read_state(reader, state, state, __LINE__) #define TEST_READER_STATE2(reader, state, brk) test_read_state(reader, state, brk, __LINE__) #define reader_value(a,b) _reader_value(__LINE__,a,b) @@ -413,9 +411,7 @@ static ULONG WINAPI testinput_Release(IUnknown *iface) ref = InterlockedDecrement(&This->ref); if (ref == 0) - { - HeapFree(GetProcessHeap(), 0, This); - } + heap_free(This); return ref; } @@ -431,7 +427,7 @@ static HRESULT testinput_createinstance(void **ppObj) { testinput *input; - input = HeapAlloc(GetProcessHeap(), 0, sizeof (*input)); + input = heap_alloc(sizeof(*input)); if(!input) return E_OUTOFMEMORY; input->IUnknown_iface.lpVtbl = &testinput_vtbl; @@ -1649,7 +1645,7 @@ static void test_readvaluechunk(void) c = 0xdeadbeef; memset(buf, 0xcc, sizeof(buf)); - hr = IXmlReader_ReadValueChunk(reader, buf, sizeof(buf)/sizeof(WCHAR), &c); + hr = IXmlReader_ReadValueChunk(reader, buf, ARRAY_SIZE(buf), &c); ok(hr == S_OK, "got %08x\n", hr); ok(c == 10, "got %u\n", c); ok(buf[c] == 0xcccc, "buffer overflow\n"); @@ -1658,7 +1654,7 @@ static void test_readvaluechunk(void) c = 0xdeadbeef; memset(buf, 0xcc, sizeof(buf)); - hr = IXmlReader_ReadValueChunk(reader, buf, sizeof(buf)/sizeof(WCHAR), &c); + hr = IXmlReader_ReadValueChunk(reader, buf, ARRAY_SIZE(buf), &c); ok(hr == S_FALSE, "got %08x\n", hr); ok(!c, "got %u\n", c); @@ -1991,7 +1987,7 @@ static void test_prefix(void) hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); ok(hr == S_OK, "S_OK, got %08x\n", hr); - for (i = 0; i < sizeof(prefix_tests)/sizeof(prefix_tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(prefix_tests); i++) { XmlNodeType type; set_input_string(reader, prefix_tests[i].xml); @@ -2066,7 +2062,7 @@ static void test_namespaceuri(void) hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); ok(hr == S_OK, "S_OK, got %08x\n", hr); - for (i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); i++) { + for (i = 0; i < ARRAY_SIZE(uri_tests); i++) { unsigned int j = 0; set_input_string(reader, uri_tests[i].xml); @@ -2187,7 +2183,7 @@ static void test_encoding_detection(void) /* there's no way to query detected encoding back, so just verify that document is browsable */ - for (i = 0; i < sizeof(encoding_testsA)/sizeof(encoding_testsA[0]); i++) + for (i = 0; i < ARRAY_SIZE(encoding_testsA); i++) { set_input_string(reader, encoding_testsA[i]); @@ -2197,7 +2193,7 @@ static void test_encoding_detection(void) ok(type != XmlNodeType_None, "Unexpected node type %d\n", type); } - for (i = 0; i < sizeof(encoding_testsW)/sizeof(encoding_testsW[0]); i++) + for (i = 0; i < ARRAY_SIZE(encoding_testsW); i++) { stream = create_stream_on_data(encoding_testsW[i].text, lstrlenW(encoding_testsW[i].text) * sizeof(WCHAR)); diff --git a/modules/rostests/winetests/xmllite/writer.c b/modules/rostests/winetests/xmllite/writer.c index 59c9a964c4..8a15f384cb 100644 --- a/modules/rostests/winetests/xmllite/writer.c +++ b/modules/rostests/winetests/xmllite/writer.c @@ -18,25 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - +#ifdef __REACTOS__ #define CONST_VTABLE +#endif + #define COBJMACROS #include <stdarg.h> -//#include <stdio.h> +#include <stdio.h> -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -#include <objbase.h> -#include <ole2.h> -#include <xmllite.h> -#include <wine/test.h> +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "xmllite.h" +#include "wine/test.h" -#include <initguid.h> +#include "initguid.h" DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, 0x33, 0x24, 0x51, 0xbc, 0x1a); static const WCHAR aW[] = {'a',0};

6 years, 5 months

01/01: [XMLLITE] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=65ac457a5840a3cf2e604… commit 65ac457a5840a3cf2e604a713a5771f2592ff156 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 25 12:44:23 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 25 12:44:23 2018 +0100 [XMLLITE] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/xmllite/CMakeLists.txt | 4 ++-- dll/win32/xmllite/precomp.h | 24 ++++++++++++++++++++++++ dll/win32/xmllite/reader.c | 24 +++++++++++++++++------- dll/win32/xmllite/writer.c | 16 ++++++++++++---- dll/win32/xmllite/xmllite_main.c | 10 +++++++++- dll/win32/xmllite/xmllite_private.h | 35 ++--------------------------------- media/doc/README.WINE | 2 +- 7 files changed, 67 insertions(+), 48 deletions(-) diff --git a/dll/win32/xmllite/CMakeLists.txt b/dll/win32/xmllite/CMakeLists.txt index 77fc0e371b..b027396d6c 100644 --- a/dll/win32/xmllite/CMakeLists.txt +++ b/dll/win32/xmllite/CMakeLists.txt @@ -7,7 +7,7 @@ list(APPEND SOURCE reader.c writer.c xmllite_main.c - xmllite_private.h + precomp.h ${CMAKE_CURRENT_BINARY_DIR}/xmllite_stubs.c) add_library(xmllite SHARED @@ -18,5 +18,5 @@ add_library(xmllite SHARED set_module_type(xmllite win32dll) target_link_libraries(xmllite uuid wine) add_importlibs(xmllite msvcrt kernel32 ntdll) -add_pch(xmllite xmllite_private.h SOURCE) +add_pch(xmllite precomp.h SOURCE) add_cd_file(TARGET xmllite DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/xmllite/precomp.h b/dll/win32/xmllite/precomp.h new file mode 100644 index 0000000000..558da227e5 --- /dev/null +++ b/dll/win32/xmllite/precomp.h @@ -0,0 +1,24 @@ + +#ifndef _XMLLITE_PRECOMP_H_ +#define _XMLLITE_PRECOMP_H_ + +#include <wine/config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <xmllite.h> + +#include <wine/debug.h> + +#include "xmllite_private.h" + +#endif /* !_XMLLITE_PRECOMP_H_ */ diff --git a/dll/win32/xmllite/reader.c b/dll/win32/xmllite/reader.c index c29b835c84..9cb7f3bd77 100644 --- a/dll/win32/xmllite/reader.c +++ b/dll/win32/xmllite/reader.c @@ -18,13 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "xmllite_private.h" +#define COBJMACROS #include <stdio.h> +#include <stdarg.h> #include <assert.h> +#include "windef.h" +#include "winbase.h" +#include "initguid.h" +#include "objbase.h" +#include "xmllite.h" +#include "xmllite_private.h" + +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/unicode.h" -#include <wine/list.h> -#include <wine/unicode.h> +WINE_DEFAULT_DEBUG_CHANNEL(xmllite); /* not defined in public headers */ DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); @@ -158,7 +168,7 @@ const WCHAR *get_encoding_name(xml_encoding encoding) xml_encoding get_encoding_from_codepage(UINT codepage) { int i; - for (i = 0; i < sizeof(xml_encoding_map)/sizeof(xml_encoding_map[0]); i++) + for (i = 0; i < ARRAY_SIZE(xml_encoding_map); i++) { if (xml_encoding_map[i].cp == codepage) return xml_encoding_map[i].enc; } @@ -739,7 +749,7 @@ xml_encoding parse_encoding_name(const WCHAR *name, int len) if (!name) return XmlEncoding_Unknown; min = 0; - max = sizeof(xml_encoding_map)/sizeof(xml_encoding_map[0]) - 1; + max = ARRAY_SIZE(xml_encoding_map) - 1; while (min <= max) { @@ -3003,12 +3013,12 @@ static void reader_get_attribute_ns_uri(xmlreader *reader, struct attribute *att strval_eq(reader, &attr->prefix, &strval_xmlns)) { *uri = xmlns_uriW; - *len = sizeof(xmlns_uriW)/sizeof(xmlns_uriW[0]) - 1; + *len = ARRAY_SIZE(xmlns_uriW) - 1; } else if (strval_eq(reader, &attr->prefix, &strval_xml)) { *uri = xml_uriW; - *len = sizeof(xml_uriW)/sizeof(xml_uriW[0]) - 1; + *len = ARRAY_SIZE(xml_uriW) - 1; } else { diff --git a/dll/win32/xmllite/writer.c b/dll/win32/xmllite/writer.c index c4570a5801..88f75b6e20 100644 --- a/dll/win32/xmllite/writer.c +++ b/dll/win32/xmllite/writer.c @@ -18,17 +18,25 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "xmllite.h" #include "xmllite_private.h" +#include "initguid.h" -#include <wine/list.h> -#include <wine/unicode.h> +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xmllite); /* not defined in public headers */ DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, 0x33, 0x24, 0x51, 0xbc, 0x1a); -#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) - static const WCHAR closeelementW[] = {'<','/'}; static const WCHAR closetagW[] = {' ','/','>'}; static const WCHAR closepiW[] = {'?','>'}; diff --git a/dll/win32/xmllite/xmllite_main.c b/dll/win32/xmllite/xmllite_main.c index 63d4046d0a..63838a99f7 100644 --- a/dll/win32/xmllite/xmllite_main.c +++ b/dll/win32/xmllite/xmllite_main.c @@ -18,7 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "xmllite_private.h" +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xmllite); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dll/win32/xmllite/xmllite_private.h b/dll/win32/xmllite/xmllite_private.h index 41cd1bf477..381dec496c 100644 --- a/dll/win32/xmllite/xmllite_private.h +++ b/dll/win32/xmllite/xmllite_private.h @@ -21,40 +21,9 @@ #ifndef __XMLLITE_PRIVATE__ #define __XMLLITE_PRIVATE__ -#include <config.h> +#include "wine/heap.h" -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <xmllite.h> - -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(xmllite); - -/* memory allocation functions */ - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} +#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) static inline void *m_alloc(IMalloc *imalloc, size_t len) { diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 9d32801102..62f294ee1f 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -218,7 +218,7 @@ reactos/dll/win32/xinput1_1 # Synced to WineStaging-2.9 reactos/dll/win32/xinput1_2 # Synced to WineStaging-2.9 reactos/dll/win32/xinput1_3 # Synced to WineStaging-2.9 reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-2.9 -reactos/dll/win32/xmllite # Synced to WineStaging-2.16 +reactos/dll/win32/xmllite # Synced to WineStaging-3.3 reactos/dll/cpl/inetcpl # Synced to WineStaging-2.9

6 years, 5 months

01/01: [WUAPI] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=150fba8dffa9054ba4296… commit 150fba8dffa9054ba4296c110938708811fc7633 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 25 12:43:17 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 25 12:43:17 2018 +0100 [WUAPI] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/wuapi/CMakeLists.txt | 4 ++-- dll/win32/wuapi/downloader.c | 15 +++++++++++++++ dll/win32/wuapi/installer.c | 14 ++++++++++++++ dll/win32/wuapi/main.c | 15 ++++++++++++++- dll/win32/wuapi/precomp.h | 23 +++++++++++++++++++++++ dll/win32/wuapi/searcher.c | 14 ++++++++++++++ dll/win32/wuapi/session.c | 14 ++++++++++++++ dll/win32/wuapi/systeminfo.c | 14 ++++++++++++++ dll/win32/wuapi/updates.c | 14 ++++++++++++++ dll/win32/wuapi/wuapi_private.h | 22 ---------------------- media/doc/README.WINE | 2 +- 11 files changed, 125 insertions(+), 26 deletions(-) diff --git a/dll/win32/wuapi/CMakeLists.txt b/dll/win32/wuapi/CMakeLists.txt index 3329a67ab8..c5afb5a95c 100644 --- a/dll/win32/wuapi/CMakeLists.txt +++ b/dll/win32/wuapi/CMakeLists.txt @@ -14,7 +14,7 @@ list(APPEND SOURCE session.c systeminfo.c updates.c - wuapi_private.h) + precomp.h) add_typelib(wuapi_tlb.idl) set_source_files_properties(wuapi.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/wuapi_tlb.tlb) @@ -28,5 +28,5 @@ set_module_type(wuapi win32dll) target_link_libraries(wuapi uuid wine wuguid) add_importlibs(wuapi msvcrt kernel32 ntdll) add_dependencies(wuapi stdole2) # wuapi_tlb.tlb needs stdole2.tlb -add_pch(wuapi wuapi_private.h SOURCE) +add_pch(wuapi precomp.h SOURCE) add_cd_file(TARGET wuapi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/wuapi/downloader.c b/dll/win32/wuapi/downloader.c index 9fd6e849ad..e17e1554f8 100644 --- a/dll/win32/wuapi/downloader.c +++ b/dll/win32/wuapi/downloader.c @@ -18,8 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "initguid.h" +#include "wuapi.h" #include "wuapi_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wuapi); + typedef struct _update_downloader { IUpdateDownloader IUpdateDownloader_iface; diff --git a/dll/win32/wuapi/installer.c b/dll/win32/wuapi/installer.c index e2f41e839a..46c8699fbe 100644 --- a/dll/win32/wuapi/installer.c +++ b/dll/win32/wuapi/installer.c @@ -18,8 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "wuapi.h" #include "wuapi_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wuapi); + typedef struct _update_installer { IUpdateInstaller IUpdateInstaller_iface; diff --git a/dll/win32/wuapi/main.c b/dll/win32/wuapi/main.c index 104bfe1a79..0527ee53ba 100644 --- a/dll/win32/wuapi/main.c +++ b/dll/win32/wuapi/main.c @@ -18,9 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "rpcproxy.h" +#include "wuapi.h" + +#include "wine/debug.h" #include "wuapi_private.h" -#include <rpcproxy.h> +WINE_DEFAULT_DEBUG_CHANNEL(wuapi); typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj ); diff --git a/dll/win32/wuapi/precomp.h b/dll/win32/wuapi/precomp.h new file mode 100644 index 0000000000..a52e44b9bf --- /dev/null +++ b/dll/win32/wuapi/precomp.h @@ -0,0 +1,23 @@ + +#ifndef _WUAPI_PRECOMP_H_ +#define _WUAPI_PRECOMP_H_ + +#include <wine/config.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <wuapi.h> + +#include <wine/debug.h> + +#include "wuapi_private.h" + +#endif /* !_WUAPI_PRECOMP_H_ */ diff --git a/dll/win32/wuapi/searcher.c b/dll/win32/wuapi/searcher.c index bf9d0c187e..1ca8020a09 100644 --- a/dll/win32/wuapi/searcher.c +++ b/dll/win32/wuapi/searcher.c @@ -18,8 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "wuapi.h" #include "wuapi_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wuapi); + typedef struct _update_searcher { IUpdateSearcher IUpdateSearcher_iface; diff --git a/dll/win32/wuapi/session.c b/dll/win32/wuapi/session.c index 48cdee9fd5..acc7cb0a35 100644 --- a/dll/win32/wuapi/session.c +++ b/dll/win32/wuapi/session.c @@ -18,8 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "wuapi.h" + +#include "wine/debug.h" #include "wuapi_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(wuapi); + typedef struct _update_session { IUpdateSession IUpdateSession_iface; diff --git a/dll/win32/wuapi/systeminfo.c b/dll/win32/wuapi/systeminfo.c index a30879f623..7c62bed529 100644 --- a/dll/win32/wuapi/systeminfo.c +++ b/dll/win32/wuapi/systeminfo.c @@ -19,8 +19,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "wuapi.h" #include "wuapi_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wuapi); + typedef struct _systeminfo { ISystemInformation ISystemInformation_iface; diff --git a/dll/win32/wuapi/updates.c b/dll/win32/wuapi/updates.c index fd3ad42d26..4f6648c5af 100644 --- a/dll/win32/wuapi/updates.c +++ b/dll/win32/wuapi/updates.c @@ -18,8 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "wuapi.h" #include "wuapi_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wuapi); + typedef struct _automatic_updates { IAutomaticUpdates IAutomaticUpdates_iface; diff --git a/dll/win32/wuapi/wuapi_private.h b/dll/win32/wuapi/wuapi_private.h index 4ef2f5115b..62b6dec521 100644 --- a/dll/win32/wuapi/wuapi_private.h +++ b/dll/win32/wuapi/wuapi_private.h @@ -16,31 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _WUAPI_PRIVATE_H_ -#define _WUAPI_PRIVATE_H_ - -#include <wine/config.h> - -#include <stdarg.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <wuapi.h> - -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(wuapi); - extern HRESULT AutomaticUpdates_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; extern HRESULT UpdateSession_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; extern HRESULT UpdateSearcher_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; extern HRESULT UpdateDownloader_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; extern HRESULT UpdateInstaller_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; extern HRESULT SystemInformation_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; - -#endif /* _WUAPI_PRIVATE_H_ */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 4b31b28fcf..9d32801102 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -213,7 +213,7 @@ reactos/dll/win32/wmiutils # Synced to WineStaging-3.3 reactos/dll/win32/wmvcore # Synced to WineStaging-3.3 reactos/dll/win32/wshom.ocx # Synced to WineStaging-3.3 reactos/dll/win32/wtsapi32 # Synced to WineStaging-3.3 -reactos/dll/win32/wuapi # Synced to WineStaging-2.9 +reactos/dll/win32/wuapi # Synced to WineStaging-3.3 reactos/dll/win32/xinput1_1 # Synced to WineStaging-2.9 reactos/dll/win32/xinput1_2 # Synced to WineStaging-2.9 reactos/dll/win32/xinput1_3 # Synced to WineStaging-2.9

6 years, 5 months

01/01: [WTSAPI32_WINETEST] Sync with Wine Staging 3.3. CORE-14434

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae2769074211c661cbb83… commit ae2769074211c661cbb833cb997c5b3c69d758ed Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Mar 25 12:42:24 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sun Mar 25 12:42:24 2018 +0100 [WTSAPI32_WINETEST] Sync with Wine Staging 3.3. CORE-14434 --- modules/rostests/winetests/wtsapi32/wtsapi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/rostests/winetests/wtsapi32/wtsapi.c b/modules/rostests/winetests/wtsapi32/wtsapi.c index 0a1b1ecb7c..dd5c8e8637 100644 --- a/modules/rostests/winetests/wtsapi32/wtsapi.c +++ b/modules/rostests/winetests/wtsapi32/wtsapi.c @@ -85,7 +85,6 @@ static void test_WTSEnumerateProcessesW(void) { found = found || !lstrcmpW(pname, info[i].pProcessName); } - todo_wine ok(found || broken(!ret), "process name %s not found\n", wine_dbgstr_w(pname)); if (info) WTSFreeMemory(info); }

6 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2018