July 2010 - Wine-Commits - list.winehq.org

Ken Sharp : kernel32: Update Welsh resource.
by Alexandre Julliard July 7, 2010

July 7, 2010

Module: wine Branch: master Commit: ecf8ebac793ac6063b16a84598a21ccd40b54c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf8ebac793ac6063b16a8459… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Sun Jul 4 17:04:54 2010 +0100 kernel32: Update Welsh resource. --- dlls/kernel32/nls/cym.nls | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/nls/cym.nls b/dlls/kernel32/nls/cym.nls index b661b5f..28df9b2 100644 --- a/dlls/kernel32/nls/cym.nls +++ b/dlls/kernel32/nls/cym.nls @@ -130,28 +130,28 @@ STRINGTABLE LANGUAGE LANG_WELSH, SUBLANG_DEFAULT LOCALE_SNEGATIVESIGN "-" LOCALE_SPOSITIVESIGN "" LOCALE_SSCRIPTS "Latn;" - LOCALE_SSHORTDATE "dd/MM/yy" + LOCALE_SSHORTDATE "dd/MM/yyyy" LOCALE_SSORTNAME "Default" LOCALE_STHOUSAND "," LOCALE_STIME ":" LOCALE_STIMEFORMAT "HH:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Unol Gorllewin Ewrop a Unedig" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Canolog Ewrop" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltig" + LGRPID_GREEK+LGRPID_RES_BASE "Groeg" LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE "Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_JAPANESE+LGRPID_RES_BASE "Siapaneaidd" + LGRPID_KOREAN+LGRPID_RES_BASE "Corea" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Tseiniaidd Traddodiadol" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Tseiniaidd Symleiddiedig" LGRPID_THAI+LGRPID_RES_BASE "Thai" - LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebraeg" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabeg" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Fietnameg" LGRPID_INDIC+LGRPID_RES_BASE "Indic" LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenia" }

1 0

Gustavo Henrique Milaré : crypt32: Update Portuguese (Brazilian) translation.
by Alexandre Julliard July 7, 2010

July 7, 2010

Module: wine Branch: master Commit: adabcc6499bc3bf78686f32b3ff360a37d0a6b26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adabcc6499bc3bf78686f32b3… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Tue Jul 6 18:10:14 2010 -0300 crypt32: Update Portuguese (Brazilian) translation. --- dlls/crypt32/crypt32_Pt.rc | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/crypt32_Pt.rc b/dlls/crypt32/crypt32_Pt.rc index 73b720e..2a00e60 100644 --- a/dlls/crypt32/crypt32_Pt.rc +++ b/dlls/crypt32/crypt32_Pt.rc @@ -164,10 +164,16 @@ STRINGTABLE DISCARDABLE IDS_FILE_RECOVERY "Recuperação de Arquivos" IDS_ROOT_LIST_SIGNER "Assinador de Lista Raiz" IDS_ANY_APPLICATION_POLICIES "Políticas para todas as aplicações" - IDS_DS_EMAIL_REPLICATION "Replicação do Directório de Serviço E-mail" + IDS_DS_EMAIL_REPLICATION "Replicação do Diretório de Serviço E-mail" IDS_ENROLLMENT_AGENT "Agente de Requisição de Certificados" IDS_LIFETIME_SIGNING "Assinatura de Tempo de Vida" IDS_ANY_CERT_POLICY "Políticas para todas as emissões" + IDS_LOCALIZEDNAME_ROOT "Autoridades de Certificação de Raiz Confiáveis" + IDS_LOCALIZEDNAME_MY "Pessoal" + IDS_LOCALIZEDNAME_CA "Autoridades de Certificação Intermédias" + IDS_LOCALIZEDNAME_ADDRESSBOOK "Outras pessoas" + IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Publicadores Confiáveis" + IDS_LOCALIZEDNAME_DISALLOWED "Certificados Desconfiáveis" } LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE @@ -315,13 +321,6 @@ STRINGTABLE DISCARDABLE IDS_ENROLLMENT_AGENT "Agente de Pedido de Certificados" IDS_LIFETIME_SIGNING "Assinatura de tempo de vida" IDS_ANY_CERT_POLICY "Políticas para todas as emissões" -} - - -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -{ IDS_LOCALIZEDNAME_ROOT "Autoridades de Certificação de Raiz Confiáveis" IDS_LOCALIZEDNAME_MY "Pessoal" IDS_LOCALIZEDNAME_CA "Autoridades de Certificação Intermédias"

1 0

André Hentschel : user32/tests: The dialog for that proc has no IDCANCEL.
by Alexandre Julliard July 7, 2010

July 7, 2010

