January 2014 - Wine-commits

Bruno Jesus : ws2_32/tests: Add some WSALookupService[Begin|Next|End] tests .
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: b461fa4468168b973fc446ccd014e62aef67459a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b461fa4468168b973fc446ccd… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 4 03:25:43 2014 -0200 ws2_32/tests: Add some WSALookupService[Begin|Next|End] tests. --- dlls/ws2_32/tests/sock.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 168 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3c09974..54b0840 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -67,6 +67,9 @@ static int (WINAPI *pgetaddrinfo)(LPCSTR,LPCSTR,const struct addrinfo *,struct static void (WINAPI *pFreeAddrInfoW)(PADDRINFOW); static int (WINAPI *pGetAddrInfoW)(LPCWSTR,LPCWSTR,const ADDRINFOW *,PADDRINFOW *); static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG); +static int (WINAPI *pWSALookupServiceBeginW)(LPWSAQUERYSETW,DWORD,LPHANDLE); +static int (WINAPI *pWSALookupServiceEnd)(HANDLE); +static int (WINAPI *pWSALookupServiceNextW)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW); /**************** Structs and typedefs ***************/ @@ -1047,6 +1050,9 @@ static void Init (void) pFreeAddrInfoW = (void *)GetProcAddress(hws2_32, "FreeAddrInfoW"); pGetAddrInfoW = (void *)GetProcAddress(hws2_32, "GetAddrInfoW"); pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); + pWSALookupServiceBeginW = (void *)GetProcAddress(hws2_32, "WSALookupServiceBeginW"); + pWSALookupServiceEnd = (void *)GetProcAddress(hws2_32, "WSALookupServiceEnd"); + pWSALookupServiceNextW = (void *)GetProcAddress(hws2_32, "WSALookupServiceNextW"); ok ( WSAStartup ( ver, &data ) == 0, "WSAStartup failed\n" ); tls = TlsAlloc(); @@ -7286,6 +7292,166 @@ static void test_inet_ntoa(void) CloseHandle(thread); } +static void test_WSALookupService(void) +{ + char buffer[4096], strbuff[128]; + WSAQUERYSETW *qs = NULL; + HANDLE hnd; + PNLA_BLOB netdata; + int ret; + DWORD error, offset, bsize; + + if (!pWSALookupServiceBeginW || !pWSALookupServiceEnd || !pWSALookupServiceNextW) + { + win_skip("WSALookupServiceBeginW or WSALookupServiceEnd or WSALookupServiceNextW not found"); + return; + } + + qs = (WSAQUERYSETW *)buffer; + memset(qs, 0, sizeof(*qs)); + + /* invalid parameter tests */ + ret = pWSALookupServiceBeginW(NULL, 0, &hnd); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); +todo_wine + ok(error == WSAEFAULT, "expected 10014, got %d\n", error); + + ret = pWSALookupServiceBeginW(qs, 0, NULL); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); +todo_wine + ok(error == WSAEFAULT, "expected 10014, got %d\n", error); + + ret = pWSALookupServiceBeginW(qs, 0, &hnd); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); +todo_wine + ok(error == WSAEINVAL + || broken(error == ERROR_INVALID_PARAMETER) /* <= XP */ + || broken(error == WSASERVICE_NOT_FOUND) /* == 2000 */, + "expected 10022, got %d\n", error); + + ret = pWSALookupServiceEnd(NULL); + error = WSAGetLastError(); +todo_wine + ok(ret == SOCKET_ERROR, "WSALookupServiceEnd should have failed\n"); +todo_wine + ok(error == ERROR_INVALID_HANDLE, "expected 6, got %d\n", error); + + /* standard network list query */ + qs->dwSize = sizeof(*qs); + hnd = (HANDLE)0xdeadbeef; + ret = pWSALookupServiceBeginW(qs, LUP_RETURN_ALL | LUP_DEEP, &hnd); + error = WSAGetLastError(); + if(ret && error == ERROR_INVALID_PARAMETER) + { + win_skip("the current WSALookupServiceBeginW test is not supported in win 2000\n"); + return; + } + +todo_wine + ok(!ret, "WSALookupServiceBeginW failed unexpectedly with error %d\n", error); +todo_wine + ok(hnd != (HANDLE)0xdeadbeef, "Handle was not filled\n"); + + offset = 0; + do + { + memset(qs, 0, sizeof(*qs)); + bsize = sizeof(buffer); + + if (pWSALookupServiceNextW(hnd, 0, &bsize, qs) == SOCKET_ERROR) + { + error = WSAGetLastError(); + if (error == WSA_E_NO_MORE) break; + ok(0, "Error %d happened while listing services\n", error); + break; + } + + WideCharToMultiByte(CP_ACP, 0, qs->lpszServiceInstanceName, -1, + strbuff, sizeof(strbuff), NULL, NULL); + trace("Network Name: %s\n", strbuff); + + /* network data is written in the blob field */ + if (qs->lpBlob) + { + /* each network may have multiple NLA_BLOB information structures */ + do + { + netdata = (PNLA_BLOB) &qs->lpBlob->pBlobData[offset]; + switch (netdata->header.type) + { + case NLA_RAW_DATA: + trace("\tNLA Data Type: NLA_RAW_DATA\n"); + break; + case NLA_INTERFACE: + trace("\tNLA Data Type: NLA_INTERFACE\n"); + trace("\t\tType: %d\n", netdata->data.interfaceData.dwType); + trace("\t\tSpeed: %d\n", netdata->data.interfaceData.dwSpeed); + trace("\t\tAdapter Name: %s\n", netdata->data.interfaceData.adapterName); + break; + case NLA_802_1X_LOCATION: + trace("\tNLA Data Type: NLA_802_1X_LOCATION\n"); + trace("\t\tInformation: %s\n", netdata->data.locationData.information); + break; + case NLA_CONNECTIVITY: + switch (netdata->data.connectivity.type) + { + case NLA_NETWORK_AD_HOC: + trace("\t\tNetwork Type: AD HOC\n"); + break; + case NLA_NETWORK_MANAGED: + trace("\t\tNetwork Type: Managed\n"); + break; + case NLA_NETWORK_UNMANAGED: + trace("\t\tNetwork Type: Unmanaged\n"); + break; + case NLA_NETWORK_UNKNOWN: + trace("\t\tNetwork Type: Unknown\n"); + } + switch (netdata->data.connectivity.internet) + { + case NLA_INTERNET_NO: + trace("\t\tInternet connectivity: No\n"); + break; + case NLA_INTERNET_YES: + trace("\t\tInternet connectivity: Yes\n"); + break; + case NLA_INTERNET_UNKNOWN: + trace("\t\tInternet connectivity: Unknown\n"); + break; + } + break; + case NLA_ICS: + trace("\tNLA Data Type: NLA_ICS\n"); + trace("\t\tSpeed: %d\n", + netdata->data.ICS.remote.speed); + trace("\t\tType: %d\n", + netdata->data.ICS.remote.type); + trace("\t\tState: %d\n", + netdata->data.ICS.remote.state); + WideCharToMultiByte(CP_ACP, 0, netdata->data.ICS.remote.machineName, -1, + strbuff, sizeof(strbuff), NULL, NULL); + trace("\t\tMachine Name: %s\n", strbuff); + WideCharToMultiByte(CP_ACP, 0, netdata->data.ICS.remote.sharedAdapterName, -1, + strbuff, sizeof(strbuff), NULL, NULL); + trace("\t\tShared Adapter Name: %s\n", strbuff); + break; + default: + trace("\tNLA Data Type: Unknown\n"); + break; + } + } + while (offset); + } + } + while (1); + + ret = pWSALookupServiceEnd(hnd); + ok(!ret, "WSALookupServiceEnd failed unexpectedly\n"); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -7351,6 +7517,8 @@ START_TEST( sock ) test_sioRoutingInterfaceQuery(); + test_WSALookupService(); + test_WSAAsyncGetServByPort(); test_WSAAsyncGetServByName();

