February 2014 - Wine-commits

Piotr Caban : qcap: Add Avi Mux input pin IMemInputPin::NotifyAllocator.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: 43bef66e8bbd93ae6d86c81aa0f1c4adc8d8127e URL: http://source.winehq.org/git/wine.git/?a=commit;h=43bef66e8bbd93ae6d86c81aa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 24 12:10:46 2014 +0100 qcap: Add Avi Mux input pin IMemInputPin::NotifyAllocator. --- dlls/qcap/avimux.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 555cc44..f9c2cc2 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1362,9 +1362,23 @@ static HRESULT WINAPI AviMuxIn_MemInputPin_NotifyAllocator( { AviMuxIn *avimuxin = AviMuxIn_from_IMemInputPin(iface); AviMux *This = impl_from_in_IPin(&avimuxin->pin.pin.IPin_iface); - FIXME("(%p:%s)->(%p %x)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), + ALLOCATOR_PROPERTIES props; + HRESULT hr; + + TRACE("(%p:%s)->(%p %x)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), pAllocator, bReadOnly); - return E_NOTIMPL; + + if(!pAllocator) + return E_POINTER; + + memset(&props, 0, sizeof(props)); + hr = IMemAllocator_GetProperties(pAllocator, &props); + if(FAILED(hr)) + return hr; + + props.cbAlign = 1; + props.cbPrefix = 8; + return IMemAllocator_SetProperties(avimuxin->pin.pAllocator, &props, &props); } static HRESULT WINAPI AviMuxIn_MemInputPin_GetAllocatorRequirements(

1 0