Module: wine Branch: master Commit: 9c1149045f3652dc0538a826c475a18a7f8e4e92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c1149045f3652dc0538a826c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 6 21:03:10 2010 +0200 user32/tests: The dialog for that proc has no IDCANCEL. --- dlls/user32/tests/dialog.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index cc80c27..b7727da 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -760,12 +760,7 @@ static INT_PTR CALLBACK focusDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wParam, return TRUE; case WM_COMMAND: - if (LOWORD(wParam) == IDCANCEL) - { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } - else if (LOWORD(wParam) == 200) + if (LOWORD(wParam) == 200) { if (HIWORD(wParam) == EN_SETFOCUS) g_hwndInitialFocusT1 = (HWND)lParam;

1 0

Ken Thomases : ntdll: Fix set_baud_rate for high rates for non-Linux ( bad copy/paste).
by Alexandre Julliard July 6, 2010

July 6, 2010

Module: wine Branch: master Commit: 85f32011cd19c26f58e778238c63039c4ff608ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f32011cd19c26f58e778238… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jul 6 09:31:55 2010 -0500 ntdll: Fix set_baud_rate for high rates for non-Linux (bad copy/paste). --- dlls/ntdll/serial.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 0c00303..b52ff22 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -528,17 +528,17 @@ static NTSTATUS set_baud_rate(int fd, const SERIAL_BAUD_RATE* sbr) case CBR_38400: port.c_ospeed = B38400; break; #ifdef B57600 case 57600: - case CBR_57600: port.c_cflag |= B57600; break; + case CBR_57600: port.c_ospeed = B57600; break; #endif #ifdef B115200 case 115200: - case CBR_115200: port.c_cflag |= B115200;break; + case CBR_115200: port.c_ospeed = B115200;break; #endif #ifdef B230400 - case 230400: port.c_cflag |= B230400;break; + case 230400: port.c_ospeed = B230400;break; #endif #ifdef B460800 - case 460800: port.c_cflag |= B460800;break; + case 460800: port.c_ospeed = B460800;break; #endif default: ERR("baudrate %d\n", sbr->BaudRate);

1 0

Alexander Nicolaysen Sørnes : wordpad: Update Norwegian Bokmål translation.
by Alexandre Julliard July 6, 2010

July 6, 2010

Module: wine Branch: master Commit: f12a846d63c30eea509a51b90b95330a7dabdcc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12a846d63c30eea509a51b90… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 6 17:44:23 2010 +0200 wordpad: Update Norwegian Bokmål translation. --- programs/wordpad/No.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 592f93b..9129d2e 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -1,5 +1,5 @@ /* - * Copyright 2006-2009 by Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright 2006-2010 by Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -118,7 +118,7 @@ BEGIN MENUITEM "Oliven" ID_COLOR_OLIVE MENUITEM "Marineblå" ID_COLOR_NAVY MENUITEM "Purpur" ID_COLOR_PURPLE - MENUITEM "Teal" ID_COLOR_TEAL + MENUITEM "Blågrønn" ID_COLOR_TEAL MENUITEM "Grå" ID_COLOR_GRAY MENUITEM "Sølv" ID_COLOR_SILVER MENUITEM "Rød" ID_COLOR_RED @@ -126,7 +126,7 @@ BEGIN MENUITEM "Gul" ID_COLOR_YELLOW MENUITEM "Blå" ID_COLOR_BLUE MENUITEM "Fuchsia" ID_COLOR_FUCHSIA - MENUITEM "Aqua" ID_COLOR_AQUA + MENUITEM "Turkis" ID_COLOR_AQUA MENUITEM "Hvit" ID_COLOR_WHITE MENUITEM "Automatisk" ID_COLOR_AUTOMATIC END @@ -244,14 +244,14 @@ BEGIN STRING_PREVIEW_PREVPAGE, "Forrige side" STRING_PREVIEW_TWOPAGES, "To sider" STRING_PREVIEW_ONEPAGE, "Én side" - STRING_PREVIEW_ZOOMIN, "Zoom in" - STRING_PREVIEW_ZOOMOUT, "Zoom out" + STRING_PREVIEW_ZOOMIN, "Forstørr" + STRING_PREVIEW_ZOOMOUT, "Forminsk" STRING_PREVIEW_CLOSE, "Lukk" STRING_PREVIEW_PAGE, "Side" STRING_PREVIEW_PAGES, "Sider" STRING_UNITS_CM, "cm" STRING_UNITS_IN, "in" - STRING_UNITS_INCH, "inch" + STRING_UNITS_INCH, "tommer" STRING_UNITS_PT, "pt" END

1 0

Stefan Dösinger : d3d9: Windows7 doesn' t draw with Viewports bigger than the framebuffer.
by Alexandre Julliard July 6, 2010

July 6, 2010

Module: wine Branch: master Commit: b50a008549443f70ec834c723687891f165eee25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b50a008549443f70ec834c723… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 3 15:34:35 2010 +0200 d3d9: Windows7 doesn't draw with Viewports bigger than the framebuffer. This is my Geforce 9600 setup here, the failure doesn't occur on all windows 7 systems. I don't think we can change wined3d's behavior as a number of games are broken on my Windows installation because they do not like the extra parameter validation. --- dlls/d3d9/tests/visual.c | 46 +++++++++++++++++++++++++++------------------- 1 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c0cd79d..502d40b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10730,6 +10730,7 @@ static void viewport_test(IDirect3DDevice9 *device) { HRESULT hr; DWORD color; D3DVIEWPORT9 vp, old_vp; + BOOL draw_failed = TRUE; const float quad[] = { -0.5, -0.5, 0.1, @@ -10749,6 +10750,10 @@ static void viewport_test(IDirect3DDevice9 *device) { * * TODO: Test Width < surface.width, but X + Width > surface.width * TODO: Test Width < surface.width, what happens with the height? + * + * Note that Windows 7 rejects MinZ / MaxZ outside [0;1], but accepts Width + * and Height fields bigger than the framebuffer. However, it later refuses + * to draw. */ memset(&vp, 0, sizeof(vp)); vp.X = 0; @@ -10767,29 +10772,32 @@ static void viewport_test(IDirect3DDevice9 *device) { if(SUCCEEDED(hr)) { hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); - ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); + ok(hr == D3D_OK || broken(hr == D3DERR_INVALIDCALL), "DrawPrimitiveUP failed (%08x)\n", hr); + draw_failed = FAILED(hr); hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); } - ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - color = getPixelColor(device, 158, 118); - ok(color == 0x00ff0000, "viewport test: (158,118) has color %08x\n", color); - color = getPixelColor(device, 162, 118); - ok(color == 0x00ff0000, "viewport test: (162,118) has color %08x\n", color); - color = getPixelColor(device, 158, 122); - ok(color == 0x00ff0000, "viewport test: (158,122) has color %08x\n", color); - color = getPixelColor(device, 162, 122); - ok(color == 0x00ffffff, "viewport test: (162,122) has color %08x\n", color); + if(!draw_failed) + { + color = getPixelColor(device, 158, 118); + ok(color == 0x00ff0000, "viewport test: (158,118) has color %08x\n", color); + color = getPixelColor(device, 162, 118); + ok(color == 0x00ff0000, "viewport test: (162,118) has color %08x\n", color); + color = getPixelColor(device, 158, 122); + ok(color == 0x00ff0000, "viewport test: (158,122) has color %08x\n", color); + color = getPixelColor(device, 162, 122); + ok(color == 0x00ffffff, "viewport test: (162,122) has color %08x\n", color); - color = getPixelColor(device, 478, 358); - ok(color == 0x00ffffff, "viewport test: (478,358 has color %08x\n", color); - color = getPixelColor(device, 482, 358); - ok(color == 0x00ff0000, "viewport test: (482,358) has color %08x\n", color); - color = getPixelColor(device, 478, 362); - ok(color == 0x00ff0000, "viewport test: (478,362) has color %08x\n", color); - color = getPixelColor(device, 482, 362); - ok(color == 0x00ff0000, "viewport test: (482,362) has color %08x\n", color); + color = getPixelColor(device, 478, 358); + ok(color == 0x00ffffff, "viewport test: (478,358 has color %08x\n", color); + color = getPixelColor(device, 482, 358); + ok(color == 0x00ff0000, "viewport test: (482,358) has color %08x\n", color); + color = getPixelColor(device, 478, 362); + ok(color == 0x00ff0000, "viewport test: (478,362) has color %08x\n", color); + color = getPixelColor(device, 482, 362); + ok(color == 0x00ff0000, "viewport test: (482,362) has color %08x\n", color); + } hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr);

