November 2011 - Wine-commits

Stefan Dösinger : ddraw/tests: Add a partial block lock test.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 6a7c82186a7173d2682cad7367b1716d92338663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a7c82186a7173d2682cad736… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 14 13:23:59 2011 +0200 ddraw/tests: Add a partial block lock test. --- dlls/ddraw/tests/dsurface.c | 181 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 180 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 3060379..7901b6e 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -4,7 +4,7 @@ * Copyright (C) 2005 Antoine Chavasse (a.chavasse(a)gmail.com) * Copyright (C) 2005 Christian Costa * Copyright 2005 Ivan Leo Puoti - * Copyright (C) 2007 Stefan Dösinger + * Copyright (C) 2007-2009, 2011 Stefan Dösinger for CodeWeavers * Copyright (C) 2008 Alexander Dorofeyev * * This library is free software; you can redistribute it and/or @@ -4528,6 +4528,184 @@ static void set_surface_desc_test(void) IDirectDrawSurface_Release(surface3); } +static BOOL fourcc_supported(DWORD fourcc, DWORD caps) +{ + DDSURFACEDESC ddsd; + HRESULT hr; + IDirectDrawSurface *surface; + + reset_ddsd(&ddsd); + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS; + ddsd.dwWidth = 4; + ddsd.dwHeight = 4; + ddsd.ddsCaps.dwCaps = caps; + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_FOURCC; + U4(ddsd).ddpfPixelFormat.dwFourCC = fourcc; + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); + if (FAILED(hr)) + { + return FALSE; + } + IDirectDrawSurface_Release(surface); + return TRUE; +} + +static void partial_block_lock_test(void) +{ + IDirectDrawSurface7 *surface; + HRESULT hr; + DDSURFACEDESC2 ddsd; + IDirectDraw7 *dd7; + const struct + { + DWORD caps, caps2; + const char *name; + BOOL success; + } + pools[] = + { + { + DDSCAPS_VIDEOMEMORY, 0, + "D3DPOOL_DEFAULT", FALSE + }, + { + DDSCAPS_SYSTEMMEMORY, 0, + "D3DPOOL_SYSTEMMEM", TRUE + }, + { + 0, DDSCAPS2_TEXTUREMANAGE, + "D3DPOOL_MANAGED", TRUE + } + }; + const struct + { + DWORD fourcc; + DWORD caps; + const char *name; + unsigned int block_width; + unsigned int block_height; + } + formats[] = + { + {MAKEFOURCC('D','X','T','1'), DDSCAPS_TEXTURE, "D3DFMT_DXT1", 4, 4}, + {MAKEFOURCC('D','X','T','2'), DDSCAPS_TEXTURE, "D3DFMT_DXT2", 4, 4}, + {MAKEFOURCC('D','X','T','3'), DDSCAPS_TEXTURE, "D3DFMT_DXT3", 4, 4}, + {MAKEFOURCC('D','X','T','4'), DDSCAPS_TEXTURE, "D3DFMT_DXT4", 4, 4}, + {MAKEFOURCC('D','X','T','5'), DDSCAPS_TEXTURE, "D3DFMT_DXT5", 4, 4}, + /* ATI2N surfaces aren't available in ddraw */ + {MAKEFOURCC('U','Y','V','Y'), DDSCAPS_OVERLAY, "D3DFMT_UYVY", 2, 1}, + {MAKEFOURCC('Y','U','Y','2'), DDSCAPS_OVERLAY, "D3DFMT_YUY2", 2, 1}, + }; + unsigned int i, j; + RECT rect; + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); + ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); + + for (i = 0; i < sizeof(formats) / sizeof(formats[0]); i++) + { + if (!fourcc_supported(formats[i].fourcc, formats[i].caps | DDSCAPS_VIDEOMEMORY)) + { + skip("%s surfaces not supported, skipping partial block lock test\n", formats[i].name); + continue; + } + + for (j = 0; j < (sizeof(pools) / sizeof(*pools)); j++) + { + if (formats[i].caps & DDSCAPS_OVERLAY && !(pools[j].caps & DDSCAPS_VIDEOMEMORY)) + continue; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS; + ddsd.dwWidth = 128; + ddsd.dwHeight = 128; + ddsd.ddsCaps.dwCaps = pools[j].caps | formats[i].caps; + ddsd.ddsCaps.dwCaps2 = pools[j].caps2; + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_FOURCC; + U4(ddsd).ddpfPixelFormat.dwFourCC = formats[i].fourcc; + hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface, NULL); + ok(SUCCEEDED(hr), "CreateSurface failed, hr %#x, format %s, pool %s\n", + hr, formats[i].name, pools[j].name); + + /* All Windows versions allow partial block locks with DDSCAPS_SYSTEMMEMORY and + * DDSCAPS2_TEXTUREMANAGE, just like in d3d8 and d3d9. Windows XP also allows those locks + * with DDSCAPS_VIDEOMEMORY. Windows Vista and Windows 7 disallow partial locks of vidmem + * surfaces, making the ddraw behavior consistent with d3d8 and 9. + * + * Mark the Windows XP behavior as broken until we find an application that needs it */ + if (formats[i].block_width > 1) + { + SetRect(&rect, formats[i].block_width >> 1, 0, formats[i].block_width, formats[i].block_height); + hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); + ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)), + "Partial block lock %s, expected %s, format %s, pool %s\n", + SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure", + formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirectDrawSurface7_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Unlock failed, hr %#x.\n", hr); + } + + SetRect(&rect, 0, 0, formats[i].block_width >> 1, formats[i].block_height); + hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); + ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)), + "Partial block lock %s, expected %s, format %s, pool %s\n", + SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure", + formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirectDrawSurface7_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Unlock failed, hr %#x.\n", hr); + } + } + + if (formats[i].block_height > 1) + { + SetRect(&rect, 0, formats[i].block_height >> 1, formats[i].block_width, formats[i].block_height); + hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); + ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)), + "Partial block lock %s, expected %s, format %s, pool %s\n", + SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure", + formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirectDrawSurface7_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Unlock failed, hr %#x.\n", hr); + } + + SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height >> 1); + hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); + ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)), + "Partial block lock %s, expected %s, format %s, pool %s\n", + SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure", + formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirectDrawSurface7_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Unlock failed, hr %#x.\n", hr); + } + } + + SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height); + hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); + ok(SUCCEEDED(hr), "Full block lock returned %08x, expected %08x, format %s, pool %s\n", + hr, DD_OK, formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirectDrawSurface7_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Unlock failed, hr %#x.\n", hr); + } + + IDirectDrawSurface7_Release(surface); + } + } + + IDirectDraw7_Release(dd7); +} + START_TEST(dsurface) { HRESULT ret; @@ -4588,5 +4766,6 @@ START_TEST(dsurface) zbufferbitdepth_test(); pixelformat_flag_test(); set_surface_desc_test(); + partial_block_lock_test(); ReleaseDirectDraw(); }

1 0

Jacek Caban : mshtml: Make nsIURL::GetParam a stub.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 1ca84cb72977750629d7c88a8b1cbbaad58b6a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca84cb72977750629d7c88a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 8 16:17:31 2011 +0100 mshtml: Make nsIURL::GetParam a stub. --- dlls/mshtml/nsio.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index f127bbc..aa34ddd 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2333,13 +2333,11 @@ static nsresult NSAPI nsURL_GetParam(nsIURL *iface, nsACString *aParam) { nsWineURI *This = impl_from_nsIURL(iface); - TRACE("(%p)->(%p)\n", This, aParam); + WARN("(%p)->(%p)\n", This, aParam); - if(This->nsurl) - return nsIURL_GetParam(This->nsurl, aParam); - - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + /* This is a leftover of ';' special handling in URLs. It will be removed from Gecko soon */ + nsACString_SetData(aParam, ""); + return NS_OK; } static nsresult NSAPI nsURL_SetParam(nsIURL *iface, const nsACString *aParam)

1 0

Jacek Caban : mshtml: Always use IUri-based nsIRI:: GetAsciiHost implementation.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 78e4d3d25c13576259f701a707fe40867c1dda5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=78e4d3d25c13576259f701a70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 8 16:17:40 2011 +0100 mshtml: Always use IUri-based nsIRI::GetAsciiHost implementation. --- dlls/mshtml/nsio.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index aa34ddd..ff93773 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2289,12 +2289,8 @@ static nsresult NSAPI nsURI_GetAsciiHost(nsIURL *iface, nsACString *aAsciiHost) { nsWineURI *This = impl_from_nsIURL(iface); - TRACE("(%p)->(%p)\n", This, aAsciiHost); + WARN("(%p)->(%p) FIXME: Use Uri_PUNYCODE_IDN_HOST flag\n", This, aAsciiHost); - if(This->nsuri) - return nsIURI_GetAsciiHost(This->nsuri, aAsciiHost); - - WARN("Use Uri_PUNYCODE_IDN_HOST flag\n"); return get_uri_string(This, Uri_PROPERTY_HOST, aAsciiHost); }

1 0

Aric Stewart : usp10: Avoid an end of buffer overrun when seeking non space characters at an end of a BiDi string .
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 38aa7696c57f9d3484a97ce9fb209c2ce1e9c32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=38aa7696c57f9d3484a97ce9f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 8 09:31:57 2011 -0600 usp10: Avoid an end of buffer overrun when seeking non space characters at an end of a BiDi string. --- dlls/usp10/usp10.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 05468eb..2a6107e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -856,7 +856,10 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int int j = 1; while (cnt + j < cInChars - 1 && (pwcInChars[cnt+j] == Numeric_space || pwcInChars[cnt+j] == ZWJ || pwcInChars[cnt+j] == ZWNJ)) j++; - New_Script = get_char_script(pwcInChars[cnt+j]); + if (cnt + j < cInChars) + New_Script = get_char_script(pwcInChars[cnt+j]); + else + New_Script = get_char_script(pwcInChars[cnt]); } if ((levels && (levels[cnt] != pItems[index].a.s.uBidiLevel || (strength && (strength[cnt] != str)))) || (New_Script != -1 && New_Script != pItems[index].a.eScript) || New_Script == Script_Control)

