February 2020 - Wine-Commits

Zebediah Figura : strmbase: Simplify CompareMediaTypes().
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: 09b0d9d4564fdb087aebe39d640ba6e52c48680e URL: https://source.winehq.org/git/wine.git/?a=commit;h=09b0d9d4564fdb087aebe39d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 5 19:50:06 2020 -0600 strmbase: Simplify CompareMediaTypes(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 58778e5789..90064c25d4 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -247,12 +247,6 @@ static HRESULT SendFurther(struct strmbase_sink *sink, SendPinFunc func, void *a return hr; } -static BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * pmt2, BOOL bWildcards) -{ - return (((bWildcards && (IsEqualGUID(&pmt1->majortype, &GUID_NULL) || IsEqualGUID(&pmt2->majortype, &GUID_NULL))) || IsEqualGUID(&pmt1->majortype, &pmt2->majortype)) && - ((bWildcards && (IsEqualGUID(&pmt1->subtype, &GUID_NULL) || IsEqualGUID(&pmt2->subtype, &GUID_NULL))) || IsEqualGUID(&pmt1->subtype, &pmt2->subtype))); -} - HRESULT strmbase_pin_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { return VFW_S_NO_MORE_ITEMS; @@ -428,6 +422,24 @@ static inline struct strmbase_source *impl_source_from_IPin( IPin *iface ) return CONTAINING_RECORD(iface, struct strmbase_source, pin.IPin_iface); } +static BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b) +{ + if (!a) + return TRUE; + + if (!IsEqualGUID(&a->majortype, &b->majortype) + && !IsEqualGUID(&a->majortype, &GUID_NULL) + && !IsEqualGUID(&b->majortype, &GUID_NULL)) + return FALSE; + + if (!IsEqualGUID(&a->subtype, &b->subtype) + && !IsEqualGUID(&a->subtype, &GUID_NULL) + && !IsEqualGUID(&b->subtype, &GUID_NULL)) + return FALSE; + + return TRUE; +} + static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) { struct strmbase_source *pin = impl_source_from_IPin(iface); @@ -468,7 +480,7 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP for (i = 0; pin->pFuncsTable->base.pin_get_media_type(&pin->pin, i, &candidate) == S_OK; ++i) { strmbase_dump_media_type(&candidate); - if ((!mt || CompareMediaTypes(mt, &candidate, TRUE)) + if (compare_media_types(mt, &candidate) && pin->pFuncsTable->pfnAttemptConnection(pin, peer, &candidate) == S_OK) { LeaveCriticalSection(&pin->pin.filter->csFilter); @@ -482,7 +494,7 @@ static HRESULT WINAPI source_Connect(IPin *iface, IPin *peer, const AM_MEDIA_TYP { while (IEnumMediaTypes_Next(enummt, 1, &candidate_ptr, &count) == S_OK) { - if ((!mt || CompareMediaTypes(mt, candidate_ptr, TRUE)) + if (compare_media_types(mt, candidate_ptr) && pin->pFuncsTable->pfnAttemptConnection(pin, peer, candidate_ptr) == S_OK) { LeaveCriticalSection(&pin->pin.filter->csFilter);

1 0

