wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Alexandre Julliard : comctl32/imagelist: Don' t pre-multiply the stored image, do it only at blending time.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 15efbc892b511e16918f576f7f0e70a8d9ef8fdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=15efbc892b511e16918f576f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 18 12:44:35 2010 +0200 comctl32/imagelist: Don't pre-multiply the stored image, do it only at blending time. --- dlls/comctl32/imagelist.c | 42 +++++++++++++++++------------------------- 1 files changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index c1ea00a..27d95f5 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -212,20 +212,6 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, { if (himl->has_alpha) himl->has_alpha[pos + n] = 1; - /* pre-multiply by the alpha channel */ - for (i = 0; i < height; i++) - { - for (j = n * width; j < (n + 1) * width; j++) - { - DWORD argb = bits[i * bm.bmWidth + j]; - DWORD alpha = argb >> 24; - bits[i * bm.bmWidth + j] = ((argb & 0xff000000) | - (((argb & 0x00ff0000) * alpha / 255) & 0x00ff0000) | - (((argb & 0x0000ff00) * alpha / 255) & 0x0000ff00) | - (((argb & 0x000000ff) * alpha / 255))); - } - } - if (mask_info && himl->hbmMask) /* generate the mask from the alpha channel */ { for (i = 0; i < height; i++) @@ -247,6 +233,7 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, done: if (hdcMask) DeleteDC( hdcMask ); HeapFree( GetProcessHeap(), 0, info ); + HeapFree( GetProcessHeap(), 0, mask_info ); HeapFree( GetProcessHeap(), 0, bits ); HeapFree( GetProcessHeap(), 0, mask_bits ); return ret; @@ -1195,7 +1182,19 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des SelectObject( hdc, bmp ); BitBlt( hdc, 0, 0, cx, cy, himl->hdcImage, src_x, src_y, SRCCOPY ); - if (himl->hbmMask) + if (himl->uBitsPixel == 32) /* we already have an alpha channel in this case */ + { + /* pre-multiply by the alpha channel */ + for (i = 0, ptr = bits; i < cx * cy; i++, ptr++) + { + DWORD alpha = *ptr >> 24; + *ptr = ((*ptr & 0xff000000) | + (((*ptr & 0x00ff0000) * alpha / 255) & 0x00ff0000) | + (((*ptr & 0x0000ff00) * alpha / 255) & 0x0000ff00) | + (((*ptr & 0x000000ff) * alpha / 255))); + } + } + else if (himl->hbmMask) { unsigned int width_bytes = (cx + 31) / 32 * 4; /* generate alpha channel from the mask */ @@ -1311,12 +1310,8 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) if (bIsTransparent) { - if (himl->uBitsPixel == 32) /* we already have an alpha channel in this case */ - bResult = GdiAlphaBlend( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, - himl->hdcImage, pt.x, pt.y, cx, cy, func ); - else - bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, - pt.x, pt.y, cx, cy, func ); + bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, + pt.x, pt.y, cx, cy, func ); goto end; } colour = pimldp->rgbBk; @@ -1325,10 +1320,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) hOldBrush = SelectObject (hImageDC, CreateSolidBrush (colour)); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); - if (himl->uBitsPixel == 32) - GdiAlphaBlend( hImageDC, 0, 0, cx, cy, himl->hdcImage, pt.x, pt.y, cx, cy, func ); - else - alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func ); + alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func ); DeleteObject (SelectObject (hImageDC, hOldBrush)); bResult = BitBlt( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, hImageDC, 0, 0, SRCCOPY ); goto end;

1 0

Nikolay Sivov : ole32: Use window property to store registered drop target.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 2c80e14eecc8baa71cda2ce777a650da955abda0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c80e14eecc8baa71cda2ce77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 18 02:21:49 2010 +0400 ole32: Use window property to store registered drop target. --- dlls/ole32/compobj.c | 1 - dlls/ole32/ole2.c | 187 ++++++++++++++----------------------------- dlls/ole32/tests/dragdrop.c | 4 + 3 files changed, 63 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c80e14eecc8baa71cda2…

1 0

