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

Piotr Caban : msvcp90: Added char_traits<wchar_t> implementation.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 8313d52ccccdb8260464919bd3128e09517e055d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8313d52ccccdb8260464919bd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 20 23:23:24 2010 +0200 msvcp90: Added char_traits<wchar_t> implementation. --- dlls/msvcp90/msvcp90.spec | 32 +++++----- dlls/msvcp90/string.c | 134 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8313d52ccccdb82604649…

1 0

Piotr Caban : msvcp90: Added char_traits<unsigned short> implementation.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 0a4e90153d74d524e2b895b58f6b49f2b44bc285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a4e90153d74d524e2b895b58… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 21 11:10:07 2010 +0200 msvcp90: Added char_traits<unsigned short> implementation. --- dlls/msvcp90/msvcp90.spec | 32 +++++----- dlls/msvcp90/string.c | 140 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a4e90153d74d524e2b89…

1 0

Piotr Caban : msvcp90/tests: Added char_traits assign tests.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: d589d95d508ee7d687599a8a98f76677d860039f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d589d95d508ee7d687599a8a9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 20 23:24:32 2010 +0200 msvcp90/tests: Added char_traits assign tests. --- configure | 1 + configure.ac | 1 + dlls/msvcp90/tests/Makefile.in | 17 ++++++ dlls/msvcp90/tests/misc.c | 104 +++++++++++++++++++++++++++++++++++ dlls/msvcp90/tests/msvcp90.manifest | 22 +++++++ dlls/msvcp90/tests/msvcp90.rc | 22 +++++++ 6 files changed, 167 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 084a3b7..6f8fca2 100755 --- a/configure +++ b/configure @@ -14519,6 +14519,7 @@ wine_fn_config_dll mstask enable_mstask wine_fn_config_test dlls/mstask/tests mstask_test wine_fn_config_dll msvcirt enable_msvcirt wine_fn_config_dll msvcp90 enable_msvcp90 +wine_fn_config_test dlls/msvcp90/tests msvcp90_test wine_fn_config_dll msvcr100 enable_msvcr100 wine_fn_config_dll msvcr70 enable_msvcr70 msvcr70 wine_fn_config_dll msvcr71 enable_msvcr71 msvcr71 diff --git a/configure.ac b/configure.ac index 4c27f84..5638f2b 100644 --- a/configure.ac +++ b/configure.ac @@ -2456,6 +2456,7 @@ WINE_CONFIG_DLL(mstask) WINE_CONFIG_TEST(dlls/mstask/tests) WINE_CONFIG_DLL(msvcirt) WINE_CONFIG_DLL(msvcp90) +WINE_CONFIG_TEST(dlls/msvcp90/tests) WINE_CONFIG_DLL(msvcr100) WINE_CONFIG_DLL(msvcr70,,[msvcr70]) WINE_CONFIG_DLL(msvcr71,,[msvcr71]) diff --git a/dlls/msvcp90/tests/Makefile.in b/dlls/msvcp90/tests/Makefile.in new file mode 100644 index 0000000..37cc9ab --- /dev/null +++ b/dlls/msvcp90/tests/Makefile.in @@ -0,0 +1,17 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = msvcp90.dll +APPMODE = -mno-cygwin +IMPORTS = kernel32 +MODCFLAGS = @BUILTINFLAG@ +EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt + +C_SRCS = \ + misc.c + +RC_SRCS = \ + msvcp90.rc + +(a)MAKE_TEST_RULES@ diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c new file mode 100644 index 0000000..2995dfd --- /dev/null +++ b/dlls/msvcp90/tests/misc.c @@ -0,0 +1,104 @@ +/* + * Copyright 2010 Piotr Caban 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 <stdio.h> + +#include <windef.h> +#include <winbase.h> +#include "wine/test.h" + +static void* (__cdecl *p_set_invalid_parameter_handler)(void*); + +static void (__cdecl *p_char_assign)(void*, const void*); +static void (__cdecl *p_wchar_assign)(void*, const void*); +static void (__cdecl *p_short_assign)(void*, const void*); + +static int invalid_parameter = 0; +static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, + const wchar_t *function, const wchar_t *file, + unsigned line, uintptr_t arg) +{ + ok(expression == NULL, "expression is not NULL\n"); + ok(function == NULL, "function is not NULL\n"); + ok(file == NULL, "file is not NULL\n"); + ok(line == 0, "line = %u\n", line); + ok(arg == 0, "arg = %lx\n", (UINT_PTR)arg); + invalid_parameter++; +} + +static BOOL init(void) +{ + HMODULE msvcr = LoadLibraryA("msvcr90.dll"); + HMODULE msvcp = LoadLibraryA("msvcp90.dll"); + if(!msvcr || !msvcp) { + win_skip("msvcp90.dll or msvcrt90.dll not installed\n"); + return FALSE; + } + + p_set_invalid_parameter_handler = (void*)GetProcAddress(msvcr, "_set_invalid_parameter_handler"); + if(!p_set_invalid_parameter_handler) { + win_skip("Error setting tests environment\n"); + return FALSE; + } + + p_set_invalid_parameter_handler(test_invalid_parameter_handler); + + p_char_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); + p_wchar_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); + p_short_assign = (void*)GetProcAddress(msvcp, "?assign@?$char_traits(a)G@std@@SAXAAGABG(a)Z"); + + return TRUE; +} + +static void test_assign(void) +{ + const char in[] = "abc"; + char out[4]; + + if(!p_char_assign || !p_wchar_assign || !p_short_assign) { + win_skip("assign tests skipped\n"); + return; + } + + out[1] = '#'; + p_char_assign(out, in); + ok(out[0] == in[0], "out[0] = %c\n", out[0]); + ok(out[1] == '#', "out[1] = %c\n", out[1]); + + out[2] = '#'; + p_wchar_assign(out, in); + ok(*((char*)out)==in[0] && *((char*)out+1)==in[1], + "out[0] = %d, out[1] = %d\n", (int)out[0], (int)out[1]); + ok(out[2] == '#', "out[2] = %c\n", out[2]); + + out[2] = '#'; + p_short_assign(out, in); + ok(*((char*)out)==in[0] && *((char*)out+1)==in[1], + "out[0] = %d, out[1] = %d\n", (int)out[0], (int)out[1]); + ok(out[2] == '#', "out[2] = %c\n", out[2]); +} + +START_TEST(misc) +{ + if(!init()) + return; + + test_assign(); + + ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); +} diff --git a/dlls/msvcp90/tests/msvcp90.manifest b/dlls/msvcp90/tests/msvcp90.manifest new file mode 100644 index 0000000..3cf3405 --- /dev/null +++ b/dlls/msvcp90/tests/msvcp90.manifest @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + type="win32" + name="Wine.msvcp90.Test" + version="1.0.0.0" + processorArchitecture="*" + /> +<description>Wine msvcp90 test suite</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="microsoft.vc90.crt" + version="9.0.20718.0" + processorArchitecture="*" + publicKeyToken="1fc8b3b9a1e18e3b" + language="*" + /> +</dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/msvcp90/tests/msvcp90.rc b/dlls/msvcp90/tests/msvcp90.rc new file mode 100644 index 0000000..4f2dd98 --- /dev/null +++ b/dlls/msvcp90/tests/msvcp90.rc @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2010 Piotr Caban + * + * 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 "winuser.h" + +/* @makedep: msvcp90.manifest */ +1 RT_MANIFEST msvcp90.manifest

