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

Re: [PATCH] usp10: fall back to 'dflt' language if shaping language tag not found
by Henri Verbeet Aug. 15, 2017

Aug. 15, 2017

On 14 August 2017 at 20:04, Aric Stewart <aric(a)codeweavers.com> wrote: > + script = get_opentype_script(hdc,psa,psc,FALSE); Does that do anything? If I'm reading the code correctly that will set it to the same value it already was. (In which case most of this would simplify to "if (!script) script = MS_MAKE_TAG('l','a','t','n');")

2 2

Re: [PATCH v3 5/5] ieframe: Add stub implementation of IInternetExplorerManager.
by Jacek Caban Aug. 15, 2017

Aug. 15, 2017

On 10.08.2017 20:52, Zebediah Figura wrote: > v2: register IE and IEM separately, and the latter with SINGLEUSE > (thanks Jacek) > > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > dlls/ieframe/ieframe.h | 5 +- > dlls/ieframe/ieframe_main.c | 35 ++++--------- > dlls/ieframe/iexplore.c | 111 ++++++++++++++++++++++++++++++++++++++--- > dlls/ieframe/tests/ie.c | 21 ++++++++ > programs/iexplore/iexplore.inf | 3 ++ > 5 files changed, 142 insertions(+), 33 deletions(-) > > diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h > index d1f1c5daf24..c690d5c6878 100644 > --- a/dlls/ieframe/ieframe.h > +++ b/dlls/ieframe/ieframe.h > @@ -312,13 +312,16 @@ TID_LIST > } tid_t; > > HRESULT get_typeinfo(tid_t,ITypeInfo**) DECLSPEC_HIDDEN; > -HRESULT register_class_object(BOOL) DECLSPEC_HIDDEN; > > HRESULT WINAPI CUrlHistory_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; > HRESULT WINAPI InternetExplorer_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; > HRESULT WINAPI InternetShortcut_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; > HRESULT WINAPI WebBrowser_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; > HRESULT WINAPI WebBrowserV1_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; > +HRESULT WINAPI InternetExplorerManager_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; > + > +extern IClassFactory InternetExplorerFactory; > +extern IClassFactory InternetExplorerManagerFactory; This is missing DECLSPEC_HIDDEN. > > +/****************************************************************** > + * IInternetExplorerManager implementation > + */ > +struct internet_explorer_manager { > + IInternetExplorerManager IInternetExplorerManager_iface; > + LONG ref; > +}; Please use the type from public declaration (coclass). See how InternetExplorer object is declared. > +HRESULT WINAPI InternetExplorerManager_Create(IClassFactory *iface, IUnknown *pOuter, REFIID riid, void **ppv) > +{ > + struct internet_explorer_manager *ret; > + > + TRACE("(%p %s %p)\n", pOuter, debugstr_guid(riid), ppv); > + > + if (!(ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)))) > + return E_OUTOFMEMORY; > + > + ret->IInternetExplorerManager_iface.lpVtbl = &InternetExplorerManager_vtbl; > + return IInternetExplorerManager_QueryInterface(&ret->IInternetExplorerManager_iface, riid, ppv); > +} This leaks the object if QueryInterface fails. The usual way to handle is to set initial ref to 1 and release the object after QI() call. > +static void test_InternetExplorerManager(void) > +{ > + IUnknown *unk; > + ULONG ref; > + HRESULT hres; > + > + hres = CoCreateInstance(&CLSID_InternetExplorerManager, NULL, CLSCTX_LOCAL_SERVER, > + &IID_IInternetExplorerManager, (void**)&unk); > + ok(hres == S_OK || hres == REGDB_E_CLASSNOTREG, "Could not create InternetExplorerManager instance: %08x\n", hres); Use broken() for failure with older versions. > + > + if(hres != S_OK) > + return; This could use a win_skip(). Thanks, Jacek

1 0

Re: [PATCH v3 4/5] ieframe: Parse multiple command-line arguments.
by Jacek Caban Aug. 15, 2017

Aug. 15, 2017

Hi Zebediah, On 10.08.2017 20:52, Zebediah Figura wrote: > + if (!strncmpiW(cmdline, embeddingW, length)) > + embedding = TRUE; > + else if (!strncmpiW(cmdline, nohomeW, length)) > + nohome = TRUE; > + else if (*cmdline == '-') > + FIXME("ignoring unknown option %s\n", debugstr_wn(cmdline, length)); It's probably not very important, but with native IE unknown options seem to be treated as URLs (iexplore.exe -test tries to open "-test" URL). Thanks, Jacek

1 0

Re: [PATCH 2/3] include: Add CryptProtectMemory and CryptUnprotectMemory.
by Michael Stefaniuc Aug. 15, 2017

Aug. 15, 2017

On 08/15/2017 05:00 PM, Alex Henrie wrote: > Needed for PuTTY to compile with Winelib. > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > include/wincrypt.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/include/wincrypt.h b/include/wincrypt.h > index abbe99f245..058798c4f4 100644 > --- a/include/wincrypt.h > +++ b/include/wincrypt.h > @@ -4428,6 +4428,9 @@ BOOL WINAPI CryptUnprotectData( DATA_BLOB* pDataIn, LPWSTR* ppszDataDescr, > DATA_BLOB* pOptionalEntropy, PVOID pvReserved, > CRYPTPROTECT_PROMPTSTRUCT* pPromptStruct, DWORD dwFlags, DATA_BLOB* pDataOut ); > > +BOOL WINAPI CryptProtectMemory(void *pData, DWORD cbData, DWORD dwFlags); > +BOOL WINAPI CryptUnrotectMemory(void *pData, DWORD cbData, DWORD dwFlags); Isn't that missing a p^ ? bye michael > + > DWORD WINAPI CertGetNameStringA(PCCERT_CONTEXT pCertContext, DWORD dwType, > DWORD dwFlags, void *pvTypePara, LPSTR pszNameString, DWORD cchNameString); > DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, >

2 1

Re: [3/8] bcrypt: Add a stub implementation of BCryptEncrypt.
by Jacek Caban Aug. 15, 2017

Aug. 15, 2017

Hi Hans, On 15.08.2017 14:51, Hans Leidekker wrote: > diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c > index 3d70c15e7c..ccab676c1a 100644 > --- a/dlls/bcrypt/bcrypt_main.c > +++ b/dlls/bcrypt/bcrypt_main.c > @@ -515,7 +515,7 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu > NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) > { > FIXME( "%p, %s, %p, %u, %08x\n", handle, debugstr_w(prop), value, size, flags ); > - return STATUS_SUCCESS; > + return STATUS_NOT_IMPLEMENTED; I think this part was meant to be in patch 2/8. Thanks, Jacek

1 0

Re: [PATCH] user32/combo: Set listview popup height correctly and add tests
by Marvin Aug. 14, 2017

Aug. 14, 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=32672 Your paranoid android. === wxppro (32 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 00000000 === w2003std (32 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 00000000 === wvistau64 (32 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 00000000 === w2008s64 (32 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 00000000 === w7u (32 bit combo) === combo.c:786: Test failed: Test 2, expected list height to be 16, got 0 combo.c:786: Test failed: Test 3, expected list height to be 16, got 18 combo.c:786: Test failed: Test 4, expected list height to be 32, got 18 combo.c:786: Test failed: Test 5, expected list height to be 32, got 36 combo.c:786: Test failed: Test 6, expected list height to be 32, got 36 combo.c:786: Test failed: Test 7, expected list height to be 32, got 36 combo.c:786: Test failed: Test 8, expected list height to be 32, got 36 combo.c:786: Test failed: Test 11, expected list height to be 16, got 0 combo.c:786: Test failed: Test 12, expected list height to be 16, got 18 combo.c:786: Test failed: Test 13, expected list height to be 32, got 18 combo.c:786: Test failed: Test 14, expected list height to be 48, got 36 combo.c:781: Test failed: Test 15, expected list height to be 48, got 54 combo.c:786: Test failed: Test 16, expected list height to be 64, got 54 combo.c:786: Test failed: Test 17, expected list height to be 64, got 72 combo.c:315: Test failed: Focus not on Main Window, instead on 00000000 === w7pro64 (32 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 00000000 === w8 (32 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 00000000 === w864 (32 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 00000000 === w1064 (32 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 00000000 === wvistau64 (64 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 0000000000000000 === w2008s64 (64 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 0000000000000000 === w7pro64 (64 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 0000000000000000 === w864 (64 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 0000000000000000 === w1064 (64 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 0000000000000000

2 1

Re: [1/3] shell32: Implement SHCreateItemFromRelativeName.
by Huw Davies Aug. 14, 2017

Aug. 14, 2017

On Sat, Aug 12, 2017 at 11:42:40PM +0800, Jactry Zeng wrote: > +HRESULT WINAPI SHCreateItemFromRelativeName(IShellItem *parent, PCWSTR name, IBindCtx *pbc, > + REFIID riid, void **ppv) > +{ > + LPITEMIDLIST pidl_folder = NULL, pidl = NULL; > + IShellFolder *desktop = NULL, *folder = NULL; > + HRESULT hr; > + > + TRACE("(%p, %p, %p, %s, %p)\n", parent, name, pbc, debugstr_guid(riid), ppv); Use debugstr_w() to trace 'name'. > + > + if(!ppv) > + return E_INVALIDARG; > + *ppv = NULL; > + if(!name) > + return E_INVALIDARG; > + > + hr = SHGetIDListFromObject((IUnknown*)parent, &pidl_folder); > + if(hr != S_OK) > + return hr; > + > + hr = SHGetDesktopFolder(&desktop); > + if(hr != S_OK) > + goto cleanup; > + > + if(!_ILIsDesktop(pidl_folder)) > + { > + hr = IShellFolder_BindToObject(desktop, pidl_folder, pbc, &IID_IShellFolder, > + (void**)&folder); You should pass a NULL IBindCtx here. pbc is associated with binding the name. > + if(hr != S_OK) > + goto cleanup; > + } > + > + hr = IShellFolder_ParseDisplayName(folder ? folder : desktop, NULL, pbc, (LPWSTR)name, > + NULL, &pidl, NULL); > + if(hr != S_OK) > + goto cleanup; > + hr = SHCreateItemFromIDList(pidl, riid, ppv); > + > diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c > index 9e7127dfea..cbab88035a 100644 > --- a/dlls/shell32/tests/shlfolder.c > +++ b/dlls/shell32/tests/shlfolder.c > @@ -2519,6 +2523,86 @@ static void test_SHCreateShellItem(void) > else > win_skip("No SHCreateItemFromIDList\n"); > > + /* SHCreateItemFromRelativeName */ > + if(pSHCreateItemFromRelativeName && pSHGetKnownFolderPath) > + { > + IShellItem *shellitem_desktop = NULL; > + WCHAR *desktop_path, *displayname; > + WCHAR testfile_path[MAX_PATH] = {0}; > + HANDLE file; > + LPITEMIDLIST pidl_desktop_testfile = NULL; > + int order; > + > + ret = pSHCreateShellItem(NULL, NULL, pidl_desktop, &shellitem_desktop); > + ok(ret == S_OK, "SHCreateShellItem failed: 0x%08x.\n", ret); > + > + shellitem = (void*)0xdeadbeef; > + ret = pSHCreateItemFromRelativeName(shellitem_desktop, NULL, NULL, &IID_IShellItem, > + (void**)&shellitem); > + ok(ret == E_INVALIDARG, "Expected 0x%08x but SHCreateItemFromRelativeName return: 0x%08x.\n", > + E_INVALIDARG, ret); > + ok(shellitem == NULL, "shellitem was %p.\n", shellitem); > + > + /* Test with a non-existent file */ > + shellitem = (void*)0xdeadbeef; > + ret = pSHCreateItemFromRelativeName(shellitem_desktop, testfileW, NULL, &IID_IShellItem, > + (void**)&shellitem); > + ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), > + "Expected 0x%08x but SHCreateItemFromRelativeName return: 0x%08x.\n", > + HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), ret); > + ok(shellitem == NULL, "shellitem was %p.\n", shellitem); > + > + /* Create a file for testing in desktop folder */ > + pSHGetKnownFolderPath(&FOLDERID_Desktop, 0, NULL, &desktop_path); > + lstrcatW(testfile_path, desktop_path); > + myPathAddBackslashW(testfile_path); > + lstrcatW(testfile_path, testfileW); > + file = CreateFileW(testfile_path, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); > + ok(file != INVALID_HANDLE_VALUE, "CreateFileW failed! Last error: 0x%08x.\n", GetLastError()); > + CloseHandle(file); > + > + shellitem = (void*)0xdeadbeef; > + ret = pSHCreateItemFromRelativeName(shellitem_desktop, testfileW, NULL, &IID_IShellItem, > + (void**)&shellitem); > + ok(ret == S_OK, "SHCreateItemFromRelativeName failed: 0x%08x.\n", ret); > + ok(shellitem != NULL, "shellitem was %p.\n", shellitem); > + if(SUCCEEDED(ret)) > + { > + ret = IShellItem_GetDisplayName(shellitem, 0, &displayname); > + ok(ret == S_OK, "IShellItem_GetDisplayName failed: 0x%08x.\n", ret); > + ok(!lstrcmpW(displayname, testfileW), "got wrong display name: %s.\n", wine_dbgstr_w(displayname)); > + > + shellitem2 = (void*)0xdeadbeef; > + ret = pSHCreateItemFromRelativeName(shellitem_desktop, testfileW, NULL, &IID_IShellItem, > + (void**)&shellitem2); > + ok(ret == S_OK, "SHCreateItemFromRelativeName failed: 0x%08x.\n", 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); > + > + shellitem2 = (void*)0xdeadbeef; > + ret = IShellFolder_ParseDisplayName(desktopfolder, NULL, NULL, testfileW, NULL, > + &pidl_desktop_testfile, NULL); > + ok(ret == S_OK, "ParseDisplayName failed 0x%08x.\n", ret); > + ret = pSHCreateItemFromIDList(pidl_desktop_testfile, &IID_IShellItem, (void**)&shellitem2); > + ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); > + ok(ret == S_OK, "IShellItem_Compare fail: 0x%08x.\n", ret); > + ok(!order, "order got wrong value: %d.\n", order); > + pILFree(pidl_desktop_testfile); > + IShellItem_Release(shellitem2); > + > + IShellItem_Release(shellitem); > + } > + > + DeleteFileW(testfile_path); > + CoTaskMemFree(desktop_path); > + CoTaskMemFree(displayname); dipslayname is uninitialized if the 'if' block isn't executed. Either move this inside the 'if' block, or just get rid of the 'if' condition. We expect the condition to succeed in all cases anyway. Huw.

2 1

Re: [2/3 v4] shell32: Implement SHCreateItemInKnownFolder.
by Huw Davies Aug. 14, 2017

Aug. 14, 2017

On Sat, Aug 12, 2017 at 11:42:43PM +0800, Jactry Zeng wrote: > Superseded patch 136380. > > ChangLog: > v4: > - Using SHCreateItemFromRelativeName() for implementing > SHCreateItemInKnownFolder(); > - Fix a logic error in tests. > v3: > - Load SHGetKnownFolderPath() dynamically. > v2: > - Using SHGetKnownFolderIDList() instead of SHGetKnownFolderPath() and > IShellFolder_ParseDisplayName(); > - Add more tests. > > Signed-off-by: Jactry Zeng <jzen g(a)codeweavers.com> > --- > dlls/shell32/shell32.spec | 1 + > dlls/shell32/shellitem.c | 35 +++++++++++++ > dlls/shell32/tests/shlfolder.c | 111 > +++++++++++++++++++++++++++++++++++++++++ > include/shobjidl.idl | 1 + > 4 files changed, 148 insertions(+) > This and patch 3/3 look good to me, so just fix up 1/3 and resend the series. Huw.

1 0

Re: [PATCH] mfplat: Add MFTEnumEx stub.
by Alistair Leslie-Hughes Aug. 14, 2017

Aug. 14, 2017

Hi Andrey, On 14/08/17 19:59, Andrey Gusev wrote: > Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> > --- > + * MFTEnumEx (mfplat.@) > + */ > +HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, > + const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, > + UINT32 *pcount) > +{ > + FIXME("(%s, %x, %p, %p, %p, %p): stub\n", debugstr_guid(&category), flags, input_type, > + output_type, activate, pcount); > + return S_OK; > +} If you must return S_OK, please set pcount to 0. (maybe rename pcount to count at the same time). Alistair.

1 0

Re: [PATCH] wined3d: Reduce timeout value to avoid GL_TIMEOUT_EXPIRED on macOS
by Henri Verbeet Aug. 12, 2017

Aug. 12, 2017

On 12 August 2017 at 11:06, <nneonneo(a)gmail.com> wrote: > - /* Apple seems to be into arbitrary limits, and timeouts larger than > - * 0xfffffffffffffbff immediately return GL_TIMEOUT_EXPIRED. We don't > - * really care and can live with waiting a few μs less. (OS X 10.7.4). */ > + /* Timeouts near 0xffffffffffffffff may immediately return GL_TIMEOUT_EXPIRED, > + * possibly because macOS internally adds some slop to the timer. To avoid this, > + * we use a large number that isn't near the point of overflow (macOS 10.12.5). > + */ > GLenum gl_ret = GL_EXTCALL(glClientWaitSync(fence->object.sync, > - GL_SYNC_FLUSH_COMMANDS_BIT, ~(GLuint64)0xffff)); > + GL_SYNC_FLUSH_COMMANDS_BIT, (GLuint64)((1ULL << 62ULL) - 0xffff))); Adjusting the workaround is probably fine, but ULL literals are not portable. Does something along the lines of "~(GLuint64)0 >> 1" work as well? I don't think we care about the low bits, but note that the patch as it is doesn't actually preserve them.

2 2

Re: [PATCH resend 1/2] krnl386.exe16: Use toupper() instead of RtlUpperChar().
by Alexandre Julliard Aug. 12, 2017

Aug. 12, 2017

Zebediah Figura <z.figura12(a)gmail.com> writes: > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/krnl386.exe16/ne_module.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) I don't think that's a good idea. Why do you need that? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH v3 2/5] ieproxy: Add stub DLL.
by Jacek Caban Aug. 11, 2017

Aug. 11, 2017

On 10.08.2017 20:52, Zebediah Figura wrote: > --- a/loader/wine.inf.in > +++ b/loader/wine.inf.in > @@ -2559,6 +2559,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" > 11,,msxml6.dll > 11,,shdocvw.dll > 16422,Internet Explorer,iexplore.exe > +16422,Internet Explorer,ieproxy.dll > 16422,Windows Media Player,wmplayer.exe > 16422,Windows NT\Accessories,wordpad.exe > 11,,* > @@ -2613,6 +2614,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" > 16410,Microsoft, > 16412,Microsoft, > 16422,Internet Explorer,iexplore.exe > +16422,Internet Explorer,ieproxy.dll Are you sure about it? It's in regular system32 (and syswow64) on my Win10. Jacek

2 2

Re: [PATCH v5 1/5] include: Add initial ieautomation.idl
by Jacek Caban Aug. 11, 2017

Aug. 11, 2017

On 11.08.2017 16:10, Zebediah Figura wrote: > +cpp_quote("#define INTERNETEXPLORERCONFIGURATION_HOST 0x00000001") This should be a value of INTERNETEXPLORERCONFIGURATION enum. Jacek

1 0

Re: [PATCH v4 1/5] include: Add initial ieautomation.idl
by Jacek Caban Aug. 11, 2017

Aug. 11, 2017

On 11.08.2017 15:54, Zebediah Figura wrote: > + */ > + > +import "unknwn.idl"; One more thing I didn't notice earlier: this should be ocidl.idl. Jacek

1 0

Re: [v3 5/5] kernel32/tests: Add tests for LoadLibrary with LIBRARY_SEARCH_* flags
by Carlos Palminha Aug. 11, 2017

Aug. 11, 2017

Hi, My patch with test is producing a strange result in Test Bot. I'm getting a ERROR_NOT_ENOUGH_MEMORY when calling LoadLibraryExA only in Vista and Win2008 64bit. Any hint? Regards, C.Palminha On 11-08-2017 11:39, Carlos Palminha wrote: > Test LIBRARY_SEARCH_* flags when loading libraries. > Uses helper from path.c to create the test dll file. > > Signed-off-by: Carlos Palminha <palminha(a)synopsys.com> > --- > v3: > - Improved check for Win2003 cases > > v2: > - Split the tests affecting different files > - Tests checks for Win2003 cases > > dlls/kernel32/tests/module.c | 132 ++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 131 insertions(+), 1 deletion(-) > > diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c > index bb22c24316c..96dd3277c1b 100644 > --- a/dlls/kernel32/tests/module.c > +++ b/dlls/kernel32/tests/module.c > @@ -407,6 +407,136 @@ static void testLoadLibraryEx(void) > FreeLibrary(hmodule); > } > > +/* use some functions and strcutures from loader.c */ > +extern DWORD create_test_dll( const IMAGE_DOS_HEADER *dos_header, UINT dos_size, > + const IMAGE_NT_HEADERS *nt_header, const char *dll_name ); > +extern const IMAGE_NT_HEADERS nt_header_template; > + > +static void testLoadLibraryExSearchFlags(void) > +{ > + HMODULE hmodule; > + char tmpPath[MAX_PATH]; > + char dllName[] = "testFlags.dll"; > + char tmpFullFile[MAX_PATH]; > + char sysFullFile[MAX_PATH]; > + IMAGE_DOS_HEADER dos_header; > + IMAGE_NT_HEADERS nt_header; > + ULONG file_size; > + char fullPath[MAX_PATH]; > + DWORD version; > + BOOL is_win2003 = FALSE; > + > + GetTempPathA(MAX_PATH, tmpPath); > + lstrcpyA(tmpFullFile, tmpPath); > + lstrcatA(tmpFullFile, dllName); > + > + /* check for required function */ > + if (!pSetDllDirectoryA) > + { > + win_skip("SetDllDirectoryA not available\n"); > + return; > + } > + > + /* check if we are in win2003... flags are not supported */ > + version = GetVersion(); > + if ((LOBYTE(LOWORD(version)) == 5) && (HIBYTE(LOWORD(version))==2)) > + is_win2003 = TRUE; > + > + /* try to load test dll from test path before creating it*/ > + SetLastError(0xdeadbeef); > + pSetDllDirectoryA(tmpPath); > + hmodule = LoadLibraryExA(dllName, NULL, LOAD_LIBRARY_SEARCH_USER_DIRS); > + ok (hmodule == NULL, "Test library %s should not be loaded from %s\n", dllName, tmpPath); > + ok( GetLastError() == ERROR_MOD_NOT_FOUND || GetLastError() == ERROR_DLL_NOT_FOUND || GetLastError() == ERROR_INVALID_PARAMETER, > + "Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x) or ERROR_INVALID_PARAMETER (win2003), got %d\n", GetLastError()); > + FreeLibrary(hmodule); > + pSetDllDirectoryA(NULL); > + > + /* create test library */ > + lstrcpyA(fullPath, tmpPath); > + lstrcatA(fullPath, dllName); > + > + dos_header.e_magic = IMAGE_DOS_SIGNATURE; > + dos_header.e_lfanew = sizeof(dos_header); > + > + nt_header = nt_header_template; > + > + nt_header.FileHeader.NumberOfSections = 1; > + nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); > + nt_header.OptionalHeader.SectionAlignment = 0x1000; > + nt_header.OptionalHeader.FileAlignment = 0x1000; > + nt_header.OptionalHeader.SizeOfImage = sizeof(dos_header) + sizeof(nt_header_template) + sizeof(IMAGE_SECTION_HEADER) + 0x1000; > + nt_header.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt_header_template) + sizeof(IMAGE_SECTION_HEADER); > + > + file_size = create_test_dll(&dos_header, sizeof(dos_header), &nt_header, fullPath); > + ok( file_size, "could not create '%s'\n",fullPath); > + > + /* try to load test dll without specifying the test path */ > + SetLastError(0xdeadbeef); > + pSetDllDirectoryA(NULL); > + hmodule = LoadLibraryExA(dllName, NULL, LOAD_LIBRARY_SEARCH_USER_DIRS); > + ok (hmodule == NULL, "Test library should not be loaded from 'NULL' path\n"); > + ok( GetLastError() == ERROR_MOD_NOT_FOUND || GetLastError() == ERROR_DLL_NOT_FOUND || GetLastError() == ERROR_INVALID_PARAMETER, > + "Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x) or ERROR_INVALID_PARAMETER (win2003), got %d\n", GetLastError()); > + FreeLibrary(hmodule); > + > + /* try to load test dll from test path */ > + SetLastError(0xdeadbeef); > + pSetDllDirectoryA(tmpPath); > + hmodule = LoadLibraryExA(dllName, NULL, LOAD_LIBRARY_SEARCH_USER_DIRS); > + if(is_win2003) > + ok (hmodule == NULL, "Test library should not be loaded from %s in Win2003 (flag not supported)\n", tmpPath); > + else > + ok (hmodule != NULL, "Could not load test library %s from %s\n", dllName, tmpPath); > + ok(GetLastError() == 0xdeadbeef || GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_INVALID_PARAMETER, > + "Expected 0xdeadbeef or ERROR_SUCCESS or ERROR_INVALID_PARAMETER (win2003), got %d\n", GetLastError()); > + FreeLibrary(hmodule); > + pSetDllDirectoryA(NULL); > + > + /* load non-existing test dll from system32 */ > + SetLastError(0xdeadbeef); > + hmodule = LoadLibraryExA(dllName, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32); > + ok(hmodule == NULL, "%s should not be loaded\n", dllName); > + ok( GetLastError() == ERROR_MOD_NOT_FOUND || GetLastError() == ERROR_DLL_NOT_FOUND || GetLastError() == ERROR_INVALID_PARAMETER, > + "Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x) or ERROR_INVALID_PARAMETER (win2003), got %d\n", GetLastError()); > + FreeLibrary(hmodule); > + > + /* move library from temp path to system32 and delete from old path */ > + GetWindowsDirectoryA(sysFullFile,MAX_PATH); > + lstrcatA(sysFullFile,"\\system32\\"); > + lstrcatA(sysFullFile, dllName); > + MoveFileA(tmpFullFile,sysFullFile); > + DeleteFileA(tmpFullFile); > + > + /* try to load dll using more than one flag */ > + pSetDllDirectoryA(tmpPath); > + SetLastError(0xdeadbeef); > + hmodule = LoadLibraryExA(dllName, NULL, LOAD_LIBRARY_SEARCH_USER_DIRS | LOAD_LIBRARY_SEARCH_SYSTEM32); > + if(is_win2003) > + ok (hmodule == NULL, "Test library should not be loaded from 'system32' in Win2003 (flag not supported)\n"); > + else > + ok (hmodule != NULL, "Library %s was expected to be loaded from 'system32'\n", dllName); > + ok(GetLastError() == 0xdeadbeef || GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_INVALID_PARAMETER, > + "Expected 0xdeadbeef or ERROR_SUCCESS or ERROR_INVALID_PARAMETER (win2003), got %d\n", GetLastError()); > + FreeLibrary(hmodule); > + pSetDllDirectoryA(NULL); > + > + /* try to load test dll from system32 */ > + SetLastError(0xdeadbeef); > + hmodule = LoadLibraryExA(dllName, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32); > + if(is_win2003) > + ok (hmodule == NULL, "Test library should not be loaded from 'system32' in Win2003 (flag not supported)\n"); > + else > + ok (hmodule != NULL, "Library %s was expected to be loaded from 'system32'\n", dllName); > + ok(GetLastError() == 0xdeadbeef || GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_INVALID_PARAMETER, > + "Expected 0xdeadbeef or ERROR_SUCCESS or ERROR_INVALID_PARAMETER (win2003), got %d\n", GetLastError()); > + FreeLibrary(hmodule); > + > + /* delete test dll from system32 directory */ > + DeleteFileA(sysFullFile); > + > +} > + > static void testGetDllDirectory(void) > { > CHAR bufferA[MAX_PATH]; > @@ -744,7 +874,6 @@ START_TEST(module) > WCHAR filenameW[MAX_PATH]; > > /* Test if we can use GetModuleFileNameW */ > - > SetLastError(0xdeadbeef); > GetModuleFileNameW(NULL, filenameW, MAX_PATH); > if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) > @@ -766,6 +895,7 @@ START_TEST(module) > testLoadLibraryA_Wrong(); > testGetProcAddress_Wrong(); > testLoadLibraryEx(); > + testLoadLibraryExSearchFlags(); > testGetModuleHandleEx(); > testK32GetModuleInformation(); > } >

1 0

Re: [PATCH v3 1/5] include: Add initial ieautomation.idl
by Jacek Caban Aug. 11, 2017

Aug. 11, 2017

On 10.08.2017 20:52, Zebediah Figura wrote: > + > +cpp_quote("DEFINE_GUID(CLSID_InternetExplorerManager, 0xdf4fcc34, 0x067a, 0x4e0a, 0x83,0x52, 0x4a,0x1a,0x50,0x95,0x34,0x6e);") Please use coclass, like in PSDK, instead. Jacek

1 0

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

Aug. 11, 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=32633 Your paranoid android. === wvistau64 (32 bit module) === module.c:479: Test failed: Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x) or ERROR_INVALID_PARAMETER (win2003), got 8 === w2008s64 (32 bit module) === module.c:479: Test failed: Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x) or ERROR_INVALID_PARAMETER (win2003), got 8 === wvistau64 (64 bit module) === module.c:479: Test failed: Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x) or ERROR_INVALID_PARAMETER (win2003), got 8 === w2008s64 (64 bit module) === module.c:479: Test failed: Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x) or ERROR_INVALID_PARAMETER (win2003), got 8

1 0

Re: [PATCH] comctl32/listview: Keep the active item selected after hwndEdit is destroyed
by Nikolay Sivov Aug. 11, 2017

Aug. 11, 2017

Could you describe how should I be testing this?

2 1

Re: [PATCH v2 3/5] ieframe: Add stub implementation of IInternetExplorerManager.
by Jacek Caban Aug. 10, 2017

Aug. 10, 2017

Hi Zebediah, On 08.08.2017 20:04, Zebediah Figura wrote: > HRESULT register_class_object(BOOL do_reg) > { > HRESULT hres; > > - static DWORD cookie; > + static DWORD ie_cookie, iem_cookie; > > if(do_reg) { > hres = CoRegisterClassObject(&CLSID_InternetExplorer, > (IUnknown*)&InternetExplorerFactory, CLSCTX_SERVER, > - REGCLS_MULTIPLEUSE|REGCLS_SUSPENDED, &cookie); > - if (FAILED(hres)) { > + REGCLS_MULTIPLEUSE, &ie_cookie); > + if (FAILED(hres)) > + ERR("failed to register object %08x\n", hres); > + hres = CoRegisterClassObject(&CLSID_InternetExplorerManager, > + (IUnknown*)&InternetExplorerManagerFactory, CLSCTX_SERVER, > + REGCLS_MULTIPLEUSE, &iem_cookie); > + if (FAILED(hres)) > ERR("failed to register object %08x\n", hres); > - return hres; > - } > - > - hres = CoResumeClassObjects(); > - if(SUCCEEDED(hres)) > - return hres; > - > - ERR("failed to resume object %08x\n", hres); > } > - > - return CoRevokeClassObject(cookie); > + else > + { > + hres = CoRevokeClassObject(ie_cookie); > + if (FAILED(hres)) > + ERR("failed to register object %08x\n", hres); > + hres = CoRevokeClassObject(iem_cookie); > + if (FAILED(hres)) > + ERR("failed to register object %08x\n", hres); > + } > + return hres; > } Are you sure that's how it's supposed to work? I didn't test it myself, but given how it's registered and documented, I'd expect that CLSID_InternetExplorerManager should live in a different process from CLSID_InternetExplorer. It should be easy to distinguish those processes with -startmanager command line argument. > +static HRESULT WINAPI InternetExplorerManager_CreateObject(IInternetExplorerManager *iface, DWORD config, LPCWSTR url, REFIID riid, void **ppv) > +{ > + FIXME("(%p)->(0x%x, %s, %s, %p) semi-stub\n", iface, config, debugstr_w(url), debugstr_guid(riid), ppv); > + > + return CoCreateInstance(&CLSID_InternetExplorer, NULL, CLSCTX_LOCAL_SERVER, riid, ppv); > +} Using CoCreateInstance is very questionable here (eg. due to the comment above). Also, a patch adding a stub should just return E_NOTIMPL. Implementation deserves a separated patch. I'd expect that it should just use internal ieframe functions to create a new IE instance. Also, I'd suggest to reorder patches to something like: 2, 4, 5, 1 (likely replaced by support for -startmanager command line argument), 3 and then a new patch implementing CreateObject. Thanks, Jacek

2 6

Re: [v3 PATCH 1/2] dwrite: Protect cached fontface list when accessed from multiple threads
by Sebastian Lackner Aug. 10, 2017

Aug. 10, 2017

On 10.08.2017 08:45, Nikolay Sivov wrote: > Based on patch by Anton Romanov <theli.ua(a)gmail.com> > > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > dlls/dwrite/dwrite_private.h | 6 ++++-- > dlls/dwrite/font.c | 24 ++++++++++++--------- > dlls/dwrite/main.c | 50 +++++++++++++++++++++++++++++++++----------- > 3 files changed, 56 insertions(+), 24 deletions(-) > Isn't it also necessary to protect factory_cache_fontface()? By the way: An alternative method to implement proper synchronization (which does not require locking critical sections before InterlockedDecrement) would be to do something like: In the destructor: --- snip --- if (!ref) { EnterCriticalSection(...); list_remove(...); LeaveCriticalSection(...); ... } --- snip --- And when querying cached font faces: --- snip --- EnterCriticalSection(...); LIST_FOR_EACH_ENTRY(...) { ... /* the following code could also be hidden in QueryInterface */ if (InterlockedIncrement( &obj->refcount ) == 1) { InterlockedDecrement( &obj->refcount ); continue; } /* return it */ } LeaveCriticalSection(...); --- snip --- This is also what is done in Wines threadpool implementation [1], and has the advantage that the CS is not needed for every Release, only when the object is really destroyed. But in the end it is a matter of taste, for rpcrt4 Jacek also picked the "hold CS during InterlockedDecrement" method. [1] https://source.winehq.org/git/wine.git/blob/HEAD:/dlls/ntdll/threadpool.c#l… Best regards, Sebastian

3 2

Re: [PATCH] gdiplus: Support GdipSetClipRegion in metafiles
by Vincent Povirk Aug. 10, 2017

Aug. 10, 2017

+ stat = GdipGetRegionData(region, (BYTE*)object_record + FIELD_OFFSET(EmfPlusObject, Header.Size), size, NULL); + object_record->Header.DataSize = object_record->Header.Size; + object_record->Header.Size = record_size; This is a little too clever. I'd rather have a solution similar to write_path_data.

1 0

Re: [v4 PATCH 1/2] dwrite: Protect cached fontface list when accessed from multiple threads
by Sebastian Lackner Aug. 10, 2017

Aug. 10, 2017

On 10.08.2017 15:41, Nikolay Sivov wrote: > @@ -861,6 +877,10 @@ HRESULT factory_get_cached_fontface(IDWriteFactory5 *iface, IDWriteFontFile * co > const void *cached_key; > IDWriteFontFile *file; > > + if (IDWriteFontFace4_AddRef(cached->fontface) == 1) > + continue; > + IDWriteFontFace4_Release(cached->fontface); This will not work as expected. The refcount also matters when the object is about to be destroyed. There could be multiple threads running factory_get_cached_fontface() before _Release() can finally remove the fontface from the list. Please note that always calling _Release() also wouldn't be correct because it would run the destructor twice. It is not really necessary to access the private structs from other parts of dwrite, but you should either: * change AddRef to use something like interlocked_dec_if_nonzero (see ntdll/sync.c) * implement the check in QueryInterface (manually run InterlockedDecrement to decrement the refcount without going through the destructor) There are probably also other ways, for example using a flag to make sure the destructor is not called twice. Best regards, Sebastian

1 0

Re: [v2 PATCH 2/2] dwrite: Added a helper to check for supported characters
by Dmitry Timoshkov Aug. 10, 2017

Aug. 10, 2017

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > - TRACE("(%p)->(0x%08x)\n", This, ch); > + TRACE("(%p)->(0x%#x)\n", This, ch); This will cause printing of the 0x prefix twice. Same applies to other places. -- Dmitry.

1 0

Re: wineandroid: Add suffix to lib directory and wine binary on 64-bit
by Alexandre Julliard Aug. 10, 2017

Aug. 10, 2017

André Hentschel <nerv(a)dawncrow.de> writes: > This fixes at least arm64-v8a builds, where you have lib64/libwine.so and bin/wine64 > > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > > This and "winebuild: Improved position independent code generation" enable Wine on ARM64 Android phones (e.g. most Android devices). > The check for 64 in the CPU_ABI can be discussed, but I think it's reliable and fast. > > dlls/wineandroid.drv/WineActivity.java | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) We already prefix with the ABI, so I think plain "lib" is better. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH v2 2/5] include: Add initial ieautomation.idl
by Nikolay Sivov Aug. 9, 2017

Aug. 9, 2017

On 08.08.2017 21:04, Zebediah Figura wrote: > +[ > + object, > + uuid(acc84351-04ff-44f9-b23f-655ed168c6d5), > + oleautomation > +] > +interface IInternetExplorerManager : IUnknown > +{ > + HRESULT CreateObject([in] DWORD config, [in, unique] LPCWSTR url, [in] REFIID riid, [out, iid_is(riid)] void **ppv); > +} This is not how it's defined in SDK - oleautomation is not used there and "url" argument has different attributes.

3 2