Module: wine
Branch: master
Commit: eca8577d5368dbbbcce0f81a1d851934446895de
URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca8577d5368dbbbcce0f81a1…
Author: Chris Robinson <chris.kcat(a)gmail.com>
Date: Sat Aug 23 14:14:10 2008 -0700
wined3d: Use 8 bits-per-component for the PBO test internal format.
GL_RGBA doesn't gaurantee an internal storage depth, which can cause the test
to fail if it's stored with less than 8 bits of precision. Some nVidia
drivers would actually store with 4 bits of precision.
---
dlls/wined3d/directx.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index c55d66c..6927052 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -3707,7 +3707,7 @@ static void test_pbo_functionality(WineD3D_GL_Info *gl_info) {
while(glGetError());
glGenTextures(1, &texture);
glBindTexture(GL_TEXTURE_2D, texture);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 4, 4, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 4, 4, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0);
checkGLcall("Specifying the PBO test texture\n");
GL_EXTCALL(glGenBuffersARB(1, &pbo));
Module: wine
Branch: master
Commit: bea8b959044b5da6c3019ce73452453c1eb761c9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea8b959044b5da6c3019ce73…
Author: Muneyuki Noguchi <nogu.dev(a)gmail.com>
Date: Sat Aug 23 14:53:21 2008 +0900
clock: Add Japanese resources.
---
programs/clock/Ja.rc | 73 ++++++++++++++++++++++++++++++++++++++++++++++++
programs/clock/rsrc.rc | 1 +
2 files changed, 74 insertions(+), 0 deletions(-)
diff --git a/programs/clock/Ja.rc b/programs/clock/Ja.rc
new file mode 100644
index 0000000..9591f3a
--- /dev/null
+++ b/programs/clock/Ja.rc
@@ -0,0 +1,73 @@
+/*
+ * Clock (Japanese resources)
+ *
+ * Copyright 1998 Marcel Baur <mbaur(a)g26.ethz.ch>
+ * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>
+ *
+ * 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_JAPANESE, SUBLANG_DEFAULT
+
+MAIN_MENU MENU
+{
+ POPUP "�v���p�e�B(&P)" {
+ MENUITEM "�A�i���O(&L)", IDM_ANALOG
+ MENUITEM "�f�W�^��(&T)", IDM_DIGITAL
+ MENUITEM SEPARATOR
+ MENUITEM "�t�H���g(&F)...", IDM_FONT
+ MENUITEM SEPARATOR
+ MENUITEM "�^�C�g���o�[�Ȃ�(&W)", IDM_NOTITLE
+ MENUITEM SEPARATOR
+ MENUITEM "�b(&S)", IDM_SECONDS
+ MENUITEM "���t(&D)", IDM_DATE
+ MENUITEM SEPARATOR
+ MENUITEM "��Ɏ�O�ɕ\��(&A)", IDM_ONTOP
+ }
+ POPUP "���(&O)" {
+ MENUITEM "���C�Z���X(&L)...", IDM_LICENSE
+ MENUITEM "���ۏ�(&N)...", IDM_NOWARRANTY
+ MENUITEM "���v�ɂ���(&A)...", IDM_ABOUT
+ }
+}
+
+STRINGTABLE DISCARDABLE
+{
+IDS_CLOCK, "���v"
+}
+
+STRINGTABLE DISCARDABLE LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+{
+IDS_LICENSE_CAPTION, "���C�Z���X"
+IDS_LICENSE,
+"This program 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.\n\
+This program 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.\n\
+You should have received a copy of the GNU Lesser General Public \
+License along with this program; if not, write to the Free Software \
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA"
+
+IDS_WARRANTY_CAPTION, "���ۏ�"
+IDS_WARRANTY,
+"This program 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."
+}
diff --git a/programs/clock/rsrc.rc b/programs/clock/rsrc.rc
index 53c5b95..bf2eb67 100644
--- a/programs/clock/rsrc.rc
+++ b/programs/clock/rsrc.rc
@@ -33,6 +33,7 @@
#include "Fr.rc"
#include "Hu.rc"
#include "It.rc"
+#include "Ja.rc"
#include "Ko.rc"
#include "Nl.rc"
#include "No.rc"