1 0

Stefan Dösinger : d3d9: Use color_match in the coissue tests.
by Alexandre Julliard July 6, 2010

July 6, 2010

Module: wine Branch: master Commit: 0190b6cb901a66dbdadf3d5cfeb1eaf3b8a29729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0190b6cb901a66dbdadf3d5cf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 3 16:13:31 2010 +0200 d3d9: Use color_match in the coissue tests. --- dlls/d3d9/tests/visual.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 502d40b..0168222 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5389,44 +5389,44 @@ static void cnd_test(IDirect3DDevice9 *device) /* 1.1 shader. coissue flag changed the semantic of cnd, c1 is always selected */ color = getPixelColor(device, 158, 358); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 158, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 162, 358); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 162, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 158, 362); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 158, 362 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 162, 362); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 162, 362 has color %08x, expected 0x0000ff00\n", color); /* 1.2 shader */ color = getPixelColor(device, 478, 358); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 478, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 358); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 482, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 478, 362); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 478, 362 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 362); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 482, 362 has color %08x, expected 0x0000ff00\n", color); /* 1.3 shader */ color = getPixelColor(device, 478, 118); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 478, 118 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 118); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 482, 118 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 478, 122); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 478, 122 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 122); - ok( (((color & 0x00ff0000) >> 16) <= 0x01) && (((color & 0x0000ff00) >> 8) == 0xff) && ((color & 0x000000ff) <= 0x01), + ok(color_match(color, 0x0000ff00, 1), "pixel 482, 122 has color %08x, expected 0x0000ff00\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);

1 0

Ken Sharp : msrle32: Add Welsh resource.
by Alexandre Julliard July 6, 2010

July 6, 2010

Module: wine Branch: master Commit: e39243e232e7e14a69a13a781720d3176a307f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e39243e232e7e14a69a13a781… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Tue Jun 15 08:02:58 2010 +0100 msrle32: Add Welsh resource. --- dlls/msrle32/Makefile.in | 1 + dlls/msrle32/msrle_Cy.rc | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/msrle32/Makefile.in b/dlls/msrle32/Makefile.in index 1c0828e..a54f0fe 100644 --- a/dlls/msrle32/Makefile.in +++ b/dlls/msrle32/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = msrle32.c RC_SRCS = \ msrle_Bg.rc \ msrle_Cs.rc \ + msrle_Cy.rc \ msrle_Da.rc \ msrle_De.rc \ msrle_En.rc \ diff --git a/dlls/msrle32/msrle_Cy.rc b/dlls/msrle32/msrle_Cy.rc new file mode 100644 index 0000000..59a36cb --- /dev/null +++ b/dlls/msrle32/msrle_Cy.rc @@ -0,0 +1,33 @@ +/* + * Cefnogaeth iaith Cymraeg + * Welsh language support + * + * Copyright 2010 Ken Sharp + * + * 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 + */ + +#include "msrle_private.h" + +#pragma code_page(65001) + +LANGUAGE LANG_WELSH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "WINE-MS-RLE" + IDS_DESCRIPTION "Wine MS-RLE 'n fideo codec" + IDS_ABOUT "Wine MS-RLE 'n fideo codec\nHawlfraint 2002 Michael Günnewig" +}

1 0

Stefan Dösinger : d3d9: Ignore a Windows 7 failure in the d3d9 depth clamp test.
by Alexandre Julliard July 6, 2010

July 6, 2010

Module: wine Branch: master Commit: cb4ba6a86210f38c1840928cd4df88718c7fbd97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb4ba6a86210f38c1840928cd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 3 10:53:14 2010 +0200 d3d9: Ignore a Windows 7 failure in the d3d9 depth clamp test. --- dlls/d3d9/tests/visual.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a17588b..c0cd79d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10862,6 +10862,17 @@ static void depth_clamp_test(IDirect3DDevice9 *device) vp.MaxZ = 7.5; hr = IDirect3DDevice9_SetViewport(device, &vp); + if(FAILED(hr)) + { + /* Windows 7 rejects MaxZ > 1.0, Windows XP allows it. This doesn't break + * the tests because the 7.5 is just intended to show that it doesn't have + * any influence on the drawing or D3DRS_CLIPPING = FALSE. Set an accepted + * viewport and continue. + */ + ok(broken(hr == D3DERR_INVALIDCALL), "D3D rejected maxZ > 1.0\n"); + vp.MaxZ = 1.0; + hr = IDirect3DDevice9_SetViewport(device, &vp); + } ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0, 0);

1 0

Paul Vriens : notepad: Use SUBLANG_NEUTRAL for the Arabic resources.
by Alexandre Julliard July 6, 2010

July 6, 2010

Module: wine Branch: master Commit: efc5209ac41de08cb78b26e650e0d2dbfba5740f URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc5209ac41de08cb78b26e65… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jul 5 20:49:50 2010 +0200 notepad: Use SUBLANG_NEUTRAL for the Arabic resources. --- programs/notepad/Ar.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/notepad/Ar.rc b/programs/notepad/Ar.rc index 5d2a9b9..e4ec771 100644 --- a/programs/notepad/Ar.rc +++ b/programs/notepad/Ar.rc @@ -22,7 +22,7 @@ #pragma code_page(65001) -LANGUAGE LANG_ARABIC, SUBLANG_DEFAULT +LANGUAGE LANG_ARABIC, SUBLANG_NEUTRAL MAIN_MENU MENU {

1 0