March 2019 - Wine-Devel - list.winehq.org

[PATCH] urlmon: Pass unescaped URLs to InternetOpenUrl in ftp protocol handler.
by Jacek Caban March 26, 2019

March 26, 2019

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Based on patch by André Hentschel. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26445 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/ftp.c | 21 ++++++++++++--------- dlls/urlmon/tests/Makefile.in | 2 +- dlls/urlmon/tests/url.c | 10 +++++++++- 3 files changed, 22 insertions(+), 11 deletions(-)

2 1

[PATCH v3 1/2] urlmon: Use unescaped Urls for FTP actions
by Alistair Leslie-Hughes March 26, 2019

March 26, 2019

From: André Hentschel <nerv(a)dawncrow.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26445 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/urlmon/ftp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index aef4a6c..b1ae637 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -66,12 +66,16 @@ static HRESULT FtpProtocol_open_request(Protocol *prot, IUri *uri, DWORD request HINTERNET internet_session, IInternetBindInfo *bind_info) { FtpProtocol *This = impl_from_Protocol(prot); + DWORD path_size = 0; BSTR url; HRESULT hres; hres = IUri_GetAbsoluteUri(uri, &url); if(FAILED(hres)) return hres; + hres = UrlUnescapeW(url, NULL, &path_size, URL_UNESCAPE_INPLACE); + if(FAILED(hres)) + return hres; This->base.request = InternetOpenUrlW(internet_session, url, NULL, 0, request_flags|INTERNET_FLAG_EXISTING_CONNECT|INTERNET_FLAG_PASSIVE, -- 1.9.1

2 1

[PATCH] kernel32/nls: Change Sinhala sublang identifier to SUBLANG_SINHALESE_SRI_LANKA.
by Isira Seneviratne March 26, 2019

March 26, 2019

1 0

[PATCH 1/3] mfplat: Keep file handle open for file stream.
by Nikolay Sivov March 26, 2019

March 26, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 8 +++++--- dlls/mfplat/tests/mfplat.c | 41 +++++++++++++++----------------------- 2 files changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 57bed4ac3e..6aaa29daa3 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1971,6 +1971,7 @@ typedef struct bytestream IMFAsyncCallback read_callback; IMFAsyncCallback write_callback; IStream *stream; + HANDLE hfile; QWORD position; DWORD capabilities; struct list pending; @@ -2235,6 +2236,8 @@ static ULONG WINAPI bytestream_Release(IMFByteStream *iface) DeleteCriticalSection(&stream->cs); if (stream->stream) IStream_Release(stream->stream); + if (stream->hfile) + CloseHandle(stream->hfile); heap_free(stream); } @@ -2820,7 +2823,7 @@ static const IMFGetServiceVtbl bytestream_file_getservice_vtbl = HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, LPCWSTR url, IMFByteStream **bytestream) { - mfbytestream *object; + struct bytestream *object; DWORD fileaccessmode = 0; DWORD filesharemode = FILE_SHARE_READ; DWORD filecreation_disposition = 0; @@ -2894,6 +2897,7 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open object->write_callback.lpVtbl = &bytestream_file_write_callback_vtbl; InitializeCriticalSection(&object->cs); list_init(&object->pending); + object->hfile = file; if (GetFileTime(file, NULL, NULL, &writetime)) { @@ -2905,8 +2909,6 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open *bytestream = &object->IMFByteStream_iface; - CloseHandle(file); - return S_OK; } diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 6c6bfc16b6..f280a35a58 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1187,15 +1187,11 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); IMFByteStream_Release(bytestream2); - hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, - MF_FILEFLAGS_NONE, filename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "Unexpected hr %#x.\n", hr); - hr = MFCreateFile(MF_ACCESSMODE_READWRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, - MF_FILEFLAGS_NONE, filename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + hr = MFCreateFile(MF_ACCESSMODE_READWRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "Unexpected hr %#x.\n", hr); IMFByteStream_Release(bytestream); @@ -1211,20 +1207,15 @@ todo_wine MF_FILEFLAGS_NONE, newfilename, &bytestream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, - MF_FILEFLAGS_NONE, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, newfilename, &bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "Unexpected hr %#x.\n", hr); - hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, - MF_FILEFLAGS_NONE, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, newfilename, &bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "Unexpected hr %#x.\n", hr); - hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, - MF_FILEFLAGS_ALLOW_WRITE_SHARING, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, + newfilename, &bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "Unexpected hr %#x.\n", hr); IMFByteStream_Release(bytestream); @@ -1233,14 +1224,14 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); /* Opening the file again fails even though MF_FILEFLAGS_ALLOW_WRITE_SHARING is set. */ - hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, - MF_FILEFLAGS_ALLOW_WRITE_SHARING, newfilename, &bytestream2); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "got 0x%08x\n", hr); - if (hr == S_OK) IMFByteStream_Release(bytestream2); + hr = MFCreateFile(MF_ACCESSMODE_WRITE, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_ALLOW_WRITE_SHARING, + newfilename, &bytestream2); + ok(hr == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "Unexpected hr %#x.\n", hr); IMFByteStream_Release(bytestream); - MFShutdown(); + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); DeleteFileW(filename); DeleteFileW(newfilename); -- 2.20.1

