June 2009 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Make sure we have an active GL context in buffer_PreLoad().
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 964f4b0157d0d0a5530c214b859c56728d9f588c URL: http://source.winehq.org/git/wine.git/?a=commit;h=964f4b0157d0d0a5530c214b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 25 10:24:55 2009 +0200 wined3d: Make sure we have an active GL context in buffer_PreLoad(). --- dlls/wined3d/buffer.c | 7 +++---- dlls/wined3d/drawprim.c | 10 +++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8896db9..4b71311 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -37,13 +37,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); static void buffer_create_buffer_object(struct wined3d_buffer *This) { GLenum error, gl_usage; - IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; TRACE("Creating an OpenGL vertex buffer object for IWineD3DVertexBuffer %p Usage(%s)\n", This, debug_d3dusage(This->resource.usage)); - /* Make sure that a context is there. Needed in a multithreaded environment. Otherwise this call is a nop */ - ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); ENTER_GL(); /* Make sure that the gl error is cleared. Do not use checkGLcall @@ -689,6 +686,8 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) TRACE("iface %p\n", iface); + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + if (!This->buffer_object) { /* TODO: Make converting independent from VBOs */ @@ -724,7 +723,7 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) if (This->conversion_count > VB_MAXDECLCHANGES) { FIXME("Too many declaration changes, stopping converting\n"); - ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); GL_EXTCALL(glDeleteBuffersARB(1, &This->buffer_object)); checkGLcall("glDeleteBuffersARB"); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index dcdf21a..c0fb678 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -756,6 +756,11 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This, GLenum feedback_type; GLfloat *feedbuffer; + /* Simply activate the context for blitting. This disables all the things we don't want and + * takes care of dirtifying. Dirtifying is preferred over pushing / popping, since drawing the + * patch (as opposed to normal draws) will most likely need different changes anyway. */ + ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_BLIT); + /* First, locate the position data. This is provided in a vertex buffer in the stateblock. * Beware of vbos */ @@ -806,11 +811,6 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This, patch->has_normals = TRUE; patch->has_texcoords = FALSE; - /* Simply activate the context for blitting. This disables all the things we don't want and - * takes care of dirtifying. Dirtifying is preferred over pushing / popping, since drawing the - * patch (as opposed to normal draws) will most likely need different changes anyway - */ - ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_BLIT); ENTER_GL(); glMatrixMode(GL_PROJECTION);

1 0

