November 2020 - Wine-Commits

Alexandre Julliard : mscms: Implement profile tag functions without relying on liblcms2.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: 881dad65035b5453184c9421dbb9685179a8366e URL: https://source.winehq.org/git/wine.git/?a=commit;h=881dad65035b5453184c9421… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 12:40:09 2020 +0100 mscms: Implement profile tag functions without relying on liblcms2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/icc.c | 75 ++++++++++++++++++++++++++++++++++++++++--------- dlls/mscms/mscms_priv.h | 12 +++++++- dlls/mscms/profile.c | 33 ++++------------------ 3 files changed, 79 insertions(+), 41 deletions(-) diff --git a/dlls/mscms/icc.c b/dlls/mscms/icc.c index 3b1c718b174..0476d805547 100644 --- a/dlls/mscms/icc.c +++ b/dlls/mscms/icc.c @@ -40,6 +40,11 @@ static inline void adjust_endianness32( ULONG *ptr ) #endif } +static const struct tag_entry *first_tag( const struct profile *profile ) +{ + return (const struct tag_entry *)(profile->data + sizeof(PROFILEHEADER) + sizeof(DWORD)); +} + void get_profile_header( const struct profile *profile, PROFILEHEADER *header ) { unsigned int i; @@ -62,34 +67,77 @@ void set_profile_header( const struct profile *profile, const PROFILEHEADER *hea adjust_endianness32( (ULONG *)profile->data + i ); } -static BOOL get_adjusted_tag( const struct profile *profile, TAGTYPE type, cmsTagEntry *tag ) +DWORD get_tag_count( const struct profile *profile ) { - DWORD i, num_tags = *(DWORD *)(profile->data + sizeof(cmsICCHeader)); - cmsTagEntry *entry; - ULONG sig; - + DWORD num_tags = *(DWORD *)(profile->data + sizeof(PROFILEHEADER)); adjust_endianness32( &num_tags ); - for (i = 0; i < num_tags; i++) + if ((const BYTE *)(first_tag( profile ) + num_tags) > (const BYTE *)profile->data + profile->size) + return 0; + return num_tags; +} + +BOOL get_tag_entry( const struct profile *profile, DWORD index, struct tag_entry *tag ) +{ + const struct tag_entry *entry = first_tag( profile ); + + if (index < 1 || index > get_tag_count( profile )) return FALSE; + *tag = entry[index - 1]; + adjust_endianness32( &tag->sig ); + adjust_endianness32( &tag->offset ); + adjust_endianness32( &tag->size ); + if (tag->offset > profile->size || tag->size > profile->size - tag->offset) return FALSE; + return TRUE; +} + +BOOL get_adjusted_tag( const struct profile *profile, TAGTYPE type, struct tag_entry *tag ) +{ + const struct tag_entry *entry = first_tag( profile ); + DWORD sig, i; + + for (i = get_tag_count(profile); i > 0; i--, entry++) { - entry = (cmsTagEntry *)(profile->data + sizeof(cmsICCHeader) + sizeof(DWORD) + i * sizeof(*tag)); sig = entry->sig; adjust_endianness32( &sig ); if (sig == type) { - tag->sig = sig; - tag->offset = entry->offset; - tag->size = entry->size; + *tag = *entry; + adjust_endianness32( &tag->sig ); adjust_endianness32( &tag->offset ); adjust_endianness32( &tag->size ); + if (tag->offset > profile->size || tag->size > profile->size - tag->offset) return FALSE; + return TRUE; + } + } + return FALSE; +} + +static BOOL get_linked_tag( const struct profile *profile, struct tag_entry *ret ) +{ + const struct tag_entry *entry = first_tag( profile ); + DWORD sig, offset, size, i; + + for (i = get_tag_count(profile); i > 0; i--, entry++) + { + sig = entry->sig; + adjust_endianness32( &sig ); + if (sig == ret->sig) continue; + offset = entry->offset; + size = entry->size; + adjust_endianness32( &offset ); + adjust_endianness32( &size ); + if (size == ret->size && offset == ret->offset) + { + ret->sig = sig; return TRUE; } } return FALSE; } -BOOL get_tag_data( const struct profile *profile, TAGTYPE type, DWORD offset, void *buffer, DWORD *len ) +BOOL get_tag_data( const struct profile *profile, TAGTYPE type, DWORD offset, void *buffer, + DWORD *len, BOOL *linked ) { - cmsTagEntry tag; + struct tag_entry tag; if (!get_adjusted_tag( profile, type, &tag )) return FALSE; @@ -102,12 +150,13 @@ BOOL get_tag_data( const struct profile *profile, TAGTYPE type, DWORD offset, vo } memcpy( buffer, profile->data + tag.offset + offset, tag.size - offset ); *len = tag.size - offset; + if (linked) *linked = get_linked_tag( profile, &tag ); return TRUE; } BOOL set_tag_data( const struct profile *profile, TAGTYPE type, DWORD offset, const void *buffer, DWORD *len ) { - cmsTagEntry tag; + struct tag_entry tag; if (!get_adjusted_tag( profile, type, &tag )) return FALSE; diff --git a/dlls/mscms/mscms_priv.h b/dlls/mscms/mscms_priv.h index ffa2cb4b4c9..f085c5bfbd6 100644 --- a/dlls/mscms/mscms_priv.h +++ b/dlls/mscms/mscms_priv.h @@ -56,7 +56,17 @@ void release_transform( struct transform * ) DECLSPEC_HIDDEN; extern void free_handle_tables( void ) DECLSPEC_HIDDEN; -extern BOOL get_tag_data( const struct profile *, TAGTYPE, DWORD, void *, DWORD * ) DECLSPEC_HIDDEN; +struct tag_entry +{ + DWORD sig; + DWORD offset; + DWORD size; +}; + +extern DWORD get_tag_count( const struct profile * ) DECLSPEC_HIDDEN; +extern BOOL get_tag_entry( const struct profile *, DWORD, struct tag_entry * ) DECLSPEC_HIDDEN; +extern BOOL get_adjusted_tag( const struct profile *, TAGTYPE, struct tag_entry * ) DECLSPEC_HIDDEN; +extern BOOL get_tag_data( const struct profile *, TAGTYPE, DWORD, void *, DWORD *, BOOL * ) DECLSPEC_HIDDEN; extern BOOL set_tag_data( const struct profile *, TAGTYPE, DWORD, const void *, DWORD * ) DECLSPEC_HIDDEN; extern void get_profile_header( const struct profile *, PROFILEHEADER * ) DECLSPEC_HIDDEN; extern void set_profile_header( const struct profile *, const PROFILEHEADER * ) DECLSPEC_HIDDEN; diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index ed0ed53158a..0f31ae91155 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -347,13 +347,7 @@ BOOL WINAPI GetColorProfileElement( HPROFILE handle, TAGTYPE type, DWORD offset, release_profile( profile ); return FALSE; } - if (!get_tag_data( profile, type, offset, buffer, size )) - { - release_profile( profile ); - return FALSE; - } - ret = get_tag_data( profile, type, offset, buffer, size ); - *ref = cmsTagLinkedTo( profile->cmsprofile, type ) != 0; + ret = get_tag_data( profile, type, offset, buffer, size, ref ); release_profile( profile ); #endif /* HAVE_LCMS2 */ return ret; @@ -382,8 +376,7 @@ BOOL WINAPI GetColorProfileElementTag( HPROFILE handle, DWORD index, PTAGTYPE ty BOOL ret = FALSE; #ifdef HAVE_LCMS2 struct profile *profile = grab_profile( handle ); - cmsInt32Number num_tags; - cmsTagSignature sig; + struct tag_entry tag; TRACE( "( %p, %d, %p )\n", handle, index, type ); @@ -394,17 +387,7 @@ BOOL WINAPI GetColorProfileElementTag( HPROFILE handle, DWORD index, PTAGTYPE ty release_profile( profile ); return FALSE; } - num_tags = cmsGetTagCount( profile->cmsprofile ); - if (num_tags < 0 || index > num_tags || index < 1) - { - release_profile( profile ); - return FALSE; - } - if ((sig = cmsGetTagSignature( profile->cmsprofile, index - 1 ))) - { - *type = sig; - ret = TRUE; - } + if ((ret = get_tag_entry( profile, index, &tag ))) *type = tag.sig; release_profile( profile ); #endif /* HAVE_LCMS2 */ @@ -523,7 +506,6 @@ BOOL WINAPI GetCountColorProfileElements( HPROFILE handle, PDWORD count ) BOOL ret = FALSE; #ifdef HAVE_LCMS2 struct profile *profile = grab_profile( handle ); - cmsInt32Number num_tags; TRACE( "( %p, %p )\n", handle, count ); @@ -534,11 +516,7 @@ BOOL WINAPI GetCountColorProfileElements( HPROFILE handle, PDWORD count ) release_profile( profile ); return FALSE; } - if ((num_tags = cmsGetTagCount( profile->cmsprofile )) >= 0) - { - *count = num_tags; - ret = TRUE; - } + *count = get_tag_count( profile ); release_profile( profile ); #endif /* HAVE_LCMS2 */ @@ -1151,6 +1129,7 @@ BOOL WINAPI IsColorProfileTagPresent( HPROFILE handle, TAGTYPE type, PBOOL prese BOOL ret = FALSE; #ifdef HAVE_LCMS2 struct profile *profile = grab_profile( handle ); + struct tag_entry tag; TRACE( "( %p, 0x%08x, %p )\n", handle, type, present ); @@ -1161,7 +1140,7 @@ BOOL WINAPI IsColorProfileTagPresent( HPROFILE handle, TAGTYPE type, PBOOL prese release_profile( profile ); return FALSE; } - *present = (cmsIsTag( profile->cmsprofile, type ) != 0); + *present = get_adjusted_tag( profile, type, &tag ); release_profile( profile ); ret = TRUE;

