February 2014 - Wine-Commits

Nikolay Sivov : oleaut32: Fix SafeArrayPutElement() for FADF_RECORD arrays.
by Alexandre Julliard Feb. 24, 2014

Feb. 24, 2014

Module: wine Branch: master Commit: a4e0fc95a914344781975b8971fbba511bbe1a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e0fc95a914344781975b897… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 24 08:15:21 2014 +0400 oleaut32: Fix SafeArrayPutElement() for FADF_RECORD arrays. --- dlls/oleaut32/safearray.c | 34 +++++++++++++++++++--------------- dlls/oleaut32/tests/safearray.c | 25 ++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index b7d8b37..f66cc80 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -898,23 +898,27 @@ HRESULT WINAPI SafeArrayPutElement(SAFEARRAY *psa, LONG *rgIndices, void *pvData if (!*lpDest) hRet = E_OUTOFMEMORY; } - else + else if (psa->fFeatures & (FADF_UNKNOWN|FADF_DISPATCH)) { - if (psa->fFeatures & (FADF_UNKNOWN|FADF_DISPATCH)) - { - LPUNKNOWN lpUnknown = pvData; - LPUNKNOWN *lpDest = lpvDest; - - if (lpUnknown) - IUnknown_AddRef(lpUnknown); - if (*lpDest) - IUnknown_Release(*lpDest); - *lpDest = lpUnknown; - } else { - /* Copy the data over */ - memcpy(lpvDest, pvData, psa->cbElements); - } + IUnknown *lpUnknown = pvData; + IUnknown **lpDest = lpvDest; + + if (lpUnknown) + IUnknown_AddRef(lpUnknown); + if (*lpDest) + IUnknown_Release(*lpDest); + *lpDest = lpUnknown; } + else if (psa->fFeatures & FADF_RECORD) + { + IRecordInfo *record; + + SafeArrayGetRecordInfo(psa, &record); + hRet = IRecordInfo_RecordCopy(record, pvData, lpvDest); + IRecordInfo_Release(record); + } else + /* Copy the data over */ + memcpy(lpvDest, pvData, psa->cbElements); } SafeArrayUnlock(psa); } diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 1af2cab..1d8943a 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1062,10 +1062,11 @@ test_LockUnlock_Vector: static void test_SafeArrayGetPutElement(void) { SAFEARRAYBOUND sab[4]; - LONG indices[NUM_DIMENSIONS]; + LONG indices[NUM_DIMENSIONS], index; SAFEARRAY *sa; HRESULT hres; int value = 0, gotvalue, dimension; + IRecordInfoImpl *irec; unsigned int x,y,z,a; for (dimension = 0; dimension < NUM_DIMENSIONS; dimension++) @@ -1184,6 +1185,28 @@ static void test_SafeArrayGetPutElement(void) } hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); + + /* VT_RECORD array */ + irec = IRecordInfoImpl_Construct(); + irec->ref = 1; + + sab[0].lLbound = 0; + sab[0].cElements = 8; + + sa = pSafeArrayCreateEx(VT_RECORD, 1, sab, &irec->IRecordInfo_iface); + ok(sa != NULL, "failed to create array\n"); + ok(irec->ref == 2, "got %d\n", irec->ref); + + index = 0; + irec->recordcopy = 0; + hres = SafeArrayPutElement(sa, &index, (void*)0xdeadbeef); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(irec->recordcopy == 1, "got %d\n", irec->recordcopy); + + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(irec->ref == 1, "got %d\n", irec->ref); + IRecordInfo_Release(&irec->IRecordInfo_iface); } static void test_SafeArrayGetPutElement_BSTR(void)

1 0

Frédéric Delanoy : setupx.dll16: Use BOOL type where appropriate.
by Alexandre Julliard Feb. 24, 2014

Feb. 24, 2014

