May 2011 - Wine-Commits - list.winehq.org

Huw Davies : gdi32: Keep track of the background colour.
by Alexandre Julliard May 6, 2011

May 6, 2011

Module: wine Branch: master Commit: 572e0f01df2986ccec266a542a990d34e4e66f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=572e0f01df2986ccec266a542… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 6 11:21:13 2011 +0100 gdi32: Keep track of the background colour. --- dlls/gdi32/dibdrv/dc.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/gdi32/gdi_private.h | 3 +++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 9e97177..5273b29 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -143,6 +143,46 @@ static HBITMAP CDECL dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) } /*********************************************************************** + * dibdrv_SetBkColor + */ +static COLORREF CDECL dibdrv_SetBkColor( PHYSDEV dev, COLORREF color ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetBkColor ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + + pdev->bkgnd_color = pdev->dib.funcs->colorref_to_pixel( &pdev->dib, color ); + + if( GetBkMode(dev->hdc) == OPAQUE ) + calc_and_xor_masks( GetROP2(dev->hdc), pdev->bkgnd_color, &pdev->bkgnd_and, &pdev->bkgnd_xor ); + else + { + pdev->bkgnd_and = ~0u; + pdev->bkgnd_xor = 0; + } + + return next->funcs->pSetBkColor( next, color ); +} + +/*********************************************************************** + * dibdrv_SetBkMode + */ +static INT CDECL dibdrv_SetBkMode( PHYSDEV dev, INT mode ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetBkMode ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + + if( mode == OPAQUE ) + calc_and_xor_masks( GetROP2(dev->hdc), pdev->bkgnd_color, &pdev->bkgnd_and, &pdev->bkgnd_xor ); + else + { + pdev->bkgnd_and = ~0u; + pdev->bkgnd_xor = 0; + } + + return next->funcs->pSetBkMode( next, mode ); +} + +/*********************************************************************** * dibdrv_SetDeviceClipping */ static void CDECL dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) @@ -165,6 +205,8 @@ static INT CDECL dibdrv_SetROP2( PHYSDEV dev, INT rop ) calc_and_xor_masks(rop, pdev->pen_color, &pdev->pen_and, &pdev->pen_xor); update_brush_rop(pdev, rop); + if( GetBkMode(dev->hdc) == OPAQUE ) + calc_and_xor_masks(rop, pdev->bkgnd_color, &pdev->bkgnd_and, &pdev->bkgnd_xor); return next->funcs->pSetROP2( next, rop ); } @@ -254,8 +296,8 @@ const DC_FUNCTIONS dib_driver = dibdrv_SelectPen, /* pSelectPen */ NULL, /* pSetArcDirection */ NULL, /* pSetBitmapBits */ - NULL, /* pSetBkColor */ - NULL, /* pSetBkMode */ + dibdrv_SetBkColor, /* pSetBkColor */ + dibdrv_SetBkMode, /* pSetBkMode */ dibdrv_SetDCBrushColor, /* pSetDCBrushColor */ dibdrv_SetDCPenColor, /* pSetDCPenColor */ NULL, /* pSetDIBColorTable */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index d61e4c8..695eff0 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -108,6 +108,9 @@ typedef struct dibdrv_physdev UINT brush_style; DWORD brush_color, brush_and, brush_xor; BOOL (* brush_rects)(struct dibdrv_physdev *pdev, int num, RECT *rects); + + /* background */ + DWORD bkgnd_color, bkgnd_and, bkgnd_xor; } dibdrv_physdev; #define DEFER_FORMAT 1

1 0

Frédéric Delanoy : taskmgr: Fix a French dialog.
by Alexandre Julliard May 6, 2011

May 6, 2011

Module: wine Branch: master Commit: 4c859de0a860aafcfb63b9c2e9beeb4559d9cd8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c859de0a860aafcfb63b9c2e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri May 6 10:34:21 2011 +0200 taskmgr: Fix a French dialog. --- programs/taskmgr/Fr.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/Fr.rc b/programs/taskmgr/Fr.rc index be85009..8b8134a 100644 --- a/programs/taskmgr/Fr.rc +++ b/programs/taskmgr/Fr.rc @@ -60,8 +60,8 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | - WS_BORDER | WS_TABSTOP,7,7,233,177 - PUSHBUTTON "&Terminer le processus",IDC_ENDPROCESS,161,189,79,14 + WS_BORDER | WS_TABSTOP,7,7,235,177 + PUSHBUTTON "&Terminer le processus",IDC_ENDPROCESS,167,189,76,14 CONTROL "Afficher les processus de &tous les utilisateurs",IDC_SHOWALLPROCESSES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,161,10 END

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard May 6, 2011

May 6, 2011

