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

Alexandre Julliard : oleaut32: Move variable declaration outside of the switch statement.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 3cc7574e9c03e4b27b2a06124068ced20bfdcd5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cc7574e9c03e4b27b2a06124… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 19 16:54:44 2010 +0100 oleaut32: Move variable declaration outside of the switch statement. --- dlls/oleaut32/typelib2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 8816e9d..6b1aea0 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1179,6 +1179,7 @@ static HRESULT ctl2_add_default_value( { VARIANT v; HRESULT hres; + int mask = 0; TRACE("%p %d %d\n", This, V_VT(value), arg_type); @@ -1196,7 +1197,6 @@ static HRESULT ctl2_add_default_value( /* Check if default value can be stored in encoded_value */ switch(arg_type) { - int mask = 0; case VT_I4: case VT_UI4: mask = 0x3ffffff;

1 0

Alexandre Julliard : shlwapi/tests: Avoid size_t in a trace.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 82e7a6e52a154e31a88518dc7cf61118525561e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82e7a6e52a154e31a88518dc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 19 17:04:02 2010 +0100 shlwapi/tests: Avoid size_t in a trace. --- dlls/shlwapi/tests/url.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 944d679..f1bd648 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -547,8 +547,7 @@ static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const ok(res == E_POINTER, "UrlGetPart for \"%s\" gave: 0x%08x\n", szUrl, res); ok(dwSize == strlen(szExpected)+1 || (*szExpected == '?' && dwSize == strlen(szExpected)), - "UrlGetPart for \"%s\" gave size: %d, expected: %d\n", - szUrl, dwSize, (*szExpected == '?' ? strlen(szExpected) : strlen(szExpected) + 1)); + "UrlGetPart for \"%s\" gave size: %u\n", szUrl, dwSize); dwSize = INTERNET_MAX_URL_LENGTH; res = pUrlGetPartA(szUrl, szPart, &dwSize, dwPart, dwFlags);

1 0

Henri Verbeet : wined3d: Rename GlPixelFormatDesc to wined3d_format_desc.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 3aaa6ee6e7500106c1e951f881f29485c3ee225c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aaa6ee6e7500106c1e951f88… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 19 13:19:51 2010 +0100 wined3d: Rename GlPixelFormatDesc to wined3d_format_desc. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/basetexture.c | 2 +- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context.c | 10 ++++---- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/device.c | 19 ++++++++------- dlls/wined3d/directx.c | 45 +++++++++++++++++++----------------- dlls/wined3d/resource.c | 2 +- dlls/wined3d/surface.c | 14 +++++----- dlls/wined3d/surface_base.c | 12 +++++----- dlls/wined3d/surface_gdi.c | 2 +- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/utils.c | 20 ++++++++-------- dlls/wined3d/volume.c | 4 +- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 24 ++++++++++---------- 17 files changed, 85 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3aaa6ee6e7500106c1e95…

1 0

Henri Verbeet : wined3d: Unify "gl_formats_template" naming with the other format info tables.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 12608b0a0db15bc046e6d1cf9bec4db7ac789941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12608b0a0db15bc046e6d1cf9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 19 13:19:52 2010 +0100 wined3d: Unify "gl_formats_template" naming with the other format info tables. --- dlls/wined3d/utils.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2e1d57a..5c8747b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -218,20 +218,20 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, 4, GL_FLOAT, 4, GL_FALSE, sizeof(GLhalfNV)} }; -typedef struct { - WINED3DFORMAT fmt; - GLint glInternal, glGammaInternal, rtInternal, glFormat, glType; - unsigned int Flags; +struct wined3d_format_texture_info +{ + WINED3DFORMAT format; + GLint gl_internal; + GLint gl_srgb_internal; + GLint gl_rt_internal; + GLint gl_format; + GLint gl_type; + unsigned int flags; GL_SupportedExt extension; -} GlPixelFormatDescTemplate; +}; -/***************************************************************************** - * OpenGL format template. Contains unexciting formats which do not need - * extension checks. The order in this table is independent of the order in - * the table StaticPixelFormatDesc above. Not all formats have to be in this - * table. - */ -static const GlPixelFormatDescTemplate gl_formats_template[] = { +static const struct wined3d_format_texture_info format_texture_info[] = +{ /* WINED3DFORMAT internal srgbInternal rtInternal format type flags @@ -798,28 +798,28 @@ static BOOL init_format_texture_info(struct wined3d_gl_info *gl_info) { unsigned int i; - for (i = 0; i < sizeof(gl_formats_template) / sizeof(gl_formats_template[0]); ++i) + for (i = 0; i < sizeof(format_texture_info) / sizeof(*format_texture_info); ++i) { - int fmt_idx = getFmtIdx(gl_formats_template[i].fmt); + int fmt_idx = getFmtIdx(format_texture_info[i].format); struct wined3d_format_desc *desc; if (fmt_idx == -1) { ERR("Format %s (%#x) not found.\n", - debug_d3dformat(gl_formats_template[i].fmt), gl_formats_template[i].fmt); + debug_d3dformat(format_texture_info[i].format), format_texture_info[i].format); return FALSE; } - if (!gl_info->supported[gl_formats_template[i].extension]) continue; + if (!gl_info->supported[format_texture_info[i].extension]) continue; desc = &gl_info->gl_formats[fmt_idx]; - desc->glInternal = gl_formats_template[i].glInternal; - desc->glGammaInternal = gl_formats_template[i].glGammaInternal; - desc->rtInternal = gl_formats_template[i].rtInternal; - desc->glFormat = gl_formats_template[i].glFormat; - desc->glType = gl_formats_template[i].glType; + desc->glInternal = format_texture_info[i].gl_internal; + desc->glGammaInternal = format_texture_info[i].gl_srgb_internal; + desc->rtInternal = format_texture_info[i].gl_rt_internal; + desc->glFormat = format_texture_info[i].gl_format; + desc->glType = format_texture_info[i].gl_type; desc->color_fixup = COLOR_FIXUP_IDENTITY; - desc->Flags |= gl_formats_template[i].Flags; + desc->Flags |= format_texture_info[i].flags; desc->heightscale = 1.0f; }

1 0

Henri Verbeet : wined3d: Add COMPLEX_FIXUP_NONE as value 0 to the complex_fixup enum.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 122129f94aabfe2c878ee1848032fbd636e9e7cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=122129f94aabfe2c878ee1848… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 19 13:19:53 2010 +0100 wined3d: Add COMPLEX_FIXUP_NONE as value 0 to the complex_fixup enum. To prevent get_complex_fixup() from returning COMPLEX_FIXUP_YUY2 for simple fixups. --- dlls/wined3d/wined3d_private.h | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3cb7fdc..9cd58ca 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -68,10 +68,11 @@ enum fixup_channel_source enum complex_fixup { - COMPLEX_FIXUP_YUY2 = 0, - COMPLEX_FIXUP_UYVY = 1, - COMPLEX_FIXUP_YV12 = 2, - COMPLEX_FIXUP_P8 = 3, + COMPLEX_FIXUP_NONE = 0, + COMPLEX_FIXUP_YUY2 = 1, + COMPLEX_FIXUP_UYVY = 2, + COMPLEX_FIXUP_YV12 = 3, + COMPLEX_FIXUP_P8 = 4, }; #include <pshpack2.h>

1 0

Detlef Riekenberg : msvcr90: Forward _malloc_crt to msvcrt.malloc.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: ccd7085ce18feabd830af886c9d802dbe4e25913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccd7085ce18feabd830af886c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 19 13:22:20 2010 +0100 msvcr90: Forward _malloc_crt to msvcrt.malloc. --- dlls/msvcr90/msvcr90.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 32c4688..cbfc6e2 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -647,7 +647,7 @@ @ stub _ltow_s @ cdecl _makepath(ptr str str str str) msvcrt._makepath @ stub _makepath_s -@ stub _malloc_crt +@ cdecl _malloc_crt(long) msvcrt.malloc @ cdecl _mbbtombc(long) msvcrt._mbbtombc @ stub _mbbtombc_l @ cdecl _mbbtype(long long) msvcrt._mbbtype

1 0

Detlef Riekenberg : msvcr80: Forward _malloc_crt functions to msvcrt.malloc .
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 2efd2355f7f27dd9896d28653eb6fa47d60d4822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2efd2355f7f27dd9896d28653… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 19 13:22:36 2010 +0100 msvcr80: Forward _malloc_crt functions to msvcrt.malloc. --- dlls/msvcr80/msvcr80.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1a108d0..ed283d9 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -72,7 +72,7 @@ @ stub ?vswprintf@@YAHPA_WIPB_WPAD(a)Z @ stub ?what(a)exception@std@@UBEPBDXZ @ stub @_calloc_crt(a)8 -@ stub @_malloc_crt(a)4 +@ cdecl _malloc_crt(a)4(long) msvcrt.malloc @ stub @_realloc_crt(a)8 @ cdecl $I10_OUTPUT() msvcrt.$I10_OUTPUT @ cdecl -arch=i386 _CIacos() msvcrt._CIacos @@ -659,7 +659,7 @@ @ stub _ltow_s @ cdecl _makepath(ptr str str str str) msvcrt._makepath @ stub _makepath_s -@ stub _malloc_crt +@ cdecl _malloc_crt(long) msvcrt.malloc @ cdecl _mbbtombc(long) msvcrt._mbbtombc @ stub _mbbtombc_l @ cdecl _mbbtype(long long) msvcrt._mbbtype

1 0

Detlef Riekenberg : msvcr80: Forward _initterm_e to msvcr90.dll.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: c9abeb3704e3a13a7cca2e424a557ed613c5d2a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9abeb3704e3a13a7cca2e424… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 19 10:00:11 2010 +0100 msvcr80: Forward _initterm_e to msvcr90.dll. --- dlls/msvcr80/Makefile.in | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index cf78bad..31dae6a 100644 --- a/dlls/msvcr80/Makefile.in +++ b/dlls/msvcr80/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msvcr80.dll IMPORTLIB = msvcr80 -IMPORTS = msvcrt kernel32 +IMPORTS = msvcrt msvcr90 kernel32 C_SRCS = \ msvcr80.c diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d2ee0fc..1a108d0 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -529,7 +529,7 @@ @ stub _i64tow_s @ stub _initptd @ cdecl _initterm(ptr ptr) msvcrt._initterm -@ stub _initterm_e +@ cdecl _initterm_e(ptr ptr) msvcr90._initterm_e @ stub _inp @ stub _inpd @ stub _inpw

1 0

Alexandre Julliard : winegcc: Force importing msvcrt when using the Unicode hack for a Windows build.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 561a3e643ea8b35adfc032d3afa979c622fcec23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=561a3e643ea8b35adfc032d3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 19 13:59:54 2010 +0100 winegcc: Force importing msvcrt when using the Unicode hack for a Windows build. Based on a patch by Alexandre Goujon. --- tools/winegcc/winegcc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 852f105..396bcc8 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -704,7 +704,6 @@ static void build(struct options* opts) { strarray_addall(link_args, get_translator(opts)); strarray_add(link_args, opts->gui_app ? "-mwindows" : "-mconsole"); - if (opts->use_msvcrt) strarray_add(link_args, "-mno-cygwin"); if (opts->nodefaultlibs) strarray_add(link_args, "-nodefaultlibs"); } @@ -777,6 +776,7 @@ static void build(struct options* opts) break; } } + if (!opts->shared && (opts->use_msvcrt || opts->unicode_app)) strarray_add(link_args, "-lmsvcrt"); if (res_o_name) compile_resources_to_object( opts, resources, res_o_name );

1 0

Christian Costa : d3dx9: Add d3dx9effect.h include file.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 72c57977a3d71c28db5665229ad6526c982832ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=72c57977a3d71c28db5665229… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Mar 19 11:55:17 2010 +0100 d3dx9: Add d3dx9effect.h include file. --- include/Makefile.in | 1 + include/d3dx9.h | 1 + include/d3dx9effect.h | 295 +++++++++++++++++++++++++++++++++++++++++++++++++ include/d3dx9shader.h | 5 + 4 files changed, 302 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=72c57977a3d71c28db566…

1 0