Module: wine
Branch: master
Commit: a59ee29dec293b9dcc3306bf40b3587c4228d8b0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59ee29dec293b9dcc3306bf4…
Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date: Fri Nov 12 13:12:03 2010 +0100
wined3d: Simplify a condition in IWineD3DSurfaceImpl_LoadTexture().
---
dlls/wined3d/surface.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 8d848d2..618e3f0 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2443,14 +2443,14 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface, BO
if (!(This->Flags & flag)) {
TRACE("Reloading because surface is dirty\n");
- } else if(/* Reload: gl texture has ck, now no ckey is set OR */
- ((This->Flags & SFLAG_GLCKEY) && (!(This->CKeyFlags & WINEDDSD_CKSRCBLT))) ||
- /* Reload: vice versa OR */
- ((!(This->Flags & SFLAG_GLCKEY)) && (This->CKeyFlags & WINEDDSD_CKSRCBLT)) ||
- /* Also reload: Color key is active AND the color key has changed */
- ((This->CKeyFlags & WINEDDSD_CKSRCBLT) && (
- (This->glCKey.dwColorSpaceLowValue != This->SrcBltCKey.dwColorSpaceLowValue) ||
- (This->glCKey.dwColorSpaceHighValue != This->SrcBltCKey.dwColorSpaceHighValue)))) {
+ }
+ /* Reload if either the texture and sysmem have different ideas about the
+ * color key, or the actual key values changed. */
+ else if (!(This->Flags & SFLAG_GLCKEY) != !(This->CKeyFlags & WINEDDSD_CKSRCBLT)
+ || ((This->CKeyFlags & WINEDDSD_CKSRCBLT)
+ && (This->glCKey.dwColorSpaceLowValue != This->SrcBltCKey.dwColorSpaceLowValue
+ || This->glCKey.dwColorSpaceHighValue != This->SrcBltCKey.dwColorSpaceHighValue)))
+ {
TRACE("Reloading because of color keying\n");
/* To perform the color key conversion we need a sysmem copy of
* the surface. Make sure we have it
Module: wine
Branch: master
Commit: 4bd1f04fbd63ce37e781fb051524eb5730e0727c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bd1f04fbd63ce37e781fb051…
Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date: Fri Nov 12 13:12:02 2010 +0100
wined3d: Check for depth/stencil surfaces in general in IWineD3DSurfaceImpl_Unmap().
Instead of just the current one.
---
dlls/wined3d/surface.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 9010482..8d848d2 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -10,7 +10,7 @@
* Copyright 2006-2008 Stefan Dösinger for CodeWeavers
* Copyright 2007-2008 Henri Verbeet
* Copyright 2006-2008 Roderick Colenbrander
- * Copyright 2009 Henri Verbeet for CodeWeavers
+ * Copyright 2009-2010 Henri Verbeet for CodeWeavers
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -1897,7 +1897,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Unmap(IWineD3DSurface *iface)
This->dirtyRect.right = 0;
This->dirtyRect.bottom = 0;
}
- else if (This == device->depth_stencil)
+ else if (This->resource.format->Flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))
{
FIXME("Depth Stencil buffer locking is not implemented\n");
}
Module: wine
Branch: master
Commit: db013ed2135738dfec611282614d087e97aed50a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=db013ed2135738dfec6112826…
Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date: Fri Nov 12 13:12:01 2010 +0100
wined3d: Avoid marking samplers dirty in IWineD3DSurfaceImpl_Unmap().
Resources are explicitly loaded in context_apply_draw_state() when needed, the
resource location management takes care of all of this.
---
dlls/wined3d/surface.c | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index dbac947..9010482 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1900,18 +1900,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Unmap(IWineD3DSurface *iface)
else if (This == device->depth_stencil)
{
FIXME("Depth Stencil buffer locking is not implemented\n");
- } else {
- /* The rest should be a normal texture */
- /* Check if the texture is bound, if yes dirtify the sampler to force a re-upload of the texture
- * Can't load the texture here because PreLoad may destroy and recreate the gl texture, so sampler
- * states need resetting
- */
- if (This->container.type == WINED3D_CONTAINER_TEXTURE)
- {
- IWineD3DBaseTextureImpl *texture = This->container.u.texture;
- if (texture->baseTexture.bindCount)
- IWineD3DDeviceImpl_MarkStateDirty(device, STATE_SAMPLER(texture->baseTexture.sampler));
- }
}
unlock_end:
Module: wine
Branch: master
Commit: ab5fbebff587ae67e92c07c993f001b4130877d7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab5fbebff587ae67e92c07c99…
Author: Hans Leidekker <hans(a)codeweavers.com>
Date: Fri Nov 12 13:07:40 2010 +0100
programs: Add a stub implementation of regsvcs.exe.
---
configure | 1 +
configure.ac | 1 +
programs/regsvcs/Makefile.in | 8 ++++++++
programs/regsvcs/main.c | 33 +++++++++++++++++++++++++++++++++
tools/wine.inf.in | 1 +
5 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/configure b/configure
index 9b1cb22..3871a74 100755
--- a/configure
+++ b/configure
@@ -15186,6 +15186,7 @@ wine_fn_config_program progman enable_progman install
wine_fn_config_program reg enable_reg install
wine_fn_config_program regedit enable_regedit installbin
wine_fn_config_test programs/regedit/tests regedit.exe_test
+wine_fn_config_program regsvcs enable_regsvcs install
wine_fn_config_program regsvr32 enable_regsvr32 installbin
wine_fn_config_program rpcss enable_rpcss install
wine_fn_config_program rundll.exe16 enable_win16 install
diff --git a/configure.ac b/configure.ac
index 04ed14f..93a6221 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2843,6 +2843,7 @@ WINE_CONFIG_PROGRAM(progman,install)
WINE_CONFIG_PROGRAM(reg,install)
WINE_CONFIG_PROGRAM(regedit,installbin)
WINE_CONFIG_TEST(programs/regedit/tests)
+WINE_CONFIG_PROGRAM(regsvcs,install)
WINE_CONFIG_PROGRAM(regsvr32,installbin)
WINE_CONFIG_PROGRAM(rpcss,install)
WINE_CONFIG_PROGRAM(rundll.exe16,install,enable_win16)
diff --git a/programs/regsvcs/Makefile.in b/programs/regsvcs/Makefile.in
new file mode 100644
index 0000000..4c808cd
--- /dev/null
+++ b/programs/regsvcs/Makefile.in
@@ -0,0 +1,8 @@
+EXTRADEFS = -DWINE_NO_UNICODE_MACROS
+MODULE = regsvcs.exe
+APPMODE = -mconsole -municode
+
+C_SRCS = \
+ main.c
+
+@MAKE_PROG_RULES@
diff --git a/programs/regsvcs/main.c b/programs/regsvcs/main.c
new file mode 100644
index 0000000..570686d
--- /dev/null
+++ b/programs/regsvcs/main.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2010 Hans Leidekker for CodeWeavers
+ *
+ * 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 "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(regsvcs);
+
+int wmain(int argc, WCHAR *argv[])
+{
+ int i;
+
+ WINE_FIXME("stub:");
+ for (i = 0; i < argc; i++)
+ WINE_FIXME(" %s", wine_dbgstr_w(argv[i]));
+ WINE_FIXME("\n");
+
+ return 0;
+}
diff --git a/tools/wine.inf.in b/tools/wine.inf.in
index 88b79ac..0bdfa36 100644
--- a/tools/wine.inf.in
+++ b/tools/wine.inf.in
@@ -2600,6 +2600,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
10,Microsoft.NET\Framework\v1.1.4322,aspnet_regiis.exe
10,Microsoft.NET\Framework\v1.1.4322,ngen.exe
10,Microsoft.NET\Framework\v1.1.4322,fusion.dll
+10,Microsoft.NET\Framework\v1.1.4322,regsvcs.exe
10,Microsoft.NET\Framework\v2.0.50727,ngen.exe
10,Microsoft.NET\Framework\v2.0.50727,fusion.dll
10,Microsoft.NET\Framework\v4.0.30319,ngen.exe