February 2019 - Wine-devel - list.winehq.org

[v2 PATCH 6/6] vssapi: Add ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z stub
by Alistair Leslie-Hughes 10 Feb '19

10 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/vssapi/main.c | 10 ++++++++++ dlls/vssapi/vssapi.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/vssapi/main.c b/dlls/vssapi/main.c index a24b320..7ac0adb 100644 --- a/dlls/vssapi/main.c +++ b/dlls/vssapi/main.c @@ -114,3 +114,13 @@ HRESULT WINAPI CreateVssBackupComponentsInternal(IVssBackupComponents **backup) FIXME("%p\n", backup); return E_NOTIMPL; } + +/****************************************************************** + * ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z + */ +HRESULT WINAPI VSSAPI_CreateVssBackupComponents( IVssBackupComponents **backup ) +{ + FIXME( "%p\n", backup ); + + return CreateVssBackupComponentsInternal(backup); +} diff --git a/dlls/vssapi/vssapi.spec b/dlls/vssapi/vssapi.spec index 7bd47e8..c759c11 100644 --- a/dlls/vssapi/vssapi.spec +++ b/dlls/vssapi/vssapi.spec @@ -9,7 +9,7 @@ @ cdecl -arch=win64 ??1CVssWriter@@UEAA(a)XZ(ptr) VSSAPI_CVssWriter_dtor @ stub ?AreComponentsSelected(a)CVssJetWriter@@IBG_NXZ @ stub ?AreComponentsSelected(a)CVssWriter@@IBG_NXZ -@ stub ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z +@ stdcall ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z(ptr) VSSAPI_CreateVssBackupComponents @ stub ?CreateVssExamineWriterMetadata@@YGJPAGPAPAVIVssExamineWriterMetadata@@@Z @ stub ?CreateVssSnapshotSetDescription@@YGJU_GUID@@JPAPAVIVssSnapshotSetDescription@@@Z @ stub ?GetBackupType(a)CVssJetWriter@@IBG?AW4_VSS_BACKUP_TYPE@@XZ -- 1.9.1

1 0

[PATCH 6/6] vssapi: Add ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z stub
by Alistair Leslie-Hughes 10 Feb '19

10 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/vssapi/main.c | 10 ++++++++++ dlls/vssapi/vssapi.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/vssapi/main.c b/dlls/vssapi/main.c index a24b320..7617c0d 100644 --- a/dlls/vssapi/main.c +++ b/dlls/vssapi/main.c @@ -114,3 +114,13 @@ HRESULT WINAPI CreateVssBackupComponentsInternal(IVssBackupComponents **backup) FIXME("%p\n", backup); return E_NOTIMPL; } + +/****************************************************************** + * ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z + */ +HRESULT VSSAPI_CreateVssBackupComponents( IVssBackupComponents **backup ) +{ + FIXME( "%p\n", backup ); + + return CreateVssBackupComponentsInternal(backup); +} diff --git a/dlls/vssapi/vssapi.spec b/dlls/vssapi/vssapi.spec index 7bd47e8..c759c11 100644 --- a/dlls/vssapi/vssapi.spec +++ b/dlls/vssapi/vssapi.spec @@ -9,7 +9,7 @@ @ cdecl -arch=win64 ??1CVssWriter@@UEAA(a)XZ(ptr) VSSAPI_CVssWriter_dtor @ stub ?AreComponentsSelected(a)CVssJetWriter@@IBG_NXZ @ stub ?AreComponentsSelected(a)CVssWriter@@IBG_NXZ -@ stub ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z +@ stdcall ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z(ptr) VSSAPI_CreateVssBackupComponents @ stub ?CreateVssExamineWriterMetadata@@YGJPAGPAPAVIVssExamineWriterMetadata@@@Z @ stub ?CreateVssSnapshotSetDescription@@YGJU_GUID@@JPAPAVIVssSnapshotSetDescription@@@Z @ stub ?GetBackupType(a)CVssJetWriter@@IBG?AW4_VSS_BACKUP_TYPE@@XZ -- 1.9.1

2 1

[PATCH 5/6] vssapi: Add CreateVssBackupComponentsInternal stub
by Alistair Leslie-Hughes 10 Feb '19

10 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/vssapi/main.c | 7 +++++++ dlls/vssapi/vssapi.spec | 2 +- include/vsbackup.idl | 11 +++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/vssapi/main.c b/dlls/vssapi/main.c index 9234544..a24b320 100644 --- a/dlls/vssapi/main.c +++ b/dlls/vssapi/main.c @@ -22,6 +22,7 @@ #include "winbase.h" #include "vss.h" #include "vswriter.h" +#include "vsbackup.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL( vssapi ); @@ -107,3 +108,9 @@ HRESULT __thiscall VSSAPI_CVssWriter_Unsubscribe( struct CVssWriter *writer ) FIXME( "%p\n", writer ); return S_OK; } + +HRESULT WINAPI CreateVssBackupComponentsInternal(IVssBackupComponents **backup) +{ + FIXME("%p\n", backup); + return E_NOTIMPL; +} diff --git a/dlls/vssapi/vssapi.spec b/dlls/vssapi/vssapi.spec index 146feb4..7bd47e8 100644 --- a/dlls/vssapi/vssapi.spec +++ b/dlls/vssapi/vssapi.spec @@ -75,7 +75,7 @@ @ stub ?Uninitialize(a)CVssJetWriter@@QAGXXZ @ thiscall -arch=i386 ?Unsubscribe(a)CVssWriter@@QAGJXZ(ptr) VSSAPI_CVssWriter_Unsubscribe @ cdecl -arch=win64 ?Unsubscribe(a)CVssWriter@@QEAAJXZ(ptr) VSSAPI_CVssWriter_Unsubscribe -@ stub CreateVssBackupComponentsInternal +@ stdcall CreateVssBackupComponentsInternal(ptr) @ stub CreateVssExamineWriterMetadataInternal @ stub CreateVssExpressWriterInternal @ stub CreateWriter diff --git a/include/vsbackup.idl b/include/vsbackup.idl index 0b5a2d3..e2f5a54 100644 --- a/include/vsbackup.idl +++ b/include/vsbackup.idl @@ -25,6 +25,17 @@ interface IVssEnumObject; interface IVssExamineWriterMetadata; interface IVssWriterComponentsExt; +cpp_quote("#ifdef _cplusplus") +cpp_quote("extern \"C\" {") +cpp_quote("#endif") +cpp_quote("HRESULT WINAPI CreateVssBackupComponentsInternal(IVssBackupComponents **backup);") +cpp_quote("#ifdef _cplusplus") +cpp_quote("}") +cpp_quote("#endif") + +cpp_quote("static inline HRESULT CreateVssBackupComponents(IVssBackupComponents **backup)") +cpp_quote(" { return CreateVssBackupComponentsInternal(backup); }") + [ uuid("665c1d5f-c218-414d-a05d-7fef5f9d5c86"), local -- 1.9.1

