January 2020 - Wine-devel - list.winehq.org

[PATCH 3/3] wined3d: Support sRGB reads for WINED3DFMT_B5G6R5_UNORM.
by Henri Verbeet 27 Jan '20

27 Jan '20

From: Paul Gofman <gofmanp(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48302 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5581c145efd..bd239d7659f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1490,15 +1490,15 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE, WINED3D_GL_EXT_NONE, NULL}, - {WINED3DFMT_B5G6R5_UNORM, GL_RGB5, GL_RGB5, GL_RGB8, + {WINED3DFMT_B5G6R5_UNORM, GL_RGB5, GL_SRGB8_EXT, GL_RGB8, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_RENDERTARGET, + | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_SRGB_READ, WINED3D_GL_EXT_NONE, NULL}, - {WINED3DFMT_B5G6R5_UNORM, GL_RGB565, GL_RGB565, GL_RGB8, + {WINED3DFMT_B5G6R5_UNORM, GL_RGB565, GL_SRGB8_EXT, GL_RGB8, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING - | WINED3DFMT_FLAG_RENDERTARGET, + | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_SRGB_READ, ARB_ES2_COMPATIBILITY, NULL}, {WINED3DFMT_B5G5R5X1_UNORM, GL_RGB5, GL_RGB5, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 0, -- 2.11.0

1 0

[PATCH 1/3] d3d9/tests: Introduce adapter_is_amd().
by Henri Verbeet 27 Jan '20

27 Jan '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index fb0746f58bc..366862a05aa 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -104,6 +104,16 @@ static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER9 *identifier) return !strcmp(identifier->Driver, "d3d10warp.dll"); } +static BOOL adapter_is_vendor(const D3DADAPTER_IDENTIFIER9 *identifier, DWORD vendor) +{ + return identifier->VendorId == vendor; +} + +static BOOL adapter_is_amd(const D3DADAPTER_IDENTIFIER9 *identifier) +{ + return adapter_is_vendor(identifier, 0x1002); +} + /* Locks a given surface and returns the color at (x,y). It's the caller's * responsibility to only pass in lockable surfaces and valid x,y coordinates */ static DWORD getPixelColorFromSurface(IDirect3DSurface9 *surface, UINT x, UINT y) @@ -26592,7 +26602,7 @@ static void test_alpha_to_coverage(void) nvidia_mode = FALSE; hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - if (identifier.VendorId != 0x1002 /* AMD */) + if (!adapter_is_amd(&identifier)) { skip("Alpha to coverage is not supported.\n"); refcount = IDirect3DDevice9_Release(device); -- 2.11.0

1 0

[PATCH 1/7] krnl386.exe16: Update comment for removed files.
by Mathew Hodson 27 Jan '20

27 Jan '20

Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com> --- dlls/krnl386.exe16/dosvm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/krnl386.exe16/dosvm.c b/dlls/krnl386.exe16/dosvm.c index a33b37a..c19b3f3 100644 --- a/dlls/krnl386.exe16/dosvm.c +++ b/dlls/krnl386.exe16/dosvm.c @@ -62,12 +62,12 @@ WORD DOSVM_retval = 0; /* * Wine DOS memory layout above 640k: * - * a0000 - affff : VGA graphics (vga.c) + * a0000 - affff : VGA graphics (unused) * b0000 - bffff : Monochrome text (unused) - * b8000 - bffff : VGA text (vga.c) + * b8000 - bffff : VGA text (unused) * c0000 - cffff : EMS frame (int67.c) - * d0000 - effff : Free memory for UMBs (himem.c) - * f0000 - fffff : BIOS stuff (msdos/dosmem.c) + * d0000 - effff : Free memory for UMBs (dosvm.c) + * f0000 - fffff : BIOS stuff (dosmem.c) * 100000 -10ffff : High memory area (unused) */ -- 2.7.4

5 15

[PATCH v3 1/2] include: Register all ADODB interfaces
by Alistair Leslie-Hughes 27 Jan '20

27 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/msado15_backcompat.idl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index e4a847ab85..a813b80bf7 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -50,6 +50,14 @@ interface Recordset21; dispinterface ConnectionEvents; dispinterface RecordsetEvents; +[ + uuid(2a75196c-d9eb-4129-b803-931327f72d5c), + version(2.8) +] +library ADODB +{ + importlib("stdole2.tlb"); + typedef [uuid(0000052A-0000-0010-8000-00AA006D2EA4)] enum ErrorValueEnum { adErrInvalidArgument = 3001, @@ -2044,14 +2052,6 @@ interface ADORecordsetConstruction : IDispatch [in] IUnknown *row_pos); }; -[ - uuid(2a75196c-d9eb-4129-b803-931327f72d5c), - version(2.8) -] -library ADODB -{ - importlib("stdole2.tlb"); - [ uuid(00000514-0000-0010-8000-00aa006d2ea4), ] -- 2.24.1

2 2

[PATCH v3 2/2] msado15: Implement _Connection get/put ConnectionString
by Alistair Leslie-Hughes 27 Jan '20

27 Jan '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 14 ++++++++++---- dlls/msado15/tests/msado15.c | 11 +++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 73b225628c..e74fcd6c02 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -37,6 +37,7 @@ struct connection LONG refs; ObjectStateEnum state; LONG timeout; + BSTR datasource; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -62,6 +63,7 @@ static ULONG WINAPI connection_Release( _Connection *iface ) if (!refs) { TRACE( "destroying %p\n", connection ); + SysFreeString(connection->datasource); heap_free( connection ); } return refs; @@ -125,14 +127,18 @@ static HRESULT WINAPI connection_get_Properties( _Connection *iface, Properties static HRESULT WINAPI connection_get_ConnectionString( _Connection *iface, BSTR *str ) { - FIXME( "%p, %p\n", iface, str ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %p\n", connection, str ); + *str = SysAllocString(connection->datasource); + return S_OK; } static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR str ) { - FIXME( "%p, %s\n", iface, debugstr_w(str) ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + TRACE( "%p, %s\n", connection, debugstr_w(str) ); + connection->datasource = SysAllocString(str); + return S_OK; } static HRESULT WINAPI connection_get_CommandTimeout( _Connection *iface, LONG *timeout ) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 917d131063..fe16fb3f02 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -667,6 +667,7 @@ static void test_Connection(void) IRunnableObject *runtime; ISupportErrorInfo *errorinfo; LONG state, timeout; + BSTR connect1, connect2; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -702,6 +703,16 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + connect1 = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test"); + hr = _Connection_put_ConnectionString(connection, connect1); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + + hr = _Connection_get_ConnectionString(connection, &connect2); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(wcscmp(connect1, connect2) == 0, "wrong string %s\n", wine_dbgstr_w(connect2)); + SysFreeString(connect1); + SysFreeString(connect2); + _Connection_Release(connection); } -- 2.24.1

2 1

[PATCH 01/12] crypt32: Global variable compatibility update for gcc 10
by Michael Cronenworth 27 Jan '20

27 Jan '20

https://gcc.gnu.org/gcc-10/porting_to.html#common Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> --- dlls/crypt32/crypt32_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 3d0129e7d4..d92eb1a157 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -152,7 +152,7 @@ BOOL WINAPI CRYPT_AsnEncodePubKeyInfoNoNull(DWORD dwCertEncodingType, */ HCRYPTPROV WINAPI I_CryptGetDefaultCryptProv(ALG_ID); -HINSTANCE hInstance DECLSPEC_HIDDEN; +extern HINSTANCE hInstance DECLSPEC_HIDDEN; void crypt_oid_init(void) DECLSPEC_HIDDEN; void crypt_oid_free(void) DECLSPEC_HIDDEN; -- 2.24.1

5 25

[PATCH] shell32: Do not use SHGetMalloc() internally.
by Nikolay Sivov 27 Jan '20

27 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/shelllink.c | 4 +--- dlls/shell32/shellord.c | 27 ++++++++++----------------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 0dfb81c6e7..5b044d4be1 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -405,7 +405,6 @@ static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile* iface, LPCOLEST static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *filename) { IShellLinkImpl *This = impl_from_IPersistFile(iface); - IMalloc *pMalloc; TRACE("(%p)->(%p)\n", This, filename); @@ -415,8 +414,7 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *f return S_FALSE; } - SHGetMalloc(&pMalloc); - *filename = IMalloc_Alloc(pMalloc, (strlenW(This->filepath)+1)*sizeof(WCHAR)); + *filename = CoTaskMemAlloc((strlenW(This->filepath) + 1) * sizeof(WCHAR)); if (!*filename) return E_OUTOFMEMORY; strcpyW(*filename, This->filepath); diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index b04a56e783..e1262accdd 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -760,7 +760,6 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) CHAR link_dir[MAX_PATH]; CHAR new_lnk_filepath[MAX_PATH]; CHAR new_lnk_name[MAX_PATH]; - IMalloc *ppM; LPITEMIDLIST pidl; HWND hwnd = 0; /* FIXME: get real window handle */ INT ret; @@ -815,24 +814,18 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) /* Get path to user's "Recent" directory */ - if(SUCCEEDED(SHGetMalloc(&ppM))) { - if (SUCCEEDED(SHGetSpecialFolderLocation(hwnd, CSIDL_RECENT, - &pidl))) { - SHGetPathFromIDListA(pidl, link_dir); - IMalloc_Free(ppM, pidl); - } - else { - /* serious issues */ - link_dir[0] = 0; - ERR("serious issues 1\n"); - } - IMalloc_Release(ppM); + if (SUCCEEDED(SHGetSpecialFolderLocation(hwnd, CSIDL_RECENT, &pidl))) + { + SHGetPathFromIDListA(pidl, link_dir); + ILFree(pidl); } - else { - /* serious issues */ - link_dir[0] = 0; - ERR("serious issues 2\n"); + else + { + /* serious issues */ + link_dir[0] = 0; + ERR("serious issues 1\n"); } + TRACE("Users Recent dir %s\n", link_dir); /* If no input, then go clear the lists */ -- 2.24.1

1 0

[PATCH] programs/wineboot: Do not use SHGetMalloc() internally.
by Nikolay Sivov 27 Jan '20

27 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/wineboot/wineboot.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index dd9a5bd8f6..8e3e234397 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -1267,7 +1267,6 @@ static BOOL ProcessStartupItems(void) { BOOL ret = FALSE; HRESULT hr; - IMalloc *ppM = NULL; IShellFolder *psfDesktop = NULL, *psfStartup = NULL; LPITEMIDLIST pidlStartup = NULL, pidlItem; ULONG NumPIDLs; @@ -1277,13 +1276,6 @@ static BOOL ProcessStartupItems(void) WINE_TRACE("Processing items in the StartUp folder.\n"); - hr = SHGetMalloc(&ppM); - if (FAILED(hr)) - { - WINE_ERR("Couldn't get IMalloc object.\n"); - goto done; - } - hr = SHGetDesktopFolder(&psfDesktop); if (FAILED(hr)) { @@ -1333,7 +1325,7 @@ static BOOL ProcessStartupItems(void) } } - IMalloc_Free(ppM, pidlItem); + ILFree(pidlItem); } /* Return success */ @@ -1342,7 +1334,7 @@ static BOOL ProcessStartupItems(void) done: if (iEnumList) IEnumIDList_Release(iEnumList); if (psfStartup) IShellFolder_Release(psfStartup); - if (pidlStartup) IMalloc_Free(ppM, pidlStartup); + if (pidlStartup) ILFree(pidlStartup); return ret; } -- 2.24.1

1 0

[PATCH] lzexpand: Fix uninitialized read in read_header
by Evan Tang 27 Jan '20

27 Jan '20

read_header calls _lread which can either return the number of characters read or HFILE_ERROR (-1), casted to a UINT. This was tested with a `< taget_length` check, which doesn't catch HFILE_ERROR (since this is a UINT), allowing that case to slip through This could cause issues if LZInit is called in quick succession, first on a file with a valid header (to put a valid LZ header in the buffer), then on an unreadable file descriptor (a write-only one, for example), depending on if the compiler decided to reuse the memory slot in the rest of LZInit Signed-off-by: Evan Tang <etang110(a)gmail.com> --- An alternative method (which might be more obvious to someone reading the code) would be to store the result of _lread in a variable and then explicitly check it both for `< target_length` and `== HFILE_ERROR`, do you think we should do that instead? Also, is this something we want regression tests for? You could try the sequence described above, which successfully fails on clang but not gcc (due to how they compile the rest of LZInit). I guess you could also make the first file have an invalid compressiontype which would run much less LZInit code and be more likely to fail, but in the end you'd still be relying on undefined behavior doing something specific --- dlls/kernel32/lzexpand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/lzexpand.c b/dlls/kernel32/lzexpand.c index 4b2ec2ed45..471dba6c75 100644 --- a/dlls/kernel32/lzexpand.c +++ b/dlls/kernel32/lzexpand.c @@ -139,7 +139,7 @@ static INT read_header(HFILE fd,struct lzfileheader *head) /* We can't directly read the lzfileheader struct due to * structure element alignment */ - if (_lread(fd,buf,LZ_HEADER_LEN)<LZ_HEADER_LEN) + if ((INT)_lread(fd,buf,LZ_HEADER_LEN)<LZ_HEADER_LEN) return 0; memcpy(head->magic,buf,LZ_MAGIC_LEN); memcpy(&(head->compressiontype),buf+LZ_MAGIC_LEN,1); -- 2.15.2 (Apple Git-101.1)

2 4

[PATCH 1/5] ole32: Add support for writing VT_BSTR properties.
by Nikolay Sivov 27 Jan '20

27 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/stg_prop.c | 65 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 8421353155..54904a581b 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -623,15 +623,24 @@ static HRESULT PropertyStorage_PropVariantCopy(PROPVARIANT *prop, const PROPVARI assert(prop); assert(propvar); - if (propvar->vt == VT_LPSTR) + + switch (propvar->vt) { - hr = PropertyStorage_StringCopy(propvar->u.pszVal, srcCP, - &prop->u.pszVal, targetCP); + case VT_LPSTR: + hr = PropertyStorage_StringCopy(propvar->u.pszVal, srcCP, &prop->u.pszVal, targetCP); if (SUCCEEDED(hr)) prop->vt = VT_LPSTR; + break; + case VT_BSTR: + if ((prop->u.bstrVal = SysAllocStringLen(propvar->u.bstrVal, SysStringLen(propvar->u.bstrVal)))) + prop->vt = VT_BSTR; + else + hr = E_OUTOFMEMORY; + break; + default: + hr = PropVariantCopy(prop, propvar); } - else - PropVariantCopy(prop, propvar); + return hr; } @@ -1881,11 +1890,11 @@ end: static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, DWORD propNum, DWORD propid, const PROPVARIANT *var, DWORD *sectionOffset) { + DWORD len, dwType, dwTemp, bytesWritten; HRESULT hr; LARGE_INTEGER seek; PROPERTYIDOFFSET propIdOffset; ULONG count; - DWORD dwType, bytesWritten; assert(var); assert(sectionOffset); @@ -1938,8 +1947,6 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, case VT_I4: case VT_UI4: { - DWORD dwTemp; - StorageUtl_WriteDWord(&dwTemp, 0, var->u.lVal); hr = IStream_Write(This->stm, &dwTemp, sizeof(dwTemp), &count); bytesWritten = count; @@ -1947,8 +1954,6 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, } case VT_LPSTR: { - DWORD len, dwTemp; - if (This->codePage == CP_UNICODE) len = (lstrlenW(var->u.pwszVal) + 1) * sizeof(WCHAR); else @@ -1961,9 +1966,45 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, bytesWritten = count + sizeof(DWORD); break; } + case VT_BSTR: + { + if (This->codePage == CP_UNICODE) + { + len = SysStringByteLen(var->u.bstrVal) + sizeof(WCHAR); + StorageUtl_WriteDWord(&dwTemp, 0, len); + hr = IStream_Write(This->stm, &dwTemp, sizeof(dwTemp), &count); + if (SUCCEEDED(hr)) + hr = IStream_Write(This->stm, var->u.bstrVal, len, &count); + } + else + { + char *str; + + len = WideCharToMultiByte(This->codePage, 0, var->u.bstrVal, SysStringLen(var->u.bstrVal) + 1, + NULL, 0, NULL, NULL); + + str = heap_alloc(len); + if (!str) + { + hr = E_OUTOFMEMORY; + goto end; + } + + WideCharToMultiByte(This->codePage, 0, var->u.bstrVal, SysStringLen(var->u.bstrVal), + str, len, NULL, NULL); + StorageUtl_WriteDWord(&dwTemp, 0, len); + hr = IStream_Write(This->stm, &dwTemp, sizeof(dwTemp), &count); + if (SUCCEEDED(hr)) + hr = IStream_Write(This->stm, str, len, &count); + heap_free(str); + } + + bytesWritten = count + sizeof(DWORD); + break; + } case VT_LPWSTR: { - DWORD len = lstrlenW(var->u.pwszVal) + 1, dwTemp; + len = lstrlenW(var->u.pwszVal) + 1; StorageUtl_WriteDWord(&dwTemp, 0, len); hr = IStream_Write(This->stm, &dwTemp, sizeof(dwTemp), &count); @@ -1985,7 +2026,7 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, } case VT_CF: { - DWORD cf_hdr[2], len; + DWORD cf_hdr[2]; len = var->u.pclipdata->cbSize; StorageUtl_WriteDWord(&cf_hdr[0], 0, len + 8); -- 2.24.1

2 5