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

Re: [PATCH v3] shell32: Implement SHCreateItemInKnownFolder.

by Huw Davies

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.

Aug. 8, 2017

Re: [PATCH v2] shell32: Implement SHCreateItemInKnownFolder.

by Jactry Zeng

Hi Huw, SHCreateItemInKnownFolder() isn't available on WinXP and 2003 too. I sent another try which loading SHGetKnownFolderPath() dynamically. Thanks for review! 2017-08-07 18:33 GMT+08:00 Huw Davies <huw(a)codeweavers.com>: > 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. > > > -- Regards, Jactry Zeng

Aug. 8, 2017

Re: [PATCH v2] ntdll: Fix wrong string size alloc when loading libraries

by Carlos Palminha

On 07-08-2017 19:55, Nikolay Sivov wrote: > 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). > yep, you are right! Somehow with my "patch" i stop getting the "Program Error" window with the exception. But after i realized i still got the exception "silently" in the logs. Need to better understand why its crashing around that Alloc. Regards, C.Palminha

Aug. 7, 2017

Re: Invitations to WineConf

by Jens Reyer

On 08/07/2017 10:50 AM, Jeremy White wrote: > 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? I hope to come this year (too early to say for sure). You might reach out to other packagers, iirc you planned that last year. q4wine guy(s?) might also be interested (but I don't know much about that). Greets jre

Aug. 7, 2017

Re: [PATCH v2] ntdll: Fix wrong string size alloc when loading libraries

by Nikolay Sivov

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).

Aug. 7, 2017

Re: Invitations to WineConf

by Jeremy White

On 08/07/2017 11:48 AM, Rosanne DiMesio wrote: > On Mon, 7 Aug 2017 09:50:45 -0500 > Jeremy White <jwhite(a)codeweavers.com> wrote: >> >> 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'd do both. The forum announcement should come from you rather than me. Maybe make the main page announcement a WWN article? Really? I would bet that on the Wine forums your name is better known and better loved than mine. > > My big question is: what are you planning for users? Users who don't live near enough to just drop in will want to know what's on the agenda before deciding. That's a good question. I think the key note and the socializing tend to work for users as well as they do for developers. The only concrete idea I have is to have a session titled something like: "What do users need?" We often say it would be nice to have the Agenda ahead of time, but efforts on that front often fall short. Arguably, we should have a visible schedule and at least a suggestion of an Agenda (and perhaps a link to last years Agenda would help people have a sense of the topics). I'll work with Jacek on getting a framework up. If others have suggestions, they can add them there. > >> I've asked PlayOnLinux folks as well as the Wineskin folks to come. >> Anyone else? >> > AppDB admins and maintainers? Most won't be interested, but some long-time, very active ones might. It's very easy to send an email to all of them through the AppDB. I think that would be a great idea. Cheers, Jeremy

Aug. 7, 2017

Re: [PATCH] ws2_32: Don't return synchronously if the connection is refused.

by Huw Davies

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.

Aug. 7, 2017

Re: [PATCH] ntdll: Fix wrong string size alloc when loading libraries

by Carlos Palminha

On 07-08-2017 18:14, Józef Kucia wrote: > 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. yep... just spot it. somehow like already fixes my issues. will send a v2. > >> return STATUS_NO_MEMORY; >> strcpyW( dllname, libname ); >> strcatW( dllname, dllW ); >> -- >> 2.11.0 >> >> >> > >

Aug. 7, 2017

Re: Invitations to WineConf

by André Hentschel

Am 07.08.2017 um 18:48 schrieb Rosanne DiMesio: > On Mon, 7 Aug 2017 09:50:45 -0500 > Jeremy White <jwhite(a)codeweavers.com> wrote: >> >> 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'd do both. The forum announcement should come from you rather than me. Maybe make the main page announcement a WWN article? > > My big question is: what are you planning for users? Users who don't live near enough to just drop in will want to know what's on the agenda before deciding. > >> I've asked PlayOnLinux folks as well as the Wineskin folks to come. >> Anyone else? >> > AppDB admins and maintainers? Most won't be interested, but some long-time, very active ones might. It's very easy to send an email to all of them through the AppDB. > > > > > > > > > If someone supplies the text, i can make a WWN out of it

Aug. 7, 2017

Re: [PATCH] ntdll: Fix wrong string size alloc when loading libraries

by Józef Kucia

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 > > >

Aug. 7, 2017