October 2011 - Wine-commits

Jacek Caban : hlink: Added TargetFrameName tests.
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: 28c94f5a53963773bf7fc8db9f56fb4625d43602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28c94f5a53963773bf7fc8db9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 21 15:12:43 2011 +0200 hlink: Added TargetFrameName tests. --- dlls/hlink/tests/hlink.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 2b2cfaa..15191df 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1821,6 +1821,43 @@ static void test_HlinkClone(void) IMoniker_Release(dummy); } +static void test_StdHlink(void) +{ + IHlink *hlink; + WCHAR *str; + HRESULT hres; + + static const WCHAR testW[] = {'t','e','s','t',0}; + + hres = CoCreateInstance(&CLSID_StdHlink, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IHlink, (void**)&hlink); + ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + + str = (void*)0xdeadbeef; + hres = IHlink_GetTargetFrameName(hlink, &str); + ok(hres == S_FALSE, "GetTargetFrameName failed: %08x\n", hres); + ok(!str, "str = %s\n", wine_dbgstr_w(str)); + + hres = IHlink_SetTargetFrameName(hlink, testW); + ok(hres == S_OK, "SetTargetFrameName failed: %08x\n", hres); + + str = (void*)0xdeadbeef; + hres = IHlink_GetTargetFrameName(hlink, &str); + ok(hres == S_OK, "GetTargetFrameName failed: %08x\n", hres); + ok(!lstrcmpW(str, testW), "str = %s\n", wine_dbgstr_w(str)); + CoTaskMemFree(str); + + hres = IHlink_SetTargetFrameName(hlink, NULL); + ok(hres == S_OK, "SetTargetFrameName failed: %08x\n", hres); + + str = (void*)0xdeadbeef; + hres = IHlink_GetTargetFrameName(hlink, &str); + ok(hres == S_FALSE, "GetTargetFrameName failed: %08x\n", hres); + ok(!str, "str = %s\n", wine_dbgstr_w(str)); + + IHlink_Release(hlink); +} + START_TEST(hlink) { CoInitialize(NULL); @@ -1838,6 +1875,7 @@ START_TEST(hlink) test_HashLink(); test_HlinkSite(); test_HlinkClone(); + test_StdHlink(); CoUninitialize(); }

1 0