Module: wine Branch: master Commit: 5a6b248ceb0ff9c734cf271a6875f1a17987cee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a6b248ceb0ff9c734cf271a6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri May 6 00:42:48 2011 +0200 po: Update French translation. --- po/fr.po | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-) diff --git a/po/fr.po b/po/fr.po index e716c85..b3d9e4b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9303,9 +9303,8 @@ msgid "&Export Registry File..." msgstr "&Exporter un fichier registre..." #: regedit.rc:42 regedit.rc:87 -#, fuzzy msgid "&Modify..." -msgstr "&Modifier" +msgstr "&Modifier..." #: regedit.rc:46 regedit.rc:97 msgid "&Key" @@ -9364,9 +9363,8 @@ msgid "&About Registry Editor" msgstr "À &propos de l'éditeur du registre" #: regedit.rc:88 -#, fuzzy msgid "Modify Binary Data..." -msgstr "Modifier les données &binaires" +msgstr "Modifier les données &binaires..." #: regedit.rc:109 msgid "&Export..." @@ -9740,12 +9738,10 @@ msgid "E&xit Task Manager" msgstr "&Quitter le gestionnaire des tâches" #: taskmgr.rc:45 -#, fuzzy msgid "&Minimize On Use" msgstr "Réd&uire à l'exécution" #: taskmgr.rc:47 -#, fuzzy msgid "&Hide When Minimized" msgstr "&Masquer l'icône réduite" @@ -10313,9 +10309,8 @@ msgid "Regular Metafile Viewer" msgstr "Visionneuse de fichiers Metafile réguliers" #: winecfg.rc:32 -#, fuzzy msgid "Configure..." -msgstr "Configurer" +msgstr "Configurer..." #: winecfg.rc:39 msgid "Libraries" @@ -10455,9 +10450,8 @@ msgid "None" msgstr "Aucun" #: winecfg.rc:81 -#, fuzzy msgid "Autodetect..." -msgstr "Détection automatique" +msgstr "Détection automatique..." #: winecfg.rc:82 msgid "Local hard disk" @@ -10869,9 +10863,8 @@ msgid "Re&name..." msgstr "Re&nommer..." #: winefile.rc:31 -#, fuzzy msgid "Propert&ies\tAlt+Enter" -msgstr "&Propriétés...\tAlt+Entrée" +msgstr "&Propriétés\tAlt+Entrée" #: winefile.rc:33 msgid "&Run..." @@ -10890,9 +10883,8 @@ msgid "&Disk" msgstr "&Disque" #: winefile.rc:45 -#, fuzzy msgid "Connect &Network Drive..." -msgstr "Connecter un lecteur &réseau" +msgstr "Connecter un lecteur &réseau..." #: winefile.rc:46 msgid "&Disconnect Network Drive" @@ -10923,7 +10915,6 @@ msgid "Sort by &Date" msgstr "Trier par dat&e" #: winefile.rc:60 -#, fuzzy msgid "Filter by&..." msgstr "Filtrer &par..."

1 0

André Hentschel : po: Add German translations.
by Alexandre Julliard May 6, 2011

May 6, 2011