Module: wine Branch: master Commit: 2ba5cdd3f6582b2ac7ae51474f955edaf804e5df URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ba5cdd3f6582b2ac7ae51474… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Feb 23 19:23:21 2014 +0100 setupx.dll16: Use BOOL type where appropriate. --- dlls/setupx.dll16/infparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupx.dll16/infparse.c b/dlls/setupx.dll16/infparse.c index 0fbc25d..3d3a25f 100644 --- a/dlls/setupx.dll16/infparse.c +++ b/dlls/setupx.dll16/infparse.c @@ -136,7 +136,7 @@ static unsigned int string_subst( HINF hinf, const char *text, char *buffer ) { const char *start, *subst, *p; unsigned int len, total = 0; - int inside = 0; + BOOL inside = FALSE; unsigned int size = MAX_INF_STRING_LENGTH; char tmp[MAX_INF_STRING_LENGTH];

1 0

Jacek Caban : urlmon: Fixed some tests on IE11.
by Alexandre Julliard Feb. 24, 2014

Feb. 24, 2014

Module: wine Branch: master Commit: 2b04a5e3ff5d05032140ae69302ac8551efb70be URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b04a5e3ff5d05032140ae693… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 11:09:54 2014 +0100 urlmon: Fixed some tests on IE11. --- dlls/urlmon/tests/protocol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index a8f8d7a..8a19329 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1385,7 +1385,7 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, ULONG ulS return S_OK; } default: - ok(0, "unexpected call\n"); + ok(0, "unexpected ulStringType %d\n", ulStringType); } return E_NOTIMPL; @@ -3638,7 +3638,7 @@ static void test_binding(int prot, DWORD grf_pi, DWORD test_flags) CHECK_CALLED(QueryService_InternetProtocol); CHECK_CALLED(CreateInstance); CHECK_CALLED(ReportProgress_PROTOCOLCLASSID); - CHECK_CALLED(SetPriority); + CLEAR_CALLED(SetPriority); /* IE11 does not call it. */ if(impl_protex) CHECK_CALLED(StartEx); else

1 0

Nikolay Sivov : include: Use existing DISPID values instead of magic numbers.
by Alexandre Julliard Feb. 24, 2014

Feb. 24, 2014

Module: wine Branch: master Commit: 1eb7cca1b9cd065c29c1f412d26a4e4f62aa86d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb7cca1b9cd065c29c1f412d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 24 08:16:59 2014 +0400 include: Use existing DISPID values instead of magic numbers. --- include/stdole2.idl | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/include/stdole2.idl b/include/stdole2.idl index 9537fd3..432314f 100644 --- a/include/stdole2.idl +++ b/include/stdole2.idl @@ -20,6 +20,8 @@ #pragma makedep typelib +#include <olectl.h> + [ uuid(00020430-0000-0000-C000-000000000046), version(2.0), @@ -272,14 +274,14 @@ library stdole ] dispinterface Font { properties: - [id(0x0)] BSTR Name; - [id(0x2)] CURRENCY Size; - [id(0x3)] VARIANT_BOOL Bold; - [id(0x4)] VARIANT_BOOL Italic; - [id(0x5)] VARIANT_BOOL Underline; - [id(0x6)] VARIANT_BOOL Strikethrough; - [id(0x7)] short Weight; - [id(0x8)] short Charset; + [id(DISPID_FONT_NAME)] BSTR Name; + [id(DISPID_FONT_SIZE)] CURRENCY Size; + [id(DISPID_FONT_BOLD)] VARIANT_BOOL Bold; + [id(DISPID_FONT_ITALIC)] VARIANT_BOOL Italic; + [id(DISPID_FONT_UNDER)] VARIANT_BOOL Underline; + [id(DISPID_FONT_STRIKE)] VARIANT_BOOL Strikethrough; + [id(DISPID_FONT_WEIGHT)] short Weight; + [id(DISPID_FONT_CHARSET)] short Charset; methods: } @@ -351,13 +353,14 @@ library stdole ] dispinterface Picture { properties: - [id(0x0), readonly] OLE_HANDLE Handle; - [id(0x2)] OLE_HANDLE hPal; - [id(0x3), readonly] short Type; - [id(0x4), readonly] OLE_XSIZE_HIMETRIC Width; - [id(0x5), readonly] OLE_YSIZE_HIMETRIC Height; + [id(DISPID_PICT_HANDLE), readonly] OLE_HANDLE Handle; + [id(DISPID_PICT_HPAL)] OLE_HANDLE hPal; + [id(DISPID_PICT_TYPE), readonly] short Type; + [id(DISPID_PICT_WIDTH), readonly] OLE_XSIZE_HIMETRIC Width; + [id(DISPID_PICT_HEIGHT), readonly] OLE_YSIZE_HIMETRIC Height; methods: - [id(0x6)] void Render(int hdc, + [id(DISPID_PICT_RENDER)] + void Render(int hdc, long x, long y, long cx, @@ -424,7 +427,7 @@ library stdole dispinterface FontEvents { properties: methods: - [id(0x9)] void FontChanged([in] BSTR PropertyName); + [id(DISPID_FONT_CHANGED)] void FontChanged([in] BSTR PropertyName); }; typedef [public] FontEvents IFontEventsDisp;

