November 2011 - Wine-commits

Alex Henrie : appwiz.cpl: Add Catalan translation.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: ffa8777883fac10ebc11a62a03b51af4d9217025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffa8777883fac10ebc11a62a0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 00:39:32 2011 -0700 appwiz.cpl: Add Catalan translation. --- dlls/appwiz.cpl/Ca.rc | 85 +++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/Makefile.in | 1 + 2 files changed, 86 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Ca.rc b/dlls/appwiz.cpl/Ca.rc new file mode 100644 index 0000000..e411bf0 --- /dev/null +++ b/dlls/appwiz.cpl/Ca.rc @@ -0,0 +1,85 @@ +/* +* Add/Remove Programs English resources +* +* Copyright 2001-2002, 2008 Owen Rudge +* Copyright 2005-2006 Jacek Caban +* +* 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 "res.h" + +LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT + +#pragma code_page(65001) /* UTF-8 */ + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instal·lar/Desinstal·lar" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Per instal·lar un nou programa des de un disquet, disc compact, o el vostre disc dur, feu clic en Instal·la.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Instal·la...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "El següent programari es pot eliminar automàticament. Per treure un programa o modificar els seus components instal·lats, seleccioneu-lo de la llista i feu clic en Canvia/Treu.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "&Info. de suport", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 + CONTROL "&Modifica...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "&Treu", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Informació de Suport" +FONT 8, "MS Shell Dlg" +{ + CONTROL "D'acord", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "La següent informació es pot utilitzar per obtenir suport tècnic per a %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Editor:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Versió:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Contacte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Informació de Suport:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Telèfon de Suport:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Llegiu-me:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Actualitzacions de Producte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Comentaris:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +} + +ID_DWL_DIALOG DIALOG 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instal·lador del Wine Gecko" +FONT 8, "MS Shell Dlg" +{ + LTEXT "El Wine no ha pogut trobar un paquet del Gecko que es necessita perquè les " \ + "aplicacions que inclouen HTML funcionin correctament. El Wine el pot descarregar i " \ + "instal·lar automàticament per vostè.\n\n" \ + "Nota: es recomana utilitzar els paquets de la vostra distribució en compte." \ + "Vegeu http://wiki.winehq.org/Gecko pels detalls.", + ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT + CONTROL "Progrés", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "&Instal·la", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancel·la", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP +} diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index 4d67b57..b28b61e 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ RC_SRCS = \ Bg.rc \ + Ca.rc \ Da.rc \ De.rc \ En.rc \

1 0

Alex Henrie : comctl32: Update Catalan translation.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: d8906da528dfa65f3f826b3a05de038b1eafc500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8906da528dfa65f3f826b3a0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 00:39:39 2011 -0700 comctl32: Update Catalan translation. --- dlls/comctl32/comctl_Ca.rc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/comctl_Ca.rc b/dlls/comctl32/comctl_Ca.rc index b95263b..d3533e1 100644 --- a/dlls/comctl32/comctl_Ca.rc +++ b/dlls/comctl32/comctl_Ca.rc @@ -18,13 +18,15 @@ LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT +#pragma code_page(65001) /* UTF-8 */ + IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Propietats de %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "D'acord", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Cancella", IDCANCEL,58,122,50,14 + PUSHBUTTON "Cancel·la", IDCANCEL,58,122,50,14 PUSHBUTTON "&Aplica", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED PUSHBUTTON "Ajuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 @@ -39,7 +41,7 @@ BEGIN PUSHBUTTON "< &Enrere", IDC_BACK_BUTTON,71,138,50,14 DEFPUSHBUTTON "&Proper >", IDC_NEXT_BUTTON,121,138,50,14 DEFPUSHBUTTON "Finalitza", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Cancella", IDCANCEL,178,138,50,14 + PUSHBUTTON "Cancel·la", IDCANCEL,178,138,50,14 PUSHBUTTON "Ajuda", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5

1 0

Alex Henrie : shell32: Update Catalan translation.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 4bda215f2b0c6e746471dc4cdfa061400ab93f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bda215f2b0c6e746471dc4cd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 00:39:49 2011 -0700 shell32: Update Catalan translation. --- dlls/shell32/shell32_Ca.rc | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shell32_Ca.rc b/dlls/shell32/shell32_Ca.rc index a617770..cc34ba7 100644 --- a/dlls/shell32/shell32_Ca.rc +++ b/dlls/shell32/shell32_Ca.rc @@ -20,13 +20,15 @@ LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT +#pragma code_page(65001) /* UTF-8 */ + SHBRSFORFOLDER_MSGBOX DIALOG 15, 40, 188, 192 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK CAPTION "Navegar per Carpeta" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "D'acord", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancella", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancel·la", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP LTEXT "", IDD_TITLE, 4, 4, 180, 12 LTEXT "", IDD_STATUS, 4, 25, 180, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", @@ -50,7 +52,7 @@ FONT 8, "MS Shell Dlg" EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Fer Una Nova Carpeta", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "D'acord", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancella", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancel·la", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP } SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 @@ -58,27 +60,27 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Missatge" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "&S", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "S a &tots", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Sí", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Sí a &tots", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&No", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Cancella", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancel·la", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP ICON "", IDD_ICON, 10, 10, 16, 16 LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 } SHELL_ABOUT_MSGBOX DIALOG 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Quant a %s" +CAPTION "Quant al %s" FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "D'acord", IDOK, 153, 133, 60, 12, WS_TABSTOP - PUSHBUTTON "&Llicencia de Wine", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP + PUSHBUTTON "&Llicència de Wine", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 137, 10 LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 137, 10 LTEXT "Executant en %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 - LTEXT "Wine ha estat construit per:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 + LTEXT "El Wine ha estat construit per:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } SHELL_RUN_DLG DIALOG 0, 0, 227, 95 @@ -87,10 +89,10 @@ CAPTION "" FONT 8, "MS Shell Dlg" { ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Introdueix el nom d'un programa, carpeta, document, o recurs de web, i Wine el obrir per vs.", IDC_RUNDLG_DESCRIPTION, 36, 11, 182, 18 - LTEXT "&Open:", IDC_RUNDLG_LABEL, 7, 39, 24, 10 + LTEXT "Introdueix el nom d'un programa, carpeta, document, o recurs de web, i el Wine el obrirà per vostè.", IDC_RUNDLG_DESCRIPTION, 36, 11, 182, 18 + LTEXT "&Obrir:", IDC_RUNDLG_LABEL, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "D'acord", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancella", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "Cancel·la", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&Navega...", IDC_RUNDLG_BROWSE, 170, 63, 50, 14, WS_TABSTOP }

1 0

Alex Henrie : wineconsole: Widen label to accomodate translations.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 157be323b7a39e939d46774a8758da53ea6ad001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=157be323b7a39e939d46774a8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 00:39:55 2011 -0700 wineconsole: Widen label to accomodate translations. --- programs/wineconsole/wineconsole.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineconsole/wineconsole.rc b/programs/wineconsole/wineconsole.rc index 8216da3..d738433 100644 --- a/programs/wineconsole/wineconsole.rc +++ b/programs/wineconsole/wineconsole.rc @@ -81,7 +81,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION " Font " FONT 8, "MS Shell Dlg" { - LTEXT "&Font", -1, 5, 5, 32, 8 + LTEXT "&Font", -1, 5, 5, 50, 8 LISTBOX IDC_FNT_LIST_FONT, 5, 18, 90, 42, LBS_SORT|WS_VSCROLL LTEXT "&Color", -1, 100, 5, 50, 8 CONTROL "", IDC_FNT_COLOR_FG, "WineConColorPreview", 0L, 100, 18, 48, 16

1 0

Alexandre Julliard : gdi32: Use the DIB engine and PutImage for the null driver rectangular gradient implementation .
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 4c6807199ef5acaa4f8c1a3b3285f30f66d6c582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6807199ef5acaa4f8c1a3b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 30 12:21:35 2011 +0100 gdi32: Use the DIB engine and PutImage for the null driver rectangular gradient implementation. --- dlls/gdi32/bitblt.c | 157 ++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/dibdrv/bitblt.c | 9 +++ dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/painting.c | 143 ---------------------------------------- 4 files changed, 167 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c6807199ef5acaa4f8c1…

1 0

Alexandre Julliard : winex11: Implement rectangular gradients using straight X11 calls.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 0446707a561e81387157ac68ea9499376ddf400f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0446707a561e81387157ac68e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 30 13:09:08 2011 +0100 winex11: Implement rectangular gradients using straight X11 calls. --- dlls/winex11.drv/graphics.c | 118 +++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 2 + 3 files changed, 121 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 0abd593..88e9b0c 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1494,6 +1494,124 @@ BOOL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillTy } /********************************************************************** + * X11DRV_GradientFill + */ +BOOL X11DRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, + void *grad_array, ULONG ngrad, ULONG mode ) +{ + X11DRV_PDEVICE *physdev = get_x11drv_dev( dev ); + const GRADIENT_RECT *rect = grad_array; + TRIVERTEX v[2]; + POINT pt[2]; + unsigned int i; + XGCValues val; + + /* 4, 8, and 16-bpp use dithering */ + if (physdev->depth >= 4 && physdev->depth <= 16) goto fallback; + + switch (mode) + { + case GRADIENT_FILL_RECT_H: + val.function = GXcopy; + val.fill_style = FillSolid; + val.line_width = 1; + val.cap_style = CapNotLast; + val.line_style = LineSolid; + wine_tsx11_lock(); + XChangeGC( gdi_display, physdev->gc, + GCFunction | GCLineWidth | GCLineStyle | GCCapStyle | GCFillStyle, &val ); + wine_tsx11_unlock(); + + X11DRV_LockDIBSection( physdev, DIB_Status_GdiMod ); + for (i = 0; i < ngrad; i++, rect++) + { + int pos, x, dx; + + v[0] = vert_array[rect->UpperLeft]; + v[1] = vert_array[rect->LowerRight]; + pt[0].x = v[0].x; + pt[0].y = v[0].y; + pt[1].x = v[1].x; + pt[1].y = v[1].y; + LPtoDP( dev->hdc, pt, 2 ); + dx = pt[1].x - pt[0].x; + if (!dx) continue; + if (dx < 0) /* swap the colors */ + { + v[0] = vert_array[rect->LowerRight]; + v[1] = vert_array[rect->UpperLeft]; + dx = -dx; + } + for (x = 0, pos = min( pt[0].x, pt[1].x ); x < dx; x++, pos++) + { + COLORREF color = RGB( (v[0].Red * (dx - x) + v[1].Red * x) / dx / 256, + (v[0].Green * (dx - x) + v[1].Green * x) / dx / 256, + (v[0].Blue * (dx - x) + v[1].Blue * x) / dx / 256); + wine_tsx11_lock(); + XSetForeground( gdi_display, physdev->gc, X11DRV_PALETTE_ToPhysical( physdev, color )); + XDrawLine( gdi_display, physdev->drawable, physdev->gc, + physdev->dc_rect.left + pos, physdev->dc_rect.top + pt[0].y, + physdev->dc_rect.left + pos, physdev->dc_rect.top + pt[1].y ); + wine_tsx11_unlock(); + } + } + X11DRV_UnlockDIBSection( physdev, TRUE ); + return TRUE; + + case GRADIENT_FILL_RECT_V: + val.function = GXcopy; + val.fill_style = FillSolid; + val.line_width = 1; + val.cap_style = CapNotLast; + val.line_style = LineSolid; + wine_tsx11_lock(); + XChangeGC( gdi_display, physdev->gc, + GCFunction | GCLineWidth | GCLineStyle | GCCapStyle | GCFillStyle, &val ); + wine_tsx11_unlock(); + + X11DRV_LockDIBSection( physdev, DIB_Status_GdiMod ); + for (i = 0; i < ngrad; i++, rect++) + { + int pos, y, dy; + + v[0] = vert_array[rect->UpperLeft]; + v[1] = vert_array[rect->LowerRight]; + pt[0].x = v[0].x; + pt[0].y = v[0].y; + pt[1].x = v[1].x; + pt[1].y = v[1].y; + LPtoDP( dev->hdc, pt, 2 ); + dy = pt[1].y - pt[0].y; + if (!dy) continue; + if (dy < 0) /* swap the colors */ + { + v[0] = vert_array[rect->LowerRight]; + v[1] = vert_array[rect->UpperLeft]; + dy = -dy; + } + for (y = 0, pos = min( pt[0].y, pt[1].y ); y < dy; y++, pos++) + { + COLORREF color = RGB( (v[0].Red * (dy - y) + v[1].Red * y) / dy / 256, + (v[0].Green * (dy - y) + v[1].Green * y) / dy / 256, + (v[0].Blue * (dy - y) + v[1].Blue * y) / dy / 256); + wine_tsx11_lock(); + XSetForeground( gdi_display, physdev->gc, X11DRV_PALETTE_ToPhysical( physdev, color )); + XDrawLine( gdi_display, physdev->drawable, physdev->gc, + physdev->dc_rect.left + pt[0].x, physdev->dc_rect.top + pos, + physdev->dc_rect.left + pt[1].x, physdev->dc_rect.top + pos ); + wine_tsx11_unlock(); + } + } + X11DRV_UnlockDIBSection( physdev, TRUE ); + return TRUE; + } + +fallback: + dev = GET_NEXT_PHYSDEV( dev, pGradientFill ); + return dev->funcs->pGradientFill( dev, vert_array, nvert, grad_array, ngrad, mode ); +} + +/********************************************************************** * X11DRV_SetBkColor */ COLORREF X11DRV_SetBkColor( PHYSDEV dev, COLORREF color ) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 8d61b5b..8b3b951 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -527,7 +527,7 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pGetTextExtentExPointI */ NULL, /* pGetTextFace */ X11DRV_GetTextMetrics, /* pGetTextMetrics */ - NULL, /* pGradientFill */ + X11DRV_GradientFill, /* pGradientFill */ NULL, /* pIntersectClipRect */ NULL, /* pInvertRgn */ X11DRV_LineTo, /* pLineTo */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index dbc0629..d90968d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -203,6 +203,8 @@ extern UINT X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, extern BOOL X11DRV_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR str, INT count, INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size ) DECLSPEC_HIDDEN; extern BOOL X11DRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) DECLSPEC_HIDDEN; +extern BOOL X11DRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, + void *grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN; extern BOOL X11DRV_LineTo( PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN; extern BOOL X11DRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL X11DRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ole32: Process all pending messages in CoWaitForMultipleHandles before waiting again , otherwise we may not wake up.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 0f3e60747f1958eaa6ef5ff31f65eb3e77da146f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3e60747f1958eaa6ef5ff31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 29 21:22:40 2011 +0100 ole32: Process all pending messages in CoWaitForMultipleHandles before waiting again, otherwise we may not wake up. --- dlls/ole32/compobj.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4579f0a..72ba32a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3650,7 +3650,7 @@ HRESULT WINAPI CoRevertToSelf(void) static BOOL COM_PeekMessage(struct apartment *apt, MSG *msg) { /* first try to retrieve messages for incoming COM calls to the apartment window */ - return PeekMessageW(msg, apt->win, WM_USER, WM_APP - 1, PM_REMOVE|PM_NOYIELD) || + return PeekMessageW(msg, apt->win, 0, 0, PM_REMOVE|PM_NOYIELD) || /* next retrieve other messages necessary for the app to remain responsive */ PeekMessageW(msg, NULL, WM_DDE_FIRST, WM_DDE_LAST, PM_REMOVE|PM_NOYIELD) || PeekMessageW(msg, NULL, 0, 0, PM_QS_PAINT|PM_QS_SENDMESSAGE|PM_REMOVE|PM_NOYIELD); @@ -3712,7 +3712,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, res = MsgWaitForMultipleObjectsEx(cHandles, pHandles, (dwTimeout == INFINITE) ? INFINITE : start_time + dwTimeout - now, - QS_ALLINPUT, wait_flags); + QS_SENDMESSAGE | QS_ALLPOSTMESSAGE | QS_PAINT, wait_flags); if (res == WAIT_OBJECT_0 + cHandles) /* messages available */ { @@ -3746,11 +3746,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, } } - /* note: using "if" here instead of "while" might seem less - * efficient, but only if we are optimising for quick delivery - * of pending messages, rather than quick completion of the - * COM call */ - if (COM_PeekMessage(apt, &msg)) + while (COM_PeekMessage(apt, &msg)) { TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message); TranslateMessage(&msg); @@ -3761,6 +3757,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, PostQuitMessage(msg.wParam); /* no longer need to process messages */ message_loop = FALSE; + break; } } continue;

