August 2017 - Wine-Devel - list.winehq.org

Re: shell32: Wait for process to finish when using flag SEE_MASK_NOASYNC
by Huw Davies Aug. 8, 2017

Aug. 8, 2017

On 8 Aug 2017, at 16:50, Carlos Palminha <CARLOS.PALMINHA(a)synopsys.com> wrote: > > Support for SEE_MASK_NOASYNC (same value as SEE_MASK_FLAG_DDEWAIT). > Waits for process execution to finish before returning. > > Signed-off-by: Carlos Palminha <palminha(a)synopsys.com> > --- > dlls/shell32/shlexec.c | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) > > diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c > index c0ef53ab8e7..fe3eeeb5743 100644 > --- a/dlls/shell32/shlexec.c > +++ b/dlls/shell32/shlexec.c > @@ -344,6 +344,11 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, > dwCreationFlags = CREATE_UNICODE_ENVIRONMENT; > if (!(psei->fMask & SEE_MASK_NO_CONSOLE)) > dwCreationFlags |= CREATE_NEW_CONSOLE; > + > + if(psei->fMask & SEE_MASK_NOASYNC) { > + dwCreationFlags |= SEE_MASK_NOASYNC; > + } > + > if (CreateProcessW(NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE, dwCreationFlags, env, > lpDirectory, &startup, &info)); Passing SEE_MASK_NOASYNC to CreateProcessW doesn’t look right… Huw.

2 2

Invitations to WineConf
by Jeremy White Aug. 8, 2017

Aug. 8, 2017

Hey folks, Last year we said that we were going to try to broaden our invitations to the Wine conference to try to draw in more voices. This means potentially asking users, and making personal appeals to people that we would like to have at the conference. I plan to write a few personal notes extending invitations to folks that I've thought of (or have had suggested to me). James in our office is also going to reach out. But I'd like to ask everyone to help with that process. Roseanne, I'm particularly hoping you can reach out to the wine users in some way. A post on the forums? Could we / should we do a big news item so it's on the main page? I've asked PlayOnLinux folks as well as the Wineskin folks to come. Anyone else? Cheers, Jeremy

6 6

Re: [v2 5/5] kernel32/tests: Add tests for LoadLibrary with LIBRARY_SEARCH_* flags
by Marvin Aug. 8, 2017

Aug. 8, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=32619 Your paranoid android. === w2003std (32 bit module) === module.c:471: Test failed: Could not load test library testFlags.dll from C:\DOCUME~1\ADMINI~1\LOCALS~1\Temp\ module.c:496: Test failed: Library testFlags.dll was expected to be loaded from 'system32' module.c:505: Test failed: Library testFlags.dll was expected to be loaded from 'system32'

1 0

Re: [PATCH] netapi32: Return ERROR_SUCCESS in DsGetDcNameA/W.
by Huw Davies Aug. 8, 2017

Aug. 8, 2017

