- wine-devel - winehq.org

[PATCH] urlmon: Pass unescaped URLs to InternetOpenUrl in ftp protocol handler.
by Jacek Caban 26 Mar '19

26 Mar '19

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 26 Mar '19

26 Mar '19

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 26 Mar '19

26 Mar '19

1 0

[PATCH 1/3] mfplat: Keep file handle open for file stream.
by Nikolay Sivov 26 Mar '19

26 Mar '19

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 26 Mar '19

26 Mar '19

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 26 Mar '19

26 Mar '19

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 26 Mar '19

26 Mar '19

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 26 Mar '19

26 Mar '19

2 1

[PATCH] wineoss.drv: Remove useless cast to self
by Michael Stefaniuc 26 Mar '19

26 Mar '19

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 26 Mar '19

26 Mar '19

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

[PATCH 4/4] msvcrt: Use _strnicmp instead of strncasecmp.
by Piotr Caban 26 Mar '19

26 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 2 +- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/string.c | 11 +---------- 3 files changed, 3 insertions(+), 12 deletions(-)

1 0

[PATCH 3/4] msvcrt: Use _stricmp instead of strcasecmp.
by Piotr Caban 26 Mar '19

26 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/locale.c | 10 +++++----- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/string.c | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-)

1 0

[PATCH 2/4] msvcrt: Use internal toupper implementation.
by Piotr Caban 26 Mar '19

26 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/mbcs.c | 6 +++--- dlls/msvcrt/printf.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-)

1 0

[PATCH 1/4] msvcrt: Use internal tolower implementation.
by Piotr Caban 26 Mar '19

26 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 5 +++-- dlls/msvcrt/mbcs.c | 6 +++--- dlls/msvcrt/string.c | 24 +++++++++++++----------- 3 files changed, 19 insertions(+), 16 deletions(-)

1 0

[PATCH 8/8] ntdll: Don't use toupper in RtlIsNameLegalDOS8Dot3 tests.
by Piotr Caban 26 Mar '19

26 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/tests/path.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)

1 0

[PATCH 7/8] ntdll: Use NTDLL_tolower instead of toupper.
by Piotr Caban 26 Mar '19

26 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/printf.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)

1 0

[PATCH 6/8] ntdll: Use _stricmp instead of strcasecmp.
by Piotr Caban 26 Mar '19

26 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/nt.c | 14 +++++++------- dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/relay.c | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-)

1 0

[PATCH 5/8] ntdll: Fix _strnicmp implementation when wine is run in tr_TR.UTF-8 locale.
by Piotr Caban 26 Mar '19

26 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/string.c | 29 ++++++++++++++++++++++------- dlls/ntdll/tests/string.c | 26 ++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 7 deletions(-)

1 0

[PATCH 4/8] ntdll: Use NTDLL_tolower in _strlwr.
by Piotr Caban 26 Mar '19

26 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 3/8] ntdll: Use NTDLL_tolower in _memicmp.
by Piotr Caban 26 Mar '19

26 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 2/8] ntdll: Use ANSI code page in toupper.
by Piotr Caban 26 Mar '19

26 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/string.c | 12 +++++++++++- dlls/ntdll/tests/string.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-)

1 0

[PATCH 1/8] ntdll: Fix tolower implementation when wine is run in tr_TR.UTF-8 locale.
by Piotr Caban 26 Mar '19

26 Mar '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/string.c | 18 +++++++++--------- dlls/ntdll/tests/string.c | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 9 deletions(-)

1 0

[PATCH 1/4] winegstreamer: Use init-once API to initialize library.
by Nikolay Sivov 26 Mar '19

