February 2019 - Wine-commits

Huw Davies : libport: Add support for singleton decomposition.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: db3ae2ca9fdbfff288db283b28583514b5faae70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db3ae2ca9fdbfff288db283b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 8 10:41:26 2019 +0000 libport: Add support for singleton decomposition. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 6 + libs/port/decompose.c | 314 ++++++++++++++++++++++++++++++++++--------- tools/make_unicode | 18 ++- 3 files changed, 267 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=db3ae2ca9fdbfff288db…

1 0

Huw Davies : kernel32: Implement canonical composing.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 2d2e93519074997fabf7e1e285cb2048e29d8ecf URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d2e93519074997fabf7e1e2… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 8 10:41:27 2019 +0000 kernel32: Implement canonical composing. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 4 ++-- dlls/kernel32/tests/locale.c | 44 ++++++++++++++++++++++---------------------- include/wine/unicode.h | 1 + libs/port/normalize.c | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index f2455bd..9f539dd 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -5407,8 +5407,8 @@ INT WINAPI NormalizeString(NORM_FORM form, const WCHAR *src, INT src_len, WCHAR if (compose) { - FIXME("Composing not yet implemented\n"); - res = 0; + res = wine_compose_string( buf, res ); + if (dst_len >= res) memcpy( dst, buf, res * sizeof(WCHAR) ); } done: diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index d877c65..0c05311 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5697,28 +5697,28 @@ static void test_NormalizeString(void) }; static const struct test_data_normal test_arr[] = { - { part0_str1, { part0_str1, part0_nfd1, part0_str1, part0_nfd1 }, { 1, 0, 1, 0 } }, - { part0_str2, { part0_nfc2, part0_str2, part0_nfc2, part0_str2 }, { 1, 0, 1, 0 } }, - { part0_str3, { part0_nfc3, part0_str3, part0_nfc3, part0_str3 }, { 1, 0, 1, 0 } }, - { part0_str4, { part0_nfc4, part0_str4, part0_nfc4, part0_str4 }, { 1, 0, 1, 0 } }, - { part0_str5, { part0_nfc5, part0_nfc5, part0_nfc5, part0_nfc5 }, { 1, 0, 1, 0 } }, - { part0_str6, { part0_nfc6, part0_nfc6, part0_nfc6, part0_nfc6 }, { 1, 0, 1, 0 } }, - { part0_str8, { part0_str8, part0_nfd8, part0_str8, part0_nfd8 }, { 1, 0, 1, 0 } }, - { part0_str9, { part0_nfc9, part0_nfd9, part0_nfc9, part0_nfd9 }, { 1, 0, 1, 0 } }, - { part0_str10, { part0_str10, part0_nfd10, part0_str10, part0_nfd10 }, { 1, 0, 1, 0 } }, - { part0_str11, { part0_str11, part0_nfd11, part0_str11, part0_nfd11 }, { 1, 0, 1, 0 } }, - { part0_str12, { part0_nfc12, part0_nfd12, part0_nfc12, part0_nfd12 }, { 1, 0, 1, 0 } }, - { part1_str1, { part1_str1, part1_str1, part1_nfkc1, part1_nfkc1 }, { 1, 0, 1, 0 } }, - { part1_str2, { part1_str2, part1_str2, part1_nfkc2, part1_nfkc2 }, { 1, 0, 1, 0 } }, - { part1_str3, { part1_str3, part1_nfd3, part1_str3, part1_nfd3 }, { 1, 0, 1, 0 } }, - { part1_str4, { part1_str4, part1_str4, part1_nfkc4, part1_nfkc4 }, { 1, 0, 1, 0 } }, - { part1_str5, { part1_str5, part1_nfd5, part1_str5, part1_nfd5 }, { 1, 0, 1, 0 } }, - { part1_str6, { part1_str6, part1_nfd6, part1_str6, part1_nfd6 }, { 1, 0, 1, 0 } }, - { part1_str7, { part1_str7, part1_str7, part1_nfkc7, part1_nfkc7 }, { 1, 0, 1, 0 } }, - { part1_str8, { part1_str8, part1_nfd8, part1_str8, part1_nfd8 }, { 1, 0, 1, 0 } }, - { part1_str9, { part1_str9, part1_str9, part1_nfkc9, part1_nfkc9 }, { 1, 0, 1, 0 } }, - { part1_str10, { part1_str10, part1_str10, part1_nfkc10, part1_nfkc10 }, { 1, 0, 1, 0 } }, - { part1_str11, { part1_nfc11, part1_nfd11, part1_nfc11, part1_nfd11 }, { 1, 0, 1, 0 } }, + { part0_str1, { part0_str1, part0_nfd1, part0_str1, part0_nfd1 } }, + { part0_str2, { part0_nfc2, part0_str2, part0_nfc2, part0_str2 } }, + { part0_str3, { part0_nfc3, part0_str3, part0_nfc3, part0_str3 } }, + { part0_str4, { part0_nfc4, part0_str4, part0_nfc4, part0_str4 } }, + { part0_str5, { part0_nfc5, part0_nfc5, part0_nfc5, part0_nfc5 } }, + { part0_str6, { part0_nfc6, part0_nfc6, part0_nfc6, part0_nfc6 } }, + { part0_str8, { part0_str8, part0_nfd8, part0_str8, part0_nfd8 } }, + { part0_str9, { part0_nfc9, part0_nfd9, part0_nfc9, part0_nfd9 } }, + { part0_str10, { part0_str10, part0_nfd10, part0_str10, part0_nfd10 } }, + { part0_str11, { part0_str11, part0_nfd11, part0_str11, part0_nfd11 } }, + { part0_str12, { part0_nfc12, part0_nfd12, part0_nfc12, part0_nfd12 } }, + { part1_str1, { part1_str1, part1_str1, part1_nfkc1, part1_nfkc1 } }, + { part1_str2, { part1_str2, part1_str2, part1_nfkc2, part1_nfkc2 } }, + { part1_str3, { part1_str3, part1_nfd3, part1_str3, part1_nfd3 } }, + { part1_str4, { part1_str4, part1_str4, part1_nfkc4, part1_nfkc4 } }, + { part1_str5, { part1_str5, part1_nfd5, part1_str5, part1_nfd5 } }, + { part1_str6, { part1_str6, part1_nfd6, part1_str6, part1_nfd6 } }, + { part1_str7, { part1_str7, part1_str7, part1_nfkc7, part1_nfkc7 } }, + { part1_str8, { part1_str8, part1_nfd8, part1_str8, part1_nfd8 } }, + { part1_str9, { part1_str9, part1_str9, part1_nfkc9, part1_nfkc9 } }, + { part1_str10, { part1_str10, part1_str10, part1_nfkc10, part1_nfkc10 } }, + { part1_str11, { part1_nfc11, part1_nfd11, part1_nfc11, part1_nfd11 } }, { 0 } }; const struct test_data_normal *ptest = test_arr; diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 2c21cdf..a4b483a 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -101,6 +101,7 @@ extern int wine_compare_string( int flags, const WCHAR *str1, int len1, const WC extern int wine_get_sortkey( int flags, const WCHAR *src, int srclen, char *dst, int dstlen ); extern int wine_fold_string( int flags, const WCHAR *src, int srclen , WCHAR *dst, int dstlen ); +extern unsigned int wine_compose_string( WCHAR *str, unsigned int len ); extern unsigned int wine_decompose_string( int flags, const WCHAR *src, unsigned int srclen, WCHAR *dst, unsigned int dstlen ); #define WINE_DECOMPOSE_COMPAT 1 #define WINE_DECOMPOSE_REORDER 2 diff --git a/libs/port/normalize.c b/libs/port/normalize.c index 8363eee..954a33c 100644 --- a/libs/port/normalize.c +++ b/libs/port/normalize.c @@ -20,6 +20,7 @@ #include "wine/unicode.h" +extern WCHAR wine_compose( const WCHAR *str ) DECLSPEC_HIDDEN; extern unsigned int wine_decompose( int flags, WCHAR ch, WCHAR *dst, unsigned int dstlen ) DECLSPEC_HIDDEN; extern const unsigned short combining_class_table[] DECLSPEC_HIDDEN; @@ -104,3 +105,37 @@ unsigned int wine_decompose_string( int flags, const WCHAR *src, unsigned int sr if (flags & WINE_DECOMPOSE_REORDER) canonical_order_string( dst, dst_pos ); return dst_pos; } + +static BOOL is_blocked( WCHAR *starter, WCHAR *ptr ) +{ + if (ptr == starter + 1) return FALSE; + /* Because the string is already canonically ordered, the chars are blocked + only if the previous char's combining class is equal to the test char. */ + if (get_combining_class( *(ptr - 1) ) == get_combining_class( *ptr )) return TRUE; + return FALSE; +} + +unsigned int wine_compose_string( WCHAR *str, unsigned int len ) +{ + unsigned int i, last_starter = len; + WCHAR pair[2], comp; + + for (i = 0; i < len; i++) + { + pair[1] = str[i]; + if (last_starter == len || is_blocked( str + last_starter, str + i ) || !(comp = wine_compose( pair ))) + { + if (is_starter( str[i] )) + { + last_starter = i; + pair[0] = str[i]; + } + continue; + } + str[last_starter] = pair[0] = comp; + len--; + memmove( str + i, str + i + 1, (len - i) * sizeof(WCHAR) ); + i = last_starter; + } + return len; +}

1 0

Zebediah Figura : ntdll: Add a direct futex-based implementation of condition variables.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: be541f1b0cf2bec93b59d3a2fde2b6c0593c011b URL: https://source.winehq.org/git/wine.git/?a=commit;h=be541f1b0cf2bec93b59d3a2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Feb 10 12:26:45 2019 -0600 ntdll: Add a direct futex-based implementation of condition variables. 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 693013f..3293c52 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

1 0

Alistair Leslie-Hughes : include: Add more VSS_* typedefs.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: c6b5651dc41a2cb3e7576bfd48eb92ab5d5edf11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6b5651dc41a2cb3e7576bfd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 10 22:48:08 2019 +0000 include: Add more VSS_* typedefs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vss.idl | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/include/vss.idl b/include/vss.idl index 62335ea..902a6ae 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, + 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, + 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 0

Alistair Leslie-Hughes : include: Add VSS writer enums.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: b6591734ddb754089743fbd3eb74338f18f0c3a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6591734ddb754089743fbd3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 10 22:48:10 2019 +0000 include: Add VSS writer enums. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vswriter.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/vswriter.h b/include/vswriter.h index 043b871..f0cc842 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, + VSS_CT_DATABASE, + VSS_CT_FILEGROUP +} VSS_COMPONENT_TYPE; + +typedef enum VSS_FILE_RESTORE_STATUS +{ + VSS_RS_UNDEFINED, + VSS_RS_NONE, + VSS_RS_ALL, + VSS_RS_FAILED +} VSS_FILE_RESTORE_STATUS; + #endif /* ___WINE_VSWRITER_H */

