September 2019 - Wine-devel

[PATCH 1/5] wineqtdecoder: Use strmbase_source_init().
by Zebediah Figura 06 Sep '19

06 Sep '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Not compile-tested. dlls/wineqtdecoder/qtsplitter.c | 48 +++++++++++++-------------------- 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index e7597e16ca8..3931452e525 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -790,10 +790,8 @@ static void free_source_pin(QTOutPin *pin) LeaveCriticalSection(pin->pin.pin.pCritSec); DeleteMediaType(pin->pmt); - FreeMediaType(&pin->pin.pin.mtCurrent); - if (pin->pin.pAllocator) - IMemAllocator_Release(pin->pin.pAllocator); - CoTaskMemFree(pin); + strmbase_source_cleanup(&pin->pin); + heap_free(pin); } /* @@ -1446,38 +1444,28 @@ static const OutputQueueFuncTable output_OutputQueueFuncTable = { OutputQueueImpl_ThreadProc }; -static HRESULT QT_AddPin(QTSplitter *This, const PIN_INFO *piOutput, const AM_MEDIA_TYPE *amt, BOOL video) +static HRESULT QT_AddPin(QTSplitter *filter, const PIN_INFO *pin_info, + const AM_MEDIA_TYPE *mt, BOOL video) { - HRESULT hr; - IPin **target; + QTOutPin *pin; + + if (!(pin = heap_alloc_zero(sizeof(*pin)))) + return E_OUTOFMEMORY; if (video) - target = (IPin**)&This->pVideo_Pin; + filter->pVideo_Pin = pin; else - target = (IPin**)&This->pAudio_Pin; - - if (*target != NULL) - { - FIXME("We already have a %s pin\n",(video)?"video":"audio"); - return E_FAIL; - } + filter->pAudio_Pin = pin; - hr = BaseOutputPin_Construct(&QT_OutputPin_Vtbl, sizeof(QTOutPin), piOutput, &output_BaseOutputFuncTable, &This->filter.csFilter, (IPin**)target); - if (SUCCEEDED(hr)) - { - QTOutPin *pin = (QTOutPin*)*target; - pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); - CopyMediaType(pin->pmt, amt); - pin->pin.pin.pinInfo.pFilter = (LPVOID)This; - pin->IQualityControl_iface.lpVtbl = &QTOutPin_QualityControl_Vtbl; - - BaseFilterImpl_IncrementPinVersion(&This->filter); + strmbase_source_init(&pin->pin, &QT_OutputPin_Vtbl, piOutput, + &output_BaseOutputFuncTable, &filter->filter.csFilter); + pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); + CopyMediaType(pin->pmt, mt); + pin->IQualityControl_iface.lpVtbl = &QTOutPin_QualityControl_Vtbl; + BaseFilterImpl_IncrementPinVersion(&filter->filter); - hr = OutputQueue_Construct(&pin->pin, TRUE, TRUE, 5, FALSE, THREAD_PRIORITY_NORMAL, &output_OutputQueueFuncTable, &pin->queue); - } - else - ERR("Failed with error %x\n", hr); - return hr; + return OutputQueue_Construct(&pin->pin, TRUE, TRUE, 5, FALSE, + THREAD_PRIORITY_NORMAL, &output_OutputQueueFuncTable, &pin->queue); } static HRESULT WINAPI QTSplitter_ChangeStart(IMediaSeeking *iface) -- 2.22.0

1 4

[PATCH v3 2/4] localspl: AddMonitor should create registry entry for a monitor before initializing it.
by Dmitry Timoshkov 05 Sep '19

05 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index ccd19811cf..8e5e3428d5 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1499,12 +1499,6 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) return FALSE; } - /* Load and initialize the monitor. SetLastError() is called on failure */ - if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) { - return FALSE; - } - monitor_unload(pm); - SetLastError(ERROR_SUCCESS); /* Monitor installer depends on this */ if (RegCreateKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) != ERROR_SUCCESS) { @@ -1538,7 +1532,17 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) res = (RegSetValueExW(hentry, driverW, 0, REG_SZ, (LPBYTE) mi2w->pDLLName, len) == ERROR_SUCCESS); } + + /* Load and initialize the monitor. SetLastError() is called on failure */ + if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) + res = FALSE; + + monitor_unload(pm); + RegCloseKey(hentry); + + if (!res) + RegDeleteKeyW(hroot, mi2w->pName); } RegCloseKey(hroot); -- 2.20.1

3 2