1 0

Bruno Jesus : ws2_32: Fix FreeBSD compiling issue on ipx address structure.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 281f69bccfaa1c8c0678f50c8db7ee149f51a117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=281f69bccfaa1c8c0678f50c8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jan 5 16:40:32 2014 -0200 ws2_32: Fix FreeBSD compiling issue on ipx address structure. --- dlls/ws2_32/socket.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0391554..12838da 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1473,7 +1473,9 @@ static BOOL is_sockaddr_bound(const struct sockaddr *uaddr, int uaddrlen) { static const struct sockaddr_ipx emptyAddr; struct sockaddr_ipx *ipx = (struct sockaddr_ipx*) uaddr; - return ipx->sipx_port || ipx->sipx_network || memcmp(&ipx->sipx_node, &emptyAddr.sipx_node, sizeof(emptyAddr.sipx_node)); + return ipx->sipx_port + || memcmp(&ipx->sipx_network, &emptyAddr.sipx_network, sizeof(emptyAddr.sipx_network)) + || memcmp(&ipx->sipx_node, &emptyAddr.sipx_node, sizeof(emptyAddr.sipx_node)); } #endif case AF_INET6:

1 0

Nikolay Sivov : scrrun: Implement Next() for folder collection.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: b99b69aac228a48bf1432a9409d0adbb620cba6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b99b69aac228a48bf1432a940… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 6 01:22:08 2014 +0400 scrrun: Implement Next() for folder collection. --- dlls/scrrun/filesystem.c | 101 ++++++++++++++++++++++++++++++++++++++-- dlls/scrrun/tests/filesystem.c | 16 ++++++- 2 files changed, 112 insertions(+), 5 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index fa53950..81d6a07 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(scrrun); +static const WCHAR bsW[] = {'\\',0}; + struct enumdata { union { @@ -125,6 +127,31 @@ static inline HRESULT create_error(DWORD err) } } +static HRESULT create_folder(const WCHAR*, IFolder**); + +static inline BOOL is_dir_data(const WIN32_FIND_DATAW *data) +{ + static const WCHAR dotdotW[] = {'.','.',0}; + static const WCHAR dotW[] = {'.',0}; + + return (data->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && + strcmpW(data->cFileName, dotdotW) && + strcmpW(data->cFileName, dotW); +} + +static BSTR get_full_path(BSTR path, const WIN32_FIND_DATAW *data) +{ + int len = SysStringLen(path); + WCHAR buffW[MAX_PATH]; + + strcpyW(buffW, path); + if (path[len-1] != '\\') + strcatW(buffW, bsW); + strcatW(buffW, data->cFileName); + + return SysAllocString(buffW); +} + static BOOL textstream_check_iomode(struct textstream *This, enum iotype type) { if (type == IORead) @@ -421,8 +448,75 @@ static ULONG WINAPI foldercoll_enumvariant_Release(IEnumVARIANT *iface) static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *var, ULONG *fetched) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%d %p %p): stub\n", This, celt, var, fetched); - return E_NOTIMPL; + HANDLE handle = This->data.u.foldercoll.find; + WIN32_FIND_DATAW data; + ULONG count = 0; + + TRACE("(%p)->(%d %p %p)\n", This, celt, var, fetched); + + if (fetched) + *fetched = 0; + + if (!handle) + { + static const WCHAR allW[] = {'*',0}; + WCHAR pathW[MAX_PATH]; + BSTR parent = This->data.u.foldercoll.path; + int len; + + strcpyW(pathW, parent); + len = SysStringLen(parent); + if (parent[len-1] != '\\') + strcatW(pathW, bsW); + strcatW(pathW, allW); + handle = FindFirstFileW(pathW, &data); + if (handle == INVALID_HANDLE_VALUE) + return S_FALSE; + + /* find first dir */ + while (1) + { + if (is_dir_data(&data)) + break; + else + if (!FindNextFileW(handle, &data)) + { + FindClose(handle); + return S_FALSE; + } + } + + This->data.u.foldercoll.find = handle; + } + + do + { + if (count >= celt) break; + + if (is_dir_data(&data)) + { + IFolder *folder; + HRESULT hr; + BSTR str; + + str = get_full_path(This->data.u.foldercoll.path, &data); + hr = create_folder(str, &folder); + SysFreeString(str); + if (FAILED(hr)) return hr; + + V_VT(&var[count]) = VT_DISPATCH; + V_DISPATCH(&var[count]) = (IDispatch*)folder; + count++; + } + } while (FindNextFileW(handle, &data)); + + if (count < celt) + return S_FALSE; + + if (fetched) + *fetched = count; + + return S_OK; } static HRESULT WINAPI foldercoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) @@ -972,7 +1066,7 @@ static const IFolderVtbl foldervtbl = { folder_CreateTextFile }; -static HRESULT create_folder(BSTR path, IFolder **folder) +HRESULT create_folder(const WCHAR *path, IFolder **folder) { struct folder *This; @@ -1466,7 +1560,6 @@ static HRESULT WINAPI filesys_BuildPath(IFileSystem3 *iface, BSTR Path, } else if (Path[path_len-1] != '\\' && Name[0] != '\\') { - static const WCHAR bsW[] = {'\\',0}; ret = SysAllocStringLen(NULL, path_len + name_len + 1); if (ret) { diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index be5131c..6d1b913 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -794,6 +794,8 @@ static void test_FolderCollection(void) LONG count, count2, ref, ref2; IUnknown *unk, *unk2; IFolder *folder; + ULONG fetched; + VARIANT var; HRESULT hr; BSTR str; @@ -813,6 +815,7 @@ static void test_FolderCollection(void) hr = IFolder_get_SubFolders(folder, &folders); ok(hr == S_OK, "got 0x%08x\n", hr); + IFolder_Release(folder); count = 0; hr = IFolderCollection_get_Count(folders, &count); @@ -870,6 +873,18 @@ if (hr == S_OK) { hr = IEnumVARIANT_Reset(enumvar); ok(hr == S_OK, "got 0x%08x\n", hr); + VariantInit(&var); + fetched = 0; + hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fetched == 1, "got %d\n", fetched); + ok(V_VT(&var) == VT_DISPATCH, "got type %d\n", V_VT(&var)); + + hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IFolder, (void**)&folder); + ok(hr == S_OK, "got 0x%08x\n", hr); + IFolder_Release(folder); + VariantClear(&var); + IEnumVARIANT_Release(enumvar); IUnknown_Release(unk); @@ -877,7 +892,6 @@ if (hr == S_OK) { RemoveDirectoryW(path2W); IFolderCollection_Release(folders); - IFolder_Release(folder); } START_TEST(filesystem)

