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

Rosanne DiMesio : admin.php: fix incorrect call to query_affected_rows
by Jeremy Newman 11 May '17

11 May '17

Module: appdb Branch: master Commit: 10e8d4eb81a850ae88e6599481bd5f7dc648fb0d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=10e8d4eb81a850ae88e65994… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu May 11 13:27:12 2017 -0500 admin.php: fix incorrect call to query_affected_rows Should be query_num_rows. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin.php b/admin.php index 09c0aca..fe1ccc6 100644 --- a/admin.php +++ b/admin.php @@ -199,7 +199,7 @@ function fixNoteLinks() echo "<br />Deleting note links<br />"; $hResult = query_parameters("DELETE FROM appNotes WHERE linkedWith != '0'"); - echo "Deleted ".query_affected_rows()." links<br />"; + echo "Deleted ".query_num_rows()." links<br />"; }

1 0

Rosanne DiMesio : Add missing default value to appData create table statement
by Jeremy Newman 11 May '17

11 May '17

Module: appdb Branch: master Commit: fe944f473ae2cd71a15edced7ef2f93380d92f53 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=fe944f473ae2cd71a15edced… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu May 11 13:28:21 2017 -0500 Add missing default value to appData create table statement The default value already exists in the production database but was not added to appdb_tables.sql. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- tables/appdb_tables.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index 6fc9caa..beb1743 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -135,7 +135,7 @@ create table appComments ( */ create table appData ( id int not null auto_increment, - appId int not null, + appId int not null default 0, versionId int default 0, type enum('screenshot', 'url', 'bug','downloadurl'), description text,

1 0

Rosanne DiMesio : Add missing column to appNotes create table statement
by Jeremy Newman 11 May '17

11 May '17

Module: appdb Branch: master Commit: b5d7a17390b75736a902e2864cae36e967c70271 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b5d7a17390b75736a902e286… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed May 10 20:37:59 2017 -0500 Add missing column to appNotes create table statement The column linkedWith already exists in the appNotes table in the production database, but is missing from the create table statement in appdb_tables.sql. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- tables/appdb_tables.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index be556d3..6fc9caa 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -174,6 +174,7 @@ create table appNotes ( appId int not null, submitterId int not null, submitTime datetime not null, + linkedWith int not null, type enum('note','howto','warning') not null default 'note', key(noteId) );

1 0

Michael Stefaniuc : dmusic: Add dsound handling to the synth port Activate () method.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: 43b3f844baaf9e2ea82bc59066880e7aae70fc21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43b3f844baaf9e2ea82bc5906… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 10 14:44:03 2017 +0200 dmusic: Add dsound handling to the synth port Activate() method. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/port.c | 24 +++++++++++++++++++++--- dlls/dmusic/tests/dmusic.c | 14 +++++++------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 1bff721..5f4d918 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -436,11 +436,29 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetNumChannelGroups(LPDIREC return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_Activate(LPDIRECTMUSICPORT iface, BOOL active) +static HRESULT WINAPI synth_dmport_Activate(IDirectMusicPort *iface, BOOL active) { SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); - TRACE("(%p/%p)->(%d)\n", iface, This, active); + FIXME("(%p/%p)->(%d): semi-stub\n", iface, This, active); + + if (This->active == active) + return S_FALSE; + + if (active) { + /* Acquire the dsound */ + if (!This->dsound) { + IDirectSound_AddRef(This->parent->dsound); + This->dsound = This->parent->dsound; + } + IDirectSound_AddRef(This->dsound); + } else { + /* Release the dsound */ + IDirectSound_Release(This->dsound); + IDirectSound_Release(This->parent->dsound); + if (This->dsound == This->parent->dsound) + This->dsound = NULL; + } This->active = active; @@ -567,7 +585,7 @@ static const IDirectMusicPortVtbl SynthPortImpl_DirectMusicPort_Vtbl = { SynthPortImpl_IDirectMusicPort_DeviceIoControl, SynthPortImpl_IDirectMusicPort_SetNumChannelGroups, SynthPortImpl_IDirectMusicPort_GetNumChannelGroups, - SynthPortImpl_IDirectMusicPort_Activate, + synth_dmport_Activate, SynthPortImpl_IDirectMusicPort_SetChannelPriority, SynthPortImpl_IDirectMusicPort_GetChannelPriority, synth_dmport_SetDirectSound, diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index a96b4f7..f65dc7e 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -179,7 +179,7 @@ static void test_setdsound(void) hr = IDirectMusicPort_Activate(port, TRUE); ok(hr == S_OK, "Port Activate returned: %x\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 4, "dsound ref count got %d expected 4\n", ref); + ok(ref == 4, "dsound ref count got %d expected 4\n", ref); /* Releasing dsound from dmusic */ hr = IDirectMusic_SetDirectSound(dmusic, NULL, NULL); @@ -231,13 +231,13 @@ static void test_setdsound(void) hr = IDirectMusicPort_Activate(port, TRUE); ok(hr == S_OK, "Activate returned: %x\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 4, "dsound ref count got %d expected 4\n", ref); + ok(ref == 4, "dsound ref count got %d expected 4\n", ref); ref = get_refcount(dsound2); ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref); hr = IDirectMusicPort_Activate(port, TRUE); - todo_wine ok(hr == S_FALSE, "Activate returned: %x\n", hr); + ok(hr == S_FALSE, "Activate returned: %x\n", hr); ref = get_refcount(dsound); - todo_wine ok(ref == 4, "dsound ref count got %d expected 4\n", ref); + ok(ref == 4, "dsound ref count got %d expected 4\n", ref); ref = get_refcount(dsound2); ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref); @@ -247,13 +247,13 @@ static void test_setdsound(void) ref = get_refcount(dsound); ok(ref == 3, "dsound ref count got %d expected 3\n", ref); ref = get_refcount(dsound2); - todo_wine ok(ref == 1, "dsound2 ref count got %d expected 1\n", ref); + ok(ref == 1, "dsound2 ref count got %d expected 1\n", ref); hr = IDirectMusicPort_Activate(port, FALSE); - todo_wine ok(hr == S_FALSE, "Port Activate returned: %x\n", hr); + ok(hr == S_FALSE, "Port Activate returned: %x\n", hr); ref = get_refcount(dsound); ok(ref == 3, "dsound ref count got %d expected 3\n", ref); ref = get_refcount(dsound2); - todo_wine ok(ref == 1, "dsound2 ref count got %d expected 1\n", ref); + ok(ref == 1, "dsound2 ref count got %d expected 1\n", ref); IDirectMusicPort_Release(port); IDirectMusic_Release(dmusic);

1 0

Nikolay Sivov : dwrite: Fix compilation failure regarding nameless unions.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: af54ed51b00db42be1adade1c8a2fb2dcf837edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=af54ed51b00db42be1adade1c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 10 17:16:10 2017 +0300 dwrite: Fix compilation failure regarding nameless unions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 5f2de23..a66500a 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define NONAMELESSUNION #include "dwrite_private.h" #include "winternl.h" @@ -1900,10 +1901,10 @@ HRESULT opentype_get_cpal_entries(const void *cpal, UINT32 palette, UINT32 first first_entry_index += GET_BE_WORD(header->colorRecordIndices[palette]); for (i = 0; i < entry_count; i++) { - entries[i].r = records[first_entry_index + i].red / 255.0f; - entries[i].g = records[first_entry_index + i].green / 255.0f; - entries[i].b = records[first_entry_index + i].blue / 255.0f; - entries[i].a = records[first_entry_index + i].alpha / 255.0f; + entries[i].u1.r = records[first_entry_index + i].red / 255.0f; + entries[i].u2.g = records[first_entry_index + i].green / 255.0f; + entries[i].u3.b = records[first_entry_index + i].blue / 255.0f; + entries[i].u4.a = records[first_entry_index + i].alpha / 255.0f; } return S_OK;

1 0

Józef Kucia : amstream: Fix compilation on systems that don't support nameless unions.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: e8e23114a220bcb3c7966e5fba541a2b3823f0f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8e23114a220bcb3c7966e5fb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 10 16:20:52 2017 +0200 amstream: Fix compilation on systems that don't support nameless unions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastream.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 188ab88..53556af 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -18,16 +18,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" - +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #define COBJMACROS +#include <stdarg.h> +#include "windef.h" #include "winbase.h" #include "wingdi.h" #include "amstream_private.h" #include "ddstream.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(amstream); @@ -1021,11 +1024,11 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD desc.dwWidth = 100; desc.ddpfPixelFormat.dwSize = sizeof(desc.ddpfPixelFormat); desc.ddpfPixelFormat.dwFlags = DDPF_RGB; - desc.ddpfPixelFormat.dwRGBBitCount = 32; - desc.ddpfPixelFormat.dwRBitMask = 0xff0000; - desc.ddpfPixelFormat.dwGBitMask = 0x00ff00; - desc.ddpfPixelFormat.dwBBitMask = 0x0000ff; - desc.ddpfPixelFormat.dwRGBAlphaBitMask = 0; + desc.ddpfPixelFormat.u1.dwRGBBitCount = 32; + desc.ddpfPixelFormat.u2.dwRBitMask = 0xff0000; + desc.ddpfPixelFormat.u3.dwGBitMask = 0x00ff00; + desc.ddpfPixelFormat.u4.dwBBitMask = 0x0000ff; + desc.ddpfPixelFormat.u5.dwRGBAlphaBitMask = 0; desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY|DDSCAPS_OFFSCREENPLAIN; desc.lpSurface = NULL;

1 0

Sebastian Lackner : psapi/tests: Remove todo_wine from succeeding tests.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: e39d1614a9dad5f1b4aabcad7ec46c744c8370b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e39d1614a9dad5f1b4aabcad7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed May 10 17:38:51 2017 +0200 psapi/tests: Remove todo_wine from succeeding tests. These were missed in 19a79f422818859dd5a052ddc8e270ffbfef6e71. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 7bc26fe..e35a7b6 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -303,9 +303,7 @@ static void test_GetProcessMemoryInfo(void) SetLastError(0xdeadbeef); ret = pGetProcessMemoryInfo(hpSR, &pmc, sizeof(pmc)); -todo_wine ok(!ret, "GetProcessMemoryInfo should fail\n"); -todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef);

1 0

Sebastian Lackner : mfplat: Fix invalid memory access.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: d7dcb965d56416f58f0ce3c441d7b8f9d5351ff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7dcb965d56416f58f0ce3c44… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed May 10 17:45:20 2017 +0200 mfplat: Fix invalid memory access. Introduced in 0e93b08f6e81799f943159e529c3fa1e767d0d02. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c1c7003..56bc284 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -262,7 +262,7 @@ static BOOL match_type(const WCHAR *clsid_str, const WCHAR *type_str, MFT_REGIST if (RegQueryValueExW(hfilter, type_str, NULL, &reg_type, (LPBYTE)info, &size) != ERROR_SUCCESS) goto out; - for (i = 0; i < size / sizeof(MFT_REGISTER_TYPE_INFO) + 1; i++) + for (i = 0; i < size / sizeof(MFT_REGISTER_TYPE_INFO); i++) { if (IsEqualGUID(&info[i].guidMajorType, &type->guidMajorType) && IsEqualGUID(&info[i].guidSubtype, &type->guidSubtype))

1 0

Józef Kucia : ipconfig: Fix compilation on systems that don't support nameless unions.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: 13a1d40583e4d4544bee5ebbf4dfc586632de54d URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a1d40583e4d4544bee5ebbf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 10 16:29:11 2017 +0200 ipconfig: Fix compilation on systems that don't support nameless unions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/ipconfig/ipconfig.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index 11ff56b..a74ded6 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION + #include <winsock2.h> #include <windows.h> #include <iphlpapi.h> @@ -339,7 +341,7 @@ static void print_full_information(void) print_field(STRING_CONN_DNS_SUFFIX, p->DnsSuffix); print_field(STRING_DESCRIPTION, p->Description); print_field(STRING_PHYS_ADDR, physaddr_to_string(physaddr_buf, p->PhysicalAddress, p->PhysicalAddressLength)); - print_field(STRING_DHCP_ENABLED, boolean_to_string(p->Flags & IP_ADAPTER_DHCP_ENABLED)); + print_field(STRING_DHCP_ENABLED, boolean_to_string(p->u1.Flags & IP_ADAPTER_DHCP_ENABLED)); /* FIXME: Output autoconfiguration status. */

1 0

Jacek Caban : server: Allocate wait handle on async object in queue_irp.
by Alexandre Julliard 10 May '17

10 May '17

Module: wine Branch: master Commit: b76c1b468adcddd402b339d613e71527e5d5008f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76c1b468adcddd402b339d61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 10 18:34:34 2017 +0200 server: Allocate wait handle on async object in queue_irp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/device.c b/server/device.c index 1d129c3..1fe3de7 100644 --- a/server/device.c +++ b/server/device.c @@ -466,7 +466,7 @@ static obj_handle_t queue_irp( struct device_file *file, struct irp_call *irp, s { obj_handle_t handle = 0; - if (async_is_blocking( async ) && !(handle = alloc_handle( current->process, irp, SYNCHRONIZE, 0 ))) return 0; + if (async_is_blocking( async ) && !(handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ))) return 0; if (!fd_queue_async( file->fd, async, ASYNC_TYPE_WAIT )) {

1 0