October 2010 - Wine-commits

André Hentschel : Brand the QuickSearch.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: bugzilla Branch: master Commit: 0cf1fb3b01909b6cec00d309412dca2c75d8b286 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=0cf1fb3b01909b6cec00d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 20 19:43:08 2010 +0200 Brand the QuickSearch. --- template/en/default/search/search-plugin.xml.tmpl | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/template/en/default/search/search-plugin.xml.tmpl b/template/en/default/search/search-plugin.xml.tmpl index 8564dca..c904362 100644 --- a/template/en/default/search/search-plugin.xml.tmpl +++ b/template/en/default/search/search-plugin.xml.tmpl @@ -13,16 +13,11 @@ # Contributor(s): Frédéric Buclin <LpSolit(a)gmail.com> # #%] -[% PROCESS global/variables.none.tmpl %] <?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> -<ShortName>[% terms.Bugzilla %]</ShortName> -<Description>[% terms.Bugzilla %] Quick Search</Description> +<ShortName>WineHQ Bugzilla</ShortName> +<Description>WineHQ Bugzilla Quick Search</Description> <InputEncoding>UTF-8</InputEncoding> -[% IF favicon %] - <Image width="16" height="16">data:image/x-icon;base64,[% favicon FILTER base64 %]</Image> -[% ELSE %] - <Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAABGdBTUEAAK%2FINwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAALBSURBVHjaYnxckcEAA3%2F%2B%2FT%2F17LUcH%2Fevf%2F8U%2BHmYGBkZMABAALEgc%2B68%2F3T227cf2tJKKhJLt59n%2FfmbnYnZV1KEhYkJrgYggBghNrz78fPIi3d8uvKBIdb%2FOaWPnzitLc97%2Bc5rFXnhnVO3%2BslLwjUABBDIhnsfPl%2Fj53VO91FX4Gfgkjxw%2Fd%2F6Q49%2FWStqyAj%2B%2B88gZqn%2B9u5rYU52iAaAAGL69%2F%2F%2F2d9%2FYiMclGT4fv76%2BZ9DbO%2FeA39%2BfJHVcvj5l%2Bnh03e%2FWThOvnwLtwEgAAAxAM7%2FBPj8%2FRYkHQYHAf3%2F%2Fv%2F%2B%2Fv8BAVNTUPX18yorLNHE2S8mB%2FT2%2Bq7a4dvu8iUSDgAAAAKICRgUv3%2F8ZGKGeIvpz6eXBvq61lZWLMwMv%2F5zMP7%2FqSAjVFyZ%2FNvZftuT10DnAAQAMQDO%2FwQIBAPz5Or6%2Ff0CBQEAAgT99ubq38z2%2BwT18%2FAM%2F%2BkNDAv6%2FQMCAA1GVVrhMze5h4kCCORpkd9%2F3n74KiHO%2B%2BffX8b%2Ff7m%2BXWP985%2Bf5R%2BPLNdfoK%2F%2F%2Ffv39%2BePj2%2FkZYR0fe0BAgikQZGX%2B9b9FzLS%2FH%2F%2B%2FGVgYGRlZWNlA7nv7z9QuDP8%2B8nw%2FRXjn68Mv4Gu%2FAwQQCCni3FxPLn7nIGZGegfNhYmNjYWZnBMASOakZER6Eumf9%2FYGT4y%2FHx%2F%2BfBFgAAC2cDGzPT99WeGvwzvv%2Fx89vrr%2F39%2FJER4pcT5Gf4z%2FP37D2jtj9%2B%2FL918fmzrKSsWNoAAgiaN%2Fz9%2Fff%2F6S4CP8%2BWbz9vWHfv54aukpAAz0Og%2Ff%2F7%2F%2Bs36668cO3ugED9QJUAAQTUArf7%2F8x87D9vRjcejhPiZhAUYcACAAGI5%2FOHH9ddvXzAxmjz%2B8P8lw4fXn5l4eRlwA4AAYmaTkBFg%2FKvJwfbkwZuXN57y%2Fv%2F34stXGR4uRmxpGwgAAgwA4%2FkfrfCWvLQAAAAASUVORK5CYII%3D</Image> -[% END %] +<Image height="16" width="16" type="image/png">[% urlbase FILTER xml %]/images/winehq_logo_16.png</Image> <Url type="text/html" method="GET" template="[% urlbase FILTER xml %]buglist.cgi?quicksearch={searchTerms}"/> </OpenSearchDescription>

1 0