Nikolay Sivov : rtworkq: Add deadline management stubs.
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: wine Branch: master Commit: 9f27848d90c6583be546d0cf17dbbb7a75762739 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f27848d90c6583be546d0cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 6 10:06:06 2020 +0300 rtworkq: Add deadline management stubs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 21 +++++++++++++++++++++ dlls/rtworkq/rtworkq.spec | 6 +++--- include/rtworkq.idl | 3 +++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 5e9ca51c60..a2fb3824c3 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -1099,3 +1099,24 @@ HRESULT WINAPI RtwqLockSharedWorkQueue(const WCHAR *usageclass, LONG priority, D return RtwqAllocateWorkQueue(RTWQ_STANDARD_WORKQUEUE, queue); } + +HRESULT WINAPI RtwqSetDeadline(DWORD queue_id, LONGLONG deadline, HANDLE *request) +{ + FIXME("%#x, %s, %p.\n", queue_id, wine_dbgstr_longlong(deadline), request); + + return E_NOTIMPL; +} + +HRESULT WINAPI RtwqSetDeadline2(DWORD queue_id, LONGLONG deadline, LONGLONG predeadline, HANDLE *request) +{ + FIXME("%#x, %s, %s, %p.\n", queue_id, wine_dbgstr_longlong(deadline), wine_dbgstr_longlong(predeadline), request); + + return E_NOTIMPL; +} + +HRESULT WINAPI RtwqCancelDeadline(HANDLE request) +{ + FIXME("%p.\n", request); + + return E_NOTIMPL; +} diff --git a/dlls/rtworkq/rtworkq.spec b/dlls/rtworkq/rtworkq.spec index c619b3a867..1a8909e098 100644 --- a/dlls/rtworkq/rtworkq.spec +++ b/dlls/rtworkq/rtworkq.spec @@ -3,7 +3,7 @@ @ stdcall RtwqAllocateWorkQueue(long ptr) @ stub RtwqBeginRegisterWorkQueueWithMMCSS @ stub RtwqBeginUnregisterWorkQueueWithMMCSS -@ stub RtwqCancelDeadline +@ stdcall RtwqCancelDeadline(long) @ stub RtwqCancelMultipleWaitingWorkItem @ stdcall RtwqCancelWorkItem(int64) @ stdcall RtwqCreateAsyncResult(ptr ptr ptr ptr) @@ -25,8 +25,8 @@ @ stub RtwqRegisterPlatformWithMMCSS @ stdcall RtwqRemovePeriodicCallback(long) @ stdcall RtwqScheduleWorkItem(ptr int64 ptr) -@ stub RtwqSetDeadline -@ stub RtwqSetDeadline2 +@ stdcall RtwqSetDeadline(long int64 ptr) +@ stdcall RtwqSetDeadline2(long int64 int64 ptr) @ stdcall RtwqSetLongRunning(long long) @ stdcall RtwqShutdown() @ stdcall RtwqStartup() diff --git a/include/rtworkq.idl b/include/rtworkq.idl index b27cce49fd..325bebfde5 100644 --- a/include/rtworkq.idl +++ b/include/rtworkq.idl @@ -79,6 +79,7 @@ cpp_quote("typedef void (WINAPI *RTWQPERIODICCALLBACK)(IUnknown *context);") cpp_quote("HRESULT WINAPI RtwqAddPeriodicCallback(RTWQPERIODICCALLBACK callback, IUnknown *context, DWORD *key);") cpp_quote("HRESULT WINAPI RtwqAllocateWorkQueue(RTWQ_WORKQUEUE_TYPE queue_type, DWORD *queue);") +cpp_quote("HRESULT WINAPI RtwqCancelDeadline(HANDLE request);") cpp_quote("HRESULT WINAPI RtwqCancelWorkItem(RTWQWORKITEM_KEY key);") cpp_quote("HRESULT WINAPI RtwqCreateAsyncResult(IUnknown *object, IRtwqAsyncCallback *callback, IUnknown *state, IRtwqAsyncResult **result);") cpp_quote("HRESULT WINAPI RtwqInvokeCallback(IRtwqAsyncResult *result);") @@ -89,6 +90,8 @@ cpp_quote("HRESULT WINAPI RtwqPutWaitingWorkItem(HANDLE event, LONG priority, IR cpp_quote("HRESULT WINAPI RtwqPutWorkItem(DWORD queue, LONG priority, IRtwqAsyncResult *result);") cpp_quote("HRESULT WINAPI RtwqRemovePeriodicCallback(DWORD key);") cpp_quote("HRESULT WINAPI RtwqScheduleWorkItem(IRtwqAsyncResult *result, INT64 timeout, RTWQWORKITEM_KEY *key);") +cpp_quote("HRESULT WINAPI RtwqSetDeadline(DWORD queue_id, LONGLONG deadline, HANDLE *request);") +cpp_quote("HRESULT WINAPI RtwqSetDeadline2(DWORD queue_id, LONGLONG deadline, LONGLONG predeadline, HANDLE *request);") cpp_quote("HRESULT WINAPI RtwqSetLongRunning(DWORD queue_id, BOOL enable);") cpp_quote("HRESULT WINAPI RtwqShutdown(void);") cpp_quote("HRESULT WINAPI RtwqStartup(void);")

1 0

Francois Gouget : testbot/UpdateTaskLogs: MoveRefReport() is not given .err files.
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: tools Branch: master Commit: 4c5ed9bbc5f9fbb1fbee33522fd8fde98d687578 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4c5ed9bbc5f9fbb1fbee335… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 6 15:12:44 2020 +0100 testbot/UpdateTaskLogs: MoveRefReport() is not given .err files. So there is no point allowing for a .err extension in the regexp splitting the report filename. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 4fe6ff3..051dbe5 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -270,7 +270,7 @@ sub MoveRefReport($$;$) $NewDir ||= $RefDir; my $NewName = $RefName; - if ($RefName =~ /^([a-zA-Z0-9_]+)_((?:exe|win|wow)(?:32|64)[a-zA-Z0-9_]*\.report(?:\.err)?)$/) + if ($RefName =~ /^([a-zA-Z0-9_]+)_((?:exe|win|wow)(?:32|64)[a-zA-Z0-9_]*\.report)$/) { # We don't know which job generated this reference log. # So use a fixed, arbitrary JobId.

1 0

Francois Gouget : testbot/UpdateTaskLogs: Fix deletion of the new per-task reference reports.
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: tools Branch: master Commit: 8ce2a0aca63da9f2c36b33f2c03405332908a2c2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8ce2a0aca63da9f2c36b33f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 6 15:13:18 2020 +0100 testbot/UpdateTaskLogs: Fix deletion of the new per-task reference reports. $ReportNames had the wrong scope, causing it to be undefined when the time came to delete the per-task reference reports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 051dbe5..e1da826 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -321,7 +321,7 @@ sub ProcessTaskLogs($$$) { # Upgrade the naming scheme of the task's old reference reports, # delete those that are not meant to exist. - my ($ErrMessage, $ReportNames, $_TaskMissions) = $Task->GetReportNames(); + (my $ErrMessage, $ReportNames, my $_TaskMissions) = $Task->GetReportNames(); if ($ErrMessage) { Error "$ErrMessage\n";

1 0

Francois Gouget : testbot/UpdateTaskLogs: Fix error handling for the task.log and testbot.log renames.
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: tools Branch: master Commit: 1db323cfd1f448bc976342d3d293e1b1caeab995 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1db323cfd1f448bc976342d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 6 15:13:36 2020 +0100 testbot/UpdateTaskLogs: Fix error handling for the task.log and testbot.log renames. The code checks that the target filename does not exist (so rename() does not clobber it), so it's very unlikely that the error is that the destination already exists. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index e1da826..c6f7b75 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -351,12 +351,17 @@ sub ProcessTaskLogs($$$) "old_log.err" => "old_testbot.log"); while (my ($OldName, $NewName) = each %LogMap) { - if (-f "$TaskDir/$OldName" and !-f "$TaskDir/$NewName" and - !rename("$TaskDir/$OldName", "$TaskDir/$NewName")) + next if (!-f "$TaskDir/$OldName"); + if (-f "$TaskDir/$NewName") { Error TaskKeyStr($Task) .": Could not rename $OldName because $NewName already exists\n"; $Rc = 1; } + elsif (!rename("$TaskDir/$OldName", "$TaskDir/$NewName")) + { + Error TaskKeyStr($Task) .": Could not rename $OldName to $NewName: $!\n"; + $Rc = 1; + } } # testbot.log is the only log which we expect to be empty.

1 0

Francois Gouget : testbot/doc: The procmail dependency is optional.
by Alexandre Julliard Feb. 6, 2020

Feb. 6, 2020

Module: tools Branch: master Commit: ec2755424c49980e5421a1dcbf650a2a8af6e635 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ec2755424c49980e5421a1d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 6 15:13:46 2020 +0100 testbot/doc: The procmail dependency is optional. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/doc/INSTALL.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 7ac155d..bd4f39b 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -4,11 +4,12 @@ Dependencies: - Apache2 with mod_perl - MySQL -- Sendmail and Procmail +- Sendmail - Bytes::Random::Secure (libbytes-random-secure-perl) - DBI::mysql (libdbd-mysql-perl) - Sys::Virt (libsys-virt-perl, see http://libvirt.org/) - Image::Magick (perlmagick) +- Optional: Procmail (to process mailing list patches) - Optional: IO::Socket::IP (for IPv6, libio-socket-ip-perl) - Optional: Net::OpenSSH (for SSH tunneling, libnet-openssh-perl)

1 0

Daniel Lehman : msvcrt: Set return value on all paths in wcstombs_s_l.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: e9737e173825201a7ecabcc9f8487d563a7bdc50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9737e173825201a7ecabcc9… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Feb 3 12:14:11 2020 -0800 msvcrt: Set return value on all paths in wcstombs_s_l. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 22 +++++++++------------- dlls/msvcrt/wcs.c | 20 +++++++++++++------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 7d9b46b3e6..29a8958b81 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2288,25 +2288,23 @@ static void test__wcstombs_s_l(void) size_t ret; int err; const char *locale; - BOOL todo_ret; - BOOL todo_err; } tests[] = { /* wstr str ret err locale */ { L"", 0, NULL, 0, 1, 0, NULL }, { L"\xfffd", 1, NULL, 0, 2, 0, NULL }, - { L"\xfffd", 1, "", 1, 0, EILSEQ, NULL, TRUE }, - { L"\xfffd", 1, "", 6, 0, EILSEQ, NULL, TRUE }, + { L"\xfffd", 1, "", 1, 0, EILSEQ, NULL }, + { L"\xfffd", 1, "", 6, 0, EILSEQ, NULL }, { L"text", _TRUNCATE, "text", 5, 5, 0, NULL }, - { L"text", _TRUNCATE, "", 1, 1, STRUNCATE, NULL, FALSE, TRUE }, - { L"text", 5, "", 3, 0, ERANGE, NULL, TRUE }, + { L"text", _TRUNCATE, "", 1, 1, STRUNCATE, NULL }, + { L"text", 5, "", 3, 0, ERANGE, NULL }, { L"", 0, NULL, 0, 1, 0, "English_United States.1252" }, - { L"\xfffd", 1, NULL, 0, 0, EILSEQ, "English_United States.1252", TRUE }, - { L"\xfffd", 1, "", 1, 0, EILSEQ, "English_United States.1252", TRUE }, - { L"\xfffd", 1, "", 6, 0, EILSEQ, "English_United States.1252", TRUE }, + { L"\xfffd", 1, NULL, 0, 0, EILSEQ, "English_United States.1252" }, + { L"\xfffd", 1, "", 1, 0, EILSEQ, "English_United States.1252" }, + { L"\xfffd", 1, "", 6, 0, EILSEQ, "English_United States.1252" }, { L"text", _TRUNCATE, "text", 5, 5, 0, "English_United States.1252" }, - { L"text", _TRUNCATE, "", 1, 1, STRUNCATE, "English_United States.1252", FALSE, TRUE }, - { L"text", 5, "", 3, 0, ERANGE, "English_United States.1252", TRUE }, + { L"text", _TRUNCATE, "", 1, 1, STRUNCATE, "English_United States.1252" }, + { L"text", 5, "", 3, 0, ERANGE, "English_United States.1252" }, }; _locale_t locale; char out[6]; @@ -2333,10 +2331,8 @@ static void test__wcstombs_s_l(void) memset(out, 0xcc, sizeof(out)); err = p_wcstombs_s_l(&ret, tests[i].str ? out : NULL, tests[i].len, tests[i].wstr, tests[i].wlen, locale); - todo_wine_if(tests[i].todo_ret) ok(ret == tests[i].ret, "%d: expected ret %d, got %d for '%s' in locale %s\n", i, tests[i].ret, ret, wine_dbgstr_w(tests[i].wstr), tests[i].locale); - todo_wine_if(tests[i].todo_err) ok(err == tests[i].err, "%d: expected err %d, got %d for '%s' in locale %s\n", i, tests[i].err, err, wine_dbgstr_w(tests[i].wstr), tests[i].locale); if(tests[i].str) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 64bc1f83d4..cf635ed1c2 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -530,13 +530,14 @@ static int MSVCRT_wcsrtombs_s_l(MSVCRT_size_t *ret, char *mbstr, MSVCRT_size_t count, MSVCRT__locale_t locale) { MSVCRT_size_t conv; + int err; if(!mbstr && !size && wcstr) { conv = MSVCRT_wcsrtombs_l(NULL, wcstr, 0, locale); - if(conv == -1) - return *MSVCRT__errno(); if(ret) *ret = conv+1; + if(conv == -1) + return *MSVCRT__errno(); return 0; } @@ -550,25 +551,30 @@ static int MSVCRT_wcsrtombs_s_l(MSVCRT_size_t *ret, char *mbstr, else conv = count; + err = 0; conv = MSVCRT_wcsrtombs_l(mbstr, wcstr, conv, locale); if(conv == -1) { + conv = 0; if(size) mbstr[0] = '\0'; - return *MSVCRT__errno(); + err = *MSVCRT__errno(); }else if(conv < size) mbstr[conv++] = '\0'; - else if(conv==size && (count==MSVCRT__TRUNCATE || mbstr[conv-1]=='\0')) + else if(conv==size && (count==MSVCRT__TRUNCATE || mbstr[conv-1]=='\0')) { mbstr[conv-1] = '\0'; - else { + if(count==MSVCRT__TRUNCATE) + err = MSVCRT_STRUNCATE; + }else { MSVCRT_INVALID_PMT("mbstr[size] is too small", MSVCRT_ERANGE); + conv = 0; if(size) mbstr[0] = '\0'; - return MSVCRT_ERANGE; + err = MSVCRT_ERANGE; } if(ret) *ret = conv; - return 0; + return err; } /*********************************************************************

1 0

Kevin Puetz : kernelbase: Allow NULL lpAssemblyDirectoryName in find_actctx_dllpath.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: b064d32c525002c0e57d3ed8c3f2004ff9eff0ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=b064d32c525002c0e57d3ed8… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Wed Feb 5 20:00:50 2020 +0100 kernelbase: Allow NULL lpAssemblyDirectoryName in find_actctx_dllpath. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index eeecc82d77..1a4c3aaf2e 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -177,7 +177,7 @@ static NTSTATUS find_actctx_dllpath( const WCHAR *name, WCHAR **path ) /* restart with larger buffer */ } - if (!info->lpAssemblyManifestPath || !info->lpAssemblyDirectoryName) + if (!info->lpAssemblyManifestPath) { status = STATUS_SXS_KEY_NOT_FOUND; goto done; @@ -188,7 +188,7 @@ static NTSTATUS find_actctx_dllpath( const WCHAR *name, WCHAR **path ) DWORD dirlen = info->ulAssemblyDirectoryNameLength / sizeof(WCHAR); p++; - if (wcsnicmp( p, info->lpAssemblyDirectoryName, dirlen ) || wcsicmp( p + dirlen, dotManifestW )) + if (!dirlen || wcsnicmp( p, info->lpAssemblyDirectoryName, dirlen ) || wcsicmp( p + dirlen, dotManifestW )) { /* manifest name does not match directory name, so it's not a global * windows/winsxs manifest; use the manifest directory name instead */ @@ -205,6 +205,12 @@ static NTSTATUS find_actctx_dllpath( const WCHAR *name, WCHAR **path ) } } + if (!info->lpAssemblyDirectoryName) + { + status = STATUS_SXS_KEY_NOT_FOUND; + goto done; + } + needed = (lstrlenW( windows_dir ) * sizeof(WCHAR) + sizeof(winsxsW) + info->ulAssemblyDirectoryNameLength + 2*sizeof(WCHAR));

1 0

Dirk Niggemann : krnl386.exe: Make CallProcEx32W16 clear CPEX_DEST_CDECL flag before looping over arguments.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: c57483ba4d77d04a7af120a6e016b53c5596fe81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c57483ba4d77d04a7af120a6… Author: Dirk Niggemann <dirk.niggemann(a)gmail.com> Date: Tue Feb 4 22:42:50 2020 +0000 krnl386.exe: Make CallProcEx32W16 clear CPEX_DEST_CDECL flag before looping over arguments. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48480 Signed-off-by: Dirk Niggemann <dirk.niggemann(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/thunk.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index c8ad3824c0..91a24f19c4 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -2475,11 +2475,12 @@ DWORD WINAPIV CallProc32W16( DWORD nrofargs, DWORD argconvmask, FARPROC proc32, DWORD WINAPIV CallProcEx32W16( DWORD nrofargs, DWORD argconvmask, FARPROC proc32, VA_LIST16 valist ) { DWORD args[32]; - unsigned int i; + unsigned int i, count = min( 32, nrofargs & ~CPEX_DEST_CDECL ); - TRACE("(%d,%d,%p args[",nrofargs,argconvmask,proc32); + TRACE("(%s,%d,%d,%p args[", nrofargs & CPEX_DEST_CDECL ? "cdecl": "stdcall", + nrofargs & ~CPEX_DEST_CDECL, argconvmask, proc32); - for (i=0;i<nrofargs;i++) + for (i = 0; i < count; i++) { if (argconvmask & (1<<i)) {

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Feb. 5, 2020

Feb. 5, 2020

Module: wine Branch: master Commit: 9642f35922b79cebacdc774eb54619e389ccd531 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9642f35922b79cebacdc774e… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Feb 5 23:27:44 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 | 46 +++++++++++++--------------------------------- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/po/lt.po b/po/lt.po index ba3854f63a..7259ebced9 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-02-03 23:24+0200\n" +"PO-Revision-Date: 2020-02-05 23:25+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" @@ -8321,76 +8321,56 @@ msgid "Select the data you want to connect to:" msgstr "Išrinkite duomenis, prie kurių norite jungtis:" #: version.rc:52 -#, fuzzy -#| msgid "Connections" msgid "Connection" -msgstr "Ryšiai" +msgstr "Ryšys" #: version.rc:55 -#, fuzzy -#| msgid "Select the data you want to connect to:" msgid "Specify the following to connect to ODBC data:" -msgstr "Išrinkite duomenis, prie kurių norite jungtis:" +msgstr "Prisijungimui prie ODBC duomenų nurodykite:" #: version.rc:56 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. Nurodykite duomenų šaltinį:" #: version.rc:57 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "Įveskite savo vardą" +msgstr "Naudoti &duomenų šaltinio vardą" #: version.rc:60 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "Panaikinti ryšiai" +msgstr "Naudoti r&yšio eilutę" #: version.rc:61 -#, fuzzy -#| msgid "Connections" msgid "&Connection string:" -msgstr "Ryšiai" +msgstr "&Ryšio eilutė:" #: version.rc:63 -#, fuzzy -#| msgid "A&dd..." msgid "B&uild..." -msgstr "Pri&dėti..." +msgstr "&Sukurti..." #: version.rc:64 msgid "2. Enter information to log on to the server" -msgstr "" +msgstr "2. Įveskite informaciją prisijungimui prie serverio" #: version.rc:65 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" msgstr "&Naudotojo vardas:" #: version.rc:69 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "&Tuščias puslapis" +msgstr "T&uščias slaptažodis" #: version.rc:70 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "Neteisingas slaptažodis.\n" +msgstr "Leisti &išsaugoti slaptažodį" #: version.rc:71 msgid "3. Enter the &initial catalog to use:" -msgstr "" +msgstr "3. Įveskite &pradinį katalogą naudojimui:" #: version.rc:73 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Panaikinti ryšiai" +msgstr "&Tikrinti ryšį" #: version.rc:36 msgid "Data Link Properties"

1 0