1 0

Alistair Leslie-Hughes : include: Convert header vswriter to an idl.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: e9ab48abdacce2c97333f5a84475fb6f798c128d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9ab48abdacce2c97333f5a8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 10 22:48:11 2019 +0000 include: Convert header vswriter to an idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 2 +- include/{vswriter.h => vswriter.idl} | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) 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.idl similarity index 94% rename from include/vswriter.h rename to include/vswriter.idl index f0cc842..9d7d4dc 100644 --- a/include/vswriter.h +++ b/include/vswriter.idl @@ -15,9 +15,7 @@ * 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 +import "oaidl.idl"; typedef enum { @@ -58,5 +56,3 @@ typedef enum VSS_FILE_RESTORE_STATUS VSS_RS_ALL, VSS_RS_FAILED } VSS_FILE_RESTORE_STATUS; - -#endif /* ___WINE_VSWRITER_H */

1 0

Alistair Leslie-Hughes : include: Add vsbackup.idl.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: b21f85c18f07c27d454b18ff14ef79d0967957aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=b21f85c18f07c27d454b18ff… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 10 22:48:12 2019 +0000 include: Add vsbackup.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/vsbackup.idl | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) 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 0

Alistair Leslie-Hughes : vssapi: Add CreateVssBackupComponentsInternal stub.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: ce9b5a7e1782828f0a84d31eff73cf643ea4fe85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9b5a7e1782828f0a84d31e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 10 22:48:13 2019 +0000 vssapi: Add CreateVssBackupComponentsInternal stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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..b2dca11 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 0