Piotr Caban : qcap: Add Avi Mux IConfigInterleaving:: put_Mode implementation.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: 6017d55d07d65dba16e89e292a9bed207d8f4dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=6017d55d07d65dba16e89e292… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 24 12:11:12 2014 +0100 qcap: Add Avi Mux IConfigInterleaving::put_Mode implementation. --- dlls/qcap/avimux.c | 25 +++++++++++++++++++++++-- dlls/qcap/tests/qcap.c | 11 +++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index f9c2cc2..e3ea363 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -54,6 +54,7 @@ typedef struct { IPersistMediaPropertyBag IPersistMediaPropertyBag_iface; ISpecifyPropertyPages ISpecifyPropertyPages_iface; + InterleavingMode mode; AviMuxOut *out; int input_pin_no; AviMuxIn *in[MAX_PIN_NO-1]; @@ -331,8 +332,28 @@ static HRESULT WINAPI ConfigInterleaving_put_Mode( IConfigInterleaving *iface, InterleavingMode mode) { AviMux *This = impl_from_IConfigInterleaving(iface); - FIXME("(%p)->(%d)\n", This, mode); - return E_NOTIMPL; + HRESULT hr = S_OK; + + TRACE("(%p)->(%d)\n", This, mode); + + if(mode>INTERLEAVE_NONE_BUFFERED) + return E_INVALIDARG; + + if(This->mode != mode) { + int i; + + for(i=0; i<This->input_pin_no; i++) { + if(!This->in[i]->pin.pin.pConnectedTo) + continue; + + hr = IFilterGraph_Reconnect(This->filter.filterInfo.pGraph, &This->in[i]->pin.pin.IPin_iface); + if(FAILED(hr)) + return hr; + } + } + + This->mode = mode; + return S_OK; } static HRESULT WINAPI ConfigInterleaving_get_Mode( diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index dff5bb8..3734132 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1235,6 +1235,7 @@ static void test_AviMux(void) IMemInputPin *memin; ALLOCATOR_PROPERTIES props; IMemAllocator *memalloc; + IConfigInterleaving *ci; HRESULT hr; init_test_filter(&source_filter, PINDIR_OUTPUT, SOURCE_FILTER); @@ -1369,6 +1370,16 @@ static void test_AviMux(void) IMemAllocator_Release(memalloc); IMemInputPin_Release(memin); + hr = IBaseFilter_QueryInterface(avimux, &IID_IConfigInterleaving, (void**)&ci); + ok(hr == S_OK, "QueryInterface(IID_IConfigInterleaving) returned %x\n", hr); + hr = IConfigInterleaving_put_Mode(ci, 5); + ok(hr == E_INVALIDARG, "put_Mode returned %x\n", hr); + SET_EXPECT(Reconnect); + hr = IConfigInterleaving_put_Mode(ci, INTERLEAVE_FULL); + ok(hr == S_OK, "put_Mode returned %x\n", hr); + CHECK_CALLED(Reconnect); + IConfigInterleaving_Release(ci); + hr = IPin_Disconnect(avimux_out); ok(hr == S_OK, "Disconnect returned %x\n", hr);

1 0

Piotr Caban : qcap: Add Avi Mux input pin IMemInputPin:: ReceiveCanBlock implementation.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: 90dfe084c6aabd791f8e7961bd5d2ddac27bed2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=90dfe084c6aabd791f8e7961b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 24 12:11:26 2014 +0100 qcap: Add Avi Mux input pin IMemInputPin::ReceiveCanBlock implementation. --- dlls/qcap/avimux.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index e3ea363..626e144 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1441,8 +1441,15 @@ static HRESULT WINAPI AviMuxIn_MemInputPin_ReceiveCanBlock(IMemInputPin *iface) { AviMuxIn *avimuxin = AviMuxIn_from_IMemInputPin(iface); AviMux *This = impl_from_in_IPin(&avimuxin->pin.pin.IPin_iface); - FIXME("(%p:%s)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName)); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p:%s)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName)); + + if(!This->out->pin.pMemInputPin) + return S_FALSE; + + hr = IMemInputPin_ReceiveCanBlock(This->out->pin.pMemInputPin); + return hr != S_FALSE ? S_OK : S_FALSE; } static const IMemInputPinVtbl AviMuxIn_MemInputPinVtbl = {

1 0

Huw Davies : wineps: Use the correct colours when a monochrome bitmap without a colour table is the source.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: ad7e889c1d58aec091e72f08db86346c74070128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad7e889c1d58aec091e72f08d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 24 15:11:57 2014 +0000 wineps: Use the correct colours when a monochrome bitmap without a colour table is the source. --- dlls/wineps.drv/bitmap.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index f5a5547..c4d0a96 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -101,6 +101,7 @@ static BOOL PSDRV_WriteImageMaskHeader(PHYSDEV dev, const BITMAPINFO *info, INT INT widthSrc, INT heightSrc) { PSCOLOR bkgnd, foregnd; + PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); assert(info->bmiHeader.biBitCount == 1); @@ -108,12 +109,20 @@ static BOOL PSDRV_WriteImageMaskHeader(PHYSDEV dev, const BITMAPINFO *info, INT the foregnd color corresponds to a bit equal to 0 in the bitmap. */ - PSDRV_CreateColor(dev, &foregnd, RGB(info->bmiColors[0].rgbRed, - info->bmiColors[0].rgbGreen, - info->bmiColors[0].rgbBlue) ); - PSDRV_CreateColor(dev, &bkgnd, RGB(info->bmiColors[1].rgbRed, - info->bmiColors[1].rgbGreen, - info->bmiColors[1].rgbBlue) ); + if (!info->bmiHeader.biClrUsed) + { + PSDRV_CreateColor( dev, &foregnd, GetTextColor( dev->hdc ) ); + bkgnd = physDev->bkColor; + } + else + { + PSDRV_CreateColor( dev, &foregnd, RGB(info->bmiColors[0].rgbRed, + info->bmiColors[0].rgbGreen, + info->bmiColors[0].rgbBlue) ); + PSDRV_CreateColor( dev, &bkgnd, RGB(info->bmiColors[1].rgbRed, + info->bmiColors[1].rgbGreen, + info->bmiColors[1].rgbBlue) ); + } PSDRV_WriteGSave(dev); PSDRV_WriteNewPath(dev);

1 0

Christoph von Wittich : comctl32: Rename TBSTYLE_EX_UNDOC1 to TBSTYLE_EX_VERTICAL.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: 37e0a1a5d4977a5f017709109dd6cf7a948b78e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37e0a1a5d4977a5f017709109… Author: Christoph von Wittich <Christoph(a)ApiViewer.de> Date: Sat Feb 22 21:02:22 2014 +0100 comctl32: Rename TBSTYLE_EX_UNDOC1 to TBSTYLE_EX_VERTICAL. --- dlls/comctl32/toolbar.c | 8 ++++---- include/commctrl.h | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index b523dc0..fb82961 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -219,7 +219,7 @@ typedef enum /* Used to find undocumented extended styles */ #define TBSTYLE_EX_ALL (TBSTYLE_EX_DRAWDDARROWS | \ - TBSTYLE_EX_UNDOC1 | \ + TBSTYLE_EX_VERTICAL | \ TBSTYLE_EX_MIXEDBUTTONS | \ TBSTYLE_EX_DOUBLEBUFFER | \ TBSTYLE_EX_HIDECLIPPEDBUTTONS) @@ -1271,7 +1271,7 @@ TOOLBAR_CalcStrings (const TOOLBAR_INFO *infoPtr, LPSIZE lpSize) * the toolbar wrapping on its own, it can use the TBSTYLE_WRAPABLE * flag, and set the TBSTATE_WRAP flags manually on the appropriate items. * -* Note: TBSTYLE_WRAPABLE or TBSTYLE_EX_UNDOC1 can be used also to allow +* Note: TBSTYLE_WRAPABLE or TBSTYLE_EX_VERTICAL can be used also to allow * vertical toolbar lists. */ @@ -1287,7 +1287,7 @@ TOOLBAR_WrapToolbar(TOOLBAR_INFO *infoPtr) /* no layout is necessary. Applications may use this style */ /* to perform their own layout on the toolbar. */ if( !(infoPtr->dwStyle & TBSTYLE_WRAPABLE) && - !(infoPtr->dwExStyle & TBSTYLE_EX_UNDOC1) ) return; + !(infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL) ) return; btnPtr = infoPtr->buttons; x = infoPtr->nIndent; @@ -3037,7 +3037,7 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) cy = TOP_BORDER + infoPtr->nRows * infoPtr->nButtonHeight + BOTTOM_BORDER; cx = parent_rect.right - parent_rect.left; - if ((infoPtr->dwStyle & TBSTYLE_WRAPABLE) || (infoPtr->dwExStyle & TBSTYLE_EX_UNDOC1)) + if ((infoPtr->dwStyle & TBSTYLE_WRAPABLE) || (infoPtr->dwExStyle & TBSTYLE_EX_VERTICAL)) { TOOLBAR_LayoutToolbar(infoPtr); InvalidateRect( infoPtr->hwndSelf, NULL, TRUE ); diff --git a/include/commctrl.h b/include/commctrl.h index 0f153e4..9993ec7 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1089,7 +1089,8 @@ static const WCHAR TOOLBARCLASSNAMEW[] = { 'T','o','o','l','b','a','r', #define TBSTYLE_REGISTERDROP 0x4000 #define TBSTYLE_TRANSPARENT 0x8000 #define TBSTYLE_EX_DRAWDDARROWS 0x00000001 -#define TBSTYLE_EX_UNDOC1 0x00000004 /* similar to TBSTYLE_WRAPABLE */ +#define TBSTYLE_EX_MULTICOLUMN 0x00000002 +#define TBSTYLE_EX_VERTICAL 0x00000004 #define TBSTYLE_EX_MIXEDBUTTONS 0x00000008 #define TBSTYLE_EX_HIDECLIPPEDBUTTONS 0x00000010 /* don't show partially obscured buttons */ #define TBSTYLE_EX_DOUBLEBUFFER 0x00000080 /* Double Buffer the toolbar */

1 0

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

24 Feb '14

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

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

24 Feb '14

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 : setupx.dll16: Use BOOL type where appropriate.
by Alexandre Julliard 24 Feb '14

24 Feb '14

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

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

24 Feb '14

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

Nikolay Sivov : oleaut32/tests: Test for internal safearray data layout.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: 598f3f0623e132de256515466474875d5967b984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=598f3f0623e132de256515466… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 24 08:15:41 2014 +0400 oleaut32/tests: Test for internal safearray data layout. --- dlls/oleaut32/tests/safearray.c | 58 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 1d8943a..c28931c 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -2003,6 +2003,63 @@ static void test_SafeArrayDestroyData (void) ok(hres == S_OK, "SAD failed, error code %x.\n", hres); } +static void test_safearray_layout(void) +{ + IRecordInfoImpl *irec; + IRecordInfo *record; + GUID guid, *guidptr; + SAFEARRAYBOUND sab; + SAFEARRAY *sa; + DWORD *dwptr; + HRESULT hr; + + sab.lLbound = 0; + sab.cElements = 10; + + /* GUID field */ + sa = SafeArrayCreate(VT_UNKNOWN, 1, &sab); + ok(sa != NULL, "got %p\n", sa); + + guidptr = (GUID*)sa - 1; + ok(IsEqualIID(guidptr, &IID_IUnknown), "got %s\n", wine_dbgstr_guid(guidptr)); + + hr = SafeArraySetIID(sa, &IID_IDispatch); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualIID(guidptr, &IID_IDispatch), "got %s\n", wine_dbgstr_guid(guidptr)); + + memcpy(guidptr, &IID_IUnknown, sizeof(GUID)); + hr = SafeArrayGetIID(sa, &guid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualIID(&guid, &IID_IUnknown), "got %s\n", wine_dbgstr_guid(&guid)); + + hr = SafeArrayDestroy(sa); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* VARTYPE field */ + sa = SafeArrayCreate(VT_UI1, 1, &sab); + ok(sa != NULL, "got %p\n", sa); + + dwptr = (DWORD*)sa - 1; + ok(*dwptr == VT_UI1, "got %d\n", *dwptr); + + hr = SafeArrayDestroy(sa); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* IRecordInfo pointer */ + irec = IRecordInfoImpl_Construct(); + irec->ref = 1; + + sa = pSafeArrayCreateEx(VT_RECORD, 1, &sab, &irec->IRecordInfo_iface); + ok(sa != NULL, "failed to create array\n"); + + record = *((IRecordInfo**)sa - 1); + ok(record == &irec->IRecordInfo_iface, "got %p\n", record); + + hr = SafeArrayDestroy(sa); + ok(hr == S_OK, "got 0x%08x\n", hr); + IRecordInfo_Release(&irec->IRecordInfo_iface); +} + START_TEST(safearray) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -2035,4 +2092,5 @@ START_TEST(safearray) test_SafeArrayGetPutElement_IUnknown(); test_SafeArrayRedim_IUnknown(); test_SafeArrayGetPutElement_VARIANT(); + test_safearray_layout(); }

1 0