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

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

May 11, 2017

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 : admin.php: fix incorrect call to query_affected_rows
by Jeremy Newman May 11, 2017

May 11, 2017

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 column to appNotes create table statement
by Jeremy Newman May 11, 2017

May 11, 2017

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

Alexandre Julliard : winex11: Remove all trailing nulls when exporting text strings.
by Alexandre Julliard May 10, 2017

May 10, 2017

Module: wine Branch: master Commit: 68bbf6fb18464f2b1f09954dda8dc121393a3046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68bbf6fb18464f2b1f09954dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 15:28:27 2017 -0500 winex11: Remove all trailing nulls when exporting text strings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 2566d01..3c1f3b4 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1130,7 +1130,7 @@ static char *string_from_unicode_text( UINT codepage, HANDLE handle, UINT *size if (str[i] == '\r' && (i == len - 1 || str[i + 1] == '\n')) continue; str[j++] = str[i]; } - if (j && !str[j - 1]) j--; /* remove trailing null */ + while (j && !str[j - 1]) j--; /* remove trailing nulls */ *size = j; TRACE( "returning %s\n", debugstr_an( str, j )); }

1 0

Alexandre Julliard : winex11: Simplify the clipboard HTML export function.
by Alexandre Julliard May 10, 2017

May 10, 2017

Module: wine Branch: master Commit: 0bdebc66c634098e24258abcbc80403243356a5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bdebc66c634098e24258abcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 15:28:12 2017 -0500 winex11: Simplify the clipboard HTML export function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 61 +++++++++++--------------------------------- 1 file changed, 15 insertions(+), 46 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 4cb8cb8..2566d01 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1293,28 +1293,6 @@ static BOOL export_enhmetafile( Display *display, Window win, Atom prop, Atom ta /************************************************************************** - * get_html_description_field - * - * Find the value of a field in an HTML Format description. - */ -static LPCSTR get_html_description_field(LPCSTR data, LPCSTR keyword) -{ - LPCSTR pos=data; - - while (pos && *pos && *pos != '<') - { - if (memcmp(pos, keyword, strlen(keyword)) == 0) - return pos+strlen(keyword); - - pos = strchr(pos, '\n'); - if (pos) pos++; - } - - return NULL; -} - - -/************************************************************************** * export_text_html * * Export HTML Format to text/html. @@ -1323,36 +1301,27 @@ static LPCSTR get_html_description_field(LPCSTR data, LPCSTR keyword) */ static BOOL export_text_html( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) { - LPCSTR data, field_value; - UINT fragmentstart, fragmentend; - - data = GlobalLock( handle ); + const char *p, *data; + UINT start = 0, end = 0; + BOOL ret = TRUE; - /* read the important fields */ - field_value = get_html_description_field(data, "StartFragment:"); - if (!field_value) - { - ERR("Couldn't find StartFragment value\n"); - goto failed; - } - fragmentstart = atoi(field_value); + if (!(data = GlobalLock( handle ))) return FALSE; - field_value = get_html_description_field(data, "EndFragment:"); - if (!field_value) + p = data; + while (*p && *p != '<') { - ERR("Couldn't find EndFragment value\n"); - goto failed; + if (!strncmp( p, "StartFragment:", 14 )) start = atoi( p + 14 ); + else if (!strncmp( p, "EndFragment:", 12 )) end = atoi( p + 12 ); + if (!(p = strpbrk( p, "\r\n" ))) break; + while (*p == '\r' || *p == '\n') p++; } - fragmentend = atoi(field_value); - - /* export only the fragment */ - put_property( display, win, prop, target, 8, &data[fragmentstart], fragmentend - fragmentstart ); - GlobalUnlock( handle ); - return TRUE; + if (start && start < end && end <= GlobalSize( handle )) + put_property( display, win, prop, target, 8, data + start, end - start ); + else + ret = FALSE; -failed: GlobalUnlock( handle ); - return FALSE; + return ret; }

1 0

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

May 10, 2017

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

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

May 10, 2017

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

Alexandre Julliard : user32/tests: Test resulting size of strings with trailing nulls.
by Alexandre Julliard May 10, 2017

May 10, 2017

Module: wine Branch: master Commit: 0647abc5071913506e681bfc5239f9a6078dca54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0647abc5071913506e681bfc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 15:29:11 2017 -0500 user32/tests: Test resulting size of strings with trailing nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 17fc028..5527a6e 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -482,19 +482,19 @@ todo_wine static HGLOBAL create_textA(void) { - HGLOBAL h = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, 5); + HGLOBAL h = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, 10); char *p = GlobalLock(h); - strcpy(p, "test"); + memcpy(p, "test\0\0\0\0\0", 10); GlobalUnlock(h); return h; } static HGLOBAL create_textW(void) { - static const WCHAR testW[] = {'t','e','s','t',0}; - HGLOBAL h = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, 5 * sizeof(WCHAR)); + static const WCHAR testW[] = {'t','e','s','t',0,0,0,0,0,0}; + HGLOBAL h = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, sizeof(testW)); WCHAR *p = GlobalLock(h); - lstrcpyW(p, testW); + memcpy(p, testW, sizeof(testW)); GlobalUnlock(h); return h; } @@ -767,7 +767,9 @@ static void test_synthesized(void) ok(data != NULL || broken( tests[i].format == CF_DIBV5 && cf == CF_DIB ), /* >= Vista */ "%u: couldn't get data, cf %04x err %d\n", i, cf, GetLastError()); - if (cf == CF_LOCALE) + switch (cf) + { + case CF_LOCALE: { UINT *ptr = GlobalLock( data ); ok( GlobalSize( data ) == sizeof(*ptr), "%u: size %lu\n", i, GlobalSize( data )); @@ -775,6 +777,15 @@ static void test_synthesized(void) broken( *ptr == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT )), "%u: CF_LOCALE %08x/%08x\n", i, *ptr, GetUserDefaultLCID() ); GlobalUnlock( data ); + break; + } + case CF_TEXT: + case CF_OEMTEXT: + ok( GlobalSize( data ) == 10, "wrong len %ld\n", GlobalSize( data )); + break; + case CF_UNICODETEXT: + ok( GlobalSize( data ) == 10 * sizeof(WCHAR), "wrong len %ld\n", GlobalSize( data )); + break; } } if (!tests[i].expected[j])

