March 2008 - Wine-Commits - list.winehq.org

Samuel Lidén Borell : mshtml: Update Swedish translation.
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: 9ba2395abab85def5164478f4e1faae768e7edf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ba2395abab85def5164478f4… Author: Samuel Lidén Borell <samuel(a)slbdata.se> Date: Tue Mar 18 22:59:25 2008 +0100 mshtml: Update Swedish translation. --- dlls/mshtml/Sv.rc | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/Sv.rc b/dlls/mshtml/Sv.rc index 9a07bb8..1a93f0e 100644 --- a/dlls/mshtml/Sv.rc +++ b/dlls/mshtml/Sv.rc @@ -1,5 +1,5 @@ /* - * Copyright 2006 Samuel Lid�n Borell + * Copyright 2006-2008 Samuel Lid�n Borell * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -39,3 +39,18 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "&Installera", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Avbryt", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP } + + +IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Hyperl�nk" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "L�nkinformation", IDC_STATIC, 5, 5, 190, 55 + LTEXT "&Typ:", IDC_STATIC, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "&URL:", IDC_STATIC, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ok", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +}

1 0

Samuel Lidén Borell : shdoclc: Update Swedish translation.
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: d356b7c064d599237f3173904b44b65f920fdd96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d356b7c064d599237f3173904… Author: Samuel Lidén Borell <samuellb(a)crashie> Date: Tue Mar 18 22:49:56 2008 +0100 shdoclc: Update Swedish translation. --- dlls/shdoclc/Sv.rc | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/shdoclc/Sv.rc b/dlls/shdoclc/Sv.rc index af593c4..9b517e6 100644 --- a/dlls/shdoclc/Sv.rc +++ b/dlls/shdoclc/Sv.rc @@ -1,5 +1,5 @@ /* - * Copyright 2006 Samuel Lid�n Borell + * Copyright 2006-2008 Samuel Lid�n Borell * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,6 +19,17 @@ LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + IDS_MESSAGE_BOX_TITLE, "Wine Internet Explorer" +} + +STRINGTABLE DISCARDABLE +{ + IDS_PRINT_HEADER_TEMPLATE "&w&bSida &p" /* FIXME: should be "&w&bPage &p of &P" */ + IDS_PRINT_FOOTER_TEMPLATE "&u&b&d" +} + IDR_BROWSE_CONTEXT_MENU MENU { POPUP "Standard"

1 0

Michael Stefaniuc : msrle32: Add the Romanian translation.
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: 881373f452132f540c2835e2ff853c1289228895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=881373f452132f540c2835e2f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 19 15:00:00 2008 +0100 msrle32: Add the Romanian translation. --- dlls/msrle32/msrle_Ro.rc | 31 +++++++++++++++++++++++++++++++ dlls/msrle32/rsrc.rc | 1 + 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/msrle32/msrle_Ro.rc b/dlls/msrle32/msrle_Ro.rc new file mode 100644 index 0000000..64366c3 --- /dev/null +++ b/dlls/msrle32/msrle_Ro.rc @@ -0,0 +1,31 @@ +/* + * Copyright 2002 Michael Günnewig + * Copyright 2008 Michael Stefaniuc + * + * 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 + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "WINE-MS-RLE" + IDS_DESCRIPTION "Codecul video Wine MS-RLE" + IDS_ABOUT "Codecul video Wine MS-RLE\nCopyright 2002 by Michael Günnewig" +} + +#pragma code_page(default) diff --git a/dlls/msrle32/rsrc.rc b/dlls/msrle32/rsrc.rc index 3421470..618b36e 100644 --- a/dlls/msrle32/rsrc.rc +++ b/dlls/msrle32/rsrc.rc @@ -45,6 +45,7 @@ #include "msrle_No.rc" #include "msrle_Pl.rc" #include "msrle_Pt.rc" +#include "msrle_Ro.rc" #include "msrle_Ru.rc" #include "msrle_Si.rc" #include "msrle_Sv.rc"

1 0

Jason Green : d3d9: Add a visual test case for the D3DSAMP_SRGBTEXTURE sampler state.
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: 27364e8454d8d768d6986be4ac0466fba6b34ae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27364e8454d8d768d6986be4a… Author: Jason Green <jave27(a)gmail.com> Date: Wed Mar 19 13:07:31 2008 -0400 d3d9: Add a visual test case for the D3DSAMP_SRGBTEXTURE sampler state. --- dlls/d3d9/tests/visual.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 77aaf5d..6acba8d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5413,6 +5413,90 @@ void test_vshader_input(IDirect3DDevice9 *device) IDirect3DVertexDeclaration9_Release(decl_color_float); } +static void srgbtexture_test(IDirect3DDevice9 *device) +{ + /* Fill a texture with 0x7f (~ .5), and then turn on the D3DSAMP_SRGBTEXTURE + * texture stage state to render a quad using that texture. The resulting + * color components should be 0x36 (~ 0.21), per this formula: + * linear_color = ((srgb_color + 0.055) / 1.055) ^ 2.4 + * This is true where srgb_color > 0.04045. + */ + IDirect3D9 *d3d = NULL; + HRESULT hr; + LPDIRECT3DTEXTURE9 texture = NULL; + LPDIRECT3DSURFACE9 surface = NULL; + D3DLOCKED_RECT lr; + DWORD color; + float quad[] = { + -1.0, 1.0, 0.0, 0.0, 0.0, + 1.0, 1.0, 0.0, 1.0, 0.0, + -1.0, -1.0, 0.0, 0.0, 1.0, + 1.0, -1.0, 0.0, 1.0, 1.0, + }; + + + memset(&lr, 0, sizeof(lr)); + IDirect3DDevice9_GetDirect3D(device, &d3d); + if(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_QUERY_SRGBREAD, D3DRTYPE_TEXTURE, + D3DFMT_A8R8G8B8) != D3D_OK) { + skip("D3DFMT_A8R8G8B8 textures with SRGBREAD not supported\n"); + goto out; + } + + hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, 0, + D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, + &texture, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed with %s\n", DXGetErrorString9(hr)); + if(!texture) { + skip("Failed to create A8R8G8B8 texture with SRGBREAD\n"); + goto out; + } + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + ok(hr == D3D_OK, "IDirect3DTexture9_GetSurfaceLevel failed with %s\n", DXGetErrorString9(hr)); + + fill_surface(surface, 0xff7f7f7f); + IDirect3DSurface9_Release(surface); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) texture); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with %s\n", DXGetErrorString9(hr)); + if(SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, TRUE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %s\n", DXGetErrorString9(hr)); + + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with %s\n", DXGetErrorString9(hr)); + } + + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_SRGBTEXTURE, FALSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %s\n", DXGetErrorString9(hr)); + + color = getPixelColor(device, 320, 240); + ok(color == 0x00363636, "srgb quad has color %08x, expected 0x00363636\n", color); + +out: + if(texture) IDirect3DTexture9_Release(texture); + IDirect3D9_Release(d3d); +} + static void fog_srgbwrite_test(IDirect3DDevice9 *device) { /* Draw a black quad, half fogged with white fog -> grey color. Enable sRGB writing. @@ -7280,6 +7364,7 @@ START_TEST(visual) } offscreen_test(device_ptr); alpha_test(device_ptr); + srgbtexture_test(device_ptr); release_buffer_test(device_ptr); float_texture_test(device_ptr); g16r16_texture_test(device_ptr);