Maarten Lankhorst : quartz: Forward IMediaFilter to IMediaControl.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 5568f33db321b851e079722ddee8b4e08077aff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5568f33db321b851e079722dd… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon May 17 21:34:11 2010 +0200 quartz: Forward IMediaFilter to IMediaControl. --- dlls/quartz/filtergraph.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 3e9a1da..66a9a95 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -5055,30 +5055,26 @@ static HRESULT WINAPI MediaFilter_GetClassID(IMediaFilter *iface, CLSID * pClass static HRESULT WINAPI MediaFilter_Stop(IMediaFilter *iface) { - FIXME("(): stub\n"); - - return E_NOTIMPL; + ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + return MediaControl_Stop((IMediaControl*)&This->IMediaControl_vtbl); } static HRESULT WINAPI MediaFilter_Pause(IMediaFilter *iface) { - FIXME("(): stub\n"); - - return E_NOTIMPL; + ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + return MediaControl_Pause((IMediaControl*)&This->IMediaControl_vtbl); } static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME tStart) { - FIXME("(0x%s): stub\n", wine_dbgstr_longlong(tStart)); - - return E_NOTIMPL; + ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + return MediaControl_Run((IMediaControl*)&This->IMediaControl_vtbl); } static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD dwMsTimeout, FILTER_STATE * pState) { - FIXME("(%d, %p): stub\n", dwMsTimeout, pState); - - return E_NOTIMPL; + ICOM_THIS_MULTI(IFilterGraphImpl, IMediaFilter_vtbl, iface); + return MediaControl_GetState((IMediaControl*)&This->IMediaControl_vtbl, dwMsTimeout, (OAFilterState*)pState); } static HRESULT WINAPI MediaFilter_SetSyncSource(IMediaFilter *iface, IReferenceClock *pClock)

1 0

Maarten Lankhorst : quartz: Implement IBasicVideo get_AvgTimePerFrame.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 44827a0336af4838940a81362c7918dfd8e68d0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=44827a0336af4838940a81362… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon May 17 21:32:32 2010 +0200 quartz: Implement IBasicVideo get_AvgTimePerFrame. --- dlls/quartz/videorenderer.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index b31959e..ed8f24e 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -1176,10 +1176,25 @@ static HRESULT WINAPI Basicvideo_Invoke(IBasicVideo *iface, /*** IBasicVideo methods ***/ static HRESULT WINAPI Basicvideo_get_AvgTimePerFrame(IBasicVideo *iface, REFTIME *pAvgTimePerFrame) { + AM_MEDIA_TYPE *pmt; ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); - FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pAvgTimePerFrame); + if (!This->pInputPin->pin.pConnectedTo) + return VFW_E_NOT_CONNECTED; + TRACE("(%p/%p)->(%p)\n", This, iface, pAvgTimePerFrame); + + pmt = &This->pInputPin->pin.mtCurrent; + if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) { + VIDEOINFOHEADER *vih = (VIDEOINFOHEADER*)pmt->pbFormat; + *pAvgTimePerFrame = vih->AvgTimePerFrame; + } else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) { + VIDEOINFOHEADER2 *vih = (VIDEOINFOHEADER2*)pmt->pbFormat; + *pAvgTimePerFrame = vih->AvgTimePerFrame; + } else { + ERR("Unknown format type %s\n", qzdebugstr_guid(&pmt->formattype)); + *pAvgTimePerFrame = 0; + } return S_OK; }

1 0

Maarten Lankhorst : includes: Fix typo.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: a0152bb161527bb0f79228140f6e4bed17e18090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0152bb161527bb0f79228140… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri May 14 23:19:35 2010 +0200 includes: Fix typo. --- include/ksmedia.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/ksmedia.h b/include/ksmedia.h index c78aa91..da69b31 100644 --- a/include/ksmedia.h +++ b/include/ksmedia.h @@ -31,7 +31,7 @@ DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0 #define KSAUDIO_SPEAKER_STEREO (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT) #define KSAUDIO_SPEAKER_QUAD (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) #define KSAUDIO_SPEAKER_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_BACK_CENTER) -#define KSAUDIO_SPEAKER_5POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOWFREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) +#define KSAUDIO_SPEAKER_5POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) #define KSAUDIO_SPEAKER_7POINT1 (KSAUDIO_SPEAKER_5POINT1 | SPEAKER_FRONT_LEFT_OF_CENTER | SPEAKER_FRONT_RIGHT_OF_CENTER) #ifndef REFERENCE_TIME_DEFINED

1 0

