July 2016 - Wine-Commits - list.winehq.org

Sebastian Lackner : vcomp/tests: Add tests for 8-bit atomic instructions.
by Alexandre Julliard July 19, 2016

July 19, 2016

Module: wine Branch: master Commit: fc0ec2de7ef2d63e5f6b7c2a8c4cfc2a04f17488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc0ec2de7ef2d63e5f6b7c2a8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 18 16:06:47 2016 +0200 vcomp/tests: Add tests for 8-bit atomic instructions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/tests/vcomp.c | 119 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc0ec2de7ef2d63e5f6b7…

1 0

Nikolay Sivov : wbemdisp: Fix a crash on null interface pointer.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: 1fda7ca72e4a4d784950c0a4503f34a32d3b987b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fda7ca72e4a4d784950c0a45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 15 23:22:50 2016 +0300 wbemdisp: Fix a crash on null interface pointer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 3 ++- dlls/wbemdisp/tests/wbemdisp.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index d1f2609..a8b1568 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -1224,7 +1224,8 @@ static ULONG WINAPI locator_Release( if (!refs) { TRACE( "destroying %p\n", locator ); - IWbemLocator_Release( locator->locator ); + if (locator->locator) + IWbemLocator_Release( locator->locator ); heap_free( locator ); } return refs; diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index e3d432b..3cc4c86 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -243,9 +243,23 @@ static void test_ParseDisplayName(void) IParseDisplayName_Release( displayname ); } +static void test_locator(void) +{ + IUnknown *locator; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_SWbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&locator ); + ok( hr == S_OK, "got %x\n", hr ); + + IUnknown_Release( locator ); +} + START_TEST(wbemdisp) { CoInitialize( NULL ); + test_ParseDisplayName(); + test_locator(); + CoUninitialize(); }

1 0

