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

Stefan Dösinger : wined3d: Hardcode local constants with glUniform4fvARB.
by Alexandre Julliard 03 Jun '08

03 Jun '08

Module: wine Branch: master Commit: cd7825c89374fb9dd4c20aef2dbfd258713efe6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7825c89374fb9dd4c20aef2… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jun 2 21:44:06 2008 +0200 wined3d: Hardcode local constants with glUniform4fvARB. --- dlls/wined3d/glsl_shader.c | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a0c793b..8aec21d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -699,12 +699,13 @@ void shader_generate_glsl_declarations( shader_addline(buffer, "vec4 tmp0;\n"); shader_addline(buffer, "vec4 tmp1;\n"); - /* Hardcodable local constants */ + /* Local constants use a different name so they can be loaded once at shader link time + * They can't be hardcoded into the shader text via LC = {x, y, z, w}; because the + * float -> string conversion can cause precision loss. + */ if(!This->baseShader.load_local_constsF) { LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { - float *value = (float *) lconst->value; - shader_addline(buffer, "const vec4 %cLC%u = vec4(%f, %f, %f, %f);\n", prefix, lconst->idx, - value[0], value[1], value[2], value[3]); + shader_addline(buffer, "uniform vec4 %cLC%u;\n", prefix, lconst->idx); } } @@ -3076,6 +3077,21 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs return ret; } +static void hardcode_local_constants(IWineD3DBaseShaderImpl *shader, WineD3D_GL_Info *gl_info, GLhandleARB programId, char prefix) { + local_constant* lconst; + GLuint tmp_loc; + float *value; + char glsl_name[8]; + + LIST_FOR_EACH_ENTRY(lconst, &shader->baseShader.constantsF, local_constant, entry) { + value = (float *) lconst->value; + snprintf(glsl_name, sizeof(glsl_name), "%cLC%u", prefix, lconst->idx); + tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); + GL_EXTCALL(glUniform4fvARB(tmp_loc, 1, value)); + } + checkGLcall("Hardcoding local constants\n"); +} + /** Sets the GLSL program ID for the given pixel and vertex shader combination. * It sets the programId on the current StateBlock (because it should be called * inside of the DrawPrimitive() part of the render loop). @@ -3228,6 +3244,17 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use /* Load pixel shader samplers */ shader_glsl_load_psamplers(gl_info, (IWineD3DStateBlock*)This->stateBlock, programId); } + + /* If the local constants do not have to be loaded with the environment constants, + * load them now to have them hardcoded in the GLSL program. This saves some CPU cycles + * later + */ + if(pshader && !((IWineD3DPixelShaderImpl*)pshader)->baseShader.load_local_constsF) { + hardcode_local_constants((IWineD3DBaseShaderImpl *) pshader, gl_info, programId, 'P'); + } + if(vshader && !((IWineD3DVertexShaderImpl*)vshader)->baseShader.load_local_constsF) { + hardcode_local_constants((IWineD3DBaseShaderImpl *) vshader, gl_info, programId, 'V'); + } } static GLhandleARB create_glsl_blt_shader(WineD3D_GL_Info *gl_info) {

1 0

Stefan Dösinger : wined3d: Give local constants a shader type prefix.
by Alexandre Julliard 03 Jun '08

03 Jun '08

Module: wine Branch: master Commit: e4413f201266f064d0807b8a73bb07c653ee0c3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4413f201266f064d0807b8a7… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jun 2 21:12:27 2008 +0200 wined3d: Give local constants a shader type prefix. --- dlls/wined3d/glsl_shader.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ebf3c09..a0c793b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -703,7 +703,7 @@ void shader_generate_glsl_declarations( if(!This->baseShader.load_local_constsF) { LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { float *value = (float *) lconst->value; - shader_addline(buffer, "const vec4 LC%u = vec4(%f, %f, %f, %f);\n", lconst->idx, + shader_addline(buffer, "const vec4 %cLC%u = vec4(%f, %f, %f, %f);\n", prefix, lconst->idx, value[0], value[1], value[2], value[3]); } } @@ -878,7 +878,7 @@ static void shader_glsl_get_register_name( break; case WINED3DSPR_CONST: { - const char* prefix = pshader? "PC":"VC"; + const char prefix = pshader? 'P':'V'; /* Relative addressing */ if (param & WINED3DSHADER_ADDRMODE_RELATIVE) { @@ -889,23 +889,23 @@ static void shader_glsl_get_register_name( glsl_src_param_t rel_param; shader_glsl_add_src_param(arg, addr_token, 0, WINED3DSP_WRITEMASK_0, &rel_param); if(reg) { - sprintf(tmpStr, "%s[%s + %u]", prefix, rel_param.param_str, reg); + sprintf(tmpStr, "%cC[%s + %u]", prefix, rel_param.param_str, reg); } else { - sprintf(tmpStr, "%s[%s]", prefix, rel_param.param_str); + sprintf(tmpStr, "%cC[%s]", prefix, rel_param.param_str); } } else { if(reg) { - sprintf(tmpStr, "%s[A0.x + %u]", prefix, reg); + sprintf(tmpStr, "%cC[A0.x + %u]", prefix, reg); } else { - sprintf(tmpStr, "%s[A0.x]", prefix); + sprintf(tmpStr, "%cC[A0.x]", prefix); } } } else { if(shader_constant_is_local(This, reg)) { - sprintf(tmpStr, "LC%u", reg); + sprintf(tmpStr, "%cLC%u", prefix, reg); } else { - sprintf(tmpStr, "%s[%u]", prefix, reg); + sprintf(tmpStr, "%cC[%u]", prefix, reg); } }

1 0

H. Verbeet : wined3d: Set the surface location to SFLAG_INSYSMEM for depth stencils on Reset.
by Alexandre Julliard 03 Jun '08

03 Jun '08

Module: wine Branch: master Commit: 35bdc00479033a22d3548ec34e7c05a4a647f4f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35bdc00479033a22d3548ec34… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jun 2 21:12:54 2008 +0200 wined3d: Set the surface location to SFLAG_INSYSMEM for depth stencils on Reset. --- dlls/wined3d/device.c | 8 ++++++-- dlls/wined3d/surface.c | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8150c97..67d27e6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7048,8 +7048,12 @@ static void updateSurfaceDesc(IWineD3DSurfaceImpl *surface, WINED3DPRESENT_PARAM surface->resource.allocatedMemory = NULL; surface->resource.heapMemory = NULL; surface->resource.size = IWineD3DSurface_GetPitch((IWineD3DSurface *) surface) * surface->pow2Width; - /* INDRAWABLE is a sane place for implicit targets / depth stencil after the reset */ - IWineD3DSurface_ModifyLocation((IWineD3DSurface *) surface, SFLAG_INDRAWABLE, TRUE); + /* INDRAWABLE is a sane place for implicit targets after the reset, INSYSMEM is more appropriate for depth stencils. */ + if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { + IWineD3DSurface_ModifyLocation((IWineD3DSurface *) surface, SFLAG_INSYSMEM, TRUE); + } else { + IWineD3DSurface_ModifyLocation((IWineD3DSurface *) surface, SFLAG_INDRAWABLE, TRUE); + } } static HRESULT WINAPI reset_unload_resources(IWineD3DResource *resource, void *data) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 684690b..adddaa9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -572,7 +572,11 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { * uninitialized drawable. That's pointless and we'd have to allocate the texture / * sysmem copy here. */ - IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, TRUE); + if (This->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { + IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE); + } else { + IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, TRUE); + } } else { /* Load the surface into system memory */ IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL);

1 0

Roderick Colenbrander : wined3d: Add a registry key to allow/ disallow multisampling.
by Alexandre Julliard 03 Jun '08

03 Jun '08

Module: wine Branch: master Commit: 042d0394dcc56da3bc496941aec05b0b82f1b71d URL: http://source.winehq.org/git/wine.git/?a=commit;h=042d0394dcc56da3bc496941a… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Jun 2 21:06:01 2008 +0000 wined3d: Add a registry key to allow/disallow multisampling. Right now it is set to disabled due to an Nvidia GLXBadDrawable bug. Second there is some issue (driver bug too?) in FBO mode. --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_main.c | 11 ++++++++++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 32f7323..51013eb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1775,6 +1775,12 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceMultiSampleType(IWineD3D *iface, U if (WINED3DMULTISAMPLE_NONE == MultiSampleType) return WINED3D_OK; + /* By default multisampling is disabled right now as it causes issues + * on some Nvidia driver versions and it doesn't work well in combination + * with FBOs yet. */ + if(!wined3d_settings.allow_multisampling) + return WINED3DERR_NOTAVAILABLE; + desc = getFormatDescEntry(SurfaceFormat, &Adapters[Adapter].gl_info, &glDesc); if(!desc || !glDesc) { return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index fe2c4fd..27de876 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -44,7 +44,8 @@ wined3d_settings_t wined3d_settings = ORM_BACKBUFFER, /* Use the backbuffer to do offscreen rendering */ RTL_AUTO, /* Automatically determine best locking method */ 0, /* The default of memory is set in FillGLCaps */ - NULL /* No wine logo by default */ + NULL, /* No wine logo by default */ + FALSE /* Disable multisampling for now due to Nvidia driver bugs which happens for some users */ }; IWineD3D* WINAPI WineDirect3DCreate(UINT SDKVersion, UINT dxVersion, IUnknown *parent) { @@ -260,6 +261,14 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) wined3d_settings.logo = HeapAlloc(GetProcessHeap(), 0, strlen(buffer) + 1); if(wined3d_settings.logo) strcpy(wined3d_settings.logo, buffer); } + if ( !get_config_key( hkey, appkey, "Multisampling", buffer, size) ) + { + if (!strcmp(buffer,"enabled")) + { + TRACE("Allow multisampling\n"); + wined3d_settings.allow_multisampling = TRUE; + } + } } if (wined3d_settings.vs_mode == VS_HW) TRACE("Allow HW vertex shaders\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6f4836e..26952be 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -248,6 +248,7 @@ typedef struct wined3d_settings_s { /* Memory tracking and object counting */ unsigned int emulated_textureram; char *logo; + int allow_multisampling; } wined3d_settings_t; extern wined3d_settings_t wined3d_settings;

1 0

Michael Stefaniuc : shell32: Fix the Italian translation.
by Alexandre Julliard 03 Jun '08

03 Jun '08

Module: wine Branch: master Commit: a2c6b25e12a70d9e63ebc41e8158e73dd082c69e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c6b25e12a70d9e63ebc41e8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 2 21:09:35 2008 +0200 shell32: Fix the Italian translation. --- dlls/shell32/shell32_It.rc | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell32_It.rc b/dlls/shell32/shell32_It.rc index a8a3b28..bbabe0c 100644 --- a/dlls/shell32/shell32_It.rc +++ b/dlls/shell32/shell32_It.rc @@ -107,17 +107,19 @@ FONT 8, "MS Shell Dlg" 4, 40, 180, 120 } -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 +SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Informazioni su %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 60, 12, WS_TABSTOP + PUSHBUTTON "Wine &license...", 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 "Wine � disponibile grazie a:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 170, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 170, 10 + LTEXT "Running on %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "Wine � disponibile grazie a:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -146,6 +148,10 @@ STRINGTABLE IDS_SHV_COLUMN7 "Spazio disponibile" IDS_SHV_COLUMN8 "Nome" IDS_SHV_COLUMN9 "Commenti" + IDS_SHV_COLUMN10 "Owner" + IDS_SHV_COLUMN11 "Group" + IDS_SHV_COLUMN_DELFROM "Original location" + IDS_SHV_COLUMN_DELDATE "Date deleted" /* special folder */ IDS_DESKTOP "Desktop" @@ -165,6 +171,11 @@ STRINGTABLE IDS_DELETEFOLDER_CAPTION "Confermare la cancellazione della cartella" IDS_DELETEITEM_TEXT "Sei sicuro di voler cancellare '%1'?" IDS_DELETEMULTIPLE_TEXT "Sei sicuro di voler cancellare questi %1 elementi?" + IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" + IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Trash?" + IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Trash?" + IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Trash?" + IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" IDS_OVERWRITEFILE_CAPTION "Confermare la sovrascrizione del File" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\

1 0

Michael Stefaniuc : regedit: Fix the Czech translation.
by Alexandre Julliard 03 Jun '08

03 Jun '08

Module: wine Branch: master Commit: 0f7ac9e672fad928d97d6014c5eb06e34b8fb8c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f7ac9e672fad928d97d6014c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 2 21:10:38 2008 +0200 regedit: Fix the Czech translation. --- programs/regedit/Cs.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Cs.rc b/programs/regedit/Cs.rc index 7e30c43..f01e95f 100644 --- a/programs/regedit/Cs.rc +++ b/programs/regedit/Cs.rc @@ -54,6 +54,7 @@ BEGIN MENUITEM "�&et�zcov� polo�ka", ID_EDIT_NEW_STRINGVALUE MENUITEM "&Bin�rn� polo�ka", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD polo�ka", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multi String Value", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Smazat\tDel", ID_EDIT_DELETE @@ -104,11 +105,13 @@ BEGIN MENUITEM "�&et�zcov� polo�ka", ID_EDIT_NEW_STRINGVALUE MENUITEM "&Binarn� polo�ka", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD polo�ka", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multi String Value", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Smazat\tDel", ID_EDIT_DELETE MENUITEM "P�e&jmenovat\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR + MENUITEM "&Export...", ID_EDIT_EXPORT MENUITEM "&Kop�rovat n�zev kl��e", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Naj�t\tCtrl+F", ID_EDIT_FIND, GRAYED @@ -220,6 +223,7 @@ BEGIN IDS_DELETE_BOX_TEXT "Opravdu chcete smazat polo�ku '%s'?" IDS_NEWKEY "Nov� kl�� #%d" IDS_NEWVALUE "Nov� polo�ka #%d" + IDS_NOTFOUND "Search string '%s' not found" END /*****************************************************************/

1 0

Michael Stefaniuc : shell32: Fix the Swedish translation.
by Alexandre Julliard 03 Jun '08

03 Jun '08

Module: wine Branch: master Commit: ee924bfde7f79bcc44d8c39d965032805a08bd5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee924bfde7f79bcc44d8c39d9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 2 21:09:51 2008 +0200 shell32: Fix the Swedish translation. --- dlls/shell32/shell32_Sv.rc | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell32_Sv.rc b/dlls/shell32/shell32_Sv.rc index 5af8b55..e77a37a 100644 --- a/dlls/shell32/shell32_Sv.rc +++ b/dlls/shell32/shell32_Sv.rc @@ -40,17 +40,19 @@ BEGIN END END -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 +SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Om %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 60, 12, WS_TABSTOP + PUSHBUTTON "Wine &license...", 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 "Wine hade inte varit m�jligt utan dessa personer:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 170, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 170, 10 + LTEXT "Running on %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "Wine hade inte varit m�jligt utan dessa personer:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95

1 0

Michael Stefaniuc : regedit: Fix the Italian translation.
by Alexandre Julliard 03 Jun '08

03 Jun '08

Module: wine Branch: master Commit: a7a68d520989c9a5f2ad473057722fd35dd1f069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7a68d520989c9a5f2ad47305… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 2 21:10:19 2008 +0200 regedit: Fix the Italian translation. --- programs/regedit/It.rc | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/programs/regedit/It.rc b/programs/regedit/It.rc index d1c0587..756f4c4 100644 --- a/programs/regedit/It.rc +++ b/programs/regedit/It.rc @@ -48,9 +48,10 @@ BEGIN BEGIN MENUITEM "Chiave", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "&Valore stringa", ID_EDIT_NEW_STRINGVALUE - MENUITEM "&Valore binario", ID_EDIT_NEW_BINARYVALUE - MENUITEM "&Valore DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "Valore &stringa", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Valore &binario", ID_EDIT_NEW_BINARYVALUE + MENUITEM "Valore &DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multi String Value", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Elimina\tDel", ID_EDIT_DELETE @@ -98,14 +99,16 @@ BEGIN BEGIN MENUITEM "&Chiave", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "&Valore stringa", ID_EDIT_NEW_STRINGVALUE - MENUITEM "&Valore binario", ID_EDIT_NEW_BINARYVALUE - MENUITEM "&Valore DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "Valore &stringa", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Valore &binario", ID_EDIT_NEW_BINARYVALUE + MENUITEM "Valore &DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multi String Value", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Elimina\tDel", ID_EDIT_DELETE MENUITEM "&Rinomina\tF2" ID_EDIT_RENAME MENUITEM SEPARATOR + MENUITEM "&Export...", ID_EDIT_EXPORT MENUITEM "&Copia nome chiave", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Trova\tCtrl+F", ID_EDIT_FIND, GRAYED @@ -267,6 +270,7 @@ BEGIN IDS_DELETE_BOX_TEXT "Sei sicuro di voler cancellare il valore '%s'?" IDS_NEWKEY "Nuova Chiave #%d" IDS_NEWVALUE "Nuovo Valore #%d" + IDS_NOTFOUND "Search string '%s' not found" END /*****************************************************************/

1 0

Michael Karcher : d3d9/tests: Keep swapchain while its backbuffer is in use .
by Alexandre Julliard 03 Jun '08

03 Jun '08

Module: wine Branch: master Commit: a6e515af83226038a6fc2da3e855187c59dc656e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6e515af83226038a6fc2da3e… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Mon Jun 2 22:51:16 2008 +0200 d3d9/tests: Keep swapchain while its backbuffer is in use. --- dlls/d3d9/tests/stateblock.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index aa23409..7efeb0c 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -255,6 +255,7 @@ static void execute_test_chain( typedef struct event_data { IDirect3DStateBlock9* stateblock; IDirect3DSurface9* original_render_target; + IDirect3DSwapChain9* new_swap_chain; } event_data; static int switch_render_target( @@ -293,7 +294,7 @@ static int switch_render_target( if (hret != D3D_OK) goto error; IUnknown_Release(backbuffer); - IUnknown_Release(swapchain); + edata->new_swap_chain = swapchain; return EVENT_OK; error: @@ -318,6 +319,8 @@ static int revert_render_target( } IUnknown_Release(edata->original_render_target); + + IUnknown_Release(edata->new_swap_chain); return EVENT_OK; }

1 0

H. Verbeet : wined3d: Fix WINED3DTOP_MULTIPLYADD for ATI cards.
by Alexandre Julliard 03 Jun '08

03 Jun '08

Module: wine Branch: master Commit: 3687207a04d0716b31391bebf99f4abb449cafa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3687207a04d0716b31391bebf… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jun 2 21:12:48 2008 +0200 wined3d: Fix WINED3DTOP_MULTIPLYADD for ATI cards. --- dlls/wined3d/utils.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bcd7b24..8ec0688 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2516,14 +2516,14 @@ void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTEXTUREOP if (GL_SUPPORT(ATI_TEXTURE_ENV_COMBINE3)) { glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI); checkGLcall("GL_TEXTURE_ENV, comb_target, GL_MODULATE_ADD_ATI"); - glTexEnvi(GL_TEXTURE_ENV, src0_target, src3); - checkGLcall("GL_TEXTURE_ENV, src0_target, src3"); - glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr3); - checkGLcall("GL_TEXTURE_ENV, opr0_target, opr3"); - glTexEnvi(GL_TEXTURE_ENV, src1_target, src1); - checkGLcall("GL_TEXTURE_ENV, src1_target, src1"); - glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr1); - checkGLcall("GL_TEXTURE_ENV, opr1_target, opr1"); + glTexEnvi(GL_TEXTURE_ENV, src0_target, src1); + checkGLcall("GL_TEXTURE_ENV, src0_target, src1"); + glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr1); + checkGLcall("GL_TEXTURE_ENV, opr0_target, opr1"); + glTexEnvi(GL_TEXTURE_ENV, src1_target, src3); + checkGLcall("GL_TEXTURE_ENV, src1_target, src3"); + glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr3); + checkGLcall("GL_TEXTURE_ENV, opr1_target, opr3"); glTexEnvi(GL_TEXTURE_ENV, src2_target, src2); checkGLcall("GL_TEXTURE_ENV, src2_target, src2"); glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2);

1 0