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

Michael Stefaniuc : msvcrt: Aoid TRUE:FALSE conditional expressions.
by Alexandre Julliard 13 Aug '12

13 Aug '12

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 : oledlg: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard 13 Aug '12

13 Aug '12

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 : winedbg: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 915e12e59fc6d430cc94bd491fac456bf4096ebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=915e12e59fc6d430cc94bd491… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 21:33:56 2012 +0200 winedbg: Avoid TRUE:FALSE conditional expressions. --- programs/winedbg/be_arm.c | 2 +- programs/winedbg/break.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 8e1b5b1..f375fe8 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -869,7 +869,7 @@ void be_arm_disasm_one_insn(ADDRESS64 *addr, int display) if (!memory_get_register(CV_ARM_CPSR, &pval, tmp, sizeof(tmp))) dbg_printf("\n\tmemory_get_register failed: %s", tmp); else - db_disasm_thumb=(*pval & 0x20)?TRUE:FALSE; + db_disasm_thumb = (*pval & 0x20) != 0; db_display = display; diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index e156a40..72979a1 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -549,7 +549,7 @@ void break_enable_xpoint(int num, BOOL enable) dbg_printf("Invalid breakpoint number %d\n", num); return; } - dbg_curr_process->bp[num].enabled = (enable) ? TRUE : FALSE; + dbg_curr_process->bp[num].enabled = enable != 0; dbg_curr_process->bp[num].skipcount = 0; }

1 0