1 0

Frédéric Delanoy : cmd: Move a global var to the file using it.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: ad81871f1568df82c537643ff8947568390cc0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad81871f1568df82c537643ff… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 29 23:30:49 2011 +0100 cmd: Move a global var to the file using it. --- programs/cmd/builtins.c | 2 +- programs/cmd/wcmdmain.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5197297..a418d92 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -41,13 +41,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); -extern HINSTANCE hinst; extern int defaultColor; extern BOOL echo_mode; extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; extern BATCH_CONTEXT *context; extern DWORD errorlevel; +static HINSTANCE hinst; static struct env_stack *saved_environment; struct env_stack *pushd_directories; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1947884..94ce9de 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -31,8 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); -extern WCHAR inbuilt[][10]; -HINSTANCE hinst; +extern const WCHAR inbuilt[][10]; DWORD errorlevel; int defaultColor = 7; BOOL echo_mode = TRUE;

1 0

Frédéric Delanoy : cmd: Move commonly used global vars declarations to header file.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 44a1e7d1993596c012334ed903bb85b315a8d0b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44a1e7d1993596c012334ed90… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 29 23:30:51 2011 +0100 cmd: Move commonly used global vars declarations to header file. --- programs/cmd/batch.c | 4 ---- programs/cmd/builtins.c | 10 ---------- programs/cmd/directory.c | 10 ---------- programs/cmd/wcmd.h | 15 ++++++++++++--- 4 files changed, 12 insertions(+), 27 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 10af36b..bf8f1b7 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -24,10 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); -extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; -extern BATCH_CONTEXT *context; -extern DWORD errorlevel; - /**************************************************************************** * WCMD_batch * diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a418d92..7a8f897 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -20,13 +20,6 @@ */ /* - * NOTES: - * On entry to each function, global variables quals, param1, param2 contain - * the qualifiers (uppercased and concatenated) and parameters entered, with - * environment-variable and batch parameter substitution already done. - */ - -/* * FIXME: * - No support for pipes, shell parameters * - Lots of functionality missing from builtins @@ -43,9 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); extern int defaultColor; extern BOOL echo_mode; -extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; -extern BATCH_CONTEXT *context; -extern DWORD errorlevel; static HINSTANCE hinst; static struct env_stack *saved_environment; diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index a5447f5..7fc60a7 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -19,13 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* - * NOTES: - * On entry, global variables quals, param1, param2 contain - * the qualifiers (uppercased and concatenated) and parameters entered, with - * environment-variable and batch parameter substitution already done. - */ - #define WIN32_LEAN_AND_MEAN #include "wcmd.h" @@ -33,9 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); -extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; -extern DWORD errorlevel; - typedef enum _DISPLAYTIME { Creation = 0, diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index c45bc88..fe16805 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -30,6 +30,9 @@ #include <ctype.h> #include <wine/unicode.h> +/* msdn specified max for Win XP */ +#define MAXSTRING 8192 + /* Data structure to hold commands delimitors/separators */ typedef enum _CMDdelimiters { @@ -155,6 +158,15 @@ typedef struct _DIRECTORY_STACK WCHAR *fileName; } DIRECTORY_STACK; +/* + * Global variables quals, param1, param2 contain the current qualifiers + * (uppercased and concatenated) and parameters entered, with environment + * variables and batch parameters substitution already done. + */ +extern WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING]; +extern DWORD errorlevel; +extern BATCH_CONTEXT *context; + #endif /* !RC_INVOKED */ /* @@ -264,6 +276,3 @@ extern WCHAR version_string[]; #define WCMD_VERSION 1033 #define WCMD_MOREPROMPT 1034 #define WCMD_LINETOOLONG 1035 - -/* msdn specified max for Win XP */ -#define MAXSTRING 8192