[PATCH] aclocal.m4: fix macro
by Evgeny Litvinenko 05 Sep '19

05 Sep '19

Signed-off-by: Evgeny Litvinenko <evgeny.v.litvinenko(a)gmail.com> --- With this fix it is possible to nest the WINE_TRY_SHLIB_FLAGS macro. Example: WINE_TRY_SHLIB_FLAGS([first set of flags], [ac_cv_c_dll_flags="first set of flags"], [WINE_TRY_SHLIB_FLAGS([second set of flags], [ac_cv_c_dll_flags="second set of flags"], [ac_cv_c_dll_flags="third set of flags"])]) aclocal.m4 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index ed0c3a8317..194b3a9d93 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -178,10 +178,14 @@ dnl dnl Usage: WINE_TRY_SHLIB_FLAGS(flags,[action-if-yes,[action-if-no]]) dnl AC_DEFUN([WINE_TRY_SHLIB_FLAGS], -[ac_wine_try_cflags_saved=$CFLAGS +[AS_VAR_PUSHDEF([ac_var], ac_cv_cflags_[[$1]])dnl +ac_wine_try_cflags_saved=$CFLAGS CFLAGS="$CFLAGS $1" -AC_LINK_IFELSE([AC_LANG_SOURCE([void myfunc() {}])],[$2],[$3]) -CFLAGS=$ac_wine_try_cflags_saved]) +AC_LINK_IFELSE([AC_LANG_SOURCE([[void myfunc() {}]])], + [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)]) +CFLAGS=$ac_wine_try_cflags_saved +AS_VAR_IF([ac_var],[yes], [$2], [$3])dnl +AS_VAR_POPDEF([ac_var])]) dnl **** Check whether we need to define a symbol on the compiler command line **** dnl -- 2.23.0

1 0

[PATCH] aclocal.m4: fix a macro
by Evgeny Litvinenko 05 Sep '19

05 Sep '19

With this fix it is possible to nest the WINE_TRY_SHLIB_FLAGS macro. Example: WINE_TRY_SHLIB_FLAGS([first set of flags], [ac_cv_c_dll_flags="first set of flags"], [WINE_TRY_SHLIB_FLAGS([second set of flags], [ac_cv_c_dll_flags="second set of flags"], [ac_cv_c_dll_flags="third set of flags"])]) --- aclocal.m4 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index ed0c3a8317..194b3a9d93 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -178,10 +178,14 @@ dnl dnl Usage: WINE_TRY_SHLIB_FLAGS(flags,[action-if-yes,[action-if-no]]) dnl AC_DEFUN([WINE_TRY_SHLIB_FLAGS], -[ac_wine_try_cflags_saved=$CFLAGS +[AS_VAR_PUSHDEF([ac_var], ac_cv_cflags_[[$1]])dnl +ac_wine_try_cflags_saved=$CFLAGS CFLAGS="$CFLAGS $1" -AC_LINK_IFELSE([AC_LANG_SOURCE([void myfunc() {}])],[$2],[$3]) -CFLAGS=$ac_wine_try_cflags_saved]) +AC_LINK_IFELSE([AC_LANG_SOURCE([[void myfunc() {}]])], + [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)]) +CFLAGS=$ac_wine_try_cflags_saved +AS_VAR_IF([ac_var],[yes], [$2], [$3])dnl +AS_VAR_POPDEF([ac_var])]) dnl **** Check whether we need to define a symbol on the compiler command line **** dnl -- 2.23.0

3 3

[PATCH v3 1/3] wininet: Return error from HttpQueryInfo if number argument is invalid.
by Daniel Lehman 05 Sep '19