1 0

Anatoly Lyutin : wine.inf: Add "MenuShowDelay" value.
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: 65ebbb328ee883d94bccc437520fbf04239fad0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=65ebbb328ee883d94bccc4375… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Wed Mar 19 18:18:29 2008 +0300 wine.inf: Add "MenuShowDelay" value. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 92a3422..9afc4fe 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -208,6 +208,7 @@ HKCU,%Desktop%,"DragFullWindows",2,"0" HKCU,%Desktop%,"SmoothScroll",3,00,00,00,00 HKCU,%Desktop%,"UserPreferenceMask",3,10,00,00,80 HKCU,%Desktop%,"LowPowerActive",,"0" +HKCU,%Desktop%,"MenuShowDelay",2,"400" [Metrics] HKCU,%Metrics%,"ScrollWidth",2,"16"

1 0

Michael Stefaniuc : regedit: Fix and update the German translation.
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: 9858a1480ef9391c778ad8c10123bee720050e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9858a1480ef9391c778ad8c10… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 19 14:58:39 2008 +0100 regedit: Fix and update the German translation. - Add the translations for REG_MULTI_SZ. - Replace "Zeichenkette" with "Zeichenfolge" as that seems to be what Windows uses. - Fix the size and placement of the "OK"/"Abbrechen" buttons. - Remove bogus accelerators on some LTEXT entries in dialogs. --- programs/regedit/De.rc | 62 ++++++++++++++++++++++++++++++----------------- 1 files changed, 39 insertions(+), 23 deletions(-) diff --git a/programs/regedit/De.rc b/programs/regedit/De.rc index 48cb5e8..f2d3dda 100644 --- a/programs/regedit/De.rc +++ b/programs/regedit/De.rc @@ -53,9 +53,10 @@ BEGIN BEGIN MENUITEM "&Schl�ssel", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "&Zeichenkette", ID_EDIT_NEW_STRINGVALUE - MENUITEM "&Bin�rwert", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&Zeichenfolge", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Bin�rwert", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD Wert", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Mehrteilige Zeichenfolge", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&L�schen\tEntf", ID_EDIT_DELETE @@ -103,9 +104,10 @@ BEGIN BEGIN MENUITEM "&Schl�ssel", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "&Zeichenkette", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Zeichenfolge", ID_EDIT_NEW_STRINGVALUE MENUITEM "&Bin�rwert", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD Wert", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Mehrteilige Zeichenfolge", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&L�schen\tEntf", ID_EDIT_DELETE @@ -156,8 +158,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "NAME:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK",IDOK,140,40,30,11, WS_GROUP - PUSHBUTTON "Abbrechen",IDCANCEL,175,40,30,11, WS_GROUP + DEFPUSHBUTTON "OK",IDOK,110,40,45,11, WS_GROUP + PUSHBUTTON "Abbrechen",IDCANCEL,160,40,45,11, WS_GROUP END IDD_DELFAVORITE DIALOG DISCARDABLE 22,17, 210, 90 @@ -167,21 +169,21 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Name:",IDC_STATIC,5,5,119,8 LISTBOX IDC_NAME_LIST,5,15,200,52, WS_BORDER | WS_TABSTOP | LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - DEFPUSHBUTTON "OK",IDOK,140,73,30,11, WS_GROUP - PUSHBUTTON "Abbrechen",IDCANCEL,175,73,30,11, WS_GROUP + DEFPUSHBUTTON "OK",IDOK,110,73,45,11,WS_GROUP + PUSHBUTTON "Abbrechen",IDCANCEL,160,73,45,11,WS_GROUP END IDD_EDIT_STRING DIALOG DISCARDABLE 22, 17, 210, 75 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Zeichenkette �ndern" +CAPTION "Zeichenfolge �ndern" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Name:",IDC_STATIC,5,5,119,8 + LTEXT "Name:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL | WS_DISABLED - LTEXT "&Daten:",IDC_STATIC,5,30,119,8 + LTEXT "Daten:",IDC_STATIC,5,30,119,8 EDITTEXT IDC_VALUE_DATA,5,40,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK",IDOK,140,60,30,11,WS_GROUP - PUSHBUTTON "Abbrechen",IDCANCEL,175,60,30,11,WS_GROUP + DEFPUSHBUTTON "OK",IDOK,110,60,45,11,WS_GROUP + PUSHBUTTON "Abbrechen",IDCANCEL,160,60,45,11,WS_GROUP END IDD_EDIT_DWORD DIALOG DISCARDABLE 22, 17, 210, 100 @@ -189,15 +191,15 @@ STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "DWORD Wert editieren" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Name:",IDC_STATIC,5,5,119,8 + LTEXT "Name:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL | WS_DISABLED - LTEXT "&Daten:",IDC_STATIC,5,30,90,8 + LTEXT "Daten:",IDC_STATIC,5,30,90,8 EDITTEXT IDC_VALUE_DATA,5,40,90,12, WS_BORDER | WS_TABSTOP GROUPBOX "Basis", IDC_DWORD_BASE, 120, 30, 85, 37, BS_GROUPBOX AUTORADIOBUTTON "Hexadezimal", IDC_DWORD_HEX, 130, 40, 60, 10, WS_TABSTOP AUTORADIOBUTTON "Dezimal", IDC_DWORD_DEC, 130, 52, 60, 10, WS_TABSTOP - DEFPUSHBUTTON "OK",IDOK,140,80,30,11,WS_GROUP - PUSHBUTTON "Abbrechen",IDCANCEL,175,80,30,11,WS_GROUP + DEFPUSHBUTTON "OK",IDOK,110,80,45,11,WS_GROUP + PUSHBUTTON "Abbrechen",IDCANCEL,160,80,45,11,WS_GROUP END IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 210, 100 @@ -205,12 +207,25 @@ STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "Bin�ren Wert editieren" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Name:",IDC_STATIC,5,5,119,8 + LTEXT "Name:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL | WS_DISABLED - LTEXT "&Daten:",IDC_STATIC,5,30,90,8 + LTEXT "Daten:",IDC_STATIC,5,30,90,8 CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,4,40,160,40 - DEFPUSHBUTTON "OK",IDOK,140,80,30,11,WS_GROUP - PUSHBUTTON "Abbrechen",IDCANCEL,175,80,30,11,WS_GROUP + DEFPUSHBUTTON "OK",IDOK,110,85,45,11,WS_GROUP + PUSHBUTTON "Abbrechen",IDCANCEL,160,85,45,11,WS_GROUP +END + +IDD_EDIT_MULTI_STRING DIALOG DISCARDABLE 22, 17, 210, 175 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Mehrteilige Zeichenfolge editieren" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Name:",IDC_STATIC,5,5,119,8 + EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED + LTEXT "Daten:",IDC_STATIC,5,30,119,8 + EDITTEXT IDC_VALUE_DATA,5,40,200,112, WS_BORDER | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN + DEFPUSHBUTTON "OK",IDOK,110,160,45,11,WS_GROUP + PUSHBUTTON "Abbrechen",IDCANCEL,160,160,45,11,WS_GROUP END /* @@ -243,9 +258,10 @@ STRINGTABLE DISCARDABLE BEGIN ID_EDIT_MODIFY "�ndert die Daten eines Wertes" ID_EDIT_NEW_KEY "F�gt einen neuen Schl�ssel hinzu" - ID_EDIT_NEW_STRINGVALUE "F�gt einen neue Zeichenkette hinzu " + ID_EDIT_NEW_STRINGVALUE "F�gt eine neue Zeichenfolge hinzu " ID_EDIT_NEW_BINARYVALUE "F�gt einen neuen Bin�rwert hinzu" ID_EDIT_NEW_DWORDVALUE "F�gt einen neuen DWORD Wert hinzu" + ID_EDIT_NEW_MULTI_STRINGVALUE "F�gt eine neue mehrteilige Zeichenfolge hinzu" ID_REGISTRY_IMPORTREGISTRYFILE "Importiert eine Textdatei in die Registry" ID_REGISTRY_EXPORTREGISTRYFILE "Exportiert Teile oder die ganze Registry in eine Textdatei" @@ -269,8 +285,8 @@ BEGIN ID_EDIT_DELETE "L�scht die Auswahl" ID_EDIT_RENAME "Benennt die Auswahl um" ID_EDIT_COPYKEYNAME "Kopiert den Schl�sselnamen in die Zwischenablage" - ID_EDIT_FIND "Findet eine Zeichenkette in einem Schl�ssel, einem Namen oder in Daten" - ID_EDIT_FINDNEXT "Findet die n�chste Zeichenkette" + ID_EDIT_FIND "Findet eine Zeichenfolge in einem Schl�ssel, einem Namen oder in Daten" + ID_EDIT_FINDNEXT "Findet die n�chste Zeichenfolge" END STRINGTABLE DISCARDABLE

1 0

Michael Stefaniuc : crypt32: Update the German translation.
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: 74b2a26cb9944eda41a2b2f3d6d953e1fb683aa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b2a26cb9944eda41a2b2f3d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 19 14:57:05 2008 +0100 crypt32: Update the German translation. --- dlls/crypt32/crypt32_De.rc | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32_De.rc b/dlls/crypt32/crypt32_De.rc index 6c109ed..40d0719 100644 --- a/dlls/crypt32/crypt32_De.rc +++ b/dlls/crypt32/crypt32_De.rc @@ -97,7 +97,7 @@ STRINGTABLE DISCARDABLE IDS_CROSS_CERT_DIST_POINTS "Verteilungspunkte f�r Kreuzzertifikate" IDS_APPLICATION_POLICIES "Anwendungsrichtlinien" IDS_APPLICATION_POLICY_MAPPINGS "Anwendungsrichtlinienzuordnungen" - IDS_APPLICATION_POLICY_CONSTRAINTS "Anweungsungsrichtlinieneinschr�nkungen" + IDS_APPLICATION_POLICY_CONSTRAINTS "Anwendungsungsrichtlinieneinschr�nkungen" IDS_CMC_DATA "CMC Daten" IDS_CMC_RESPONSE "CMC Antwort" IDS_UNSIGNED_CMC_REQUEST "Unsignierte CMC Antwort" @@ -164,3 +164,11 @@ STRINGTABLE DISCARDABLE IDS_LIFETIME_SIGNING "Lebensdauersignatur" IDS_ANY_CERT_POLICY "Alle ausgegebenen Richtlinien" } + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALIZEDNAME_ROOT "Vertrauensw�rdige Stammzertifizierungsstellen" + IDS_LOCALIZEDNAME_MY "Pers�nlich" + IDS_LOCALIZEDNAME_CA "Zwischenzertifizierungsstellen" + IDS_LOCALIZEDNAME_ADDRESSBOOK "Andere Personen" +}

1 0

Roderick Colenbrander : wined3d: Report software processing in CheckDeviceFormat.
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: fd71421ebe7b83544d521cd39d0fd8b71605c2cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd71421ebe7b83544d521cd39… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Mar 18 09:45:35 2008 +0100 wined3d: Report software processing in CheckDeviceFormat. --- dlls/wined3d/directx.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f3d7b25..bd861a6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2258,6 +2258,10 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } + /* Always report software processing */ + if(Usage & WINED3DUSAGE_SOFTWAREPROCESSING) + UsageCaps |= WINED3DUSAGE_SOFTWAREPROCESSING; + /* Check QUERY_FILTER support */ if(Usage & WINED3DUSAGE_QUERY_FILTER) { if(CheckFilterCapability(CheckFormat)) { @@ -2350,6 +2354,10 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } + /* Always report software processing */ + if(Usage & WINED3DUSAGE_SOFTWAREPROCESSING) + UsageCaps |= WINED3DUSAGE_SOFTWAREPROCESSING; + /* Check QUERY_FILTER support */ if(Usage & WINED3DUSAGE_QUERY_FILTER) { if(CheckFilterCapability(CheckFormat)) { @@ -2411,6 +2419,10 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt if(Usage & WINED3DUSAGE_DYNAMIC) UsageCaps |= WINED3DUSAGE_DYNAMIC; + /* Always report software processing */ + if(Usage & WINED3DUSAGE_SOFTWAREPROCESSING) + UsageCaps |= WINED3DUSAGE_SOFTWAREPROCESSING; + /* Check QUERY_FILTER support */ if(Usage & WINED3DUSAGE_QUERY_FILTER) { if(CheckFilterCapability(CheckFormat)) {

1 0

Roderick Colenbrander : wined3d: Add dynamic locking support to CheckDeviceFormat.
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: 30a3bc2651ed5ded408f002f30601008e4c23988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30a3bc2651ed5ded408f002f3… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Mar 18 09:43:27 2008 +0100 wined3d: Add dynamic locking support to CheckDeviceFormat. --- dlls/wined3d/directx.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index aa2c537..f3d7b25 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2245,6 +2245,10 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } + /* Always report dynamic locking */ + if(Usage & WINED3DUSAGE_DYNAMIC) + UsageCaps |= WINED3DUSAGE_DYNAMIC; + if(Usage & WINED3DUSAGE_RENDERTARGET) { if(CheckRenderTargetCapability(AdapterFormat, CheckFormat)) { UsageCaps |= WINED3DUSAGE_RENDERTARGET; @@ -2333,6 +2337,10 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } + /* Always report dynamic locking */ + if(Usage & WINED3DUSAGE_DYNAMIC) + UsageCaps |= WINED3DUSAGE_DYNAMIC; + if(Usage & WINED3DUSAGE_RENDERTARGET) { if(CheckRenderTargetCapability(AdapterFormat, CheckFormat)) { UsageCaps |= WINED3DUSAGE_RENDERTARGET; @@ -2386,6 +2394,12 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt UsageCaps |= WINED3DUSAGE_DEPTHSTENCIL; } } else if(RType == WINED3DRTYPE_VOLUMETEXTURE) { + /* Volumetexture allows: + * - D3DUSAGE_DYNAMIC + * - D3DUSAGE_NONSECURE (d3d9ex) + * - D3DUSAGE_SOFTWAREPROCESSING + */ + /* Check volume texture and volume usage caps */ if(GL_SUPPORT(EXT_TEXTURE3D)) { if(CheckTextureCapability(Adapter, CheckFormat) == FALSE) { @@ -2393,6 +2407,10 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } + /* Always report dynamic locking */ + if(Usage & WINED3DUSAGE_DYNAMIC) + UsageCaps |= WINED3DUSAGE_DYNAMIC; + /* Check QUERY_FILTER support */ if(Usage & WINED3DUSAGE_QUERY_FILTER) { if(CheckFilterCapability(CheckFormat)) {

1 0

Roderick Colenbrander : wined3d: There is no need for the !Usage checks at the start of the resource type checks .
by Alexandre Julliard March 20, 2008

March 20, 2008

Module: wine Branch: master Commit: 7fd87f10cdf0d9345d909a4b5cc6130855e7ee0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fd87f10cdf0d9345d909a4b5… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Mar 18 09:38:55 2008 +0100 wined3d: There is no need for the !Usage checks at the start of the resource type checks. The return-path of the code will handle this properly and this also ensures that the R8G8B8 dxVersion test is reached. --- dlls/wined3d/directx.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5cbb082..aa2c537 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2235,10 +2235,6 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt if(GL_SUPPORT(ARB_TEXTURE_CUBE_MAP)) { /* Check if the texture format is around */ if(CheckTextureCapability(Adapter, CheckFormat)) { - /* No usage checks were requested, so return because we know that the format is supported */ - if(!Usage) - return WINED3D_OK; - if(Usage & WINED3DUSAGE_AUTOGENMIPMAP) { /* Check for automatic mipmap generation support */ if(GL_SUPPORT(SGIS_GENERATE_MIPMAP)) { @@ -2327,10 +2323,6 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt /* Check if the texture format is around */ if(CheckTextureCapability(Adapter, CheckFormat)) { - /* No usage checks were requested, so return because we know that the format is supported */ - if(!Usage) - return WINED3D_OK; - if(Usage & WINED3DUSAGE_AUTOGENMIPMAP) { /* Check for automatic mipmap generation support */ if(GL_SUPPORT(SGIS_GENERATE_MIPMAP)) {

1 0