26 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 2 +- dlls/winegstreamer/gstdemux.c | 2 +- dlls/winegstreamer/gsttffilter.c | 8 ++-- dlls/winegstreamer/main.c | 74 ++++++++++++++++++-------------- 4 files changed, 47 insertions(+), 39 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index a1f201c6f4..85659c4bd9 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -43,7 +43,7 @@ IUnknown * CALLBACK Gstreamer_YUV2RGB_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_YUV2ARGB_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr); -DWORD Gstreamer_init(void); +BOOL init_gstreamer(void) DECLSPEC_HIDDEN; GstFlowReturn got_data(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; GstFlowReturn request_buffer(GstPad *pad, guint64 ofs, guint size, GstCaps *caps, GstBuffer **buf) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 0d9ab8ded7..200913f249 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1230,7 +1230,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) TRACE("%p %p\n", pUnkOuter, phr); - if (!Gstreamer_init()) + if (!init_gstreamer()) { *phr = E_FAIL; return NULL; diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index d2d36b694f..7a1d4930fc 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -626,7 +626,7 @@ IUnknown * CALLBACK Gstreamer_Mp3_create(IUnknown *punkouter, HRESULT *phr) TRACE("%p %p\n", punkouter, phr); - if (!Gstreamer_init()) + if (!init_gstreamer()) { *phr = E_FAIL; return NULL; @@ -769,7 +769,7 @@ IUnknown * CALLBACK Gstreamer_YUV2RGB_create(IUnknown *punkouter, HRESULT *phr) TRACE("%p %p\n", punkouter, phr); - if (!Gstreamer_init()) + if (!init_gstreamer()) { *phr = E_FAIL; return NULL; @@ -871,7 +871,7 @@ IUnknown * CALLBACK Gstreamer_YUV2ARGB_create(IUnknown *punkouter, HRESULT *phr) TRACE("%p %p\n", punkouter, phr); - if (!Gstreamer_init()) + if (!init_gstreamer()) { *phr = E_FAIL; return NULL; @@ -1004,7 +1004,7 @@ IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *punkouter, HRESULT * TRACE("%p %p\n", punkouter, phr); - if (!Gstreamer_init()) + if (!init_gstreamer()) { *phr = E_FAIL; return NULL; diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index b9cddcbc3e..a1b1648d9d 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -257,41 +257,49 @@ void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt) TRACE("\t%s\n\t%s\n\t...\n\t%s\n", debugstr_guid(&pmt->majortype), debugstr_guid(&pmt->subtype), debugstr_guid(&pmt->formattype)); } -DWORD Gstreamer_init(void) +static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ctx) { - static int inited; - - if (!inited) { - char argv0[] = "wine"; - char argv1[] = "--gst-disable-registry-fork"; - char **argv = HeapAlloc(GetProcessHeap(), 0, sizeof(char *)*3); - int argc = 2; - GError *err = NULL; - - TRACE("initializing\n"); - - argv[0] = argv0; - argv[1] = argv1; - argv[2] = NULL; - inited = gst_init_check(&argc, &argv, &err); - HeapFree(GetProcessHeap(), 0, argv); - if (err) { - ERR("Failed to initialize gstreamer: %s\n", err->message); - g_error_free(err); - } - if (inited) { - HINSTANCE newhandle; - /* Unloading glib is a bad idea.. it installs atexit handlers, - * so never unload the dll after loading */ - GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, - (LPCWSTR)hInst, &newhandle); - if (!newhandle) - ERR("Could not pin module %p\n", hInst); - - start_dispatch_thread(); - } + BOOL *status = param; + char argv0[] = "wine"; + char argv1[] = "--gst-disable-registry-fork"; + char **argv = HeapAlloc(GetProcessHeap(), 0, sizeof(char *)*3); + int argc = 2; + GError *err = NULL; + + TRACE("initializing\n"); + + argv[0] = argv0; + argv[1] = argv1; + argv[2] = NULL; + *status = gst_init_check(&argc, &argv, &err); + HeapFree(GetProcessHeap(), 0, argv); + if (err) { + ERR("Failed to initialize gstreamer: %s\n", err->message); + g_error_free(err); } - return inited; + if (*status) { + HINSTANCE newhandle; + /* Unloading glib is a bad idea.. it installs atexit handlers, + * so never unload the dll after loading */ + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (LPCWSTR)hInst, &newhandle); + if (!newhandle) + ERR("Could not pin module %p\n", hInst); + + start_dispatch_thread(); + } + + return TRUE; +} + +BOOL init_gstreamer(void) +{ + static INIT_ONCE once = INIT_ONCE_STATIC_INIT; + static BOOL status; + + InitOnceExecuteOnce(&once, init_gstreamer_proc, &status, NULL); + + return status; } #define INF_SET_ID(id) \ -- 2.20.1

1 3

[PATCH] .editorconfig: Remove the trim_trailing_whitespace setting.
by Ken Thomases 26 Mar '19

26 Mar '19

Editors don't behave consistently. Some remove trailing whitespace from the entire file, not just touched lines, on save. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- .editorconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 289038d37f0..82f57343ad0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,7 +6,6 @@ indent_style = space indent_size = 4 tab_width = 8 charset = utf-8 -trim_trailing_whitespace = true insert_final_newline = true max_line_length = 100 -- 2.21.0

1 0

[PATCH v3 2/2] urlmon/tests: Add FTP encoded url test
by Alistair Leslie-Hughes 25 Mar '19

25 Mar '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/urlmon/tests/Makefile.in | 2 +- dlls/urlmon/tests/url.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/Makefile.in b/dlls/urlmon/tests/Makefile.in index 2eef129..48afdc9 100644 --- a/dlls/urlmon/tests/Makefile.in +++ b/dlls/urlmon/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = urlmon.dll -IMPORTS = urlmon wininet ole32 oleaut32 user32 advapi32 +IMPORTS = urlmon wininet ole32 oleaut32 user32 advapi32 shlwapi C_SRCS = \ generated.c \ diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index ada78c9..0f2b14e 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -32,6 +32,7 @@ #include "urlmon.h" #include "wininet.h" #include "mshtml.h" +#include "shlwapi.h" #include "wine/test.h" @@ -2905,7 +2906,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) url_a = (flags & BINDTEST_INVALID_CN) ? "https://4.15.184.77/favicon.ico" : "https://test.winehq.org/tests/hello.html"; break; case FTP_TEST: - url_a = "ftp://ftp.winehq.org/welcome.msg"; + url_a = "ftp://ftp.winehq.org/welcome%2emsg"; break; default: url_a = "winetest:test"; @@ -2969,6 +2970,13 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) if(FAILED(hres)) return; + if(protocol == FTP_TEST) + { + /* FTP url dont have any escape characters, so convert the url to what is expected */ + DWORD size = 0; + UrlUnescapeW(current_url, NULL, &size, URL_UNESCAPE_INPLACE); + } + hres = IMoniker_QueryInterface(mon, &IID_IBinding, (void**)&bind); ok(hres == E_NOINTERFACE, "IMoniker should not have IBinding interface\n"); if(SUCCEEDED(hres)) -- 1.9.1

2 1

[PATCH] msi: Avoid a crash in RemoveFiles if the component directory is invalid.
by Hans Leidekker 25 Mar '19

25 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46907 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 92a98f1eca..68b8954f57 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -1645,7 +1645,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) else { MSIFOLDER *folder = msi_get_loaded_folder( package, comp->Directory ); - remove_folder( folder ); + if (folder) remove_folder( folder ); } } return ERROR_SUCCESS; -- 2.11.0