1 0

Aric Stewart : usp10: Add a few chars that Windows itemizes as punctuation.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: cd3d305b6040c6e46ceed97603c22ef45c46a668 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd3d305b6040c6e46ceed9760… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 8 10:33:43 2011 -0600 usp10: Add a few chars that Windows itemizes as punctuation. --- dlls/usp10/usp10.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 2a6107e..a19ed81 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -494,6 +494,10 @@ static WORD get_char_script( WCHAR ch) if (ch == 0xc || ch == 0x20 || ch == 0x202f) return Script_CR; + /* These chars are itemized as Punctuation by Windows */ + if (ch == 0x2212 || ch == 0x2044 || ch == 0x00a0) + return Script_Punctuation; + GetStringTypeW(CT_CTYPE1, &ch, 1, &type); if (type == 0)

1 0

Aric Stewart : usp10/tests: Add Kannada shaping test.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: c5db60200f00966c9a6cb65a117481026433c505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5db60200f00966c9a6cb65a1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 8 10:33:37 2011 -0600 usp10/tests: Add Kannada shaping test. --- dlls/usp10/tests/usp10.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 6655ba6..955e19d 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -843,6 +843,16 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + /* Kannada */ + static const WCHAR test_kannada[] = {0x0c95, 0x0ca8, 0x0ccd, 0x0ca8, 0x0ca1}; + static const shapeTest_char kannada_c[] = {{0,{0,0}},{1,{0,0}},{1,{0,0}},{1,{0,0}},{3,{0,0}}}; + static const shapeTest_glyph kannada_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -1003,6 +1013,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Tunga", 22, test_kannada[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_kannada, 5, &Control, &State, 0, 4, kannada_c, kannada_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Alexandre Julliard : regedit: Convert dialogs to po files.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: b9aed40111f765c002d0e1008171521b90bc78f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9aed40111f765c002d0e1008… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 15:27:07 2011 +0100 regedit: Convert dialogs to po files. --- po/ar.po | 114 ++++++++++++++++-- po/bg.po | 109 +++++++++++++++-- po/ca.po | 120 +++++++++++++++++-- po/cs.po | 115 ++++++++++++++++-- po/da.po | 107 +++++++++++++++-- po/de.po | 107 +++++++++++++++-- po/el.po | 112 ++++++++++++++++-- po/en.po | 109 +++++++++++++++-- po/en_US.po | 107 +++++++++++++++-- po/eo.po | 120 +++++++++++++++++-- po/es.po | 107 +++++++++++++++-- po/fa.po | 114 ++++++++++++++++-- po/fi.po | 120 +++++++++++++++++-- po/fr.po | 107 +++++++++++++++-- po/he.po | 107 +++++++++++++++-- po/hi.po | 107 +++++++++++++++-- po/hu.po | 109 +++++++++++++++-- po/it.po | 107 +++++++++++++++-- po/ja.po | 107 +++++++++++++++-- po/ko.po | 107 +++++++++++++++-- po/lt.po | 107 +++++++++++++++-- po/ml.po | 107 +++++++++++++++-- po/nb_NO.po | 107 +++++++++++++++-- po/nl.po | 107 +++++++++++++++-- po/or.po | 107 +++++++++++++++-- po/pa.po | 107 +++++++++++++++-- po/pl.po | 107 +++++++++++++++-- po/pt_BR.po | 107 +++++++++++++++-- po/pt_PT.po | 107 +++++++++++++++-- po/rm.po | 113 ++++++++++++++++-- po/ro.po | 107 +++++++++++++++-- po/ru.po | 107 +++++++++++++++-- po/sk.po | 114 ++++++++++++++++-- po/sl.po | 107 +++++++++++++++-- po/sr_RS(a)cyrillic.po | 120 +++++++++++++++++-- po/sr_RS(a)latin.po | 128 ++++++++++++++++++-- po/sv.po | 107 +++++++++++++++-- po/te.po | 107 +++++++++++++++-- po/th.po | 116 +++++++++++++++++-- po/tr.po | 109 +++++++++++++++-- po/uk.po | 107 +++++++++++++++-- po/wa.po | 115 ++++++++++++++++-- po/wine.pot | 107 +++++++++++++++-- po/zh_CN.po | 107 +++++++++++++++-- po/zh_TW.po | 107 +++++++++++++++-- programs/regedit/Bg.rc | 120 ------------------ programs/regedit/Cs.rc | 73 ----------- programs/regedit/Da.rc | 147 ---------------------- programs/regedit/De.rc | 146 ---------------------- programs/regedit/En.rc | 137 --------------------- programs/regedit/Es.rc | 147 ---------------------- programs/regedit/Fr.rc | 149 ----------------------- programs/regedit/He.rc | 157 ------------------------ programs/regedit/Hu.rc | 122 ------------------- programs/regedit/It.rc | 150 ----------------------- programs/regedit/Ja.rc | 147 ---------------------- programs/regedit/Ko.rc | 152 ----------------------- programs/regedit/Lt.rc | 145 ---------------------- programs/regedit/Makefile.in | 23 ---- programs/regedit/Nl.rc | 144 ---------------------- programs/regedit/No.rc | 146 ---------------------- programs/regedit/Pl.rc | 143 ---------------------- programs/regedit/Pt.rc | 164 ------------------------- programs/regedit/Ro.rc | 148 ---------------------- programs/regedit/Ru.rc | 147 ---------------------- programs/regedit/Si.rc | 146 ---------------------- programs/regedit/Sv.rc | 144 ---------------------- programs/regedit/Tr.rc | 120 ------------------ programs/regedit/Uk.rc | 150 ----------------------- programs/regedit/Zh.rc | 275 ------------------------------------------ programs/regedit/regedit.rc | 107 ++++++++++++++++ 71 files changed, 4699 insertions(+), 3903 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9aed40111f765c002d0e…