Yaron Shahrabani : wineconsole: Added Hebrew translation.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: d4e8f30332bfacb79c71338665cbff44981db173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4e8f30332bfacb79c7133866… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Thu Oct 21 15:52:33 2010 +0200 wineconsole: Added Hebrew translation. --- programs/wineconsole/Makefile.in | 1 + programs/wineconsole/wineconsole_He.rc | 142 ++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 0 deletions(-) diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in index cca7e2f..024b774 100644 --- a/programs/wineconsole/Makefile.in +++ b/programs/wineconsole/Makefile.in @@ -19,6 +19,7 @@ RC_SRCS = \ wineconsole_Eo.rc \ wineconsole_Es.rc \ wineconsole_Fr.rc \ + wineconsole_He.rc \ wineconsole_Hu.rc \ wineconsole_It.rc \ wineconsole_Ko.rc \ diff --git a/programs/wineconsole/wineconsole_He.rc b/programs/wineconsole/wineconsole_He.rc new file mode 100644 index 0000000..213bc9e --- /dev/null +++ b/programs/wineconsole/wineconsole_He.rc @@ -0,0 +1,142 @@ +/* + * Copyright 2001 Eric Pouech + * Copyright 2010 Yaron Shahrabani <sh.yaron(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 + * 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 + */ + +#include "wineconsole_res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN +IDS_EDIT, "ע&ריכה" +IDS_DEFAULT, "הגדרת &בררות מחדל" +IDS_PROPERTIES, "מ&אפינים" +IDS_MARK, "&סימון" +IDS_COPY, "ה&עתקה" +IDS_PASTE, "ה&דבקה" +IDS_SELECTALL, "בחירת ה&כול" +IDS_SCROLL, "&גלילה" +IDS_SEARCH, "&חיפוש" +IDS_FNT_DISPLAY, "כל תו הוא ברוחב %ld פיקסלים על גובה של %ld פיקסלים" +IDS_FNT_PREVIEW, "זוהי בדיקה" +IDS_DLG_TIT_DEFAULT, "תצורה - הגדרות בררת המחדל" +IDS_DLG_TIT_CURRENT, "תצורה - ההגדרות הנוכחיות" +IDS_DLG_TIT_ERROR, "שגיאת תצוגה" +IDS_DLG_ERR_SBWINSIZE, "גודל מאגר המסך חייב להיות גדול או שווה לזה של החלון" + +IDS_CMD_INVALID_EVENT_ID "wineconsole: Couldn't parse event id\n" +IDS_CMD_INVALID_BACKEND "wineconsole: Invalid backend\n" +IDS_CMD_INVALID_OPTION "wineconsole: Unrecognized command line option\n" +IDS_CMD_ABOUT "Starts a program in a Wine console\n" +IDS_CMD_LAUNCH_FAILED "wineconsole: Starting program %s failed.\n"\ + "The command is invalid.\n" + +IDS_USAGE_HEADER "\nUsage:\n wineconsole [options] <command>\n\nOptions:\n" +IDS_USAGE_BACKEND " --backend={user|curses} Choosing user will spawn a new window, curses will\n"\ + " try to setup the current terminal as a Wine console\n" +IDS_USAGE_COMMAND " <command> The Wine program to launch in the console\n" +IDS_USAGE_FOOTER "\nExample:\n wineconsole cmd\nStarts the Wine command prompt in a Wine console\n\n" + +END + +IDD_OPTION DIALOG 36, 24, 140, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION " אפשרויות " +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "גודל הסמן", -1, 10, 11, 60, 44, BS_GROUPBOX + AUTORADIOBUTTON "&קטן", IDC_OPT_CURSOR_SMALL, 14, 23, 44, 10, WS_TABSTOP + AUTORADIOBUTTON "&בינוני", IDC_OPT_CURSOR_MEDIUM, 14, 33, 44, 10, WS_TABSTOP + AUTORADIOBUTTON "&גדול", IDC_OPT_CURSOR_LARGE, 14, 43, 44, 10, WS_TABSTOP + + GROUPBOX "שליטה", -1, 75, 11, 125, 44, BS_GROUPBOX + LTEXT "התפריט הקובץ", -1, 79, 23, 40, 10 + AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 129, 23, 60, 10, WS_TABSTOP + AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 129, 33, 60, 10, WS_TABSTOP + LTEXT "עריכה מהירה", -1, 79, 43, 50, 10 + AUTOCHECKBOX "ה&פעלה", IDC_OPT_QUICK_EDIT, 129, 43, 60, 10, WS_TABSTOP + + GROUPBOX "היסטוריית הפקודות", -1, 10, 57, 190, 35, BS_GROUPBOX + LTEXT "&מספר הפקודות שנשמרות :", -1, 14, 67, 78, 18 + EDITTEXT IDC_OPT_HIST_SIZE, 92, 69, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + AUTOCHECKBOX "ה&סרת כפולים", IDC_OPT_HIST_NODOUBLE, 130, 67, 50, 18, WS_TABSTOP|BS_MULTILINE +} + +IDD_FONT DIALOG 36, 24, 140, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION " גופן " +FONT 8, "MS Shell Dlg" +{ + LTEXT "&גופן", -1, 5, 5, 24, 8 + LISTBOX IDC_FNT_LIST_FONT, 5, 18, 90, 42, LBS_SORT|WS_VSCROLL + LTEXT "&צבע", -1, 100, 5, 50, 8 + CONTROL "", IDC_FNT_COLOR_FG, "WineConColorPreview", 0L, 100, 18, 48, 16 + CONTROL "", IDC_FNT_COLOR_BK, "WineConColorPreview", 0L, 100, 40, 48, 16 + LTEXT "&גודל", -1, 158, 5, 40, 8 + LISTBOX IDC_FNT_LIST_SIZE, 158, 18, 40, 60, WS_VSCROLL + CONTROL "", IDC_FNT_PREVIEW, "WineConFontPreview", 0L, 5, 60, 109, 40 + LTEXT "", IDC_FNT_FONT_INFO, 128, 76, 80, 18 +} + +IDD_CONFIG DIALOG 36, 24, 140, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION " תצוגה " +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "אזור האגירה", -1, 10, 11, 100, 42, BS_GROUPBOX + LTEXT "&רוחב :", -1, 14, 25, 54, 9 + EDITTEXT IDC_CNF_SB_WIDTH, 68, 23, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_SB_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + LTEXT "&גובה :", -1, 14, 39, 54, 9 + EDITTEXT IDC_CNF_SB_HEIGHT, 68, 37, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_SB_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + + GROUPBOX "גודל החלון", -1, 10, 55, 100, 42 + LTEXT "&גובה :", -1, 14, 69, 54, 9 + EDITTEXT IDC_CNF_WIN_WIDTH, 68, 67, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_WIN_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + LTEXT "&רוחב :", -1, 14, 83, 54, 9 + EDITTEXT IDC_CNF_WIN_HEIGHT, 68, 81, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 + + GROUPBOX "סיום התכנית", -1, 115, 11, 80, 42, BS_GROUPBOX + AUTOCHECKBOX "סגירת ה&מסוף", IDC_CNF_CLOSE_EXIT, 119, 25, 72, 20, WS_TABSTOP + + GROUPBOX "מצב עריכה", -1, 115, 55, 80, 42 + COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 72, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP +} + +IDD_SAVE_SETTINGS DIALOG 20, 20, 170, 60 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "הפרמטרים של המסוף" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 10, 10, 150, 31, BS_GROUPBOX + AUTORADIOBUTTON "שמירת הגדרות אלו להפעלות הבאות", IDC_SAV_SAVE, 14, 15, 140, 10, WS_TABSTOP + AUTORADIOBUTTON "שינוי בהפעלה הנוכחית בלבד", IDC_SAV_SESSION, 14, 27, 140, 10, WS_TABSTOP + + PUSHBUTTON "שמירה", IDOK, 35, 45, 35, 12 + PUSHBUTTON "ביטול", IDCANCEL, 80, 45, 35, 12 +}