Module: wine Branch: master Commit: 6fa0999ffbb08f7079fdc8d81aafe2c1dfd26892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fa0999ffbb08f7079fdc8d81… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 5 21:01:46 2011 +0200 po: Add German translations. --- po/de.po | 73 +++++++++++++++++++++++++++++-------------------------------- 1 files changed, 35 insertions(+), 38 deletions(-) diff --git a/po/de.po b/po/de.po index 103a69c..59e1825 100644 --- a/po/de.po +++ b/po/de.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-04-13 19:56+0200\n" -"Last-Translator: Detlef Riekenberg\n" +"PO-Revision-Date: 2011-05-05 20:25+0200\n" +"Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" "MIME-Version: 1.0\n" @@ -2046,7 +2046,7 @@ msgstr "Standardeinstellungen" #: dxdiagn.rc:26 msgid "%uMB used, %uMB available" -msgstr "" +msgstr "%uMB benutzt, %uMB verfügbar" #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155 msgid "Options" @@ -2054,27 +2054,24 @@ msgstr "Einstellungen" #: hhctrl.rc:70 msgid "S&ync" -msgstr "" +msgstr "S&ync" #: hhctrl.rc:71 shdoclc.rc:38 winhlp32.rc:86 msgid "&Back" msgstr "&Zurück" #: hhctrl.rc:72 -#, fuzzy msgid "&Forward" -msgstr "Vorwärts" +msgstr "&Vorwärts" #: hhctrl.rc:73 -#, fuzzy msgctxt "table of contents" msgid "&Home" -msgstr "Start" +msgstr "St&art" #: hhctrl.rc:74 -#, fuzzy msgid "&Stop" -msgstr "Stopp" +msgstr "&Stopp" #: hhctrl.rc:75 shdoclc.rc:56 msgid "&Refresh" @@ -2102,11 +2099,11 @@ msgstr "&Favoriten" #: hhctrl.rc:33 msgid "Hide &Tabs" -msgstr "" +msgstr "&Tabs verbergen" #: hhctrl.rc:34 msgid "Show &Tabs" -msgstr "" +msgstr "&Tabs zeigen" #: hhctrl.rc:39 msgid "Show" @@ -3086,7 +3083,7 @@ msgstr "Read/WriteProcessMemory teilweise abgeschlossen\n" #: winerror.mc:956 msgid "The oplock wasn't granted\n" -msgstr "" +msgstr "Oplock nicht gestattet\n" #: winerror.mc:961 #, fuzzy @@ -3346,7 +3343,7 @@ msgstr "Anderes Dienst-Konto\n" #: winerror.mc:1276 msgid "Driver failure cannot be detected\n" -msgstr "" +msgstr "Treiberfehler nicht gefunden\n" #: winerror.mc:1281 #, fuzzy @@ -3355,7 +3352,7 @@ msgstr "Prozess fehlgeschlagen\n" #: winerror.mc:1286 msgid "No recovery program for service\n" -msgstr "" +msgstr "Kein Wiederherstellungsprogramm für den Dienst\n" #: winerror.mc:1291 #, fuzzy @@ -3545,11 +3542,11 @@ msgstr "Keine weiteren Such-Handles\n" #: winerror.mc:1521 msgid "Message can only be used in synchronous calls\n" -msgstr "" +msgstr "Nachricht kann nur in synchronen Aufrufen verwendet werden\n" #: winerror.mc:1526 msgid "The source element is empty\n" -msgstr "" +msgstr "Das Quellelement is leer\n" #: winerror.mc:1531 #, fuzzy @@ -3563,11 +3560,11 @@ msgstr "Das angegebende Gerätehandle ist ungültig." #: winerror.mc:1541 msgid "The magazine is not present\n" -msgstr "" +msgstr "Die Ablage ist nicht vorhanden\n" #: winerror.mc:1546 msgid "The device needs reinitialization\n" -msgstr "" +msgstr "Das Gerät muss neu initialisiert werden\n" #: winerror.mc:1551 #, fuzzy @@ -3616,15 +3613,15 @@ msgstr "Kein solcher Benutzer\n" #: winerror.mc:1596 msgid "Unable to remove the file to be replaced\n" -msgstr "" +msgstr "Konnte die zu ersetzende Datei nicht entfernen\n" #: winerror.mc:1601 msgid "Unable to move the replacement file into place\n" -msgstr "" +msgstr "Konnte die ersetzende Datei nicht zum Ziel bewegen\n" #: winerror.mc:1606 msgid "Moving the replacement file failed\n" -msgstr "" +msgstr "Konnte die ersetzende Datei nicht verschieben\n" #: winerror.mc:1611 #, fuzzy @@ -3638,11 +3635,11 @@ msgstr "Dienst nicht aktiv\n" #: winerror.mc:1621 msgid "Potential matching file found\n" -msgstr "" +msgstr "Potenziell übereinstimmende Datei gefunden\n" #: winerror.mc:1626 msgid "The journal entry was deleted\n" -msgstr "" +msgstr "Der Journal Eintrag wurde gelöscht\n" #: winerror.mc:1631 msgid "Invalid device name\n" @@ -3853,7 +3850,7 @@ msgstr "Pipe nicht verbunden\n" #: winerror.mc:1891 msgid "Perform operation even when nothing changed\n" -msgstr "" +msgstr "Operation durchführen, auch wenn sich nichts ändert\n" #: winerror.mc:1896 #, fuzzy @@ -3862,7 +3859,7 @@ msgstr "Das angegebende Gerätehandle ist ungültig." #: winerror.mc:1901 msgid "Not supported on Small Business Server\n" -msgstr "" +msgstr "Nicht auf Small Business Servern unterstützt\n" #: winerror.mc:1906 msgid "Not all privileges assigned\n" @@ -4182,7 +4179,7 @@ msgstr "Lokale Gruppe existiert bereits\n" #: winerror.mc:2301 winerror.mc:2326 msgid "Logon type not granted\n" -msgstr "Logon-Typ nicht zugestanden\n" +msgstr "Logon-Typ nicht gestattet\n" #: winerror.mc:2306 msgid "Too many secrets\n" @@ -4252,7 +4249,7 @@ msgstr "Ungültige Authentifizierungs-Identität\n" #: winerror.mc:2391 msgid "Time skew between client and server\n" -msgstr "" +msgstr "Zeitversatz zwischen Client und Server\n" #: winerror.mc:2396 msgid "Invalid window handle\n" @@ -4500,7 +4497,7 @@ msgstr "Logon-Typ nicht zugestanden\n" #: winerror.mc:2691 msgid "Interactive window station required\n" -msgstr "" +msgstr "Interaktive Fensterposition nötig\n" #: winerror.mc:2696 #, fuzzy @@ -4580,7 +4577,7 @@ msgstr "Wine-Konfiguration" #: winerror.mc:2776 msgid "Index is missing\n" -msgstr "" +msgstr "Index fehlt\n" #: winerror.mc:2781 #, fuzzy @@ -4619,7 +4616,7 @@ msgstr "Dienst läuft bereits\n" #: winerror.mc:2816 msgid "Installation package failed to open\n" -msgstr "" +msgstr "Installationspaket konnte nicht geöffnet werden\n" #: winerror.mc:2821 #, fuzzy @@ -4628,11 +4625,11 @@ msgstr "Setup-Programme" #: winerror.mc:2826 msgid "Installer user interface failed\n" -msgstr "" +msgstr "Benutzeroberfläche des Installers fehlgeschlagen\n" #: winerror.mc:2831 msgid "Failed to open installation log file\n" -msgstr "" +msgstr "Konnte Installations Logdatei nicht öffnen\n" #: winerror.mc:2836 #, fuzzy @@ -4641,7 +4638,7 @@ msgstr "Operation nicht unterstützt\n" #: winerror.mc:2841 msgid "Installation transform failed to apply\n" -msgstr "" +msgstr "Installationsumwandlung konnte nicht angewendet werden\n" #: winerror.mc:2846 #, fuzzy @@ -4719,11 +4716,11 @@ msgstr "Ungültiger GW-Befehl\n" #: winerror.mc:2921 msgid "Remote installation not allowed\n" -msgstr "" +msgstr "Remote Installation nicht erlaubt\n" #: winerror.mc:2926 msgid "Reboot initiated after successful install\n" -msgstr "" +msgstr "Neustart nach erfolgreicher Installation initiiert\n" #: winerror.mc:2931 msgid "Invalid string binding\n" @@ -5321,7 +5318,7 @@ msgstr "Pipe geschlossen\n" #: winerror.mc:3671 msgid "Discipline error on RPC pipe\n" -msgstr "" +msgstr "Verfahrensfehler in RPC Pipe\n" #: winerror.mc:3676 #, fuzzy @@ -5335,7 +5332,7 @@ msgstr "Kein Sicherheits-Kontext verfügbar\n" #: winerror.mc:3686 msgid "The file cannot be accessed\n" -msgstr "" +msgstr "Auf die Datei kann nicht zugegriffen werden\n" #: winerror.mc:3691 #, fuzzy

