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

[PATCH] winemenubuilder: Remove useless cast to self
by Michael Stefaniuc 08 Mar '19

08 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 3fa2b476d0..fa700f8c19 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -539,7 +539,7 @@ static int populate_module16_icons(struct IconData16 *iconData16, GRPICONDIR *gr for (j = 0; j < iconData16->iconResources->count; j++) { NE_NAMEINFO *iconInfo = (NE_NAMEINFO*)iconPtr; - if ((((BYTE*)iconPtr) + sizeof(NE_NAMEINFO)) > (iconData16->fileBytes + iconData16->fileSize)) + if ((iconPtr + sizeof(NE_NAMEINFO)) > (iconData16->fileBytes + iconData16->fileSize)) { WINE_WARN("file too small for icon NE_NAMEINFO\n"); break; -- 2.20.1

1 0

[PATCH] winefile: Remove useless cast to self
by Michael Stefaniuc 08 Mar '19

08 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winefile/winefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 23be450d5f..2f4eb2a444 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -739,7 +739,7 @@ static HICON extract_icon(IShellFolder* folder, LPCITEMIDLIST pidl) { IExtractIconW* pExtract; - if (SUCCEEDED(IShellFolder_GetUIObjectOf(folder, 0, 1, (LPCITEMIDLIST*)&pidl, &IID_IExtractIconW, 0, (LPVOID*)&pExtract))) { + if (SUCCEEDED(IShellFolder_GetUIObjectOf(folder, 0, 1, &pidl, &IID_IExtractIconW, 0, (void**)&pExtract))) { WCHAR path[_MAX_PATH]; unsigned flags; HICON hicon; -- 2.20.1

1 0

[PATCH] wininet: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc 08 Mar '19

08 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return NULL if lpwfs is NULL. dlls/wininet/ftp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index e12e494160..ec94f85723 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2581,8 +2581,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, lerror: if (!bSuccess) { - if(lpwfs) - WININET_Release( &lpwfs->hdr ); + WININET_Release(&lpwfs->hdr); return NULL; } -- 2.20.1

1 0

[PATCH 1/5] d3d8: Return failure in CheckDeviceFormat() for unsupported adapter formats.
by Matteo Bruni 08 Mar '19

08 Mar '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- I saw bug 46792, not debugged yet... dlls/d3d8/directx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 09188cc2aef..f78ff3e5af7 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -242,10 +242,11 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3 TRACE("iface %p, adapter %u, device_type %#x, adapter_format %#x, usage %#x, resource_type %#x, format %#x.\n", iface, adapter, device_type, adapter_format, usage, resource_type, format); - if (!adapter_format) + if (adapter_format != D3DFMT_X8R8G8B8 && adapter_format != D3DFMT_R5G6B5 + && adapter_format != D3DFMT_X1R5G5B5) { WARN("Invalid adapter format.\n"); - return D3DERR_INVALIDCALL; + return adapter_format ? D3DERR_NOTAVAILABLE : D3DERR_INVALIDCALL; } bind_flags = wined3d_bind_flags_from_d3d8_usage(usage); -- 2.19.2

5 15

[PATCH] winemac: Fix typo in comments.
by Nikolay Sivov 08 Mar '19

08 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/winemac.drv/ime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 00fb236589..4d95275168 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -144,8 +144,8 @@ static int updateField(DWORD origLen, DWORD origOffset, DWORD currentOffset, static HIMCC updateCompStr(HIMCC old, LPCWSTR compstr, DWORD len, DWORD *flags) { - /* we need to make sure the CompStr, CompClaus and CompAttr fields are all - * set and correct */ + /* We need to make sure the CompStr, CompClause and CompAttr fields are all + * set and correct. */ int needed_size; HIMCC rc; LPBYTE newdata = NULL; -- 2.20.1

2 1

[PATCH 13/13] msidb: Add support for wildcard (full database) export.
by Erich E. Hoover 08 Mar '19

08 Mar '19

msidb allows a full database export with the special "*" database name. Note: It does not support true wildcards, just this special indication that you wish to export all the tables in the database.

1 0

[PATCH 12/13] msi: Add support for exporting binary streams (Binary/Icon tables).
by Erich E. Hoover 08 Mar '19

08 Mar '19

The Binary and Icon tables store their data in a different format from other tables, one column of the data is stored as a "stream" instead of a normal text field. With this patch those tables can now be exported properly by the MSI export functionality.

1 0

[PATCH 11/13] msi: Break out field exporting into a separate routine.
by Erich E. Hoover 08 Mar '19

08 Mar '19

msi_export_record is a lot more complicated than necessary, this patch splits out the field export part of that functionality as msi_export_field. This also needs to be separate for exporting binary stream data (next patch).

1 0

[PATCH 10/13] msi: Add support for exporting the _SummaryInformation table.
by Erich E. Hoover 08 Mar '19

08 Mar '19

The _SummaryInformation table stores a lot of important information about an MSI database. This patch adds the ability to export that table since, like _ForceCodepage, it is stored in a different format than the other tables.

1 0

[PATCH 9/13] msidb: Add support for exporting with short (DOS) filenames.
by Erich E. Hoover 08 Mar '19

08 Mar '19

msidb's "-s" flag modifies the database export to use short (DOS) filenames instead of full table names. This flag is convenient because it uses the same filenames that the import (-i) option expects. For example, the InstallExecuteSequence table gets imported (or exported with this flag) as InstallE.idt where the normal export option uses InstallExecuteSequence.idt.

1 0