1 0

Paul Vriens : ipconfig: Update the Serbian (Latin and Cyrillic) translation .
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 5f845d3beb5a2a2c64a6f6aec762fcf337ff43d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f845d3beb5a2a2c64a6f6aec… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 21 14:38:45 2010 +0200 ipconfig: Update the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- programs/ipconfig/Sr.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Sr.rc b/programs/ipconfig/Sr.rc index cb5cdc2..0174595 100644 --- a/programs/ipconfig/Sr.rc +++ b/programs/ipconfig/Sr.rc @@ -47,6 +47,7 @@ STRINGTABLE STRING_DHCP_ENABLED, "DHCP је омогућен" STRING_YES, "Да" STRING_NO, "Не" + STRING_DEFAULT_GATEWAY, "Подразумевани мрежни пролаз" } LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN @@ -72,4 +73,5 @@ STRINGTABLE STRING_DHCP_ENABLED, "DHCP je omogućen" STRING_YES, "Da" STRING_NO, "Ne" + STRING_DEFAULT_GATEWAY, "Podrazumevani mrežni prolaz" }

1 0

David Adam : ddraw: Remove a useless function.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: f8690a6bdad79ab66de4de37fd8a1e11c0a631ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8690a6bdad79ab66de4de37f… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Thu Oct 21 15:01:24 2010 +0200 ddraw: Remove a useless function. --- dlls/ddraw/ddraw_private.h | 2 -- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/utils.c | 24 ------------------------ 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index f9b9a48..1518db2 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -653,8 +653,6 @@ void DDRAW_dump_cooperativelevel(DWORD cooplevel) DECLSPEC_HIDDEN; * IDirect3DExecuteBuffer isn't in WineD3D */ void multiply_matrix(LPD3DMATRIX dest, const D3DMATRIX *src1, const D3DMATRIX *src2) DECLSPEC_HIDDEN; -void multiply_matrix_D3D_way(LPD3DMATRIX result, const D3DMATRIX *m1, const D3DMATRIX *m2) DECLSPEC_HIDDEN; - /* Helper function in main.c */ BOOL LoadWineD3D(void) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7976ecb..a7eb2dd 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4502,11 +4502,11 @@ IDirect3DDeviceImpl_7_ComputeSphereVisibility(IDirect3DDevice7 *iface, if ( hr != DD_OK ) return DDERR_INVALIDPARAMS; hr = IDirect3DDeviceImpl_7_GetTransform(iface, D3DTRANSFORMSTATE_VIEW, &temp); if ( hr != DD_OK ) return DDERR_INVALIDPARAMS; - multiply_matrix_D3D_way(&m, &m, &temp); + multiply_matrix(&m, &temp, &m); hr = IDirect3DDeviceImpl_7_GetTransform(iface, D3DTRANSFORMSTATE_PROJECTION, &temp); if ( hr != DD_OK ) return DDERR_INVALIDPARAMS; - multiply_matrix_D3D_way(&m, &m, &temp); + multiply_matrix(&m, &temp, &m); /* Left plane */ vec[0].u1.x = m._14 + m._11; diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 9d1b892..c07fbe6 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -1172,30 +1172,6 @@ multiply_matrix(D3DMATRIX *dest, memcpy(dest, &temp, 16 * sizeof(D3DVALUE)); } -void multiply_matrix_D3D_way(D3DMATRIX* result, const D3DMATRIX *m1, const D3DMATRIX *m2) -{ - D3DMATRIX temp; - - temp._11 = m1->_11 * m2->_11 + m1->_12 * m2->_21 + m1->_13 * m2->_31 + m1->_14 * m2->_41; - temp._12 = m1->_11 * m2->_12 + m1->_12 * m2->_22 + m1->_13 * m2->_32 + m1->_14 * m2->_42; - temp._13 = m1->_11 * m2->_13 + m1->_12 * m2->_23 + m1->_13 * m2->_33 + m1->_14 * m2->_43; - temp._14 = m1->_11 * m2->_14 + m1->_12 * m2->_24 + m1->_13 * m2->_34 + m1->_14 * m2->_44; - temp._21 = m1->_21 * m2->_11 + m1->_22 * m2->_21 + m1->_23 * m2->_31 + m1->_24 * m2->_41; - temp._22 = m1->_21 * m2->_12 + m1->_22 * m2->_22 + m1->_23 * m2->_32 + m1->_24 * m2->_42; - temp._23 = m1->_21 * m2->_13 + m1->_22 * m2->_23 + m1->_23 * m2->_33 + m1->_24 * m2->_43; - temp._24 = m1->_21 * m2->_14 + m1->_22 * m2->_24 + m1->_23 * m2->_34 + m1->_24 * m2->_44; - temp._31 = m1->_31 * m2->_11 + m1->_32 * m2->_21 + m1->_33 * m2->_31 + m1->_34 * m2->_41; - temp._32 = m1->_31 * m2->_12 + m1->_32 * m2->_22 + m1->_33 * m2->_32 + m1->_34 * m2->_42; - temp._33 = m1->_31 * m2->_13 + m1->_32 * m2->_23 + m1->_33 * m2->_33 + m1->_34 * m2->_43; - temp._34 = m1->_31 * m2->_14 + m1->_32 * m2->_24 + m1->_33 * m2->_34 + m1->_34 * m2->_44; - temp._41 = m1->_41 * m2->_11 + m1->_42 * m2->_21 + m1->_43 * m2->_31 + m1->_44 * m2->_41; - temp._42 = m1->_41 * m2->_12 + m1->_42 * m2->_22 + m1->_43 * m2->_32 + m1->_44 * m2->_42; - temp._43 = m1->_41 * m2->_13 + m1->_42 * m2->_23 + m1->_43 * m2->_33 + m1->_44 * m2->_43; - temp._44 = m1->_41 * m2->_14 + m1->_42 * m2->_24 + m1->_43 * m2->_34 + m1->_44 * m2->_44; - - *result = temp; -} - HRESULT hr_ddraw_from_wined3d(HRESULT hr) {