1 0

Henri Verbeet : wined3d: Add some missing flags to debug_d3dusage().
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 9976e078cb7fc19836b245de4899a8fd6e87b92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9976e078cb7fc19836b245de4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 20 18:51:51 2010 +0200 wined3d: Add some missing flags to debug_d3dusage(). --- dlls/wined3d/utils.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b63a5f8..b38d6c0 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1696,7 +1696,7 @@ const char* debug_d3ddevicetype(WINED3DDEVTYPE devtype) { const char *debug_d3dusage(DWORD usage) { - char buf[284]; + char buf[333]; buf[0] = '\0'; #define WINED3DUSAGE_TO_STR(u) if (usage & u) { strcat(buf, " | "#u); usage &= ~u; } @@ -1711,6 +1711,8 @@ const char *debug_d3dusage(DWORD usage) WINED3DUSAGE_TO_STR(WINED3DUSAGE_DYNAMIC); WINED3DUSAGE_TO_STR(WINED3DUSAGE_AUTOGENMIPMAP); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DMAP); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_STATICDECL); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_OVERLAY); #undef WINED3DUSAGE_TO_STR if (usage) FIXME("Unrecognized usage flag(s) %#x\n", usage);

1 0

Henri Verbeet : wined3d: Remove an unused prototype.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: aae8f13610c3da2ea556befa34490fe646107884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aae8f13610c3da2ea556befa3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 20 18:51:52 2010 +0200 wined3d: Remove an unused prototype. --- dlls/wined3d/wined3d_private.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c46810b..2ec88e3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2110,7 +2110,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetColorKey(IWineD3DSurface *iface, DWORD Flags, const WINEDDCOLORKEY *CKey) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetContainer(IWineD3DSurface *iface, IWineD3DBase *container) DECLSPEC_HIDDEN; DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPitch(IWineD3DSurface *iface) DECLSPEC_HIDDEN; -HRESULT WINAPI IWineD3DBaseSurfaceImpl_RealizePalette(IWineD3DSurface *iface) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetOverlayPosition(IWineD3DSurface *iface, LONG X, LONG Y) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetOverlayPosition(IWineD3DSurface *iface, LONG *X, LONG *Y) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_UpdateOverlayZOrder(IWineD3DSurface *iface,

1 0

Henri Verbeet : wined3d: Just implement BindTexture() for GDI surfaces in surface_gdi.c.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 0344bc429dff01d1d37990cc9938b1823c693d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0344bc429dff01d1d37990cc9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 20 18:51:53 2010 +0200 wined3d: Just implement BindTexture() for GDI surfaces in surface_gdi.c. --- dlls/wined3d/surface_base.c | 4 ---- dlls/wined3d/surface_gdi.c | 7 ++++++- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 10d1141..2bd0e37 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1903,10 +1903,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DL return WINED3D_OK; } -void WINAPI IWineD3DBaseSurfaceImpl_BindTexture(IWineD3DSurface *iface, BOOL srgb) { - ERR("Should not be called on base texture\n"); -} - /* TODO: think about moving this down to resource? */ const void *WINAPI IWineD3DBaseSurfaceImpl_GetData(IWineD3DSurface *iface) { diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index a97675e..8e7eb2f 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -241,6 +241,11 @@ IWineGDISurfaceImpl_LoadTexture(IWineD3DSurface *iface, BOOL srgb_mode) return WINED3DERR_INVALIDCALL; } +static void WINAPI IWineGDISurfaceImpl_BindTexture(IWineD3DSurface *iface, BOOL srgb) +{ + ERR("Not supported.\n"); +} + static HRESULT WINAPI IWineGDISurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHDC) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; WINED3DLOCKED_RECT lock; @@ -547,7 +552,7 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineD3DBaseSurfaceImpl_GetClipper, /* Internal use: */ IWineGDISurfaceImpl_LoadTexture, - IWineD3DBaseSurfaceImpl_BindTexture, + IWineGDISurfaceImpl_BindTexture, IWineD3DBaseSurfaceImpl_SetContainer, IWineD3DBaseSurfaceImpl_GetData, IWineD3DBaseSurfaceImpl_SetFormat, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2ec88e3..f5fb280 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2126,7 +2126,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst IWineD3DSurface *Source, const RECT *rsrc, DWORD trans) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DLOCKED_RECT *pLockedRect, const RECT *pRect, DWORD Flags) DECLSPEC_HIDDEN; -void WINAPI IWineD3DBaseSurfaceImpl_BindTexture(IWineD3DSurface *iface, BOOL srgb) DECLSPEC_HIDDEN; const void *WINAPI IWineD3DBaseSurfaceImpl_GetData(IWineD3DSurface *iface) DECLSPEC_HIDDEN; void get_drawable_size_swapchain(struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Use a more consistent name for the normalized texrect "extension".
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: c411b45da93ecb34ee127330ab7bf4e38dff0cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c411b45da93ecb34ee127330a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 20 18:51:54 2010 +0200 wined3d: Use a more consistent name for the normalized texrect "extension". --- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/state.c | 16 ++++++++-------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_gl.h | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ecd2919..4496393 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6199,7 +6199,7 @@ static HRESULT updateSurfaceDesc(IWineD3DSurfaceImpl *surface, const WINED3DPRES surface->currentDesc.Width = pPresentationParameters->BackBufferWidth; surface->currentDesc.Height = pPresentationParameters->BackBufferHeight; if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] || gl_info->supported[ARB_TEXTURE_RECTANGLE] - || gl_info->supported[WINE_NORMALIZED_TEXRECT]) + || gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) { surface->pow2Width = pPresentationParameters->BackBufferWidth; surface->pow2Height = pPresentationParameters->BackBufferHeight; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8c744ff..5705def 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -789,7 +789,7 @@ static void quirk_ati_dx9(struct wined3d_gl_info *gl_info) { TRACE("GL_ARB_texture_non_power_of_two advertised on R500 or earlier card, removing.\n"); gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; - gl_info->supported[WINE_NORMALIZED_TEXRECT] = TRUE; + gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] = TRUE; } /* fglrx has the same structural issues as the one described in quirk_apple_glsl_constants, although diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4c6d5bf..7f35091 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5416,28 +5416,28 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { * otherwise, register sampler_texmatrix, which takes care of updating the texture matrix */ { STATE_SAMPLER(0), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, - { STATE_SAMPLER(0), { 0, NULL }, WINE_NORMALIZED_TEXRECT }, + { STATE_SAMPLER(0), { 0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT }, { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler_texmatrix }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(1), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, - { STATE_SAMPLER(1), { 0, NULL }, WINE_NORMALIZED_TEXRECT }, + { STATE_SAMPLER(1), { 0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT }, { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler_texmatrix }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(2), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, - { STATE_SAMPLER(2), { 0, NULL }, WINE_NORMALIZED_TEXRECT }, + { STATE_SAMPLER(2), { 0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT }, { STATE_SAMPLER(2), { STATE_SAMPLER(2), sampler_texmatrix }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(3), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, - { STATE_SAMPLER(3), { 0, NULL }, WINE_NORMALIZED_TEXRECT }, + { STATE_SAMPLER(3), { 0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT }, { STATE_SAMPLER(3), { STATE_SAMPLER(3), sampler_texmatrix }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(4), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, - { STATE_SAMPLER(4), { 0, NULL }, WINE_NORMALIZED_TEXRECT }, + { STATE_SAMPLER(4), { 0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT }, { STATE_SAMPLER(4), { STATE_SAMPLER(4), sampler_texmatrix }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(5), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, - { STATE_SAMPLER(5), { 0, NULL }, WINE_NORMALIZED_TEXRECT }, + { STATE_SAMPLER(5), { 0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT }, { STATE_SAMPLER(5), { STATE_SAMPLER(5), sampler_texmatrix }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(6), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, - { STATE_SAMPLER(6), { 0, NULL }, WINE_NORMALIZED_TEXRECT }, + { STATE_SAMPLER(6), { 0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT }, { STATE_SAMPLER(6), { STATE_SAMPLER(6), sampler_texmatrix }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(7), { 0, NULL }, ARB_TEXTURE_NON_POWER_OF_TWO }, - { STATE_SAMPLER(7), { 0, NULL }, WINE_NORMALIZED_TEXRECT }, + { STATE_SAMPLER(7), { 0, NULL }, WINED3D_GL_NORMALIZED_TEXRECT }, { STATE_SAMPLER(7), { STATE_SAMPLER(7), sampler_texmatrix }, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, }; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 94066ed..00aa188 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3805,7 +3805,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { This->texture_target = GL_TEXTURE_2D; /* Non-power2 support */ - if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] || gl_info->supported[WINE_NORMALIZED_TEXRECT]) + if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] || gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) { pow2Width = This->currentDesc.Width; pow2Height = This->currentDesc.Height; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 98e7909..8e8b191 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -541,7 +541,7 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT * 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). The reason is that EXT_PALETTED_TEXTURE * doesn't work in combination with ARB_TEXTURE_RECTANGLE. */ - if (gl_info->supported[WINE_NORMALIZED_TEXRECT] && (width != pow2_width || height != pow2_height)) + if (gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] && (width != pow2_width || height != pow2_height)) { texture->baseTexture.pow2Matrix[0] = 1.0f; texture->baseTexture.pow2Matrix[5] = 1.0f; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index e069ae6..c76a753 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1837,7 +1837,7 @@ typedef enum wined3d_gl_extension WGL_ARB_PIXEL_FORMAT, WGL_WINE_PIXEL_FORMAT_PASSTHROUGH, /* Internally used */ - WINE_NORMALIZED_TEXRECT, + WINED3D_GL_NORMALIZED_TEXRECT, WINED3D_GL_VERSION_2_0, WINED3D_GL_EXT_COUNT,

1 0

Owen Rudge : fusion: Implement IAssemblyNameImpl_GetDisplayName more completely.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 11dea57f692d1a3c24eebd5b393b05711301b5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=11dea57f692d1a3c24eebd5b3… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Jul 20 18:02:36 2010 +0100 fusion: Implement IAssemblyNameImpl_GetDisplayName more completely. --- dlls/fusion/Makefile.in | 2 +- dlls/fusion/asmname.c | 134 +++++++++++++++++++++++++++++++++++++++---- dlls/fusion/tests/asmname.c | 97 +++++++++++++++++++++++++++++-- 3 files changed, 216 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11dea57f692d1a3c24eeb…

1 0

André Hentschel : ntdll: Add LDT error codes.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 10e1387f61ff97489d3ff184fb6319c663a7afbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e1387f61ff97489d3ff184f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 20 19:33:21 2010 +0200 ntdll: Add LDT error codes. --- dlls/ntdll/error.c | 6 +++--- dlls/ntdll/tests/error.c | 3 +++ include/winerror.h | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c index 80bf787..3cccf27 100644 --- a/dlls/ntdll/error.c +++ b/dlls/ntdll/error.c @@ -669,9 +669,9 @@ static const DWORD table_c0000001[411] = 0, /* c0000115 (STATUS_ABIOS_SELECTOR_NOT_AVAILABLE) */ 0, /* c0000116 (STATUS_ABIOS_INVALID_SELECTOR) */ ERROR_INVALID_THREAD_ID, /* c0000117 (STATUS_NO_LDT) */ - 0, /* c0000118 (STATUS_INVALID_LDT_SIZE) */ - 0, /* c0000119 (STATUS_INVALID_LDT_OFFSET) */ - 0, /* c000011a (STATUS_INVALID_LDT_DESCRIPTOR) */ + ERROR_INVALID_LDT_SIZE, /* c0000118 (STATUS_INVALID_LDT_SIZE) */ + ERROR_INVALID_LDT_OFFSET, /* c0000119 (STATUS_INVALID_LDT_OFFSET) */ + ERROR_INVALID_LDT_DESCRIPTOR, /* c000011a (STATUS_INVALID_LDT_DESCRIPTOR) */ ERROR_BAD_EXE_FORMAT, /* c000011b (STATUS_INVALID_IMAGE_NE_FORMAT) */ ERROR_RXACT_INVALID_STATE, /* c000011c (STATUS_RXACT_INVALID_STATE) */ ERROR_RXACT_COMMIT_FAILURE, /* c000011d (STATUS_RXACT_COMMIT_FAILURE) */ diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index 01c165d..7edc0ba 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -329,6 +329,9 @@ static void run_error_tests(void) cmp(STATUS_INVALID_SID, ERROR_INVALID_SID); cmp(STATUS_INVALID_SECURITY_DESCR, ERROR_INVALID_SECURITY_DESCR); cmp(STATUS_PROCEDURE_NOT_FOUND, ERROR_PROC_NOT_FOUND); + cmp2(STATUS_INVALID_LDT_SIZE, ERROR_INVALID_LDT_SIZE); + cmp2(STATUS_INVALID_LDT_OFFSET, ERROR_INVALID_LDT_OFFSET); + cmp2(STATUS_INVALID_LDT_DESCRIPTOR, ERROR_INVALID_LDT_DESCRIPTOR); cmp(STATUS_BAD_INITIAL_PC, ERROR_BAD_EXE_FORMAT); cmp(STATUS_INVALID_FILE_FOR_SECTION, ERROR_BAD_EXE_FORMAT); cmp(STATUS_INVALID_IMAGE_FORMAT, ERROR_BAD_EXE_FORMAT); diff --git a/include/winerror.h b/include/winerror.h index 97a58cb..a2089b6 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -305,6 +305,9 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_ARITHMETIC_OVERFLOW 534 #define ERROR_PIPE_CONNECTED 535 #define ERROR_PIPE_LISTENING 536 +#define ERROR_INVALID_LDT_SIZE 561 +#define ERROR_INVALID_LDT_OFFSET 563 +#define ERROR_INVALID_LDT_DESCRIPTOR 564 #define ERROR_HANDLES_CLOSED 676 #define ERROR_EA_ACCESS_DENIED 994 #define ERROR_OPERATION_ABORTED 995

1 0

Damjan Jovanovic : winemenubuilder: Always initialize COM.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 187dec992f9e4056e80d4f00b06d54f5a0ca0fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=187dec992f9e4056e80d4f00b… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jul 20 21:16:29 2010 +0200 winemenubuilder: Always initialize COM. --- programs/winemenubuilder/winemenubuilder.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 8ee8387..7641b91 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2775,13 +2775,6 @@ static BOOL Process_Link( LPCWSTR linkname, BOOL bWait ) return 1; } - r = CoInitialize( NULL ); - if( FAILED( r ) ) - { - WINE_ERR("CoInitialize failed\n"); - return 1; - } - r = CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID *) &sl ); if( FAILED( r ) ) @@ -2817,8 +2810,6 @@ static BOOL Process_Link( LPCWSTR linkname, BOOL bWait ) IPersistFile_Release( pf ); IShellLinkW_Release( sl ); - CoUninitialize(); - return !r; } @@ -2845,13 +2836,6 @@ static BOOL Process_URL( LPCWSTR urlname, BOOL bWait ) return 1; } - r = CoInitialize( NULL ); - if( FAILED( r ) ) - { - WINE_ERR("CoInitialize failed\n"); - return 1; - } - r = CoCreateInstance( &CLSID_InternetShortcut, NULL, CLSCTX_INPROC_SERVER, &IID_IUniformResourceLocatorW, (LPVOID *) &url ); if( FAILED( r ) ) @@ -2882,8 +2866,6 @@ static BOOL Process_URL( LPCWSTR urlname, BOOL bWait ) IPersistFile_Release( pf ); url->lpVtbl->Release( url ); - CoUninitialize(); - return !r; } @@ -3116,11 +3098,19 @@ int PASCAL wWinMain (HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sh LPWSTR token = NULL, p; BOOL bWait = FALSE; BOOL bURL = FALSE; + HRESULT hr; int ret = 0; if (!init_xdg()) return 1; + hr = CoInitialize(NULL); + if (FAILED(hr)) + { + WINE_ERR("could not initialize COM, error 0x%08X\n", hr); + return 1; + } + for( p = cmdline; p && *p; ) { token = next_token( &p ); @@ -3160,5 +3150,6 @@ int PASCAL wWinMain (HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sh } } + CoUninitialize(); return ret; }

1 0