February 2012 - Wine-Commits

Henri Verbeet : wined3d: Specify the depth range in surface_depth_blt().
by Alexandre Julliard Feb. 22, 2012

Feb. 22, 2012

Module: wine Branch: master Commit: 80555d2cb86965de0e636e670f3efd3bb98da395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80555d2cb86965de0e636e670… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 22 17:10:27 2012 +0100 wined3d: Specify the depth range in surface_depth_blt(). --- dlls/wined3d/surface.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ac44194..d293940 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5561,6 +5561,7 @@ static void surface_depth_blt(const struct wined3d_surface *surface, struct wine glDepthMask(GL_TRUE); glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); glViewport(x, y, w, h); + glDepthRange(0.0, 1.0); SetRect(&rect, 0, h, w, 0); surface_get_blt_info(target, &rect, surface->pow2Width, surface->pow2Height, &info);

1 0

Thomas Faber : user32/tests: Do not depend on argument evaluation order.
by Alexandre Julliard Feb. 22, 2012

Feb. 22, 2012

Module: wine Branch: master Commit: eaaa448d2b7cd73e195a1ea1e11e74444ec0c694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaaa448d2b7cd73e195a1ea1e… Author: Thomas Faber <thfabba(a)gmx.de> Date: Wed Feb 22 17:30:23 2012 +0100 user32/tests: Do not depend on argument evaluation order. --- dlls/user32/tests/msg.c | 103 +++++++++++++++++++++++++++++++--------------- 1 files changed, 69 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eaaa448d2b7cd73e195a1…

1 0

Alexandre Julliard : gdi32: Avoid overflows for invalid coordinates in line clipping.
by Alexandre Julliard Feb. 22, 2012

Feb. 22, 2012

Module: wine Branch: master Commit: 556267bde446412741e5c209d4090f4a3761e03f URL: http://source.winehq.org/git/wine.git/?a=commit;h=556267bde446412741e5c209d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 22 11:27:58 2012 +0100 gdi32: Avoid overflows for invalid coordinates in line clipping. --- dlls/gdi32/dibdrv/objects.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index b6e50cb..a9d6ca5 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -372,7 +372,8 @@ static inline DWORD calc_outcode(const POINT *pt, const RECT *clip) int clip_line(const POINT *start, const POINT *end, const RECT *clip, const bres_params *params, POINT *pt1, POINT *pt2) { - int m, n; + + INT64 m, n; /* 64-bit to avoid overflows (FIXME: find a more efficient way) */ BOOL clipped = FALSE; DWORD start_oc, end_oc; const int bias = params->bias;

1 0

Henri Verbeet : ddraw: Always pin surfaces.
by Alexandre Julliard Feb. 22, 2012

Feb. 22, 2012

Module: wine Branch: master Commit: f20e07b77bec5863e71141cfe623f1ef8ef28c60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20e07b77bec5863e71141cfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 22 09:36:28 2012 +0100 ddraw: Always pin surfaces. --- dlls/ddraw/surface.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2e97510..10643f5 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5526,8 +5526,7 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr * the surface isn't mapped, and that updates done this way will be * visible on the screen. The game Nox is such an application, * Commandos: Behind Enemy Lines is another. */ - if (version == 1) - flags |= WINED3D_SURFACE_PIN_SYSMEM; + flags |= WINED3D_SURFACE_PIN_SYSMEM; if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) {

1 0

Gaurav Jain : wined3d: Recognize Nvidia GeForce 320M, 8600M GT & 9400M.
by Alexandre Julliard Feb. 22, 2012

Feb. 22, 2012