1 0

[PATCH 4/6] include: Add vsbackup.idl
by Alistair Leslie-Hughes 10 Feb '19

10 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/vsbackup.idl | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 include/vsbackup.idl diff --git a/include/Makefile.in b/include/Makefile.in index a4642ce..eaf3114 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -646,6 +646,7 @@ SOURCES = \ virtdisk.h \ vmr9.idl \ vmrender.idl \ + vsbackup.idl \ vss.idl \ vsstyle.h \ vssym32.h \ diff --git a/include/vsbackup.idl b/include/vsbackup.idl new file mode 100644 index 0000000..0b5a2d3 --- /dev/null +++ b/include/vsbackup.idl @@ -0,0 +1,97 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "vswriter.idl"; +import "vss.idl"; + +interface IVssAsync; +interface IVssEnumObject; +interface IVssExamineWriterMetadata; +interface IVssWriterComponentsExt; + +[ + uuid("665c1d5f-c218-414d-a05d-7fef5f9d5c86"), + local +] +interface IVssBackupComponents : IUnknown +{ + HRESULT GetWriterComponentsCount([out] UINT *components); + HRESULT GetWriterComponents([in] UINT index, [out] IVssWriterComponentsExt **writer); + HRESULT InitializeForBackup( [in, optional, defaultvalue(NULL)] BSTR bstrXML); + HRESULT SetBackupState([in] BOOL select_components, [in] BOOL state, + [in] VSS_BACKUP_TYPE type, [in, defaultvalue(FALSE)] BOOL partial_support); + HRESULT InitializeForRestore([in] BSTR xml); + HRESULT SetRestoreState([in] VSS_RESTORE_TYPE restore); + HRESULT GatherWriterMetadata([out] IVssAsync **async); + HRESULT GetWriterMetadataCount([out] UINT *count); + HRESULT GetWriterMetadata([in] UINT index, [out] VSS_ID *instance, [out] IVssExamineWriterMetadata **metadata); + HRESULT FreeWriterMetadata(); + HRESULT AddComponent([in] VSS_ID instance, [in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR wszLogicalPath, + [in] LPCWSTR name); + HRESULT PrepareForBackup([out] IVssAsync **async); + HRESULT AbortBackup(); + HRESULT GatherWriterStatus([out] IVssAsync **async); + HRESULT GetWriterStatusCount([out] UINT *count); + HRESULT FreeWriterStatus(); + HRESULT GetWriterStatus([in] UINT index, [out] VSS_ID *instance, [out] VSS_ID *id, [out] BSTR *writer, + [out] VSS_WRITER_STATE *status, [out] HRESULT *failure); + HRESULT SetBackupSucceeded([in] VSS_ID instance, [in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, + [in] LPCWSTR path, [in] LPCWSTR name, [in] BOOL succeded); + HRESULT SetBackupOptions([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, + [in] LPCWSTR name, [in] LPCWSTR options); + HRESULT SetSelectedForRestore([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, + [in] LPCWSTR name, [in] BOOL selected_restore); + HRESULT SetRestoreOptions([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, [in] LPCWSTR name, + [in] LPCWSTR options); + HRESULT SetAdditionalRestores([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, [in] LPCWSTR name, + [in] BOOL additional); + HRESULT SetPreviousBackupStamp([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, [in] LPCWSTR name, + [in] LPCWSTR stamp); + HRESULT SaveAsXML([in] BSTR *xml); + HRESULT BackupComplete([out] IVssAsync **async); + HRESULT AddAlternativeLocationMapping([in] VSS_ID id, [in] VSS_COMPONENT_TYPE type, [in] LPCWSTR logical, + [in] LPCWSTR name, [in] LPCWSTR path, [in] LPCWSTR filespec, [in] BOOL recursive, [in] LPCWSTR destination); + HRESULT AddRestoreSubcomponent([in] VSS_ID id, [in] VSS_COMPONENT_TYPE type, [in] LPCWSTR logical, [in] LPCWSTR name, + [in] LPCWSTR path, [in] LPCWSTR sub_name, [in] BOOL repair); + HRESULT SetFileRestoreStatus([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, [in] LPCWSTR name, + [in] VSS_FILE_RESTORE_STATUS status); + HRESULT AddNewTarget([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR logical, [in] LPCWSTR component, + [in] LPCWSTR path, [in] LPCWSTR filename, [in] BOOL recursive, [in] LPCWSTR alternate); + HRESULT SetRangesFilePath([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR logical, [in] LPCWSTR component, + [in] UINT partial, [in] LPCWSTR ranges); + HRESULT PreRestore([out] IVssAsync **async); + HRESULT PostRestore([out] IVssAsync **async); + HRESULT SetContext([in] LONG context); + HRESULT StartSnapshotSet([out] VSS_ID *id); + HRESULT AddToSnapshotSet([in] VSS_PWSZ volume,[in] VSS_ID id,[out] VSS_ID *snapshot); + HRESULT DoSnapshotSet([out] IVssAsync ** async); + HRESULT DeleteSnapshots([in] VSS_ID object, [in] VSS_OBJECT_TYPE type, [in] BOOL force, [in] LONG *snapshots, [in] VSS_ID *id); + HRESULT ImportSnapshots([out] IVssAsync **async); + HRESULT BreakSnapshotSet([in] VSS_ID snapshot); + HRESULT GetSnapshotProperties([in] VSS_ID snapshot, [out] VSS_SNAPSHOT_PROP *prop); + HRESULT Query([in] VSS_ID queried, [in] VSS_OBJECT_TYPE queried_type, [in] VSS_OBJECT_TYPE returned_type, [in] IVssEnumObject **enums); + HRESULT IsVolumeSupported([in] VSS_ID provider, [in] VSS_PWSZ volume,[in] BOOL *supported); + HRESULT DisableWriterClasses([in] const VSS_ID *writer_id, [in] UINT class_id); + HRESULT EnableWriterClasses([in] const VSS_ID *classid, [in] UINT id); + HRESULT DisableWriterInstances([in] const VSS_ID *instance, [in] UINT id); + HRESULT ExposeSnapshot([in] VSS_ID snapshot, [in] VSS_PWSZ path, [in] LONG attributes, + [in] VSS_PWSZ expose, [out] VSS_PWSZ *exposed); + HRESULT RevertToSnapshot([in] VSS_ID snapshot, [in] BOOL force); + HRESULT QueryRevertStatus([in] VSS_PWSZ volume, [out] IVssAsync **async); +}; -- 1.9.1

1 0

[PATCH 3/6] include: Convert header vswriter to an idl.
by Alistair Leslie-Hughes 10 Feb '19

10 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 2 +- include/vswriter.h | 62 ---------------------------------------------------- include/vswriter.idl | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 63 deletions(-) delete mode 100644 include/vswriter.h create mode 100644 include/vswriter.idl diff --git a/include/Makefile.in b/include/Makefile.in index fd47078..a4642ce 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -649,7 +649,7 @@ SOURCES = \ vss.idl \ vsstyle.h \ vssym32.h \ - vswriter.h \ + vswriter.idl \ wbemcli.idl \ wbemdisp.idl \ wbemprov.idl \ diff --git a/include/vswriter.h b/include/vswriter.h deleted file mode 100644 index ac23861..0000000 --- a/include/vswriter.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2014 Hans Leidekker for CodeWeavers - * - * 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 - */ - -#ifndef __WINE_VSWRITER_H -#define __WINE_VSWRITER_H - -typedef enum -{ - VSS_UT_UNDEFINED, - VSS_UT_BOOTABLESYSTEMSTATE, - VSS_UT_SYSTEMSERVICE, - VSS_UT_USERDATA, - VSS_UT_OTHER -} VSS_USAGE_TYPE; - -typedef enum -{ - VSS_ST_UNDEFINED, - VSS_ST_TRANSACTEDDB, - VSS_ST_NONTRANSACTEDDB, - VSS_ST_OTHER -} VSS_SOURCE_TYPE; - -typedef enum -{ - VSS_AWS_UNDEFINED, - VSS_AWS_NO_ALTERNATE_WRITER, - VSS_AWS_ALTERNATE_WRITER_EXISTS, - VSS_AWS_THIS_IS_ALTERNATE_WRITER -} VSS_ALTERNATE_WRITER_STATE; - -typedef enum VSS_COMPONENT_TYPE -{ - VSS_CT_UNDEFINED = 0, - VSS_CT_DATABASE, - VSS_CT_FILEGROUP -} VSS_COMPONENT_TYPE; - -typedef enum VSS_FILE_RESTORE_STATUS -{ - VSS_RS_UNDEFINED = 0, - VSS_RS_NONE, - VSS_RS_ALL, - VSS_RS_FAILED -} VSS_FILE_RESTORE_STATUS; - -#endif /* ___WINE_VSWRITER_H */ diff --git a/include/vswriter.idl b/include/vswriter.idl new file mode 100644 index 0000000..6bc6890 --- /dev/null +++ b/include/vswriter.idl @@ -0,0 +1,58 @@ +/* + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * 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"; + +typedef enum +{ + VSS_UT_UNDEFINED, + VSS_UT_BOOTABLESYSTEMSTATE, + VSS_UT_SYSTEMSERVICE, + VSS_UT_USERDATA, + VSS_UT_OTHER +} VSS_USAGE_TYPE; + +typedef enum +{ + VSS_ST_UNDEFINED, + VSS_ST_TRANSACTEDDB, + VSS_ST_NONTRANSACTEDDB, + VSS_ST_OTHER +} VSS_SOURCE_TYPE; + +typedef enum +{ + VSS_AWS_UNDEFINED, + VSS_AWS_NO_ALTERNATE_WRITER, + VSS_AWS_ALTERNATE_WRITER_EXISTS, + VSS_AWS_THIS_IS_ALTERNATE_WRITER +} VSS_ALTERNATE_WRITER_STATE; + +typedef enum VSS_COMPONENT_TYPE +{ + VSS_CT_UNDEFINED = 0, + VSS_CT_DATABASE, + VSS_CT_FILEGROUP +} VSS_COMPONENT_TYPE; + +typedef enum VSS_FILE_RESTORE_STATUS +{ + VSS_RS_UNDEFINED = 0, + VSS_RS_NONE, + VSS_RS_ALL, + VSS_RS_FAILED +} VSS_FILE_RESTORE_STATUS; -- 1.9.1

1 0

[PATCH 2/6] include: Add VSS writer enums
by Alistair Leslie-Hughes 10 Feb '19

10 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/vswriter.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/vswriter.h b/include/vswriter.h index 043b871..ac23861 100644 --- a/include/vswriter.h +++ b/include/vswriter.h @@ -44,4 +44,19 @@ typedef enum VSS_AWS_THIS_IS_ALTERNATE_WRITER } VSS_ALTERNATE_WRITER_STATE; +typedef enum VSS_COMPONENT_TYPE +{ + VSS_CT_UNDEFINED = 0, + VSS_CT_DATABASE, + VSS_CT_FILEGROUP +} VSS_COMPONENT_TYPE; + +typedef enum VSS_FILE_RESTORE_STATUS +{ + VSS_RS_UNDEFINED = 0, + VSS_RS_NONE, + VSS_RS_ALL, + VSS_RS_FAILED +} VSS_FILE_RESTORE_STATUS; + #endif /* ___WINE_VSWRITER_H */ -- 1.9.1

1 0

[PATCH 1/6] include: Add more VSS_* typedefs
by Alistair Leslie-Hughes 10 Feb '19

10 Feb '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/vss.idl | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/include/vss.idl b/include/vss.idl index 62335ea..a190e66 100644 --- a/include/vss.idl +++ b/include/vss.idl @@ -19,6 +19,8 @@ import "oaidl.idl"; typedef GUID VSS_ID; +typedef [unique, string] WCHAR *VSS_PWSZ; +typedef LONGLONG VSS_TIMESTAMP; typedef enum _VSS_APPLICATION_LEVEL { @@ -29,3 +31,91 @@ typedef enum _VSS_APPLICATION_LEVEL VSS_APP_FRONT_END = 3, VSS_APP_SYSTEM_RM = 4 } VSS_APPLICATION_LEVEL; + +typedef enum _VSS_BACKUP_TYPE +{ + VSS_BT_UNDEFINED, + VSS_BT_FULL, + VSS_BT_INCREMENTAL, + VSS_BT_DIFFERENTIAL, + VSS_BT_LOG, + VSS_BT_COPY, + VSS_BT_OTHER +} VSS_BACKUP_TYPE, *PVSS_BACKUP_TYPE; + +typedef enum _VSS_RESTORE_TYPE +{ + VSS_RTYPE_UNDEFINED, + VSS_RTYPE_BY_COPY, + VSS_RTYPE_IMPORT, + VSS_RTYPE_OTHER +} VSS_RESTORE_TYPE, *PVSS_RESTORE_TYPE; + +typedef enum _VSS_WRITER_STATE +{ + VSS_WS_UNKNOWN = 0, + VSS_WS_STABLE, + VSS_WS_WAITING_FOR_FREEZE, + VSS_WS_WAITING_FOR_THAW, + VSS_WS_WAITING_FOR_POST_SNAPSHOT, + VSS_WS_WAITING_FOR_BACKUP_COMPLETE, + VSS_WS_FAILED_AT_IDENTIFY, + VSS_WS_FAILED_AT_PREPARE_BACKUP, + VSS_WS_FAILED_AT_PREPARE_SNAPSHOT, + VSS_WS_FAILED_AT_FREEZE, + VSS_WS_FAILED_AT_THAW, + VSS_WS_FAILED_AT_POST_SNAPSHOT, + VSS_WS_FAILED_AT_BACKUP_COMPLETE, + VSS_WS_FAILED_AT_PRE_RESTORE, + VSS_WS_FAILED_AT_POST_RESTORE, + VSS_WS_FAILED_AT_BACKUPSHUTDOWN, + VSS_WS_COUNT +} VSS_WRITER_STATE, *PVSS_WRITER_STATE; + +typedef enum _VSS_OBJECT_TYPE +{ + VSS_OBJECT_UNKNOWN = 0, + VSS_OBJECT_NONE, + VSS_OBJECT_SNAPSHOT_SET, + VSS_OBJECT_SNAPSHOT, + VSS_OBJECT_PROVIDER, + VSS_OBJECT_TYPE_COUNT +} VSS_OBJECT_TYPE, *PVSS_OBJECT_TYPE; + +typedef enum _VSS_SNAPSHOT_STATE +{ + VSS_SS_UNKNOWN = 0, + VSS_SS_PREPARING, + VSS_SS_PROCESSING_PREPARE, + VSS_SS_PREPARED, + VSS_SS_PROCESSING_PRECOMMIT, + VSS_SS_PRECOMMITTED, + VSS_SS_PROCESSING_COMMIT, + VSS_SS_COMMITTED, + VSS_SS_PROCESSING_POSTCOMMIT, + VSS_SS_PROCESSING_PREFINALCOMMIT, + VSS_SS_PREFINALCOMMITTED, + VSS_SS_PROCESSING_POSTFINALCOMMIT, + VSS_SS_CREATED, + VSS_SS_ABORTED, + VSS_SS_DELETED, + VSS_SS_POSTCOMMITTED, + VSS_SS_COUNT +} VSS_SNAPSHOT_STATE, *PVSS_SNAPSHOT_STATE; + +typedef struct _VSS_SNAPSHOT_PROP +{ + VSS_ID m_SnapshotId; + VSS_ID m_SnapshotSetId; + LONG m_lSnapshotsCount; + VSS_PWSZ m_pwszSnapshotDeviceObject; + VSS_PWSZ m_pwszOriginalVolumeName; + VSS_PWSZ m_pwszOriginatingMachine; + VSS_PWSZ m_pwszServiceMachine; + VSS_PWSZ m_pwszExposedName; + VSS_PWSZ m_pwszExposedPath; + VSS_ID m_ProviderId; + LONG m_lSnapshotAttributes; + VSS_TIMESTAMP m_tsCreationTimestamp; + VSS_SNAPSHOT_STATE m_eStatus; +} VSS_SNAPSHOT_PROP, *PVSS_SNAPSHOT_PROP; -- 1.9.1

1 0

wine-3.0.5-rc1 Available
by Michael Stefaniuc 10 Feb '19

10 Feb '19

Hello guys, I have pushed wine-3.0.5-rc1 (with tag) to https://github.com/mstefani/wine-stable/tree/oldstable https://people.redhat.com/mstefani/wine/stable/ This should hopefully be the final release for 3.0.x. Nothing special in it, just that it has more patches that I would have liked it to have. Now the interesting bits and pieces from the ANNOUNCE file: What's new in this release (see below for details): - Various bug fixes ---------------------------------------------------------------- Bugs fixed in 3.0.5 (total 75): 5402 Multiple MFC-based apps crash during non-modal child dialog control creation with active window being zero (Canon PhotoStitch 3.1.13, Flexible Renamer v8.4) 16845 Radio buttons not being checked on focus 33117 Can't load Bach41.ttf with CreateFontIndirect 33502 SnagIt writes incomplete HKLM\\System\\CurrentControlSet\\Control\\Print\\Printers entry, causing loader failures for apps that depend on winspool.drv 35320 setlocale(Chinese_China.950) returns NULL 35504 LibreOffice 4.2 installer copies MSVC++ runtime files into erroneous 'C:\Win\System\' path (directory targets/properties not re-resolved after updates from custom actions) 38066 Memento Mori (Numen: Contest of Heroes): mouse buttons don't work (needs native dinput8) 38402 glDebugMessageCallback has mismatched calling convention 39051 TabbedTextOut() incorrect output on tab character 39508 Microsoft Office 365/OneDrive for Business installer fails in Win8+ mode with 'advapi:ParseStringSidToSid String constant not supported: "OW"' (failure to decode 'Owner Rights' SID 'S-1-3-4') 40160 cant install mobogenie 40206 Revit Architecture fails to install: throws Messagebox "Function failed" and aborts 40208 Cegid Business Line installer fails in custom script action with "Object doesn't support this property or method: 'ObjRegistry.CreateKey'" (needs 'StdRegProv.CreateKey') 40264 Iris Online cannot connect to login server (SO_SNDBUF with value 0 is not allowed in OSX) 40303 Control Data passed in DIALOGEX Resource passes pointer with offset sizeof(WORD) 40433 Fifa 11 EU demo fails to install when run from custom DVD 40828 Switching resolution in desktop mode makes task bar redraw on top of full screen game 41039 Multiple kernel drivers crash on unimplemented function ntoskrnl.exe.FsRtlIsNameInExpression (VirtualBox, QQProtect for Tencent TIM (com.qq.office) 2.1.x) 41356 Multiple applications and games need support for szOID_NIST_sha* OIDs in crypt32 (The Crew (Uplay), Star Wars The Old Republic, PSNow v9.0.5) 41404 WPS Office 10.1.0.5775 unhandled exception on installation 41419 Visio 2013 crashes with unimplemented function msvcp100.dll.?_GetCombinableSize(a)details@Concurrency@@YAIXZ 41934 Spreaker Studio 1.4.2 fails to install 42010 ReactOS Calc does not show dots in radio buttons. 42078 Dungeons & Dragons: Chronicles of Mystara needs d3dx11_43.dll.D3DX11CreateShaderResourceViewFromMemory 43187 EA Origin 'OriginWebHelperService' (QGuiApplication) non-interactive service process crashes due to null monitor info when determining the primary (default) screen 43358 EVE Online crashes on startup in Win7+ mode (XAudio 2.7 'IXAudio2SourceVoice::GetState' called with 'Flags' parameter, causing %ESI or %EDI register corruption) 43464 Elite Dangerous Horizons fails to connect to server with CRC error 43550 Photoshop Elements 15 spams console with fixme:file:MoveFileWithProgressW MOVEFILE_WRITE_THROUGH unimplemented 43630 Altium Designer Installer - Richedit control shows rtf code instead of text 43890 Divinity: Original Sin 2 does not successfully launch 44109 Simple free HAM program Opera crashes, needs unimplemented function pdh.dll.PdhVbAddCounter 44177 Guitar Pro 5: Long freezes during draw process of dashed lines (P.M. or let ring markers) 44229 Visual C++ 1.51 can't add files to project (GetOpenFileName16() doesn't support custom templates or hooks) 44409 png with indexed colors and alpha miss the alpha channel on loading 44485 Delphi 7 debugger generates new exceptions by itself 45320 cmd creates an environment variable with an empty name 45347 Google Chrome installer crashes on unimplemented function propsys.dll.InitPropVariantFromCLSID 45523 FIFA 18 Demo needs KERNEL32.dll.SetProcessWorkingSetSizeEx 45538 Multiple applications crash on unimplemented function msvcr120.dll.?wait(a)Concurrency@@YAXI(a)Z (Amazon Workspaces client, EnginePrime, Bethesda Launcher Updater) 45569 League of Legends 8.12+ needs NtQueryInformationProcess(ProcessCookie) stub 45588 .Net Framework 4.5.2 (WPF) System.Windows.Media.PixelFormat requires windowscodecs.dll.IWICPixelFormatInfo_{GetChannelCount,GetChannelMask,GetBitsPerPixel}_Proxy 45593 Wargaming.net Game Center: Installer deadlocks during download ('ntdll.RtlDeregisterWaitEx' must not synchronously wait when 'CompletionEvent' is NULL) 45673 Calling delegated proxy methods returns 0x800706b5 (RPC_S_UNKNOWN_IF), "err:rpc:RpcAssoc_BindConnection syntax {xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}, 0.0 not supported" 45709 djkaty.com Simple2D demos v1.13 need support for IWICImagingFactory2, CLSID '{317d06e8-5f24-433d-bdf7-79ce68d8abc2}' 45724 Multiple EndScene calls result in multiple glFlush (FF XIV) 45782 mono needs unimplemented function api-ms-win-crt-math-l1-1-0.dll._Cbuild 45816 Orbit Profile crashes in Unhandled exception: unimplemented function msvcp140.dll.?_Winerror_message(a)std@@YAKKPADK(a)Z called 45831 Slack installer (Squirrel) fails:Unhandled Exception: System.AccessViolationException:at MS.Win32.PresentationCore.UnsafeNativeMethods.WICMetadataQueryReader.ContainsMetadataByName 45832 Windower 5 beta (FF XI tool) crash: Unhandled Exception: System.NotImplementedException at Windower.UI.Views.RootView.OnSourceInitialized (DwmExtendFrameIntoClientArea should return S_OK) 45880 Multiple PC/SC applications crash on unimplemented function winscard.dll.SCardCancel (Aruba key, SmartCard test apps) 45910 nProtect GameGuard used by multiple MMORPG games crashes on unimplemented function wevtapi.dll.EvtExportLog (4Story, Phantasy Star Online 2) 45913 tchar.h: using the macro _sntprintf leads to an undefined reference to snwprintf; macro should resolve to _snwprintf 45915 x64dbg/x32dbg crash during shutdown on unimplemented function msvcr120.dll.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z 45928 Microsoft Windows SDK for Windows 10 (.NET 4.6) installer fails, claims KB3118401 is needed ('ucrtbase.dll' missing version resource, >= 10.0.0) 45942 AnyRail6: crashing when open Options 45997 iPed 7G 2019 (.NET 4.0 app) v13.0.10800 crashes with System.NotImplementedException at system.drawing.pen.ScaleTransform 46040 Intel Extreme Tuning Utility v6.4 kernel driver 'iocbios2.sys' crashes on unimplemented function ntoskrnl.exe.KeSetTargetProcessorDpc 46057 Multiple applications want 'ntdll.NtQueryInformationToken' to support 'TokenVirtualizationEnabled' (24) info class (Blizzard Battle.net) 46080 Multiple installers are missing title bar buttons 46081 Multiple installers show readonly drives with broken size 46084 Skype 8.33.0.50 installer crashes due to unimplemented msvcp140.dll.?_Winerror_map(a)std@@YAHH(a)Z 46089 TopoEdit tool from Windows 10 SDK (10.0.17763.x) crashes in ntdll.LdrResolveDelayLoadedAPI during resolver failure (NULL dll failure hook) 46129 'sqlwriter.exe' from Microsoft SQL Server 2012/2014 crashes on unimplemented function VSSAPI.DLL.??0CVssWriter@@QEAA(a)XZ 46135 Microsoft ODBC tool 'odbcconf.exe' (part of MDAC 2.x install) crashes during configuration (some 'advapi32.dll' API entries are not hotpatchable due to PIC/GOT code at entry) 46156 Multiple applications from Windows 7-10 crash on unimplemented function slc.dll.SLOpen 46157 Doxie 2.10.3 crashes on unimplemented function msvcr120.dll._vscprintf_l 46168 dotnet35sp1 installer has an error under wow64 46172 Multiple applications from Windows 7-10 crash on unimplemented function slc.dll.SLGetLicensingStatusInformation 46186 LoadImageA searches images in the wrong directory 46210 explorer /desktop leaks atoms from DDE interface 46215 File Open Dialog fails to set focus to Filename text box 46229 server/ptrace: NetBSD debug register storage 46328 Installer for Tanglet 1.5.3 crashes at target directory selection 46430 Doom3 (CD version) fails to install 46435 F1 2011 crashes with a messed up rendering in DX9 mode ---------------------------------------------------------------- Changes since 3.0.4: Akihiro Sagawa (6): dinput/tests: Use GET_DIDEVICE_SUBTYPE macro in keyboard type tests. dinput/tests: Add more tests for keyboard subtypes. dinput: Return DIDEVTYPEKEYBOARD_JAPAN106 subtype when it is used. windowscodecs: Fix buffer overflow when generating a palette. gdiplus/tests: Add more PNG color format tests. gdiplus: Convert to 32bppARGB when PNG image with transparency chunk is loaded. (rebased). Alex Henrie (1): advapi32: Fix memory leak in QueryServiceConfig2W (Coverity). Alexandre Julliard (8): user32: Use height from font metrics for empty text runs in TabbedTextOut(). oleaut32: Fix argument order with instance and VARIANT return type. server: Reset hardware breakpoint sizes before setting them. commdlg: Implement custom template support in 16-bit file dialogs. commdlg: Add support for 16-bit file dialog hooks. ntdll: Also store FPU registers in RtlRaiseException(). msi: Return an error code instead of a button id in msi_change_media(). winspool.drv: Make cupsGetPPD optional to work around deprecation warning. Alistair Leslie-Hughes (6): include: Add more types to ntifs.h. ntdll: Support TokenVirtualizationEnabled in NtQueryInformationToken. include: Add MmIsAddressValid to header. ws2_32: Ignore a SO_SNDBUF value of 0 on macOS. advapi32: Add DECL_HOTPATCH to registry functions. user32: Don't reset focus if current dialog is a child. Andrew Wesie (2): wined3d: Remove extraneous flush from EndScene. ntdll: Stub for ProcessCookie in NtQueryInformationProcess. Andrey Gusev (4): pdh: Add PdhVbAddCounter stub. slc: Add SLOpen stub. slc: Add SLGetLicensingStatusInformation stub. d3dx11: Fix D3DX11CreateShaderResourceViewFromMemory spec entry. André Hentschel (2): kernel32: Add stub for SetProcessWorkingSetSizeEx. ntdll: Call system hook in LdrResolveDelayLoadedAPI when dll hook is missing. Austin English (1): winscard: Add SCardCancel stub. Bernhard Übelacker (1): user32: Let nulldrv return some dummy monitor information. Brendan McGrath (4): advapi32: Don't create a WoW6432 MachineGuid. dinput/tests: Test that the GUID is the same for Instance and Product. dinput: Use the same GUID for Instance and Product. msi: Set stale function pointers to NULL. Daniel Lehman (1): gdi32: Fix memory leak (Valgrind). Dmitry Timoshkov (13): windowscodecs: IWICMetadataQueryReader::GetMetadataByName() should accept NULL for returned value. kernel32: Add support for MOVEFILE_WRITE_THROUGH to MoveFile. user32/tests: Add a test for custom dialog control data. wrc: Fix generation of custom dialog control data. user32: Fix the pointer to custom dialog control data. user32: Don't force a combobox repaint on WM_SIZE. user32/tests: Add a focus test for an empty dialog that returns TRUE in WM_INITDIALOG. user32: If there is no dialog controls to set focus to then set focus to dialog itself. gdi32: Improve detection of symbol charset for old truetype fonts. user32: Move the auto radio button group logic from BM_SETCHECK to WM_LBUTTONUP handler. user32/tests: Simplify the test for BM_CLICK on autoradio button by using a dialog. user32/tests: Add a test for navigating a group of buttons using keyboard events. user32: Add support for navigating a group of radio buttons using a keyboard. Fabian Maurer (5): propsys: Add PropVariantToStringWithDefault and tests. msi: In dialogs show titlebar buttons. riched20: Properly handle \0 inside rtf input. user32: LoadImage should not only search in the working directory. winealsa.drv: Don't crash when getting NULL event from midi. Frédéric Fauberteau (1): wineserver: Support debug registers on NetBSD. Gijs Vermeulen (2): msvcr100: Add Concurrency::wait stub. msvcp100: Add Concurrency::_GetCombinableSize stub. Hans Leidekker (4): wbemprox: Implement StdRegProv.CreateKey. msi: Allow recursive changes to the target folder path. msi: Support substorage transforms in MsiDatabaseApplyTransform. msi: Only perform the media check if the label of the disk entry differs from the last. Huw D. M. Davies (1): winspool: Skip the old printer check if it has a NULL port name. Jacek Caban (2): crypt32: Added support for szOID_NIST_sha* OIDs. include: Don't use unnamed struct for NDR_SCONTEXT declaration. Jactry Zeng (1): ntoskrnl: Add FsRtlIsNameInExpression stub. Jason Edmeades (1): msvcrt: Do not put cmd.exe special environment variables into the environ. Louis Lenders (6): dwmapi: Return S_OK in DwmExtendFrameIntoClientArea. ucrtbase: Add version resource. wevtapi: Add stub for EvtExportLog. wevtapi: Fix typo in spec file. ntoskrnl.exe: Add stub for KeSetTargetProcessorDpc. vssapi: Add a few win64 spec entries. Michael Müller (2): ntdll: Implement ProcessPriorityClass in NtQueryInformationProcess. ntdll: Implement ProcessImageFileNameWin32 in NtQueryInformationProcess. Michael Stefaniuc (2): include: Make ARRAY_SIZE() available in wine/test.h. include: Add a generic available ARRAY_SIZE(). Mihail Ivanchev (1): include: Fixed the Unicode expansion of _sntprintf. Nikolay Sivov (11): propsys: Add InitPropVariantFromCLSID(). advapi32/tests: Test return SIDs for wellknown two-character names. advapi32: Add WinCreatorOwnerRightsSid to wellknown list. advapi32: Add a name for WinBuiltinAnyPackageSid. wincodecs: Add IWICImagingFactory2 stub. wincodecs/icoformat: Improve input data validation on decoder initialization. wincodecs: Add IWICPixelFormatInfo exports. gdiplus: Implement GdipScalePenTransform(). gdiplus: Fix the number of transformed points for squared caps. xmllite/reader: Fix compiler warning. inetcomm: Fix a leak on DeleteProp() (Valgrind). Olivier F. R. Dierick (1): explorer: Don't change Z-order of the taskbar when displaying it. Paul Gofman (1): d3dx9: Return correct comment length from get_instr_length(). Pierre Schweitzer (1): msi: Don't consider read-only drives when enumerating volumes. Piotr Caban (10): msvcr120: Added _Cbuild implementation. msvcp140: Added _Winerror_message implementation. msvcr100: Use scoped_lock internal buffer when locking critical_section. msvcr100: Add _NonReentrantPPLLock class implementation. msvcr100: Add _ReentrantPPLLock class implementation. msvcr100: Add _ReentrantPPLLock::_Scoped_lock class implementation. msvcr100: Added _Scoped_lock::_NonReentrantPPLLock class. msvcrt: Support "China" country name in setlocale function. msvcp140: Add _Winerror_map implementation. msvcrt: Add _vscprintf_l implementation. Ralf Habacker (1): explorer: Fix atom leaks caused by not releasing DDE interface. Roger Zoellner (1): ntdll: Relax checks for valid affinity mask in NtSetInformationThread(). Sebastian Lackner (2): opengl32: Add wrappers for glDebugMessageCallback to handle calling convention differences. xaudio2: Use assembly wrapper to call OnVoiceProcessingPassStart callback. Serge Gautherie (1): jscript: Fix a MSVC-x64 warning about to_uint32(). Stefan Dösinger (5): msvcp140: Implement _Temp_get. msvcp120: Tr2::_Rename_wchar NULL ptr handling differs from tr2::_Rename. msvcp140: Export _Rename. msvcp140/tests: Test _Last_write_time and _Set_last_write_time. ntdll: Avoid more race conditions in RtlDeregisterWaitEx. Sven Baars (2): dsound: Fix a memory leak (Valgrind). gdiplus: Fix a memory leak (Valgrind). Zebediah Figura (2): rpcrt4/tests: Add tests for delegated proxy methods. ole32: Use the real proxy IID in ClientRpcChannelBuffer_GetBuffer(). Zhiyi Zhang (1): riched20: Fix a use after free. -- Michael Stefaniuc mstefani(a)winehq.org

1 0

[PATCH] ntdll: Add a direct futex-based implementation of condition variables.
by Zebediah Figura 10 Feb '19

10 Feb '19

While the current path for condition variables will ultimately use futexes if they are available, the path for address waits is vulnerable to several spurious wakes, which can be obviated by using condition variables as futexes directly. This greatly improves performance for Path of Exile. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45524 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/sync.c | 84 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 67 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 693013f5a3..3293c52859 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -113,6 +113,23 @@ static inline int use_futexes(void) } return supported; } + +static void timespec_from_timeout( struct timespec *timespec, const LARGE_INTEGER *timeout ) +{ + LARGE_INTEGER now; + timeout_t diff; + + if (timeout->QuadPart > 0) + { + NtQuerySystemTime( &now ); + diff = timeout->QuadPart - now.QuadPart; + } + else + diff = -timeout->QuadPart; + + timespec->tv_sec = diff / TICKSPERSEC; + timespec->tv_nsec = (diff % TICKSPERSEC) * 100; +} #endif /* creates a struct security_descriptor and contained information in one contiguous piece of memory */ @@ -1876,6 +1893,47 @@ BOOLEAN WINAPI RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) return TRUE; } +#ifdef __linux__ +static NTSTATUS fast_wait_cv( RTL_CONDITION_VARIABLE *variable, int val, const LARGE_INTEGER *timeout ) +{ + struct timespec timespec; + int ret; + + if (!use_futexes()) + return STATUS_NOT_IMPLEMENTED; + + if (timeout && timeout->QuadPart != TIMEOUT_INFINITE) + { + timespec_from_timeout( &timespec, timeout ); + ret = futex_wait( (int *)&variable->Ptr, val, &timespec ); + } + else + ret = futex_wait( (int *)&variable->Ptr, val, NULL ); + + if (ret == -1 && errno == ETIMEDOUT) + return STATUS_TIMEOUT; + return STATUS_WAIT_0; +} + +static NTSTATUS fast_wake_cv( RTL_CONDITION_VARIABLE *variable, int count ) +{ + if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; + + futex_wake( (int *)&variable->Ptr, count ); + return STATUS_SUCCESS; +} +#else +static NTSTATUS fast_wait_cv( RTL_CONDITION_VARIABLE *variable, int val, const LARGE_INTEGER *timeout ) +{ + return STATUS_NOT_IMPLEMENTED; +} + +static NTSTATUS fast_wake_cv( RTL_CONDITION_VARIABLE *variable, int count ) +{ + return STATUS_NOT_IMPLEMENTED; +} +#endif + /*********************************************************************** * RtlInitializeConditionVariable (NTDLL.@) * @@ -1910,7 +1968,8 @@ void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable ) void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) { interlocked_xchg_add( (int *)&variable->Ptr, 1 ); - RtlWakeAddressSingle( variable ); + if (fast_wake_cv( variable, 1 ) == STATUS_NOT_IMPLEMENTED) + RtlWakeAddressSingle( variable ); } /*********************************************************************** @@ -1921,7 +1980,8 @@ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) { interlocked_xchg_add( (int *)&variable->Ptr, 1 ); - RtlWakeAddressAll( variable ); + if (fast_wake_cv( variable, INT_MAX ) == STATUS_NOT_IMPLEMENTED) + RtlWakeAddressAll( variable ); } /*********************************************************************** @@ -1947,7 +2007,8 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R RtlLeaveCriticalSection( crit ); - status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); + if ((status = fast_wait_cv( variable, val, timeout )) == STATUS_NOT_IMPLEMENTED) + status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); RtlEnterCriticalSection( crit ); @@ -1984,7 +2045,8 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, else RtlReleaseSRWLockExclusive( lock ); - status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); + if ((status = fast_wait_cv( variable, val, timeout )) == STATUS_NOT_IMPLEMENTED) + status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout ); if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) RtlAcquireSRWLockShared( lock ); @@ -2039,8 +2101,6 @@ static inline NTSTATUS fast_wait_addr( const void *addr, const void *cmp, SIZE_T { int *futex; int val; - LARGE_INTEGER now; - timeout_t diff; struct timespec timespec; int ret; @@ -2060,17 +2120,7 @@ static inline NTSTATUS fast_wait_addr( const void *addr, const void *cmp, SIZE_T if (timeout) { - if (timeout->QuadPart > 0) - { - NtQuerySystemTime( &now ); - diff = timeout->QuadPart - now.QuadPart; - } - else - diff = -timeout->QuadPart; - - timespec.tv_sec = diff / TICKSPERSEC; - timespec.tv_nsec = (diff % TICKSPERSEC) * 100; - + timespec_from_timeout( &timespec, timeout ); ret = futex_wait( futex, val, &timespec ); } else -- 2.20.1

1 0

[PATCH v2] winecfg: Update Windows version array.
by Isira Seneviratne 10 Feb '19

10 Feb '19

2 1