1 0

Nikolay Sivov : scrrun: Implement Name() property for Folder.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 42d2b51992fe3644c1705fc0e054928e8da9a17b URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d2b51992fe3644c1705fc0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 6 01:22:32 2014 +0400 scrrun: Implement Name() property for Folder. --- dlls/scrrun/filesystem.c | 24 ++++++++++++++++++++++-- dlls/scrrun/tests/filesystem.c | 6 ++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 81d6a07..91a2795 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -892,8 +892,26 @@ static HRESULT WINAPI folder_get_Path(IFolder *iface, BSTR *path) static HRESULT WINAPI folder_get_Name(IFolder *iface, BSTR *name) { struct folder *This = impl_from_IFolder(iface); - FIXME("(%p)->(%p): stub\n", This, name); - return E_NOTIMPL; + WCHAR *ptr; + + TRACE("(%p)->(%p)\n", This, name); + + if(!name) + return E_POINTER; + + *name = NULL; + + ptr = strrchrW(This->path, '\\'); + if (ptr) + { + *name = SysAllocString(ptr+1); + TRACE("%s\n", debugstr_w(*name)); + if (!*name) return E_OUTOFMEMORY; + } + else + return E_FAIL; + + return S_OK; } static HRESULT WINAPI folder_put_Name(IFolder *iface, BSTR name) @@ -1072,6 +1090,8 @@ HRESULT create_folder(const WCHAR *path, IFolder **folder) *folder = NULL; + TRACE("%s\n", debugstr_w(path)); + This = heap_alloc(sizeof(struct folder)); if (!This) return E_OUTOFMEMORY; diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 6d1b913..9df619f 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -882,6 +882,12 @@ if (hr == S_OK) { hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IFolder, (void**)&folder); ok(hr == S_OK, "got 0x%08x\n", hr); + + str = NULL; + hr = IFolder_get_Name(folder, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + IFolder_Release(folder); VariantClear(&var);

1 0

Nikolay Sivov : scrrun: Added IFileCollection stub.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 07ded6bb36221c48fbdd67a935555fbef103f6c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ded6bb36221c48fbdd67a93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 6 01:23:03 2014 +0400 scrrun: Added IFileCollection stub. --- dlls/scrrun/filesystem.c | 169 +++++++++++++++++++++++++++++++++++++++- dlls/scrrun/scrrun.c | 3 +- dlls/scrrun/scrrun_private.h | 1 + dlls/scrrun/tests/filesystem.c | 26 ++++++ 4 files changed, 196 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 91a2795..c61020d 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -63,6 +63,11 @@ struct foldercollection { BSTR path; }; +struct filecollection { + IFileCollection IFileCollection_iface; + LONG ref; +}; + struct folder { IFolder IFolder_iface; LONG ref; @@ -108,6 +113,11 @@ static inline struct foldercollection *impl_from_IFolderCollection(IFolderCollec return CONTAINING_RECORD(iface, struct foldercollection, IFolderCollection_iface); } +static inline struct filecollection *impl_from_IFileCollection(IFileCollection *iface) +{ + return CONTAINING_RECORD(iface, struct filecollection, IFileCollection_iface); +} + static inline struct enumvariant *impl_from_IEnumVARIANT(IEnumVARIANT *iface) { return CONTAINING_RECORD(iface, struct enumvariant, IEnumVARIANT_iface); @@ -779,6 +789,156 @@ static HRESULT create_foldercoll(BSTR path, IFolderCollection **folders) return S_OK; } +static HRESULT WINAPI filecoll_QueryInterface(IFileCollection *iface, REFIID riid, void **obj) +{ + struct filecollection *This = impl_from_IFileCollection(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + *obj = NULL; + + if (IsEqualIID( riid, &IID_IFileCollection ) || + IsEqualIID( riid, &IID_IDispatch ) || + IsEqualIID( riid, &IID_IUnknown )) + { + *obj = iface; + IFileCollection_AddRef(iface); + } + else + return E_NOINTERFACE; + + return S_OK; +} + +static ULONG WINAPI filecoll_AddRef(IFileCollection *iface) +{ + struct filecollection *This = impl_from_IFileCollection(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI filecoll_Release(IFileCollection *iface) +{ + struct filecollection *This = impl_from_IFileCollection(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI filecoll_GetTypeInfoCount(IFileCollection *iface, UINT *pctinfo) +{ + struct filecollection *This = impl_from_IFileCollection(iface); + TRACE("(%p)->(%p)\n", This, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI filecoll_GetTypeInfo(IFileCollection *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + struct filecollection *This = impl_from_IFileCollection(iface); + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo(IFileCollection_tid, ppTInfo); +} + +static HRESULT WINAPI filecoll_GetIDsOfNames(IFileCollection *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + struct filecollection *This = impl_from_IFileCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IFileCollection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI filecoll_Invoke(IFileCollection *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, + DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + struct filecollection *This = impl_from_IFileCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IFileCollection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI filecoll_get_Item(IFileCollection *iface, VARIANT Key, IFile **file) +{ + struct filecollection *This = impl_from_IFileCollection(iface); + FIXME("(%p)->(%p)\n", This, file); + return E_NOTIMPL; +} + +static HRESULT WINAPI filecoll_get__NewEnum(IFileCollection *iface, IUnknown **ppenum) +{ + struct filecollection *This = impl_from_IFileCollection(iface); + FIXME("(%p)->(%p)\n", This, ppenum); + return E_NOTIMPL; +} + +static HRESULT WINAPI filecoll_get_Count(IFileCollection *iface, LONG *count) +{ + struct filecollection *This = impl_from_IFileCollection(iface); + FIXME("(%p)->(%p)\n", This, count); + return E_NOTIMPL; +} + +static const IFileCollectionVtbl filecollectionvtbl = { + filecoll_QueryInterface, + filecoll_AddRef, + filecoll_Release, + filecoll_GetTypeInfoCount, + filecoll_GetTypeInfo, + filecoll_GetIDsOfNames, + filecoll_Invoke, + filecoll_get_Item, + filecoll_get__NewEnum, + filecoll_get_Count +}; + +static HRESULT create_filecoll(IFileCollection **files) +{ + struct filecollection *This; + + *files = NULL; + + This = heap_alloc(sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + + This->IFileCollection_iface.lpVtbl = &filecollectionvtbl; + This->ref = 1; + + *files = &This->IFileCollection_iface; + return S_OK; +} + static HRESULT WINAPI folder_QueryInterface(IFolder *iface, REFIID riid, void **obj) { struct folder *This = impl_from_IFolder(iface); @@ -1041,8 +1201,13 @@ static HRESULT WINAPI folder_get_SubFolders(IFolder *iface, IFolderCollection ** static HRESULT WINAPI folder_get_Files(IFolder *iface, IFileCollection **files) { struct folder *This = impl_from_IFolder(iface); - FIXME("(%p)->(%p): stub\n", This, files); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, files); + + if(!files) + return E_POINTER; + + return create_filecoll(files); } static HRESULT WINAPI folder_CreateTextFile(IFolder *iface, BSTR filename, VARIANT_BOOL overwrite, diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index 761e2d6..9c7c6dc 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -107,7 +107,8 @@ static REFIID tid_ids[] = { &IID_IFolder, &IID_IFolderCollection, &IID_ITextStream, - &IID_IFile + &IID_IFile, + &IID_IFileCollection }; static HRESULT load_typelib(void) diff --git a/dlls/scrrun/scrrun_private.h b/dlls/scrrun/scrrun_private.h index 2c6aba5..3ffde50 100644 --- a/dlls/scrrun/scrrun_private.h +++ b/dlls/scrrun/scrrun_private.h @@ -30,6 +30,7 @@ typedef enum tid_t IFolderCollection_tid, ITextStream_tid, IFile_tid, + IFileCollection_tid, LAST_tid } tid_t; diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 9df619f..00d7686 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -900,6 +900,31 @@ if (hr == S_OK) { IFolderCollection_Release(folders); } +static void test_FileCollection(void) +{ + IFileCollection *files; + WCHAR buffW[MAX_PATH]; + IFolder *folder; + HRESULT hr; + BSTR str; + + GetWindowsDirectoryW(buffW, MAX_PATH); + + str = SysAllocString(buffW); + hr = IFileSystem3_GetFolder(fs3, str, &folder); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + hr = IFolder_get_Files(folder, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IFolder_get_Files(folder, &files); + ok(hr == S_OK, "got 0x%08x\n", hr); + IFileCollection_Release(files); + + IFolder_Release(folder); +} + START_TEST(filesystem) { HRESULT hr; @@ -926,6 +951,7 @@ START_TEST(filesystem) test_BuildPath(); test_GetFolder(); test_FolderCollection(); + test_FileCollection(); IFileSystem3_Release(fs3);

1 0

Nikolay Sivov : dwrite: Implement ConvertFontFaceToLOGFONT().
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 5e4d5ebde73db6340986abdf3d13b6f7844e76d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e4d5ebde73db6340986abdf3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 6 01:24:17 2014 +0400 dwrite: Implement ConvertFontFaceToLOGFONT(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 11 ++++++++ dlls/dwrite/gdiinterop.c | 6 ++-- dlls/dwrite/tests/font.c | 53 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 0c2698e..5450732 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -72,6 +72,7 @@ static inline LPWSTR heap_strdupnW(const WCHAR *str, UINT32 len) } extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; +extern HRESULT convert_fontface_to_logfont(IDWriteFontFace*, LOGFONTW*) DECLSPEC_HIDDEN; extern HRESULT create_textformat(const WCHAR*,IDWriteFontCollection*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,IDWriteTextLayout**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ec18312..2564d67 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -396,6 +396,8 @@ static HRESULT create_fontface(struct dwrite_font *font, IDWriteFontFace **face) memset(&This->logfont, 0, sizeof(This->logfont)); This->logfont.lfItalic = font->style == DWRITE_FONT_STYLE_ITALIC; + /* weight values from DWRITE_FONT_WEIGHT match values used for LOGFONT */ + This->logfont.lfWeight = font->weight; strcpyW(This->logfont.lfFaceName, font->facename); *face = &This->IDWriteFontFace_iface; @@ -403,6 +405,15 @@ static HRESULT create_fontface(struct dwrite_font *font, IDWriteFontFace **face) return S_OK; } +HRESULT convert_fontface_to_logfont(IDWriteFontFace *face, LOGFONTW *logfont) +{ + struct dwrite_fontface *fontface = impl_from_IDWriteFontFace(face); + + *logfont = fontface->logfont; + + return S_OK; +} + static HRESULT WINAPI dwritefont_QueryInterface(IDWriteFont *iface, REFIID riid, void **obj) { struct dwrite_font *This = impl_from_IDWriteFont(iface); diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 496f099..bb24305 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -242,10 +242,10 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop *iface, } static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop *iface, - IDWriteFontFace *font, LOGFONTW *logfont) + IDWriteFontFace *fontface, LOGFONTW *logfont) { - FIXME("(%p %p): stub\n", font, logfont); - return E_NOTIMPL; + TRACE("(%p %p)\n", fontface, logfont); + return convert_fontface_to_logfont(fontface, logfont); } static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 8404c22..a4a7854 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -561,6 +561,58 @@ static void test_system_fontcollection(void) IDWriteFontCollection_Release(collection); } +static void test_ConvertFontFaceToLOGFONT(void) +{ + IDWriteGdiInterop *interop; + IDWriteFontFace *fontface; + IDWriteFont *font; + LOGFONTW logfont; + HRESULT hr; + + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfEscapement = 100; + logfont.lfWeight = FW_NORMAL; + logfont.lfItalic = 1; + logfont.lfUnderline = 1; + logfont.lfStrikeOut = 1; + + lstrcpyW(logfont.lfFaceName, tahomaW); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (0) /* crashes on native */ +{ + hr = IDWriteGdiInterop_ConvertFontFaceToLOGFONT(interop, NULL, NULL); + hr = IDWriteGdiInterop_ConvertFontFaceToLOGFONT(interop, fontface, NULL); +} + + memset(&logfont, 0xa, sizeof(logfont)); + logfont.lfFaceName[0] = 0; + + hr = IDWriteGdiInterop_ConvertFontFaceToLOGFONT(interop, fontface, &logfont); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(logfont.lfHeight == 0, "got %d\n", logfont.lfHeight); + ok(logfont.lfWidth == 0, "got %d\n", logfont.lfWidth); + ok(logfont.lfWeight == FW_NORMAL, "got %d\n", logfont.lfWeight); + ok(logfont.lfEscapement == 0, "got %d\n", logfont.lfEscapement); + ok(logfont.lfItalic == 1, "got %d\n", logfont.lfItalic); + ok(logfont.lfUnderline == 0, "got %d\n", logfont.lfUnderline); + ok(logfont.lfStrikeOut == 0, "got %d\n", logfont.lfStrikeOut); + ok(!lstrcmpW(logfont.lfFaceName, tahomaW), "got %s\n", wine_dbgstr_w(logfont.lfFaceName)); + + IDWriteGdiInterop_Release(interop); + IDWriteFontFace_Release(fontface); +} + START_TEST(font) { HRESULT hr; @@ -580,6 +632,7 @@ START_TEST(font) test_CreateFontFace(); test_GetMetrics(); test_system_fontcollection(); + test_ConvertFontFaceToLOGFONT(); IDWriteFactory_Release(factory); }

1 0

Michael Stefaniuc : dmusic: Always AddRef the returned iface in QueryInterface.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: d3c550d0ba36e8ed7c2c9c8741d59b7df01b96c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c550d0ba36e8ed7c2c9c874… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 5 23:38:33 2014 +0100 dmusic: Always AddRef the returned iface in QueryInterface. --- dlls/dmusic/collection.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index f98bc19..a673390 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -48,31 +48,22 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInt TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface); - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IDirectMusicCollection)) - { + *ret_iface = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicCollection)) *ret_iface = iface; - IDirectMusicCollection_AddRef(iface); - return S_OK; - } else if (IsEqualIID(riid, &IID_IDirectMusicObject)) - { *ret_iface = &This->IDirectMusicObject_iface; - IDirectMusicCollection_AddRef(iface); - return S_OK; - } else if (IsEqualIID(riid, &IID_IPersistStream)) - { *ret_iface = &This->IPersistStream_iface; - IDirectMusicCollection_AddRef(iface); - return S_OK; + else + { + WARN("(%p/%p)->(%s, %p): not found\n", iface, This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; } - *ret_iface = NULL; - - WARN("(%p/%p)->(%s, %p): not found\n", iface, This, debugstr_dmguid(riid), ret_iface); - - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; } static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef(LPDIRECTMUSICCOLLECTION iface)

1 0

Michael Stefaniuc : dmusic: Don' t leak mem if DirectMusicCollection creation fails.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 5771ff8912506d5f998d181a23ee4d382f00cfcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5771ff8912506d5f998d181a2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 5 23:43:00 2014 +0100 dmusic: Don't leak mem if DirectMusicCollection creation fails. --- dlls/dmusic/collection.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index a673390..cbcc082 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -805,6 +805,7 @@ static const IPersistStreamVtbl DirectMusicCollection_PersistStream_Vtbl = { HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { IDirectMusicCollectionImpl* obj; + HRESULT hr; *ppobj = NULL; if (pUnkOuter) @@ -821,8 +822,11 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* p DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; obj->pDesc->guidClass = CLSID_DirectMusicCollection; - obj->ref = 0; /* will be inited by QueryInterface */ + obj->ref = 1; list_init (&obj->Instruments); - return IDirectMusicCollection_QueryInterface(&obj->IDirectMusicCollection_iface, lpcGUID, ppobj); + hr = IDirectMusicCollection_QueryInterface(&obj->IDirectMusicCollection_iface, lpcGUID, ppobj); + IDirectMusicCollection_Release(&obj->IDirectMusicCollection_iface); + + return hr; }

1 0

Michael Stefaniuc : dmusic: The object class is immutable in a DirectMusicObject.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: fda99c0fcc96729b096a1434820f90ec7ab6886a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda99c0fcc96729b096a14348… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 5 23:48:46 2014 +0100 dmusic: The object class is immutable in a DirectMusicObject. --- dlls/dmusic/collection.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index cbcc082..a519b2a 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -189,7 +189,9 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_GetDescripto static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescriptor(LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { - IDirectMusicCollectionImpl *This = impl_from_IDirectMusicObject(iface); + IDirectMusicCollectionImpl *This = impl_from_IDirectMusicObject(iface); + HRESULT ret = S_OK; + TRACE("(%p, %p)\n", iface, pDesc); @@ -206,7 +208,10 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescripto if (pDesc->dwValidData & DMUS_OBJ_OBJECT) This->pDesc->guidObject = pDesc->guidObject; if (pDesc->dwValidData & DMUS_OBJ_CLASS) - This->pDesc->guidClass = pDesc->guidClass; + { + pDesc->dwValidData &= ~DMUS_OBJ_CLASS; + ret = S_FALSE; + } if (pDesc->dwValidData & DMUS_OBJ_NAME) lstrcpynW(This->pDesc->wszName, pDesc->wszName, DMUS_MAX_NAME); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) @@ -229,7 +234,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescripto /* add new flags */ This->pDesc->dwValidData |= pDesc->dwValidData; - return S_OK; + return ret; } static HRESULT read_from_stream(IStream *stream, void *data, ULONG size)

1 0

Michael Stefaniuc : dmusic: Don't crash on NULL in IDirectMusicObject:: GetDescriptor.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: fe0d2a2ba796dc0551cef08098a42a405738b421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe0d2a2ba796dc0551cef0809… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 5 23:51:17 2014 +0100 dmusic: Don't crash on NULL in IDirectMusicObject::GetDescriptor. --- dlls/dmusic/collection.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index a519b2a..4c6a034 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -181,7 +181,9 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_GetDescripto TRACE("(%p/%p)->(%p)\n", iface, This, pDesc); - /* I think we shouldn't return pointer here since then values can be changed; it'd be a mess */ + if (!pDesc) + return E_POINTER; + memcpy (pDesc, This->pDesc, This->pDesc->dwSize); return S_OK;

1 0