2 3

[PATCH 1/7] msi/tests: Test calling more functions from custom actions.
by Zebediah Figura March 26, 2019

March 26, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/custom.c | 54 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index c7ce4d20ae..6ae5bfc30a 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1112,11 +1112,57 @@ static void test_costs(MSIHANDLE hinst) ok(hinst, sz == 2, "got size %u\n", sz); } +static void test_invalid_functions(MSIHANDLE hinst) +{ + char path[MAX_PATH], package_name[20]; + MSIHANDLE db, preview, package; + UINT r; + + r = MsiGetDatabaseState(hinst); + todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); + + db = MsiGetActiveDatabase(hinst); + ok(hinst, db, "MsiGetActiveDatabase failed\n"); + + r = MsiDatabaseGenerateTransformA(db, db, "bogus.mst", 0, 0); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiDatabaseApplyTransformA(db, "bogus.mst", 0); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiCreateTransformSummaryInfoA(db, db, "bogus.mst", 0, 0); + todo_wine ok(hinst, r == ERROR_INSTALL_PACKAGE_OPEN_FAILED, "got %u\n", r); + + GetCurrentDirectoryA(sizeof(path), path); + r = MsiDatabaseExportA(db, "Test", path, "bogus.idt"); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiDatabaseImportA(db, path, "bogus.idt"); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiDatabaseCommit(db); + ok(hinst, r == ERROR_SUCCESS, "got %u\n", r); + + r = MsiDatabaseMergeA(db, db, "MergeErrors"); + ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiGetDatabaseState(db); + todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); + + r = MsiEnableUIPreview(db, &preview); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + sprintf(package_name, "#%u", db); + r = MsiOpenPackageA(package_name, &package); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + MsiCloseHandle(db); +} + /* Main test. Anything that doesn't depend on a specific install configuration * or have undesired side effects should go here. */ UINT WINAPI main_test(MSIHANDLE hinst) { - UINT res; IUnknown *unk = NULL; HRESULT hr; @@ -1131,11 +1177,6 @@ UINT WINAPI main_test(MSIHANDLE hinst) ok(hinst, hr == S_OK, "got %#x\n", hr); CoUninitialize(); - /* Test MsiGetDatabaseState() */ - res = MsiGetDatabaseState(hinst); - todo_wine - ok(hinst, res == MSIDBSTATE_ERROR, "expected MSIDBSTATE_ERROR, got %u\n", res); - test_props(hinst); test_db(hinst); test_doaction(hinst); @@ -1144,6 +1185,7 @@ UINT WINAPI main_test(MSIHANDLE hinst) test_feature_states(hinst); test_format_record(hinst); test_costs(hinst); + test_invalid_functions(hinst); return ERROR_SUCCESS; } -- 2.17.1

3 20

[PATCH] wineandroid.drv: Remove useless cast to self
by Andrew Eikum March 26, 2019

March 26, 2019

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/wineandroid.drv/mmdevdrv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 3968536601..1dafe02f4c 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -379,8 +379,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, if(!This) return E_OUTOFMEMORY; - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, - (IUnknown **)&This->pUnkFTMarshal); + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return hr; -- 2.21.0

1 0

[PATCH] winecoreaudio.drv: Remove useless cast to self
by Andrew Eikum March 26, 2019

March 26, 2019

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index c362a5142f..28ada4359b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -695,8 +695,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->lock = 0; - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, - (IUnknown **)&This->pUnkFTMarshal); + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return hr; -- 2.21.0

1 0

[PATCH] winmm: Correct phrasing of some resource strings.
by Isira Seneviratne March 26, 2019

March 26, 2019

2 1

[PATCH] wineoss.drv: Remove useless cast to self
by Michael Stefaniuc March 26, 2019

March 26, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Not compile tested as I don't have OSSv4 on Fedora dlls/wineoss.drv/mmdevdrv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index fa3f885ea1..afa018ab0f 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -605,8 +605,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, if(!This) return E_OUTOFMEMORY; - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, - (IUnknown **)&This->pUnkFTMarshal); + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return hr; -- 2.20.1

2 1

[PATCH] winealsa.drv: Remove useless cast to self
by Michael Stefaniuc March 26, 2019

March 26, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index de89fd05c5..2bf4d73dc6 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -803,8 +803,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient return E_UNEXPECTED; } - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, - (IUnknown **)&This->pUnkFTMarshal); + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return hr; -- 2.20.1

2 1