wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Henri Verbeet : wined3d: Get rid of the CONVERT_TYPES typedef.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: d8b00ecf34fd97c12378900a394677d56339f881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8b00ecf34fd97c12378900a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 20 00:36:27 2012 +0100 wined3d: Get rid of the CONVERT_TYPES typedef. --- dlls/wined3d/surface.c | 71 +++++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 21 ++++++------ 2 files changed, 49 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8b00ecf34fd97c123789…

1 0

Henri Verbeet : wined3d: Don' t load the draw_binding location in surface_unmap() unless the surface is on a swapchain.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 8692ff48a953f368860967c1141ec875adba9aaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8692ff48a953f368860967c11… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 20 00:36:26 2012 +0100 wined3d: Don't load the draw_binding location in surface_unmap() unless the surface is on a swapchain. It really makes no sense to do this just because a surface happens to be the current render target. In particular, this patch prevents needlessly bouncing the surface between the CPU and the GPU when the application does e.g. multiple colorkeyed blits to the current render target to draw a HUD. --- dlls/wined3d/surface.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7aa68d1..21bd088 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -953,8 +953,14 @@ static void surface_unmap(struct wined3d_surface *surface) goto done; } + /* FIXME: The ORM_BACKBUFFER case probably isn't needed, but who knows + * what obscure bugs in backbuffer ORM removing it will uncover. Also, + * this should only be needed for the frontbuffer, but that requires + * present calls to call surface_load_location() on the backbuffer. + * Fix both of those after 1.4. */ if (surface->container.type == WINED3D_CONTAINER_SWAPCHAIN - || (device->fb.render_targets && surface == device->fb.render_targets[0])) + || (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER + && device->fb.render_targets && surface == device->fb.render_targets[0])) { if (!surface->dirtyRect.left && !surface->dirtyRect.top && surface->dirtyRect.right == surface->resource.width

1 0

Henri Verbeet : wined3d: Properly enable / disable register combiners.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: d1254eddb598ad2a6bddaf09ddb5d73247d460cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1254eddb598ad2a6bddaf09d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 20 00:36:25 2012 +0100 wined3d: Properly enable / disable register combiners. --- dlls/wined3d/nvidia_texture_shader.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index dc3f8b9..1fef980 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -629,15 +629,31 @@ static void nvrc_texfactor(struct wined3d_context *context, const struct wined3d } /* Context activation is done by the caller. */ -static void nvrc_enable(BOOL enable) {} +static void nvrc_enable(BOOL enable) +{ + if (enable) + { + glEnable(GL_REGISTER_COMBINERS_NV); + checkGLcall("glEnable(GL_REGISTER_COMBINERS_NV)"); + } + else + { + glDisable(GL_REGISTER_COMBINERS_NV); + checkGLcall("glDisable(GL_REGISTER_COMBINERS_NV)"); + } +} /* Context activation and GL locking are done by the caller. */ static void nvts_enable(BOOL enable) { - if(enable) { + nvrc_enable(enable); + if (enable) + { glEnable(GL_TEXTURE_SHADER_NV); checkGLcall("glEnable(GL_TEXTURE_SHADER_NV)"); - } else { + } + else + { glDisable(GL_TEXTURE_SHADER_NV); checkGLcall("glDisable(GL_TEXTURE_SHADER_NV)"); }

1 0

Alexandre Julliard : makefiles: Disable use of Unicode macros globally for all the programs.
by Alexandre Julliard 20 Jan '12

20 Jan '12

1 0

Alexandre Julliard : progman: Avoid Unicode macros.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 6109f05e450dffb99feeebed5bb0734635624359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6109f05e450dffb99feeebed5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 20 13:06:40 2012 +0100 progman: Avoid Unicode macros. --- programs/progman/Makefile.in | 1 + programs/progman/dialog.c | 132 ++++++++++++++++-------------------------- programs/progman/group.c | 42 ++++++------- programs/progman/grpfile.c | 39 ++++++------- programs/progman/main.c | 90 +++++++++++++---------------- programs/progman/progman.h | 31 +++++----- programs/progman/progman.rc | 16 +++--- programs/progman/program.c | 51 ++++++++--------- programs/progman/string.c | 34 +++-------- 9 files changed, 184 insertions(+), 252 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6109f05e450dffb99feee…

1 0

Alexandre Julliard : winhlp32: Avoid Unicode macros.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: e12d39dc10c8802de4241893337cfc3601d2af2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e12d39dc10c8802de42418933… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 20 12:50:15 2012 +0100 winhlp32: Avoid Unicode macros. --- programs/winhlp32/Makefile.in | 1 + programs/winhlp32/callback.c | 2 +- programs/winhlp32/hlpfile.c | 14 +- programs/winhlp32/hlpfile.h | 2 +- programs/winhlp32/macro.c | 46 ++++---- programs/winhlp32/winhelp.c | 284 ++++++++++++++++++++--------------------- 6 files changed, 174 insertions(+), 175 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e12d39dc10c8802de4241…

1 0

Alexandre Julliard : winecfg: Avoid Unicode macros.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: edf44bfb1e74e0d4b9fd5f5e973c8c4152f311dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=edf44bfb1e74e0d4b9fd5f5e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 20 12:42:33 2012 +0100 winecfg: Avoid Unicode macros. --- programs/winecfg/Makefile.in | 1 + programs/winecfg/about.c | 16 ++++---- programs/winecfg/appdefaults.c | 84 ++++++++++++++++++++------------------- programs/winecfg/audio.c | 14 +++--- programs/winecfg/drive.c | 20 +++++----- programs/winecfg/drivedetect.c | 12 +++--- programs/winecfg/driveui.c | 68 ++++++++++++++++++-------------- programs/winecfg/libraries.c | 83 ++++++++++++++++++++------------------- programs/winecfg/theme.c | 69 ++++++++++++++++---------------- programs/winecfg/winecfg.c | 10 ++-- programs/winecfg/winecfg.h | 6 +- programs/winecfg/winecfg.rc | 6 +- programs/winecfg/x11drvdlg.c | 59 +++++++++++++++------------- 13 files changed, 232 insertions(+), 216 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=edf44bfb1e74e0d4b9fd5…

1 0

Alexandre Julliard : wordpad: Avoid Unicode macros.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: f2fe53d6ab8b8194123bf5ac3d10bf1a5126ee70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2fe53d6ab8b8194123bf5ac3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 20 12:07:24 2012 +0100 wordpad: Avoid Unicode macros. --- programs/wordpad/Makefile.in | 2 +- programs/wordpad/print.c | 4 +- programs/wordpad/wordpad.c | 57 ++++++++++++++++++++--------------------- 3 files changed, 31 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2fe53d6ab8b8194123bf…

1 0

Alexandre Julliard : winedbg: Use the standard dialog font for the crash dialogs.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: aef2eeea6c247e37ce53c571558c8b5d7b3aa2f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef2eeea6c247e37ce53c5715… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 20 11:58:45 2012 +0100 winedbg: Use the standard dialog font for the crash dialogs. --- programs/winedbg/winedbg.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/winedbg.rc b/programs/winedbg/winedbg.rc index cadfc67..4effa6e 100644 --- a/programs/winedbg/winedbg.rc +++ b/programs/winedbg/winedbg.rc @@ -44,7 +44,7 @@ END IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Program Error" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 LTEXT "The program %s has encountered a serious problem and needs \ @@ -61,7 +61,7 @@ END IDD_DETAILS_DLG DIALOGEX 100, 100, 300, 240 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_VISIBLE CAPTION "Program Error Details" -FONT 8, "Tahoma" +FONT 8, "MS Shell Dlg" BEGIN EDITTEXT IDC_CRASH_TXT, 4, 4, 292, 172, ES_MULTILINE | ES_READONLY | WS_HSCROLL | WS_VSCROLL, WS_TABSTOP CONTROL "If this problem is not present under Windows and has not been reported yet, \

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 6dd16ec1f0ca01800090b0c9b9aa1a189fdd49a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dd16ec1f0ca01800090b0c9b… Author: Luca Bennati <lucak3(a)gmail.com> Date: Thu Jan 19 09:52:05 2012 +0100 po: Update Italian translation. --- po/it.po | 41 +++++++++++++++-------------------------- 1 files changed, 15 insertions(+), 26 deletions(-) diff --git a/po/it.po b/po/it.po index 4eddc86..84a40b2 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-01-13 12:10+0100\n" +"PO-Revision-Date: 2012-01-19 09:43+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -40,9 +40,8 @@ msgstr "" "lista e clicca Cambia/Rimuovi." #: appwiz.rc:64 -#, fuzzy msgid "&Support Information" -msgstr "Informazioni di supporto" +msgstr "Informazioni di &supporto" #: appwiz.rc:65 regedit.rc:42 regedit.rc:87 msgid "&Modify..." @@ -3488,12 +3487,11 @@ msgstr "Impossibile avere 'continue' fuori dal ciclo" #: jscript.rc:40 msgid "Label redefined" -msgstr "" +msgstr "Etichetta ridefinita" #: jscript.rc:41 -#, fuzzy msgid "Label not found" -msgstr "File non trovato" +msgstr "Etichetta non trovata" #: jscript.rc:42 msgid "Conditional compilation is turned off" @@ -7504,9 +7502,8 @@ msgid "Resource Failures" msgstr "Fallimenti della risorsa" #: shdoclc.rc:198 -#, fuzzy msgid "Dump Tracking Info" -msgstr "Informazioni di Dump Tracking" +msgstr "" #: shdoclc.rc:199 msgid "Debug Break" @@ -13073,9 +13070,8 @@ msgid "Command history" msgstr "Cronologia" #: wineconsole.rc:73 -#, fuzzy msgid "&Number of recalled commands:" -msgstr "&Numero di comandi richiamati :" +msgstr "&Numero di comandi richiamati:" #: wineconsole.rc:76 msgid "&Remove doubles" @@ -13098,12 +13094,10 @@ msgid "Buffer zone" msgstr "Zona del buffer" #: wineconsole.rc:101 -#, fuzzy msgid "&Width:" msgstr "&Larghezza:" #: wineconsole.rc:104 -#, fuzzy msgid "&Height:" msgstr "&Altezza:" @@ -13112,12 +13106,10 @@ msgid "Window size" msgstr "Dimensione della finestra" #: wineconsole.rc:109 -#, fuzzy msgid "W&idth:" msgstr "&Larghezza:" #: wineconsole.rc:112 -#, fuzzy msgid "H&eight:" msgstr "&Altezza:" @@ -13274,7 +13266,6 @@ msgstr "" "spiacenti per l'inconveniente." #: winedbg.rc:55 -#, fuzzy msgid "" "This can be caused by a problem in the program or a deficiency in Wine. You " "may want to check the <a href=\"http://appdb.winehq.org\">Application " @@ -13282,20 +13273,15 @@ msgid "" msgstr "" "Ciò può essere causato da un problema nel programma o da una mancanza di " "Wine. Potresti voler consultare il <a href=\"http://appdb.winehq.org" -"\">Database delle applicazioni</a> per consigli su questa applicazione.\n" -"\n" -"Se questo problema non è presente sotto Windows e non è stato ancora " -"segnalato, puoi <a href=\"http://wiki.winehq.org/Bugs\">segnalarlo</a>." +"\">Database delle applicazioni</a> per consigli su questa applicazione." #: winedbg.rc:58 -#, fuzzy msgid "Show &Details" -msgstr "&Dettagli" +msgstr "Mostra i &dettagli" #: winedbg.rc:63 -#, fuzzy msgid "Program Error Details" -msgstr "Errore del programma" +msgstr "Dettagli dell'errore del programma" #: winedbg.rc:70 msgid "" @@ -13304,6 +13290,10 @@ msgid "" "button, then <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" +"Se questo problema non è presente sotto Windows e non è stato ancora " +"riportato, puoi salvare le informazioni dettagliate su un file usando il " +"pulsante \"Salva con nome\", poi <a href=\"http://wiki.winehq.org/Bugs" +"\">segnalalo</a> e allega quel file al report del bug." #: winedbg.rc:35 msgid "Wine program crash" @@ -13318,13 +13308,12 @@ msgid "(unidentified)" msgstr "(non identificato)" #: winedbg.rc:40 -#, fuzzy msgid "Saving failed" -msgstr "Creazione fallita\n" +msgstr "Salvataggio fallito" #: winedbg.rc:41 msgid "Loading detailed information, please wait..." -msgstr "" +msgstr "Caricamento delle informazioni dettagliate, aspetta un momento..." #: winefile.rc:26 msgid "&Open\tEnter"

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
98
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2012