May 2017 - Wine-Commits - list.winehq.org

Nikolay Sivov : rpcrt4/tests: Added missing assignment (Coverity).
by Alexandre Julliard May 15, 2017

May 15, 2017

Module: wine Branch: master Commit: dcdf7d6f6d40b7f4eca6598a9a5253f9ad5c7ce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcdf7d6f6d40b7f4eca6598a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 14 23:32:17 2017 +0300 rpcrt4/tests: Added missing assignment (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/rpc.c | 2 +- dlls/rpcrt4/tests/server.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 7fdaf88..f026e99 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -1146,7 +1146,7 @@ static HRESULT set_firewall( enum firewall_op op ) hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); if (hr != S_OK) goto done; - INetFwProfile_get_AuthorizedApplications( profile, &apps ); + hr = INetFwProfile_get_AuthorizedApplications( profile, &apps ); ok( hr == S_OK, "got %08x\n", hr ); if (hr != S_OK) goto done; diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 44a024d..b42a78f 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1875,7 +1875,7 @@ static HRESULT set_firewall( enum firewall_op op ) hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); if (hr != S_OK) goto done; - INetFwProfile_get_AuthorizedApplications( profile, &apps ); + hr = INetFwProfile_get_AuthorizedApplications( profile, &apps ); ok( hr == S_OK, "got %08x\n", hr ); if (hr != S_OK) goto done;

1 0

Nikolay Sivov : comctl32/tests: Remove some dead code (Coverity).
by Alexandre Julliard May 15, 2017

May 15, 2017