Alistair Leslie-Hughes : vssapi: Add ? CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z stub.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 767c94bc5c0b9cdef0465b0fec555d846331fb03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=767c94bc5c0b9cdef0465b0f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Feb 10 23:36:55 2019 +0000 vssapi: Add ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 0

Zebediah Figura : oleaut32: Register non-dual dispinterfaces using the correct proxy.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: f72f8e5c4036ed3344ef9aa5df8f000b1634c664 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f72f8e5c4036ed3344ef9aa5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Feb 10 21:20:35 2019 -0600 oleaut32: Register non-dual dispinterfaces using the correct proxy. Fixes a bug where NetLinx Studio 4 would fail to compile files. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 22 +++++++++++++++++++++- dlls/oleaut32/typelib.c | 20 +++++++++++++++----- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 90f0cb2..857100e 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4963,6 +4963,7 @@ static void test_register_typelib(BOOL system_registration) HKEY hkey; REGSAM opposite = (sizeof(void*) == 8 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY); BOOL is_wow64 = FALSE; + LONG size; struct { TYPEKIND kind; @@ -5071,7 +5072,26 @@ static void test_register_typelib(BOOL system_registration) ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ, &hkey); ok(ret == expect_ret, "%d: got %d\n", i, ret); - if(ret == ERROR_SUCCESS) RegCloseKey(hkey); + if (ret == ERROR_SUCCESS) + { + size = sizeof(uuid); + ret = RegQueryValueA(hkey, "ProxyStubClsid32", uuid, &size); + ok(!ret, "Failed to get proxy GUID, error %u.\n", ret); + + if (attrs[i].kind == TKIND_INTERFACE || (attrs[i].flags & TYPEFLAG_FDUAL)) + { + ok(!strcasecmp(uuid, "{00020424-0000-0000-c000-000000000046}"), + "Got unexpected proxy CLSID %s.\n", uuid); + } + else + { + ok(!strcasecmp(uuid, "{00020420-0000-0000-c000-000000000046}"), + "Got unexpected proxy CLSID %s.\n", uuid); + } + + RegCloseKey(hkey); + } + /* 32-bit typelibs should be registered into both registry bit modes */ if (is_win64 || is_wow64) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f17a926..acd4d07 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -578,14 +578,24 @@ static void TLB_register_interface(TLIBATTR *libattr, LPOLESTR name, TYPEATTR *t WCHAR keyName[60]; HKEY key, subKey; - static const WCHAR PSOA[] = {'{','0','0','0','2','0','4','2','4','-', - '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', - '0','0','0','0','0','0','0','0','0','0','4','6','}',0}; + static const WCHAR typelib_proxy_clsid[] = {'{','0','0','0','2','0','4','2','4','-', + '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', + '0','0','0','0','0','0','0','0','0','0','4','6','}',0}; + static const WCHAR dispatch_proxy_clsid[] = {'{','0','0','0','2','0','4','2','0','-', + '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', + '0','0','0','0','0','0','0','0','0','0','4','6','}',0}; get_interface_key( &tattr->guid, keyName ); if (RegCreateKeyExW(HKEY_CLASSES_ROOT, keyName, 0, NULL, 0, KEY_WRITE | flag, NULL, &key, NULL) == ERROR_SUCCESS) { + const WCHAR *proxy_clsid; + + if (tattr->typekind == TKIND_INTERFACE || (tattr->wTypeFlags & TYPEFLAG_FDUAL)) + proxy_clsid = typelib_proxy_clsid; + else + proxy_clsid = dispatch_proxy_clsid; + if (name) RegSetValueExW(key, NULL, 0, REG_SZ, (BYTE *)name, (strlenW(name)+1) * sizeof(OLECHAR)); @@ -593,14 +603,14 @@ static void TLB_register_interface(TLIBATTR *libattr, LPOLESTR name, TYPEATTR *t if (RegCreateKeyExW(key, ProxyStubClsidW, 0, NULL, 0, KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) { RegSetValueExW(subKey, NULL, 0, REG_SZ, - (const BYTE *)PSOA, sizeof PSOA); + (const BYTE *)proxy_clsid, sizeof(typelib_proxy_clsid)); RegCloseKey(subKey); } if (RegCreateKeyExW(key, ProxyStubClsid32W, 0, NULL, 0, KEY_WRITE | flag, NULL, &subKey, NULL) == ERROR_SUCCESS) { RegSetValueExW(subKey, NULL, 0, REG_SZ, - (const BYTE *)PSOA, sizeof PSOA); + (const BYTE *)proxy_clsid, sizeof(typelib_proxy_clsid)); RegCloseKey(subKey); }

1 0