Alexandre Julliard : kernel32: Store synchronization objects under the session directory.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: 2f514becdb374f793511f8c3b229412fcd2e6c81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f514becdb374f793511f8c3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 15:38:30 2016 +0900 kernel32: Store synchronization objects under the session directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 8 +++++--- dlls/ntdll/tests/om.c | 27 ++++++++++++--------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 13fb0f0..c10fd01 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -57,8 +57,9 @@ static inline BOOL is_version_nt(void) HANDLE get_BaseNamedObjects_handle(void) { static HANDLE handle = NULL; - static const WCHAR basenameW[] = - {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s',0}; + static const WCHAR basenameW[] = {'\\','S','e','s','s','i','o','n','s','\\','%','u', + '\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s',0}; + WCHAR buffer[64]; UNICODE_STRING str; OBJECT_ATTRIBUTES attr; @@ -66,7 +67,8 @@ HANDLE get_BaseNamedObjects_handle(void) { HANDLE dir; - RtlInitUnicodeString(&str, basenameW); + sprintfW( buffer, basenameW, NtCurrentTeb()->Peb->SessionId ); + RtlInitUnicodeString( &str, buffer ); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); NtOpenDirectoryObject(&dir, DIRECTORY_CREATE_OBJECT|DIRECTORY_TRAVERSE, &attr); diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 64a16ab..43c5ee4 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -231,13 +231,14 @@ static HANDLE get_base_dir(void) UNICODE_STRING str; OBJECT_ATTRIBUTES attr; HANDLE dir, h; - unsigned int i; + char name[40]; h = CreateMutexA(NULL, FALSE, objname); ok(h != 0, "CreateMutexA failed got ret=%p (%d)\n", h, GetLastError()); InitializeObjectAttributes(&attr, &str, OBJ_OPENIF, 0, NULL); - pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Local"); + sprintf( name, "\\BaseNamedObjects\\Session\\%u", NtCurrentTeb()->Peb->SessionId ); + pRtlCreateUnicodeStringFromAsciiz(&str, name ); status = pNtOpenDirectoryObject(&dir, DIRECTORY_QUERY, &attr); pRtlFreeUnicodeString(&str); if (!status && is_correct_dir( dir, objname )) goto done; @@ -249,16 +250,6 @@ static HANDLE get_base_dir(void) if (!status && is_correct_dir( dir, objname )) goto done; if (!status) pNtClose( dir ); - for (i = 0; i < 20; i++) - { - char name[40]; - sprintf( name, "\\BaseNamedObjects\\Session\\%u", i ); - pRtlCreateUnicodeStringFromAsciiz(&str, name ); - status = pNtOpenDirectoryObject(&dir, DIRECTORY_QUERY, &attr); - pRtlFreeUnicodeString(&str); - if (!status && is_correct_dir( dir, objname )) goto done; - if (!status) pNtClose( dir ); - } dir = 0; done: @@ -1293,10 +1284,12 @@ static void test_query_object(void) NTSTATUS status; ULONG len, expected_len; OBJECT_ATTRIBUTES attr; - UNICODE_STRING path, *str; + UNICODE_STRING path, session, *str; char dir[MAX_PATH], tmp_path[MAX_PATH], file1[MAX_PATH + 16]; LARGE_INTEGER size; + sprintf( tmp_path, "\\Sessions\\%u", NtCurrentTeb()->Peb->SessionId ); + pRtlCreateUnicodeStringFromAsciiz( &session, tmp_path ); InitializeObjectAttributes( &attr, &path, 0, 0, 0 ); handle = CreateEventA( NULL, FALSE, FALSE, "test_event" ); @@ -1330,8 +1323,11 @@ static void test_query_object(void) ok( str->Length >= sizeof(name), "unexpected len %u\n", str->Length ); ok( len > sizeof(UNICODE_STRING) + sizeof("\\test_event") * sizeof(WCHAR), "name too short %s\n", wine_dbgstr_w(str->Buffer) ); - /* there can be a \\Sessions prefix in the name */ - ok( !memcmp( str->Buffer + (str->Length - sizeof(name)) / sizeof(WCHAR), name, sizeof(name) ), + /* check for \\Sessions prefix in the name */ + ok( (str->Length > session.Length && + !memcmp( str->Buffer, session.Buffer, session.Length ) && + !memcmp( str->Buffer + session.Length / sizeof(WCHAR), name, sizeof(name) )) || + broken( !memcmp( str->Buffer, name, sizeof(name) )), /* winxp */ "wrong name %s\n", wine_dbgstr_w(str->Buffer) ); trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); @@ -1528,6 +1524,7 @@ static void test_query_object(void) trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); pNtClose( handle ); } + pRtlFreeUnicodeString( &session ); } static void test_type_mismatch(void)

1 0

Alexandre Julliard : server: Add a helper function to create session directories and symlinks.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: 87bbc84ad538758c777ff1ad9829495c2d1d448e URL: http://source.winehq.org/git/wine.git/?a=commit;h=87bbc84ad538758c777ff1ad9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 15:36:32 2016 +0900 server: Add a helper function to create session directories and symlinks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 133 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 91 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87bbc84ad538758c777ff…

1 0

Iván Matellanes : msvcirt: Implement istream:: get for streambufs.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: 5c691f3f09b1d7c7db06d732780556c4c852f358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c691f3f09b1d7c7db06d7327… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 18 09:13:03 2016 +0100 msvcirt: Implement istream::get for streambufs. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 18 ++++++- dlls/msvcirt/tests/msvcirt.c | 125 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c691f3f09b1d7c7db06d…

1 0

Iván Matellanes : msvcirt: Implement istream:: get for single characters.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: a3313793e0a11b59064b368b3865015d7893e2b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3313793e0a11b59064b368b3… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jul 18 09:13:02 2016 +0100 msvcirt: Implement istream::get for single characters. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 29 ++++++++++-- dlls/msvcirt/tests/msvcirt.c | 105 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 129 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3313793e0a11b59064b3…

1 0

Jan Schmidt : winegstreamer: Do conversion before flipping.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: 4aefacd16239659724e4449b7184a44ee6ae09f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aefacd16239659724e4449b7… Author: Jan Schmidt <jan(a)centricular.com> Date: Sun Jul 17 14:58:21 2016 +1000 winegstreamer: Do conversion before flipping. The videoflip element doesn't handle all formats, so some formats like Intel Indeo 3 will cause errors and fail. Add videoconvert before videoflip to do format conversion when it's needed. Signed-off-by: Jan Schmidt <jan(a)centricular.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 21385d7..6f98521 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -831,11 +831,20 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) gst_segment_init(pin->segment, GST_FORMAT_TIME); if (isvid) { + GstElement *vconv; + TRACE("setting up videoflip filter for pin %p, my_sink: %p, their_src: %p\n", pin, pin->my_sink, pad); /* gstreamer outputs video top-down, but dshow expects bottom-up, so * make new transform filter to invert video */ + vconv = gst_element_factory_make("videoconvert", NULL); + if(!vconv){ + ERR("Missing videoconvert filter?\n"); + ret = -1; + goto exit; + } + pin->flipfilter = gst_element_factory_make("videoflip", NULL); if(!pin->flipfilter){ ERR("Missing videoflip filter?\n"); @@ -845,10 +854,14 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) gst_util_set_object_arg(G_OBJECT(pin->flipfilter), "method", "vertical-flip"); - gst_bin_add(GST_BIN(This->container), pin->flipfilter); + gst_bin_add(GST_BIN(This->container), vconv); /* bin takes ownership */ + gst_element_sync_state_with_parent(vconv); + gst_bin_add(GST_BIN(This->container), pin->flipfilter); /* bin takes ownership */ gst_element_sync_state_with_parent(pin->flipfilter); - pin->flip_sink = gst_element_get_static_pad(pin->flipfilter, "sink"); + gst_element_link (vconv, pin->flipfilter); + + pin->flip_sink = gst_element_get_static_pad(vconv, "sink"); if(!pin->flip_sink){ WARN("Couldn't find sink on flip filter\n"); gst_object_unref(pin->flipfilter);

1 0

Alexandre Julliard : user32: Store window station objects under the session directory.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: 911e59c1333be238cc504bd9c3e06131e1204882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=911e59c1333be238cc504bd9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 15:38:42 2016 +0900 user32: Store window station objects under the session directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winstation.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 61add76..673917c 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -59,8 +59,10 @@ static BOOL CALLBACK enum_names_WtoA( LPWSTR name, LPARAM lparam ) static HANDLE get_winstations_dir_handle(void) { static HANDLE handle = NULL; - static const WCHAR basenameW[] = {'\\','W','i','n','d','o','w','s','\\', + static const WCHAR basenameW[] = {'\\','S','e','s','s','i','o','n','s','\\','%','u', + '\\','W','i','n','d','o','w','s','\\', 'W','i','n','d','o','w','S','t','a','t','i','o','n','s',0}; + WCHAR buffer[64]; UNICODE_STRING str; OBJECT_ATTRIBUTES attr; @@ -68,7 +70,8 @@ static HANDLE get_winstations_dir_handle(void) { HANDLE dir; - RtlInitUnicodeString( &str, basenameW ); + sprintfW( buffer, basenameW, NtCurrentTeb()->Peb->SessionId ); + RtlInitUnicodeString( &str, buffer ); InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); NtOpenDirectoryObject( &dir, DIRECTORY_CREATE_OBJECT | DIRECTORY_TRAVERSE, &attr ); if (InterlockedCompareExchangePointer( &handle, dir, 0 ) != 0) /* someone beat us here */

1 0

Alexandre Julliard : server: Add a helper function to create a symlink to an existing object.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: c7f16d62204c86ed66c216125448d6678b5ad42e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f16d62204c86ed66c216125… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 15:34:08 2016 +0900 server: Add a helper function to create a symlink to an existing object. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 5 ++--- server/directory.c | 56 +++++++++++++++++++++++++---------------------------- server/file.h | 6 +++--- server/mailslot.c | 4 ++-- server/named_pipe.c | 4 ++-- server/object.h | 6 +++--- server/symlink.c | 31 ++++++++++++++++++++++++++--- 7 files changed, 66 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7f16d62204c86ed66c21…

1 0

Jan Schmidt : winegstreamer: Don't replace internal bus.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: 22bdf774869e08bad14d9ff885ba293753f788d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22bdf774869e08bad14d9ff88… Author: Jan Schmidt <jan(a)centricular.com> Date: Sun Jul 17 14:58:19 2016 +1000 winegstreamer: Don't replace internal bus. Don't replace the bus on the decodebin inside our container, as it causes problems with internal GStreamer element management. Put the bus only on the top-level container. Signed-off-by: Jan Schmidt <jan(a)centricular.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1de9b41..e7ff2b4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1103,6 +1103,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI } This->container = gst_bin_new(NULL); + gst_element_set_bus(This->container, This->bus); This->gstfilter = gst_element_factory_make("decodebin", NULL); if (!This->gstfilter) { @@ -1113,7 +1114,6 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI gst_bin_add(GST_BIN(This->container), This->gstfilter); - gst_element_set_bus(This->gstfilter, This->bus); g_signal_connect(This->gstfilter, "pad-added", G_CALLBACK(existing_new_pad_wrapper), This); g_signal_connect(This->gstfilter, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), This); g_signal_connect(This->gstfilter, "autoplug-select", G_CALLBACK(autoplug_blacklist_wrapper), This); @@ -1902,7 +1902,6 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) if (!This->container) return S_OK; - gst_element_set_bus(This->gstfilter, NULL); gst_element_set_state(This->container, GST_STATE_NULL); gst_pad_unlink(This->my_src, This->their_sink); gst_object_unref(This->my_src); @@ -1918,6 +1917,7 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) This->ppPins = NULL; gst_object_unref(This->gstfilter); This->gstfilter = NULL; + gst_element_set_bus(This->container, NULL); gst_object_unref(This->container); This->container = NULL; BaseFilterImpl_IncrementPinVersion((BaseFilter*)This);

1 0