1 0

Jacek Caban : mshtml: Use IUri in nsIURI::Equals implementation.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: c4ae314330066d791a7d004400b6f4843638737f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ae314330066d791a7d00440… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 21 15:50:27 2010 +0200 mshtml: Use IUri in nsIURI::Equals implementation. --- dlls/mshtml/nsio.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index fbfde61..80d5649 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1971,25 +1971,28 @@ static nsresult NSAPI nsURI_SetPath(nsIURL *iface, const nsACString *aPath) static nsresult NSAPI nsURI_Equals(nsIURL *iface, nsIURI *other, PRBool *_retval) { nsWineURI *This = NSURI_THIS(iface); - nsWineURI *wine_uri; + nsWineURI *other_obj; nsresult nsres; + HRESULT hres; TRACE("(%p)->(%p %p)\n", This, other, _retval); - if(This->nsuri) - return nsIURI_Equals(This->nsuri, other, _retval); - - nsres = nsIURI_QueryInterface(other, &IID_nsWineURI, (void**)&wine_uri); + nsres = nsIURI_QueryInterface(other, &IID_nsWineURI, (void**)&other_obj); if(NS_FAILED(nsres)) { TRACE("Could not get nsWineURI interface\n"); *_retval = FALSE; return NS_OK; } - *_retval = wine_uri->wine_url && !UrlCompareW(This->wine_url, wine_uri->wine_url, TRUE); - nsIURI_Release(NSURI(wine_uri)); + if(ensure_uri(This) && ensure_uri(other_obj)) { + hres = IUri_IsEqual(This->uri, other_obj->uri, _retval); + nsres = SUCCEEDED(hres) ? NS_OK : NS_ERROR_FAILURE; + }else { + nsres = NS_ERROR_UNEXPECTED; + } - return NS_OK; + nsIURI_Release(NSURI(other_obj)); + return nsres; } static nsresult NSAPI nsURI_SchemeIs(nsIURL *iface, const char *scheme, PRBool *_retval)