1 0

Peter Urbanec : msxml3: Reorder headers to allow use of libxml2 with +icu useflag.
by Alexandre Julliard May 6, 2011

May 6, 2011

Module: wine Branch: master Commit: 7e894f8741dbe56680e42c95500fee44bb43ce67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e894f8741dbe56680e42c955… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Fri May 6 12:16:00 2011 +1000 msxml3: Reorder headers to allow use of libxml2 with +icu useflag. --- dlls/msxml3/xslpattern.h | 3 +++ dlls/msxml3/xslpattern.l | 2 -- dlls/msxml3/xslpattern.y | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/xslpattern.h b/dlls/msxml3/xslpattern.h index ee6612d..7b3ee2c 100644 --- a/dlls/msxml3/xslpattern.h +++ b/dlls/msxml3/xslpattern.h @@ -33,6 +33,9 @@ #include <libxml/xmlstring.h> #include <libxml/xpath.h> +#include "windef.h" +#include "winnt.h" + typedef struct _parser_param { void* yyscanner; xmlXPathContextPtr ctx; diff --git a/dlls/msxml3/xslpattern.l b/dlls/msxml3/xslpattern.l index 6fae60e4..caea1be 100644 --- a/dlls/msxml3/xslpattern.l +++ b/dlls/msxml3/xslpattern.l @@ -21,8 +21,6 @@ %{ #include "config.h" #include "wine/port.h" -#include "windef.h" -#include "winnt.h" #ifdef HAVE_LIBXML2 diff --git a/dlls/msxml3/xslpattern.y b/dlls/msxml3/xslpattern.y index 152be8b..5187761 100644 --- a/dlls/msxml3/xslpattern.y +++ b/dlls/msxml3/xslpattern.y @@ -21,8 +21,6 @@ %{ #include "config.h" #include "wine/port.h" -#include "windef.h" -#include "winnt.h" #ifdef HAVE_LIBXML2 #include "xslpattern.h"

1 0

Marcus Meissner : riched20: Fixed some lParams with keycodes (Coverity).
by Alexandre Julliard May 6, 2011

May 6, 2011

