August 2012 - Wine-Commits - list.winehq.org

Michael Stefaniuc : comdlg32: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: df158e43791c935f09322ae8dc763e97a2dc59a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df158e43791c935f09322ae8d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 21:01:59 2012 +0200 comdlg32: Avoid TRUE:FALSE conditional expressions. --- dlls/comdlg32/filedlg31.c | 2 +- dlls/comdlg32/printdlg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index b3d1c51..3feb106 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -492,7 +492,7 @@ static LRESULT FD31_TestPath( const FD31_DATA *lfs, LPWSTR path ) TRACE("path=%s, tmpstr2=%s\n", debugstr_w(path), debugstr_w(tmpstr2)); SetDlgItemTextW( hWnd, edt1, tmpstr2 ); FD31_ScanDir(lfs->ofnW, hWnd, path); - return (lfs->ofnW->Flags & OFN_NOVALIDATE) ? TRUE : FALSE; + return (lfs->ofnW->Flags & OFN_NOVALIDATE) != 0; } /* no wildcards, we might have a directory or a filename */ diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 57b077b..2d80fd5 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2190,7 +2190,7 @@ static BOOL PRINTDLG_CreateDCA(LPPRINTDLGA lppd) } GlobalUnlock(lppd->hDevNames); GlobalUnlock(lppd->hDevMode); - return lppd->hDC ? TRUE : FALSE; + return lppd->hDC != NULL; } static BOOL PRINTDLG_CreateDCW(LPPRINTDLGW lppd) @@ -2211,7 +2211,7 @@ static BOOL PRINTDLG_CreateDCW(LPPRINTDLGW lppd) } GlobalUnlock(lppd->hDevNames); GlobalUnlock(lppd->hDevMode); - return lppd->hDC ? TRUE : FALSE; + return lppd->hDC != NULL; } /***********************************************************************

1 0

Michael Stefaniuc : oledlg: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: eeed445f448d33cd1de21ac2cea466b2fe96d85b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeed445f448d33cd1de21ac2c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 21:29:34 2012 +0200 oledlg: Avoid TRUE:FALSE conditional expressions. --- dlls/oledlg/insobjdlg.c | 4 ++-- dlls/oledlg/pastespl.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index c801fba..75ca77b 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -233,8 +233,8 @@ static void UIINSERTOBJECTDLG_InitDialog(InsertObjectDlgInfo* pdlgInfo) IOF_SHOWINSERTCONTROL) ? SW_SHOW : SW_HIDE); ShowWindow(pdlgInfo->hwndDisplayIconCB, (pdlgInfo->lpOleUIInsertObject->dwFlags & IOF_CHECKDISPLAYASICON) ? SW_SHOW : SW_HIDE); - EnableWindow(pdlgInfo->hwndDisplayIconCB, (pdlgInfo->lpOleUIInsertObject->dwFlags & - IOF_DISABLEDISPLAYASICON) ? FALSE : TRUE); + EnableWindow(pdlgInfo->hwndDisplayIconCB, !(pdlgInfo->lpOleUIInsertObject->dwFlags & + IOF_DISABLEDISPLAYASICON)); if (pdlgInfo->lpOleUIInsertObject->dwFlags & IOF_SELECTCREATECONTROL) UIINSERTOBJECTDLG_SelectCreateCtrl(pdlgInfo); diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index a487db7..1dba9583 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -252,7 +252,7 @@ static DWORD init_pastelist(HWND hdlg, OLEUIPASTESPECIALW *ps) } IEnumFORMATETC_Release(penum); - EnableWindow(GetDlgItem(hdlg, IDC_PS_PASTE), items_added ? TRUE : FALSE); + EnableWindow(GetDlgItem(hdlg, IDC_PS_PASTE), items_added != 0); return items_added; } @@ -287,7 +287,7 @@ static DWORD init_linklist(HWND hdlg, OLEUIPASTESPECIALW *ps) } } - EnableWindow(GetDlgItem(hdlg, IDC_PS_PASTELINK), items_added ? TRUE : FALSE); + EnableWindow(GetDlgItem(hdlg, IDC_PS_PASTELINK), items_added != 0); return items_added; } @@ -495,7 +495,7 @@ static void update_structure(HWND hdlg, ps_struct_t *ps_struct) ps_struct->ps->nSelectedIndex = pent->dwScratchSpace; } ps_struct->ps->dwFlags = ps_struct->flags; - ps_struct->ps->fLink = (ps_struct->flags & PSF_SELECTPASTELINK) ? TRUE : FALSE; + ps_struct->ps->fLink = (ps_struct->flags & PSF_SELECTPASTELINK) != 0; } static void free_structure(ps_struct_t *ps_struct)

1 0

Michael Stefaniuc : msvcrt: Aoid TRUE:FALSE conditional expressions.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 0409b9895ce48496e4391878a6e2ba7b594822e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0409b9895ce48496e4391878a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 21:25:57 2012 +0200 msvcrt: Aoid TRUE:FALSE conditional expressions. --- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/wcs.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c07ae30..59b7eb8 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1771,7 +1771,7 @@ int CDECL MSVCRT__sopen_s( int *fd, const char *path, int oflags, int shflags, i sa.nLength = sizeof( SECURITY_ATTRIBUTES ); sa.lpSecurityDescriptor = NULL; - sa.bInheritHandle = (oflags & MSVCRT__O_NOINHERIT) ? FALSE : TRUE; + sa.bInheritHandle = !(oflags & MSVCRT__O_NOINHERIT); hand = CreateFileA(path, access, sharing, &sa, creation, attrib, 0); if (hand == INVALID_HANDLE_VALUE) { @@ -1885,7 +1885,7 @@ int CDECL MSVCRT__wsopen_s( int *fd, const MSVCRT_wchar_t* path, int oflags, int sa.nLength = sizeof( SECURITY_ATTRIBUTES ); sa.lpSecurityDescriptor = NULL; - sa.bInheritHandle = (oflags & MSVCRT__O_NOINHERIT) ? FALSE : TRUE; + sa.bInheritHandle = !(oflags & MSVCRT__O_NOINHERIT); hand = CreateFileW(path, access, sharing, &sa, creation, attrib, 0); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index d9fb0a5..32ee76b 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -50,7 +50,7 @@ int CDECL MSVCRT__get_printf_count_output( void ) int CDECL MSVCRT__set_printf_count_output( int enable ) { BOOL old = n_format_enabled; - n_format_enabled = (enable ? TRUE : FALSE); + n_format_enabled = enable != 0; return old ? 1 : 0; }

1 0

Michael Stefaniuc : comctl32: Get rid of two macros.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 11d35ef8e72ef5cfb676fb57d0c102f79bec7347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d35ef8e72ef5cfb676fb57d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 20:58:35 2012 +0200 comctl32: Get rid of two macros. --- dlls/comctl32/toolbar.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index cd19a58..382161c 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -217,9 +217,6 @@ typedef enum #define TOOLBAR_NOWHERE (-1) -#define TOOLBAR_HasText(x, y) (TOOLBAR_GetText(x, y) ? TRUE : FALSE) -#define TOOLBAR_HasDropDownArrows(exStyle) ((exStyle & TBSTYLE_EX_DRAWDDARROWS) ? TRUE : FALSE) - /* Used to find undocumented extended styles */ #define TBSTYLE_EX_ALL (TBSTYLE_EX_DRAWDDARROWS | \ TBSTYLE_EX_UNDOC1 | \ @@ -258,6 +255,11 @@ static inline int default_top_margin(const TOOLBAR_INFO *infoPtr) return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); } +static inline BOOL TOOLBAR_HasDropDownArrows(DWORD exStyle) +{ + return (exStyle & TBSTYLE_EX_DRAWDDARROWS) != 0; +} + static LPWSTR TOOLBAR_GetText(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *btnPtr) { @@ -1247,7 +1249,7 @@ TOOLBAR_CalcStrings (const TOOLBAR_INFO *infoPtr, LPSIZE lpSize) btnPtr = infoPtr->buttons; for (i = 0; i < infoPtr->nNumButtons; i++, btnPtr++) { - if(TOOLBAR_HasText(infoPtr, btnPtr)) + if(TOOLBAR_GetText(infoPtr, btnPtr)) { TOOLBAR_MeasureString(infoPtr, btnPtr, hdc, &sz); if (sz.cx > lpSize->cx)