1 0

Nikolay Sivov : oleaut32: Fix buffer increment step for VT_RECORD case doing SafeArrayCopyData().
by Alexandre Julliard Feb. 24, 2014

Feb. 24, 2014

Module: wine Branch: master Commit: 4da741daf16f041f0222f4fb71ef648d759251df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4da741daf16f041f0222f4fb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 24 08:15:59 2014 +0400 oleaut32: Fix buffer increment step for VT_RECORD case doing SafeArrayCopyData(). --- dlls/oleaut32/safearray.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index f66cc80..4801f3b 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -401,7 +401,6 @@ static HRESULT SAFEARRAY_CopyData(SAFEARRAY *psa, SAFEARRAY *dest) } else if (psa->fFeatures & FADF_RECORD) { - const SAFEARRAYBOUND* psab = psa->rgsabound; BYTE *dest_data = dest->pvData; BYTE *src_data = psa->pvData; IRecordInfo *record; @@ -412,11 +411,14 @@ static HRESULT SAFEARRAY_CopyData(SAFEARRAY *psa, SAFEARRAY *dest) /* RecordCopy() clears destination record */ hr = IRecordInfo_RecordCopy(record, src_data, dest_data); if (FAILED(hr)) break; - src_data += psab->cElements; - dest_data += psab->cElements; + src_data += psa->cbElements; + dest_data += psa->cbElements; } SafeArraySetRecordInfo(dest, record); + /* This value is set to 32 bytes by default on descriptor creation, + update with actual structure size. */ + dest->cbElements = psa->cbElements; IRecordInfo_Release(record); } else if (psa->fFeatures & (FADF_UNKNOWN|FADF_DISPATCH))

1 0

Marcus Meissner : include: Added missing FindExInfoBasic enum.
by Alexandre Julliard Feb. 24, 2014

Feb. 24, 2014

Module: wine Branch: master Commit: 563486b55559b9fc54339481f0e32df726420f54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=563486b55559b9fc54339481f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Feb 24 08:26:54 2014 +0100 include: Added missing FindExInfoBasic enum. --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index 889f018..6cc0a24 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -285,6 +285,7 @@ DECL_WINELIB_TYPE_AW(LPWIN32_FIND_DATA) typedef enum _FINDEX_INFO_LEVELS { FindExInfoStandard, + FindExInfoBasic, FindExInfoMaxInfoLevel } FINDEX_INFO_LEVELS;

1 0

Nikolay Sivov : shell32/tests: Fix some test failures on Win8.
by Alexandre Julliard Feb. 24, 2014

Feb. 24, 2014