Module: wine Branch: master Commit: 2b53df89cb1e629a6b481e9e069d09c65cb08457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b53df89cb1e629a6b481e9e0… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 6 09:29:16 2011 +0200 riched20: Fixed some lParams with keycodes (Coverity). --- dlls/riched20/tests/editor.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 7a4e032..c0ad42f 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4739,7 +4739,7 @@ static void test_WM_PASTE(void) SendMessage(hwndRichEdit, WM_SETTEXT, 0, 0); /* Send WM_CHAR to simulates Ctrl-V */ SendMessage(hwndRichEdit, WM_CHAR, 22, - (MapVirtualKey('V', MAPVK_VK_TO_VSC) << 16) & 1); + (MapVirtualKey('V', MAPVK_VK_TO_VSC) << 16) | 1); SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); /* Shouldn't paste because pasting is handled by WM_KEYDOWN */ result = strcmp(buffer,""); @@ -4753,7 +4753,7 @@ static void test_WM_PASTE(void) /* Simulates paste (Ctrl-V) */ hold_key(VK_CONTROL); SendMessage(hwndRichEdit, WM_KEYDOWN, 'V', - (MapVirtualKey('V', MAPVK_VK_TO_VSC) << 16) & 1); + (MapVirtualKey('V', MAPVK_VK_TO_VSC) << 16) | 1); release_key(VK_CONTROL); SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); result = strcmp(buffer,"paste"); @@ -4765,7 +4765,7 @@ static void test_WM_PASTE(void) /* Simulates copy (Ctrl-C) */ hold_key(VK_CONTROL); SendMessage(hwndRichEdit, WM_KEYDOWN, 'C', - (MapVirtualKey('C', MAPVK_VK_TO_VSC) << 16) & 1); + (MapVirtualKey('C', MAPVK_VK_TO_VSC) << 16) | 1); release_key(VK_CONTROL); SendMessage(hwndRichEdit, WM_SETTEXT, 0, 0); SendMessage(hwndRichEdit, WM_PASTE, 0, 0); @@ -4779,10 +4779,10 @@ static void test_WM_PASTE(void) /* Simulates select all (Ctrl-A) */ hold_key(VK_CONTROL); SendMessage(hwndRichEdit, WM_KEYDOWN, 'A', - (MapVirtualKey('A', MAPVK_VK_TO_VSC) << 16) & 1); + (MapVirtualKey('A', MAPVK_VK_TO_VSC) << 16) | 1); /* Simulates select cut (Ctrl-X) */ SendMessage(hwndRichEdit, WM_KEYDOWN, 'X', - (MapVirtualKey('X', MAPVK_VK_TO_VSC) << 16) & 1); + (MapVirtualKey('X', MAPVK_VK_TO_VSC) << 16) | 1); release_key(VK_CONTROL); SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); result = strcmp(buffer,""); @@ -4797,14 +4797,14 @@ static void test_WM_PASTE(void) /* Simulates undo (Ctrl-Z) */ hold_key(VK_CONTROL); SendMessage(hwndRichEdit, WM_KEYDOWN, 'Z', - (MapVirtualKey('Z', MAPVK_VK_TO_VSC) << 16) & 1); + (MapVirtualKey('Z', MAPVK_VK_TO_VSC) << 16) | 1); SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); result = strcmp(buffer,""); ok(result == 0, "test paste: strcmp = %i, actual = '%s'\n", result, buffer); /* Simulates redo (Ctrl-Y) */ SendMessage(hwndRichEdit, WM_KEYDOWN, 'Y', - (MapVirtualKey('Y', MAPVK_VK_TO_VSC) << 16) & 1); + (MapVirtualKey('Y', MAPVK_VK_TO_VSC) << 16) | 1); SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); result = strcmp(buffer,"cut\r\n"); todo_wine ok(result == 0, @@ -6418,7 +6418,7 @@ static void test_WM_GETDLGCODE(void) msg.message = WM_KEYDOWN; msg.wParam = VK_RETURN; - msg.lParam = MapVirtualKey(VK_RETURN, MAPVK_VK_TO_VSC) | 0x0001; + msg.lParam = (MapVirtualKey(VK_RETURN, MAPVK_VK_TO_VSC) << 16) | 0x0001; msg.pt.x = 0; msg.pt.y = 0; msg.time = GetTickCount(); @@ -6468,7 +6468,7 @@ static void test_WM_GETDLGCODE(void) DestroyWindow(hwnd); msg.wParam = VK_TAB; - msg.lParam = MapVirtualKey(VK_TAB, MAPVK_VK_TO_VSC) | 0x0001; + msg.lParam = (MapVirtualKey(VK_TAB, MAPVK_VK_TO_VSC) << 16) | 0x0001; hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, ES_MULTILINE|WS_POPUP, @@ -6519,7 +6519,7 @@ static void test_WM_GETDLGCODE(void) release_key(VK_CONTROL); msg.wParam = 'a'; - msg.lParam = MapVirtualKey('a', MAPVK_VK_TO_VSC) | 0x0001; + msg.lParam = (MapVirtualKey('a', MAPVK_VK_TO_VSC) << 16) | 0x0001; hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, ES_MULTILINE|WS_POPUP,

1 0

Nicolas Le Cam : wintrust/tests: BaseOfData isn' t part of IMAGE_OPTIONAL_HEADER64 structure.
by Alexandre Julliard May 6, 2011

May 6, 2011

Module: wine Branch: master Commit: 2573c84423ef4bc203600f9c1dd454dcbca9dcec URL: http://source.winehq.org/git/wine.git/?a=commit;h=2573c84423ef4bc203600f9c1… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Thu May 5 20:48:20 2011 +0200 wintrust/tests: BaseOfData isn't part of IMAGE_OPTIONAL_HEADER64 structure. --- dlls/wintrust/tests/crypt.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index e5f36e1..d6672ea 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -1158,7 +1158,9 @@ static IMAGE_NT_HEADERS nt_header = 0, /* SizeOfUninitializedData */ 0, /* AddressOfEntryPoint */ 0x10, /* BaseOfCode, also serves as e_lfanew in the truncated MZ header */ +#ifndef _WIN64 0, /* BaseOfData */ +#endif 0x10000000, /* ImageBase */ 0, /* SectionAlignment */ 0, /* FileAlignment */

1 0

Henri Verbeet : wined3d: Get rid of the wined3d_settings_t typedef.
by Alexandre Julliard May 6, 2011

May 6, 2011

Module: wine Branch: master Commit: 9f90225fa59fa79eba177bfcb6fb035cff25200e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f90225fa59fa79eba177bfcb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 5 20:56:09 2011 +0200 wined3d: Get rid of the wined3d_settings_t typedef. --- dlls/wined3d/wined3d_main.c | 2 +- dlls/wined3d/wined3d_private.h | 41 ++++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 63cc677..2d60a6f 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -62,7 +62,7 @@ static CRITICAL_SECTION wined3d_cs = {&wined3d_cs_debug, -1, 0, 0, 0, 0}; /* When updating default value here, make sure to update winecfg as well, * where appropriate. */ -wined3d_settings_t wined3d_settings = +struct wined3d_settings wined3d_settings = { VS_HW, /* Hardware by default */ PS_HW, /* Hardware by default */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 549f827..6ca0ed7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -254,26 +254,27 @@ static inline float float_24_to_32(DWORD in) /* NOTE: When adding fields to this structure, make sure to update the default * values in wined3d_main.c as well. */ -typedef struct wined3d_settings_s { -/* vertex and pixel shader modes */ - int vs_mode; - int ps_mode; -/* Ideally, we don't want the user to have to request GLSL. If the hardware supports GLSL, - we should use it. However, until it's fully implemented, we'll leave it as a registry - setting for developers. */ - BOOL glslRequested; - int offscreen_rendering_mode; - int rendertargetlock_mode; - unsigned short pci_vendor_id; - unsigned short pci_device_id; -/* Memory tracking and object counting */ - unsigned int emulated_textureram; - char *logo; - int allow_multisampling; - BOOL strict_draw_ordering; -} wined3d_settings_t; - -extern wined3d_settings_t wined3d_settings DECLSPEC_HIDDEN; +struct wined3d_settings +{ + /* vertex and pixel shader modes */ + int vs_mode; + int ps_mode; + /* Ideally, we don't want the user to have to request GLSL. If the + * hardware supports GLSL, we should use it. However, until it's fully + * implemented, we'll leave it as a registry setting for developers. */ + BOOL glslRequested; + int offscreen_rendering_mode; + int rendertargetlock_mode; + unsigned short pci_vendor_id; + unsigned short pci_device_id; + /* Memory tracking and object counting. */ + unsigned int emulated_textureram; + char *logo; + int allow_multisampling; + BOOL strict_draw_ordering; +}; + +extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN; typedef enum _WINED3DSAMPLER_TEXTURE_TYPE {

1 0

Henri Verbeet : wined3d: Get rid of the WineD3D_PixelFormat typedef.
by Alexandre Julliard May 6, 2011

May 6, 2011

Module: wine Branch: master Commit: 0cbdd10c586da70bfd44398d30cd21e906600da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cbdd10c586da70bfd44398d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 5 20:56:10 2011 +0200 wined3d: Get rid of the WineD3D_PixelFormat typedef. --- dlls/wined3d/context.c | 8 +++++--- dlls/wined3d/directx.c | 22 +++++++++++----------- dlls/wined3d/wined3d_private.h | 6 +++--- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9fecddd..6898603 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1219,10 +1219,12 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, getDepthStencilBits(ds_format, &depthBits, &stencilBits); - for(matchtry = 0; matchtry < (sizeof(matches) / sizeof(matches[0])) && !iPixelFormat; matchtry++) { - for(i=0; i<nCfgs; i++) { + for (matchtry = 0; matchtry < (sizeof(matches) / sizeof(*matches)) && !iPixelFormat; ++matchtry) + { + for (i = 0; i < nCfgs; ++i) + { + const struct wined3d_pixel_format *cfg = &This->adapter->cfgs[i]; BOOL exactDepthMatch = TRUE; - WineD3D_PixelFormat *cfg = &This->adapter->cfgs[i]; /* For now only accept RGBA formats. Perhaps some day we will * allow floating point formats for pbuffers. */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 69a0673..8b486f8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2932,7 +2932,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, } static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(const struct wined3d_gl_info *gl_info, - const WineD3D_PixelFormat *cfg, const struct wined3d_format *format) + const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) { short redSize, greenSize, blueSize, alphaSize, colorBits; @@ -2969,7 +2969,7 @@ static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(const struct wined } static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(const struct wined3d_gl_info *gl_info, - const WineD3D_PixelFormat *cfg, const struct wined3d_format *format) + const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) { short depthSize, stencilSize; BOOL lockable = FALSE; @@ -3033,7 +3033,7 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, } else { - const WineD3D_PixelFormat *cfgs; + const struct wined3d_pixel_format *cfgs; unsigned int cfg_count; unsigned int i; @@ -3094,7 +3094,7 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 if (format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) { - const WineD3D_PixelFormat *cfgs; + const struct wined3d_pixel_format *cfgs; unsigned int i, cfg_count; cfgs = adapter->cfgs; @@ -3118,7 +3118,7 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 else if (format->flags & WINED3DFMT_FLAG_RENDERTARGET) { short redSize, greenSize, blueSize, alphaSize, colorBits; - const WineD3D_PixelFormat *cfgs; + const struct wined3d_pixel_format *cfgs; unsigned int i, cfg_count; if (!getColorBits(format, &redSize, &greenSize, &blueSize, &alphaSize, &colorBits)) @@ -3187,7 +3187,7 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, /* Walk through all WGL pixel formats to find a match */ for (it = 0; it < adapter->nCfgs; ++it) { - WineD3D_PixelFormat *cfg = &adapter->cfgs[it]; + const struct wined3d_pixel_format *cfg = &adapter->cfgs[it]; if (IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&adapter->gl_info, cfg, display_format)) { if (IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(&adapter->gl_info, cfg, ds_format)) @@ -3217,10 +3217,10 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, if (!(check_format->flags & WINED3DFMT_FLAG_RENDERTARGET)) return FALSE; if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { - WineD3D_PixelFormat *cfgs = adapter->cfgs; - int it; short AdapterRed, AdapterGreen, AdapterBlue, AdapterAlpha, AdapterTotalSize; short CheckRed, CheckGreen, CheckBlue, CheckAlpha, CheckTotalSize; + const struct wined3d_pixel_format *cfgs = adapter->cfgs; + int it; getColorBits(adapter_format, &AdapterRed, &AdapterGreen, &AdapterBlue, &AdapterAlpha, &AdapterTotalSize); getColorBits(check_format, &CheckRed, &CheckGreen, &CheckBlue, &CheckAlpha, &CheckTotalSize); @@ -5140,10 +5140,10 @@ static BOOL InitAdapters(struct wined3d *wined3d) struct wined3d_adapter *adapter = &wined3d->adapters[0]; const struct wined3d_gl_info *gl_info = &adapter->gl_info; struct wined3d_fake_gl_ctx fake_gl_ctx = {0}; + struct wined3d_pixel_format *cfgs; int iPixelFormat; int res; int i; - WineD3D_PixelFormat *cfgs; DISPLAY_DEVICEW DisplayDevice; HDC hdc; @@ -5202,7 +5202,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) attribute = WGL_NUMBER_PIXEL_FORMATS_ARB; GL_EXTCALL(wglGetPixelFormatAttribivARB(hdc, 0, 0, 1, &attribute, &adapter->nCfgs)); - adapter->cfgs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, adapter->nCfgs *sizeof(WineD3D_PixelFormat)); + adapter->cfgs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, adapter->nCfgs * sizeof(*adapter->cfgs)); cfgs = adapter->cfgs; attribs[nAttribs++] = WGL_RED_BITS_ARB; attribs[nAttribs++] = WGL_GREEN_BITS_ARB; @@ -5262,7 +5262,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) else { int nCfgs = DescribePixelFormat(hdc, 0, 0, 0); - adapter->cfgs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nCfgs*sizeof(WineD3D_PixelFormat)); + adapter->cfgs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nCfgs * sizeof(*adapter->cfgs)); adapter->nCfgs = 0; /* We won't accept all formats e.g. software accelerated ones will be skipped */ cfgs = adapter->cfgs; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6ca0ed7..3c3c428 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1263,7 +1263,7 @@ struct wined3d_light_info /* The default light parameters */ extern const WINED3DLIGHT WINED3D_default_light DECLSPEC_HIDDEN; -typedef struct WineD3D_PixelFormat +struct wined3d_pixel_format { int iPixelFormat; /* WGL pixel format */ int iPixelType; /* WGL pixel type e.g. WGL_TYPE_RGBA_ARB, WGL_TYPE_RGBA_FLOAT_ARB or WGL_TYPE_COLORINDEX_ARB */ @@ -1273,7 +1273,7 @@ typedef struct WineD3D_PixelFormat BOOL doubleBuffer; int auxBuffers; int numSamples; -} WineD3D_PixelFormat; +} wined3d_pixel_format; /* The driver names reflect the lowest GPU supported * by a certain driver, so DRIVER_AMD_R300 supports @@ -1528,7 +1528,7 @@ struct wined3d_adapter struct wined3d_driver_info driver_info; WCHAR DeviceName[CCHDEVICENAME]; /* DeviceName for use with e.g. ChangeDisplaySettings */ int nCfgs; - WineD3D_PixelFormat *cfgs; + struct wined3d_pixel_format *cfgs; BOOL brokenStencil; /* Set on cards which only offer mixed depth+stencil */ unsigned int TextureRam; /* Amount of texture memory both video ram + AGP/TurboCache/HyperMemory/.. */ unsigned int UsedTextureRam;

1 0

Henri Verbeet : wined3d: Add some initial access checking for resources.
by Alexandre Julliard May 6, 2011

May 6, 2011

Module: wine Branch: master Commit: f9f83fc88495244a683dd10a0a1004c39a36c2e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f83fc88495244a683dd10a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 5 20:56:07 2011 +0200 wined3d: Add some initial access checking for resources. Just print a WARN in surface_load_location() for the moment. We currently pretend all resources are managed, strictly enforcing pool restrictions would just break a lot of things. --- dlls/wined3d/resource.c | 25 +++++++++++++++++++++++++ dlls/wined3d/surface.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 7 +++++++ 3 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 3807e89..253fc52 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -43,6 +43,28 @@ struct private_data DWORD size; }; +static DWORD resource_access_from_pool(WINED3DPOOL pool) +{ + switch (pool) + { + case WINED3DPOOL_DEFAULT: + return WINED3D_RESOURCE_ACCESS_GPU; + + case WINED3DPOOL_MANAGED: + return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU; + + case WINED3DPOOL_SYSTEMMEM: + return WINED3D_RESOURCE_ACCESS_CPU; + + case WINED3DPOOL_SCRATCH: + return WINED3D_RESOURCE_ACCESS_SCRATCH; + + default: + FIXME("Unhandled pool %#x.\n", pool); + return 0; + } +} + HRESULT resource_init(struct wined3d_resource *resource, IWineD3DDeviceImpl *device, WINED3DRESOURCETYPE resource_type, const struct wined3d_format *format, WINED3DMULTISAMPLE_TYPE multisample_type, UINT multisample_quality, @@ -58,6 +80,9 @@ HRESULT resource_init(struct wined3d_resource *resource, IWineD3DDeviceImpl *dev resource->multisample_quality = multisample_quality; resource->usage = usage; resource->pool = pool; + resource->access_flags = resource_access_from_pool(pool); + if (usage & WINED3DUSAGE_DYNAMIC) + resource->access_flags |= WINED3D_RESOURCE_ACCESS_CPU; resource->width = width; resource->height = height; resource->depth = depth; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f5245cc..ff84102 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5846,6 +5846,24 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD flag, BOOL p } } +static DWORD resource_access_from_location(DWORD location) +{ + switch (location) + { + case SFLAG_INSYSMEM: + return WINED3D_RESOURCE_ACCESS_CPU; + + case SFLAG_INDRAWABLE: + case SFLAG_INSRGBTEX: + case SFLAG_INTEXTURE: + return WINED3D_RESOURCE_ACCESS_GPU; + + default: + FIXME("Unhandled location %#x.\n", location); + return 0; + } +} + HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const RECT *rect) { IWineD3DDeviceImpl *device = surface->resource.device; @@ -5902,6 +5920,14 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const return WINED3D_OK; } + if (WARN_ON(d3d_surface)) + { + DWORD required_access = resource_access_from_location(flag); + if ((surface->resource.access_flags & required_access) != required_access) + WARN("Operation requires %#x access, but surface only has %#x.\n", + required_access, surface->resource.access_flags); + } + if (!(surface->flags & SFLAG_LOCATIONS)) { ERR("Surface %p does not have any up to date location.\n", surface); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 199d7ef..549f827 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1798,6 +1798,12 @@ static inline BOOL isStateDirty(struct wined3d_context *context, DWORD state) return context->isStateDirty[idx] & (1 << shift); } +#define WINED3D_RESOURCE_ACCESS_GPU 0x1 +#define WINED3D_RESOURCE_ACCESS_CPU 0x2 +/* SCRATCH is mostly the same as CPU, but can't be used by the GPU at all, + * not even for resource uploads. */ +#define WINED3D_RESOURCE_ACCESS_SCRATCH 0x4 + struct wined3d_resource_ops { void (*resource_unload)(struct wined3d_resource *resource); @@ -1813,6 +1819,7 @@ struct wined3d_resource UINT multisample_quality; DWORD usage; WINED3DPOOL pool; + DWORD access_flags; UINT width; UINT height; UINT depth;

1 0