Henri Verbeet : wined3d: Make context_resource_released() responsible for activating a different GL context.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 94cd8656ea123420b31826231a6d8b8ae3347ad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94cd8656ea123420b31826231… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 25 10:24:56 2009 +0200 wined3d: Make context_resource_released() responsible for activating a different GL context. In case lastActiveRenderTarget is destroyed. --- dlls/wined3d/context.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 35 ++--------------------------------- 2 files changed, 49 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 81bddb1..5b3cecb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -426,6 +426,53 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource { case WINED3DRTYPE_SURFACE: { + if ((IWineD3DSurface *)resource == This->lastActiveRenderTarget) + { + IWineD3DSwapChainImpl *swapchain; + + TRACE("Last active render target destroyed.\n"); + + /* Find a replacement surface for the currently active back + * buffer. The context manager does not do NULL checks, so + * switch to a valid target as long as the currently set + * surface is still valid. Use the surface of the implicit + * swpchain. If that is the same as the destroyed surface the + * device is destroyed and the lastActiveRenderTarget member + * shouldn't matter. */ + swapchain = This->swapchains ? (IWineD3DSwapChainImpl *)This->swapchains[0] : NULL; + if (swapchain) + { + if (swapchain->backBuffer && swapchain->backBuffer[0] != (IWineD3DSurface *)resource) + { + TRACE("Activating primary back buffer.\n"); + ActivateContext(This, swapchain->backBuffer[0], CTXUSAGE_RESOURCELOAD); + } + else if (!swapchain->backBuffer && swapchain->frontBuffer != (IWineD3DSurface *)resource) + { + /* Single buffering environment */ + TRACE("Activating primary front buffer.\n"); + + ActivateContext(This, swapchain->frontBuffer, CTXUSAGE_RESOURCELOAD); + } + else + { + /* Implicit render target destroyed, that means the + * device is being destroyed whatever we set here, it + * shouldn't matter. */ + TRACE("Device is being destroyed, setting lastActiveRenderTarget to 0xdeadbabe.\n"); + + This->lastActiveRenderTarget = (IWineD3DSurface *) 0xdeadbabe; + } + } + else + { + WARN("Render target set, but swapchain does not exist!\n"); + + /* May happen during ddraw uninitialization. */ + This->lastActiveRenderTarget = (IWineD3DSurface *)0xdeadcafe; + } + } + for (i = 0; i < This->numContexts; ++i) { WineD3DContext *context = This->contexts[i]; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 48d49a8..3ad0625 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7327,39 +7327,8 @@ void device_resource_released(IWineD3DDeviceImpl *This, IWineD3DResource *resour case WINED3DRTYPE_SURFACE: { unsigned int i; - /* Cleanup any FBO attachments if d3d is enabled */ - if(This->d3d_initialized) { - if((IWineD3DSurface *)resource == This->lastActiveRenderTarget) { - IWineD3DSwapChainImpl *swapchain = This->swapchains ? (IWineD3DSwapChainImpl *) This->swapchains[0] : NULL; - - TRACE("Last active render target destroyed\n"); - /* Find a replacement surface for the currently active back buffer. The context manager does not do NULL - * checks, so switch to a valid target as long as the currently set surface is still valid. Use the - * surface of the implicit swpchain. If that is the same as the destroyed surface the device is destroyed - * and the lastActiveRenderTarget member shouldn't matter - */ - if(swapchain) { - if(swapchain->backBuffer && swapchain->backBuffer[0] != (IWineD3DSurface *)resource) { - TRACE("Activating primary back buffer\n"); - ActivateContext(This, swapchain->backBuffer[0], CTXUSAGE_RESOURCELOAD); - } else if(!swapchain->backBuffer && swapchain->frontBuffer != (IWineD3DSurface *)resource) { - /* Single buffering environment */ - TRACE("Activating primary front buffer\n"); - ActivateContext(This, swapchain->frontBuffer, CTXUSAGE_RESOURCELOAD); - } else { - TRACE("Device is being destroyed, setting lastActiveRenderTarget = 0xdeadbabe\n"); - /* Implicit render target destroyed, that means the device is being destroyed - * whatever we set here, it shouldn't matter - */ - This->lastActiveRenderTarget = (IWineD3DSurface *) 0xdeadbabe; - } - } else { - /* May happen during ddraw uninitialization */ - TRACE("Render target set, but swapchain does not exist!\n"); - This->lastActiveRenderTarget = (IWineD3DSurface *) 0xdeadcafe; - } - } - + if (This->d3d_initialized) + { for (i = 0; i < GL_LIMITS(buffers); ++i) { if (This->render_targets[i] == (IWineD3DSurface *)resource) { This->render_targets[i] = NULL;

1 0

Henri Verbeet : wined3d: Make sure we have an active GL context in context_resource_released().
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 5dcbc40581f0fc355deb935287e7e8c3f89c25ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dcbc40581f0fc355deb93528… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 25 10:24:57 2009 +0200 wined3d: Make sure we have an active GL context in context_resource_released(). --- dlls/wined3d/context.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5b3cecb..fa67872 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -472,6 +472,10 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource This->lastActiveRenderTarget = (IWineD3DSurface *)0xdeadcafe; } } + else if (This->d3d_initialized) + { + ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + } for (i = 0; i < This->numContexts; ++i) {

1 0

Henri Verbeet : wined3d: Make sure we have an active GL context in IWineD3DDeviceImpl_SetCursorProperties ().
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 4a137815dbc1fbc82cad42ffe3b025b3c14d77da URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a137815dbc1fbc82cad42ffe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 25 10:24:58 2009 +0200 wined3d: Make sure we have an active GL context in IWineD3DDeviceImpl_SetCursorProperties(). --- dlls/wined3d/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3ad0625..9959aea 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6708,6 +6708,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetCursorProperties(IWineD3DDevice* i for(i = 0; i < height; i++) memcpy(&mem[width * bpp * i], &bits[rect.Pitch * i], width * bpp); IWineD3DSurface_UnlockRect(pCursorBitmap); + + ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); if(GL_SUPPORT(APPLE_CLIENT_STORAGE)) {

1 0

Aurimas Fišeras : taskmgr: Make MessageBoxes translatable.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 282dac432b8ba702f48807669c35e206b5c784a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=282dac432b8ba702f48807669… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jun 24 15:39:19 2009 +0300 taskmgr: Make MessageBoxes translatable. --- programs/taskmgr/En.rc | 21 +++++++++++++++++++++ programs/taskmgr/affinity.c | 18 ++++++++---------- programs/taskmgr/debug.c | 18 ++++++++---------- programs/taskmgr/endproc.c | 17 ++++++++++++++--- programs/taskmgr/priority.c | 11 +++++++---- programs/taskmgr/resource.h | 10 ++++++++++ 6 files changed, 68 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=282dac432b8ba702f4880…

1 0

Aurimas Fišeras : taskmgr: Add Lithuanian translation.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 619c377fd78f69590fd53084a77ca03607450438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=619c377fd78f69590fd53084a… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jun 24 15:54:17 2009 +0300 taskmgr: Add Lithuanian translation. --- programs/taskmgr/Lt.rc | 550 +++++++++++++++++++++++++++++++++++++++++++ programs/taskmgr/taskmgr.rc | 1 + 2 files changed, 551 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=619c377fd78f69590fd53…

1 0

Aurimas Fišeras : taskmgr: Add missing resource.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 6c977e477a2aec17aca7331735d34d78689b6822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c977e477a2aec17aca733173… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jun 24 17:40:40 2009 +0300 taskmgr: Add missing resource. --- programs/taskmgr/En.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/taskmgr/En.rc b/programs/taskmgr/En.rc index fc99c31..425f44e 100644 --- a/programs/taskmgr/En.rc +++ b/programs/taskmgr/En.rc @@ -483,6 +483,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Sets process to the BELOW NORMAL priority class" ID_PROCESS_PAGE_SETPRIORITY_LOW "Sets process to the LOW priority class" + ID_PROCESS_PAGE_DEBUGCHANNELS + "Controls Debug Channels" END STRINGTABLE DISCARDABLE

1 0

Aurimas Fišeras : appwiz.cpl: Update Lithuanian translation.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: d5558b63cdc27936b7a37e43741d6df17884747f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5558b63cdc27936b7a37e437… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jun 24 18:34:15 2009 +0300 appwiz.cpl: Update Lithuanian translation. --- dlls/appwiz.cpl/Lt.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Lt.rc b/dlls/appwiz.cpl/Lt.rc index 6f524ac..a738828 100644 --- a/dlls/appwiz.cpl/Lt.rc +++ b/dlls/appwiz.cpl/Lt.rc @@ -36,6 +36,7 @@ STRINGTABLE IDS_COLUMN_NAME, "Vardas" IDS_COLUMN_PUBLISHER, "Leidėjas" IDS_COLUMN_VERSION, "Versija" + IDS_INSTALL_FILTER, "Diegimo programos\0*instal*.exe;*setup*.exe;*.msi\0Programos (*.exe)\0*.exe\0Visi failai (*.*)\0*.*\0\0" } IDD_MAIN DIALOG 0, 0, 320, 220

1 0

Paul Chitescu : cryptdlg: Add Romanian translation.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: 5ed4960fb7c99ce08e8a2f31652b0dce1c9f45f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ed4960fb7c99ce08e8a2f316… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Jun 24 19:13:45 2009 +0300 cryptdlg: Add Romanian translation. --- dlls/cryptdlg/cryptdlg.rc | 1 + dlls/cryptdlg/cryptdlg_Ro.rc | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/cryptdlg/cryptdlg.rc b/dlls/cryptdlg/cryptdlg.rc index a494652..e99e280 100644 --- a/dlls/cryptdlg/cryptdlg.rc +++ b/dlls/cryptdlg/cryptdlg.rc @@ -27,3 +27,4 @@ #include "cryptdlg_Fr.rc" #include "cryptdlg_Ko.rc" #include "cryptdlg_Nl.rc" +#include "cryptdlg_Ro.rc" diff --git a/dlls/cryptdlg/cryptdlg_Ro.rc b/dlls/cryptdlg/cryptdlg_Ro.rc new file mode 100644 index 0000000..998ce7f --- /dev/null +++ b/dlls/cryptdlg/cryptdlg_Ro.rc @@ -0,0 +1,41 @@ +/* + * cryptdlg dll Romanian resources + * + * Copyright 2009 Paul Chitescu + * + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_CERT_POLICY "Politica certificatului" + IDS_POLICY_ID "Identificatorul politicii: " + IDS_POLICY_QUALIFIER_INFO "Informația calificatorului politicii" + IDS_POLICY_QUALIFIER_ID "Identificatorul calificatorului politicii=" + IDS_CPS "CPS" + IDS_USER_NOTICE "Notiță utilizator" + IDS_QUALIFIER "Calificator" + IDS_NOTICE_REF "Referința notiței" + IDS_ORGANIZATION "Organizația=" + IDS_NOTICE_NUM "Numărul notiței=" + IDS_NOTICE_TEXT "Textul notiței=" +} + +#pragma code_page(default)

1 0

Davide Pizzetti : progman: Update Italian translation.
by Alexandre Julliard 25 Jun '09

25 Jun '09

Module: wine Branch: master Commit: b64e07b540043cb27e3c7015f549f155012b08f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b64e07b540043cb27e3c7015f… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Wed Jun 24 18:48:34 2009 +0200 progman: Update Italian translation. --- programs/progman/It.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/progman/It.rc b/programs/progman/It.rc index 0da544c..0c280f5 100644 --- a/programs/progman/It.rc +++ b/programs/progman/It.rc @@ -55,7 +55,7 @@ POPUP "&Aiuto" { MENUITEM "&Tutorial", PM_TUTORIAL MENUITEM SEPARATOR - POPUP "&Informazioni sul Program Manager" { + POPUP "&Informazioni sul Gestore Del Programma" { MENUITEM "&Licenza", PM_LICENSE MENUITEM "&Garanzia", PM_NO_WARRANTY MENUITEM "&Informazioni su WINE", PM_ABOUT_WINE @@ -84,7 +84,7 @@ PUSHBUTTON "&Aiuto", PM_HELP, 105, 45, 60, 15, WS_TABSTOP DIALOG_MOVE DIALOG 0, 0, 250, 65 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Move Program" +CAPTION "Sposta Programma" { LTEXT "Sposta programma:", -1, 5, 5, 90, 15 LTEXT "", PM_PROGRAM, 95, 5, 90, 15 @@ -108,7 +108,7 @@ LTEXT "Copia programma:", -1, 5, 5, 90, 15 LTEXT "", PM_PROGRAM, 95, 5, 90, 15 LTEXT "Dal gruppo:", -1, 5, 13, 90, 15 LTEXT "", PM_FROM_GROUP, 95, 13, 90, 15 -LTEXT "&Al grouppo:", PM_TO_GROUP_TXT, 5, 28, 140, 15 +LTEXT "&Al gruppo:", PM_TO_GROUP_TXT, 5, 28, 140, 15 COMBOBOX PM_TO_GROUP, 5, 38, 140, 50, WS_TABSTOP | CBS_DROPDOWNLIST DEFPUSHBUTTON "OK", IDOK, 185, 5, 60, 15, WS_TABSTOP PUSHBUTTON "Annulla", IDCANCEL, 185, 25, 60, 15, WS_TABSTOP @@ -195,9 +195,9 @@ PUSHBUTTON "&Aiuto", PM_HELP, 135, 65, 60, 15, WS_TABSTOP STRINGTABLE DISCARDABLE LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL { -IDS_PROGRAM_MANAGER, "Program Manager" +IDS_PROGRAM_MANAGER, "Gestore Programma" IDS_ERROR, "ERRORE" -IDS_WARNING, "ATTENZONE" +IDS_WARNING, "ATTENZIONE" IDS_INFO, "Informazioni" IDS_DELETE, "Elimina" IDS_DELETE_GROUP_s, "Eliminare il gruppo `%s' ?"

1 0