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

Christian Costa : attrib.exe: Add stubbed command.
by Alexandre Julliard March 19, 2010

March 19, 2010

Module: wine Branch: master Commit: 3ae8d5888af2ddb592b66fdba3764e220484b66d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae8d5888af2ddb592b66fdba… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Mar 19 11:56:20 2010 +0100 attrib.exe: Add stubbed command. --- configure | 5 +++++ configure.ac | 1 + programs/attrib/Makefile.in | 12 ++++++++++++ programs/attrib/attrib.c | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 0 deletions(-) diff --git a/configure b/configure index c177802..e62a54e 100755 --- a/configure +++ b/configure @@ -16026,6 +16026,10 @@ test "x$enable_loader" != xno && wine_fn_append_file ALL_TOP_DIRS "loader" wine_fn_config_makefile programs "Make.rules \$(MAKEDEP)" test "x$enable_programs" != xno && wine_fn_append_file ALL_TOP_DIRS "programs" +wine_fn_config_program attrib +wine_fn_config_makefile programs/attrib "programs/Makeprog.rules \$(MAKEDEP)" +test "x$enable_attrib" != xno && wine_fn_append_file ALL_PROGRAM_DIRS "programs/attrib" && wine_fn_append_file ALL_INSTALL_DIRS "programs/attrib" + wine_fn_config_program cacls wine_fn_config_makefile programs/cacls "programs/Makeprog.rules \$(MAKEDEP)" test "x$enable_cacls" != xno && wine_fn_append_file ALL_PROGRAM_DIRS "programs/cacls" && wine_fn_append_file ALL_INSTALL_DIRS "programs/cacls" @@ -17470,6 +17474,7 @@ do "libs/wpp/Makefile") CONFIG_FILES="$CONFIG_FILES libs/wpp/Makefile" ;; "loader/Makefile") CONFIG_FILES="$CONFIG_FILES loader/Makefile" ;; "programs/Makefile") CONFIG_FILES="$CONFIG_FILES programs/Makefile" ;; + "programs/attrib/Makefile") CONFIG_FILES="$CONFIG_FILES programs/attrib/Makefile" ;; "programs/cacls/Makefile") CONFIG_FILES="$CONFIG_FILES programs/cacls/Makefile" ;; "programs/clock/Makefile") CONFIG_FILES="$CONFIG_FILES programs/clock/Makefile" ;; "programs/cmd/Makefile") CONFIG_FILES="$CONFIG_FILES programs/cmd/Makefile" ;; diff --git a/configure.ac b/configure.ac index ce14e53..1431a33 100644 --- a/configure.ac +++ b/configure.ac @@ -2642,6 +2642,7 @@ WINE_CONFIG_MAKEFILE([libs/wine/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([libs/wpp/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([loader/Makefile],[Make.rules],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([programs/Makefile],[Make.rules],[ALL_TOP_DIRS]) +WINE_CONFIG_PROGRAM(attrib,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(cacls,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(clock,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS]) WINE_CONFIG_PROGRAM(cmd,[ALL_PROGRAM_DIRS,ALL_INSTALL_DIRS]) diff --git a/programs/attrib/Makefile.in b/programs/attrib/Makefile.in new file mode 100644 index 0000000..3696b93 --- /dev/null +++ b/programs/attrib/Makefile.in @@ -0,0 +1,12 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = attrib.exe +APPMODE = -mconsole -municode +IMPORTS = kernel32 + +C_SRCS = attrib.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c new file mode 100644 index 0000000..9cb9d9f --- /dev/null +++ b/programs/attrib/attrib.c @@ -0,0 +1,34 @@ +/* + * Copyright 2010 Christian Costa + * + * 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(attrib); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("attrib.exe is currently only a stub command\n"); + WINE_FIXME("cmdline:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Rob Shearman : rpcrt4: Add tests for a complex array of pointers.
by Alexandre Julliard March 19, 2010

March 19, 2010

Module: wine Branch: master Commit: f6c4c49f86866cb7c15edb43af7203fca32850de URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c4c49f86866cb7c15edb43a… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Mar 19 14:50:15 2010 +0000 rpcrt4: Add tests for a complex array of pointers. --- dlls/rpcrt4/tests/server.c | 19 +++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 3 +++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 693fe69..e792170 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -283,6 +283,15 @@ s_sum_var_array(int x[20], int n) } int +s_sum_complex_array(int n, refpint_t pi[]) +{ + int total = 0; + for (; n > 0; n--) + total += *pi[n - 1]; + return total; +} + +int s_dot_two_vectors(vector_t vs[2]) { return vs[0].x * vs[1].x + vs[0].y * vs[1].y + vs[0].z * vs[1].z; @@ -1213,6 +1222,7 @@ array_tests(void) int *pi; pints_t api[5]; numbers_struct_t *ns; + refpint_t rpi[5]; if (!old_windows_version) { @@ -1317,6 +1327,15 @@ array_tests(void) HeapFree(GetProcessHeap(), 0, ns); } HeapFree(GetProcessHeap(), 0, pi); + + pi = HeapAlloc(GetProcessHeap(), 0, 5 * sizeof(*pi)); + pi[0] = 3; rpi[0] = &pi[0]; + pi[1] = 5; rpi[1] = &pi[1]; + pi[2] = -2; rpi[2] = &pi[2]; + pi[3] = -1; rpi[3] = &pi[3]; + pi[4] = -4; rpi[4] = &pi[4]; + ok(sum_complex_array(5, rpi) == 1, "RPC sum_complex_array\n"); + HeapFree(GetProcessHeap(), 0, pi); } void diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 29b90b5..6899675 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -120,6 +120,8 @@ cpp_quote("#endif") } u; } test_list_t; + typedef [ref] int *refpint_t; + int test_list_length(test_list_t *ls); int sum_fixed_int_3d(int m[2][3][4]); int sum_conf_array([size_is(n)] int x[], int n); @@ -154,6 +156,7 @@ cpp_quote("#endif") int sum_cs(cs_t *cs); int sum_cps(cps_t *cps); int sum_cpsc(cpsc_t *cpsc); + int sum_complex_array(int n, refpint_t pi[n]); typedef [wire_marshal(int)] void *puint_t; int square_puint(puint_t p);

1 0

Detlef Riekenberg : msvcr80: Forward _malloc_crt functions to msvcrt.malloc .
by Alexandre Julliard March 19, 2010

March 19, 2010

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

Henri Verbeet : wined3d: Add COMPLEX_FIXUP_NONE as value 0 to the complex_fixup enum.
by Alexandre Julliard March 19, 2010

March 19, 2010

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

Henri Verbeet : wined3d: Unify "gl_formats_template" naming with the other format info tables.
by Alexandre Julliard March 19, 2010

March 19, 2010

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: Rename GlPixelFormatDesc to wined3d_format_desc.
by Alexandre Julliard March 19, 2010

March 19, 2010

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

Detlef Riekenberg : msvcr90: Forward _malloc_crt to msvcrt.malloc.
by Alexandre Julliard March 19, 2010

March 19, 2010

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

Christian Costa : d3dx9_36: Fix method name.
by Alexandre Julliard March 19, 2010

March 19, 2010

Module: wine Branch: master Commit: 312aa4996ec87ddc44a163944c8c07a37257679e URL: http://source.winehq.org/git/wine.git/?a=commit;h=312aa4996ec87ddc44a163944… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Mar 19 11:54:17 2010 +0100 d3dx9_36: Fix method name. --- dlls/d3dx9_36/shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index a87911e..23c3cdd 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -401,7 +401,7 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByName(ID3DXConstantT return NULL; } -static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByElement(ID3DXConstantTable* iface, D3DXHANDLE constant, UINT index) +static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantElement(ID3DXConstantTable* iface, D3DXHANDLE constant, UINT index) { ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface; @@ -583,7 +583,7 @@ static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl = ID3DXConstantTableImpl_GetSamplerIndex, ID3DXConstantTableImpl_GetConstant, ID3DXConstantTableImpl_GetConstantByName, - ID3DXConstantTableImpl_GetConstantByElement, + ID3DXConstantTableImpl_GetConstantElement, ID3DXConstantTableImpl_SetDefaults, ID3DXConstantTableImpl_SetValue, ID3DXConstantTableImpl_SetBool,

1 0

Henri Verbeet : wined3d: Simplify the generated GLSL for NRM.
by Alexandre Julliard March 19, 2010

March 19, 2010

Module: wine Branch: master Commit: 4cd69b8a097f16012f5c6ba3a6237df3495fba97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cd69b8a097f16012f5c6ba3a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 19 13:19:50 2010 +0100 wined3d: Simplify the generated GLSL for NRM. --- dlls/wined3d/glsl_shader.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2d057f7..9bce13b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2164,16 +2164,26 @@ static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; glsl_src_param_t src_param; + unsigned int mask_size; DWORD write_mask; char dst_mask[6]; write_mask = shader_glsl_get_write_mask(ins->dst, dst_mask); + mask_size = shader_glsl_get_write_mask_size(write_mask); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); shader_addline(buffer, "tmp0.x = length(%s);\n", src_param.param_str); shader_glsl_append_dst(buffer, ins); - shader_addline(buffer, "tmp0.x == 0.0 ? (%s * FLT_MAX) : (%s / tmp0.x));", - src_param.param_str, src_param.param_str); + if (mask_size > 1) + { + shader_addline(buffer, "tmp0.x == 0.0 ? vec%u(0.0) : (%s / tmp0.x));\n", + mask_size, src_param.param_str); + } + else + { + shader_addline(buffer, "tmp0.x == 0.0 ? 0.0 : (%s / tmp0.x));\n", + src_param.param_str); + } } /** Process the WINED3DSIO_EXPP instruction in GLSL:

1 0

Christian Costa : d3dx9_36: Use %u to print unsigned integer.
by Alexandre Julliard March 19, 2010

March 19, 2010

Module: wine Branch: master Commit: 8da1d69c2278a61805c568fd50fe5a65a2c238e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8da1d69c2278a61805c568fd5… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Mar 19 11:55:54 2010 +0100 d3dx9_36: Use %u to print unsigned integer. --- dlls/d3dx9_36/texture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index f0773b9..3ab4541 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -30,7 +30,7 @@ HRESULT WINAPI D3DXCreateTexture(LPDIRECT3DDEVICE9 pDevice, D3DPOOL pool, LPDIRECT3DTEXTURE9 *ppTexture) { - FIXME("(%p, %d, %d, %d, %x, %x, %x, %p): semi-stub\n", pDevice, width, height, miplevels, usage, format, + FIXME("(%p, %u, %u, %u, %x, %x, %x, %p): semi-stub\n", pDevice, width, height, miplevels, usage, format, pool, ppTexture); return IDirect3DDevice9_CreateTexture(pDevice, width, height, miplevels, usage, format, pool, ppTexture, NULL); @@ -52,7 +52,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device, PALETTEENTRY* palette, LPDIRECT3DTEXTURE9* texture) { - FIXME("(%p, %p, %d, %d, %d, %d, %x, %x, %x, %d, %d, %x, %p, %p, %p): stub\n", device, srcdata, srcdatasize, width, + FIXME("(%p, %p, %u, %u, %u, %u, %x, %x, %x, %u, %u, %x, %p, %p, %p): stub\n", device, srcdata, srcdatasize, width, height, miplevels, usage, format, pool, filter, mipfilter, colorkey, srcinfo, palette, texture); return E_NOTIMPL;

1 0