May 2020 - Wine-Devel - list.winehq.org

[PATCH 2/7] ntoskrnl.exe: Exprot _chkstk from importlib.
by Jacek Caban May 5, 2020

May 5, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)

2 1

[PATCH 6/7] configure: Allow specifying default CROSSTARGET as configure argument.
by Jacek Caban May 5, 2020

May 5, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This series, together with __cpuid patches, are enough to do a functional 64-bit Wine with ./configure CROSSTARGET=x86_64-windows CROSSCC=clang 32-bit target needs a bit more. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 5/7] configure: Asume that -delayload linker argument is supported when -target argument is used.
by Jacek Caban May 5, 2020

May 5, 2020

In practice, it's present only on clang and it always needs to be used there. mingw and msvc targets have different syntax. We take care of that in winegcc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- aclocal.m4 | 2 +- configure.ac | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)

1 0

[PATCH 4/7] winecrt0: Add _fltused symbol.
by Jacek Caban May 5, 2020

May 5, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winecrt0/Makefile.in | 1 + dlls/winecrt0/crt_fltused.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 dlls/winecrt0/crt_fltused.c

1 0

[PATCH 3/7] winecrt0: Build exception functions on clang msvc target.
by Jacek Caban May 5, 2020

May 5, 2020

We may potentially use compiler __try/__except support in this case, but there is no reason not to support both. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winecrt0/exception.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)

1 0

[PATCH 1/7] ntdll: Export _chkstk from importlib.
by Jacek Caban May 5, 2020

May 5, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/signal_i386.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH] mf: Add missing ::Release of clock timer.
by Derek Lesho May 5, 2020

May 5, 2020

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mf/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 75ef600a4df..eb388de62ac 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -4014,6 +4014,7 @@ static HRESULT present_clock_schedule_timer(struct presentation_clock *clock, DW if (FAILED(hr = MFCreateAsyncResult(&timer->IUnknown_iface, &clock->timer_callback, NULL, &result))) return hr; + IUnknown_Release(&timer->IUnknown_iface); hr = MFScheduleWorkItemEx(result, -time, &timer->key); IMFAsyncResult_Release(result); -- 2.26.2

2 3

[PATCH] cmd.exe: Don't treat explicit paths as a PATH search list.
by Gabriel Ivăncescu May 5, 2020

May 5, 2020

For example, the explicit path "C:\some;path" is currently treated as if the PATH environment variable is "C:\some;path" which is obviously wrong, and searches for the directories "C:\some" and "path". Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- programs/cmd/wcmdmain.c | 63 +++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 16843e4..4026f3e 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1045,6 +1045,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) WCHAR pathext[MAXSTRING]; WCHAR *firstParam; BOOL extensionsupplied = FALSE; + BOOL explicit_path = FALSE; BOOL status; DWORD len; static const WCHAR envPath[] = {'P','A','T','H','\0'}; @@ -1084,6 +1085,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Reduce pathtosearch to a path with trailing '\' to support c:\a.bat and c:\windows\a.bat syntax */ if (lastSlash) *(lastSlash + 1) = 0x00; + explicit_path = TRUE; } /* Now extract PATHEXT */ @@ -1103,37 +1105,48 @@ void WCMD_run_program (WCHAR *command, BOOL called) BOOL found = FALSE; BOOL inside_quotes = FALSE; - /* Work on the first directory on the search path */ - pos = pathposn; - while ((inside_quotes || *pos != ';') && *pos != 0) + if (explicit_path) { - if (*pos == '"') - inside_quotes = !inside_quotes; - pos++; + lstrcpyW(thisDir, pathposn); + pathposn = NULL; } + else + { + /* Work on the next directory on the search path */ + pos = pathposn; + while ((inside_quotes || *pos != ';') && *pos != 0) + { + if (*pos == '"') + inside_quotes = !inside_quotes; + pos++; + } - if (*pos) { /* Reached semicolon */ - memcpy(thisDir, pathposn, (pos-pathposn) * sizeof(WCHAR)); - thisDir[(pos-pathposn)] = 0x00; - pathposn = pos+1; - } else { /* Reached string end */ - lstrcpyW(thisDir, pathposn); - pathposn = NULL; - } + if (*pos) /* Reached semicolon */ + { + memcpy(thisDir, pathposn, (pos-pathposn) * sizeof(WCHAR)); + thisDir[(pos-pathposn)] = 0x00; + pathposn = pos+1; + } + else /* Reached string end */ + { + lstrcpyW(thisDir, pathposn); + pathposn = NULL; + } - /* Remove quotes */ - length = lstrlenW(thisDir); - if (thisDir[length - 1] == '"') - thisDir[length - 1] = 0; + /* Remove quotes */ + length = lstrlenW(thisDir); + if (thisDir[length - 1] == '"') + thisDir[length - 1] = 0; - if (*thisDir != '"') - lstrcpyW(temp, thisDir); - else - lstrcpyW(temp, thisDir + 1); + if (*thisDir != '"') + lstrcpyW(temp, thisDir); + else + lstrcpyW(temp, thisDir + 1); - /* Since you can have eg. ..\.. on the path, need to expand - to full information */ - GetFullPathNameW(temp, MAX_PATH, thisDir, NULL); + /* Since you can have eg. ..\.. on the path, need to expand + to full information */ + GetFullPathNameW(temp, MAX_PATH, thisDir, NULL); + } /* 1. If extension supplied, see if that file exists */ lstrcatW(thisDir, slashW); -- 2.21.0

1 0

[PATCH 2/2] msasn1: Implement ASN1_CloseModule function
by Vijay Kiran Kamuju May 5, 2020

May 5, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 4/4] user32: Leave critical section before calling callbacks in EnumDisplayMonitors().
by Zhiyi Zhang May 5, 2020

May 5, 2020

Previously, callbacks were called with a critical section held. It was intended that monitor handles passed to callbacks should always be valid. But it created a deadlock condition when callbacks call other functions which try to grab the critical section using a different thread. Tests also show that a monitor handle can be invalid after a display change. So do not hold the critical section when calling callbacks. Monitor handles will be checked when passed to GetMonitorInfo(), which is the sole function that consumes HMONITORs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index ab386a074e8..043742a9bfa 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4126,28 +4126,34 @@ static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) { - RECT default_rect = {0, 0, 640, 480}; - DWORD i; + RECT monitor_rect; + DWORD i = 0; TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); if (update_monitor_cache()) { - EnterCriticalSection( &monitors_section ); - for (i = 0; i < monitor_count; i++) + while (TRUE) { - if (!proc( (HMONITOR)(UINT_PTR)(i + 1), hdc, &monitors[i].rcMonitor, lp )) + EnterCriticalSection( &monitors_section ); + if (i >= monitor_count) { LeaveCriticalSection( &monitors_section ); - return FALSE; + return TRUE; } + monitor_rect = monitors[i].rcMonitor; + LeaveCriticalSection( &monitors_section ); + + if (!proc( (HMONITOR)(UINT_PTR)(i + 1), hdc, &monitor_rect, lp )) + return FALSE; + + ++i; } - LeaveCriticalSection( &monitors_section ); - return TRUE; } /* Fallback to report one monitor if using SetupAPI failed */ - if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &default_rect, lp )) + SetRect( &monitor_rect, 0, 0, 640, 480 ); + if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &monitor_rect, lp )) return FALSE; return TRUE; } -- 2.25.1

1 0