Matej Špindler : jscript: Add Slovenian translation.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 515b15233ea05ef54d86082f2b646594c5cf770a URL: http://source.winehq.org/git/wine.git/?a=commit;h=515b15233ea05ef54d86082f2… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Mon May 17 20:02:31 2010 +0200 jscript: Add Slovenian translation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jscript_Si.rc | 49 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 3d3ffff..932dabe 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -14,6 +14,7 @@ RC_SRCS = \ jscript_Nl.rc \ jscript_Pt.rc \ jscript_Ru.rc \ + jscript_Si.rc \ rsrc.rc C_SRCS = \ diff --git a/dlls/jscript/jscript_Si.rc b/dlls/jscript/jscript_Si.rc new file mode 100644 index 0000000..0ddeab1 --- /dev/null +++ b/dlls/jscript/jscript_Si.rc @@ -0,0 +1,49 @@ +/* + * Copyright 2010 Matej Spindler + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TO_PRIMITIVE "Napaka med spreminjanjem v primitivni tip" + IDS_INVALID_CALL_ARG "Napačen klic postopka ali argument" + IDS_CREATE_OBJ_ERROR "Avtomatizacijski server ne more ustvariti objekta" + IDS_NO_PROPERTY "Objekt ne podpira atributa ali metode" + IDS_ARG_NOT_OPT "Argument je obvezen" + IDS_SYNTAX_ERROR "Napačna sintaksa" + IDS_SEMICOLON "Pričakujem ';'" + IDS_LBRACKET "Pričakujem '('" + IDS_RBRACKET "Pričakujem ')'" + IDS_UNTERMINATED_STR "Nezaključen niz" + IDS_NOT_FUNC "Pričakujem funkcijo" + IDS_NOT_DATE "'[object]' ni date objekt" + IDS_NOT_NUM "Pričakujem število" + IDS_OBJECT_EXPECTED "Pričakujem objekt" + IDS_ILLEGAL_ASSIGN "Napačna prireditev" + IDS_UNDEFINED "'|' je nedifiniran" + IDS_NOT_BOOL "Pričakujem Boolean objekt" + IDS_JSCRIPT_EXPECTED "Pričakujem JScript objekt" + IDS_REGEXP_SYNTAX_ERROR "Napačna sintaksa v regularnem izrazu" + IDS_URI_INVALID_CHAR "URI vsebuje neveljavne znake" + IDS_INVALID_LENGTH "Dožina polja mora bit pozitivno celo število" + IDS_ARRAY_EXPECTED "Pričakujem Array objekt" +}

1 0

Matej Špindler : wininet: Update Slovenian translation .
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 4ed5079b676550765eb5f4885afd2ea1cb49f553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed5079b676550765eb5f4885… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Mon May 17 18:40:15 2010 +0200 wininet: Update Slovenian translation. --- dlls/wininet/wininet_Si.rc | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/wininet_Si.rc b/dlls/wininet/wininet_Si.rc index b5bf291..488104e 100644 --- a/dlls/wininet/wininet_Si.rc +++ b/dlls/wininet/wininet_Si.rc @@ -27,11 +27,11 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Vnos omrežnega gesla" FONT 8, "MS Shell Dlg" { - LTEXT "Vnesite uporabniško ime in geslo:", -1, 40, 6, 150, 15 - LTEXT "Proksi", -1, 40, 26, 50, 10 - LTEXT "Kraljestvo", -1, 40, 46, 50, 10 - LTEXT "Uporabniško ime", -1, 40, 66, 50, 10 - LTEXT "Geslo", -1, 40, 86, 50, 10 + LTEXT "Vnesite uporabniško ime in geslo:", -1, 20, 6, 150, 15 + LTEXT "Proksi", -1, 20, 26, 50, 10 + LTEXT "Področje", -1, 20, 46, 50, 10 + LTEXT "Uporabniško ime", -1, 20, 66, 55, 10 + LTEXT "Geslo", -1, 20, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP @@ -42,6 +42,26 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Prekliči", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Authentication Required" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Vnesite uporabniško ime in geslo:", -1, 20, 6, 150, 15 + LTEXT "Server", -1, 20, 26, 50, 10 + LTEXT "Področje", -1, 20, 46, 50, 10 + LTEXT "Uporabniško ime", -1, 20, 66, 55, 10 + LTEXT "Geslo", -1, 20, 86, 50, 10 + LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Shrani geslo (nezaščiteno)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "V redu", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Prekliči", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "LAN povezava"

1 0