1 0

[PATCH v2 1/2] urlmon: Use unescaped Urls for FTP actions
by Alistair Leslie-Hughes 25 Mar '19

25 Mar '19

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 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index aef4a6cf16..31bdc79852 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -66,17 +66,24 @@ 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; + LPWSTR path; BSTR url; HRESULT hres; hres = IUri_GetAbsoluteUri(uri, &url); if(FAILED(hres)) return hres; + path = heap_strdupW((LPWSTR)url); + hres = UrlUnescapeW(path, NULL, &path_size, URL_UNESCAPE_INPLACE); + if(FAILED(hres)) + return hres; + SysFreeString(url); - This->base.request = InternetOpenUrlW(internet_session, url, NULL, 0, + This->base.request = InternetOpenUrlW(internet_session, path, NULL, 0, request_flags|INTERNET_FLAG_EXISTING_CONNECT|INTERNET_FLAG_PASSIVE, (DWORD_PTR)&This->base); - SysFreeString(url); + heap_free(path); if (!This->base.request && GetLastError() != ERROR_IO_PENDING) { WARN("InternetOpenUrl failed: %d\n", GetLastError()); return INET_E_RESOURCE_NOT_FOUND; -- 2.20.1

2 1

[PATCH] kernel32/tests: Add tests for FindFirstFileA with invalid characters.
by Vijay Kiran Kamuju 25 Mar '19

25 Mar '19

Includes testcases by Vincent Pelletier. Mark some test as todo. From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/kernel32/tests/file.c | 109 ++++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 33b17aa327..0aa1bff177 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2543,11 +2543,86 @@ static char get_windows_drive(void) return windowsdir[0]; } +struct +{ + const char *path; + BOOL expected; + BOOL todo; +} +static const invalid_char_tests[] = +{ + { "./test-dir", TRUE }, + { "./test-dir/", FALSE }, + { ".\\test-dir", TRUE }, + { ".\\test-dir\\", FALSE }, + { "/>test-dir", FALSE }, + { "<\"test->dir", FALSE }, + { "<test->dir", FALSE }, + { "><test->dir", FALSE }, + { ">>test-dir", FALSE }, + { ">test->dir", FALSE }, + { ">test-dir", FALSE }, + { "\"test-dir\"", FALSE }, + { "\"test-file\"", FALSE }, + { "test-/>dir", FALSE }, + { "test-dir/", FALSE }, + { "test-dir//", FALSE }, + { "test-dir/:", FALSE }, + { "test-dir/<", TRUE, TRUE }, + { "test-dir/>", TRUE, TRUE }, + { "test-dir/\"", TRUE, TRUE }, + { "test-dir/\\", FALSE }, + { "test-dir/|", FALSE }, + { "test-dir<", TRUE, TRUE }, + { "test-dir</", FALSE }, + { "test-dir<<", TRUE, TRUE }, + { "test-dir<<<><><>\"\"\"\"<<<>", TRUE, TRUE }, + { "test-dir<>", TRUE, TRUE }, + { "test-dir<\"", TRUE, TRUE }, + { "test-dir>", TRUE, TRUE }, + { "test-dir>/", FALSE }, + { "test-dir><", TRUE, TRUE }, + { "test-dir>>", TRUE, TRUE }, + { "test-dir>\"", TRUE, TRUE }, + { "test-dir\"", TRUE, TRUE }, + { "test-dir\"/", FALSE }, + { "test-dir\"<", TRUE, TRUE }, + { "test-dir\">", TRUE, TRUE }, + { "test-dir\"\"", TRUE, TRUE }, + { "test-dir\"\"\"\"\"", TRUE, TRUE }, + { "test-dir\\", FALSE }, + { "test-dir\\/", FALSE }, + { "test-dir\\<", TRUE, TRUE }, + { "test-dir\\>", TRUE, TRUE }, + { "test-dir\\\"", TRUE, TRUE }, + { "test-dir\\\\", FALSE }, + { "test-file/", FALSE }, + { "test-file/<", FALSE }, + { "test-file/>", FALSE }, + { "test-file/\"", FALSE }, + { "test-file<", TRUE, TRUE }, + { "test-file<<", TRUE, TRUE }, + { "test-file<>", TRUE, TRUE }, + { "test-file<\"", TRUE, TRUE }, + { "test-file>", TRUE, TRUE }, + { "test-file><", TRUE, TRUE }, + { "test-file>>", TRUE, TRUE }, + { "test-file>\"", TRUE, TRUE }, + { "test-file\"", TRUE, TRUE }, + { "test-file\"<", TRUE, TRUE }, + { "test-file\">", TRUE, TRUE }, + { "test-file\"\"", TRUE, TRUE }, + { "test-file\\", FALSE }, + { "test-file\\<", FALSE }, + { "test-file\\>", FALSE }, + { "test-file\\\"", FALSE }, +}; + static void test_FindFirstFileA(void) { HANDLE handle; WIN32_FIND_DATAA data; - int err; + int err, i; char buffer[5] = "C:\\"; char buffer2[100]; char nonexistent[MAX_PATH]; @@ -2715,6 +2790,38 @@ static void test_FindFirstFileA(void) err = GetLastError(); ok ( handle == INVALID_HANDLE_VALUE, "FindFirstFile on %s should fail\n", buffer2 ); ok ( err == ERROR_PATH_NOT_FOUND, "Bad Error number %d\n", err ); + + /* try FindFirstFileA with invalid characters */ + CreateDirectoryA("test-dir", NULL); + _lclose(_lcreat("test-file", 0)); + + for (i = 0; i < sizeof(invalid_char_tests) / sizeof(invalid_char_tests[0]); i++) + { + handle = FindFirstFileA(invalid_char_tests[i].path, &data); + if (invalid_char_tests[i].expected) + { + if (invalid_char_tests[i].todo) + { + todo_wine ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileA on %s should succeed\n", + invalid_char_tests[i].path); + } + else + { + ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileA on %s should succeed\n", + invalid_char_tests[i].path); + } + } + else + { + ok(handle == INVALID_HANDLE_VALUE, "FindFirstFileA on %s should fail\n", + invalid_char_tests[i].path); + } + if (handle != INVALID_HANDLE_VALUE) + FindClose(handle); + } + + DeleteFileA("test-file"); + RemoveDirectoryA("test-dir"); } static void test_FindNextFileA(void) -- 2.21.0