1 0

Jacek Caban : oleaut32/tests: Use proper helpers for iface calls.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 5a31c1a8814f7de78fe3430fa5a527c450c77f26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a31c1a8814f7de78fe3430fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:12:24 2012 +0200 oleaut32/tests: Use proper helpers for iface calls. --- dlls/oleaut32/tests/olefont.c | 2 +- dlls/oleaut32/tests/typelib.c | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 6fc1520..2482554 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -236,7 +236,7 @@ static HRESULT WINAPI FontEventsDisp_QueryInterface( { if (IsEqualIID(riid, &IID_IFontEventsDisp) || IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDispatch)) { - IUnknown_AddRef(iface); + IFontEventsDisp_AddRef(iface); *ppvObject = iface; return S_OK; } diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 631f6d8..85fd965 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1404,7 +1404,7 @@ static void test_CreateTypeLib(void) { hres = CreateTypeLib2(SYS_WIN32, filenameW, &createtl); ok(hres == S_OK, "got %08x\n", hres); - hres = ICreateTypeLib_QueryInterface(createtl, &IID_ITypeLib, (void**)&tl); + hres = ICreateTypeLib2_QueryInterface(createtl, &IID_ITypeLib, (void**)&tl); ok(hres == S_OK, "got %08x\n", hres); hres = ITypeLib_GetTypeInfo(tl, 0, NULL); @@ -1443,10 +1443,10 @@ static void test_CreateTypeLib(void) { hres = ITypeLib_GetDocumentation(tl, 0, &name, NULL, NULL, NULL); ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); - hres = ICreateTypeLib_SetName(createtl, typelibW); + hres = ICreateTypeLib2_SetName(createtl, typelibW); ok(hres == S_OK, "got %08x\n", hres); - hres = ICreateTypeLib_SetHelpFileName(createtl, helpfileW); + hres = ICreateTypeLib2_SetHelpFileName(createtl, helpfileW); ok(hres == S_OK, "got %08x\n", hres); hres = ITypeLib_GetDocumentation(tl, -1, NULL, NULL, NULL, NULL); @@ -1461,16 +1461,16 @@ static void test_CreateTypeLib(void) { SysFreeString(helpfile); /* invalid parameters */ - hres = ICreateTypeLib_CreateTypeInfo(createtl, NULL, TKIND_INTERFACE, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, NULL, TKIND_INTERFACE, &createti); ok(hres == E_INVALIDARG, "got %08x\n", hres); - hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, NULL); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, NULL); ok(hres == E_INVALIDARG, "got %08x\n", hres); - hres = ICreateTypeLib_CreateTypeInfo(createtl, NULL, TKIND_INTERFACE, NULL); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, NULL, TKIND_INTERFACE, NULL); ok(hres == E_INVALIDARG, "got %08x\n", hres); - hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); ok(hres == S_OK, "got %08x\n", hres); hres = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&interface1); @@ -1977,10 +1977,10 @@ static void test_CreateTypeLib(void) { ITypeInfo2_Release(ti2); ICreateTypeInfo_Release(createti); - hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); ok(hres == TYPE_E_NAMECONFLICT, "got %08x\n", hres); - hres = ICreateTypeLib_CreateTypeInfo(createtl, interface2W, TKIND_INTERFACE, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, interface2W, TKIND_INTERFACE, &createti); ok(hres == S_OK, "got %08x\n", hres); hres = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&interface2); @@ -2030,7 +2030,7 @@ static void test_CreateTypeLib(void) { VariantInit(&cust_data); - hres = ICreateTypeLib_CreateTypeInfo(createtl, interface3W, TKIND_INTERFACE, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, interface3W, TKIND_INTERFACE, &createti); ok(hres == S_OK, "got %08x\n", hres); hres = ICreateTypeInfo_QueryInterface(createti, &IID_ICreateTypeInfo2, (void**)&createti2); @@ -2116,7 +2116,7 @@ static void test_CreateTypeLib(void) { ICreateTypeInfo2_Release(createti2); ICreateTypeInfo_Release(createti); - hres = ICreateTypeLib_CreateTypeInfo(createtl, coclassW, TKIND_COCLASS, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, coclassW, TKIND_COCLASS, &createti); ok(hres == S_OK, "got %08x\n", hres); hres = ICreateTypeInfo_AddRefTypeInfo(createti, interface1, &hreftype); @@ -2183,7 +2183,7 @@ static void test_CreateTypeLib(void) { ICreateTypeInfo_Release(createti); - hres = ICreateTypeLib_CreateTypeInfo(createtl, dualW, TKIND_INTERFACE, &createti); + hres = ICreateTypeLib2_CreateTypeInfo(createtl, dualW, TKIND_INTERFACE, &createti); ok(hres == S_OK, "got %08x\n", hres); hres = ICreateTypeInfo_SetTypeFlags(createti, TYPEFLAG_FDUAL); @@ -2967,18 +2967,18 @@ static void test_SetVarHelpContext(void) V_VT(&v) = VT_INT; V_INT(&v) = 1; U(desc).lpvarValue = &v; - hr = ICreateTypeInfo2_AddVarDesc(cti, 0, &desc); + hr = ICreateTypeInfo_AddVarDesc(cti, 0, &desc); ok(hr == S_OK, "got %08x\n", hr); - hr = ICreateTypeInfo2_SetVarHelpContext(cti, 0, 0); + hr = ICreateTypeInfo_SetVarHelpContext(cti, 0, 0); ok(hr == S_OK, "got %08x\n", hr); /* another time */ - hr = ICreateTypeInfo2_SetVarHelpContext(cti, 0, 1); + hr = ICreateTypeInfo_SetVarHelpContext(cti, 0, 1); ok(hr == S_OK, "got %08x\n", hr); /* wrong index now */ - hr = ICreateTypeInfo2_SetVarHelpContext(cti, 1, 0); + hr = ICreateTypeInfo_SetVarHelpContext(cti, 1, 0); ok(hr == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hr); ICreateTypeInfo_Release(cti); @@ -3090,7 +3090,7 @@ static void test_SetVarDocString(void) V_VT(&v) = VT_INT; V_INT(&v) = 1; U(desc).lpvarValue = &v; - hr = ICreateTypeInfo2_AddVarDesc(cti, 0, &desc); + hr = ICreateTypeInfo_AddVarDesc(cti, 0, &desc); ok(hr == S_OK, "got %08x\n", hr); hr = ICreateTypeInfo_SetVarDocString(cti, 0, NULL); @@ -3104,7 +3104,7 @@ static void test_SetVarDocString(void) ok(hr == S_OK, "got %08x\n", hr); /* wrong index now */ - hr = ICreateTypeInfo2_SetVarDocString(cti, 1, doc1W); + hr = ICreateTypeInfo_SetVarDocString(cti, 1, doc1W); ok(hr == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hr); ICreateTypeInfo_Release(cti);

1 0

Jacek Caban : inetcomm: Use proper iface call helpers.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 1f60e14c78a44d9e4d889619dfc328a9e88b4df1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f60e14c78a44d9e4d889619d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:11:26 2012 +0200 inetcomm: Use proper iface call helpers. --- dlls/inetcomm/imaptransport.c | 14 +++++++------- dlls/inetcomm/mimeole.c | 6 +++--- dlls/inetcomm/pop3transport.c | 4 ++-- dlls/inetcomm/smtptransport.c | 4 ++-- dlls/inetcomm/tests/mimeole.c | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/inetcomm/imaptransport.c b/dlls/inetcomm/imaptransport.c index 4cef083..0da456e 100644 --- a/dlls/inetcomm/imaptransport.c +++ b/dlls/inetcomm/imaptransport.c @@ -50,7 +50,7 @@ static HRESULT WINAPI IMAPTransport_QueryInterface(IIMAPTransport *iface, REFIID IsEqualIID(riid, &IID_IIMAPTransport)) { *ppv = iface; - IUnknown_AddRef(iface); + IIMAPTransport_AddRef(iface); return S_OK; } *ppv = NULL; @@ -443,30 +443,30 @@ HRESULT WINAPI CreateIMAPTransport(IIMAPTransport **ppTransport) return S_OK; } -static HRESULT WINAPI IMAPTransportCF_QueryInterface(LPCLASSFACTORY iface, +static HRESULT WINAPI IMAPTransportCF_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppv) { *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) { *ppv = iface; - IUnknown_AddRef(iface); + IClassFactory_AddRef(iface); return S_OK; } return E_NOINTERFACE; } -static ULONG WINAPI IMAPTransportCF_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI IMAPTransportCF_AddRef(IClassFactory *iface) { return 2; /* non-heap based object */ } -static ULONG WINAPI IMAPTransportCF_Release(LPCLASSFACTORY iface) +static ULONG WINAPI IMAPTransportCF_Release(IClassFactory *iface) { return 1; /* non-heap based object */ } -static HRESULT WINAPI IMAPTransportCF_CreateInstance(LPCLASSFACTORY iface, +static HRESULT WINAPI IMAPTransportCF_CreateInstance(IClassFactory *iface, LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) { HRESULT hr; @@ -489,7 +489,7 @@ static HRESULT WINAPI IMAPTransportCF_CreateInstance(LPCLASSFACTORY iface, return hr; } -static HRESULT WINAPI IMAPTransportCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) +static HRESULT WINAPI IMAPTransportCF_LockServer(IClassFactory *iface, BOOL fLock) { FIXME("(%d), stub!\n",fLock); return S_OK; diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 8a1e3d4..ac4142a 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1448,7 +1448,7 @@ static HRESULT WINAPI MimeMessage_QueryInterface(IMimeMessage *iface, REFIID rii IsEqualIID(riid, &IID_IMimeMessage)) { *ppv = iface; - IUnknown_AddRef(iface); + IMimeMessage_AddRef(iface); return S_OK; } @@ -2619,7 +2619,7 @@ static HRESULT WINAPI MimeSecurity_QueryInterface( IsEqualIID(riid, &IID_IMimeSecurity)) { *obj = iface; - IUnknown_AddRef(iface); + IMimeSecurity_AddRef(iface); return S_OK; } @@ -2807,7 +2807,7 @@ static HRESULT WINAPI MimeAlloc_QueryInterface( IsEqualIID(riid, &IID_IMimeAllocator)) { *obj = iface; - IUnknown_AddRef(iface); + IMimeAllocator_AddRef(iface); return S_OK; } diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index af7d1bf..bdae830 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -729,7 +729,7 @@ static HRESULT WINAPI POP3Transport_QueryInterface(IPOP3Transport *iface, REFIID IsEqualIID(riid, &IID_IPOP3Transport)) { *ppv = iface; - IUnknown_AddRef(iface); + IPOP3Transport_AddRef(iface); return S_OK; } *ppv = NULL; @@ -1139,7 +1139,7 @@ static HRESULT WINAPI POP3TransportCF_QueryInterface(LPCLASSFACTORY iface, if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) { *ppv = iface; - IUnknown_AddRef(iface); + IClassFactory_AddRef(iface); return S_OK; } return E_NOINTERFACE; diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c index d17419f..c88ac9c 100644 --- a/dlls/inetcomm/smtptransport.c +++ b/dlls/inetcomm/smtptransport.c @@ -532,7 +532,7 @@ static HRESULT WINAPI SMTPTransport_QueryInterface(ISMTPTransport2 *iface, REFII IsEqualIID(riid, &IID_ISMTPTransport2)) { *ppv = iface; - IUnknown_AddRef(iface); + ISMTPTransport2_AddRef(iface); return S_OK; } *ppv = NULL; @@ -989,7 +989,7 @@ static HRESULT WINAPI SMTPTransportCF_QueryInterface(LPCLASSFACTORY iface, if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) { *ppv = iface; - IUnknown_AddRef(iface); + IClassFactory_AddRef(iface); return S_OK; } return E_NOINTERFACE; diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index a53ab23..389e267 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -314,7 +314,7 @@ static void test_CreateMessage(void) ok(count == 2, "got %d\n", count); CoTaskMemFree(body_list); - hr = IMimeMessage_GetCharset(body, &hcs); + hr = IMimeBody_GetCharset(body, &hcs); ok(hr == S_OK, "ret %08x\n", hr); todo_wine {

1 0

Józef Kucia : d3dx9/tests: Clean up device state after tests.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: c51bf7b08247d3f78b1a09b8ffc2a45a22ce97e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51bf7b08247d3f78b1a09b8f… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jul 31 15:26:37 2012 +0200 d3dx9/tests: Clean up device state after tests. --- dlls/d3dx9_36/tests/core.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index cb5c7ec..eb1e769 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -927,6 +927,8 @@ static void test_ID3DXRenderToSurface_device_state(IDirect3DDevice9 *device) compare_device_state(&current_state, &pre_state, FALSE); release_device_state(&current_state); + check_release((IUnknown *)render, 0); + /* if EndScene isn't called, the device state isn't restored */ hr = retrieve_device_state(device, &current_state); ok(SUCCEEDED(hr), "Failed to retrieve device state\n"); @@ -936,7 +938,7 @@ static void test_ID3DXRenderToSurface_device_state(IDirect3DDevice9 *device) hr = apply_device_state(device, &pre_state); ok(SUCCEEDED(hr), "Failed to restore previous device state\n"); - check_release((IUnknown *)render, 0); + IDirect3DDevice9_EndScene(device); } release_device_state(&pre_state);

1 0

Jacek Caban : ole32/tests: Use proper helpers for iface calls.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: df4f0272388f0480ce87da976ca86dd8fc3edbc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df4f0272388f0480ce87da976… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:40:46 2012 +0200 ole32/tests: Use proper helpers for iface calls. --- dlls/ole32/tests/dragdrop.c | 2 +- dlls/ole32/tests/hglobalstream.c | 2 +- dlls/ole32/tests/marshal.c | 18 ++++++------ dlls/ole32/tests/moniker.c | 2 +- dlls/ole32/tests/ole2.c | 54 +++++++++++++++++++------------------- dlls/ole32/tests/storage32.c | 18 ++++++------ 6 files changed, 48 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df4f0272388f0480ce87d…

1 0

Nikolay Sivov : dwrite: Implement IDWriteBitmapRenderTarget_GetSize.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: c843e71ba57a89c5ba1a4ef8856aa4291cc9476c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c843e71ba57a89c5ba1a4ef88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 13 07:51:38 2012 +0400 dwrite: Implement IDWriteBitmapRenderTarget_GetSize. --- dlls/dwrite/gdiinterop.c | 10 ++++++++-- dlls/dwrite/tests/font.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index c3bcc88..bac6e40 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -36,6 +36,7 @@ struct rendertarget { IDWriteBitmapRenderTarget IDWriteBitmapRenderTarget_iface; LONG ref; + SIZE size; HDC hdc; }; @@ -135,8 +136,10 @@ static HRESULT WINAPI rendertarget_SetCurrentTransform(IDWriteBitmapRenderTarget static HRESULT WINAPI rendertarget_GetSize(IDWriteBitmapRenderTarget *iface, SIZE *size) { struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); - FIXME("(%p)->(%p): stub\n", This, size); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, size); + *size = This->size; + return S_OK; } static HRESULT WINAPI rendertarget_Resize(IDWriteBitmapRenderTarget *iface, UINT32 width, UINT32 height) @@ -175,6 +178,9 @@ static HRESULT create_rendertarget(HDC hdc, UINT32 width, UINT32 height, IDWrite This->IDWriteBitmapRenderTarget_iface.lpVtbl = &rendertargetvtbl; This->ref = 1; + This->size.cx = width; + This->size.cy = height; + This->hdc = CreateCompatibleDC(hdc); memset(bmi, 0, sizeof(bmibuf)); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 97cd477..ccaba88 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -158,6 +158,7 @@ static void test_CreateBitmapRenderTarget(void) DIBSECTION ds; HBITMAP hbm; HRESULT hr; + SIZE size; HDC hdc; int ret; @@ -168,6 +169,15 @@ static void test_CreateBitmapRenderTarget(void) hr = IDWriteGdiInterop_CreateBitmapRenderTarget(interop, NULL, 0, 0, &target); EXPECT_HR(hr, S_OK); +if (0) /* crashes on native */ + hr = IDWriteBitmapRenderTarget_GetSize(target, NULL); + + size.cx = size.cy = -1; + hr = IDWriteBitmapRenderTarget_GetSize(target, &size); + EXPECT_HR(hr, S_OK); + ok(size.cx == 0, "got %d\n", size.cx); + ok(size.cy == 0, "got %d\n", size.cy); + target2 = NULL; hr = IDWriteGdiInterop_CreateBitmapRenderTarget(interop, NULL, 0, 0, &target2); EXPECT_HR(hr, S_OK); @@ -213,6 +223,12 @@ static void test_CreateBitmapRenderTarget(void) ok(ds.dsBm.bmBitsPixel == 32, "got %d\n", ds.dsBm.bmBitsPixel); ok(ds.dsBm.bmBits != NULL, "got %p\n", ds.dsBm.bmBits); + size.cx = size.cy = -1; + hr = IDWriteBitmapRenderTarget_GetSize(target, &size); + EXPECT_HR(hr, S_OK); + ok(size.cx == 10, "got %d\n", size.cx); + ok(size.cy == 5, "got %d\n", size.cy); + IDWriteBitmapRenderTarget_Release(target); IDWriteGdiInterop_Release(interop);

1 0

Józef Kucia : d3dx9: Implement rendering to cube textures in ID3DXRenderToEnvMap.
by Alexandre Julliard Aug. 13, 2012

Aug. 13, 2012

Module: wine Branch: master Commit: 17d92f3b8f508a37163c8d0e91c456594c17f3f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17d92f3b8f508a37163c8d0e9… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jul 31 15:26:39 2012 +0200 d3dx9: Implement rendering to cube textures in ID3DXRenderToEnvMap. --- dlls/d3dx9_36/render.c | 187 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 180 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/render.c b/dlls/d3dx9_36/render.c index 97a2916..cca6b44 100644 --- a/dlls/d3dx9_36/render.c +++ b/dlls/d3dx9_36/render.c @@ -416,6 +416,14 @@ HRESULT WINAPI D3DXCreateRenderToSurface(IDirect3DDevice9 *device, } +enum render_state +{ + INITIAL, + + CUBE_BEGIN, + CUBE_FACE +}; + struct render_to_envmap { ID3DXRenderToEnvMap ID3DXRenderToEnvMap_iface; @@ -423,8 +431,33 @@ struct render_to_envmap IDirect3DDevice9 *device; D3DXRTE_DESC desc; + + enum render_state state; + struct device_state previous_device_state; + + D3DCUBEMAP_FACES face; + DWORD filter; + + IDirect3DSurface9 *render_target; + IDirect3DSurface9 *depth_stencil; + + IDirect3DCubeTexture9 *dst_cube_texture; }; +static void copy_render_target_to_cube_texture_face(IDirect3DCubeTexture9 *cube_texture, + D3DCUBEMAP_FACES face, IDirect3DSurface9 *render_target, DWORD filter) +{ + HRESULT hr; + IDirect3DSurface9 *cube_surface; + + IDirect3DCubeTexture9_GetCubeMapSurface(cube_texture, face, 0, &cube_surface); + + hr = D3DXLoadSurfaceFromSurface(cube_surface, NULL, NULL, render_target, NULL, NULL, filter, 0); + if (FAILED(hr)) ERR("Copying render target data to surface failed %#x\n", hr); + + IDirect3DSurface9_Release(cube_surface); +} + static inline struct render_to_envmap *impl_from_ID3DXRenderToEnvMap(ID3DXRenderToEnvMap *iface) { return CONTAINING_RECORD(iface, struct render_to_envmap, ID3DXRenderToEnvMap_iface); @@ -469,6 +502,13 @@ static ULONG WINAPI D3DXRenderToEnvMap_Release(ID3DXRenderToEnvMap *iface) if (!ref) { + if (render->dst_cube_texture) IDirect3DSurface9_Release(render->dst_cube_texture); + + if (render->render_target) IDirect3DSurface9_Release(render->render_target); + if (render->depth_stencil) IDirect3DSurface9_Release(render->depth_stencil); + + device_state_release(&render->previous_device_state); + IDirect3DDevice9_Release(render->device); HeapFree(GetProcessHeap(), 0, render); @@ -507,8 +547,52 @@ static HRESULT WINAPI D3DXRenderToEnvMap_GetDesc(ID3DXRenderToEnvMap *iface, static HRESULT WINAPI D3DXRenderToEnvMap_BeginCube(ID3DXRenderToEnvMap *iface, IDirect3DCubeTexture9 *texture) { - FIXME("(%p)->(%p): stub\n", iface, texture); - return E_NOTIMPL; + struct render_to_envmap *render = impl_from_ID3DXRenderToEnvMap(iface); + HRESULT hr; + D3DSURFACE_DESC level_desc; + + TRACE("(%p)->(%p)\n", iface, texture); + + if (!texture) return D3DERR_INVALIDCALL; + + if (render->state != INITIAL) return D3DERR_INVALIDCALL; + + IDirect3DCubeTexture9_GetLevelDesc(texture, 0, &level_desc); + if (level_desc.Format != render->desc.Format || level_desc.Width != render->desc.Size) + return D3DERR_INVALIDCALL; + + if (!(level_desc.Usage & D3DUSAGE_RENDERTARGET)) + { + hr = IDirect3DDevice9_CreateRenderTarget(render->device, level_desc.Width, level_desc.Height, + level_desc.Format, level_desc.MultiSampleType, level_desc.MultiSampleQuality, + TRUE, &render->render_target, NULL); + if (FAILED(hr)) goto cleanup; + IDirect3DCubeTexture9_GetLevelDesc(texture, 0, &level_desc); + } + + if (render->desc.DepthStencil) + { + hr = IDirect3DDevice9_CreateDepthStencilSurface(render->device, level_desc.Width, level_desc.Height, + render->desc.DepthStencilFormat, level_desc.MultiSampleType, level_desc.MultiSampleQuality, + TRUE, &render->depth_stencil, NULL); + if (FAILED(hr)) goto cleanup; + } + + IDirect3DCubeTexture9_AddRef(texture); + render->dst_cube_texture = texture; + render->state = CUBE_BEGIN; + return D3D_OK; + +cleanup: + if (render->dst_cube_texture) IDirect3DSurface9_Release(render->dst_cube_texture); + render->dst_cube_texture = NULL; + + if (render->render_target) IDirect3DSurface9_Release(render->render_target); + render->render_target = NULL; + if (render->depth_stencil) IDirect3DSurface9_Release(render->depth_stencil); + render->depth_stencil = NULL; + + return hr; } static HRESULT WINAPI D3DXRenderToEnvMap_BeginSphere(ID3DXRenderToEnvMap *iface, @@ -538,17 +622,94 @@ static HRESULT WINAPI D3DXRenderToEnvMap_Face(ID3DXRenderToEnvMap *iface, D3DCUBEMAP_FACES face, DWORD filter) { - FIXME("(%p)->(%u, %#x): stub\n", iface, face, filter); - return E_NOTIMPL; + struct render_to_envmap *render = impl_from_ID3DXRenderToEnvMap(iface); + HRESULT hr; + unsigned int i; + + TRACE("(%p)->(%u, %#x)\n", iface, face, filter); + + if (render->state == CUBE_FACE) + { + IDirect3DDevice9_EndScene(render->device); + if (render->render_target) + copy_render_target_to_cube_texture_face(render->dst_cube_texture, render->face, + render->render_target, render->filter); + + device_state_restore(render->device, &render->previous_device_state); + + render->state = CUBE_BEGIN; + } + else if (render->state != CUBE_BEGIN) + return D3DERR_INVALIDCALL; + + device_state_capture(render->device, &render->previous_device_state); + + for (i = 1; i < render->previous_device_state.num_render_targets; i++) + IDirect3DDevice9_SetRenderTarget(render->device, i, NULL); + + if (!render->render_target) + { + IDirect3DSurface9 *render_target; + IDirect3DCubeTexture9_GetCubeMapSurface(render->dst_cube_texture, face, 0, &render_target); + hr = IDirect3DDevice9_SetRenderTarget(render->device, 0, render_target); + IDirect3DSurface9_Release(render_target); + } + else hr = IDirect3DDevice9_SetRenderTarget(render->device, 0, render->render_target); + + if (FAILED(hr)) goto cleanup; + + hr = IDirect3DDevice9_SetDepthStencilSurface(render->device, render->depth_stencil); + if (FAILED(hr)) goto cleanup; + + render->state = CUBE_FACE; + render->face = face; + render->filter = filter; + return IDirect3DDevice9_BeginScene(render->device); + +cleanup: + device_state_restore(render->device, &render->previous_device_state); + return hr; } static HRESULT WINAPI D3DXRenderToEnvMap_End(ID3DXRenderToEnvMap *iface, DWORD filter) { - FIXME("(%p)->(%#x): stub\n", iface, filter); - return E_NOTIMPL; -} + struct render_to_envmap *render = impl_from_ID3DXRenderToEnvMap(iface); + + TRACE("(%p)->(%#x)\n", iface, filter); + if (render->state == INITIAL) return D3DERR_INVALIDCALL; + + if (render->state == CUBE_FACE) + { + IDirect3DDevice9_EndScene(render->device); + if (render->render_target) + copy_render_target_to_cube_texture_face(render->dst_cube_texture, render->face, + render->render_target, render->filter); + + device_state_restore(render->device, &render->previous_device_state); + } + + D3DXFilterTexture((IDirect3DBaseTexture9 *)render->dst_cube_texture, NULL, 0, filter); + + if (render->render_target) + { + IDirect3DSurface9_Release(render->render_target); + render->render_target = NULL; + } + + if (render->depth_stencil) + { + IDirect3DSurface9_Release(render->depth_stencil); + render->depth_stencil = NULL; + } + + IDirect3DSurface9_Release(render->dst_cube_texture); + render->dst_cube_texture = NULL; + + render->state = INITIAL; + return D3D_OK; +} static HRESULT WINAPI D3DXRenderToEnvMap_OnLostDevice(ID3DXRenderToEnvMap *iface) { @@ -613,6 +774,18 @@ HRESULT WINAPI D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device, render->desc.DepthStencil = depth_stencil; render->desc.DepthStencilFormat = depth_stencil_format; + render->state = INITIAL; + render->render_target = NULL; + render->depth_stencil = NULL; + render->dst_cube_texture = NULL; + + hr = device_state_init(device, &render->previous_device_state); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, render); + return hr; + } + IDirect3DDevice9_AddRef(device); render->device = device;

1 0