Aurimas Fišeras : comdlg32: Update Lithuanian translation.
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: 46aa1511fadfc64de89b11d1fe6b10f4ee167185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46aa1511fadfc64de89b11d1f… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Oct 21 08:37:58 2011 +0300 comdlg32: Update Lithuanian translation. --- dlls/comdlg32/cdlg_Lt.rc | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/cdlg_Lt.rc b/dlls/comdlg32/cdlg_Lt.rc index 0cc004a..1481ba5 100644 --- a/dlls/comdlg32/cdlg_Lt.rc +++ b/dlls/comdlg32/cdlg_Lt.rc @@ -1,5 +1,5 @@ /* - * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * Copyright 2009-2011 Aurimas Fišeras <aurimas(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -354,3 +354,21 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Atsisakyti", IDCANCEL,222,128,50,14 PUSHBUTTON "&Žinynas", pshHelp,222,145,50,14 } + +NEWFILEOPENV3ORD DIALOG 0, 0, 440, 300 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN | + WS_THICKFRAME +CAPTION "Atverti" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Failo vardas:", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT + EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP + + LTEXT "Failų tipai:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT + COMBOBOX IDC_FILETYPE, 226, 256, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | + CBS_HASSTRINGS | CBS_DROPDOWNLIST + + DEFPUSHBUTTON "&Atverti", IDOK, 350, 240, 40, 14, WS_GROUP + PUSHBUTTON "Atsisakyti", IDCANCEL, 395, 240, 40, 14 + PUSHBUTTON "&Žinynas", pshHelp, 350, 272, 40, 14 +}

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: 79558f293265f78de3b801c0ff2a0a8c285fc9eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=79558f293265f78de3b801c0f… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Oct 20 22:45:07 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index c781b78..5591632 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-10-18 21:24+0300\n" +"PO-Revision-Date: 2011-10-20 22:44+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -10717,9 +10717,9 @@ msgid "Screen buffer size must be greater or equal to the window's one" msgstr "Ekrano buferio dydis turi būti didesnis arba lygus lango buferiui" #: wineconsole.rc:34 -#, fuzzy msgid "Each character is %1!u! pixels wide on %2!u! pixels high" -msgstr "Kiekvienas simbolis yra %ld pikselių pločio ir %ld pikselių aukščio" +msgstr "" +"Kiekvienas simbolis yra %1!u! pikselių pločio ir %2!u! pikselių aukščio" #: wineconsole.rc:35 msgid "This is a test" @@ -10941,9 +10941,8 @@ msgid "Security" msgstr "Saugumas" #: winefile.rc:120 -#, fuzzy msgid "%1 of %2 free" -msgstr "%s iš %s laisva" +msgstr "%1 iš %2 laisva" #: winemine.rc:34 msgid "&Game"

1 0

Frédéric Delanoy : msvcrt: Avoid superfluous cast of MSVCRT_malloc return value.
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: 7bfe648666355585b74e1f31c286ddd1d86aa894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bfe648666355585b74e1f31c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 21 01:44:45 2011 +0200 msvcrt: Avoid superfluous cast of MSVCRT_malloc return value. --- dlls/msvcrt/math.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2e3b4fc..4f187de 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1351,7 +1351,7 @@ int CDECL _ecvt_s( char *buffer, MSVCRT_size_t length, double number, int ndigit /* handle cases with zero ndigits or less */ prec = ndigits; if( prec < 1) prec = 2; - result = (char*)MSVCRT_malloc(prec + 7); + result = MSVCRT_malloc(prec + 7); if( number < 0) { *sign = TRUE;

1 0

Frédéric Delanoy : cmd: Constify WCMD_pushd parameter.
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: 42f126e80ddd5edcc5df825e23b6c5faae1957fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=42f126e80ddd5edcc5df825e2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 21 00:56:32 2011 +0200 cmd: Constify WCMD_pushd parameter. --- programs/cmd/builtins.c | 3 ++- programs/cmd/wcmd.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 79e1ced..721fb02 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1418,7 +1418,8 @@ void WCMD_goto (CMD_LIST **cmdList) { * Push a directory onto the stack */ -void WCMD_pushd (WCHAR *command) { +void WCMD_pushd (const WCHAR *command) +{ struct env_stack *curdir; WCHAR *thisdir; static const WCHAR parmD[] = {'/','D','\0'}; diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index e025484..33ae12f 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -79,7 +79,7 @@ void WCMD_output_asis_stderr (const WCHAR *message); void WCMD_pause (void); void WCMD_popd (void); void WCMD_print_error (void); -void WCMD_pushd (WCHAR *); +void WCMD_pushd (const WCHAR *command); void WCMD_remove_dir (WCHAR *command); void WCMD_rename (void); void WCMD_run_program (WCHAR *command, int called);

1 0

Jacek Caban : vbscript: Added vbSunday constant implementation.
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: 89c76714038d60ee6a62e98157c2477b2d87ca27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c76714038d60ee6a62e9815… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 21 12:42:37 2011 +0200 vbscript: Added vbSunday constant implementation. --- dlls/vbscript/global.c | 14 ++++++++++++-- dlls/vbscript/tests/api.vbs | 3 +++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 56cedf6..d3c4c0c 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -75,6 +75,16 @@ static HRESULT return_bstr(VARIANT *res, const WCHAR *str) return S_OK; } +static HRESULT return_short(VARIANT *res, short val) +{ + if(res) { + V_VT(res) = VT_I2; + V_I2(res) = val; + } + + return S_OK; +} + static IUnknown *create_object(script_ctx_t *ctx, const WCHAR *progid) { IInternetHostSecurityManager *secmgr = NULL; @@ -897,8 +907,8 @@ static HRESULT Global_vbUseSystemDayOfWeek(vbdisp_t *This, VARIANT *arg, unsigne static HRESULT Global_vbSunday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, 1); } static HRESULT Global_vbMonday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 126f1e0..c201bea 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -23,6 +23,9 @@ Dim x Class EmptyClass End Class +Call ok(vbSunday = 1, "vbSunday = " & vbSunday) +Call ok(getVT(vbSunday) = "VT_I2", "getVT(vbSunday) = " & getVT(vbSunday)) + Call ok(isObject(new EmptyClass), "isObject(new EmptyClass) is not true?") Set x = new EmptyClass Call ok(isObject(x), "isObject(x) is not true?")

1 0

Jacek Caban : vbscript: Added remaining week day constants implementations.
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: d0740365ffa8edc04b839bc75e24cfcab35f7f8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0740365ffa8edc04b839bc75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 21 12:42:48 2011 +0200 vbscript: Added remaining week day constants implementations. --- dlls/vbscript/global.c | 24 ++++++++++++------------ dlls/vbscript/tests/api.vbs | 12 ++++++++++++ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index d3c4c0c..e3c7161 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -913,38 +913,38 @@ static HRESULT Global_vbSunday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_vbMonday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, 2); } static HRESULT Global_vbTuesday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, 3); } static HRESULT Global_vbWednesday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, 4); } static HRESULT Global_vbThursday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, 5); } static HRESULT Global_vbFriday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, 6); } static HRESULT Global_vbSaturday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, 7); } static HRESULT Global_vbFirstJan1(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index c201bea..ae1e73b 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -25,6 +25,18 @@ End Class Call ok(vbSunday = 1, "vbSunday = " & vbSunday) Call ok(getVT(vbSunday) = "VT_I2", "getVT(vbSunday) = " & getVT(vbSunday)) +Call ok(vbMonday = 2, "vbMonday = " & vbMonday) +Call ok(getVT(vbMonday) = "VT_I2", "getVT(vbMonday) = " & getVT(vbMonday)) +Call ok(vbTuesday = 3, "vbTuesday = " & vbTuesday) +Call ok(getVT(vbTuesday) = "VT_I2", "getVT(vbTuesday) = " & getVT(vbTuesday)) +Call ok(vbWednesday = 4, "vbWednesday = " & vbWednesday) +Call ok(getVT(vbWednesday) = "VT_I2", "getVT(vbWednesday) = " & getVT(vbWednesday)) +Call ok(vbThursday = 5, "vbThursday = " & vbThursday) +Call ok(getVT(vbThursday) = "VT_I2", "getVT(vbThursday) = " & getVT(vbThursday)) +Call ok(vbFriday = 6, "vbFriday = " & vbFriday) +Call ok(getVT(vbFriday) = "VT_I2", "getVT(vbFriday) = " & getVT(vbFriday)) +Call ok(vbSaturday = 7, "vbSaturday = " & vbSaturday) +Call ok(getVT(vbSaturday) = "VT_I2", "getVT(vbSaturday) = " & getVT(vbSaturday)) Call ok(isObject(new EmptyClass), "isObject(new EmptyClass) is not true?") Set x = new EmptyClass

1 0

Alexandre Julliard : winex11: Filter out zero-size dashes for PS_USERSTYLE pens.
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: f839e5327255077ba6f569d2e8e907eaba98ce97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f839e5327255077ba6f569d2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 21 14:55:26 2011 +0200 winex11: Filter out zero-size dashes for PS_USERSTYLE pens. --- dlls/winex11.drv/pen.c | 41 +++++++++++++++++++++++++++++++++++------ 1 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/pen.c b/dlls/winex11.drv/pen.c index b677515..c0eff92 100644 --- a/dlls/winex11.drv/pen.c +++ b/dlls/winex11.drv/pen.c @@ -25,6 +25,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); + +static DWORD get_user_dashes( char *res, const DWORD *style, DWORD len ) +{ + DWORD i, pos, dashes[MAX_DASHLEN]; + + len = min( len, MAX_DASHLEN ); + memcpy( dashes, style, len * sizeof(DWORD) ); + for (i = pos = 0; i < len; i++) + { + if (!dashes[i]) /* get rid of 0 entry */ + { + if (i < len - 1) + { + i++; + if (pos) dashes[pos - 1] += dashes[i]; + else dashes[len - 1] += dashes[i]; + } + else if (pos) + { + dashes[0] += dashes[pos - 1]; + pos--; + } + } + else dashes[pos++] = dashes[i]; + } + for (i = 0; i < pos; i++) res[i] = min( dashes[i], 255 ); + return pos; +} + /*********************************************************************** * SelectPen (X11DRV.@) */ @@ -106,18 +135,18 @@ HPEN X11DRV_SelectPen( PHYSDEV dev, HPEN hpen ) memcpy(physDev->pen.dashes, PEN_alternate, physDev->pen.dash_len); break; case PS_USERSTYLE: - physDev->pen.dash_len = min(elp->elpNumEntries, MAX_DASHLEN); - for(i = 0; i < physDev->pen.dash_len ; i++) - physDev->pen.dashes[i] = min(elp->elpStyleEntry[i], 255); + physDev->pen.dash_len = get_user_dashes( physDev->pen.dashes, + elp->elpStyleEntry, elp->elpNumEntries ); break; default: physDev->pen.dash_len = 0; break; } - if(physDev->pen.ext && physDev->pen.dash_len && - (logpen.lopnStyle & PS_STYLE_MASK) != PS_ALTERNATE) + if(physDev->pen.ext && physDev->pen.dash_len && physDev->pen.width && + (logpen.lopnStyle & PS_STYLE_MASK) != PS_USERSTYLE && + (logpen.lopnStyle & PS_STYLE_MASK) != PS_ALTERNATE) for(i = 0; i < physDev->pen.dash_len; i++) - physDev->pen.dashes[i] *= (physDev->pen.width ? physDev->pen.width : 1); + physDev->pen.dashes[i] = min( physDev->pen.dashes[i] * physDev->pen.width, 255 ); HeapFree( GetProcessHeap(), 0, elp );