2 2

[PATCH 11/11] mshtml: Move IHTMLCSSStyleDeclaration2 implementation to CSSStyle object.
by Jacek Caban 25 Mar '19

25 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 494 ++++++++++++++++++++-------------------- dlls/mshtml/htmlstyle.h | 2 +- 2 files changed, 248 insertions(+), 248 deletions(-)

1 0

[PATCH 10/11] mshtml: Move IHTMLCSSStyleDeclaration implementation to CSSStyle.
by Jacek Caban 25 Mar '19

25 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 1239 ++++++++++++++++++++------------------- dlls/mshtml/htmlstyle.h | 15 +- 2 files changed, 637 insertions(+), 617 deletions(-)

1 0

[PATCH 09/11] mshtml: Move backgroundPosition[XY] properties implementation to IHTMLCSSStyleDeclaration.
by Jacek Caban 25 Mar '19

25 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 328 ++++++++++++++++++++-------------------- 1 file changed, 164 insertions(+), 164 deletions(-)

1 0

[PATCH 08/11] mshtml: Move style zoom property implementation to IHTMLCSSStyleDeclaration.
by Jacek Caban 25 Mar '19

25 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 60 ++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 28 deletions(-)

1 0

[PATCH 07/11] mshtml: Pass style as CSSStyle to get_style_property_var.
by Jacek Caban 25 Mar '19