1 0

Frédéric Delanoy : cmd: Reorder global vars declarations/definitions to improve readability.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: a5becedd0e869ec979e933fda61a8010aedca9c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5becedd0e869ec979e933fda… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 29 23:30:52 2011 +0100 cmd: Reorder global vars declarations/definitions to improve readability. --- programs/cmd/builtins.c | 23 ++++++++++------------- programs/cmd/wcmdmain.c | 29 ++++++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7a8f897..60f9f99 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -37,12 +37,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); extern int defaultColor; extern BOOL echo_mode; -static HINSTANCE hinst; -static struct env_stack *saved_environment; struct env_stack *pushd_directories; - -static BOOL verify_mode = FALSE; - +const WCHAR dotW[] = {'.','\0'}; +const WCHAR dotdotW[] = {'.','.','\0'}; +const WCHAR nullW[] = {'\0'}; +const WCHAR starW[] = {'*','\0'}; +const WCHAR slashW[] = {'\\','\0'}; +const WCHAR equalW[] = {'=','\0'}; const WCHAR inbuilt[][10] = { {'C','A','L','L','\0'}, {'C','D','\0'}, @@ -90,24 +91,20 @@ const WCHAR inbuilt[][10] = { {'C','H','O','I','C','E','\0'}, {'E','X','I','T','\0'} }; - static const WCHAR externals[][10] = { {'A','T','T','R','I','B','\0'}, {'X','C','O','P','Y','\0'} }; - -const WCHAR dotW[] = {'.','\0'}; -const WCHAR dotdotW[] = {'.','.','\0'}; -const WCHAR nullW[] = {'\0'}; -const WCHAR starW[] = {'*','\0'}; -const WCHAR slashW[] = {'\\','\0'}; -const WCHAR equalW[] = {'=','\0'}; static const WCHAR fslashW[] = {'/','\0'}; static const WCHAR onW[] = {'O','N','\0'}; static const WCHAR offW[] = {'O','F','F','\0'}; static const WCHAR parmY[] = {'/','Y','\0'}; static const WCHAR parmNoY[] = {'/','-','Y','\0'}; +static HINSTANCE hinst; +static struct env_stack *saved_environment; +static BOOL verify_mode = FALSE; + /************************************************************************** * WCMD_ask_confirm * diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 94ce9de..df4f9cb 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -32,19 +32,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); extern const WCHAR inbuilt[][10]; +extern struct env_stack *pushd_directories; + +BATCH_CONTEXT *context = NULL; DWORD errorlevel; +WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING]; + int defaultColor = 7; BOOL echo_mode = TRUE; -static BOOL opt_c, opt_k, opt_s; + +WCHAR anykey[100], version_string[100]; const WCHAR newline[] = {'\r','\n','\0'}; const WCHAR space[] = {' ','\0'}; -WCHAR anykey[100]; -WCHAR version_string[100]; -WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING]; -BATCH_CONTEXT *context = NULL; -extern struct env_stack *pushd_directories; + +static BOOL opt_c, opt_k, opt_s, unicodeOutput = FALSE; + +/* Variables pertaining to paging */ +static BOOL paged_mode; static const WCHAR *pagedMessage = NULL; -static BOOL unicodeOutput = FALSE; +static int line_count; +static int max_height; +static int max_width; +static int numChars; #define MAX_WRITECONSOLE_SIZE 65535 @@ -151,12 +160,6 @@ void WCMD_output_stderr (const WCHAR *format, ...) { WCMD_output_asis_len(string, ret, GetStdHandle(STD_ERROR_HANDLE)); } -static int line_count; -static int max_height; -static int max_width; -static BOOL paged_mode; -static int numChars; - void WCMD_enter_paged_mode(const WCHAR *msg) { CONSOLE_SCREEN_BUFFER_INFO consoleInfo;

1 0