05 Sep '19

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v3: - more tests - check errno v2: - just use strtoulW with overflow check - make this patch first since it's really 0003 that needs it --- dlls/wininet/http.c | 22 +++++++++-- dlls/wininet/tests/http.c | 82 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 538fc2bf6b..3230749d40 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -42,6 +42,7 @@ #include <stdio.h> #include <time.h> #include <assert.h> +#include <errno.h> #include "windef.h" #include "winbase.h" @@ -3724,9 +3725,24 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, /* coalesce value to requested type */ if (dwInfoLevel & HTTP_QUERY_FLAG_NUMBER && lpBuffer) { - *(int *)lpBuffer = atoiW(lphttpHdr->lpszValue); - TRACE(" returning number: %d\n", *(int *)lpBuffer); - } + unsigned long value; + + if (*lpdwBufferLength != sizeof(DWORD)) + { + LeaveCriticalSection( &request->headers_section ); + return ERROR_HTTP_INVALID_HEADER; + } + + value = strtoulW( lphttpHdr->lpszValue, NULL, 10 ); + if (value > UINT_MAX || (value == ULONG_MAX && errno == ERANGE)) + { + LeaveCriticalSection( &request->headers_section ); + return ERROR_HTTP_INVALID_HEADER; + } + + *(DWORD *)lpBuffer = value; + TRACE(" returning number: %u\n", *(DWORD *)lpBuffer); + } else if (dwInfoLevel & HTTP_QUERY_FLAG_SYSTEMTIME && lpBuffer) { time_t tmpTime; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index cb96abe612..fcbd95b837 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -23,6 +23,7 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -2061,6 +2062,12 @@ static const char okmsg2[] = "Set-Cookie: two\r\n" "\r\n"; +static DWORD64 content_length; +static const char largemsg[] = +"HTTP/1.1 200 OK\r\n" +"Content-Length: %I64u\r\n" +"\r\n"; + static const char notokmsg[] = "HTTP/1.1 400 Bad Request\r\n" "Server: winetest\r\n" @@ -2455,6 +2462,12 @@ static DWORD CALLBACK server_thread(LPVOID param) { send(c, okmsg, sizeof(okmsg)-1, 0); } + if (strstr(buffer, "HEAD /test_large_content")) + { + char msg[sizeof(largemsg) + 16]; + sprintf(msg, largemsg, content_length); + send(c, msg, strlen(msg), 0); + } shutdown(c, 2); closesocket(c); c = -1; @@ -5515,6 +5528,74 @@ static void test_remove_dot_segments(int port) close_request(&req); } +struct large_test +{ + DWORD64 content_length; + BOOL ret; +}; + +static void test_large_content(int port) +{ + struct large_test tests[] = { + { 0, TRUE }, + { UINT_MAX-1, TRUE }, + { UINT_MAX, TRUE }, + { (DWORD64)UINT_MAX+1, FALSE }, + { ~0, FALSE }, + }; + test_request_t req; + DWORD sizelen, len; + DWORD64 len64; + BOOL ret; + size_t i; + + open_simple_request(&req, "localhost", port, "HEAD", "/test_large_content"); + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + content_length = tests[i].content_length; + ret = HttpSendRequestA(req.request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + + len = ~0; + sizelen = sizeof(len); + SetLastError(0xdeadbeef); + ret = HttpQueryInfoA(req.request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, + &len, &sizelen, 0); + if (tests[i].ret) + { + ok(ret, "HttpQueryInfo should have succeeded\n"); + ok(GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == 0xdeadbeef), /* xp, 2k8, vista */ + "expected ERROR_SUCCESS, got %x\n", GetLastError()); + ok(len == (DWORD)tests[i].content_length, "expected %u, got %u\n", + (DWORD)tests[i].content_length, len); + } + else + { + ok(!ret, "HttpQueryInfo should have failed\n"); + ok(GetLastError() == ERROR_HTTP_INVALID_HEADER, + "expected ERROR_HTTP_INVALID_HEADER, got %x\n", GetLastError()); + ok(len == ~0, "expected ~0, got %u\n", len); + } + ok(sizelen == sizeof(DWORD), "sizelen %u\n", sizelen); + } + + /* test argument size */ + len64 = ~0; + sizelen = sizeof(len64); + SetLastError(0xdeadbeef); + ret = HttpQueryInfoA(req.request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, + &len64, &len, 0); + ok(!ret, "HttpQueryInfo should have failed\n"); + ok(GetLastError() == ERROR_HTTP_INVALID_HEADER, + "expected ERROR_HTTP_INVALID_HEADER, got %x\n", GetLastError()); + ok(sizelen == sizeof(DWORD64), "sizelen %u\n", sizelen); + ok(len64 == ~0, "len64 %x%08x\n", (DWORD)(len64 >> 32), (DWORD)len64); + + close_request(&req); +} + static void test_http_connection(void) { struct server_info si; @@ -5573,6 +5654,7 @@ static void test_http_connection(void) test_redirect(si.port); test_persistent_connection(si.port); test_remove_dot_segments(si.port); + test_large_content(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit"); -- 2.17.1

3 6

[PATCH] dsound: Trace each Special Effect as it's processed.
by Alistair Leslie-Hughes 05 Sep '19