25 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 146 ++++++++++++++++++++-------------------- 1 file changed, 73 insertions(+), 73 deletions(-)

1 0

[PATCH 06/11] mshtml: Pass style as CSSStyle to get_style_property.
by Jacek Caban 25 Mar '19

25 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 202 ++++++++++++++++++++-------------------- 1 file changed, 101 insertions(+), 101 deletions(-)

1 0

[PATCH 05/11] mshtml: Pass style as CSSStyle to set_style_property_var.
by Jacek Caban 25 Mar '19

25 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 156 ++++++++++++++++++++-------------------- 1 file changed, 78 insertions(+), 78 deletions(-)

1 0

[PATCH 04/11] mshtml: Pass style as CSSStyle to set_style_property.
by Jacek Caban 25 Mar '19

25 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 226 ++++++++++++++++++++-------------------- 1 file changed, 113 insertions(+), 113 deletions(-)

1 0

[PATCH 03/11] mshtml: Forward HTMLStyle IUnknown calls to IHTMLCSSStyleDeclaration implementation.
by Jacek Caban 25 Mar '19

25 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 103 ++++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 52 deletions(-)

1 0

[PATCH 02/11] mshtml: Move style DispatchEx to CSSStyle.
by Jacek Caban 25 Mar '19

25 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 90 ++++++++++++++++++++--------------------- dlls/mshtml/htmlstyle.h | 2 +- 2 files changed, 46 insertions(+), 46 deletions(-)

1 0

[PATCH 01/11] mshtml: Introduce new CSSStyle type as a base for different style object implementations.
by Jacek Caban 25 Mar '19

25 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 40 ++++++++++++++++++++-------------------- dlls/mshtml/htmlstyle.h | 6 +++++- 2 files changed, 25 insertions(+), 21 deletions(-)

1 0

[PATCH 8/8] ntoskrnl.exe: Support event functions on kernel objects.
by Jacek Caban 25 Mar '19

25 Mar '19

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

2 1

[PATCH 7/8] ntoskrnl.exe: Support waiting on kernel objects.
by Jacek Caban 25 Mar '19

25 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + dlls/ntoskrnl.exe/sync.c | 11 ++++++----- dlls/ntoskrnl.exe/tests/driver.c | 3 +-- server/device.c | 19 +++++++++++++++++++ server/protocol.def | 10 ++++++++++ 6 files changed, 51 insertions(+), 7 deletions(-)

