wine-commits August 2012

wine-commits@winehq.org

2 participants
541 discussions

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: 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

Eric Pouech : msacm32: Convert acmFormatChoose internals to Unicode, implement acmFormatChoose[AW] on top of it.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 22789aa30ef94fed0f74f8623e1088716ec3ce14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22789aa30ef94fed0f74f8623… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Aug 12 10:03:41 2012 +0200 msacm32: Convert acmFormatChoose internals to Unicode, implement acmFormatChoose[AW] on top of it. --- dlls/msacm32/format.c | 181 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 125 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22789aa30ef94fed0f74f…

1 0

Eric Pouech : msacm32: In format chosse dialog, get rid of static variables , and store information as a property of dialog.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 03ab4bea9c72972a9e54eff76e3a6cadf43ca6a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ab4bea9c72972a9e54eff76… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Aug 12 10:03:35 2012 +0200 msacm32: In format chosse dialog, get rid of static variables, and store information as a property of dialog. --- dlls/msacm32/format.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 9866139..f117994 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -39,8 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msacm); -static PACMFORMATCHOOSEA afc; - struct MSACM_FillFormatData { HWND hWnd; #define WINE_ACMFF_TAG 0 @@ -195,20 +193,24 @@ static MMRESULT MSACM_GetWFX(HWND hWnd, PACMFORMATCHOOSEA afc) return affd.ret; } +static const char* fmt_prop = "acmprop"; + static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, - WPARAM wParam, LPARAM lParam) + WPARAM wParam, LPARAM lParam) { + PACMFORMATCHOOSEA afc = (PACMFORMATCHOOSEA)GetPropA(hWnd, fmt_prop); - TRACE("hwnd=%p msg=%i 0x%08lx 0x%08lx\n", hWnd, msg, wParam, lParam ); + TRACE("hwnd=%p msg=%i 0x%08lx 0x%08lx\n", hWnd, msg, wParam, lParam); switch (msg) { case WM_INITDIALOG: afc = (PACMFORMATCHOOSEA)lParam; + SetPropA(hWnd, fmt_prop, (HANDLE)afc); MSACM_FillFormatTags(hWnd); MSACM_FillFormat(hWnd); if ((afc->fdwStyle & ~(ACMFORMATCHOOSE_STYLEF_CONTEXTHELP| ACMFORMATCHOOSE_STYLEF_SHOWHELP)) != 0) - FIXME("Unsupported style %08x\n", ((PACMFORMATCHOOSEA)lParam)->fdwStyle); + FIXME("Unsupported style %08x\n", afc->fdwStyle); if (!(afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_SHOWHELP)) ShowWindow(GetDlgItem(hWnd, IDD_ACMFORMATCHOOSE_BTN_HELP), SW_HIDE); return TRUE;

1 0

André Hentschel : winedbg: Add Coprocessor move operators to Thumb2 disassembler.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: ca3afdc156852d12d87948a41a8edbc96dc15e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca3afdc156852d12d87948a41… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 9 23:20:03 2012 +0200 winedbg: Add Coprocessor move operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 33 ++++++++++++++++++++++++++------- 1 files changed, 26 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 1362ef1..8e1b5b1 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -645,7 +645,7 @@ static UINT thumb2_disasm_misc(UINT inst, ADDRESS64 *addr) if (op1 == 3 && op2 == 0) { - dbg_printf("\n\tclz\t%s, %s\t", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 0)]); + dbg_printf("\n\tclz\t%s, %s", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 0)]); return 0; } @@ -666,7 +666,7 @@ static UINT thumb2_disasm_misc(UINT inst, ADDRESS64 *addr) dbg_printf("\n\trevsh\t"); break; } - dbg_printf("%s, %s\t", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 0)]); + dbg_printf("%s, %s", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 0)]); return 0; } @@ -683,7 +683,7 @@ static UINT thumb2_disasm_mul(UINT inst, ADDRESS64 *addr) if (op2 == 0 && get_nibble(inst, 3) != 0xf) { - dbg_printf("\n\tmla\t%s, %s, %s, %s\t", tbl_regs[get_nibble(inst, 2)], + dbg_printf("\n\tmla\t%s, %s, %s, %s", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)], tbl_regs[get_nibble(inst, 3)]); @@ -692,7 +692,7 @@ static UINT thumb2_disasm_mul(UINT inst, ADDRESS64 *addr) if (op2 == 0 && get_nibble(inst, 3) == 0xf) { - dbg_printf("\n\tmul\t%s, %s, %s\t", tbl_regs[get_nibble(inst, 2)], + dbg_printf("\n\tmul\t%s, %s, %s", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); return 0; @@ -700,7 +700,7 @@ static UINT thumb2_disasm_mul(UINT inst, ADDRESS64 *addr) if (op2 == 1) { - dbg_printf("\n\tmls\t%s, %s, %s, %s\t", tbl_regs[get_nibble(inst, 2)], + dbg_printf("\n\tmls\t%s, %s, %s, %s", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)], tbl_regs[get_nibble(inst, 3)]); @@ -734,7 +734,7 @@ static UINT thumb2_disasm_longmuldiv(UINT inst, ADDRESS64 *addr) default: return inst; } - dbg_printf("%s, %s, %s, %s\t", tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 2)], + dbg_printf("%s, %s, %s, %s", tbl_regs[get_nibble(inst, 3)], tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); return 0; } @@ -752,7 +752,7 @@ static UINT thumb2_disasm_longmuldiv(UINT inst, ADDRESS64 *addr) default: return inst; } - dbg_printf("%s, %s, %s\t", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 4)], + dbg_printf("%s, %s, %s", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); return 0; } @@ -760,6 +760,23 @@ static UINT thumb2_disasm_longmuldiv(UINT inst, ADDRESS64 *addr) return inst; } +static UINT thumb2_disasm_coprocmov1(UINT inst, ADDRESS64 *addr) +{ + WORD opc1 = (inst >> 21) & 0x07; + WORD opc2 = (inst >> 5) & 0x07; + + if (opc2) + dbg_printf("\n\t%s%s\tp%u, #%u, %s, cr%u, cr%u, #%u", (inst & 0x00100000)?"mrc":"mcr", + (inst & 0x10000000)?"2":"", get_nibble(inst, 2), opc1, + tbl_regs[get_nibble(inst, 3)], get_nibble(inst, 4), get_nibble(inst, 0), opc2); + else + dbg_printf("\n\t%s%s\tp%u, #%u, %s, cr%u, cr%u", (inst & 0x00100000)?"mrc":"mcr", + (inst & 0x10000000)?"2":"", get_nibble(inst, 2), opc1, + tbl_regs[get_nibble(inst, 3)], get_nibble(inst, 4), get_nibble(inst, 0)); + + return 0; +} + struct inst_arm { UINT mask; @@ -825,6 +842,8 @@ static const struct inst_arm tbl_thumb32[] = { { 0xff8000c0, 0xfb000000, thumb2_disasm_mul }, { 0xff8000f0, 0xfb800000, thumb2_disasm_longmuldiv }, { 0xff8000f0, 0xfb8000f0, thumb2_disasm_longmuldiv }, + { 0xef100010, 0xee100010, thumb2_disasm_coprocmov1 }, + { 0xef100010, 0xee000010, thumb2_disasm_coprocmov1 }, { 0x00000000, 0x00000000, NULL } };

1 0

Detlef Riekenberg : mpr/tests: Handle result from the AppV virtual drive.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: fc4b2f6ceca61ca7738b81f6e843509d79977314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4b2f6ceca61ca7738b81f6e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Aug 3 19:16:35 2012 +0200 mpr/tests: Handle result from the AppV virtual drive. --- dlls/mpr/tests/mpr.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index d54d80d..8ccce78 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -42,7 +42,11 @@ static void test_WNetGetUniversalName(void) if(drive_type == DRIVE_REMOTE) ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); else - ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameA gave wrong error: %08x\n", ret); + /* WN_NO_NET_OR_BAD_PATH (DRIVE_FIXED) returned from the virtual drive (usual Q:) + created by the microsoft application virtualization client */ + ok((ret == WN_NOT_CONNECTED) || (ret == WN_NO_NET_OR_BAD_PATH), + "WNetGetUniversalNameA(%s, ...) returned %u (drive_type: %u)\n", + driveA, ret, drive_type); ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); @@ -53,7 +57,9 @@ static void test_WNetGetUniversalName(void) if(drive_type == DRIVE_REMOTE) ok(ret == WN_NO_ERROR, "WNetGetUniversalNameW failed: %08x\n", ret); else - ok(ret == ERROR_NOT_CONNECTED, "WNetGetUniversalNameW gave wrong error: %08x\n", ret); + ok((ret == WN_NOT_CONNECTED) || (ret == WN_NO_NET_OR_BAD_PATH), + "WNetGetUniversalNameW(%s, ...) returned %u (drive_type: %u)\n", + wine_dbgstr_w(driveW), ret, drive_type); ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); }

