Module: wine
Branch: master
Commit: a1364d11c0a1e919eb66a81df04c57e156c95694
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1364d11c0a1e919eb66a81df…
Author: Roderick Colenbrander <thunderbird2k(a)gmx.net>
Date: Mon Jan 21 22:29:03 2008 +0100
wined3d: Don't use texture_rectangle for paletted textures.
---
dlls/wined3d/device.c | 10 ++++++++--
dlls/wined3d/surface.c | 10 ++++++++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 8d4dfd7..0801ac2 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -894,9 +894,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U
}
/** FIXME: add support for real non-power-two if it's provided by the video card **/
- /* Precalculated scaling for 'faked' non power of two texture coords */
+ /* Precalculated scaling for 'faked' non power of two texture coords.
+ Second also don't use ARB_TEXTURE_RECTANGLE in case the surface format is P8 and EXT_PALETTED_TEXTURE
+ is used in combination with texture uploads (RTL_READTEX/RTL_TEXTEX). The reason is that EXT_PALETTED_TEXTURE
+ doesn't work in combination with ARB_TEXTURE_RECTANGLE.
+ */
if(GL_SUPPORT(ARB_TEXTURE_RECTANGLE) &&
- (Width != pow2Width || Height != pow2Height)) {
+ (Width != pow2Width || Height != pow2Height) &&
+ !((Format == WINED3DFMT_P8) && GL_SUPPORT(EXT_PALETTED_TEXTURE) && (wined3d_settings.rendertargetlock_mode == RTL_READTEX || wined3d_settings.rendertargetlock_mode == RTL_TEXTEX)))
+ {
object->baseTexture.pow2Matrix[0] = (float)Width;
object->baseTexture.pow2Matrix[5] = (float)Height;
object->baseTexture.pow2Matrix[10] = 1.0;
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index c6aa7a9..f6aed08 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3463,8 +3463,14 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) {
This->glRect.right = 0;
This->glRect.bottom = 0;
} else {
- /* Check this after the oversize check - do not make an oversized surface a texture_rectangle one */
- if(This->Flags & SFLAG_NONPOW2 && GL_SUPPORT(ARB_TEXTURE_RECTANGLE)) {
+ /* Check this after the oversize check - do not make an oversized surface a texture_rectangle one.
+ Second also don't use ARB_TEXTURE_RECTANGLE in case the surface format is P8 and EXT_PALETTED_TEXTURE
+ is used in combination with texture uploads (RTL_READTEX/RTL_TEXTEX). The reason is that EXT_PALETTED_TEXTURE
+ doesn't work in combination with ARB_TEXTURE_RECTANGLE.
+ */
+ if(This->Flags & SFLAG_NONPOW2 && GL_SUPPORT(ARB_TEXTURE_RECTANGLE) &&
+ !((This->resource.format == WINED3DFMT_P8) && GL_SUPPORT(EXT_PALETTED_TEXTURE) && (wined3d_settings.rendertargetlock_mode == RTL_READTEX || wined3d_settings.rendertargetlock_mode == RTL_TEXTEX)))
+ {
This->glDescription.target = GL_TEXTURE_RECTANGLE_ARB;
This->pow2Width = This->currentDesc.Width;
This->pow2Height = This->currentDesc.Height;
Module: wine
Branch: master
Commit: 0fdf73dd5c159755cbc3e9bb0527e14c9b0d3995
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fdf73dd5c159755cbc3e9bb0…
Author: Andrey Esin <andrey(a)esin.name>
Date: Tue Jan 22 21:22:04 2008 +0300
browseui: Russian translation.
---
dlls/browseui/rsrc.rc | 1 +
dlls/browseui/rsrc_Ru.rc | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/dlls/browseui/rsrc.rc b/dlls/browseui/rsrc.rc
index 96f39f7..5a4a8a9 100644
--- a/dlls/browseui/rsrc.rc
+++ b/dlls/browseui/rsrc.rc
@@ -29,3 +29,4 @@
#include "rsrc_Fr.rc"
#include "rsrc_Ko.rc"
#include "rsrc_No.rc"
+#include "rsrc_Ru.rc"
diff --git a/dlls/browseui/rsrc_Ru.rc b/dlls/browseui/rsrc_Ru.rc
new file mode 100644
index 0000000..bab8e44
--- /dev/null
+++ b/dlls/browseui/rsrc_Ru.rc
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2008 Andrey Esin <andrey(a)esin.name>
+ *
+ * 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_RUSSIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+ IDS_CANCELLING "������..."
+}
+
+IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+{
+ CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */
+ LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX
+ LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX
+ CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8
+ PUSHBUTTON "&������", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE
+ LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX
+}
Module: wine
Branch: master
Commit: 21e2caa484ecd0051bad5333fdc0843b71448c11
URL: http://source.winehq.org/git/wine.git/?a=commit;h=21e2caa484ecd0051bad5333f…
Author: Rob Shearman <rob(a)codeweavers.com>
Date: Tue Jan 22 15:36:09 2008 +0000
ntdll: Fix the index check in RtlGetAce.
The index is zero based so we should obviously be returning
STATUS_INVALID_PARAMETER if the index is equal to the ACE count.
---
dlls/ntdll/sec.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
index 5a1fe89..ea24414 100644
--- a/dlls/ntdll/sec.c
+++ b/dlls/ntdll/sec.c
@@ -1341,7 +1341,7 @@ NTSTATUS WINAPI RtlGetAce(PACL pAcl,DWORD dwAceIndex,LPVOID *pAce )
TRACE("(%p,%d,%p)\n",pAcl,dwAceIndex,pAce);
- if (dwAceIndex > pAcl->AceCount)
+ if (dwAceIndex >= pAcl->AceCount)
return STATUS_INVALID_PARAMETER;
ace = (PACE_HEADER)(pAcl + 1);