1 0

Yaron Shahrabani : oledlg: Added Hebrew translation.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 19fa8dae030a70360a1cc5f3c580a17bf75c62dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=19fa8dae030a70360a1cc5f3c… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Thu Oct 21 14:51:20 2010 +0200 oledlg: Added Hebrew translation. --- dlls/oledlg/Makefile.in | 1 + dlls/oledlg/oledlg_He.rc | 102 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in index b4e7aee..5ea1a1e 100644 --- a/dlls/oledlg/Makefile.in +++ b/dlls/oledlg/Makefile.in @@ -14,6 +14,7 @@ RC_SRCS = \ oledlg_En.rc \ oledlg_Es.rc \ oledlg_Fr.rc \ + oledlg_He.rc \ oledlg_Hu.rc \ oledlg_It.rc \ oledlg_Ja.rc \ diff --git a/dlls/oledlg/oledlg_He.rc b/dlls/oledlg/oledlg_He.rc new file mode 100644 index 0000000..6f28351 --- /dev/null +++ b/dlls/oledlg/oledlg_He.rc @@ -0,0 +1,102 @@ +/* + * Copyright 2003 Ulrich Czekalla for CodeWeavers + * Copyright 2010 Yaron Shahrabani <sh.yaron(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 + * 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 + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +UIINSERTOBJECT DIALOG 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "הוספת עצם" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "סוג העצם:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "אישור",IDOK,221,7,66,14 + PUSHBUTTON "ביטול",IDCANCEL,221,24,66,14 + GROUPBOX "תוצאה",IDC_RESULT,7,103,208,41 + CONTROL "יצירת חדש",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "יצירת פקד",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "יצירה מקובץ",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "הוספת &פקד...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "הצגה כסמל",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "עיון...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "קובץ:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE +{ + IDS_RESULTOBJDESC "הוספת עצם חדש מסוג %s למסמך שלך" + IDS_RESULTFILEOBJDESC "הוספת תוכן הקובץ כעצם לתוך המסמך כדי שניתן יהיה להפעיל אותו באמצעות התכנית שיצרה אותו." + IDS_BROWSE "עיון" + IDS_NOTOLEMOD "נראה כי הקובץ אינו מודול OLE תקני. לא ניתן לרשום את פקד ה־OLE." + IDS_NOTOLEMODCAPTION "הוספת פקד" +} + +IDD_PASTESPECIAL4 DIALOG 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "הדבקה מיוחדת" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "מקור:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "ה&דבקה", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "הדבקת &קישור", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "ב&תור:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "אישור", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "ביטול", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "ע&זרה", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "ה&צגה כסמל", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 + CONTROL "החלפת ה&סמל...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< טקסט התוצאה יופיע כאן >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "תוצאה", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE +{ + IDS_PS_PASTE_DATA "הוספת תוכן לוח הגזירים למסמך שלך בתור %s." + IDS_PS_PASTE_OBJECT "הוספת תוכן לוח הגזירים למסמך שלך כדי שניתן יהיה להפעילו באמצעות %s." + IDS_PS_PASTE_OBJECT_AS_ICON "הוספת תוכן לוח הגזירים למסמך שלך כדי שניתן יהיה להפעילו באמצעות %s. העצם יוצג כסמל." + IDS_PS_PASTE_LINK_DATA "הוספת תוכן לוח הגזירים למסמך שלך כדי שניתן יהיה להפעילו באמצעות %s. הנתונים יהיו מקושרים לקובץ המקור כך ששינויים בקובץ המקור ישפיעו גם על המסמך שלך." + IDS_PS_PASTE_LINK_OBJECT "הוספת תמונה מתוכן לוח הגזירים למסמך שלך. התמונה מקושרת לקובץ המקור כך ששינויים לקובץ ישפיעו גם על המסמך שלך." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "הוספת קיצור דרך המצביע אל מיקום תוכן לוח הגזירים. קיצור הדרך מקושר לקובץ המקור כך ששינויים לקובץ המקור ישפיעו גם על המסמך שלך." + IDS_PS_NON_OLE "הוספת תוכן לוח הגזירים למסמך שלך." + IDS_PS_UNKNOWN_TYPE "סוג לא ידוע" + IDS_PS_UNKNOWN_SRC "מקור לא ידוע" + IDS_PS_UNKNOWN_APP "התכנית שיצרה אותו" +}

1 0

Yaron Shahrabani : cmdlgtst: Added Hebrew translation.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 0aa4c7f5d3c1084e8b1056562fae9ded3c2df6f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa4c7f5d3c1084e8b1056562… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Thu Oct 21 15:23:50 2010 +0200 cmdlgtst: Added Hebrew translation. --- programs/cmdlgtst/He.rc | 309 +++++++++++++++++++++++++++++++++++++++++ programs/cmdlgtst/Makefile.in | 1 + 2 files changed, 310 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0aa4c7f5d3c1084e8b105…

1 0

Yaron Shahrabani : wineps: Added Hebrew translation.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 2309f933370ad7419732edbfb109ad386f2229bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2309f933370ad7419732edbfb… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Thu Oct 21 15:37:12 2010 +0200 wineps: Added Hebrew translation. --- dlls/wineps.drv/Makefile.in | 1 + dlls/wineps.drv/wps_He.rc | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in index b57b4d5..71d03de 100644 --- a/dlls/wineps.drv/Makefile.in +++ b/dlls/wineps.drv/Makefile.in @@ -71,6 +71,7 @@ RC_SRCS= \ wps_En.rc \ wps_Es.rc \ wps_Fr.rc \ + wps_He.rc \ wps_Hu.rc \ wps_It.rc \ wps_Ja.rc \ diff --git a/dlls/wineps.drv/wps_He.rc b/dlls/wineps.drv/wps_He.rc new file mode 100644 index 0000000..883c4b0 --- /dev/null +++ b/dlls/wineps.drv/wps_He.rc @@ -0,0 +1,43 @@ +/* + * Copyright 2000 Huw D M Davies + * Copyright 2010 Yaron Shahrabani <sh.yaron(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 + * 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 + */ + +#include "psdlg.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +PAPER DIALOG 5, 43, 227, 215 +STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "נייר" +FONT 8, "MS Shell Dlg" +{ + LTEXT "גודל ה&נייר:", -1, 10, 6, 100, 8 + LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | + WS_TABSTOP + GROUPBOX "כיווניות", -1, 10, 80, 200, 50 + CONTROL "ל&אורך", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | + WS_TABSTOP, 20, 90, 60, 10 + CONTROL "ל&רוחב", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, + 20, 110, 60, 10 + LTEXT "דו־צדדי:", IDD_DUPLEX_NAME, 10, 140, 100, 8 + COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS | + WS_TABSTOP +}