Module: wine Branch: master Commit: b2eadfd4eb13dc9cc66293ce06f96b3a88572a91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2eadfd4eb13dc9cc66293ce0… Author: Gaurav Jain <gaurav(a)gauravjain.org> Date: Tue Feb 14 22:46:04 2012 -0500 wined3d: Recognize Nvidia GeForce 320M, 8600M GT & 9400M. --- dlls/wined3d/directx.c | 5 +++++ dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5ac2073..95581ab 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1098,6 +1098,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, "NVIDIA GeForce 8800 GTS", DRIVER_NVIDIA_GEFORCE6, 320 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTX, "NVIDIA GeForce 8800 GTX", DRIVER_NVIDIA_GEFORCE6, 768 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9200, "NVIDIA GeForce 9200", DRIVER_NVIDIA_GEFORCE6, 256 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400M, "NVIDIA GeForce 9400M", DRIVER_NVIDIA_GEFORCE6, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", DRIVER_NVIDIA_GEFORCE6, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", DRIVER_NVIDIA_GEFORCE6, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", DRIVER_NVIDIA_GEFORCE6, 384 }, @@ -1108,6 +1109,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", DRIVER_NVIDIA_GEFORCE6, 896 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_320M, "NVIDIA GeForce 320M", DRIVER_NVIDIA_GEFORCE6, 256}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT320M, "NVIDIA GeForce GT 320M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT330, "NVIDIA GeForce GT 330", DRIVER_NVIDIA_GEFORCE6, 1024}, @@ -1541,6 +1543,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GT 330M", CARD_NVIDIA_GEFORCE_GT325M}, /* Geforce 300 - midend mobile */ {"GT 325M", CARD_NVIDIA_GEFORCE_GT325M}, /* Geforce 300 - midend mobile */ {"GT 320M", CARD_NVIDIA_GEFORCE_GT320M}, /* Geforce 300 - midend mobile */ + {"320M", CARD_NVIDIA_GEFORCE_320M}, /* Geforce 300 - midend mobile */ {"GTX 295", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ {"GTX 285", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ {"GTX 280", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ @@ -1560,6 +1563,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GT 130", CARD_NVIDIA_GEFORCE_9500GT}, /* Geforce 9 - midend low / Geforce 200 - low */ {"GT 120", CARD_NVIDIA_GEFORCE_9500GT}, /* Geforce 9 - midend low / Geforce 200 - low */ {"9500", CARD_NVIDIA_GEFORCE_9500GT}, /* Geforce 9 - midend low / Geforce 200 - low */ + {"9400M", CARD_NVIDIA_GEFORCE_9400M}, /* Geforce 9 - lowend */ {"9400", CARD_NVIDIA_GEFORCE_9400GT}, /* Geforce 9 - lowend */ {"9300", CARD_NVIDIA_GEFORCE_9200}, /* Geforce 9 - lowend low */ {"9200", CARD_NVIDIA_GEFORCE_9200}, /* Geforce 9 - lowend low */ @@ -1567,6 +1571,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"G 100", CARD_NVIDIA_GEFORCE_9200}, /* Geforce 9 - lowend low */ {"8800 GTX", CARD_NVIDIA_GEFORCE_8800GTX}, /* Geforce 8 - highend high */ {"8800", CARD_NVIDIA_GEFORCE_8800GTS}, /* Geforce 8 - highend */ + {"8600M", CARD_NVIDIA_GEFORCE_8600MGT}, /* Geforce 8 - midend mobile */ {"8600 M", CARD_NVIDIA_GEFORCE_8600MGT}, /* Geforce 8 - midend mobile */ {"8700", CARD_NVIDIA_GEFORCE_8600GT}, /* Geforce 8 - midend */ {"8600", CARD_NVIDIA_GEFORCE_8600GT}, /* Geforce 8 - midend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3cabe76..df817af 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1385,6 +1385,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_8800GTS = 0x0193, CARD_NVIDIA_GEFORCE_8800GTX = 0x0191, CARD_NVIDIA_GEFORCE_9200 = 0x086d, + CARD_NVIDIA_GEFORCE_9400M = 0x0863, CARD_NVIDIA_GEFORCE_9400GT = 0x042c, CARD_NVIDIA_GEFORCE_9500GT = 0x0640, CARD_NVIDIA_GEFORCE_9600GT = 0x0622, @@ -1395,6 +1396,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX260 = 0x05e2, CARD_NVIDIA_GEFORCE_GTX275 = 0x05e6, CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1, + CARD_NVIDIA_GEFORCE_320M = 0x08a3, CARD_NVIDIA_GEFORCE_GT320M = 0x0a2d, CARD_NVIDIA_GEFORCE_GT325M = 0x0a35, CARD_NVIDIA_GEFORCE_GT330 = 0x0ca0,

1 0

Francois Gouget : po: Remove English strings from the Polish shell folder path translations.
by Alexandre Julliard Feb. 22, 2012

Feb. 22, 2012

Module: wine Branch: master Commit: eedb776b5fb5435cba0b95f11fef2cfcda7594cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=eedb776b5fb5435cba0b95f11… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 22 12:14:29 2012 +0100 po: Remove English strings from the Polish shell folder path translations. --- po/pl.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/pl.po b/po/pl.po index 9e7d70a..dbdb638 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7886,7 +7886,7 @@ msgstr "Pulpit" #: shell32.rc:208 msgid "NetHood" -msgstr "NetHood" +msgstr "" #: shell32.rc:209 msgid "Templates" @@ -7894,7 +7894,7 @@ msgstr "Szablony" #: shell32.rc:210 msgid "PrintHood" -msgstr "PrintHood" +msgstr "" #: shell32.rc:211 winhlp32.rc:45 msgid "History" @@ -7902,7 +7902,7 @@ msgstr "Historia" #: shell32.rc:212 msgid "Program Files" -msgstr "Program Files" +msgstr "" #: shell32.rc:214 msgid "My Pictures" @@ -7934,7 +7934,7 @@ msgstr "Wideo" #: shell32.rc:213 msgid "Program Files (x86)" -msgstr "Program Files (x86)" +msgstr "" #: shell32.rc:221 msgid "Contacts"

1 0

Alexandre Julliard : wineps: Convert path points to device coords since GetPath returns logical coords.
by Alexandre Julliard Feb. 22, 2012

Feb. 22, 2012

Module: wine Branch: master Commit: 061b8c409497b3ed586e756a4d67ebc7926131f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=061b8c409497b3ed586e756a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 22 16:03:59 2012 +0100 wineps: Convert path points to device coords since GetPath returns logical coords. --- dlls/wineps.drv/graphics.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 5459ce4..711ab43 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -521,6 +521,7 @@ static BOOL paint_path( PHYSDEV dev, BOOL stroke, BOOL fill ) types = HeapAlloc( GetProcessHeap(), 0, size * sizeof(*types) ); if (!points || !types) goto done; if (GetPath( dev->hdc, points, types, size ) == -1) goto done; + LPtoDP( dev->hdc, points, size ); if (stroke) PSDRV_SetPen(dev); PSDRV_SetClip(dev);

1 0

Francois Gouget : po: Fix a couple of line wrapping issues in the Lithuanian translation.
by Alexandre Julliard Feb. 22, 2012

Feb. 22, 2012

Module: wine Branch: master Commit: a7e9836a72cb69231afcc01800f38221428fad0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e9836a72cb69231afcc0180… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 22 10:46:28 2012 +0100 po: Fix a couple of line wrapping issues in the Lithuanian translation. --- po/lt.po | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index 2e58b24..49abf38 100644 --- a/po/lt.po +++ b/po/lt.po @@ -9469,7 +9469,8 @@ msgid "" msgstr "" "PAUSE ekrane parodo pranešimą, kuriuo prašo naudotojo paspausti klavišą.\n" "\n" -"Ši komanda naudingiausia komandų failuose, kad leistų naudotojui perskaityti " +"Ši komanda naudingiausia komandų failuose, kad leistų naudotojui " +"perskaityti\n" "ankstesnės komandos rezultatą kol jis nepasislinko už ekrano ribų.\n" #: cmd.rc:149 @@ -10413,8 +10414,7 @@ msgid "" "\n" "Do you want to create a new file?" msgstr "" -"Failas „%s“\n" -"neegzistuoja.\n" +"Failas „%s“ neegzistuoja.\n" "\n" "Ar norite sukurti naują failą?" @@ -10424,8 +10424,7 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"Failas „%s“\n" -"buvo pakeistas.\n" +"Failas „%s“ buvo pakeistas.\n" "\n" "Ar norite išsaugoti pakeitimus?"

1 0

Francois Gouget : po: Restore or add some 'Yes/No' Norwegian Bokmål translations.
by Alexandre Julliard Feb. 22, 2012

Feb. 22, 2012

Module: wine Branch: master Commit: 60da6dcc2289588cdaea66e9b496ce853cba803c URL: http://source.winehq.org/git/wine.git/?a=commit;h=60da6dcc2289588cdaea66e9b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 22 11:55:07 2012 +0100 po: Restore or add some 'Yes/No' Norwegian Bokmål translations. --- po/nb_NO.po | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 09b3410..abd3a87 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -10266,14 +10266,12 @@ msgid "Volume in drive %1!c! has no label.\n" msgstr "" #: cmd.rc:344 -#, fuzzy msgid " (Yes|No)" -msgstr "%s? (Ja|Nei)\n" +msgstr " (Ja|Nei)" #: cmd.rc:345 -#, fuzzy msgid " (Yes|No|All)" -msgstr "%s? (Ja|Nei)\n" +msgstr " (Ja|Nei|Alle)" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -14471,14 +14469,12 @@ msgstr "" "(F - Fil, K - Katalog)\n" #: xcopy.rc:35 -#, fuzzy msgid "%1? (Yes|No)\n" -msgstr "%s? (Ja|Nei)\n" +msgstr "%1? (Ja|Nei)\n" #: xcopy.rc:36 -#, fuzzy msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "Skrive over «%s»? (Ja|Nei|Alle)\n" +msgstr "Skrive over «%1»? (Ja|Nei|Alle)\n" #: xcopy.rc:37 #, fuzzy

1 0

Francois Gouget : po: Restore some 'About' Norwegian Bokmål translations or improve the suggestions.
by Alexandre Julliard Feb. 22, 2012

Feb. 22, 2012

Module: wine Branch: master Commit: 5dd206b14a050a698f7efa31e79a1c4981b208b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dd206b14a050a698f7efa31e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 22 11:54:59 2012 +0100 po: Restore some 'About' Norwegian Bokmål translations or improve the suggestions. --- po/nb_NO.po | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 28dc390..09b3410 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -3364,7 +3364,7 @@ msgstr "Legg til i f&avoritter..." #: ieframe.rc:57 #, fuzzy msgid "&About Internet Explorer" -msgstr "Wine Internet Explorer" +msgstr "&Om Internet Explorer" #: ieframe.rc:87 #, fuzzy @@ -7966,9 +7966,8 @@ msgid "E&xit" msgstr "&Avslutt" #: shell32.rc:127 -#, fuzzy msgid "&About Control Panel" -msgstr "&Om Kontrollpanel..." +msgstr "&Om Kontrollpanel" #: shell32.rc:270 shell32.rc:285 msgid "Browse for Folder" @@ -9515,9 +9514,8 @@ msgid "&Always on Top" msgstr "&Alltid øverst" #: clock.rc:42 -#, fuzzy msgid "&About Clock" -msgstr "&Om Klokke..." +msgstr "&Om Klokke" #: clock.rc:48 msgid "Clock" @@ -11169,7 +11167,7 @@ msgstr "Ordne &ikoner" #: progman.rc:54 #, fuzzy msgid "&About Program Manager" -msgstr "Programbehandling" +msgstr "&Om Programbehandling" #: progman.rc:100 msgid "Program &group" @@ -13722,7 +13720,7 @@ msgstr "Still &loddrett\tCtrl+F4" #: winefile.rc:83 #, fuzzy msgid "&About Wine File Manager" -msgstr "Filbehandling" +msgstr "&Om Filbehandling" #: winefile.rc:124 msgid "Select destination" @@ -13903,7 +13901,7 @@ msgstr "&Beste tider" #: winemine.rc:49 #, fuzzy msgid "&About WineMine" -msgstr "&om Wine" +msgstr "&Om WineMine" #: winemine.rc:56 msgid "Fastest Times" @@ -14012,7 +14010,7 @@ msgstr "All&tid øverst" #: winhlp32.rc:56 #, fuzzy msgid "&About Wine Help" -msgstr "&Informasjon" +msgstr "&Om Wine Help" #: winhlp32.rc:64 msgid "Annotation..."

1 0