1 0

Alexandre Julliard : wineps: Add support for PS_USERSTYLE pens.
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: f1faeb0f28916e5620482af099b8e92466d63ba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1faeb0f28916e5620482af09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 21 16:38:39 2011 +0200 wineps: Add support for PS_USERSTYLE pens. --- dlls/wineps.drv/pen.c | 45 ++++++++++++++++++++++++++++----------------- dlls/wineps.drv/ps.c | 16 +++++++++------- dlls/wineps.drv/psdrv.h | 5 ++++- 3 files changed, 41 insertions(+), 25 deletions(-) diff --git a/dlls/wineps.drv/pen.c b/dlls/wineps.drv/pen.c index 55379db..422b049 100644 --- a/dlls/wineps.drv/pen.c +++ b/dlls/wineps.drv/pen.c @@ -28,11 +28,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); -static const char PEN_dash[] = "50 30"; /* ----- ----- ----- */ -static const char PEN_dot[] = "20"; /* -- -- -- -- -- -- */ -static const char PEN_dashdot[] = "40 30 20 30"; /* ---- -- ---- -- */ -static const char PEN_dashdotdot[] = "40 20 20 20 20 20"; /* ---- -- -- ---- */ -static const char PEN_alternate[] = "1"; +static const DWORD PEN_dash[] = { 50, 30 }; /* ----- ----- ----- */ +static const DWORD PEN_dot[] = { 20 }; /* -- -- -- -- -- -- */ +static const DWORD PEN_dashdot[] = { 40, 30, 20, 30 }; /* ---- -- ---- -- */ +static const DWORD PEN_dashdotdot[] = { 40, 20, 20, 20, 20, 20 }; /* ---- -- -- ---- */ +static const DWORD PEN_alternate[] = { 1 }; /*********************************************************************** * SelectPen (WINEPS.@) @@ -41,11 +41,11 @@ HPEN PSDRV_SelectPen( PHYSDEV dev, HPEN hpen ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); LOGPEN logpen; + EXTLOGPEN *elp = NULL; if (!GetObjectW( hpen, sizeof(logpen), &logpen )) { /* must be an extended pen */ - EXTLOGPEN *elp; INT size = GetObjectW( hpen, 0, NULL ); if (!size) return 0; @@ -58,8 +58,6 @@ HPEN PSDRV_SelectPen( PHYSDEV dev, HPEN hpen ) logpen.lopnWidth.x = elp->elpWidth; logpen.lopnWidth.y = 0; logpen.lopnColor = elp->elpColor; - - HeapFree( GetProcessHeap(), 0, elp ); } TRACE("hpen = %p colour = %08x\n", hpen, logpen.lopnColor); @@ -94,34 +92,47 @@ HPEN PSDRV_SelectPen( PHYSDEV dev, HPEN hpen ) switch(physDev->pen.style) { case PS_DASH: - physDev->pen.dash = PEN_dash; + memcpy( physDev->pen.dash, PEN_dash, sizeof(PEN_dash) ); + physDev->pen.dash_len = sizeof(PEN_dash) / sizeof(DWORD); break; case PS_DOT: - physDev->pen.dash = PEN_dot; + memcpy( physDev->pen.dash, PEN_dot, sizeof(PEN_dot) ); + physDev->pen.dash_len = sizeof(PEN_dot) / sizeof(DWORD); break; case PS_DASHDOT: - physDev->pen.dash = PEN_dashdot; + memcpy( physDev->pen.dash, PEN_dashdot, sizeof(PEN_dashdot) ); + physDev->pen.dash_len = sizeof(PEN_dashdot) / sizeof(DWORD); break; case PS_DASHDOTDOT: - physDev->pen.dash = PEN_dashdotdot; + memcpy( physDev->pen.dash, PEN_dashdotdot, sizeof(PEN_dashdotdot) ); + physDev->pen.dash_len = sizeof(PEN_dashdotdot) / sizeof(DWORD); break; case PS_ALTERNATE: - physDev->pen.dash = PEN_alternate; + memcpy( physDev->pen.dash, PEN_alternate, sizeof(PEN_alternate) ); + physDev->pen.dash_len = sizeof(PEN_alternate) / sizeof(DWORD); + break; + + case PS_USERSTYLE: + physDev->pen.dash_len = min( elp->elpNumEntries, MAX_DASHLEN ); + memcpy( physDev->pen.dash, elp->elpStyleEntry, physDev->pen.dash_len * sizeof(DWORD) ); break; default: - physDev->pen.dash = NULL; + physDev->pen.dash_len = 0; } - if ((physDev->pen.width > 1) && (physDev->pen.dash != NULL)) { - physDev->pen.style = PS_SOLID; - physDev->pen.dash = NULL; + if ((physDev->pen.width > 1) && physDev->pen.dash_len && + physDev->pen.style != PS_USERSTYLE && physDev->pen.style != PS_ALTERNATE) + { + physDev->pen.style = PS_SOLID; + physDev->pen.dash_len = 0; } + HeapFree( GetProcessHeap(), 0, elp ); physDev->pen.set = FALSE; return hpen; } diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 09b02ef..7b8a0bf 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -125,9 +125,6 @@ static const char pssetfont[] = /* fontname, xx_scale, xy_scale, yx_scale, yy_sc static const char pssetline[] = /* width, join, endcap */ "%d setlinewidth %u setlinejoin %u setlinecap\n"; -static const char pssetdash[] = /* dash, offset */ -"[%s] %d setdash\n"; - static const char pssetgray[] = /* gray */ "%.2f setgray\n"; @@ -556,16 +553,21 @@ BOOL PSDRV_WriteSetPen(PHYSDEV dev) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); char buf[256]; + DWORD i, pos; sprintf(buf, pssetline, physDev->pen.width, physDev->pen.join, physDev->pen.endcap); PSDRV_WriteSpool(dev, buf, strlen(buf)); - if(physDev->pen.dash) { - sprintf(buf, pssetdash, physDev->pen.dash, 0); + if (physDev->pen.dash_len) + { + for (i = pos = 0; i < physDev->pen.dash_len; i++) + pos += sprintf( buf + pos, " %u", physDev->pen.dash[i] ); + buf[0] = '['; + sprintf(buf + pos, "] %u setdash\n", 0); } else - sprintf(buf, pssetdash, "", 0); - + sprintf(buf, "[] %u setdash\n", 0); + PSDRV_WriteSpool(dev, buf, strlen(buf)); return TRUE; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index adea39f..2ac748b 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -329,12 +329,15 @@ typedef struct { BOOL set; } PSBRUSH; +#define MAX_DASHLEN 16 + typedef struct { INT style; INT width; BYTE join; BYTE endcap; - const char* dash; + DWORD dash[MAX_DASHLEN]; + DWORD dash_len; PSCOLOR color; BOOL set; } PSPEN;

1 0

Huw Davies : gdi32: Add a fake 1-entry color table for 1-bpp ddbs.
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: f53d73a017a4ca5682f6ae6d216d71828488eb21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f53d73a017a4ca5682f6ae6d2… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 21 14:52:34 2011 +0100 gdi32: Add a fake 1-entry color table for 1-bpp ddbs. --- dlls/gdi32/dib.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 550f099..8eba236 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -501,8 +501,24 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he err = dev->funcs->pPutImage( dev, 0, clip, dst_info, &src_bits, &src, &dst, rop ); if (err == ERROR_BAD_FORMAT) { - err = convert_bits( src_info, &src, dst_info, &src_bits, FALSE ); - if (!err) err = dev->funcs->pPutImage( dev, 0, clip, dst_info, &src_bits, &src, &dst, rop ); + /* 1-bpp destination without a color table requires a fake 1-entry table + * that contains only the background color */ + if (dst_info->bmiHeader.biBitCount == 1 && !dst_info->bmiHeader.biClrUsed) + { + COLORREF color = GetBkColor( dev->hdc ); + dst_info->bmiColors[0].rgbRed = GetRValue( color ); + dst_info->bmiColors[0].rgbGreen = GetGValue( color ); + dst_info->bmiColors[0].rgbBlue = GetBValue( color ); + dst_info->bmiColors[0].rgbReserved = 0; + dst_info->bmiHeader.biClrUsed = 1; + } + + if (!(err = convert_bits( src_info, &src, dst_info, &src_bits, FALSE ))) + { + /* get rid of the fake 1-bpp table */ + if (dst_info->bmiHeader.biClrUsed == 1) dst_info->bmiHeader.biClrUsed = 0; + err = dev->funcs->pPutImage( dev, 0, clip, dst_info, &src_bits, &src, &dst, rop ); + } } if (err == ERROR_TRANSFORM_NOT_SUPPORTED)

1 0