Jacek Caban : shobjidl.idl: Added NWMF declaration.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 9795e7a57052d55abd1d62f07ae8941f2cc9e781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9795e7a57052d55abd1d62f07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 17 20:16:30 2010 +0200 shobjidl.idl: Added NWMF declaration. --- include/shobjidl.idl | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 7c4fb78..a106248 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -372,7 +372,17 @@ interface IShellItem : IUnknown [out] int *piOrder); } - +typedef enum tagNWMF { + NWMF_UNLOADING = 0x0001, + NWMF_USERINITED = 0x0002, + NWMF_FIRST = 0x0004, + NWMF_OVERRIDEKEY = 0x0008, + NWMF_SHOWHELP = 0x0010, + NWMF_HTMLDIALOG = 0x0020, + NWMF_FROMDIALOGCHILD = 0x0040, + NWMF_USERREQUESTED = 0x0080, + NWMF_USERALLOWED = 0x0100 +} NWMF; /***************************************************************************** * FOLDERSETTINGS

1 0

Jacek Caban : exdisp.idl: Added missing DWebBrowserEvents2 methods.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: c38c3d5aaa20765c83d5b01f8e92f7748535b89f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38c3d5aaa20765c83d5b01f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 17 20:15:42 2010 +0200 exdisp.idl: Added missing DWebBrowserEvents2 methods. --- include/exdisp.idl | 35 +++++++++++++++++++++++++++++++++++ include/exdispid.h | 7 +++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/include/exdisp.idl b/include/exdisp.idl index 363e61a..808663e 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -433,6 +433,41 @@ dispinterface DWebBrowserEvents2 [id(DISPID_PRIVACYIMPACTEDSTATECHANGE)] void PrivacyImpactedStateChange([in] VARIANT_BOOL bImpacted); + + [id(DISPID_NEWWINDOW3)] + void NewWindow3( + [in, out] IDispatch **ppDisp, + [in, out] VARIANT_BOOL *Cancel, + [in] DWORD dwFlags, + [in] BSTR bstrUrlContext, + [in] BSTR bstrUrl); + + [id(DISPID_SETPHISHINGFILTERSTATUS)] + void SetPhishingFilterStatus([in] long PhishingFilterStatus); + + [id(DISPID_WINDOWSTATECHANGED)] + void WindowStateChanged( + [in] DWORD dwWindowStateFlags, + [in] DWORD dwValidFlagsMask); + + [id(DISPID_NEWPROCESS)] + void NewProcess( + [in] long lCauseFlag, + [in] IDispatch *pWB2, + [in, out] VARIANT_BOOL *Cancel); + + [id(DISPID_THIRDPARTYURLBLOCKED)] + void ThirdPartyUrlBlocked( + [in] VARIANT *URL, + [in] DWORD dwCount); + + [id(DISPID_REDIRECTXDOMAINBLOCKED)] + void RedirectXDomainBlocked( + [in] IDispatch *pDisp, + [in] VARIANT *StartURL, + [in] VARIANT *RedirectURL, + [in] VARIANT *Frame, + [in] VARIANT *StatusCode); } [ diff --git a/include/exdispid.h b/include/exdispid.h index 2f02f8a..232cee6 100644 --- a/include/exdispid.h +++ b/include/exdispid.h @@ -63,6 +63,13 @@ #define DISPID_FILEDOWNLOAD 270 #define DISPID_NAVIGATEERROR 271 #define DISPID_PRIVACYIMPACTEDSTATECHANGE 272 +#define DISPID_NEWWINDOW3 273 +#define DISPID_VIEWUPDATE 281 +#define DISPID_SETPHISHINGFILTERSTATUS 282 +#define DISPID_WINDOWSTATECHANGED 283 +#define DISPID_NEWPROCESS 284 +#define DISPID_THIRDPARTYURLBLOCKED 285 +#define DISPID_REDIRECTXDOMAINBLOCKED 286 #define DISPID_PRINTTEMPLATEINSTANTIATION 225 #define DISPID_PRINTTEMPLATETEARDOWN 226

1 0

Juan Lang : wintrust/tests: Fix test failures when not running as administrator.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 0b7711e545e2aa8d43049114b8a823112212486c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b7711e545e2aa8d43049114b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon May 17 10:44:11 2010 -0700 wintrust/tests: Fix test failures when not running as administrator. --- dlls/wintrust/tests/crypt.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 64a91b7..68a9ebc 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -233,7 +233,12 @@ static void test_context(void) */ ret = pCryptCATAdminAcquireContext(&hca, &dummy, 0); - ok(ret, "Expected success\n"); + ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "CryptCATAdminAcquireContext failed %u\n", GetLastError()); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip("Not running as administrator\n"); + return; + } ok(hca != NULL, "Expected a context handle, got NULL\n"); attrs = GetFileAttributes(catroot); @@ -492,7 +497,12 @@ static void test_CryptCATAdminAddRemoveCatalog(void) CloseHandle(file); ret = pCryptCATAdminAcquireContext(&hcatadmin, &dummy, 0); - ok(ret, "CryptCATAdminAcquireContext failed %u\n", GetLastError()); + ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "CryptCATAdminAcquireContext failed %u\n", GetLastError()); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip("Not running as administrator\n"); + return; + } SetLastError(0xdeadbeef); hcatinfo = pCryptCATAdminAddCatalog(NULL, NULL, NULL, 0);

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2010