On Fri, Aug 04, 2017 at 04:17:14PM +0300, Andrey Gusev wrote: > Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> > --- > dlls/netapi32/netapi32.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c > index 278d4528b0..0236a2ad53 100644 > --- a/dlls/netapi32/netapi32.c > +++ b/dlls/netapi32/netapi32.c > @@ -3024,7 +3024,7 @@ DWORD WINAPI DsGetDcNameW(LPCWSTR ComputerName, LPCWSTR AvoidDCName, > FIXME("(%s, %s, %s, %s, %08x, %p): stub\n", debugstr_w(ComputerName), > debugstr_w(AvoidDCName), debugstr_guid(DomainGuid), > debugstr_w(SiteName), Flags, DomainControllerInfo); > - return ERROR_CALL_NOT_IMPLEMENTED; > + return ERROR_SUCCESS; > } > > DWORD WINAPI DsGetDcNameA(LPCSTR ComputerName, LPCSTR AvoidDCName, > @@ -3034,7 +3034,7 @@ DWORD WINAPI DsGetDcNameA(LPCSTR ComputerName, LPCSTR AvoidDCName, > FIXME("(%s, %s, %s, %s, %08x, %p): stub\n", debugstr_a(ComputerName), > debugstr_a(AvoidDCName), debugstr_guid(DomainGuid), > debugstr_a(SiteName), Flags, DomainControllerInfo); > - return ERROR_CALL_NOT_IMPLEMENTED; > + return ERROR_SUCCESS; > } This can't be right. These functions are supposed to return a ptr to an allocated DOMAIN_CONTROLLER_INFO in the final parameter. If you return ERROR_SUCCESS, the app will likely dereference that uninitialized pointer. Huw.

1 0

Re: [PATCH v3] shell32: Implement SHCreateItemInKnownFolder.
by Alistair Leslie-Hughes Aug. 8, 2017

Aug. 8, 2017

Hi Jactry, On 08/08/17 17:04, Jactry Zeng wrote: > + /* SHCreateItemInKnownFolder */ > + if(pSHCreateItemInKnownFolder || pSHGetKnownFolderPath) If one of these is NULL then the test will crash. Best Regards Alistair

2 1

Re: [PATCH v3] shell32: Implement SHCreateItemInKnownFolder.
by Huw Davies Aug. 8, 2017

Aug. 8, 2017

On Tue, Aug 08, 2017 at 03:04:21PM +0800, Jactry Zeng wrote: > diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c > index 1e19f7c72e..0bfb4a7f6f 100644 > --- a/dlls/shell32/shellitem.c > +++ b/dlls/shell32/shellitem.c > @@ -662,6 +662,67 @@ HRESULT WINAPI SHCreateItemFromIDList(PCIDLIST_ABSOLUTE pidl, REFIID riid, void > return ret; > } > > +HRESULT WINAPI SHCreateItemInKnownFolder(REFKNOWNFOLDERID rfid, DWORD flags, > + LPWSTR filename, REFIID riid, void **ppv) > +{ > + HRESULT hr; > + WCHAR *pathW = NULL; > + IShellFolder *desktop = NULL, *folder = NULL; > + LPITEMIDLIST pidl_folder = NULL, pidl = NULL; > + > + TRACE("%p, %x, %s, %s, %p\n", rfid, flags, wine_dbgstr_w(filename), > + debugstr_guid(riid), ppv); > + > + if(!rfid || !ppv) > + return E_INVALIDARG; > + > + if(flags) > + FIXME("flags 0x%08x not supported\n", flags); > + > + *ppv = NULL; > + hr = SHGetKnownFolderIDList(rfid, 0, NULL, &pidl_folder); flags should just be passed as the second parameter here and then you can ditch the FIXME(). > + if(hr != S_OK) > + goto cleanup; > + > + hr = SHGetDesktopFolder(&desktop); > + if(hr != S_OK) > + goto cleanup; > + > + if(!IsEqualIID(rfid, &FOLDERID_Desktop)) > + { > + hr = IShellFolder_BindToObject(desktop, pidl_folder, NULL, &IID_IShellFolder, > + (void**)&folder); > + if(hr != S_OK) > + goto cleanup; > + } > + > + if(filename) > + { > + hr = IShellFolder_ParseDisplayName(folder ? folder : desktop, NULL, NULL, > + filename, NULL, &pidl, NULL); > + if(hr != S_OK) > + goto cleanup; > + hr = SHCreateItemFromIDList(pidl, riid, ppv); > + if(hr != S_OK) > + goto cleanup; > + } > + else > + hr = SHCreateItemFromIDList(pidl_folder, riid, ppv); Thinking about this some more, how about implementing SHCreateItemFromRelativeName() first? Then this function becomes something like: SHGetKnownFolderIDList( rfid, flags, NULL, &pidl ); SHCreateItemFromIDList( pidl, &IID_IShellItem, &parent ); if (name) SHCreateItemFromRelativeName( parent, name, NULL, iid, ppv ); else IShellItem_QueryInterface( parent, iid, ppv ); IShellItem_Release( parent ); ILFree( pidl ); > diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c > index 9e7127dfea..461f8cea95 100644 > --- a/dlls/shell32/tests/shlfolder.c > +++ b/dlls/shell32/tests/shlfolder.c > > + /* SHCreateItemInKnownFolder */ > + if(pSHCreateItemInKnownFolder || pSHGetKnownFolderPath) I think you mean && here (although in practice it doesn't matter). > + if(0) > + { > + /* crashes on Windows */ > + pSHCreateItemInKnownFolder(NULL, 0, NULL, NULL, NULL); > + pSHCreateItemInKnownFolder(&FOLDERID_Desktop, 0, NULL, NULL, NULL); > + pSHCreateItemInKnownFolder(&FOLDERID_Desktop, 0, testfileW, &IID_IShellItem, NULL); > + } I'm not a big fan of this sort of thing, just leave it out. Huw.

1 0

Re: [PATCH v2] shell32: Implement SHCreateItemInKnownFolder.
by Huw Davies Aug. 8, 2017

Aug. 8, 2017

On Fri, Aug 04, 2017 at 02:54:15PM +0800, Jactry Zeng wrote: > diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c > index 9e7127dfea..b77619d428 100644 > --- a/dlls/shell32/tests/shlfolder.c > +++ b/dlls/shell32/tests/shlfolder.c > @@ -2519,6 +2521,120 @@ static void test_SHCreateShellItem(void) > else > win_skip("No SHCreateItemFromIDList\n"); > > + /* SHCreateItemInKnownFolder */ > + if(pSHCreateItemInKnownFolder) > + { > + WCHAR *desktop_path; > + WCHAR testfile_path[MAX_PATH] = {0}; > + HANDLE file; > + WCHAR *displayname = NULL; > + int order; > + LPITEMIDLIST pidl_desktop_testfile = NULL; > + > + if(0) > + { > + /* crashes on Windows */ > + pSHCreateItemInKnownFolder(NULL, 0, NULL, NULL, NULL); > + pSHCreateItemInKnownFolder(&FOLDERID_Desktop, 0, NULL, NULL, NULL); > + pSHCreateItemInKnownFolder(&FOLDERID_Desktop, 0, testfileW, &IID_IShellItem, NULL); > + } > + > + shellitem = (void*)0xdeadbeef; > + ret = pSHCreateItemInKnownFolder(&FOLDERID_Desktop, 0, NULL, &IID_IShellItem, > + (void**)&shellitem); > + ok(ret == S_OK, "SHCreateItemInKnownFolder failed: 0x%08x.\n", ret); > + ok(shellitem != NULL, "shellitem was %p.\n", shellitem); > + if(SUCCEEDED(ret)) > + { > + shellitem2 = (void*)0xdeadbeef; > + ret = pSHCreateShellItem(NULL, NULL, pidl_desktop, &shellitem2); > + ok(SUCCEEDED(ret), "SHCreateShellItem returned %x\n", ret); > + if(SUCCEEDED(ret)) > + { > + ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); > + ok(ret == S_OK, "IShellItem_Compare failed: 0x%08x\n", ret); > + ok(!order, "order got wrong value: %d\n", order); > + IShellItem_Release(shellitem2); > + } > + IShellItem_Release(shellitem); > + } > + > + /* Test with a non-existent file */ > + shellitem = (void*)0xdeadbeef; > + ret = pSHCreateItemInKnownFolder(&FOLDERID_Desktop, 0, testfileW, &IID_IShellItem, > + (void**)&shellitem); > + ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Expected 0x%08x but SHCreateItemInKnownFolder return: 0x%08x.\n", > + HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), ret); > + ok(shellitem == NULL, "shellitem was %p.\n", shellitem); > + > + SHGetKnownFolderPath(&FOLDERID_Desktop, 0, NULL, &desktop_path); It looks like SHGetKnownFolderPath is not available on WinXP, so you'll have to load it dynamically. OTOH I think SHCreateItemInKnownFolder() is available on all the platforms that we care about, so you can static link to that one. Huw.

2 1

Re: [PATCH v2] ntdll: Fix wrong string size alloc when loading libraries
by Nikolay Sivov Aug. 7, 2017

Aug. 7, 2017

On 07.08.2017 20:41, Carlos Palminha wrote: > Fixed some nasty unhandled exceptions when loading libraries > that don't have .dll extension. > > Problem was caused by wrong string size calculation. > > v2: Now properly takes into account strlen * sizeof WCHAR > > Signed-off-by: Carlos Palminha <palminha(a)synopsys.com> > --- > dlls/ntdll/loader.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c > index dd1f74c0fc..83dd6d378e 100644 > --- a/dlls/ntdll/loader.c > +++ b/dlls/ntdll/loader.c > @@ -2141,7 +2141,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, > if (!(ext = strrchrW( libname, '.')) || strchrW( ext, '/' ) || strchrW( ext, '\\')) > { > if (!(dllname = RtlAllocateHeap( GetProcessHeap(), 0, > - (strlenW(libname) * sizeof(WCHAR)) + sizeof(dllW) ))) > + (strlenW(libname) * sizeof(WCHAR)) + (strlenW(dllW) * sizeof(WCHAR)) ))) > return STATUS_NO_MEMORY; > strcpyW( dllname, libname ); > strcatW( dllname, dllW ); > This is still shorter than it is now: sizeof(dllW) is 5 * sizeof(WCHAR) vs strlenW(dllW) * sizeof(WCHAR) == 4 * sizeof(WCHAR).

2 1

Re: [PATCH] ws2_32: Don't return synchronously if the connection is refused.
by Huw Davies Aug. 7, 2017

Aug. 7, 2017

On Mon, Aug 07, 2017 at 03:39:14PM +0100, Huw Davies wrote: > Signed-off-by: Huw Davies <huw(a)codeweavers.com> > --- > dlls/ws2_32/socket.c | 5 +++++ > dlls/ws2_32/tests/sock.c | 20 ++++++-------------- > 2 files changed, 11 insertions(+), 14 deletions(-) Please ignore this for now, it needs more work. Huw.

1 0

Re: [PATCH] ntdll: Fix wrong string size alloc when loading libraries
by Józef Kucia Aug. 7, 2017

Aug. 7, 2017

On Mon, Aug 7, 2017 at 6:48 PM, Carlos Palminha <CARLOS.PALMINHA(a)synopsys.com> wrote: > Fixed some nasty unhandled exceptions when loading libraries > that don't have .dll extension. > > Problem was caused by wrong string size calculation. > > Signed-off-by: Carlos Palminha <palminha(a)synopsys.com> > --- > dlls/ntdll/loader.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c > index dd1f74c0fc..8fc464bcd7 100644 > --- a/dlls/ntdll/loader.c > +++ b/dlls/ntdll/loader.c > @@ -2141,7 +2141,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, > if (!(ext = strrchrW( libname, '.')) || strchrW( ext, '/' ) || strchrW( ext, '\\')) > { > if (!(dllname = RtlAllocateHeap( GetProcessHeap(), 0, > - (strlenW(libname) * sizeof(WCHAR)) + sizeof(dllW) ))) > + (strlenW(libname) * sizeof(WCHAR)) + strlenW(dllW) ))) This doesn't look right. After the change it allocates less memory than before. Notice that strlenW(dllW) == 4 and sizeof(dllW) == 10. > return STATUS_NO_MEMORY; > strcpyW( dllname, libname ); > strcatW( dllname, dllW ); > -- > 2.11.0 > > >

2 1