1 0

Alexandre Julliard : progman: Convert dialogs to po files.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: dda92997607f751e8a801dcd11ff060622914221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dda92997607f751e8a801dcd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 16:40:14 2011 +0100 progman: Convert dialogs to po files. --- po/ar.po | 122 ++++++++++++++++--- po/bg.po | 130 +++++++++++++++++--- po/ca.po | 138 +++++++++++++++++++--- po/cs.po | 121 ++++++++++++++++--- po/da.po | 121 ++++++++++++++++--- po/de.po | 121 ++++++++++++++++--- po/el.po | 122 ++++++++++++++++--- po/en.po | 121 ++++++++++++++++--- po/en_US.po | 121 ++++++++++++++++--- po/eo.po | 137 +++++++++++++++++++--- po/es.po | 121 ++++++++++++++++--- po/fa.po | 122 ++++++++++++++++--- po/fi.po | 133 ++++++++++++++++++--- po/fr.po | 121 ++++++++++++++++--- po/he.po | 121 ++++++++++++++++--- po/hi.po | 125 +++++++++++++++++--- po/hu.po | 122 ++++++++++++++++--- po/it.po | 121 ++++++++++++++++--- po/ja.po | 136 ++++++++++++++++++--- po/ko.po | 121 ++++++++++++++++--- po/lt.po | 121 ++++++++++++++++--- po/ml.po | 125 +++++++++++++++++--- po/nb_NO.po | 121 ++++++++++++++++--- po/nl.po | 121 ++++++++++++++++--- po/or.po | 125 +++++++++++++++++--- po/pa.po | 125 +++++++++++++++++--- po/pl.po | 121 ++++++++++++++++--- po/pt_BR.po | 121 ++++++++++++++++--- po/pt_PT.po | 121 ++++++++++++++++--- po/rm.po | 122 ++++++++++++++++--- po/ro.po | 121 ++++++++++++++++--- po/ru.po | 121 ++++++++++++++++--- po/sk.po | 143 +++++++++++++++++++--- po/sl.po | 121 ++++++++++++++++--- po/sr_RS(a)cyrillic.po | 144 +++++++++++++++++++---- po/sr_RS(a)latin.po | 144 +++++++++++++++++++---- po/sv.po | 121 ++++++++++++++++--- po/te.po | 125 +++++++++++++++++--- po/th.po | 126 +++++++++++++++++--- po/tr.po | 121 ++++++++++++++++--- po/uk.po | 121 ++++++++++++++++--- po/wa.po | 126 +++++++++++++++++--- po/wine.pot | 121 ++++++++++++++++--- po/zh_CN.po | 122 ++++++++++++++++--- po/zh_TW.po | 122 ++++++++++++++++--- programs/progman/Cs.rc | 149 ----------------------- programs/progman/Da.rc | 144 ---------------------- programs/progman/De.rc | 148 ----------------------- programs/progman/En.rc | 145 ---------------------- programs/progman/Es.rc | 144 ---------------------- programs/progman/Fr.rc | 149 ----------------------- programs/progman/He.rc | 155 ------------------------ programs/progman/Hu.rc | 146 ---------------------- programs/progman/It.rc | 149 ----------------------- programs/progman/Ko.rc | 155 ------------------------ programs/progman/Lt.rc | 149 ----------------------- programs/progman/Makefile.in | 26 +---- programs/progman/Nl.rc | 146 ---------------------- programs/progman/No.rc | 144 ---------------------- programs/progman/Pl.rc | 146 ---------------------- programs/progman/Pt.rc | 199 ------------------------------ programs/progman/Ro.rc | 149 ----------------------- programs/progman/Ru.rc | 148 ----------------------- programs/progman/Si.rc | 146 ---------------------- programs/progman/Sv.rc | 146 ---------------------- programs/progman/Tr.rc | 144 ---------------------- programs/progman/Uk.rc | 149 ----------------------- programs/progman/Zh.rc | 272 ------------------------------------------ programs/progman/progman.rc | 127 ++++++++++++++++++++ 69 files changed, 4967 insertions(+), 4227 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dda92997607f751e8a801…