Module: wine Branch: master Commit: d867a49a3dffacc3833c81ce692cab4ba7c82d73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d867a49a3dffacc3833c81ce6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 24 09:59:17 2014 +0400 shell32/tests: Fix some test failures on Win8. --- dlls/shell32/tests/ebrowser.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index fe05e5f..1936cf9 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -67,8 +67,10 @@ DEFINE_GUID(IID_UnknownInterface13, 0xa36a3ace, 0x8332, 0x45ce, 0xaa,0x29, 0x5 DEFINE_GUID(IID_UnknownInterface14, 0x16770868, 0x239c, 0x445b, 0xa0,0x1d, 0xf2,0x6c,0x7f,0xbb,0xf2,0x6c); DEFINE_GUID(IID_UnknownInterface15, 0x05a89298, 0x6246, 0x4c63, 0xbb,0x0d, 0x9b,0xda,0xf1,0x40,0xbf,0x3b); DEFINE_GUID(IID_UnknownInterface16, 0x35094a87, 0x8bb1, 0x4237, 0x96,0xc6, 0xc4,0x17,0xee,0xbd,0xb0,0x78); -DEFINE_GUID(IID_UnknownInterface17, 0xa36a3ace, 0x8332, 0x45ce, 0xaa,0x29, 0x50,0x3c,0xb7,0x6b,0x25,0x87); -DEFINE_GUID(IID_UnknownInterface18, 0x3d5d8c60, 0x21e4, 0x4b03, 0x83,0xb8, 0xc7,0x3f,0x8c,0x94,0x00,0x78); +DEFINE_GUID(IID_UnknownInterface17, 0x3d5d8c60, 0x21e4, 0x4b03, 0x83,0xb8, 0xc7,0x3f,0x8c,0x94,0x00,0x78); +DEFINE_GUID(IID_UnknownInterface18, 0x1fc45c07, 0x9e35, 0x4276, 0xad,0x7f, 0x08,0x60,0x3a,0xa0,0xf6,0x0f); +DEFINE_GUID(IID_UnknownInterface19, 0xacd9b67a, 0xceab, 0x4c6c, 0x90,0xa1, 0xe8,0x57,0xc6,0x59,0xe3,0x9d); +DEFINE_GUID(IID_UnknownInterface20, 0xd0fe6f62, 0xdea4, 0x46c9, 0x9d,0xae, 0x36,0xcb,0x13,0x99,0x78,0xfa); static HWND hwnd; @@ -926,12 +928,15 @@ static void test_SetSite(void) /* Win 8 */ { &IID_ICommDlgBrowser, &IID_UnknownInterface11, 0, NULL }, { &IID_ICommDlgBrowser, &IID_UnknownInterface12, 0, NULL }, + { &IID_ICommDlgBrowser, &IID_UnknownInterface20, 0, NULL }, { &IID_UnknownInterface13, &IID_IUnknown, 0, NULL }, + { &IID_UnknownInterface13, &IID_UnknownInterface13, 0, NULL }, + { &IID_UnknownInterface13, &IID_UnknownInterface18, 0, NULL }, { &IID_UnknownInterface14, &IID_UnknownInterface14, 0, NULL }, { &IID_UnknownInterface15, &IID_UnknownInterface15, 0, NULL }, { &IID_UnknownInterface16, &IID_UnknownInterface16, 0, NULL }, { &IID_UnknownInterface17, &IID_UnknownInterface17, 0, NULL }, - { &IID_UnknownInterface18, &IID_UnknownInterface18, 0, NULL }, + { &IID_UnknownInterface17, &IID_UnknownInterface19, 0, NULL }, /* Other services requested in Vista, Windows 2008 but not in Windows 7 */ { &IID_IBrowserSettings_Vista, &IID_IBrowserSettings_Vista, 0, NULL },

1 0

Nikolay Sivov : scrrun: Added a IDriveCollection stub.
by Alexandre Julliard Feb. 24, 2014

Feb. 24, 2014

Module: wine Branch: master Commit: 8a7795407cc2eb2d3341d379dacdc5737e64d5b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7795407cc2eb2d3341d379d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 24 08:16:16 2014 +0400 scrrun: Added a IDriveCollection stub. --- dlls/scrrun/filesystem.c | 165 +++++++++++++++++++++++++++++++++++++++++- dlls/scrrun/scrrun.c | 7 +- dlls/scrrun/scrrun.idl | 2 +- dlls/scrrun/scrrun_private.h | 5 +- 4 files changed, 170 insertions(+), 9 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 21aaf70..d4f5887 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -50,6 +50,11 @@ struct filecollection { BSTR path; }; +struct drivecollection { + IDriveCollection IDriveCollection_iface; + LONG ref; +}; + struct enumdata { union { @@ -123,6 +128,11 @@ static inline struct filecollection *impl_from_IFileCollection(IFileCollection * return CONTAINING_RECORD(iface, struct filecollection, IFileCollection_iface); } +static inline struct drivecollection *impl_from_IDriveCollection(IDriveCollection *iface) +{ + return CONTAINING_RECORD(iface, struct drivecollection, IDriveCollection_iface); +} + static inline struct enumvariant *impl_from_IEnumVARIANT(IEnumVARIANT *iface) { return CONTAINING_RECORD(iface, struct enumvariant, IEnumVARIANT_iface); @@ -1150,6 +1160,156 @@ static HRESULT create_filecoll(BSTR path, IFileCollection **files) return S_OK; } +static HRESULT WINAPI drivecoll_QueryInterface(IDriveCollection *iface, REFIID riid, void **obj) +{ + struct drivecollection *This = impl_from_IDriveCollection(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + *obj = NULL; + + if (IsEqualIID( riid, &IID_IDriveCollection ) || + IsEqualIID( riid, &IID_IDispatch ) || + IsEqualIID( riid, &IID_IUnknown )) + { + *obj = iface; + IDriveCollection_AddRef(iface); + } + else + return E_NOINTERFACE; + + return S_OK; +} + +static ULONG WINAPI drivecoll_AddRef(IDriveCollection *iface) +{ + struct drivecollection *This = impl_from_IDriveCollection(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI drivecoll_Release(IDriveCollection *iface) +{ + struct drivecollection *This = impl_from_IDriveCollection(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI drivecoll_GetTypeInfoCount(IDriveCollection *iface, UINT *pctinfo) +{ + struct drivecollection *This = impl_from_IDriveCollection(iface); + TRACE("(%p)->(%p)\n", This, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI drivecoll_GetTypeInfo(IDriveCollection *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + struct drivecollection *This = impl_from_IDriveCollection(iface); + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo(IDriveCollection_tid, ppTInfo); +} + +static HRESULT WINAPI drivecoll_GetIDsOfNames(IDriveCollection *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + struct drivecollection *This = impl_from_IDriveCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IDriveCollection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI drivecoll_Invoke(IDriveCollection *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, + DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + struct drivecollection *This = impl_from_IDriveCollection(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(IDriveCollection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI drivecoll_get_Item(IDriveCollection *iface, VARIANT key, IDrive **drive) +{ + struct drivecollection *This = impl_from_IDriveCollection(iface); + FIXME("(%p)->(%p): stub\n", This, drive); + return E_NOTIMPL; +} + +static HRESULT WINAPI drivecoll_get__NewEnum(IDriveCollection *iface, IUnknown **penum) +{ + struct drivecollection *This = impl_from_IDriveCollection(iface); + FIXME("(%p)->(%p): stub\n", This, penum); + return E_NOTIMPL; +} + +static HRESULT WINAPI drivecoll_get_Count(IDriveCollection *iface, LONG *count) +{ + struct drivecollection *This = impl_from_IDriveCollection(iface); + FIXME("(%p)->(%p): stub\n", This, count); + return E_NOTIMPL; +} + +static const IDriveCollectionVtbl drivecollectionvtbl = { + drivecoll_QueryInterface, + drivecoll_AddRef, + drivecoll_Release, + drivecoll_GetTypeInfoCount, + drivecoll_GetTypeInfo, + drivecoll_GetIDsOfNames, + drivecoll_Invoke, + drivecoll_get_Item, + drivecoll_get__NewEnum, + drivecoll_get_Count +}; + +static HRESULT create_drivecoll(IDriveCollection **drives) +{ + struct drivecollection *This; + + *drives = NULL; + + This = heap_alloc(sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + + This->IDriveCollection_iface.lpVtbl = &drivecollectionvtbl; + This->ref = 1; + + *drives = &This->IDriveCollection_iface; + return S_OK; +} + static HRESULT WINAPI folder_QueryInterface(IFolder *iface, REFIID riid, void **obj) { struct folder *This = impl_from_IFolder(iface); @@ -1944,9 +2104,8 @@ static HRESULT WINAPI filesys_Invoke(IFileSystem3 *iface, DISPID dispIdMember, static HRESULT WINAPI filesys_get_Drives(IFileSystem3 *iface, IDriveCollection **ppdrives) { - FIXME("%p %p\n", iface, ppdrives); - - return E_NOTIMPL; + TRACE("%p %p\n", iface, ppdrives); + return create_drivecoll(ppdrives); } static HRESULT WINAPI filesys_BuildPath(IFileSystem3 *iface, BSTR Path, diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index 9c7c6dc..b88dda1 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -103,12 +103,13 @@ static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { &IID_NULL, &IID_IDictionary, + &IID_IDriveCollection, + &IID_IFile, + &IID_IFileCollection, &IID_IFileSystem3, &IID_IFolder, &IID_IFolderCollection, - &IID_ITextStream, - &IID_IFile, - &IID_IFileCollection + &IID_ITextStream }; static HRESULT load_typelib(void) diff --git a/dlls/scrrun/scrrun.idl b/dlls/scrrun/scrrun.idl index 73948b5..016eeb6 100644 --- a/dlls/scrrun/scrrun.idl +++ b/dlls/scrrun/scrrun.idl @@ -263,7 +263,7 @@ library Scripting oleautomation ] interface IDriveCollection : IDispatch { - [id(DISPID_VALUE)] + [id(DISPID_VALUE), propget] HRESULT Item([in] VARIANT Key, [out, retval] IDrive** ppdrive); [id(DISPID_NEWENUM), propget, restricted, hidden] diff --git a/dlls/scrrun/scrrun_private.h b/dlls/scrrun/scrrun_private.h index 3ffde50..4d3e7be 100644 --- a/dlls/scrrun/scrrun_private.h +++ b/dlls/scrrun/scrrun_private.h @@ -25,12 +25,13 @@ typedef enum tid_t { NULL_tid, IDictionary_tid, + IDriveCollection_tid, + IFile_tid, + IFileCollection_tid, IFileSystem3_tid, IFolder_tid, IFolderCollection_tid, ITextStream_tid, - IFile_tid, - IFileCollection_tid, LAST_tid } tid_t;

1 0

Frédéric Delanoy : d3dcompiler_43/tests: Use BOOL type where appropriate.
by Alexandre Julliard Feb. 24, 2014

Feb. 24, 2014

Module: wine Branch: master Commit: b09833a847f2fb7b340b210da9605bb3269f8602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09833a847f2fb7b340b210da… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Feb 23 19:23:20 2014 +0100 d3dcompiler_43/tests: Use BOOL type where appropriate. --- dlls/d3dcompiler_43/tests/hlsl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index c3778ca..7a04762 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -235,7 +235,7 @@ static void setup_device9(IDirect3DDevice9 *device, IDirect3DSurface9 **render_t ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned: %08x\n", hr); } -static int colors_match(D3DXCOLOR a, D3DXCOLOR b, float epsilon) +static BOOL colors_match(D3DXCOLOR a, D3DXCOLOR b, float epsilon) { return (fabs(a.r - b.r) < epsilon && fabs(a.g - b.g) < epsilon && fabs(a.b - b.b) < epsilon && fabs(a.a - b.a) < epsilon);

1 0

Frédéric Delanoy : atl/tests: Use BOOL type where appropriate.
by Alexandre Julliard Feb. 24, 2014

Feb. 24, 2014

Module: wine Branch: master Commit: 10197d3173fe24c397994fa0e9dfb6ae2b0122c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10197d3173fe24c397994fa0e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Feb 23 19:23:19 2014 +0100 atl/tests: Use BOOL type where appropriate. --- dlls/atl/tests/registrar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl/tests/registrar.c b/dlls/atl/tests/registrar.c index b9b62e7..c05b672 100644 --- a/dlls/atl/tests/registrar.c +++ b/dlls/atl/tests/registrar.c @@ -114,7 +114,7 @@ static void test_registrar(void) hr = IRegistrar_StringRegister(registrar, textW); if (FAILED(hr)) { - int is_limited = is_process_limited(); + BOOL is_limited = is_process_limited(); ok(hr == DISP_E_EXCEPTION && is_limited, "IRegistrar_StringRegister failed, hr = 0x%08X, is_limited=%d\n", hr, is_limited); skip("Skipping registrar tests\n");

1 0