Module: wine Branch: master Commit: 1f97ef8ec505320a7c353e66c1d87c013c6da8d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f97ef8ec505320a7c353e66c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 14 23:26:25 2017 +0300 comctl32/tests: Remove some dead code (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index d54352f..41cf165 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -164,17 +164,6 @@ static LRESULT WINAPI test_parent_wndproc(HWND hwnd, UINT message, WPARAM wParam message == WM_DRAWITEM || message == WM_COMMAND || message == WM_IME_SETCONTEXT) { - switch (message) - { - /* ignore */ - case WM_NCHITTEST: - return HTCLIENT; - case WM_SETCURSOR: - case WM_MOUSEMOVE: - case WM_NCMOUSEMOVE: - return 0; - } - msg.message = message; msg.flags = sent|parent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc;

1 0

Józef Kucia : gdiplus: Fix compilation on systems that don't support nameless unions.
by Alexandre Julliard May 15, 2017

May 15, 2017

Module: wine Branch: master Commit: c2a4f194cab6e3b7aaedb1598977c2de5f8747c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a4f194cab6e3b7aaedb1598… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 11 09:46:36 2017 +0200 gdiplus: Fix compilation on systems that don't support nameless unions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 69d8a16..d5b1b14 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -19,6 +19,8 @@ #include <stdarg.h> #include <math.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -947,7 +949,7 @@ GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) bounds_rc.right = ceilf(metafile->auto_frame_max.X * x_scale); bounds_rc.bottom = ceilf(metafile->auto_frame_max.Y * y_scale); - gdi_bounds_rc = header.EmfHeader.rclBounds; + gdi_bounds_rc = header.u.EmfHeader.rclBounds; if (gdi_bounds_rc.right > gdi_bounds_rc.left && gdi_bounds_rc.bottom > gdi_bounds_rc.top) { bounds_rc.left = min(bounds_rc.left, gdi_bounds_rc.left); @@ -1913,7 +1915,7 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE hemf, header->Y = gdip_round((REAL)emfheader.rclFrame.top / 2540.0 * header->DpiY); header->Width = gdip_round((REAL)(emfheader.rclFrame.right - emfheader.rclFrame.left) / 2540.0 * header->DpiX); header->Height = gdip_round((REAL)(emfheader.rclFrame.bottom - emfheader.rclFrame.top) / 2540.0 * header->DpiY); - header->EmfHeader = emfheader; + header->u.EmfHeader = emfheader; if (metafile_type == MetafileTypeEmfPlusDual || metafile_type == MetafileTypeEmfPlusOnly) { @@ -2016,11 +2018,11 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, (*metafile)->image.frame_count = 1; (*metafile)->image.xres = header.DpiX; (*metafile)->image.yres = header.DpiY; - (*metafile)->bounds.X = (REAL)header.EmfHeader.rclFrame.left / 2540.0 * header.DpiX; - (*metafile)->bounds.Y = (REAL)header.EmfHeader.rclFrame.top / 2540.0 * header.DpiY; - (*metafile)->bounds.Width = (REAL)(header.EmfHeader.rclFrame.right - header.EmfHeader.rclFrame.left) + (*metafile)->bounds.X = (REAL)header.u.EmfHeader.rclFrame.left / 2540.0 * header.DpiX; + (*metafile)->bounds.Y = (REAL)header.u.EmfHeader.rclFrame.top / 2540.0 * header.DpiY; + (*metafile)->bounds.Width = (REAL)(header.u.EmfHeader.rclFrame.right - header.u.EmfHeader.rclFrame.left) / 2540.0 * header.DpiX; - (*metafile)->bounds.Height = (REAL)(header.EmfHeader.rclFrame.bottom - header.EmfHeader.rclFrame.top) + (*metafile)->bounds.Height = (REAL)(header.u.EmfHeader.rclFrame.bottom - header.u.EmfHeader.rclFrame.top) / 2540.0 * header.DpiY; (*metafile)->unit = UnitPixel; (*metafile)->metafile_type = header.Type;

1 0

Nikolay Sivov : wshom: Fix IWshShell3::Invoke() call to use correct implementation pointer.
by Alexandre Julliard May 15, 2017

May 15, 2017

Module: wine Branch: master Commit: 2619bdb94fa59034a0ebef8bd7f4ba84d67acbdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2619bdb94fa59034a0ebef8bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 14 06:44:34 2017 +0300 wshom: Fix IWshShell3::Invoke() call to use correct implementation pointer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/shell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index f8c2a4b..b00bc10 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1192,7 +1192,7 @@ static HRESULT WINAPI WshShell3_Invoke(IWshShell3 *iface, DISPID dispIdMember, R hr = get_typeinfo(IWshShell3_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &WshShell3, dispIdMember, wFlags, + hr = ITypeInfo_Invoke(typeinfo, &WshShell3.IWshShell3_iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); }

1 0

Alistair Leslie-Hughes : include/wmsdkidl.idl: Stop redefinition of QWORD.
by Alexandre Julliard May 15, 2017

May 15, 2017

Module: wine Branch: master Commit: 0c07a33c4c86fce7923f8e18bd99b75243c9d9b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c07a33c4c86fce7923f8e18b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat May 13 22:57:17 2017 +0000 include/wmsdkidl.idl: Stop redefinition of QWORD. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index b621826..ea8d63b 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -20,8 +20,6 @@ import "oaidl.idl"; import "wmsbuffer.idl"; import "drmexternals.idl"; -typedef unsigned __int64 QWORD; - typedef struct _WMMediaType { GUID majortype;

1 0

Jeremy Newman : changes made to live db
by Jeremy Newman May 12, 2017

May 12, 2017

Module: appdb Branch: master Commit: aa6236d359fa817a031bbd4f9fa33f0f0d20a1cd URL: http://source.winehq.org/git/appdb.git/?a=commit;h=aa6236d359fa817a031bbd4f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri May 12 13:33:21 2017 -0500 changes made to live db Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- tables/alter.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tables/alter.sql b/tables/alter.sql index 36876a9..457f8d9 100644 --- a/tables/alter.sql +++ b/tables/alter.sql @@ -1 +1,2 @@ -ALTER TABLE `appVersion` CHANGE `license` `license` ENUM('Retail','Open Source','Demo','Shareware','Free to use','Free to use and share') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL; +/* append to this file when changes are required to the live db */ +/* it will be cleared when the changes go live */

1 0

Rosanne DiMesio : Update licenses field
by Jeremy Newman May 12, 2017

May 12, 2017

Module: appdb Branch: master Commit: 05c4ab3ef02a4de3a78e28a41171cf24514582d2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=05c4ab3ef02a4de3a78e28a4… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri May 12 12:10:14 2017 -0500 Update licenses field Affected entries in the production database have been fixed. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- tables/alter.sql | 1 + tables/appdb_tables.sql | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tables/alter.sql b/tables/alter.sql new file mode 100644 index 0000000..36876a9 --- /dev/null +++ b/tables/alter.sql @@ -0,0 +1 @@ +ALTER TABLE `appVersion` CHANGE `license` `license` ENUM('Retail','Open Source','Demo','Shareware','Free to use','Free to use and share') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL; diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index beb1743..d60ee68 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -48,7 +48,6 @@ create table appFamily ( /* * a version of an application - * TODO: remove Steam and GOG from the list of licenses after entries using them have been corrected in the live database */ create table appVersion ( versionId int not null auto_increment, @@ -59,7 +58,7 @@ create table appVersion ( ratingRelease text, submitTime datetime NOT NULL, submitterId int(11) NOT NULL default '0', - license enum('Retail','Open Source','Demo','Shareware','Free to use','Free to use and share','Steam','GOG'), + license enum('Retail','Open Source','Demo','Shareware','Free to use','Free to use and share'), obsoleteBy int(11) NOT NULL default '0', state enum('accepted','queued','rejected','pending','deleted') NOT NULL default 'accepted', hasMaintainer enum('true','false') NOT NULL default 'false',

1 0

Alexandre Julliard : Wine release 2.8
by Alexandre Julliard May 12, 2017

May 12, 2017

Module: website Branch: master Commit: ec1bc4aaac62aca0c308cc0b30a9cb42f6f78928 URL: http://source.winehq.org/git/website.git/?a=commit;h=ec1bc4aaac62aca0c308cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 12 18:48:15 2017 +0200 Wine release 2.8 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017051201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2017051201.xml b/news/en/2017051201.xml new file mode 100644 index 0000000..dded6ea --- /dev/null +++ b/news/en/2017051201.xml @@ -0,0 +1,16 @@ +<news> +<date>May 12, 2017</date> +<title>Wine 2.8 Released</title> +<body> + The Wine development release 2.8 is now available. + <a href="{$root}/announce/2.8">What's new</a> in this release: +<ul> + <li>Direct3D command stream runs asynchronously.</li> + <li>Better serial and parallel ports autodetection.</li> + <li>Still more fixes for high DPI settings.</li> + <li>System tray notifications on macOS.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.8.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Michael Stefaniuc : dmime: Initialize dmusic in InitAudio().
by Alexandre Julliard May 12, 2017

May 12, 2017

Module: wine Branch: master Commit: 14f899317ac10dd15ccb0457abf655bc9d32efa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f899317ac10dd15ccb0457a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 12 16:11:24 2017 +0200 dmime: Initialize dmusic in InitAudio(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 9 ++++++++- dlls/dmime/tests/performance.c | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index d0df2d5..6e4dae6 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -802,6 +802,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CloseDown(IDirectMusicPerform This->dsound = NULL; } if (This->dmusic) { + IDirectMusic_SetDirectSound(This->dmusic, NULL, NULL); IDirectMusic8_Release(This->dmusic); This->dmusic = NULL; } @@ -895,6 +896,10 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerform IDirectSound_AddRef(This->dsound); } + hr = IDirectMusic8_SetDirectSound(This->dmusic, This->dsound, NULL); + if (FAILED(hr)) + goto error; + if (!params) { This->params.dwSize = sizeof(DMUS_AUDIOPARAMS); This->params.fInitNow = FALSE; @@ -910,8 +915,10 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerform if (default_path_type) { hr = IDirectMusicPerformance8_CreateStandardAudioPath(iface, default_path_type, num_channels, FALSE, &This->pDefaultPath); - if (FAILED(hr)) + if (FAILED(hr)) { + IDirectMusic8_SetDirectSound(This->dmusic, NULL, NULL); goto error; + } } if (dsound && !*dsound) { diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 9187c81..c4cbb32 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -129,7 +129,7 @@ static HRESULT test_InitAudio(void) hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, &dsound, NULL, 0, 64, 0, NULL); ok(hr == S_OK, "InitAudio failed: %08x\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 3, "dsound ref count got %d expected 3\n", ref); + ok(ref == 3, "dsound ref count got %d expected 3\n", ref); ref = get_refcount(dmusic); ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); destroy_performance(performance, NULL, NULL); @@ -171,7 +171,7 @@ static HRESULT test_InitAudio(void) hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, &dsound, NULL, 0, 64, 0, NULL); ok(hr == S_OK, "InitAudio failed: %08x\n", hr); ref = get_refcount(dsound); - ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); ref = get_refcount(dmusic); ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); destroy_performance(performance, dmusic, dsound); @@ -185,7 +185,7 @@ static HRESULT test_InitAudio(void) hr = IDirectMusicPerformance8_InitAudio(performance, &dmusic, NULL, NULL, 0, 64, 0, NULL); ok(hr == S_OK, "InitAudio failed: %08x\n", hr); ref = get_refcount(dsound); - ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); ref = get_refcount(dmusic); ok(ref == 2, "dmusic ref count got %d expected 2\n", ref); destroy_performance(performance, dmusic, dsound);

1 0

Michael Stefaniuc : dmime: Add proper error handling to InitAudio().
by Alexandre Julliard May 12, 2017

May 12, 2017

Module: wine Branch: master Commit: 3505137d2486ffc1366565d2f51a81d35942814d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3505137d2486ffc1366565d2f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 12 16:11:23 2017 +0200 dmime: Add proper error handling to InitAudio(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 2b9c984..d0df2d5 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -877,25 +877,23 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerform (void **)&This->dmusic); if (FAILED(hr)) return hr; - if (dmusic) - *dmusic = (IDirectMusic *)This->dmusic; - } else + } else { This->dmusic = (IDirectMusic8 *)*dmusic; - if (dmusic) IDirectMusic8_AddRef(This->dmusic); + } if (!dsound || !*dsound) { hr = DirectSoundCreate8(NULL, (IDirectSound8 **)&This->dsound, NULL); if (FAILED(hr)) - return hr; - IDirectSound_SetCooperativeLevel(This->dsound, hwnd ? hwnd : GetForegroundWindow(), + goto error; + hr = IDirectSound_SetCooperativeLevel(This->dsound, hwnd ? hwnd : GetForegroundWindow(), DSSCL_PRIORITY); - if (dsound) - *dsound = This->dsound; - } else + if (FAILED(hr)) + goto error; + } else { This->dsound = *dsound; - if (dsound) IDirectSound_AddRef(This->dsound); + } if (!params) { This->params.dwSize = sizeof(DMUS_AUDIOPARAMS); @@ -909,12 +907,34 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerform } else This->params = *params; - if (default_path_type) + if (default_path_type) { hr = IDirectMusicPerformance8_CreateStandardAudioPath(iface, default_path_type, num_channels, FALSE, &This->pDefaultPath); + if (FAILED(hr)) + goto error; + } + if (dsound && !*dsound) { + *dsound = This->dsound; + IDirectSound_AddRef(*dsound); + } + if (dmusic && !*dmusic) { + *dmusic = (IDirectMusic *)This->dmusic; + IDirectMusic_AddRef(*dmusic); + } PostMessageToProcessMsgThread(This, PROCESSMSG_START); + return S_OK; + +error: + if (This->dsound) { + IDirectSound_Release(This->dsound); + This->dsound = NULL; + } + if (This->dmusic) { + IDirectMusic8_Release(This->dmusic); + This->dmusic = NULL; + } return hr; }

1 0