1 0

Alexandre Julliard : gdi32: Reselect the pattern brush on every use if it' s mapped with DIB_PAL_COLORS.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: bb162ba4b4ebbe383745b095bb5f70f78b170745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb162ba4b4ebbe383745b095b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 13:18:01 2011 +0100 gdi32: Reselect the pattern brush on every use if it's mapped with DIB_PAL_COLORS. --- dlls/gdi32/dibdrv/dibdrv.h | 3 + dlls/gdi32/dibdrv/objects.c | 86 +++++++++++++++++++++++++++++-------------- dlls/gdi32/tests/brush.c | 2 +- 3 files changed, 62 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 0650e08..6ef0d94 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -90,6 +90,9 @@ typedef struct dibdrv_physdev DWORD brush_color, brush_and, brush_xor; dib_info brush_dib; void *brush_and_bits, *brush_xor_bits; + const BITMAPINFO *brush_pattern_info; + void *brush_pattern_bits; + UINT brush_pattern_usage; BOOL (* brush_rects)(struct dibdrv_physdev *pdev, dib_info *dib, int num, const RECT *rects, HRGN clip); /* background */ diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 3418dc8..cf714b5 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1246,6 +1246,30 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev) return ret; } +static void select_pattern_brush( dibdrv_physdev *pdev, dib_info *pattern ) +{ + RECT rect; + + free_pattern_brush( pdev ); + copy_dib_color_info(&pdev->brush_dib, &pdev->dib); + + pdev->brush_dib.height = pattern->height; + pdev->brush_dib.width = pattern->width; + pdev->brush_dib.stride = get_dib_stride( pdev->brush_dib.width, pdev->brush_dib.bit_count ); + + pdev->brush_dib.bits.param = NULL; + pdev->brush_dib.bits.ptr = HeapAlloc( GetProcessHeap(), 0, + pdev->brush_dib.height * pdev->brush_dib.stride ); + pdev->brush_dib.bits.is_copy = TRUE; + pdev->brush_dib.bits.free = free_heap_bits; + + rect.left = rect.top = 0; + rect.right = pattern->width; + rect.bottom = pattern->height; + + pdev->brush_dib.funcs->convert_to(&pdev->brush_dib, pattern, &rect); +} + /********************************************************************** * pattern_brush * @@ -1263,6 +1287,16 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RE switch(pdev->brush_style) { case BS_DIBPATTERN: + if (pdev->brush_pattern_usage == DIB_PAL_COLORS) + { + dib_info pattern; + HPALETTE pal = GetCurrentObject( pdev->dev.hdc, OBJ_PAL ); + if (!init_dib_info_from_brush( &pattern, pdev->brush_pattern_info, + pdev->brush_pattern_bits, DIB_PAL_COLORS, pal )) + return FALSE; + select_pattern_brush( pdev, &pattern ); + free_dib_info( &pattern ); + } if(!create_pattern_brush_bits(pdev)) return FALSE; break; @@ -1317,6 +1351,11 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_info *dib, int num, const RE } } release_wine_region( region ); + + /* we need to recompute the bits each time for DIB_PAL_COLORS */ + if (pdev->brush_style == BS_DIBPATTERN && pdev->brush_pattern_usage == DIB_PAL_COLORS) + free_pattern_brush_bits( pdev ); + return TRUE; } @@ -1347,9 +1386,7 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, if (bitmap || info) /* pattern brush */ { - dib_info orig_dib; - HPALETTE pal = (usage == DIB_PAL_COLORS) ? GetCurrentObject(dev->hdc, OBJ_PAL) : NULL; - RECT rect; + dib_info pattern; BOOL ret; if (!info) @@ -1357,37 +1394,30 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); if (!bmp) return 0; - ret = init_dib_info_from_bitmapobj( &orig_dib, bmp, 0 ); + ret = init_dib_info_from_bitmapobj( &pattern, bmp, 0 ); GDI_ReleaseObj( bitmap ); + if (!ret) return 0; + select_pattern_brush( pdev, &pattern ); + free_dib_info( &pattern ); + } + else if (usage != DIB_PAL_COLORS) + { + if (!init_dib_info_from_brush( &pattern, info, bits, DIB_RGB_COLORS, 0 )) return 0; + select_pattern_brush( pdev, &pattern ); + free_dib_info( &pattern ); + } + else + { + /* brush is actually selected only when it's used */ + free_pattern_brush( pdev ); } - else ret = init_dib_info_from_brush( &orig_dib, info, bits, usage, pal ); - - if (!ret) return 0; - - if (usage == DIB_PAL_COLORS) FIXME( "DIB_PAL_COLORS brush not handled correctly\n"); - - free_pattern_brush( pdev ); - copy_dib_color_info(&pdev->brush_dib, &pdev->dib); - - pdev->brush_dib.height = orig_dib.height; - pdev->brush_dib.width = orig_dib.width; - pdev->brush_dib.stride = get_dib_stride( pdev->brush_dib.width, pdev->brush_dib.bit_count ); - - pdev->brush_dib.bits.param = NULL; - pdev->brush_dib.bits.ptr = HeapAlloc( GetProcessHeap(), 0, - pdev->brush_dib.height * pdev->brush_dib.stride ); - pdev->brush_dib.bits.is_copy = TRUE; - pdev->brush_dib.bits.free = free_heap_bits; - - rect.left = rect.top = 0; - rect.right = orig_dib.width; - rect.bottom = orig_dib.height; - pdev->brush_dib.funcs->convert_to(&pdev->brush_dib, &orig_dib, &rect); pdev->brush_rects = pattern_brush; pdev->brush_style = BS_DIBPATTERN; + pdev->brush_pattern_info = info; + pdev->brush_pattern_bits = bits; + pdev->brush_pattern_usage = usage; pdev->defer &= ~DEFER_BRUSH; - free_dib_info(&orig_dib); return next->funcs->pSelectBrush( next, hbrush, bitmap, info, bits, usage ); } diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index f0ef2df..c6c7678 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -288,7 +288,7 @@ static void test_palette_brush(void) pal->palPalEntry[255 - i].peGreen << 8 | pal->palPalEntry[255 - i].peBlue); if (expect) - todo_wine ok( dib_bits[i] == expect, "wrong bits %x/%x at %u,%u\n", dib_bits[i], expect, i % 16, i / 16 ); + ok( dib_bits[i] == expect, "wrong bits %x/%x at %u,%u\n", dib_bits[i], expect, i % 16, i / 16 ); else ok( dib_bits[i] == expect, "wrong bits %x/%x at %u,%u\n", dib_bits[i], expect, i % 16, i / 16 ); }