1 0

Alexandre Julliard : qcap: Fix build when O_CLOEXEC isn't defined.
by Alexandre Julliard May 10, 2017

May 10, 2017

Module: wine Branch: master Commit: bcc36abd8886f035652630fa62bd732519c83d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcc36abd8886f035652630fa6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 13:08:57 2017 -0500 qcap: Fix build when O_CLOEXEC isn't defined. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index d67df73..b4b7b96 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -799,12 +799,16 @@ Capture * qcap_driver_init( IPin *pOut, USHORT card ) sprintf(device, "/dev/video%i", card); TRACE("opening %s\n", device); - capBox->fd = video_open(device, O_RDWR | O_NONBLOCK | O_CLOEXEC); +#ifdef O_CLOEXEC + if ((capBox->fd = video_open(device, O_RDWR | O_NONBLOCK | O_CLOEXEC)) == -1 && errno == EINVAL) +#endif + capBox->fd = video_open(device, O_RDWR | O_NONBLOCK); if (capBox->fd == -1) { WARN("open failed (%d)\n", errno); goto error; } + fcntl( capBox->fd, F_SETFD, FD_CLOEXEC ); /* in case O_CLOEXEC isn't supported */ memset(&capa, 0, sizeof(capa));

1 0

Jacek Caban : ntdll/tests: Added FSCTL_PIPE_PEEK tests.
by Alexandre Julliard May 10, 2017

May 10, 2017

Module: wine Branch: master Commit: 4370073bbfea01bad9a600046903a4fa6ed7a525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4370073bbfea01bad9a600046… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 10 18:55:41 2017 +0200 ntdll/tests: Added FSCTL_PIPE_PEEK tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index e242cb4..c0a785b 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -724,6 +724,31 @@ static void WINAPI apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved ) ok( !reserved, "reserved is not 0: %x\n", reserved ); } +static void test_peek(HANDLE pipe) +{ + FILE_PIPE_PEEK_BUFFER buf; + IO_STATUS_BLOCK iosb; + HANDLE event = CreateEventA( NULL, TRUE, FALSE, NULL ); + NTSTATUS status; + + memset(&iosb, 0x55, sizeof(iosb)); + status = NtFsControlFile(pipe, NULL, NULL, NULL, &iosb, FSCTL_PIPE_PEEK, NULL, 0, &buf, sizeof(buf)); + ok(!status || status == STATUS_PENDING, "NtFsControlFile failed: %x\n", status); + ok(!iosb.Status, "iosb.Status = %x\n", iosb.Status); + ok(buf.ReadDataAvailable == 1, "ReadDataAvailable = %u\n", buf.ReadDataAvailable); + + ResetEvent(event); + memset(&iosb, 0x55, sizeof(iosb)); + status = NtFsControlFile(pipe, event, NULL, NULL, &iosb, FSCTL_PIPE_PEEK, NULL, 0, &buf, sizeof(buf)); + ok(!status || status == STATUS_PENDING, "NtFsControlFile failed: %x\n", status); + ok(buf.ReadDataAvailable == 1, "ReadDataAvailable = %u\n", buf.ReadDataAvailable); + ok(!iosb.Status, "iosb.Status = %x\n", iosb.Status); + todo_wine + ok(is_signaled(event), "event is not signaled\n"); + + CloseHandle(event); +} + #define PIPENAME "\\\\.\\pipe\\ntdll_tests_pipe.c" static BOOL create_pipe_pair( HANDLE *read, HANDLE *write, ULONG flags, ULONG type, ULONG size ) @@ -829,6 +854,9 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type) ResetEvent( event ); ret = WriteFile( write, buffer, 1, &written, NULL ); ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); + + test_peek(read); + status = NtReadFile( read, event, apc, &apc_count, &iosb, buffer, 1, NULL, NULL ); ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status );

1 0