05 Sep '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/buffer.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index e76d113e63..003a518c5f 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -695,6 +695,23 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetFrequency(IDirectSoundBuffer8 *i return DS_OK; } +static const char* dump_DSFX_guid(const DSEFFECTDESC *desc) +{ + #define FE(guid) if (IsEqualGUID(&guid, &desc->guidDSFXClass)) return #guid; + FE(GUID_DSFX_STANDARD_GARGLE) + FE(GUID_DSFX_STANDARD_CHORUS) + FE(GUID_DSFX_STANDARD_FLANGER) + FE(GUID_DSFX_STANDARD_ECHO) + FE(GUID_DSFX_STANDARD_DISTORTION) + FE(GUID_DSFX_STANDARD_COMPRESSOR) + FE(GUID_DSFX_STANDARD_PARAMEQ) + FE(GUID_DSFX_STANDARD_I3DL2REVERB) + FE(GUID_DSFX_WAVES_REVERB) + #undef FE + + return debugstr_guid(&desc->guidDSFXClass); +} + static HRESULT WINAPI IDirectSoundBufferImpl_SetFX(IDirectSoundBuffer8 *iface, DWORD dwEffectsCount, LPDSEFFECTDESC pDSFXDesc, DWORD *pdwResultCodes) { @@ -767,6 +784,8 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFX(IDirectSoundBuffer8 *iface, D dmt.pbFormat = (BYTE*)&wfx; for (u = 0; u < dwEffectsCount; u++) { + TRACE("%d: 0x%08x, %s\n", u, pDSFXDesc[u].dwFlags, dump_DSFX_guid(&pDSFXDesc[u])); + hr2 = CoCreateInstance(&pDSFXDesc[u].guidDSFXClass, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (LPVOID*)&filters[u].obj); if (SUCCEEDED(hr2)) { -- 2.17.1

2 1

[PATCH v4 1/2] kernel32/path: Allow renaming a file/directory to a different capitalization of itself
by Gabriel Ivăncescu 05 Sep '19

05 Sep '19

Renaming a file or directory from e.g. foobar to FooBar (or any other caps-only change) should work and capitalize it, like on Windows, instead of being a no-op. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46203 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/path.c | 66 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 61 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index b93add9..e55c305 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1136,6 +1136,16 @@ static BOOL is_same_file(HANDLE h1, HANDLE h2) return ret; } +static ULONG get_handle_attr(HANDLE handle) +{ + FILE_BASIC_INFORMATION info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtQueryInformationFile(handle, &io, &info, sizeof(info), FileBasicInformation); + return status != STATUS_SUCCESS ? 0 : info.FileAttributes; +} + /************************************************************************** * CopyFileW (KERNEL32.@) */ @@ -1317,6 +1327,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, NTSTATUS status; HANDLE source_handle = 0, dest_handle = 0; ANSI_STRING source_unix, dest_unix; + BOOL same_file = FALSE; DWORD options; TRACE("(%s,%s,%p,%p,%04x)\n", @@ -1369,18 +1380,22 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_PATH_NOT_FOUND ); goto error; } - options = FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT; + options = FILE_SYNCHRONOUS_IO_NONALERT; if (flag & MOVEFILE_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, options ); if (status == STATUS_SUCCESS) /* destination exists */ { - if (!(flag & MOVEFILE_REPLACE_EXISTING)) + ULONG attrib = 0; + + if (!(flag & MOVEFILE_REPLACE_EXISTING) || + ((attrib = get_handle_attr(dest_handle)) & FILE_ATTRIBUTE_DIRECTORY)) { - if (!is_same_file( source_handle, dest_handle )) + if (!(same_file = is_same_file( source_handle, dest_handle ))) { - SetLastError( ERROR_ALREADY_EXISTS ); + SetLastError( (attrib & FILE_ATTRIBUTE_DIRECTORY) + ? ERROR_ACCESS_DENIED : ERROR_ALREADY_EXISTS ); RtlFreeUnicodeString( &nt_name ); goto error; } @@ -1390,6 +1405,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_ACCESS_DENIED ); goto error; } + else same_file = is_same_file( source_handle, dest_handle ); NtClose( dest_handle ); dest_handle = NULL; @@ -1402,13 +1418,53 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, } status = wine_nt_to_unix_file_name( &nt_name, &dest_unix, FILE_OPEN_IF, FALSE ); - RtlFreeUnicodeString( &nt_name ); if (status != STATUS_SUCCESS && status != STATUS_NO_SUCH_FILE) { + RtlFreeUnicodeString( &nt_name ); SetLastError( RtlNtStatusToDosError(status) ); goto error; } + /* When it's renaming to the same file, preserve the case sensitivity of the last + component, so that renaming a\b\c\foobar to a\b\c\Foobar works correctly like + on Windows, but note that due to hard links the paths must be exactly identical */ + if (same_file && source_unix.Length == dest_unix.Length && + !memcmp(source_unix.Buffer, dest_unix.Buffer, dest_unix.Length)) + { + size_t nt_filename_len, pathlen; + const WCHAR *nt_filename; + BOOL used_default; + char *tmp; + INT num; + + nt_filename = memrchrW(nt_name.Buffer, '\\', nt_name.Length / sizeof(WCHAR)) + 1; + nt_filename_len = nt_name.Buffer + nt_name.Length / sizeof(WCHAR) - nt_filename; + + /* Build it from path + filename (the latter converted from nt_name) */ + num = WideCharToMultiByte(CP_UNIXCP, 0, nt_filename, nt_filename_len, + NULL, 0, NULL, &used_default); + if (num > 0 && !used_default) + { + for (pathlen = dest_unix.Length; --pathlen > 0;) + if (dest_unix.Buffer[pathlen] == '/') { pathlen++; break; } + + tmp = dest_unix.Buffer; + if (dest_unix.MaximumLength < pathlen + num + 1) + tmp = RtlReAllocateHeap(GetProcessHeap(), 0, tmp, pathlen + num + 1); + if (tmp) + { + dest_unix.Buffer = tmp; + dest_unix.Length = pathlen + num; + dest_unix.MaximumLength = dest_unix.Length + 1; + dest_unix.Buffer[dest_unix.Length] = '\0'; + + WideCharToMultiByte(CP_UNIXCP, 0, nt_filename, nt_filename_len, + dest_unix.Buffer + pathlen, num, NULL, NULL); + } + } + } + RtlFreeUnicodeString( &nt_name ); + /* now perform the rename */ if (rename( source_unix.Buffer, dest_unix.Buffer ) == -1) -- 2.21.0