1 0

Yaron Shahrabani : write: Added Hebrew translation.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 2080bf5abc99fe07bf77bfef72045c777f781b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2080bf5abc99fe07bf77bfef7… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Thu Oct 21 15:57:29 2010 +0200 write: Added Hebrew translation. --- programs/write/He.rc | 31 +++++++++++++++++++++++++++++++ programs/write/Makefile.in | 1 + 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/programs/write/He.rc b/programs/write/He.rc new file mode 100644 index 0000000..0361335 --- /dev/null +++ b/programs/write/He.rc @@ -0,0 +1,31 @@ +/* + * Hebrew language support + * + * Copyright (C) 2007 Mikolaj Zalewski + * Copyright (C) 2010 Yaron Shahrabani <sh.yaron(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 + * 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 + */ + +#include "resources.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_FAILED, "הפעלת הכתבן נכשלה" +} diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in index 31f86b4..9b98f3d 100644 --- a/programs/write/Makefile.in +++ b/programs/write/Makefile.in @@ -11,6 +11,7 @@ RC_SRCS = \ En.rc \ Es.rc \ Fr.rc \ + He.rc \ It.rc \ Ja.rc \ Ko.rc \

1 0

Henri Verbeet : wined3d: Use surface_blt_to_drawable() in IWineD3DSurfaceImpl_BltOverride().
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 2b58f80c27810aa999bee76a13fc4a30ffb97247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b58f80c27810aa999bee76a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 21 12:40:45 2010 +0200 wined3d: Use surface_blt_to_drawable() in IWineD3DSurfaceImpl_BltOverride(). --- dlls/wined3d/surface.c | 190 ++++++++++++++++++++++------------------------- 1 files changed, 89 insertions(+), 101 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a1587b0..b24a6de 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3344,6 +3344,89 @@ static void surface_blt_fbo(IWineD3DDeviceImpl *device, const WINED3DTEXTUREFILT context_release(context); } +static void surface_blt_to_drawable(IWineD3DDeviceImpl *device, + WINED3DTEXTUREFILTERTYPE filter, BOOL color_key, + IWineD3DSurfaceImpl *src_surface, const RECT *src_rect_in, + IWineD3DSurfaceImpl *dst_surface, const RECT *dst_rect_in) +{ + IWineD3DSwapChainImpl *swapchain = NULL; + struct wined3d_context *context; + RECT src_rect, dst_rect; + + src_rect = *src_rect_in; + dst_rect = *dst_rect_in; + + if (dst_surface->container.type == WINED3D_CONTAINER_SWAPCHAIN) + swapchain = dst_surface->container.u.swapchain; + + /* Make sure the surface is up-to-date. This should probably use + * surface_load_location() and worry about the destination surface too, + * unless we're overwriting it completely. */ + surface_internal_preload(src_surface, SRGB_RGB); + + /* Activate the destination context, set it up for blitting */ + context = context_acquire(device, dst_surface); + context_apply_blit_state(context, device); + + /* context_apply_blit_state() sets up a flipped (in GL terms) projection + * matrix. As a result, we need to skip the flip for onscreen surfaces, + * and have to flip for offscreen surfaces instead, to undo the flip done + * by the projection matrix. */ + if (swapchain && dst_surface == swapchain->front_buffer) + { + surface_translate_frontbuffer_coords(dst_surface, context->win_handle, &dst_rect); + } + else if (surface_is_offscreen(dst_surface)) + { + dst_rect.top = dst_surface->currentDesc.Height - dst_rect.top; + dst_rect.bottom = dst_surface->currentDesc.Height - dst_rect.bottom; + } + + device->blitter->set_shader((IWineD3DDevice *)device, src_surface); + + ENTER_GL(); + + if (color_key) + { + glEnable(GL_ALPHA_TEST); + checkGLcall("glEnable(GL_ALPHA_TEST)"); + + /* When the primary render target uses P8, the alpha component + * contains the palette index. Which means that the colorkey is one of + * the palette entries. In other cases pixels that should be masked + * away have alpha set to 0. */ + if (primary_render_target_is_p8(device)) + glAlphaFunc(GL_NOTEQUAL, (float)src_surface->SrcBltCKey.dwColorSpaceLowValue / 256.0f); + else + glAlphaFunc(GL_NOTEQUAL, 0.0f); + checkGLcall("glAlphaFunc"); + } + else + { + glDisable(GL_ALPHA_TEST); + checkGLcall("glDisable(GL_ALPHA_TEST)"); + } + + draw_textured_quad(src_surface, &src_rect, &dst_rect, filter); + + if (color_key) + { + glDisable(GL_ALPHA_TEST); + checkGLcall("glDisable(GL_ALPHA_TEST)"); + } + + LEAVE_GL(); + + /* Leave the opengl state valid for blitting */ + device->blitter->unset_shader((IWineD3DDevice *)device); + + if (wined3d_settings.strict_draw_ordering || (swapchain + && (dst_surface == swapchain->front_buffer || swapchain->num_contexts > 1))) + wglFlush(); /* Flush to ensure ordering across contexts. */ + + context_release(context); +} + /* Do not call while under the GL lock. */ HRESULT surface_color_fill(IWineD3DSurfaceImpl *s, const RECT *rect, const WINED3DCOLORVALUE *color) { @@ -3611,7 +3694,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, /* Blit from offscreen surface to render target */ DWORD oldCKeyFlags = src_surface->CKeyFlags; WINEDDCOLORKEY oldBltCKey = src_surface->SrcBltCKey; - struct wined3d_context *context; TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface); @@ -3668,72 +3750,13 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, src_surface->CKeyFlags &= ~WINEDDSD_CKSRCBLT; } - /* Now load the surface */ - surface_internal_preload(src_surface, SRGB_RGB); - - /* Activate the destination context, set it up for blitting */ - context = context_acquire(device, dst_surface); - context_apply_blit_state(context, device); - - if (dstSwapchain && dst_surface == dstSwapchain->front_buffer) - surface_translate_frontbuffer_coords(dst_surface, context->win_handle, &dst_rect); - else if (surface_is_offscreen(dst_surface)) - { - dst_rect.top = dst_surface->currentDesc.Height - dst_rect.top; - dst_rect.bottom = dst_surface->currentDesc.Height - dst_rect.bottom; - } - - device->blitter->set_shader((IWineD3DDevice *)device, src_surface); - - ENTER_GL(); - - /* This is for color keying */ - if(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) { - glEnable(GL_ALPHA_TEST); - checkGLcall("glEnable(GL_ALPHA_TEST)"); - - /* When the primary render target uses P8, the alpha component contains the palette index. - * Which means that the colorkey is one of the palette entries. In other cases pixels that - * should be masked away have alpha set to 0. */ - if (primary_render_target_is_p8(device)) - glAlphaFunc(GL_NOTEQUAL, (float)src_surface->SrcBltCKey.dwColorSpaceLowValue / 256.0f); - else - glAlphaFunc(GL_NOTEQUAL, 0.0f); - checkGLcall("glAlphaFunc"); - } else { - glDisable(GL_ALPHA_TEST); - checkGLcall("glDisable(GL_ALPHA_TEST)"); - } - - /* Draw a textured quad - */ - draw_textured_quad(src_surface, &src_rect, &dst_rect, Filter); - - if(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) { - glDisable(GL_ALPHA_TEST); - checkGLcall("glDisable(GL_ALPHA_TEST)"); - } + surface_blt_to_drawable(device, Filter, Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE), + src_surface, &src_rect, dst_surface, &dst_rect); /* Restore the color key parameters */ src_surface->CKeyFlags = oldCKeyFlags; src_surface->SrcBltCKey = oldBltCKey; - LEAVE_GL(); - - /* Leave the opengl state valid for blitting */ - device->blitter->unset_shader((IWineD3DDevice *)device); - - if (wined3d_settings.strict_draw_ordering || (dstSwapchain - && (dst_surface == dstSwapchain->front_buffer - || dstSwapchain->num_contexts > 1))) - wglFlush(); /* Flush to ensure ordering across contexts. */ - - context_release(context); - - /* TODO: If the surface is locked often, perform the Blt in software on the memory instead */ - /* The surface is now in the drawable. On onscreen surfaces or without fbos the texture - * is outdated now - */ surface_modify_location(dst_surface, SFLAG_INDRAWABLE, TRUE); return WINED3D_OK; @@ -4325,44 +4348,6 @@ void surface_modify_location(IWineD3DSurfaceImpl *surface, DWORD flag, BOOL pers } } -static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT *rect_in) -{ - IWineD3DDeviceImpl *device = This->resource.device; - IWineD3DSwapChainImpl *swapchain; - struct wined3d_context *context; - RECT src_rect, dst_rect; - - surface_get_rect(This, rect_in, &src_rect); - - context = context_acquire(device, This); - context_apply_blit_state(context, device); - - dst_rect = src_rect; - if (context->render_offscreen) - { - dst_rect.top = This->currentDesc.Height - dst_rect.top; - dst_rect.bottom = This->currentDesc.Height - dst_rect.bottom; - } - - swapchain = This->container.type == WINED3D_CONTAINER_SWAPCHAIN ? This->container.u.swapchain : NULL; - if (swapchain && This == swapchain->front_buffer) - surface_translate_frontbuffer_coords(This, context->win_handle, &dst_rect); - - device->blitter->set_shader((IWineD3DDevice *) device, This); - - ENTER_GL(); - draw_textured_quad(This, &src_rect, &dst_rect, WINED3DTEXF_POINT); - LEAVE_GL(); - - device->blitter->unset_shader((IWineD3DDevice *) device); - - if (wined3d_settings.strict_draw_ordering || (swapchain - && (This == swapchain->front_buffer || swapchain->num_contexts > 1))) - wglFlush(); /* Flush to ensure ordering across contexts. */ - - context_release(context); -} - HRESULT surface_load_location(IWineD3DSurfaceImpl *surface, DWORD flag, const RECT *rect) { IWineD3DDeviceImpl *device = surface->resource.device; @@ -4448,7 +4433,10 @@ HRESULT surface_load_location(IWineD3DSurfaceImpl *surface, DWORD flag, const RE { if (surface->Flags & SFLAG_INTEXTURE) { - surface_blt_to_drawable(surface, rect); + RECT r; + + surface_get_rect(surface, rect, &r); + surface_blt_to_drawable(device, WINED3DTEXF_POINT, FALSE, surface, &r, surface, &r); } else {

1 0