1 0

Alistair Leslie-Hughes : include: Add IConvertType interface.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: 34155d099835d49941793e3364be975a4a41a486 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34155d099835d49941793e33… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 10 20:29:58 2020 +1100 include: Add IConvertType interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 13 +++++++++++++ include/Makefile.in | 1 + include/cvttyp.idl | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 4 files changed, 65 insertions(+) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 9eb14147690..fa086290061 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1616,3 +1616,16 @@ HRESULT __RPC_STUB ICommandProperties_SetProperties_Stub(ICommandProperties* Thi FIXME("(%p)->(%d %p %d %p %p): stub\n", This, count, propertyset, total, propstatus, error); return E_NOTIMPL; } + +HRESULT CALLBACK IConvertType_CanConvert_Proxy(IConvertType* This, DBTYPE from, DBTYPE to, DBCONVERTFLAGS flags) +{ + FIXME("(%p)->(%d %d 0x%08x): stub\n", This, from, to, flags); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IConvertType_CanConvert_Stub(IConvertType* This, DBTYPE from, DBTYPE to, + DBCONVERTFLAGS flags, IErrorInfo **error) +{ + FIXME("(%p)->(%d %d 0x%08x %p): stub\n", This, from, to, flags, error); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index c9c8ebe8bb5..3ccacdaeecf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -91,6 +91,7 @@ SOURCES = \ ctxtcall.idl \ custcntl.h \ cvconst.h \ + cvttyp.idl \ d2d1.idl \ d2d1_1.idl \ d2d1_2.idl \ diff --git a/include/cvttyp.idl b/include/cvttyp.idl new file mode 100644 index 00000000000..87bc385a5ba --- /dev/null +++ b/include/cvttyp.idl @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2020 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 + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a88-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IConvertType : IUnknown +{ + typedef DWORD DBCONVERTFLAGS; + + enum DBCONVERTFLAGSENUM + { + DBCONVERTFLAGS_COLUMN = 0x000, + DBCONVERTFLAGS_PARAMETER = 0x001, + }; + + enum DBCONVERTFLAGSENUM20 + { + DBCONVERTFLAGS_ISLONG = 0x002, + DBCONVERTFLAGS_ISFIXEDLENGTH = 0x004, + DBCONVERTFLAGS_FROMVARIANT = 0x008, + }; + + [local] + HRESULT CanConvert([in] DBTYPE from, [in] DBTYPE to, [in] DBCONVERTFLAGS flags); + + [call_as(CanConvert)] + HRESULT RemoteCanConvert([in] DBTYPE from, [in] DBTYPE to, [in] DBCONVERTFLAGS flags, [out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index 4370c7f6bcc..c56460262f5 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -72,6 +72,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "getdts.idl" #include "cmdstrm.idl" #include "cmdprp.idl" +#include "cvttyp.idl" cpp_quote("#include <accctrl.h>")

1 0

Jacek Caban : server: Support waiting on screen buffer handles.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: 2eb8644426d327d2c75fd02dd4d038c68c901fad URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eb8644426d327d2c75fd02d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 10 16:31:53 2020 +0100 server: Support waiting on screen buffer handles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 4 ---- server/console.c | 14 +++++++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 6d15abd8c5f..4a06a2b396e 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1019,7 +1019,6 @@ static void test_wait(HANDLE input, HANDLE orig_output) res = WaitForSingleObject(input, 0); ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); res = WaitForSingleObject(output, 0); - todo_wine ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); res = WaitForSingleObject(orig_output, 0); ok(res == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", res); @@ -1027,7 +1026,6 @@ static void test_wait(HANDLE input, HANDLE orig_output) ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); status = NtWaitForSingleObject(output, FALSE, &zero); - todo_wine ok(status == STATUS_TIMEOUT || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); @@ -1037,7 +1035,6 @@ static void test_wait(HANDLE input, HANDLE orig_output) res = WaitForSingleObject(input, 0); ok(!res, "WaitForSingleObject returned %x\n", res); res = WaitForSingleObject(output, 0); - todo_wine ok(!res, "WaitForSingleObject returned %x\n", res); res = WaitForSingleObject(orig_output, 0); ok(!res, "WaitForSingleObject returned %x\n", res); @@ -1045,7 +1042,6 @@ static void test_wait(HANDLE input, HANDLE orig_output) ok(!status || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); status = NtWaitForSingleObject(output, FALSE, &zero); - todo_wine ok(!status || broken(status == STATUS_ACCESS_DENIED /* win2k8 */), "NtWaitForSingleObject returned %x\n", status); diff --git a/server/console.c b/server/console.c index 4e51ed48a31..8bb7d8ecfa8 100644 --- a/server/console.c +++ b/server/console.c @@ -208,6 +208,7 @@ struct screen_buffer static void screen_buffer_dump( struct object *obj, int verbose ); static void screen_buffer_destroy( struct object *obj ); +static int screen_buffer_add_queue( struct object *obj, struct wait_queue_entry *entry ); static struct fd *screen_buffer_get_fd( struct object *obj ); static struct object *screen_buffer_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); @@ -217,7 +218,7 @@ static const struct object_ops screen_buffer_ops = sizeof(struct screen_buffer), /* size */ screen_buffer_dump, /* dump */ no_get_type, /* get_type */ - no_add_queue, /* add_queue */ + screen_buffer_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ NULL, /* satisfied */ @@ -706,6 +707,17 @@ static struct object *screen_buffer_open_file( struct object *obj, unsigned int return grab_object( obj ); } +static int screen_buffer_add_queue( struct object *obj, struct wait_queue_entry *entry ) +{ + struct screen_buffer *screen_buffer = (struct screen_buffer*)obj; + if (!screen_buffer->input) + { + set_error( STATUS_ACCESS_DENIED ); + return 0; + } + return add_queue( &screen_buffer->input->obj, entry ); +} + static struct fd *screen_buffer_get_fd( struct object *obj ) { struct screen_buffer *screen_buffer = (struct screen_buffer*)obj;

1 0

Damjan Jovanovic : ntdll: Treat smbfs as case-insensitive on FreeBSD.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: eba4f333b9ed217d8b40bde9b4941c0edc336f6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=eba4f333b9ed217d8b40bde9… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Nov 10 06:49:56 2020 +0200 ntdll: Treat smbfs as case-insensitive on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 7a97f2bdd85..f7fa78db2be 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1128,14 +1128,16 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) !strncmp( stfs.f_mntfromname, "ciopfs", 5 )) return FALSE; /* msdosfs was case-insensitive since FreeBSD 8, if not earlier */ - if (!strcmp( stfs.f_fstypename, "msdosfs" )) + if (!strcmp( stfs.f_fstypename, "msdosfs" ) || + /* older CIFS protocol versions uppercase filename on the client, + * newer versions should be case-insensitive on the server anyway */ + !strcmp( stfs.f_fstypename, "smbfs" )) return FALSE; #ifdef __APPLE__ if (!strcmp( stfs.f_fstypename, "msdos" ) || !strcmp( stfs.f_fstypename, "cd9660" ) || !strcmp( stfs.f_fstypename, "udf" ) || - !strcmp( stfs.f_fstypename, "ntfs" ) || - !strcmp( stfs.f_fstypename, "smbfs" )) + !strcmp( stfs.f_fstypename, "ntfs" )) return FALSE; #ifdef _DARWIN_FEATURE_64_BIT_INODE if (!strcmp( stfs.f_fstypename, "hfs" ) && (stfs.f_fssubtype == 0 ||

1 0

Damjan Jovanovic : ntdll: FAT filesystems are called "msdosfs" on FreeBSD >= 5.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: d1c8611886f65c11f6985bc6f4e7c72a5e349083 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1c8611886f65c11f6985bc6… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Nov 10 06:49:46 2020 +0200 ntdll: FAT filesystems are called "msdosfs" on FreeBSD >= 5. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index c8531bb4f93..3699f8b8891 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6349,7 +6349,9 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io fs_type = MOUNTMGR_FS_TYPE_ISO9660; else if (!strcmp( stfs.f_fstypename, "udf" )) fs_type = MOUNTMGR_FS_TYPE_UDF; - else if (!strcmp( stfs.f_fstypename, "msdos" )) + else if (!strcmp( stfs.f_fstypename, "msdos" )) /* FreeBSD < 5, Apple */ + fs_type = MOUNTMGR_FS_TYPE_FAT32; + else if (!strcmp( stfs.f_fstypename, "msdosfs" )) /* FreeBSD >= 5 */ fs_type = MOUNTMGR_FS_TYPE_FAT32; #endif }

1 0

Nikolay Sivov : evr/allocator: Call user callback when sample is returned to the pool.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: 2192d0146a0a066c8d04dc4d03667b48631a754a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2192d0146a0a066c8d04dc4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 13:07:22 2020 +0300 evr/allocator: Call user callback when sample is returned to the pool. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 729f279fafe..a44e3ef45c6 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -815,6 +815,9 @@ static HRESULT WINAPI sample_allocator_tracking_callback_Invoke(IMFAsyncCallback IUnknown_Release(sample); + if (allocator->callback) + IMFVideoSampleAllocatorNotify_NotifyRelease(allocator->callback); + LeaveCriticalSection(&allocator->cs); return S_OK;

1 0

Nikolay Sivov : evr/presenter: Notify renderer host about mixer latency.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: 38d75c4294399dc7465c7c5f86c6c578962e1cdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=38d75c4294399dc7465c7c5f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 10 13:07:20 2020 +0300 evr/presenter: Notify renderer host about mixer latency. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 8be3dd91aa7..5bffa9af228 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -131,6 +131,13 @@ static struct video_presenter *impl_from_IMFVideoPositionMapper(IMFVideoPosition return CONTAINING_RECORD(iface, struct video_presenter, IMFVideoPositionMapper_iface); } +static void video_presenter_notify_renderer(struct video_presenter *presenter, + LONG event, LONG_PTR param1, LONG_PTR param2) +{ + if (presenter->event_sink) + IMediaEventSink_Notify(presenter->event_sink, event, param1, param2); +} + static unsigned int get_gcd(unsigned int a, unsigned int b) { unsigned int m; @@ -329,6 +336,9 @@ static HRESULT video_presenter_process_input(struct video_presenter *presenter) while (hr == S_OK) { + LONGLONG mixing_started, mixing_finished; + MFTIME systime; + if (!(presenter->flags & PRESENTER_MIXER_HAS_INPUT)) break; @@ -341,6 +351,9 @@ static HRESULT video_presenter_process_input(struct video_presenter *presenter) memset(&buffer, 0, sizeof(buffer)); buffer.pSample = sample; + if (presenter->clock) + IMFClock_GetCorrelatedTime(presenter->clock, 0, &mixing_started, &systime); + if (FAILED(hr = IMFTransform_ProcessOutput(presenter->mixer, 0, 1, &buffer, &status))) { /* FIXME: failure path probably needs to handle some errors specifically */ @@ -350,6 +363,15 @@ static HRESULT video_presenter_process_input(struct video_presenter *presenter) } else { + if (presenter->clock) + { + LONGLONG latency; + + IMFClock_GetCorrelatedTime(presenter->clock, 0, &mixing_finished, &systime); + latency = mixing_finished - mixing_started; + video_presenter_notify_renderer(presenter, EC_PROCESSING_LATENCY, (LONG_PTR)&latency, 0); + } + if (buffer.pEvents) IMFCollection_Release(buffer.pEvents);

1 0

Alexandre Julliard : mscms: Move liblcms support to a new Unix library.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: daf9f128507980bb87506be43ebad36941af6218 URL: https://source.winehq.org/git/wine.git/?a=commit;h=daf9f128507980bb87506be4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 12:46:37 2020 +0100 mscms: Move liblcms support to a new Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/Makefile.in | 1 + dlls/mscms/handle.c | 9 +- dlls/mscms/icc.c | 4 - dlls/mscms/liblcms.c | 226 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mscms/mscms_main.c | 17 +--- dlls/mscms/mscms_priv.h | 22 +++-- dlls/mscms/profile.c | 88 +++++-------------- dlls/mscms/transform.c | 221 ++++------------------------------------------ 8 files changed, 287 insertions(+), 301 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=daf9f128507980bb8750…

1 0

Alistair Leslie-Hughes : include: Add ICommandProperties interface.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: e9d6612a0157eae10682b7a5346eb325ca55308b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9d6612a0157eae10682b7a5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 10 20:29:57 2020 +1100 include: Add ICommandProperties interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 27 +++++++++++++++++++++++++++ include/Makefile.in | 1 + include/cmdprp.idl | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 4 files changed, 73 insertions(+) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 2fe4e60b68b..9eb14147690 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1589,3 +1589,30 @@ HRESULT __RPC_STUB IGetDataSource_GetDataSource_Stub(IGetDataSource* This, REFII FIXME("(%p)->(%s %p %p): stub\n", This, debugstr_guid(riid), datasource, error); return E_NOTIMPL; } + +HRESULT CALLBACK ICommandProperties_GetProperties_Proxy(ICommandProperties* This, const ULONG count, + const DBPROPIDSET propertyidsets[], ULONG *sets_cnt, DBPROPSET **propertyset) +{ + FIXME("(%p)->(%d %p %p %p): stub\n", This, count, propertyidsets, sets_cnt, propertyset); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ICommandProperties_GetProperties_Stub(ICommandProperties* This, const ULONG count, + const DBPROPIDSET *propertyidsets, ULONG *sets_cnt, DBPROPSET **propertyset, IErrorInfo **error) +{ + FIXME("(%p)->(%d %p %p %p %p): stub\n", This, count, propertyidsets, sets_cnt, propertyset, error); + return E_NOTIMPL; +} + +HRESULT CALLBACK ICommandProperties_SetProperties_Proxy(ICommandProperties* This, ULONG count, DBPROPSET propertyset[]) +{ + FIXME("(%p)->(%d %p): stub\n", This, count, propertyset); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ICommandProperties_SetProperties_Stub(ICommandProperties* This, ULONG count, + DBPROPSET *propertyset, ULONG total, DBPROPSTATUS *propstatus, IErrorInfo **error) +{ + FIXME("(%p)->(%d %p %d %p %p): stub\n", This, count, propertyset, total, propstatus, error); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index 1db3765f68b..c9c8ebe8bb5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -63,6 +63,7 @@ SOURCES = \ cierror.h \ clusapi.h \ cmdbas.idl \ + cmdprp.idl \ cmdstrm.idl \ cmdtxt.idl \ cmnquery.idl \ diff --git a/include/cmdprp.idl b/include/cmdprp.idl new file mode 100644 index 00000000000..ce9e7075523 --- /dev/null +++ b/include/cmdprp.idl @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2020 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 + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a79-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ICommandProperties : IUnknown +{ + [local] + HRESULT GetProperties([in] ULONG count, [in, size_is(count)] const DBPROPIDSET propertyidsets[], + [in, out] ULONG *sets_cnt, [out, size_is(,*sets_cnt)] DBPROPSET **propertyset); + + [call_as(GetProperties)] + HRESULT RemoteGetProperties([in] ULONG count, [in, unique, size_is(count)] const DBPROPIDSET *propertyidsets, + [in, out] ULONG *sets_cnt, [out, size_is(,*sets_cnt)] DBPROPSET **propertyset, [out] IErrorInfo **error); + + [local] + HRESULT SetProperties([in] ULONG count, [in, out, unique, size_is(count)] DBPROPSET propertyset[]); + + [call_as(SetProperties)] + HRESULT RemoteSetProperties([in] ULONG count, [in, unique, size_is(count)] DBPROPSET *propertyset, + [in] ULONG total, [out, size_is(total)] DBPROPSTATUS *propstatus, [out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index 87d148f67b4..4370c7f6bcc 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -71,6 +71,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "errrec.idl" #include "getdts.idl" #include "cmdstrm.idl" +#include "cmdprp.idl" cpp_quote("#include <accctrl.h>")

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: master Commit: 71bf73795d02f624e6758491a26e243123244e31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71bf73795d02f624e6758491… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Mon Nov 9 23:19:04 2020 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/po/lt.po b/po/lt.po index 11c21bda7c8..cc929c91eb3 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-11-04 09:28+0200\n" +"PO-Revision-Date: 2020-11-09 23:18+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -9954,16 +9954,12 @@ msgid "Central Asia Daylight Time" msgstr "Vidurio Azijos vasaros laikas" #: dlls/tzres/tzres.rc:146 -#, fuzzy -#| msgid "Korea Standard Time" msgid "Lord Howe Standard Time" -msgstr "Korėjos juostinis laikas" +msgstr "Lordo Hau juostinis laikas" #: dlls/tzres/tzres.rc:147 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "Lord Howe Daylight Time" -msgstr "Korėjos vasaros laikas" +msgstr "Lordo Hau vasaros laikas" #: dlls/tzres/tzres.rc:40 msgid "Arabic Standard Time" @@ -10386,16 +10382,12 @@ msgid "Russian Daylight Time" msgstr "Rusijos vasaros laikas" #: dlls/tzres/tzres.rc:48 -#, fuzzy -#| msgid "AUS Central Standard Time" msgid "Aus Central W. Standard Time" -msgstr "AUS Centrinis juostinis laikas" +msgstr "AUS Centrinis v. juostinis laikas" #: dlls/tzres/tzres.rc:49 -#, fuzzy -#| msgid "AUS Central Daylight Time" msgid "Aus Central W. Daylight Time" -msgstr "AUS Centrinis vasaros laikas" +msgstr "AUS Centrinis v. vasaros laikas" #: dlls/tzres/tzres.rc:194 msgid "Romance Standard Time"

1 0