1 0

Detlef Riekenberg : kernel32/tests: Fix test failures on win7.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 9aacf4ce6fe240dcfb41f09cd959af2c0e52f66d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aacf4ce6fe240dcfb41f09cd… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Aug 3 05:12:59 2012 +0200 kernel32/tests: Fix test failures on win7. --- dlls/kernel32/tests/debugger.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 2094190..22f7190 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -287,6 +287,13 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) } ret=RegSetValueExA(hkey, "auto", 0, REG_SZ, (BYTE*)"1", 2); + if (ret == ERROR_ACCESS_DENIED) + { + skip_crash_and_debug = TRUE; + skip("No write access to change the debugger\n"); + return; + } + ok(ret == ERROR_SUCCESS, "unable to set AeDebug/auto: ret=%d\n", ret); get_file_name(dbglog);

1 0

Michael Stefaniuc : ole32: Remove superfluous NULL pointer check before free (Smatch).
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 55d811351ab1c7212b513d21995867db61fc65d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55d811351ab1c7212b513d219… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 1 01:14:56 2012 +0200 ole32: Remove superfluous NULL pointer check before free (Smatch). --- dlls/ole32/ole2.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 74fb43e..b857a3c 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2953,8 +2953,7 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */ CoTaskMemFree(pvar->u.blob.pBlobData); break; case VT_BSTR: - if (pvar->u.bstrVal) - PropSysFreeString(pvar->u.bstrVal); + PropSysFreeString(pvar->u.bstrVal); break; case VT_CF: if (pvar->u.pclipdata)