Michael Stefaniuc : shlwapi: Avoid FALSE:TRUE conditional expressions.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 8d24dd49eee67251c46bb03b0c1de78d0b1d2074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d24dd49eee67251c46bb03b0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 21:35:53 2012 +0200 shlwapi: Avoid FALSE:TRUE conditional expressions. --- dlls/shlwapi/path.c | 4 ++-- dlls/shlwapi/reg.c | 16 ++++------------ dlls/shlwapi/thread.c | 2 +- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 6f09d22..bb2879e 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -1714,7 +1714,7 @@ BOOL WINAPI PathFileExistsA(LPCSTR lpszPath) iPrevErrMode = SetErrorMode(SEM_FAILCRITICALERRORS); dwAttr = GetFileAttributesA(lpszPath); SetErrorMode(iPrevErrMode); - return dwAttr == INVALID_FILE_ATTRIBUTES ? FALSE : TRUE; + return dwAttr != INVALID_FILE_ATTRIBUTES; } /************************************************************************* @@ -1735,7 +1735,7 @@ BOOL WINAPI PathFileExistsW(LPCWSTR lpszPath) iPrevErrMode = SetErrorMode(SEM_FAILCRITICALERRORS); dwAttr = GetFileAttributesW(lpszPath); SetErrorMode(iPrevErrMode); - return dwAttr == INVALID_FILE_ATTRIBUTES ? FALSE : TRUE; + return dwAttr != INVALID_FILE_ATTRIBUTES; } /************************************************************************* diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 26f83bf..c58a8c7 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -1890,17 +1890,14 @@ DWORD WINAPI SHGetValueGoodBootW(HKEY hkey, LPCWSTR pSubKey, LPCWSTR pValue, */ BOOL WINAPI RegisterMIMETypeForExtensionA(LPCSTR lpszSubKey, LPCSTR lpszValue) { - DWORD dwRet; - if (!lpszValue) { WARN("Invalid lpszValue would crash under Win32!\n"); return FALSE; } - dwRet = SHSetValueA(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeA, + return !SHSetValueA(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeA, REG_SZ, lpszValue, strlen(lpszValue)); - return dwRet ? FALSE : TRUE; } /************************************************************************* @@ -1910,17 +1907,14 @@ BOOL WINAPI RegisterMIMETypeForExtensionA(LPCSTR lpszSubKey, LPCSTR lpszValue) */ BOOL WINAPI RegisterMIMETypeForExtensionW(LPCWSTR lpszSubKey, LPCWSTR lpszValue) { - DWORD dwRet; - if (!lpszValue) { WARN("Invalid lpszValue would crash under Win32!\n"); return FALSE; } - dwRet = SHSetValueW(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeW, + return !SHSetValueW(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeW, REG_SZ, lpszValue, strlenW(lpszValue)); - return dwRet ? FALSE : TRUE; } /************************************************************************* @@ -1937,8 +1931,7 @@ BOOL WINAPI RegisterMIMETypeForExtensionW(LPCWSTR lpszSubKey, LPCWSTR lpszValue) */ BOOL WINAPI UnregisterMIMETypeForExtensionA(LPCSTR lpszSubKey) { - HRESULT ret = SHDeleteValueA(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeA); - return ret ? FALSE : TRUE; + return !SHDeleteValueA(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeA); } /************************************************************************* @@ -1948,8 +1941,7 @@ BOOL WINAPI UnregisterMIMETypeForExtensionA(LPCSTR lpszSubKey) */ BOOL WINAPI UnregisterMIMETypeForExtensionW(LPCWSTR lpszSubKey) { - HRESULT ret = SHDeleteValueW(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeW); - return ret ? FALSE : TRUE; + return !SHDeleteValueW(HKEY_CLASSES_ROOT, lpszSubKey, lpszContentTypeW); } /************************************************************************* diff --git a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c index c18d5a4..f8afc29 100644 --- a/dlls/shlwapi/thread.c +++ b/dlls/shlwapi/thread.c @@ -365,7 +365,7 @@ BOOL WINAPI SHCreateThread(LPTHREAD_START_ROUTINE pfnThreadProc, VOID *pData, ti.pfnThreadProc = pfnThreadProc; ti.pfnCallback = pfnCallback; ti.pData = pData; - ti.bInitCom = dwFlags & CTF_COINIT ? TRUE : FALSE; + ti.bInitCom = (dwFlags & CTF_COINIT) != 0; ti.hEvent = CreateEventW(NULL,FALSE,FALSE,NULL); /* Hold references to the current thread and IE process, if desired */

1 0

Nikolay Sivov : dwrite: Added IDWriteFont stub.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 56d71b04b7c3f40f152acb43e68f69141d5a16d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56d71b04b7c3f40f152acb43e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 13 07:44:19 2012 +0400 dwrite: Added IDWriteFont stub. --- dlls/dwrite/Makefile.in | 1 + dlls/dwrite/dwrite_private.h | 11 +++ dlls/dwrite/font.c | 184 ++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/gdiinterop.c | 3 +- dlls/dwrite/tests/font.c | 5 +- 5 files changed, 199 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in index 03220d1..f4ee7ae 100644 --- a/dlls/dwrite/Makefile.in +++ b/dlls/dwrite/Makefile.in @@ -2,6 +2,7 @@ MODULE = dwrite.dll IMPORTLIB = dwrite C_SRCS = \ + font.c \ gdiinterop.c \ main.c diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 59ca09e..c52b93a 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -16,4 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; +extern HRESULT create_font(IDWriteFont**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c new file mode 100644 index 0000000..29dd63c --- /dev/null +++ b/dlls/dwrite/font.c @@ -0,0 +1,184 @@ +/* + * Font and collections + * + * Copyright 2012 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +#define COBJMACROS + +#include "dwrite.h" +#include "dwrite_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dwrite); + +struct dwrite_font { + IDWriteFont IDWriteFont_iface; + LONG ref; +}; + +static inline struct dwrite_font *impl_from_IDWriteFont(IDWriteFont *iface) +{ + return CONTAINING_RECORD(iface, struct dwrite_font, IDWriteFont_iface); +} + +static HRESULT WINAPI dwritefont_QueryInterface(IDWriteFont *iface, REFIID riid, void **obj) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteFont)) + { + *obj = iface; + IDWriteFont_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dwritefont_AddRef(IDWriteFont *iface) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI dwritefont_Release(IDWriteFont *iface) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + heap_free(This); + + return S_OK; +} + +static HRESULT WINAPI dwritefont_GetFontFamily(IDWriteFont *iface, IDWriteFontFamily **family) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p)->(%p): stub\n", This, family); + return E_NOTIMPL; +} + +static DWRITE_FONT_WEIGHT WINAPI dwritefont_GetWeight(IDWriteFont *iface) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p): stub\n", This); + return DWRITE_FONT_WEIGHT_NORMAL; +} + +static DWRITE_FONT_STRETCH WINAPI dwritefont_GetStretch(IDWriteFont *iface) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p): stub\n", This); + return DWRITE_FONT_STRETCH_UNDEFINED; +} + +static DWRITE_FONT_STYLE WINAPI dwritefont_GetStyle(IDWriteFont *iface) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p): stub\n", This); + return DWRITE_FONT_STYLE_NORMAL; +} + +static BOOL WINAPI dwritefont_IsSymbolFont(IDWriteFont *iface) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p): stub\n", This); + return FALSE; +} + +static HRESULT WINAPI dwritefont_GetFaceNames(IDWriteFont *iface, IDWriteLocalizedStrings **names) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p)->(%p): stub\n", This, names); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont *iface, + DWRITE_INFORMATIONAL_STRING_ID stringid, IDWriteLocalizedStrings **strings, BOOL *exists) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p)->(%d %p %p): stub\n", This, stringid, strings, exists); + return E_NOTIMPL; +} + +static DWRITE_FONT_SIMULATIONS WINAPI dwritefont_GetSimulations(IDWriteFont *iface) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p): stub\n", This); + return DWRITE_FONT_SIMULATIONS_NONE; +} + +static void WINAPI dwritefont_GetMetrics(IDWriteFont *iface, DWRITE_FONT_METRICS *metrics) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p)->(%p): stub\n", This, metrics); +} + +static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont *iface, UINT32 value, BOOL *exists) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p)->(0x%08x %p): stub\n", This, value, exists); + return E_NOTIMPL; +} + +static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont *iface, IDWriteFontFace **face) +{ + struct dwrite_font *This = impl_from_IDWriteFont(iface); + FIXME("(%p)->(%p): stub\n", This, face); + return E_NOTIMPL; +} + +static const IDWriteFontVtbl dwritefontvtbl = { + dwritefont_QueryInterface, + dwritefont_AddRef, + dwritefont_Release, + dwritefont_GetFontFamily, + dwritefont_GetWeight, + dwritefont_GetStretch, + dwritefont_GetStyle, + dwritefont_IsSymbolFont, + dwritefont_GetFaceNames, + dwritefont_GetInformationalStrings, + dwritefont_GetSimulations, + dwritefont_GetMetrics, + dwritefont_HasCharacter, + dwritefont_CreateFontFace +}; + +HRESULT create_font(IDWriteFont **font) +{ + struct dwrite_font *This; + + This = heap_alloc(sizeof(struct dwrite_font)); + if (!This) return E_OUTOFMEMORY; + + This->IDWriteFont_iface.lpVtbl = &dwritefontvtbl; + This->ref = 1; + *font = &This->IDWriteFont_iface; + + return S_OK; +} diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 8215185..d374724 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "dwrite.h" +#include "dwrite_private.h" #include "wine/debug.h" @@ -60,7 +61,7 @@ static HRESULT WINAPI gdiinterop_CreateFontFromLOGFONT(IDWriteGdiInterop *iface, if (!logfont) return E_INVALIDARG; - return E_NOTIMPL; + return create_font(font); } static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index fa345e3..520fc1b 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -61,23 +61,20 @@ if (0) lstrcpyW(logfont.lfFaceName, arialW); hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); -todo_wine EXPECT_HR(hr, S_OK); -if (hr == S_OK) -{ /* now check properties */ weight = IDWriteFont_GetWeight(font); ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "got %d\n", weight); style = IDWriteFont_GetStyle(font); +todo_wine ok(style == DWRITE_FONT_STYLE_ITALIC, "got %d\n", style); ret = IDWriteFont_IsSymbolFont(font); ok(!ret, "got %d\n", ret); IDWriteFont_Release(font); -} IDWriteGdiInterop_Release(interop); }

1 0

Nikolay Sivov : dwrite: Store font style provided in LOGFONT data.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 09ba9bdb0addc7ff1d24521724d0ecaedf300e4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=09ba9bdb0addc7ff1d2452172… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 13 07:46:43 2012 +0400 dwrite: Store font style provided in LOGFONT data. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 15 ++++++-- dlls/dwrite/gdiinterop.c | 4 +- dlls/dwrite/tests/font.c | 76 ++++++++++++++++++++++++++++++++++++++++- include/dwrite.idl | 14 ++++++++ 5 files changed, 102 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index c52b93a..c3c7cb1 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -27,4 +27,4 @@ static inline BOOL heap_free(void *mem) } extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; -extern HRESULT create_font(IDWriteFont**) DECLSPEC_HIDDEN; +extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 29dd63c..e73ef44 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); struct dwrite_font { IDWriteFont IDWriteFont_iface; LONG ref; + + DWRITE_FONT_STYLE style; }; static inline struct dwrite_font *impl_from_IDWriteFont(IDWriteFont *iface) @@ -86,7 +88,7 @@ static DWRITE_FONT_WEIGHT WINAPI dwritefont_GetWeight(IDWriteFont *iface) { struct dwrite_font *This = impl_from_IDWriteFont(iface); FIXME("(%p): stub\n", This); - return DWRITE_FONT_WEIGHT_NORMAL; + return 0; } static DWRITE_FONT_STRETCH WINAPI dwritefont_GetStretch(IDWriteFont *iface) @@ -99,8 +101,8 @@ static DWRITE_FONT_STRETCH WINAPI dwritefont_GetStretch(IDWriteFont *iface) static DWRITE_FONT_STYLE WINAPI dwritefont_GetStyle(IDWriteFont *iface) { struct dwrite_font *This = impl_from_IDWriteFont(iface); - FIXME("(%p): stub\n", This); - return DWRITE_FONT_STYLE_NORMAL; + TRACE("(%p)\n", This); + return This->style; } static BOOL WINAPI dwritefont_IsSymbolFont(IDWriteFont *iface) @@ -169,15 +171,20 @@ static const IDWriteFontVtbl dwritefontvtbl = { dwritefont_CreateFontFace }; -HRESULT create_font(IDWriteFont **font) +HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) { struct dwrite_font *This; + *font = NULL; + This = heap_alloc(sizeof(struct dwrite_font)); if (!This) return E_OUTOFMEMORY; This->IDWriteFont_iface.lpVtbl = &dwritefontvtbl; This->ref = 1; + + This->style = logfont->lfItalic ? DWRITE_FONT_STYLE_ITALIC : DWRITE_FONT_STYLE_NORMAL; + *font = &This->IDWriteFont_iface; return S_OK; diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index d374724..d98eb5b 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -57,11 +57,11 @@ static ULONG WINAPI gdiinterop_Release(IDWriteGdiInterop *iface) static HRESULT WINAPI gdiinterop_CreateFontFromLOGFONT(IDWriteGdiInterop *iface, LOGFONTW const *logfont, IDWriteFont **font) { - FIXME("(%p %p): stub\n", logfont, font); + TRACE("(%p %p)\n", logfont, font); if (!logfont) return E_INVALIDARG; - return create_font(font); + return create_font_from_logfont(logfont, font); } static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 520fc1b..f169393 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -30,18 +30,35 @@ #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) -IDWriteFactory *factory; +static IDWriteFactory *factory; static void test_CreateFontFromLOGFONT(void) { static const WCHAR arialW[] = {'A','r','i','a','l',0}; + static const WCHAR blahW[] = {'B','l','a','h','!',0}; IDWriteGdiInterop *interop; DWRITE_FONT_WEIGHT weight; DWRITE_FONT_STYLE style; IDWriteFont *font; LOGFONTW logfont; + LONG weights[][2] = { + {FW_NORMAL, DWRITE_FONT_WEIGHT_NORMAL}, + {FW_BOLD, DWRITE_FONT_WEIGHT_BOLD}, + { 0, DWRITE_FONT_WEIGHT_NORMAL}, + { 50, DWRITE_FONT_WEIGHT_NORMAL}, + {150, DWRITE_FONT_WEIGHT_NORMAL}, + {250, DWRITE_FONT_WEIGHT_NORMAL}, + {350, DWRITE_FONT_WEIGHT_NORMAL}, + {450, DWRITE_FONT_WEIGHT_NORMAL}, + {650, DWRITE_FONT_WEIGHT_BOLD}, + {750, DWRITE_FONT_WEIGHT_BOLD}, + {850, DWRITE_FONT_WEIGHT_BOLD}, + {950, DWRITE_FONT_WEIGHT_BOLD}, + {960, DWRITE_FONT_WEIGHT_BOLD}, + }; HRESULT hr; BOOL ret; + int i; hr = IDWriteFactory_GetGdiInterop(factory, &interop); EXPECT_HR(hr, S_OK); @@ -65,10 +82,10 @@ if (0) /* now check properties */ weight = IDWriteFont_GetWeight(font); +todo_wine ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "got %d\n", weight); style = IDWriteFont_GetStyle(font); -todo_wine ok(style == DWRITE_FONT_STYLE_ITALIC, "got %d\n", style); ret = IDWriteFont_IsSymbolFont(font); @@ -76,6 +93,61 @@ todo_wine IDWriteFont_Release(font); + /* weight values */ + for (i = 0; i < sizeof(weights)/(2*sizeof(LONG)); i++) + { + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = weights[i][0]; + lstrcpyW(logfont.lfFaceName, arialW); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); + EXPECT_HR(hr, S_OK); + + weight = IDWriteFont_GetWeight(font); + todo_wine + ok(weight == weights[i][1], + "%d: got %d, expected %d\n", i, weight, weights[i][1]); + IDWriteFont_Release(font); + } + + /* weight not from enum */ + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = 550; + lstrcpyW(logfont.lfFaceName, arialW); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); + EXPECT_HR(hr, S_OK); + + weight = IDWriteFont_GetWeight(font); +todo_wine + ok(weight == DWRITE_FONT_WEIGHT_NORMAL || broken(weight == DWRITE_FONT_WEIGHT_BOLD) /* win7 w/o SP */, + "got %d\n", weight); + IDWriteFont_Release(font); + + /* empty or nonexistent face name */ + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_NORMAL; + lstrcpyW(logfont.lfFaceName, blahW); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); +todo_wine + EXPECT_HR(hr, DWRITE_E_NOFONT); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_NORMAL; + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); +todo_wine + EXPECT_HR(hr, DWRITE_E_NOFONT); + IDWriteGdiInterop_Release(interop); } diff --git a/include/dwrite.idl b/include/dwrite.idl index aff529a..60a2bae 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -1394,3 +1394,17 @@ interface IDWriteFactory : IUnknown } cpp_quote("HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE,REFIID,IUnknown**);") + +/* error codes */ +cpp_quote("#define FACILITY_DWRITE 0x898") +cpp_quote("#define DWRITE_ERR_BASE 0x5000") +cpp_quote("#define MAKE_DWRITE_HR(severity, code) MAKE_HRESULT(severity, FACILITY_DWRITE, (DWRITE_ERR_BASE + code))") +cpp_quote("#define MAKE_DWRITE_HR_ERR(code) MAKE_DWRITE_HR(SEVERITY_ERROR, code)") + +cpp_quote("#define DWRITE_E_FILEFORMAT MAKE_DWRITE_HR_ERR(0x0)") +cpp_quote("#define DWRITE_E_UNEXPECTED MAKE_DWRITE_HR_ERR(0x1)") +cpp_quote("#define DWRITE_E_NOFONT MAKE_DWRITE_HR_ERR(0x2)") +cpp_quote("#define DWRITE_E_FILENOTFOUND MAKE_DWRITE_HR_ERR(0x3)") +cpp_quote("#define DWRITE_E_FILEACCESS MAKE_DWRITE_HR_ERR(0x4)") +cpp_quote("#define DWRITE_E_FONTCOLLECTIONOBSOLETE MAKE_DWRITE_HR_ERR(0x5)") +cpp_quote("#define DWRITE_E_ALREADYREGISTERED MAKE_DWRITE_HR_ERR(0x6)")

1 0

Nikolay Sivov : dwrite: Implement IDWriteBitmapRenderTarget creation.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 292fd912c91b1b4bd50160820a0b914eb4c972db URL: http://source.winehq.org/git/wine.git/?a=commit;h=292fd912c91b1b4bd50160820… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 13 07:49:19 2012 +0400 dwrite: Implement IDWriteBitmapRenderTarget creation. --- dlls/dwrite/Makefile.in | 1 + dlls/dwrite/gdiinterop.c | 168 ++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/Makefile.in | 2 +- dlls/dwrite/tests/font.c | 68 +++++++++++++++++ 4 files changed, 236 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in index f4ee7ae..6da8c62 100644 --- a/dlls/dwrite/Makefile.in +++ b/dlls/dwrite/Makefile.in @@ -1,5 +1,6 @@ MODULE = dwrite.dll IMPORTLIB = dwrite +IMPORTS = gdi32 C_SRCS = \ font.c \ diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index d98eb5b..c3bcc88 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -18,10 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "dwrite.h" #include "dwrite_private.h" @@ -29,6 +32,167 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); +struct rendertarget { + IDWriteBitmapRenderTarget IDWriteBitmapRenderTarget_iface; + LONG ref; + + HDC hdc; +}; + +static inline struct rendertarget *impl_from_IDWriteBitmapRenderTarget(IDWriteBitmapRenderTarget *iface) +{ + return CONTAINING_RECORD(iface, struct rendertarget, IDWriteBitmapRenderTarget_iface); +} + +static HRESULT WINAPI rendertarget_QueryInterface(IDWriteBitmapRenderTarget *iface, REFIID riid, void **obj) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteBitmapRenderTarget)) + { + *obj = iface; + IDWriteBitmapRenderTarget_AddRef(iface); + return S_OK; + } + + *obj = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI rendertarget_AddRef(IDWriteBitmapRenderTarget *iface) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI rendertarget_Release(IDWriteBitmapRenderTarget *iface) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + { + DeleteDC(This->hdc); + heap_free(This); + } + + return S_OK; +} + +static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget *iface, + FLOAT baselineOriginX, FLOAT baselineOriginY, DWRITE_MEASURING_MODE measuring_mode, + DWRITE_GLYPH_RUN const* glyph_run, IDWriteRenderingParams* params, COLORREF textColor, + RECT *blackbox_rect) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + FIXME("(%p)->(%f %f %d %p %p 0x%08x %p): stub\n", This, baselineOriginX, baselineOriginY, + measuring_mode, glyph_run, params, textColor, blackbox_rect); + return E_NOTIMPL; +} + +static HDC WINAPI rendertarget_GetMemoryDC(IDWriteBitmapRenderTarget *iface) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + TRACE("(%p)\n", This); + return This->hdc; +} + +static FLOAT WINAPI rendertarget_GetPixelsPerDip(IDWriteBitmapRenderTarget *iface) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + FIXME("(%p): stub\n", This); + return 1.0; +} + +static HRESULT WINAPI rendertarget_SetPixelsPerDip(IDWriteBitmapRenderTarget *iface, FLOAT pixels_per_dip) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + FIXME("(%p)->(%f): stub\n", This, pixels_per_dip); + return E_NOTIMPL; +} + +static HRESULT WINAPI rendertarget_GetCurrentTransform(IDWriteBitmapRenderTarget *iface, DWRITE_MATRIX *transform) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + FIXME("(%p)->(%p): stub\n", This, transform); + return E_NOTIMPL; +} + +static HRESULT WINAPI rendertarget_SetCurrentTransform(IDWriteBitmapRenderTarget *iface, DWRITE_MATRIX const *transform) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + FIXME("(%p)->(%p): stub\n", This, transform); + return E_NOTIMPL; +} + +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; +} + +static HRESULT WINAPI rendertarget_Resize(IDWriteBitmapRenderTarget *iface, UINT32 width, UINT32 height) +{ + struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); + FIXME("(%p)->(%u %u): stub\n", This, width, height); + return E_NOTIMPL; +} + +static const IDWriteBitmapRenderTargetVtbl rendertargetvtbl = { + rendertarget_QueryInterface, + rendertarget_AddRef, + rendertarget_Release, + rendertarget_DrawGlyphRun, + rendertarget_GetMemoryDC, + rendertarget_GetPixelsPerDip, + rendertarget_SetPixelsPerDip, + rendertarget_GetCurrentTransform, + rendertarget_SetCurrentTransform, + rendertarget_GetSize, + rendertarget_Resize +}; + +static HRESULT create_rendertarget(HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **target) +{ + char bmibuf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *bmi = (BITMAPINFO*)bmibuf; + struct rendertarget *This; + HBITMAP dib; + + *target = NULL; + + This = heap_alloc(sizeof(struct rendertarget)); + if (!This) return E_OUTOFMEMORY; + + This->IDWriteBitmapRenderTarget_iface.lpVtbl = &rendertargetvtbl; + This->ref = 1; + + This->hdc = CreateCompatibleDC(hdc); + + memset(bmi, 0, sizeof(bmibuf)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biHeight = height; + bmi->bmiHeader.biWidth = width; + bmi->bmiHeader.biBitCount = 32; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + + dib = CreateDIBSection(This->hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); + SelectObject(This->hdc, dib); + + *target = &This->IDWriteBitmapRenderTarget_iface; + + return S_OK; +} + static HRESULT WINAPI gdiinterop_QueryInterface(IDWriteGdiInterop *iface, REFIID riid, void **obj) { TRACE("(%s %p)\n", debugstr_guid(riid), obj); @@ -88,8 +252,8 @@ static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop *iface, static HRESULT WINAPI gdiinterop_CreateBitmapRenderTarget(IDWriteGdiInterop *iface, HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **target) { - FIXME("(%p %u %u %p): stub\n", hdc, width, height, target); - return E_NOTIMPL; + TRACE("(%p %u %u %p)\n", hdc, width, height, target); + return create_rendertarget(hdc, width, height, target); } static const struct IDWriteGdiInteropVtbl gdiinteropvtbl = { diff --git a/dlls/dwrite/tests/Makefile.in b/dlls/dwrite/tests/Makefile.in index f00d0e7..98843cf 100644 --- a/dlls/dwrite/tests/Makefile.in +++ b/dlls/dwrite/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dwrite.dll -IMPORTS = dwrite +IMPORTS = dwrite gdi32 C_SRCS = \ font.c diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f169393..97cd477 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -151,6 +151,73 @@ todo_wine IDWriteGdiInterop_Release(interop); } +static void test_CreateBitmapRenderTarget(void) +{ + IDWriteBitmapRenderTarget *target, *target2; + IDWriteGdiInterop *interop; + DIBSECTION ds; + HBITMAP hbm; + HRESULT hr; + HDC hdc; + int ret; + + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + EXPECT_HR(hr, S_OK); + + target = NULL; + hr = IDWriteGdiInterop_CreateBitmapRenderTarget(interop, NULL, 0, 0, &target); + EXPECT_HR(hr, S_OK); + + target2 = NULL; + hr = IDWriteGdiInterop_CreateBitmapRenderTarget(interop, NULL, 0, 0, &target2); + EXPECT_HR(hr, S_OK); + ok(target != target2, "got %p, %p\n", target2, target); + IDWriteBitmapRenderTarget_Release(target2); + + hdc = IDWriteBitmapRenderTarget_GetMemoryDC(target); + ok(hdc != NULL, "got %p\n", hdc); + + hbm = GetCurrentObject(hdc, OBJ_BITMAP); + ok(hbm != NULL, "got %p\n", hbm); + + /* check DIB properties */ + ret = GetObjectW(hbm, sizeof(ds), &ds); + ok(ret == sizeof(BITMAP), "got %d\n", ret); + ok(ds.dsBm.bmWidth == 1, "got %d\n", ds.dsBm.bmWidth); + ok(ds.dsBm.bmHeight == 1, "got %d\n", ds.dsBm.bmHeight); + ok(ds.dsBm.bmPlanes == 1, "got %d\n", ds.dsBm.bmPlanes); + ok(ds.dsBm.bmBitsPixel == 1, "got %d\n", ds.dsBm.bmBitsPixel); + ok(!ds.dsBm.bmBits, "got %p\n", ds.dsBm.bmBits); + + IDWriteBitmapRenderTarget_Release(target); + + hbm = GetCurrentObject(hdc, OBJ_BITMAP); + ok(!hbm, "got %p\n", hbm); + + target = NULL; + hr = IDWriteGdiInterop_CreateBitmapRenderTarget(interop, NULL, 10, 5, &target); + EXPECT_HR(hr, S_OK); + + hdc = IDWriteBitmapRenderTarget_GetMemoryDC(target); + ok(hdc != NULL, "got %p\n", hdc); + + hbm = GetCurrentObject(hdc, OBJ_BITMAP); + ok(hbm != NULL, "got %p\n", hbm); + + /* check DIB properties */ + ret = GetObjectW(hbm, sizeof(ds), &ds); + ok(ret == sizeof(ds), "got %d\n", ret); + ok(ds.dsBm.bmWidth == 10, "got %d\n", ds.dsBm.bmWidth); + ok(ds.dsBm.bmHeight == 5, "got %d\n", ds.dsBm.bmHeight); + ok(ds.dsBm.bmPlanes == 1, "got %d\n", ds.dsBm.bmPlanes); + ok(ds.dsBm.bmBitsPixel == 32, "got %d\n", ds.dsBm.bmBitsPixel); + ok(ds.dsBm.bmBits != NULL, "got %p\n", ds.dsBm.bmBits); + + IDWriteBitmapRenderTarget_Release(target); + + IDWriteGdiInterop_Release(interop); +} + START_TEST(font) { HRESULT hr; @@ -164,6 +231,7 @@ START_TEST(font) } test_CreateFontFromLOGFONT(); + test_CreateBitmapRenderTarget(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Implement IDWriteBitmapRenderTarget_GetSize.
by Alexandre Julliard 13 Aug '12

13 Aug '12

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

Jacek Caban : wscript: Use proper helpers for iface calls.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: e02c33164d186e219e23d8b111881c71bfc53909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02c33164d186e219e23d8b11… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 11:10:21 2012 +0200 wscript: Use proper helpers for iface calls. --- programs/wscript/main.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index d456e98..3d97bde 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -33,6 +33,20 @@ #include <wine/debug.h> #include <wine/unicode.h> +#ifdef _WIN64 + +#define IActiveScriptParse_Release IActiveScriptParse64_Release +#define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew +#define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText + +#else + +#define IActiveScriptParse_Release IActiveScriptParse32_Release +#define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew +#define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText + +#endif + WINE_DEFAULT_DEBUG_CHANNEL(wscript); static const WCHAR wscriptW[] = {'W','S','c','r','i','p','t',0}; @@ -253,7 +267,7 @@ static HRESULT init_engine(IActiveScript *script, IActiveScriptParse *parser) if(FAILED(hres)) return FALSE; - hres = IActiveScriptParse64_InitNew(parser); + hres = IActiveScriptParse_InitNew(parser); if(FAILED(hres)) return FALSE; @@ -310,7 +324,7 @@ static void run_script(const WCHAR *filename, IActiveScript *script, IActiveScri return; } - hres = IActiveScriptParse64_ParseScriptText(parser, text, NULL, NULL, NULL, 1, 1, + hres = IActiveScriptParse_ParseScriptText(parser, text, NULL, NULL, NULL, 1, 1, SCRIPTTEXT_HOSTMANAGESSOURCE|SCRIPTITEM_ISVISIBLE, NULL, NULL); SysFreeString(text); if(FAILED(hres)) { @@ -406,7 +420,7 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm } IActiveScript_Release(script); - IUnknown_Release(parser); + IActiveScriptParse_Release(parser); CoUninitialize();

1 0

Jacek Caban : inetcomm: Use proper iface call helpers.
by Alexandre Julliard 13 Aug '12

13 Aug '12

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