2 3

[PATCH v3 4/4] localspl: Unload monitor in DeleteMonitor.
by Dmitry Timoshkov 05 Sep '19

05 Sep '19

Some print monitors are very sensitive to loads/unloads being done in a quick succession like AddMonitor() does, and that even leads to crashes because the monitor I have here creates a thread on load and when the thread starts - the monitor dll is already unloaded. A solution to this is moving the monitor unloading to DeleteMonitor. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 0e602ff701..3da71525d1 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1560,8 +1560,6 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) if ((pm = monitor_load(mi2w->pName, mi2w->pDLLName)) == NULL) res = FALSE; - monitor_unload(pm); - RegCloseKey(hentry); if (!res) @@ -1862,6 +1860,7 @@ static BOOL WINAPI fpConfigurePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName) static BOOL WINAPI fpDeleteMonitor(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorName) { + monitor_t *pm; HKEY hroot = NULL; LONG lres; @@ -1882,6 +1881,18 @@ static BOOL WINAPI fpDeleteMonitor(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMo return FALSE; } + /* Unload the monitor if it's loaded */ + EnterCriticalSection(&monitor_handles_cs); + LIST_FOR_EACH_ENTRY(pm, &monitor_handles, monitor_t, entry) + { + if (pm->name && !lstrcmpW(pMonitorName, pm->name)) + { + monitor_unload(pm); + break; + } + } + LeaveCriticalSection(&monitor_handles_cs); + if(RegCreateKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) != ERROR_SUCCESS) { ERR("unable to create key %s\n", debugstr_w(monitorsW)); return FALSE; -- 2.20.1

2 1

[PATCH v3 3/4] localspl: Add support for monitors providing the MONITOR2 interface.
by Dmitry Timoshkov 05 Sep '19

05 Sep '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 145 ++++++++++++++++++++++++--------------- 1 file changed, 90 insertions(+), 55 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 8e5e3428d5..0e602ff701 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -65,10 +65,10 @@ typedef struct { LPWSTR name; LPWSTR dllname; PMONITORUI monitorUI; - LPMONITOR monitor; + MONITOR2 monitor; + BOOL (WINAPI *old_XcvOpenPort)(LPCWSTR,ACCESS_MASK,PHANDLE); HMODULE hdll; DWORD refcount; - DWORD dwMonitorSize; } monitor_t; typedef struct { @@ -327,6 +327,10 @@ static void monitor_unload(monitor_t * pm) if (pm->refcount == 0) { list_remove(&pm->entry); + + if (pm->monitor.pfnShutdown) + pm->monitor.pfnShutdown(0); + FreeLibrary(pm->hdll); heap_free(pm->name); heap_free(pm->dllname); @@ -352,7 +356,7 @@ static void monitor_unloadall(void) LIST_FOR_EACH_ENTRY_SAFE(pm, next, &monitor_handles, monitor_t, entry) { /* skip monitorui dlls */ - if (pm->monitor) monitor_unload(pm); + if (pm->monitor.cbSize) monitor_unload(pm); } LeaveCriticalSection(&monitor_handles_cs); } @@ -378,6 +382,7 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) monitor_t * cursor; LPWSTR regroot = NULL; LPWSTR driver = dllname; + HKEY hroot = 0; TRACE("(%s, %s)\n", debugstr_w(name), debugstr_w(dllname)); /* Is the Monitor already loaded? */ @@ -402,7 +407,6 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) if (pm->name == NULL) { /* Load the monitor */ - LPMONITOREX pmonitorEx; DWORD len; if (name) { @@ -413,19 +417,19 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) if (regroot) { lstrcpyW(regroot, monitorsW); lstrcatW(regroot, name); - /* Get the Driver from the Registry */ - if (driver == NULL) { - HKEY hroot; - DWORD namesize; - if (RegOpenKeyW(HKEY_LOCAL_MACHINE, regroot, &hroot) == ERROR_SUCCESS) { + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, regroot, &hroot) == ERROR_SUCCESS) { + /* Get the Driver from the Registry */ + if (driver == NULL) { + DWORD namesize; if (RegQueryValueExW(hroot, driverW, NULL, NULL, NULL, &namesize) == ERROR_SUCCESS) { driver = heap_alloc(namesize); RegQueryValueExW(hroot, driverW, NULL, NULL, (LPBYTE) driver, &namesize) ; } - RegCloseKey(hroot); } } + else + WARN("%s not found\n", debugstr_w(regroot)); } pm->name = strdupW(name); @@ -471,26 +475,38 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) } } - if (pInitializePrintMonitor && regroot) { + if (pInitializePrintMonitor2 && hroot) { + MONITORINIT init; + MONITOR2 *monitor2; + HANDLE hmon; + + memset(&init, 0, sizeof(init)); + init.cbSize = sizeof(init); + init.hckRegistryRoot = hroot; + init.bLocal = TRUE; + + monitor2 = pInitializePrintMonitor2(&init, &hmon); + TRACE("%p: MONITOR2 from %s,InitializePrintMonitor2(%s)\n", + monitor2, debugstr_w(driver), debugstr_w(regroot)); + if (monitor2) + memcpy(&pm->monitor, monitor2, min(monitor2->cbSize, sizeof(pm->monitor))); + } + else if (pInitializePrintMonitor && regroot) { + MONITOREX *pmonitorEx; + pmonitorEx = pInitializePrintMonitor(regroot); TRACE("%p: LPMONITOREX from %s,InitializePrintMonitor(%s)\n", pmonitorEx, debugstr_w(driver), debugstr_w(regroot)); - - if (pmonitorEx) { - pm->dwMonitorSize = pmonitorEx->dwMonitorSize; - pm->monitor = &(pmonitorEx->Monitor); + if (pmonitorEx) + { + /* Layout of MONITOREX and MONITOR2 mostly matches */ + memcpy(&pm->monitor, pmonitorEx, min(pmonitorEx->dwMonitorSize, sizeof(pm->monitor))); + pm->old_XcvOpenPort = pmonitorEx->Monitor.pfnXcvOpenPort; + pm->monitor.pfnXcvOpenPort = NULL; } } - if (pm->monitor) { - TRACE("0x%08x: dwMonitorSize (%d)\n", pm->dwMonitorSize, pm->dwMonitorSize); - - } - - if (!pm->monitor && regroot) { - if (pInitializePrintMonitor2 != NULL) { - FIXME("%s,InitializePrintMonitor2 not implemented\n", debugstr_w(driver)); - } + if (!pm->monitor.cbSize && regroot) { if (pInitializeMonitorEx != NULL) { FIXME("%s,InitializeMonitorEx not implemented\n", debugstr_w(driver)); } @@ -498,7 +514,7 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) FIXME("%s,InitializeMonitor not implemented\n", debugstr_w(driver)); } } - if (!pm->monitor && !pm->monitorUI) { + if (!pm->monitor.cbSize && !pm->monitorUI) { monitor_unload(pm); SetLastError(ERROR_PROC_NOT_FOUND); pm = NULL; @@ -511,6 +527,7 @@ cleanup: } LeaveCriticalSection(&monitor_handles_cs); if (driver != dllname) heap_free(driver); + if (hroot) RegCloseKey(hroot); heap_free(regroot); TRACE("=> %p\n", pm); return pm; @@ -563,7 +580,7 @@ static monitor_t * monitor_loadui(monitor_t * pm) WCHAR buffer[MAX_PATH]; HANDLE hXcv; DWORD len; - DWORD res; + DWORD res = 0; if (pm == NULL) return NULL; TRACE("(%p) => dllname: %s\n", pm, debugstr_w(pm->dllname)); @@ -577,16 +594,17 @@ static monitor_t * monitor_loadui(monitor_t * pm) } /* query the userinterface-dllname from the Portmonitor */ - if ((pm->monitor) && (pm->monitor->pfnXcvDataPort)) { - /* building (",XcvMonitor %s",pm->name) not needed yet */ - res = pm->monitor->pfnXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); - TRACE("got %u with %p\n", res, hXcv); - if (res) { - res = pm->monitor->pfnXcvDataPort(hXcv, monitorUIW, NULL, 0, (BYTE *) buffer, sizeof(buffer), &len); - TRACE("got %u with %s\n", res, debugstr_w(buffer)); - if (res == ERROR_SUCCESS) pui = monitor_load(NULL, buffer); - pm->monitor->pfnXcvClosePort(hXcv); - } + /* building (",XcvMonitor %s",pm->name) not needed yet */ + if (pm->monitor.pfnXcvOpenPort) + res = pm->monitor.pfnXcvOpenPort(0, emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + else if (pm->old_XcvOpenPort) + res = pm->old_XcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + TRACE("got %u with %p\n", res, hXcv); + if (res) { + res = pm->monitor.pfnXcvDataPort(hXcv, monitorUIW, NULL, 0, (BYTE *) buffer, sizeof(buffer), &len); + TRACE("got %u with %s\n", res, debugstr_w(buffer)); + if (res == ERROR_SUCCESS) pui = monitor_load(NULL, buffer); + pm->monitor.pfnXcvClosePort(hXcv); } return pui; } @@ -921,7 +939,6 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf DWORD numentries; DWORD entrysize; - TRACE("(%d, %p, %d, %p)\n", level, pPorts, cbBuf, lpreturned); entrysize = (level == 1) ? sizeof(PORT_INFO_1W) : sizeof(PORT_INFO_2W); @@ -934,16 +951,16 @@ static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf LIST_FOR_EACH_ENTRY(pm, &monitor_handles, monitor_t, entry) { - if ((pm->monitor) && (pm->monitor->pfnEnumPorts)) { + if (pm->monitor.pfnEnumPorts) { pi_needed = 0; pi_returned = 0; - res = pm->monitor->pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); + res = pm->monitor.pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { /* Do not use heap_realloc (we do not need the old data in the buffer) */ heap_free(pi_buffer); pi_buffer = heap_alloc(pi_needed); pi_allocated = (pi_buffer) ? pi_needed : 0; - res = pm->monitor->pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); + res = pm->monitor.pfnEnumPorts(NULL, level, pi_buffer, pi_allocated, &pi_needed, &pi_returned); } TRACE("(%s) got %d with %d (need %d byte for %d entries)\n", debugstr_w(pm->name), res, GetLastError(), pi_needed, pi_returned); @@ -1144,7 +1161,10 @@ static HMODULE driver_load(const printenv_t * env, LPWSTR dllname) static VOID printer_free(printer_t * printer) { if (printer->hXcv) - printer->pm->monitor->pfnXcvClosePort(printer->hXcv); + { + if (printer->pm->monitor.pfnXcvClosePort) + printer->pm->monitor.pfnXcvClosePort(printer->hXcv); + } monitor_unload(printer->pm); @@ -1224,11 +1244,14 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) } if (printer->pm) { - if ((printer->pm->monitor) && (printer->pm->monitor->pfnXcvOpenPort)) { - printer->pm->monitor->pfnXcvOpenPort(&printername[len], - pDefault ? pDefault->DesiredAccess : 0, - &printer->hXcv); - } + if (printer->pm->monitor.pfnXcvOpenPort) + printer->pm->monitor.pfnXcvOpenPort(0, &printername[len], + pDefault ? pDefault->DesiredAccess : 0, + &printer->hXcv); + else if (printer->pm->old_XcvOpenPort) + printer->pm->old_XcvOpenPort(&printername[len], + pDefault ? pDefault->DesiredAccess : 0, + &printer->hXcv); if (printer->hXcv == NULL) { printer_free(printer); SetLastError(ERROR_INVALID_PARAMETER); @@ -1587,8 +1610,10 @@ static BOOL WINAPI fpAddPort(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName) } pm = monitor_load(pMonitorName, NULL); - if (pm && pm->monitor && pm->monitor->pfnAddPort) { - res = pm->monitor->pfnAddPort(pName, hWnd, pMonitorName); + if (!pm) return FALSE; + + if (pm->monitor.pfnAddPort) { + res = pm->monitor.pfnAddPort(pName, hWnd, pMonitorName); TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pm->dllname)); } else @@ -1664,8 +1689,11 @@ static BOOL WINAPI fpAddPortEx(LPWSTR pName, DWORD level, LPBYTE pBuffer, LPWSTR /* load the Monitor */ pm = monitor_load(pMonitorName, NULL); - if (pm && pm->monitor && pm->monitor->pfnAddPortEx) { - res = pm->monitor->pfnAddPortEx(pName, level, pBuffer, pMonitorName); + if (!pm) return FALSE; + + if (pm->monitor.pfnAddPortEx) + { + res = pm->monitor.pfnAddPortEx(pName, level, pBuffer, pMonitorName); TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pm->dllname)); } else @@ -1778,10 +1806,13 @@ static BOOL WINAPI fpConfigurePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName) } pm = monitor_load_by_port(pPortName); - if (pm && pm->monitor && pm->monitor->pfnConfigurePort) { + if (!pm) return FALSE; + + if (pm->monitor.pfnConfigurePort) + { TRACE("use %s for %s (monitor %p: %s)\n", debugstr_w(pm->name), debugstr_w(pPortName), pm, debugstr_w(pm->dllname)); - res = pm->monitor->pfnConfigurePort(pName, hWnd, pPortName); + res = pm->monitor.pfnConfigurePort(pName, hWnd, pPortName); TRACE("got %d with %u\n", res, GetLastError()); } else @@ -1908,10 +1939,13 @@ static BOOL WINAPI fpDeletePort(LPWSTR pName, HWND hWnd, LPWSTR pPortName) } pm = monitor_load_by_port(pPortName); - if (pm && pm->monitor && pm->monitor->pfnDeletePort) { + if (!pm) return FALSE; + + if (pm->monitor.pfnDeletePort) + { TRACE("use %s for %s (monitor %p: %s)\n", debugstr_w(pm->name), debugstr_w(pPortName), pm, debugstr_w(pm->dllname)); - res = pm->monitor->pfnDeletePort(pName, hWnd, pPortName); + res = pm->monitor.pfnDeletePort(pName, hWnd, pPortName); TRACE("got %d with %u\n", res, GetLastError()); } else @@ -2338,7 +2372,8 @@ static BOOL WINAPI fpXcvData(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, *pcbOutputNeeded = 0; - *pdwStatus = printer->pm->monitor->pfnXcvDataPort(printer->hXcv, pszDataName, + if (printer->pm->monitor.pfnXcvDataPort) + *pdwStatus = printer->pm->monitor.pfnXcvDataPort(printer->hXcv, pszDataName, pInputData, cbInputData, pOutputData, cbOutputData, pcbOutputNeeded); return TRUE; -- 2.20.1

2 1

[PATCH v3 1/4] localspl: Remove useless NULL checks from AddMonitor trace.
by Dmitry Timoshkov 05 Sep '19

05 Sep '19

AddMonitor dereferences pMonitors later without any checks. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/localspl/provider.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index cb31b194ae..ccd19811cf 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1475,9 +1475,7 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) mi2w = (LPMONITOR_INFO_2W) pMonitors; TRACE("(%s, %d, %p): %s %s %s\n", debugstr_w(pName), Level, pMonitors, - debugstr_w(mi2w ? mi2w->pName : NULL), - debugstr_w(mi2w ? mi2w->pEnvironment : NULL), - debugstr_w(mi2w ? mi2w->pDLLName : NULL)); + debugstr_w(mi2w->pName), debugstr_w(mi2w->pEnvironment), debugstr_w(mi2w->pDLLName)); if (copy_servername_from_name(pName, NULL)) { FIXME("server %s not supported\n", debugstr_w(pName)); -- 2.20.1

2 1