2 1

[PATCH 6/8] ntoskrnl.exe: Support creating event objects from server handle.
by Jacek Caban 25 Mar '19

25 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl_private.h | 2 + dlls/ntoskrnl.exe/sync.c | 63 ++++++++++++++++++++++------ dlls/ntoskrnl.exe/tests/driver.c | 41 ++++++++++++++++-- server/event.c | 11 ++++- 4 files changed, 101 insertions(+), 16 deletions(-)

2 1

[PATCH 3/8] server: Allow kernel to keep reference to server objects by client pointer.
by Jacek Caban 25 Mar '19

25 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 46 +++++++++++++++++++++++++--- server/device.c | 59 ++++++++++++++++++++++++++++++++++++ server/protocol.def | 14 +++++++++ 3 files changed, 115 insertions(+), 4 deletions(-)

2 1

[PATCH 5/8] server: Notify client about freed object so that it may free associated kernel object.
by Jacek Caban 25 Mar '19

25 Mar '19

Long term, we may consider making interface between server and device manager more generic so that it could be used for messages other than IRPs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 +++++++++++++- server/device.c | 15 +++++++++++++++ server/protocol.def | 6 ++++++ 3 files changed, 34 insertions(+), 1 deletion(-)

1 0

[PATCH 4/8] server: Allow queuing IRPs with no file associated.
by Jacek Caban 25 Mar '19

25 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/device.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)

1 0

[PATCH 2/8] server: Store pointers to objects created by kernel_object_from_handle in server.
by Jacek Caban 25 Mar '19

25 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 126 +++++++++++++++++++++++++---------- server/device.c | 87 ++++++++++++++++++++++++ server/protocol.def | 17 +++++ 3 files changed, 194 insertions(+), 36 deletions(-)

1 0

[PATCH 1/8] server: Introduce kernel_object struct for generic association between server and kernel objects.
by Jacek Caban 25 Mar '19

25 Mar '19

1 0

[PATCH 1/8] server: Introduce kernel_object struct for generic association between server and kernel objects.
by Jacek Caban 25 Mar '19

25 Mar '19

3 3

[PATCH] wined3d: Adjust video memory when resizing swapchain buffers.
by Stefan Dösinger 25 Mar '19

25 Mar '19

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/wined3d/texture.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 55c9543f30b..949492063d2 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1531,6 +1531,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; const struct wined3d_format *format; + const struct wined3d *d3d; struct wined3d_device *device; unsigned int resource_size; DWORD valid_location = 0; @@ -1541,6 +1542,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT texture, width, height, debug_d3dformat(format_id), multisample_type, multisample_quality, mem, pitch); device = texture->resource.device; + d3d = device->wined3d; gl_info = &device->adapter->gl_info; d3d_info = &device->adapter->d3d_info; format = wined3d_get_format(device->adapter, format_id, texture->resource.bind_flags); @@ -1608,6 +1610,8 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT texture->resource.multisample_quality = multisample_quality; texture->resource.width = width; texture->resource.height = height; + if (!(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) + adapter_adjust_memory(device->adapter, (INT64)texture->slice_pitch - texture->resource.size); texture->resource.size = texture->slice_pitch; sub_resource->size = texture->slice_pitch; sub_resource->locations = WINED3D_LOCATION_DISCARDED; -- 2.19.2

2 1

[PATCH] wined3d: Clean up lights in wined3d_stateblock_cleanup().
by Zebediah Figura 25 Mar '19

25 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46829 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 7495d217c4..e9c1fe2374 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -523,6 +523,7 @@ void state_unbind_resources(struct wined3d_state *state) void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) { + struct wined3d_light_info *light, *cursor; struct wined3d_vertex_declaration *decl; struct wined3d_texture *texture; struct wined3d_buffer *buffer; @@ -570,6 +571,15 @@ void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) wined3d_texture_decref(texture); } } + + for (i = 0; i < LIGHTMAP_SIZE; ++i) + { + LIST_FOR_EACH_ENTRY_SAFE(light, cursor, &state->light_state.light_map[i], struct wined3d_light_info, entry) + { + list_remove(&light->entry); + heap_free(light); + } + } } void state_cleanup(struct wined3d_state *state) -- 2.17.1

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel