February 2014 - Wine-Commits

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

Feb. 24, 2014

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 Feb. 24, 2014

Feb. 24, 2014

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

Christoph von Wittich : comctl32: Rename TBSTYLE_EX_UNDOC1 to TBSTYLE_EX_VERTICAL.
by Alexandre Julliard Feb. 24, 2014

Feb. 24, 2014

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

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

Feb. 24, 2014

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

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

Feb. 24, 2014

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

Jacek Caban : wmp: Added DoVerb(OLEIVERB_HIDE) implementation.
by Alexandre Julliard Feb. 24, 2014

Feb. 24, 2014

Module: wine Branch: master Commit: bd95cb54041e9dace1d0fe4b01e56d69ed7f9391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd95cb54041e9dace1d0fe4b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 13:03:24 2014 +0100 wmp: Added DoVerb(OLEIVERB_HIDE) implementation. --- dlls/wmp/oleobj.c | 10 ++++++++++ dlls/wmp/tests/oleobj.c | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 29f39d7..3dd2378 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -396,6 +396,16 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms case OLEIVERB_INPLACEACTIVATE: TRACE("(%p)->(OLEIVERB_INPLACEACTIVATE)\n", This); return activate_inplace(This); + + case OLEIVERB_HIDE: + if(!This->hwnd) { + FIXME("No window to hide\n"); + return E_UNEXPECTED; + } + + ShowWindow(This->hwnd, SW_HIDE); + return S_OK; + default: FIXME("Unsupported iVerb %d\n", iVerb); } diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 52110c1..9e27d3b 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -926,6 +926,10 @@ static void test_wmp(void) test_window(hwnd); + hres = IOleObject_DoVerb(oleobj, OLEIVERB_HIDE, NULL, &ClientSite, 0, container_hwnd, &pos); + ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + ok(!IsWindowVisible(hwnd), "Window is visible\n"); + SET_EXPECT(OnShowWindow_FALSE); SET_EXPECT(OnInPlaceDeactivate); hres = IOleObject_Close(oleobj, 0);

1 0

Jacek Caban : wmp: Return success in IPersistStreamInit::InitNew.
by Alexandre Julliard Feb. 24, 2014

Feb. 24, 2014

Module: wine Branch: master Commit: b0f4ed187b6e741d5762cd46f858c647d5f286d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f4ed187b6e741d5762cd46f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 13:03:12 2014 +0100 wmp: Return success in IPersistStreamInit::InitNew. --- dlls/wmp/oleobj.c | 11 +++++++++-- dlls/wmp/tests/oleobj.c | 8 ++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 1e50a45..29f39d7 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -744,8 +744,15 @@ static HRESULT WINAPI PersistStreamInit_GetSizeMax(IPersistStreamInit *iface, static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) { WindowsMediaPlayer *This = impl_from_IPersistStreamInit(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + if(!This->client_site) + return E_FAIL; + + /* Nothing to do, yet. */ + get_container_hwnd(This); + return S_OK; } static const IPersistStreamInitVtbl PersistStreamInitVtbl = { diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index eababdb..52110c1 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -877,6 +877,9 @@ static void test_wmp(void) hres = IOleObject_QueryInterface(oleobj, &IID_IOleInPlaceObject, (void**)&ipobj); ok(hres == S_OK, "Could not get IOleInPlaceObject iface: %08x\n", hres); + hres = IPersistStreamInit_InitNew(psi); + ok(hres == E_FAIL || broken(hres == S_OK /* Old WMP */), "InitNew failed: %08x\n", hres); + SET_EXPECT(GetContainer); SET_EXPECT(GetExtendedControl); SET_EXPECT(GetWindow); @@ -893,6 +896,11 @@ static void test_wmp(void) ok(hres == S_OK, "GetClientSite failed: %08x\n", hres); ok(client_site == &ClientSite, "client_site != ClientSite\n"); + SET_EXPECT(GetWindow); + hres = IPersistStreamInit_InitNew(psi); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + CHECK_CALLED(GetWindow); + hwnd = (HWND)0xdeadbeef; hres = IOleInPlaceObject_GetWindow(ipobj, &hwnd); ok(hres == E_UNEXPECTED, "GetWindow failed: %08x\n", hres);

1 0

Nikolay Sivov : ntdll: Use case-insensitive matching for typelib flags.
by Alexandre Julliard Feb. 24, 2014

Feb. 24, 2014

Module: wine Branch: master Commit: 88fc9164422f48fc67fee58753753e60d09b5058 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88fc9164422f48fc67fee5875… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 24 08:17:44 2014 +0400 ntdll: Use case-insensitive matching for typelib flags. Spotted by Austin English. --- dlls/kernel32/tests/actctx.c | 2 +- dlls/ntdll/actctx.c | 8 ++++---- dlls/oleaut32/tests/typelib.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 06b5c9c..ae9674a 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -186,7 +186,7 @@ static const char manifest_wndcls2[] = " <windowClass versioned=\"no\">wndClass3</windowClass>" " <windowClass>wndClass4</windowClass>" " <typelib tlbid=\"{99999999-8888-7777-6666-555555555555}\" version=\"1.0\" helpdir=\"help\" resourceid=\"409\"" -" flags=\"HIDDEN,CONTROL,RESTRICTED\" />" +" flags=\"HiddeN,CoNTROL,rESTRICTED\" />" " <typelib tlbid=\"{99999999-8888-7777-6666-555555555556}\" version=\"1.0\" helpdir=\"help1\" resourceid=\"409\" />" " <typelib tlbid=\"{99999999-8888-7777-6666-555555555557}\" version=\"1.0\" helpdir=\"\" />" "</file>" diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index bdbb330..5d88b9a 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1646,13 +1646,13 @@ static BOOL parse_typelib_flags(const xmlstr_t *value, struct entity *entity) start = str; while (*str != ',' && (i++ < value->len)) str++; - if (!strncmpW(start, restrictedW, str-start)) + if (!strncmpiW(start, restrictedW, str-start)) *flags |= LIBFLAG_FRESTRICTED; - else if (!strncmpW(start, controlW, str-start)) + else if (!strncmpiW(start, controlW, str-start)) *flags |= LIBFLAG_FCONTROL; - else if (!strncmpW(start, hiddenW, str-start)) + else if (!strncmpiW(start, hiddenW, str-start)) *flags |= LIBFLAG_FHIDDEN; - else if (!strncmpW(start, hasdiskimageW, str-start)) + else if (!strncmpiW(start, hasdiskimageW, str-start)) *flags |= LIBFLAG_FHASDISKIMAGE; else { diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 73ec679..7adf064 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4806,7 +4806,7 @@ static const char manifest_dep[] = "<assemblyIdentity version=\"1.2.3.4\" name=\"testdep\" type=\"win32\" processorArchitecture=\"" ARCH "\"/>" "<file name=\"test_actctx_tlb.tlb\">" " <typelib tlbid=\"{d96d8a3e-78b6-4c8d-8f27-059db959be8a}\" version=\"2.7\" helpdir=\"\" resourceid=\"409\"" -" flags=\"RESTRICTED,CONTROL\"" +" flags=\"Restricted,cONTROL\"" " />" "</file>" "<file name=\"test_actctx_tlb2.tlb\">"

1 0

Nikolay Sivov : oleaut32: Some tests for IFontEventsDisp change event.
by Alexandre Julliard Feb. 24, 2014

Feb. 24, 2014

Module: wine Branch: master Commit: 0fb770492d30b8fee4a295a08fc0c98e0b63f12a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb770492d30b8fee4a295a08… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 24 08:17:19 2014 +0400 oleaut32: Some tests for IFontEventsDisp change event. --- dlls/oleaut32/olefont.c | 5 +- dlls/oleaut32/tests/olefont.c | 167 +++++++++++++++++++++++++++++++---------- 2 files changed, 130 insertions(+), 42 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index bf69950..7f8ab5d 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -388,7 +388,7 @@ static void OLEFont_SendNotify(OLEFontImpl* this, DISPID dispID) static const WCHAR wszUnder[] = {'U','n','d','e','r','l','i','n','e',0}; static const WCHAR wszStrike[] = {'S','t','r','i','k','e','t','h','r','o','u','g','h',0}; static const WCHAR wszWeight[] = {'W','e','i','g','h','t',0}; - static const WCHAR wszCharset[] = {'C','h','a','r','s','s','e','t',0}; + static const WCHAR wszCharset[] = {'C','h','a','r','s','e','t',0}; static const LPCWSTR dispid_mapping[] = { wszName, @@ -1305,9 +1305,6 @@ static HRESULT WINAPI OLEFontImpl_GetIDsOfNames( /************************************************************************ * OLEFontImpl_Invoke (IDispatch) * - * Note: Do not call _put_Xxx methods, since setting things here - * should not call notify functions as I found out debugging the generic - * MS VB5 installer. */ static HRESULT WINAPI OLEFontImpl_Invoke( IDispatch* iface, diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 0eab729..53afc8d 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -261,10 +261,7 @@ static void test_type_info(void) IFontDisp_Release(fontdisp); } -static HRESULT WINAPI FontEventsDisp_QueryInterface( - IFontEventsDisp *iface, - /* [in] */ REFIID riid, - /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject) +static HRESULT WINAPI FontEventsDisp_QueryInterface(IFontEventsDisp *iface, REFIID riid, void **ppvObject) { if (IsEqualIID(riid, &IID_IFontEventsDisp) || IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDispatch)) { @@ -291,26 +288,48 @@ static ULONG WINAPI FontEventsDisp_Release( return 1; } -static int fonteventsdisp_invoke_called = 0; +static HRESULT WINAPI FontEventsDisp_GetTypeInfoCount(IFontEventsDisp *iface, UINT *pctinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI FontEventsDisp_GetTypeInfo(IFontEventsDisp *iface, UINT itinfo, LCID lcid, ITypeInfo **pptinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI FontEventsDisp_GetIDsOfNames(IFontEventsDisp *iface, REFIID riid, LPOLESTR *names, UINT cNames, LCID lcid, + DISPID *dispid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static int fonteventsdisp_invoke_called; +static BSTR fonteventsdisp_invoke_arg0; static HRESULT WINAPI FontEventsDisp_Invoke( - IFontEventsDisp __RPC_FAR * iface, - /* [in] */ DISPID dispIdMember, - /* [in] */ REFIID riid, - /* [in] */ LCID lcid, - /* [in] */ WORD wFlags, - /* [out][in] */ DISPPARAMS __RPC_FAR *pDispParams, - /* [out] */ VARIANT __RPC_FAR *pVarResult, - /* [out] */ EXCEPINFO __RPC_FAR *pExcepInfo, - /* [out] */ UINT __RPC_FAR *puArgErr) + IFontEventsDisp *iface, + DISPID dispid, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr) { - static const WCHAR wszBold[] = {'B','o','l','d',0}; - ok(wFlags == INVOKE_FUNC, "invoke flags should have been INVOKE_FUNC instead of 0x%x\n", wFlags); - ok(dispIdMember == DISPID_FONT_CHANGED, "dispIdMember should have been DISPID_FONT_CHANGED instead of 0x%x\n", dispIdMember); - ok(pDispParams->cArgs == 1, "pDispParams->cArgs should have been 1 instead of %d\n", pDispParams->cArgs); - ok(V_VT(&pDispParams->rgvarg[0]) == VT_BSTR, "VT of first param should have been VT_BSTR instead of %d\n", V_VT(&pDispParams->rgvarg[0])); - ok(!lstrcmpW(V_BSTR(&pDispParams->rgvarg[0]), wszBold), "String in first param should have been \"Bold\"\n"); + VARIANTARG *arg0 = &pDispParams->rgvarg[0]; + + ok(dispid == DISPID_FONT_CHANGED, "expected DISPID_FONT_CHANGED instead of 0x%x\n", dispid); + ok(IsEqualGUID(riid, &GUID_NULL), "got riid %s\n", wine_dbgstr_guid(riid)); + ok(wFlags == INVOKE_FUNC, "expected INVOKE_FUNC instead of 0x%x\n", wFlags); + ok(pDispParams->cArgs == 1, "expected arg count 1, got %d\n", pDispParams->cArgs); + ok(V_VT(arg0) == VT_BSTR, "expected VT_BSTR, got %d\n", V_VT(arg0)); + fonteventsdisp_invoke_arg0 = SysAllocString(V_BSTR(arg0)); fonteventsdisp_invoke_called++; return S_OK; } @@ -320,16 +339,43 @@ static IFontEventsDispVtbl FontEventsDisp_Vtbl = FontEventsDisp_QueryInterface, FontEventsDisp_AddRef, FontEventsDisp_Release, - NULL, - NULL, - NULL, + FontEventsDisp_GetTypeInfoCount, + FontEventsDisp_GetTypeInfo, + FontEventsDisp_GetIDsOfNames, FontEventsDisp_Invoke }; static IFontEventsDisp FontEventsDisp = { &FontEventsDisp_Vtbl }; + struct font_dispid + { + DISPID dispid; + const WCHAR *name; + }; + static void test_font_events_disp(void) { + static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR sizeW[] = {'S','i','z','e',0}; + static const WCHAR boldW[] = {'B','o','l','d',0}; + static const WCHAR italicW[] = {'I','t','a','l','i','c',0}; + static const WCHAR underlineW[] = {'U','n','d','e','r','l','i','n','e',0}; + static const WCHAR strikeW[] = {'S','t','r','i','k','e','t','h','r','o','u','g','h',0}; + static const WCHAR weightW[] = {'W','e','i','g','h','t',0}; + static const WCHAR charsetW[] = {'C','h','a','r','s','e','t',0}; + + static const struct font_dispid font_dispids[] = + { + { DISPID_FONT_NAME, nameW }, + { DISPID_FONT_SIZE, sizeW }, + { DISPID_FONT_BOLD, boldW }, + { DISPID_FONT_ITALIC, italicW }, + { DISPID_FONT_UNDER, underlineW }, + { DISPID_FONT_STRIKE, strikeW }, + { DISPID_FONT_WEIGHT, weightW }, + { DISPID_FONT_CHARSET, charsetW } + }; + IFont *pFont; IFont *pFont2; IConnectionPointContainer *pCPC; @@ -340,6 +386,7 @@ static void test_font_events_disp(void) IFontDisp *pFontDisp; DISPPARAMS dispparams; VARIANTARG vararg; + INT i; fontdesc.cbSizeofstruct = sizeof(fontdesc); fontdesc.lpstrName = MSSansSerif_font; @@ -364,6 +411,7 @@ static void test_font_events_disp(void) EXPECT_HR(hr, S_OK); IConnectionPoint_Release(pCP); + fonteventsdisp_invoke_called = 0; hr = IFont_put_Bold(pFont, TRUE); EXPECT_HR(hr, S_OK); @@ -372,30 +420,73 @@ static void test_font_events_disp(void) hr = IFont_QueryInterface(pFont, &IID_IFontDisp, (void **)&pFontDisp); EXPECT_HR(hr, S_OK); - V_VT(&vararg) = VT_BOOL; - V_BOOL(&vararg) = VARIANT_FALSE; - dispparams.cNamedArgs = 0; - dispparams.rgdispidNamedArgs = NULL; - dispparams.cArgs = 1; - dispparams.rgvarg = &vararg; - hr = IFontDisp_Invoke(pFontDisp, DISPID_FONT_BOLD, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, NULL); - EXPECT_HR(hr, S_OK); + for (i = 0; i < sizeof(font_dispids)/sizeof(font_dispids[0]); i++) + { + switch (font_dispids[i].dispid) + { + case DISPID_FONT_NAME: + { + static const WCHAR arialW[] = {'A','r','i','a','l',0}; + V_VT(&vararg) = VT_BSTR; + V_BSTR(&vararg) = SysAllocString(arialW); + break; + } + case DISPID_FONT_SIZE: + V_VT(&vararg) = VT_CY; + V_CY(&vararg).Lo = 25; + V_CY(&vararg).Hi = 0; + break; + case DISPID_FONT_BOLD: + V_VT(&vararg) = VT_BOOL; + V_BOOL(&vararg) = VARIANT_FALSE; + break; + case DISPID_FONT_ITALIC: + case DISPID_FONT_UNDER: + case DISPID_FONT_STRIKE: + V_VT(&vararg) = VT_BOOL; + V_BOOL(&vararg) = VARIANT_TRUE; + break; + case DISPID_FONT_WEIGHT: + V_VT(&vararg) = VT_I2; + V_I2(&vararg) = FW_BLACK; + break; + case DISPID_FONT_CHARSET: + V_VT(&vararg) = VT_I2; + V_I2(&vararg) = 1; + break; + default: + ; + } - IFontDisp_Release(pFontDisp); + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.cArgs = 1; + dispparams.rgvarg = &vararg; + fonteventsdisp_invoke_called = 0; + hr = IFontDisp_Invoke(pFontDisp, font_dispids[i].dispid, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dispparams, NULL, NULL, NULL); + ok(hr == S_OK, "dispid=%d, got 0x%08x\n", font_dispids[i].dispid, hr); + ok(fonteventsdisp_invoke_called == 1, "dispid=%d, DISPID_FONT_CHANGED not called, got %d\n", font_dispids[i].dispid, + fonteventsdisp_invoke_called); + if (hr == S_OK) + { + ok(!lstrcmpW(font_dispids[i].name, fonteventsdisp_invoke_arg0), "dispid=%d, got %s, expected %s\n", + font_dispids[i].dispid, wine_dbgstr_w(fonteventsdisp_invoke_arg0), wine_dbgstr_w(font_dispids[i].name)); + SysFreeString(fonteventsdisp_invoke_arg0); + } + VariantClear(&vararg); + } - ok(fonteventsdisp_invoke_called == 2, "IFontEventDisp::Invoke was called %d times instead of twice\n", - fonteventsdisp_invoke_called); + IFontDisp_Release(pFontDisp); hr = IFont_Clone(pFont, &pFont2); EXPECT_HR(hr, S_OK); IFont_Release(pFont); + /* this test shows that the notification routine isn't called again */ + fonteventsdisp_invoke_called = 0; hr = IFont_put_Bold(pFont2, FALSE); EXPECT_HR(hr, S_OK); - - /* this test shows that the notification routine isn't called again */ - ok(fonteventsdisp_invoke_called == 2, "IFontEventDisp::Invoke was called %d times instead of twice\n", - fonteventsdisp_invoke_called); + ok(fonteventsdisp_invoke_called == 0, "got %d\n", fonteventsdisp_invoke_called); IFont_Release(pFont2); }

1 0

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

Feb. 24, 2014

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