1 0

Michael Stefaniuc : gdiplus: Remove unreachable break after return (Smatch) .
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 60bef1409401ea11a71c8b4bdb4b92688ae516ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=60bef1409401ea11a71c8b4bd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 1 01:14:15 2012 +0200 gdiplus: Remove unreachable break after return (Smatch). --- dlls/gdiplus/gdiplus.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 2599c58..ed2dcae 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -379,7 +379,6 @@ REAL pixels_to_units(REAL pixels, GpUnit unit, REAL dpi) return pixels * point_per_inch / dpi; case UnitInch: return pixels / dpi; - break; case UnitDocument: return pixels * 300.0 / dpi; case UnitMillimeter:

1 0

Aric Stewart : usp10: Use cached values in GPOS functions.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: 7819ce61b51f53e0819ee2f335bfee5ff82a5562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7819ce61b51f53e0819ee2f33… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 31 08:50:06 2012 -0500 usp10: Use cached values in GPOS functions. --- dlls/usp10/shape.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 1ef6039..3d6b303 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -3285,9 +3285,6 @@ void SHAPE_ApplyOpenTypePositions(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps const TEXTRANGE_PROPERTIES *rpRangeProperties; int i; INT dirL; - LPOUTLINETEXTMETRICW lpotm; - LOGFONTW lf; - HFONT hfont; rpRangeProperties = &ShapingData[psa->eScript].defaultGPOSTextRange; @@ -3296,15 +3293,9 @@ void SHAPE_ApplyOpenTypePositions(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps load_ot_tables(hdc, psc); - if (!psc->GPOS_Table) + if (!psc->GPOS_Table || !psc->otm) return; - i = GetOutlineTextMetricsW( hdc, 0, NULL); - lpotm = HeapAlloc(GetProcessHeap(),0,i); - GetOutlineTextMetricsW( hdc, i, lpotm); - hfont = GetCurrentObject(hdc, OBJ_FONT); - GetObjectW(hfont, sizeof(lf), &lf); - if (!psa->fLogicalOrder && psa->fRTL) dirL = -1; else @@ -3320,7 +3311,7 @@ void SHAPE_ApplyOpenTypePositions(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps if (!feature) continue; - GPOS_apply_feature(lpotm, &lf, piAdvance, psc->GPOS_Table, feature, pwGlyphs, dirL, cGlyphs, pGoffset); + GPOS_apply_feature(psc->otm, &psc->lf, piAdvance, psc->GPOS_Table, feature, pwGlyphs, dirL, cGlyphs, pGoffset); } } }

1 0

← Newer
1
...
48
49
50
51
52
53
54
55
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 August 2012