1 0

Alexandre Julliard : gdi32: Avoid copying the brush pattern if the format matches the DC.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 03496d6fba8d44a9113ccf5b5999746c756afc40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03496d6fba8d44a9113ccf5b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 13:32:36 2011 +0100 gdi32: Avoid copying the brush pattern if the format matches the DC. --- dlls/gdi32/dibdrv/objects.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index cf714b5..ddd3563 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1246,6 +1246,27 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev) return ret; } +static BOOL matching_pattern_format( dib_info *dib, dib_info *pattern ) +{ + if (dib->bit_count != pattern->bit_count) return FALSE; + if (dib->stride != pattern->stride) return FALSE; + + switch (dib->bit_count) + { + case 1: + case 4: + case 8: + if (dib->color_table_size != pattern->color_table_size) return FALSE; + return !memcmp( dib->color_table, pattern->color_table, dib->color_table_size * sizeof(RGBQUAD) ); + case 16: + case 32: + return (dib->red_mask == pattern->red_mask && + dib->green_mask == pattern->green_mask && + dib->blue_mask == pattern->blue_mask); + } + return TRUE; +} + static void select_pattern_brush( dibdrv_physdev *pdev, dib_info *pattern ) { RECT rect; @@ -1257,7 +1278,14 @@ static void select_pattern_brush( dibdrv_physdev *pdev, dib_info *pattern ) pdev->brush_dib.width = pattern->width; pdev->brush_dib.stride = get_dib_stride( pdev->brush_dib.width, pdev->brush_dib.bit_count ); - pdev->brush_dib.bits.param = NULL; + if (matching_pattern_format( &pdev->brush_dib, pattern )) + { + pdev->brush_dib.bits.ptr = pattern->bits.ptr; + pdev->brush_dib.bits.is_copy = FALSE; + pdev->brush_dib.bits.free = NULL; + return; + } + pdev->brush_dib.bits.ptr = HeapAlloc( GetProcessHeap(), 0, pdev->brush_dib.height * pdev->brush_dib.stride ); pdev->brush_dib.bits.is_copy = TRUE;

1 0